0 files changed, 0 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ff253c1da..c5371b264 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,41 +8,26 @@ install-sh
 ltmain.sh
 Makefile.in
 missing
-py-compile
 *.sw?
 *~
-*.lo
-*.la
-*.o
-*.tar.gz
-*.rpm
+*lo
+*la
+*o
 .libs
-.deps
 Makefile
 stamp-h1
 
 # Generated files
-api/examples/__init__.py*
-api/examples/setup.py
-argp-standalone/libargp.a
-contrib/uuid/uuid_types.h
-extras/init.d/glusterd-Debian
-extras/init.d/glusterd-Redhat
-extras/init.d/glusterd-SuSE
-extras/init.d/glusterd.plist
-extras/ocf/glusterd
-extras/ocf/volume
-extras/who-wrote-glusterfs/gitdm
-glusterfs-api.pc
+extras/init.d/glusterfs-server.plist
+extras/init.d/glusterfsd-Debian
+extras/init.d/glusterfsd-Redhat
+extras/init.d/glusterfsd-SuSE
 glusterfs.spec
+libtool
+xlators/mount/fuse/utils/mount.glusterfs
+xlators/mount/fuse/utils/mount_glusterfs
+argp-standalone/libargp.a
 glusterfsd/src/glusterfsd
-libgfchangelog.pc
 libglusterfs/src/spec.lex.c
 libglusterfs/src/y.tab.c
 libglusterfs/src/y.tab.h
-libtool
-run-tests.sh
-ufo/.tox
-ufo/test/unit/.coverage
-xlators/mount/fuse/utils/mount.glusterfs
-xlators/mount/fuse/utils/mount_glusterfs
diff --git a/.mailmap b/.mailmap
deleted file mode 100644
index 6bcd95dea..000000000
--- a/.mailmap
+++ /dev/null
@@ -1,31 +0,0 @@
-# .mailmap, see 'git short-log --help' for details
-#
-# Listing of contributors that filed patches with different email addresses.
-# Format: <name> <main-email> <alias> [<alias> ...]
-#
-
-Amar Tumballi <amarts@redhat.com> <amar@gluster.com> <amar@del.gluster.com>
-Anand Avati <avati@redhat.com> <avati@gluster.com> <avati@dev.gluster.com> <avati@amp.gluster.com> <avati@blackhole.gluster.com>
-Anush Shetty <ashetty@redhat.com> <anush@gluster.com>
-Csaba Henk <csaba@redhat.com> <csaba@gluster.com> <csaba@lowlife.hu> <csaba@zresearch.com>
-Harshavardhana <fharshav@redhat.com> <harsha@gluster.com> <harsha@zresearch.com> <harsha@dev.gluster.com> <harsha@harshavardhana.net>
-Kaleb S. KEITHLEY <kkeithle@redhat.com> <kkeithle@f16node1.kkeithle.usersys.redhat.com>
-Kaushal M <kaushal@redhat.com> <kaushal@gluster.com>
-Kaushik BV <kbudiger@redhat.com> <kaushikbv@gluster.com>
-Krishna Srinivas <ksriniva@redhat.com> <krishna@gluster.com> <krishna@zresearch.com> <krishna@guest-laptop>
-Krishnan Parthasarathi <kparthas@redhat.com> <kp@gluster.com>
-Louis Zuckerman <louiszuckerman@gmail.com> <me@louiszuckerman.com>
-M S Vishwanath Bhat <vbhat@redhat.com> <msvbhat@gmail.com> <vishwanath@gluster.com>
-Pavan Sondur <pavan@gluster.com> <pavan@dev.gluster.com>
-Pete Zaitcev <zaitcev@kotori.zaitcev.us> <zaitcev@yahoo.com>
-Pranith Kumar K <pkarampu@redhat.com> <pranithk@gluster.com>
-Raghavendra Bhat <raghavendra@redhat.com> <raghavendrabhat@gluster.com>
-Raghavendra G <rgowdapp@redhat.com> <raghavendra@gluster.com> <raghavendra@zresearch.com>
-Rahul C S <rahulcs@redhat.com> <rahulcssjce@gmail.com>
-Rajesh Amaravathi <rajesh@redhat.com> <rajesh@gluster.com> <rajesh.amaravathi@gmail.com>
-Shehjar Tikoo <shehjart@gluster.com> <shehjart@zresearch.com>
-Venky Shankar <vshankar@redhat.com> <venky@gluster.com>
-Vijay Bellur <vbellur@redhat.com> <vijay@gluster.com> <vijay@dev.gluster.com>
-Vijaykumar Koppad <vkoppad@redhat.com> <vijaykumar.koppad@gmail.com>
-Vikas Gorur <vikas@gluster.com> <vikas@zresearch.com>
-shishir gowda <sgowda@redhat.com> <shishirng@gluster.com>
diff --git a/CONTRIBUTING b/CONTRIBUTING
deleted file mode 100644
index 7bccd88d7..000000000
--- a/CONTRIBUTING
+++ /dev/null
@@ -1,25 +0,0 @@
-        Developer's Certificate of Origin 1.1
-
-        By making a contribution to this project, I certify that:
-
-        (a) The contribution was created in whole or in part by me and I
-            have the right to submit it under the open source license
-            indicated in the file; or
-
-        (b) The contribution is based upon previous work that, to the best
-            of my knowledge, is covered under an appropriate open source
-            license and I have the right under that license to submit that
-            work with modifications, whether created in whole or in part
-            by me, under the same open source license (unless I am
-            permitted to submit under a different license), as indicated
-            in the file; or
-
-        (c) The contribution was provided directly to me by some other
-            person who certified (a), (b) or (c) and I have not modified
-            it.
-
-        (d) I understand and agree that this project and the contribution
-            are public and that a record of the contribution (including all
-            personal information I submit with it, including my sign-off) is
-            maintained indefinitely and may be redistributed consistent with
-            this project or the open source license(s) involved.
diff --git a/COPYING b/COPYING
new file mode 100644
index 000000000..5737cfa27
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  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.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     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
+state 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program 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, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU 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 Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/COPYING-GPLV2 b/COPYING-GPLV2
deleted file mode 100644
index d159169d1..000000000
--- a/COPYING-GPLV2
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser General
-Public License instead of this License.
diff --git a/COPYING-LGPLV3 b/COPYING-LGPLV3
deleted file mode 100644
index 65c5ca88a..000000000
--- a/COPYING-LGPLV3
+++ /dev/null
@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  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 that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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 as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/Makefile.am b/Makefile.am
index 598ebb410..85e0a13f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,8 @@
-EXTRA_DIST = autogen.sh \
-	COPYING-GPLV2 COPYING-LGPLV3 \
-	INSTALL README AUTHORS THANKS NEWS \
-	glusterfs.spec glusterfs-api.pc.in libgfchangelog.pc.in \
-	error-codes.json gf-error-codes.h.template \
-	gen-headers.py run-tests.sh \
-	$(shell find $(top_srcdir)/tests -type f -print)
+EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS glusterfs.spec
 
-SUBDIRS = argp-standalone libglusterfs rpc api xlators glusterfsd \
-	$(FUSERMOUNT_SUBDIR) doc extras cli @SYNCDAEMON_SUBDIR@
+SUBDIRS = argp-standalone libglusterfs rpc xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras cli
 
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = glusterfs-api.pc libgfchangelog.pc
-
-CLEANFILES =
+CLEANFILES = 
 
 gitclean: distclean
 	find . -name Makefile.in -exec rm -f {} \;
@@ -21,9 +11,4 @@ gitclean: distclean
 	rm -fr autom4te.cache
 	rm -f missing aclocal.m4 config.h.in config.guess config.sub ltmain.sh install-sh configure depcomp
 	rm -fr argp-standalone/autom4te.cache
-	rm -f argp-standalone/aclocal.m4 argp-standalone/config.h.in
-	rm -f argp-standalone/configure argp-standalone/depcomp
-	rm -f argp-standalone/install-sh argp-standalone/missing
-
-dist-hook:
-	(cd $(srcdir) && git diff && echo ===== git log ==== && git log) > $(distdir)/ChangeLog
+	rm -f argp-standalone/aclocal.m4 argp-standalone/config.h.in argp-standalone/configure argp-standalone/depcomp argp-standalone/install-sh argp-standalone/missing
diff --git a/NEWS b/NEWS
index ad00208d3..e69de29bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +0,0 @@
-Gluster moves to Gerrit.
diff --git a/README b/README
index ce648743e..07e76c945 100644
--- a/README
+++ b/README
@@ -1 +1 @@
-For more info, please visit http://www.gluster.org/.
+For more info visit http://www.gluster.org
diff --git a/THANKS b/THANKS
index e1ce5105d..ea9816662 100644
--- a/THANKS
+++ b/THANKS
@@ -1 +1,3 @@
-For all of you, who use the product and help us making it more robust, useful, popular..
+
+For all of you, who use the product and help us making it more robust, useful, popular.
+
diff --git a/api/Makefile.am b/api/Makefile.am
deleted file mode 100644
index f0ad1ee97..000000000
--- a/api/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src examples
diff --git a/api/examples/Makefile.am b/api/examples/Makefile.am
deleted file mode 100644
index 05f40ff53..000000000
--- a/api/examples/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_PROGRAMS = glfsxmp
-glfsxmp_SOURCES = glfsxmp.c
-glfsxmp_CFLAGS = $(GLFS_CFLAGS) -Wall
-glfsxmp_LDADD = $(GLFS_LIBS) -lrt
-
-EXTRA_DIST = gfapi.py
diff --git a/api/examples/README b/api/examples/README
deleted file mode 100644
index 4d2b521f7..000000000
--- a/api/examples/README
+++ /dev/null
@@ -1,36 +0,0 @@
-This is an example application which uses libgfapi. It is
-a complete autotools based build system which demonstrates the
-required changes in configure.ac, Makefile.am etc to successfuly
-detect for and build an application against libgfapi.
-
-There are two approaches to building a libgfapi based application:
-
-1. In the presence of pkg-config in your build system.
-This is the recommended approach which is also used in this example.
-For this approach to work, you need to build glusterfs by passing
---pkgconfigdir=/usr/lib64/pkgconfig (or the appropriate directory)
-in your distro. This already happens if you build RPMs with the
-glusterfs.spec provided in glusterfs.git. You will also need to
-install glusterfs-api RPM.
-
-2. In the absence of pkg-config in your build system.
-Make sure your LDFLAGS includes -L/path/to/lib where libgfapi.so is
-installed and -I/path/to/include/glusterfs where the 'api' directory
-containing the headers are available.
-
-glfsxmp.c
-=========
-
-glfsxmp.c is an example application which uses libgfapi
-
-Compilation Steps For glfsxmp.c
-===============================
-
-1. $./autogen.sh
-2. $./configure
-
-Note: Before running ./configure , as mentioned above, you need to
-      take care of #1 or #2 i.e. pkg-config path or LDFLAGS and
-      -I/<path> with correct values.
-
-3. $make glfsxmp
diff --git a/api/examples/autogen.sh b/api/examples/autogen.sh
deleted file mode 100755
index 1fee6be11..000000000
--- a/api/examples/autogen.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-aclocal
-autoconf
-automake --foreign
diff --git a/api/examples/configure.ac b/api/examples/configure.ac
deleted file mode 100644
index b80177a4e..000000000
--- a/api/examples/configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
-
-AC_INIT([glfs-test],[0.1],[gluster-devel@nongu.org])
-
-AM_INIT_AUTOMAKE
-
-AC_CONFIG_FILES([Makefile])
-
-AC_PROG_CC
-
-PKG_CHECK_MODULES([GLFS], [glusterfs-api >= 3])
-
-AC_OUTPUT
diff --git a/api/examples/gfapi.py b/api/examples/gfapi.py
deleted file mode 100755
index 3ac67f4d5..000000000
--- a/api/examples/gfapi.py
+++ /dev/null
@@ -1,422 +0,0 @@
-#!/usr/bin/python
-
-from ctypes import *
-from ctypes.util import find_library
-import os
-import sys
-import time
-import types
-
-# Looks like ctypes is having trouble with dependencies, so just force them to
-# load with RTLD_GLOBAL until I figure that out.
-glfs = CDLL(find_library("glusterfs"),RTLD_GLOBAL)
-xdr = CDLL(find_library("gfxdr"),RTLD_GLOBAL)
-api = CDLL(find_library("gfapi"),RTLD_GLOBAL)
-
-# Wow, the Linux kernel folks really play nasty games with this structure.  If
-# you look at the man page for stat(2) and then at this definition you'll note
-# two discrepancies.  First, we seem to have st_nlink and st_mode reversed.  In
-# fact that's exactly how they're defined *for 64-bit systems*; for 32-bit
-# they're in the man-page order.  Even uglier, the man page makes no mention of
-# the *nsec fields, but they are very much present and if they're not included
-# then we get memory corruption because libgfapi has a structure definition
-# that's longer than ours and they overwrite some random bit of memory after
-# the space we allocated.  Yes, that's all very disgusting, and I'm still not
-# sure this will really work on 32-bit because all of the field types are so
-# obfuscated behind macros and feature checks.
-class Stat (Structure):
-        _fields_ = [
-                ("st_dev",              c_ulong),
-                ("st_ino",              c_ulong),
-                ("st_nlink",            c_ulong),
-                ("st_mode",             c_uint),
-                ("st_uid",              c_uint),
-                ("st_gid",              c_uint),
-                ("st_rdev",             c_ulong),
-                ("st_size",             c_ulong),
-                ("st_blksize",          c_ulong),
-                ("st_blocks",           c_ulong),
-                ("st_atime",            c_ulong),
-                ("st_atimensec",        c_ulong),
-                ("st_mtime",            c_ulong),
-                ("st_mtimensec",        c_ulong),
-                ("st_ctime",            c_ulong),
-                ("st_ctimensec",        c_ulong),
-        ]
-api.glfs_creat.restype = c_void_p
-api.glfs_open.restype = c_void_p
-api.glfs_lstat.restype = c_int
-api.glfs_lstat.argtypes = [c_void_p, c_char_p, POINTER(Stat)]
-
-class Dirent (Structure):
-        _fields_ = [
-                ("d_ino",       c_ulong),
-                ("d_off",       c_ulong),
-                ("d_reclen",    c_ushort),
-                ("d_type",      c_char),
-                ("d_name",      c_char * 256),
-        ]
-api.glfs_opendir.restype = c_void_p
-api.glfs_readdir_r.restype = c_int
-api.glfs_readdir_r.argtypes = [c_void_p, POINTER(Dirent),
-                               POINTER(POINTER(Dirent))]
-
-# There's a bit of ctypes glitchiness around __del__ functions and module-level
-# variables.  If we unload the module while we still have references to File or
-# Volume objects, the module-level variables might have disappeared by the time
-# __del__ gets called.  Therefore the objects hold references which they
-# release when __del__ is done.  We only actually use the object-local values
-# in __del__; for clarity, we just use the simpler module-level form elsewhere.
-
-class File(object):
-
-        def __init__ (self, fd):
-                # Add a reference so the module-level variable "api" doesn't
-                # get yanked out from under us (see comment above File def'n).
-                self._api = api
-                self.fd = fd
-
-        def __del__ (self):
-                self._api.glfs_close(self.fd)
-                self._api = None
-
-        # File operations, in alphabetical order.
-
-        def fsync (self):
-                return api.glfs_fsync(self.fd)
-
-        def read (self, buflen, flags=0):
-                rbuf = create_string_buffer(buflen)
-                rc = api.glfs_read(self.fd,rbuf,buflen,flags)
-                if rc > 0:
-                        return rbuf.value[:rc]
-                else:
-                        return rc
-
-        def read_buffer (self, buf, flags=0):
-                return api.glfs_read(self.fd,buf,len(buf),flags)
-
-        def write (self, data, flags=0):
-                return api.glfs_write(self.fd,data,len(data),flags)
-
-        def fallocate (self, mode, offset, len):
-            return api.glfs_fallocate(self.fd, mode, offset, len)
-
-        def discard (self, offset, len):
-            return api.glfs_discard(self.fd, offset, len)
-
-
-class Dir(object):
-
-        def __init__ (self, fd):
-                # Add a reference so the module-level variable "api" doesn't
-                # get yanked out from under us (see comment above File def'n).
-                self._api = api
-                self.fd = fd
-                self.cursor = POINTER(Dirent)()
-
-        def __del__ (self):
-                self._api.glfs_closedir(self.fd)
-                self._api = None
-
-        def next (self):
-                entry = Dirent()
-                entry.d_reclen = 256
-                rc = api.glfs_readdir_r(self.fd,byref(entry),byref(self.cursor))
-                if (rc < 0) or (not self.cursor) or (not self.cursor.contents):
-                        return rc
-                return entry
-
-class Volume(object):
-
-        # Housekeeping functions.
-
-        def __init__ (self, host, volid, proto="tcp", port=24007):
-                # Add a reference so the module-level variable "api" doesn't
-                # get yanked out from under us (see comment above File def'n).
-                self._api = api
-                self.fs = api.glfs_new(volid)
-                api.glfs_set_volfile_server(self.fs,proto,host,port)
-
-        def __del__ (self):
-                self._api.glfs_fini(self.fs)
-                self._api = None
-
-        def set_logging (self, path, level):
-                api.glfs_set_logging(self.fs,path,level)
-
-        def mount (self):
-                api.glfs_init(self.fs)
-
-        # File operations, in alphabetical order.
-
-        def creat (self, path, flags, mode):
-                fd = api.glfs_creat(self.fs,path,flags,mode)
-                if not fd:
-                        return fd
-                return File(fd)
-
-        def getxattr (self, path, key, maxlen):
-                buf = create_string_buffer(maxlen)
-                rc = api.glfs_getxattr(self.fs,path,key,buf,maxlen)
-                if rc < 0:
-                        return rc
-                return buf.value[:rc]
-
-        def listxattr (self, path):
-                buf = create_string_buffer(512)
-                rc = api.glfs_listxattr(self.fs,path,buf,512)
-                if rc < 0:
-                        return rc
-                xattrs = []
-                # Parsing character by character is ugly, but it seems like the
-                # easiest way to deal with the "strings separated by NUL in one
-                # buffer" format.
-                i = 0
-                while i < rc:
-                        new_xa = buf.raw[i]
-                        i += 1
-                        while i < rc:
-                                next_char = buf.raw[i]
-                                i += 1
-                                if next_char == '\0':
-                                        xattrs.append(new_xa)
-                                        break
-                                new_xa += next_char
-                xattrs.sort()
-                return xattrs
-
-        def lstat (self, path):
-                x = Stat()
-                rc = api.glfs_lstat(self.fs,path,byref(x))
-                if rc >= 0:
-                        return x
-                else:
-                        return rc
-
-        def mkdir (self, path):
-                return api.glfs_mkdir(self.fs,path)
-
-        def open (self, path, flags):
-                fd = api.glfs_open(self.fs,path,flags)
-                if not fd:
-                        return fd
-                return File(fd)
-
-        def opendir (self, path):
-                fd = api.glfs_opendir(self.fs,path)
-                if not fd:
-                        return fd
-                return Dir(fd)
-
-        def rename (self, opath, npath):
-                return api.glfs_rename(self.fs,opath,npath)
-
-        def rmdir (self, path):
-                return api.glfs_rmdir(self.fs,path)
-
-        def setxattr (self, path, key, value, vlen):
-                return api.glfs_setxattr(self.fs,path,key,value,vlen,0)
-
-        def unlink (self, path):
-                return api.glfs_unlink(self.fs,path)
-
-if __name__ == "__main__":
-        def test_create_write (vol, path, data):
-                mypath = path + ".io"
-                fd = vol.creat(mypath,os.O_WRONLY|os.O_EXCL,0644)
-                if not fd:
-                        return False, "creat error"
-                rc = fd.write(data)
-                if rc != len(data):
-                        return False, "wrote %d/%d bytes" % (rc, len(data))
-                return True, "wrote %d bytes" % rc
-
-        # TBD: this test fails if we do create, open, write, read
-        def test_open_read (vol, path, data):
-                mypath = path + ".io"
-                fd = vol.open(mypath,os.O_RDONLY)
-                if not fd:
-                        return False, "open error"
-                dlen = len(data) * 2
-                buf = fd.read(dlen)
-                if type(buf) == types.IntType:
-                        return False, "read error %d" % buf
-                if len(buf) != len(data):
-                        return False, "read %d/%d bytes" % (len(buf), len(data))
-                return True, "read '%s'" % buf
-
-        def test_lstat (vol, path, data):
-                mypath = path + ".io"
-                sb = vol.lstat(mypath)
-                if type(sb) == types.IntType:
-                        return False, "lstat error %d" % sb
-                if sb.st_size != len(data):
-                        return False, "lstat size is %d, expected %d" % (
-                                sb.st_size, len(data))
-                return True, "lstat got correct size %d" % sb.st_size
-
-        def test_rename (vol, path, data):
-                opath = path + ".io"
-                npath = path + ".tmp"
-                rc = vol.rename(opath,npath)
-                if rc < 0:
-                        return False, "rename error %d" % rc
-                ofd = vol.open(opath,os.O_RDWR)
-                if isinstance(ofd,File):
-                        return False, "old path working after rename"
-                nfd = vol.open(npath,os.O_RDWR)
-                if isinstance(nfd,File):
-                        return False, "new path not working after rename"
-                return True, "rename worked"
-
-        def test_unlink (vol, path, data):
-                mypath = path + ".tmp"
-                rc = vol.unlink(mypath)
-                if rc < 0:
-                        return False, "unlink error %d" % fd
-                fd = vol.open(mypath,os.O_RDWR)
-                if isinstance(fd,File):
-                        return False, "path still usable after unlink"
-                return True, "unlink worked"
-
-        def test_mkdir (vol, path, data):
-                mypath = path + ".dir"
-                rc = vol.mkdir(mypath)
-                if rc < 0:
-                        return False, "mkdir error %d" % rc
-                return True, "mkdir worked"
-
-        def test_create_in_dir (vol, path, data):
-                mypath = path + ".dir/probe"
-                fd = vol.creat(mypath,os.O_RDWR,0644)
-                if not isinstance(fd,File):
-                        return False, "create (in dir) error"
-                return True, "create (in dir) worked"
-
-        def test_dir_listing (vol, path, data):
-                mypath = path + ".dir"
-                fd = vol.opendir(mypath)
-                if not isinstance(fd,Dir):
-                        return False, "opendir error %d" % fd
-                files = []
-                while True:
-                        ent = fd.next()
-                        if not isinstance(ent,Dirent):
-                                break
-                        name = ent.d_name[:ent.d_reclen]
-                        files.append(name)
-                if files != [".", "..", "probe"]:
-                        return False, "wrong directory contents"
-                return True, "directory listing worked"
-
-        def test_unlink_in_dir (vol, path, data):
-                mypath = path + ".dir/probe"
-                rc = vol.unlink(mypath)
-                if rc < 0:
-                        return False, "unlink (in dir) error %d" % rc
-                return True, "unlink (in dir) worked"
-
-        def test_rmdir (vol, path, data):
-                mypath = path + ".dir"
-                rc = vol.rmdir(mypath)
-                if rc < 0:
-                        return False, "rmdir error %d" % rc
-                sb = vol.lstat(mypath)
-                if not isinstance(sb,Stat):
-                        return False, "dir still there after rmdir"
-                return True, "rmdir worked"
-
-        def test_setxattr (vol, path, data):
-                mypath = path + ".xa"
-                fd = vol.creat(mypath,os.O_RDWR|os.O_EXCL,0644)
-                if not fd:
-                        return False, "creat (xattr test) error"
-                key1, key2 = "hello", "goodbye"
-                if vol.setxattr(mypath,"trusted.key1",key1,len(key1)) < 0:
-                        return False, "setxattr (key1) error"
-                if vol.setxattr(mypath,"trusted.key2",key2,len(key2)) < 0:
-                        return False, "setxattr (key2) error"
-                return True, "setxattr worked"
-
-        def test_getxattr (vol, path, data):
-                mypath = path + ".xa"
-                buf = vol.getxattr(mypath,"trusted.key1",32)
-                if type(buf) == types.IntType:
-                        return False, "getxattr error"
-                if buf != "hello":
-                        return False, "wrong getxattr value %s" % buf
-                return True, "getxattr worked"
-
-        def test_listxattr (vol, path, data):
-                mypath = path + ".xa"
-                xattrs = vol.listxattr(mypath)
-                if type(xattrs) == types.IntType:
-                        return False, "listxattr error"
-                if xattrs != ["trusted.key1","trusted.key2"]:
-                        return False, "wrong listxattr value %s" % repr(xattrs)
-                return True, "listxattr worked"
-
-        def test_fallocate (vol, path, data):
-                mypath = path + ".io"
-                fd = vol.creat(mypath,os.O_WRONLY|os.O_EXCL,0644)
-                if not fd:
-                        return False, "creat error"
-		rc = fd.fallocate(0, 0, 1024*1024)
-                if rc != 0:
-                        return False, "fallocate error"
-		rc = fd.discard(4096, 4096)
-		if rc != 0:
-			return False, "discard error"
-                return True, "fallocate/discard worked"
-
-        test_list = (
-                test_create_write,
-                test_open_read,
-                test_lstat,
-                test_rename,
-                test_unlink,
-                test_mkdir,
-                test_create_in_dir,
-                test_dir_listing,
-                test_unlink_in_dir,
-                test_rmdir,
-                test_setxattr,
-                test_getxattr,
-                test_listxattr,
-                test_fallocate,
-        )
-
-        ok_to_fail = (
-                # TBD: this fails opening the new file, even though the file
-                # did get renamed.  Looks like a gfapi bug, not ours.
-                (test_rename, "new path not working after rename"),
-                # TBD: similar, call returns error even though it worked
-                (test_rmdir, "dir still there after rmdir"),
-        )
-
-        volid, path = sys.argv[1:3]
-        data = "fubar"
-        vol = Volume("localhost",volid)
-        vol.set_logging("/dev/null",7)
-        #vol.set_logging("/dev/stderr",7)
-        vol.mount()
-
-        failures = 0
-        expected = 0
-        for t in test_list:
-                rc, msg = t(vol,path,data)
-                if rc:
-                        print "PASS: %s" % msg
-                else:
-                        print "FAIL: %s" % msg
-                        failures += 1
-                        for otf in ok_to_fail:
-                                if (t == otf[0]) and (msg == otf[1]):
-                                        print "  (skipping known failure)"
-                                        expected += 1
-                                        break # from the *inner* for loop
-                        else:
-                                break # from the *outer* for loop
-
-        print "%d failures (%d expected)" % (failures, expected)
diff --git a/api/examples/glfsxmp.c b/api/examples/glfsxmp.c
deleted file mode 100644
index 600d72fb5..000000000
--- a/api/examples/glfsxmp.c
+++ /dev/null
@@ -1,1598 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include "api/glfs.h"
-#include "api/glfs-handles.h"
-#include <string.h>
-#include <time.h>
-
-
-int
-test_dirops (glfs_t *fs)
-{
-        glfs_fd_t *fd = NULL;
-        char buf[512];
-        struct dirent *entry = NULL;
-
-        fd = glfs_opendir (fs, "/");
-        if (!fd) {
-                fprintf (stderr, "/: %s\n", strerror (errno));
-                return -1;
-        }
-
-        fprintf (stderr, "Entries:\n");
-        while (glfs_readdir_r (fd, (struct dirent *)buf, &entry), entry) {
-                fprintf (stderr, "%s: %lu\n", entry->d_name, glfs_telldir (fd));
-        }
-
-        glfs_closedir (fd);
-        return 0;
-}
-
-
-int
-test_xattr (glfs_t *fs)
-{
-        char *filename = "/filename2";
-        char buf[512];
-        char *ptr;
-        int ret;
-
-        ret = glfs_setxattr (fs, filename, "user.testkey", "testval", 8, 0);
-        fprintf (stderr, "setxattr(%s): %d (%s)\n", filename, ret,
-                 strerror (errno));
-
-        ret = glfs_setxattr (fs, filename, "user.testkey2", "testval", 8, 0);
-        fprintf (stderr, "setxattr(%s): %d (%s)\n", filename, ret,
-                 strerror (errno));
-
-        ret = glfs_listxattr (fs, filename, buf, 512);
-        fprintf (stderr, "listxattr(%s): %d (%s)\n", filename, ret,
-                 strerror (errno));
-        if (ret < 0)
-                return -1;
-
-        for (ptr = buf; ptr < buf + ret; ptr++) {
-                printf ("key=%s\n", ptr);
-                ptr += strlen (ptr);
-        }
-
-        return 0;
-}
-
-
-int
-test_chdir (glfs_t *fs)
-{
-        int ret = -1;
-        char *topdir = "/topdir";
-        char *linkdir = "/linkdir";
-        char *subdir = "./subdir";
-        char *respath = NULL;
-        char pathbuf[4096];
-
-        ret = glfs_mkdir (fs, topdir, 0755);
-        if (ret) {
-                fprintf (stderr, "mkdir(%s): %s\n", topdir, strerror (errno));
-                return -1;
-        }
-
-        respath = glfs_getcwd (fs, pathbuf, 4096);
-        fprintf (stdout, "getcwd() = %s\n", respath);
-
-        ret = glfs_symlink (fs, topdir, linkdir);
-        if (ret) {
-                fprintf (stderr, "symlink(%s, %s): %s\n", topdir, linkdir, strerror (errno));
-                return -1;
-        }
-
-        ret = glfs_chdir (fs, linkdir);
-        if (ret) {
-                fprintf (stderr, "chdir(%s): %s\n", linkdir, strerror (errno));
-                return -1;
-        }
-
-        respath = glfs_getcwd (fs, pathbuf, 4096);
-        fprintf (stdout, "getcwd() = %s\n", respath);
-
-        respath = glfs_realpath (fs, subdir, pathbuf);
-        if (respath) {
-                fprintf (stderr, "realpath(%s) worked unexpectedly: %s\n", subdir, respath);
-                return -1;
-        }
-
-        ret = glfs_mkdir (fs, subdir, 0755);
-        if (ret) {
-                fprintf (stderr, "mkdir(%s): %s\n", subdir, strerror (errno));
-                return -1;
-        }
-
-        respath = glfs_realpath (fs, subdir, pathbuf);
-        if (!respath) {
-                fprintf (stderr, "realpath(%s): %s\n", subdir, strerror (errno));
-        } else {
-                fprintf (stdout, "realpath(%s) = %s\n", subdir, respath);
-        }
-
-        ret = glfs_chdir (fs, subdir);
-        if (ret) {
-                fprintf (stderr, "chdir(%s): %s\n", subdir, strerror (errno));
-                return -1;
-        }
-
-        respath = glfs_getcwd (fs, pathbuf, 4096);
-        fprintf (stdout, "getcwd() = %s\n", respath);
-
-        respath = glfs_realpath (fs, "/linkdir/subdir", pathbuf);
-        if (!respath) {
-                fprintf (stderr, "realpath(/linkdir/subdir): %s\n", strerror (errno));
-        } else {
-                fprintf (stdout, "realpath(/linkdir/subdir) = %s\n", respath);
-        }
-
-        return 0;
-}
-
-#ifdef DEBUG
-static void
-peek_stat (struct stat *sb)
-{
-        printf ("Dumping stat information:\n");
-        printf ("File type:                ");
-
-        switch (sb->st_mode & S_IFMT) {
-                case S_IFBLK:  printf ("block device\n");            break;
-                case S_IFCHR:  printf ("character device\n");        break;
-                case S_IFDIR:  printf ("directory\n");               break;
-                case S_IFIFO:  printf ("FIFO/pipe\n");               break;
-                case S_IFLNK:  printf ("symlink\n");                 break;
-                case S_IFREG:  printf ("regular file\n");            break;
-                case S_IFSOCK: printf ("socket\n");                  break;
-                default:       printf ("unknown?\n");                break;
-        }
-
-        printf ("I-node number:            %ld\n", (long) sb->st_ino);
-
-        printf ("Mode:                     %lo (octal)\n",
-                (unsigned long) sb->st_mode);
-
-        printf ("Link count:               %ld\n", (long) sb->st_nlink);
-        printf ("Ownership:                UID=%ld   GID=%ld\n",
-                (long) sb->st_uid, (long) sb->st_gid);
-
-        printf ("Preferred I/O block size: %ld bytes\n",
-                (long) sb->st_blksize);
-        printf ("File size:                %lld bytes\n",
-                (long long) sb->st_size);
-        printf ("Blocks allocated:         %lld\n",
-                (long long) sb->st_blocks);
-
-        printf ("Last status change:       %s", ctime(&sb->st_ctime));
-        printf ("Last file access:         %s", ctime(&sb->st_atime));
-        printf ("Last file modification:   %s", ctime(&sb->st_mtime));
-
-        return;
-}
-
-static void
-peek_handle (unsigned char *glid)
-{
-        int i;
-
-        for (i = 0; i < GFAPI_HANDLE_LENGTH; i++)
-        {
-                printf (":%02x:", glid[i]);
-        }
-        printf ("\n");
-}
-#else /* DEBUG */
-static void
-peek_stat (struct stat *sb)
-{
-        return;
-}
-
-static void
-peek_handle (unsigned char *id)
-{
-        return;
-}
-#endif /* DEBUG */
-
-glfs_t    *fs = NULL;
-char      *full_parent_name = "/testdir", *parent_name = "testdir";
-
-void
-test_h_unlink (void)
-{
-        char               *my_dir = "unlinkdir";
-        char               *my_file = "file.txt";
-        char               *my_subdir = "dir1";
-        struct glfs_object *parent = NULL, *leaf = NULL, *dir = NULL,
-                           *subdir = NULL, *subleaf = NULL;
-        struct stat         sb;
-        int                 ret;
-
-        printf ("glfs_h_unlink tests: In Progress\n");
-
-        /* Prepare tests */
-        parent = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, NULL, strerror (errno));
-                printf ("glfs_h_lookupat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        dir = glfs_h_mkdir (fs, parent, my_dir, 0644, &sb);
-        if (dir == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         my_dir, parent, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        leaf = glfs_h_creat (fs, dir, my_file, O_CREAT, 0644, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                         my_file, dir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        subdir = glfs_h_mkdir (fs, dir, my_subdir, 0644, &sb);
-        if (subdir == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         my_subdir, dir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        subleaf = glfs_h_creat (fs, subdir, my_file, O_CREAT, 0644, &sb);
-        if (subleaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                         my_file, subdir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        /* unlink non empty directory */
-        ret = glfs_h_unlink (fs, dir, my_subdir);
-        if ((ret && errno != ENOTEMPTY) || (ret == 0)) {
-                fprintf (stderr, "glfs_h_unlink: error unlinking %s: it is non empty: %s\n",
-                         my_subdir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        /* unlink regular file */
-        ret = glfs_h_unlink (fs, subdir, my_file);
-        if (ret) {
-                fprintf (stderr, "glfs_h_unlink: error unlinking %s: from (%p),%s\n",
-                         my_file, subdir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        /* unlink directory */
-        ret = glfs_h_unlink (fs, dir, my_subdir);
-        if (ret) {
-                fprintf (stderr, "glfs_h_unlink: error unlinking %s: from (%p),%s\n",
-                         my_subdir, dir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        /* unlink regular file */
-        ret = glfs_h_unlink (fs, dir, my_file);
-        if (ret) {
-                fprintf (stderr, "glfs_h_unlink: error unlinking %s: from (%p),%s\n",
-                         my_file, dir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        /* unlink non-existant regular file */
-        ret = glfs_h_unlink (fs, dir, my_file);
-        if ((ret && errno != ENOENT) || (ret == 0)) {
-                fprintf (stderr, "glfs_h_unlink: error unlinking non-existant %s: invalid errno ,%d, %s\n",
-                         my_file, ret, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        /* unlink non-existant directory */
-        ret = glfs_h_unlink (fs, dir, my_subdir);
-        if ((ret && errno != ENOENT) || (ret == 0)) {
-                fprintf (stderr, "glfs_h_unlink: error unlinking non-existant %s:  invalid errno ,%d, %s\n",
-                         my_subdir, ret, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        /* unlink directory */
-        ret = glfs_h_unlink (fs, parent, my_dir);
-        if (ret) {
-                fprintf (stderr, "glfs_h_unlink: error unlinking %s: from (%p),%s\n",
-                         my_dir, dir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-
-        printf ("glfs_h_unlink tests: PASSED\n");
-
-out:
-        if (dir)
-                glfs_h_close (dir);
-        if (leaf)
-                glfs_h_close (leaf);
-        if (subdir)
-                glfs_h_close (subdir);
-        if (subleaf)
-                glfs_h_close (subleaf);
-        if (parent)
-                glfs_h_close (parent);
-
-        return;
-}
-
-void
-test_h_getsetattrs (void)
-{
-        char               *my_dir = "attrdir";
-        char               *my_file = "attrfile.txt";
-        struct glfs_object *parent = NULL, *leaf = NULL, *dir = NULL;
-        struct stat         sb, retsb;
-        int                 ret, valid;
-        struct timespec     timestamp;
-
-        printf("glfs_h_getattrs and setattrs tests: In Progress\n");
-
-        /* Prepare tests */
-        parent = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, NULL, strerror (errno));
-                printf ("glfs_h_lookupat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        dir = glfs_h_mkdir (fs, parent, my_dir, 0644, &sb);
-        if (dir == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         my_dir, parent, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        leaf = glfs_h_creat (fs, dir, my_file, O_CREAT, 0644, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                         my_file, dir, strerror (errno));
-                printf ("glfs_h_unlink tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        ret = glfs_h_getattrs (fs, dir, &retsb);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_getattrs: error %s: from (%p),%s\n",
-                         my_dir, dir, strerror (errno));
-                printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&retsb);
-        /* TODO: Compare stat information */
-
-        retsb.st_mode = 00666;
-        retsb.st_uid = 1000;
-        retsb.st_gid = 1001;
-        ret = clock_gettime (CLOCK_REALTIME, &timestamp);
-        if(ret != 0) {
-                fprintf (stderr, "clock_gettime: error %s\n", strerror (errno));
-                printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                goto out;
-        }
-        retsb.st_atim = timestamp;
-        retsb.st_mtim = timestamp;
-        valid = GFAPI_SET_ATTR_MODE | GFAPI_SET_ATTR_UID | GFAPI_SET_ATTR_GID |
-        GFAPI_SET_ATTR_ATIME | GFAPI_SET_ATTR_MTIME;
-        peek_stat (&retsb);
-
-        ret = glfs_h_setattrs (fs, dir, &retsb, valid);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_setattrs: error %s: from (%p),%s\n",
-                         my_dir, dir, strerror (errno));
-                printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                goto out;
-        }
-
-        memset(&retsb, 0, sizeof (struct stat));
-        ret = glfs_h_stat (fs, dir, &retsb);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_stat: error %s: from (%p),%s\n",
-                         my_dir, dir, strerror (errno));
-                printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&retsb);
-
-        printf ("glfs_h_getattrs and setattrs tests: PASSED\n");
-out:
-        if (parent)
-                glfs_h_close (parent);
-        if (leaf)
-                glfs_h_close (leaf);
-        if (dir)
-                glfs_h_close (dir);
-
-        return;
-}
-
-void
-test_h_truncate (void)
-{
-        char               *my_dir = "truncatedir";
-        char               *my_file = "file.txt";
-        struct glfs_object *root = NULL, *parent = NULL, *leaf = NULL;
-        struct stat         sb;
-        glfs_fd_t          *fd = NULL;
-        char                buf[32];
-        off_t               offset = 0;
-        int                 ret = 0;
-
-        printf("glfs_h_truncate tests: In Progress\n");
-
-        /* Prepare tests */
-        root = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (root == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, NULL, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        parent = glfs_h_mkdir (fs, root, my_dir, 0644, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         my_dir, root, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        leaf = glfs_h_creat (fs, parent, my_file, O_CREAT, 0644, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                         my_file, parent, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        fd = glfs_h_open (fs, leaf, O_RDWR);
-        if (fd == NULL) {
-                fprintf (stderr, "glfs_h_open: error on open of %s: %s\n",
-                         my_file, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-
-        memcpy (buf, "abcdefghijklmnopqrstuvwxyz012345", 32);
-        ret = glfs_write (fd, buf, 32, 0);
-
-        /* run tests */
-        /* truncate lower */
-        offset = 30;
-        ret = glfs_h_truncate (fs, leaf, offset);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_truncate: error creating %s: from (%p),%s\n",
-                         my_file, parent, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        ret = glfs_h_getattrs (fs, leaf, &sb);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_getattrs: error for %s (%p),%s\n",
-                         my_file, leaf, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        if (sb.st_size != offset) {
-                fprintf (stderr, "glfs_h_truncate: post size mismatch\n");
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-
-        /* truncate higher */
-        offset = 32;
-        ret = glfs_h_truncate (fs, leaf, offset);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_truncate: error creating %s: from (%p),%s\n",
-                         my_file, parent, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        ret = glfs_h_getattrs (fs, leaf, &sb);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_getattrs: error for %s (%p),%s\n",
-                         my_file, leaf, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        if (sb.st_size != offset) {
-                fprintf (stderr, "glfs_h_truncate: post size mismatch\n");
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-
-        /* truncate equal */
-        offset = 30;
-        ret = glfs_h_truncate (fs, leaf, offset);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_truncate: error creating %s: from (%p),%s\n",
-                         my_file, parent, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        ret = glfs_h_getattrs (fs, leaf, &sb);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_getattrs: error for %s (%p),%s\n",
-                         my_file, leaf, strerror (errno));
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-        if (sb.st_size != offset) {
-                fprintf (stderr, "glfs_h_truncate: post size mismatch\n");
-                printf ("glfs_h_truncate tests: FAILED\n");
-                goto out;
-        }
-
-        printf ("glfs_h_truncate tests: PASSED\n");
-out:
-        if (fd)
-                glfs_close (fd);
-        if (root)
-                glfs_h_close (root);
-        if (parent)
-                glfs_h_close (parent);
-        if (leaf)
-                glfs_h_close (leaf);
-
-        return;
-}
-
-void
-test_h_links (void)
-{
-        char               *my_dir = "linkdir";
-        char               *my_file = "file.txt";
-        char               *my_symlnk = "slnk.txt";
-        char               *my_lnk = "lnk.txt";
-        char               *linksrc_dir = "dir1";
-        char               *linktgt_dir = "dir2";
-        struct glfs_object *root = NULL, *parent = NULL, *leaf = NULL,
-                           *dirsrc = NULL, *dirtgt = NULL, *dleaf = NULL;
-        struct glfs_object *ln1 = NULL;
-        struct stat         sb;
-        int                 ret;
-        char               *buf = NULL;
-
-        printf("glfs_h_link(s) tests: In Progress\n");
-
-        /* Prepare tests */
-        root = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (root == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, NULL, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        parent = glfs_h_mkdir (fs, root, my_dir, 0644, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         my_dir, root, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        leaf = glfs_h_creat (fs, parent, my_file, O_CREAT, 0644, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                         my_file, parent, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        dirsrc = glfs_h_mkdir (fs, parent, linksrc_dir, 0644, &sb);
-        if (dirsrc == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         linksrc_dir, parent, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        dirtgt = glfs_h_mkdir (fs, parent, linktgt_dir, 0644, &sb);
-        if (dirtgt == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         linktgt_dir, parent, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        dleaf = glfs_h_creat (fs, dirsrc, my_file, O_CREAT, 0644, &sb);
-        if (dleaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                         my_file, dirsrc, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* run tests */
-        /* sym link: /testdir/linkdir/file.txt to ./slnk.txt */
-        ln1 = glfs_h_symlink (fs, parent, my_symlnk, "./file.txt", &sb);
-        if (ln1 == NULL) {
-                fprintf (stderr, "glfs_h_symlink: error creating %s: from (%p),%s\n",
-                         my_symlnk, parent, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        buf = calloc (1024, sizeof(char));
-        if (buf == NULL) {
-                fprintf (stderr, "Error allocating memory\n");
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-
-        ret = glfs_h_readlink (fs, ln1, buf, 1024);
-        if (ret <= 0) {
-                fprintf (stderr, "glfs_h_readlink: error reading %s: from (%p),%s\n",
-                         my_symlnk, ln1, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        if (!(strncmp (buf, my_symlnk, strlen (my_symlnk)))) {
-                fprintf (stderr, "glfs_h_readlink: error mismatch in link name: actual %s: retrieved %s\n",
-                         my_symlnk, buf);
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-
-        /* link: /testdir/linkdir/file.txt to ./lnk.txt */
-        ret = glfs_h_link (fs, leaf, parent, my_lnk);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_link: error creating %s: from (%p),%s\n",
-                         my_lnk, parent, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        /* TODO: Should write content to a file and read from the link */
-
-        /* link: /testdir/linkdir/dir1/file.txt to ../dir2/slnk.txt */
-        ret = glfs_h_link (fs, dleaf, dirtgt, my_lnk);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_link: error creating %s: from (%p),%s\n",
-                         my_lnk, dirtgt, strerror (errno));
-                printf ("glfs_h_link(s) tests: FAILED\n");
-                goto out;
-        }
-        /* TODO: Should write content to a file and read from the link */
-
-        printf ("glfs_h_link(s) tests: PASSED\n");
-
-out:
-        if (root)
-                glfs_h_close (root);
-        if (parent)
-                glfs_h_close (parent);
-        if (leaf)
-                glfs_h_close (leaf);
-        if (dirsrc)
-                glfs_h_close (dirsrc);
-        if (dirtgt)
-                glfs_h_close (dirtgt);
-        if (dleaf)
-                glfs_h_close (dleaf);
-        if (ln1)
-                glfs_h_close (ln1);
-        if (buf)
-                free (buf);
-
-        return;
-}
-
-void
-test_h_rename (void)
-{
-        char               *my_dir = "renamedir";
-        char               *my_file = "file.txt";
-        char               *src_dir = "dir1";
-        char               *tgt_dir = "dir2";
-        struct glfs_object *root = NULL, *parent = NULL, *leaf = NULL,
-                           *dirsrc = NULL, *dirtgt = NULL, *dleaf = NULL;
-        struct stat         sb;
-        int                 ret;
-
-        printf("glfs_h_rename tests: In Progress\n");
-
-        /* Prepare tests */
-        root = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (root == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, NULL, strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        parent = glfs_h_mkdir (fs, root, my_dir, 0644, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         my_dir, root, strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        leaf = glfs_h_creat (fs, parent, my_file, O_CREAT, 0644, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                         my_file, parent, strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        dirsrc = glfs_h_mkdir (fs, parent, src_dir, 0644, &sb);
-        if (dirsrc == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         src_dir, parent, strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        dirtgt = glfs_h_mkdir (fs, parent, tgt_dir, 0644, &sb);
-        if (dirtgt == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         tgt_dir, parent, strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        dleaf = glfs_h_creat (fs, dirsrc, my_file, O_CREAT, 0644, &sb);
-        if (dleaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                         my_file, dirsrc, strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* run tests */
-        /* Rename file.txt -> file1.txt */
-        ret = glfs_h_rename (fs, parent, "file.txt", parent, "file1.txt");
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_rename: error renaming %s to %s (%s)\n",
-                         "file.txt", "file1.txt", strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-
-        /* rename dir1/file.txt -> file.txt */
-        ret = glfs_h_rename (fs, dirsrc, "file.txt", parent, "file.txt");
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_rename: error renaming %s/%s to %s (%s)\n",
-                         src_dir, "file.txt", "file.txt", strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-
-        /* rename file1.txt -> file.txt (exists) */
-        ret = glfs_h_rename (fs, parent, "file1.txt", parent, "file.txt");
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_rename: error renaming %s to %s (%s)\n",
-                         "file.txt", "file.txt", strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-
-        /* rename dir1 -> dir3 */
-        ret = glfs_h_rename (fs, parent, "dir1", parent, "dir3");
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_rename: error renaming %s to %s (%s)\n",
-                         "dir1", "dir3", strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-
-        /* rename dir2 ->dir3 (exists) */
-        ret = glfs_h_rename (fs, parent, "dir2", parent, "dir3");
-        if (ret != 0) {
-                fprintf (stderr, "glfs_h_rename: error renaming %s to %s (%s)\n",
-                         "dir2", "dir3", strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-
-        /* rename file.txt -> dir3 (fail) */
-        ret = glfs_h_rename (fs, parent, "file.txt", parent, "dir3");
-        if (ret == 0) {
-                fprintf (stderr, "glfs_h_rename: NO error renaming %s to %s (%s)\n",
-                         "file.txt", "dir3", strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-
-        /* rename dir3 -> file.txt (fail) */
-        ret = glfs_h_rename (fs, parent, "dir3", parent, "file.txt");
-        if (ret == 0) {
-                fprintf (stderr, "glfs_h_rename: NO error renaming %s to %s (%s)\n",
-                         "dir3", "file.txt", strerror (errno));
-                printf ("glfs_h_rename tests: FAILED\n");
-                goto out;
-        }
-
-        printf ("glfs_h_rename tests: PASSED\n");
-
-out:
-        if (root)
-                glfs_h_close (root);
-        if (parent)
-                glfs_h_close (parent);
-        if (leaf)
-                glfs_h_close (leaf);
-        if (dirsrc)
-                glfs_h_close (dirsrc);
-        if (dirtgt)
-                glfs_h_close (dirtgt);
-        if (dleaf)
-                glfs_h_close (dleaf);
-
-        return;
-}
-
-void
-assimilatetime (struct timespec *ts, struct timespec ts_st,
-                struct timespec ts_ed)
-{
-        if ((ts_ed.tv_nsec - ts_st.tv_nsec) < 0) {
-                ts->tv_sec += ts_ed.tv_sec - ts_st.tv_sec - 1;
-                ts->tv_nsec += 1000000000 + ts_ed.tv_nsec - ts_st.tv_nsec;
-        } else {
-                ts->tv_sec += ts_ed.tv_sec - ts_st.tv_sec;
-                ts->tv_nsec += ts_ed.tv_nsec - ts_st.tv_nsec;
-        }
-
-        if (ts->tv_nsec > 1000000000) {
-                ts->tv_nsec = ts->tv_nsec - 1000000000;
-                ts->tv_sec += 1;
-        }
-
-        return;
-}
-
-#define MAX_FILES_CREATE 10
-#define MAXPATHNAME      512
-void
-test_h_performance (void)
-{
-        char               *my_dir = "perftest",
-                           *full_dir_path="/testdir/perftest";
-        char               *my_file = "file_", my_file_name[MAXPATHNAME];
-        struct glfs_object *parent = NULL, *leaf = NULL, *dir = NULL;
-        struct stat         sb;
-        int                 ret, i;
-        struct glfs_fd     *fd;
-        struct timespec     c_ts = {0, 0}, c_ts_st, c_ts_ed;
-        struct timespec     o_ts = {0, 0}, o_ts_st, o_ts_ed;
-
-        printf("glfs_h_performance tests: In Progress\n");
-
-        /* Prepare tests */
-        parent = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, NULL, strerror (errno));
-                printf ("glfs_h_performance tests: FAILED\n");
-                goto out;
-        }
-
-        dir = glfs_h_mkdir (fs, parent, my_dir, 0644, &sb);
-        if (dir == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error creating %s: from (%p),%s\n",
-                         my_dir, parent, strerror (errno));
-                printf ("glfs_h_performance tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* create performance */
-        ret = clock_gettime (CLOCK_REALTIME, &o_ts_st);
-        if(ret != 0) {
-                fprintf (stderr, "clock_gettime: error %s\n", strerror (errno));
-                printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                goto out;
-        }
-
-        for (i = 0; i < MAX_FILES_CREATE; i++) {
-                sprintf (my_file_name, "%s%d", my_file, i);
-
-                ret = clock_gettime (CLOCK_REALTIME, &c_ts_st);
-                if(ret != 0) {
-                        fprintf (stderr, "clock_gettime: error %s\n",
-                                 strerror (errno));
-                        printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                        goto out;
-                }
-
-                leaf = glfs_h_lookupat (fs, dir, my_file_name, &sb);
-                if (leaf != NULL) {
-                        fprintf (stderr, "glfs_h_lookup: exists %s\n",
-                                 my_file_name);
-                        printf ("glfs_h_performance tests: FAILED\n");
-                        goto out;
-                }
-
-                leaf = glfs_h_creat (fs, dir, my_file_name, O_CREAT, 0644, &sb);
-                if (leaf == NULL) {
-                        fprintf (stderr, "glfs_h_creat: error creating %s: from (%p),%s\n",
-                                 my_file, dir, strerror (errno));
-                        printf ("glfs_h_performance tests: FAILED\n");
-                        goto out;
-                }
-
-                ret = clock_gettime (CLOCK_REALTIME, &c_ts_ed);
-                if(ret != 0) {
-                        fprintf (stderr, "clock_gettime: error %s\n",
-                                 strerror (errno));
-                        printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                        goto out;
-                }
-
-                assimilatetime (&c_ts, c_ts_st, c_ts_ed);
-                glfs_h_close (leaf); leaf = NULL;
-        }
-
-        ret = clock_gettime (CLOCK_REALTIME, &o_ts_ed);
-        if(ret != 0) {
-                fprintf (stderr, "clock_gettime: error %s\n", strerror (errno));
-                printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                goto out;
-        }
-
-        assimilatetime (&o_ts, o_ts_st, o_ts_ed);
-
-        printf ("Creation performance (handle based):\n\t# empty files:%d\n",
-                MAX_FILES_CREATE);
-        printf ("\tOverall time:\n\t\tSecs:%ld\n\t\tnSecs:%ld\n",
-                o_ts.tv_sec, o_ts.tv_nsec);
-        printf ("\tcreate call time time:\n\t\tSecs:%ld\n\t\tnSecs:%ld\n",
-                c_ts.tv_sec, c_ts.tv_nsec);
-
-        /* create using path */
-        c_ts.tv_sec = o_ts.tv_sec = 0;
-        c_ts.tv_nsec = o_ts.tv_nsec = 0;
-
-        sprintf (my_file_name, "%s1", full_dir_path);
-        ret = glfs_mkdir (fs, my_file_name, 0644);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_mkdir: error creating %s: from (%p),%s\n",
-                         my_dir, parent, strerror (errno));
-                printf ("glfs_h_performance tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        ret = clock_gettime (CLOCK_REALTIME, &o_ts_st);
-        if(ret != 0) {
-                fprintf (stderr, "clock_gettime: error %s\n", strerror (errno));
-                printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                goto out;
-        }
-
-        for (i = 0; i < MAX_FILES_CREATE; i++) {
-                sprintf (my_file_name, "%s1/%sn%d", full_dir_path, my_file, i);
-
-                ret = clock_gettime (CLOCK_REALTIME, &c_ts_st);
-                if(ret != 0) {
-                        fprintf (stderr, "clock_gettime: error %s\n",
-                                 strerror (errno));
-                        printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                        goto out;
-                }
-
-                ret = glfs_stat (fs, my_file_name, &sb);
-                if (ret == 0) {
-                        fprintf (stderr, "glfs_stat: exists %s\n",
-                                 my_file_name);
-                        printf ("glfs_h_performance tests: FAILED\n");
-                        goto out;
-                }
-
-                fd = glfs_creat (fs, my_file_name, O_CREAT, 0644);
-                if (fd == NULL) {
-                        fprintf (stderr, "glfs_creat: error creating %s: from (%p),%s\n",
-                                 my_file, dir, strerror (errno));
-                        printf ("glfs_h_performance tests: FAILED\n");
-                        goto out;
-                }
-
-                ret = clock_gettime (CLOCK_REALTIME, &c_ts_ed);
-                if(ret != 0) {
-                        fprintf (stderr, "clock_gettime: error %s\n",
-                                 strerror (errno));
-                        printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                        goto out;
-                }
-
-                assimilatetime (&c_ts, c_ts_st, c_ts_ed);
-                glfs_close (fd);
-        }
-
-        ret = clock_gettime (CLOCK_REALTIME, &o_ts_ed);
-        if(ret != 0) {
-                fprintf (stderr, "clock_gettime: error %s\n", strerror (errno));
-                printf ("glfs_h_getattrs and setattrs tests: FAILED\n");
-                goto out;
-        }
-
-        assimilatetime (&o_ts, o_ts_st, o_ts_ed);
-
-        printf ("Creation performance (path based):\n\t# empty files:%d\n",
-                MAX_FILES_CREATE);
-        printf ("\tOverall time:\n\t\tSecs:%ld\n\t\tnSecs:%ld\n",
-                o_ts.tv_sec, o_ts.tv_nsec);
-        printf ("\tcreate call time time:\n\t\tSecs:%ld\n\t\tnSecs:%ld\n",
-                c_ts.tv_sec, c_ts.tv_nsec);
-out:
-        return;
-}
-
-int
-test_handleops (int argc, char *argv[])
-{
-        int                 ret = 0;
-        glfs_fd_t          *fd = NULL;
-        struct stat         sb = {0, };
-        struct glfs_object *root = NULL, *parent = NULL, *leaf = NULL,
-                           *tmp = NULL;
-        char                readbuf[32], writebuf[32];
-        unsigned char       leaf_handle[GFAPI_HANDLE_LENGTH];
-
-        char *full_leaf_name = "/testdir/testfile.txt",
-             *leaf_name = "testfile.txt",
-             *relative_leaf_name = "testdir/testfile.txt";
-        char *leaf_name1 = "testfile1.txt";
-        char *full_newparent_name = "/testdir/dir1",
-             *newparent_name = "dir1";
-        char *full_newnod_name = "/testdir/nod1",
-             *newnod_name = "nod1";
-
-        /* Initialize test area */
-        ret = glfs_mkdir (fs, full_parent_name, 0644);
-        if (ret != 0 && errno != EEXIST) {
-                fprintf (stderr, "%s: (%p) %s\n", full_parent_name, fd,
-                        strerror (errno));
-                printf ("Test initialization failed on volume %s\n", argv[1]);
-                goto out;
-        }
-        else if (ret != 0) {
-                printf ("Found test directory %s to be existing\n",
-                        full_parent_name);
-                printf ("Cleanup test directory and restart tests\n");
-                goto out;
-        }
-
-        fd = glfs_creat (fs, full_leaf_name, O_CREAT, 0644);
-        if (fd == NULL) {
-                fprintf (stderr, "%s: (%p) %s\n", full_leaf_name, fd,
-                        strerror (errno));
-                printf ("Test initialization failed on volume %s\n", argv[1]);
-                goto out;
-        }
-        glfs_close (fd);
-
-        printf ("Initialized the test area, within volume %s\n", argv[1]);
-
-        /* Handle based APIs test area */
-
-        /* glfs_lookupat test */
-        printf ("glfs_h_lookupat tests: In Progress\n");
-        /* start at root of the volume */
-        root = glfs_h_lookupat (fs, NULL, "/", &sb);
-        if (root == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         "/", NULL, strerror (errno));
-                printf ("glfs_h_lookupat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* lookup a parent within root */
-        parent = glfs_h_lookupat (fs, root, parent_name, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         parent_name, root, strerror (errno));
-                printf ("glfs_h_lookupat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* lookup a leaf/child within the parent */
-        leaf = glfs_h_lookupat (fs, parent, leaf_name, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         leaf_name, parent, strerror (errno));
-                printf ("glfs_h_lookupat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* reset */
-        glfs_h_close (root); root = NULL;
-        glfs_h_close (leaf); leaf = NULL;
-        glfs_h_close (parent); parent = NULL;
-
-        /* check absolute paths */
-        root = glfs_h_lookupat (fs, NULL, "/", &sb);
-        if (root == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         "/", NULL, strerror (errno));
-                printf ("glfs_h_lookupat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        parent = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, root, strerror (errno));
-                printf ("glfs_h_lookupat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        leaf = glfs_h_lookupat (fs, NULL, full_leaf_name, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_leaf_name, parent, strerror (errno));
-                printf ("glfs_h_lookupat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* reset */
-        glfs_h_close (leaf); leaf = NULL;
-
-        /* check multiple component paths */
-        leaf = glfs_h_lookupat (fs, root, relative_leaf_name, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         relative_leaf_name, parent, strerror (errno));
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* reset */
-        glfs_h_close (root); root = NULL;
-        glfs_h_close (parent); parent = NULL;
-
-        /* check symlinks in path */
-
-        /* TODO: -ve test cases */
-        /* parent invalid
-        * path invalid
-        * path does not exist after some components
-        * no parent, but relative path
-        * parent and full path? -ve?
-        */
-
-        printf ("glfs_h_lookupat tests: PASSED\n");
-
-        /* glfs_openat test */
-        printf ("glfs_h_open tests: In Progress\n");
-        fd = glfs_h_open (fs, leaf, O_RDWR);
-        if (fd == NULL) {
-                fprintf (stderr, "glfs_h_open: error on open of %s: %s\n",
-                         full_leaf_name, strerror (errno));
-                printf ("glfs_h_open tests: FAILED\n");
-                goto out;
-        }
-
-        /* test read/write based on fd */
-        memcpy (writebuf, "abcdefghijklmnopqrstuvwxyz012345", 32);
-        ret = glfs_write (fd, writebuf, 32, 0);
-
-        glfs_lseek (fd, 0, SEEK_SET);
-
-        ret = glfs_read (fd, readbuf, 32, 0);
-        if (memcmp (readbuf, writebuf, 32)) {
-                printf ("Failed to read what I wrote: %s %s\n", readbuf,
-                        writebuf);
-                glfs_close (fd);
-                printf ("glfs_h_open tests: FAILED\n");
-                goto out;
-        }
-
-        glfs_h_close (leaf); leaf = NULL;
-        glfs_close (fd);
-
-        printf ("glfs_h_open tests: PASSED\n");
-
-        /* Create tests */
-        printf ("glfs_h_creat tests: In Progress\n");
-        parent = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, root, strerror (errno));
-                printf ("glfs_h_creat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        leaf = glfs_h_creat (fs, parent, leaf_name1, O_CREAT, 0644, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_creat: error on create of %s: from (%p),%s\n",
-                         leaf_name1, parent, strerror (errno));
-                printf ("glfs_h_creat tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        glfs_h_close (leaf); leaf = NULL;
-
-        leaf = glfs_h_creat (fs, parent, leaf_name1, O_CREAT | O_EXCL, 0644,
-                            &sb);
-        if (leaf != NULL || errno != EEXIST) {
-                fprintf (stderr, "glfs_h_creat: existing file, leaf = (%p), errno = %s\n",
-                        leaf, strerror (errno));
-                printf ("glfs_h_creat tests: FAILED\n");
-                if (leaf != NULL) {
-                        glfs_h_close (leaf); leaf = NULL;
-                }
-        }
-
-        tmp = glfs_h_creat (fs, root, parent_name, O_CREAT, 0644, &sb);
-        if (tmp != NULL || !(errno == EISDIR || errno == EINVAL)) {
-                fprintf (stderr, "glfs_h_creat: dir create, tmp = (%p), errno = %s\n",
-                        leaf, strerror (errno));
-                printf ("glfs_h_creat tests: FAILED\n");
-                if (tmp != NULL) {
-                        glfs_h_close (tmp); tmp = NULL;
-                }
-        }
-
-        /* TODO: Other combinations and -ve cases as applicable */
-        printf ("glfs_h_creat tests: PASSED\n");
-
-        /* extract handle and create from handle test */
-        printf ("glfs_h_extract_handle and glfs_h_create_from_handle tests: In Progress\n");
-        /* TODO: Change the lookup to creat below for a GIFD recovery falure,
-         * that needs to be fixed */
-        leaf = glfs_h_lookupat (fs, parent, leaf_name1, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         leaf_name1, parent, strerror (errno));
-                printf ("glfs_h_extract_handle tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        ret = glfs_h_extract_handle (leaf, leaf_handle,
-                                             GFAPI_HANDLE_LENGTH);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_h_extract_handle: error extracting handle of %s: %s\n",
-                         full_leaf_name, strerror (errno));
-                printf ("glfs_h_extract_handle tests: FAILED\n");
-                goto out;
-        }
-        peek_handle (leaf_handle);
-
-        glfs_h_close (leaf); leaf = NULL;
-
-        leaf = glfs_h_create_from_handle (fs, leaf_handle, GFAPI_HANDLE_LENGTH,
-                                          &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_create_from_handle: error on create of %s: from (%p),%s\n",
-                         leaf_name1, leaf_handle, strerror (errno));
-                printf ("glfs_h_create_from_handle tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        fd = glfs_h_open (fs, leaf, O_RDWR);
-        if (fd == NULL) {
-                fprintf (stderr, "glfs_h_open: error on open of %s: %s\n",
-                         full_leaf_name, strerror (errno));
-                printf ("glfs_h_create_from_handle tests: FAILED\n");
-                goto out;
-        }
-
-        /* test read/write based on fd */
-        memcpy (writebuf, "abcdefghijklmnopqrstuvwxyz012345", 32);
-        ret = glfs_write (fd, writebuf, 32, 0);
-
-        glfs_lseek (fd, 0, SEEK_SET);
-
-        ret = glfs_read (fd, readbuf, 32, 0);
-        if (memcmp (readbuf, writebuf, 32)) {
-                printf ("Failed to read what I wrote: %s %s\n", writebuf,
-                        writebuf);
-                printf ("glfs_h_create_from_handle tests: FAILED\n");
-                glfs_close (fd);
-                goto out;
-        }
-
-        glfs_close (fd);
-        glfs_h_close (leaf); leaf = NULL;
-        glfs_h_close (parent); parent = NULL;
-
-        printf ("glfs_h_extract_handle and glfs_h_create_from_handle tests: PASSED\n");
-
-        /* Mkdir tests */
-        printf ("glfs_h_mkdir tests: In Progress\n");
-
-        ret = glfs_rmdir (fs, full_newparent_name);
-        if (ret && errno != ENOENT) {
-                fprintf (stderr, "glfs_rmdir: Failed for %s: %s\n",
-                         full_newparent_name, strerror (errno));
-                printf ("glfs_h_mkdir tests: FAILED\n");
-                goto out;
-        }
-
-        parent = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, root, strerror (errno));
-                printf ("glfs_h_mkdir tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        leaf = glfs_h_mkdir (fs, parent, newparent_name, 0644, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error on mkdir of %s: from (%p),%s\n",
-                         newparent_name, parent, strerror (errno));
-                printf ("glfs_h_mkdir tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        glfs_h_close (leaf); leaf = NULL;
-
-        leaf = glfs_h_mkdir (fs, parent, newparent_name, 0644, &sb);
-        if (leaf != NULL || errno != EEXIST) {
-                fprintf (stderr, "glfs_h_mkdir: existing directory, leaf = (%p), errno = %s\n",
-                         leaf, strerror (errno));
-                printf ("glfs_h_mkdir tests: FAILED\n");
-                if (leaf != NULL) {
-                        glfs_h_close (leaf); leaf = NULL;
-                }
-        }
-
-        glfs_h_close (parent); parent = NULL;
-
-        printf ("glfs_h_mkdir tests: PASSED\n");
-
-        /* Mknod tests */
-        printf ("glfs_h_mknod tests: In Progress\n");
-        ret = glfs_unlink (fs, full_newnod_name);
-        if (ret && errno != ENOENT) {
-                fprintf (stderr, "glfs_unlink: Failed for %s: %s\n",
-                         full_newnod_name, strerror (errno));
-                printf ("glfs_h_mknod tests: FAILED\n");
-                goto out;
-        }
-
-        parent = glfs_h_lookupat (fs, NULL, full_parent_name, &sb);
-        if (parent == NULL) {
-                fprintf (stderr, "glfs_h_lookupat: error on lookup of %s: from (%p),%s\n",
-                         full_parent_name, root, strerror (errno));
-                printf ("glfs_h_mknod tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        leaf = glfs_h_mknod (fs, parent, newnod_name, S_IFIFO, 0, &sb);
-        if (leaf == NULL) {
-                fprintf (stderr, "glfs_h_mkdir: error on mkdir of %s: from (%p),%s\n",
-                         newnod_name, parent, strerror (errno));
-                printf ("glfs_h_mknod tests: FAILED\n");
-                goto out;
-        }
-        peek_stat (&sb);
-
-        /* TODO: creat op on a FIFO node hangs, need to check and fix
-        tmp = glfs_h_creat (fs, parent, newnod_name, O_CREAT, 0644, &sb);
-        if (tmp != NULL || errno != EINVAL) {
-                fprintf (stderr, "glfs_h_creat: node create, tmp = (%p), errno = %s\n",
-                        tmp, strerror (errno));
-                printf ("glfs_h_creat/mknod tests: FAILED\n");
-                if (tmp != NULL) {
-                        glfs_h_close(tmp); tmp = NULL;
-                }
-        } */
-
-        glfs_h_close (leaf); leaf = NULL;
-
-        leaf = glfs_h_mknod (fs, parent, newnod_name, 0644, 0, &sb);
-        if (leaf != NULL || errno != EEXIST) {
-                fprintf (stderr, "glfs_h_mknod: existing node, leaf = (%p), errno = %s\n",
-                         leaf, strerror (errno));
-                printf ("glfs_h_mknod tests: FAILED\n");
-                if (leaf != NULL) {
-                        glfs_h_close (leaf); leaf = NULL;
-                }
-        }
-
-        glfs_h_close (parent); parent = NULL;
-
-        printf ("glfs_h_mknod tests: PASSED\n");
-
-        /* unlink tests */
-        test_h_unlink ();
-
-        /* TODO: opendir tests */
-
-        /* getattr tests */
-        test_h_getsetattrs ();
-
-        /* TODO: setattr tests */
-
-        /* truncate tests */
-        test_h_truncate();
-
-        /* link tests */
-        test_h_links ();
-
-        /* rename tests */
-        test_h_rename ();
-
-        /* performance tests */
-        test_h_performance ();
-
-        /* END: New APIs test area */
-
-out:
-        /* Cleanup glfs handles */
-        if (root)
-                glfs_h_close (root);
-        if (parent)
-                glfs_h_close (parent);
-        if (leaf)
-                glfs_h_close (leaf);
-
-        return ret;
-}
-
-int
-main (int argc, char *argv[])
-{
-        glfs_t    *fs2 = NULL;
-        int        ret = 0;
-        glfs_fd_t *fd = NULL;
-        glfs_fd_t *fd2 = NULL;
-        struct stat sb = {0, };
-        char       readbuf[32];
-        char       writebuf[32];
-
-        char      *filename = "/filename2";
-
-        if (argc != 3) {
-                printf ("Expect following args\n\t%s <volname> <hostname>\n", argv[0]);
-                return -1;
-        }
-
-        fs = glfs_new (argv[1]);
-        if (!fs) {
-                fprintf (stderr, "glfs_new: returned NULL\n");
-                return 1;
-        }
-
-//      ret = glfs_set_volfile (fs, "/tmp/posix.vol");
-
-        ret = glfs_set_volfile_server (fs, "tcp", argv[2], 24007);
-
-//      ret = glfs_set_volfile_server (fs, "unix", "/tmp/gluster.sock", 0);
-
-        ret = glfs_set_logging (fs, "/dev/stderr", 7);
-
-        ret = glfs_init (fs);
-
-        fprintf (stderr, "glfs_init: returned %d\n", ret);
-
-        sleep (2);
-
-        fs2 = glfs_new (argv[1]);
-        if (!fs2) {
-                fprintf (stderr, "glfs_new: returned NULL\n");
-                return 1;
-        }
-
-
-//      ret = glfs_set_volfile (fs2, "/tmp/posix.vol");
-
-        ret = glfs_set_volfile_server (fs2, "tcp", argv[2], 24007);
-
-        ret = glfs_set_logging (fs2, "/dev/stderr", 7);
-
-        ret = glfs_init (fs2);
-
-        fprintf (stderr, "glfs_init: returned %d\n", ret);
-
-        ret = glfs_lstat (fs, filename, &sb);
-        fprintf (stderr, "%s: (%d) %s\n", filename, ret, strerror (errno));
-
-        fd = glfs_creat (fs, filename, O_RDWR, 0644);
-        fprintf (stderr, "%s: (%p) %s\n", filename, fd, strerror (errno));
-
-        fd2 = glfs_open (fs2, filename, O_RDWR);
-        fprintf (stderr, "%s: (%p) %s\n", filename, fd, strerror (errno));
-
-        sprintf (writebuf, "hi there\n");
-        ret = glfs_write (fd, writebuf, 32, 0);
-
-        glfs_lseek (fd2, 0, SEEK_SET);
-
-        ret = glfs_read (fd2, readbuf, 32, 0);
-
-        printf ("read %d, %s", ret, readbuf);
-
-        glfs_close (fd);
-        glfs_close (fd2);
-
-        filename = "/filename3";
-        ret = glfs_mknod (fs, filename, S_IFIFO, 0);
-        fprintf (stderr, "%s: (%d) %s\n", filename, ret, strerror (errno));
-
-        ret = glfs_lstat (fs, filename, &sb);
-        fprintf (stderr, "%s: (%d) %s\n", filename, ret, strerror (errno));
-
-
-        ret = glfs_rename (fs, filename, "/filename4");
-        fprintf (stderr, "rename(%s): (%d) %s\n", filename, ret,
-                 strerror (errno));
-
-        ret = glfs_unlink (fs, "/filename4");
-        fprintf (stderr, "unlink(%s): (%d) %s\n", "/filename4", ret,
-                 strerror (errno));
-
-        filename = "/dirname2";
-        ret = glfs_mkdir (fs, filename, 0);
-        fprintf (stderr, "%s: (%d) %s\n", filename, ret, strerror (errno));
-
-        ret = glfs_lstat (fs, filename, &sb);
-        fprintf (stderr, "lstat(%s): (%d) %s\n", filename, ret, strerror (errno));
-
-        ret = glfs_rmdir (fs, filename);
-        fprintf (stderr, "rmdir(%s): (%d) %s\n", filename, ret, strerror (errno));
-
-        test_dirops (fs);
-
-        test_xattr (fs);
-
-        test_chdir (fs);
-
-        test_handleops (argc, argv);
-        // done
-
-        glfs_fini (fs);
-        glfs_fini (fs2);
-
-        return ret;
-}
diff --git a/api/examples/setup.py.in b/api/examples/setup.py.in
deleted file mode 100644
index 44b738094..000000000
--- a/api/examples/setup.py.in
+++ /dev/null
@@ -1,29 +0,0 @@
-from distutils.core import setup
-
-# generate a __init__.py for the package namespace
-fo = open('__init__.py', 'w')
-fo.write('__version__ = "@PACKAGE_VERSION@"\n')
-fo.close()
-
-DESC = """GlusterFS is a clustered file-system capable of scaling to
-several petabytes. It aggregates various storage bricks over Infiniband
-RDMA or TCP/IP interconnect into one large parallel network file system.
-GlusterFS is one of the most sophisticated file systems in terms of
-features and extensibility.  It borrows a powerful concept called
-Translators from GNU Hurd kernel. Much of the code in GlusterFS is in
-user space and easily manageable.
-
-This package contains the Python interface to the libgfapi library."""
-
-setup(
-    name='glusterfs-api',
-    version='@PACKAGE_VERSION@',
-    description='Python client library for the GlusterFS libgfapi',
-    long_description=DESC,
-    author='Gluster Community',
-    author_email='gluster-devel@nongnu.org',
-    license='LGPLv3',
-    url='http://gluster.org/',
-    package_dir={'gluster':''},
-    packages=['gluster']
-)
diff --git a/api/src/Makefile.am b/api/src/Makefile.am
deleted file mode 100644
index 7c5df3e20..000000000
--- a/api/src/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-lib_LTLIBRARIES = libgfapi.la
-noinst_HEADERS = glfs-mem-types.h glfs-internal.h
-libgfapi_HEADERS = glfs.h glfs-handles.h
-libgfapidir = $(includedir)/glusterfs/api
-
-libgfapi_la_SOURCES = glfs.c glfs-mgmt.c glfs-fops.c glfs-resolve.c \
-	glfs-handleops.c
-libgfapi_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
-	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
-	$(GF_LDADD)
-
-libgfapi_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \
-	-I$(top_srcdir)/libglusterfs/src \
-	-I$(top_srcdir)/rpc/rpc-lib/src \
-	-I$(top_srcdir)/rpc/xdr/src
-
-
-xlator_LTLIBRARIES = api.la
-xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount
-# workaround for broken parallel install support in automake with LTLIBRARIES
-# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
-install_xlatorLTLIBRARIES = install-xlatorLTLIBRARIES
-$(install_xlatorLTLIBRARIES): install-libLTLIBRARIES
-
-api_la_SOURCES = glfs-master.c
-api_la_DEPENDENCIES = libgfapi.la
-api_la_LDFLAGS = -module -avoid-version
-api_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
-	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
-	$(top_builddir)/api/src/libgfapi.la
-
-AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
deleted file mode 100644
index 10bb7d38b..000000000
--- a/api/src/glfs-fops.c
+++ /dev/null
@@ -1,3252 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-#include "glfs-internal.h"
-#include "glfs-mem-types.h"
-#include "syncop.h"
-#include "glfs.h"
-#include <limits.h>
-
-#ifdef NAME_MAX
-#define GF_NAME_MAX NAME_MAX
-#else
-#define GF_NAME_MAX 255
-#endif
-
-#define READDIRBUF_SIZE (sizeof(struct dirent) + GF_NAME_MAX + 1)
-
-int
-glfs_loc_link (loc_t *loc, struct iatt *iatt)
-{
-	int ret = -1;
-	inode_t *linked_inode = NULL;
-
-	if (!loc->inode) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	linked_inode = inode_link (loc->inode, loc->parent, loc->name, iatt);
-	if (linked_inode) {
-		inode_lookup (linked_inode);
-		inode_unref (linked_inode);
-		ret = 0;
-	} else {
-		ret = -1;
-		errno = ENOMEM;
-	}
-
-	return ret;
-}
-
-
-void
-glfs_iatt_to_stat (struct glfs *fs, struct iatt *iatt, struct stat *stat)
-{
-	iatt_to_stat (iatt, stat);
-	stat->st_dev = fs->dev_id;
-}
-
-
-int
-glfs_loc_unlink (loc_t *loc)
-{
-	inode_unlink (loc->inode, loc->parent, loc->name);
-
-	return 0;
-}
-
-
-struct glfs_fd *
-glfs_open (struct glfs *fs, const char *path, int flags)
-{
-	int              ret = -1;
-	struct glfs_fd  *glfd = NULL;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	glfd = glfs_fd_new (fs);
-	if (!glfd)
-		goto out;
-
-retry:
-	ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	if (IA_ISDIR (iatt.ia_type)) {
-		ret = -1;
-		errno = EISDIR;
-		goto out;
-	}
-
-	if (!IA_ISREG (iatt.ia_type)) {
-		ret = -1;
-		errno = EINVAL;
-		goto out;
-	}
-
-	if (glfd->fd) {
-		/* Retry. Safe to touch glfd->fd as we
-		   still have not glfs_fd_bind() yet.
-		*/
-		fd_unref (glfd->fd);
-		glfd->fd = NULL;
-	}
-
-	glfd->fd = fd_create (loc.inode, getpid());
-	if (!glfd->fd) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	ret = syncop_open (subvol, &loc, flags, glfd->fd);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-out:
-	loc_wipe (&loc);
-
-	if (ret && glfd) {
-		glfs_fd_destroy (glfd);
-		glfd = NULL;
-	} else if (glfd) {
-                glfd->fd->flags = flags;
-		fd_bind (glfd->fd);
-		glfs_fd_bind (glfd);
-	}
-
-	glfs_subvol_done (fs, subvol);
-
-	return glfd;
-}
-
-
-int
-glfs_close (struct glfs_fd *glfd)
-{
-	xlator_t  *subvol = NULL;
-	int        ret = -1;
-	fd_t      *fd = NULL;
-	struct glfs *fs = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-        if (!subvol) {
-                ret = -1;
-                errno = EIO;
-                goto out;
-        }
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_flush (subvol, fd);
-out:
-	fs = glfd->fs;
-	glfs_fd_destroy (glfd);
-
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_lstat (struct glfs *fs, const char *path, struct stat *stat)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == 0 && stat)
-		glfs_iatt_to_stat (fs, &iatt, stat);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_stat (struct glfs *fs, const char *path, struct stat *stat)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == 0 && stat)
-		glfs_iatt_to_stat (fs, &iatt, stat);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_fstat (struct glfs_fd *glfd, struct stat *stat)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	struct iatt      iatt = {0, };
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_fstat (subvol, fd, &iatt);
-
-	if (ret == 0 && stat)
-		glfs_iatt_to_stat (glfd->fs, &iatt, stat);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-struct glfs_fd *
-glfs_creat (struct glfs *fs, const char *path, int flags, mode_t mode)
-{
-	int              ret = -1;
-	struct glfs_fd  *glfd = NULL;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	uuid_t           gfid;
-	dict_t          *xattr_req = NULL;
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	xattr_req = dict_new ();
-	if (!xattr_req) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	uuid_generate (gfid);
-	ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-	if (ret) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	glfd = glfs_fd_new (fs);
-	if (!glfd)
-		goto out;
-
-	/* This must be glfs_resolve() and NOT glfs_lresolve().
-	   That is because open("name", O_CREAT) where "name"
-	   is a danging symlink must create the dangling
-	   destinataion.
-	*/
-retry:
-	ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == -1 && errno != ENOENT)
-		/* Any other type of error is fatal */
-		goto out;
-
-	if (ret == -1 && errno == ENOENT && !loc.parent)
-		/* The parent directory or an ancestor even
-		   higher does not exist
-		*/
-		goto out;
-
-	if (loc.inode) {
-		if (flags & O_EXCL) {
-			ret = -1;
-			errno = EEXIST;
-			goto out;
-		}
-
-		if (IA_ISDIR (iatt.ia_type)) {
-			ret = -1;
-			errno = EISDIR;
-			goto out;
-		}
-
-		if (!IA_ISREG (iatt.ia_type)) {
-			ret = -1;
-			errno = EINVAL;
-			goto out;
-		}
-	}
-
-	if (ret == -1 && errno == ENOENT) {
-		loc.inode = inode_new (loc.parent->table);
-		if (!loc.inode) {
-			ret = -1;
-			errno = ENOMEM;
-			goto out;
-		}
-	}
-
-	if (glfd->fd) {
-		/* Retry. Safe to touch glfd->fd as we
-		   still have not glfs_fd_bind() yet.
-		*/
-		fd_unref (glfd->fd);
-		glfd->fd = NULL;
-	}
-
-	glfd->fd = fd_create (loc.inode, getpid());
-	if (!glfd->fd) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	if (ret == 0) {
-		ret = syncop_open (subvol, &loc, flags, glfd->fd);
-	} else {
-		ret = syncop_create (subvol, &loc, flags, mode, glfd->fd,
-				     xattr_req, &iatt);
-	}
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == 0)
-		ret = glfs_loc_link (&loc, &iatt);
-out:
-	loc_wipe (&loc);
-
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	if (ret && glfd) {
-		glfs_fd_destroy (glfd);
-		glfd = NULL;
-	} else if (glfd) {
-                glfd->fd->flags = flags;
-		fd_bind (glfd->fd);
-		glfs_fd_bind (glfd);
-	}
-
-	glfs_subvol_done (fs, subvol);
-
-	return glfd;
-}
-
-
-off_t
-glfs_lseek (struct glfs_fd *glfd, off_t offset, int whence)
-{
-	struct stat sb = {0, };
-	int         ret = -1;
-
-	__glfs_entry_fd (glfd);
-
-	switch (whence) {
-	case SEEK_SET:
-		glfd->offset = offset;
-		break;
-	case SEEK_CUR:
-		glfd->offset += offset;
-		break;
-	case SEEK_END:
-		ret = glfs_fstat (glfd, &sb);
-		if (ret) {
-			/* seek cannot fail :O */
-			break;
-		}
-		glfd->offset = sb.st_size + offset;
-		break;
-	}
-
-	return glfd->offset;
-}
-
-
-//////////////
-
-ssize_t
-glfs_preadv (struct glfs_fd *glfd, const struct iovec *iovec, int iovcnt,
-	     off_t offset, int flags)
-{
-	xlator_t       *subvol = NULL;
-	ssize_t         ret = -1;
-	ssize_t         size = -1;
-	struct iovec   *iov = NULL;
-	int             cnt = 0;
-	struct iobref  *iobref = NULL;
-	fd_t           *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	size = iov_length (iovec, iovcnt);
-
-	ret = syncop_readv (subvol, fd, size, offset, 0, &iov, &cnt, &iobref);
-	if (ret <= 0)
-		goto out;
-
-	size = iov_copy (iovec, iovcnt, iov, cnt); /* FIXME!!! */
-
-	glfd->offset = (offset + size);
-
-	ret = size;
-out:
-        if (iov)
-                GF_FREE (iov);
-        if (iobref)
-                iobref_unref (iobref);
-
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-ssize_t
-glfs_read (struct glfs_fd *glfd, void *buf, size_t count, int flags)
-{
-	struct iovec iov = {0, };
-	ssize_t      ret = 0;
-
-	iov.iov_base = buf;
-	iov.iov_len = count;
-
-	ret = glfs_preadv (glfd, &iov, 1, glfd->offset, flags);
-
-	return ret;
-}
-
-
-ssize_t
-glfs_pread (struct glfs_fd *glfd, void *buf, size_t count, off_t offset,
-	    int flags)
-{
-	struct iovec iov = {0, };
-	ssize_t      ret = 0;
-
-	iov.iov_base = buf;
-	iov.iov_len = count;
-
-	ret = glfs_preadv (glfd, &iov, 1, offset, flags);
-
-	return ret;
-}
-
-
-ssize_t
-glfs_readv (struct glfs_fd *glfd, const struct iovec *iov, int count,
-	    int flags)
-{
-	ssize_t      ret = 0;
-
-	ret = glfs_preadv (glfd, iov, count, glfd->offset, flags);
-
-	return ret;
-}
-
-
-struct glfs_io {
-	struct glfs_fd      *glfd;
-	int                  op;
-	off_t                offset;
-	struct iovec        *iov;
-	int                  count;
-	int                  flags;
-	glfs_io_cbk          fn;
-	void                *data;
-};
-
-
-static int
-glfs_io_async_cbk (int ret, call_frame_t *frame, void *data)
-{
-	struct glfs_io  *gio = data;
-
-	gio->fn (gio->glfd, ret, gio->data);
-
-	GF_FREE (gio->iov);
-	GF_FREE (gio);
-
-	return 0;
-}
-
-
-static int
-glfs_io_async_task (void *data)
-{
-	struct glfs_io *gio = data;
-	ssize_t         ret = 0;
-
-	switch (gio->op) {
-	case GF_FOP_WRITE:
-		ret = glfs_pwritev (gio->glfd, gio->iov, gio->count,
-				    gio->offset, gio->flags);
-		break;
-	case GF_FOP_FTRUNCATE:
-		ret = glfs_ftruncate (gio->glfd, gio->offset);
-		break;
-	case GF_FOP_FSYNC:
-		if (gio->flags)
-			ret = glfs_fdatasync (gio->glfd);
-		else
-			ret = glfs_fsync (gio->glfd);
-		break;
-	case GF_FOP_DISCARD:
-		ret = glfs_discard (gio->glfd, gio->offset, gio->count);
-		break;
-        case GF_FOP_ZEROFILL:
-                ret = glfs_zerofill(gio->glfd, gio->offset, gio->count);
-                break;
-	}
-
-	return (int) ret;
-}
-
-
-int
-glfs_preadv_async_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-		       int op_ret, int op_errno, struct iovec *iovec,
-		       int count, struct iatt *stbuf, struct iobref *iobref,
-		       dict_t *xdata)
-{
-	struct glfs_io *gio = NULL;
-	xlator_t       *subvol = NULL;
-	struct glfs    *fs = NULL;
-	struct glfs_fd *glfd = NULL;
-
-
-	gio = frame->local;
-	frame->local = NULL;
-	subvol = cookie;
-	glfd = gio->glfd;
-	fs = glfd->fs;
-
-	if (op_ret <= 0)
-		goto out;
-
-	op_ret = iov_copy (gio->iov, gio->count, iovec, count);
-
-	glfd->offset = gio->offset + op_ret;
-out:
-	errno = op_errno;
-	gio->fn (gio->glfd, op_ret, gio->data);
-
-	GF_FREE (gio->iov);
-	GF_FREE (gio);
-	STACK_DESTROY (frame->root);
-	glfs_subvol_done (fs, subvol);
-
-	return 0;
-}
-
-
-int
-glfs_preadv_async (struct glfs_fd *glfd, const struct iovec *iovec, int count,
-		   off_t offset, int flags, glfs_io_cbk fn, void *data)
-{
-	struct glfs_io *gio = NULL;
-	int             ret = 0;
-	call_frame_t   *frame = NULL;
-	xlator_t       *subvol = NULL;
-	glfs_t         *fs = NULL;
-	fd_t           *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	fs = glfd->fs;
-
-	frame = syncop_create_frame (THIS);
-	if (!frame) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	gio = GF_CALLOC (1, sizeof (*gio), glfs_mt_glfs_io_t);
-	if (!gio) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	gio->iov = iov_dup (iovec, count);
-	if (!gio->iov) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	gio->op     = GF_FOP_READ;
-	gio->glfd   = glfd;
-	gio->count  = count;
-	gio->offset = offset;
-	gio->flags  = flags;
-	gio->fn     = fn;
-	gio->data   = data;
-
-	frame->local = gio;
-
-	STACK_WIND_COOKIE (frame, glfs_preadv_async_cbk, subvol, subvol,
-			   subvol->fops->readv, fd, iov_length (iovec, count),
-			   offset, flags, NULL);
-
-out:
-	if (ret) {
-		GF_FREE (gio->iov);
-		GF_FREE (gio);
-		STACK_DESTROY (frame->root);
-		glfs_subvol_done (fs, subvol);
-	}
-
-	if (fd)
-		fd_unref (fd);
-
-	return ret;
-}
-
-
-int
-glfs_read_async (struct glfs_fd *glfd, void *buf, size_t count, int flags,
-		 glfs_io_cbk fn, void *data)
-{
-	struct iovec iov = {0, };
-	ssize_t      ret = 0;
-
-	iov.iov_base = buf;
-	iov.iov_len = count;
-
-	ret = glfs_preadv_async (glfd, &iov, 1, glfd->offset, flags, fn, data);
-
-	return ret;
-}
-
-
-int
-glfs_pread_async (struct glfs_fd *glfd, void *buf, size_t count, off_t offset,
-		  int flags, glfs_io_cbk fn, void *data)
-{
-	struct iovec iov = {0, };
-	ssize_t      ret = 0;
-
-	iov.iov_base = buf;
-	iov.iov_len = count;
-
-	ret = glfs_preadv_async (glfd, &iov, 1, offset, flags, fn, data);
-
-	return ret;
-}
-
-
-int
-glfs_readv_async (struct glfs_fd *glfd, const struct iovec *iov, int count,
-		  int flags, glfs_io_cbk fn, void *data)
-{
-	ssize_t      ret = 0;
-
-	ret = glfs_preadv_async (glfd, iov, count, glfd->offset, flags,
-				 fn, data);
-	return ret;
-}
-
-///// writev /////
-
-ssize_t
-glfs_pwritev (struct glfs_fd *glfd, const struct iovec *iovec, int iovcnt,
-	      off_t offset, int flags)
-{
-	xlator_t       *subvol = NULL;
-	int             ret = -1;
-	size_t          size = -1;
-	struct iobref  *iobref = NULL;
-	struct iobuf   *iobuf = NULL;
-	struct iovec    iov = {0, };
-	fd_t           *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	size = iov_length (iovec, iovcnt);
-
-	iobuf = iobuf_get2 (subvol->ctx->iobuf_pool, size);
-	if (!iobuf) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	iobref = iobref_new ();
-	if (!iobref) {
-		iobuf_unref (iobuf);
-		errno = ENOMEM;
-		ret = -1;
-		goto out;
-	}
-
-	ret = iobref_add (iobref, iobuf);
-	if (ret) {
-		iobuf_unref (iobuf);
-		iobref_unref (iobref);
-		errno = ENOMEM;
-		ret = -1;
-		goto out;
-	}
-
-	iov_unload (iobuf_ptr (iobuf), iovec, iovcnt);  /* FIXME!!! */
-
-	iov.iov_base = iobuf_ptr (iobuf);
-	iov.iov_len = size;
-
-	ret = syncop_writev (subvol, fd, &iov, 1, offset, iobref, flags);
-
-	iobuf_unref (iobuf);
-	iobref_unref (iobref);
-
-	if (ret <= 0)
-		goto out;
-
-	glfd->offset = (offset + size);
-
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-ssize_t
-glfs_write (struct glfs_fd *glfd, const void *buf, size_t count, int flags)
-{
-	struct iovec iov = {0, };
-	ssize_t      ret = 0;
-
-	iov.iov_base = (void *) buf;
-	iov.iov_len = count;
-
-	ret = glfs_pwritev (glfd, &iov, 1, glfd->offset, flags);
-
-	return ret;
-}
-
-
-
-ssize_t
-glfs_writev (struct glfs_fd *glfd, const struct iovec *iov, int count,
-	     int flags)
-{
-	ssize_t      ret = 0;
-
-	ret = glfs_pwritev (glfd, iov, count, glfd->offset, flags);
-
-	return ret;
-}
-
-
-ssize_t
-glfs_pwrite (struct glfs_fd *glfd, const void *buf, size_t count, off_t offset,
-	     int flags)
-{
-	struct iovec iov = {0, };
-	ssize_t      ret = 0;
-
-	iov.iov_base = (void *) buf;
-	iov.iov_len = count;
-
-	ret = glfs_pwritev (glfd, &iov, 1, offset, flags);
-
-	return ret;
-}
-
-
-int
-glfs_pwritev_async (struct glfs_fd *glfd, const struct iovec *iovec, int count,
-		    off_t offset, int flags, glfs_io_cbk fn, void *data)
-{
-	struct glfs_io *gio = NULL;
-	int             ret = 0;
-
-	gio = GF_CALLOC (1, sizeof (*gio), glfs_mt_glfs_io_t);
-	if (!gio) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	gio->iov = iov_dup (iovec, count);
-	if (!gio->iov) {
-		GF_FREE (gio);
-		errno = ENOMEM;
-		return -1;
-	}
-
-	gio->op     = GF_FOP_WRITE;
-	gio->glfd   = glfd;
-	gio->count  = count;
-	gio->offset = offset;
-	gio->flags  = flags;
-	gio->fn     = fn;
-	gio->data   = data;
-
-	ret = synctask_new (glfs_from_glfd (glfd)->ctx->env,
-			    glfs_io_async_task, glfs_io_async_cbk,
-			    NULL, gio);
-
-	if (ret) {
-		GF_FREE (gio->iov);
-		GF_FREE (gio);
-	}
-
-	return ret;
-}
-
-
-int
-glfs_write_async (struct glfs_fd *glfd, const void *buf, size_t count, int flags,
-		  glfs_io_cbk fn, void *data)
-{
-	struct iovec iov = {0, };
-	ssize_t      ret = 0;
-
-	iov.iov_base = (void *) buf;
-	iov.iov_len = count;
-
-	ret = glfs_pwritev_async (glfd, &iov, 1, glfd->offset, flags, fn, data);
-
-	return ret;
-}
-
-
-int
-glfs_pwrite_async (struct glfs_fd *glfd, const void *buf, int count,
-		   off_t offset, int flags, glfs_io_cbk fn, void *data)
-{
-	struct iovec iov = {0, };
-	ssize_t      ret = 0;
-
-	iov.iov_base = (void *) buf;
-	iov.iov_len = count;
-
-	ret = glfs_pwritev_async (glfd, &iov, 1, offset, flags, fn, data);
-
-	return ret;
-}
-
-
-int
-glfs_writev_async (struct glfs_fd *glfd, const struct iovec *iov, int count,
-		   int flags, glfs_io_cbk fn, void *data)
-{
-	ssize_t      ret = 0;
-
-	ret = glfs_pwritev_async (glfd, iov, count, glfd->offset, flags,
-				  fn, data);
-	return ret;
-}
-
-
-int
-glfs_fsync (struct glfs_fd *glfd)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_fsync (subvol, fd, 0);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-static int
-glfs_fsync_async_common (struct glfs_fd *glfd, glfs_io_cbk fn, void *data,
-			 int dataonly)
-{
-	struct glfs_io *gio = NULL;
-	int             ret = 0;
-
-	gio = GF_CALLOC (1, sizeof (*gio), glfs_mt_glfs_io_t);
-	if (!gio) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	gio->op     = GF_FOP_FSYNC;
-	gio->glfd   = glfd;
-	gio->flags  = dataonly;
-	gio->fn     = fn;
-	gio->data   = data;
-
-	ret = synctask_new (glfs_from_glfd (glfd)->ctx->env,
-			    glfs_io_async_task, glfs_io_async_cbk,
-			    NULL, gio);
-
-	if (ret) {
-		GF_FREE (gio->iov);
-		GF_FREE (gio);
-	}
-
-	return ret;
-
-}
-
-
-int
-glfs_fsync_async (struct glfs_fd *glfd, glfs_io_cbk fn, void *data)
-{
-	return glfs_fsync_async_common (glfd, fn, data, 0);
-}
-
-
-int
-glfs_fdatasync (struct glfs_fd *glfd)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_fsync (subvol, fd, 1);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_fdatasync_async (struct glfs_fd *glfd, glfs_io_cbk fn, void *data)
-{
-	return glfs_fsync_async_common (glfd, fn, data, 1);
-}
-
-
-int
-glfs_ftruncate (struct glfs_fd *glfd, off_t offset)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_ftruncate (subvol, fd, offset);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_ftruncate_async (struct glfs_fd *glfd, off_t offset,
-		      glfs_io_cbk fn, void *data)
-{
-	struct glfs_io *gio = NULL;
-	int             ret = 0;
-
-	gio = GF_CALLOC (1, sizeof (*gio), glfs_mt_glfs_io_t);
-	if (!gio) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	gio->op     = GF_FOP_FTRUNCATE;
-	gio->glfd   = glfd;
-	gio->offset = offset;
-	gio->fn     = fn;
-	gio->data   = data;
-
-	ret = synctask_new (glfs_from_glfd (glfd)->ctx->env,
-			    glfs_io_async_task, glfs_io_async_cbk,
-			    NULL, gio);
-
-	if (ret) {
-		GF_FREE (gio->iov);
-		GF_FREE (gio);
-	}
-
-	return ret;
-}
-
-
-int
-glfs_access (struct glfs *fs, const char *path, int mode)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	ret = syncop_access (subvol, &loc, mode);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_symlink (struct glfs *fs, const char *data, const char *path)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	uuid_t           gfid;
-	dict_t          *xattr_req = NULL;
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	xattr_req = dict_new ();
-	if (!xattr_req) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	uuid_generate (gfid);
-	ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-	if (ret) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (loc.inode) {
-		errno = EEXIST;
-		ret = -1;
-		goto out;
-	}
-
-	if (ret == -1 && errno != ENOENT)
-		/* Any other type of error is fatal */
-		goto out;
-
-	if (ret == -1 && errno == ENOENT && !loc.parent)
-		/* The parent directory or an ancestor even
-		   higher does not exist
-		*/
-		goto out;
-
-	/* ret == -1 && errno == ENOENT */
-	loc.inode = inode_new (loc.parent->table);
-	if (!loc.inode) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	ret = syncop_symlink (subvol, &loc, data, xattr_req, &iatt);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == 0)
-		ret = glfs_loc_link (&loc, &iatt);
-out:
-	loc_wipe (&loc);
-
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_readlink (struct glfs *fs, const char *path, char *buf, size_t bufsiz)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-	char            *linkval = NULL;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	if (iatt.ia_type != IA_IFLNK) {
-		ret = -1;
-		errno = EINVAL;
-		goto out;
-	}
-
-	ret = syncop_readlink (subvol, &loc, &linkval, bufsiz);
-	if (ret > 0) {
-		memcpy (buf, linkval, ret);
-		GF_FREE (linkval);
-	}
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_mknod (struct glfs *fs, const char *path, mode_t mode, dev_t dev)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	uuid_t           gfid;
-	dict_t          *xattr_req = NULL;
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	xattr_req = dict_new ();
-	if (!xattr_req) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	uuid_generate (gfid);
-	ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-	if (ret) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (loc.inode) {
-		errno = EEXIST;
-		ret = -1;
-		goto out;
-	}
-
-	if (ret == -1 && errno != ENOENT)
-		/* Any other type of error is fatal */
-		goto out;
-
-	if (ret == -1 && errno == ENOENT && !loc.parent)
-		/* The parent directory or an ancestor even
-		   higher does not exist
-		*/
-		goto out;
-
-	/* ret == -1 && errno == ENOENT */
-	loc.inode = inode_new (loc.parent->table);
-	if (!loc.inode) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	ret = syncop_mknod (subvol, &loc, mode, dev, xattr_req, &iatt);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == 0)
-		ret = glfs_loc_link (&loc, &iatt);
-out:
-	loc_wipe (&loc);
-
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_mkdir (struct glfs *fs, const char *path, mode_t mode)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	uuid_t           gfid;
-	dict_t          *xattr_req = NULL;
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	xattr_req = dict_new ();
-	if (!xattr_req) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	uuid_generate (gfid);
-	ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-	if (ret) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (loc.inode) {
-		errno = EEXIST;
-		ret = -1;
-		goto out;
-	}
-
-	if (ret == -1 && errno != ENOENT)
-		/* Any other type of error is fatal */
-		goto out;
-
-	if (ret == -1 && errno == ENOENT && !loc.parent)
-		/* The parent directory or an ancestor even
-		   higher does not exist
-		*/
-		goto out;
-
-	/* ret == -1 && errno == ENOENT */
-	loc.inode = inode_new (loc.parent->table);
-	if (!loc.inode) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	ret = syncop_mkdir (subvol, &loc, mode, xattr_req, &iatt);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == 0)
-		ret = glfs_loc_link (&loc, &iatt);
-out:
-	loc_wipe (&loc);
-
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_unlink (struct glfs *fs, const char *path)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	if (iatt.ia_type == IA_IFDIR) {
-		ret = -1;
-		errno = EISDIR;
-		goto out;
-	}
-
-	ret = syncop_unlink (subvol, &loc);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == 0)
-		ret = glfs_loc_unlink (&loc);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_rmdir (struct glfs *fs, const char *path)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	if (iatt.ia_type != IA_IFDIR) {
-		ret = -1;
-		errno = ENOTDIR;
-		goto out;
-	}
-
-	ret = syncop_rmdir (subvol, &loc);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret == 0)
-		ret = glfs_loc_unlink (&loc);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_rename (struct glfs *fs, const char *oldpath, const char *newpath)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            oldloc = {0, };
-	loc_t            newloc = {0, };
-	struct iatt      oldiatt = {0, };
-	struct iatt      newiatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, oldpath, &oldloc, &oldiatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &oldloc, retry);
-
-	if (ret)
-		goto out;
-retrynew:
-	ret = glfs_lresolve (fs, subvol, newpath, &newloc, &newiatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &newloc, retrynew);
-
-	if (ret && errno != ENOENT && newloc.parent)
-		goto out;
-
-	if (newiatt.ia_type != IA_INVAL) {
-                if ((oldiatt.ia_type == IA_IFDIR) !=
-                    (newiatt.ia_type == IA_IFDIR)) {
-                       /* Either both old and new must be dirs,
-                        * or both must be non-dirs. Else, fail.
-                        */
-                       ret = -1;
-                       errno = EISDIR;
-                       goto out;
-                }
-        }
-
-	/* TODO: check if new or old is a prefix of the other, and fail EINVAL */
-
-	ret = syncop_rename (subvol, &oldloc, &newloc);
-
-	if (ret == -1 && errno == ESTALE) {
-		if (reval < DEFAULT_REVAL_COUNT) {
-			reval++;
-			loc_wipe (&oldloc);
-			loc_wipe (&newloc);
-			goto retry;
-		}
-	}
-
-	if (ret == 0)
-		inode_rename (oldloc.parent->table, oldloc.parent, oldloc.name,
-			      newloc.parent, newloc.name, oldloc.inode,
-			      &oldiatt);
-out:
-	loc_wipe (&oldloc);
-	loc_wipe (&newloc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_link (struct glfs *fs, const char *oldpath, const char *newpath)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            oldloc = {0, };
-	loc_t            newloc = {0, };
-	struct iatt      oldiatt = {0, };
-	struct iatt      newiatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_lresolve (fs, subvol, oldpath, &oldloc, &oldiatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &oldloc, retry);
-
-	if (ret)
-		goto out;
-retrynew:
-	ret = glfs_lresolve (fs, subvol, newpath, &newloc, &newiatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &newloc, retrynew);
-
-	if (ret == 0) {
-		ret = -1;
-		errno = EEXIST;
-		goto out;
-	}
-
-	if (oldiatt.ia_type == IA_IFDIR) {
-		ret = -1;
-		errno = EISDIR;
-		goto out;
-	}
-
-        /* Filling the inode of the hard link to be same as that of the
-           original file
-        */
-	if (newloc.inode) {
-		inode_unref (newloc.inode);
-		newloc.inode = NULL;
-	}
-        newloc.inode = inode_ref (oldloc.inode);
-
-	ret = syncop_link (subvol, &oldloc, &newloc);
-
-	if (ret == -1 && errno == ESTALE) {
-		loc_wipe (&oldloc);
-		loc_wipe (&newloc);
-		if (reval--)
-			goto retry;
-	}
-
-	if (ret == 0)
-		ret = glfs_loc_link (&newloc, &oldiatt);
-out:
-	loc_wipe (&oldloc);
-	loc_wipe (&newloc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-struct glfs_fd *
-glfs_opendir (struct glfs *fs, const char *path)
-{
-	int              ret = -1;
-	struct glfs_fd  *glfd = NULL;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	glfd = glfs_fd_new (fs);
-	if (!glfd)
-		goto out;
-
-	INIT_LIST_HEAD (&glfd->entries);
-retry:
-	ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	if (!IA_ISDIR (iatt.ia_type)) {
-		ret = -1;
-		errno = ENOTDIR;
-		goto out;
-	}
-
-	if (glfd->fd) {
-		/* Retry. Safe to touch glfd->fd as we
-		   still have not glfs_fd_bind() yet.
-		*/
-		fd_unref (glfd->fd);
-		glfd->fd = NULL;
-	}
-
-	glfd->fd = fd_create (loc.inode, getpid());
-	if (!glfd->fd) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	ret = syncop_opendir (subvol, &loc, glfd->fd);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-out:
-	loc_wipe (&loc);
-
-	if (ret && glfd) {
-		glfs_fd_destroy (glfd);
-		glfd = NULL;
-	} else {
-		fd_bind (glfd->fd);
-		glfs_fd_bind (glfd);
-	}
-
-	glfs_subvol_done (fs, subvol);
-
-	return glfd;
-}
-
-
-int
-glfs_closedir (struct glfs_fd *glfd)
-{
-	__glfs_entry_fd (glfd);
-
-	gf_dirent_free (list_entry (&glfd->entries, gf_dirent_t, list));
-
-	glfs_fd_destroy (glfd);
-
-	return 0;
-}
-
-
-long
-glfs_telldir (struct glfs_fd *fd)
-{
-	return fd->offset;
-}
-
-
-void
-glfs_seekdir (struct glfs_fd *fd, long offset)
-{
-	gf_dirent_t *entry = NULL;
-	gf_dirent_t *tmp = NULL;
-
-	if (fd->offset == offset)
-		return;
-
-	fd->offset = offset;
-	fd->next = NULL;
-
-	list_for_each_entry_safe (entry, tmp, &fd->entries, list) {
-		if (entry->d_off != offset)
-			continue;
-
-		if (&tmp->list != &fd->entries) {
-			/* found! */
-			fd->next = tmp;
-			return;
-		}
-	}
-	/* could not find entry at requested offset in the cache.
-	   next readdir_r() will result in glfd_entry_refresh()
-	*/
-}
-
-int
-glfs_discard_async (struct glfs_fd *glfd, off_t offset, size_t len,
-		      glfs_io_cbk fn, void *data)
-{
-	struct glfs_io *gio = NULL;
-	int             ret = 0;
-
-	gio = GF_CALLOC (1, sizeof (*gio), glfs_mt_glfs_io_t);
-	if (!gio) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	gio->op     = GF_FOP_DISCARD;
-	gio->glfd   = glfd;
-	gio->offset = offset;
-	gio->count  = len;
-	gio->fn     = fn;
-	gio->data   = data;
-
-	ret = synctask_new (glfs_from_glfd (glfd)->ctx->env,
-			    glfs_io_async_task, glfs_io_async_cbk,
-			    NULL, gio);
-
-	if (ret) {
-		GF_FREE (gio->iov);
-		GF_FREE (gio);
-	}
-
-	return ret;
-}
-
-int
-glfs_zerofill_async (struct glfs_fd *glfd, off_t offset, size_t len,
-                      glfs_io_cbk fn, void *data)
-{
-        struct glfs_io *gio  = NULL;
-        int             ret  = 0;
-
-        gio = GF_CALLOC (1, sizeof (*gio), glfs_mt_glfs_io_t);
-        if (!gio) {
-                errno = ENOMEM;
-                return -1;
-        }
-
-        gio->op     = GF_FOP_ZEROFILL;
-        gio->glfd   = glfd;
-        gio->offset = offset;
-        gio->count  = len;
-        gio->fn     = fn;
-        gio->data   = data;
-
-        ret = synctask_new (glfs_from_glfd (glfd)->ctx->env,
-                            glfs_io_async_task, glfs_io_async_cbk,
-                            NULL, gio);
-
-        if (ret) {
-                GF_FREE (gio->iov);
-                GF_FREE (gio);
-        }
-
-        return ret;
-}
-
-
-void
-gf_dirent_to_dirent (gf_dirent_t *gf_dirent, struct dirent *dirent)
-{
-	dirent->d_ino = gf_dirent->d_ino;
-
-#ifdef _DIRENT_HAVE_D_OFF
-	dirent->d_off = gf_dirent->d_off;
-#endif
-
-#ifdef _DIRENT_HAVE_D_TYPE
-	dirent->d_type = gf_dirent->d_type;
-#endif
-
-#ifdef _DIRENT_HAVE_D_NAMLEN
-	dirent->d_namlen = strlen (gf_dirent->d_name);
-#endif
-
-	strncpy (dirent->d_name, gf_dirent->d_name, GF_NAME_MAX + 1);
-}
-
-
-int
-glfd_entry_refresh (struct glfs_fd *glfd, int plus)
-{
-	xlator_t        *subvol = NULL;
-	gf_dirent_t      entries;
-	gf_dirent_t      old;
-	int              ret = -1;
-	fd_t            *fd = NULL;
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	if (fd->inode->ia_type != IA_IFDIR) {
-		ret = -1;
-		errno = EBADF;
-		goto out;
-	}
-
-	INIT_LIST_HEAD (&entries.list);
-	INIT_LIST_HEAD (&old.list);
-
-	if (plus)
-		ret = syncop_readdirp (subvol, fd, 131072, glfd->offset,
-				       NULL, &entries);
-	else
-		ret = syncop_readdir (subvol, fd, 131072, glfd->offset,
-				      &entries);
-	if (ret >= 0) {
-		if (plus)
-			gf_link_inodes_from_dirent (THIS, fd->inode, &entries);
-
-		list_splice_init (&glfd->entries, &old.list);
-		list_splice_init (&entries.list, &glfd->entries);
-
-		/* spurious errno is dangerous for glfd_entry_next() */
-		errno = 0;
-	}
-
-	if (ret > 0)
-		glfd->next = list_entry (glfd->entries.next, gf_dirent_t, list);
-
-	gf_dirent_free (&old);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-gf_dirent_t *
-glfd_entry_next (struct glfs_fd *glfd, int plus)
-{
-	gf_dirent_t     *entry = NULL;
-	int              ret = -1;
-
-	if (!glfd->offset || !glfd->next) {
-		ret = glfd_entry_refresh (glfd, plus);
-		if (ret < 0)
-			return NULL;
-	}
-
-	entry = glfd->next;
-	if (!entry)
-		return NULL;
-
-	if (&entry->next->list == &glfd->entries)
-		glfd->next = NULL;
-	else
-		glfd->next = entry->next;
-
-	glfd->offset = entry->d_off;
-
-	return entry;
-}
-
-
-static struct dirent *
-glfs_readdirbuf_get (struct glfs_fd *glfd)
-{
-        struct dirent *buf = NULL;
-
-        LOCK (&glfd->fd->lock);
-        {
-                buf = glfd->readdirbuf;
-                if (buf) {
-                        memset (buf, 0, READDIRBUF_SIZE);
-                        goto unlock;
-                }
-
-                buf = GF_CALLOC (1, READDIRBUF_SIZE, glfs_mt_readdirbuf_t);
-                if (!buf) {
-                        errno = ENOMEM;
-                        goto unlock;
-                }
-
-                glfd->readdirbuf = buf;
-        }
-unlock:
-        UNLOCK (&glfd->fd->lock);
-
-        return buf;
-}
-
-
-int
-glfs_readdirplus_r (struct glfs_fd *glfd, struct stat *stat, struct dirent *ext,
-		    struct dirent **res)
-{
-	int              ret = 0;
-	gf_dirent_t     *entry = NULL;
-	struct dirent   *buf = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	errno = 0;
-
-	if (ext)
-		buf = ext;
-	else
-		buf = glfs_readdirbuf_get (glfd);
-
-	if (!buf) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	entry = glfd_entry_next (glfd, !!stat);
-	if (errno)
-		ret = -1;
-
-	if (res) {
-		if (entry)
-			*res = buf;
-		else
-			*res = NULL;
-	}
-
-	if (entry) {
-		gf_dirent_to_dirent (entry, buf);
-		if (stat)
-			glfs_iatt_to_stat (glfd->fs, &entry->d_stat, stat);
-	}
-
-	return ret;
-}
-
-
-int
-glfs_readdir_r (struct glfs_fd *glfd, struct dirent *buf, struct dirent **res)
-{
-	return glfs_readdirplus_r (glfd, 0, buf, res);
-}
-
-
-struct dirent *
-glfs_readdirplus (struct glfs_fd *glfd, struct stat *stat)
-{
-        struct dirent *res = NULL;
-        int ret = -1;
-
-        ret = glfs_readdirplus_r (glfd, stat, NULL, &res);
-        if (ret)
-                return NULL;
-
-        return res;
-}
-
-
-
-struct dirent *
-glfs_readdir (struct glfs_fd *glfd)
-{
-        return glfs_readdirplus (glfd, NULL);
-}
-
-
-int
-glfs_statvfs (struct glfs *fs, const char *path, struct statvfs *buf)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	ret = syncop_statfs (subvol, &loc, buf);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_setattr (struct glfs *fs, const char *path, struct iatt *iatt,
-	      int valid, int follow)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      riatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	if (follow)
-		ret = glfs_resolve (fs, subvol, path, &loc, &riatt, reval);
-	else
-		ret = glfs_lresolve (fs, subvol, path, &loc, &riatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	ret = syncop_setattr (subvol, &loc, iatt, valid, 0, 0);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_fsetattr (struct glfs_fd *glfd, struct iatt *iatt, int valid)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_fsetattr (subvol, fd, iatt, valid, 0, 0);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_chmod (struct glfs *fs, const char *path, mode_t mode)
-{
-	int              ret = -1;
-	struct iatt      iatt = {0, };
-	int              valid = 0;
-
-	iatt.ia_prot = ia_prot_from_st_mode (mode);
-	valid = GF_SET_ATTR_MODE;
-
-	ret = glfs_setattr (fs, path, &iatt, valid, 1);
-
-	return ret;
-}
-
-
-int
-glfs_fchmod (struct glfs_fd *glfd, mode_t mode)
-{
-	int              ret = -1;
-	struct iatt      iatt = {0, };
-	int              valid = 0;
-
-	iatt.ia_prot = ia_prot_from_st_mode (mode);
-	valid = GF_SET_ATTR_MODE;
-
-	ret = glfs_fsetattr (glfd, &iatt, valid);
-
-	return ret;
-}
-
-
-int
-glfs_chown (struct glfs *fs, const char *path, uid_t uid, gid_t gid)
-{
-	int              ret = -1;
-	int              valid = 0;
-	struct iatt      iatt = {0, };
-
-	iatt.ia_uid = uid;
-	iatt.ia_gid = gid;
-	valid = GF_SET_ATTR_UID|GF_SET_ATTR_GID;
-
-	ret = glfs_setattr (fs, path, &iatt, valid, 1);
-
-	return ret;
-}
-
-
-int
-glfs_lchown (struct glfs *fs, const char *path, uid_t uid, gid_t gid)
-{
-	int              ret = -1;
-	int              valid = 0;
-	struct iatt      iatt = {0, };
-
-	iatt.ia_uid = uid;
-	iatt.ia_gid = gid;
-	valid = GF_SET_ATTR_UID|GF_SET_ATTR_GID;
-
-	ret = glfs_setattr (fs, path, &iatt, valid, 0);
-
-	return ret;
-}
-
-
-int
-glfs_fchown (struct glfs_fd *glfd, uid_t uid, gid_t gid)
-{
-	int              ret = -1;
-	int              valid = 0;
-	struct iatt      iatt = {0, };
-
-	iatt.ia_uid = uid;
-	iatt.ia_gid = gid;
-	valid = GF_SET_ATTR_UID|GF_SET_ATTR_GID;
-
-	ret = glfs_fsetattr (glfd, &iatt, valid);
-
-	return ret;
-}
-
-
-int
-glfs_utimens (struct glfs *fs, const char *path, struct timespec times[2])
-{
-	int              ret = -1;
-	int              valid = 0;
-	struct iatt      iatt = {0, };
-
-	iatt.ia_atime = times[0].tv_sec;
-	iatt.ia_atime_nsec = times[0].tv_nsec;
-	iatt.ia_mtime = times[1].tv_sec;
-	iatt.ia_mtime_nsec = times[1].tv_nsec;
-
-	valid = GF_SET_ATTR_ATIME|GF_SET_ATTR_MTIME;
-
-	ret = glfs_setattr (fs, path, &iatt, valid, 1);
-
-	return ret;
-}
-
-
-int
-glfs_lutimens (struct glfs *fs, const char *path, struct timespec times[2])
-{
-	int              ret = -1;
-	int              valid = 0;
-	struct iatt      iatt = {0, };
-
-	iatt.ia_atime = times[0].tv_sec;
-	iatt.ia_atime_nsec = times[0].tv_nsec;
-	iatt.ia_mtime = times[1].tv_sec;
-	iatt.ia_mtime_nsec = times[1].tv_nsec;
-
-	valid = GF_SET_ATTR_ATIME|GF_SET_ATTR_MTIME;
-
-	ret = glfs_setattr (fs, path, &iatt, valid, 0);
-
-	return ret;
-}
-
-
-int
-glfs_futimens (struct glfs_fd *glfd, struct timespec times[2])
-{
-	int              ret = -1;
-	int              valid = 0;
-	struct iatt      iatt = {0, };
-
-	iatt.ia_atime = times[0].tv_sec;
-	iatt.ia_atime_nsec = times[0].tv_nsec;
-	iatt.ia_mtime = times[1].tv_sec;
-	iatt.ia_mtime_nsec = times[1].tv_nsec;
-
-	valid = GF_SET_ATTR_ATIME|GF_SET_ATTR_MTIME;
-
-	ret = glfs_fsetattr (glfd, &iatt, valid);
-
-	return ret;
-}
-
-
-int
-glfs_getxattr_process (void *value, size_t size, dict_t *xattr,
-		       const char *name)
-{
-	data_t *data = NULL;
-	int     ret = -1;
-
-	data = dict_get (xattr, (char *)name);
-	if (!data) {
-		errno = ENODATA;
-		ret = -1;
-		goto out;
-	}
-
-	ret = data->len;
-	if (!value || !size)
-		goto out;
-
-	if (size < ret) {
-		ret = -1;
-		errno = ERANGE;
-		goto out;
-	}
-
-	memcpy (value, data->data, ret);
-out:
-	if (xattr)
-		dict_unref (xattr);
-	return ret;
-}
-
-
-ssize_t
-glfs_getxattr_common (struct glfs *fs, const char *path, const char *name,
-		      void *value, size_t size, int follow)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	dict_t          *xattr = NULL;
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	if (follow)
-		ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-	else
-		ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	ret = syncop_getxattr (subvol, &loc, &xattr, name);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	ret = glfs_getxattr_process (value, size, xattr, name);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-ssize_t
-glfs_getxattr (struct glfs *fs, const char *path, const char *name,
-	       void *value, size_t size)
-{
-	return glfs_getxattr_common (fs, path, name, value, size, 1);
-}
-
-
-ssize_t
-glfs_lgetxattr (struct glfs *fs, const char *path, const char *name,
-		void *value, size_t size)
-{
-	return glfs_getxattr_common (fs, path, name, value, size, 0);
-}
-
-
-ssize_t
-glfs_fgetxattr (struct glfs_fd *glfd, const char *name, void *value,
-		size_t size)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	dict_t          *xattr = NULL;
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_fgetxattr (subvol, fd, &xattr, name);
-	if (ret)
-		goto out;
-
-	ret = glfs_getxattr_process (value, size, xattr, name);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_listxattr_process (void *value, size_t size, dict_t *xattr)
-{
-	int     ret = -1;
-
-	ret = dict_keys_join (NULL, 0, xattr, NULL);
-
-	if (!value || !size)
-		goto out;
-
-	if (size < ret) {
-		ret = -1;
-		errno = ERANGE;
-		goto out;
-	}
-
-	dict_keys_join (value, size, xattr, NULL);
-out:
-	if (xattr)
-		dict_unref (xattr);
-	return ret;
-}
-
-
-ssize_t
-glfs_listxattr_common (struct glfs *fs, const char *path, void *value,
-		       size_t size, int follow)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	dict_t          *xattr = NULL;
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-retry:
-	if (follow)
-		ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-	else
-		ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	ret = syncop_getxattr (subvol, &loc, &xattr, NULL);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	ret = glfs_listxattr_process (value, size, xattr);
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-ssize_t
-glfs_listxattr (struct glfs *fs, const char *path, void *value, size_t size)
-{
-	return glfs_listxattr_common (fs, path, value, size, 1);
-}
-
-
-ssize_t
-glfs_llistxattr (struct glfs *fs, const char *path, void *value, size_t size)
-{
-	return glfs_listxattr_common (fs, path, value, size, 0);
-}
-
-
-ssize_t
-glfs_flistxattr (struct glfs_fd *glfd, void *value, size_t size)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	dict_t          *xattr = NULL;
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_fgetxattr (subvol, fd, &xattr, NULL);
-	if (ret)
-		goto out;
-
-	ret = glfs_listxattr_process (value, size, xattr);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-dict_t *
-dict_for_key_value (const char *name, const char *value, size_t size)
-{
-	dict_t *xattr = NULL;
-	int     ret = 0;
-
-	xattr = dict_new ();
-	if (!xattr)
-		return NULL;
-
-	ret = dict_set_static_bin (xattr, (char *)name, (void *)value, size);
-	if (ret) {
-		dict_destroy (xattr);
-		xattr = NULL;
-	}
-
-	return xattr;
-}
-
-
-int
-glfs_setxattr_common (struct glfs *fs, const char *path, const char *name,
-		      const void *value, size_t size, int flags, int follow)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	dict_t          *xattr = NULL;
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	if (follow)
-		ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-	else
-		ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	xattr = dict_for_key_value (name, value, size);
-	if (!xattr) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	ret = syncop_setxattr (subvol, &loc, xattr, flags);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-out:
-	loc_wipe (&loc);
-	if (xattr)
-		dict_unref (xattr);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_setxattr (struct glfs *fs, const char *path, const char *name,
-	       const void *value, size_t size, int flags)
-{
-	return glfs_setxattr_common (fs, path, name, value, size, flags, 1);
-}
-
-
-int
-glfs_lsetxattr (struct glfs *fs, const char *path, const char *name,
-		const void *value, size_t size, int flags)
-{
-	return glfs_setxattr_common (fs, path, name, value, size, flags, 0);
-}
-
-
-int
-glfs_fsetxattr (struct glfs_fd *glfd, const char *name, const void *value,
-		size_t size, int flags)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	dict_t          *xattr = NULL;
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	xattr = dict_for_key_value (name, value, size);
-	if (!xattr) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	ret = syncop_fsetxattr (subvol, fd, xattr, flags);
-out:
-	if (xattr)
-		dict_unref (xattr);
-
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_removexattr_common (struct glfs *fs, const char *path, const char *name,
-			 int follow)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	if (follow)
-		ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-	else
-		ret = glfs_lresolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	ret = syncop_removexattr (subvol, &loc, name);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_removexattr (struct glfs *fs, const char *path, const char *name)
-{
-	return glfs_removexattr_common (fs, path, name, 1);
-}
-
-
-int
-glfs_lremovexattr (struct glfs *fs, const char *path, const char *name)
-{
-	return glfs_removexattr_common (fs, path, name, 0);
-}
-
-
-int
-glfs_fremovexattr (struct glfs_fd *glfd, const char *name)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_fremovexattr (subvol, fd, name);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_fallocate (struct glfs_fd *glfd, int keep_size, off_t offset, size_t len)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	fd_t		*fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_fallocate (subvol, fd, keep_size, offset, len);
-out:
-	if (fd)
-		fd_unref(fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_discard (struct glfs_fd *glfd, off_t offset, size_t len)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	fd_t		*fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	ret = syncop_discard (subvol, fd, offset, len);
-out:
-	if (fd)
-		fd_unref(fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-int
-glfs_zerofill (struct glfs_fd *glfd, off_t offset, size_t len)
-{
-        int               ret             = -1;
-        xlator_t         *subvol          = NULL;
-        fd_t             *fd              = NULL;
-
-        __glfs_entry_fd (glfd);
-
-        subvol = glfs_active_subvol (glfd->fs);
-        if (!subvol) {
-                errno = EIO;
-                goto out;
-        }
-
-        fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-        if (!fd) {
-                errno = EBADFD;
-                goto out;
-        }
-
-        ret = syncop_zerofill (subvol, fd, offset, len);
-out:
-        if (fd)
-                fd_unref(fd);
-
-        glfs_subvol_done (glfd->fs, subvol);
-
-        return ret;
-}
-
-int
-glfs_chdir (struct glfs *fs, const char *path)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	if (!IA_ISDIR (iatt.ia_type)) {
-		ret = -1;
-		errno = ENOTDIR;
-		goto out;
-	}
-
-	glfs_cwd_set (fs, loc.inode);
-
-out:
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-
-int
-glfs_fchdir (struct glfs_fd *glfd)
-{
-	int       ret = -1;
-	inode_t  *inode = NULL;
-	xlator_t *subvol = NULL;
-	fd_t     *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	inode = fd->inode;
-
-	if (!IA_ISDIR (inode->ia_type)) {
-		ret = -1;
-		errno = ENOTDIR;
-		goto out;
-	}
-
-	glfs_cwd_set (glfd->fs, inode);
-	ret = 0;
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-char *
-glfs_realpath (struct glfs *fs, const char *path, char *resolved_path)
-{
-	int              ret = -1;
-	char            *retpath = NULL;
-	char            *allocpath = NULL;
-	xlator_t        *subvol = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              reval = 0;
-
-	__glfs_entry_fs (fs);
-
-	if (resolved_path)
-		retpath = resolved_path;
-	else
-		retpath = allocpath = malloc (PATH_MAX + 1);
-
-	if (!retpath) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-retry:
-	ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval);
-
-	ESTALE_RETRY (ret, errno, reval, &loc, retry);
-
-	if (ret)
-		goto out;
-
-	if (loc.path) {
-		strncpy (retpath, loc.path, PATH_MAX);
-		retpath[PATH_MAX] = 0;
-	}
-
-out:
-	loc_wipe (&loc);
-
-	if (ret == -1) {
-		if (allocpath)
-			free (allocpath);
-		retpath = NULL;
-	}
-
-	glfs_subvol_done (fs, subvol);
-
-	return retpath;
-}
-
-
-char *
-glfs_getcwd (struct glfs *fs, char *buf, size_t n)
-{
-	int              ret = -1;
-	inode_t         *inode = NULL;
-	char            *path = NULL;
-
-	__glfs_entry_fs (fs);
-
-	if (!buf || n < 2) {
-		ret = -1;
-		errno = EINVAL;
-		goto out;
-	}
-
-	inode = glfs_cwd_get (fs);
-
-	if (!inode) {
-		strncpy (buf, "/", n);
-		ret = 0;
-		goto out;
-	}
-
-	ret = inode_path (inode, 0, &path);
-	if (n <= ret) {
-		ret = -1;
-		errno = ERANGE;
-		goto out;
-	}
-
-	strncpy (buf, path, n);
-	ret = 0;
-out:
-	GF_FREE (path);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (ret < 0)
-		return NULL;
-
-	return buf;
-}
-
-
-static void
-gf_flock_to_flock (struct gf_flock *gf_flock, struct flock *flock)
-{
-	flock->l_type   = gf_flock->l_type;
-	flock->l_whence = gf_flock->l_whence;
-	flock->l_start  = gf_flock->l_start;
-	flock->l_len    = gf_flock->l_len;
-	flock->l_pid    = gf_flock->l_pid;
-}
-
-
-static void
-gf_flock_from_flock (struct gf_flock *gf_flock, struct flock *flock)
-{
-	gf_flock->l_type   = flock->l_type;
-	gf_flock->l_whence = flock->l_whence;
-	gf_flock->l_start  = flock->l_start;
-	gf_flock->l_len    = flock->l_len;
-	gf_flock->l_pid    = flock->l_pid;
-}
-
-
-int
-glfs_posix_lock (struct glfs_fd *glfd, int cmd, struct flock *flock)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	struct gf_flock  gf_flock = {0, };
-	struct gf_flock  saved_flock = {0, };
-	fd_t            *fd = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	subvol = glfs_active_subvol (glfd->fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (glfd->fs, subvol, glfd);
-	if (!fd) {
-		ret = -1;
-		errno = EBADFD;
-		goto out;
-	}
-
-	gf_flock_from_flock (&gf_flock, flock);
-	gf_flock_from_flock (&saved_flock, flock);
-	ret = syncop_lk (subvol, fd, cmd, &gf_flock);
-	gf_flock_to_flock (&gf_flock, flock);
-
-	if (ret == 0 && (cmd == F_SETLK || cmd == F_SETLKW))
-		fd_lk_insert_and_merge (fd, cmd, &saved_flock);
-out:
-	if (fd)
-		fd_unref (fd);
-
-	glfs_subvol_done (glfd->fs, subvol);
-
-	return ret;
-}
-
-
-struct glfs_fd *
-glfs_dup (struct glfs_fd *glfd)
-{
-	xlator_t  *subvol = NULL;
-	fd_t      *fd = NULL;
-	glfs_fd_t *dupfd = NULL;
-	struct glfs *fs = NULL;
-
-	__glfs_entry_fd (glfd);
-
-	fs = glfd->fs;
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		errno = EIO;
-		goto out;
-	}
-
-	fd = glfs_resolve_fd (fs, subvol, glfd);
-	if (!fd) {
-		errno = EBADFD;
-		goto out;
-	}
-
-	dupfd = glfs_fd_new (fs);
-	if (!dupfd) {
-		errno = ENOMEM;
-		goto out;
-	}
-
-	dupfd->fd = fd_ref (fd);
-out:
-	if (fd)
-		fd_unref (fd);
-	if (dupfd)
-		glfs_fd_bind (dupfd);
-
-	glfs_subvol_done (fs, subvol);
-
-	return dupfd;
-}
diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c
deleted file mode 100644
index 9c707a619..000000000
--- a/api/src/glfs-handleops.c
+++ /dev/null
@@ -1,1278 +0,0 @@
-/*
- *  Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
- *  This file is part of GlusterFS.
- *
- *  This file is licensed to you under your choice of the GNU Lesser
- *  General Public License, version 3 or any later version (LGPLv3 or
- *  later), or the GNU General Public License, version 2 (GPLv2), in all
- *  cases as published by the Free Software Foundation.
- */
-
-
-#include "glfs-internal.h"
-#include "glfs-mem-types.h"
-#include "syncop.h"
-#include "glfs.h"
-#include "glfs-handles.h"
-
-static void
-glfs_iatt_from_stat (struct stat *stat, int valid, struct iatt *iatt,
-		     int *glvalid)
-{
-	/* validate in args */
-	if ((stat == NULL) || (iatt == NULL) || (glvalid == NULL)) {
-		errno = EINVAL;
-		return;
-	}
-
-	*glvalid = 0;
-
-	if (valid & GFAPI_SET_ATTR_MODE) {
-		iatt->ia_prot = ia_prot_from_st_mode (stat->st_mode);
-		*glvalid |= GF_SET_ATTR_MODE;
-	}
-
-	if (valid & GFAPI_SET_ATTR_UID) {
-		iatt->ia_uid = stat->st_uid;
-		*glvalid |= GF_SET_ATTR_UID;
-	}
-
-	if (valid & GFAPI_SET_ATTR_GID) {
-		iatt->ia_gid = stat->st_gid;
-		*glvalid |= GF_SET_ATTR_GID;
-	}
-
-	if (valid & GFAPI_SET_ATTR_ATIME) {
-		iatt->ia_atime = stat->st_atime;
-		iatt->ia_atime_nsec = ST_ATIM_NSEC (stat);
-		*glvalid |= GF_SET_ATTR_ATIME;
-	}
-
-	if (valid & GFAPI_SET_ATTR_MTIME) {
-		iatt->ia_mtime = stat->st_mtime;
-		iatt->ia_mtime_nsec = ST_MTIM_NSEC (stat);
-		*glvalid |= GF_SET_ATTR_MTIME;
-	}
-
-	return;
-}
-
-struct glfs_object *
-glfs_h_lookupat (struct glfs *fs, struct glfs_object *parent,
-		 const char *path, struct stat *stat)
-{
-	int                      ret = 0;
-	xlator_t                *subvol = NULL;
-	inode_t                 *inode = NULL;
-	struct iatt              iatt = {0, };
-	struct glfs_object      *object = NULL;
-	loc_t                    loc = {0, };
-
-	/* validate in args */
-	if ((fs == NULL) || (path == NULL)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	if (parent) {
-		inode = glfs_resolve_inode (fs, subvol, parent);
-		if (!inode) {
-			errno = ESTALE;
-			goto out;
-		}
-	}
-
-	/* fop/op */
-	ret = glfs_resolve_at (fs, subvol, inode, path, &loc, &iatt,
-			       0 /*TODO: links? */, 0);
-
-	/* populate out args */
-	if (!ret) {
-		if (stat)
-			glfs_iatt_to_stat (fs, &iatt, stat);
-
-		ret = glfs_create_object (&loc, &object);
-	}
-
-out:
-	loc_wipe (&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	glfs_subvol_done (fs, subvol);
-
-	return object;
-}
-
-int
-glfs_h_stat (struct glfs *fs, struct glfs_object *object, struct stat *stat)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	inode_t         *inode = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-
-	/* validate in args */
-	if ((fs == NULL) || (object == NULL)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, object);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	/* populate loc */
-	GLFS_LOC_FILL_INODE (inode, loc, out);
-
-	/* fop/op */
-	ret = syncop_stat (subvol, &loc, &iatt);
-
-	/* populate out args */
-	if (!ret && stat) {
-		glfs_iatt_to_stat (fs, &iatt, stat);
-	}
-out:
-	loc_wipe (&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-int
-glfs_h_getattrs (struct glfs *fs, struct glfs_object *object, struct stat *stat)
-{
-	int                      ret = 0;
-	xlator_t                *subvol = NULL;
-	inode_t                 *inode = NULL;
-	struct iatt              iatt = {0, };
-
-	/* validate in args */
-	if ((fs == NULL) || (object == NULL)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, object);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	/* fop/op */
-	ret = glfs_resolve_base (fs, subvol, inode, &iatt);
-
-	/* populate out args */
-	if (!ret && stat) {
-		glfs_iatt_to_stat (fs, &iatt, stat);
-	}
-
-out:
-	if (inode)
-		inode_unref (inode);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-int
-glfs_h_setattrs (struct glfs *fs, struct glfs_object *object, struct stat *stat,
-		 int valid)
-{
-	int              ret = -1;
-	xlator_t        *subvol = NULL;
-	inode_t         *inode = NULL;
-	loc_t            loc = {0, };
-	struct iatt      iatt = {0, };
-	int              glvalid = 0;
-
-	/* validate in args */
-	if ((fs == NULL) || (object == NULL) || (stat == NULL)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, object);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	/* map valid masks from in args */
-	glfs_iatt_from_stat (stat, valid, &iatt, &glvalid);
-
-	/* populate loc */
-	GLFS_LOC_FILL_INODE (inode, loc, out);
-
-	/* fop/op */
-	ret = syncop_setattr (subvol, &loc, &iatt, glvalid, 0, 0);
-out:
-	loc_wipe (&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-struct glfs_fd *
-glfs_h_open (struct glfs *fs, struct glfs_object *object, int flags)
-{
-	int              ret = -1;
-	struct glfs_fd  *glfd = NULL;
-	xlator_t        *subvol = NULL;
-	inode_t         *inode = NULL;
-	loc_t            loc = {0, };
-
-	/* validate in args */
-	if ((fs == NULL) || (object == NULL)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, object);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	/* check types to open */
-	if (IA_ISDIR (inode->ia_type)) {
-		ret = -1;
-		errno = EISDIR;
-		goto out;
-	}
-
-	if (!IA_ISREG (inode->ia_type)) {
-		ret = -1;
-		errno = EINVAL;
-		goto out;
-	}
-
-	glfd = glfs_fd_new (fs);
-	if (!glfd) {
-		errno = ENOMEM;
-		goto out;
-	}
-
-	glfd->fd = fd_create (inode, getpid());
-	if (!glfd->fd) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	/* populate loc */
-	GLFS_LOC_FILL_INODE (inode, loc, out);
-
-	/* fop/op */
-	ret = syncop_open (subvol, &loc, flags, glfd->fd);
-
-out:
-	loc_wipe (&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (ret && glfd) {
-		glfs_fd_destroy (glfd);
-		glfd = NULL;
-	} else {
-		glfd->fd->flags = flags;
-		fd_bind (glfd->fd);
-		glfs_fd_bind (glfd);
-	}
-
-	glfs_subvol_done (fs, subvol);
-
-	return glfd;
-}
-
-struct glfs_object *
-glfs_h_creat (struct glfs *fs, struct glfs_object *parent, const char *path,
-	      int flags, mode_t mode, struct stat *stat)
-{
-	int                 ret = -1;
-	struct glfs_fd     *glfd = NULL;
-	xlator_t           *subvol = NULL;
-	inode_t            *inode = NULL;
-	loc_t               loc = {0, };
-	struct iatt         iatt = {0, };
-	uuid_t              gfid;
-	dict_t             *xattr_req = NULL;
-	struct glfs_object *object = NULL;
-
-	/* validate in args */
-	if ((fs == NULL) || (parent == NULL) || (path == NULL)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, parent);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	xattr_req = dict_new ();
-	if (!xattr_req) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	uuid_generate (gfid);
-	ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-	if (ret) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	GLFS_LOC_FILL_PINODE (inode, loc, ret, errno, out, path);
-
-	glfd = glfs_fd_new (fs);
-	if (!glfd)
-		goto out;
-
-	glfd->fd = fd_create (loc.inode, getpid());
-	if (!glfd->fd) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	/* fop/op */
-	ret = syncop_create (subvol, &loc, flags, mode, glfd->fd,
-			     xattr_req, &iatt);
-
-	/* populate out args */
-	if (ret == 0) {
-		/* TODO: If the inode existed in the cache (say file already
-		   exists), then the glfs_loc_link will not update the
-		   loc.inode, as a result we will have a 0000 GFID that we
-		   would copy out to the object, this needs to be fixed.
-		*/
-		ret = glfs_loc_link (&loc, &iatt);
-		if (ret != 0) {
-			goto out;
-		}
-
-		if (stat)
-			glfs_iatt_to_stat (fs, &iatt, stat);
-
-		ret = glfs_create_object (&loc, &object);
-	}
-
-out:
-	if (ret && object != NULL) {
-		glfs_h_close (object);
-		object = NULL;
-	}
-
-	loc_wipe(&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	if (glfd) {
-		glfs_fd_destroy (glfd);
-		glfd = NULL;
-	}
-
-	glfs_subvol_done (fs, subvol);
-
-	return object;
-}
-
-struct glfs_object *
-glfs_h_mkdir (struct glfs *fs, struct glfs_object *parent, const char *path,
-	      mode_t mode, struct stat *stat)
-{
-	int                 ret = -1;
-	xlator_t           *subvol = NULL;
-	inode_t            *inode = NULL;
-	loc_t               loc = {0, };
-	struct iatt         iatt = {0, };
-	uuid_t              gfid;
-	dict_t             *xattr_req = NULL;
-	struct glfs_object *object = NULL;
-
-	/* validate in args */
-	if ((fs == NULL) || (parent == NULL) || (path == NULL)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, parent);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	xattr_req = dict_new ();
-	if (!xattr_req) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	uuid_generate (gfid);
-	ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-	if (ret) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	GLFS_LOC_FILL_PINODE (inode, loc, ret, errno, out, path);
-
-	/* fop/op */
-	ret = syncop_mkdir (subvol, &loc, mode, xattr_req, &iatt);
-
-	/* populate out args */
-	if ( ret == 0 )  {
-		ret = glfs_loc_link (&loc, &iatt);
-		if (ret != 0) {
-			goto out;
-		}
-
-		if (stat)
-			glfs_iatt_to_stat (fs, &iatt, stat);
-
-		ret = glfs_create_object (&loc, &object);
-	}
-
-out:
-	if (ret && object != NULL) {
-		glfs_h_close (object);
-		object = NULL;
-	}
-
-	loc_wipe(&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	glfs_subvol_done (fs, subvol);
-
-	return object;
-}
-
-struct glfs_object *
-glfs_h_mknod (struct glfs *fs, struct glfs_object *parent, const char *path,
-	      mode_t mode, dev_t dev, struct stat *stat)
-{
-	int                 ret = -1;
-	xlator_t           *subvol = NULL;
-	inode_t            *inode = NULL;
-	loc_t               loc = {0, };
-	struct iatt         iatt = {0, };
-	uuid_t              gfid;
-	dict_t             *xattr_req = NULL;
-	struct glfs_object *object = NULL;
-
-	/* validate in args */
-	if ((fs == NULL) || (parent == NULL) || (path == NULL)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, parent);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	xattr_req = dict_new ();
-	if (!xattr_req) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	uuid_generate (gfid);
-	ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-	if (ret) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	GLFS_LOC_FILL_PINODE (inode, loc, ret, errno, out, path);
-
-	/* fop/op */
-	ret = syncop_mknod (subvol, &loc, mode, dev, xattr_req, &iatt);
-
-	/* populate out args */
-	if (ret == 0) {
-		ret = glfs_loc_link (&loc, &iatt);
-		if (ret != 0) {
-			goto out;
-		}
-
-		if (stat)
-			glfs_iatt_to_stat (fs, &iatt, stat);
-
-		ret = glfs_create_object (&loc, &object);
-	}
-out:
-	if (ret && object != NULL) {
-		glfs_h_close (object);
-		object = NULL;
-	}
-
-	loc_wipe(&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	glfs_subvol_done (fs, subvol);
-
-	return object;
-}
-
-int
-glfs_h_unlink (struct glfs *fs, struct glfs_object *parent, const char *path)
-{
-	int                 ret = -1;
-	xlator_t           *subvol = NULL;
-	inode_t            *inode = NULL;
-	loc_t               loc = {0, };
-
-	/* validate in args */
-	if ((fs == NULL) || (parent == NULL) || (path == NULL)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if ( !subvol ) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, parent);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	ret = glfs_resolve_at (fs, subvol, inode, path, &loc, NULL, 0 , 0);
-	if (ret != 0) {
-		goto out;
-	}
-
-	if (!IA_ISDIR(loc.inode->ia_type)) {
-		ret = syncop_unlink (subvol, &loc);
-		if (ret != 0) {
-			goto out;
-		}
-	} else {
-		ret = syncop_rmdir (subvol, &loc);
-		if (ret != 0) {
-			goto out;
-		}
-	}
-
-	if (ret == 0)
-		ret = glfs_loc_unlink (&loc);
-
-out:
-	loc_wipe (&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-struct glfs_fd *
-glfs_h_opendir (struct glfs *fs, struct glfs_object *object)
-{
-	int              ret = -1;
-	struct glfs_fd  *glfd = NULL;
-	xlator_t        *subvol = NULL;
-	inode_t         *inode = NULL;
-	loc_t            loc = {0, };
-
-	/* validate in args */
-	if ((fs == NULL) || (object == NULL)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, object);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	if (!IA_ISDIR (inode->ia_type)) {
-		ret = -1;
-		errno = ENOTDIR;
-		goto out;
-	}
-
-	glfd = glfs_fd_new (fs);
-	if (!glfd)
-		goto out;
-
-	INIT_LIST_HEAD (&glfd->entries);
-
-	glfd->fd = fd_create (inode, getpid());
-	if (!glfd->fd) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	GLFS_LOC_FILL_INODE (inode, loc, out);
-
-	/* fop/op */
-	ret = syncop_opendir (subvol, &loc, glfd->fd);
-
-out:
-	loc_wipe (&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (ret && glfd) {
-		glfs_fd_destroy (glfd);
-		glfd = NULL;
-	} else {
-		fd_bind (glfd->fd);
-		glfs_fd_bind (glfd);
-	}
-
-	glfs_subvol_done (fs, subvol);
-
-	return glfd;
-}
-
-ssize_t
-glfs_h_extract_handle (struct glfs_object *object, unsigned char *handle,
-		       int len)
-{
-	ssize_t ret = -1;
-
-	/* validate in args */
-	if (object == NULL) {
-		errno = EINVAL;
-		goto out;
-	}
-
-	if (!handle || !len) {
-		ret = GFAPI_HANDLE_LENGTH;
-		goto out;
-	}
-
-	if (len < GFAPI_HANDLE_LENGTH)
-	{
-		errno = ERANGE;
-		goto out;
-	}
-
-	memcpy (handle, object->gfid, GFAPI_HANDLE_LENGTH);
-
-	ret = GFAPI_HANDLE_LENGTH;
-
-out:
-	return ret;
-}
-
-struct glfs_object *
-glfs_h_create_from_handle (struct glfs *fs, unsigned char *handle, int len,
-			   struct stat *stat)
-{
-	loc_t               loc = {0, };
-	int                 ret = -1;
-	struct iatt         iatt = {0, };
-	inode_t            *newinode = NULL;
-	xlator_t           *subvol = NULL;
-	struct glfs_object *object = NULL;
-
-	/* validate in args */
-	if ((fs == NULL) || (handle == NULL) || (len != GFAPI_HANDLE_LENGTH)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		errno = EIO;
-		goto out;
-	}
-
-	memcpy (loc.gfid, handle, GFAPI_HANDLE_LENGTH);
-
-	newinode = inode_find (subvol->itable, loc.gfid);
-	if (newinode)
-		loc.inode = newinode;
-	else {
-		loc.inode = inode_new (subvol->itable);
-		if (!loc.inode) {
-			errno = ENOMEM;
-			goto out;
-		}
-	}
-
-	ret = syncop_lookup (subvol, &loc, 0, &iatt, 0, 0);
-	if (ret) {
-		gf_log (subvol->name, GF_LOG_WARNING,
-			"inode refresh of %s failed: %s",
-			uuid_utoa (loc.gfid), strerror (errno));
-		goto out;
-	}
-
-	newinode = inode_link (loc.inode, 0, 0, &iatt);
-	if (newinode)
-		inode_lookup (newinode);
-	else {
-		gf_log (subvol->name, GF_LOG_WARNING,
-			"inode linking of %s failed: %s",
-			uuid_utoa (loc.gfid), strerror (errno));
-		errno = EINVAL;
-		goto out;
-	}
-
-	/* populate stat */
-	if (stat)
-		glfs_iatt_to_stat (fs, &iatt, stat);
-
-	object = GF_CALLOC (1, sizeof(struct glfs_object),
-			    glfs_mt_glfs_object_t);
-	if (object == NULL) {
-		errno = ENOMEM;
-		ret = -1;
-		goto out;
-	}
-
-	/* populate the return object */
-	object->inode = newinode;
-	uuid_copy (object->gfid, object->inode->gfid);
-
-out:
-	/* TODO: Check where the inode ref is being held? */
-	loc_wipe (&loc);
-
-	glfs_subvol_done (fs, subvol);
-
-	return object;
-}
-
-int
-glfs_h_close (struct glfs_object *object)
-{
-	/* Release the held reference */
-	inode_unref (object->inode);
-	GF_FREE (object);
-
-	return 0;
-}
-
-int
-glfs_h_truncate (struct glfs *fs, struct glfs_object *object, off_t offset)
-{
-	loc_t               loc = {0, };
-	int                 ret = -1;
-	xlator_t           *subvol = NULL;
-	inode_t            *inode = NULL;
-
-	/* validate in args */
-	if ((fs == NULL) || (object == NULL)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, object);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	GLFS_LOC_FILL_INODE (inode, loc, out);
-
-	/* fop/op */
-	ret = syncop_truncate (subvol, &loc, (off_t)offset);
-
-	/* populate out args */
-	if (ret == 0)
-		ret = glfs_loc_unlink (&loc);
-
-out:
-	loc_wipe (&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-struct glfs_object *
-glfs_h_symlink (struct glfs *fs, struct glfs_object *parent, const char *name,
-		const char *data, struct stat *stat)
-{
-	int                 ret = -1;
-	xlator_t           *subvol = NULL;
-	inode_t            *inode = NULL;
-	loc_t               loc = {0, };
-	struct iatt         iatt = {0, };
-	uuid_t              gfid;
-	dict_t             *xattr_req = NULL;
-	struct glfs_object *object = NULL;
-
-	/* validate in args */
-	if ((fs == NULL) || (parent == NULL) || (name == NULL) ||
-		(data == NULL)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, parent);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	xattr_req = dict_new ();
-	if (!xattr_req) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	uuid_generate (gfid);
-	ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-	if (ret) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	GLFS_LOC_FILL_PINODE (inode, loc, ret, errno, out, name);
-
-	/* fop/op */
-	ret = syncop_symlink (subvol, &loc, data, xattr_req, &iatt);
-
-	/* populate out args */
-	if (ret == 0) {
-		/* TODO: If the inode existed in the cache (say file already
-		 * exists), then the glfs_loc_link will not update the
-		 * loc.inode, as a result we will have a 0000 GFID that we
-		 * would copy out to the object, this needs to be fixed.
-		 */
-		ret = glfs_loc_link (&loc, &iatt);
-		if (ret != 0) {
-			goto out;
-		}
-
-		if (stat)
-			glfs_iatt_to_stat (fs, &iatt, stat);
-
-		ret = glfs_create_object (&loc, &object);
-	}
-
-out:
-	if (ret && object != NULL) {
-		glfs_h_close (object);
-		object = NULL;
-	}
-
-	loc_wipe(&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	glfs_subvol_done (fs, subvol);
-
-	return object;
-}
-
-int
-glfs_h_readlink (struct glfs *fs, struct glfs_object *object, char *buf,
-		 size_t bufsiz)
-{
-	loc_t               loc = {0, };
-	int                 ret = -1;
-	xlator_t           *subvol = NULL;
-	inode_t            *inode = NULL;
-	char               *linkval = NULL;
-
-	/* validate in args */
-	if ((fs == NULL) || (object == NULL) || (buf == NULL)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, object);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	GLFS_LOC_FILL_INODE (inode, loc, out);
-
-	/* fop/op */
-	ret = syncop_readlink (subvol, &loc, &linkval, bufsiz);
-
-	/* populate out args */
-	if (ret > 0)
-		memcpy (buf, linkval, ret);
-
-out:
-	loc_wipe (&loc);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (linkval)
-		GF_FREE (linkval);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-int
-glfs_h_link (struct glfs *fs, struct glfs_object *linksrc,
-	     struct glfs_object *parent, const char *name)
-{
-	int                 ret = -1;
-	xlator_t           *subvol = NULL;
-	inode_t            *inode = NULL;
-	inode_t            *pinode = NULL;
-	loc_t               oldloc = {0, };
-	loc_t               newloc = {0, };
-
-	/* validate in args */
-	if ((fs == NULL) || (linksrc == NULL) || (parent == NULL) ||
-		(name == NULL)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if (!subvol) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	inode = glfs_resolve_inode (fs, subvol, linksrc);
-	if (!inode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	if (inode->ia_type == IA_IFDIR) {
-		ret = -1;
-		errno = EISDIR;
-		goto out;
-	}
-
-	GLFS_LOC_FILL_INODE (inode, oldloc, out);
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	pinode = glfs_resolve_inode (fs, subvol, parent);
-	if (!pinode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	/* setup newloc based on parent */
-	newloc.parent = inode_ref (pinode);
-	newloc.name = name;
-	ret = glfs_loc_touchup (&newloc);
-	if (ret != 0) {
-		errno = EINVAL;
-		goto out;
-	}
-
-	/* Filling the inode of the hard link to be same as that of the
-	 * original file
-	 */
-	newloc.inode = inode_ref (inode);
-
-	/* fop/op */
-	ret = syncop_link (subvol, &oldloc, &newloc);
-
-	if (ret == 0)
-		/* TODO: No iatt to pass as there has been no lookup */
-		ret = glfs_loc_link (&newloc, NULL);
-out:
-	loc_wipe (&oldloc);
-	loc_wipe (&newloc);
-
-	if (inode)
-		inode_unref (inode);
-
-	if (pinode)
-		inode_unref (pinode);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
-
-int
-glfs_h_rename (struct glfs *fs, struct glfs_object *olddir, const char *oldname,
-	       struct glfs_object *newdir, const char *newname)
-{
-	int                 ret = -1;
-	xlator_t           *subvol = NULL;
-	inode_t            *oldpinode = NULL;
-	inode_t            *newpinode = NULL;
-	loc_t               oldloc = {0, };
-	loc_t               newloc = {0, };
-	struct iatt         oldiatt = {0, };
-	struct iatt         newiatt = {0, };
-
-	/* validate in args */
-	if ((fs == NULL) || (olddir == NULL) || (oldname == NULL) ||
-		(newdir == NULL) || (newname == NULL)) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	__glfs_entry_fs (fs);
-
-	/* get the active volume */
-	subvol = glfs_active_subvol (fs);
-	if ( !subvol ) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	oldpinode = glfs_resolve_inode (fs, subvol, olddir);
-	if (!oldpinode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	ret = glfs_resolve_at (fs, subvol, oldpinode, oldname, &oldloc,
-			       &oldiatt, 0 , 0);
-	if (ret != 0) {
-		goto out;
-	}
-
-	/* get/refresh the in arg objects inode in correlation to the xlator */
-	newpinode = glfs_resolve_inode (fs, subvol, newdir);
-	if (!newpinode) {
-		errno = ESTALE;
-		goto out;
-	}
-
-	ret = glfs_resolve_at (fs, subvol, newpinode, newname, &newloc,
-			       &newiatt, 0, 0);
-
-	if (ret && errno != ENOENT && newloc.parent)
-		goto out;
-
-	if (newiatt.ia_type != IA_INVAL) {
-		if ((oldiatt.ia_type == IA_IFDIR) !=
-			(newiatt.ia_type == IA_IFDIR)) {
-			/* Either both old and new must be dirs,
-			 * or both must be non-dirs. Else, fail.
-			 */
-			ret = -1;
-			errno = EISDIR;
-			goto out;
-		}
-	}
-
-	/* TODO: check if new or old is a prefix of the other, and fail EINVAL */
-
-	ret = syncop_rename (subvol, &oldloc, &newloc);
-
-	if (ret == 0)
-		inode_rename (oldloc.parent->table, oldloc.parent, oldloc.name,
-			      newloc.parent, newloc.name, oldloc.inode,
-			      &oldiatt);
-
-out:
-	loc_wipe (&oldloc);
-	loc_wipe (&newloc);
-
-	if (oldpinode)
-		inode_unref (oldpinode);
-
-	if (newpinode)
-		inode_unref (newpinode);
-
-	glfs_subvol_done (fs, subvol);
-
-	return ret;
-}
diff --git a/api/src/glfs-handles.h b/api/src/glfs-handles.h
deleted file mode 100644
index 437f2cbc8..000000000
--- a/api/src/glfs-handles.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-  Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _GLFS_HANDLES_H
-#define _GLFS_HANDLES_H
-
-#include "glfs.h"
-
-/* GLFS OBJECT BASED OPERATIONS
- *
- * The following APIs are introduced to provide an API framework that can work
- * with gluster objects (files and directories), instead of absolute paths.
- *
- * The following API set can be related to the POSIX *at interfaces (like
- * openat (2)). The intention of these APIs is to be able to operate based
- * on parent object and looking up or creating child objects within, OR to be
- * used on the actual object thus looked up or created, and retrieve information
- * regarding the same.
- *
- * The APIs also provide for generating an opaque invariant handle to the
- * object, that can later be used to lookup the object, instead of the regular
- * glfs_h_* variants. The APIs that provide this behaviour are,
- * glfs_h_extract_handle and glfs_h_create_from_handle.
- *
- * The object handles can be transitioned to fd based operations as supported
- * by glfs.h calls, using the glfs_h_open call. This provides a way to move
- * from objects to fd's akin to moving from path to fd for required operations.
- *
- * NOTE: The opaque invariant handle is the GFID of the object in reality, but
- * maintained as an opaque data value, for potential internal changes to the
- * same without impacting the caller.
- *
- * NOTE: Currently looking up an object can create multiple object handles to
- * the same, i.e distinct glfs_object *. Hence each such looked up or received
- * handle from other calls, would need to be closed. In the future, for a given
- * object these pointers would be the same, and an ease of use API to forget all
- * instances of this bject would be provided (instead of a per lookup close).
- * This should not change the APIs in their current form.
- *
- */
-
-/* Values for valid falgs to be used when using XXXsetattr, to set multiple
- attribute values passed via the related stat structure.
- */
-#define GFAPI_SET_ATTR_MODE  0x1
-#define GFAPI_SET_ATTR_UID   0x2
-#define GFAPI_SET_ATTR_GID   0x4
-#define GFAPI_SET_ATTR_SIZE  0x8
-#define GFAPI_SET_ATTR_ATIME 0x10
-#define GFAPI_SET_ATTR_MTIME 0x20
-
-/* Handle length for object handles returned from glfs_h_extract_handle or
- * glfs_h_create_from_handle */
-#define GFAPI_HANDLE_LENGTH 16
-
-__BEGIN_DECLS
-
-/*
- * Notes:
- *
- * The file object handle. One per looked up, created file/directory
- *
- * This had been introduced to facilitate gfid/inode based gfapi
- * - a requirement introduced by nfs-ganesha
- */
-struct glfs_object;
-typedef struct glfs_object glfs_object_t;
-
-/* Handle based operations */
-/* Operations that generate handles */
-struct glfs_object *glfs_h_lookupat (struct glfs *fs,
-				     struct glfs_object *parent,
-				     const char *path, struct stat *stat);
-
-struct glfs_object *glfs_h_creat (struct glfs *fs, struct glfs_object *parent,
-				  const char *path, int flags, mode_t mode,
-				  struct stat *sb);
-
-struct glfs_object *glfs_h_mkdir (struct glfs *fs, struct glfs_object *parent,
-				  const char *path, mode_t flags,
-				  struct stat *sb);
-
-struct glfs_object *glfs_h_mknod (struct glfs *fs, struct glfs_object *parent,
-				  const char *path, mode_t mode, dev_t dev,
-				  struct stat *sb);
-
-struct glfs_object *glfs_h_symlink (struct glfs *fs, struct glfs_object *parent,
-				    const char *name, const char *data,
-				    struct stat *stat);
-
-/* Operations on the actual objects */
-int glfs_h_unlink (struct glfs *fs, struct glfs_object *parent,
-		   const char *path);
-
-int glfs_h_close (struct glfs_object *object);
-
-int glfs_caller_specific_init (void *uid_caller_key, void *gid_caller_key,
-			       void *future);
-
-int glfs_h_truncate (struct glfs *fs, struct glfs_object *object, off_t offset);
-
-int glfs_h_stat(struct glfs *fs, struct glfs_object *object, struct stat *stat);
-
-int glfs_h_getattrs (struct glfs *fs, struct glfs_object *object,
-		     struct stat *stat);
-
-int glfs_h_setattrs (struct glfs *fs, struct glfs_object *object,
-		     struct stat *sb, int valid);
-
-int glfs_h_readlink (struct glfs *fs, struct glfs_object *object, char *buf,
-		     size_t bufsiz);
-
-int glfs_h_link (struct glfs *fs, struct glfs_object *linktgt,
-		 struct glfs_object *parent, const char *name);
-
-int glfs_h_rename (struct glfs *fs, struct glfs_object *olddir,
-		   const char *oldname, struct glfs_object *newdir,
-		   const char *newname);
-
-/* Operations enabling opaque invariant handle to object transitions */
-ssize_t glfs_h_extract_handle (struct glfs_object *object,
-			       unsigned char *handle, int len);
-
-struct glfs_object *glfs_h_create_from_handle (struct glfs *fs,
-					       unsigned char *handle, int len,
-					       struct stat *stat);
-
-/* Operations enabling object handles to fd transitions */
-struct glfs_fd *glfs_h_opendir (struct glfs *fs, struct glfs_object *object);
-
-struct glfs_fd *glfs_h_open (struct glfs *fs, struct glfs_object *object,
-			     int flags);
-
-__END_DECLS
-
-#endif /* !_GLFS_HANDLES_H */
-\ No newline at end of file
diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
deleted file mode 100644
index ec1d5579d..000000000
--- a/api/src/glfs-internal.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-#ifndef _GLFS_INTERNAL_H
-#define _GLFS_INTERNAL_H
-
-#include "xlator.h"
-
-#define GLFS_SYMLINK_MAX_FOLLOW 2048
-
-#define DEFAULT_REVAL_COUNT 1
-
-#define ESTALE_RETRY(ret,errno,reval,loc,label) do {	\
-	if (ret == -1 && errno == ESTALE) {	        \
-		if (reval < DEFAULT_REVAL_COUNT) {	\
-			reval++;			\
-			loc_wipe (loc);			\
-			goto label;			\
-		}					\
-	}						\
-	} while (0)
-
-#define GLFS_LOC_FILL_INODE(oinode, loc, label) do {   \
-	loc.inode = inode_ref (oinode);                \
-	uuid_copy (loc.gfid, oinode->gfid);            \
-	ret = glfs_loc_touchup (&loc);                 \
-	if (ret != 0) {                                \
-		errno = EINVAL;                        \
-		goto label;                            \
-	}                                              \
-	} while (0)
-
-#define GLFS_LOC_FILL_PINODE(pinode, loc, ret, errno, label, path) do {   \
-	loc.inode = inode_new (pinode->table);                            \
-	if (!loc.inode) {                                                 \
-		ret = -1;                                                 \
-		errno = ENOMEM;                                           \
-		goto label;                                               \
-	}                                                                 \
-	loc.parent = inode_ref (pinode);                                  \
-	loc.name = path;                                                  \
-	ret = glfs_loc_touchup (&loc);                                    \
-	if (ret != 0) {                                                   \
-		errno = EINVAL;                                           \
-		goto label;                                               \
-	}                                                                 \
-	} while (0)
-
-struct glfs;
-
-typedef int (*glfs_init_cbk) (struct glfs *fs, int ret);
-
-struct glfs {
-	char               *volname;
-
-	glusterfs_ctx_t    *ctx;
-
-	pthread_t           poller;
-
-	glfs_init_cbk       init_cbk;
-	pthread_mutex_t     mutex;
-	pthread_cond_t      cond;
-	int                 init;
-	int                 ret;
-	int                 err;
-
-	xlator_t           *active_subvol;
-	xlator_t           *next_subvol;
-	xlator_t           *old_subvol;
-
-	char               *oldvolfile;
-	ssize_t             oldvollen;
-
-	inode_t            *cwd;
-
-	uint32_t            dev_id; /* Used to fill st_dev in struct stat */
-
-	struct list_head    openfds;
-
-	gf_boolean_t        migration_in_progress;
-};
-
-struct glfs_fd {
-	struct list_head   openfds;
-	struct glfs       *fs;
-	off_t              offset;
-	fd_t              *fd; /* Currently guared by @fs->mutex. TODO: per-glfd lock */
-	struct list_head   entries;
-	gf_dirent_t       *next;
-	struct dirent     *readdirbuf;
-};
-
-/* glfs object handle introduced for the alternate gfapi implementation based
-   on glfs handles/gfid/inode
-*/
-struct glfs_object {
-        inode_t         *inode;
-        uuid_t          gfid;
-};
-
-#define DEFAULT_EVENT_POOL_SIZE           16384
-#define GF_MEMPOOL_COUNT_OF_DICT_T        4096
-#define GF_MEMPOOL_COUNT_OF_DATA_T        (GF_MEMPOOL_COUNT_OF_DICT_T * 4)
-#define GF_MEMPOOL_COUNT_OF_DATA_PAIR_T   (GF_MEMPOOL_COUNT_OF_DICT_T * 4)
-
-int glfs_mgmt_init (struct glfs *fs);
-void glfs_init_done (struct glfs *fs, int ret);
-int glfs_process_volfp (struct glfs *fs, FILE *fp);
-int glfs_resolve (struct glfs *fs, xlator_t *subvol, const char *path, loc_t *loc,
-		  struct iatt *iatt, int reval);
-int glfs_lresolve (struct glfs *fs, xlator_t *subvol, const char *path, loc_t *loc,
-		   struct iatt *iatt, int reval);
-fd_t *glfs_resolve_fd (struct glfs *fs, xlator_t *subvol, struct glfs_fd *glfd);
-
-fd_t *__glfs_migrate_fd (struct glfs *fs, xlator_t *subvol, struct glfs_fd *glfd);
-
-int glfs_first_lookup (xlator_t *subvol);
-
-static inline void
-__glfs_entry_fs (struct glfs *fs)
-{
-	THIS = fs->ctx->master;
-}
-
-
-static inline void
-__glfs_entry_fd (struct glfs_fd *fd)
-{
-	THIS = fd->fd->inode->table->xl->ctx->master;
-}
-
-
-/*
-  By default all lock attempts from user context must
-  use glfs_lock() and glfs_unlock(). This allows
-  for a safe implementation of graph migration where
-  we can give up the mutex during syncop calls so
-  that bottom up calls (particularly CHILD_UP notify)
-  can do a mutex_lock() on @glfs without deadlocking
-  the filesystem
-*/
-static inline int
-glfs_lock (struct glfs *fs)
-{
-	pthread_mutex_lock (&fs->mutex);
-
-	while (!fs->init)
-		pthread_cond_wait (&fs->cond, &fs->mutex);
-
-	while (fs->migration_in_progress)
-		pthread_cond_wait (&fs->cond, &fs->mutex);
-
-	return 0;
-}
-
-
-static inline void
-glfs_unlock (struct glfs *fs)
-{
-	pthread_mutex_unlock (&fs->mutex);
-}
-
-
-void glfs_fd_destroy (struct glfs_fd *glfd);
-
-struct glfs_fd *glfs_fd_new (struct glfs *fs);
-void glfs_fd_bind (struct glfs_fd *glfd);
-
-xlator_t * glfs_active_subvol (struct glfs *fs);
-xlator_t * __glfs_active_subvol (struct glfs *fs);
-void glfs_subvol_done (struct glfs *fs, xlator_t *subvol);
-
-inode_t * glfs_refresh_inode (xlator_t *subvol, inode_t *inode);
-
-inode_t *glfs_cwd_get (struct glfs *fs);
-int glfs_cwd_set (struct glfs *fs, inode_t *inode);
-inode_t *glfs_resolve_inode (struct glfs *fs, xlator_t *subvol,
-			     struct glfs_object *object);
-int glfs_create_object (loc_t *loc, struct glfs_object **retobject);
-int __glfs_cwd_set (struct glfs *fs, inode_t *inode);
-
-int glfs_resolve_base (struct glfs *fs, xlator_t *subvol, inode_t *inode,
-		       struct iatt *iatt);
-int glfs_resolve_at (struct glfs *fs, xlator_t *subvol, inode_t *at,
-                     const char *origpath, loc_t *loc, struct iatt *iatt,
-                     int follow, int reval);
-int glfs_loc_touchup (loc_t *loc);
-void glfs_iatt_to_stat (struct glfs *fs, struct iatt *iatt, struct stat *stat);
-int glfs_loc_link (loc_t *loc, struct iatt *iatt);
-int glfs_loc_unlink (loc_t *loc);
-
-#endif /* !_GLFS_INTERNAL_H */
diff --git a/api/src/glfs-master.c b/api/src/glfs-master.c
deleted file mode 100644
index c02534c18..000000000
--- a/api/src/glfs-master.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <inttypes.h>
-#include <limits.h>
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "xlator.h"
-#include "glusterfs.h"
-
-#include "glfs-internal.h"
-#include "glfs-mem-types.h"
-
-
-int
-glfs_graph_setup (struct glfs *fs, glusterfs_graph_t *graph)
-{
-	xlator_t      *new_subvol = NULL;
-	xlator_t      *old_subvol = NULL;
-	inode_table_t *itable = NULL;
-	int            ret = -1;
-
-	new_subvol = graph->top;
-
-	/* This is called in a bottom-up context, it should specifically
-	   NOT be glfs_lock()
-	*/
-	pthread_mutex_lock (&fs->mutex);
-	{
-		if (new_subvol->switched ||
-		    new_subvol == fs->active_subvol ||
-		    new_subvol == fs->next_subvol) {
-			/* Spurious CHILD_UP event on old graph */
-			ret = 0;
-			goto unlock;
-		}
-
-		if (!new_subvol->itable) {
-			itable = inode_table_new (131072, new_subvol);
-			if (!itable) {
-				errno = ENOMEM;
-				ret = -1;
-				goto unlock;
-			}
-
-			new_subvol->itable = itable;
-		}
-
-		old_subvol = fs->next_subvol;
-		fs->next_subvol = new_subvol;
-		fs->next_subvol->winds++; /* first ref */
-		ret = 0;
-	}
-unlock:
-	pthread_mutex_unlock (&fs->mutex);
-
-	if (old_subvol)
-		/* wasn't picked up so far, skip */
-		glfs_subvol_done (fs, old_subvol);
-
-	return ret;
-}
-
-
-int
-notify (xlator_t *this, int event, void *data, ...)
-{
-	glusterfs_graph_t   *graph = NULL;
-	struct glfs	    *fs = NULL;
-
-	graph = data;
-	fs = this->private;
-
-	switch (event) {
-	case GF_EVENT_GRAPH_NEW:
-		gf_log (this->name, GF_LOG_INFO, "New graph %s (%d) coming up",
-			uuid_utoa ((unsigned char *)graph->graph_uuid),
-			graph->id);
-		break;
-	case GF_EVENT_CHILD_UP:
-		glfs_graph_setup (fs, graph);
-		glfs_init_done (fs, 0);
-		break;
-	case GF_EVENT_CHILD_DOWN:
-		glfs_graph_setup (fs, graph);
-		glfs_init_done (fs, 1);
-		break;
-	case GF_EVENT_CHILD_CONNECTING:
-		break;
-	default:
-		gf_log (this->name, GF_LOG_DEBUG,
-			"got notify event %d", event);
-		break;
-	}
-
-	return 0;
-}
-
-
-int
-mem_acct_init (xlator_t *this)
-{
-	int ret = -1;
-
-	if (!this)
-		return ret;
-
-	ret = xlator_mem_acct_init (this, glfs_mt_end + 1);
-	if (ret) {
-		gf_log (this->name, GF_LOG_ERROR, "Failed to initialise "
-                        "memory accounting");
-		return ret;
-	}
-
-	return 0;
-}
-
-
-int
-init (xlator_t *this)
-{
-	return 0;
-}
-
-
-void
-fini (xlator_t *this)
-{
-
-}
-
-
-struct xlator_dumpops dumpops;
-
-
-struct xlator_fops fops;
-
-
-struct xlator_cbks cbks;
diff --git a/api/src/glfs-mem-types.h b/api/src/glfs-mem-types.h
deleted file mode 100644
index 3301b3da5..000000000
--- a/api/src/glfs-mem-types.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _GLFS_MEM_TYPES_H
-#define _GLFS_MEM_TYPES_H
-
-#include "mem-types.h"
-
-#define GF_MEM_TYPE_START (gf_common_mt_end + 1)
-
-enum glfs_mem_types_ {
-        glfs_mt_glfs_t = GF_MEM_TYPE_START,
-        glfs_mt_call_pool_t,
-        glfs_mt_xlator_t,
-	glfs_mt_glfs_fd_t,
-	glfs_mt_glfs_io_t,
-	glfs_mt_volfile_t,
-	glfs_mt_xlator_cmdline_option_t,
-	glfs_mt_glfs_object_t,
-	glfs_mt_readdirbuf_t,
-	glfs_mt_end
-
-};
-#endif
-
diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
deleted file mode 100644
index 6843e9cb3..000000000
--- a/api/src/glfs-mgmt.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <pthread.h>
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif /* _CONFIG_H */
-
-#include "glusterfs.h"
-#include "stack.h"
-#include "dict.h"
-#include "event.h"
-#include "defaults.h"
-
-#include "rpc-clnt.h"
-#include "protocol-common.h"
-#include "glusterfs3.h"
-#include "portmap-xdr.h"
-#include "xdr-generic.h"
-
-#include "syncop.h"
-#include "xlator.h"
-
-#include "glfs-internal.h"
-#include "glfs-mem-types.h"
-
-
-int glfs_volfile_fetch (struct glfs *fs);
-
-int
-glfs_process_volfp (struct glfs *fs, FILE *fp)
-{
-	glusterfs_graph_t  *graph = NULL;
-	int		    ret = -1;
-	xlator_t	   *trav = NULL;
-	glusterfs_ctx_t	   *ctx = NULL;
-
-	ctx = fs->ctx;
-	graph = glusterfs_graph_construct (fp);
-	if (!graph) {
-		gf_log ("glfs", GF_LOG_ERROR, "failed to construct the graph");
-		goto out;
-	}
-
-	for (trav = graph->first; trav; trav = trav->next) {
-		if (strcmp (trav->type, "mount/fuse") == 0) {
-			gf_log ("glfs", GF_LOG_ERROR,
-				"fuse xlator cannot be specified "
-				"in volume file");
-			goto out;
-		}
-	}
-
-	ret = glusterfs_graph_prepare (graph, ctx);
-	if (ret) {
-		glusterfs_graph_destroy (graph);
-		goto out;
-	}
-
-	ret = glusterfs_graph_activate (graph, ctx);
-
-	if (ret) {
-		glusterfs_graph_destroy (graph);
-		goto out;
-	}
-
-	ret = 0;
-out:
-	if (fp)
-		fclose (fp);
-
-	if (!ctx->active) {
-		ret = -1;
-	}
-
-	return ret;
-}
-
-
-int
-mgmt_cbk_spec (struct rpc_clnt *rpc, void *mydata, void *data)
-{
-	struct glfs *fs = NULL;
-	xlator_t    *this = NULL;
-
-	this = mydata;
-	fs = this->private;
-
-	glfs_volfile_fetch (fs);
-
-	return 0;
-}
-
-
-int
-mgmt_cbk_event (struct rpc_clnt *rpc, void *mydata, void *data)
-{
-	return 0;
-}
-
-
-rpcclnt_cb_actor_t mgmt_cbk_actors[] = {
-	[GF_CBK_FETCHSPEC] = {"FETCHSPEC", GF_CBK_FETCHSPEC, mgmt_cbk_spec },
-	[GF_CBK_EVENT_NOTIFY] = {"EVENTNOTIFY", GF_CBK_EVENT_NOTIFY,
-				 mgmt_cbk_event},
-};
-
-
-struct rpcclnt_cb_program mgmt_cbk_prog = {
-	.progname  = "GlusterFS Callback",
-	.prognum   = GLUSTER_CBK_PROGRAM,
-	.progver   = GLUSTER_CBK_VERSION,
-	.actors	   = mgmt_cbk_actors,
-	.numactors = GF_CBK_MAXVALUE,
-};
-
-char *clnt_handshake_procs[GF_HNDSK_MAXVALUE] = {
-	[GF_HNDSK_NULL]		= "NULL",
-	[GF_HNDSK_SETVOLUME]	= "SETVOLUME",
-	[GF_HNDSK_GETSPEC]	= "GETSPEC",
-	[GF_HNDSK_PING]		= "PING",
-	[GF_HNDSK_EVENT_NOTIFY] = "EVENTNOTIFY",
-};
-
-rpc_clnt_prog_t clnt_handshake_prog = {
-	.progname  = "GlusterFS Handshake",
-	.prognum   = GLUSTER_HNDSK_PROGRAM,
-	.progver   = GLUSTER_HNDSK_VERSION,
-	.procnames = clnt_handshake_procs,
-};
-
-
-int
-mgmt_submit_request (void *req, call_frame_t *frame,
-		     glusterfs_ctx_t *ctx,
-		     rpc_clnt_prog_t *prog, int procnum,
-		     fop_cbk_fn_t cbkfn, xdrproc_t xdrproc)
-{
-	int			ret	    = -1;
-	int			count	   = 0;
-	struct iovec		iov	    = {0, };
-	struct iobuf		*iobuf = NULL;
-	struct iobref		*iobref = NULL;
-	ssize_t			xdr_size = 0;
-
-	iobref = iobref_new ();
-	if (!iobref) {
-		goto out;
-	}
-
-	if (req) {
-		xdr_size = xdr_sizeof (xdrproc, req);
-
-		iobuf = iobuf_get2 (ctx->iobuf_pool, xdr_size);
-		if (!iobuf) {
-			goto out;
-		};
-
-		iobref_add (iobref, iobuf);
-
-		iov.iov_base = iobuf->ptr;
-		iov.iov_len  = iobuf_pagesize (iobuf);
-
-		/* Create the xdr payload */
-		ret = xdr_serialize_generic (iov, req, xdrproc);
-		if (ret == -1) {
-			gf_log (THIS->name, GF_LOG_WARNING,
-				"failed to create XDR payload");
-			goto out;
-		}
-		iov.iov_len = ret;
-		count = 1;
-	}
-
-	/* Send the msg */
-	ret = rpc_clnt_submit (ctx->mgmt, prog, procnum, cbkfn,
-			       &iov, count,
-			       NULL, 0, iobref, frame, NULL, 0, NULL, 0, NULL);
-
-out:
-	if (iobref)
-		iobref_unref (iobref);
-
-	if (iobuf)
-		iobuf_unref (iobuf);
-	return ret;
-}
-
-
-static int
-glusterfs_oldvolfile_update (struct glfs *fs, char *volfile, ssize_t size)
-{
-	int ret = -1;
-
-	fs->oldvollen = size;
-	if (!fs->oldvolfile) {
-		fs->oldvolfile = GF_CALLOC (1, size+1, glfs_mt_volfile_t);
-	} else {
-		fs->oldvolfile = GF_REALLOC (fs->oldvolfile, size+1);
-	}
-
-	if (!fs->oldvolfile) {
-		fs->oldvollen = 0;
-	} else {
-		memcpy (fs->oldvolfile, volfile, size);
-		fs->oldvollen = size;
-		ret = 0;
-	}
-
-	return ret;
-}
-
-
-int
-mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
-		  void *myframe)
-{
-	gf_getspec_rsp		 rsp   = {0,};
-	call_frame_t		*frame = NULL;
-	glusterfs_ctx_t		*ctx = NULL;
-	int			 ret   = 0;
-	ssize_t			 size = 0;
-	FILE			*tmpfp = NULL;
-	int                      need_retry = 0;
-	struct glfs		*fs = NULL;
-
-	frame = myframe;
-	ctx = frame->this->ctx;
-	fs = ((xlator_t *)ctx->master)->private;
-
-	if (-1 == req->rpc_status) {
-		ret = -1;
-		need_retry = 1;
-		goto out;
-	}
-
-	ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_getspec_rsp);
-	if (ret < 0) {
-		gf_log (frame->this->name, GF_LOG_ERROR, "XDR decoding error");
-		ret   = -1;
-		goto out;
-	}
-
-	if (-1 == rsp.op_ret) {
-		gf_log (frame->this->name, GF_LOG_ERROR,
-			"failed to get the 'volume file' from server");
-		ret = -1;
-                errno = rsp.op_errno;
-		goto out;
-	}
-
-	ret = 0;
-	size = rsp.op_ret;
-
-	if ((size == fs->oldvollen) &&
-	    (memcmp (fs->oldvolfile, rsp.spec, size) == 0)) {
-		gf_log (frame->this->name, GF_LOG_INFO,
-			"No change in volfile, continuing");
-		goto out;
-	}
-
-	tmpfp = tmpfile ();
-	if (!tmpfp) {
-		ret = -1;
-		goto out;
-	}
-
-	fwrite (rsp.spec, size, 1, tmpfp);
-	fflush (tmpfp);
-	if (ferror (tmpfp)) {
-		ret = -1;
-		goto out;
-	}
-
-	/*  Check if only options have changed. No need to reload the
-	*  volfile if topology hasn't changed.
-	*  glusterfs_volfile_reconfigure returns 3 possible return states
-	*  return 0	     =======> reconfiguration of options has succeeded
-	*  return 1	     =======> the graph has to be reconstructed and all the xlators should be inited
-	*  return -1(or -ve) =======> Some Internal Error occurred during the operation
-	*/
-
-	ret = glusterfs_volfile_reconfigure (fs->oldvollen, tmpfp, fs->ctx,
-                                             fs->oldvolfile);
-	if (ret == 0) {
-		gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-			"No need to re-load volfile, reconfigure done");
-		ret = glusterfs_oldvolfile_update (fs, rsp.spec, size);
-		goto out;
-	}
-
-	if (ret < 0) {
-		gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-			"Reconfigure failed !!");
-		goto out;
-	}
-
-	ret = glfs_process_volfp (fs, tmpfp);
-	/* tmpfp closed */
-	tmpfp = NULL;
-	if (ret)
-		goto out;
-
-	ret = glusterfs_oldvolfile_update (fs, rsp.spec, size);
-out:
-	STACK_DESTROY (frame->root);
-
-	if (rsp.spec)
-		free (rsp.spec);
-
-        // Stop if server is running at an unsupported op-version
-        if (ENOTSUP == ret) {
-                gf_log ("mgmt", GF_LOG_ERROR, "Server is operating at an "
-                        "op-version which is not supported");
-                errno = ENOTSUP;
-                glfs_init_done (fs, -1);
-        }
-
-	if (ret && ctx && !ctx->active) {
-		/* Do it only for the first time */
-		/* Failed to get the volume file, something wrong,
-		   restart the process */
-		gf_log ("glfs-mgmt", GF_LOG_ERROR,
-			"failed to fetch volume file (key:%s)",
-			ctx->cmd_args.volfile_id);
-		if (!need_retry) {
-                        if (!errno)
-                                errno = EINVAL;
-			glfs_init_done (fs, -1);
-                }
-	}
-
-	if (tmpfp)
-		fclose (tmpfp);
-
-	return 0;
-}
-
-
-int
-glfs_volfile_fetch (struct glfs *fs)
-{
-	cmd_args_t	 *cmd_args = NULL;
-	gf_getspec_req	  req = {0, };
-	int		  ret = 0;
-	call_frame_t	 *frame = NULL;
-	glusterfs_ctx_t	 *ctx = NULL;
-        dict_t           *dict = NULL;
-
-	ctx = fs->ctx;
-	cmd_args = &ctx->cmd_args;
-
-	frame = create_frame (THIS, ctx->pool);
-
-	req.key = cmd_args->volfile_id;
-	req.flags = 0;
-
-        dict = dict_new ();
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
-
-        // Set the supported min and max op-versions, so glusterd can make a
-        // decision
-        ret = dict_set_int32 (dict, "min-op-version", GD_OP_VERSION_MIN);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to set min-op-version"
-                        " in request dict");
-                goto out;
-        }
-
-        ret = dict_set_int32 (dict, "max-op-version", GD_OP_VERSION_MAX);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to set max-op-version"
-                        " in request dict");
-                goto out;
-        }
-
-        ret = dict_allocate_and_serialize (dict, &req.xdata.xdata_val,
-                                           &req.xdata.xdata_len);
-        if (ret < 0) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "Failed to serialize dictionary");
-                goto out;
-        }
-
-	ret = mgmt_submit_request (&req, frame, ctx, &clnt_handshake_prog,
-				   GF_HNDSK_GETSPEC, mgmt_getspec_cbk,
-				   (xdrproc_t)xdr_gf_getspec_req);
-out:
-        return ret;
-}
-
-
-static int
-mgmt_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
-		 void *data)
-{
-	xlator_t	*this = NULL;
-	cmd_args_t	*cmd_args = NULL;
-	glusterfs_ctx_t *ctx = NULL;
-	struct glfs	 *fs = NULL;
-	int		 ret = 0;
-
-	this = mydata;
-	ctx = this->ctx;
-	fs = ((xlator_t *)ctx->master)->private;
-	cmd_args = &ctx->cmd_args;
-
-	switch (event) {
-	case RPC_CLNT_DISCONNECT:
-		if (!ctx->active) {
-			cmd_args->max_connect_attempts--;
-			gf_log ("glfs-mgmt", GF_LOG_ERROR,
-				"failed to connect with remote-host: %s",
-				strerror (errno));
-			gf_log ("glfs-mgmt", GF_LOG_INFO,
-				"%d connect attempts left",
-				cmd_args->max_connect_attempts);
-			if (0 >= cmd_args->max_connect_attempts) {
-                                errno = ENOTCONN;
-				glfs_init_done (fs, -1);
-                        }
-		}
-		break;
-	case RPC_CLNT_CONNECT:
-		rpc_clnt_set_connected (&((struct rpc_clnt*)ctx->mgmt)->conn);
-
-		ret = glfs_volfile_fetch (fs);
-		if (ret && ctx && (ctx->active == NULL)) {
-			/* Do it only for the first time */
-			/* Exit the process.. there are some wrong options */
-			gf_log ("glfs-mgmt", GF_LOG_ERROR,
-				"failed to fetch volume file (key:%s)",
-				ctx->cmd_args.volfile_id);
-                        errno = EINVAL;
-			glfs_init_done (fs, -1);
-		}
-
-		break;
-	default:
-		break;
-	}
-
-	return 0;
-}
-
-
-int
-glusterfs_mgmt_notify (int32_t op, void *data, ...)
-{
-	int ret = 0;
-
-	switch (op)
-	{
-		case GF_EN_DEFRAG_STATUS:
-			break;
-
-		default:
-			break;
-	}
-
-	return ret;
-}
-
-
-int
-glfs_mgmt_init (struct glfs *fs)
-{
-	cmd_args_t		*cmd_args = NULL;
-	struct rpc_clnt		*rpc = NULL;
-	dict_t			*options = NULL;
-	int			ret = -1;
-	int			port = GF_DEFAULT_BASE_PORT;
-	char			*host = NULL;
-	glusterfs_ctx_t		*ctx = NULL;
-
-	ctx = fs->ctx;
-	cmd_args = &ctx->cmd_args;
-
-	if (ctx->mgmt)
-		return 0;
-
-	if (cmd_args->volfile_server_port)
-		port = cmd_args->volfile_server_port;
-
-	host = "localhost";
-	if (cmd_args->volfile_server)
-		host = cmd_args->volfile_server;
-
-	ret = rpc_transport_inet_options_build (&options, host, port);
-	if (ret)
-		goto out;
-
-	rpc = rpc_clnt_new (options, THIS->ctx, THIS->name, 8);
-	if (!rpc) {
-		ret = -1;
-		gf_log (THIS->name, GF_LOG_WARNING,
-			"failed to create rpc clnt");
-		goto out;
-	}
-
-	ret = rpc_clnt_register_notify (rpc, mgmt_rpc_notify, THIS);
-	if (ret) {
-		gf_log (THIS->name, GF_LOG_WARNING,
-			"failed to register notify function");
-		goto out;
-	}
-
-	ret = rpcclnt_cbk_program_register (rpc, &mgmt_cbk_prog, THIS);
-	if (ret) {
-		gf_log (THIS->name, GF_LOG_WARNING,
-			"failed to register callback function");
-		goto out;
-	}
-
-	ctx->notify = glusterfs_mgmt_notify;
-
-	/* This value should be set before doing the 'rpc_clnt_start()' as
-	   the notify function uses this variable */
-	ctx->mgmt = rpc;
-
-	ret = rpc_clnt_start (rpc);
-out:
-	return ret;
-}
-
diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c
deleted file mode 100644
index 4ca2eb6fc..000000000
--- a/api/src/glfs-resolve.c
+++ /dev/null
@@ -1,969 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <inttypes.h>
-#include <limits.h>
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "glusterfs.h"
-#include "logging.h"
-#include "stack.h"
-#include "event.h"
-#include "glfs-mem-types.h"
-#include "common-utils.h"
-#include "syncop.h"
-#include "call-stub.h"
-
-#include "glfs-internal.h"
-
-#define graphid_str(subvol) (uuid_utoa((unsigned char *)subvol->graph->graph_uuid))
-
-
-int
-glfs_first_lookup_safe (xlator_t *subvol)
-{
-	loc_t  loc = {0, };
-	int    ret = -1;
-
-	loc.inode = subvol->itable->root;
-	memset (loc.gfid, 0, 16);
-	loc.gfid[15] = 1;
-	loc.path = "/";
-	loc.name = "";
-
-	ret = syncop_lookup (subvol, &loc, 0, 0, 0, 0);
-
-	gf_log (subvol->name, GF_LOG_DEBUG, "first lookup complete %d", ret);
-
-	return ret;
-}
-
-
-int
-__glfs_first_lookup (struct glfs *fs, xlator_t *subvol)
-{
-	int ret = -1;
-
-	fs->migration_in_progress = 1;
-	pthread_mutex_unlock (&fs->mutex);
-	{
-		ret = glfs_first_lookup_safe (subvol);
-	}
-	pthread_mutex_lock (&fs->mutex);
-	fs->migration_in_progress = 0;
-	pthread_cond_broadcast (&fs->cond);
-
-	return ret;
-}
-
-
-inode_t *
-glfs_refresh_inode_safe (xlator_t *subvol, inode_t *oldinode)
-{
-	loc_t        loc = {0, };
-	int          ret = -1;
-	struct iatt  iatt = {0, };
-	inode_t     *newinode = NULL;
-
-
-	if (!oldinode)
-		return NULL;
-
-	if (oldinode->table->xl == subvol)
-		return inode_ref (oldinode);
-
-	newinode = inode_find (subvol->itable, oldinode->gfid);
-	if (newinode)
-		return newinode;
-
-	uuid_copy (loc.gfid, oldinode->gfid);
-	loc.inode = inode_new (subvol->itable);
-	if (!loc.inode)
-		return NULL;
-
-	ret = syncop_lookup (subvol, &loc, 0, &iatt, 0, 0);
-
-	if (ret) {
-		gf_log (subvol->name, GF_LOG_WARNING,
-			"inode refresh of %s failed: %s",
-			uuid_utoa (oldinode->gfid), strerror (errno));
-		loc_wipe (&loc);
-		return NULL;
-	}
-
-	newinode = inode_link (loc.inode, 0, 0, &iatt);
-	if (newinode)
-		inode_lookup (newinode);
-
-	loc_wipe (&loc);
-
-	return newinode;
-}
-
-
-inode_t *
-__glfs_refresh_inode (struct glfs *fs, xlator_t *subvol, inode_t *inode)
-{
-	inode_t *newinode = NULL;
-
-	fs->migration_in_progress = 1;
-	pthread_mutex_unlock (&fs->mutex);
-	{
-		newinode = glfs_refresh_inode_safe (subvol, inode);
-	}
-	pthread_mutex_lock (&fs->mutex);
-	fs->migration_in_progress = 0;
-	pthread_cond_broadcast (&fs->cond);
-
-	return newinode;
-}
-
-int
-glfs_loc_touchup (loc_t *loc)
-{
-	char *path = NULL;
-	int   ret = -1;
-	char *bn = NULL;
-
-	if (loc->parent)
-		ret = inode_path (loc->parent, loc->name, &path);
-	else
-		ret = inode_path (loc->inode, 0, &path);
-
-	loc->path = path;
-
-	if (ret < 0 || !path) {
-		ret = -1;
-		errno = ENOMEM;
-		goto out;
-	}
-
-	bn = strrchr (path, '/');
-	if (bn)
-		bn++;
-	loc->name = bn;
-	ret = 0;
-out:
-	return ret;
-}
-
-
-int
-glfs_resolve_symlink (struct glfs *fs, xlator_t *subvol, inode_t *inode,
-		      char **lpath)
-{
-	loc_t  loc = {0, };
-	char  *path = NULL;
-	char  *rpath = NULL;
-	int    ret = -1;
-
-	loc.inode = inode_ref (inode);
-	uuid_copy (loc.gfid, inode->gfid);
-	ret = inode_path (inode, NULL, &rpath);
-	if (ret < 0)
-		goto out;
-	loc.path = rpath;
-
-	ret = syncop_readlink (subvol, &loc, &path, 4096);
-
-	if (ret < 0)
-		goto out;
-
-	if (lpath)
-		*lpath = path;
-out:
-	loc_wipe (&loc);
-	return ret;
-}
-
-
-int
-glfs_resolve_base (struct glfs *fs, xlator_t *subvol, inode_t *inode,
-		   struct iatt *iatt)
-{
-	loc_t       loc = {0, };
-	int         ret = -1;
-	char       *path = NULL;
-
-	loc.inode = inode_ref (inode);
-	uuid_copy (loc.gfid, inode->gfid);
-
-	ret = inode_path (loc.inode, NULL, &path);
-	loc.path = path;
-	if (ret < 0)
-		goto out;
-
-	ret = syncop_lookup (subvol, &loc, NULL, iatt, NULL, NULL);
-out:
-	loc_wipe (&loc);
-
-	return ret;
-}
-
-
-inode_t *
-glfs_resolve_component (struct glfs *fs, xlator_t *subvol, inode_t *parent,
-			const char *component, struct iatt *iatt,
-			int force_lookup)
-{
-	loc_t        loc = {0, };
-	inode_t     *inode = NULL;
-	int          reval = 0;
-	int          ret = -1;
-	int          glret = -1;
-	struct iatt  ciatt = {0, };
-	uuid_t       gfid;
-	dict_t      *xattr_req = NULL;
-
-	loc.name = component;
-
-	loc.parent = inode_ref (parent);
-	uuid_copy (loc.pargfid, parent->gfid);
-
-
-	if (strcmp (component, ".") == 0)
-		loc.inode = inode_ref (parent);
-	else if (strcmp (component, "..") == 0)
-		loc.inode = inode_parent (parent, 0, 0);
-	else
-		loc.inode = inode_grep (parent->table, parent, component);
-
-	if (loc.inode) {
-		uuid_copy (loc.gfid, loc.inode->gfid);
-		reval = 1;
-
-		if (!force_lookup) {
-			inode = inode_ref (loc.inode);
-			ciatt.ia_type = inode->ia_type;
-			goto found;
-		}
-	} else {
-		uuid_generate (gfid);
-		loc.inode = inode_new (parent->table);
-	}
-
-	if (!loc.inode)
-		goto out;
-
-	glret = glfs_loc_touchup (&loc);
-	if (glret < 0) {
-		ret = -1;
-		goto out;
-	}
-
-	ret = syncop_lookup (subvol, &loc, NULL, &ciatt, NULL, NULL);
-	if (ret && reval) {
-		inode_unref (loc.inode);
-		loc.inode = inode_new (parent->table);
-		if (!loc.inode) {
-			errno = ENOMEM;
-			goto out;
-		}
-
-		xattr_req = dict_new ();
-		if (!xattr_req) {
-			errno = ENOMEM;
-			goto out;
-		}
-
-		uuid_generate (gfid);
-
-		ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16);
-		if (ret) {
-			errno = ENOMEM;
-			goto out;
-		}
-
-		ret = syncop_lookup (subvol, &loc, xattr_req, &ciatt,
-				     NULL, NULL);
-	}
-	if (ret)
-		goto out;
-
-	inode = inode_link (loc.inode, loc.parent, component, &ciatt);
-found:
-	if (inode)
-		inode_lookup (inode);
-	if (iatt)
-		*iatt = ciatt;
-out:
-	if (xattr_req)
-		dict_unref (xattr_req);
-
-	loc_wipe (&loc);
-
-	return inode;
-}
-
-
-int
-glfs_resolve_at (struct glfs *fs, xlator_t *subvol, inode_t *at,
-		 const char *origpath, loc_t *loc, struct iatt *iatt,
-		 int follow, int reval)
-{
-	inode_t    *inode = NULL;
-	inode_t    *parent = NULL;
-	char       *saveptr = NULL;
-	char       *path = NULL;
-	char       *component = NULL;
-	char       *next_component = NULL;
-	int         ret = -1;
-	struct iatt ciatt = {0, };
-
-	path = gf_strdup (origpath);
-	if (!path) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	parent = NULL;
-	if (at && path[0] != '/') {
-		/* A relative resolution of a path which starts with '/'
-		   is equal to an absolute path resolution.
-		*/
-		inode = inode_ref (at);
-	} else {
-		inode = inode_ref (subvol->itable->root);
-
-		if (strcmp (path, "/") == 0)
-			glfs_resolve_base (fs, subvol, inode, &ciatt);
-	}
-
-	for (component = strtok_r (path, "/", &saveptr);
-	     component; component = next_component) {
-
-		next_component = strtok_r (NULL, "/", &saveptr);
-
-		if (parent)
-			inode_unref (parent);
-
-		parent = inode;
-
-		inode = glfs_resolve_component (fs, subvol, parent,
-						component, &ciatt,
-						/* force hard lookup on the last
-						   component, as the caller
-						   wants proper iatt filled
-						*/
-						(reval || (!next_component &&
-						iatt)));
-		if (!inode)
-			break;
-
-		if (IA_ISLNK (ciatt.ia_type) && (next_component || follow)) {
-			/* If the component is not the last piece,
-			   then following it is necessary even if
-			   not requested by the caller
-			*/
-			char *lpath = NULL;
-			loc_t sym_loc = {0,};
-
-			if (follow > GLFS_SYMLINK_MAX_FOLLOW) {
-				errno = ELOOP;
-				ret = -1;
-				if (inode) {
-					inode_unref (inode);
-					inode = NULL;
-				}
-				break;
-			}
-
-			ret = glfs_resolve_symlink (fs, subvol, inode, &lpath);
-			inode_unref (inode);
-			inode = NULL;
-			if (ret < 0)
-				break;
-
-			ret = glfs_resolve_at (fs, subvol, parent, lpath,
-					       &sym_loc,
-					       /* followed iatt becomes the
-						  component iatt
-					       */
-					       &ciatt,
-					       /* always recurisvely follow while
-						  following symlink
-					       */
-					       follow + 1, reval);
-			if (ret == 0)
-				inode = inode_ref (sym_loc.inode);
-			loc_wipe (&sym_loc);
-			GF_FREE (lpath);
-		}
-
-		if (!next_component)
-			break;
-
-		if (!IA_ISDIR (ciatt.ia_type)) {
-			/* next_component exists and this component is
-			   not a directory
-			*/
-			inode_unref (inode);
-			inode = NULL;
-			ret = -1;
-			errno = ENOTDIR;
-			break;
-		}
-	}
-
-	if (parent && next_component)
-		/* resolution failed mid-way */
-		goto out;
-
-	/* At this point, all components up to the last parent directory
-	   have been resolved successfully (@parent). Resolution of basename
-	   might have failed (@inode) if at all.
-	*/
-
-	loc->parent = parent;
-	if (parent) {
-		uuid_copy (loc->pargfid, parent->gfid);
-		loc->name = component;
-	}
-
-	loc->inode = inode;
-	if (inode) {
-		uuid_copy (loc->gfid, inode->gfid);
-		if (iatt)
-			*iatt = ciatt;
-		ret = 0;
-	}
-
-	glfs_loc_touchup (loc);
-out:
-	GF_FREE (path);
-
-	/* do NOT loc_wipe here as only last component might be missing */
-
-	return ret;
-}
-
-
-int
-glfs_resolve_path (struct glfs *fs, xlator_t *subvol, const char *origpath,
-		   loc_t *loc, struct iatt *iatt, int follow, int reval)
-{
-	int ret = -1;
-	inode_t *cwd = NULL;
-
-	if (origpath[0] == '/')
-		return glfs_resolve_at (fs, subvol, NULL, origpath, loc, iatt,
-					follow, reval);
-
-	cwd = glfs_cwd_get (fs);
-
-	ret = glfs_resolve_at (fs, subvol, cwd, origpath, loc, iatt,
-			       follow, reval);
-	if (cwd)
-		inode_unref (cwd);
-
-	return ret;
-}
-
-
-int
-glfs_resolve (struct glfs *fs, xlator_t *subvol, const char *origpath,
-	      loc_t *loc, struct iatt *iatt, int reval)
-{
-	int ret = -1;
-
-	ret = glfs_resolve_path (fs, subvol, origpath, loc, iatt, 1, reval);
-
-	return ret;
-}
-
-
-int
-glfs_lresolve (struct glfs *fs, xlator_t *subvol, const char *origpath,
-	       loc_t *loc, struct iatt *iatt, int reval)
-{
-	int ret = -1;
-
-	ret = glfs_resolve_path (fs, subvol, origpath, loc, iatt, 0, reval);
-
-	return ret;
-}
-
-
-int
-glfs_migrate_fd_locks_safe (struct glfs *fs, xlator_t *oldsubvol, fd_t *oldfd,
-			    xlator_t *newsubvol, fd_t *newfd)
-{
-	dict_t *lockinfo = NULL;
-	int ret = 0;
-	char uuid1[64];
-
-	if (!oldfd->lk_ctx || fd_lk_ctx_empty (oldfd->lk_ctx))
-		return 0;
-
-	newfd->lk_ctx = fd_lk_ctx_ref (oldfd->lk_ctx);
-
-	ret = syncop_fgetxattr (oldsubvol, oldfd, &lockinfo,
-				GF_XATTR_LOCKINFO_KEY);
-	if (ret < 0) {
-		gf_log (fs->volname, GF_LOG_WARNING,
-			"fgetxattr (%s) failed (%s) on graph %s (%d)",
-			uuid_utoa_r (oldfd->inode->gfid, uuid1),
-			strerror (errno),
-			graphid_str (oldsubvol), oldsubvol->graph->id);
-		goto out;
-	}
-
-	if (!dict_get (lockinfo, GF_XATTR_LOCKINFO_KEY)) {
-		gf_log (fs->volname, GF_LOG_WARNING,
-			"missing lokinfo key (%s) on graph %s (%d)",
-			uuid_utoa_r (oldfd->inode->gfid, uuid1),
-			graphid_str (oldsubvol), oldsubvol->graph->id);
-		goto out;
-	}
-
-	ret = syncop_fsetxattr (newsubvol, newfd, lockinfo, 0);
-	if (ret < 0) {
-		gf_log (fs->volname, GF_LOG_WARNING,
-			"fsetxattr (%s) failed (%s) on graph %s (%d)",
-			uuid_utoa_r (newfd->inode->gfid, uuid1),
-			strerror (errno),
-			graphid_str (newsubvol), newsubvol->graph->id);
-		goto out;
-	}
-out:
-	if (lockinfo)
-		dict_unref (lockinfo);
-	return ret;
-}
-
-
-fd_t *
-glfs_migrate_fd_safe (struct glfs *fs, xlator_t *newsubvol, fd_t *oldfd)
-{
-	fd_t *newfd = NULL;
-	inode_t *oldinode = NULL;
-	inode_t *newinode = NULL;
-	xlator_t *oldsubvol = NULL;
-	int ret = -1;
-	loc_t loc = {0, };
-	char uuid1[64];
-
-
-	oldinode = oldfd->inode;
-	oldsubvol = oldinode->table->xl;
-
-	if (oldsubvol == newsubvol)
-		return fd_ref (oldfd);
-
-	if (!oldsubvol->switched) {
-		ret = syncop_fsync (oldsubvol, oldfd, 0);
-		if (ret) {
-			gf_log (fs->volname, GF_LOG_WARNING,
-				"fsync() failed (%s) on %s graph %s (%d)",
-				strerror (errno),
-				uuid_utoa_r (oldfd->inode->gfid, uuid1),
-				graphid_str (oldsubvol), oldsubvol->graph->id);
-		}
-	}
-
-	newinode = glfs_refresh_inode_safe (newsubvol, oldinode);
-	if (!newinode) {
-		gf_log (fs->volname, GF_LOG_WARNING,
-			"inode (%s) refresh failed (%s) on graph %s (%d)",
-			uuid_utoa_r (oldinode->gfid, uuid1),
-			strerror (errno),
-			graphid_str (newsubvol), newsubvol->graph->id);
-		goto out;
-	}
-
-	newfd = fd_create (newinode, getpid());
-	if (!newfd) {
-		gf_log (fs->volname, GF_LOG_WARNING,
-			"fd_create (%s) failed (%s) on graph %s (%d)",
-			uuid_utoa_r (newinode->gfid, uuid1),
-			strerror (errno),
-			graphid_str (newsubvol), newsubvol->graph->id);
-		goto out;
-	}
-
-	loc.inode = inode_ref (newinode);
-
-        ret = inode_path (oldfd->inode, NULL, (char **)&loc.path);
-        if (ret < 0) {
-                gf_log (fs->volname, GF_LOG_INFO, "inode_path failed");
-                goto out;
-        }
-
-        uuid_copy (loc.gfid, oldinode->gfid);
-
-
-	if (IA_ISDIR (oldinode->ia_type))
-		ret = syncop_opendir (newsubvol, &loc, newfd);
-	else
-		ret = syncop_open (newsubvol, &loc,
-				   oldfd->flags & ~(O_TRUNC|O_EXCL|O_CREAT),
-				   newfd);
-	loc_wipe (&loc);
-
-	if (ret) {
-		gf_log (fs->volname, GF_LOG_WARNING,
-			"syncop_open%s (%s) failed (%s) on graph %s (%d)",
-			IA_ISDIR (oldinode->ia_type) ? "dir" : "",
-			uuid_utoa_r (newinode->gfid, uuid1),
-			strerror (errno),
-			graphid_str (newsubvol), newsubvol->graph->id);
-		goto out;
-	}
-
-	ret = glfs_migrate_fd_locks_safe (fs, oldsubvol, oldfd, newsubvol,
-					  newfd);
-
-	if (ret) {
-		gf_log (fs->volname, GF_LOG_WARNING,
-			"lock migration (%s) failed (%s) on graph %s (%d)",
-			uuid_utoa_r (newinode->gfid, uuid1),
-			strerror (errno),
-			graphid_str (newsubvol), newsubvol->graph->id);
-		goto out;
-	}
-
-        newfd->flags = oldfd->flags;
-	fd_bind (newfd);
-out:
-	if (newinode)
-		inode_unref (newinode);
-
-	if (ret) {
-		fd_unref (newfd);
-		newfd = NULL;
-	}
-
-	return newfd;
-}
-
-
-fd_t *
-__glfs_migrate_fd (struct glfs *fs, xlator_t *newsubvol, struct glfs_fd *glfd)
-{
-	fd_t *oldfd = NULL;
-	fd_t *newfd = NULL;
-
-	oldfd = glfd->fd;
-
-	fs->migration_in_progress = 1;
-	pthread_mutex_unlock (&fs->mutex);
-	{
-		newfd = glfs_migrate_fd_safe (fs, newsubvol, oldfd);
-	}
-	pthread_mutex_lock (&fs->mutex);
-	fs->migration_in_progress = 0;
-	pthread_cond_broadcast (&fs->cond);
-
-	return newfd;
-}
-
-
-fd_t *
-__glfs_resolve_fd (struct glfs *fs, xlator_t *subvol, struct glfs_fd *glfd)
-{
-	fd_t *fd = NULL;
-
-	if (glfd->fd->inode->table->xl == subvol)
-		return fd_ref (glfd->fd);
-
-	fd = __glfs_migrate_fd (fs, subvol, glfd);
-	if (!fd)
-		return NULL;
-
-	if (subvol == fs->active_subvol) {
-		fd_unref (glfd->fd);
-		glfd->fd = fd_ref (fd);
-	}
-
-	return fd;
-}
-
-
-fd_t *
-glfs_resolve_fd (struct glfs *fs, xlator_t *subvol, struct glfs_fd *glfd)
-{
-	fd_t *fd = NULL;
-
-	glfs_lock (fs);
-	{
-		fd = __glfs_resolve_fd (fs, subvol, glfd);
-	}
-	glfs_unlock (fs);
-
-	return fd;
-}
-
-
-void
-__glfs_migrate_openfds (struct glfs *fs, xlator_t *subvol)
-{
-	struct glfs_fd *glfd = NULL;
-	fd_t *fd = NULL;
-
-	list_for_each_entry (glfd, &fs->openfds, openfds) {
-		if (uuid_is_null (glfd->fd->inode->gfid)) {
-			gf_log (fs->volname, GF_LOG_INFO,
-				"skipping openfd %p/%p in graph %s (%d)",
-				glfd, glfd->fd,	graphid_str(subvol),
-				subvol->graph->id);
-			/* create in progress, defer */
-			continue;
-		}
-
-		fd = __glfs_migrate_fd (fs, subvol, glfd);
-		if (fd) {
-			fd_unref (glfd->fd);
-			glfd->fd = fd;
-		}
-	}
-}
-
-
-xlator_t *
-__glfs_active_subvol (struct glfs *fs)
-{
-	xlator_t      *new_subvol = NULL;
-	int            ret = -1;
-	inode_t       *new_cwd = NULL;
-
-	if (!fs->next_subvol)
-		return fs->active_subvol;
-
-	new_subvol = fs->next_subvol;
-
-	ret = __glfs_first_lookup (fs, new_subvol);
-	if (ret) {
-		gf_log (fs->volname, GF_LOG_INFO,
-			"first lookup on graph %s (%d) failed (%s)",
-			graphid_str (new_subvol), new_subvol->graph->id,
-			strerror (errno));
-		return NULL;
-	}
-
-	if (fs->cwd) {
-		new_cwd = __glfs_refresh_inode (fs, new_subvol, fs->cwd);
-
-		if (!new_cwd) {
-			char buf1[64];
-			gf_log (fs->volname, GF_LOG_INFO,
-				"cwd refresh of %s graph %s (%d) failed (%s)",
-				uuid_utoa_r (fs->cwd->gfid, buf1),
-				graphid_str (new_subvol),
-				new_subvol->graph->id, strerror (errno));
-			return NULL;
-		}
-	}
-
-	__glfs_migrate_openfds (fs, new_subvol);
-
-	/* switching @active_subvol and @cwd
-	   should be atomic
-	*/
-	fs->old_subvol = fs->active_subvol;
-	fs->active_subvol = fs->next_subvol;
-	fs->next_subvol = NULL;
-
-	if (new_cwd) {
-		__glfs_cwd_set (fs, new_cwd);
-		inode_unref (new_cwd);
-	}
-
-	gf_log (fs->volname, GF_LOG_INFO, "switched to graph %s (%d)",
-		graphid_str (new_subvol), new_subvol->graph->id);
-
-	return new_subvol;
-}
-
-xlator_t *
-glfs_active_subvol (struct glfs *fs)
-{
-	xlator_t      *subvol = NULL;
-	xlator_t      *old_subvol = NULL;
-
-	glfs_lock (fs);
-	{
-		subvol = __glfs_active_subvol (fs);
-
-		if (subvol)
-			subvol->winds++;
-
-		if (fs->old_subvol) {
-			old_subvol = fs->old_subvol;
-			fs->old_subvol = NULL;
-			old_subvol->switched = 1;
-		}
-	}
-	glfs_unlock (fs);
-
-	if (old_subvol)
-		glfs_subvol_done (fs, old_subvol);
-
-	return subvol;
-}
-
-
-void
-glfs_subvol_done (struct glfs *fs, xlator_t *subvol)
-{
-	int ref = 0;
-	xlator_t *active_subvol = NULL;
-
-	if (!subvol)
-		return;
-
-	glfs_lock (fs);
-	{
-		ref = (--subvol->winds);
-		active_subvol = fs->active_subvol;
-	}
-	glfs_unlock (fs);
-
-	if (ref == 0) {
-		assert (subvol != active_subvol);
-		xlator_notify (subvol, GF_EVENT_PARENT_DOWN, subvol, NULL);
-	}
-}
-
-
-int
-__glfs_cwd_set (struct glfs *fs, inode_t *inode)
-{
-	if (inode->table->xl != fs->active_subvol) {
-		inode = __glfs_refresh_inode (fs, fs->active_subvol, inode);
-		if (!inode)
-			return -1;
-	} else {
-		inode_ref (inode);
-	}
-
-	if (fs->cwd)
-		inode_unref (fs->cwd);
-
-	fs->cwd = inode;
-
-	return 0;
-}
-
-
-int
-glfs_cwd_set (struct glfs *fs, inode_t *inode)
-{
-	int ret = 0;
-
-	glfs_lock (fs);
-	{
-		ret = __glfs_cwd_set (fs, inode);
-	}
-	glfs_unlock (fs);
-
-	return ret;
-}
-
-
-inode_t *
-__glfs_cwd_get (struct glfs *fs)
-{
-	inode_t *cwd = NULL;
-
-	if (!fs->cwd)
-		return NULL;
-
-	if (fs->cwd->table->xl == fs->active_subvol) {
-		cwd = inode_ref (fs->cwd);
-		return cwd;
-	}
-
-	cwd = __glfs_refresh_inode (fs, fs->active_subvol, fs->cwd);
-
-	return cwd;
-}
-
-inode_t *
-glfs_cwd_get (struct glfs *fs)
-{
-	inode_t *cwd = NULL;
-
-	glfs_lock (fs);
-	{
-		cwd = __glfs_cwd_get (fs);
-	}
-	glfs_unlock (fs);
-
-	return cwd;
-}
-
-inode_t *
-__glfs_resolve_inode (struct glfs *fs, xlator_t *subvol,
-		    struct glfs_object *object)
-{
-	inode_t *inode = NULL;
-
-	if (object->inode->table->xl == subvol)
-		return inode_ref (object->inode);
-
-	inode = __glfs_refresh_inode (fs, fs->active_subvol,
-					object->inode);
-	if (!inode)
-		return NULL;
-
-	if (subvol == fs->active_subvol) {
-		inode_unref (object->inode);
-		object->inode = inode_ref (inode);
-	}
-
-	return inode;
-}
-
-inode_t *
-glfs_resolve_inode (struct glfs *fs, xlator_t *subvol,
-		    struct glfs_object *object)
-{
-	inode_t *inode = NULL;
-
-	glfs_lock (fs);
-	{
-		inode = __glfs_resolve_inode(fs, subvol, object);
-	}
-	glfs_unlock (fs);
-
-	return inode;
-}
-
-int
-glfs_create_object (loc_t *loc, struct glfs_object **retobject)
-{
-	struct glfs_object *object = NULL;
-
-	object = GF_CALLOC (1, sizeof(struct glfs_object),
-			    glfs_mt_glfs_object_t);
-	if (object == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	object->inode = loc->inode;
-	uuid_copy (object->gfid, object->inode->gfid);
-
-	/* we hold the reference */
-	loc->inode = NULL;
-
-	*retobject = object;
-
-	return 0;
-}
diff --git a/api/src/glfs.c b/api/src/glfs.c
deleted file mode 100644
index 29ed47c0c..000000000
--- a/api/src/glfs.c
+++ /dev/null
@@ -1,673 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-/*
-  TODO:
-  - merge locks in glfs_posix_lock for lock self-healing
-  - set proper pid/lk_owner to call frames (currently buried in syncop)
-  - fix logging.c/h to store logfp and loglevel in glusterfs_ctx_t and
-    reach it via THIS.
-  - update syncop functions to accept/return xdata. ???
-  - protocol/client to reconnect immediately after portmap disconnect.
-  - handle SEEK_END failure in _lseek()
-  - handle umask (per filesystem?)
-  - make itables LRU based
-  - 0-copy for readv/writev
-  - reconcile the open/creat mess
-*/
-
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <inttypes.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <limits.h>
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "glusterfs.h"
-#include "logging.h"
-#include "stack.h"
-#include "event.h"
-#include "glfs-mem-types.h"
-#include "common-utils.h"
-#include "syncop.h"
-#include "call-stub.h"
-
-#include "glfs.h"
-#include "glfs-internal.h"
-#include "hashfn.h"
-#include "rpc-clnt.h"
-
-
-static gf_boolean_t
-vol_assigned (cmd_args_t *args)
-{
-	return args->volfile || args->volfile_server;
-}
-
-
-static int
-glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
-{
-	call_pool_t   *pool = NULL;
-	int	       ret = -1;
-
-	xlator_mem_acct_init (THIS, glfs_mt_end + 1);
-
-	ctx->process_uuid = generate_glusterfs_ctx_id ();
-	if (!ctx->process_uuid) {
-		goto err;
-	}
-
-	ctx->page_size	= 128 * GF_UNIT_KB;
-
-	ctx->iobuf_pool = iobuf_pool_new ();
-	if (!ctx->iobuf_pool) {
-		goto err;
-	}
-
-	ctx->event_pool = event_pool_new (DEFAULT_EVENT_POOL_SIZE);
-	if (!ctx->event_pool) {
-		goto err;
-	}
-
-	ctx->env = syncenv_new (0, 0, 0);
-	if (!ctx->env) {
-		goto err;
-	}
-
-	pool = GF_CALLOC (1, sizeof (call_pool_t),
-			  glfs_mt_call_pool_t);
-	if (!pool) {
-		goto err;
-	}
-
-	/* frame_mem_pool size 112 * 4k */
-	pool->frame_mem_pool = mem_pool_new (call_frame_t, 4096);
-	if (!pool->frame_mem_pool) {
-		goto err;
-	}
-	/* stack_mem_pool size 256 * 1024 */
-	pool->stack_mem_pool = mem_pool_new (call_stack_t, 1024);
-	if (!pool->stack_mem_pool) {
-		goto err;
-	}
-
-	ctx->stub_mem_pool = mem_pool_new (call_stub_t, 1024);
-	if (!ctx->stub_mem_pool) {
-		goto err;
-	}
-
-	ctx->dict_pool = mem_pool_new (dict_t, GF_MEMPOOL_COUNT_OF_DICT_T);
-	if (!ctx->dict_pool)
-		goto err;
-
-	ctx->dict_pair_pool = mem_pool_new (data_pair_t,
-					    GF_MEMPOOL_COUNT_OF_DATA_PAIR_T);
-	if (!ctx->dict_pair_pool)
-		goto err;
-
-	ctx->dict_data_pool = mem_pool_new (data_t, GF_MEMPOOL_COUNT_OF_DATA_T);
-	if (!ctx->dict_data_pool)
-		goto err;
-
-	INIT_LIST_HEAD (&pool->all_frames);
-	INIT_LIST_HEAD (&ctx->cmd_args.xlator_options);
-	LOCK_INIT (&pool->lock);
-	ctx->pool = pool;
-
-	pthread_mutex_init (&(ctx->lock), NULL);
-
-	ret = 0;
-err:
-	if (ret && pool) {
-		if (pool->frame_mem_pool)
-			mem_pool_destroy (pool->frame_mem_pool);
-		if (pool->stack_mem_pool)
-			mem_pool_destroy (pool->stack_mem_pool);
-		GF_FREE (pool);
-	}
-
-	if (ret && ctx) {
-		if (ctx->stub_mem_pool)
-			mem_pool_destroy (ctx->stub_mem_pool);
-		if (ctx->dict_pool)
-			mem_pool_destroy (ctx->dict_pool);
-		if (ctx->dict_data_pool)
-			mem_pool_destroy (ctx->dict_data_pool);
-		if (ctx->dict_pair_pool)
-			mem_pool_destroy (ctx->dict_pair_pool);
-	}
-
-	return ret;
-}
-
-
-static int
-create_master (struct glfs *fs)
-{
-	int		 ret = 0;
-	xlator_t	*master = NULL;
-
-	master = GF_CALLOC (1, sizeof (*master),
-			    glfs_mt_xlator_t);
-	if (!master)
-		goto err;
-
-	master->name = gf_strdup ("gfapi");
-	if (!master->name)
-		goto err;
-
-	if (xlator_set_type (master, "mount/api") == -1) {
-		gf_log ("glfs", GF_LOG_ERROR,
-			"master xlator for %s initialization failed",
-			fs->volname);
-		goto err;
-	}
-
-	master->ctx	 = fs->ctx;
-	master->private	 = fs;
-	master->options	 = get_new_dict ();
-	if (!master->options)
-		goto err;
-
-
-	ret = xlator_init (master);
-	if (ret) {
-		gf_log ("glfs", GF_LOG_ERROR,
-			"failed to initialize gfapi translator");
-		goto err;
-	}
-
-	fs->ctx->master = master;
-	THIS = master;
-
-	return 0;
-
-err:
-	if (master) {
-		xlator_destroy (master);
-	}
-
-	return -1;
-}
-
-
-static FILE *
-get_volfp (struct glfs *fs)
-{
-	int	     ret = 0;
-	cmd_args_t  *cmd_args = NULL;
-	FILE	    *specfp = NULL;
-	struct stat  statbuf;
-
-	cmd_args = &fs->ctx->cmd_args;
-
-	ret = lstat (cmd_args->volfile, &statbuf);
-	if (ret == -1) {
-		gf_log ("glfs", GF_LOG_ERROR,
-			"%s: %s", cmd_args->volfile, strerror (errno));
-		return NULL;
-	}
-
-	if ((specfp = fopen (cmd_args->volfile, "r")) == NULL) {
-		gf_log ("glfs", GF_LOG_ERROR,
-			"volume file %s: %s",
-			cmd_args->volfile,
-			strerror (errno));
-		return NULL;
-	}
-
-	gf_log ("glfs", GF_LOG_DEBUG,
-		"loading volume file %s", cmd_args->volfile);
-
-	return specfp;
-}
-
-
-int
-glfs_volumes_init (struct glfs *fs)
-{
-	FILE		   *fp = NULL;
-	cmd_args_t	   *cmd_args = NULL;
-	int		    ret = 0;
-
-	cmd_args = &fs->ctx->cmd_args;
-
-	if (!vol_assigned (cmd_args))
-		return -1;
-
-	if (cmd_args->volfile_server) {
-		ret = glfs_mgmt_init (fs);
-		goto out;
-	}
-
-	fp = get_volfp (fs);
-
-	if (!fp) {
-		gf_log ("glfs", GF_LOG_ERROR,
-			"Cannot reach volume specification file");
-		ret = -1;
-		goto out;
-	}
-
-	ret = glfs_process_volfp (fs, fp);
-	if (ret)
-		goto out;
-
-out:
-	return ret;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-int
-glfs_set_xlator_option (struct glfs *fs, const char *xlator, const char *key,
-			const char *value)
-{
-	xlator_cmdline_option_t *option = NULL;
-
-	option = GF_CALLOC (1, sizeof (*option),
-			    glfs_mt_xlator_cmdline_option_t);
-	if (!option)
-		goto enomem;
-
-	INIT_LIST_HEAD (&option->cmd_args);
-
-	option->volume = gf_strdup (xlator);
-	if (!option->volume)
-		goto enomem;
-	option->key = gf_strdup (key);
-	if (!option->key)
-		goto enomem;
-	option->value = gf_strdup (value);
-	if (!option->value)
-		goto enomem;
-
-	list_add (&option->cmd_args, &fs->ctx->cmd_args.xlator_options);
-
-	return 0;
-enomem:
-	errno = ENOMEM;
-
-	if (!option)
-		return -1;
-
-	GF_FREE (option->volume);
-	GF_FREE (option->key);
-	GF_FREE (option->value);
-	GF_FREE (option);
-
-	return -1;
-}
-
-int glfs_setfsuid (uid_t fsuid)
-{
-	return syncopctx_setfsuid (&fsuid);
-}
-
-int glfs_setfsgid (gid_t fsgid)
-{
-	return syncopctx_setfsgid (&fsgid);
-}
-
-int glfs_setfsgroups (size_t size, const gid_t *list)
-{
-	return syncopctx_setfsgroups(size, list);
-}
-
-struct glfs *
-glfs_from_glfd (struct glfs_fd *glfd)
-{
-	return glfd->fs;
-}
-
-
-struct glfs_fd *
-glfs_fd_new (struct glfs *fs)
-{
-	struct glfs_fd  *glfd = NULL;
-
-	glfd = GF_CALLOC (1, sizeof (*glfd), glfs_mt_glfs_fd_t);
-	if (!glfd)
-		return NULL;
-
-	glfd->fs = fs;
-
-	INIT_LIST_HEAD (&glfd->openfds);
-
-	return glfd;
-}
-
-
-void
-glfs_fd_bind (struct glfs_fd *glfd)
-{
-	struct glfs *fs = NULL;
-
-	fs = glfd->fs;
-
-	glfs_lock (fs);
-	{
-		list_add_tail (&glfd->openfds, &fs->openfds);
-	}
-	glfs_unlock (fs);
-}
-
-void
-glfs_fd_destroy (struct glfs_fd *glfd)
-{
-	if (!glfd)
-		return;
-
-	glfs_lock (glfd->fs);
-	{
-		list_del_init (&glfd->openfds);
-	}
-	glfs_unlock (glfd->fs);
-
-	if (glfd->fd)
-		fd_unref (glfd->fd);
-
-	GF_FREE (glfd->readdirbuf);
-
-	GF_FREE (glfd);
-}
-
-
-static void *
-glfs_poller (void *data)
-{
-	struct glfs  *fs = NULL;
-
-	fs = data;
-
-	event_dispatch (fs->ctx->event_pool);
-
-	return NULL;
-}
-
-
-struct glfs *
-glfs_new (const char *volname)
-{
-	struct glfs     *fs = NULL;
-	int              ret = -1;
-	glusterfs_ctx_t *ctx = NULL;
-
-	ctx = glusterfs_ctx_new ();
-	if (!ctx) {
-		return NULL;
-	}
-
-#ifdef DEBUG
-        gf_mem_acct_enable_set (ctx);
-#endif
-
-	/* first globals init, for gf_mem_acct_enable_set () */
-	ret = glusterfs_globals_init (ctx);
-	if (ret)
-		return NULL;
-
-	THIS->ctx = ctx;
-
-	/* then ctx_defaults_init, for xlator_mem_acct_init(THIS) */
-	ret = glusterfs_ctx_defaults_init (ctx);
-	if (ret)
-		return NULL;
-
-	fs = GF_CALLOC (1, sizeof (*fs), glfs_mt_glfs_t);
-	if (!fs)
-		return NULL;
-	fs->ctx = ctx;
-
-	glfs_set_logging (fs, "/dev/null", 0);
-
-	fs->ctx->cmd_args.volfile_id = gf_strdup (volname);
-
-	fs->volname = gf_strdup (volname);
-
-	pthread_mutex_init (&fs->mutex, NULL);
-	pthread_cond_init (&fs->cond, NULL);
-
-	INIT_LIST_HEAD (&fs->openfds);
-
-	return fs;
-}
-
-
-int
-glfs_set_volfile (struct glfs *fs, const char *volfile)
-{
-	cmd_args_t  *cmd_args = NULL;
-
-	cmd_args = &fs->ctx->cmd_args;
-
-	if (vol_assigned (cmd_args))
-		return -1;
-
-	cmd_args->volfile = gf_strdup (volfile);
-
-	return 0;
-}
-
-
-int
-glfs_set_volfile_server (struct glfs *fs, const char *transport,
-			 const char *host, int port)
-{
-	cmd_args_t  *cmd_args = NULL;
-
-	cmd_args = &fs->ctx->cmd_args;
-
-	if (vol_assigned (cmd_args))
-		return -1;
-
-	cmd_args->volfile_server = gf_strdup (host);
-	cmd_args->volfile_server_transport = gf_strdup (transport);
-	cmd_args->volfile_server_port = port;
-	cmd_args->max_connect_attempts = 2;
-
-	return 0;
-}
-
-
-int
-glfs_set_logging (struct glfs *fs, const char *logfile, int loglevel)
-{
-	int  ret = 0;
-        char *tmplog = NULL;
-
-        if (!logfile) {
-                ret = gf_set_log_file_path (&fs->ctx->cmd_args);
-                if (ret)
-                        goto out;
-                tmplog = fs->ctx->cmd_args.log_file;
-        } else {
-                tmplog = (char *)logfile;
-        }
-
-        ret = gf_log_init (fs->ctx, tmplog, NULL);
-        if (ret)
-                goto out;
-
-	if (loglevel >= 0)
-		gf_log_set_loglevel (loglevel);
-
-out:
-	return ret;
-}
-
-
-int
-glfs_init_wait (struct glfs *fs)
-{
-	int   ret = -1;
-
-	/* Always a top-down call, use glfs_lock() */
-	glfs_lock (fs);
-	{
-		while (!fs->init)
-			pthread_cond_wait (&fs->cond,
-					   &fs->mutex);
-		ret = fs->ret;
-		errno = fs->err;
-	}
-	glfs_unlock (fs);
-
-	return ret;
-}
-
-
-void
-glfs_init_done (struct glfs *fs, int ret)
-{
-	glfs_init_cbk init_cbk;
-
-	if (!fs) {
-		gf_log ("glfs", GF_LOG_ERROR,
-			"fs is NULL");
-		goto out;
-	}
-
-	init_cbk = fs->init_cbk;
-
-	/* Always a bottom-up call, use mutex_lock() */
-	pthread_mutex_lock (&fs->mutex);
-	{
-		fs->init = 1;
-		fs->ret = ret;
-		fs->err = errno;
-
-		if (!init_cbk)
-			pthread_cond_broadcast (&fs->cond);
-	}
-	pthread_mutex_unlock (&fs->mutex);
-
-	if (init_cbk)
-		init_cbk (fs, ret);
-out:
-	return;
-}
-
-
-int
-glfs_init_common (struct glfs *fs)
-{
-	int  ret = -1;
-
-	ret = create_master (fs);
-	if (ret)
-		return ret;
-
-	ret = gf_thread_create (&fs->poller, NULL, glfs_poller, fs);
-	if (ret)
-		return ret;
-
-	ret = glfs_volumes_init (fs);
-	if (ret)
-		return ret;
-
-	fs->dev_id = gf_dm_hashfn (fs->volname, strlen (fs->volname));
-	return ret;
-}
-
-
-int
-glfs_init_async (struct glfs *fs, glfs_init_cbk cbk)
-{
-	int  ret = -1;
-
-	fs->init_cbk = cbk;
-
-	ret = glfs_init_common (fs);
-
-	return ret;
-}
-
-
-int
-glfs_init (struct glfs *fs)
-{
-	int  ret = -1;
-
-	ret = glfs_init_common (fs);
-	if (ret)
-		return ret;
-
-	ret = glfs_init_wait (fs);
-
-	return ret;
-}
-
-
-int
-glfs_fini (struct glfs *fs)
-{
-        int             ret = -1;
-        int             countdown = 100;
-        xlator_t        *subvol = NULL;
-        glusterfs_ctx_t *ctx = NULL;
-        call_pool_t     *call_pool = NULL;
-
-        ctx = fs->ctx;
-
-        if (ctx->mgmt) {
-                rpc_clnt_disable (ctx->mgmt);
-                ctx->mgmt = NULL;
-        }
-
-        __glfs_entry_fs (fs);
-
-        call_pool = fs->ctx->pool;
-
-        while (countdown--) {
-                /* give some time for background frames to finish */
-                if (!call_pool->cnt)
-                        break;
-                usleep (100000);
-        }
-        /* leaked frames may exist, we ignore */
-
-        /*We deem glfs_fini as successful if there are no pending frames in the call
-         *pool*/
-        ret = (call_pool->cnt == 0)? 0: -1;
-
-        subvol = glfs_active_subvol (fs);
-        if (subvol) {
-                /* PARENT_DOWN within glfs_subvol_done() is issued only
-                   on graph switch (new graph should activiate and
-                   decrement the extra @winds count taken in glfs_graph_setup()
-
-                   Since we are explicitly destroying, PARENT_DOWN is necessary
-                */
-                xlator_notify (subvol, GF_EVENT_PARENT_DOWN, subvol, 0);
-                /* TBD: wait for CHILD_DOWN before exiting, in case of
-                   asynchronous cleanup like graceful socket disconnection
-                   in the future.
-                */
-        }
-
-        glfs_subvol_done (fs, subvol);
-
-        if (ctx->log.logfile)
-                fclose (ctx->log.logfile);
-
-        return ret;
-}
diff --git a/api/src/glfs.h b/api/src/glfs.h
deleted file mode 100644
index 18fda496e..000000000
--- a/api/src/glfs.h
+++ /dev/null
@@ -1,581 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-#ifndef _GLFS_H
-#define _GLFS_H
-
-/*
-  Enforce the following flags as libgfapi is built
-  with them, and we want programs linking against them to also
-  be built with these flags. This is necessary as it affects
-  some of the structures defined in libc headers (like struct stat)
-  and those definitions need to be consistently compiled in
-  both the library and the application.
-*/
-
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-
-#ifndef __USE_FILE_OFFSET64
-#define __USE_FILE_OFFSET64
-#endif
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <sys/cdefs.h>
-#include <dirent.h>
-#include <sys/statvfs.h>
-
-__BEGIN_DECLS
-
-/* The filesystem object. One object per 'virtual mount' */
-struct glfs;
-typedef struct glfs glfs_t;
-
-
-/*
-  SYNOPSIS
-
-  glfs_new: Create a new 'virtual mount' object.
-
-  DESCRIPTION
-
-  This is most likely the very first function you will use. This function
-  will create a new glfs_t (virtual mount) object in memory.
-
-  On this newly created glfs_t, you need to be either set a volfile path
-  (glfs_set_volfile) or a volfile server (glfs_set_volfile_server).
-
-  The glfs_t object needs to be initialized with glfs_init() before you
-  can start issuing file operations on it.
-
-  PARAMETERS
-
-  @volname: Name of the volume. This identifies the server-side volume and
-            the fetched volfile (equivalent of --volfile-id command line
-	    parameter to glusterfsd). When used with glfs_set_volfile() the
-	    @volname has no effect (except for appearing in log messages).
-
-  RETURN VALUES
-
-  NULL   : Out of memory condition.
-  Others : Pointer to the newly created glfs_t virtual mount object.
-
-*/
-
-glfs_t *glfs_new (const char *volname);
-
-
-/*
-  SYNOPSIS
-
-  glfs_set_volfile: Specify the path to the volume specification file.
-
-  DESCRIPTION
-
-  If you are using a static volume specification file (without dynamic
-  volume management abilities from the CLI), then specify the path to
-  the volume specification file.
-
-  This is incompatible with glfs_set_volfile_server().
-
-  PARAMETERS
-
-  @fs: The 'virtual mount' object to be configured with the volume
-       specification file.
-
-  @volfile: Path to the locally available volume specification file.
-
-  RETURN VALUES
-
-   0 : Success.
-  -1 : Failure. @errno will be set with the type of failure.
-
-*/
-
-int glfs_set_volfile (glfs_t *fs, const char *volfile);
-
-
-/*
-  SYNOPSIS
-
-  glfs_set_volfile_server: Specify the address of management server.
-
-  DESCRIPTION
-
-  This function specifies the address of the management server (glusterd)
-  to connect, and establish the volume configuration. The @volname
-  parameter passed to glfs_new() is the volume which will be virtually
-  mounted as the glfs_t object. All operations performed by the CLI at
-  the management server will automatically be reflected in the 'virtual
-  mount' object as it maintains a connection to glusterd and polls on
-  configuration change notifications.
-
-  This is incompatible with glfs_set_volfile().
-
-  PARAMETERS
-
-  @fs: The 'virtual mount' object to be configured with the volume
-       specification file.
-
-  @transport: String specifying the transport used to connect to the
-              management daemon. Specifying NULL will result in the usage
-	      of the default (tcp) transport type. Permitted values
-	      are those what you specify as transport-type in a volume
-	      specification file (e.g "tcp", "rdma", "unix".)
-
-  @host: String specifying the address of where to find the management
-         daemon. Depending on the transport type this would either be
-	 an FQDN (e.g: "storage01.company.com"), ASCII encoded IP
-	 address "192.168.22.1", or a UNIX domain socket path (e.g
-	 "/tmp/glusterd.socket".)
-
-  @port: The TCP port number where gluster management daemon is listening.
-         Specifying 0 uses the default port number GF_DEFAULT_BASE_PORT.
-	 This parameter is unused if you are using a UNIX domain socket.
-
-  RETURN VALUES
-
-   0 : Success.
-  -1 : Failure. @errno will be set with the type of failure.
-
-*/
-
-int glfs_set_volfile_server (glfs_t *fs, const char *transport,
-			     const char *host, int port);
-
-
-/*
-  SYNOPSIS
-
-  glfs_set_logging: Specify logging parameters.
-
-  DESCRIPTION
-
-  This function specifies logging parameters for the virtual mount.
-  Default log file is /dev/null.
-
-  PARAMETERS
-
-  @fs: The 'virtual mount' object to be configured with the logging parameters.
-
-  @logfile: The logfile to be used for logging. Will be created if it does not
-            already exist (provided system permissions allow). If NULL, a new
-            logfile will be created in default log directory associated with
-            the glusterfs installation.
-
-  @loglevel: Numerical value specifying the degree of verbosity. Higher the
-             value, more verbose the logging.
-
-  RETURN VALUES
-
-   0 : Success.
-  -1 : Failure. @errno will be set with the type of failure.
-
-*/
-
-int glfs_set_logging (glfs_t *fs, const char *logfile, int loglevel);
-
-
-/*
-  SYNOPSIS
-
-  glfs_init: Initialize the 'virtual mount'
-
-  DESCRIPTION
-
-  This function initializes the glfs_t object. This consists of many steps:
-  - Spawn a poll-loop thread.
-  - Establish connection to management daemon and receive volume specification.
-  - Construct translator graph and initialize graph.
-  - Wait for initialization (connecting to all bricks) to complete.
-
-  PARAMETERS
-
-  @fs: The 'virtual mount' object to be initialized.
-
-  RETURN VALUES
-
-   0 : Success.
-  -1 : Failure. @errno will be set with the type of failure.
-
-*/
-
-int glfs_init (glfs_t *fs);
-
-
-/*
-  SYNOPSIS
-
-  glfs_fini: Cleanup and destroy the 'virtual mount'
-
-  DESCRIPTION
-
-  This function attempts to gracefully destroy glfs_t object. An attempt is
-  made to wait for all background processing to complete before returning.
-
-  glfs_fini() must be called after all operations on glfs_t is finished.
-
-  IMPORTANT
-
-  IT IS NECESSARY TO CALL glfs_fini() ON ALL THE INITIALIZED glfs_t
-  OBJECTS BEFORE TERMINATING THE PROGRAM. THERE MAY BE CACHED AND
-  UNWRITTEN / INCOMPLETE OPERATIONS STILL IN PROGRESS EVEN THOUGH THE
-  API CALLS HAVE RETURNED. glfs_fini() WILL WAIT FOR BACKGROUND OPERATIONS
-  TO COMPLETE BEFORE RETURNING, THEREBY MAKING IT SAFE FOR THE PROGRAM TO
-  EXIT.
-
-  PARAMETERS
-
-  @fs: The 'virtual mount' object to be destroyed.
-
-  RETURN VALUES
-
-   0 : Success.
-*/
-
-int glfs_fini (glfs_t *fs);
-
-/*
- * FILE OPERATION
- *
- * What follows are filesystem operations performed on the
- * 'virtual mount'. The calls here are kept as close to
- * the POSIX system calls as possible.
- *
- * Notes:
- *
- * - All paths specified, even if absolute, are relative to the
- *   root of the virtual mount and not the system root (/).
- *
- */
-
-/* The file descriptor object. One per open file/directory. */
-
-struct glfs_fd;
-typedef struct glfs_fd glfs_fd_t;
-
-/*
- * PER THREAD IDENTITY MODIFIERS
- *
- * The following operations enable to set a per thread identity context
- * for the glfs APIs to perform operations as. The calls here are kept as close
- * to POSIX equivalents as possible.
- *
- * NOTES:
- *
- *  - setgroups is a per thread setting, hence this is named as fsgroups to be
- *    close in naming to the fs(u/g)id APIs
- *  - Typical mode of operation is to set the IDs as required, with the
- *    supplementary groups being optionally set, make the glfs call and post the
- *    glfs operation set them back to eu/gid or uid/gid as appropriate to the
- *    caller
- *  - The groups once set, need to be unset by setting the size to 0 (in which
- *    case the list argument is a do not care)
- *  - Once a process for a thread of operation choses to set the IDs, all glfs
- *    calls made from that thread would default to the IDs set for the thread.
- *    As a result use these APIs with care and ensure that the set IDs are
- *    reverted to global process defaults as required.
- *
- */
-int glfs_setfsuid (uid_t fsuid);
-int glfs_setfsgid (gid_t fsgid);
-int glfs_setfsgroups (size_t size, const gid_t *list);
-
-/*
-  SYNOPSIS
-
-  glfs_open: Open a file.
-
-  DESCRIPTION
-
-  This function opens a file on a virtual mount.
-
-  PARAMETERS
-
-  @fs: The 'virtual mount' object to be initialized.
-
-  @path: Path of the file within the virtual mount.
-
-  @flags: Open flags. See open(2). O_CREAT is not supported.
-          Use glfs_creat() for creating files.
-
-  RETURN VALUES
-
-  NULL   : Failure. @errno will be set with the type of failure.
-  Others : Pointer to the opened glfs_fd_t.
-
- */
-
-glfs_fd_t *glfs_open (glfs_t *fs, const char *path, int flags);
-
-
-/*
-  SYNOPSIS
-
-  glfs_creat: Create a file.
-
-  DESCRIPTION
-
-  This function opens a file on a virtual mount.
-
-  PARAMETERS
-
-  @fs: The 'virtual mount' object to be initialized.
-
-  @path: Path of the file within the virtual mount.
-
-  @mode: Permission of the file to be created.
-
-  @flags: Create flags. See open(2). O_EXCL is supported.
-
-  RETURN VALUES
-
-  NULL   : Failure. @errno will be set with the type of failure.
-  Others : Pointer to the opened glfs_fd_t.
-
- */
-
-glfs_fd_t *glfs_creat (glfs_t *fs, const char *path, int flags,
-		       mode_t mode);
-
-int glfs_close (glfs_fd_t *fd);
-
-glfs_t *glfs_from_glfd (glfs_fd_t *fd);
-
-int glfs_set_xlator_option (glfs_t *fs, const char *xlator, const char *key,
-			    const char *value);
-
-/*
-
-  glfs_io_cbk
-
-  The following is the function type definition of the callback
-  function pointer which has to be provided by the caller to the
-  *_async() versions of the IO calls.
-
-  The callback function is called on completion of the requested
-  IO, and the appropriate return value is returned in @ret.
-
-  In case of an error in completing the IO, @ret will be -1 and
-  @errno will be set with the appropriate error.
-
-  @ret will be same as the return value of the non _async() variant
-  of the particular call
-
-  @data is the same context pointer provided by the caller at the
-  time of issuing the async IO call. This can be used by the
-  caller to differentiate different instances of the async requests
-  in a common callback function.
-*/
-
-typedef void (*glfs_io_cbk) (glfs_fd_t *fd, ssize_t ret, void *data);
-
-// glfs_{read,write}[_async]
-
-ssize_t glfs_read (glfs_fd_t *fd, void *buf, size_t count, int flags);
-ssize_t glfs_write (glfs_fd_t *fd, const void *buf, size_t count, int flags);
-int glfs_read_async (glfs_fd_t *fd, void *buf, size_t count, int flags,
-		     glfs_io_cbk fn, void *data);
-int glfs_write_async (glfs_fd_t *fd, const void *buf, size_t count, int flags,
-		      glfs_io_cbk fn, void *data);
-
-// glfs_{read,write}v[_async]
-
-ssize_t glfs_readv (glfs_fd_t *fd, const struct iovec *iov, int iovcnt,
-		    int flags);
-ssize_t glfs_writev (glfs_fd_t *fd, const struct iovec *iov, int iovcnt,
-		     int flags);
-int glfs_readv_async (glfs_fd_t *fd, const struct iovec *iov, int count,
-		      int flags, glfs_io_cbk fn, void *data);
-int glfs_writev_async (glfs_fd_t *fd, const struct iovec *iov, int count,
-		       int flags, glfs_io_cbk fn, void *data);
-
-// glfs_p{read,write}[_async]
-
-ssize_t glfs_pread (glfs_fd_t *fd, void *buf, size_t count, off_t offset,
-		    int flags);
-ssize_t glfs_pwrite (glfs_fd_t *fd, const void *buf, size_t count,
-		     off_t offset, int flags);
-int glfs_pread_async (glfs_fd_t *fd, void *buf, size_t count, off_t offset,
-		      int flags, glfs_io_cbk fn, void *data);
-int glfs_pwrite_async (glfs_fd_t *fd, const void *buf, int count, off_t offset,
-		       int flags, glfs_io_cbk fn, void *data);
-
-// glfs_p{read,write}v[_async]
-
-ssize_t glfs_preadv (glfs_fd_t *fd, const struct iovec *iov, int iovcnt,
-		     off_t offset, int flags);
-ssize_t glfs_pwritev (glfs_fd_t *fd, const struct iovec *iov, int iovcnt,
-		      off_t offset, int flags);
-int glfs_preadv_async (glfs_fd_t *fd, const struct iovec *iov, int count,
-		       off_t offset, int flags, glfs_io_cbk fn, void *data);
-int glfs_pwritev_async (glfs_fd_t *fd, const struct iovec *iov, int count,
-			off_t offset, int flags, glfs_io_cbk fn, void *data);
-
-
-off_t glfs_lseek (glfs_fd_t *fd, off_t offset, int whence);
-
-int glfs_truncate (glfs_t *fs, const char *path, off_t length);
-
-int glfs_ftruncate (glfs_fd_t *fd, off_t length);
-int glfs_ftruncate_async (glfs_fd_t *fd, off_t length, glfs_io_cbk fn,
-			  void *data);
-
-int glfs_lstat (glfs_t *fs, const char *path, struct stat *buf);
-int glfs_stat (glfs_t *fs, const char *path, struct stat *buf);
-int glfs_fstat (glfs_fd_t *fd, struct stat *buf);
-
-int glfs_fsync (glfs_fd_t *fd);
-int glfs_fsync_async (glfs_fd_t *fd, glfs_io_cbk fn, void *data);
-
-int glfs_fdatasync (glfs_fd_t *fd);
-int glfs_fdatasync_async (glfs_fd_t *fd, glfs_io_cbk fn, void *data);
-
-int glfs_access (glfs_t *fs, const char *path, int mode);
-
-int glfs_symlink (glfs_t *fs, const char *oldpath, const char *newpath);
-
-int glfs_readlink (glfs_t *fs, const char *path, char *buf, size_t bufsiz);
-
-int glfs_mknod (glfs_t *fs, const char *path, mode_t mode, dev_t dev);
-
-int glfs_mkdir (glfs_t *fs, const char *path, mode_t mode);
-
-int glfs_unlink (glfs_t *fs, const char *path);
-
-int glfs_rmdir (glfs_t *fs, const char *path);
-
-int glfs_rename (glfs_t *fs, const char *oldpath, const char *newpath);
-
-int glfs_link (glfs_t *fs, const char *oldpath, const char *newpath);
-
-glfs_fd_t *glfs_opendir (glfs_t *fs, const char *path);
-
-/*
- * @glfs_readdir_r and @glfs_readdirplus_r ARE thread safe AND re-entrant,
- * but the interface has ambiguity about the size of @dirent to be allocated
- * before calling the APIs. 512 byte buffer (for @dirent) is sufficient for
- * all known systems which are tested againt glusterfs/gfapi, but may be
- * insufficient in the future.
- */
-
-int glfs_readdir_r (glfs_fd_t *fd, struct dirent *dirent,
-		    struct dirent **result);
-
-int glfs_readdirplus_r (glfs_fd_t *fd, struct stat *stat, struct dirent *dirent,
-			struct dirent **result);
-
-/*
- * @glfs_readdir and @glfs_readdirplus are NEITHER thread safe NOR re-entrant
- * when called on the same directory handle. However they ARE thread safe
- * AND re-entrant when called on different directory handles (which may be
- * referring to the same directory too.)
- */
-
-struct dirent *glfs_readdir (glfs_fd_t *fd);
-
-struct dirent *glfs_readdirplus (glfs_fd_t *fd, struct stat *stat);
-
-long glfs_telldir (glfs_fd_t *fd);
-
-void glfs_seekdir (glfs_fd_t *fd, long offset);
-
-int glfs_closedir (glfs_fd_t *fd);
-
-int glfs_statvfs (glfs_t *fs, const char *path, struct statvfs *buf);
-
-int glfs_chmod (glfs_t *fs, const char *path, mode_t mode);
-
-int glfs_fchmod (glfs_fd_t *fd, mode_t mode);
-
-int glfs_chown (glfs_t *fs, const char *path, uid_t uid, gid_t gid);
-
-int glfs_lchown (glfs_t *fs, const char *path, uid_t uid, gid_t gid);
-
-int glfs_fchown (glfs_fd_t *fd, uid_t uid, gid_t gid);
-
-int glfs_utimens (glfs_t *fs, const char *path, struct timespec times[2]);
-
-int glfs_lutimens (glfs_t *fs, const char *path, struct timespec times[2]);
-
-int glfs_futimens (glfs_fd_t *fd, struct timespec times[2]);
-
-ssize_t glfs_getxattr (glfs_t *fs, const char *path, const char *name,
-		       void *value, size_t size);
-
-ssize_t glfs_lgetxattr (glfs_t *fs, const char *path, const char *name,
-			void *value, size_t size);
-
-ssize_t glfs_fgetxattr (glfs_fd_t *fd, const char *name,
-			void *value, size_t size);
-
-ssize_t glfs_listxattr (glfs_t *fs, const char *path, void *value, size_t size);
-
-ssize_t glfs_llistxattr (glfs_t *fs, const char *path, void *value,
-			 size_t size);
-
-ssize_t glfs_flistxattr (glfs_fd_t *fd, void *value, size_t size);
-
-int glfs_setxattr (glfs_t *fs, const char *path, const char *name,
-		   const void *value, size_t size, int flags);
-
-int glfs_lsetxattr (glfs_t *fs, const char *path, const char *name,
-		    const void *value, size_t size, int flags);
-
-int glfs_fsetxattr (glfs_fd_t *fd, const char *name,
-		    const void *value, size_t size, int flags);
-
-int glfs_removexattr (glfs_t *fs, const char *path, const char *name);
-
-int glfs_lremovexattr (glfs_t *fs, const char *path, const char *name);
-
-int glfs_fremovexattr (glfs_fd_t *fd, const char *name);
-
-int glfs_fallocate(glfs_fd_t *fd, int keep_size, off_t offset, size_t len);
-
-int glfs_discard(glfs_fd_t *fd, off_t offset, size_t len);
-
-
-int glfs_discard_async (glfs_fd_t *fd, off_t length, size_t lent,
-			glfs_io_cbk fn, void *data);
-
-int glfs_zerofill(glfs_fd_t *fd, off_t offset, size_t len);
-
-int glfs_zerofill_async (glfs_fd_t *fd, off_t length, size_t len,
-                        glfs_io_cbk fn, void *data);
-
-char *glfs_getcwd (glfs_t *fs, char *buf, size_t size);
-
-int glfs_chdir (glfs_t *fs, const char *path);
-
-int glfs_fchdir (glfs_fd_t *fd);
-
-char *glfs_realpath (glfs_t *fs, const char *path, char *resolved_path);
-
-/*
- * @cmd and @flock are as specified in man fcntl(2).
- */
-int glfs_posix_lock (glfs_fd_t *fd, int cmd, struct flock *flock);
-
-glfs_fd_t *glfs_dup (glfs_fd_t *fd);
-
-__END_DECLS
-
-#endif /* !_GLFS_H */
diff --git a/argp-standalone/configure.ac b/argp-standalone/configure.ac
index 2ecd2a801..65ebc4518 100644
--- a/argp-standalone/configure.ac
+++ b/argp-standalone/configure.ac
@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([argp-ba.c])
 AC_CONFIG_AUX_DIR([.])
 
 AM_INIT_AUTOMAKE
-AC_CONFIG_HEADERS(config.h)
+AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
 
@@ -22,7 +22,7 @@ AC_GNU_SOURCE
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
-AC_PROG_CC
+AM_PROG_CC_STDC
 
 if test "x$am_cv_prog_cc_stdc" = xno ; then
   AC_ERROR([the C compiler doesn't handle ANSI-C])
diff --git a/autogen.sh b/autogen.sh
index f937e6be0..e20408bf2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,105 +1,8 @@
 #!/bin/sh
 
-echo
-echo ... GlusterFS autogen ...
-echo
-
-## Check all dependencies are present
-MISSING=""
-
-# Check for aclocal
-env aclocal --version > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-  ACLOCAL=aclocal
-else
-  MISSING="$MISSING aclocal"
-fi
-
-# Check for autoconf
-env autoconf --version > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-  AUTOCONF=autoconf
-else
-  MISSING="$MISSING autoconf"
-fi
-
-# Check for autoheader
-env autoheader --version > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-  AUTOHEADER=autoheader
-else
-  MISSING="$MISSING autoheader"
-fi
-
-# Check for automake
-env automake --version > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-  AUTOMAKE=automake
-else
-  MISSING="$MISSING automake"
-fi
-
-# Check for libtoolize or glibtoolize
-env libtoolize --version > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-  # libtoolize was found, so use it
-  TOOL=libtoolize
-else
-  # libtoolize wasn't found, so check for glibtoolize
-  env glibtoolize --version > /dev/null 2>&1
-  if [ $? -eq 0 ]; then
-    TOOL=glibtoolize
-  else
-    MISSING="$MISSING libtoolize/glibtoolize"
-  fi
-fi
-
-# Check for tar
-env tar --version > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-  MISSING="$MISSING tar"
-fi
-
-## If dependencies are missing, warn the user and abort
-if [ "x$MISSING" != "x" ]; then
-  echo "Aborting."
-  echo
-  echo "The following build tools are missing:"
-  echo
-  for pkg in $MISSING; do
-    echo "  * $pkg"
-  done
-  echo
-  echo "Please install them and try again."
-  echo
-  exit 1
-fi
-
-## generate gf-error-codes.h from error-codes.json
-echo "Generate gf-error-codes.h ..."
-if ./gen-headers.py; then
-    if ! mv -fv gf-error-codes.h libglusterfs/src/gf-error-codes.h; then
-	exit 1
-    fi
-else
-    exit 1
-fi
-
-## Do the autogeneration
-echo Running ${ACLOCAL}...
-$ACLOCAL -I ./contrib/aclocal
-echo Running ${AUTOHEADER}...
-$AUTOHEADER
-echo Running ${TOOL}...
-$TOOL --automake --copy --force
-echo Running ${AUTOCONF}...
-$AUTOCONF
-echo Running ${AUTOMAKE}...
-$AUTOMAKE --add-missing --copy --foreign
-
-# Run autogen in the argp-standalone sub-directory
+aclocal
+autoheader
+(libtoolize --automake --copy --force || glibtoolize --automake --copy --force)
+autoconf
+automake --add-missing --copy --foreign
 cd argp-standalone;./autogen.sh
-
-# Instruct user on next steps
-echo
-echo "Please proceed with configuring, compiling, and installing."
diff --git a/booster/Makefile.am b/booster/Makefile.am
new file mode 100644
index 000000000..e1c45f305
--- /dev/null
+++ b/booster/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=src
+\ No newline at end of file
diff --git a/booster/src/Makefile.am b/booster/src/Makefile.am
new file mode 100644
index 000000000..d7d83abf5
--- /dev/null
+++ b/booster/src/Makefile.am
@@ -0,0 +1,21 @@
+ldpreload_LTLIBRARIES = libglusterfs-booster.la
+ldpreloaddir = $(libdir)/glusterfs
+noinst_HEADERS = booster_fstab.h booster-fd.h
+libglusterfs_booster_la_SOURCES = booster.c booster_stat.c booster_fstab.c booster-fd.c
+libglusterfs_booster_la_CFLAGS = -I$(top_srcdir)/libglusterfsclient/src/ -D_GNU_SOURCE -D$(GF_HOST_OS) -fPIC -Wall \
+	-pthread $(GF_BOOSTER_CFLAGS) -shared -nostartfiles 
+libglusterfs_booster_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE  \
+	-I$(top_srcdir)/libglusterfsclient/src \
+	-I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" \
+	-DCONFDIR=\"$(sysconfdir)/glusterfs\" $(ARGP_STANDALONE_CPPFLAGS)
+
+libglusterfs_booster_la_LDFLAGS = -module -avoidversion
+libglusterfs_booster_la_LIBADD =  $(top_builddir)/libglusterfs/src/libglusterfs.la $(top_builddir)/libglusterfsclient/src/libglusterfsclient.la
+
+CLEANFILES =
+
+uninstall-local:
+	rm -f $(DESTDIR)$(ldpreloaddir)/glusterfs-booster.so
+
+install-data-hook:
+	ln -sf libglusterfs-booster.so $(DESTDIR)$(ldpreloaddir)/glusterfs-booster.so
diff --git a/booster/src/booster-fd.c b/booster/src/booster-fd.c
new file mode 100644
index 000000000..0f08890be
--- /dev/null
+++ b/booster/src/booster-fd.c
@@ -0,0 +1,342 @@
+/*
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+
+#include "booster-fd.h"
+#include <logging.h>
+#include <mem-pool.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <common-utils.h>
+#include <string.h>
+
+#include <assert.h>
+
+extern fd_t *
+fd_ref (fd_t *fd);
+
+extern void
+fd_unref (fd_t *fd);
+/*
+   Allocate in memory chunks of power of 2 starting from 1024B
+   Assumes fdtable->lock is held
+   */
+static inline uint
+gf_roundup_power_of_two (uint nr)
+{
+        uint result = 1;
+
+        if (nr < 0) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "Negative number passed");
+                return -1;
+        }
+        
+        while (result <= nr)
+                result *= 2;
+
+        return result;
+}
+
+#define BOOSTER_NFDBITS (sizeof (unsigned long))
+
+#define BOOSTER_FDMASK(d)             (1UL << ((d) % BOOSTER_NFDBITS))
+#define BOOSTER_FDELT(d)              (d / BOOSTER_NFDBITS)
+#define BOOSTER_FD_SET(set, d)        (set->fd_bits[BOOSTER_FDELT(d)] |= BOOSTER_FDMASK(d))
+#define BOOSTER_FD_CLR(set, d)        (set->fd_bits[BOOSTER_FDELT(d)] &= ~BOOSTER_FDMASK(d))
+#define BOOSTER_FD_ISSET(set, d)      (set->fd_bits[BOOSTER_FDELT(d)] & BOOSTER_FDMASK(d))
+
+inline int
+booster_get_close_on_exec (booster_fdtable_t *fdtable, int fd)
+{
+        return BOOSTER_FD_ISSET(fdtable->close_on_exec, fd);
+}
+
+inline void
+booster_set_close_on_exec (booster_fdtable_t *fdtable, int fd)
+{
+        BOOSTER_FD_SET(fdtable->close_on_exec, fd);
+}
+
+int
+booster_fdtable_expand (booster_fdtable_t *fdtable, uint nr)
+{
+        fd_t    **oldfds = NULL, **tmp = NULL;
+        uint    oldmax_fds = -1;
+        uint    cpy = 0;
+        int32_t ret = -1, bytes = 0;
+        booster_fd_set_t *oldclose_on_exec = NULL;
+
+        if (fdtable == NULL || nr < 0) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "Invalid argument");
+                errno = EINVAL;
+                ret = -1;
+                goto out;
+        }
+
+        nr /= (1024 / sizeof (fd_t *));
+        nr = gf_roundup_power_of_two (nr + 1);
+        nr *= (1024 / sizeof (fd_t *));
+
+        oldfds = fdtable->fds;
+        oldmax_fds = fdtable->max_fds;
+        oldclose_on_exec = fdtable->close_on_exec;
+
+        fdtable->fds = CALLOC (nr, sizeof (fd_t *));
+        if (fdtable->fds == NULL) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "Memory allocation failed");
+                fdtable->fds = oldfds;
+                oldfds = NULL;
+                ret = -1;
+                goto out;
+        }
+
+        fdtable->max_fds = nr;
+
+        if (oldfds) {
+                cpy = oldmax_fds * sizeof (fd_t *);
+                memcpy (fdtable->fds, oldfds, cpy);
+        }
+
+        /* nr will be either less than 8 or a multiple of 8 */
+        bytes = nr/8;
+        bytes = bytes ? bytes : 1;
+        fdtable->close_on_exec = CALLOC (bytes, 1);
+        if (fdtable->close_on_exec == NULL) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "Memory allocation "
+                        "failed");
+                tmp = fdtable->fds;
+                fdtable->fds = oldfds;
+                oldfds = tmp;
+                ret = -1;
+                goto out;
+        }
+
+        if (oldclose_on_exec != NULL) {
+                bytes = oldmax_fds/8;
+                cpy = bytes ? bytes : 1;
+                memcpy (fdtable->close_on_exec, oldclose_on_exec, cpy);
+        }
+        gf_log ("booster-fd", GF_LOG_TRACE, "FD-table expanded: Old: %d,New: %d"
+                , oldmax_fds, nr);
+        ret = 0;
+
+out:
+        FREE (oldfds);
+        FREE (oldclose_on_exec);
+
+        return ret;
+}
+
+booster_fdtable_t *
+booster_fdtable_alloc (void)
+{
+        booster_fdtable_t *fdtable = NULL;
+        int32_t            ret = -1;
+
+        fdtable = CALLOC (1, sizeof (*fdtable));
+        GF_VALIDATE_OR_GOTO ("booster-fd", fdtable, out);
+
+        LOCK_INIT (&fdtable->lock);
+
+        LOCK (&fdtable->lock);
+        {
+                ret = booster_fdtable_expand (fdtable, 0);
+        }
+        UNLOCK (&fdtable->lock);
+
+        if (ret == -1) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "FD-table allocation "
+                        "failed");
+                FREE (fdtable);
+                fdtable = NULL;
+        }
+
+out:
+        return fdtable;
+}
+
+fd_t **
+__booster_fdtable_get_all_fds (booster_fdtable_t *fdtable, uint *count)
+{
+        fd_t **fds = NULL;
+
+        if (count == NULL)
+                goto out;
+
+        fds = fdtable->fds;
+        fdtable->fds = calloc (fdtable->max_fds, sizeof (fd_t *));
+        *count = fdtable->max_fds;
+
+out:
+        return fds;
+}
+
+fd_t **
+booster_fdtable_get_all_fds (booster_fdtable_t *fdtable, uint *count)
+{
+        fd_t **fds = NULL;
+        if (!fdtable)
+                return NULL;
+
+        LOCK (&fdtable->lock);
+        {
+                fds = __booster_fdtable_get_all_fds (fdtable, count);
+        }
+        UNLOCK (&fdtable->lock);
+
+        return fds;
+}
+
+void
+booster_fdtable_destroy (booster_fdtable_t *fdtable)
+{
+        fd_t                    *fd = NULL;
+        fd_t                    **fds = NULL;
+        uint                    fd_count = 0;
+        int                     i = 0;
+
+        if (!fdtable)
+                return;
+
+        LOCK (&fdtable->lock);
+        {
+                fds = __booster_fdtable_get_all_fds (fdtable, &fd_count);
+                FREE (fdtable->fds);
+        }
+        UNLOCK (&fdtable->lock);
+
+        if (!fds)
+                goto free_table;
+        
+        for (i = 0; i < fd_count; i++) {
+                fd = fds[i];
+                if (fd != NULL)
+                        fd_unref (fd);
+        }
+        FREE (fds);
+free_table:
+        LOCK_DESTROY (&fdtable->lock);
+        FREE (fdtable);
+}
+
+int
+booster_fd_unused_get (booster_fdtable_t *fdtable, fd_t *fdptr, int fd)
+{
+        int ret = -1;
+        int error = 0;
+
+        if (fdtable == NULL || fdptr == NULL || fd < 0) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "invalid argument");
+                errno = EINVAL;
+                return -1;
+        }
+
+        gf_log ("booster-fd", GF_LOG_TRACE, "Requested fd: %d", fd);
+        LOCK (&fdtable->lock);
+        {
+                while (fdtable->max_fds < fd) {
+                        error = 0;
+                        error = booster_fdtable_expand (fdtable,
+                                                        fdtable->max_fds + 1);
+                        if (error) {
+                                gf_log ("booster-fd", GF_LOG_ERROR,
+                                        "Cannot expand fdtable:%s",
+                                        strerror (error));
+                                goto err;
+                        }
+                }
+
+                if (!fdtable->fds[fd]) {
+                        fdtable->fds[fd] = fdptr;
+                        fd_ref (fdptr);
+                        ret = fd;
+                } else
+                        gf_log ("booster-fd", GF_LOG_ERROR, "Cannot allocate fd"
+                                " %d (slot not empty in fdtable)", fd);
+        }
+err:
+        UNLOCK (&fdtable->lock);
+
+        return ret;
+}
+
+void
+booster_fd_put (booster_fdtable_t *fdtable, int fd)
+{
+        fd_t *fdptr = NULL;
+        if (fdtable == NULL || fd < 0) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "invalid argument");
+                return;
+        }
+
+        gf_log ("booster-fd", GF_LOG_TRACE, "FD put: %d", fd);
+        if (!(fd < fdtable->max_fds)) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "FD not in booster fd"
+                        " table");
+                return;
+        }
+
+        LOCK (&fdtable->lock);
+        {
+                fdptr = fdtable->fds[fd];
+                fdtable->fds[fd] = NULL;
+        }
+        UNLOCK (&fdtable->lock);
+
+        if (fdptr)
+                fd_unref (fdptr);
+}
+
+fd_t *
+booster_fdptr_get (booster_fdtable_t *fdtable, int fd)
+{
+        fd_t *fdptr = NULL;
+
+        if (fdtable == NULL || fd < 0) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "invalid argument");
+                errno = EINVAL;
+                return NULL;
+        }
+
+        gf_log ("booster-fd", GF_LOG_TRACE, "FD ptr request: %d", fd);
+        if (!(fd < fdtable->max_fds)) {
+                gf_log ("booster-fd", GF_LOG_ERROR, "FD not in booster fd"
+                        " table");
+                errno = EINVAL;
+                return NULL;
+        }
+
+        LOCK (&fdtable->lock);
+        {
+                fdptr = fdtable->fds[fd];
+                if (fdptr)
+                        fd_ref (fdptr);
+        }
+        UNLOCK (&fdtable->lock);
+
+        return fdptr;
+}
+
+void
+booster_fdptr_put (fd_t *booster_fd)
+{
+        if (booster_fd)
+                fd_unref (booster_fd);
+}
diff --git a/booster/src/booster-fd.h b/booster/src/booster-fd.h
new file mode 100644
index 000000000..27057c728
--- /dev/null
+++ b/booster/src/booster-fd.h
@@ -0,0 +1,83 @@
+/*
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _BOOSTER_FD_H
+#define _BOOSTER_FD_H
+
+#include <libglusterfsclient.h>
+#include <locking.h>
+#include <list.h>
+
+/* This struct must be updated if the fd_t in fd.h changes.
+ * We cannot include those headers here because unistd.h, included
+ * by glusterfs headers, conflicts with the syscall prototypes we
+ * define for booster.
+ */
+struct _fd {
+        pid_t             pid;
+	int32_t           flags;
+        int32_t           refcount;
+        struct list_head  inode_list;
+        struct _inode    *inode;
+        struct _dict     *ctx;
+        gf_lock_t         lock; /* used ONLY for manipulating
+                                   'struct _fd_ctx' array (_ctx).*/
+	struct _fd_ctx   *_ctx;
+};
+typedef struct _fd fd_t;
+
+struct _booster_fd_set {
+        unsigned long fd_bits[0];
+};
+typedef struct _booster_fd_set booster_fd_set_t;
+
+struct _booster_fdtable {
+        booster_fd_set_t *close_on_exec;
+        int               refcount;
+        unsigned int      max_fds;
+        gf_lock_t         lock;
+        fd_t            **fds;
+};
+typedef struct _booster_fdtable booster_fdtable_t;
+
+void
+booster_set_close_on_exec (booster_fdtable_t *fdtable, int fd);
+
+int
+booster_get_close_on_exec (booster_fdtable_t *fdtable, int fd);
+
+extern int
+booster_fd_unused_get (booster_fdtable_t *fdtable, fd_t *fdptr, int fd);
+
+extern void
+booster_fd_put (booster_fdtable_t *fdtable, int fd);
+
+extern fd_t *
+booster_fdptr_get (booster_fdtable_t *fdtable, int fd);
+
+extern void
+booster_fdptr_put (fd_t *fdptr);
+
+extern void
+booster_fdtable_destroy (booster_fdtable_t *fdtable);
+
+booster_fdtable_t *
+booster_fdtable_alloc (void);
+
+#endif /* #ifndef _BOOSTER_FD_H */
diff --git a/booster/src/booster.c b/booster/src/booster.c
new file mode 100644
index 000000000..c34ec1146
--- /dev/null
+++ b/booster/src/booster.c
@@ -0,0 +1,3172 @@
+/*
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include <dlfcn.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <libglusterfsclient.h>
+#include <list.h>
+#include <pthread.h>
+#include <sys/xattr.h>
+#include <string.h>
+#include <assert.h>
+#include <errno.h>
+#include <ctype.h>
+#include <logging.h>
+#include <utime.h>
+#include <dirent.h>
+#include <sys/statfs.h>
+#include <sys/statvfs.h>
+#include <fcntl.h>
+#include "booster-fd.h"
+
+#ifndef GF_UNIT_KB
+#define GF_UNIT_KB 1024
+#endif
+
+static pthread_mutex_t cwdlock   = PTHREAD_MUTEX_INITIALIZER;
+
+/* attr constructor registers this function with libc's
+ * _init function as a function that must be called before
+ * the main() of the program.
+ */
+static void booster_lib_init (void) __attribute__((constructor));
+
+extern fd_t *
+fd_ref (fd_t *fd);
+
+extern void
+fd_unref (fd_t *fd);
+
+extern int pipe (int filedes[2]);
+/* We define these flags so that we can remove fcntl.h from the include path.
+ * fcntl.h has certain defines and other lines of code that redirect the
+ * application's open and open64 calls to the syscalls defined by
+ * libc, for us, thats not a Good Thing (TM).
+ */
+#ifndef GF_O_CREAT
+#define GF_O_CREAT      0x40
+#endif
+
+#ifndef GF_O_TRUNC
+#define GF_O_TRUNC      0x200
+#endif
+
+#ifndef GF_O_RDWR
+#define GF_O_RDWR       0x2
+#endif
+
+#ifndef GF_O_WRONLY
+#define GF_O_WRONLY     0x1
+#endif
+
+#ifndef UNIX_PATH_MAX
+#define UNIX_PATH_MAX 108
+#endif
+
+typedef enum {
+        BOOSTER_OPEN,
+        BOOSTER_CREAT
+} booster_op_t;
+
+struct _inode;
+struct _dict;
+
+ssize_t
+write (int fd, const void *buf, size_t count);
+
+/* open, open64, creat */
+static int (*real_open) (const char *pathname, int flags, ...);
+static int (*real_open64) (const char *pathname, int flags, ...);
+static int (*real_creat) (const char *pathname, mode_t mode);
+static int (*real_creat64) (const char *pathname, mode_t mode);
+
+/* read, readv, pread, pread64 */
+static ssize_t (*real_read) (int fd, void *buf, size_t count);
+static ssize_t (*real_readv) (int fd, const struct iovec *vector, int count);
+static ssize_t (*real_pread) (int fd, void *buf, size_t count,
+                              unsigned long offset);
+static ssize_t (*real_pread64) (int fd, void *buf, size_t count,
+                                uint64_t offset);
+
+/* write, writev, pwrite, pwrite64 */
+static ssize_t (*real_write) (int fd, const void *buf, size_t count);
+static ssize_t (*real_writev) (int fd, const struct iovec *vector, int count);
+static ssize_t (*real_pwrite) (int fd, const void *buf, size_t count,
+                               unsigned long offset);
+static ssize_t (*real_pwrite64) (int fd, const void *buf, size_t count,
+                                 uint64_t offset);
+
+/* lseek, llseek, lseek64 */
+static off_t (*real_lseek) (int fildes, unsigned long offset, int whence);
+static off_t (*real_lseek64) (int fildes, uint64_t offset, int whence);
+
+/* close */
+static int (*real_close) (int fd);
+
+/* dup dup2 */
+static int (*real_dup) (int fd);
+static int (*real_dup2) (int oldfd, int newfd);
+
+static pid_t (*real_fork) (void);
+static int (*real_mkdir) (const char *pathname, mode_t mode);
+static int (*real_rmdir) (const char *pathname);
+static int (*real_chmod) (const char *pathname, mode_t mode);
+static int (*real_chown) (const char *pathname, uid_t owner, gid_t group);
+static int (*real_fchmod) (int fd, mode_t mode);
+static int (*real_fchown) (int fd, uid_t, gid_t gid);
+static int (*real_fsync) (int fd);
+static int (*real_ftruncate) (int fd, off_t length);
+static int (*real_ftruncate64) (int fd, loff_t length);
+static int (*real_link) (const char *oldpath, const char *newname);
+static int (*real_rename) (const char *oldpath, const char *newpath);
+static int (*real_utimes) (const char *path, const struct timeval times[2]);
+static int (*real_utime) (const char *path, const struct utimbuf *buf);
+static int (*real_mknod) (const char *path, mode_t mode, dev_t dev);
+static int (*real_mkfifo) (const char *path, mode_t mode);
+static int (*real_unlink) (const char *path);
+static int (*real_symlink) (const char *oldpath, const char *newpath);
+static int (*real_readlink) (const char *path, char *buf, size_t bufsize);
+static char * (*real_realpath) (const char *path, char *resolved);
+static DIR * (*real_opendir) (const char *path);
+static struct dirent * (*real_readdir) (DIR *dir);
+static struct dirent64 * (*real_readdir64) (DIR *dir);
+static int (*real_readdir_r) (DIR *dir, struct dirent *entry,
+                              struct dirent **result);
+static int (*real_readdir64_r) (DIR *dir, struct dirent64 *entry,
+                                struct dirent64 **result);
+static int (*real_closedir) (DIR *dh);
+static int (*real___xstat) (int ver, const char *path, struct stat *buf);
+static int (*real___xstat64) (int ver, const char *path, struct stat64 *buf);
+static int (*real_stat) (const char *path, struct stat *buf);
+static int (*real_stat64) (const char *path, struct stat64 *buf);
+static int (*real___fxstat) (int ver, int fd, struct stat *buf);
+static int (*real___fxstat64) (int ver, int fd, struct stat64 *buf);
+static int (*real_fstat) (int fd, struct stat *buf);
+static int (*real_fstat64) (int fd , struct stat64 *buf);
+static int (*real___lxstat) (int ver, const char *path, struct stat *buf);
+static int (*real___lxstat64) (int ver, const char *path, struct stat64 *buf);
+static int (*real_lstat) (const char *path, struct stat *buf);
+static int (*real_lstat64) (const char *path, struct stat64 *buf);
+static int (*real_statfs) (const char *path, struct statfs *buf);
+static int (*real_statfs64) (const char *path, struct statfs64 *buf);
+static int (*real_statvfs) (const char *path, struct statvfs *buf);
+static int (*real_statvfs64) (const char *path, struct statvfs64 *buf);
+static ssize_t (*real_getxattr) (const char *path, const char *name,
+                                 void *value, size_t size);
+static ssize_t (*real_lgetxattr) (const char *path, const char *name,
+                                  void *value, size_t size);
+static int (*real_remove) (const char* path);
+static int (*real_lchown) (const char *path, uid_t owner, gid_t group);
+static void (*real_rewinddir) (DIR *dirp);
+static void (*real_seekdir) (DIR *dirp, off_t offset);
+static off_t (*real_telldir) (DIR *dirp);
+
+static ssize_t (*real_sendfile) (int out_fd, int in_fd, off_t *offset,
+                                 size_t count);
+static ssize_t (*real_sendfile64) (int out_fd, int in_fd, off_t *offset,
+                                   size_t count);
+static int (*real_fcntl) (int fd, int cmd, ...);
+static int (*real_chdir) (const char *path);
+static int (*real_fchdir) (int fd);  
+static char * (*real_getcwd) (char *buf, size_t size);
+static int (*real_truncate) (const char *path, off_t length);
+static int (*real_truncate64) (const char *path, loff_t length);
+static int (*real_setxattr) (const char *path, const char *name,
+                             const void *value, size_t size, int flags);
+static int (*real_lsetxattr) (const char *path, const char *name,
+                              const void *value, size_t size, int flags);
+static int (*real_fsetxattr) (int filedes, const char *name,
+                              const void *value, size_t size, int flags);
+
+
+#define RESOLVE(sym) do {                                       \
+                if (!real_##sym)                                \
+                        real_##sym = dlsym (RTLD_NEXT, #sym);   \
+        } while (0)
+
+/*TODO: set proper value */
+#define MOUNT_HASH_SIZE 256
+
+struct booster_mount {
+        dev_t st_dev;
+        glusterfs_handle_t handle;
+        struct list_head device_list;
+};
+typedef struct booster_mount booster_mount_t;
+
+static booster_fdtable_t *booster_fdtable = NULL;
+
+extern int booster_configure (char *confpath);
+/* This is dup'ed every time VMP open/creat wants a new fd.
+ * This is needed so we occupy an entry in the process' file
+ * table.
+ */
+int process_piped_fd = -1;
+
+static int
+booster_get_process_fd ()
+{
+        return real_dup (process_piped_fd);
+}
+
+/* The following two define which file contains
+ * the FSTAB configuration for VMP-based usage.
+ */
+#define DEFAULT_BOOSTER_CONF    CONFDIR"/booster.conf"
+#define BOOSTER_CONF_ENV_VAR    "GLUSTERFS_BOOSTER_FSTAB"
+
+
+/* The following define which log file is used when
+ * using the old mount point bypass approach.
+ */
+#define BOOSTER_DEFAULT_LOG     CONFDIR"/booster.log"
+#define BOOSTER_LOG_ENV_VAR     "GLUSTERFS_BOOSTER_LOG"
+
+void
+do_open (int fd, const char *pathname, int flags, mode_t mode, booster_op_t op)
+{
+        char                   *specfile = NULL;
+        char                   *mount_point = NULL; 
+        int32_t                 size = 0;
+        int32_t                 ret = -1;
+        FILE                   *specfp = NULL;
+        glusterfs_file_t        fh = NULL;
+        char                   *logfile = NULL;
+        glusterfs_init_params_t iparams = {
+                .loglevel = "error",
+                .lookup_timeout = 600,
+                .stat_timeout = 600,
+        };
+      
+        gf_log ("booster", GF_LOG_DEBUG, "Opening using MPB: %s", pathname);
+        size = fgetxattr (fd, "user.glusterfs-booster-volfile", NULL, 0);
+        if (size == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Xattr "
+                        "user.glusterfs-booster-volfile not found: %s",
+                        strerror (errno));
+                goto out;
+        }
+		
+        specfile = calloc (1, size);
+        if (!specfile) {
+                gf_log ("booster", GF_LOG_ERROR, "Memory allocation failed");
+                goto out;
+        }
+
+        ret = fgetxattr (fd, "user.glusterfs-booster-volfile", specfile,
+                         size);
+        if (ret == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Xattr "
+                        "user.glusterfs-booster-volfile not found: %s",
+                        strerror (errno));
+                goto out;
+        }
+    
+        specfp = tmpfile ();
+        if (!specfp) {
+                gf_log ("booster", GF_LOG_ERROR, "Temp file creation failed"
+                        ": %s", strerror (errno));
+                goto out;
+        }
+
+        ret = fwrite (specfile, size, 1, specfp);
+        if (ret != 1) {
+                gf_log ("booster", GF_LOG_ERROR, "Failed to write volfile: %s",
+                        strerror (errno));
+                goto out;
+        }
+		
+        fseek (specfp, 0L, SEEK_SET);
+
+        size = fgetxattr (fd, "user.glusterfs-booster-mount", NULL, 0);
+        if (size == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Xattr "
+                        "user.glusterfs-booster-mount not found: %s",
+                        strerror (errno));
+                goto out;
+        }
+        
+        mount_point = calloc (size, sizeof (char));
+        if (!mount_point) {
+                gf_log ("booster", GF_LOG_ERROR, "Memory allocation failed");
+                goto out;
+        }
+	
+        ret = fgetxattr (fd, "user.glusterfs-booster-mount", mount_point, size);
+        if (ret == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Xattr "
+                        "user.glusterfs-booster-mount not found: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        logfile = getenv (BOOSTER_LOG_ENV_VAR);
+        if (logfile) {
+                if (strlen (logfile) > 0)
+                        iparams.logfile = strdup (logfile);
+                else
+                        iparams.logfile = strdup (BOOSTER_DEFAULT_LOG);
+        } else {
+                iparams.logfile = strdup (BOOSTER_DEFAULT_LOG);
+        }
+
+        gf_log ("booster", GF_LOG_TRACE, "Using log-file: %s", iparams.logfile);
+        iparams.specfp = specfp;
+
+        ret = glusterfs_mount (mount_point, &iparams);
+        if (ret == -1) {
+                if (errno != EEXIST) {
+                        gf_log ("booster", GF_LOG_ERROR, "Mount failed over"
+                                " glusterfs");
+                        goto out;
+                } else
+                        gf_log ("booster", GF_LOG_ERROR, "Already mounted");
+        }
+
+        switch (op) {
+        case BOOSTER_OPEN:
+                gf_log ("booster", GF_LOG_TRACE, "Booster open call");
+                fh = glusterfs_open (pathname, flags, mode);
+                break;
+
+        case BOOSTER_CREAT:
+                gf_log ("booster", GF_LOG_TRACE, "Booster create call");
+                fh = glusterfs_creat (pathname, mode);
+                break;
+        }
+
+        if (!fh) {
+                gf_log ("booster", GF_LOG_ERROR, "Error performing operation");
+                goto out;
+        }
+
+        if (booster_fd_unused_get (booster_fdtable, fh, fd) == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Failed to get unused FD");
+                goto out;
+        }
+        fh = NULL;
+
+out:
+        if (specfile) {
+                free (specfile);
+        }
+
+        if (specfp) {
+                fclose (specfp);
+        }
+
+        if (mount_point) {
+                free (mount_point);
+        }
+
+        if (fh) {
+                glusterfs_close (fh);
+        }
+
+        return;
+}
+
+int
+vmp_open (const char *pathname, int flags, ...)
+{
+        mode_t                  mode = 0;
+        int                     fd = -1;
+        glusterfs_file_t        fh = NULL;
+        va_list                 ap;
+
+        if (flags & GF_O_CREAT) {
+                va_start (ap, flags);
+                mode = va_arg (ap, mode_t);
+                va_end (ap);
+
+                fh = glusterfs_open (pathname, flags, mode);
+        }
+        else
+                fh = glusterfs_open (pathname, flags);
+
+        if (!fh) {
+                gf_log ("booster", GF_LOG_ERROR, "VMP open failed");
+                goto out;
+        }
+
+        fd = booster_get_process_fd ();
+        if (fd == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Failed to create open fd");
+                goto fh_close_out;
+        }
+
+        if (booster_fd_unused_get (booster_fdtable, fh, fd) == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Failed to map fd into table");
+                goto realfd_close_out;
+        }
+
+        return fd;
+
+realfd_close_out:
+        real_close (fd);
+        fd = -1;
+
+fh_close_out:
+        glusterfs_close (fh);
+
+out:
+        return fd;
+}
+
+#define BOOSTER_USE_OPEN64          1
+#define BOOSTER_DONT_USE_OPEN64     0
+
+int
+booster_open (const char *pathname, int use64, int flags, ...)
+{
+        int     ret = -1;
+        mode_t  mode = 0;
+        va_list ap;
+        int     (*my_open) (const char *pathname, int flags, ...);
+
+        if (!pathname) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        gf_log ("booster", GF_LOG_TRACE, "Open: %s", pathname);
+        /* First try opening through the virtual mount point.
+         * The difference lies in the fact that:
+         * 1. We depend on libglusterfsclient library to perform
+         * the translation from the path to handle.
+         * 2. We do not go to the file system for the fd, instead
+         * we use booster_get_process_fd (), which returns a dup'ed
+         * fd of a pipe created in booster_init.
+         */
+        if (flags & GF_O_CREAT) {
+                va_start (ap, flags);
+                mode = va_arg (ap, mode_t);
+                va_end (ap);
+                ret = vmp_open (pathname, flags, mode);
+        }
+        else
+                ret = vmp_open (pathname, flags);
+
+        /* We receive an ENODEV if the VMP does not exist. If we
+         * receive an error other than ENODEV, it means, there
+         * actually was an error performing vmp_open. This must
+         * be returned to the user.
+         */
+        if ((ret < 0) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "Error in opening file over "
+                        " VMP: %s", strerror (errno));
+                goto out;
+        }
+
+        if (ret > 0) {
+                gf_log ("booster", GF_LOG_TRACE, "File opened");
+                goto out;
+        }
+
+        if (use64) {
+                gf_log ("booster", GF_LOG_TRACE, "Using 64-bit open");
+		my_open = real_open64;
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Using 32-bit open");
+		my_open = real_open;
+        }
+
+        /* It is possible the RESOLVE macro is not able
+         * to resolve the symbol of a function, in that case
+         * we dont want to seg-fault on calling a NULL functor.
+         */
+        if (my_open == NULL) {
+                gf_log ("booster", GF_LOG_ERROR, "open not resolved");
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+	if (flags & GF_O_CREAT) {
+		va_start (ap, flags);
+		mode = va_arg (ap, mode_t);
+		va_end (ap);
+
+                ret = my_open (pathname, flags, mode);
+	} else
+                ret = my_open (pathname, flags);
+
+        if (ret != -1) {
+                do_open (ret, pathname, flags, mode, BOOSTER_OPEN);
+        }
+
+out:
+        return ret;
+}
+
+/* This is done to over-write existing definitions of open and open64 inside
+ * libc with our own copies. __REDIRECT is provided by libc.
+ *
+ * XXX: This will not work anywhere other than libc based systems.
+ */
+int __REDIRECT (booster_false_open, (__const char *__file, int __oflag, ...),
+                open) __nonnull ((1));
+int __REDIRECT (booster_false_open64, (__const char *__file, int __oflag, ...),
+                open64) __nonnull ((1));
+int
+booster_false_open (const char *pathname, int flags, ...)
+{
+        int     ret;
+        mode_t  mode = 0;
+        va_list ap;
+
+        if (flags & GF_O_CREAT) {
+                va_start (ap, flags);
+                mode = va_arg (ap, mode_t);
+                va_end (ap);
+
+                ret = booster_open (pathname, BOOSTER_DONT_USE_OPEN64, flags,
+                                    mode);
+        }
+        else
+                ret = booster_open (pathname, BOOSTER_DONT_USE_OPEN64, flags);
+
+        return ret;
+}
+
+int
+booster_false_open64 (const char *pathname, int flags, ...)
+{
+        int     ret;
+        mode_t  mode = 0;
+        va_list ap;
+
+        if (flags & GF_O_CREAT) {
+                va_start (ap, flags);
+                mode = va_arg (ap, mode_t);
+                va_end (ap);
+
+                ret = booster_open (pathname, BOOSTER_USE_OPEN64, flags, mode);
+        }
+        else
+                ret = booster_open (pathname, BOOSTER_USE_OPEN64, flags);
+
+        return ret;
+}
+
+int
+vmp_creat (const char *pathname, mode_t mode)
+{
+        int                     fd = -1;
+        glusterfs_file_t        fh = NULL;
+
+        fh = glusterfs_creat (pathname, mode);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_ERROR, "Create failed: %s: %s",
+                        pathname, strerror (errno));
+                goto out;
+        }
+
+        fd = booster_get_process_fd ();
+        if (fd == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Failed to create fd");
+                goto close_out;
+        }
+
+        if ((booster_fd_unused_get (booster_fdtable, fh, fd)) == -1) {
+                gf_log ("booster", GF_LOG_ERROR, "Failed to map unused fd");
+                goto real_close_out;
+        }
+
+        return fd;
+
+real_close_out:
+        real_close (fd);
+        fd = -1;
+
+close_out:
+        glusterfs_close (fh);
+
+out:
+        return -1;
+}
+
+int __REDIRECT (booster_false_creat, (const char *pathname, mode_t mode),
+                creat) __nonnull ((1));
+int __REDIRECT (booster_false_creat64, (const char *pathname, mode_t mode),
+                creat64) __nonnull ((1));
+
+int
+booster_false_creat (const char *pathname, mode_t mode)
+{
+        int     ret = -1;
+        if (!pathname) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        gf_log ("booster", GF_LOG_TRACE, "Create: %s", pathname);
+        ret = vmp_creat (pathname, mode);
+
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "VMP create failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret > 0) {
+                gf_log ("booster", GF_LOG_TRACE, "File created");
+                goto out;
+        }
+
+        if (real_creat == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+        ret = real_creat (pathname, mode);
+
+        if (ret != -1) {
+                do_open (ret, pathname, GF_O_WRONLY | GF_O_TRUNC, mode,
+                         BOOSTER_CREAT);
+        } else
+                gf_log ("booster", GF_LOG_ERROR, "real create failed: %s",
+                        strerror (errno));
+
+out:
+        return ret;
+}
+
+
+int
+booster_false_creat64 (const char *pathname, mode_t mode)
+{
+        int     ret = -1;
+        if (!pathname) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        gf_log ("booster", GF_LOG_TRACE, "Create: %s", pathname);
+        ret = vmp_creat (pathname, mode);
+
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "VMP create failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret > 0) {
+                gf_log ("booster", GF_LOG_TRACE, "File created");
+                goto out;
+        }
+
+        if (real_creat64 == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+        ret = real_creat64 (pathname, mode);
+
+        if (ret != -1) {
+                do_open (ret, pathname, GF_O_WRONLY | GF_O_TRUNC, mode,
+                         BOOSTER_CREAT);
+        } else
+                gf_log ("booster", GF_LOG_ERROR, "real create failed: %s",
+                        strerror (errno));
+
+out:
+        return ret;
+}
+
+
+/* pread */
+
+ssize_t
+pread (int fd, void *buf, size_t count, unsigned long offset)
+{
+        ssize_t ret;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "pread: fd %d, count %lu, offset %lu"
+                ,fd, (long unsigned)count, offset);
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+        if (!glfs_fd) { 
+                gf_log ("booster", GF_LOG_TRACE, "Not booster fd");
+                if (real_pread == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_pread (fd, buf, count, offset);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_pread (glfs_fd, buf, count, offset);
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return ret;
+}
+
+
+ssize_t
+pread64 (int fd, void *buf, size_t count, uint64_t offset)
+{
+        ssize_t ret;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "pread64: fd %d, count %lu, offset %"
+                PRIu64, fd, (long unsigned)count, offset);
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+        if (!glfs_fd) { 
+                gf_log ("booster", GF_LOG_TRACE, "Not booster fd");
+                if (real_pread64 == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_pread64 (fd, buf, count, offset);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_pread (glfs_fd, buf, count, offset);
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return ret;
+}
+
+
+ssize_t
+read (int fd, void *buf, size_t count)
+{
+        int ret;
+        glusterfs_file_t glfs_fd;
+
+        gf_log ("booster", GF_LOG_TRACE, "read: fd %d, count %lu", fd,
+                (long unsigned)count);
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+        if (!glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Not booster fd");
+                if (real_read == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_read (fd, buf, count);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_read (glfs_fd, buf, count);
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return ret;
+}
+
+
+ssize_t
+readv (int fd, const struct iovec *vector, int count)
+{
+        int ret;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "readv: fd %d, iovecs %d", fd, count);
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+        if (!glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_readv == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_readv (fd, vector, count);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+		ret = glusterfs_readv (glfs_fd, vector, count);
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return ret;
+}
+
+
+ssize_t
+write (int fd, const void *buf, size_t count)
+{
+        int ret;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "write: fd %d, count %"GF_PRI_SIZET,
+                fd, count);
+
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+
+        if (!glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_write == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_write (fd, buf, count);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_write (glfs_fd, buf, count);
+                booster_fdptr_put (glfs_fd);
+        }
+ 
+        return ret;
+}
+
+ssize_t
+writev (int fd, const struct iovec *vector, int count)
+{
+        int ret = 0;
+        glusterfs_file_t glfs_fd = 0; 
+
+        gf_log ("booster", GF_LOG_TRACE, "writev: fd %d, iovecs %d", fd, count);
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+
+        if (!glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_writev == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_writev (fd, vector, count);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_writev (glfs_fd, vector, count);
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return ret;
+}
+
+
+ssize_t
+pwrite (int fd, const void *buf, size_t count, unsigned long offset)
+{
+        int ret;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "pwrite: fd %d, count %"GF_PRI_SIZET
+                ", offset %lu", fd, count, offset);
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+
+        if (!glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_pwrite == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_pwrite (fd, buf, count, offset);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_pwrite (glfs_fd, buf, count, offset);
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return ret;
+}
+
+
+ssize_t
+pwrite64 (int fd, const void *buf, size_t count, uint64_t offset)
+{
+        int ret;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "pwrite64: fd %d, count %"GF_PRI_SIZET
+                ", offset %"PRIu64, fd, count, offset);
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+
+        if (!glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_pwrite64 == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_pwrite64 (fd, buf, count, offset);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_pwrite (glfs_fd, buf, count, offset);
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return ret;
+}
+
+
+int
+close (int fd)
+{
+        int ret = -1;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "close: fd %d", fd);
+	glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+    
+	if (glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+		booster_fd_put (booster_fdtable, fd);
+		ret = glusterfs_close (glfs_fd);
+		booster_fdptr_put (glfs_fd);
+	}
+
+        ret = real_close (fd);
+
+        return ret;
+}
+
+#ifndef _LSEEK_DECLARED
+#define _LSEEK_DECLARED
+off_t
+lseek (int filedes, unsigned long offset, int whence)
+{
+        int ret;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "lseek: fd %d, offset %ld",
+                filedes, offset);
+
+        glfs_fd = booster_fdptr_get (booster_fdtable, filedes);
+        if (glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_lseek (glfs_fd, offset, whence);
+                booster_fdptr_put (glfs_fd);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_lseek == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_lseek (filedes, offset, whence);
+        }
+
+        return ret;
+}
+#endif
+
+off_t
+lseek64 (int filedes, uint64_t offset, int whence)
+{
+        int ret;
+        glusterfs_file_t glfs_fd = 0;
+
+
+        gf_log ("booster", GF_LOG_TRACE, "lseek: fd %d, offset %"PRIu64,
+                filedes, offset);
+        glfs_fd = booster_fdptr_get (booster_fdtable, filedes);
+        if (glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_lseek (glfs_fd, offset, whence);
+                booster_fdptr_put (glfs_fd);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_lseek64 == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_lseek64 (filedes, offset, whence);
+        }
+
+        return ret;
+}
+
+int 
+dup (int oldfd)
+{
+        int ret = -1, new_fd = -1;
+        glusterfs_file_t glfs_fd = 0;
+
+        gf_log ("booster", GF_LOG_TRACE, "dup: fd %d", oldfd);
+        glfs_fd = booster_fdptr_get (booster_fdtable, oldfd);
+        new_fd = real_dup (oldfd);
+
+        if (new_fd >=0 && glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = booster_fd_unused_get (booster_fdtable, glfs_fd,
+                                             new_fd);
+                fd_ref ((fd_t *)glfs_fd);
+                if (ret == -1) {
+                        gf_log ("booster", GF_LOG_ERROR,"Failed to map new fd");
+                        real_close (new_fd);
+                } 
+        }
+
+        if (glfs_fd) {
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return new_fd;
+}
+
+
+int 
+dup2 (int oldfd, int newfd)
+{
+        int ret = -1;
+        glusterfs_file_t old_glfs_fd = NULL, new_glfs_fd = NULL;
+
+        if (oldfd == newfd) {
+                return newfd;
+        }
+
+        old_glfs_fd = booster_fdptr_get (booster_fdtable, oldfd);
+        new_glfs_fd = booster_fdptr_get (booster_fdtable, newfd);
+ 
+        ret = real_dup2 (oldfd, newfd); 
+        if (ret >= 0) {
+                if (new_glfs_fd) {
+                        glusterfs_close (new_glfs_fd);
+                        booster_fdptr_put (new_glfs_fd);
+                        booster_fd_put (booster_fdtable, newfd);
+                        new_glfs_fd = 0;
+                }
+
+                if (old_glfs_fd) {
+                        ret = booster_fd_unused_get (booster_fdtable,
+                                                     old_glfs_fd, newfd);
+                        fd_ref ((fd_t *)old_glfs_fd);
+                        if (ret == -1) {
+                                real_close (newfd);
+                        }
+                }
+        } 
+
+        if (old_glfs_fd) {
+                booster_fdptr_put (old_glfs_fd);
+        }
+
+        if (new_glfs_fd) {
+                booster_fdptr_put (new_glfs_fd);
+        }
+
+        return ret;
+}
+
+int
+mkdir (const char *pathname, mode_t mode)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "mkdir: path %s", pathname);
+        ret = glusterfs_mkdir (pathname, mode);
+
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "mkdir failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "directory created");
+                return ret;
+        }
+
+        if (real_mkdir == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+        } else
+                ret = real_mkdir (pathname, mode);
+
+        return ret;
+}
+
+int
+rmdir (const char *pathname)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "rmdir: path %s", pathname);
+        ret = glusterfs_rmdir (pathname);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "rmdir failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "directory removed");
+                return ret;
+        }
+
+        if (real_rmdir == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_rmdir (pathname);
+
+        return ret;
+}
+
+int
+chmod (const char *pathname, mode_t mode)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "chmod: path %s", pathname);
+        ret = glusterfs_chmod (pathname, mode);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "chmod failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "chmod succeeded");
+                return ret;
+        }
+
+        if (real_chmod == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_chmod (pathname, mode);
+
+        return ret;
+}
+
+int
+chown (const char *pathname, uid_t owner, gid_t group)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "chown: path: %s", pathname);
+        ret = glusterfs_chown (pathname, owner, group);
+
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "chown failed: %s\n",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "chown succeeded");
+                return ret;
+        }
+
+        if (real_chown == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_chown (pathname, owner, group);
+
+        return ret;
+}
+
+int
+fchown (int fd, uid_t owner, gid_t group)
+{
+        int                     ret = -1;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "fchown: fd %d, uid %d, gid %d", fd,
+                owner, group);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_fchown == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_fchown (fd, owner, group);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fchown (fh, owner, group);
+                booster_fdptr_put (fh);
+        }
+
+        return ret;
+}
+
+
+#define MOUNT_TABLE_HASH_SIZE 256
+
+
+static void booster_cleanup (void);
+static int 
+booster_init (void)
+{
+        char    *booster_conf_path = NULL;
+        int     ret = -1;
+        int     pipefd[2];
+
+        booster_fdtable = booster_fdtable_alloc ();
+        if (!booster_fdtable) {
+                fprintf (stderr, "cannot allocate fdtable: %s\n",
+                         strerror (errno));
+		goto err;
+        }
+ 
+        if (pipe (pipefd) == -1) {
+                gf_log ("booster-fstab", GF_LOG_ERROR, "Pipe creation failed:%s"
+                        , strerror (errno));
+                goto err;
+        }
+
+        process_piped_fd = pipefd[0];
+        real_close (pipefd[1]);
+        /* libglusterfsclient based VMPs should be inited only
+         * after the file tables are inited so that if the socket
+         * calls use the fd based syscalls, the fd tables are
+         * correctly initialized to return a NULL handle, on which the
+         * socket calls will fall-back to the real API.
+         */
+        booster_conf_path = getenv (BOOSTER_CONF_ENV_VAR);
+        if (booster_conf_path != NULL) {
+                if (strlen (booster_conf_path) > 0)
+                        ret = booster_configure (booster_conf_path);
+                else {
+                        gf_log ("booster", GF_LOG_ERROR, "%s not defined, "
+                                "using default path: %s", BOOSTER_CONF_ENV_VAR,
+                                DEFAULT_BOOSTER_CONF);
+                        ret = booster_configure (DEFAULT_BOOSTER_CONF);
+                }
+        } else {
+                gf_log ("booster", GF_LOG_ERROR, "%s not defined, using default"
+                        " path: %s", BOOSTER_CONF_ENV_VAR,DEFAULT_BOOSTER_CONF);
+                ret = booster_configure (DEFAULT_BOOSTER_CONF);
+        }
+
+        atexit (booster_cleanup);
+        if (ret == 0)
+                gf_log ("booster", GF_LOG_DEBUG, "booster is inited");
+	return 0;
+
+err:
+        /* Sure we return an error value here
+         * but who cares about booster.
+         */
+	return -1; 
+}
+
+
+static void
+booster_cleanup (void)
+{
+        /* Ideally, we should be de-initing the fd-table
+         * here but the problem is that I've seen file accesses through booster
+         * continuing while the atexit registered function is called. That means
+         * , we cannot dealloc the fd-table since then there could be a crash
+         * while trying to determine whether a given fd is for libc or for
+         * libglusterfsclient.
+         * We should be satisfied with having cleaned up glusterfs contexts.
+         */
+        glusterfs_umount_all ();
+	glusterfs_reset ();
+}
+
+int
+fchmod (int fd, mode_t mode)
+{
+        int                     ret = -1;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "fchmod: fd %d, mode: 0x%x", fd, mode);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_fchmod == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_fchmod (fd, mode);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fchmod (fh, mode);
+                booster_fdptr_put (fh);
+        }
+
+        return ret;
+}
+
+int
+fsync (int fd)
+{
+        int                     ret = -1;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "fsync: fd %d", fd);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_fsync == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_fsync (fd);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fsync (fh);
+                booster_fdptr_put (fh);
+        }
+
+        return ret;
+}
+
+int __REDIRECT (booster_false_ftruncate, (int fd, off_t length),
+                ftruncate);
+int __REDIRECT (booster_false_ftruncate64, (int fd, loff_t length),
+                ftruncate64);
+
+int
+booster_false_ftruncate (int fd, off_t length)
+{
+        int                     ret = -1;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "ftruncate: fd %d, length: %"PRIu64,fd
+                , length);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_ftruncate == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_ftruncate (fd, length);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_ftruncate (fh, length);
+                booster_fdptr_put (fh);
+        }
+
+        return ret;
+}
+
+int
+booster_false_ftruncate64 (int fd, loff_t length)
+{
+        int                     ret = -1;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "ftruncate: fd %d, length: %"PRIu64,fd
+                , length);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_ftruncate == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_ftruncate64 (fd, length);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_ftruncate (fh, length);
+                booster_fdptr_put (fh);
+        }
+
+        return ret;
+}
+
+int
+link (const char *old, const char *new)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "link: old: %s, new: %s", old, new);
+        ret = glusterfs_link (old, new);
+
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "Link failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "link call succeeded");
+                return ret;
+        }
+
+        if (real_link == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_link (old, new);
+
+        return ret;
+}
+
+int
+rename (const char *old, const char *new)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "link: old: %s, new: %s", old, new);
+        ret = glusterfs_rename (old, new);
+
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "Rename failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "Rename succeeded");
+                return ret;
+        }
+
+        if (real_rename == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_rename (old, new);
+
+        return ret;
+}
+
+int
+utimes (const char *path, const struct timeval times[2])
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "utimes: path %s", path);
+        ret = glusterfs_utimes (path, times);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "utimes failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "utimes succeeded");
+                return ret;
+        }
+
+        if (real_utimes == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_utimes (path, times);
+
+        return ret;
+}
+
+int
+utime (const char *path, const struct utimbuf *buf)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "utime: path %s", path);
+        ret = glusterfs_utime (path, buf);
+
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "utime failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "utime succeeded");
+                return ret;
+        }
+
+        if (real_utime == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_utime (path, buf);
+
+        return ret;
+}
+
+int
+mknod (const char *path, mode_t mode, dev_t dev)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "mknod: path %s", path);
+        ret = glusterfs_mknod (path, mode, dev);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "mknod failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "mknod succeeded");
+                return ret;
+        }
+
+        if (real_mknod) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_mknod (path, mode, dev);
+
+        return ret;
+}
+
+int
+mkfifo (const  char *path, mode_t mode)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "mkfifo: path %s", path);
+        ret = glusterfs_mkfifo (path, mode);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "mkfifo failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "mkfifo succeeded");
+                return ret;
+        }
+
+        if (real_mkfifo == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_mkfifo (path, mode);
+
+        return ret;
+}
+
+int
+unlink (const char *path)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "unlink: path %s", path);
+        ret = glusterfs_unlink (path);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "unlink failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "unlink succeeded");
+                return ret;
+        }
+
+        if (real_unlink == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_unlink (path);
+
+        return ret;
+}
+
+int
+symlink (const char *oldpath, const char *newpath)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "symlink: old: %s, new: %s",
+                oldpath, newpath);
+        ret = glusterfs_symlink (oldpath, newpath);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "symlink failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "symlink succeeded");
+                return ret;
+        }
+
+        if (real_symlink == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_symlink (oldpath, newpath);
+
+        return ret;
+}
+
+int
+readlink (const char *path, char *buf, size_t bufsize)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "readlink: path %s", path);
+        ret = glusterfs_readlink (path, buf, bufsize);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "readlink failed: %s",
+                        strerror (errno));
+                return ret;
+        }
+
+        if (ret > 0) {
+                gf_log ("booster", GF_LOG_TRACE, "readlink succeeded");
+                return ret;
+        }
+
+        if (real_readlink == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+        } else
+                ret = real_readlink (path, buf, bufsize);
+
+        return ret;
+}
+
+char *
+realpath (const char *path, char *resolved_path)
+{
+        char    *res = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "realpath: path %s", path);
+        res = glusterfs_realpath (path, resolved_path);
+        if ((res == NULL) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "realpath failed: %s",
+                        strerror (errno));
+                return res;
+        }
+
+        if (res != NULL) {
+                gf_log ("booster", GF_LOG_TRACE, "realpath succeeded");
+                return res;
+        }
+
+        if (real_realpath == NULL) {
+                errno = ENOSYS;
+                res = NULL;
+        } else
+                res = real_realpath (path, resolved_path);
+
+        return res;
+}
+
+#define BOOSTER_GL_DIR          1
+#define BOOSTER_POSIX_DIR       2
+
+struct booster_dir_handle {
+        int type;
+        void *dirh;
+};
+
+DIR *
+opendir (const char *path)
+{
+        glusterfs_dir_t                 gdir = NULL;
+        struct booster_dir_handle       *bh = NULL;
+        DIR                             *pdir = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "opendir: path: %s", path);
+        bh = calloc (1, sizeof (struct booster_dir_handle));
+        if (!bh) {
+                gf_log ("booster", GF_LOG_ERROR, "memory allocation failed");
+                errno = ENOMEM;
+                goto out;
+        }
+
+        gdir = glusterfs_opendir (path);
+        if (gdir) {
+                gf_log ("booster", GF_LOG_TRACE, "Gluster dir opened");
+                bh->type = BOOSTER_GL_DIR;
+                bh->dirh = (void *)gdir;
+                goto out;
+        } else if ((!gdir) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "Opendir failed");
+                goto free_out;
+        }
+
+        if (real_opendir == NULL) {
+                errno = ENOSYS;
+                goto free_out;
+        }
+
+        pdir = real_opendir (path);
+
+        if (pdir) {
+                bh->type = BOOSTER_POSIX_DIR;
+                bh->dirh = (void *)pdir;
+                goto out;
+        }
+
+free_out:
+        if (bh) {
+                free (bh);
+                bh = NULL;
+        }
+out:
+        return (DIR *)bh;
+}
+
+int __REDIRECT (booster_false_readdir_r, (DIR *dir, struct dirent *entry,
+                struct dirent **result), readdir_r) __nonnull ((1));
+int __REDIRECT (booster_false_readdir64_r, (DIR *dir, struct dirent64 *entry,
+                struct dirent64 **result), readdir64_r) __nonnull ((1));
+
+int
+booster_false_readdir_r (DIR *dir, struct dirent *entry, struct dirent **result)
+{
+        struct booster_dir_handle       *bh = (struct booster_dir_handle *)dir;
+        int                              ret = 0;  
+
+        if (!bh) {
+                ret = errno = EFAULT;
+                goto out;
+        }
+
+        if (bh->type == BOOSTER_GL_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "readdir_r on gluster");
+                ret = glusterfs_readdir_r ((glusterfs_dir_t)bh->dirh, entry,
+                                           result);
+                
+        } else if (bh->type == BOOSTER_POSIX_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "readdir_r on posix");
+                if (real_readdir_r == NULL) {
+                        ret = errno = ENOSYS;
+                        goto out;
+                }
+
+                ret = real_readdir_r ((DIR *)bh->dirh, entry, result);
+        } else {
+                ret = errno = EINVAL;
+        }
+
+out:
+        return  ret;
+}
+
+int
+booster_false_readdir64_r (DIR *dir, struct dirent64 *entry,
+                           struct dirent64 **result)
+{
+        struct booster_dir_handle       *bh = (struct booster_dir_handle *)dir;
+        int                              ret = 0;  
+
+        if (!bh) {
+                ret = errno = EFAULT;
+                goto out;
+        }
+
+        if (bh->type == BOOSTER_GL_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "readdir_r on gluster");
+                ret = glusterfs_readdir_r ((glusterfs_dir_t)bh->dirh,
+                                           (struct dirent *)entry,
+                                           (struct dirent **)result);
+        } else if (bh->type == BOOSTER_POSIX_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "readdir_r on posix");
+                if (real_readdir64_r == NULL) {
+                        ret = errno = ENOSYS;
+                        goto out;
+                }
+
+                ret = real_readdir64_r ((DIR *)bh->dirh, entry, result);
+        } else {
+                ret = errno = EINVAL;
+        }
+
+out:
+        return  ret;
+}
+
+struct dirent *
+__REDIRECT (booster_false_readdir, (DIR *dir), readdir) __nonnull ((1));
+
+struct dirent64 *
+__REDIRECT (booster_false_readdir64, (DIR *dir), readdir64) __nonnull ((1));
+
+struct dirent *
+booster_false_readdir (DIR *dir)
+{
+        struct booster_dir_handle       *bh = (struct booster_dir_handle *)dir;
+        struct dirent                   *dirp = NULL;
+
+        if (!bh) {
+                errno = EFAULT;
+                goto out;
+        }
+
+        if (bh->type == BOOSTER_GL_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "readdir on gluster");
+                dirp = glusterfs_readdir ((glusterfs_dir_t)bh->dirh);
+        } else if (bh->type == BOOSTER_POSIX_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "readdir on posix");
+                if (real_readdir == NULL) {
+                        errno = ENOSYS;
+                        dirp = NULL;
+                        goto out;
+                }
+
+                dirp = real_readdir ((DIR *)bh->dirh);
+        } else {
+                dirp = NULL;
+                errno = EINVAL;
+        }
+
+out:
+        return  dirp;
+}
+
+struct dirent64 *
+booster_false_readdir64 (DIR *dir)
+{
+        struct booster_dir_handle       *bh = (struct booster_dir_handle *)dir;
+        struct dirent64                 *dirp = NULL;
+
+        if (!bh) {
+                errno = EFAULT;
+                goto out;
+        }
+
+        if (bh->type == BOOSTER_GL_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "readdir on gluster");
+                dirp = glusterfs_readdir ((glusterfs_dir_t)bh->dirh);
+        } else if (bh->type == BOOSTER_POSIX_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "readdir on posix");
+                if (real_readdir == NULL) {
+                        errno = ENOSYS;
+                        dirp = NULL;
+                        goto out;
+                }
+
+                dirp = real_readdir64 ((DIR *)bh->dirh);
+        } else {
+                dirp = NULL;
+                errno = EINVAL;
+        }
+
+out:
+        return  dirp;
+}
+
+int
+closedir (DIR *dh)
+{
+        struct booster_dir_handle       *bh = (struct booster_dir_handle *)dh;
+        int                             ret = -1;
+
+        if (!bh) {
+                errno = EFAULT;
+                goto out;
+        }
+
+        if (bh->type == BOOSTER_GL_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "closedir on gluster");
+                ret = glusterfs_closedir ((glusterfs_dir_t)bh->dirh);
+        } else if (bh->type == BOOSTER_POSIX_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "closedir on posix");
+                if (real_closedir == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else
+                        ret = real_closedir ((DIR *)bh->dirh);
+        } else {
+                errno = EBADF;
+        }
+
+        if (ret == 0) {
+                free (bh);
+                bh = NULL;
+        }
+out:
+        return ret;
+}
+
+/* The real stat functions reside in booster_stat.c to
+ * prevent clash with the statX prototype and functions
+ * declared from sys/stat.h
+ */
+int
+booster_xstat (int ver, const char *path, void *buf)
+{
+        struct stat     *sbuf = (struct stat *)buf;
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "xstat: path: %s", path);
+        ret = glusterfs_stat (path, sbuf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "xstat failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "xstat succeeded");
+                goto out;
+        }
+
+        if (real___xstat == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+        ret = real___xstat (ver, path, sbuf);
+out:
+        return ret;
+}
+
+int
+booster_xstat64 (int ver, const char *path, void *buf)
+{
+        int             ret = -1;
+        struct stat64   *sbuf = (struct stat64 *)buf;
+
+        gf_log ("booster", GF_LOG_TRACE, "xstat64: path: %s", path);
+        ret = glusterfs_stat (path, (struct stat *)sbuf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "xstat64 failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "xstat64 succeeded");
+                goto out;
+        }
+
+        if (real___xstat64 == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+        ret = real___xstat64 (ver, path, sbuf);
+out:
+        return ret;
+}
+
+int
+booster_stat (const char *path, void *buf)
+{
+        struct stat     *sbuf = (struct stat *)buf;
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "stat: path: %s", path);
+        ret = glusterfs_stat (path, sbuf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "stat failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "stat succeeded");
+                goto out;
+        }
+
+        if (real_stat != NULL)
+                ret = real_stat (path, sbuf);
+        else if (real___xstat != NULL)
+                ret = real___xstat (0, path, sbuf);
+        else {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+
+out:
+        return ret;
+}
+
+int
+booster_stat64 (const char *path, void *buf)
+{
+        int             ret = -1;
+        struct stat64   *sbuf = (struct stat64 *)buf;
+
+        gf_log ("booster", GF_LOG_TRACE, "stat64: %s", path);
+        ret = glusterfs_stat (path, (struct stat *)sbuf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "stat64 failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "stat64 succeeded");
+                goto out;
+        }
+
+        if (real_stat64 != NULL)
+                ret = real_stat64 (path, sbuf);
+        else if (real___xstat64 != NULL)
+                ret = real___xstat64 (0, path, sbuf);
+        else {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+int
+booster_fxstat (int ver, int fd, void *buf)
+{
+        struct stat             *sbuf = (struct stat *)buf;
+        int                     ret = -1;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "fxstat: fd %d", fd);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real___fxstat == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                        goto out;
+                }
+
+                ret = real___fxstat (ver, fd, sbuf);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fstat (fh, sbuf);
+                booster_fdptr_put (fh);
+        }
+
+out:
+        return ret;
+}
+
+int
+booster_fxstat64 (int ver, int fd, void *buf)
+{
+        int                     ret = -1;
+        struct stat64           *sbuf = (struct stat64 *)buf;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "fxstat64: fd %d", fd);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real___fxstat64 == NULL) {
+                        ret = -1;
+                        errno = ENOSYS;
+                        goto out;
+                }
+                ret = real___fxstat64 (ver, fd, sbuf);
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fstat (fh, (struct stat *)sbuf);
+                booster_fdptr_put (fh);
+        }
+
+out:
+        return ret;
+}
+
+int
+booster_fstat (int fd, void *buf)
+{
+        struct stat             *sbuf = (struct stat *)buf;
+        int                     ret = -1;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "fstat: fd %d", fd);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_fstat != NULL)
+                        ret = real_fstat (fd, sbuf);
+                else if (real___fxstat != NULL)
+                        ret = real___fxstat (0, fd, sbuf);
+                else {
+                        ret = -1;
+                        errno = ENOSYS;
+                        goto out;
+                }
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fstat (fh, sbuf);
+                booster_fdptr_put (fh);
+        }
+
+out:
+        return ret;
+}
+
+int
+booster_fstat64 (int fd, void *buf)
+{
+        int                     ret = -1;
+        struct stat64           *sbuf = (struct stat64 *)buf;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "fstat64: fd %d", fd);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_fstat64 != NULL)
+                        ret = real_fstat64 (fd, sbuf);
+                else if (real___fxstat64 != NULL)
+                        /* Not sure how portable the use of 0 for
+                         * version number is but it works over glibc.
+                         * We need this because, I've
+                         * observed that all the above real* functors can be
+                         * NULL. In that case, this is our last and only option.
+                         */
+                        ret = real___fxstat64 (0, fd, sbuf);
+                else {
+                        ret = -1;
+                        errno = ENOSYS;
+                        goto out;
+                }
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fstat (fh, (struct stat *)sbuf);
+                booster_fdptr_put (fh);
+        }
+
+out:
+        return ret;
+}
+
+int
+booster_lxstat (int ver, const char *path, void *buf)
+{
+        struct stat     *sbuf = (struct stat *)buf;
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "lxstat: path %s", path);
+        ret = glusterfs_lstat (path, sbuf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "lxstat failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "lxstat succeeded");
+                goto out;
+        }
+
+        if (real___lxstat == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+        ret = real___lxstat (ver, path, sbuf);
+out:
+        return ret;
+}
+
+int
+booster_lxstat64 (int ver, const char *path, void *buf)
+{
+        int             ret = -1;
+        struct stat64   *sbuf = (struct stat64 *)buf;
+
+        gf_log ("booster", GF_LOG_TRACE, "lxstat64: path %s", path);
+        ret = glusterfs_lstat (path, (struct stat *)sbuf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "lxstat64 failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "lxstat64 succeeded");
+                goto out;
+        }
+
+        if (real___lxstat64 == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+        ret = real___lxstat64 (ver, path, sbuf);
+out:
+        return ret;
+}
+
+int
+booster_lstat (const char *path, void *buf)
+{
+        struct stat     *sbuf = (struct stat *)buf;
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "lstat: path %s", path);
+        ret = glusterfs_lstat (path, sbuf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "lstat failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "lstat succeeded");
+                goto out;
+        }
+
+        if (real_lstat != NULL)
+                ret = real_lstat (path, sbuf);
+        else if (real___lxstat != NULL)
+                ret = real___lxstat (0, path, sbuf);
+        else {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+
+out:
+        return ret;
+}
+
+int
+booster_lstat64 (const char *path, void *buf)
+{
+        int             ret = -1;
+        struct stat64   *sbuf = (struct stat64 *)buf;
+
+        gf_log ("booster", GF_LOG_TRACE, "lstat64: path %s", path);
+        ret = glusterfs_lstat (path, (struct stat *)sbuf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "lstat64 failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "lstat64 succeeded");
+                goto out;
+        }
+
+        if (real_lstat64 != NULL)
+                ret = real_lstat64 (path, sbuf);
+        else if (real___lxstat64 != NULL)
+                ret = real___lxstat64 (0, path, sbuf);
+        else {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+int
+booster_statfs (const char *pathname, struct statfs *buf)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "statfs: path %s", pathname);
+        ret = glusterfs_statfs (pathname, buf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "statfs failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "statfs succeeded");
+                goto out;
+        }
+
+        if (real_statfs == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+        ret = real_statfs (pathname, buf);
+
+out:
+        return ret;
+}
+
+int
+booster_statfs64 (const char *pathname, struct statfs64 *buf)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "stat64: path %s", pathname);
+        ret = glusterfs_statfs (pathname, (struct statfs *)buf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "statfs64 failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "statfs64 succeeded");
+                goto out;
+        }
+
+        if (real_statfs64 == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+        ret = real_statfs64 (pathname, buf);
+
+out:
+        return ret;
+}
+
+int
+booster_statvfs (const char *pathname, struct statvfs *buf)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "statvfs: path %s", pathname);
+        ret = glusterfs_statvfs (pathname, buf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "statvfs failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "statvfs succeeded");
+                goto out;
+        }
+
+        if (real_statvfs == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+        ret = real_statvfs (pathname, buf);
+
+out:
+        return ret;
+}
+
+int
+booster_statvfs64 (const char *pathname, struct statvfs64 *buf)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "statvfs64: path %s", pathname);
+        ret = glusterfs_statvfs (pathname, (struct statvfs *)buf);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "statvfs64 failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "statvfs64 succeeded");
+                goto out;
+        }
+
+        if (real_statvfs64 == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+        ret = real_statvfs64 (pathname, buf);
+
+out:
+        return ret;
+}
+
+ssize_t
+getxattr (const char *path, const char *name, void *value, size_t size)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "getxattr: path %s, name %s", path,
+                name);
+        ret = glusterfs_getxattr (path, name, value, size);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "getxattr failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret > 0) {
+                gf_log ("booster", GF_LOG_TRACE, "getxattr succeeded");
+                return ret;
+        }
+
+        if (real_getxattr == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+        ret = real_getxattr (path, name, value, size);
+out:
+        return ret;
+}
+
+
+ssize_t
+lgetxattr (const char *path, const char *name, void *value, size_t size)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "lgetxattr: path %s, name %s", path,
+                name);
+        ret = glusterfs_lgetxattr (path, name, value, size);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "lgetxattr failed: %s",
+                        strerror (errno));
+
+                goto out;
+        }
+
+        if (ret > 0) {
+                gf_log ("booster", GF_LOG_TRACE, "lgetxattr succeeded");
+                return ret;
+        }
+
+        if (real_lgetxattr == NULL) {
+                ret = -1;
+                errno = ENOSYS;
+                goto out;
+        }
+
+        ret = real_lgetxattr (path, name, value, size);
+out:
+        return ret;
+}
+
+int
+remove (const char *path)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "remove: %s", path);
+        ret = glusterfs_remove (path);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "remove failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "remove succeeded");
+                goto out;
+        }
+
+        if (real_remove == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+        ret = real_remove (path);
+
+out:
+        return ret;
+}
+
+int
+lchown (const char *path, uid_t owner, gid_t group)
+{
+        int     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "lchown: path %s", path);
+        ret = glusterfs_lchown (path, owner, group);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "lchown failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_ERROR, "lchown succeeded");
+                goto out;
+        }
+
+        if (real_lchown == NULL) {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+        ret = real_lchown (path, owner, group);
+
+out:
+        return ret;
+}
+
+void
+booster_rewinddir (DIR *dir)
+{
+        struct booster_dir_handle       *bh = (struct booster_dir_handle *)dir;
+
+        if (!bh) {
+                errno = EFAULT;
+                goto out;
+        }
+
+        if (bh->type == BOOSTER_GL_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "rewinddir on glusterfs");
+                glusterfs_rewinddir ((glusterfs_dir_t)bh->dirh);
+        } else if (bh->type == BOOSTER_POSIX_DIR) {
+                if (real_rewinddir == NULL) {
+                        errno = ENOSYS;
+                        goto out;
+                }
+                gf_log ("booster", GF_LOG_TRACE, "rewinddir on posix");
+                real_rewinddir ((DIR *)bh->dirh);
+        } else
+                errno = EINVAL;
+out:
+        return;
+}
+
+void
+booster_seekdir (DIR *dir, off_t offset)
+{
+        struct booster_dir_handle       *bh = (struct booster_dir_handle *)dir;
+
+        if (!bh) {
+                errno = EFAULT;
+                goto out;
+        }
+
+        if (bh->type == BOOSTER_GL_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "seekdir on glusterfs");
+                glusterfs_seekdir ((glusterfs_dir_t)bh->dirh, offset);
+         } else if (bh->type == BOOSTER_POSIX_DIR) {
+                if (real_seekdir == NULL) {
+                        errno = ENOSYS;
+                        goto out;
+                }
+
+                gf_log ("booster", GF_LOG_TRACE, "seekdir on posix");
+                real_seekdir ((DIR *)bh->dirh, offset);
+        } else
+                errno = EINVAL;
+out:
+        return;
+}
+
+off_t
+booster_telldir (DIR *dir)
+{
+        struct booster_dir_handle       *bh = (struct booster_dir_handle *)dir;
+        off_t	offset = -1;
+
+        if (!bh) {
+                errno = EFAULT;
+                goto out;
+        }
+
+        if (bh->type == BOOSTER_GL_DIR) {
+                gf_log ("booster", GF_LOG_TRACE, "telldir on glusterfs");
+                offset = glusterfs_telldir ((glusterfs_dir_t)bh->dirh);
+        } else if (bh->type == BOOSTER_POSIX_DIR) {
+                if (real_telldir == NULL) {
+                        errno = ENOSYS;
+                        goto out;
+                }
+
+                gf_log ("booster", GF_LOG_TRACE, "telldir on posix");
+                offset = real_telldir ((DIR *)bh->dirh);
+        } else
+                errno = EINVAL;
+out:
+        return offset;
+}
+
+
+pid_t 
+fork (void)
+{
+	pid_t pid = 0;
+	char child = 0;
+
+	glusterfs_log_lock ();
+	{
+		pid = real_fork ();
+	}
+	glusterfs_log_unlock ();
+
+	child = (pid == 0);
+	if (child) {
+		booster_cleanup ();
+		booster_init ();
+	}
+
+	return pid;
+}
+
+ssize_t
+sendfile (int out_fd, int in_fd, off_t *offset, size_t count)
+{
+        glusterfs_file_t            in_fh = NULL;
+        ssize_t                     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "sendfile: in fd %d, out fd %d, offset"
+                " %"PRIu64", count %"GF_PRI_SIZET, in_fd, out_fd, *offset,
+                count);
+        /*
+         * handle sendfile in booster only if in_fd corresponds to a glusterfs
+         * file handle 
+         */
+        in_fh = booster_fdptr_get (booster_fdtable, in_fd);
+        if (!in_fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_sendfile == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else {
+                        ret = real_sendfile (out_fd, in_fd, offset, count);
+                }
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_sendfile (out_fd, in_fh, offset, count);
+                booster_fdptr_put (in_fh);
+        }
+        
+        return ret;
+}
+
+ssize_t
+sendfile64 (int out_fd, int in_fd, off_t *offset, size_t count)
+{
+        glusterfs_file_t            in_fh = NULL;
+        ssize_t                     ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "sendfile64: in fd %d, out fd %d,"
+                " offset %"PRIu64", count %"GF_PRI_SIZET, in_fd, out_fd,
+                *offset, count);
+        /*
+         * handle sendfile in booster only if in_fd corresponds to a glusterfs
+         * file handle 
+         */
+        in_fh = booster_fdptr_get (booster_fdtable, in_fd);
+        if (!in_fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_sendfile64 == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else {
+                        ret = real_sendfile64 (out_fd, in_fd, offset, count);
+                }
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_sendfile (out_fd, in_fh, offset, count);
+                booster_fdptr_put (in_fh);
+        }
+        
+        return ret;
+}
+
+
+int
+fcntl (int fd, int cmd, ...)
+{
+        va_list           ap;
+        int               ret = -1;
+        long              arg = 0;
+        struct flock     *lock = NULL;
+        glusterfs_file_t  glfs_fd = 0; 
+
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+
+        gf_log ("booster", GF_LOG_TRACE, "fcntl: fd %d, cmd %d", fd, cmd);
+	switch (cmd) {
+	case F_DUPFD:
+                ret = dup (fd);
+                break;
+                /* 
+                 * FIXME: Consider this case when implementing F_DUPFD, F_GETFD
+                 *        etc flags in libglusterfsclient. Commenting it out for
+                 *        timebeing since it is defined only in linux kernel 
+                 *        versions >= 2.6.24.
+                 */
+                /* case F_DUPFD_CLOEXEC: */
+	case F_GETFD:
+                if (glfs_fd != NULL) {
+                        ret = booster_get_close_on_exec (booster_fdtable, fd)
+                                ? FD_CLOEXEC : 0;
+                } else {
+                        if (real_fcntl == NULL) {
+                                ret = -1;
+                                errno = ENOSYS;
+                        } else {
+                                ret = real_fcntl (fd, cmd);
+                        }
+                }
+                break;
+
+	case F_GETFL:
+	case F_GETOWN:
+	case F_GETSIG:
+	case F_GETLEASE:
+                if (glfs_fd) {
+                        gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                        ret = glusterfs_fcntl (glfs_fd, cmd);
+                } else {
+                        if (!real_fcntl) {
+                                errno = ENOSYS;
+                                goto out;
+                        }
+
+                        gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                        ret = real_fcntl (fd, cmd);
+                }
+		break;
+
+	case F_SETFD:
+                if (glfs_fd != NULL) {
+                        booster_set_close_on_exec (booster_fdtable, fd);
+                        ret = 0;
+                } else {
+                        if (real_fcntl == NULL) {
+                                ret = -1;
+                                errno = ENOSYS;
+                        } else {
+                                ret = real_fcntl (fd, cmd);
+                        }
+                }
+                break;
+
+	case F_SETFL:
+	case F_SETOWN:
+	case F_SETSIG:
+	case F_SETLEASE:
+	case F_NOTIFY:
+                va_start (ap, cmd);
+                arg = va_arg (ap, long);
+                va_end (ap);
+
+                if (glfs_fd) {
+                        gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                        ret = glusterfs_fcntl (glfs_fd, cmd, arg);
+                } else {
+                        if (!real_fcntl) {
+                                errno = ENOSYS;
+                                goto out;
+                        }
+
+                        gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                        ret = real_fcntl (fd, cmd, arg);
+                }
+		break;
+
+	case F_GETLK:
+	case F_SETLK:
+	case F_SETLKW:
+#if F_GETLK != F_GETLK64 
+        case F_GETLK64:
+#endif
+#if F_SETLK != F_SETLK64
+        case F_SETLK64:
+#endif
+#if F_SETLKW != F_SETLKW64
+        case F_SETLKW64:
+#endif
+                va_start (ap, cmd);
+                lock = va_arg (ap, struct flock *);
+                va_end (ap);
+
+                if (lock == NULL) {
+                        errno = EINVAL;
+                        goto out;
+                }
+
+                if (glfs_fd) {
+                        gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                        ret = glusterfs_fcntl (glfs_fd, cmd, lock);
+                } else {
+                        if (!real_fcntl) {
+                                errno = ENOSYS;
+                                goto out;
+                        }
+
+                        gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                        ret = real_fcntl (fd, cmd, lock);
+                }
+		break;
+
+	default:
+                errno = EINVAL;
+		break;
+	}
+
+out:
+        if (glfs_fd) {
+                booster_fdptr_put (glfs_fd);
+        }
+
+        return ret;
+}
+
+
+int
+chdir (const char *path)
+{
+        int     ret = -1;
+        char    cwd[PATH_MAX];
+        char   *res = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "chdir: path %s", path);
+
+        pthread_mutex_lock (&cwdlock);
+        {
+                res = glusterfs_getcwd (cwd, PATH_MAX);
+                if (res == NULL) {
+                        gf_log ("booster", GF_LOG_ERROR, "getcwd failed: %s",
+                                strerror (errno));
+                        goto unlock;
+                }
+
+                ret = glusterfs_chdir (path);
+                if ((ret == -1) && (errno != ENODEV)) {
+                        gf_log ("booster", GF_LOG_ERROR, "chdir failed: %s",
+                                strerror (errno));
+                        goto unlock;
+                }
+
+                if (ret == 0) {
+                        gf_log ("booster", GF_LOG_TRACE, "chdir succeeded");
+                        goto unlock;
+                }
+
+                if (real_chdir == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                        goto unlock;
+                }
+
+                ret = real_chdir (path);
+                if (ret == -1) {
+                        glusterfs_chdir (cwd);
+                }
+        }
+unlock:
+        pthread_mutex_unlock (&cwdlock);
+
+        return ret;
+}
+
+
+int
+fchdir (int fd)
+{
+        int              ret     = -1;
+        glusterfs_file_t glfs_fd = 0;
+        char             cwd[PATH_MAX]; 
+        char            *res     = NULL;
+
+        glfs_fd = booster_fdptr_get (booster_fdtable, fd);
+
+        if (!glfs_fd) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_write == NULL) {
+                        errno = ENOSYS;
+                        ret = -1;
+                } else {
+                        ret = real_fchdir (fd);
+                        if (ret == 0) {
+                                res = real_getcwd (cwd, PATH_MAX);
+                                if (res == NULL) {
+                                        gf_log ("booster", GF_LOG_ERROR,
+                                                "getcwd failed (%s)",
+                                                strerror (errno));
+                                        ret = -1;
+                                } else {
+                                        glusterfs_chdir (cwd);
+                                }
+                        }
+                }
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fchdir (glfs_fd);
+                booster_fdptr_put (glfs_fd);
+        }
+ 
+        return ret;
+}
+
+
+char *
+getcwd (char *buf, size_t size)
+{
+        char *res = NULL;
+
+        res = glusterfs_getcwd (buf, size);
+        if ((res == NULL) && (errno == ENODEV)) {
+                res = real_getcwd (buf, size);
+        }
+
+        return res;
+}
+
+
+int __REDIRECT (booster_false_truncate, (const char *path, off_t length),
+                truncate) __nonnull ((1));
+int __REDIRECT (booster_false_truncate64, (const char *path, loff_t length),
+                truncate64) __nonnull ((1));;
+
+int
+booster_false_truncate (const char *path, off_t length)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "truncate: path (%s) length (%"PRIu64
+                ")", path, length);
+
+        ret = glusterfs_truncate (path, length);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "truncate failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "truncate succeeded");
+                goto out;
+        }
+
+        if (real_truncate != NULL)
+                ret = real_truncate (path, length);
+        else {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+
+int
+booster_false_truncate64 (const char *path, loff_t length)
+{
+        int             ret = -1;
+  
+        gf_log ("booster", GF_LOG_TRACE, "truncate64: path (%s) length "
+                "(%"PRIu64")", path, length);
+
+        ret = glusterfs_truncate (path, length);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "truncate64 failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "truncate64 succeeded");
+                goto out;
+        }
+
+        if (real_truncate64 != NULL)
+                ret = real_truncate64 (path, length);
+        else {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+
+int
+setxattr (const char *path, const char *name, const void *value, size_t size,
+          int flags)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "setxattr: path: %s", path);
+        ret = glusterfs_setxattr (path, name, value, size, flags);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "setxattr failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "setxattr succeeded");
+                goto out;
+        }
+
+        if (real_setxattr != NULL)
+                ret = real_setxattr (path, name, value, size, flags);
+        else {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+
+int
+lsetxattr (const char *path, const char *name, const void *value, size_t size,
+           int flags)
+{
+        int             ret = -1;
+
+        gf_log ("booster", GF_LOG_TRACE, "lsetxattr: path: %s", path);
+        ret = glusterfs_lsetxattr (path, name, value, size, flags);
+        if ((ret == -1) && (errno != ENODEV)) {
+                gf_log ("booster", GF_LOG_ERROR, "lsetxattr failed: %s",
+                        strerror (errno));
+                goto out;
+        }
+
+        if (ret == 0) {
+                gf_log ("booster", GF_LOG_TRACE, "lsetxattr succeeded");
+                goto out;
+        }
+
+        if (real_lsetxattr != NULL)
+                ret = real_lsetxattr (path, name, value, size, flags);
+        else {
+                errno = ENOSYS;
+                ret = -1;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+
+int
+fsetxattr (int fd, const char *name, const void *value, size_t size, int flags)
+{
+        int                     ret = -1;
+        glusterfs_file_t        fh = NULL;
+
+        gf_log ("booster", GF_LOG_TRACE, "fsetxattr: fd %d", fd);
+        fh = booster_fdptr_get (booster_fdtable, fd);
+        if (!fh) {
+                gf_log ("booster", GF_LOG_TRACE, "Not a booster fd");
+                if (real_fsetxattr != NULL)
+                        ret = real_fsetxattr (fd, name, value, size, flags);
+                else {
+                        ret = -1;
+                        errno = ENOSYS;
+                        goto out;
+                }
+        } else {
+                gf_log ("booster", GF_LOG_TRACE, "Is a booster fd");
+                ret = glusterfs_fsetxattr (fh, name, value, size, flags);
+                booster_fdptr_put (fh);
+        }
+
+out:
+        return ret;
+}
+
+
+void
+booster_lib_init (void)
+{
+
+        RESOLVE (open);
+        RESOLVE (open64);
+        RESOLVE (creat);
+        RESOLVE (creat64);
+
+        RESOLVE (read);
+        RESOLVE (readv);
+        RESOLVE (pread);
+        RESOLVE (pread64);
+
+        RESOLVE (write);
+        RESOLVE (writev);
+        RESOLVE (pwrite);
+        RESOLVE (pwrite64);
+
+        RESOLVE (lseek);
+        RESOLVE (lseek64);
+
+        RESOLVE (close);
+
+        RESOLVE (dup);
+        RESOLVE (dup2);
+
+	RESOLVE (fork); 
+        RESOLVE (mkdir);
+        RESOLVE (rmdir);
+        RESOLVE (chmod);
+        RESOLVE (chown);
+        RESOLVE (fchmod);
+        RESOLVE (fchown);
+        RESOLVE (fsync);
+        RESOLVE (ftruncate);
+        RESOLVE (ftruncate64);
+        RESOLVE (link);
+        RESOLVE (rename);
+        RESOLVE (utimes);
+        RESOLVE (utime);
+        RESOLVE (mknod);
+        RESOLVE (mkfifo);
+        RESOLVE (unlink);
+        RESOLVE (symlink);
+        RESOLVE (readlink);
+        RESOLVE (realpath);
+        RESOLVE (opendir);
+        RESOLVE (readdir);
+        RESOLVE (readdir64);
+        RESOLVE (closedir);
+        RESOLVE (__xstat);
+        RESOLVE (__xstat64);
+        RESOLVE (stat);
+        RESOLVE (stat64);
+        RESOLVE (__fxstat);
+        RESOLVE (__fxstat64);
+        RESOLVE (fstat);
+        RESOLVE (fstat64);
+        RESOLVE (__lxstat);
+        RESOLVE (__lxstat64);
+        RESOLVE (lstat);
+        RESOLVE (lstat64);
+        RESOLVE (statfs);
+        RESOLVE (statfs64);
+        RESOLVE (statvfs);
+        RESOLVE (statvfs64);
+        RESOLVE (getxattr);
+        RESOLVE (lgetxattr);
+        RESOLVE (remove);
+        RESOLVE (lchown);
+	RESOLVE (rewinddir);
+	RESOLVE (seekdir);
+	RESOLVE (telldir);
+        RESOLVE (sendfile);
+        RESOLVE (sendfile64);
+        RESOLVE (readdir_r);
+        RESOLVE (readdir64_r);
+        RESOLVE (fcntl);
+        RESOLVE (chdir);
+        RESOLVE (fchdir);
+        RESOLVE (getcwd);
+        RESOLVE (truncate);
+        RESOLVE (truncate64);
+        RESOLVE (setxattr);
+        RESOLVE (lsetxattr);
+        RESOLVE (fsetxattr);
+
+        /* This must be called after resolving real functions
+         * above so that the socket based IO calls in libglusterfsclient
+         * can fall back to a non-NULL real_XXX function pointer.
+         * Calling booster_init before resolving the names above
+         * results in seg-faults because the function symbols above are NULL.
+         */
+	booster_init ();
+}
+
diff --git a/booster/src/booster_fstab.c b/booster/src/booster_fstab.c
new file mode 100644
index 000000000..202249cad
--- /dev/null
+++ b/booster/src/booster_fstab.c
@@ -0,0 +1,452 @@
+/* Utilities for reading/writing fstab, mtab, etc.
+   Copyright (C) 1995-2000, 2001, 2002, 2003, 2006
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <alloca.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include "booster_fstab.h"
+#include <stdlib.h>
+#include <libglusterfsclient.h>
+#include <errno.h>
+
+/* The default timeout for inode and stat cache. */
+#define BOOSTER_DEFAULT_ATTR_TIMEO      5 /* In Secs */
+
+/* Prepare to begin reading and/or writing mount table entries from the
+   beginning of FILE.  MODE is as for `fopen'.  */
+glusterfs_fstab_t *
+glusterfs_fstab_init (const char *file, const char *mode)
+{
+        glusterfs_fstab_t *handle = NULL;
+        handle = calloc (1, sizeof (glusterfs_fstab_t));
+        if (!handle) {
+                gf_log ("booster-fstab", GF_LOG_ERROR, "Memory allocation"
+                        " failed");
+                goto out;
+        }
+
+        gf_log ("booster-fstab", GF_LOG_DEBUG, "FSTAB file: %s", file);
+        FILE *result = fopen (file,mode);
+        if (result != NULL) {
+                handle->fp = result;
+        } else {
+                gf_log ("booster-fstab", GF_LOG_ERROR, "FSTAB file open failed:"
+                        " %s", strerror (errno));
+                free (handle);
+                handle = NULL;
+        }
+
+out:
+
+        return handle;
+}
+
+int
+glusterfs_fstab_close (glusterfs_fstab_t *h)
+{
+        if (!h)
+                return -1;
+
+        if (h->fp)
+                fclose (h->fp);
+
+        return 0;
+}
+
+/* Since the values in a line are separated by spaces, a name cannot
+   contain a space.  Therefore some programs encode spaces in names
+   by the strings "\040".  We undo the encoding when reading an entry.
+   The decoding happens in place.  */
+static char *
+decode_name (char *buf)
+{
+        char *rp = buf;
+        char *wp = buf;
+
+        do
+                if (rp[0] == '\\' && rp[1] == '0' && rp[2] == '4'
+                                && rp[3] == '0')
+                {
+                        /* \040 is a SPACE.  */
+                        *wp++ = ' ';
+                        rp += 3;
+                }
+                else if (rp[0] == '\\' && rp[1] == '0' && rp[2] == '1'
+                                && rp[3] == '1')
+                {
+                        /* \011 is a TAB.  */
+                        *wp++ = '\t';
+                        rp += 3;
+                }
+                else if (rp[0] == '\\' && rp[1] == '0' && rp[2] == '1'
+                                && rp[3] == '2')
+                {
+                        /* \012 is a NEWLINE.  */
+                        *wp++ = '\n';
+                        rp += 3;
+                }
+                else if (rp[0] == '\\' && rp[1] == '\\')
+                {
+                        /* We have to escape \\ to be able to represent all
+                         * characters.  */
+                        *wp++ = '\\';
+                        rp += 1;
+                }
+                else if (rp[0] == '\\' && rp[1] == '1' && rp[2] == '3'
+                                && rp[3] == '4')
+                {
+                        /* \134 is also \\.  */
+                        *wp++ = '\\';
+                        rp += 3;
+                }
+                else
+                        *wp++ = *rp;
+        while (*rp++ != '\0');
+
+        return buf;
+}
+
+
+/* Read one mount table entry from STREAM.  Returns a pointer to storage
+   reused on the next call, or null for EOF or error (use feof/ferror to
+   check).  */
+struct glusterfs_mntent *
+__glusterfs_fstab_getent (FILE *stream, struct glusterfs_mntent *mp,
+                          char *buffer, int bufsiz)
+{
+        char *cp;
+        char *head;
+
+        do
+        {
+                char *end_ptr;
+
+                if (fgets (buffer, bufsiz, stream) == NULL)
+                {
+                        return NULL;
+                }
+
+                end_ptr = strchr (buffer, '\n');
+                if (end_ptr != NULL)	/* chop newline */
+                        *end_ptr = '\0';
+                else
+                {
+                        /* Not the whole line was read.  Do it now but forget
+                         * it.  */
+                        char tmp[1024];
+                        while (fgets (tmp, sizeof tmp, stream) != NULL)
+                                if (strchr (tmp, '\n') != NULL)
+                                        break;
+                }
+
+                head = buffer + strspn (buffer, " \t");
+                /* skip empty lines and comment lines:  */
+        }
+        while (head[0] == '\0' || head[0] == '#');
+
+        cp = strsep (&head, " \t");
+        mp->mnt_fsname = cp != NULL ? decode_name (cp) : (char *) "";
+        if (head)
+                head += strspn (head, " \t");
+        cp = strsep (&head, " \t");
+        mp->mnt_dir = cp != NULL ? decode_name (cp) : (char *) "";
+        if (head)
+                head += strspn (head, " \t");
+        cp = strsep (&head, " \t");
+        mp->mnt_type = cp != NULL ? decode_name (cp) : (char *) "";
+        if (head)
+                head += strspn (head, " \t");
+        cp = strsep (&head, " \t");
+        mp->mnt_opts = cp != NULL ? decode_name (cp) : (char *) "";
+        switch (head ? sscanf (head, " %d %d ", &mp->mnt_freq,
+                               &mp->mnt_passno) : 0)
+        {
+                case 0:
+                        mp->mnt_freq = 0;
+                case 1:
+                        mp->mnt_passno = 0;
+                case 2:
+                        break;
+        }
+
+        return mp;
+}
+
+struct glusterfs_mntent *
+glusterfs_fstab_getent (glusterfs_fstab_t *h)
+{
+        if (!h)
+                return NULL;
+
+        if (!h->fp)
+                return NULL;
+
+        return __glusterfs_fstab_getent (h->fp, &h->tmpent, h->buf,
+                                         GF_MNTENT_BUFSIZE);
+}
+
+/* We have to use an encoding for names if they contain spaces or tabs.
+   To be able to represent all characters we also have to escape the
+   backslash itself.  This "function" must be a macro since we use
+   `alloca'.  */
+#define encode_name(name)                                               \
+        do {                                                            \
+                const char *rp = name;		                        \
+                                                                        \
+                while (*rp != '\0')     	                        \
+                        if (*rp == ' ' || *rp == '\t' || *rp == '\\')   \
+                                break;                                  \
+                        else	                                        \
+                                ++rp;                                   \
+                                                                        \
+                if (*rp != '\0')                                        \
+                {                                               \
+                /* In the worst case the length of the string   \
+                 * can increase to four times the current       \
+                 * length.  */				        \
+                        char *wp;				\
+                                                                \
+                        rp = name;				\
+                        name = wp = (char *) alloca (strlen (name) * 4 + 1);                                                                 \
+                                                                \
+                        do {                            \
+                                if (*rp == ' ')		\
+                                {       		\
+                                        *wp++ = '\\';   \
+                                        *wp++ = '0';	\
+                                        *wp++ = '4';	\
+                                        *wp++ = '0';    \
+                                }			\
+                                else if (*rp == '\t')	\
+                                {			\
+                                        *wp++ = '\\';	\
+                                        *wp++ = '0';	\
+                                        *wp++ = '1';	\
+                                        *wp++ = '1';	\
+                                }			\
+                                else if (*rp == '\n')	\
+                                {	                \
+                                        *wp++ = '\\';	\
+                                        *wp++ = '0';	\
+                                        *wp++ = '1';	\
+                                        *wp++ = '2';	\
+                                }	                \
+                                else if (*rp == '\\')	\
+                                {                       \
+                                        *wp++ = '\\';	\
+                                        *wp++ = '\\';	\
+                                }                       \
+                                else	                \
+                                        *wp++ = *rp;	\
+                        } while (*rp++ != '\0');	\
+                }                                       \
+        } while (0)                                     \
+
+
+int
+glusterfs_fstab_addent (glusterfs_fstab_t *h,
+                const struct glusterfs_mntent *mnt)
+{
+        struct glusterfs_mntent mntcopy = *mnt;
+        if (!h)
+                return -1;
+
+        if (!h->fp)
+                return -1;
+
+        if (fseek (h->fp, 0, SEEK_END))
+                return -1;
+
+        /* Encode spaces and tabs in the names.  */
+        encode_name (mntcopy.mnt_fsname);
+        encode_name (mntcopy.mnt_dir);
+        encode_name (mntcopy.mnt_type);
+        encode_name (mntcopy.mnt_opts);
+
+        return (fprintf (h->fp, "%s %s %s %s %d %d\n",
+                                mntcopy.mnt_fsname,
+                                mntcopy.mnt_dir,
+                                mntcopy.mnt_type,
+                                mntcopy.mnt_opts,
+                                mntcopy.mnt_freq,
+                                mntcopy.mnt_passno)
+                        < 0 ? 1 : 0);
+}
+
+
+/* Search MNT->mnt_opts for an option matching OPT.
+   Returns the address of the substring, or null if none found.  */
+char *
+glusterfs_fstab_hasoption (const struct glusterfs_mntent *mnt, const char *opt)
+{
+        const size_t optlen = strlen (opt);
+        char *rest = mnt->mnt_opts, *p;
+
+        while ((p = strstr (rest, opt)) != NULL)
+        {
+                if ((p == rest || p[-1] == ',')
+                                && (p[optlen] == '\0' || p[optlen] == '=' || p[optlen] == ','))
+                        return p;
+
+                rest = strchr (p, ',');
+                if (rest == NULL)
+                        break;
+                ++rest;
+        }
+
+        return NULL;
+}
+
+void
+clean_init_params (glusterfs_init_params_t *ipars)
+{
+        if (!ipars)
+                return;
+
+        if (ipars->volume_name)
+                free (ipars->volume_name);
+
+        if (ipars->specfile)
+                free (ipars->specfile);
+
+        if (ipars->logfile)
+                free (ipars->logfile);
+
+        if (ipars->loglevel)
+                free (ipars->loglevel);
+
+        return;
+}
+
+char *
+get_option_value (char *opt)
+{
+        char *val = NULL;
+        char *saveptr = NULL;
+        char *copy_opt = NULL;
+        char *retval = NULL;
+
+        copy_opt = strdup (opt);
+
+        /* Get the = before the value of the option. */
+        val = index (copy_opt, '=');
+        if (val) {
+                /* Move to start of option */
+                ++val;
+
+                /* Now, to create a '\0' delimited string out of the
+                 * options string, first get the position where the
+                 * next option starts, that would be the next ','.
+                 */
+                saveptr = index (val, ',');
+                if (saveptr)
+                        *saveptr = '\0';
+                retval = strdup (val);
+        }
+
+        free (copy_opt);
+
+        return retval;
+}
+
+void
+booster_mount (struct glusterfs_mntent *ent)
+{
+        char                    *opt = NULL;
+        glusterfs_init_params_t ipars;
+        time_t                  timeout = BOOSTER_DEFAULT_ATTR_TIMEO;
+        char                    *timeostr = NULL;
+        char                    *endptr = NULL;
+
+        if (!ent)
+                return;
+
+        gf_log ("booster-fstab", GF_LOG_DEBUG, "Mount entry: volfile: %s,"
+                " VMP: %s, Type: %s, Options: %s", ent->mnt_fsname,
+                ent->mnt_dir, ent->mnt_type, ent->mnt_opts);
+        if ((strcmp (ent->mnt_type, "glusterfs") != 0)) {
+                gf_log ("booster-fstab", GF_LOG_ERROR, "Type is not glusterfs");
+                return;
+        }
+
+        memset (&ipars, 0, sizeof (glusterfs_init_params_t));
+        if (ent->mnt_fsname)
+                ipars.specfile = strdup (ent->mnt_fsname);
+
+        opt = glusterfs_fstab_hasoption (ent, "subvolume");
+        if (opt)
+                ipars.volume_name = get_option_value (opt);
+
+        opt = glusterfs_fstab_hasoption (ent, "log-file");
+        if (!opt)
+                opt = glusterfs_fstab_hasoption (ent, "logfile");
+
+        if (opt)
+                ipars.logfile = get_option_value (opt);
+
+        opt = glusterfs_fstab_hasoption (ent, "log-level");
+        if (!opt)
+                opt = glusterfs_fstab_hasoption (ent, "loglevel");
+
+        if (opt)
+                ipars.loglevel = get_option_value (opt);
+
+        /* Attribute cache timeout */
+        opt = glusterfs_fstab_hasoption (ent, "attr_timeout");
+        if (opt) {
+                 timeostr = get_option_value (opt);
+                 if (timeostr)
+                         timeout = strtol (timeostr, &endptr, 10);
+        }
+
+        ipars.lookup_timeout = timeout;
+        ipars.stat_timeout = timeout;
+
+        if ((glusterfs_mount (ent->mnt_dir, &ipars)) == -1)
+                gf_log ("booster-fstab", GF_LOG_ERROR, "VMP mounting failed");
+
+        clean_init_params (&ipars);
+}
+
+int
+booster_configure (char *confpath)
+{
+        int                     ret = -1;
+        glusterfs_fstab_t       *handle = NULL;
+        struct glusterfs_mntent *ent = NULL;
+
+        if (!confpath)
+                goto out;
+
+        handle = glusterfs_fstab_init (confpath, "r");
+        if (!handle)
+                goto out;
+
+        while ((ent = glusterfs_fstab_getent (handle)) != NULL)
+                booster_mount (ent);
+
+        glusterfs_fstab_close (handle);
+        ret = 0;
+out:
+        return ret;
+}
+
+
diff --git a/booster/src/booster_fstab.h b/booster/src/booster_fstab.h
new file mode 100644
index 000000000..9bab04c5a
--- /dev/null
+++ b/booster/src/booster_fstab.h
@@ -0,0 +1,83 @@
+/* Utilities for reading/writing fstab, mtab, etc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef	GLUSTERFS_FSTAB_MNTENT_H
+#define	GLUSTERFS_FSTAB_MNTENT_H	1
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+ 
+#include "compat.h"
+
+/* General filesystem types.  */
+#define GF_MNTTYPE_IGNORE	"ignore"	/* Ignore this entry.  */
+#define GF_MNTTYPE_NFS	"nfs"		/* Network file system.  */
+#define GF_MNTTYPE_SWAP	"swap"		/* Swap device.  */
+
+
+/* Generic mount options.  */
+#define GF_MNTOPT_DEFAULTS	"defaults"	/* Use all default options.  */
+#define GF_MNTOPT_RO	        "ro"		/* Read only.  */
+#define GF_MNTOPT_RW	        "rw"		/* Read/write.  */
+#define GF_MNTOPT_SUID	        "suid"		/* Set uid allowed.  */
+#define GF_MNTOPT_NOSUID	"nosuid"	/* No set uid allowed.  */
+#define GF_MNTOPT_NOAUTO	"noauto"	/* Do not auto mount.  */
+
+
+/* Structure describing a mount table entry.  */
+struct glusterfs_mntent
+{
+        char *mnt_fsname;		/* Device or server for filesystem.  */
+        char *mnt_dir;		/* Directory mounted on.  */
+        char *mnt_type;		/* Type of filesystem: ufs, nfs, etc.  */
+        char *mnt_opts;		/* Comma-separated options for fs.  */
+        int mnt_freq;		/* Dump frequency (in days).  */
+        int mnt_passno;		/* Pass number for `fsck'.  */
+};
+
+#define GF_MNTENT_BUFSIZE       1024
+typedef struct glusterfs_fstab_handle {
+        FILE *fp;
+        char buf[GF_MNTENT_BUFSIZE];
+        struct glusterfs_mntent tmpent;
+}glusterfs_fstab_t;
+
+
+/* Prepare to begin reading and/or writing mount table entries from the
+   beginning of FILE.  MODE is as for `fopen'.  */
+extern glusterfs_fstab_t *glusterfs_fstab_init (const char *file,
+                const char *mode);
+
+extern struct glusterfs_mntent *glusterfs_fstab_getent (glusterfs_fstab_t *h);
+
+/* Write the mount table entry described by MNT to STREAM.
+   Return zero on success, nonzero on failure.  */
+extern int glusterfs_fstab_addent (glusterfs_fstab_t *h,
+                const struct glusterfs_mntent *mnt);
+
+/* Close a stream opened with `glusterfs_fstab_init'.  */
+extern int glusterfs_fstab_close (glusterfs_fstab_t *h);
+
+/* Search MNT->mnt_opts for an option matching OPT.
+   Returns the address of the substring, or null if none found.  */
+extern char *glusterfs_fstab_hasoption (const struct glusterfs_mntent *mnt,
+                const char *opt);
+
+#endif
diff --git a/booster/src/booster_stat.c b/booster/src/booster_stat.c
new file mode 100644
index 000000000..8f76cfe37
--- /dev/null
+++ b/booster/src/booster_stat.c
@@ -0,0 +1,188 @@
+/*
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#include <sys/types.h>
+
+extern int
+booster_stat (const char *path, void *buf);
+
+extern int
+booster_stat64 (const char *path, void *buf);
+
+extern int
+booster_xstat (int ver, const char *path, void *buf);
+
+extern int
+booster_xstat64 (int ver, const char *path, void *buf);
+
+extern int
+booster_fxstat (int ver, int fd, void *buf);
+extern int
+booster_fxstat64 (int ver, int fd, void *buf);
+extern int
+booster_fstat (int fd, void *buf);
+extern int
+booster_fstat64 (int fd, void *buf);
+
+extern int
+booster_lstat (const char *path, void *buf);
+extern int
+booster_lstat64 (const char *path, void *buf);
+extern int
+booster_lxstat (int ver, const char *path, void *buf);
+extern int
+booster_lxstat64 (int ver, const char *path, void *buf);
+
+
+extern int
+booster_statfs (const char *path, void *buf);
+extern int
+booster_statfs64 (const char *path, void *buf);
+
+extern int
+booster_statvfs (const char *path, void *buf);
+
+extern int
+booster_statvfs64 (const char *path, void *buf);
+
+extern void *
+booster_readdir (void *dir);
+
+extern void
+booster_rewinddir (void *dir);
+
+extern void
+booster_seekdir (void *dir, off_t offset);
+
+extern off_t
+booster_telldir (void *dir);
+
+int
+stat (const char *path, void *buf)
+{
+        return booster_stat (path, buf);
+}
+
+int
+stat64 (const char *path, void *buf)
+{
+        return booster_stat64 (path, buf);
+}
+
+int
+__xstat (int ver, const char *path, void *buf)
+{
+        return booster_xstat (ver, path, buf);
+}
+
+int
+__xstat64 (int ver, const char *path, void *buf)
+{
+        return booster_xstat64 (ver, path, buf);
+}
+
+int
+__fxstat (int ver, int fd, void *buf)
+{
+        return booster_fxstat (ver, fd, buf);
+}
+
+int
+__fxstat64 (int ver, int fd, void *buf)
+{
+        return booster_fxstat64 (ver, fd, buf);
+}
+
+int
+fstat (int fd, void *buf)
+{
+        return booster_fstat (fd, buf);
+}
+
+int
+fstat64 (int fd, void *buf)
+{
+        return booster_fstat64 (fd, buf);
+}
+
+int
+lstat (const char *path, void *buf)
+{
+        return booster_lstat (path, buf);
+}
+
+int
+lstat64 (const char *path, void *buf)
+{
+        return booster_lstat64 (path, buf);
+}
+
+int
+__lxstat (int ver, const char *path, void *buf)
+{
+        return booster_lxstat (ver, path, buf);
+}
+
+int
+__lxstat64 (int ver, const char *path, void *buf)
+{
+        return booster_lxstat64 (ver, path, buf);
+}
+
+int
+statfs (const char *pathname, void *buf)
+{
+        return booster_statfs (pathname, buf);
+}
+
+int
+statfs64 (const char *pathname, void *buf)
+{
+        return booster_statfs64 (pathname, buf);
+}
+
+int
+statvfs (const char *pathname, void *buf)
+{
+        return booster_statvfs (pathname, buf);
+}
+
+int
+statvfs64 (const char *pathname, void *buf)
+{
+        return booster_statvfs64 (pathname, buf);
+}
+
+void
+rewinddir (void *dir)
+{
+	return booster_rewinddir (dir);
+}
+
+void
+seekdir (void *dir, off_t offset)
+{
+	return booster_seekdir (dir, offset);
+}
+
+off_t
+telldir (void *dir)
+{
+	return booster_telldir (dir);
+}
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index d5189da5e..b50b7dbca 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -2,26 +2,23 @@ sbin_PROGRAMS = gluster
 
 gluster_SOURCES = cli.c registry.c input.c cli-cmd.c cli-rl.c \
 	 cli-cmd-volume.c cli-cmd-peer.c cli-rpc-ops.c cli-cmd-parser.c\
-	 cli-cmd-system.c cli-cmd-misc.c cli-xml-output.c
+	 cli-cmd-system.c cli-cmd-misc.c
 
 gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\
 		$(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \
-		$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-		$(GF_GLUSTERFS_LIBS) $(XML_LIBS)
+		$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la
 
-gluster_LDFLAGS = $(GF_LDFLAGS)
+gluster_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS)
 noinst_HEADERS = cli.h cli-mem-types.h cli-cmd.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) \
+AM_CFLAGS = -fPIC -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
 	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src\
 	-I$(top_srcdir)/rpc/xdr/src\
 	-DDATADIR=\"$(localstatedir)\" \
-	-DCONFDIR=\"$(sysconfdir)/glusterfs\" \
+	-DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS)\
 	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
-	-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\
-	$(XML_CPPFLAGS)
+	-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DGFS_PREFIX=\"$(prefix)\"
 
-AM_CFLAGS = -Wall $(GF_GLUSTERFS_CFLAGS)
 
 CLEANFILES =
 
diff --git a/cli/src/cli-cmd-misc.c b/cli/src/cli-cmd-misc.c
index 4aec8dd35..40f419cde 100644
--- a/cli/src/cli-cmd-misc.c
+++ b/cli/src/cli-cmd-misc.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -31,7 +41,6 @@ extern struct cli_cmd volume_cmds[];
 extern struct cli_cmd cli_probe_cmds[];
 extern struct cli_cmd cli_log_cmds[];
 extern struct cli_cmd cli_system_cmds[];
-extern struct cli_cmd cli_bd_cmds[];
 struct cli_cmd cli_misc_cmds[];
 
 int
@@ -46,8 +55,7 @@ cli_cmd_display_help (struct cli_state *state, struct cli_cmd_word *in_word,
                       const char **words, int wordcount)
 {
         struct cli_cmd        *cmd[] = {volume_cmds, cli_probe_cmds,
-                                       cli_misc_cmds,
-                                       NULL};
+                                       cli_misc_cmds, NULL};
         struct cli_cmd        *cmd_ind = NULL;
         int                   i = 0;
 
@@ -72,10 +80,6 @@ struct cli_cmd cli_misc_cmds[] = {
            cli_cmd_display_help,
            "display command options"},
 
-        { "exit",
-          cli_cmd_quit_cbk,
-          "exit"},
-
         { NULL, NULL, NULL }
 };
 
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index cd0370acc..4b749f8cd 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -26,18 +36,6 @@
 #include "protocol-common.h"
 #include "cli1-xdr.h"
 
-static const char *
-id_sel (void *wcon)
-{
-        return (const char *)wcon;
-}
-
-static char *
-str_getunamb (const char *tok, char **opwords)
-{
-        return (char *)cli_getunamb (tok, (void **)opwords, id_sel);
-}
-
 int32_t
 cli_cmd_bricks_parse (const char **words, int wordcount, int brick_index,
                       char **bricks, int *brick_count)
@@ -48,11 +46,11 @@ cli_cmd_bricks_parse (const char **words, int wordcount, int brick_index,
         char                *space = " ";
         char            *delimiter = NULL;
         char            *host_name = NULL;
+        char                  *tmp = NULL;
         char        *free_list_ptr = NULL;
         char               *tmpptr = NULL;
         int                      j = 0;
         int         brick_list_len = 0;
-        char             *tmp_host = NULL;
 
         GF_ASSERT (words);
         GF_ASSERT (wordcount);
@@ -63,32 +61,26 @@ cli_cmd_bricks_parse (const char **words, int wordcount, int brick_index,
         strncpy (brick_list, space, strlen (space));
         brick_list_len++;
         while (brick_index < wordcount) {
-                if (validate_brick_name ((char *)words[brick_index])) {
-                        cli_err ("Wrong brick type: %s, use <HOSTNAME>:"
+                delimiter = strchr (words[brick_index], ':');
+                if (!delimiter || delimiter == words[brick_index]
+                    || *(delimiter+1) != '/') {
+                        cli_out ("wrong brick type: %s, use <HOSTNAME>:"
                                  "<export-dir-abs-path>", words[brick_index]);
                         ret = -1;
                         goto out;
                 } else {
-                        delimiter = strrchr (words[brick_index], ':');
-                        ret = gf_canonicalize_path (delimiter + 1);
-                        if (ret)
-                                goto out;
+                        cli_path_strip_trailing_slashes (delimiter + 1);
                 }
 
                 if ((brick_list_len + strlen (words[brick_index]) + 1) > sizeof (brick_list)) {
-                        cli_err ("Total brick list is larger than a request. "
-                                 "Can take (brick_count %d)", *brick_count);
+                        gf_log ("cli", GF_LOG_ERROR,
+                                "total brick list is larger than a request "
+                                "can take (brick_count %d)", *brick_count);
                         ret = -1;
                         goto out;
                 }
 
-                tmp_host = gf_strdup ((char *)words[brick_index]);
-                if (!tmp_host) {
-                        gf_log ("cli", GF_LOG_ERROR, "Out of memory");
-                        ret = -1;
-                        goto out;
-                }
-                get_host_name (tmp_host, &host_name);
+                host_name = gf_strdup (words[brick_index]);
                 if (!host_name) {
                         ret = -1;
                         gf_log("cli",GF_LOG_ERROR, "Unable to allocate "
@@ -96,21 +88,20 @@ cli_cmd_bricks_parse (const char **words, int wordcount, int brick_index,
                         goto out;
                 }
 
+                strtok_r (host_name, ":", &tmp);
                 if (!(strcmp (host_name, "localhost") &&
-                      strcmp (host_name, "127.0.0.1") &&
-                      strncmp (host_name, "0.", 2))) {
-                        cli_err ("Please provide a valid hostname/ip other "
-                                 "than localhost, 127.0.0.1 or loopback "
-                                 "address (0.0.0.0 to 0.255.255.255).");
+                      strcmp (host_name, "127.0.0.1"))) {
+                        cli_out ("Please provide a valid hostname/ip other "
+                                 "than localhost or 127.0.0.1");
                         ret = -1;
-                        GF_FREE (tmp_host);
+                        GF_FREE (host_name);
                         goto out;
                 }
-                if (!valid_internet_address (host_name, _gf_false)) {
-                        cli_err ("internet address '%s' does not conform to "
-                                 "standards", host_name);
+                if (!valid_host_name(host_name, strlen(host_name))) {
+                        cli_out ("internet address '%s' does not comform to "
+			         "standards", host_name);
                 }
-                GF_FREE (tmp_host);
+                GF_FREE (host_name);
                 tmp_list = gf_strdup (brick_list + 1);
                 if (free_list_ptr) {
                         GF_FREE (free_list_ptr);
@@ -122,7 +113,7 @@ cli_cmd_bricks_parse (const char **words, int wordcount, int brick_index,
                         strtok_r (tmp_list, " ", &tmpptr);
                         if (!(strcmp (tmp_list, words[brick_index]))) {
                                 ret = -1;
-                                cli_err ("Found duplicate"
+                                cli_out ("Found duplicate"
                                          " exports %s",words[brick_index]);
                                 goto out;
                        }
@@ -140,7 +131,8 @@ cli_cmd_bricks_parse (const char **words, int wordcount, int brick_index,
         if (!*bricks)
                 ret = -1;
 out:
-        GF_FREE (free_list_ptr);
+        if (free_list_ptr)
+                GF_FREE (free_list_ptr);
         return ret;
 }
 
@@ -152,28 +144,19 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options
         int     ret = -1;
         gf1_cluster_type type = GF_CLUSTER_TYPE_NONE;
         int     count = 1;
-        int     sub_count = 1;
         int     brick_index = 0;
         int     i = 0;
         char    *trans_type = NULL;
         int32_t index = 0;
         char    *bricks = NULL;
         int32_t brick_count = 0;
-        char    *opwords[] = { "replica", "stripe", "transport", NULL };
-
-        char    *invalid_volnames[] = {"volume", "type", "subvolumes", "option",
-                                       "end-volume", "all", "volume_not_in_ring",
-                                       NULL};
-        char    *w = NULL;
-        int      op_count = 0;
-        int32_t  replica_count = 1;
-        int32_t  stripe_count = 1;
-        gf_boolean_t is_force = _gf_false;
-        int wc = wordcount;
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "create")) == 0);
+
         dict = dict_new ();
 
         if (!dict)
@@ -191,12 +174,9 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options
                 if (volname[0] == '-')
                         goto out;
 
-                for (i = 0; invalid_volnames[i]; i++) {
-                        if (!strcmp (volname, invalid_volnames[i])) {
-                                cli_err ("\"%s\" cannot be the name of a volume.",
-                                         volname);
-                                goto out;
-                        }
+                if (!strcmp (volname, "all")) {
+                        cli_out ("\"all\" cannot be the name of a volume.");
+                        goto out;
                 }
 
                 if (strchr (volname, '/'))
@@ -210,129 +190,95 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options
                                 goto out;
         }
 
+
+        ret = dict_set_str (dict, "volname", volname);
+        if (ret)
+                goto out;
+
         if (wordcount < 4) {
                 ret = -1;
                 goto out;
         }
-
-        type = GF_CLUSTER_TYPE_NONE;
-        index = 3;
-
-        while (op_count < 3) {
-                ret = -1;
-                w = str_getunamb (words[index], opwords);
-                if (!w) {
-                        break;
-                } else if ((strcmp (w, "replica")) == 0) {
-                        switch (type) {
-                        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
-                        case GF_CLUSTER_TYPE_REPLICATE:
-                                cli_err ("replica option given twice");
-                                goto out;
-                        case GF_CLUSTER_TYPE_NONE:
-                                type = GF_CLUSTER_TYPE_REPLICATE;
-                                break;
-                        case GF_CLUSTER_TYPE_STRIPE:
-                                type = GF_CLUSTER_TYPE_STRIPE_REPLICATE;
-                                break;
-                        }
-
-                        if (wordcount < (index+2)) {
-                                ret = -1;
-                                goto out;
-                        }
-                        replica_count = strtol (words[index+1], NULL, 0);
-                        if (replica_count < 2) {
-                                cli_err ("replica count should be greater"
-                                         " than 1");
-                                ret = -1;
-                                goto out;
-                        }
-                        ret = dict_set_int32 (dict, "replica-count", replica_count);
-                        if (ret)
-                                goto out;
-
-                        index += 2;
-
-                } else if ((strcmp (w, "stripe")) == 0) {
-                        switch (type) {
-                        case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
-                        case GF_CLUSTER_TYPE_STRIPE:
-                                cli_err ("stripe option given twice");
-                                goto out;
-                        case GF_CLUSTER_TYPE_NONE:
-                                type = GF_CLUSTER_TYPE_STRIPE;
-                                break;
-                        case GF_CLUSTER_TYPE_REPLICATE:
-                                type = GF_CLUSTER_TYPE_STRIPE_REPLICATE;
-                                break;
-                        }
-                        if (wordcount < (index + 2)) {
-                                ret = -1;
-                                goto out;
-                        }
-                        stripe_count = strtol (words[index+1], NULL, 0);
-                        if (stripe_count < 2) {
-                                cli_err ("stripe count should be greater"
-                                         " than 1");
-                                ret = -1;
-                                goto out;
-                        }
-                        ret = dict_set_int32 (dict, "stripe-count", stripe_count);
-                        if (ret)
-                                goto out;
-
-                        index += 2;
-
-                } else if ((strcmp (w, "transport")) == 0) {
-                        if (trans_type) {
-                                cli_err ("'transport' option given more"
-                                         " than one time");
-                                goto out;
-                        }
-                        if ((strcasecmp (words[index+1], "tcp") == 0)) {
-                                trans_type = gf_strdup ("tcp");
-                        } else if ((strcasecmp (words[index+1], "rdma") == 0)) {
-                                trans_type = gf_strdup ("rdma");
-                        } else if ((strcasecmp (words[index+1], "tcp,rdma") == 0) ||
-                                   (strcasecmp (words[index+1], "rdma,tcp") == 0)) {
-                                trans_type = gf_strdup ("tcp,rdma");
-                        } else {
-                                gf_log ("", GF_LOG_ERROR, "incorrect transport"
-                                        " protocol specified");
-                                ret = -1;
-                                goto out;
-                        }
-                        index += 2;
-                }              else {
-                        GF_ASSERT (!"opword mismatch");
+        if ((strcasecmp (words[3], "replica")) == 0) {
+                type = GF_CLUSTER_TYPE_REPLICATE;
+                if (wordcount < 5) {
+                        ret = -1;
+                        goto out;
+                }
+                count = strtol (words[4], NULL, 0);
+                if (!count || (count < 2)) {
+                        cli_out ("replica count should be greater than 1");
+                        ret = -1;
+                        goto out;
+                }
+                ret = dict_set_int32 (dict, "replica-count", count);
+                if (ret)
+                        goto out;
+                brick_index = 5;
+        } else if ((strcasecmp (words[3], "stripe")) == 0) {
+                type = GF_CLUSTER_TYPE_STRIPE;
+                if (wordcount < 5) {
+                        ret = -1;
+                        goto out;
+                }
+                count = strtol (words[4], NULL, 0);
+                if (!count || (count < 2)) {
+                        cli_out ("stripe count should be greater than 1");
                         ret = -1;
                         goto out;
                 }
-                op_count++;
+                ret = dict_set_int32 (dict, "stripe-count", count);
+                if (ret)
+                        goto out;
+                brick_index = 5;
+        } else {
+                type = GF_CLUSTER_TYPE_NONE;
+                brick_index = 3;
         }
 
-        if (!trans_type)
-                trans_type = gf_strdup ("tcp");
-
-        sub_count = stripe_count * replica_count;
+        ret = dict_set_int32 (dict, "type", type);
+        if (ret)
+                goto out;
 
-        /* reset the count value now */
-        count = 1;
+        if (type)
+                index = 5;
+        else
+                index = 3;
 
-        if (index >= wordcount) {
+        if (wordcount < (index + 1)) {
                 ret = -1;
                 goto out;
         }
 
-        brick_index = index;
+        if (strcasecmp(words[index], "transport") == 0) {
+                brick_index = index+2;
+                if (wordcount < (index + 2)) {
+                        ret = -1;
+                        goto out;
+                }
 
-        if (strcmp (words[wordcount - 1], "force") == 0) {
-                is_force = _gf_true;
-                wc = wordcount - 1;
+                if ((strcasecmp (words[index+1], "tcp") == 0)) {
+                        trans_type = gf_strdup ("tcp");
+                } else if ((strcasecmp (words[index+1], "rdma") == 0)) {
+                        trans_type = gf_strdup ("rdma");
+                } else if ((strcasecmp (words[index+1], "tcp,rdma") == 0) ||
+                           (strcasecmp (words[index+1], "rdma,tcp") == 0)) {
+                        trans_type = gf_strdup ("tcp,rdma");
+                } else {
+                        gf_log ("", GF_LOG_ERROR, "incorrect transport"
+                                       " protocol specified");
+                        ret = -1;
+                        goto out;
+                }
+        } else {
+                trans_type = gf_strdup ("tcp");
         }
 
-        ret = cli_cmd_bricks_parse (words, wc, brick_index, &bricks,
+        ret = dict_set_dynstr (dict, "transport", trans_type);
+        if (ret)
+                goto out;
+
+        ret = cli_cmd_bricks_parse (words, wordcount, brick_index, &bricks,
                                     &brick_count);
         if (ret)
                 goto out;
@@ -340,40 +286,22 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options
         /* If brick-count is not valid when replica or stripe is
            given, exit here */
         if (!brick_count) {
-                cli_err ("No bricks specified");
+                cli_out ("No bricks specified");
                 ret = -1;
                 goto out;
         }
 
-        if (brick_count % sub_count) {
+        if (brick_count % count) {
                 if (type == GF_CLUSTER_TYPE_STRIPE)
-                        cli_err ("number of bricks is not a multiple of "
+                        cli_out ("number of bricks is not a multiple of "
                                  "stripe count");
                 else if (type == GF_CLUSTER_TYPE_REPLICATE)
-                        cli_err ("number of bricks is not a multiple of "
+                        cli_out ("number of bricks is not a multiple of "
                                  "replica count");
-                else
-                        cli_err ("number of bricks given doesn't match "
-                                 "required count");
-
                 ret = -1;
                 goto out;
         }
 
-        /* Everything if parsed fine. start setting info in dict */
-        ret = dict_set_str (dict, "volname", volname);
-        if (ret)
-                goto out;
-
-        ret = dict_set_int32 (dict, "type", type);
-        if (ret)
-                goto out;
-
-        ret = dict_set_dynstr (dict, "transport", trans_type);
-        if (ret)
-                goto out;
-        trans_type = NULL;
-
         ret = dict_set_dynstr (dict, "bricks", bricks);
         if (ret)
                 goto out;
@@ -382,10 +310,6 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options
         if (ret)
                 goto out;
 
-        ret = dict_set_int32 (dict, "force", is_force);
-        if (ret)
-                goto out;
-
         *options = dict;
 
 out:
@@ -394,9 +318,6 @@ out:
                 if (dict)
                         dict_destroy (dict);
         }
-
-        GF_FREE (trans_type);
-
         return ret;
 }
 
@@ -410,6 +331,9 @@ cli_cmd_volume_reset_parse (const char **words, int wordcount, dict_t **options)
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "reset")) == 0);
+
         dict = dict_new ();
 
         if (!dict)
@@ -418,7 +342,7 @@ cli_cmd_volume_reset_parse (const char **words, int wordcount, dict_t **options)
         if (wordcount < 3)
                 goto out;
 
-        if (wordcount > 5)
+        if (wordcount > 4)
                 goto out;
 
         volname = (char *)words[2];
@@ -432,29 +356,8 @@ cli_cmd_volume_reset_parse (const char **words, int wordcount, dict_t **options)
         if (ret)
                 goto out;
 
-        if (wordcount == 3) {
-                ret = dict_set_str (dict, "key", "all");
-                if (ret)
-                        goto out;
-        }
-
-        if (wordcount >= 4) {
-                if (!strcmp ("force", (char*)words[3])) {
-                        ret = dict_set_int32 (dict, "force", 1);
-                        if (ret)
-                                goto out;
-                        ret = dict_set_str (dict, "key", "all");
-                        if (ret)
-                                goto out;
-                } else {
-                        ret = dict_set_str (dict, "key", (char *)words[3]);
-                        if (ret)
-                                goto out;
-                }
-        }
-
-        if (wordcount == 5) {
-                if (strcmp ("force", (char*)words[4])) {
+        if (wordcount == 4) {
+                if (strcmp ("force", (char*)words[3])) {
                         ret = -1;
                         goto out;
                 } else {
@@ -484,14 +387,15 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
         char             key[20] = {0, };
         uint64_t         value   = 0;
         gf_quota_type    type    = GF_QUOTA_OPTION_TYPE_NONE;
-        char           *opwords[] = { "enable", "disable", "limit-usage",
-                                      "remove", "list", "version", NULL };
-        char            *w       = NULL;
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "quota")) == 0);
+
         dict = dict_new ();
+
         if (!dict)
                 goto out;
 
@@ -499,6 +403,7 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
                 goto out;
 
         volname = (char *)words[2];
+
         if (!volname) {
                 ret = -1;
                 goto out;
@@ -510,7 +415,7 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
                         goto out;
 
                 if (!strcmp (volname, "all")) {
-                        cli_err ("\"all\" cannot be the name of a volume.");
+                        cli_out ("\"all\" cannot be the name of a volume.");
                         goto out;
                 }
 
@@ -526,38 +431,21 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
         }
 
         ret = dict_set_str (dict, "volname", volname);
-        if (ret < 0)
+        if (ret)
                 goto out;
 
-        w = str_getunamb (words[3], opwords);
-        if (!w) {
-                ret = - 1;
-                goto out;
-        }
 
-        if (strcmp (w, "enable") == 0) {
-                if (wordcount == 4) {
-                        type = GF_QUOTA_OPTION_TYPE_ENABLE;
-                        ret = 0;
-                        goto set_type;
-                } else {
-                        ret = -1;
-                        goto out;
-                }
+        if ((strcasecmp (words[3], "enable")) == 0 && wordcount == 4) {
+                type = GF_QUOTA_OPTION_TYPE_ENABLE;
+                goto set_type;
         }
 
-        if (strcmp (w, "disable") == 0) {
-                if (wordcount == 4) {
-                        type = GF_QUOTA_OPTION_TYPE_DISABLE;
-                        ret = 0;
-                        goto set_type;
-                } else {
-                        ret = -1;
-                        goto out;
-                }
+        if (strcasecmp (words[3], "disable") == 0 && wordcount == 4) {
+                type = GF_QUOTA_OPTION_TYPE_DISABLE;
+                goto set_type;
         }
 
-        if (strcmp (w, "limit-usage") == 0) {
+        if (strcasecmp (words[3], "limit-usage") == 0) {
                 if (wordcount != 6) {
                         ret = -1;
                         goto out;
@@ -566,7 +454,7 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
                 type = GF_QUOTA_OPTION_TYPE_LIMIT_USAGE;
 
                 if (words[4][0] != '/') {
-                        cli_err ("Please enter absolute path");
+                        cli_out ("Please enter absolute path");
 
                         return -2;
                 }
@@ -575,24 +463,24 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
                         goto out;
 
                 if (!words[5]) {
-                        cli_err ("Please enter the limit value to be set");
+                        cli_out ("Please enter the limit value to be set");
 
                         return -2;
                 }
 
                 ret = gf_string2bytesize (words[5], &value);
                 if (ret != 0) {
-                        cli_err ("Please enter a correct value");
+                        cli_out ("Please enter a correct value");
                         return -1;
                 }
 
                 ret = dict_set_str (dict, "limit", (char *) words[5]);
-                if (ret < 0)
+                if (ret)
                         goto out;
 
                 goto set_type;
         }
-        if (strcmp (w, "remove") == 0) {
+        if (strcasecmp (words[3], "remove") == 0) {
                 if (wordcount != 5) {
                         ret = -1;
                         goto out;
@@ -601,55 +489,57 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
                 type = GF_QUOTA_OPTION_TYPE_REMOVE;
 
                 if (words[4][0] != '/') {
-                        cli_err ("Please enter absolute path");
+                        cli_out ("Please enter absolute path");
 
                         return -2;
                 }
 
                 ret = dict_set_str (dict, "path", (char *) words[4]);
-                if (ret < 0)
+                if (ret)
                         goto out;
                 goto set_type;
         }
 
-        if (strcmp (w, "list") == 0) {
-                if (wordcount < 4) {
-                        ret = -1;
-                        goto out;
-                }
+        if (strcasecmp (words[3], "list") == 0) {
+                        if (wordcount < 4) {
+                                ret = -1;
+                                goto out;
+                        }
 
-                type = GF_QUOTA_OPTION_TYPE_LIST;
+                        type = GF_QUOTA_OPTION_TYPE_LIST;
 
-                i = 4;
-                while (i < wordcount) {
-                        snprintf (key, 20, "path%d", i-4);
+                        i = 4;
+                        while (i < wordcount) {
+                                snprintf (key, 20, "path%d", i-4);
 
-                        ret = dict_set_str (dict, key, (char *) words [i++]);
+                                ret = dict_set_str (dict, key, (char *) words [i++]);
+                                if (ret < 0)
+                                        goto out;
+                        }
+
+                        ret = dict_set_int32 (dict, "count", i - 4);
                         if (ret < 0)
                                 goto out;
-                }
 
-                ret = dict_set_int32 (dict, "count", i - 4);
-                if (ret < 0)
-                        goto out;
-
-                goto set_type;
+                        goto set_type;
         }
 
-        if (strcmp (w, "version") == 0) {
+        if (strcasecmp (words[3], "version") == 0) {
                 type = GF_QUOTA_OPTION_TYPE_VERSION;
+
         } else {
-                GF_ASSERT (!"opword mismatch");
+                ret = -1;
+                goto out;
         }
 
 set_type:
         ret = dict_set_int32 (dict, "type", type);
-        if (ret < 0)
-                goto out;
 
+        if (ret)
+                goto out;
         *options = dict;
 out:
-        if (ret < 0) {
+        if (ret) {
                 if (dict)
                         dict_destroy (dict);
         }
@@ -657,121 +547,24 @@ out:
         return ret;
 }
 
-static inline gf_boolean_t
-cli_is_key_spl (char *key)
-{
-        return (strcmp (key, "group") == 0);
-}
-
-#define GLUSTERD_DEFAULT_WORKDIR "/var/lib/glusterd"
-static int
-cli_add_key_group (dict_t *dict, char *key, char *value, char **op_errstr)
-{
-        int             ret = -1;
-        int             opt_count = 0;
-        char            iter_key[1024] = {0,};
-        char            iter_val[1024] = {0,};
-        char            *saveptr = NULL;
-        char            *tok_key = NULL;
-        char            *tok_val = NULL;
-        char            *dkey = NULL;
-        char            *dval = NULL;
-        char            *tagpath = NULL;
-        char            *buf = NULL;
-        char            line[PATH_MAX + 256] = {0,};
-        char            errstr[2048] = "";
-        FILE            *fp = NULL;
-
-        ret = gf_asprintf (&tagpath, "%s/groups/%s",
-                           GLUSTERD_DEFAULT_WORKDIR, value);
-        if (ret == -1) {
-                tagpath = NULL;
-                goto out;
-        }
-
-        fp = fopen (tagpath, "r");
-        if (!fp) {
-                ret = -1;
-                snprintf(errstr, sizeof(errstr), "Unable to open file '%s'."
-                         " Error: %s", tagpath, strerror (errno));
-                if (op_errstr)
-                        *op_errstr = gf_strdup(errstr);
-                goto out;
-        }
-
-        opt_count = 0;
-        buf = line;
-        while (fscanf (fp, "%s", buf) != EOF) {
-
-                opt_count++;
-                tok_key = strtok_r (line, "=", &saveptr);
-                tok_val = strtok_r (NULL, "=", &saveptr);
-                if (!tok_key || !tok_val) {
-                        ret = -1;
-                        snprintf(errstr, sizeof(errstr), "'%s' file format "
-                                 "not valid.", tagpath);
-                        if (op_errstr)
-                                *op_errstr = gf_strdup(errstr);
-                        goto out;
-                }
-
-                snprintf (iter_key, sizeof (iter_key), "key%d", opt_count);
-                dkey = gf_strdup (tok_key);
-                ret = dict_set_dynstr (dict, iter_key, dkey);
-                if (ret)
-                        goto out;
-                dkey = NULL;
-
-                snprintf (iter_val, sizeof (iter_val), "value%d", opt_count);
-                dval = gf_strdup (tok_val);
-                ret = dict_set_dynstr (dict, iter_val, dval);
-                if (ret)
-                        goto out;
-                dval = NULL;
-
-        }
-
-        if (!opt_count) {
-                ret = -1;
-                snprintf(errstr, sizeof(errstr), "'%s' file format "
-                         "not valid.", tagpath);
-                if (op_errstr)
-                        *op_errstr = gf_strdup(errstr);
-                goto out;
-        }
-        ret = dict_set_int32 (dict, "count", opt_count);
-out:
-
-        GF_FREE (tagpath);
-
-        if (ret) {
-                GF_FREE (dkey);
-                GF_FREE (dval);
-        }
-
-        if (fp)
-                fclose (fp);
-
-        return ret;
-}
-#undef GLUSTERD_DEFAULT_WORKDIR
-
 int32_t
-cli_cmd_volume_set_parse (const char **words, int wordcount, dict_t **options,
-                          char **op_errstr)
+cli_cmd_volume_set_parse (const char **words, int wordcount, dict_t **options)
 {
-        dict_t                  *dict = NULL;
-        char                    *volname = NULL;
-        int                     ret = -1;
-        int                     count = 0;
-        char                    *key = NULL;
-        char                    *value = NULL;
-        int                     i = 0;
-        char                    str[50] = {0,};
+        dict_t  *dict = NULL;
+        char    *volname = NULL;
+        int     ret = -1;
+        int     count = 0;
+        char    *key = NULL;
+        char    *value = NULL;
+        int     i = 0;
+        char    str[50] = {0,};
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "set")) == 0);
+
         dict = dict_new ();
 
         if (!dict)
@@ -789,65 +582,27 @@ cli_cmd_volume_set_parse (const char **words, int wordcount, dict_t **options,
         if (ret)
                 goto out;
 
-        if ((!strcmp (volname, "help") || !strcmp (volname, "help-xml"))
-            && wordcount == 3 ) {
-                ret = dict_set_str (dict, volname, volname);
-                if (ret)
-                        goto out;
-
-        } else if (wordcount < 5) {
-                ret = -1;
-                goto out;
+        if (!strcmp (volname, "help") && wordcount == 3 )
+                ret = dict_set_str (dict, "help", volname);
 
-        } else if (wordcount == 5  && cli_is_key_spl ((char *)words[3])) {
-                key = (char *) words[3];
-                value = (char *) words[4];
-                if ( !key || !value) {
-                        ret = -1;
-                        goto out;
-                }
-
-                ret = gf_strip_whitespace (value, strlen (value));
-                if (ret == -1)
-                        goto out;
-
-                if (strlen (value) == 0) {
-                        ret = -1;
-                        goto out;
-                }
+        if (!strcmp (volname, "help-xml") && wordcount == 3 )
+                ret = dict_set_str (dict, "help-xml", volname);
 
-                ret = cli_add_key_group (dict, key, value, op_errstr);
-                if (ret == 0)
-                        *options = dict;
+        if (ret)
                 goto out;
-        }
 
         for (i = 3; i < wordcount; i+=2) {
 
-                key = (char *) words[i];
-                value = (char *) words[i+1];
+		key = (char *) words[i];
+		value = (char *) words[i+1];
 
-                if ( !key || !value) {
-                        ret = -1;
-                        goto out;
-                }
+		if ( !key || !value) {
+			ret = -1;
+			goto out;
+        	}
 
                 count++;
 
-                ret = gf_strip_whitespace (value, strlen (value));
-                if (ret == -1)
-                        goto out;
-
-                if (strlen (value) == 0) {
-                        ret = -1;
-                        goto out;
-                }
-
-                if (cli_is_key_spl (key)) {
-                        ret = -1;
-                        goto out;
-                }
-
                 sprintf (str, "key%d", count);
                 ret = dict_set_str (dict, str, key);
                 if (ret)
@@ -868,8 +623,10 @@ cli_cmd_volume_set_parse (const char **words, int wordcount, dict_t **options,
         *options = dict;
 
 out:
-        if (ret)
-                dict_destroy (dict);
+        if (ret) {
+                if (dict)
+                        dict_destroy (dict);
+        }
 
         return ret;
 }
@@ -883,17 +640,13 @@ cli_cmd_volume_add_brick_parse (const char **words, int wordcount,
         int     ret = -1;
         int     brick_count = 0, brick_index = 0;
         char    *bricks = NULL;
-        char    *opwords_cl[] = { "replica", "stripe", NULL };
-        gf1_cluster_type type = GF_CLUSTER_TYPE_NONE;
-        int     count = 1;
-        char    *w = NULL;
-        int     index;
-        gf_boolean_t is_force = _gf_false;
-        int wc = wordcount;
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "add-brick")) == 0);
+
         dict = dict_new ();
 
         if (!dict)
@@ -915,65 +668,9 @@ cli_cmd_volume_add_brick_parse (const char **words, int wordcount,
                 ret = -1;
                 goto out;
         }
-        if (wordcount < 6) {
-                /* seems no options are given, go directly to the parse_brick */
-                brick_index = 3;
-                type = GF_CLUSTER_TYPE_NONE;
-                goto parse_bricks;
-        }
 
-        w = str_getunamb (words[3], opwords_cl);
-        if (!w) {
-                type = GF_CLUSTER_TYPE_NONE;
-                index = 3;
-        } else if ((strcmp (w, "replica")) == 0) {
-                type = GF_CLUSTER_TYPE_REPLICATE;
-                if (wordcount < 5) {
-                        ret = -1;
-                        goto out;
-                }
-                count = strtol (words[4], NULL, 0);
-                if (!count || (count < 2)) {
-                        cli_err ("replica count should be greater than 1");
-                        ret = -1;
-                        goto out;
-                }
-                ret = dict_set_int32 (dict, "replica-count", count);
-                if (ret)
-                        goto out;
-                index = 5;
-        } else if ((strcmp (w, "stripe")) == 0) {
-                type = GF_CLUSTER_TYPE_STRIPE;
-                if (wordcount < 5) {
-                        ret = -1;
-                        goto out;
-                }
-                count = strtol (words[4], NULL, 0);
-                if (!count || (count < 2)) {
-                        cli_err ("stripe count should be greater than 1");
-                        ret = -1;
-                        goto out;
-                }
-                ret = dict_set_int32 (dict, "stripe-count", count);
-                if (ret)
-                        goto out;
-                index = 5;
-        } else {
-                GF_ASSERT (!"opword mismatch");
-                ret = -1;
-                goto out;
-        }
-
-        brick_index = index;
-
-parse_bricks:
-
-        if (strcmp (words[wordcount - 1], "force") == 0) {
-                is_force = _gf_true;
-                wc = wordcount - 1;
-        }
-
-        ret = cli_cmd_bricks_parse (words, wc, brick_index, &bricks,
+        brick_index = 3;
+        ret = cli_cmd_bricks_parse (words, wordcount, brick_index, &bricks,
                                     &brick_count);
         if (ret)
                 goto out;
@@ -987,10 +684,6 @@ parse_bricks:
         if (ret)
                 goto out;
 
-        ret = dict_set_int32 (dict, "force", is_force);
-        if (ret)
-                goto out;
-
         *options = dict;
 
 out:
@@ -1006,7 +699,7 @@ out:
 
 int32_t
 cli_cmd_volume_remove_brick_parse (const char **words, int wordcount,
-                                   dict_t **options, int *question)
+                                   dict_t **options)
 {
         dict_t  *dict = NULL;
         char    *volname = NULL;
@@ -1018,94 +711,39 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount,
         int32_t j = 0;
         char    *tmp_brick = NULL;
         char    *tmp_brick1 = NULL;
-        char    *type_opword[] = { "replica", NULL };
-        char    *opwords[] = { "start", "commit", "stop", "status",
-                               "force", NULL };
-        char    *w = NULL;
-        int32_t  command = GF_OP_CMD_NONE;
-        long     count = 0;
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
-        if (wordcount < 4)
-                goto out;
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "remove-brick")) == 0);
 
         dict = dict_new ();
+
         if (!dict)
                 goto out;
 
+        if (wordcount < 3)
+                goto out;
+
         volname = (char *)words[2];
 
         GF_ASSERT (volname);
 
         ret = dict_set_str (dict, "volname", volname);
+
         if (ret)
                 goto out;
 
-        brick_index = 3;
-        w = str_getunamb (words[3], type_opword);
-        if (w && !strcmp ("replica", w)) {
-                if (wordcount < 5) {
-                        ret = -1;
-                        goto out;
-                }
-                count = strtol (words[4], NULL, 0);
-                if (count < 1) {
-                        cli_err ("replica count should be greater than 0 in "
-                                 "case of remove-brick");
-                        ret = -1;
-                        goto out;
-                }
-
-                ret = dict_set_int32 (dict, "replica-count", count);
-                if (ret)
-                        goto out;
-                brick_index = 5;
-        } else if (w) {
-                GF_ASSERT (!"opword mismatch");
-        }
-
-        w = str_getunamb (words[wordcount - 1], opwords);
-        if (!w) {
-                /* Should be default 'force' */
-                command = GF_OP_CMD_COMMIT_FORCE;
-                if (question)
-                        *question = 1;
-        } else {
-                /* handled this option */
-                wordcount--;
-                if (!strcmp ("start", w)) {
-                        command = GF_OP_CMD_START;
-                } else if (!strcmp ("commit", w)) {
-                        command = GF_OP_CMD_COMMIT;
-                        if (question)
-                                *question = 1;
-                } else if (!strcmp ("stop", w)) {
-                        command = GF_OP_CMD_STOP;
-                } else if (!strcmp ("status", w)) {
-                        command = GF_OP_CMD_STATUS;
-                } else if (!strcmp ("force", w)) {
-                        command = GF_OP_CMD_COMMIT_FORCE;
-                        if (question)
-                                *question = 1;
-                } else {
-                        GF_ASSERT (!"opword mismatch");
-                        ret = -1;
-                        goto out;
-                }
-        }
-
         if (wordcount < 4) {
                 ret = -1;
                 goto out;
         }
 
-        ret = dict_set_int32 (dict, "command", command);
-        if (ret)
-                gf_log ("cli", GF_LOG_INFO, "failed to set 'command' %d",
-                        command);
+        brick_index = 3;
 
+        if (ret)
+                goto out;
 
         tmp_index = brick_index;
         tmp_brick = GF_MALLOC(2048 * sizeof(*tmp_brick), gf_common_mt_char);
@@ -1116,7 +754,7 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount,
                 ret = -1;
                 goto out;
         }
-
+ 
         tmp_brick1 = GF_MALLOC(2048 * sizeof(*tmp_brick1), gf_common_mt_char);
 
         if (!tmp_brick1) {
@@ -1127,16 +765,15 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount,
         }
 
         while (brick_index < wordcount) {
-                if (validate_brick_name ((char *)words[brick_index])) {
-                        cli_err ("wrong brick type: %s, use <HOSTNAME>:"
+                delimiter = strchr(words[brick_index], ':');
+                if (!delimiter || delimiter == words[brick_index]
+                    || *(delimiter+1) != '/') {
+                        cli_out ("wrong brick type: %s, use <HOSTNAME>:"
                                  "<export-dir-abs-path>", words[brick_index]);
                         ret = -1;
                         goto out;
                 } else {
-                        delimiter = strrchr(words[brick_index], ':');
-                        ret = gf_canonicalize_path (delimiter + 1);
-                        if (ret)
-                                goto out;
+                        cli_path_strip_trailing_slashes (delimiter + 1);
                 }
 
                 j = tmp_index;
@@ -1146,7 +783,7 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount,
                         if (!(strcmp (tmp_brick, tmp_brick1))) {
                                 gf_log("",GF_LOG_ERROR, "Duplicate bricks"
                                        " found %s", words[brick_index]);
-                                cli_err("Duplicate bricks found %s",
+                                cli_out("Duplicate bricks found %s",
                                         words[brick_index]);
                                 ret = -1;
                                 goto out;
@@ -1161,6 +798,7 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount,
         }
 
         ret = dict_set_int32 (dict, "count", brick_count);
+
         if (ret)
                 goto out;
 
@@ -1173,8 +811,10 @@ out:
                         dict_destroy (dict);
         }
 
-        GF_FREE (tmp_brick);
-        GF_FREE (tmp_brick1);
+        if (tmp_brick)
+                GF_FREE (tmp_brick);
+        if (tmp_brick1)
+                GF_FREE (tmp_brick1);
 
         return ret;
 }
@@ -1187,17 +827,17 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
         dict_t  *dict = NULL;
         char    *volname = NULL;
         int     ret = -1;
+        char    *op = NULL;
         int     op_index = 0;
         char    *delimiter = NULL;
         gf1_cli_replace_op replace_op = GF_REPLACE_OP_NONE;
-        char    *opwords[] = { "start", "commit", "pause", "abort", "status",
-                                NULL };
-        char    *w = NULL;
-        gf_boolean_t is_force = _gf_false;
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "replace-brick")) == 0);
+
         dict = dict_new ();
 
         if (!dict)
@@ -1220,16 +860,15 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
                 goto out;
         }
 
-        if (validate_brick_name ((char *)words[3])) {
-                cli_err ("wrong brick type: %s, use "
-                         "<HOSTNAME>:<export-dir-abs-path>", words[3]);
+        delimiter = strchr ((char *)words[3], ':');
+        if (!delimiter || delimiter == words[3]
+            || *(delimiter+1) != '/') {
+                cli_out ("wrong brick type: %s, use "
+                        "<HOSTNAME>:<export-dir-abs-path>", words[3]);
                 ret = -1;
                 goto out;
         } else {
-                delimiter = strrchr ((char *)words[3], ':');
-                ret = gf_canonicalize_path (delimiter + 1);
-                if (ret)
-                        goto out;
+                cli_path_strip_trailing_slashes (delimiter + 1);
         }
         ret = dict_set_str (dict, "src-brick", (char *)words[3]);
 
@@ -1241,16 +880,15 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
                 goto out;
         }
 
-        if (validate_brick_name ((char *)words[4])) {
-                cli_err ("wrong brick type: %s, use "
-                         "<HOSTNAME>:<export-dir-abs-path>", words[4]);
+        delimiter = strchr ((char *)words[4], ':');
+        if (!delimiter || delimiter == words[4]
+            || *(delimiter+1) != '/') {
+                cli_out ("wrong brick type: %s, use "
+                        "<HOSTNAME>:<export-dir-abs-path>", words[4]);
                 ret = -1;
                 goto out;
         } else {
-                delimiter = strrchr ((char *)words[4], ':');
-                ret = gf_canonicalize_path (delimiter + 1);
-                if (ret)
-                        goto out;
+                cli_path_strip_trailing_slashes (delimiter + 1);
         }
 
 
@@ -1265,24 +903,21 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
                 goto out;
         }
 
-        w = str_getunamb (words[op_index], opwords);
+        op = (char *) words[op_index];
 
-        if (!w) {
-        } else if (!strcmp ("start", w)) {
+        if (!strcasecmp ("start", op)) {
                 replace_op = GF_REPLACE_OP_START;
-        } else if (!strcmp ("commit", w)) {
+        } else if (!strcasecmp ("commit", op)) {
                 replace_op = GF_REPLACE_OP_COMMIT;
-        } else if (!strcmp ("pause", w)) {
+        } else if (!strcasecmp ("pause", op)) {
                 replace_op = GF_REPLACE_OP_PAUSE;
-        } else if (!strcmp ("abort", w)) {
+        } else if (!strcasecmp ("abort", op)) {
                 replace_op = GF_REPLACE_OP_ABORT;
-        } else if (!strcmp ("status", w)) {
+        } else if (!strcasecmp ("status", op)) {
                 replace_op = GF_REPLACE_OP_STATUS;
-        } else
-                GF_ASSERT (!"opword mismatch");
+        }
 
         /* commit force option */
-
         op_index = 6;
 
         if (wordcount > (op_index + 1)) {
@@ -1291,17 +926,9 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
         }
 
         if (wordcount == (op_index + 1)) {
-                if ((replace_op != GF_REPLACE_OP_COMMIT) &&
-                    (replace_op != GF_REPLACE_OP_START)) {
-                        ret = -1;
-                        goto out;
-                }
-                if (!strcmp ("force", words[op_index])) {
-                        if (replace_op == GF_REPLACE_OP_COMMIT)
-                                replace_op = GF_REPLACE_OP_COMMIT_FORCE;
-
-                        else if (replace_op == GF_REPLACE_OP_START)
-                                is_force = _gf_true;
+                op = (char *) words[op_index];
+                if (!strcasecmp ("force", op)) {
+                        replace_op = GF_REPLACE_OP_COMMIT_FORCE;
                 }
         }
 
@@ -1315,15 +942,14 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
         if (ret)
                 goto out;
 
-        ret = dict_set_int32 (dict, "force", is_force);
-        if (ret)
-                goto out;
+
+
 
         *options = dict;
 
 out:
         if (ret) {
-                gf_log ("cli", GF_LOG_ERROR, "Unable to parse replace-brick CLI");
+                gf_log ("cli", GF_LOG_ERROR, "Unable to parse remove-brick CLI");
                 if (dict)
                         dict_destroy (dict);
         }
@@ -1343,6 +969,10 @@ cli_cmd_log_filename_parse (const char **words, int wordcount, dict_t **options)
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "log")) == 0);
+        GF_ASSERT ((strcmp (words[2], "filename")) == 0);
+
         dict = dict_new ();
         if (!dict)
                 goto out;
@@ -1359,14 +989,12 @@ cli_cmd_log_filename_parse (const char **words, int wordcount, dict_t **options)
                 delimiter = strchr (words[4], ':');
                 if (!delimiter || delimiter == words[4]
                     || *(delimiter+1) != '/') {
-                        cli_err ("wrong brick type: %s, use <HOSTNAME>:"
+                        cli_out ("wrong brick type: %s, use <HOSTNAME>:"
                                  "<export-dir-abs-path>", words[4]);
                         ret = -1;
                         goto out;
                 } else {
-                        ret = gf_canonicalize_path (delimiter + 1);
-                        if (ret)
-                                goto out;
+                        cli_path_strip_trailing_slashes (delimiter + 1);
                 }
                 ret = dict_set_str (dict, "brick", str);
                 if (ret)
@@ -1392,63 +1020,6 @@ out:
 }
 
 int32_t
-cli_cmd_log_level_parse (const char **words, int worcount, dict_t **options)
-{
-        dict_t *dict            = NULL;
-        int     ret             = -1;
-
-        GF_ASSERT (words);
-        GF_ASSERT (options);
-
-        /*
-         * loglevel command format:
-         *  > volume log level <VOL> <XLATOR[*]> <LOGLEVEL>
-         *  > volume log level colon-o posix WARNING
-         *  > volume log level colon-o replicate* DEBUG
-         *  > volume log level coon-o * TRACE
-         */
-
-        GF_ASSERT ((strncmp(words[0], "volume", 6) == 0));
-        GF_ASSERT ((strncmp(words[1], "log", 3) == 0));
-        GF_ASSERT ((strncmp(words[2], "level", 5) == 0));
-
-        ret = glusterd_check_log_level(words[5]);
-        if (ret == -1) {
-                cli_err("Invalid log level [%s] specified", words[5]);
-                cli_err("Valid values for loglevel: (DEBUG|WARNING|ERROR"
-                        "|CRITICAL|NONE|TRACE)");
-                goto out;
-        }
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        GF_ASSERT(words[3]);
-        GF_ASSERT(words[4]);
-
-        ret = dict_set_str (dict, "volname", (char *)words[3]);
-        if (ret)
-                goto out;
-
-        ret = dict_set_str (dict, "xlator", (char *)words[4]);
-        if (ret)
-                goto out;
-
-        ret = dict_set_str (dict, "loglevel", (char *)words[5]);
-        if (ret)
-                goto out;
-
-        *options = dict;
-
- out:
-        if (ret && dict)
-                dict_destroy (dict);
-
-        return ret;
-}
-
-int32_t
 cli_cmd_log_locate_parse (const char **words, int wordcount, dict_t **options)
 {
         dict_t  *dict = NULL;
@@ -1460,6 +1031,10 @@ cli_cmd_log_locate_parse (const char **words, int wordcount, dict_t **options)
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "log")) == 0);
+        GF_ASSERT ((strcmp (words[2], "locate")) == 0);
+
         dict = dict_new ();
         if (!dict)
                 goto out;
@@ -1475,14 +1050,12 @@ cli_cmd_log_locate_parse (const char **words, int wordcount, dict_t **options)
                 delimiter = strchr (words[4], ':');
                 if (!delimiter || delimiter == words[4]
                     || *(delimiter+1) != '/') {
-                        cli_err ("wrong brick type: %s, use <HOSTNAME>:"
+                        cli_out ("wrong brick type: %s, use <HOSTNAME>:"
                                  "<export-dir-abs-path>", words[4]);
                         ret = -1;
                         goto out;
                 } else {
-                        ret = gf_canonicalize_path (delimiter + 1);
-                        if (ret)
-                                goto out;
+                        cli_path_strip_trailing_slashes (delimiter + 1);
                 }
                 str = (char *)words[4];
                 ret = dict_set_str (dict, "brick", str);
@@ -1511,6 +1084,10 @@ cli_cmd_log_rotate_parse (const char **words, int wordcount, dict_t **options)
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "log")) == 0);
+        GF_ASSERT ((strcmp (words[2], "rotate")) == 0);
+
         dict = dict_new ();
         if (!dict)
                 goto out;
@@ -1526,14 +1103,12 @@ cli_cmd_log_rotate_parse (const char **words, int wordcount, dict_t **options)
                 delimiter = strchr (words[4], ':');
                 if (!delimiter || delimiter == words[4]
                     || *(delimiter+1) != '/') {
-                        cli_err ("wrong brick type: %s, use <HOSTNAME>:"
+                        cli_out ("wrong brick type: %s, use <HOSTNAME>:"
                                  "<export-dir-abs-path>", words[4]);
                         ret = -1;
                         goto out;
                 } else {
-                        ret = gf_canonicalize_path (delimiter + 1);
-                        if (ret)
-                                goto out;
+                        cli_path_strip_trailing_slashes (delimiter + 1);
                 }
                 str = (char *)words[4];
                 ret = dict_set_str (dict, "brick", str);
@@ -1556,220 +1131,53 @@ gsyncd_url_check (const char *w)
         return !!strpbrk (w, ":/");
 }
 
-static gf_boolean_t
-gsyncd_glob_check (const char *w)
-{
-        return !!strpbrk (w, "*?[");
-}
-
-static int
-config_parse (const char **words, int wordcount, dict_t *dict,
-              unsigned cmdi, unsigned glob)
-{
-        int32_t            ret     = -1;
-        int32_t            i       = -1;
-        char               *append_str = NULL;
-        size_t             append_len = 0;
-        char               *subop = NULL;
-
-        switch ((wordcount - 1) - cmdi) {
-        case 0:
-                subop = gf_strdup ("get-all");
-                break;
-        case 1:
-                if (words[cmdi + 1][0] == '!') {
-                        (words[cmdi + 1])++;
-                        if (gf_asprintf (&subop, "del%s",
-                                         glob ? "-glob" : "") == -1)
-                                subop = NULL;
-                } else
-                        subop = gf_strdup ("get");
-
-                ret = dict_set_str (dict, "op_name", ((char *)words[cmdi + 1]));
-                if (ret < 0)
-                        goto out;
-                break;
-        default:
-                if (gf_asprintf (&subop, "set%s", glob ? "-glob" : "") == -1)
-                        subop = NULL;
-
-                ret = dict_set_str (dict, "op_name", ((char *)words[cmdi + 1]));
-                if (ret < 0)
-                        goto out;
-
-                /* join the varargs by spaces to get the op_value */
-
-                for (i = cmdi + 2; i < wordcount; i++)
-                        append_len += (strlen (words[i]) + 1);
-                /* trailing strcat will add two bytes, make space for that */
-                append_len++;
-
-                append_str = GF_CALLOC (1, append_len, cli_mt_append_str);
-                if (!append_str) {
-                        ret = -1;
-                        goto out;
-                }
-
-                for (i = cmdi + 2; i < wordcount; i++) {
-                        strcat (append_str, words[i]);
-                        strcat (append_str, " ");
-                }
-                append_str[append_len - 2] = '\0';
-                /* "checkpoint now" is special: we resolve that "now" */
-                if (strcmp (words[cmdi + 1], "checkpoint") == 0 &&
-                    strcmp (append_str, "now") == 0) {
-                        struct timeval tv = {0,};
-
-                        ret = gettimeofday (&tv, NULL);
-                        if (ret == -1)
-                                goto out; /* FIXME: free append_str? */
-
-                        GF_FREE (append_str);
-                        append_str = GF_CALLOC (1, 300, cli_mt_append_str);
-                        if (!append_str) {
-                                ret = -1;
-                                goto out;
-                        }
-                        strcpy (append_str, "as of ");
-                        gf_time_fmt (append_str + strlen ("as of "),
-                                     300 - strlen ("as of "),
-                                     tv.tv_sec, gf_timefmt_FT);
-                }
-
-                ret = dict_set_dynstr (dict, "op_value", append_str);
-        }
-
-        ret = -1;
-        if (subop) {
-                ret = dict_set_dynstr (dict, "subop", subop);
-                if (!ret)
-                      subop = NULL;
-        }
-
-out:
-        if (ret && append_str)
-                GF_FREE (append_str);
-
-        GF_FREE (subop);
-
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-static int32_t
-force_push_pem_parse (const char **words, int wordcount,
-                      dict_t *dict, unsigned *cmdi)
-{
-        int32_t            ret     = 0;
-
-        if (!strcmp ((char *)words[wordcount-1], "force")) {
-                if ((strcmp ((char *)words[wordcount-2], "start")) &&
-                    (strcmp ((char *)words[wordcount-2], "stop")) &&
-                    (strcmp ((char *)words[wordcount-2], "create")) &&
-                    (strcmp ((char *)words[wordcount-2], "push-pem"))) {
-                        ret = -1;
-                        goto out;
-                }
-                ret = dict_set_uint32 (dict, "force",
-                                       _gf_true);
-                if (ret)
-                        goto out;
-                (*cmdi)++;
-
-                if (!strcmp ((char *)words[wordcount-2], "push-pem")) {
-                        if (strcmp ((char *)words[wordcount-3], "create")) {
-                                ret = -1;
-                                goto out;
-                        }
-                        ret = dict_set_int32 (dict, "push_pem", 1);
-                        if (ret)
-                                goto out;
-                        (*cmdi)++;
-                }
-        } else if (!strcmp ((char *)words[wordcount-1], "push-pem")) {
-                if (strcmp ((char *)words[wordcount-2], "create")) {
-                        ret = -1;
-                        goto out;
-                }
-                ret = dict_set_int32 (dict, "push_pem", 1);
-                if (ret)
-                        goto out;
-                (*cmdi)++;
-        }
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-
 int32_t
 cli_cmd_gsync_set_parse (const char **words, int wordcount, dict_t **options)
 {
         int32_t            ret     = -1;
         dict_t             *dict   = NULL;
         gf1_cli_gsync_set  type    = GF_GSYNC_OPTION_TYPE_NONE;
+        char               *append_str = NULL;
+        size_t             append_len = 0;
+        char               *subop = NULL;
         int                i       = 0;
         unsigned           masteri = 0;
         unsigned           slavei  = 0;
-        unsigned           glob    = 0;
         unsigned           cmdi    = 0;
-        char               *opwords[] = { "create", "status", "start", "stop",
-                                          "config", "force", "delete",
-                                          "push-pem", "detail", NULL };
-        char               *w = NULL;
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], GEOREP)) == 0);
+
         dict = dict_new ();
         if (!dict)
                 goto out;
 
         /* new syntax:
          *
-         * volume geo-replication $m $s create [push-pem] [force]
-         * volume geo-replication [$m [$s]] status [detail]
+         * volume geo-replication [$m [$s]] status
          * volume geo-replication [$m] $s config [[!]$opt [$val]]
-         * volume geo-replication $m $s start|stop [force]
-         * volume geo-replication $m $s delete
+         * volume geo-replication $m $s start|stop
+         * volume geo-replication $m [$s] log-rotate
          */
 
         if (wordcount < 3)
                 goto out;
 
         for (i = 2; i <= 3 && i < wordcount - 1; i++) {
-                if (gsyncd_glob_check (words[i]))
-                        glob = i;
                 if (gsyncd_url_check (words[i])) {
                         slavei = i;
                         break;
                 }
         }
 
-        if (glob && !slavei)
-                /* glob is allowed only for config, thus it implies there is a
-                 * slave argument; but that might have not been recognized on
-                 * the first scan as it's url characteristics has been covered
-                 * by the glob syntax.
-                 *
-                 * In this case, the slave is perforce the last glob-word -- the
-                 * upcoming one is neither glob, nor url, so it's definitely not
-                 * the slave.
-                 */
-                slavei = glob;
         if (slavei) {
                 cmdi = slavei + 1;
                 if (slavei == 3)
                         masteri = 2;
         } else if (i <= 3) {
-                if (!strcmp ((char *)words[wordcount-1], "detail")) {
-                        /* For status detail it is mandatory to provide
-                         * both master and slave */
-                        ret = -1;
-                        goto out;
-                }
-
                 /* no $s, can only be status cmd
                  * (with either a single $m before it or nothing)
                  * -- these conditions imply that i <= 3 after
@@ -1789,94 +1197,108 @@ cli_cmd_gsync_set_parse (const char **words, int wordcount, dict_t **options)
 
         if (masteri && gsyncd_url_check (words[masteri]))
                 goto out;
-        if (slavei && !glob && !gsyncd_url_check (words[slavei]))
-                goto out;
-
-        w = str_getunamb (words[cmdi], opwords);
-        if (!w)
+        if (slavei && !gsyncd_url_check (words[slavei]))
                 goto out;
 
-        if (strcmp (w, "create") == 0) {
-                type = GF_GSYNC_OPTION_TYPE_CREATE;
-
-                if (!masteri || !slavei)
-                        goto out;
-        } else if (strcmp (w, "status") == 0) {
+        if (strcmp (words[cmdi], "status") == 0) {
                 type = GF_GSYNC_OPTION_TYPE_STATUS;
 
                 if (slavei && !masteri)
                         goto out;
-        } else if (strcmp (w, "config") == 0) {
+        } else if (strcmp (words[cmdi], "config") == 0) {
                 type = GF_GSYNC_OPTION_TYPE_CONFIG;
 
                 if (!slavei)
                         goto out;
-        } else if (strcmp (w, "start") == 0) {
+        } else if (strcmp (words[cmdi], "start") == 0) {
                 type = GF_GSYNC_OPTION_TYPE_START;
 
                 if (!masteri || !slavei)
                         goto out;
-        } else if (strcmp (w, "stop") == 0) {
+        } else if (strcmp (words[cmdi], "stop") == 0) {
                 type = GF_GSYNC_OPTION_TYPE_STOP;
 
                 if (!masteri || !slavei)
                         goto out;
-        } else if (strcmp (w, "delete") == 0) {
-                type = GF_GSYNC_OPTION_TYPE_DELETE;
+        } else if (strcmp(words[cmdi], "log-rotate") == 0) {
+                type = GF_GSYNC_OPTION_TYPE_ROTATE;
 
-                if (!masteri || !slavei)
+                if (slavei && !masteri)
                         goto out;
         } else
-                GF_ASSERT (!"opword mismatch");
-
-        ret = force_push_pem_parse (words, wordcount, dict, &cmdi);
-        if (ret)
                 goto out;
 
-        if (!strcmp ((char *)words[wordcount-1], "detail")) {
-                if (strcmp ((char *)words[wordcount-2], "status")) {
-                        ret = -1;
-                        goto out;
-                }
-                if (!slavei || !masteri) {
-                        ret = -1;
-                        goto out;
-                }
-                ret = dict_set_uint32 (dict, "status-detail", _gf_true);
-                if (ret)
-                        goto out;
-                cmdi++;
-        }
-
-        if (type != GF_GSYNC_OPTION_TYPE_CONFIG &&
-            (cmdi < wordcount - 1 || glob))
+        if (type != GF_GSYNC_OPTION_TYPE_CONFIG && cmdi < wordcount - 1)
                 goto out;
 
         /* If got so far, input is valid, assemble the message */
 
         ret = 0;
 
-        if (masteri) {
+        if (masteri)
                 ret = dict_set_str (dict, "master", (char *)words[masteri]);
-                if (!ret)
-                        ret = dict_set_str (dict, "volname",
-                                            (char *)words[masteri]);
-        }
         if (!ret && slavei)
                 ret = dict_set_str (dict, "slave", (char *)words[slavei]);
         if (!ret)
                 ret = dict_set_int32 (dict, "type", type);
-        if (!ret && type == GF_GSYNC_OPTION_TYPE_CONFIG)
-                ret = config_parse (words, wordcount, dict, cmdi, glob);
+        if (!ret && type == GF_GSYNC_OPTION_TYPE_CONFIG) {
+                switch ((wordcount - 1) - cmdi) {
+                case 0:
+                        subop = gf_strdup ("get-all");
+                        break;
+                case 1:
+                        if (words[cmdi + 1][0] == '!') {
+                                (words[cmdi + 1])++;
+                                subop = gf_strdup ("del");
+                        } else
+                                subop = gf_strdup ("get");
+
+                        ret = dict_set_str (dict, "op_name", ((char *)words[cmdi + 1]));
+                        if (ret < 0)
+                                goto out;
+                        break;
+                default:
+                        subop = gf_strdup ("set");
+
+                        ret = dict_set_str (dict, "op_name", ((char *)words[cmdi + 1]));
+                        if (ret < 0)
+                                goto out;
+
+                        /* join the varargs by spaces to get the op_value */
+
+                        for (i = cmdi + 2; i < wordcount; i++)
+                                append_len += (strlen (words[i]) + 1);
+                        /* trailing strcat will add two bytes, make space for that */
+                        append_len++;
+
+                        append_str = GF_CALLOC (1, append_len, cli_mt_append_str);
+                        if (!append_str) {
+                                ret = -1;
+                                goto out;
+                        }
+
+                        for (i = cmdi + 2; i < wordcount; i++) {
+                                strcat (append_str, words[i]);
+                                strcat (append_str, " ");
+                        }
+                        append_str[append_len - 2] = '\0';
+
+                        ret = dict_set_dynstr (dict, "op_value", append_str);
+                }
+
+                if (!subop || dict_set_dynstr (dict, "subop", subop) != 0)
+                        ret = -1;
+        }
 
 out:
         if (ret) {
                 if (dict)
                         dict_destroy (dict);
+                if (append_str)
+                        GF_FREE (append_str);
         } else
                 *options = dict;
 
-
         return ret;
 }
 
@@ -1888,17 +1310,18 @@ cli_cmd_volume_profile_parse (const char **words, int wordcount,
         char      *volname    = NULL;
         int       ret         = -1;
         gf1_cli_stats_op op = GF_CLI_STATS_NONE;
-        char      *opwords[] = { "start", "stop", "info", NULL };
-        char      *w = NULL;
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "profile")) == 0);
+
         dict = dict_new ();
         if (!dict)
                 goto out;
 
-        if (wordcount < 4 || wordcount >5)
+        if (wordcount != 4)
                 goto out;
 
         volname = (char *)words[2];
@@ -1907,32 +1330,17 @@ cli_cmd_volume_profile_parse (const char **words, int wordcount,
         if (ret)
                 goto out;
 
-        w = str_getunamb (words[3], opwords);
-        if (!w) {
-                ret = -1;
-                goto out;
-        }
-        if (strcmp (w, "start") == 0) {
+        if (strcmp (words[3], "start") == 0) {
                 op = GF_CLI_STATS_START;
-        } else if (strcmp (w, "stop") == 0) {
+        } else if (strcmp (words[3], "stop") == 0) {
                 op = GF_CLI_STATS_STOP;
-        } else if (strcmp (w, "info") == 0) {
+        } else if (strcmp (words[3], "info") == 0) {
                 op = GF_CLI_STATS_INFO;
-        } else
-                GF_ASSERT (!"opword mismatch");
-
-        ret = dict_set_int32 (dict, "op", (int32_t)op);
-        if (ret)
+        } else {
+                ret = -1;
                 goto out;
-
-        if (wordcount == 5) {
-                if (!strcmp (words[4], "nfs")) {
-                        ret = dict_set_int32 (dict, "nfs", _gf_true);
-                        if (ret)
-                                goto out;
-                }
         }
-
+        ret = dict_set_int32 (dict, "op", (int32_t)op);
         *options = dict;
 out:
         if (ret && dict)
@@ -1954,18 +1362,16 @@ cli_cmd_volume_top_parse (const char **words, int wordcount,
         int32_t  list_cnt       = -1;
         int      index          = 0;
         int      perf           = 0;
-        uint32_t  blk_size      = 0;
-        uint32_t  count         = 0;
-        gf_boolean_t nfs        = _gf_false;
+        int32_t  blk_size       = 0;
+        int32_t  count          = 0;
         char    *delimiter      = NULL;
-        char    *opwords[]      = { "open", "read", "write", "opendir",
-                                    "readdir", "read-perf", "write-perf",
-                                    "clear", NULL };
-        char    *w = NULL;
 
         GF_ASSERT (words);
         GF_ASSERT (options);
 
+        GF_ASSERT ((strcmp (words[0], "volume")) == 0);
+        GF_ASSERT ((strcmp (words[1], "top")) == 0);
+
         dict = dict_new ();
         if (!dict)
                 goto out;
@@ -1984,51 +1390,31 @@ cli_cmd_volume_top_parse (const char **words, int wordcount,
         if (ret)
                 goto out;
 
-        w = str_getunamb (words[3], opwords);
-        if (!w) {
-                ret = -1;
-                goto out;
-        }
-        if (strcmp (w, "open") == 0) {
+        if (strcmp (words[3], "open") == 0) {
                 top_op = GF_CLI_TOP_OPEN;
-        } else if (strcmp (w, "read") == 0) {
+        } else if (strcmp (words[3], "read") == 0) {
                 top_op = GF_CLI_TOP_READ;
-        } else if (strcmp (w, "write") == 0) {
+        } else if (strcmp (words[3], "write") == 0) {
                 top_op = GF_CLI_TOP_WRITE;
-        } else if (strcmp (w, "opendir") == 0) {
+        } else if (strcmp (words[3], "opendir") == 0) {
                 top_op = GF_CLI_TOP_OPENDIR;
-        } else if (strcmp (w, "readdir") == 0) {
+        } else if (strcmp (words[3], "readdir") == 0) {
                 top_op = GF_CLI_TOP_READDIR;
-        } else if (strcmp (w, "read-perf") == 0) {
+        } else if (strcmp (words[3], "read-perf") == 0) {
                 top_op = GF_CLI_TOP_READ_PERF;
                 perf = 1;
-        } else if (strcmp (w, "write-perf") == 0) {
+        } else if (strcmp (words[3], "write-perf") == 0) {
                 top_op = GF_CLI_TOP_WRITE_PERF;
                 perf = 1;
-        } else if (strcmp (w, "clear") == 0) {
-                ret = dict_set_int32 (dict, "clear-stats", 1);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Could not set clear-stats in dict");
-                        goto out;
-                }
-        } else
-                GF_ASSERT (!"opword mismatch");
+        } else {
+                ret = -1;
+                goto out;
+        } 
         ret = dict_set_int32 (dict, "top-op", (int32_t)top_op);
         if (ret)
                 goto out;
 
-        if ((wordcount > 4) && !strcmp (words[4], "nfs")) {
-                nfs = _gf_true;
-                ret = dict_set_int32 (dict, "nfs", nfs);
-                if (ret)
-                        goto out;
-                index = 5;
-        } else {
-                index = 4;
-        }
-
-        for (; index < wordcount; index+=2) {
+        for (index = 4; index < wordcount; index+=2) {
 
                 key = (char *) words[index];
                 value = (char *) words[index+1];
@@ -2039,16 +1425,14 @@ cli_cmd_volume_top_parse (const char **words, int wordcount,
                 }
                 if (!strcmp (key, "brick")) {
                         delimiter = strchr (value, ':');
-                        if (!delimiter || delimiter == value
+                        if (!delimiter || delimiter == value 
                             || *(delimiter+1) != '/') {
-                                cli_err ("wrong brick type: %s, use <HOSTNAME>:"
+                                cli_out ("wrong brick type: %s, use <HOSTNAME>:"
                                          "<export-dir-abs-path>", value);
                                 ret = -1;
                                 goto out;
                         } else {
-                                ret = gf_canonicalize_path (delimiter + 1);
-                                if (ret)
-                                        goto out;
+                                cli_path_strip_trailing_slashes (delimiter + 1);
                         }
                         ret = dict_set_str (dict, "brick", value);
 
@@ -2057,40 +1441,39 @@ cli_cmd_volume_top_parse (const char **words, int wordcount,
                         if (!ret)
                                 list_cnt = atoi (value);
                         if (ret || (list_cnt < 0) || (list_cnt > 100)) {
-                                cli_err ("list-cnt should be between 0 to 100");
+                                cli_out ("list-cnt should be between 0 to 100");
                                 ret = -1;
                                 goto out;
                         }
-                } else if (perf && !nfs && !strcmp (key, "bs")) {
+                } else if (perf && !strcmp (key, "bs")) {
                         ret = gf_is_str_int (value);
                         if (!ret)
                                 blk_size = atoi (value);
                         if (ret || (blk_size <= 0)) {
                                 if (blk_size < 0)
-                                        cli_err ("block size is an invalid"
-                                                 " number");
-                                else
-                                        cli_err ("block size should be an "
-                                                 "integer greater than zero");
+                                        cli_out ("block size is an invalid number");
+                                else 
+                                        cli_out ("block size should be an integer "
+                                         "greater than zero");
                                 ret = -1;
                                 goto out;
                         }
-                        ret = dict_set_uint32 (dict, "blk-size", blk_size);
-                } else if (perf && !nfs && !strcmp (key, "count")) {
+                        ret = dict_set_int32 (dict, "blk-size", blk_size);
+                } else if (perf && !strcmp (key, "count")) {
                         ret = gf_is_str_int (value);
                         if (!ret)
                                 count = atoi(value);
                         if (ret || (count <= 0)) {
                                 if (count < 0)
-                                        cli_err ("count is an invalid number");
-                                else
-                                        cli_err ("count should be an integer "
+                                        cli_out ("count is an invalid number");
+                                else 
+                                        cli_out ("count should be an integer "
                                                  "greater than zero");
 
                                 ret = -1;
                                 goto out;
                         }
-                        ret = dict_set_uint32 (dict, "blk-cnt", count);
+                        ret = dict_set_int32 (dict, "blk-cnt", count);
                 } else {
                         ret = -1;
                         goto out;
@@ -2110,17 +1493,9 @@ cli_cmd_volume_top_parse (const char **words, int wordcount,
         }
 
         if ((blk_size > 0) ^ (count > 0)) {
-                cli_err ("Need to give both 'bs' and 'count'");
-                ret = -1;
-                goto out;
-        } else if (((uint64_t)blk_size * count) > (10 * GF_UNIT_GB)) {
-                cli_err ("'bs * count' value %"PRIu64" is greater than "
-                         "maximum allowed value of 10GB",
-                         ((uint64_t)blk_size * count));
                 ret = -1;
                 goto out;
         }
-
         *options = dict;
 out:
         if (ret && dict)
@@ -2128,607 +1503,3 @@ out:
         return ret;
 }
 
-uint32_t
-cli_cmd_get_statusop (const char *arg)
-{
-        int        i         = 0;
-        uint32_t   ret       = GF_CLI_STATUS_NONE;
-        char      *w         = NULL;
-        char      *opwords[] = {"detail", "mem", "clients", "fd",
-                                "inode", "callpool", "tasks", NULL};
-        struct {
-                char      *opname;
-                uint32_t   opcode;
-        } optable[] = {
-                { "detail",   GF_CLI_STATUS_DETAIL   },
-                { "mem",      GF_CLI_STATUS_MEM      },
-                { "clients",  GF_CLI_STATUS_CLIENTS  },
-                { "fd",       GF_CLI_STATUS_FD       },
-                { "inode",    GF_CLI_STATUS_INODE    },
-                { "callpool", GF_CLI_STATUS_CALLPOOL },
-                { "tasks",    GF_CLI_STATUS_TASKS    },
-                { NULL }
-        };
-
-        w = str_getunamb (arg, opwords);
-        if (!w) {
-                gf_log ("cli", GF_LOG_DEBUG,
-                        "Not a status op  %s", arg);
-                goto out;
-        }
-
-        for (i = 0; optable[i].opname; i++) {
-                if (!strcmp (w, optable[i].opname)) {
-                        ret = optable[i].opcode;
-                        break;
-                }
-        }
-
- out:
-        return ret;
-}
-
-int
-cli_cmd_volume_status_parse (const char **words, int wordcount,
-                             dict_t **options)
-{
-        dict_t    *dict            = NULL;
-        int        ret             = -1;
-        uint32_t   cmd             = 0;
-
-        GF_ASSERT (options);
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        switch (wordcount) {
-
-        case 2:
-                cmd = GF_CLI_STATUS_ALL;
-                ret = 0;
-                break;
-
-        case 3:
-                if (!strcmp (words[2], "all")) {
-                        cmd = GF_CLI_STATUS_ALL;
-                        ret = 0;
-
-                } else {
-                        cmd = GF_CLI_STATUS_VOL;
-                        ret = dict_set_str (dict, "volname", (char *)words[2]);
-                }
-
-                break;
-
-        case 4:
-                cmd = cli_cmd_get_statusop (words[3]);
-
-                if (!strcmp (words[2], "all")) {
-                        if (cmd == GF_CLI_STATUS_NONE) {
-                                cli_err ("%s is not a valid status option",
-                                         words[3]);
-                                ret = -1;
-                                goto out;
-                        }
-                        cmd |= GF_CLI_STATUS_ALL;
-                        ret  = 0;
-
-                } else {
-                        ret = dict_set_str (dict, "volname",
-                                            (char *)words[2]);
-                        if (ret)
-                                goto out;
-
-                        if (cmd == GF_CLI_STATUS_NONE) {
-                                if (!strcmp (words[3], "nfs")) {
-                                        cmd |= GF_CLI_STATUS_NFS;
-                                } else if (!strcmp (words[3], "shd")) {
-                                        cmd |= GF_CLI_STATUS_SHD;
-                                } else {
-                                        cmd = GF_CLI_STATUS_BRICK;
-                                        ret = dict_set_str (dict, "brick",
-                                                            (char *)words[3]);
-                                }
-
-                        } else {
-                                cmd |= GF_CLI_STATUS_VOL;
-                                ret  = 0;
-                        }
-                }
-
-                break;
-
-        case 5:
-                if (!strcmp (words[2], "all")) {
-                        cli_err ("Cannot specify brick/nfs for \"all\"");
-                        ret = -1;
-                        goto out;
-                }
-
-                cmd = cli_cmd_get_statusop (words[4]);
-                if (cmd == GF_CLI_STATUS_NONE) {
-                        cli_err ("%s is not a valid status option",
-                                 words[4]);
-                        ret = -1;
-                        goto out;
-                }
-
-
-                ret = dict_set_str (dict, "volname", (char *)words[2]);
-                if (ret)
-                        goto out;
-
-                if (!strcmp (words[3], "nfs")) {
-                        if (cmd == GF_CLI_STATUS_FD ||
-                            cmd == GF_CLI_STATUS_DETAIL ||
-                            cmd == GF_CLI_STATUS_TASKS) {
-                                cli_err ("Detail/FD/Tasks status not available"
-                                         " for NFS Servers");
-                                ret = -1;
-                                goto out;
-                        }
-                        cmd |= GF_CLI_STATUS_NFS;
-                } else if (!strcmp (words[3], "shd")){
-                        if (cmd == GF_CLI_STATUS_FD ||
-                            cmd == GF_CLI_STATUS_CLIENTS ||
-                            cmd == GF_CLI_STATUS_DETAIL ||
-                            cmd == GF_CLI_STATUS_TASKS) {
-                                cli_err ("Detail/FD/Clients/Tasks status not "
-                                         "available for Self-heal Daemons");
-                                ret = -1;
-                                goto out;
-                        }
-                        cmd |= GF_CLI_STATUS_SHD;
-                } else {
-                        if (cmd == GF_CLI_STATUS_TASKS) {
-                                cli_err ("Tasks status not available for "
-                                         "bricks");
-                                ret = -1;
-                                goto out;
-                        }
-                        cmd |= GF_CLI_STATUS_BRICK;
-                        ret = dict_set_str (dict, "brick", (char *)words[3]);
-                }
-                break;
-
-        default:
-                goto out;
-        }
-
-        if (ret)
-                goto out;
-
-        ret = dict_set_int32 (dict, "cmd", cmd);
-        if (ret)
-                goto out;
-
-        *options = dict;
-
- out:
-        if (ret && dict)
-                dict_destroy (dict);
-
-        return ret;
-}
-
-gf_boolean_t
-cli_cmd_validate_dumpoption (const char *arg, char **option)
-{
-        char    *opwords[] = {"all", "nfs", "mem", "iobuf", "callpool", "priv",
-                              "fd", "inode", "history", "inodectx", "fdctx",
-                              NULL};
-        char    *w = NULL;
-
-        w = str_getunamb (arg, opwords);
-        if (!w) {
-                gf_log ("cli", GF_LOG_DEBUG, "Unknown statedump option  %s",
-                        arg);
-                return _gf_false;
-        }
-        *option = w;
-        return _gf_true;
-}
-
-int
-cli_cmd_volume_statedump_options_parse (const char **words, int wordcount,
-                                        dict_t **options)
-{
-        int     ret = 0;
-        int     i = 0;
-        dict_t  *dict = NULL;
-        int     option_cnt = 0;
-        char    *option = NULL;
-        char    option_str[100] = {0,};
-
-        for (i = 3; i < wordcount; i++, option_cnt++) {
-                if (!cli_cmd_validate_dumpoption (words[i], &option)) {
-                        ret = -1;
-                        goto out;
-                }
-                strncat (option_str, option, strlen (option));
-                strncat (option_str, " ", 1);
-        }
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        ret = dict_set_dynstr (dict, "options", gf_strdup (option_str));
-        if (ret)
-                goto out;
-
-        ret = dict_set_int32 (dict, "option_cnt", option_cnt);
-        if (ret)
-                goto out;
-
-        *options = dict;
-out:
-        if (ret && dict)
-                dict_destroy (dict);
-        if (ret)
-                gf_log ("cli", GF_LOG_ERROR, "Error parsing dumpoptions");
-        return ret;
-}
-
-int
-cli_cmd_volume_clrlks_opts_parse (const char **words, int wordcount,
-                                  dict_t **options)
-{
-        int     ret = -1;
-        int     i = 0;
-        dict_t  *dict = NULL;
-        char    *kind_opts[4] = {"blocked", "granted", "all", NULL};
-        char    *types[4] = {"inode", "entry", "posix", NULL};
-        char    *free_ptr = NULL;
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        if (strcmp (words[4], "kind"))
-                goto out;
-
-        for (i = 0; kind_opts[i]; i++) {
-               if (!strcmp (words[5], kind_opts[i])) {
-                       free_ptr = gf_strdup (words[5]);
-                       ret = dict_set_dynstr (dict, "kind", free_ptr);
-                       if (ret)
-                               goto out;
-                       free_ptr = NULL;
-                       break;
-               }
-        }
-        if (i == 3)
-                goto out;
-
-        ret = -1;
-        for (i = 0; types[i]; i++) {
-               if (!strcmp (words[6], types[i])) {
-                       free_ptr = gf_strdup (words[6]);
-                       ret = dict_set_dynstr (dict, "type", free_ptr);
-                       if (ret)
-                               goto out;
-                       free_ptr = NULL;
-                       break;
-               }
-        }
-        if (i == 3)
-                goto out;
-
-        if (wordcount == 8) {
-                free_ptr = gf_strdup (words[7]);
-                ret = dict_set_dynstr (dict, "opts", free_ptr);
-                if (ret)
-                        goto out;
-                free_ptr = NULL;
-        }
-
-        ret = 0;
-        *options = dict;
-out:
-       if (ret) {
-               GF_FREE (free_ptr);
-               dict_unref (dict);
-       }
-
-       return ret;
-}
-
-static int
-extract_hostname_path_from_token (const char *tmp_words, char **hostname,
-                                  char **path)
-{
-        int ret = 0;
-        char *delimiter = NULL;
-        char *tmp_host = NULL;
-        char *host_name = NULL;
-        char *words = NULL;
-
-        *hostname = NULL;
-        *path = NULL;
-
-        words = GF_CALLOC (1, strlen (tmp_words) + 1, gf_common_mt_char);
-        if (!words){
-                ret = -1;
-                goto out;
-        }
-
-        strncpy (words, tmp_words, strlen (tmp_words) + 1);
-
-        if (validate_brick_name (words)) {
-                cli_err ("Wrong brick type: %s, use <HOSTNAME>:"
-                        "<export-dir-abs-path>", words);
-                ret = -1;
-                goto out;
-        } else {
-                delimiter = strrchr (words, ':');
-                ret = gf_canonicalize_path (delimiter + 1);
-                if (ret) {
-                        goto out;
-                } else {
-                        *path = GF_CALLOC (1, strlen (delimiter+1) +1,
-                                           gf_common_mt_char);
-                        if (!*path) {
-                           ret = -1;
-                                goto out;
-
-                        }
-                        strncpy (*path, delimiter +1,
-                                 strlen(delimiter + 1) + 1);
-                }
-        }
-
-        tmp_host = gf_strdup (words);
-        if (!tmp_host) {
-                gf_log ("cli", GF_LOG_ERROR, "Out of memory");
-                ret = -1;
-                goto out;
-        }
-        get_host_name (tmp_host, &host_name);
-        if (!host_name) {
-                ret = -1;
-                gf_log("cli",GF_LOG_ERROR, "Unable to allocate "
-                        "memory");
-                goto out;
-        }
-        if (!(strcmp (host_name, "localhost") &&
-            strcmp (host_name, "127.0.0.1") &&
-            strncmp (host_name, "0.", 2))) {
-                cli_err ("Please provide a valid hostname/ip other "
-                         "than localhost, 127.0.0.1 or loopback "
-                         "address (0.0.0.0 to 0.255.255.255).");
-                ret = -1;
-                goto out;
-        }
-        if (!valid_internet_address (host_name, _gf_false)) {
-                cli_err ("internet address '%s' does not conform to "
-                          "standards", host_name);
-                ret = -1;
-                goto out;
-        }
-
-        *hostname = GF_CALLOC (1, strlen (host_name) + 1,
-                                       gf_common_mt_char);
-        if (!*hostname) {
-                ret = -1;
-                goto out;
-        }
-        strncpy (*hostname, host_name, strlen (host_name) + 1);
-        ret = 0;
-
-out:
-        GF_FREE (words);
-        GF_FREE (tmp_host);
-        return ret;
-}
-
-
-int
-cli_cmd_volume_heal_options_parse (const char **words, int wordcount,
-                                   dict_t **options)
-{
-        int     ret = 0;
-        dict_t  *dict = NULL;
-        char    *hostname = NULL;
-        char    *path = NULL;
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        ret = dict_set_str (dict, "volname", (char *) words[2]);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "failed to set volname");
-                goto out;
-        }
-
-        if (wordcount == 3) {
-                ret = dict_set_int32 (dict, "heal-op", GF_AFR_OP_HEAL_INDEX);
-                goto done;
-        }
-
-        if (wordcount == 4) {
-                if (!strcmp (words[3], "full")) {
-                        ret = dict_set_int32 (dict, "heal-op",
-                                              GF_AFR_OP_HEAL_FULL);
-                        goto done;
-                } else if (!strcmp (words[3], "statistics")) {
-                        ret = dict_set_int32 (dict, "heal-op",
-                                              GF_AFR_OP_STATISTICS);
-                        goto done;
-
-                } else if (!strcmp (words[3], "info")) {
-                        ret = dict_set_int32 (dict, "heal-op",
-                                              GF_AFR_OP_INDEX_SUMMARY);
-                        goto done;
-                } else {
-                        ret = -1;
-                        goto out;
-                }
-        }
-        if (wordcount == 5) {
-                if (strcmp (words[3], "info") &&
-                    strcmp (words[3], "statistics")) {
-                        ret = -1;
-                        goto out;
-                }
-
-                if (!strcmp (words[3], "info")) {
-                        if (!strcmp (words[4], "healed")) {
-                                ret = dict_set_int32 (dict, "heal-op",
-                                                      GF_AFR_OP_HEALED_FILES);
-                                goto done;
-                        }
-                        if (!strcmp (words[4], "heal-failed")) {
-                                ret = dict_set_int32 (dict, "heal-op",
-                                                   GF_AFR_OP_HEAL_FAILED_FILES);
-                                goto done;
-                        }
-                        if (!strcmp (words[4], "split-brain")) {
-                                ret = dict_set_int32 (dict, "heal-op",
-                                                   GF_AFR_OP_SPLIT_BRAIN_FILES);
-                                goto done;
-                        }
-                }
-
-                if (!strcmp (words[3], "statistics")) {
-                        if (!strcmp (words[4], "heal-count")) {
-                                ret = dict_set_int32 (dict, "heal-op",
-                                               GF_AFR_OP_STATISTICS_HEAL_COUNT);
-                                goto done;
-                        }
-                }
-                ret = -1;
-                goto out;
-        }
-        if (wordcount == 7) {
-                if (!strcmp (words[3], "statistics")
-                    && !strcmp (words[4], "heal-count")
-                    && !strcmp (words[5], "replica")) {
-
-                        ret = dict_set_int32 (dict, "heal-op",
-                                   GF_AFR_OP_STATISTICS_HEAL_COUNT_PER_REPLICA);
-                        if (ret)
-                                goto out;
-                        ret = extract_hostname_path_from_token (words[6],
-                                                              &hostname, &path);
-                        if (ret)
-                                goto out;
-                        ret = dict_set_dynstr (dict, "per-replica-cmd-hostname",
-                                               hostname);
-                        if (ret)
-                                goto out;
-                        ret = dict_set_dynstr (dict, "per-replica-cmd-path",
-                                               path);
-                        if (ret)
-                                goto out;
-                        else
-                                goto done;
-
-                }
-        }
-        ret = -1;
-        goto out;
-done:
-        *options = dict;
-out:
-        if (ret && dict) {
-                dict_unref (dict);
-                *options = NULL;
-        }
-
-        return ret;
-}
-
-int
-cli_cmd_volume_defrag_parse (const char **words, int wordcount,
-                             dict_t **options)
-{
-        dict_t                 *dict = NULL;
-        int                      ret = -1;
-        char                *option  = NULL;
-        char                *volname = NULL;
-        char                *command = NULL;
-        gf_cli_defrag_type       cmd = 0;
-
-        GF_ASSERT (words);
-        GF_ASSERT (options);
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        if (!((wordcount == 4) || (wordcount == 5)))
-                goto out;
-
-        if (wordcount == 4) {
-                if (strcmp (words[3], "start") && strcmp (words[3], "stop") &&
-                    strcmp (words[3], "status"))
-                            goto out;
-        } else {
-                if (strcmp (words[3], "fix-layout") &&
-                    strcmp (words[3], "start"))
-                        goto out;
-        }
-
-        volname = (char *) words[2];
-
-        if (wordcount == 4) {
-                command = (char *) words[3];
-        }
-        if (wordcount == 5) {
-               if ((strcmp (words[3], "fix-layout") ||
-                    strcmp (words[4], "start")) &&
-                    (strcmp (words[3], "start") ||
-                    strcmp (words[4], "force"))) {
-                        ret = -1;
-                        goto out;
-                }
-                command = (char *) words[3];
-                option = (char *) words[4];
-        }
-
-        if (strcmp (command, "start") == 0) {
-                cmd = GF_DEFRAG_CMD_START;
-                if (option && strcmp (option, "force") == 0) {
-                                cmd = GF_DEFRAG_CMD_START_FORCE;
-                        }
-                goto done;
-        }
-
-        if (strcmp (command, "fix-layout") == 0) {
-                cmd = GF_DEFRAG_CMD_START_LAYOUT_FIX;
-                goto done;
-        }
-        if (strcmp (command, "stop") == 0) {
-                cmd = GF_DEFRAG_CMD_STOP;
-                goto done;
-        }
-        if (strcmp (command, "status") == 0) {
-                cmd = GF_DEFRAG_CMD_STATUS;
-        }
-
-done:
-        ret = dict_set_str (dict, "volname", volname);
-
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "failed to set dict");
-                goto out;
-        }
-
-        ret = dict_set_int32 (dict, "rebalance-command", (int32_t) cmd);
-
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "failed to set dict");
-                goto out;
-        }
-
-        *options = dict;
-
-out:
-        if (ret && dict)
-                dict_destroy (dict);
-
-        return ret;
-}
diff --git a/cli/src/cli-cmd-peer.c b/cli/src/cli-cmd-peer.c
index 551312411..3b41195a1 100644
--- a/cli/src/cli-cmd-peer.c
+++ b/cli/src/cli-cmd-peer.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -21,7 +31,6 @@
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
-#include "cli1-xdr.h"
 #include "protocol-common.h"
 
 extern struct rpc_clnt *global_rpc;
@@ -41,7 +50,6 @@ cli_cmd_peer_probe_cbk (struct cli_state *state, struct cli_cmd_word *word,
         dict_t                  *dict = NULL;
         int                     sent = 0;
         int                     parse_error = 0;
-        cli_local_t             *local = NULL;
 
         if (!(wordcount == 3)) {
                 cli_usage_out (word->pattern);
@@ -63,14 +71,12 @@ cli_cmd_peer_probe_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (ret)
                 goto out;
 
-        ret = valid_internet_address ((char *) words[2], _gf_false);
+        ret = valid_internet_address ((char *) words[2]);
         if (ret == 1) {
                 ret = 0;
         } else {
-                cli_out ("%s is an invalid address", words[2]);
                 cli_usage_out (word->pattern);
                 parse_error = 1;
-                ret = -1;
                 goto out;
         }
 /*        if (words[3]) {
@@ -79,9 +85,6 @@ cli_cmd_peer_probe_cbk (struct cli_state *state, struct cli_cmd_word *word,
                         goto out;
         }
 */
-
-        CLI_LOCAL_INIT (local, words, frame, dict);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, dict);
         }
@@ -92,9 +95,6 @@ out:
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Peer probe failed");
         }
-
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -107,12 +107,10 @@ cli_cmd_peer_deprobe_cbk (struct cli_state *state, struct cli_cmd_word *word,
         rpc_clnt_procedure_t *proc  = NULL;
         call_frame_t         *frame = NULL;
         dict_t               *dict  = NULL;
-        int                  flags = 0;
         int                  sent = 0;
         int                  parse_error = 0;
-        cli_local_t          *local = NULL;
 
-        if ((wordcount < 3) || (wordcount > 4)) {
+        if (!(wordcount == 3) ) {
                 cli_usage_out (word->pattern);
                 parse_error = 1;
                 goto out;
@@ -136,22 +134,6 @@ cli_cmd_peer_deprobe_cbk (struct cli_state *state, struct cli_cmd_word *word,
                         goto out;
         }
 */
-        if (wordcount == 4) {
-                if (!strcmp("force", words[3]))
-                        flags |= GF_CLI_FLAG_OP_FORCE;
-                else {
-                        ret = -1;
-                        cli_usage_out (word->pattern);
-                        parse_error = 1;
-                        goto out;
-                }
-        }
-        ret = dict_set_int32 (dict, "flags", flags);
-        if (ret)
-                goto out;
-
-        CLI_LOCAL_INIT (local, words, frame, dict);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, dict);
         }
@@ -163,8 +145,6 @@ out:
                         cli_out ("Peer detach failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -191,7 +171,7 @@ cli_cmd_peer_status_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 goto out;
 
         if (proc->fn) {
-                ret = proc->fn (frame, THIS, (void *)GF_CLI_LIST_PEERS);
+                ret = proc->fn (frame, THIS, (char *)words[1] );
         }
 
 out:
@@ -200,48 +180,6 @@ out:
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Peer status failed");
         }
-
-        CLI_STACK_DESTROY (frame);
-
-        return ret;
-}
-
-int
-cli_cmd_pool_list_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                       const char **words, int wordcount)
-{
-        int                     ret = -1;
-        rpc_clnt_procedure_t    *proc = NULL;
-        call_frame_t            *frame = NULL;
-        int                     sent = 0;
-        int                     parse_error = 0;
-
-        if (wordcount != 2) {
-                cli_usage_out (word->pattern);
-                parse_error = 1;
-                goto out;
-        }
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_LIST_FRIENDS];
-
-        frame = create_frame (THIS, THIS->ctx->pool);
-        if (!frame)
-                goto out;
-
-        if (proc->fn) {
-                ret = proc->fn (frame, THIS,
-                                (void *)GF_CLI_LIST_POOL_NODES);
-        }
-
-out:
-        if (ret) {
-                cli_cmd_sent_status_get (&sent);
-                if ((sent == 0) && (parse_error == 0))
-                        cli_err ("pool list: command execution failed");
-        }
-
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -250,7 +188,7 @@ struct cli_cmd cli_probe_cmds[] = {
           cli_cmd_peer_probe_cbk,
           "probe peer specified by <HOSTNAME>"},
 
-        { "peer detach <HOSTNAME> [force]",
+        { "peer detach <HOSTNAME>",
           cli_cmd_peer_deprobe_cbk,
           "detach peer specified by <HOSTNAME>"},
 
@@ -262,10 +200,6 @@ struct cli_cmd cli_probe_cmds[] = {
            cli_cmd_peer_help_cbk,
            "Help command for peer "},
 
-        { "pool list",
-          cli_cmd_pool_list_cbk,
-          "list all the nodes in the pool (including localhost)"},
-
         { NULL, NULL, NULL }
 };
 
diff --git a/cli/src/cli-cmd-system.c b/cli/src/cli-cmd-system.c
index 8cfa5e70c..061cf4e83 100644
--- a/cli/src/cli-cmd-system.c
+++ b/cli/src/cli-cmd-system.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -31,12 +41,6 @@ extern rpc_clnt_prog_t *cli_rpc_prog;
 int cli_cmd_system_help_cbk (struct cli_state *state, struct cli_cmd_word *in_word,
                              const char **words, int wordcount);
 
-int cli_cmd_copy_file_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                           const char **words, int wordcount);
-
-int cli_cmd_sys_exec_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                          const char **words, int wordcount);
-
 int
 cli_cmd_getspec_cbk (struct cli_state *state, struct cli_cmd_word *word,
                      const char **words, int wordcount)
@@ -174,224 +178,6 @@ out:
         return ret;
 }
 
-static dict_t *
-make_seq_dict (int argc, char **argv)
-{
-        char index[] = "4294967296"; // 1<<32
-        int i        = 0;
-        int ret      = 0;
-        dict_t *dict = dict_new ();
-
-        if (!dict)
-                return NULL;
-
-        for (i = 0; i < argc; i++) {
-                snprintf(index, sizeof(index), "%d", i);
-                ret = dict_set_str (dict, index, argv[i]);
-                if (ret == -1)
-                        break;
-        }
-
-        if (ret) {
-                dict_destroy (dict);
-                dict = NULL;
-        }
-
-        return dict;
-}
-
-int
-cli_cmd_mount_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                   const char **words, int wordcount)
-{
-        rpc_clnt_procedure_t *proc = NULL;
-        call_frame_t *frame        = NULL;
-        int ret                    = -1;
-        dict_t *dict               = NULL;
-        void *dataa[]              = {NULL, NULL};
-
-        if (wordcount < 4) {
-                cli_usage_out (word->pattern);
-                goto out;
-        }
-
-        dict = make_seq_dict (wordcount - 3, (char **)words + 3);
-        if (!dict)
-                goto out;
-
-        dataa[0] = (void *)words[2];
-        dataa[1] = dict;
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_MOUNT];
-        if (proc && proc->fn) {
-                frame = create_frame (THIS, THIS->ctx->pool);
-                if (!frame)
-                        goto out;
-                ret = proc->fn (frame, THIS, dataa);
-        }
-
- out:
-        if (dict)
-                dict_unref (dict);
-
-        if (!proc && ret)
-                cli_out ("Mount command failed");
-
-        return ret;
-}
-
-int
-cli_cmd_umount_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                   const char **words, int wordcount)
-{
-        rpc_clnt_procedure_t *proc = NULL;
-        call_frame_t *frame        = NULL;
-        int ret                    = -1;
-        dict_t *dict               = NULL;
-
-        if (!(wordcount == 3 ||
-              (wordcount == 4 && strcmp (words[3], "lazy") == 0))) {
-                cli_usage_out (word->pattern);
-                goto out;
-        }
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        ret = dict_set_str (dict, "path", (char *)words[2]);
-        if (ret != 0)
-                goto out;
-        ret = dict_set_int32 (dict, "lazy", wordcount == 4);
-        if (ret != 0)
-                goto out;
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_UMOUNT];
-        if (proc && proc->fn) {
-                frame = create_frame (THIS, THIS->ctx->pool);
-                if (!frame)
-                        goto out;
-                ret = proc->fn (frame, THIS, dict);
-        }
-
- out:
-        if (dict)
-                dict_unref (dict);
-
-        if (!proc && ret)
-                cli_out ("Umount command failed");
-
-        return ret;
-}
-
-int
-cli_cmd_uuid_get_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                      const char **words, int wordcount)
-{
-        int                     ret = -1;
-        int                     sent = 0;
-        int                     parse_error = 0;
-        dict_t                  *dict  = NULL;
-        rpc_clnt_procedure_t    *proc = NULL;
-        call_frame_t            *frame = NULL;
-        cli_local_t             *local = NULL;
-        xlator_t                *this  = NULL;
-
-        this = THIS;
-        if (wordcount != 3) {
-                cli_usage_out (word->pattern);
-                parse_error = 1;
-                goto out;
-        }
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_UUID_GET];
-        frame = create_frame (this, this->ctx->pool);
-        if (!frame)
-                goto out;
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        CLI_LOCAL_INIT (local, words, frame, dict);
-        if (proc->fn)
-                ret = proc->fn (frame, this, dict);
-
-out:
-        if (ret) {
-                cli_cmd_sent_status_get (&sent);
-                if ((sent == 0) && (parse_error == 0))
-                        cli_out ("uuid get failed");
-        }
-
-        if (dict)
-                dict_unref (dict);
-
-        CLI_STACK_DESTROY (frame);
-        return ret;
-}
-
-int
-cli_cmd_uuid_reset_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                        const char **words, int wordcount)
-{
-        int                     ret = -1;
-        rpc_clnt_procedure_t    *proc = NULL;
-        call_frame_t            *frame = NULL;
-        int                     sent = 0;
-        int                     parse_error = 0;
-        gf_answer_t             answer = GF_ANSWER_NO;
-        char                    *question = NULL;
-        cli_local_t             *local = NULL;
-        dict_t                  *dict  = NULL;
-        xlator_t                *this  = NULL;
-
-        question = "Resetting uuid changes the uuid of local glusterd. "
-                   "Do you want to continue?";
-
-        if (wordcount != 3) {
-                cli_usage_out (word->pattern);
-                parse_error = 1;
-                goto out;
-        }
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_UUID_RESET];
-
-        this = THIS;
-        frame = create_frame (this, this->ctx->pool);
-        if (!frame)
-                goto out;
-
-        dict = dict_new ();
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
-        CLI_LOCAL_INIT (local, words, frame, dict);
-        answer = cli_cmd_get_confirmation (state, question);
-
-        if (GF_ANSWER_NO == answer) {
-                ret = 0;
-                goto out;
-        }
-
-        //send NULL as argument since no dictionary is sent to glusterd
-        if (proc->fn) {
-                ret = proc->fn (frame, this, dict);
-        }
-
-out:
-        if (ret) {
-                cli_cmd_sent_status_get (&sent);
-                if ((sent == 0) && (parse_error == 0))
-                        cli_out ("uuid reset failed");
-        }
-
-        CLI_STACK_DESTROY (frame);
-
-        return ret;
-}
-
 struct cli_cmd cli_system_cmds[] = {
         { "system:: getspec <VOLID>",
           cli_cmd_getspec_cbk,
@@ -409,171 +195,14 @@ struct cli_cmd cli_system_cmds[] = {
           cli_cmd_getwd_cbk,
           "query glusterd work directory"},
 
-        { "system:: mount <label> <args...>",
-          cli_cmd_mount_cbk,
-          "request a mount"},
-
-        { "system:: umount <path> [lazy]",
-          cli_cmd_umount_cbk,
-          "request an umount"},
-
-        { "system:: uuid get",
-          cli_cmd_uuid_get_cbk,
-          "get uuid of glusterd"},
-
-        { "system:: uuid reset",
-          cli_cmd_uuid_reset_cbk,
-          "reset the uuid of glusterd"},
-
         { "system:: help",
            cli_cmd_system_help_cbk,
            "display help for system commands"},
 
-        { "system:: copy file [<filename>]",
-           cli_cmd_copy_file_cbk,
-           "Copy file from current node's $working_dir to "
-           "$working_dir of all cluster nodes"},
-
-        { "system:: execute <command> <args>",
-           cli_cmd_sys_exec_cbk,
-           "Execute the command on all the nodes "
-           "in the cluster and display their output."},
-
         { NULL, NULL, NULL }
 };
 
 int
-cli_cmd_sys_exec_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                      const char **words, int wordcount)
-{
-        char                   cmd_arg_name[PATH_MAX] = "";
-        char                  *command                = NULL;
-        char                  *saveptr                = NULL;
-        char                  *tmp                    = NULL;
-        int                    ret                    = -1;
-        int                    i                      = -1;
-        int                    cmd_args_count         = 0;
-        int                    in_cmd_args_count      = 0;
-        rpc_clnt_procedure_t  *proc                   = NULL;
-        call_frame_t          *frame                  = NULL;
-        dict_t                *dict                   = NULL;
-        cli_local_t           *local                  = NULL;
-
-        if (wordcount < 3) {
-                cli_usage_out (word->pattern);
-                goto out;
-        }
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        command = strtok_r ((char *)words[2], " ", &saveptr);
-        do {
-                tmp = strtok_r (NULL, " ", &saveptr);
-                if (tmp) {
-                        in_cmd_args_count++;
-                        memset (cmd_arg_name, '\0', sizeof(cmd_arg_name));
-                        snprintf (cmd_arg_name, sizeof(cmd_arg_name),
-                                  "cmd_arg_%d", in_cmd_args_count);
-                        ret = dict_set_str (dict, cmd_arg_name, tmp);
-                        if (ret) {
-                                gf_log ("", GF_LOG_ERROR, "Unable to set "
-                                        "%s in dict", cmd_arg_name);
-                                goto out;
-                        }
-                }
-        } while (tmp);
-
-        cmd_args_count = wordcount - 3;
-
-        ret = dict_set_str (dict, "command", command);
-        if (ret) {
-                gf_log ("", GF_LOG_ERROR, "Unable to set command in dict");
-                goto out;
-        }
-
-        for (i=1; i <= cmd_args_count; i++) {
-                in_cmd_args_count++;
-                memset (cmd_arg_name, '\0', sizeof(cmd_arg_name));
-                snprintf (cmd_arg_name, sizeof(cmd_arg_name),
-                          "cmd_arg_%d", in_cmd_args_count);
-                ret = dict_set_str (dict, cmd_arg_name,
-                                    (char *)words[2+i]);
-                if (ret) {
-                        gf_log ("", GF_LOG_ERROR, "Unable to set %s in dict",
-                               cmd_arg_name);
-                        goto out;
-                }
-        }
-
-        ret = dict_set_int32 (dict, "cmd_args_count", in_cmd_args_count);
-        if (ret) {
-                gf_log ("", GF_LOG_ERROR,
-                        "Unable to set cmd_args_count in dict");
-                goto out;
-        }
-
-        ret = dict_set_str (dict, "volname", "N/A");
-        if (ret) {
-                gf_log ("", GF_LOG_ERROR, "Unable to set volname in dict");
-                goto out;
-        }
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_SYS_EXEC];
-        if (proc && proc->fn) {
-                frame = create_frame (THIS, THIS->ctx->pool);
-                if (!frame)
-                        goto out;
-                CLI_LOCAL_INIT (local, words, frame, dict);
-                ret = proc->fn (frame, THIS, (void*)dict);
-        }
-out:
-        return ret;
-}
-
-int
-cli_cmd_copy_file_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                       const char **words, int wordcount)
-{
-        int                    ret      = -1;
-        rpc_clnt_procedure_t  *proc     = NULL;
-        call_frame_t          *frame    = NULL;
-        char                  *filename = "";
-        dict_t                *dict     = NULL;
-        cli_local_t           *local    = NULL;
-
-        if (wordcount != 4) {
-                cli_usage_out (word->pattern);
-                goto out;
-        }
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        filename = (char*)words[3];
-        ret = dict_set_str (dict, "source", filename);
-        if (ret)
-                 gf_log ("", GF_LOG_ERROR, "Unable to set filename in dict");
-
-        ret = dict_set_str (dict, "volname", "N/A");
-        if (ret)
-                 gf_log ("", GF_LOG_ERROR, "Unable to set volname in dict");
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_COPY_FILE];
-        if (proc && proc->fn) {
-                frame = create_frame (THIS, THIS->ctx->pool);
-                if (!frame)
-                        goto out;
-                CLI_LOCAL_INIT (local, words, frame, dict);
-                ret = proc->fn (frame, THIS, (void*)dict);
-        }
-out:
-        return ret;
-}
-
-int
 cli_cmd_system_help_cbk (struct cli_state *state, struct cli_cmd_word *in_word,
                          const char **words, int wordcount)
 {
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index 100be0b73..60618db09 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -1,23 +1,28 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <pthread.h>
 
-#include <sys/socket.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #ifndef _CONFIG_H
 #define _CONFIG_H
 #include "config.h"
@@ -27,7 +32,6 @@
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
 #include "cli1-xdr.h"
-#include "run.h"
 
 extern struct rpc_clnt *global_rpc;
 
@@ -78,9 +82,9 @@ cli_cmd_volume_info_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (!local)
                 goto out;
 
-        local->get_vol.flags = ctx.flags;
+        local->u.get_vol.flags = ctx.flags;
         if (ctx.volname)
-                local->get_vol.volname = gf_strdup (ctx.volname);
+                local->u.get_vol.volname = gf_strdup (ctx.volname);
 
         frame->local = local;
 
@@ -95,8 +99,6 @@ out:
                         cli_out ("Getting Volume information failed!");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 
 }
@@ -108,15 +110,9 @@ cli_cmd_sync_volume_cbk (struct cli_state *state, struct cli_cmd_word *word,
         int                     ret = -1;
         rpc_clnt_procedure_t    *proc = NULL;
         call_frame_t            *frame = NULL;
+        gf1_cli_sync_volume_req req = {0,};
         int                     sent = 0;
         int                     parse_error = 0;
-        dict_t                  *dict = NULL;
-        cli_local_t             *local = NULL;
-        gf_answer_t             answer = GF_ANSWER_NO;
-        const char              *question = "Sync volume may make data "
-                                            "inaccessible while the sync "
-                                            "is in progress. Do you want "
-                                            "to continue?";
 
         if ((wordcount < 3) || (wordcount > 4)) {
                 cli_usage_out (word->pattern);
@@ -124,40 +120,14 @@ cli_cmd_sync_volume_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 goto out;
         }
 
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
         if ((wordcount == 3) || !strcmp(words[3], "all")) {
-                ret = dict_set_int32 (dict, "flags", (int32_t)
-                                      GF_CLI_SYNC_ALL);
-                if (ret) {
-                        gf_log (THIS->name, GF_LOG_ERROR, "failed to set"
-                                "flag");
-                        goto out;
-                }
+                req.flags = GF_CLI_SYNC_ALL;
+                req.volname = "";
         } else {
-                ret = dict_set_str (dict, "volname", (char *) words[3]);
-                if (ret) {
-                        gf_log (THIS->name, GF_LOG_ERROR, "failed to set "
-                                "volume");
-                        goto out;
-                }
-        }
-
-        ret = dict_set_str (dict, "hostname", (char *) words[2]);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "failed to set hostname");
-                goto out;
+                req.volname = (char *)words[3];
         }
 
-        if (!(state->mode & GLUSTER_MODE_SCRIPT)) {
-                answer = cli_cmd_get_confirmation (state, question);
-                if (GF_ANSWER_NO == answer) {
-                        ret = 0;
-                        goto out;
-                }
-        }
+        req.hostname = (char *)words[2];
 
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_SYNC_VOLUME];
 
@@ -165,10 +135,8 @@ cli_cmd_sync_volume_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (!frame)
                 goto out;
 
-        CLI_LOCAL_INIT (local, words, frame, dict);
-
         if (proc->fn) {
-                ret = proc->fn (frame, THIS, dict);
+                ret = proc->fn (frame, THIS, &req);
         }
 
 out:
@@ -178,156 +146,6 @@ out:
                         cli_out ("Volume sync failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
-        return ret;
-}
-
-gf_ai_compare_t
-cli_cmd_compare_addrinfo (struct addrinfo *first, struct addrinfo *next)
-{
-        int             ret = -1;
-        struct addrinfo *tmp1 = NULL;
-        struct addrinfo *tmp2 = NULL;
-        char            firstip[NI_MAXHOST] = {0.};
-        char            nextip[NI_MAXHOST] = {0,};
-
-        for (tmp1 = first; tmp1 != NULL; tmp1 = tmp1->ai_next) {
-                ret = getnameinfo (tmp1->ai_addr, tmp1->ai_addrlen, firstip,
-                                   NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-                if (ret)
-                        return GF_AI_COMPARE_ERROR;
-                for (tmp2 = next; tmp2 != NULL; tmp2 = tmp2->ai_next) {
-                        ret = getnameinfo (tmp2->ai_addr, tmp2->ai_addrlen, nextip,
-                                           NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-                        if (ret)
-                                return GF_AI_COMPARE_ERROR;
-                        if (!strcmp (firstip, nextip)) {
-                                return GF_AI_COMPARE_MATCH;
-                        }
-                }
-        }
-        return GF_AI_COMPARE_NO_MATCH;
-}
-
-/* Check for non optimal brick order for replicate :
- * Checks if bricks belonging to a replicate volume
- * are present on the same server
- */
-int32_t
-cli_cmd_check_brick_order (struct cli_state *state, const char *bricks,
-                           int brick_count, int sub_count)
-{
-        int             ret = -1;
-        int             i = 0;
-        int             j = 0;
-        int             k = 0;
-        addrinfo_list_t *ai_list = NULL;
-        addrinfo_list_t *ai_list_tmp1 = NULL;
-        addrinfo_list_t *ai_list_tmp2 = NULL;
-        char            *brick = NULL;
-        char            *brick_list = NULL;
-        char            *brick_list_dup = NULL;
-        char            *tmpptr = NULL;
-        struct addrinfo *ai_info = NULL;
-        gf_answer_t     answer = GF_ANSWER_NO;
-        const char      *failed_question = NULL;
-        const char      *found_question = NULL;
-        failed_question = "Failed to perform brick order check. "
-                          "Do you want to continue creating the volume? ";
-        found_question =  "Multiple bricks of a replicate volume are present"
-                          " on the same server. This setup is not optimal.\n"
-                          "Do you still want to continue creating the volume? ";
-
-        GF_ASSERT (bricks);
-        GF_ASSERT (brick_count > 0);
-        GF_ASSERT (sub_count > 0);
-
-        ai_list = malloc (sizeof (addrinfo_list_t));
-        ai_list->info = NULL;
-        INIT_LIST_HEAD (&ai_list->list);
-        brick_list = gf_strdup (bricks);
-        if (brick_list == NULL) {
-                gf_log ("cli", GF_LOG_DEBUG, "failed to allocate memory");
-                goto check_failed;
-        }
-        brick_list_dup = brick_list;
-        /* Resolve hostnames and get addrinfo */
-        while (i < brick_count) {
-                ++i;
-                brick = strtok_r (brick_list, " \n", &tmpptr);
-                brick_list = tmpptr;
-                if (brick == NULL)
-                        goto check_failed;
-                brick = strtok_r (brick, ":", &tmpptr);
-                if (brick == NULL)
-                        goto check_failed;
-                ret = getaddrinfo (brick, NULL, NULL, &ai_info);
-                if (ret)
-                        goto check_failed;
-                ai_list_tmp1 = malloc (sizeof (addrinfo_list_t));
-                if (ai_list_tmp1 == NULL)
-                        goto check_failed;
-                ai_list_tmp1->info = ai_info;
-                list_add_tail (&ai_list_tmp1->list, &ai_list->list);
-                ai_list_tmp1 = NULL;
-        }
-
-        i = 0;
-        ai_list_tmp1 = list_entry (ai_list->list.next, addrinfo_list_t, list);
-
-        /* Check for bad brick order */
-        while (i < brick_count) {
-                ++i;
-                ai_info = ai_list_tmp1->info;
-                ai_list_tmp1 = list_entry (ai_list_tmp1->list.next,
-                                           addrinfo_list_t, list);
-                if ( 0 == i % sub_count) {
-                        j = 0;
-                        continue;
-                }
-                ai_list_tmp2 = ai_list_tmp1;
-                k = j;
-                while (k < sub_count - 1) {
-                        ++k;
-                        ret = cli_cmd_compare_addrinfo (ai_info,
-                                                        ai_list_tmp2->info);
-                        if (GF_AI_COMPARE_ERROR == ret)
-                                goto check_failed;
-                        if (GF_AI_COMPARE_MATCH == ret)
-                                goto found_bad_brick_order;
-                        ai_list_tmp2 = list_entry (ai_list_tmp2->list.next,
-                                                   addrinfo_list_t, list);
-                }
-                ++j;
-        }
-        gf_log ("cli", GF_LOG_INFO, "Brick order okay");
-        ret = 0;
-        goto out;
-
-check_failed:
-        gf_log ("cli", GF_LOG_INFO, "Failed bad brick order check");
-        answer = cli_cmd_get_confirmation(state, failed_question);
-        if (GF_ANSWER_YES == answer)
-                ret = 0;
-        goto out;
-
-found_bad_brick_order:
-        gf_log ("cli", GF_LOG_INFO, "Bad brick order found");
-        answer = cli_cmd_get_confirmation (state, found_question);
-        if (GF_ANSWER_YES == answer)
-                ret = 0;
-out:
-        ai_list_tmp2 = NULL;
-        i = 0;
-        GF_FREE (brick_list_dup);
-        list_for_each_entry (ai_list_tmp1, &ai_list->list, list) {
-                if (ai_list_tmp1->info)
-                        freeaddrinfo (ai_list_tmp1->info);
-                free (ai_list_tmp2);
-                ai_list_tmp2 = ai_list_tmp1;
-        }
-        free (ai_list_tmp2);
         return ret;
 }
 
@@ -341,11 +159,6 @@ cli_cmd_volume_create_cbk (struct cli_state *state, struct cli_cmd_word *word,
         dict_t                  *options = NULL;
         int                     sent = 0;
         int                     parse_error = 0;
-        char                    *brick_list = NULL;
-        int32_t                 brick_count = 0;
-        int32_t                 sub_count = 0;
-        int32_t                 type = GF_CLUSTER_TYPE_NONE;
-        cli_local_t             *local = NULL;
 
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_CREATE_VOLUME];
 
@@ -360,62 +173,20 @@ cli_cmd_volume_create_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 parse_error = 1;
                 goto out;
         }
-        /*Check brick order if type is replicate*/
-        ret = dict_get_int32 (options, "type", &type);
-        if (ret) {
-                gf_log ("cli", GF_LOG_ERROR, "Could not get brick type");
-                goto out;
-        }
-        if ((type == GF_CLUSTER_TYPE_REPLICATE) ||
-            (type == GF_CLUSTER_TYPE_STRIPE_REPLICATE)) {
-                if ((ret = dict_get_str (options, "bricks", &brick_list)) != 0) {
-                        gf_log ("cli", GF_LOG_ERROR, "Replica bricks check : "
-                                                     "Could not retrieve bricks list");
-                        goto out;
-                }
-                if ((ret = dict_get_int32 (options, "count", &brick_count)) != 0) {
-                        gf_log ("cli", GF_LOG_ERROR, "Replica bricks check : "
-                                                     "Could not retrieve brick count");
-                        goto out;
-                }
-                if ((ret = dict_get_int32 (options, "replica-count", &sub_count)) != 0) {
-                        gf_log ("cli", GF_LOG_ERROR, "Replica bricks check : "
-                                                    "Could not retrieve replica count");
-                        goto out;
-                }
-                gf_log ("cli", GF_LOG_INFO, "Replicate cluster type found."
-                                            " Checking brick order.");
-                ret = cli_cmd_check_brick_order (state, brick_list, brick_count, sub_count);
-                if (ret) {
-                        gf_log("cli", GF_LOG_INFO, "Not creating volume because of bad brick order");
-                        goto out;
-                }
-        }
-
-        if (state->mode & GLUSTER_MODE_SCRIPT) {
-                ret = dict_set_int32 (options, "force", _gf_true);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR, "Failed to set force "
-                                "option");
-                        goto out;
-                }
-        }
-
-        CLI_LOCAL_INIT (local, words, frame, options);
 
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
 
 out:
+        if (options)
+                dict_unref (options);
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume create failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -432,8 +203,6 @@ cli_cmd_volume_delete_cbk (struct cli_state *state, struct cli_cmd_word *word,
         const char              *question = NULL;
         int                     sent = 0;
         int                     parse_error = 0;
-        cli_local_t             *local = NULL;
-        dict_t                  *dict = NULL;
 
         question = "Deleting volume will erase all information about the volume. "
                    "Do you want to continue?";
@@ -443,10 +212,6 @@ cli_cmd_volume_delete_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (!frame)
                 goto out;
 
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
         if (wordcount != 3) {
                 cli_usage_out (word->pattern);
                 parse_error = 1;
@@ -462,17 +227,8 @@ cli_cmd_volume_delete_cbk (struct cli_state *state, struct cli_cmd_word *word,
 
         volname = (char *)words[2];
 
-        ret = dict_set_str (dict, "volname", volname);
-
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING, "dict set failed");
-                goto out;
-        }
-
-        CLI_LOCAL_INIT (local, words, frame, dict);
-
         if (proc->fn) {
-                ret = proc->fn (frame, THIS, dict);
+                ret = proc->fn (frame, THIS, volname);
         }
 
 out:
@@ -482,8 +238,6 @@ out:
                         cli_out ("Volume delete failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -494,11 +248,9 @@ cli_cmd_volume_start_cbk (struct cli_state *state, struct cli_cmd_word *word,
         int                     ret = -1;
         rpc_clnt_procedure_t    *proc = NULL;
         call_frame_t            *frame = NULL;
+        gf1_cli_start_vol_req    req = {0,};
         int                     sent = 0;
         int                     parse_error = 0;
-        dict_t                  *dict = NULL;
-        int                     flags = 0;
-        cli_local_t             *local = NULL;
 
         frame = create_frame (THIS, THIS->ctx->pool);
         if (!frame)
@@ -510,23 +262,13 @@ cli_cmd_volume_start_cbk (struct cli_state *state, struct cli_cmd_word *word,
                goto out;
         }
 
-        dict = dict_new ();
-        if (!dict) {
-                goto out;
-        }
-
-        if (!words[2])
-                goto out;
-
-        ret = dict_set_str (dict, "volname", (char *)words[2]);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "dict set failed");
+        req.volname = (char *)words[2];
+        if (!req.volname)
                 goto out;
-        }
 
         if (wordcount == 4) {
                 if (!strcmp("force", words[3])) {
-                        flags |= GF_CLI_FLAG_OP_FORCE;
+                        req.flags |= GF_CLI_FLAG_OP_FORCE;
                 } else {
                         ret = -1;
                         cli_usage_out (word->pattern);
@@ -534,25 +276,11 @@ cli_cmd_volume_start_cbk (struct cli_state *state, struct cli_cmd_word *word,
                         goto out;
                 }
         }
-        ret = dict_set_int32 (dict, "flags", flags);
-        if (ret) {
-                 gf_log (THIS->name, GF_LOG_ERROR,
-                         "dict set failed");
-                 goto out;
-        }
-
-        if (ret < 0) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "failed to serialize dict");
-                goto out;
-        }
 
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_START_VOLUME];
 
-        CLI_LOCAL_INIT (local, words, frame, dict);
-
         if (proc->fn) {
-                ret = proc->fn (frame, THIS, dict);
+                ret = proc->fn (frame, THIS, &req);
         }
 
 out:
@@ -562,8 +290,6 @@ out:
                         cli_out ("Volume start failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -572,7 +298,7 @@ cli_cmd_get_confirmation (struct cli_state *state, const char *question)
 {
         char                    answer[5] = {'\0', };
         char                    flush = '\0';
-        size_t			len;
+	int			len = 0;
 
         if (state->mode & GLUSTER_MODE_SCRIPT)
                 return GF_ANSWER_YES;
@@ -586,7 +312,7 @@ cli_cmd_get_confirmation (struct cli_state *state, const char *question)
 
 	len = strlen (answer);
 
-	if (len && answer [len - 1] == '\n'){
+	if (answer [len - 1] == '\n'){
 		answer [--len] = '\0';
 	} else {
 		do{
@@ -617,12 +343,10 @@ cli_cmd_volume_stop_cbk (struct cli_state *state, struct cli_cmd_word *word,
         rpc_clnt_procedure_t    *proc = NULL;
         call_frame_t            *frame = NULL;
         int                     flags   = 0;
+        gf1_cli_stop_vol_req    req = {0,};
         gf_answer_t             answer = GF_ANSWER_NO;
         int                     sent = 0;
         int                     parse_error = 0;
-        dict_t                  *dict = NULL;
-        char                    *volname = NULL;
-        cli_local_t             *local = NULL;
 
         const char *question = "Stopping volume will make its data inaccessible. "
                                "Do you want to continue?";
@@ -637,14 +361,9 @@ cli_cmd_volume_stop_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 goto out;
         }
 
-        volname = (char*) words[2];
-
-        dict = dict_new ();
-        ret = dict_set_str (dict, "volname", volname);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "dict set failed");
+        req.volname = (char *)words[2];
+        if (!req.volname)
                 goto out;
-        }
 
         if (wordcount == 4) {
                 if (!strcmp("force", words[3])) {
@@ -656,12 +375,6 @@ cli_cmd_volume_stop_cbk (struct cli_state *state, struct cli_cmd_word *word,
                         goto out;
                 }
         }
-        ret = dict_set_int32 (dict, "flags", flags);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "dict set failed");
-                goto out;
-        }
 
         answer = cli_cmd_get_confirmation (state, question);
 
@@ -670,23 +383,20 @@ cli_cmd_volume_stop_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 goto out;
         }
 
+        req.flags = flags;
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_STOP_VOLUME];
 
-        CLI_LOCAL_INIT (local, words, frame, dict);
-
         if (proc->fn) {
-                ret = proc->fn (frame, THIS, dict);
+                ret = proc->fn (frame, THIS, &req);
         }
 
 out:
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
-                        cli_out ("Volume stop on '%s' failed", volname);
+                        cli_out ("Volume stop failed", req.volname);
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -740,11 +450,9 @@ out:
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
-                        cli_out ("Volume rename on '%s' failed", (char *)words[2]);
+                        cli_out ("Volume rename failed", (char *)words[2]);
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -758,7 +466,7 @@ cli_cmd_volume_defrag_cbk (struct cli_state *state, struct cli_cmd_word *word,
         dict_t               *dict = NULL;
         int                     sent = 0;
         int                     parse_error = 0;
-        cli_local_t          *local = NULL;
+        int                     index = 0;
 #ifdef GF_SOLARIS_HOST_OS
         cli_out ("Command not supported on Solaris");
         goto out;
@@ -768,30 +476,69 @@ cli_cmd_volume_defrag_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (!frame)
                 goto out;
 
-        ret = cli_cmd_volume_defrag_parse (words, wordcount, &dict);
+        dict = dict_new ();
+        if (!dict)
+                goto out;
 
-        if (ret) {
+        if (!((wordcount == 4) || (wordcount == 5))) {
                 cli_usage_out (word->pattern);
                 parse_error = 1;
+                goto out;
         }
 
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_DEFRAG_VOLUME];
+        if (wordcount == 4) {
+                index = 3;
+        } else {
+                if (strcmp (words[3], "fix-layout") && 
+                    strcmp (words[3], "migrate-data")) {
+                        cli_usage_out (word->pattern);
+                        parse_error = 1;
+                        goto out;
+                }
+                index = 4;
+        }
+
+	if (strcmp (words[index], "start") && strcmp (words[index], "stop") && 
+            strcmp (words[index], "status")) {
+	        cli_usage_out (word->pattern);
+		parse_error = 1;
+		goto out;
+	}
 
-        CLI_LOCAL_INIT (local, words, frame, dict);
+        ret = dict_set_str (dict, "volname", (char *)words[2]);
+        if (ret)
+                goto out;
+
+        if (wordcount == 4) {
+                ret = dict_set_str (dict, "command", (char *)words[3]);
+                if (ret)
+                        goto out;
+        }
+        if (wordcount == 5) {
+                ret = dict_set_str (dict, "start-type", (char *)words[3]);
+                if (ret)
+                        goto out;
+                ret = dict_set_str (dict, "command", (char *)words[4]);
+                if (ret)
+                        goto out;
+        }
+
+        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_DEFRAG_VOLUME];
 
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, dict);
         }
 
 out:
+        if (dict)
+                dict_destroy (dict);
+
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume rebalance failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -801,11 +548,11 @@ cli_cmd_volume_reset_cbk (struct cli_state *state, struct cli_cmd_word *word,
 {
         int                     sent = 0;
         int                     parse_error = 0;
+
         int                     ret = -1;
         rpc_clnt_procedure_t    *proc = NULL;
         call_frame_t            *frame = NULL;
         dict_t                  *options = NULL;
-        cli_local_t             *local = NULL;
 
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_RESET_VOLUME];
 
@@ -814,27 +561,27 @@ cli_cmd_volume_reset_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 goto out;
 
         ret = cli_cmd_volume_reset_parse (words, wordcount, &options);
+
         if (ret) {
                 cli_usage_out (word->pattern);
                 parse_error = 1;
                 goto out;
         }
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
 
 out:
+        if (options)
+                dict_unref (options);
+
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume reset failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 
 }
@@ -850,7 +597,6 @@ cli_cmd_volume_profile_cbk (struct cli_state *state, struct cli_cmd_word *word,
         rpc_clnt_procedure_t    *proc    = NULL;
         call_frame_t            *frame   = NULL;
         dict_t                  *options = NULL;
-        cli_local_t             *local = NULL;
 
         ret = cli_cmd_volume_profile_parse (words, wordcount, &options);
 
@@ -866,21 +612,20 @@ cli_cmd_volume_profile_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (!frame)
                 goto out;
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
 
 out:
+        if (options)
+                dict_unref (options);
+
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume profile failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 
 }
@@ -896,8 +641,6 @@ cli_cmd_volume_set_cbk (struct cli_state *state, struct cli_cmd_word *word,
         rpc_clnt_procedure_t    *proc = NULL;
         call_frame_t            *frame = NULL;
         dict_t                  *options = NULL;
-        cli_local_t             *local = NULL;
-        char                    *op_errstr = NULL;
 
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_SET_VOLUME];
 
@@ -905,33 +648,28 @@ cli_cmd_volume_set_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (!frame)
                 goto out;
 
-        ret = cli_cmd_volume_set_parse (words, wordcount, &options, &op_errstr);
-        if (ret) {
-                if (op_errstr) {
-                    cli_err ("%s", op_errstr);
-                    GF_FREE (op_errstr);
-                } else
-                    cli_usage_out (word->pattern);
+        ret = cli_cmd_volume_set_parse (words, wordcount, &options);
 
+        if (ret) {
+                cli_usage_out (word->pattern);
                 parse_error = 1;
                 goto out;
         }
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
 
 out:
+        if (options)
+                dict_unref (options);
+
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume set failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 
 }
@@ -947,63 +685,35 @@ cli_cmd_volume_add_brick_cbk (struct cli_state *state,
         dict_t                  *options = NULL;
         int                     sent = 0;
         int                     parse_error = 0;
-        gf_answer_t             answer = GF_ANSWER_NO;
-        cli_local_t             *local = NULL;
-
-        const char *question = "Changing the 'stripe count' of the volume is "
-                "not a supported feature. In some cases it may result in data "
-                "loss on the volume. Also there may be issues with regular "
-                "filesystem operations on the volume after the change. Do you "
-                "really want to continue with 'stripe' count option ? ";
 
         frame = create_frame (THIS, THIS->ctx->pool);
         if (!frame)
                 goto out;
 
         ret = cli_cmd_volume_add_brick_parse (words, wordcount, &options);
+
         if (ret) {
                 cli_usage_out (word->pattern);
                 parse_error = 1;
                 goto out;
         }
 
-        /* TODO: there are challenges in supporting changing of
-           stripe-count, untill it is properly supported give warning to user */
-        if (dict_get (options, "stripe-count")) {
-                answer = cli_cmd_get_confirmation (state, question);
-
-                if (GF_ANSWER_NO == answer) {
-                        ret = 0;
-                        goto out;
-                }
-        }
-
-        if (state->mode & GLUSTER_MODE_SCRIPT) {
-                ret = dict_set_int32 (options, "force", _gf_true);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR, "Failed to set force "
-                                "option");
-                        goto out;
-                }
-        }
-
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_ADD_BRICK];
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
 
 out:
+        if (options)
+                dict_unref (options);
+
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume add-brick failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -1014,14 +724,9 @@ cli_cmd_quota_cbk (struct cli_state *state, struct cli_cmd_word *word,
 
         int                      ret       = 0;
         int                      parse_err = 0;
-        int32_t                  type      = 0;
         rpc_clnt_procedure_t    *proc      = NULL;
         call_frame_t            *frame     = NULL;
         dict_t                  *options   = NULL;
-        gf_answer_t              answer    = GF_ANSWER_NO;
-        cli_local_t             *local     = NULL;
-        const char *question = "Disabling quota will delete all the quota "
-                               "configuration. Do you want to continue?";
 
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_QUOTA];
         if (proc == NULL) {
@@ -1036,29 +741,22 @@ cli_cmd_quota_cbk (struct cli_state *state, struct cli_cmd_word *word,
         }
 
         ret = cli_cmd_quota_parse (words, wordcount, &options);
-
-        if (ret < 0) {
+        if (ret) {
                 cli_usage_out (word->pattern);
                 parse_err = 1;
                 goto out;
-        } else if (dict_get_int32 (options, "type", &type) == 0 &&
-                   type == GF_QUOTA_OPTION_TYPE_DISABLE) {
-                answer = cli_cmd_get_confirmation (state, question);
-                if (answer == GF_ANSWER_NO)
-                        goto out;
         }
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn)
                 ret = proc->fn (frame, THIS, options);
 
 out:
+        if (options)
+                dict_unref (options);
+
         if (ret && parse_err == 0)
                 cli_out ("Quota command failed");
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 
 }
@@ -1075,8 +773,6 @@ cli_cmd_volume_remove_brick_cbk (struct cli_state *state,
         gf_answer_t             answer = GF_ANSWER_NO;
         int                     sent = 0;
         int                     parse_error = 0;
-        int                     need_question = 0;
-        cli_local_t             *local = NULL;
 
         const char *question = "Removing brick(s) can result in data loss. "
                                "Do you want to Continue?";
@@ -1085,27 +781,23 @@ cli_cmd_volume_remove_brick_cbk (struct cli_state *state,
         if (!frame)
                 goto out;
 
-        ret = cli_cmd_volume_remove_brick_parse (words, wordcount, &options,
-                                                 &need_question);
+        ret = cli_cmd_volume_remove_brick_parse (words, wordcount, &options);
+
         if (ret) {
                 cli_usage_out (word->pattern);
                 parse_error = 1;
                 goto out;
         }
 
-        if (!(state->mode & GLUSTER_MODE_SCRIPT) && need_question) {
-                /* we need to ask question only in case of 'commit or force' */
-                answer = cli_cmd_get_confirmation (state, question);
-                if (GF_ANSWER_NO == answer) {
-                        ret = 0;
-                        goto out;
-                }
+        answer = cli_cmd_get_confirmation (state, question);
+
+        if (GF_ANSWER_NO == answer) {
+                ret = 0;
+                goto out;
         }
 
         proc = &cli_rpc_prog->proctable[GLUSTER_CLI_REMOVE_BRICK];
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
@@ -1117,8 +809,8 @@ out:
                         cli_out ("Volume remove-brick failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
+        if (options)
+                dict_unref (options);
         return ret;
 
 }
@@ -1135,7 +827,6 @@ cli_cmd_volume_replace_brick_cbk (struct cli_state *state,
         dict_t                  *options = NULL;
         int                     sent = 0;
         int                     parse_error = 0;
-        cli_local_t             *local = NULL;
 
 #ifdef GF_SOLARIS_HOST_OS
         cli_out ("Command not supported on Solaris");
@@ -1155,30 +846,20 @@ cli_cmd_volume_replace_brick_cbk (struct cli_state *state,
                 goto out;
         }
 
-        if (state->mode & GLUSTER_MODE_SCRIPT) {
-                ret = dict_set_int32 (options, "force", _gf_true);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR, "Failed to set force"
-                                "option");
-                        goto out;
-                }
-        }
-
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
 
 out:
+        if (options)
+                dict_unref (options);
+
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume replace-brick failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -1193,6 +874,50 @@ cli_cmd_volume_set_transport_cbk (struct cli_state *state,
 }
 
 int
+cli_cmd_log_filename_cbk (struct cli_state *state, struct cli_cmd_word *word,
+                          const char **words, int wordcount)
+{
+        int                     ret = -1;
+        rpc_clnt_procedure_t    *proc = NULL;
+        call_frame_t            *frame = NULL;
+        dict_t                  *options = NULL;
+        int                     sent = 0;
+        int                     parse_error = 0;
+
+        if (!((wordcount == 5) || (wordcount == 6))) {
+                cli_usage_out (word->pattern);
+                parse_error = 1;
+                goto out;
+        }
+
+        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_LOG_FILENAME];
+
+        frame = create_frame (THIS, THIS->ctx->pool);
+        if (!frame)
+                goto out;
+
+        ret = cli_cmd_log_filename_parse (words, wordcount, &options);
+        if (ret)
+                goto out;
+
+        if (proc->fn) {
+                ret = proc->fn (frame, THIS, options);
+        }
+
+out:
+        if (options)
+                dict_destroy (options);
+
+        if (ret) {
+                cli_cmd_sent_status_get (&sent);
+                if ((sent == 0) && (parse_error == 0))
+                        cli_out ("Volume log filename failed");
+        }
+
+        return ret;
+}
+
+int
 cli_cmd_volume_top_cbk (struct cli_state *state, struct cli_cmd_word *word,
                           const char **words, int wordcount)
 {
@@ -1203,7 +928,6 @@ cli_cmd_volume_top_cbk (struct cli_state *state, struct cli_cmd_word *word,
         dict_t                  *options = NULL;
         int                     sent     = 0;
         int                     parse_error = 0;
-        cli_local_t             *local = NULL;
 
         ret = cli_cmd_volume_top_parse (words, wordcount, &options);
 
@@ -1219,25 +943,67 @@ cli_cmd_volume_top_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (!frame)
                 goto out;
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
 
 out:
+        if (options)
+                dict_unref (options);
+
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume top failed");
         }
 
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 
 }
 
+int
+cli_cmd_log_locate_cbk (struct cli_state *state, struct cli_cmd_word *word,
+                        const char **words, int wordcount)
+{
+        int                     ret = -1;
+        rpc_clnt_procedure_t    *proc = NULL;
+        call_frame_t            *frame = NULL;
+        dict_t                  *options = NULL;
+        int                     sent = 0;
+        int                     parse_error = 0;
+
+        if (!((wordcount == 4) || (wordcount == 5))) {
+                cli_usage_out (word->pattern);
+                parse_error = 1;
+                goto out;
+        }
+
+        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_LOG_LOCATE];
+
+        frame = create_frame (THIS, THIS->ctx->pool);
+        if (!frame)
+                goto out;
+
+        ret = cli_cmd_log_locate_parse (words, wordcount, &options);
+        if (ret)
+                goto out;
+
+        if (proc->fn) {
+                ret = proc->fn (frame, THIS, options);
+        }
+
+out:
+        if (options)
+                dict_destroy (options);
+
+        if (ret) {
+                cli_cmd_sent_status_get (&sent);
+                if ((sent == 0) && (parse_error == 0))
+                        cli_out ("getting log file location information failed");
+        }
+
+        return ret;
+}
 
 int
 cli_cmd_log_rotate_cbk (struct cli_state *state, struct cli_cmd_word *word,
@@ -1249,7 +1015,6 @@ cli_cmd_log_rotate_cbk (struct cli_state *state, struct cli_cmd_word *word,
         dict_t                  *options = NULL;
         int                     sent = 0;
         int                     parse_error = 0;
-        cli_local_t             *local = NULL;
 
         if (!((wordcount == 4) || (wordcount == 5))) {
                 cli_usage_out (word->pattern);
@@ -1267,19 +1032,19 @@ cli_cmd_log_rotate_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (ret)
                 goto out;
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn) {
                 ret = proc->fn (frame, THIS, options);
         }
 
 out:
+        if (options)
+                dict_destroy (options);
+
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
                 if ((sent == 0) && (parse_error == 0))
                         cli_out ("Volume log rotate failed");
         }
-        CLI_STACK_DESTROY (frame);
 
         return ret;
 }
@@ -1288,10 +1053,30 @@ out:
 static int
 cli_check_gsync_present ()
 {
+        FILE                *in = NULL;
         char                buff[PATH_MAX] = {0, };
-        runner_t            runner = {0,};
+        char                cmd[PATH_MAX + 256] = {0, };
         char                *ptr = NULL;
         int                 ret = 0;
+        struct stat         stat_buff;
+
+        if (strlen (GSYNCD_PREFIX)+1 > PATH_MAX-strlen("/gsyncd")) {
+                ret = -1;
+                goto out;
+        }
+
+        ret = snprintf (cmd, sizeof(cmd), GSYNCD_PREFIX "/gsyncd");
+        if (ret < 0) {
+               ret = 0;
+               goto out;
+        }
+        ret = lstat (cmd, &stat_buff);
+
+        if (ret || !(stat_buff.st_mode & S_IXUSR)) {
+                ret = -1;
+                gf_log ("", GF_LOG_INFO, "geo-replication not installed");
+                goto out;
+        }
 
         ret = setenv ("_GLUSTERD_CALLED_", "1", 1);
         if (-1 == ret) {
@@ -1300,16 +1085,16 @@ cli_check_gsync_present ()
                 goto out;
         }
 
-        runinit (&runner);
-        runner_add_args (&runner, GSYNCD_PREFIX"/gsyncd", "--version", NULL);
-        runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
-        ret = runner_start (&runner);
-        if (ret == -1) {
+        memset (cmd, 0, sizeof (cmd));
+        ret = snprintf (cmd, sizeof(cmd), GSYNCD_PREFIX"/gsyncd --version");
+
+        if (!(in = popen(cmd, "r"))) {
+                ret = -1;
                 gf_log ("", GF_LOG_INFO, "geo-replication not installed");
                 goto out;
         }
 
-        ptr = fgets(buff, sizeof(buff), runner_chio (&runner, STDOUT_FILENO));
+        ptr = fgets(buff, sizeof(buff), in);
         if (ptr) {
                 if (!strstr (buff, "gsyncd")) {
                         ret  = -1;
@@ -1320,7 +1105,7 @@ cli_check_gsync_present ()
                 goto out;
         }
 
-        ret = runner_end (&runner);
+        ret = pclose (in);
 
         if (ret)
                 gf_log ("", GF_LOG_ERROR, "geo-replication not installed");
@@ -1353,7 +1138,6 @@ cli_cmd_volume_gsync_set_cbk (struct cli_state *state, struct cli_cmd_word *word
         dict_t                  *options = NULL;
         rpc_clnt_procedure_t    *proc    = NULL;
         call_frame_t            *frame   = NULL;
-        cli_local_t             *local   = NULL;
 
         proc = &cli_rpc_prog->proctable [GLUSTER_CLI_GSYNC_SET];
         if (proc == NULL) {
@@ -1374,452 +1158,16 @@ cli_cmd_volume_gsync_set_cbk (struct cli_state *state, struct cli_cmd_word *word
                 goto out;
         }
 
-        CLI_LOCAL_INIT (local, words, frame, options);
-
         if (proc->fn)
                 ret = proc->fn (frame, THIS, options);
 
 out:
+        if (options)
+                dict_unref (options);
+
         if (ret && parse_err == 0)
                 cli_out (GEOREP" command failed");
 
-        CLI_STACK_DESTROY (frame);
-
-        return ret;
-}
-
-int
-cli_cmd_volume_status_cbk (struct cli_state *state,
-                           struct cli_cmd_word *word,
-                           const char **words, int wordcount)
-{
-        int                   ret         = -1;
-        rpc_clnt_procedure_t *proc        = NULL;
-        call_frame_t         *frame       = NULL;
-        dict_t               *dict        = NULL;
-        uint32_t              cmd         = 0;
-        cli_local_t          *local       = NULL;
-
-        ret = cli_cmd_volume_status_parse (words, wordcount, &dict);
-
-        if (ret) {
-                cli_usage_out (word->pattern);
-                goto out;
-        }
-
-        ret = dict_get_uint32 (dict, "cmd", &cmd);
-        if (ret)
-                goto out;
-
-        if (!(cmd & GF_CLI_STATUS_ALL)) {
-                /* for one volume or brick */
-                proc = &cli_rpc_prog->proctable[GLUSTER_CLI_STATUS_VOLUME];
-        } else {
-                /* volume status all or all detail */
-                proc = &cli_rpc_prog->proctable[GLUSTER_CLI_STATUS_ALL];
-        }
-
-        if (!proc->fn)
-                goto out;
-
-        frame = create_frame (THIS, THIS->ctx->pool);
-        if (!frame)
-                goto out;
-
-        CLI_LOCAL_INIT (local, words, frame, dict);
-
-        ret = proc->fn (frame, THIS, dict);
-
-out:
-        CLI_STACK_DESTROY (frame);
-
-        return ret;
-}
-
-
-int
-cli_get_detail_status (dict_t *dict, int i, cli_volume_status_t *status)
-{
-        uint64_t                   free            = 0;
-        uint64_t                   total           = 0;
-        char                       key[1024]       = {0};
-        int                        ret             = 0;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.free", i);
-        ret = dict_get_uint64 (dict, key, &free);
-
-        status->free = gf_uint64_2human_readable (free);
-        if (!status->free)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.total", i);
-        ret = dict_get_uint64 (dict, key, &total);
-
-        status->total = gf_uint64_2human_readable (total);
-        if (!status->total)
-                goto out;
-
-#ifdef GF_LINUX_HOST_OS
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.device", i);
-        ret = dict_get_str (dict, key, &(status->device));
-        if (ret)
-                status->device = NULL;
-#endif
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.block_size", i);
-        ret = dict_get_uint64 (dict, key, &(status->block_size));
-        if (ret) {
-                ret = 0;
-                status->block_size = 0;
-        }
-
-#ifdef GF_LINUX_HOST_OS
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mnt_options", i);
-        ret = dict_get_str (dict, key, &(status->mount_options));
-        if (ret)
-                status->mount_options = NULL;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.fs_name", i);
-        ret = dict_get_str (dict, key, &(status->fs_name));
-        if (ret) {
-                ret = 0;
-                status->fs_name = NULL;
-        }
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.inode_size", i);
-        ret = dict_get_str (dict, key, &(status->inode_size));
-        if (ret)
-                status->inode_size = NULL;
-#endif /* GF_LINUX_HOST_OS */
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.total_inodes", i);
-        ret = dict_get_uint64 (dict, key,
-                        &(status->total_inodes));
-        if (ret)
-                status->total_inodes = 0;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.free_inodes", i);
-        ret = dict_get_uint64 (dict, key, &(status->free_inodes));
-        if (ret) {
-                ret = 0;
-                status->free_inodes = 0;
-        }
-
-
- out:
-        return ret;
-}
-
-void
-cli_print_detailed_status (cli_volume_status_t *status)
-{
-        cli_out ("%-20s : %-20s", "Brick", status->brick);
-        if (status->online)
-                cli_out ("%-20s : %-20d", "Port", status->port);
-        else
-                cli_out ("%-20s : %-20s", "Port", "N/A");
-        cli_out ("%-20s : %-20c", "Online", (status->online) ? 'Y' : 'N');
-        cli_out ("%-20s : %-20s", "Pid", status->pid_str);
-
-#ifdef GF_LINUX_HOST_OS
-        if (status->fs_name)
-                cli_out ("%-20s : %-20s", "File System", status->fs_name);
-        else
-                cli_out ("%-20s : %-20s", "File System", "N/A");
-
-        if (status->device)
-                cli_out ("%-20s : %-20s", "Device", status->device);
-        else
-                cli_out ("%-20s : %-20s", "Device", "N/A");
-
-        if (status->mount_options) {
-                cli_out ("%-20s : %-20s", "Mount Options",
-                         status->mount_options);
-        } else {
-                cli_out ("%-20s : %-20s", "Mount Options", "N/A");
-        }
-
-        if (status->inode_size) {
-                cli_out ("%-20s : %-20s", "Inode Size",
-                         status->inode_size);
-        } else {
-                cli_out ("%-20s : %-20s", "Inode Size", "N/A");
-        }
-#endif
-        if (status->free)
-                cli_out ("%-20s : %-20s", "Disk Space Free", status->free);
-        else
-                cli_out ("%-20s : %-20s", "Disk Space Free", "N/A");
-
-        if (status->total)
-                cli_out ("%-20s : %-20s", "Total Disk Space", status->total);
-        else
-                cli_out ("%-20s : %-20s", "Total Disk Space", "N/A");
-
-
-        if (status->total_inodes) {
-                cli_out ("%-20s : %-20ld", "Inode Count",
-                         status->total_inodes);
-        } else {
-                cli_out ("%-20s : %-20s", "Inode Count", "N/A");
-        }
-
-        if (status->free_inodes) {
-                cli_out ("%-20s : %-20ld", "Free Inodes",
-                         status->free_inodes);
-        } else {
-                cli_out ("%-20s : %-20s", "Free Inodes", "N/A");
-        }
-}
-
-int
-cli_print_brick_status (cli_volume_status_t *status)
-{
-        int  fieldlen = CLI_VOL_STATUS_BRICK_LEN;
-        int  bricklen = 0;
-        char *p = NULL;
-        int  num_tabs = 0;
-
-        p = status->brick;
-        bricklen = strlen (p);
-        while (bricklen > 0) {
-                if (bricklen > fieldlen) {
-                        cli_out ("%.*s", fieldlen, p);
-                        p += fieldlen;
-                        bricklen -= fieldlen;
-                } else {
-                        num_tabs = (fieldlen - bricklen) / CLI_TAB_LENGTH + 1;
-                        printf ("%s", p);
-                        while (num_tabs-- != 0)
-                                printf ("\t");
-                        if (status->port) {
-                                if (status->online)
-                                        cli_out ("%d\t%c\t%s",
-                                                 status->port,
-                                                 status->online?'Y':'N',
-                                                 status->pid_str);
-                                else
-                                        cli_out ("%s\t%c\t%s",
-                                                 "N/A",
-                                                 status->online?'Y':'N',
-                                                 status->pid_str);
-                        }
-                        else
-                                cli_out ("%s\t%c\t%s",
-                                         "N/A", status->online?'Y':'N',
-                                         status->pid_str);
-                        bricklen = 0;
-                }
-        }
-
-        return 0;
-}
-
-int
-cli_cmd_volume_heal_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                          const char **words, int wordcount)
-{
-        int                     ret = -1;
-        rpc_clnt_procedure_t    *proc = NULL;
-        call_frame_t            *frame = NULL;
-        int                     sent = 0;
-        int                     parse_error = 0;
-        dict_t                  *options = NULL;
-        xlator_t                *this = NULL;
-        cli_local_t             *local = NULL;
-
-        this = THIS;
-        frame = create_frame (this, this->ctx->pool);
-        if (!frame)
-                goto out;
-
-        if (wordcount < 3) {
-               cli_usage_out (word->pattern);
-               parse_error = 1;
-               goto out;
-        }
-
-        ret = cli_cmd_volume_heal_options_parse (words, wordcount, &options);
-        if (ret) {
-                cli_usage_out (word->pattern);
-                parse_error = 1;
-                goto out;
-        }
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_HEAL_VOLUME];
-
-        CLI_LOCAL_INIT (local, words, frame, options);
-
-        if (proc->fn) {
-                ret = proc->fn (frame, THIS, options);
-        }
-
-out:
-        if (ret) {
-                cli_cmd_sent_status_get (&sent);
-                if ((sent == 0) && (parse_error == 0))
-                        cli_out ("Volume heal failed");
-        }
-
-        CLI_STACK_DESTROY (frame);
-
-        return ret;
-}
-
-int
-cli_cmd_volume_statedump_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                              const char **words, int wordcount)
-{
-        int                             ret = -1;
-        rpc_clnt_procedure_t            *proc = NULL;
-        call_frame_t                    *frame = NULL;
-        dict_t                          *options = NULL;
-        int                             sent = 0;
-        int                             parse_error = 0;
-        cli_local_t                     *local = NULL;
-
-        frame = create_frame (THIS, THIS->ctx->pool);
-        if (!frame)
-                goto out;
-
-        if (wordcount < 3) {
-                cli_usage_out (word->pattern);
-                parse_error = 1;
-                goto out;
-        }
-
-        if (wordcount >= 3) {
-               ret = cli_cmd_volume_statedump_options_parse (words, wordcount,
-                                                              &options);
-               if (ret) {
-                       parse_error = 1;
-                       gf_log ("cli", GF_LOG_ERROR, "Error parsing "
-                               "statedump options");
-                       cli_out ("Error parsing options");
-                       cli_usage_out (word->pattern);
-               }
-        }
-
-        ret = dict_set_str (options, "volname", (char *)words[2]);
-        if (ret)
-                goto out;
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_STATEDUMP_VOLUME];
-
-        CLI_LOCAL_INIT (local, words, frame, options);
-
-        if (proc->fn) {
-                ret = proc->fn (frame, THIS, options);
-        }
-
-out:
-        if (ret) {
-                cli_cmd_sent_status_get (&sent);
-                if ((sent == 0) && (parse_error = 0))
-                        cli_out ("Volume statedump failed");
-        }
-
-        CLI_STACK_DESTROY (frame);
-
-        return ret;
-}
-
-int
-cli_cmd_volume_list_cbk (struct cli_state *state, struct cli_cmd_word *word,
-                         const char **words, int wordcount)
-{
-        int                     ret = -1;
-        call_frame_t            *frame = NULL;
-        rpc_clnt_procedure_t    *proc = NULL;
-        int                     sent = 0;
-
-        frame = create_frame (THIS, THIS->ctx->pool);
-        if (!frame)
-                goto out;
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_LIST_VOLUME];
-        if (proc->fn) {
-                ret = proc->fn (frame, THIS, NULL);
-        }
-
-out:
-        if (ret) {
-                cli_cmd_sent_status_get (&sent);
-                if (sent == 0)
-                        cli_out ("Volume list failed");
-        }
-
-        CLI_STACK_DESTROY (frame);
-
-        return ret;
-}
-
-int
-cli_cmd_volume_clearlocks_cbk (struct cli_state *state,
-                               struct cli_cmd_word *word,
-                               const char **words, int wordcount)
-{
-        int                             ret = -1;
-        rpc_clnt_procedure_t            *proc = NULL;
-        call_frame_t                    *frame = NULL;
-        dict_t                          *options = NULL;
-        int                             sent = 0;
-        int                             parse_error = 0;
-        cli_local_t                     *local = NULL;
-
-        frame = create_frame (THIS, THIS->ctx->pool);
-        if (!frame)
-                goto out;
-
-        if (wordcount < 7 || wordcount > 8) {
-                cli_usage_out (word->pattern);
-                parse_error = 1;
-                goto out;
-        }
-
-       ret = cli_cmd_volume_clrlks_opts_parse (words, wordcount, &options);
-       if (ret) {
-               parse_error = 1;
-               gf_log ("cli", GF_LOG_ERROR, "Error parsing "
-                       "clear-locks options");
-               cli_out ("Error parsing options");
-               cli_usage_out (word->pattern);
-       }
-
-        ret = dict_set_str (options, "volname", (char *)words[2]);
-        if (ret)
-                goto out;
-
-        ret = dict_set_str (options, "path", (char *)words[3]);
-        if (ret)
-                goto out;
-
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_CLRLOCKS_VOLUME];
-
-        CLI_LOCAL_INIT (local, words, frame, options);
-
-        if (proc->fn) {
-                ret = proc->fn (frame, THIS, options);
-        }
-
-out:
-        if (ret) {
-                cli_cmd_sent_status_get (&sent);
-                if ((sent == 0) && (parse_error = 0))
-                        cli_out ("Volume clear-locks failed");
-        }
-
-        CLI_STACK_DESTROY (frame);
-
         return ret;
 }
 
@@ -1828,13 +1176,7 @@ struct cli_cmd volume_cmds[] = {
           cli_cmd_volume_info_cbk,
           "list information of all volumes"},
 
-        { "volume create <NEW-VOLNAME> [stripe <COUNT>] [replica <COUNT>] "
-          "[transport <tcp|rdma|tcp,rdma>] <NEW-BRICK>"
-#ifdef HAVE_BD_XLATOR
-          "?<vg_name>"
-#endif
-          "... [force]",
-
+        { "volume create <NEW-VOLNAME> [stripe <COUNT>] [replica <COUNT>] [transport <tcp|rdma|tcp,rdma>] <NEW-BRICK> ...",
           cli_cmd_volume_create_cbk,
           "create a new volume of specified type with mentioned bricks"},
 
@@ -1854,19 +1196,19 @@ struct cli_cmd volume_cmds[] = {
           cli_cmd_volume_rename_cbk,
           "rename volume <VOLNAME> to <NEW-VOLNAME>"},*/
 
-        { "volume add-brick <VOLNAME> [<stripe|replica> <COUNT>] <NEW-BRICK> ... [force]",
+        { "volume add-brick <VOLNAME> <NEW-BRICK> ...",
           cli_cmd_volume_add_brick_cbk,
           "add brick to volume <VOLNAME>"},
 
-        { "volume remove-brick <VOLNAME> [replica <COUNT>] <BRICK> ... [start|stop|status|commit|force]",
+        { "volume remove-brick <VOLNAME> <BRICK> ...",
           cli_cmd_volume_remove_brick_cbk,
           "remove brick from volume <VOLNAME>"},
 
-        { "volume rebalance <VOLNAME> [fix-layout] {start|stop|status} [force]",
+        { "volume rebalance <VOLNAME> [fix-layout|migrate-data] {start|stop|status}",
           cli_cmd_volume_defrag_cbk,
           "rebalance operations"},
 
-        { "volume replace-brick <VOLNAME> <BRICK> <NEW-BRICK> {start [force]|pause|abort|status|commit [force]}",
+        { "volume replace-brick <VOLNAME> <BRICK> <NEW-BRICK> {start|pause|abort|status|commit}",
           cli_cmd_volume_replace_brick_cbk,
           "replace-brick operations"},
 
@@ -1882,6 +1224,14 @@ struct cli_cmd volume_cmds[] = {
           cli_cmd_volume_help_cbk,
           "display help for the volume command"},
 
+        { "volume log filename <VOLNAME> [BRICK] <PATH>",
+          cli_cmd_log_filename_cbk,
+         "set the log file for corresponding volume/brick"},
+
+        { "volume log locate <VOLNAME> [BRICK]",
+          cli_cmd_log_locate_cbk,
+         "locate the log file for corresponding volume/brick"},
+
         { "volume log rotate <VOLNAME> [BRICK]",
           cli_cmd_log_rotate_cbk,
          "rotate the log file for corresponding volume/brick"},
@@ -1890,19 +1240,18 @@ struct cli_cmd volume_cmds[] = {
           cli_cmd_sync_volume_cbk,
          "sync the volume information from a peer"},
 
-         { "volume reset <VOLNAME> [option] [force]",
+         { "volume reset <VOLNAME> [force]",
          cli_cmd_volume_reset_cbk,
          "reset all the reconfigured options"},
 
 #if (SYNCDAEMON_COMPILE)
-        {"volume "GEOREP" [<VOLNAME>] [<SLAVE-URL>] {create [push-pem] [force]"
-         "|start [force]|stop [force]|config|status [detail]|delete} [options...]",
+        {"volume "GEOREP" [<VOLNAME>] [<SLAVE-URL>] {start|stop|config|status|log-rotate} [options...]",
          cli_cmd_volume_gsync_set_cbk,
          "Geo-sync operations",
          cli_cmd_check_gsync_exists_cbk},
 #endif
 
-         { "volume profile <VOLNAME> {start|stop|info [nfs]}",
+         { "volume profile <VOLNAME> {start|info|stop}",
            cli_cmd_volume_profile_cbk,
            "volume profile operations"},
 
@@ -1910,35 +1259,12 @@ struct cli_cmd volume_cmds[] = {
           cli_cmd_quota_cbk,
           "quota translator specific operations"},
 
-         { "volume top <VOLNAME> {open|read|write|opendir|readdir|clear} [nfs|brick <brick>] [list-cnt <value>] |\n"
-           "volume top <VOLNAME> {read-perf|write-perf} [bs <size> count <count>] [brick <brick>] [list-cnt <value>]",
+         { "volume top <VOLNAME> {[open|read|write|opendir|readdir] "
+           "|[read-perf|write-perf bs <size> count <count>]} "
+           " [brick <brick>] [list-cnt <count>]",
            cli_cmd_volume_top_cbk,
            "volume top operations"},
 
-        { "volume status [all | <VOLNAME> [nfs|shd|<BRICK>]]"
-          " [detail|clients|mem|inode|fd|callpool|tasks]",
-          cli_cmd_volume_status_cbk,
-          "display status of all or specified volume(s)/brick"},
-
-        { "volume heal <VOLNAME> [{full | statistics {heal-count {replica <hostname:brickname>}} |info {healed | heal-failed | split-brain}}]",
-          cli_cmd_volume_heal_cbk,
-          "self-heal commands on volume specified by <VOLNAME>"},
-
-        {"volume statedump <VOLNAME> [nfs] [all|mem|iobuf|callpool|priv|fd|"
-         "inode|history]...",
-         cli_cmd_volume_statedump_cbk,
-         "perform statedump on bricks"},
-
-        {"volume list",
-         cli_cmd_volume_list_cbk,
-         "list all volumes in cluster"},
-
-        {"volume clear-locks <VOLNAME> <path> kind {blocked|granted|all}"
-          "{inode [range]|entry [basename]|posix [range]}",
-          cli_cmd_volume_clearlocks_cbk,
-          "Clear locks held on path"
-        },
-
         { NULL, NULL, NULL }
 };
 
diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c
index 1045f34f0..a9016ae36 100644
--- a/cli/src/cli-cmd.c
+++ b/cli/src/cli-cmd.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -21,7 +31,6 @@
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
-#include "protocol-common.h"
 
 #include <fnmatch.h>
 
@@ -50,9 +59,6 @@ cli_cmd_needs_connection (struct cli_cmd_word *word)
         if (!strcasecmp ("getwd", word->word))
                 return 1;
 
-        if (!strcasecmp ("exit", word->word))
-                return 0;
-
         return CLI_DEFAULT_CONN_TIMEOUT;
 }
 
@@ -201,7 +207,8 @@ cli_cmd_process_line (struct cli_state *state, const char *text)
 
         ret = cli_cmd_process (state, count, tokens);
 out:
-        free (copy);
+        if (copy)
+                free (copy);
 
         if (tokens)
                 cli_cmd_tokens_destroy (tokens);
@@ -274,14 +281,14 @@ seconds_from_now (unsigned secs, struct timespec *ts)
 }
 
 int
-cli_cmd_await_response (unsigned time)
+cli_cmd_await_response ()
 {
         struct  timespec        ts = {0,};
         int                     ret = 0;
 
         cli_op_ret = -1;
 
-        seconds_from_now (time, &ts);
+        seconds_from_now (CLI_DEFAULT_CMD_TIMEOUT, &ts);
         while (!cmd_done && !ret) {
                 ret = pthread_cond_timedwait (&cond, &cond_mutex,
                                         &ts);
@@ -289,6 +296,8 @@ cli_cmd_await_response (unsigned time)
 
         cmd_done = 0;
 
+        cli_cmd_unlock ();
+
         if (ret)
                 return ret;
 
@@ -355,28 +364,22 @@ int
 cli_cmd_submit (void *req, call_frame_t *frame,
                 rpc_clnt_prog_t *prog,
                 int procnum, struct iobref *iobref,
-                xlator_t *this, fop_cbk_fn_t cbkfn, xdrproc_t xdrproc)
+                cli_serialize_t sfunc, xlator_t *this,
+                fop_cbk_fn_t cbkfn)
 {
-        int             ret = -1;
-        unsigned        timeout = 0;
-
-        if ((GLUSTER_CLI_PROFILE_VOLUME == procnum) ||
-            (GLUSTER_CLI_HEAL_VOLUME == procnum))
-                timeout = CLI_TEN_MINUTES_TIMEOUT;
-        else
-                timeout = CLI_DEFAULT_CMD_TIMEOUT;
+        int     ret = -1;
 
         cli_cmd_lock ();
         cmd_sent = 0;
         ret = cli_submit_request (req, frame, prog,
-                                  procnum, NULL, this, cbkfn, xdrproc);
+                                  procnum, NULL, sfunc,
+                                  this, cbkfn);
 
         if (!ret) {
                 cmd_sent = 1;
-                ret = cli_cmd_await_response (timeout);
-        }
-
-        cli_cmd_unlock ();
+                ret = cli_cmd_await_response ();
+        } else
+                cli_cmd_unlock ();
 
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
diff --git a/cli/src/cli-cmd.h b/cli/src/cli-cmd.h
index 06a1ed32a..86c0ea97a 100644
--- a/cli/src/cli-cmd.h
+++ b/cli/src/cli-cmd.h
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
+
 #ifndef __CLI_CMD_H__
 #define __CLI_CMD_H__
 
@@ -15,36 +25,7 @@
 #include "config.h"
 #endif
 
-#include <netdb.h>
-
 #include "cli.h"
-#include "list.h"
-
-#define CLI_LOCAL_INIT(local, words, frame, dictionary) \
-        do {                                                 \
-                local = cli_local_get ();                    \
-                                                             \
-                if (local) {                                 \
-                        local->words = words;                \
-                        if (dictionary)                      \
-                                local->dict = dictionary;    \
-                        if (frame)                           \
-                                frame->local = local;        \
-                }                                            \
-        } while (0)
-
-#define CLI_STACK_DESTROY(_frame)                                       \
-        do {                                                            \
-                if (_frame) {                                           \
-                        if (_frame->local) {                            \
-                                gf_log ("cli", GF_LOG_DEBUG, "frame->local " \
-                                        "is not NULL (%p)", _frame->local); \
-                                cli_local_wipe (_frame->local);         \
-                                _frame->local = NULL;                   \
-                        }                                               \
-                        STACK_DESTROY (_frame->root);                   \
-                }                                                       \
-        } while (0);
 
 typedef enum {
         GF_ANSWER_YES = 1,
@@ -74,17 +55,6 @@ typedef struct cli_profile_info_ {
         double percentage_avg_latency;
 } cli_profile_info_t;
 
-typedef struct addrinfo_list {
-        struct list_head list;
-        struct addrinfo *info;
-} addrinfo_list_t;
-
-typedef enum {
-        GF_AI_COMPARE_NO_MATCH     = 0,
-        GF_AI_COMPARE_MATCH        = 1,
-        GF_AI_COMPARE_ERROR        = 2
-} gf_ai_compare_t;
-
 typedef struct cli_cmd_volume_get_ctx_ cli_cmd_volume_get_ctx_t;
 
 int cli_cmd_volume_register (struct cli_state *state);
@@ -99,7 +69,7 @@ struct cli_cmd_word *cli_cmd_nextword (struct cli_cmd_word *word,
                                        const char *text);
 void cli_cmd_tokens_destroy (char **tokens);
 
-int cli_cmd_await_response (unsigned time);
+int cli_cmd_await_response ();
 
 int cli_cmd_broadcast_response (int32_t status);
 
@@ -113,10 +83,10 @@ int
 cli_cmd_submit (void *req, call_frame_t *frame,
                 rpc_clnt_prog_t *prog,
                 int procnum, struct iobref *iobref,
-                xlator_t *this, fop_cbk_fn_t cbkfn, xdrproc_t xdrproc);
+                cli_serialize_t sfunc, xlator_t *this,
+                fop_cbk_fn_t cbkfn);
 
 gf_answer_t
 cli_cmd_get_confirmation (struct cli_state *state, const char *question);
 int cli_cmd_sent_status_get (int *status);
-
 #endif /* __CLI_CMD_H__ */
diff --git a/cli/src/cli-mem-types.h b/cli/src/cli-mem-types.h
index 09fcb639b..3c49d2183 100644
--- a/cli/src/cli-mem-types.h
+++ b/cli/src/cli-mem-types.h
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
+
 #ifndef __CLI_MEM_TYPES_H__
 #define __CLI_MEM_TYPES_H__
 
diff --git a/cli/src/cli-rl.c b/cli/src/cli-rl.c
index ade1c8ebb..80b14620f 100644
--- a/cli/src/cli-rl.c
+++ b/cli/src/cli-rl.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -38,6 +48,7 @@ cli_rl_out (struct cli_state *state, const char *fmt, va_list ap)
 {
         int tmp_rl_point = rl_point;
         int            n = rl_end;
+        int            i = 0;
         int            ret = 0;
 
         if (rl_end >= 0 ) {
@@ -45,7 +56,12 @@ cli_rl_out (struct cli_state *state, const char *fmt, va_list ap)
                 rl_redisplay ();
         }
 
-        printf ("\r%*s\r", (int)strlen (state->prompt), "");
+        printf ("\r");
+
+        for (i = 0; i <= strlen (state->prompt); i++)
+                printf (" ");
+
+        printf ("\r");
 
         ret = vprintf (fmt, ap);
 
@@ -61,34 +77,6 @@ cli_rl_out (struct cli_state *state, const char *fmt, va_list ap)
         return ret;
 }
 
-int
-cli_rl_err (struct cli_state *state, const char *fmt, va_list ap)
-{
-        int tmp_rl_point = rl_point;
-        int            n = rl_end;
-        int            ret = 0;
-
-        if (rl_end >= 0 ) {
-                rl_kill_text (0, rl_end);
-                rl_redisplay ();
-        }
-
-        fprintf (stderr, "\r%*s\r", (int)strlen (state->prompt), "");
-
-        ret = vfprintf (stderr, fmt, ap);
-
-        fprintf (stderr, "\n");
-        fflush(stderr);
-
-        if (n) {
-                rl_do_undo ();
-                rl_point = tmp_rl_point;
-                rl_reset_line_state ();
-        }
-
-        return ret;
-}
-
 
 void
 cli_rl_process_line (char *line)
@@ -101,14 +89,9 @@ cli_rl_process_line (char *line)
         state->rl_processing = 1;
         {
                 ret = cli_cmd_process_line (state, line);
-                if (ret)
-                        gf_log (THIS->name, GF_LOG_WARNING,
-                                "failed to process line");
-
                 add_history (line);
         }
         state->rl_processing = 0;
-
 }
 
 
@@ -204,7 +187,7 @@ cli_rl_tokenize (const char *text)
         }
 
         if (i < count) {
-                /* symbolize that what needs to be autocompleted is
+                /* symoblize that what needs to be autocompleted is
                    the full set of possible nextwords, and not extend
                    the last word
                 */
@@ -216,7 +199,8 @@ cli_rl_tokenize (const char *text)
         }
 
 out:
-        free (copy);
+        if (copy)
+                free (copy);
 
         if (i < count) {
                 cli_cmd_tokens_destroy (tokens);
@@ -363,10 +347,9 @@ cli_rl_input (void *_data)
         for (;;) {
                 line = readline (state->prompt);
                 if (!line)
-                        exit(0);  //break;
+                        break;
 
-                if (*line)
-                        cli_rl_process_line (line);
+                cli_rl_process_line (line);
 
                 free (line);
         }
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 808145015..94db9787e 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -1,18 +1,33 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
+
 #ifndef _CONFIG_H
 #define _CONFIG_H
 #include "config.h"
 #endif
 
+#ifndef GSYNC_CONF
+#define GSYNC_CONF GEOREP"/gsyncd.conf"
+#endif
+#define DEFAULT_LOG_FILE_DIRECTORY      DATADIR "/log/glusterfs"
+
 /* Widths of various columns in top read/write-perf output
  * Total width of top read/write-perf should be 80 chars
  * including one space between column
@@ -29,54 +44,36 @@
 #include <stdlib.h>
 #include <sys/mount.h>
 #include "cli1-xdr.h"
-#include "xdr-generic.h"
+#include "cli1.h"
 #include "protocol-common.h"
 #include "cli-mem-types.h"
 #include "compat.h"
 
-#include "syscall.h"
 #include "glusterfs3.h"
-#include "portmap-xdr.h"
-
-#include "run.h"
+#include "portmap.h"
+#include "syscall.h"
 
 extern rpc_clnt_prog_t *cli_rpc_prog;
 extern int              cli_op_ret;
 extern int              connected;
 
-char *cli_vol_type_str[] = {"Distribute",
-                            "Stripe",
-                            "Replicate",
-                            "Striped-Replicate",
-                            "Distributed-Stripe",
-                            "Distributed-Replicate",
-                            "Distributed-Striped-Replicate",
-                           };
-
-char *cli_vol_status_str[] = {"Created",
-                              "Started",
-                              "Stopped",
-                             };
-
-char *cli_vol_task_status_str[] = {"not started",
-                                   "in progress",
-                                   "stopped",
-                                   "completed",
-                                   "failed",
-                                   "fix-layout in progress",
-                                   "fix-layout stopped",
-                                   "fix-layout completed",
-                                   "fix-layout failed",
+char *cli_volume_type[] = {"Distribute",
+                           "Stripe",
+                           "Replicate",
+                           "Distributed-Stripe",
+                           "Distributed-Replicate",
+};
+
+
+char *cli_volume_status[] = {"Created",
+                             "Started",
+                             "Stopped"
 };
 
 int32_t
-gf_cli_get_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_get_volume (call_frame_t *frame, xlator_t *this,
                       void *data);
 
-int
-cli_to_glusterd (gf_cli_req *req, call_frame_t *frame, fop_cbk_fn_t cbkfn,
-                 xdrproc_t xdrproc, dict_t *dict, int procnum, xlator_t *this,
-                 rpc_clnt_prog_t *prog, struct iobref *iobref);
 
 rpc_clnt_prog_t cli_handshake_prog = {
         .progname  = "cli handshake",
@@ -90,51 +87,76 @@ rpc_clnt_prog_t cli_pmap_prog = {
         .progver    = GLUSTER_PMAP_VERSION,
 };
 
+
 int
-gf_cli_probe_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_probe_cbk (struct rpc_req *req, struct iovec *iov,
                         int count, void *myframe)
 {
-        gf_cli_rsp            rsp   = {0,};
-        int                   ret   = -1;
-        char                  msg[1024] = {0,};
+        gf1_cli_probe_rsp    rsp   = {0,};
+        int                   ret   = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_probe_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 //rsp.op_ret   = -1;
                 //rsp.op_errno = EINVAL;
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to probe");
+	 if (!rsp.op_ret) {
+	 	switch (rsp.op_errno) {
+		 	case GF_PROBE_SUCCESS:
+		      		cli_out ("Probe successful");
+		      		break;
+	 	 	case GF_PROBE_LOCALHOST:
+		      		cli_out ("Probe on localhost not needed");
+		      		break;
+			case GF_PROBE_FRIEND:
+				cli_out ("Probe on host %s port %d already"
+					 " in peer list", rsp.hostname, rsp.port);
+				break;
+		 	default:
+		      		cli_out ("Probe returned with unknown errno %d",
+					rsp.op_errno);
+		      		break;
+	 	}
+	 }
 
-        if (rsp.op_errstr && (strlen (rsp.op_errstr) > 0)) {
-                snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
-                if (rsp.op_ret)
-                        gf_log ("cli", GF_LOG_ERROR, "%s", msg);
-        }
+        if (rsp.op_ret) {
+                switch (rsp.op_errno) {
+                        case GF_PROBE_ANOTHER_CLUSTER:
+                                cli_out ("%s is already part of "
+                                         "another cluster", rsp.hostname);
+                                break;
+                        case GF_PROBE_VOLUME_CONFLICT:
+                                cli_out ("Atleast one volume on %s conflicts "
+                                         "with existing volumes in the "
+                                         "cluster", rsp.hostname);
+                                break;
+                        case GF_PROBE_UNKNOWN_PEER:
+                                cli_out ("%s responded with 'unknown peer' error, "
+                                         "this could happen if %s doesn't have"
+                                         " localhost in its peer database",
+                                         rsp.hostname, rsp.hostname);
+                                break;
+                        case GF_PROBE_ADD_FAILED:
+                                cli_out ("Failed to add peer information "
+                                         "on %s" , rsp.hostname);
+                                break;
 
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str (NULL,
-                                          (rsp.op_ret)? NULL : msg,
-                                          rsp.op_ret, rsp.op_errno,
-                                          (rsp.op_ret)? msg : NULL);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
+                        default:
+                                cli_out ("Probe unsuccessful\nProbe returned "
+                                         "with unknown errno %d", rsp.op_errno);
+                                break;
+                }
+                gf_log ("glusterd",GF_LOG_ERROR,"Probe failed with op_ret %d"
+                        " and op_errno %d", rsp.op_ret, rsp.op_errno);
         }
-
-        if (!rsp.op_ret)
-                cli_out ("peer probe: success. %s", msg);
-        else
-                cli_err ("peer probe: failed: %s", msg);
-
         ret = rsp.op_ret;
 
 out:
@@ -143,52 +165,51 @@ out:
 }
 
 int
-gf_cli_deprobe_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_deprobe_cbk (struct rpc_req *req, struct iovec *iov,
                        int count, void *myframe)
 {
-        gf_cli_rsp            rsp   = {0,};
-        int                   ret   = -1;
-        char              msg[1024] = {0,};
+        gf1_cli_deprobe_rsp    rsp   = {0,};
+        int                   ret   = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_deprobe_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 //rsp.op_ret   = -1;
                 //rsp.op_errno = EINVAL;
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to deprobe");
-
         if (rsp.op_ret) {
-                if (strlen (rsp.op_errstr) > 0) {
-                        snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
-                        gf_log ("cli", GF_LOG_ERROR, "%s", rsp.op_errstr);
+                switch (rsp.op_errno) {
+                        case GF_DEPROBE_LOCALHOST:
+                                cli_out ("%s is localhost",
+                                         rsp.hostname);
+                                break;
+                        case GF_DEPROBE_NOT_FRIEND:
+                                cli_out ("%s is not part of cluster",
+                                         rsp.hostname);
+                                break;
+                        case GF_DEPROBE_BRICK_EXIST:
+                                cli_out ("Brick(s) with the peer %s exist in "
+                                         "cluster", rsp.hostname);
+                                break;
+                        default:
+                                cli_out ("Detach unsuccessful\nDetach returned "
+                                         "with unknown errno %d",
+                                         rsp.op_errno);
+                                break;
                 }
+                gf_log ("glusterd",GF_LOG_ERROR,"Detach failed with op_ret %d"
+                        " and op_errno %d", rsp.op_ret, rsp.op_errno);
         } else {
-                snprintf (msg, sizeof (msg), "success");
-        }
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str (NULL,
-                                          (rsp.op_ret)? NULL : msg,
-                                          rsp.op_ret, rsp.op_errno,
-                                          (rsp.op_ret)? msg : NULL);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
+                cli_out ("Detach successful");
         }
 
-        if (!rsp.op_ret)
-                cli_out ("peer detach: %s", msg);
-        else
-                cli_err ("peer detach: failed: %s", msg);
 
         ret = rsp.op_ret;
 
@@ -198,143 +219,35 @@ out:
 }
 
 int
-gf_cli_output_peer_status (dict_t *dict, int count)
+gf_cli3_1_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
+                             int count, void *myframe)
 {
-        int                        ret   = -1;
+        gf1_cli_peer_list_rsp      rsp   = {0,};
+        int                        ret   = 0;
+        dict_t                     *dict = NULL;
         char                       *uuid_buf = NULL;
         char                       *hostname_buf = NULL;
         int32_t                    i = 1;
         char                       key[256] = {0,};
         char                       *state = NULL;
+        int32_t                    port = 0;
         int32_t                    connected = 0;
         char                       *connected_str = NULL;
 
-        cli_out ("Number of Peers: %d", count);
-        i = 1;
-        while ( i <= count) {
-                snprintf (key, 256, "friend%d.uuid", i);
-                ret = dict_get_str (dict, key, &uuid_buf);
-                if (ret)
-                        goto out;
-
-                snprintf (key, 256, "friend%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname_buf);
-                if (ret)
-                        goto out;
-
-                snprintf (key, 256, "friend%d.connected", i);
-                ret = dict_get_int32 (dict, key, &connected);
-                if (ret)
-                        goto out;
-                if (connected)
-                        connected_str = "Connected";
-                else
-                        connected_str = "Disconnected";
-
-
-                snprintf (key, 256, "friend%d.state", i);
-                ret = dict_get_str (dict, key, &state);
-                if (ret)
-                        goto out;
-
-                cli_out ("\nHostname: %s\nUuid: %s\nState: %s (%s)",
-                         hostname_buf, uuid_buf, state, connected_str);
-                i++;
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-gf_cli_output_pool_list (dict_t *dict, int count)
-{
-        int                        ret   = -1;
-        char                       *uuid_buf = NULL;
-        char                       *hostname_buf = NULL;
-        int32_t                    i = 1;
-        char                       key[256] = {0,};
-        int32_t                    connected = 0;
-        char                       *connected_str = NULL;
-
-        if (count >= 1)
-                cli_out ("UUID\t\t\t\t\tHostname\tState");
-
-        while ( i <= count) {
-                snprintf (key, 256, "friend%d.uuid", i);
-                ret = dict_get_str (dict, key, &uuid_buf);
-                if (ret)
-                        goto out;
-
-                snprintf (key, 256, "friend%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname_buf);
-                if (ret)
-                        goto out;
-
-                snprintf (key, 256, "friend%d.connected", i);
-                ret = dict_get_int32 (dict, key, &connected);
-                if (ret)
-                        goto out;
-                if (connected)
-                        connected_str = "Connected";
-                else
-                        connected_str = "Disconnected";
-
-                cli_out ("%s\t%-8s\t%s ", uuid_buf, hostname_buf,
-                         connected_str);
-                i++;
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
-
-/* function pointer for gf_cli_output_{pool_list,peer_status} */
-typedef int (*cli_friend_output_fn) (dict_t*, int);
-
-int
-gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
-                             int count, void *myframe)
-{
-        gf1_cli_peer_list_rsp      rsp   = {0,};
-        int                        ret   = -1;
-        dict_t                    *dict = NULL;
-        char                       msg[1024] = {0,};
-        char                      *cmd = NULL;
-        cli_friend_output_fn       friend_output_fn;
-        call_frame_t              *frame = NULL;
-        unsigned long              flags = 0;
-
-        frame = myframe;
-        flags = (long)frame->local;
-
-        if (flags == GF_CLI_LIST_POOL_NODES) {
-                cmd = "pool list";
-                friend_output_fn = &gf_cli_output_pool_list;
-        } else {
-                cmd = "peer status";
-                friend_output_fn = &gf_cli_output_peer_status;
-        }
-
-        /* 'free' the flags set by gf_cli_list_friends */
-        frame->local = NULL;
-
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf1_cli_peer_list_rsp);
+        ret = gf_xdr_to_cli_peer_list_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 //rsp.op_ret   = -1;
                 //rsp.op_errno = EINVAL;
                 goto out;
         }
 
-        gf_log ("cli", GF_LOG_DEBUG, "Received resp to list: %d",
+
+        gf_log ("cli", GF_LOG_INFO, "Received resp to list: %d",
                 rsp.op_ret);
 
         ret = rsp.op_ret;
@@ -342,19 +255,7 @@ gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
         if (!rsp.op_ret) {
 
                 if (!rsp.friends.friends_len) {
-                        snprintf (msg, sizeof (msg),
-                                  "%s: No peers present", cmd);
-                        if (global_state->mode & GLUSTER_MODE_XML) {
-                                ret = cli_xml_output_peer_status (dict,
-                                                                  rsp.op_ret,
-                                                                  rsp.op_errno,
-                                                                  msg);
-                                if (ret)
-                                        gf_log ("cli", GF_LOG_ERROR,
-                                                "Error outputting to xml");
-                                goto out;
-                        }
-                        cli_err ("%s", msg);
+                        cli_out ("No peers present");
                         ret = 0;
                         goto out;
                 }
@@ -376,34 +277,58 @@ gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
                         goto out;
                 }
 
-                if (global_state->mode & GLUSTER_MODE_XML) {
-                        ret = cli_xml_output_peer_status (dict, rsp.op_ret,
-                                                          rsp.op_errno, msg);
-                        if (ret)
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
-                        goto out;
-                }
-
                 ret = dict_get_int32 (dict, "count", &count);
-                if (ret) {
-                        goto out;
-                }
 
-                ret = friend_output_fn (dict, count);
                 if (ret) {
                         goto out;
                 }
-        } else {
-                if (global_state->mode & GLUSTER_MODE_XML) {
-                        ret = cli_xml_output_peer_status (dict, rsp.op_ret,
-                                                          rsp.op_errno, NULL);
+
+                cli_out ("Number of Peers: %d", count);
+
+                while ( i <= count) {
+                        snprintf (key, 256, "friend%d.uuid", i);
+                        ret = dict_get_str (dict, key, &uuid_buf);
                         if (ret)
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
-                } else {
-                        ret = -1;
+                                goto out;
+
+                        snprintf (key, 256, "friend%d.hostname", i);
+                        ret = dict_get_str (dict, key, &hostname_buf);
+                        if (ret)
+                                goto out;
+
+                        snprintf (key, 256, "friend%d.connected", i);
+                        ret = dict_get_int32 (dict, key, &connected);
+                        if (ret)
+                                goto out;
+                        if (connected)
+                                connected_str = "Connected";
+                        else
+                                connected_str = "Disconnected";
+
+                        snprintf (key, 256, "friend%d.port", i);
+                        ret = dict_get_int32 (dict, key, &port);
+                        if (ret)
+                                goto out;
+
+                        snprintf (key, 256, "friend%d.state", i);
+                        ret = dict_get_str (dict, key, &state);
+                        if (ret)
+                                goto out;
+
+                        if (!port) {
+                                cli_out ("\nHostname: %s\nUuid: %s\nState: %s "
+                                         "(%s)",
+                                         hostname_buf, uuid_buf, state,
+                                         connected_str);
+                        } else {
+                                cli_out ("\nHostname: %s\nPort: %d\nUuid: %s\n"
+                                         "State: %s (%s)", hostname_buf, port,
+                                         uuid_buf, state, connected_str);
+                        }
+                        i++;
                 }
+        } else {
+                ret = -1;
                 goto out;
         }
 
@@ -413,7 +338,7 @@ gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov,
 out:
         cli_cmd_broadcast_response (ret);
         if (ret)
-                cli_err ("%s: failed", cmd);
+                cli_out ("Peer status unsuccessful");
 
         if (dict)
                 dict_destroy (dict);
@@ -447,1055 +372,561 @@ cli_out_options ( char *substr, char *optstr, char *valstr)
         cli_out ("%s: %s",ptr2 , valstr);
 }
 
-static int
-_gf_cli_output_volinfo_opts (dict_t *d, char *k,
-                             data_t *v, void *tmp)
-{
-        int     ret   = 0;
-        char   *key   = NULL;
-        char   *ptr   = NULL;
-        data_t *value = NULL;
-
-        key = tmp;
-
-        ptr = strstr (k, "option.");
-        if (ptr) {
-                value = v;
-                if (!value) {
-                        ret = -1;
-                        goto out;
-                }
-                cli_out_options (key, k, v->data);
-        }
-out:
-        return ret;
-}
-
 
 int
-gf_cli_get_volume_cbk (struct rpc_req *req, struct iovec *iov,
-                          int count, void *myframe)
+gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov,
+                             int count, void *myframe)
 {
-        int                        ret                  = -1;
-        int                        opt_count            = 0;
-        int32_t                    i                    = 0;
-        int32_t                    j                    = 1;
-        int32_t                    status               = 0;
-        int32_t                    type                 = 0;
-        int32_t                    brick_count          = 0;
-        int32_t                    dist_count           = 0;
-        int32_t                    stripe_count         = 0;
-        int32_t                    replica_count        = 0;
-        int32_t                    vol_type             = 0;
-        int32_t                    transport            = 0;
-        char                      *volume_id_str        = NULL;
-        char                      *brick                = NULL;
-        char                      *volname              = NULL;
-        dict_t                    *dict                 = NULL;
-        cli_local_t               *local                = NULL;
-        char                       key[1024]            = {0};
-        char                       err_str[2048]        = {0};
-        gf_cli_rsp                 rsp                  = {0};
-        char                      *caps                 = NULL;
-        int                        k __attribute__((unused)) = 0;
-
-        if (-1 == req->rpc_status)
-                goto out;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        gf1_cli_get_vol_rsp        rsp   = {0,};
+        int                        ret   = 0;
+        dict_t                     *dict = NULL;
+        char                       *volname = NULL;
+        int32_t                    i = 0;
+        char                       key[1024] = {0,};
+        int32_t                    status = 0;
+        int32_t                    type = 0;
+        int32_t                    brick_count = 0;
+        int32_t                    sub_count = 0;
+        int32_t                    vol_type = 0;
+        char                       *brick = NULL;
+        int32_t                    j = 1;
+        cli_local_t                *local = NULL;
+        int32_t                    transport = 0;
+        data_pair_t                *pairs = NULL;
+        char                       *ptr = NULL;
+        data_t                     *value = NULL;
+        int                        opt_count = 0;
+        int                        k = 0;
+        char                       err_str[2048] = {0};
+
+        snprintf (err_str, sizeof (err_str), "Volume info unsuccessful");
+        if (-1 == req->rpc_status) {
+                goto out;
+        }
+
+        ret = gf_xdr_to_cli_get_vol_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
+                //rsp.op_ret   = -1;
+                //rsp.op_errno = EINVAL;
                 goto out;
         }
 
+
         gf_log ("cli", GF_LOG_INFO, "Received resp to get vol: %d",
                 rsp.op_ret);
 
-        if (rsp.op_ret) {
-                ret = -1;
-                goto out;
-        }
+        if (!rsp.op_ret) {
 
-        if (!rsp.dict.dict_len) {
-                if (global_state->mode & GLUSTER_MODE_XML)
-                        goto xml_output;
-                cli_err ("No volumes present");
-                ret = 0;
-                goto out;
-        }
+                if (!rsp.volumes.volumes_len) {
+                        cli_out ("No volumes present");
+                        ret = 0;
+                        goto out;
+                }
 
-        dict = dict_new ();
+                dict = dict_new ();
 
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
+                if (!dict) {
+                        ret = -1;
+                        goto out;
+                }
 
-        ret = dict_unserialize (rsp.dict.dict_val,
-                                rsp.dict.dict_len,
-                                &dict);
+                ret = dict_unserialize (rsp.volumes.volumes_val,
+                                        rsp.volumes.volumes_len,
+                                        &dict);
 
-        if (ret) {
-                gf_log ("cli", GF_LOG_ERROR,
-                        "Unable to allocate memory");
-                goto out;
-        }
+                if (ret) {
+                        gf_log ("", GF_LOG_ERROR,
+                                        "Unable to allocate memory");
+                        goto out;
+                }
 
-        ret = dict_get_int32 (dict, "count", &count);
-        if (ret)
-                goto out;
+                ret = dict_get_int32 (dict, "count", &count);
 
-        local = ((call_frame_t *)myframe)->local;
+                if (ret) {
+                        goto out;
+                }
 
-        if (!count) {
-                switch (local->get_vol.flags) {
+                local = ((call_frame_t *)myframe)->local;
+                //cli_out ("Number of Volumes: %d", count);
 
-                case GF_CLI_GET_NEXT_VOLUME:
-                        GF_FREE (local->get_vol.volname);
-                        local->get_vol.volname = NULL;
+                if (!count && (local->u.get_vol.flags ==
+                                        GF_CLI_GET_NEXT_VOLUME)) {
+                        local->u.get_vol.volname = NULL;
                         ret = 0;
                         goto out;
-
-                case GF_CLI_GET_VOLUME:
-                        memset (err_str, 0, sizeof (err_str));
+                } else if (!count && (local->u.get_vol.flags ==
+                                        GF_CLI_GET_VOLUME)) {
                         snprintf (err_str, sizeof (err_str),
                                   "Volume %s does not exist",
-                                  local->get_vol.volname);
+                                  local->u.get_vol.volname);
                         ret = -1;
-                        if (!(global_state->mode & GLUSTER_MODE_XML))
-                                goto out;
+                        goto out;
                 }
-        }
 
-xml_output:
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                /* For GET_NEXT_VOLUME output is already begun in
-                 * and will also end in gf_cli_get_next_volume()
-                 */
-                if (local->get_vol.flags == GF_CLI_GET_VOLUME) {
-                        ret = cli_xml_output_vol_info_begin
-                                (local, rsp.op_ret, rsp.op_errno,
-                                 rsp.op_errstr);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
+                while ( i < count) {
+                        cli_out ("");
+                        snprintf (key, 256, "volume%d.name", i);
+                        ret = dict_get_str (dict, key, &volname);
+                        if (ret)
                                 goto out;
-                        }
-                }
 
-                if (dict) {
-                        ret = cli_xml_output_vol_info (local, dict);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
+                        snprintf (key, 256, "volume%d.type", i);
+                        ret = dict_get_int32 (dict, key, &type);
+                        if (ret)
                                 goto out;
-                        }
-                }
 
-                if (local->get_vol.flags == GF_CLI_GET_VOLUME) {
-                        ret = cli_xml_output_vol_info_end (local);
+                        snprintf (key, 256, "volume%d.status", i);
+                        ret = dict_get_int32 (dict, key, &status);
                         if (ret)
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
-                }
-                goto out;
-        }
-
-        while ( i < count) {
-                cli_out (" ");
-                snprintf (key, 256, "volume%d.name", i);
-                ret = dict_get_str (dict, key, &volname);
-                if (ret)
-                        goto out;
+                                goto out;
 
-                snprintf (key, 256, "volume%d.type", i);
-                ret = dict_get_int32 (dict, key, &type);
-                if (ret)
-                        goto out;
+                        snprintf (key, 256, "volume%d.brick_count", i);
+                        ret = dict_get_int32 (dict, key, &brick_count);
+                        if (ret)
+                                goto out;
 
-                snprintf (key, 256, "volume%d.status", i);
-                ret = dict_get_int32 (dict, key, &status);
-                if (ret)
-                        goto out;
+                        snprintf (key, 256, "volume%d.sub_count", i);
+                        ret = dict_get_int32 (dict, key, &sub_count);
+                        if (ret)
+                                goto out;
 
-                snprintf (key, 256, "volume%d.brick_count", i);
-                ret = dict_get_int32 (dict, key, &brick_count);
-                if (ret)
-                        goto out;
+                        snprintf (key, 256, "volume%d.transport", i);
+                        ret = dict_get_int32 (dict, key, &transport);
+                        if (ret)
+                                goto out;
 
-                snprintf (key, 256, "volume%d.dist_count", i);
-                ret = dict_get_int32 (dict, key, &dist_count);
-                if (ret)
-                        goto out;
+                        vol_type = type;
 
-                snprintf (key, 256, "volume%d.stripe_count", i);
-                ret = dict_get_int32 (dict, key, &stripe_count);
-                if (ret)
-                        goto out;
+                        // Stripe
+                        if ((type == 1) && (sub_count < brick_count))
+                                vol_type = 3;
 
-                snprintf (key, 256, "volume%d.replica_count", i);
-                ret = dict_get_int32 (dict, key, &replica_count);
-                if (ret)
-                        goto out;
+                        // Replicate
+                        if ((type == 2) && (sub_count < brick_count))
+                                vol_type = 4;
 
-                snprintf (key, 256, "volume%d.transport", i);
-                ret = dict_get_int32 (dict, key, &transport);
-                if (ret)
-                        goto out;
+                        cli_out ("Volume Name: %s", volname);
+                        cli_out ("Type: %s", cli_volume_type[vol_type]);
+                        cli_out ("Status: %s", cli_volume_status[status], brick_count);
+                        if ((sub_count > 1) && (brick_count > sub_count))
+                                cli_out ("Number of Bricks: %d x %d = %d",
+                                         brick_count / sub_count, sub_count,
+                                         brick_count);
+                        else
+                                cli_out ("Number of Bricks: %d", brick_count);
 
-                snprintf (key, 256, "volume%d.volume_id", i);
-                ret = dict_get_str (dict, key, &volume_id_str);
-                if (ret)
-                        goto out;
+                        cli_out ("Transport-type: %s",
+                                 ((transport == 0)?"tcp":
+                                   (transport == 1)?"rdma":
+                                  "tcp,rdma"));
+                        j = 1;
 
-                vol_type = type;
 
-                // Distributed (stripe/replicate/stripe-replica) setups
-                if ((type > 0) && ( dist_count < brick_count))
-                        vol_type = type + 3;
+                        GF_FREE (local->u.get_vol.volname);
+                        local->u.get_vol.volname = gf_strdup (volname);
 
-                cli_out ("Volume Name: %s", volname);
-                cli_out ("Type: %s", cli_vol_type_str[vol_type]);
-                cli_out ("Volume ID: %s", volume_id_str);
-                cli_out ("Status: %s", cli_vol_status_str[status]);
+                        if (brick_count)
+                                cli_out ("Bricks:");
 
-#ifdef HAVE_BD_XLATOR
-                k = 0;
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.xlator%d", i, k);
-                ret = dict_get_str (dict, key, &caps);
-                if (ret)
-                        goto next;
-                do {
-                        j = 0;
-                        cli_out ("Xlator %d: %s", k + 1, caps);
-                        do {
-                                memset (key, 0, sizeof (key));
-                                snprintf (key, sizeof (key),
-                                          "volume%d.xlator%d.caps%d",
-                                          i, k, j++);
-                                ret = dict_get_str (dict, key, &caps);
+                        while ( j <= brick_count) {
+                                snprintf (key, 1024, "volume%d.brick%d",
+                                          i, j);
+                                ret = dict_get_str (dict, key, &brick);
                                 if (ret)
-                                        break;
-                                cli_out ("Capability %d: %s", j, caps);
-                        } while (1);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key),
-                                  "volume%d.xlator%d", i, ++k);
-                        ret = dict_get_str (dict, key, &caps);
-                        if (ret)
-                                break;
-                } while (1);
-
-next:
-#else
-                caps = 0; /* Avoid compiler warnings when BD not enabled */
-#endif
-
-                if (type == GF_CLUSTER_TYPE_STRIPE_REPLICATE) {
-                        cli_out ("Number of Bricks: %d x %d x %d = %d",
-                                 (brick_count / dist_count),
-                                 stripe_count,
-                                 replica_count,
-                                 brick_count);
-                } else if (type == GF_CLUSTER_TYPE_NONE) {
-                        cli_out ("Number of Bricks: %d", brick_count);
-                } else {
-                        /* For both replicate and stripe, dist_count is
-                           good enough */
-                        cli_out ("Number of Bricks: %d x %d = %d",
-                                 (brick_count / dist_count),
-                                 dist_count, brick_count);
-                }
-
-                cli_out ("Transport-type: %s",
-                         ((transport == 0)?"tcp":
-                          (transport == 1)?"rdma":
-                          "tcp,rdma"));
-                j = 1;
-
-                GF_FREE (local->get_vol.volname);
-                local->get_vol.volname = gf_strdup (volname);
-
-                if (brick_count)
-                        cli_out ("Bricks:");
+                                        goto out;
+                                cli_out ("Brick%d: %s", j, brick);
+                                j++;
+                        }
+                        pairs = dict->members_list;
+                        if (!pairs) {
+                                ret = -1;
+                                goto out;
+                        }
 
-                while (j <= brick_count) {
-                        snprintf (key, 1024, "volume%d.brick%d", i, j);
-                        ret = dict_get_str (dict, key, &brick);
+                        snprintf (key, 256, "volume%d.opt_count",i);
+                        ret = dict_get_int32 (dict, key, &opt_count);
                         if (ret)
-                                goto out;
+                            goto out;
+
+                        if (!opt_count)
+                            goto out;
+
+                        cli_out ("Options Reconfigured:");
+                        k = 0;
+                        while ( k < opt_count) {
+
+                                snprintf (key, 256, "volume%d.option.",i);
+                                while (pairs) {
+                                        ptr = strstr (pairs->key, "option.");
+                                        if (ptr) {
+                                                value = pairs->value;
+                                                if (!value) {
+                                                        ret = -1;
+                                                        goto out;
+                                                }
+                                                cli_out_options (key, pairs->key,
+                                                                 value->data);
+                                        }
+                                        pairs = pairs->next;
+                                }
+                                k++;
+                       }
 
-                        cli_out ("Brick%d: %s", j, brick);
-#ifdef HAVE_BD_XLATOR
-                        snprintf (key, 256, "volume%d.vg%d", i, j);
-                        ret = dict_get_str (dict, key, &caps);
-                        if (!ret)
-                                cli_out ("Brick%d VG: %s", j, caps);
-#endif
-                        j++;
+                       i++;
                 }
 
-                snprintf (key, 256, "volume%d.opt_count",i);
-                ret = dict_get_int32 (dict, key, &opt_count);
-                if (ret)
-                        goto out;
-
-                if (!opt_count)
-                        goto out;
-
-                cli_out ("Options Reconfigured:");
-
-                snprintf (key, 256, "volume%d.option.",i);
-
-                ret = dict_foreach (dict, _gf_cli_output_volinfo_opts, key);
-                if (ret)
-                        goto out;
 
-                i++;
+        } else {
+                ret = -1;
+                goto out;
         }
 
 
         ret = 0;
+
 out:
         cli_cmd_broadcast_response (ret);
         if (ret)
-                cli_err ("%s", err_str);
+                cli_out (err_str);
 
         if (dict)
                 dict_destroy (dict);
 
-        free (rsp.dict.dict_val);
-
-        free (rsp.op_errstr);
-
-        gf_log ("cli", GF_LOG_INFO, "Returning: %d", ret);
+        gf_log ("", GF_LOG_INFO, "Returning: %d", ret);
         return ret;
 }
 
 int
-gf_cli_create_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_create_volume_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp              rsp   = {0,};
-        int                     ret   = -1;
+        gf1_cli_create_vol_rsp  rsp   = {0,};
+        int                     ret   = 0;
         cli_local_t             *local = NULL;
         char                    *volname = NULL;
         dict_t                  *dict = NULL;
-        dict_t                  *rsp_dict = NULL;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
         local = ((call_frame_t *) (myframe))->local;
+        ((call_frame_t *) (myframe))->local = NULL;
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_create_vol_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
-        gf_log ("cli", GF_LOG_INFO, "Received resp to create volume");
-
-        dict = local->dict;
+        dict = local->u.create_vol.dict;
 
         ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                if (rsp.op_ret == 0) {
-                        rsp_dict = dict_new ();
-                        ret = dict_unserialize (rsp.dict.dict_val,
-                                                rsp.dict.dict_len,
-                                                &rsp_dict);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Failed rsp_dict unserialization");
-                                goto out;
-                        }
-                }
 
-                ret = cli_xml_output_vol_create (rsp_dict, rsp.op_ret,
-                                                 rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                cli_err ("volume create: %s: failed: %s", volname,
-                         rsp.op_errstr);
-        else if (rsp.op_ret)
-                cli_err ("volume create: %s: failed", volname);
+        gf_log ("cli", GF_LOG_INFO, "Received resp to create volume");
+	if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
+	        cli_out ("%s", rsp.op_errstr);
         else
-                cli_out ("volume create: %s: success: "
-                         "please start the volume to access data", volname);
-
+                cli_out ("Creation of volume %s has been %s", volname,
+                                (rsp.op_ret) ? "unsuccessful":
+                                "successful. Please start the volume to "
+                                "access data.");
         ret = rsp.op_ret;
 
 out:
         cli_cmd_broadcast_response (ret);
-        free (rsp.dict.dict_val);
-        free (rsp.op_errstr);
+        if (dict)
+                dict_unref (dict);
+        if (local)
+                cli_local_wipe (local);
+        if (rsp.volname)
+                free (rsp.volname);
+        if (rsp.op_errstr)
+                free (rsp.op_errstr);
         return ret;
 }
 
 int
-gf_cli_delete_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_delete_volume_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp              rsp   = {0,};
-        int                     ret   = -1;
+        gf1_cli_delete_vol_rsp  rsp   = {0,};
+        int                     ret   = 0;
         cli_local_t             *local = NULL;
         char                    *volname = NULL;
         call_frame_t            *frame = NULL;
-        dict_t                  *dict = NULL;
-        dict_t                  *rsp_dict = NULL;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_delete_vol_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
-        local = frame->local;
-
-        if (local)
-                dict = local->dict;
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "dict get failed");
-                goto out;
-        }
-
-        gf_log ("cli", GF_LOG_INFO, "Received resp to delete volume");
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                if (rsp.op_ret == 0) {
-                        rsp_dict = dict_new ();
-                        ret = dict_unserialize (rsp.dict.dict_val,
-                                                rsp.dict.dict_len,
-                                                &rsp_dict);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Failed rsp_dict unserialization");
-                                goto out;
-                        }
-                }
-
-                ret = cli_xml_output_generic_volume ("volDelete", rsp_dict,
-                                                     rsp.op_ret, rsp.op_errno,
-                                                     rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                cli_err ("volume delete: %s: failed: %s", volname,
-                         rsp.op_errstr);
-        else if (rsp.op_ret)
-                cli_err ("volume delete: %s: failed", volname);
-        else
-                cli_out ("volume delete: %s: success", volname);
-
-        ret = rsp.op_ret;
-
-out:
-        cli_cmd_broadcast_response (ret);
-        free (rsp.dict.dict_val);
-
-        gf_log ("", GF_LOG_INFO, "Returning with %d", ret);
-        return ret;
-}
-
-int
-gf_cli3_1_uuid_get_cbk (struct rpc_req *req, struct iovec *iov,
-                        int count, void *myframe)
-{
-        char                    *uuid_str = NULL;
-        gf_cli_rsp              rsp   = {0,};
-        int                     ret   = -1;
-        cli_local_t             *local = NULL;
-        call_frame_t            *frame = NULL;
-        dict_t                  *dict = NULL;
-
-        if (-1 == req->rpc_status)
-                goto out;
-
         frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
         local = frame->local;
         frame->local = NULL;
 
-        gf_log ("cli", GF_LOG_INFO, "Received resp to uuid get");
-
-        dict = dict_new ();
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = dict_unserialize (rsp.dict.dict_val, rsp.dict.dict_len,
-                                &dict);
-        if (ret) {
-                gf_log ("cli", GF_LOG_ERROR, "Failed to unserialize "
-                        "response for uuid get");
-                goto out;
-        }
-
-        ret = dict_get_str (dict, "uuid", &uuid_str);
-        if (ret) {
-                gf_log ("cli", GF_LOG_ERROR, "Failed to get uuid "
-                        "from dictionary");
-                goto out;
-        }
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_dict ("uuidGenerate", dict, rsp.op_ret,
-                                           rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret) {
-                if (strcmp (rsp.op_errstr, "") == 0)
-                        cli_err ("Get uuid was unsuccessful");
-                else
-                        cli_err ("%s", rsp.op_errstr);
-
-        } else {
-                cli_out ("UUID: %s", uuid_str);
-
-        }
-        ret = rsp.op_ret;
-
-out:
-        cli_cmd_broadcast_response (ret);
-        cli_local_wipe (local);
-        if (rsp.dict.dict_val)
-                free (rsp.dict.dict_val);
-        if (dict)
-                dict_unref (dict);
-
-        gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret);
-        return ret;
-}
-
-int
-gf_cli3_1_uuid_reset_cbk (struct rpc_req *req, struct iovec *iov,
-                             int count, void *myframe)
-{
-        gf_cli_rsp              rsp   = {0,};
-        int                     ret   = -1;
-        cli_local_t             *local = NULL;
-        call_frame_t            *frame = NULL;
-        dict_t                  *dict = NULL;
-
-        if (-1 == req->rpc_status) {
-                goto out;
-        }
-
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        local = frame->local;
-        frame->local = NULL;
+        if (local)
+                volname = local->u.delete_vol.volname;
 
-        gf_log ("cli", GF_LOG_INFO, "Received resp to uuid reset");
 
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_dict ("uuidReset", dict, rsp.op_ret,
-                                           rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
+        gf_log ("cli", GF_LOG_INFO, "Received resp to delete volume");
 
         if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                cli_err ("%s", rsp.op_errstr);
+                cli_out (rsp.op_errstr);
         else
-                cli_out ("resetting the peer uuid has been %s",
+                cli_out ("Deleting volume %s has been %s", volname,
                          (rsp.op_ret) ? "unsuccessful": "successful");
         ret = rsp.op_ret;
 
 out:
         cli_cmd_broadcast_response (ret);
         cli_local_wipe (local);
-        if (rsp.dict.dict_val)
-                free (rsp.dict.dict_val);
-        if (dict)
-                dict_unref (dict);
-
+        if (rsp.volname)
+                free (rsp.volname);
         gf_log ("", GF_LOG_INFO, "Returning with %d", ret);
         return ret;
 }
 
 int
-gf_cli_start_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_start_volume_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp              rsp   = {0,};
-        int                     ret   = -1;
+        gf1_cli_start_vol_rsp   rsp   = {0,};
+        int                     ret   = 0;
         cli_local_t             *local = NULL;
         char                    *volname = NULL;
         call_frame_t            *frame = NULL;
-        dict_t                  *dict = NULL;
-        dict_t                  *rsp_dict = NULL;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_start_vol_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
-        if (frame)
+        frame = myframe;
+
+        if (frame) {
                 local = frame->local;
+                frame->local = NULL;
+        }
 
         if (local)
-                dict = local->dict;
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR, "dict get failed");
-                goto out;
-        }
+                volname = local->u.start_vol.volname;
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to start volume");
 
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                if (rsp.op_ret == 0) {
-                        rsp_dict = dict_new ();
-                        ret = dict_unserialize (rsp.dict.dict_val,
-                                                rsp.dict.dict_len,
-                                                &rsp_dict);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Failed rsp_dict unserialization");
-                                goto out;
-                        }
-                }
-
-                ret = cli_xml_output_generic_volume ("volStart", rsp_dict,
-                                                     rsp.op_ret, rsp.op_errno,
-                                                     rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
         if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                cli_err ("volume start: %s: failed: %s", volname,
-                         rsp.op_errstr);
-        else if (rsp.op_ret)
-                cli_err ("volume start: %s: failed", volname);
+                cli_out ("%s", rsp.op_errstr);
         else
-                cli_out ("volume start: %s: success", volname);
+                cli_out ("Starting volume %s has been %s", volname,
+                        (rsp.op_ret) ? "unsuccessful": "successful");
 
         ret = rsp.op_ret;
 
 out:
         cli_cmd_broadcast_response (ret);
-        free (rsp.dict.dict_val);
-        free (rsp.op_errstr);
+        if (local)
+                cli_local_wipe (local);
+        if (rsp.volname)
+                free (rsp.volname);
+        if (rsp.op_errstr)
+                free (rsp.op_errstr);
         return ret;
 }
 
 int
-gf_cli_stop_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_stop_volume_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp            rsp   = {0,};
-        int                   ret   = -1;
+        gf1_cli_stop_vol_rsp  rsp   = {0,};
+        int                   ret   = 0;
         cli_local_t           *local = NULL;
         char                  *volname = NULL;
         call_frame_t          *frame = NULL;
-        dict_t                *dict = NULL;
-        dict_t                *rsp_dict = NULL;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_stop_vol_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
+        frame = myframe;
+
         if (frame)
                 local = frame->local;
 
-        if (local) {
-                dict = local->dict;
-                ret = dict_get_str (dict, "volname", &volname);
-                if (ret) {
-                        gf_log (frame->this->name, GF_LOG_ERROR,
-                                "Unable to get volname from dict");
-                        goto out;
-                }
-        }
+        if (local)
+                volname = local->u.start_vol.volname;
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to stop volume");
 
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                if (rsp.op_ret == 0) {
-                        rsp_dict = dict_new ();
-                        ret = dict_unserialize (rsp.dict.dict_val,
-                                                rsp.dict.dict_len,
-                                                &rsp_dict);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Failed rsp_dict unserialization");
-                                goto out;
-                        }
-                }
-
-                ret = cli_xml_output_generic_volume ("volStop", rsp_dict,
-                                                     rsp.op_ret, rsp.op_errno,
-                                                     rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
         if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                cli_err ("volume stop: %s: failed: %s", volname, rsp.op_errstr);
-        else if (rsp.op_ret)
-                cli_err ("volume stop: %s: failed", volname);
+                cli_out (rsp.op_errstr);
         else
-                cli_out ("volume stop: %s: success", volname);
-
+                cli_out ("Stopping volume %s has been %s", volname,
+                        (rsp.op_ret) ? "unsuccessful": "successful");
         ret = rsp.op_ret;
 
 out:
         cli_cmd_broadcast_response (ret);
-        free (rsp.op_errstr);
-        free (rsp.dict.dict_val);
-
+        if (rsp.op_errstr)
+                free (rsp.op_errstr);
+        if (rsp.volname)
+                free (rsp.volname);
         return ret;
 }
 
 int
-gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp               rsp     = {0,};
+        gf2_cli_defrag_vol_rsp  rsp     = {0,};
         cli_local_t             *local   = NULL;
         char                    *volname = NULL;
         call_frame_t            *frame   = NULL;
-        char                    *status  = "unknown";
         int                      cmd     = 0;
-        int                      ret     = -1;
-        dict_t                  *dict    = NULL;
-        dict_t                  *local_dict = NULL;
-        uint64_t                 files   = 0;
-        uint64_t                 size    = 0;
-        uint64_t                 lookup  = 0;
-        char                     msg[1024] = {0,};
-        gf_defrag_status_t       status_rcd = GF_DEFRAG_STATUS_NOT_STARTED;
-        int32_t                  counter = 0;
-        char                    *node_name = NULL;
-        char                     key[256] = {0,};
-        int32_t                  i = 1;
-        uint64_t                 failures = 0;
-        uint64_t                 skipped = 0;
-        double                   elapsed = 0;
-        char                    *size_str = NULL;
-        char                    *task_id_str = NULL;
+        int                      ret     = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp,
-                              (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_defrag_vol_rsp_v2 (*iov, &rsp);
         if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
+        frame = myframe;
+
         if (frame)
                 local = frame->local;
 
-        if (local)
-                local_dict = local->dict;
-
-        ret = dict_get_str (local_dict, "volname", &volname);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to get volname");
-                goto out;
-        }
-
-        ret = dict_get_int32 (local_dict, "rebalance-command", (int32_t*)&cmd);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to get command");
-                goto out;
-        }
-
-        if (rsp.dict.dict_len) {
-                /* Unserialize the dictionary */
-                dict  = dict_new ();
-
-                ret = dict_unserialize (rsp.dict.dict_val,
-                                        rsp.dict.dict_len,
-                                        &dict);
-                if (ret < 0) {
-                        gf_log ("glusterd", GF_LOG_ERROR,
-                                "failed to "
-                                "unserialize req-buffer to dictionary");
-                        goto out;
-                }
-        }
-
-        if (!((cmd == GF_DEFRAG_CMD_STOP) || (cmd == GF_DEFRAG_CMD_STATUS)) &&
-             !(global_state->mode & GLUSTER_MODE_XML)) {
-                /* All other possibilites are about starting a rebalance */
-                ret = dict_get_str (dict, GF_REBALANCE_TID_KEY, &task_id_str);
-                if (rsp.op_ret && strcmp (rsp.op_errstr, "")) {
-                        snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
-                } else {
-                        if (!rsp.op_ret) {
-                                snprintf (msg, sizeof (msg),
-                                          "Starting rebalance on volume %s has "
-                                          "been successful.\nID: %s", volname,
-                                          task_id_str);
-                        } else {
-                                snprintf (msg, sizeof (msg),
-                                          "Starting rebalance on volume %s has "
-                                          "been unsuccessful.", volname);
-                        }
-                }
-                goto done;
+        if (local) {
+                volname = local->u.defrag_vol.volname;
+                cmd = local->u.defrag_vol.cmd;
+        }
+        if ((cmd == GF_DEFRAG_CMD_START) ||
+            (cmd == GF_DEFRAG_CMD_START_LAYOUT_FIX) ||
+            (cmd == GF_DEFRAG_CMD_START_MIGRATE_DATA)) {
+                if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
+                        cli_out (rsp.op_errstr);
+                else
+                        cli_out ("starting rebalance on volume %s has been %s",
+                                 volname, (rsp.op_ret) ? "unsuccessful":
+                                 "successful");
         }
-
         if (cmd == GF_DEFRAG_CMD_STOP) {
                 if (rsp.op_ret == -1) {
                         if (strcmp (rsp.op_errstr, ""))
-                                snprintf (msg, sizeof (msg),
-                                          "%s", rsp.op_errstr);
+                                cli_out (rsp.op_errstr);
                         else
-                                snprintf (msg, sizeof (msg),
-                                          "rebalance volume %s stop failed",
-                                          volname);
-                        goto done;
+                                cli_out ("rebalance volume %s stop failed",
+                                         volname);
                 } else {
-                        snprintf (msg, sizeof (msg),
-                                  "rebalance process may be in the middle of a "
-                                  "file migration.\nThe process will be fully "
-                                  "stopped once the migration of the file is "
-                                  "complete.\nPlease check rebalance process "
-                                  "for completion before doing any further "
-                                  "brick related tasks on the volume.");
+                        cli_out ("stopped rebalance process of volume %s \n"
+                                 "(after rebalancing %"PRId64" files totaling "
+                                 "%"PRId64" bytes)", volname, rsp.files, rsp.size);
                 }
         }
         if (cmd == GF_DEFRAG_CMD_STATUS) {
                 if (rsp.op_ret == -1) {
                         if (strcmp (rsp.op_errstr, ""))
-                                snprintf (msg, sizeof (msg),
-                                          "%s", rsp.op_errstr);
+                                cli_out (rsp.op_errstr);
                         else
-                                snprintf (msg, sizeof (msg),
-                                          "Failed to get the status of "
-                                          "rebalance process");
-                        goto done;
-                }
-        }
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_rebalance (cmd, dict, rsp.op_ret,
-                                                    rsp.op_errno,
-                                                    rsp.op_errstr);
-                goto out;
-        }
+                                cli_out ("failed to get the status of "
+                                         "rebalance process");
+                } else {
+                        char *status = "unknown";
+                        if (rsp.op_errno == 0)
+                                status = "not started";
+                        if (rsp.op_errno == 1)
+                                status = "step 1: layout fix in progress";
+                        if (rsp.op_errno == 2)
+                                status = "step 2: data migration in progress";
+                        if (rsp.op_errno == 3)
+                                status = "stopped";
+                        if (rsp.op_errno == 4)
+                                status = "completed";
+                        if (rsp.op_errno == 5)
+                                status = "failed";
+                        if (rsp.op_errno == 6)
+                                status = "step 1: layout fix complete";
+                        if (rsp.op_errno == 7)
+                                status = "step 2: data migration complete";
+
+                        if (rsp.files && (rsp.op_errno == 1)) {
+                                cli_out ("rebalance %s: fixed layout %"PRId64,
+                                         status, rsp.files);
+                                goto done;
+                        }
+                        if (rsp.files && (rsp.op_errno == 6)) {
+                                cli_out ("rebalance %s: fixed layout %"PRId64,
+                                         status, rsp.files);
+                                goto done;
+                        }
+                        if (rsp.files) {
+                                cli_out ("rebalance %s: rebalanced %"PRId64
+                                         " files of size %"PRId64" (total files"
+                                         " scanned %"PRId64")", status,
+                                         rsp.files, rsp.size, rsp.lookedup_files);
+                                goto done;
+                        }
 
-        ret = dict_get_int32 (dict, "count", &counter);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR, "count not set");
-                goto out;
+                        cli_out ("rebalance %s", status);
+                }
         }
 
-        cli_out ("%40s %16s %13s %13s %13s %13s %20s %18s", "Node",
-                 "Rebalanced-files", "size", "scanned", "failures", "skipped",
-                 "status", "run time in secs");
-        cli_out ("%40s %16s %13s %13s %13s %13s %20s %18s", "---------",
-                 "-----------", "-----------", "-----------", "-----------",
-                 "-----------", "------------", "--------------");
-        do {
-                snprintf (key, 256, "node-name-%d", i);
-                ret = dict_get_str (dict, key, &node_name);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get node-name");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "files-%d", i);
-                ret = dict_get_uint64 (dict, key, &files);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get file count");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "size-%d", i);
-                ret = dict_get_uint64 (dict, key, &size);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get size of xfer");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "lookups-%d", i);
-                ret = dict_get_uint64 (dict, key, &lookup);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get lookedup file count");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "status-%d", i);
-                ret = dict_get_int32 (dict, key, (int32_t *)&status_rcd);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get status");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "failures-%d", i);
-                ret = dict_get_uint64 (dict, key, &failures);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get failures count");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "skipped-%d", i);
-                ret = dict_get_uint64 (dict, key, &skipped);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get skipped count");
-                memset (key, 0, 256);
-                snprintf (key, 256, "run-time-%d", i);
-                ret = dict_get_double (dict, key, &elapsed);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get run-time");
-
-                status = cli_vol_task_status_str[status_rcd];
-                size_str = gf_uint64_2human_readable(size);
-                cli_out ("%40s %16"PRIu64 " %13s" " %13"PRIu64 " %13"PRIu64
-                         " %13"PRIu64 " %20s %18.2f", node_name, files,
-                         size_str, lookup, failures, skipped, status, elapsed);
-                GF_FREE(size_str);
-
-                i++;
-        } while (i <= counter);
-
-
 done:
-        if (global_state->mode & GLUSTER_MODE_XML)
-                cli_xml_output_str ("volRebalance", msg,
-                                    rsp.op_ret, rsp.op_errno,
-                                    rsp.op_errstr);
-        else {
-                if (rsp.op_ret)
-                        cli_err ("volume rebalance: %s: failed: %s", volname,
-                                 msg);
-                else
-                        cli_out ("volume rebalance: %s: success: %s", volname,
-                                 msg);
-        }
+        if (volname)
+                GF_FREE (volname);
+
         ret = rsp.op_ret;
 
 out:
-        free (rsp.op_errstr); //malloced by xdr
-        free (rsp.dict.dict_val); //malloced by xdr
-        if (dict)
-                dict_unref (dict);
+        if (rsp.op_errstr)
+                free (rsp.op_errstr); //malloced by xdr
+        if (rsp.volname)
+                free (rsp.volname); //malloced by xdr
         cli_cmd_broadcast_response (ret);
         return ret;
 }
 
 int
-gf_cli_rename_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_rename_volume_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp              rsp   = {0,};
-        int                     ret   = -1;
-        char                    msg[1024] = {0,};
+        gf1_cli_rename_vol_rsp  rsp   = {0,};
+        int                     ret   = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_rename_vol_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to probe");
-        snprintf (msg, sizeof (msg), "Rename volume %s",
-                  (rsp.op_ret) ? "unsuccessful": "successful");
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str ("volRename", msg, rsp.op_ret,
-                                          rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret)
-                cli_err ("volume rename: failed");
-        else
-                cli_out ("volume rename: success");
+        cli_out ("Rename volume %s", (rsp.op_ret) ? "unsuccessful":
+                                        "successful");
 
         ret = rsp.op_ret;
 
@@ -1505,125 +936,61 @@ out:
 }
 
 int
-gf_cli_reset_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_reset_volume_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp           rsp   = {0,};
-        int                  ret   = -1;
-        char                 msg[1024] = {0,};
+        gf1_cli_reset_vol_rsp  rsp   = {0,};
+        int                  ret   = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_reset_vol_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to reset");
 
-        if (strcmp (rsp.op_errstr, ""))
-                snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
+        if (rsp.op_ret &&  strcmp (rsp.op_errstr, ""))
+                cli_out ("%s", rsp.op_errstr);
         else
-                snprintf (msg, sizeof (msg), "reset volume %s",
-                          (rsp.op_ret) ? "unsuccessful": "successful");
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str ("volReset", msg, rsp.op_ret,
-                                          rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret)
-                cli_err ("volume reset: failed: %s", msg);
-        else
-                cli_out ("volume reset: success: %s", msg);
+                cli_out ("reset volume %s", (rsp.op_ret) ? "unsuccessful":
+                                "successful");
 
         ret = rsp.op_ret;
 
 out:
-        cli_cmd_broadcast_response (ret);
+                cli_cmd_broadcast_response (ret);
         return ret;
 }
 
-char *
-is_server_debug_xlator (void *myframe)
-{
-        call_frame_t         *frame        = NULL;
-        cli_local_t          *local        = NULL;
-        char                 **words       = NULL;
-        char                 *key          = NULL;
-        char                 *value        = NULL;
-        char                 *debug_xlator = NULL;
-
-        frame = myframe;
-        local = frame->local;
-        words = (char **)local->words;
-
-        while (*words != NULL) {
-                if (strstr (*words, "trace") == NULL &&
-                    strstr (*words, "error-gen") == NULL) {
-                        words++;
-                        continue;
-                }
-
-                key = *words;
-                words++;
-                value = *words;
-                if (value == NULL)
-                        break;
-                if (strstr (value, "client")) {
-                        words++;
-                        continue;
-                } else {
-                        if (!(strstr (value, "posix") || strstr (value, "acl")
-                              || strstr (value, "locks") ||
-                              strstr (value, "io-threads") ||
-                              strstr (value, "marker") ||
-                              strstr (value, "index"))) {
-                                words++;
-                                continue;
-                        } else {
-                                debug_xlator = gf_strdup (key);
-                                break;
-                        }
-                }
-        }
-
-        return debug_xlator;
-}
-
 int
-gf_cli_set_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_set_volume_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp           rsp   = {0,};
-        int                  ret   = -1;
+        gf1_cli_set_vol_rsp  rsp   = {0,};
+        int                  ret   = 0;
         dict_t               *dict = NULL;
         char                 *help_str = NULL;
-        char                 msg[1024] = {0,};
-        char                 *debug_xlator = _gf_false;
-        char                 tmp_str[512] = {0,};
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_set_vol_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to set");
 
+        if (rsp.op_ret &&  strcmp (rsp.op_errstr, ""))
+                cli_out ("%s", rsp.op_errstr);
+
         dict = dict_new ();
 
         if (!dict) {
@@ -1633,73 +1000,36 @@ gf_cli_set_volume_cbk (struct rpc_req *req, struct iovec *iov,
 
         ret = dict_unserialize (rsp.dict.dict_val, rsp.dict.dict_len, &dict);
 
-        /* For brick processes graph change does not happen on the fly.
-         * The proces has to be restarted. So this is a check from the
-         * volume set option such that if debug xlators such as trace/errorgen
-         * are provided in the set command, warn the user.
-         */
-        debug_xlator = is_server_debug_xlator (myframe);
-
-        if (dict_get_str (dict, "help-str", &help_str) && !msg[0])
-                snprintf (msg, sizeof (msg), "Set volume %s",
-                          (rsp.op_ret) ? "unsuccessful": "successful");
-        if (rsp.op_ret == 0 && debug_xlator) {
-                snprintf (tmp_str, sizeof (tmp_str), "\n%s translator has been "
-                          "added to the server volume file. Please restart the"
-                          " volume for enabling the translator", debug_xlator);
-        }
-
-        if ((global_state->mode & GLUSTER_MODE_XML) && (help_str == NULL)) {
-                ret = cli_xml_output_str ("volSet", msg, rsp.op_ret,
-                                          rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
+        if (ret)
                 goto out;
-        }
 
-        if (rsp.op_ret) {
-                if (strcmp (rsp.op_errstr, ""))
-                        cli_err ("volume set: failed: %s", rsp.op_errstr);
-                else
-                        cli_err ("volume set: failed");
-        } else {
-                if (help_str == NULL) {
-                        if (debug_xlator == NULL)
-                                cli_out ("volume set: success");
-                        else
-                                cli_out ("volume set: success%s", tmp_str);
-                }else {
-                        cli_out ("%s", help_str);
-                }
-        }
+        if (dict_get_str (dict, "help-str", &help_str))
+                cli_out ("Set volume %s", (rsp.op_ret) ? "unsuccessful":
+                                                         "successful");
+        else
+                cli_out ("%s", help_str);
 
         ret = rsp.op_ret;
 
 out:
-        if (dict)
-                dict_unref (dict);
-        GF_FREE (debug_xlator);
         cli_cmd_broadcast_response (ret);
         return ret;
 }
 
 int
-gf_cli_add_brick_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_add_brick_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp                  rsp   = {0,};
-        int                         ret   = -1;
-        char                        msg[1024] = {0,};
+        gf1_cli_add_brick_rsp       rsp   = {0,};
+        int                         ret   = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_add_brick_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
@@ -1707,379 +1037,66 @@ gf_cli_add_brick_cbk (struct rpc_req *req, struct iovec *iov,
         gf_log ("cli", GF_LOG_INFO, "Received resp to add brick");
 
         if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
+                cli_out ("%s", rsp.op_errstr);
         else
-                snprintf (msg, sizeof (msg), "Add Brick %s",
-                          (rsp.op_ret) ? "unsuccessful": "successful");
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str ("volAddBrick", msg, rsp.op_ret,
-                                          rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret)
-                cli_err ("volume add-brick: failed: %s", rsp.op_errstr);
-        else
-                cli_out ("volume add-brick: success");
+                cli_out ("Add Brick %s", (rsp.op_ret) ? "unsuccessful":
+                                                        "successful");
         ret = rsp.op_ret;
 
 out:
         cli_cmd_broadcast_response (ret);
-        free (rsp.dict.dict_val);
-        free (rsp.op_errstr);
-        return ret;
-}
-
-int
-gf_cli3_remove_brick_status_cbk (struct rpc_req *req, struct iovec *iov,
-                                 int count, void *myframe)
-{
-        gf_cli_rsp               rsp     = {0,};
-        char                    *status  = "unknown";
-        int                      ret     = -1;
-        uint64_t                 files   = 0;
-        uint64_t                 size    = 0;
-        uint64_t                 lookup  = 0;
-        dict_t                  *dict    = NULL;
-        char                     msg[1024] = {0,};
-        char                     key[256] = {0,};
-        int32_t                  i       = 1;
-        int32_t                  counter = 0;
-        char                    *node_name = 0;
-        gf_defrag_status_t       status_rcd = GF_DEFRAG_STATUS_NOT_STARTED;
-        uint64_t                 failures = 0;
-        uint64_t                 skipped = 0;
-        double                   elapsed = 0;
-        char                    *size_str = NULL;
-        int32_t                  command = 0;
-        gf1_op_commands          cmd = GF_OP_CMD_NONE;
-        cli_local_t             *local = NULL;
-        call_frame_t            *frame = NULL;
-        char                    *cmd_str = "unknown";
-
-        if (-1 == req->rpc_status) {
-                goto out;
-        }
-
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp,
-                              (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        if (frame)
-                local = frame->local;
-        ret = dict_get_int32 (local->dict, "command", &command);
-        if (ret)
-                goto out;
-        cmd = command;
-
-        switch (cmd) {
-        case GF_OP_CMD_STOP:
-                cmd_str = "stop";
-                break;
-        case GF_OP_CMD_STATUS:
-                cmd_str = "status";
-                break;
-        default:
-                break;
-        }
-
-        ret = rsp.op_ret;
-        if (rsp.op_ret == -1) {
-                if (strcmp (rsp.op_errstr, ""))
-                        snprintf (msg, sizeof (msg), "volume remove-brick %s: "
-                                  "failed: %s", cmd_str, rsp.op_errstr);
-                else
-                        snprintf (msg, sizeof (msg), "volume remove-brick %s: "
-                                  "failed", cmd_str);
-
-                if (global_state->mode & GLUSTER_MODE_XML)
-                        goto xml_output;
-
-                cli_err ("%s", msg);
-                goto out;
-        }
-
-        if (rsp.dict.dict_len) {
-                /* Unserialize the dictionary */
-                dict  = dict_new ();
-
-                ret = dict_unserialize (rsp.dict.dict_val,
-                                        rsp.dict.dict_len,
-                                        &dict);
-                if (ret < 0) {
-                        strncpy (msg, "failed to unserialize req-buffer to "
-                                 "dictionary", sizeof (msg));
-
-                        if (global_state->mode & GLUSTER_MODE_XML) {
-                                rsp.op_ret = -1;
-                                goto xml_output;
-                        }
-
-                        gf_log ("cli", GF_LOG_ERROR, "%s", msg);
-                        goto out;
-                }
-        }
-
-xml_output:
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                if (strcmp (rsp.op_errstr, "")) {
-                        ret = cli_xml_output_vol_remove_brick (_gf_true, dict,
-                                                               rsp.op_ret,
-                                                               rsp.op_errno,
-                                                               rsp.op_errstr);
-                } else {
-                        ret = cli_xml_output_vol_remove_brick (_gf_true, dict,
-                                                               rsp.op_ret,
-                                                               rsp.op_errno,
-                                                               msg);
-                }
-                goto out;
-        }
-
-        ret = dict_get_int32 (dict, "count", &counter);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR, "count not set");
-                goto out;
-        }
-
-
-        cli_out ("%40s %16s %13s %13s %13s %13s %14s %s", "Node",
-                 "Rebalanced-files", "size", "scanned", "failures", "skipped",
-                 "status", "run-time in secs");
-        cli_out ("%40s %16s %13s %13s %13s %13s %14s %16s", "---------",
-                 "-----------", "-----------", "-----------", "-----------",
-                  "-----------","------------", "--------------");
-
-        do {
-                snprintf (key, 256, "node-name-%d", i);
-                ret = dict_get_str (dict, key, &node_name);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get node-name");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "files-%d", i);
-                ret = dict_get_uint64 (dict, key, &files);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get file count");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "size-%d", i);
-                ret = dict_get_uint64 (dict, key, &size);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get size of xfer");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "lookups-%d", i);
-                ret = dict_get_uint64 (dict, key, &lookup);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get lookedup file count");
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "status-%d", i);
-                ret = dict_get_int32 (dict, key, (int32_t *)&status_rcd);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "failed to get status");
-
-                snprintf (key, 256, "failures-%d", i);
-                ret = dict_get_uint64 (dict, key, &failures);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "Failed to get failure on files");
-
-                snprintf (key, 256, "failures-%d", i);
-                ret = dict_get_uint64 (dict, key, &skipped);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "Failed to get skipped files");
-                memset (key, 0, 256);
-                snprintf (key, 256, "run-time-%d", i);
-                ret = dict_get_double (dict, key, &elapsed);
-                if (ret)
-                        gf_log (frame->this->name, GF_LOG_TRACE,
-                                "Failed to get run-time");
-
-                switch (status_rcd) {
-                case GF_DEFRAG_STATUS_NOT_STARTED:
-                        status = "not started";
-                        break;
-                case GF_DEFRAG_STATUS_STARTED:
-                        status = "in progress";
-                        break;
-                case GF_DEFRAG_STATUS_STOPPED:
-                        status = "stopped";
-                        break;
-                case GF_DEFRAG_STATUS_COMPLETE:
-                        status = "completed";
-                        break;
-                case GF_DEFRAG_STATUS_FAILED:
-                        status = "failed";
-                        break;
-                default:
-                        break;
-                }
-
-                size_str = gf_uint64_2human_readable(size);
-                
-		if (strcmp (status, "not started")) {
-			cli_out ("%40s %16"PRIu64 " %13s" " %13"PRIu64 " %13"
-				PRIu64 " %13"PRIu64 " %14s %16.2f", node_name,
-                                files, size_str, lookup, failures, skipped,
-                                status, elapsed);
-		}
-                GF_FREE(size_str);
-
-                i++;
-        } while (i <= counter);
-
-        if ((cmd == GF_OP_CMD_STOP) && (rsp.op_ret == 0)) {
-                cli_out ("'remove-brick' process may be in the middle of a "
-                         "file migration.\nThe process will be fully stopped "
-                         "once the migration of the file is complete.\nPlease "
-                         "check remove-brick process for completion before "
-                         "doing any further brick related tasks on the "
-                         "volume.");
-        }
-
-out:
-        free (rsp.dict.dict_val); //malloced by xdr
-        if (dict)
-                dict_unref (dict);
-        cli_cmd_broadcast_response (ret);
+        if (rsp.volname)
+                free (rsp.volname);
+        if (rsp.op_errstr)
+                free (rsp.op_errstr);
         return ret;
 }
 
 
 int
-gf_cli_remove_brick_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_remove_brick_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp                      rsp   = {0,};
-        int                             ret   = -1;
-        char                            msg[1024] = {0,};
-        gf1_op_commands                 cmd = GF_OP_CMD_NONE;
-        char                           *cmd_str = "unknown";
-        cli_local_t                    *local = NULL;
-        call_frame_t                   *frame = NULL;
-        char                           *task_id_str = NULL;
-        dict_t                         *rsp_dict = NULL;
+        gf1_cli_remove_brick_rsp        rsp   = {0,};
+        int                             ret   = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        frame = myframe;
-        local = frame->local;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_remove_brick_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
-        ret = dict_get_int32 (local->dict, "command", (int32_t *)&cmd);
-        if (ret) {
-                 gf_log ("", GF_LOG_ERROR, "failed to get command");
-                 goto out;
-        }
-
-        if (rsp.dict.dict_len) {
-                rsp_dict = dict_new ();
-                if (!rsp_dict) {
-                        ret = -1;
-                        goto out;
-                }
-
-                ret = dict_unserialize (rsp.dict.dict_val, rsp.dict.dict_len,
-                                        &rsp_dict);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Failed to unserialize rsp_dict");
-                        goto out;
-                }
-        }
-
-        switch (cmd) {
-        case GF_OP_CMD_START:
-                cmd_str = "start";
-
-                ret = dict_get_str (rsp_dict, GF_REMOVE_BRICK_TID_KEY, &task_id_str);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "remove-brick-id is not present in dict");
-                }
-                break;
-        case GF_OP_CMD_COMMIT:
-                cmd_str = "commit";
-                break;
-        case GF_OP_CMD_COMMIT_FORCE:
-                cmd_str = "commit force";
-                break;
-        default:
-                cmd_str = "unknown";
-                break;
-        }
-
         gf_log ("cli", GF_LOG_INFO, "Received resp to remove brick");
 
         if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
+                cli_out ("%s", rsp.op_errstr);
         else
-                snprintf (msg, sizeof (msg), "Remove Brick %s %s", cmd_str,
-                          (rsp.op_ret) ? "unsuccessful": "successful");
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_remove_brick (_gf_false, rsp_dict,
-                                                       rsp.op_ret, rsp.op_errno,
-                                                       msg);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret) {
-                cli_err ("volume remove-brick %s: failed: %s", cmd_str,
-                         msg);
-        } else {
-                cli_out ("volume remove-brick %s: success", cmd_str);
-                if (GF_OP_CMD_START == cmd && task_id_str != NULL)
-                        cli_out ("ID: %s", task_id_str);
-        }
+                cli_out ("Remove Brick %s", (rsp.op_ret) ? "unsuccessful":
+                                                           "successful");
 
         ret = rsp.op_ret;
 
 out:
         cli_cmd_broadcast_response (ret);
-        free (rsp.dict.dict_val);
-        free (rsp.op_errstr);
-
+        if (rsp.volname)
+                free (rsp.volname);
+        if (rsp.op_errstr)
+                free (rsp.op_errstr);
         return ret;
 }
 
 
 
 int
-gf_cli_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
                              int count, void *myframe)
 {
-        gf_cli_rsp                       rsp              = {0,};
-        int                              ret              = -1;
+        gf1_cli_replace_brick_rsp        rsp              = {0,};
+        int                              ret              = 0;
         cli_local_t                     *local            = NULL;
         call_frame_t                    *frame            = NULL;
         dict_t                          *dict             = NULL;
@@ -2088,9 +1105,6 @@ gf_cli_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
         char                            *status_reply     = NULL;
         gf1_cli_replace_op               replace_op       = 0;
         char                            *rb_operation_str = NULL;
-        dict_t                          *rsp_dict         = NULL;
-        char                             msg[1024]        = {0,};
-        char                            *task_id_str      = NULL;
 
         if (-1 == req->rpc_status) {
                 goto out;
@@ -2098,16 +1112,15 @@ gf_cli_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
 
         frame = (call_frame_t *) myframe;
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_replace_brick_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
         local = frame->local;
         GF_ASSERT (local);
-        dict = local->dict;
+        dict = local->u.replace_brick.dict;
 
         ret = dict_get_int32 (dict, "operation", (int32_t *)&replace_op);
         if (ret) {
@@ -2116,77 +1129,36 @@ gf_cli_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
                 goto out;
         }
 
-        if (rsp.dict.dict_len) {
-                /* Unserialize the dictionary */
-                rsp_dict  = dict_new ();
-
-                ret = dict_unserialize (rsp.dict.dict_val,
-                                rsp.dict.dict_len,
-                                &rsp_dict);
-                if (ret < 0) {
-                        gf_log ("glusterd", GF_LOG_ERROR,
-                                        "failed to "
-                                        "unserialize rsp buffer to dictionary");
-                        goto out;
-                }
-        }
-
         switch (replace_op) {
         case GF_REPLACE_OP_START:
-                if (rsp.op_ret) {
-                        rb_operation_str = gf_strdup ("replace-brick failed to"
-                                                      " start");
-                } else {
-                        ret = dict_get_str (rsp_dict, GF_REPLACE_BRICK_TID_KEY,
-                                            &task_id_str);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR, "Failed to get "
-                                        "\"replace-brick-id\" from dict");
-                                goto out;
-                        }
-                        ret = gf_asprintf (&rb_operation_str,
-                                           "replace-brick started successfully"
-                                           "\nID: %s", task_id_str);
-                        if (ret < 0)
-                                goto out;
-                }
+                if (rsp.op_ret)
+                        rb_operation_str = "replace-brick failed to start";
+                else
+                        rb_operation_str = "replace-brick started successfully";
                 break;
 
         case GF_REPLACE_OP_STATUS:
 
-                if (rsp.op_ret || ret) {
-                        rb_operation_str = gf_strdup ("replace-brick status "
-                                                      "unknown");
-                } else {
-                        ret = dict_get_str (rsp_dict, "status-reply",
-                                            &status_reply);
-                        if (ret) {
-                                gf_log (frame->this->name, GF_LOG_ERROR, "failed to"
-                                        "get status");
-                                goto out;
-                        }
-
-                        rb_operation_str = gf_strdup (status_reply);
-                }
+                status_reply = rsp.status;
+                if (rsp.op_ret || ret)
+                        rb_operation_str = "replace-brick status unknown";
+                else
+                        rb_operation_str = status_reply;
 
                 break;
 
         case GF_REPLACE_OP_PAUSE:
                 if (rsp.op_ret)
-                        rb_operation_str = gf_strdup ("replace-brick pause "
-                                                      "failed");
+                        rb_operation_str = "replace-brick pause failed";
                 else
-                        rb_operation_str = gf_strdup ("replace-brick paused "
-                                                      "successfully");
+                        rb_operation_str = "replace-brick paused successfully";
                 break;
 
         case GF_REPLACE_OP_ABORT:
                 if (rsp.op_ret)
-                        rb_operation_str = gf_strdup ("replace-brick abort "
-                                                      "failed");
+                        rb_operation_str = "replace-brick abort failed";
                 else
-                        rb_operation_str = gf_strdup ("replace-brick aborted "
-                                                      "successfully");
+                        rb_operation_str = "replace-brick aborted successfully";
                 break;
 
         case GF_REPLACE_OP_COMMIT:
@@ -2207,11 +1179,9 @@ gf_cli_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
 
 
                 if (rsp.op_ret || ret)
-                        rb_operation_str = gf_strdup ("replace-brick commit "
-                                                      "failed");
+                        rb_operation_str = "replace-brick commit failed";
                 else
-                        rb_operation_str = gf_strdup ("replace-brick commit "
-                                                      "successful");
+                        rb_operation_str = "replace-brick commit successful";
 
                 break;
 
@@ -2222,140 +1192,141 @@ gf_cli_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
         }
 
         if (rsp.op_ret && (strcmp (rsp.op_errstr, ""))) {
-                rb_operation_str = gf_strdup (rsp.op_errstr);
+                rb_operation_str = rsp.op_errstr;
         }
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to replace brick");
-        snprintf (msg, sizeof (msg), "%s",
-                  rb_operation_str ? rb_operation_str : "Unknown operation");
+        cli_out ("%s",
+                 rb_operation_str ? rb_operation_str : "Unknown operation");
 
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_replace_brick (replace_op, rsp_dict,
-                                                        rsp.op_ret,
-                                                        rsp.op_errno, msg);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
+        ret = rsp.op_ret;
+
+out:
+        if (local) {
+                dict_unref (local->u.replace_brick.dict);
+                GF_FREE (local->u.replace_brick.volname);
+                cli_local_wipe (local);
+        }
+
+        cli_cmd_broadcast_response (ret);
+        return ret;
+}
+
+static int
+gf_cli3_1_log_filename_cbk (struct rpc_req *req, struct iovec *iov,
+                            int count, void *myframe)
+{
+        gf1_cli_log_filename_rsp        rsp   = {0,};
+        int                             ret   = -1;
+
+        if (-1 == req->rpc_status) {
+                goto out;
+        }
+
+        ret = gf_xdr_to_cli_log_filename_rsp (*iov, &rsp);
+        if (ret < 0) {
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
-        if (rsp.op_ret)
-                cli_err ("volume replace-brick: failed: %s", msg);
+        gf_log ("cli", GF_LOG_DEBUG, "Received resp to log filename");
+
+        if (rsp.op_ret && strcmp (rsp.errstr, ""))
+                cli_out (rsp.errstr);
         else
-                cli_out ("volume replace-brick: success: %s", msg);
+                cli_out ("log filename : %s",
+                         (rsp.op_ret) ? "unsuccessful": "successful");
+
         ret = rsp.op_ret;
 
 out:
-        if (frame)
-                frame->local = NULL;
+        cli_cmd_broadcast_response (ret);
+        return ret;
+}
 
-        if (local) {
-                dict_unref (local->dict);
-                cli_local_wipe (local);
+static int
+gf_cli3_1_log_locate_cbk (struct rpc_req *req, struct iovec *iov,
+                          int count, void *myframe)
+{
+        gf1_cli_log_locate_rsp rsp   = {0,};
+        int                    ret   = -1;
+
+        if (-1 == req->rpc_status) {
+                goto out;
         }
 
-        if (rb_operation_str)
-                GF_FREE (rb_operation_str);
+        ret = gf_xdr_to_cli_log_locate_rsp (*iov, &rsp);
+        if (ret < 0) {
+                gf_log ("", GF_LOG_ERROR, "error");
+                goto out;
+        }
 
-        cli_cmd_broadcast_response (ret);
-        free (rsp.dict.dict_val);
-        if (rsp_dict)
-                dict_unref (rsp_dict);
+        gf_log ("cli", GF_LOG_DEBUG, "Received resp to log locate");
+        cli_out ("log file location: %s", rsp.path);
 
+        ret = rsp.op_ret;
+
+out:
+        cli_cmd_broadcast_response (ret);
         return ret;
 }
 
-
 static int
-gf_cli_log_rotate_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_log_rotate_cbk (struct rpc_req *req, struct iovec *iov,
                           int count, void *myframe)
 {
-        gf_cli_rsp             rsp   = {0,};
+        gf1_cli_log_rotate_rsp rsp   = {0,};
         int                    ret   = -1;
-        char                   msg[1024] = {0,};
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_log_rotate_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_DEBUG, "Received resp to log rotate");
 
-        if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
+        if (rsp.op_ret && strcmp (rsp.errstr, ""))
+                cli_out (rsp.errstr);
         else
-                snprintf (msg, sizeof (msg), "log rotate %s",
-                          (rsp.op_ret) ? "unsuccessful": "successful");
+                cli_out ("log rotate %s", (rsp.op_ret) ? "unsuccessful":
+                                                         "successful");
 
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str ("volLogRotate", msg, rsp.op_ret,
-                                          rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret)
-                cli_err ("volume log-rotate: failed: %s", msg);
-        else
-                cli_out ("volume log-rotate: success");
         ret = rsp.op_ret;
 
 out:
         cli_cmd_broadcast_response (ret);
-        free (rsp.dict.dict_val);
-
         return ret;
 }
 
 static int
-gf_cli_sync_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_sync_volume_cbk (struct rpc_req *req, struct iovec *iov,
                            int count, void *myframe)
 {
-        gf_cli_rsp                     rsp   = {0,};
+        gf1_cli_sync_volume_rsp        rsp   = {0,};
         int                            ret   = -1;
-        char                           msg[1024] = {0,};
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_sync_volume_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_DEBUG, "Received resp to sync");
 
         if (rsp.op_ret && strcmp (rsp.op_errstr, ""))
-                snprintf (msg, sizeof (msg), "volume sync: failed: %s",
-                          rsp.op_errstr);
+                cli_out (rsp.op_errstr);
         else
-                snprintf (msg, sizeof (msg), "volume sync: %s",
-                          (rsp.op_ret) ? "failed": "success");
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str ("volSync", msg, rsp.op_ret,
-                                          rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret)
-                cli_err ("%s", msg);
-        else
-                cli_out ("%s", msg);
+                cli_out ("volume sync: %s",
+                         (rsp.op_ret) ? "unsuccessful": "successful");
         ret = rsp.op_ret;
 
 out:
@@ -2364,21 +1335,19 @@ out:
 }
 
 int32_t
-gf_cli_print_limit_list (char *volname, char *limit_list,
+gf_cli3_1_print_limit_list (char *volname, char *limit_list,
                             char *op_errstr)
 {
         int64_t  size            = 0;
         int64_t  limit_value     = 0;
-        int32_t  i, j;
+        int32_t  i, j, k;
         int32_t  len = 0, ret    = -1;
         char     *size_str       = NULL;
         char     path [PATH_MAX] = {0, };
         char     ret_str [1024]  = {0, };
         char     value [1024]    = {0, };
         char     mountdir []     = "/tmp/mntXXXXXX";
-        char     abspath [PATH_MAX] = {0, };
-        char     *colon_ptr      = NULL;
-        runner_t runner          = {0,};
+        char     cmd_str [PATH_MAX + 1024] = {0, };
 
         GF_VALIDATE_OR_GOTO ("cli", volname, out);
         GF_VALIDATE_OR_GOTO ("cli", limit_list, out);
@@ -2386,9 +1355,8 @@ gf_cli_print_limit_list (char *volname, char *limit_list,
         if (!connected)
                 goto out;
 
-        len = strlen (limit_list);
-        if (len == 0) {
-                cli_err ("%s", op_errstr?op_errstr:"quota limit not set ");
+        if (strcmp (limit_list, "") == 0) {
+                cli_out ("%s", op_errstr?op_errstr:"quota limit not set ");
                 goto out;
         }
 
@@ -2402,10 +1370,10 @@ gf_cli_print_limit_list (char *volname, char *limit_list,
         /* Mount a temporary client to fetch the disk usage
          * of the directory on which the limit is set.
          */
-        ret = runcmd (SBIN_DIR"/glusterfs", "-s",
-                      "localhost", "--volfile-id", volname, "-l",
-                      DEFAULT_LOG_FILE_DIRECTORY"/quota-list.log",
-                      mountdir, NULL);
+        snprintf (cmd_str, sizeof (cmd_str), GFS_PREFIX "/sbin/glusterfs -s localhost "
+                  "--volfile-id %s %s", volname, mountdir);
+
+        ret = system (cmd_str);
         if (ret) {
                 gf_log ("cli", GF_LOG_WARNING, "failed to mount glusterfs client");
                 ret = -1;
@@ -2414,7 +1382,7 @@ gf_cli_print_limit_list (char *volname, char *limit_list,
 
         len = strlen (limit_list);
         if (len == 0) {
-                cli_err ("quota limit not set ");
+                cli_out ("quota limit not set ");
                 goto unmount;
         }
 
@@ -2425,20 +1393,24 @@ gf_cli_print_limit_list (char *volname, char *limit_list,
                  "-----------------------");
         while (i < len) {
                 j = 0;
+                k = 0;
 
-                while (limit_list [i] != ',' && limit_list [i] != '\0') {
-                        path [j++] = limit_list[i++];
+                while (limit_list [i] != ':') {
+                        path [k++] = limit_list [i++];
                 }
-                path [j] = '\0';
-                //here path[] contains both path and limit value
+                path [k] = '\0';
+
+                i++;  //skip ':'
 
-                colon_ptr = strrchr (path, ':');
-                *colon_ptr = '\0';
-                strcpy (value, ++colon_ptr);
+                while (limit_list [i] != ',' && limit_list [i] != '\0') {
+                        value [j++] = limit_list[i++];
+                }
+                value [j] = '\0';
 
-                snprintf (abspath, sizeof (abspath), "%s/%s", mountdir, path);
+                memset (&cmd_str, 0, sizeof (cmd_str));
+                snprintf (cmd_str, sizeof (cmd_str), "%s/%s", mountdir, path);
 
-                ret = sys_lgetxattr (abspath, "trusted.limit.list", (void *) ret_str, 4096);
+                ret = sys_lgetxattr (cmd_str, "trusted.limit.list", (void *) ret_str, 4096);
                 if (ret < 0) {
                         cli_out ("%-20s %10s", path, value);
                 } else {
@@ -2458,18 +1430,17 @@ gf_cli_print_limit_list (char *volname, char *limit_list,
         }
 
 unmount:
+        memset (&cmd_str, 0, sizeof (cmd_str));
 
-        runinit (&runner);
-        runner_add_args (&runner, "umount",
 #if GF_LINUX_HOST_OS
-                         "-l",
+        usleep (200000);
+        snprintf (cmd_str, sizeof (cmd_str), "umount -l %s", mountdir);
+#else
+        snprintf (cmd_str, sizeof (cmd_str), "umount %s", mountdir);
 #endif
-                         mountdir, NULL);
-        ret = runner_run_reuse (&runner);
+        ret = system (cmd_str);
         if (ret)
-                runner_log (&runner, "cli", GF_LOG_WARNING, "error executing");
-        runner_end (&runner);
-
+                gf_log ("cli", GF_LOG_WARNING, "error executing: %s", cmd_str);
 rm_dir:
         rmdir (mountdir);
 out:
@@ -2477,155 +1448,64 @@ out:
 }
 
 int
-gf_cli_quota_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_quota_cbk (struct rpc_req *req, struct iovec *iov,
                      int count, void *myframe)
 {
-        gf_cli_rsp         rsp        = {0,};
-        int                ret        = -1;
-        dict_t            *dict       = NULL;
-        char              *volname    = NULL;
-        char              *limit_list = NULL;
-        int32_t            type       = 0;
-        char               msg[1024]  = {0,};
-        call_frame_t      *frame      = NULL;
+        gf1_cli_quota_rsp  rsp        = {0,};
+        int                ret        = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_quota_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
         if (rsp.op_ret &&
             strcmp (rsp.op_errstr, "") == 0) {
-                snprintf (msg, sizeof (msg), "command unsuccessful %s",
-                          rsp.op_errstr);
-
-                if (global_state->mode & GLUSTER_MODE_XML)
-                        goto xml_output;
+                cli_out ("command unsuccessful %s", rsp.op_errstr);
                 goto out;
         }
 
-        if (rsp.dict.dict_len) {
-                /* Unserialize the dictionary */
-                dict  = dict_new ();
-
-                ret = dict_unserialize (rsp.dict.dict_val,
-                                        rsp.dict.dict_len,
-                                        &dict);
-                if (ret < 0) {
-                        gf_log ("glusterd", GF_LOG_ERROR,
-                                "failed to "
-                                "unserialize req-buffer to dictionary");
-                        goto out;
-                }
-        }
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                gf_log (frame->this->name, GF_LOG_TRACE,
-                        "failed to get volname");
-
-        ret = dict_get_str (dict, "limit_list", &limit_list);
-        if (ret)
-                gf_log (frame->this->name, GF_LOG_TRACE,
-                        "failed to get limit_list");
-
-        ret = dict_get_int32 (dict, "type", &type);
-        if (ret)
-                gf_log (frame->this->name, GF_LOG_TRACE,
-                        "failed to get type");
-
-        if (type == GF_QUOTA_OPTION_TYPE_LIST) {
-                if (global_state->mode & GLUSTER_MODE_XML) {
-                        ret = cli_xml_output_vol_quota_limit_list
-                                (volname, limit_list, rsp.op_ret,
-                                 rsp.op_errno, rsp.op_errstr);
-                        if (ret)
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
-                        goto out;
-
-                }
-
-                if (limit_list) {
-                        gf_cli_print_limit_list (volname,
-                                                    limit_list,
+        if (rsp.type == GF_QUOTA_OPTION_TYPE_LIST) {
+                if (rsp.limit_list) {
+                        gf_cli3_1_print_limit_list (rsp.volname,
+                                                    rsp.limit_list,
                                                     rsp.op_errstr);
-                } else {
-                        gf_log ("cli", GF_LOG_INFO, "Received resp to quota "
-                                "command ");
-                        if (rsp.op_errstr)
-                                snprintf (msg, sizeof (msg), "%s",
-                                          rsp.op_errstr);
                 }
         } else {
                 gf_log ("cli", GF_LOG_INFO, "Received resp to quota command ");
                 if (rsp.op_errstr)
-                        snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
-                else
-                        snprintf (msg, sizeof (msg), "successful");
-        }
-
-xml_output:
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str ("volQuota", msg, rsp.op_ret,
-                                          rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (strlen (msg) > 0) {
-                if (rsp.op_ret)
-                        cli_err ("%s", msg);
+                        cli_out ("%s", rsp.op_errstr);
                 else
-                        cli_out ("%s", msg);
+                        cli_out ("%s", "successful");
         }
 
-        ret = rsp.op_ret;
 out:
-        cli_cmd_broadcast_response (ret);
-        if (dict)
-                dict_unref (dict);
-
-        free (rsp.dict.dict_val);
+        ret = rsp.op_ret;
 
+        cli_cmd_broadcast_response (ret);
         return ret;
 }
 
 int
-gf_cli_getspec_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_getspec_cbk (struct rpc_req *req, struct iovec *iov,
                        int count, void *myframe)
 {
         gf_getspec_rsp          rsp   = {0,};
-        int                     ret   = -1;
+        int                     ret   = 0;
         char                   *spec  = NULL;
-        call_frame_t           *frame = NULL;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_getspec_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        if (rsp.op_ret == -1) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "getspec failed");
+        ret = xdr_to_getspec_rsp (*iov, &rsp);
+        if (ret < 0 || rsp.op_ret == -1) {
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
@@ -2649,30 +1529,20 @@ out:
 }
 
 int
-gf_cli_pmap_b2p_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_pmap_b2p_cbk (struct rpc_req *req, struct iovec *iov,
                         int count, void *myframe)
 {
         pmap_port_by_brick_rsp rsp = {0,};
-        int                     ret   = -1;
+        int                     ret   = 0;
         char                   *spec  = NULL;
-        call_frame_t           *frame = NULL;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_pmap_port_by_brick_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        if (rsp.op_ret == -1) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "pump_b2p failed");
+        ret = xdr_to_pmap_port_by_brick_rsp (*iov, &rsp);
+        if (ret < 0 || rsp.op_ret == -1) {
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
@@ -2690,12 +1560,13 @@ out:
 
 
 int32_t
-gf_cli_probe (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_probe (call_frame_t *frame, xlator_t *this,
                  void *data)
 {
-        gf_cli_req         req      = {{0,},};
+        gf1_cli_probe_req  req      = {0,};
         int                ret      = 0;
         dict_t            *dict     = NULL;
+        char              *hostname = NULL;
         int                port     = 0;
 
         if (!frame || !this ||  !data) {
@@ -2704,34 +1575,35 @@ gf_cli_probe (call_frame_t *frame, xlator_t *this,
         }
 
         dict = data;
+        ret = dict_get_str (dict, "hostname", &hostname);
+        if (ret)
+                goto out;
 
         ret = dict_get_int32 (dict, "port", &port);
-        if (ret) {
-                ret = dict_set_int32 (dict, "port", CLI_GLUSTERD_PORT);
-                if (ret)
-                        goto out;
-        }
+        if (ret)
+                port = CLI_GLUSTERD_PORT;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_probe_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_PROBE, this, cli_rpc_prog, NULL);
+        req.hostname = hostname;
+        req.port     = port;
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_PROBE, NULL, gf_xdr_from_cli_probe_req,
+                              this, gf_cli3_1_probe_cbk);
 
 out:
-        GF_FREE (req.dict.dict_val);
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-
         return ret;
 }
 
 int32_t
-gf_cli_deprobe (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_deprobe (call_frame_t *frame, xlator_t *this,
                    void *data)
 {
-        gf_cli_req           req      = {{0,},};
+        gf1_cli_deprobe_req  req      = {0,};
         int                  ret      = 0;
         dict_t              *dict     = NULL;
+        char                *hostname = NULL;
         int                  port     = 0;
-        int                  flags    = 0;
 
         if (!frame || !this ||  !data) {
                 ret = -1;
@@ -2739,70 +1611,53 @@ gf_cli_deprobe (call_frame_t *frame, xlator_t *this,
         }
 
         dict = data;
+        ret = dict_get_str (dict, "hostname", &hostname);
+        if (ret)
+                goto out;
+
         ret = dict_get_int32 (dict, "port", &port);
-        if (ret) {
-                ret = dict_set_int32 (dict, "port", CLI_GLUSTERD_PORT);
-                if (ret)
-                        goto out;
-        }
+        if (ret)
+                port = CLI_GLUSTERD_PORT;
 
-        ret = dict_get_int32 (dict, "flags", &flags);
-        if (ret) {
-                ret = dict_set_int32 (dict, "flags", 0);
-                if (ret)
-                        goto out;
-        }
+        req.hostname = hostname;
+        req.port     = port;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_deprobe_cbk,
-                               (xdrproc_t)xdr_gf_cli_req, dict,
-                              GLUSTER_CLI_DEPROBE, this, cli_rpc_prog, NULL);
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_DEPROBE, NULL,
+                              gf_xdr_from_cli_deprobe_req,
+                              this, gf_cli3_1_deprobe_cbk);
 
 out:
-        GF_FREE (req.dict.dict_val);
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-
         return ret;
 }
 
 int32_t
-gf_cli_list_friends (call_frame_t *frame, xlator_t *this,
-                     void *data)
+gf_cli3_1_list_friends (call_frame_t *frame, xlator_t *this,
+                        void *data)
 {
         gf1_cli_peer_list_req   req = {0,};
         int                     ret = 0;
-        unsigned long           flags = 0;
 
         if (!frame || !this) {
                 ret = -1;
                 goto out;
         }
 
-        GF_ASSERT (frame->local == NULL);
+        req.flags = GF_CLI_LIST_ALL;
 
-        flags = (long)data;
-        req.flags = flags;
-        frame->local = (void*)flags;
         ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
                               GLUSTER_CLI_LIST_FRIENDS, NULL,
-                              this, gf_cli_list_friends_cbk,
-                              (xdrproc_t) xdr_gf1_cli_peer_list_req);
+                              gf_xdr_from_cli_peer_list_req,
+                              this, gf_cli3_1_list_friends_cbk);
 
 out:
-        if (ret) {
-                /*
-                 * If everything goes fine, gf_cli_list_friends_cbk()
-                 * [invoked through cli_cmd_submit()]resets the
-                 * frame->local to NULL. In case cli_cmd_submit()
-                 * fails in between, RESET frame->local here.
-                 */
-                frame->local = NULL;
-        }
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
 }
 
 int32_t
-gf_cli_get_next_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_get_next_volume (call_frame_t *frame, xlator_t *this,
                            void *data)
 {
 
@@ -2816,58 +1671,37 @@ gf_cli_get_next_volume (call_frame_t *frame, xlator_t *this,
         }
 
         ctx = data;
-        local = frame->local;
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_info_begin (local, 0, 0, "");
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR, "Error outputting to xml");
-                        goto out;
-                }
-        }
-
-        ret = gf_cli_get_volume (frame, this, data);
 
+        ret = gf_cli3_1_get_volume (frame, this, data);
 
-        if (!local || !local->get_vol.volname) {
-                if ((global_state->mode & GLUSTER_MODE_XML))
-                        goto end_xml;
+        local = frame->local;
 
-                cli_err ("No volumes present");
+        if (!local || !local->u.get_vol.volname) {
+                cli_out ("No volumes present");
                 goto out;
         }
 
-
-        ctx->volname = local->get_vol.volname;
+        ctx->volname = local->u.get_vol.volname;
 
         while (ctx->volname) {
-                ret = gf_cli_get_volume (frame, this, ctx);
+                ret = gf_cli3_1_get_volume (frame, this, ctx);
                 if (ret)
                         goto out;
-                ctx->volname = local->get_vol.volname;
-        }
-
-end_xml:
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_info_end (local);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR, "Error outputting to xml");
+                ctx->volname = local->u.get_vol.volname;
         }
 
 out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
 }
 
 int32_t
-gf_cli_get_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_get_volume (call_frame_t *frame, xlator_t *this,
                       void *data)
 {
-        gf_cli_req                      req = {{0,}};
+        gf1_cli_get_vol_req             req = {0,};
         int                             ret = 0;
         cli_cmd_volume_get_ctx_t        *ctx = NULL;
         dict_t                          *dict = NULL;
-        int32_t                         flags = 0;
 
         if (!frame || !this || !data) {
                 ret = -1;
@@ -2875,6 +1709,7 @@ gf_cli_get_volume (call_frame_t *frame, xlator_t *this,
         }
 
         ctx = data;
+        req.flags = ctx->flags;
 
         dict = dict_new ();
         if (!dict)
@@ -2886,151 +1721,146 @@ gf_cli_get_volume (call_frame_t *frame, xlator_t *this,
                         goto out;
         }
 
-        flags = ctx->flags;
-        ret = dict_set_int32 (dict, "flags", flags);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR, "failed to set flags");
-                goto out;
-        }
-
-        ret = dict_allocate_and_serialize (dict, &req.dict.dict_val,
-                                           &req.dict.dict_len);
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.dict.dict_val,
+                                           (size_t *)&req.dict.dict_len);
 
         ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
                               GLUSTER_CLI_GET_VOLUME, NULL,
-                              this, gf_cli_get_volume_cbk,
-                              (xdrproc_t) xdr_gf_cli_req);
+                              gf_xdr_from_cli_get_vol_req,
+                              this, gf_cli3_1_get_volume_cbk);
 
 out:
-        if (dict)
-                dict_unref (dict);
-
-        GF_FREE (req.dict.dict_val);
-
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
 }
 
+
 int32_t
-gf_cli3_1_uuid_get (call_frame_t *frame, xlator_t *this,
-                      void *data)
+gf_cli3_1_create_volume (call_frame_t *frame, xlator_t *this,
+                         void *data)
 {
-        gf_cli_req                      req = {{0,}};
-        int                             ret = 0;
-        dict_t                          *dict = NULL;
+        gf1_cli_create_vol_req  req = {0,};
+        int                     ret = 0;
+        dict_t                  *dict = NULL;
+        cli_local_t             *local = NULL;
 
-        if (!frame || !this || !data) {
+        if (!frame || !this ||  !data) {
                 ret = -1;
                 goto out;
         }
 
-        dict = data;
-        ret = cli_to_glusterd (&req, frame, gf_cli3_1_uuid_get_cbk,
-                               (xdrproc_t)xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_UUID_GET, this, cli_rpc_prog,
-                               NULL);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
+        dict = dict_ref ((dict_t *)data);
 
-int32_t
-gf_cli3_1_uuid_reset (call_frame_t *frame, xlator_t *this,
-                      void *data)
-{
-        gf_cli_req                      req = {{0,}};
-        int                             ret = 0;
-        dict_t                          *dict = NULL;
+        ret = dict_get_str (dict, "volname", &req.volname);
 
-        if (!frame || !this || !data) {
-                ret = -1;
+        if (ret)
                 goto out;
-        }
 
-        dict = data;
-        ret = cli_to_glusterd (&req, frame, gf_cli3_1_uuid_reset_cbk,
-                               (xdrproc_t)xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_UUID_RESET, this, cli_rpc_prog,
-                               NULL);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
+        ret = dict_get_int32 (dict, "type", (int32_t *)&req.type);
 
-int32_t
-gf_cli_create_volume (call_frame_t *frame, xlator_t *this,
-                         void *data)
-{
-        gf_cli_req              req = {{0,}};
-        int                     ret = 0;
-        dict_t                  *dict = NULL;
+        if (ret)
+                goto out;
 
-        if (!frame || !this ||  !data) {
-                ret = -1;
+        ret = dict_get_int32 (dict, "count", &req.count);
+        if (ret)
+                goto out;
+
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.bricks.bricks_val,
+                                           (size_t *)&req.bricks.bricks_len);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "failed to get serialized length of dict");
                 goto out;
         }
 
-        dict = data;
+        local = cli_local_get ();
+
+        if (local) {
+                local->u.create_vol.dict = dict_ref (dict);
+                frame->local = local;
+        }
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_CREATE_VOLUME, NULL,
+                              gf_xdr_from_cli_create_vol_req,
+                              this, gf_cli3_1_create_volume_cbk);
+
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_create_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_CREATE_VOLUME, this, cli_rpc_prog,
-                               NULL);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
 
-        GF_FREE (req.dict.dict_val);
+        if (dict)
+                dict_unref (dict);
+
+        if (req.bricks.bricks_val) {
+                GF_FREE (req.bricks.bricks_val);
+        }
 
         return ret;
 }
 
 int32_t
-gf_cli_delete_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_delete_volume (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req              req = {{0,}};
+        gf1_cli_delete_vol_req  req = {0,};
         int                     ret = 0;
-        dict_t                  *dict = NULL;
+        cli_local_t             *local = NULL;
 
         if (!frame || !this ||  !data) {
                 ret = -1;
                 goto out;
         }
 
-        dict = data;
+        local = cli_local_get ();
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_delete_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_DELETE_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        if (local) {
+                local->u.delete_vol.volname = data;
+                frame->local = local;
+        }
+
+        req.volname = data;
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_DELETE_VOLUME, NULL,
+                              gf_xdr_from_cli_delete_vol_req,
+                              this, gf_cli3_1_delete_volume_cbk);
 
 out:
-        GF_FREE (req.dict.dict_val);
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
 
         return ret;
 }
 
 int32_t
-gf_cli_start_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_start_volume (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req              req = {{0,}};
+        gf1_cli_start_vol_req   *req = NULL;
         int                     ret = 0;
-        dict_t                  *dict = NULL;
+        cli_local_t             *local = NULL;
 
         if (!frame || !this ||  !data) {
                 ret = -1;
                 goto out;
         }
 
-        dict = data;
+        req = data;
+        local = cli_local_get ();
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_start_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_START_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        if (local) {
+                local->u.start_vol.volname = req->volname;
+                local->u.start_vol.flags = req->flags;
+                frame->local = local;
+        }
+
+        ret = cli_cmd_submit (req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_START_VOLUME, NULL,
+                              gf_xdr_from_cli_start_vol_req,
+                              this, gf_cli3_1_start_volume_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
@@ -3039,24 +1869,31 @@ out:
 }
 
 int32_t
-gf_cli_stop_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_stop_volume (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req             req = {{0,}};
+        gf1_cli_stop_vol_req   req = {0,};
         int                    ret = 0;
-        dict_t                 *dict = data;
+        cli_local_t            *local = NULL;
 
         if (!frame || !this ||  !data) {
                 ret = -1;
                 goto out;
         }
 
-        dict = data;
+        req = *((gf1_cli_stop_vol_req*)data);
+        local = cli_local_get ();
+
+        if (local) {
+                local->u.stop_vol.volname = req.volname;
+                local->u.stop_vol.flags = req.flags;
+                frame->local = local;
+        }
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_stop_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_STOP_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_STOP_VOLUME, NULL,
+                              gf_xdr_from_cli_stop_vol_req,
+                              this, gf_cli3_1_stop_volume_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
@@ -3065,11 +1902,14 @@ out:
 }
 
 int32_t
-gf_cli_defrag_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_defrag_volume (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req              req     =  {{0,}};
+        gf1_cli_defrag_vol_req  req     = {0,};
         int                     ret     = 0;
+        cli_local_t            *local   = NULL;
+        char                   *volname = NULL;
+        char                   *cmd_str = NULL;
         dict_t                 *dict    = NULL;
 
         if (!frame || !this ||  !data) {
@@ -3079,10 +1919,52 @@ gf_cli_defrag_volume (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_defrag_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_DEFRAG_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        ret = dict_get_str (dict, "volname", &volname);
+        if (ret)
+                gf_log ("", GF_LOG_DEBUG, "error");
+
+        ret = dict_get_str (dict, "command", &cmd_str);
+        if (ret) {
+                gf_log ("", GF_LOG_DEBUG, "error");
+                goto out;
+        }
+
+        if (strcmp (cmd_str, "start") == 0) {
+                req.cmd = GF_DEFRAG_CMD_START;
+                ret = dict_get_str (dict, "start-type", &cmd_str);
+                if (!ret) {
+                        if (strcmp (cmd_str, "fix-layout") == 0) {
+                                req.cmd = GF_DEFRAG_CMD_START_LAYOUT_FIX;
+                        }
+                        if (strcmp (cmd_str, "migrate-data") == 0) {
+                                req.cmd = GF_DEFRAG_CMD_START_MIGRATE_DATA;
+                        }
+                }
+                goto done;
+        }
+        if (strcmp (cmd_str, "stop") == 0) {
+                req.cmd = GF_DEFRAG_CMD_STOP;
+                goto done;
+        }
+        if (strcmp (cmd_str, "status") == 0) {
+                req.cmd = GF_DEFRAG_CMD_STATUS;
+        }
+
+done:
+        local = cli_local_get ();
+
+        if (local) {
+                local->u.defrag_vol.volname = gf_strdup (volname);
+                local->u.defrag_vol.cmd = req.cmd;
+                frame->local = local;
+        }
+
+        req.volname = volname;
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_DEFRAG_VOLUME, NULL,
+                              gf_xdr_from_cli_defrag_vol_req,
+                              this, gf_cli3_1_defrag_volume_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
@@ -3091,10 +1973,10 @@ out:
 }
 
 int32_t
-gf_cli_rename_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_rename_volume (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req              req = {{0,}};
+        gf1_cli_rename_vol_req  req = {0,};
         int                     ret = 0;
         dict_t                  *dict = NULL;
 
@@ -3105,20 +1987,20 @@ gf_cli_rename_volume (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = dict_allocate_and_serialize (dict, &req.dict.dict_val,
-                                           &req.dict.dict_len);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to serialize the data");
+        ret = dict_get_str (dict, "old-volname", &req.old_volname);
 
+        if (ret)
                 goto out;
-        }
 
+        ret = dict_get_str (dict, "new-volname", &req.new_volname);
+
+        if (ret)
+                goto out;
 
         ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
                               GLUSTER_CLI_RENAME_VOLUME, NULL,
-                              this, gf_cli_rename_volume_cbk,
-                              (xdrproc_t) xdr_gf_cli_req);
+                              gf_xdr_from_cli_rename_vol_req,
+                              this, gf_cli3_1_rename_volume_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
@@ -3127,10 +2009,10 @@ out:
 }
 
 int32_t
-gf_cli_reset_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_reset_volume (call_frame_t *frame, xlator_t *this, 
                         void *data)
 {
-        gf_cli_req              req =  {{0,}};
+        gf1_cli_reset_vol_req     req = {0,};
         int                     ret = 0;
         dict_t                  *dict = NULL;
 
@@ -3141,21 +2023,37 @@ gf_cli_reset_volume (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_reset_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_RESET_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        ret = dict_get_str (dict, "volname", &req.volname);
+
+        if (ret)
+                goto out;
+
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.dict.dict_val,
+                                           (size_t *)&req.dict.dict_len);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "failed to get serialized length of dict");
+                goto out;
+        }
+
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                               GLUSTER_CLI_RESET_VOLUME, NULL,
+                               gf_xdr_from_cli_reset_vol_req,
+                               this, gf_cli3_1_reset_volume_cbk);
 
 out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
+                gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
+
         return ret;
 }
 
 int32_t
-gf_cli_set_volume (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_set_volume (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req              req =  {{0,}};
+        gf1_cli_set_vol_req     req = {0,};
         int                     ret = 0;
         dict_t                  *dict = NULL;
 
@@ -3166,10 +2064,25 @@ gf_cli_set_volume (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_set_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_SET_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        ret = dict_get_str (dict, "volname", &req.volname);
+
+        if (ret)
+                goto out;
+
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.dict.dict_val,
+                                           (size_t *)&req.dict.dict_len);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "failed to get serialized length of dict");
+                goto out;
+        }
+
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_SET_VOLUME, NULL,
+                              gf_xdr_from_cli_set_vol_req,
+                              this, gf_cli3_1_set_volume_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
@@ -3178,14 +2091,12 @@ out:
 }
 
 int32_t
-gf_cli_add_brick (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_add_brick (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req              req =  {{0,}};
+        gf1_cli_add_brick_req  req = {0,};
         int                     ret = 0;
         dict_t                  *dict = NULL;
-        char                    *volname = NULL;
-        int32_t                 count = 0;
 
         if (!frame || !this ||  !data) {
                 ret = -1;
@@ -3194,39 +2105,47 @@ gf_cli_add_brick (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = dict_get_str (dict, "volname", &volname);
+        ret = dict_get_str (dict, "volname", &req.volname);
 
         if (ret)
                 goto out;
 
-        ret = dict_get_int32 (dict, "count", &count);
+        ret = dict_get_int32 (dict, "count", &req.count);
         if (ret)
                 goto out;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_add_brick_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_ADD_BRICK, this, cli_rpc_prog, NULL);
+
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.bricks.bricks_val,
+                                           (size_t *)&req.bricks.bricks_len);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "failed to get serialized length of dict");
+                goto out;
+        }
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_ADD_BRICK, NULL,
+                              gf_xdr_from_cli_add_brick_req,
+                              this, gf_cli3_1_add_brick_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
 
-        GF_FREE (req.dict.dict_val);
+        if (req.bricks.bricks_val) {
+                GF_FREE (req.bricks.bricks_val);
+        }
 
         return ret;
 }
 
 int32_t
-gf_cli_remove_brick (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_remove_brick (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req                req =  {{0,}};;
-        gf_cli_req                status_req =  {{0,}};;
+        gf1_cli_remove_brick_req  req = {0,};
         int                       ret = 0;
-        dict_t                   *dict = NULL;
-        int32_t                   command = 0;
-        char                     *volname = NULL;
-        dict_t                   *req_dict = NULL;
-        int32_t                   cmd = 0;
+        dict_t                    *dict = NULL;
 
         if (!frame || !this ||  !data) {
                 ret = -1;
@@ -3235,101 +2154,91 @@ gf_cli_remove_brick (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
+        ret = dict_get_str (dict, "volname", &req.volname);
 
-        ret = dict_get_int32 (dict, "command", &command);
         if (ret)
                 goto out;
 
-        if ((command != GF_OP_CMD_STATUS) &&
-            (command != GF_OP_CMD_STOP)) {
-
+        ret = dict_get_int32 (dict, "count", &req.count);
 
-                ret = cli_to_glusterd (&req, frame, gf_cli_remove_brick_cbk,
-                                       (xdrproc_t) xdr_gf_cli_req, dict,
-                                       GLUSTER_CLI_REMOVE_BRICK, this,
-                                       cli_rpc_prog, NULL);
-        } else {
-                /* Need rebalance status to be sent :-) */
-                req_dict = dict_new ();
-                if (!req_dict) {
-                        ret = -1;
-                        goto out;
-                }
-
-                ret = dict_set_str (req_dict, "volname", volname);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "Failed to set dict");
-                        goto out;
-                }
-
-                if (command == GF_OP_CMD_STATUS)
-                        cmd |= GF_DEFRAG_CMD_STATUS;
-                else
-                        cmd |= GF_DEFRAG_CMD_STOP;
+        if (ret)
+                goto out;
 
-                ret = dict_set_int32 (req_dict, "rebalance-command", (int32_t) cmd);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "Failed to set dict");
-                        goto out;
-                }
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.bricks.bricks_val,
+                                           (size_t *)&req.bricks.bricks_len);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "failed to get serialized length of dict");
+                goto out;
+        }
 
-                ret = cli_to_glusterd (&status_req, frame,
-                                       gf_cli3_remove_brick_status_cbk,
-                                       (xdrproc_t) xdr_gf_cli_req, req_dict,
-                                       GLUSTER_CLI_DEFRAG_VOLUME, this,
-                                       cli_rpc_prog, NULL);
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_REMOVE_BRICK, NULL,
+                              gf_xdr_from_cli_remove_brick_req,
+                              this, gf_cli3_1_remove_brick_cbk);
 
-                }
 
 out:
-        if (req_dict)
-                dict_unref (req_dict);
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
 
-        GF_FREE (req.dict.dict_val);
-
-        GF_FREE (status_req.dict.dict_val);
+        if (req.bricks.bricks_val) {
+                GF_FREE (req.bricks.bricks_val);
+        }
 
         return ret;
 }
 
 int32_t
-gf_cli_replace_brick (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_replace_brick (call_frame_t *frame, xlator_t *this,
                          void *data)
 {
-        gf_cli_req                  req        =  {{0,}};
+        gf1_cli_replace_brick_req   req        = {0,};
         int                         ret        = 0;
+        cli_local_t                *local      = NULL;
         dict_t                     *dict       = NULL;
         char                       *src_brick  = NULL;
         char                       *dst_brick  = NULL;
-        char                       *volname    = NULL;
-        int32_t                     op         = 0;
 
         if (!frame || !this ||  !data) {
                 ret = -1;
                 goto out;
         }
 
-        dict = data;
+	dict = data;
+
+        local = cli_local_get ();
+        if (!local) {
+                ret = -1;
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Out of memory");
+                goto out;
+        }
+
+        local->u.replace_brick.dict = dict_ref (dict);
+        frame->local                = local;
 
-        ret = dict_get_int32 (dict, "operation", &op);
+        ret = dict_get_int32 (dict, "operation", (int32_t *)&req.op);
         if (ret) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "dict_get on operation failed");
                 goto out;
         }
-        ret = dict_get_str (dict, "volname", &volname);
+        ret = dict_get_str (dict, "volname", &req.volname);
         if (ret) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "dict_get on volname failed");
                 goto out;
         }
 
+        local->u.replace_brick.volname = gf_strdup (req.volname);
+        if (!local->u.replace_brick.volname) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Out of memory");
+                ret = -1;
+                goto out;
+        }
+
         ret = dict_get_str (dict, "src-brick", &src_brick);
         if (ret) {
                 gf_log (this->name, GF_LOG_DEBUG,
@@ -3345,29 +2254,40 @@ gf_cli_replace_brick (call_frame_t *frame, xlator_t *this,
         }
 
         gf_log (this->name, GF_LOG_DEBUG,
-                "Received command replace-brick %s with "
+                "Recevied command replace-brick %s with "
                 "%s with operation=%d", src_brick,
-                dst_brick, op);
+                dst_brick, req.op);
+
+
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.bricks.bricks_val,
+                                           (size_t *)&req.bricks.bricks_len);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "failed to get serialized length of dict");
+                goto out;
+        }
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_replace_brick_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_REPLACE_BRICK, this, cli_rpc_prog,
-                               NULL);
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_REPLACE_BRICK, NULL,
+                              gf_xdr_from_cli_replace_brick_req,
+                              this, gf_cli3_1_replace_brick_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
 
-        GF_FREE (req.dict.dict_val);
+        if (req.bricks.bricks_val) {
+                GF_FREE (req.bricks.bricks_val);
+        }
 
         return ret;
 }
 
-
 int32_t
-gf_cli_log_rotate (call_frame_t *frame, xlator_t *this,
-                      void *data)
+gf_cli3_1_log_filename (call_frame_t *frame, xlator_t *this,
+                        void *data)
 {
-        gf_cli_req                req = {{0,}};
+        gf1_cli_log_filename_req  req = {0,};
         int                       ret = 0;
         dict_t                   *dict = NULL;
 
@@ -3378,53 +2298,71 @@ gf_cli_log_rotate (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_log_rotate_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_LOG_ROTATE, this, cli_rpc_prog,
-                               NULL);
+        ret = dict_get_str (dict, "volname", &req.volname);
+        if (ret)
+                goto out;
+
+        ret = dict_get_str (dict, "brick", &req.brick);
+        if (ret)
+                req.brick = "";
+
+        ret = dict_get_str (dict, "path", &req.path);
+        if (ret)
+                goto out;
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_LOG_FILENAME, NULL,
+                              gf_xdr_from_cli_log_filename_req,
+                              this, gf_cli3_1_log_filename_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
 
-        GF_FREE (req.dict.dict_val);
         return ret;
 }
 
+
 int32_t
-gf_cli_sync_volume (call_frame_t *frame, xlator_t *this,
-                       void *data)
+gf_cli3_1_log_locate (call_frame_t *frame, xlator_t *this,
+                      void *data)
 {
-        int               ret = 0;
-        gf_cli_req        req = {{0,}};
-        dict_t            *dict = NULL;
+        gf1_cli_log_locate_req  req = {0,};
+        int                     ret = 0;
+        dict_t                 *dict = NULL;
 
-        if (!frame || !this || !data) {
+        if (!frame || !this ||  !data) {
                 ret = -1;
                 goto out;
         }
 
         dict = data;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_sync_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_SYNC_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        ret = dict_get_str (dict, "volname", &req.volname);
+        if (ret)
+                goto out;
+
+        ret = dict_get_str (dict, "brick", &req.brick);
+        if (ret)
+                req.brick = "";
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_LOG_LOCATE, NULL,
+                              gf_xdr_from_cli_log_locate_req,
+                              this, gf_cli3_1_log_locate_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        GF_FREE (req.dict.dict_val);
 
         return ret;
 }
 
 int32_t
-gf_cli_getspec (call_frame_t *frame, xlator_t *this,
-                         void *data)
+gf_cli3_1_log_rotate (call_frame_t *frame, xlator_t *this,
+                      void *data)
 {
-        gf_getspec_req          req = {0,};
-        int                     ret = 0;
-        dict_t                  *dict = NULL;
-        dict_t                  *op_dict = NULL;
+        gf1_cli_log_locate_req  req = {0,};
+        int                       ret = 0;
+        dict_t                   *dict = NULL;
 
         if (!frame || !this ||  !data) {
                 ret = -1;
@@ -3433,59 +2371,83 @@ gf_cli_getspec (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = dict_get_str (dict, "volid", &req.key);
+        ret = dict_get_str (dict, "volname", &req.volname);
         if (ret)
                 goto out;
 
-        op_dict = dict_new ();
-        if (!dict) {
+        ret = dict_get_str (dict, "brick", &req.brick);
+        if (ret)
+                req.brick = "";
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_LOG_ROTATE, NULL,
+                              gf_xdr_from_cli_log_rotate_req,
+                              this, gf_cli3_1_log_rotate_cbk);
+
+
+out:
+        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
+
+        return ret;
+}
+
+int32_t
+gf_cli3_1_sync_volume (call_frame_t *frame, xlator_t *this,
+                       void *data)
+{
+        int               ret = 0;
+
+        if (!frame || !this || !data) {
                 ret = -1;
                 goto out;
         }
 
-        // Set the supported min and max op-versions, so glusterd can make a
-        // decision
-        ret = dict_set_int32 (op_dict, "min-op-version", GD_OP_VERSION_MIN);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to set min-op-version"
-                        " in request dict");
-                goto out;
-        }
+        ret = cli_cmd_submit ((gf1_cli_sync_volume_req*)data, frame,
+                              cli_rpc_prog, GLUSTER_CLI_SYNC_VOLUME,
+                              NULL, gf_xdr_from_cli_sync_volume_req,
+                              this, gf_cli3_1_sync_volume_cbk);
 
-        ret = dict_set_int32 (op_dict, "max-op-version", GD_OP_VERSION_MAX);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to set max-op-version"
-                        " in request dict");
+out:
+        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
+
+        return ret;
+}
+
+int32_t
+gf_cli3_1_getspec (call_frame_t *frame, xlator_t *this,
+                         void *data)
+{
+        gf_getspec_req          req = {0,};
+        int                     ret = 0;
+        dict_t                  *dict = NULL;
+
+        if (!frame || !this ||  !data) {
+                ret = -1;
                 goto out;
         }
 
-        ret = dict_allocate_and_serialize (op_dict, &req.xdata.xdata_val,
-                                           &req.xdata.xdata_len);
-        if (ret < 0) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "Failed to serialize dictionary");
+        dict = data;
+
+        ret = dict_get_str (dict, "volid", &req.key);
+        if (ret)
                 goto out;
-        }
 
         ret = cli_cmd_submit (&req, frame, &cli_handshake_prog,
                               GF_HNDSK_GETSPEC, NULL,
-                              this, gf_cli_getspec_cbk,
-                              (xdrproc_t) xdr_gf_getspec_req);
+                              xdr_from_getspec_req,
+                              this, gf_cli3_1_getspec_cbk);
 
 out:
-        if (op_dict) {
-                dict_unref(op_dict);
-        }
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
 
         return ret;
 }
 
 int32_t
-gf_cli_quota (call_frame_t *frame, xlator_t *this,
+gf_cli3_1_quota (call_frame_t *frame, xlator_t *this,
                  void *data)
 {
-        gf_cli_req          req = {{0,}};
+        gf1_cli_quota_req   req = {0,};
         int                 ret = 0;
         dict_t             *dict = NULL;
 
@@ -3496,18 +2458,33 @@ gf_cli_quota (call_frame_t *frame, xlator_t *this,
 
         dict = data;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_quota_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_QUOTA, this, cli_rpc_prog, NULL);
+        ret = dict_get_str (dict, "volname", &req.volname);
+
+        if (ret)
+                goto out;
+
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.dict.dict_val,
+                                           (size_t *)&req.dict.dict_len);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "failed to get serialized length of dict");
+                goto out;
+        }
 
-out:
-        GF_FREE (req.dict.dict_val);
 
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                               GLUSTER_CLI_QUOTA, NULL,
+                               gf_xdr_from_cli_quota_req,
+                               this, gf_cli3_1_quota_cbk);
+
+        GF_FREE (req.dict.dict_val);
+out:
         return ret;
 }
 
 int32_t
-gf_cli_pmap_b2p (call_frame_t *frame, xlator_t *this, void *data)
+gf_cli3_1_pmap_b2p (call_frame_t *frame, xlator_t *this, void *data)
 {
         pmap_port_by_brick_req  req = {0,};
         int                     ret = 0;
@@ -3526,8 +2503,8 @@ gf_cli_pmap_b2p (call_frame_t *frame, xlator_t *this, void *data)
 
         ret = cli_cmd_submit (&req, frame, &cli_pmap_prog,
                               GF_PMAP_PORTBYBRICK, NULL,
-                              this, gf_cli_pmap_b2p_cbk,
-                              (xdrproc_t) xdr_pmap_port_by_brick_req);
+                              xdr_from_pmap_port_by_brick_req,
+                              this, gf_cli3_1_pmap_b2p_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
@@ -3536,7 +2513,7 @@ out:
 }
 
 static int
-gf_cli_fsm_log_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_fsm_log_cbk (struct rpc_req *req, struct iovec *iov,
                        int count, void *myframe)
 {
         gf1_cli_fsm_log_rsp        rsp   = {0,};
@@ -3554,17 +2531,18 @@ gf_cli_fsm_log_cbk (struct rpc_req *req, struct iovec *iov,
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf1_cli_fsm_log_rsp);
+        ret = gf_xdr_to_cli_fsm_log_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
         if (rsp.op_ret) {
-                if (strcmp (rsp.op_errstr, ""))
-                        cli_err ("%s", rsp.op_errstr);
-                cli_err ("fsm log unsuccessful");
+                if (strcmp (rsp.op_errstr, "")) {
+                        cli_out (rsp.op_errstr);
+                } else if (rsp.op_ret) {
+                        cli_out ("fsm log unsuccessful");
+                }
                 ret = rsp.op_ret;
                 goto out;
         }
@@ -3580,7 +2558,7 @@ gf_cli_fsm_log_cbk (struct rpc_req *req, struct iovec *iov,
                                 &dict);
 
         if (ret) {
-                cli_err ("bad response");
+                cli_out ("bad response");
                 goto out;
         }
 
@@ -3588,7 +2566,7 @@ gf_cli_fsm_log_cbk (struct rpc_req *req, struct iovec *iov,
         if (tr_count)
                 cli_out("number of transitions: %d", tr_count);
         else
-                cli_err("No transitions");
+                cli_out("No transitions");
         for (i = 0; i < tr_count; i++) {
                 memset (key, 0, sizeof (key));
                 snprintf (key, sizeof (key), "log%d-old-state", i);
@@ -3627,7 +2605,7 @@ out:
 }
 
 int32_t
-gf_cli_fsm_log (call_frame_t *frame, xlator_t *this, void *data)
+gf_cli3_1_fsm_log (call_frame_t *frame, xlator_t *this, void *data)
 {
         int                        ret = -1;
         gf1_cli_fsm_log_req        req = {0,};
@@ -3641,8 +2619,8 @@ gf_cli_fsm_log (call_frame_t *frame, xlator_t *this, void *data)
         req.name = data;
         ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
                               GLUSTER_CLI_FSM_LOG, NULL,
-                              this, gf_cli_fsm_log_cbk,
-                              (xdrproc_t) xdr_gf1_cli_fsm_log_req);
+                              gf_xdr_from_cli_fsm_log_req,
+                              this, gf_cli3_1_fsm_log_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
@@ -3650,719 +2628,111 @@ out:
         return ret;
 }
 
+
 int
-gf_cli_gsync_config_command (dict_t *dict)
+gf_cli3_1_gsync_config_command (gf1_cli_gsync_set_rsp rsp)
 {
-        runner_t runner     = {0,};
-        char *subop         = NULL;
-        char *gwd           = NULL;
-        char *slave         = NULL;
-        char *confpath      = NULL;
-        char *master        = NULL;
-        char *op_name       = NULL;
-        int   ret           = -1;
-        char  conf_path[PATH_MAX] = "";
-
-        if (dict_get_str (dict, "subop", &subop) != 0)
-                return -1;
+        char  cmd[PATH_MAX] = {0,};
+        int ret = -1;
 
-        if (strcmp (subop, "get") != 0 && strcmp (subop, "get-all") != 0) {
-                cli_out (GEOREP" config updated successfully");
+        if (rsp.op_ret < 0)
                 return 0;
-        }
 
-        if (dict_get_str (dict, "glusterd_workdir", &gwd) != 0 ||
-            dict_get_str (dict, "slave", &slave) != 0)
+        if (!rsp.gsync_prefix || !rsp.master || !rsp.slave || !rsp.glusterd_workdir)
                 return -1;
 
-        if (dict_get_str (dict, "master", &master) != 0)
-                master = NULL;
-        if (dict_get_str (dict, "op_name", &op_name) != 0)
-                op_name = NULL;
-
-        ret = dict_get_str (dict, "conf_path", &confpath);
-        if (!confpath) {
-                ret = snprintf (conf_path, sizeof(conf_path) - 1,
-                                "%s/"GEOREP"/gsyncd_template.conf", gwd);
-                conf_path[ret] = '\0';
-                confpath = conf_path;
-        }
-
-        runinit (&runner);
-        runner_add_args (&runner, GSYNCD_PREFIX"/gsyncd", "-c", NULL);
-        runner_argprintf (&runner, "%s", confpath);
-        if (master)
-                runner_argprintf (&runner, ":%s", master);
-        runner_add_arg (&runner, slave);
-        runner_argprintf (&runner, "--config-%s", subop);
-        if (op_name)
-                runner_add_arg (&runner, op_name);
-
-        return runner_run (&runner);
-}
-
-int
-gf_cli_fetch_gsyncd_status_values (char *status,
-                                   gf_cli_gsync_status_t *sts_val)
-{
-        int32_t   ret      = -1;
-        char     *tmp      = NULL;
-        char     *save_ptr = NULL;
-        char     *key      = NULL;
-        char     *value    = NULL;
-
-        if (!status || !sts_val) {
-                gf_log ("", GF_LOG_ERROR, "status or sts_val is null");
-                goto out;
-        }
-
-        tmp = strtok_r (status, "\n", &save_ptr);
-
-        if (tmp)
-                sts_val->health = gf_strdup (tmp);
-
-        while (tmp) {
-                key = strtok_r (tmp, "=", &value);
-
-                if ((key) && (!strcmp(key, "Uptime")))
-                        sts_val->uptime = gf_strdup (value);
-
-                if ((key) && (!strcmp(key, "FilesSyncd")))
-                        sts_val->files_syncd = gf_strdup (value);
-
-                if ((key) && (!strcmp(key, "FilesPending")))
-                        sts_val->files_pending = gf_strdup (value);
-
-                if ((key) && (!strcmp(key, "BytesPending"))) {
-                        value = gf_uint64_2human_readable(atol(value));
-                        sts_val->bytes_pending = gf_strdup (value);
-                }
-
-                if ((key) && (!strcmp(key, "DeletesPending")))
-                        sts_val->deletes_pending = gf_strdup (value);
-
-                tmp = strtok_r (NULL, ";", &save_ptr);
+        if (strcmp (rsp.subop, "get") != 0 && strcmp (rsp.subop, "get-all") != 0) {
+                cli_out (GEOREP" config updated successfully");
+                return 0;
         }
 
-        if (sts_val->health)
-                ret = 0;
-
-        if (!sts_val->uptime)
-                sts_val->uptime = gf_strdup ("N/A");
-
-        if (!sts_val->files_syncd)
-                sts_val->files_syncd = gf_strdup ("N/A");
-
-        if (!sts_val->files_pending)
-                sts_val->files_pending = gf_strdup ("N/A");
-
-        if (!sts_val->bytes_pending)
-                sts_val->bytes_pending = gf_strdup ("N/A");
-
-        if (!sts_val->deletes_pending)
-                sts_val->deletes_pending = gf_strdup ("N/A");
+        snprintf (cmd, PATH_MAX,
+                  GSYNCD_PREFIX"/gsyncd -c %s/"GSYNC_CONF" %s%s %s --config-%s%s%s",
+                  rsp.glusterd_workdir,
+                  *rsp.master ? ":" : "", rsp.master, rsp.slave, rsp.subop,
+                  *rsp.op_name ? " " : "", rsp.op_name);
+        ret = system (cmd);
+                /*
+                 * gf_log() failure from system() ?
+                 */
 
-out:
-        gf_log ("", GF_LOG_DEBUG, "Returning %d.", ret);
-        return ret;
+        return ret ? -1 : 0;
 }
 
-char*
-get_struct_variable (int mem_num, gf_cli_gsync_status_t *sts_val)
+int
+gf_cli3_1_gsync_out_status (dict_t *dict)
 {
-        switch (mem_num) {
-        case 0: return (sts_val->node);
-        case 1: return (sts_val->master);
-        case 2: return (sts_val->slave);
-        case 3: return (sts_val->health);
-        case 4: return (sts_val->uptime);
-        case 5: return (sts_val->files_syncd);
-        case 6: return (sts_val->files_pending);
-        case 7: return (sts_val->bytes_pending);
-        case 8: return (sts_val->deletes_pending);
-        default:
-                 goto out;
-        }
+        int              gsync_count = 0;
+        int              i = 0;
+        int              ret = 0;
+        char             mst[PATH_MAX] = {0, };
+        char             slv[PATH_MAX]= {0, };
+        char             sts[PATH_MAX] = {0, };
+        char             hyphens[81] = {0, };
+        char             *mst_val = NULL;
+        char             *slv_val = NULL;
+        char             *sts_val = NULL;
 
-out:
-        return NULL;
-}
+        cli_out ("%-20s %-50s %-10s", "MASTER", "SLAVE", "STATUS");
 
-int
-gf_cli_print_status (char **title_values,
-                     gf_cli_gsync_status_t **sts_vals,
-                     int *spacing, int gsync_count,
-                     int number_of_fields, int is_detail)
-{
-        int     indents                  = 0;
-        int     i                        = 0;
-        int     j                        = 0;
-        int     ret                      = 0;
-        int     total_spacing            = 0;
-        char  **output_values            = NULL;
-        char   *tmp                      = NULL;
-        char   *hyphens                  = NULL;
-        char    heading[PATH_MAX]        = {0, };
-        char    indent_spaces[PATH_MAX]  = {0, };
-
-        /* calculating spacing for hyphens */
-        for (i = 0; i < number_of_fields; i++) {
-                /* Suppressing master and slave output for status detail */
-                if ((is_detail) && ((i == 1) || (i == 2))) {
-                        total_spacing++;
-                        continue;
-                } else if ((!is_detail) && (i > 4)) {
-                       /* Suppressing detailed output for
-                        * status */
-                        continue;
-                }
-                spacing[i] += 3; /* Adding extra space to
-                                    distinguish between fields */
-                total_spacing += spacing[i];
-        }
-        total_spacing += 4; /* For the spacing between the fields */
+        for (i=0; i<sizeof(hyphens)-1; i++)
+                hyphens[i] = '-';
 
-        /* char pointers for each field */
-        output_values = GF_CALLOC (number_of_fields, sizeof (char *),
-                                   gf_common_mt_char);
-        if (!output_values) {
-                ret = -1;
-                goto out;
-        }
-        for (i = 0; i < number_of_fields; i++) {
-                output_values[i] = GF_CALLOC (spacing[i] + 1, sizeof (char),
-                                              gf_common_mt_char);
-                if (!output_values[i]) {
-                        ret = -1;
-                        goto out;
-                }
-        }
+        cli_out ("%s", hyphens);
 
-        hyphens = GF_CALLOC (total_spacing + 1, sizeof (char),
-                             gf_common_mt_char);
-        if (!hyphens) {
-                ret = -1;
-                goto out;
-        }
 
-        ret = snprintf(heading, sizeof(heading), "MASTER: %s  SLAVE: %s",
-                       sts_vals[0]->master, sts_vals[0]->slave);
+        ret = dict_get_int32 (dict, "gsync-count", &gsync_count);
         if (ret) {
-                if (ret < sizeof(heading))
-                        heading[ret] = '\0';
-                else
-                        heading[sizeof(heading) - 1] = '\0';
+                gf_log ("cli", GF_LOG_INFO, "No active geo-replication sessions"
+                        "present for the selected");
                 ret = 0;
-        } else {
-                ret = -1;
                 goto out;
         }
 
-        if (is_detail) {
-                cli_out (" ");
-                if (strlen(heading) > total_spacing)
-                        cli_out ("%s", heading);
-                else {
-                        /* Printing the heading with centre justification */
-                        indents = (total_spacing - strlen(heading)) / 2;
-                        memset (indent_spaces, ' ', indents);
-                        indent_spaces[indents] = '\0';
-                        ret = snprintf (hyphens, total_spacing, "%s%s",
-                                        indent_spaces, heading);
-                        if (ret) {
-                                hyphens[ret] = '\0';
-                                cli_out ("%s", hyphens);
-                                ret = 0;
-                        } else {
-                                ret = -1;
-                                goto out;
-                        }
-                }
-                cli_out (" ");
-        }
-
-        /* setting the title "NODE", "MASTER", etc. from title_values[]
-           and printing the same */
-        for (j = 0; j < number_of_fields; j++) {
-                /* Suppressing master and slave output for status detail */
-                if ((is_detail) && ((j == 1) || (j == 2))) {
-                        output_values[j][0] = '\0';
-                        continue;
-                } else if ((!is_detail) && (j > 4)) {
-                       /* Suppressing detailed output for
-                        * status */
-                       output_values[j][0] = '\0';
-                        continue;
-                }
-                memset (output_values[j], ' ', spacing[j]);
-                memcpy (output_values[j], title_values[j],
-                        strlen(title_values[j]));
-                output_values[j][spacing[j]] = '\0';
-        }
-        cli_out ("%s %s %s %s %s %s %s %s %s", output_values[0],
-                 output_values[1], output_values[2], output_values[3],
-                 output_values[4], output_values[5], output_values[6],
-                 output_values[7], output_values[8]);
-
-        /* setting and printing the hyphens */
-        memset (hyphens, '-', total_spacing);
-        hyphens[total_spacing] = '\0';
-        cli_out ("%s", hyphens);
-
-        for (i = 0; i < gsync_count; i++) {
-                for (j = 0; j < number_of_fields; j++) {
-                        /* Suppressing master and slave output for
-                         * status detail */
-                        if ((is_detail) && ((j == 1) || (j == 2))) {
-                                output_values[j][0] = '\0';
-                                continue;
-                        }  else if ((!is_detail) && (j > 4)) {
-                                /* Suppressing detailed output for
-                                 * status */
-                                output_values[j][0] = '\0';
-                                continue;
-                        }
-                        tmp = get_struct_variable(j, sts_vals[i]);
-                        if (!tmp) {
-                                gf_log ("", GF_LOG_ERROR,
-                                        "struct member empty.");
-                                ret = -1;
-                                goto out;
-                        }
-                        memset (output_values[j], ' ', spacing[j]);
-                        memcpy (output_values[j], tmp, strlen (tmp));
-                        output_values[j][spacing[j]] = '\0';
-                }
-
-                cli_out ("%s %s %s %s %s %s %s %s %s", output_values[0],
-                         output_values[1], output_values[2], output_values[3],
-                         output_values[4], output_values[5], output_values[6],
-                         output_values[7], output_values[8]);
-        }
-
-out:
-        if (output_values) {
-                for (i = 0; i < number_of_fields; i++) {
-                        if (output_values[i])
-                                GF_FREE (output_values[i]);
-                }
-                GF_FREE (output_values);
-        }
-
-        if (hyphens)
-                GF_FREE (hyphens);
-
-        return ret;
-}
-
-int
-gf_cli_read_status_data (dict_t *dict,
-                         gf_cli_gsync_status_t **sts_vals,
-                         int *spacing, int gsync_count,
-                         int number_of_fields)
-{
-        int     ret            = 0;
-        int     i              = 0;
-        int     j              = 0;
-        char    mst[PATH_MAX]  = {0, };
-        char    slv[PATH_MAX]  = {0, };
-        char    sts[PATH_MAX]  = {0, };
-        char    nds[PATH_MAX]  = {0, };
-        char   *status         = NULL;
-        char   *tmp            = NULL;
-
-        /* Storing per node status info in each object */
-        for (i = 0; i < gsync_count; i++) {
-                snprintf (nds, sizeof(nds), "node%d", i + 1);
-                snprintf (mst, sizeof(mst), "master%d", i + 1);
-                snprintf (slv, sizeof(slv), "slave%d", i + 1);
-                snprintf (sts, sizeof(sts), "status%d", i + 1);
-
-                /* Fetching the values from dict, and calculating
-                   the max length for each field */
-                ret = dict_get_str (dict, nds, &(sts_vals[i]->node));
-                if (ret)
-                        goto out;
-
-                ret = dict_get_str (dict, mst, &(sts_vals[i]->master));
-                if (ret)
-                        goto out;
+        for (i = 1; i <= gsync_count; i++) {
+                snprintf (mst, sizeof(mst), "master%d", i);
+                snprintf (slv, sizeof(slv), "slave%d", i);
+                snprintf (sts, sizeof(sts), "status%d", i);
 
-                ret = dict_get_str (dict, slv, &(sts_vals[i]->slave));
+                ret = dict_get_str (dict, mst, &mst_val);
                 if (ret)
                         goto out;
 
-                ret = dict_get_str (dict, sts, &status);
+                ret = dict_get_str (dict, slv, &slv_val);
                 if (ret)
                         goto out;
 
-                /* Fetching health and uptime from sts_val */
-                ret = gf_cli_fetch_gsyncd_status_values (status, sts_vals[i]);
+                ret = dict_get_str (dict, sts, &sts_val);
                 if (ret)
                         goto out;
 
-                for (j = 0; j < number_of_fields; j++) {
-                        tmp = get_struct_variable(j, sts_vals[i]);
-                        if (!tmp) {
-                                gf_log ("", GF_LOG_ERROR,
-                                        "struct member empty.");
-                                ret = -1;
-                                goto out;
-                        }
-                        if (strlen (tmp) > spacing[j])
-                                spacing[j] = strlen (tmp);
-                }
-        }
-
-out:
-        return ret;
-}
-
-int
-gf_cli_gsync_status_output (dict_t *dict, int status_detail)
-{
-        int                     gsync_count    = 0;
-        int                     i              = 0;
-        int                     j              = 0;
-        int                     ret            = 0;
-        int                     spacing[10]    = {0};
-        int                     num_of_fields  = 9;
-        char                    errmsg[1024]   = "";
-        char                   *master         = NULL;
-        char                   *slave          = NULL;
-        char                   *tmp            = NULL;
-        char                   *title_values[] = {"NODE", "MASTER", "SLAVE",
-                                                  "HEALTH", "UPTIME",
-                                                  "FILES SYNCD",
-                                                  "FILES PENDING",
-                                                  "BYTES PENDING",
-                                                  "DELETES PENDING"};
-        gf_cli_gsync_status_t **sts_vals = NULL;
-
-        /* Checks if any session is active or not */
-        ret = dict_get_int32 (dict, "gsync-count", &gsync_count);
-        if (ret) {
-                ret = dict_get_str (dict, "master", &master);
-
-                ret = dict_get_str (dict, "slave", &slave);
-
-                if (master) {
-                        if (slave)
-                                snprintf (errmsg, sizeof(errmsg), "No active "
-                                          "geo-replication sessions between %s"
-                                          " and %s", master, slave);
-                        else
-                                snprintf (errmsg, sizeof(errmsg), "No active "
-                                          "geo-replication sessions for %s",
-                                          master);
-                } else
-                        snprintf (errmsg, sizeof(errmsg), "No active "
-                                  "geo-replication sessions");
-
-                gf_log ("cli", GF_LOG_INFO, "%s", errmsg);
-                cli_out ("%s", errmsg);
-                ret = 0;
-                goto out;
-        }
-
-        for (i = 0; i < num_of_fields; i++)
-                spacing[i] = strlen(title_values[i]);
-
-        /* gsync_count = number of nodes reporting output.
-           each sts_val object will store output of each
-           node */
-        sts_vals = GF_CALLOC (gsync_count, sizeof (gf_cli_gsync_status_t *),
-                              gf_common_mt_char);
-        if (!sts_vals) {
-                ret = -1;
-                goto out;
-        }
-        for (i = 0; i < gsync_count; i++) {
-                sts_vals[i] = GF_CALLOC (1, sizeof (gf_cli_gsync_status_t),
-                                         gf_common_mt_char);
-                if (!sts_vals[i]) {
-                        ret = -1;
-                        goto out;
-                }
-        }
-
-        ret = gf_cli_read_status_data (dict, sts_vals, spacing,
-                                       gsync_count, num_of_fields);
-        if (ret) {
-                gf_log ("", GF_LOG_ERROR, "Unable to read status data");
-                goto out;
-        }
-
-        ret = gf_cli_print_status (title_values, sts_vals, spacing, gsync_count,
-                                   num_of_fields, status_detail);
-        if (ret) {
-                gf_log ("", GF_LOG_ERROR, "Unable to print status output");
-                goto out;
-        }
-
-out:
-        if (sts_vals) {
-                for (i = 0; i < gsync_count; i++) {
-                        for (j = 3; j < num_of_fields; j++) {
-                                tmp = get_struct_variable(j, sts_vals[i]);
-                                if (tmp)
-                                        GF_FREE (tmp);
-                        }
-                }
-                GF_FREE (sts_vals);
-        }
-
-        return ret;
-}
-
-static int32_t
-write_contents_to_common_pem_file (dict_t *dict, int output_count)
-{
-        char            *workdir                   = NULL;
-        char             common_pem_file[PATH_MAX] = "";
-        char            *output                    = NULL;
-        char             output_name[PATH_MAX]     = "";
-        int              bytes_writen              = 0;
-        int              fd                        = -1;
-        int              ret                       = -1;
-        int              i                         = -1;
-
-        ret = dict_get_str (dict, "glusterd_workdir", &workdir);
-        if (ret || !workdir) {
-                gf_log ("", GF_LOG_ERROR, "Unable to fetch workdir");
-                ret = -1;
-                goto out;
-        }
-
-        snprintf (common_pem_file, sizeof(common_pem_file),
-                  "%s/geo-replication/common_secret.pem.pub",
-                  workdir);
-
-        unlink (common_pem_file);
-
-        fd = open (common_pem_file, O_WRONLY | O_CREAT, 0600);
-        if (fd == -1) {
-                gf_log ("", GF_LOG_ERROR, "Failed to open %s"
-                        " Error : %s", common_pem_file,
-                        strerror (errno));
-                ret = -1;
-                goto out;
-        }
-
-        for (i = 1; i <= output_count; i++) {
-                memset (output_name, '\0', sizeof (output_name));
-                snprintf (output_name, sizeof (output_name),
-                          "output_%d", i);
-                ret = dict_get_str (dict, output_name, &output);
-                if (ret) {
-                        gf_log ("", GF_LOG_ERROR, "Failed to get %s.",
-                                output_name);
-                        cli_out ("Unable to fetch output.");
-                }
-                if (output) {
-                        bytes_writen = write (fd, output, strlen(output));
-                        if (bytes_writen != strlen(output)) {
-                                gf_log ("", GF_LOG_ERROR, "Failed to write "
-                                        "to %s", common_pem_file);
-                                ret = -1;
-                                goto out;
-                        }
-                        /* Adding the new line character */
-                        bytes_writen = write (fd, "\n", strlen("\n"));
-                        if (bytes_writen != strlen("\n")) {
-                                gf_log ("", GF_LOG_ERROR,
-                                        "Failed to add new line char");
-                                ret = -1;
-                                goto out;
-                        }
-                        output = NULL;
-                }
-        }
-
-        cli_out ("Common secret pub file present at %s", common_pem_file);
-        ret = 0;
-out:
-        if (fd)
-                close (fd);
-
-        gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-gf_cli_sys_exec_cbk (struct rpc_req *req, struct iovec *iov,
-                     int count, void *myframe)
-{
-        int                     ret     = -1;
-        int                     output_count     = -1;
-        int                     i     = -1;
-        char                   *output  = NULL;
-        char                   *command = NULL;
-        char                    output_name[PATH_MAX] = "";
-        gf_cli_rsp              rsp     = {0, };
-        dict_t                  *dict   = NULL;
-        call_frame_t            *frame  = NULL;
-
-        if (req->rpc_status == -1) {
-                ret = -1;
-                goto out;
-        }
-
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-       }
-
-        dict = dict_new ();
-
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = dict_unserialize (rsp.dict.dict_val, rsp.dict.dict_len, &dict);
-
-        if (ret)
-                goto out;
-
-        if (rsp.op_ret) {
-                cli_err ("%s", rsp.op_errstr ? rsp.op_errstr :
-                         "Command failed.");
-                ret = rsp.op_ret;
-                goto out;
-        }
-
-        ret = dict_get_int32 (dict, "output_count", &output_count);
-        if (ret) {
-                cli_out ("Command executed successfully.");
-                ret = 0;
-                goto out;
-        }
-
-        ret = dict_get_str (dict, "command", &command);
-        if (ret) {
-                gf_log ("", GF_LOG_ERROR,
-                        "Unable to get command from dict");
-                goto out;
-        }
-
-        if (!strcmp (command, "gsec_create")) {
-                ret = write_contents_to_common_pem_file (dict, output_count);
-                if (!ret)
-                        goto out;
-        }
+                cli_out ("%-20s %-50s %-10s", mst_val,
+                         slv_val, sts_val);
 
-        for (i = 1; i <= output_count; i++) {
-                memset (output_name, '\0', sizeof (output_name));
-                snprintf (output_name, sizeof (output_name),
-                          "output_%d", i);
-                ret = dict_get_str (dict, output_name, &output);
-                if (ret) {
-                        gf_log ("", GF_LOG_ERROR, "Failed to get %s.",
-                                output_name);
-                        cli_out ("Unable to fetch output.");
-                }
-                if (output) {
-                        cli_out ("%s", output);
-                        output = NULL;
-                }
         }
 
-        ret = 0;
-out:
-        if (dict)
-                dict_unref (dict);
-        cli_cmd_broadcast_response (ret);
-
-        free (rsp.dict.dict_val);
-
+ out:
         return ret;
-}
-
-int
-gf_cli_copy_file_cbk (struct rpc_req *req, struct iovec *iov,
-                      int count, void *myframe)
-{
-        int                     ret     = -1;
-        gf_cli_rsp              rsp     = {0, };
-        dict_t                  *dict   = NULL;
-        call_frame_t            *frame  = NULL;
-
-        if (req->rpc_status == -1) {
-                ret = -1;
-                goto out;
-        }
-
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-       }
-
-        dict = dict_new ();
-
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = dict_unserialize (rsp.dict.dict_val, rsp.dict.dict_len, &dict);
-
-       if (ret)
-                goto out;
-
-        if (rsp.op_ret) {
-                cli_err ("%s", rsp.op_errstr ? rsp.op_errstr :
-                         "Copy unsuccessful");
-                ret = rsp.op_ret;
-                goto out;
-        }
 
-        cli_out ("Successfully copied file.");
-
-out:
-        if (dict)
-                dict_unref (dict);
-        cli_cmd_broadcast_response (ret);
-
-        free (rsp.dict.dict_val);
-
-        return ret;
 }
 
 int
-gf_cli_gsync_set_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_gsync_set_cbk (struct rpc_req *req, struct iovec *iov,
                          int count, void *myframe)
 {
-        int                     ret     = -1;
-        gf_cli_rsp              rsp     = {0, };
+        int                     ret     = 0;
+        gf1_cli_gsync_set_rsp   rsp     = {0, };
         dict_t                  *dict   = NULL;
-        char                    *gsync_status = NULL;
-        char                    *master = NULL;
-        char                    *slave  = NULL;
-        int32_t                  type   = 0;
-        call_frame_t            *frame  = NULL;
-        gf_boolean_t             status_detail = _gf_false;
-
 
         if (req->rpc_status == -1) {
                 ret = -1;
                 goto out;
         }
 
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_gsync_set_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR,
+                        "Unable to get response structure");
                 goto out;
         }
 
@@ -4373,172 +2743,89 @@ gf_cli_gsync_set_cbk (struct rpc_req *req, struct iovec *iov,
                 goto out;
         }
 
-        ret = dict_unserialize (rsp.dict.dict_val, rsp.dict.dict_len, &dict);
+        ret = dict_unserialize (rsp.status_dict.status_dict_val,
+                                rsp.status_dict.status_dict_len,
+                                &dict);
 
         if (ret)
                 goto out;
 
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_gsync (dict, rsp.op_ret, rsp.op_errno,
-                                                rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
         if (rsp.op_ret) {
-                cli_err ("%s", rsp.op_errstr ? rsp.op_errstr :
+                cli_out ("%s", rsp.op_errstr ? rsp.op_errstr :
                          GEOREP" command unsuccessful");
                 ret = rsp.op_ret;
                 goto out;
         }
 
-        ret = dict_get_str (dict, "gsync-status", &gsync_status);
-        if (!ret)
-                cli_out ("%s", gsync_status);
-        else
-                ret = 0;
-
-        ret = dict_get_int32 (dict, "type", &type);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR, "failed to get type");
-                goto out;
-        }
-
-        switch (type) {
+        switch (rsp.type) {
                 case GF_GSYNC_OPTION_TYPE_START:
+                        cli_out ("Starting " GEOREP " session between %s & %s"
+                                 " has been successful", rsp.master, rsp.slave);
+                break;
+
                 case GF_GSYNC_OPTION_TYPE_STOP:
-                        if (dict_get_str (dict, "master", &master) != 0)
-                                master = "???";
-                        if (dict_get_str (dict, "slave", &slave) != 0)
-                                slave = "???";
-
-                        cli_out ("%s " GEOREP " session between %s & %s"
-                                 " has been successful",
-                                 type == GF_GSYNC_OPTION_TYPE_START ?
-                                  "Starting" : "Stopping",
-                                 master, slave);
+                         cli_out ("Stopping " GEOREP " session between %s & %s"
+                                 " has been successful", rsp.master, rsp.slave);
                 break;
 
                 case GF_GSYNC_OPTION_TYPE_CONFIG:
-                        ret = gf_cli_gsync_config_command (dict);
+                        ret = gf_cli3_1_gsync_config_command (rsp);
                 break;
 
                 case GF_GSYNC_OPTION_TYPE_STATUS:
-                        status_detail = dict_get_str_boolean (dict,
-                                                              "status-detail",
-                                                              _gf_false);
-                        ret = gf_cli_gsync_status_output (dict, status_detail);
-                break;
-
-                case GF_GSYNC_OPTION_TYPE_DELETE:
-                        if (dict_get_str (dict, "master", &master) != 0)
-                                master = "???";
-                        if (dict_get_str (dict, "slave", &slave) != 0)
-                                slave = "???";
-                        cli_out ("Deleting " GEOREP " session between %s & %s"
-                                 " has been successful", master, slave);
-                break;
-
-                case GF_GSYNC_OPTION_TYPE_CREATE:
-                        if (dict_get_str (dict, "master", &master) != 0)
-                                master = "???";
-                        if (dict_get_str (dict, "slave", &slave) != 0)
-                                slave = "???";
-                        cli_out ("Creating " GEOREP " session between %s & %s"
-                                 " has been successful", master, slave);
-                break;
-
+                        ret = gf_cli3_1_gsync_out_status (dict);
+                        goto out;
                 default:
                         cli_out (GEOREP" command executed successfully");
         }
 
 out:
-        if (dict)
-                dict_unref (dict);
-        cli_cmd_broadcast_response (ret);
 
-        free (rsp.dict.dict_val);
+        cli_cmd_broadcast_response (ret);
 
         return ret;
 }
 
 int32_t
-gf_cli_sys_exec (call_frame_t *frame, xlator_t *this, void *data)
+gf_cli3_1_gsync_set (call_frame_t *frame, xlator_t *this,
+                     void *data)
 {
         int                      ret    = 0;
         dict_t                  *dict   = NULL;
-        gf_cli_req               req = {{0,}};
+        gf1_cli_gsync_set_req    req;
 
         if (!frame || !this || !data) {
                 ret = -1;
-                gf_log ("cli", GF_LOG_ERROR, "Invalid data");
                 goto out;
         }
 
         dict = data;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_sys_exec_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_SYS_EXEC, this, cli_rpc_prog,
-                               NULL);
-out:
-        GF_FREE (req.dict.dict_val);
-        return ret;
-}
-
-int32_t
-gf_cli_copy_file (call_frame_t *frame, xlator_t *this, void *data)
-{
-        int                      ret    = 0;
-        dict_t                  *dict   = NULL;
-        gf_cli_req               req = {{0,}};
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.dict.dict_val,
+                                           (size_t *) &req.dict.dict_len);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "failed to serialize the data");
 
-        if (!frame || !this || !data) {
-                ret = -1;
-                gf_log ("cli", GF_LOG_ERROR, "Invalid data");
                 goto out;
         }
 
-        dict = data;
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_GSYNC_SET, NULL,
+                              gf_xdr_from_cli_gsync_set_req,
+                              this, gf_cli3_1_gsync_set_cbk);
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_copy_file_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_COPY_FILE, this, cli_rpc_prog,
-                               NULL);
 out:
-        GF_FREE (req.dict.dict_val);
         return ret;
 }
 
-int32_t
-gf_cli_gsync_set (call_frame_t *frame, xlator_t *this,
-                     void *data)
+void*
+cli_profile_info_elem (void *a, int index)
 {
-        int                      ret    = 0;
-        dict_t                  *dict   = NULL;
-        gf_cli_req               req = {{0,}};
-
-        if (!frame || !this || !data) {
-                ret = -1;
-                goto out;
-        }
-
-        dict = data;
-
-        ret = cli_to_glusterd (&req, frame, gf_cli_gsync_set_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_GSYNC_SET, this, cli_rpc_prog,
-                               NULL);
-
-out:
-        GF_FREE (req.dict.dict_val);
-
-        return ret;
+        return ((cli_profile_info_t *)a) + index;
 }
 
-
 int
 cli_profile_info_percentage_cmp (void *a, void *b)
 {
@@ -4557,6 +2844,19 @@ cli_profile_info_percentage_cmp (void *a, void *b)
         return ret;
 }
 
+void
+cli_profile_info_swap (void *a, void *b)
+{
+        cli_profile_info_t *ia = NULL;
+        cli_profile_info_t *ib = NULL;
+        cli_profile_info_t tmp = {0};
+
+        ia = a;
+        ib = b;
+        tmp = *ia;
+        *ia = *ib;
+        *ib = tmp;
+}
 
 void
 cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
@@ -4566,6 +2866,7 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
         uint64_t                sec = 0;
         uint64_t                r_count = 0;
         uint64_t                w_count = 0;
+        char                    *brick = NULL;
         uint64_t                rb_counts[32] = {0};
         uint64_t                wb_counts[32] = {0};
         cli_profile_info_t      profile_info[GF_FOP_MAXVALUE] = {{0}};
@@ -4578,6 +2879,9 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
         int                     ret = 0;
         double                  total_percentage_latency = 0;
 
+        memset (key, 0, sizeof (key));
+        snprintf (key, sizeof (key), "%d-brick", count);
+        ret = dict_get_str (dict, key, &brick);
         for (i = 0; i < 32; i++) {
                 memset (key, 0, sizeof (key));
                 snprintf (key, sizeof (key), "%d-%d-read-%d", count,
@@ -4612,7 +2916,7 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
                 snprintf (key, sizeof (key), "%d-%d-%d-maxlatency", count,
                           interval, i);
                 ret = dict_get_double (dict, key, &profile_info[i].max_latency);
-                profile_info[i].fop_name = (char *)gf_fop_list[i];
+                profile_info[i].fop_name = gf_fop_list[i];
 
                 total_percentage_latency +=
                        (profile_info[i].fop_hits * profile_info[i].avg_latency);
@@ -4640,6 +2944,7 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
         ret = dict_get_uint64 (dict, key, &w_count);
 
         if (ret == 0) {
+                cli_out ("Brick: %s", brick);
         }
 
         if (interval == -1)
@@ -4647,8 +2952,10 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
         else
                 cli_out ("Interval %d Stats:", interval);
         snprintf (output, sizeof (output), "%14s", "Block Size:");
-        snprintf (read_blocks, sizeof (read_blocks), "%14s", "No. of Reads:");
-        snprintf (write_blocks, sizeof (write_blocks), "%14s", "No. of Writes:");
+        snprintf (read_blocks, sizeof (read_blocks), "%14s",
+                  "No. of Reads:");
+        snprintf (write_blocks, sizeof (write_blocks), "%14s",
+                  "No. of Writes:");
         index = 14;
         for (i = 0; i < 32; i++) {
                 if ((rb_counts[i] == 0) && (wb_counts[i] == 0))
@@ -4671,10 +2978,10 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
                 }
                 index += 22;
                 if (per_line == 3) {
-                        cli_out ("%s", output);
-                        cli_out ("%s", read_blocks);
-                        cli_out ("%s", write_blocks);
-                        cli_out (" ");
+                        cli_out (output);
+                        cli_out (read_blocks);
+                        cli_out (write_blocks);
+                        cli_out ("");
                         per_line = 0;
                         memset (output, 0, sizeof (output));
                         memset (read_blocks, 0, sizeof (read_blocks));
@@ -4689,9 +2996,9 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
         }
 
         if (per_line != 0) {
-                cli_out ("%s", output);
-                cli_out ("%s", read_blocks);
-                cli_out ("%s", write_blocks);
+                cli_out (output);
+                cli_out (read_blocks);
+                cli_out (write_blocks);
         }
         for (i = 0; i < GF_FOP_MAXVALUE; i++) {
                 if (profile_info[i].fop_hits == 0)
@@ -4716,38 +3023,34 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval)
                                  profile_info[i].fop_name);
                 }
         }
-        cli_out (" ");
-        cli_out ("%12s: %"PRId64" seconds", "Duration", sec);
-        cli_out ("%12s: %"PRId64" bytes", "Data Read", r_count);
-        cli_out ("%12s: %"PRId64" bytes", "Data Written", w_count);
-        cli_out (" ");
+        cli_out ("");
+        cli_out ("%12s : %"PRId64" seconds", "Duration", sec);
+        cli_out ("%12s : %"PRId64" bytes", "Data Read", r_count);
+        cli_out ("%12s : %"PRId64" bytes", "Data Written", w_count);
+        cli_out ("");
 }
 
 int32_t
-gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
                               int count, void *myframe)
 {
-        gf_cli_rsp                        rsp   = {0,};
+        gf1_cli_stats_volume_rsp          rsp   = {0,};
         int                               ret   = -1;
         dict_t                            *dict = NULL;
-        gf1_cli_stats_op                  op = GF_CLI_STATS_NONE;
+	gf1_cli_stats_op                  op = GF_CLI_STATS_NONE;
         char                              key[256] = {0};
         int                               interval = 0;
         int                               i = 1;
         int32_t                           brick_count = 0;
         char                              *volname = NULL;
-        char                              *brick = NULL;
-        char                              str[1024] = {0,};
-
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_DEBUG, "Received resp to profile");
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_stats_volume_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
@@ -4758,8 +3061,8 @@ gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
                 goto out;
         }
 
-        ret = dict_unserialize (rsp.dict.dict_val,
-                                rsp.dict.dict_len,
+        ret = dict_unserialize (rsp.stats_info.stats_info_val,
+                                rsp.stats_info.stats_info_len,
                                 &dict);
 
         if (ret) {
@@ -4767,17 +3070,7 @@ gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
                                 "Unable to allocate memory");
                 goto out;
         } else {
-                dict->extra_stdfree = rsp.dict.dict_val;
-        }
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_profile (dict, rsp.op_ret,
-                                                  rsp.op_errno,
-                                                  rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
+                dict->extra_stdfree = rsp.stats_info.stats_info_val;
         }
 
         ret = dict_get_str (dict, "volname", &volname);
@@ -4789,7 +3082,7 @@ gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
                 goto out;
 
         if (rsp.op_ret && strcmp (rsp.op_errstr, "")) {
-                cli_err ("%s", rsp.op_errstr);
+                cli_out (rsp.op_errstr);
         } else {
                 switch (op) {
                 case GF_CLI_STATS_START:
@@ -4827,28 +3120,11 @@ gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
                 goto out;
 
         if (!brick_count) {
-                cli_err ("All bricks of volume %s are down.", volname);
+                cli_out ("All bricks of volume %s are down.", volname);
                 goto out;
         }
 
         while (i <= brick_count) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-brick", i);
-                ret = dict_get_str (dict, key, &brick);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR, "Couldn't get brick name");
-                        goto out;
-                }
-
-                ret = dict_get_str_boolean (dict, "nfs", _gf_false);
-                if (ret)
-                        snprintf (str, sizeof (str), "NFS Server : %s", brick);
-                else
-                        snprintf (str, sizeof (str), "Brick: %s", brick);
-                cli_out ("%s", str);
-                memset (str, '-', strlen (str));
-                cli_out ("%s", str);
-
                 snprintf (key, sizeof (key), "%d-cumulative", i);
                 ret = dict_get_int32 (dict, key, &interval);
                 if (ret == 0) {
@@ -4866,17 +3142,18 @@ gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov,
 out:
         if (dict)
                 dict_unref (dict);
-        free (rsp.op_errstr);
+        if (rsp.op_errstr)
+                free (rsp.op_errstr);
         cli_cmd_broadcast_response (ret);
         return ret;
 }
 
 int32_t
-gf_cli_profile_volume (call_frame_t *frame, xlator_t *this, void *data)
+gf_cli3_1_profile_volume (call_frame_t *frame, xlator_t *this, void *data)
 {
         int                        ret   = -1;
-        gf_cli_req                 req   = {{0,}};
-        dict_t                     *dict = NULL;
+        gf1_cli_stats_volume_req   req   = {0,};
+        dict_t			   *dict = NULL;
 
         GF_ASSERT (frame);
         GF_ASSERT (this);
@@ -4885,65 +3162,70 @@ gf_cli_profile_volume (call_frame_t *frame, xlator_t *this, void *data)
         if (!frame || !this || !data)
                 goto out;
         dict = data;
+        ret = dict_get_str (dict, "volname", &req.volname);
+        if (ret)
+                goto out;
+
+        ret = dict_get_int32 (dict, "op", (int32_t*)&req.op);
+        if (ret)
+                goto out;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_profile_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_PROFILE_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_PROFILE_VOLUME, NULL,
+                              gf_xdr_from_cli_stats_volume_req,
+                              this, gf_cli3_1_profile_volume_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-
-        GF_FREE (req.dict.dict_val);
         return ret;
 }
 
 int32_t
-gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
                               int count, void *myframe)
 {
-        gf_cli_rsp                        rsp   = {0,};
+        gf1_cli_stats_volume_rsp        rsp   = {0,};
         int                               ret   = -1;
-        dict_t                           *dict = NULL;
-        gf1_cli_stats_op                  op = GF_CLI_STATS_NONE;
+        dict_t                            *dict = NULL;
+        gf1_cli_stats_op                op = GF_CLI_STATS_NONE;
         char                              key[256] = {0};
         int                               i = 0;
         int32_t                           brick_count = 0;
         char                              brick[1024];
         int32_t                           members = 0;
-        char                             *filename;
-        char                             *bricks;
-        uint64_t                          value = 0;
+        char                              *filename;
+        char                              *bricks;
+        uint64_t                           value = 0;
         int32_t                           j = 0;
         gf1_cli_top_op                    top_op = GF_CLI_TOP_NONE;
         uint64_t                          nr_open = 0;
         uint64_t                          max_nr_open = 0;
         double                            throughput = 0;
         double                            time = 0;
-        int32_t                           time_sec = 0;
-        long int                          time_usec = 0;
+        long int                          time_sec = 0;
+        long int                           time_usec = 0;
+        struct tm                         *tm = NULL;
         char                              timestr[256] = {0, };
-        char                             *openfd_str = NULL;
-        gf_boolean_t                      nfs = _gf_false;
-        gf_boolean_t                      clear_stats = _gf_false;
-        int                               stats_cleared = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_DEBUG, "Received resp to top");
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
+        ret = gf_xdr_to_cli_stats_volume_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
+                gf_log ("", GF_LOG_ERROR, "Unable to decode response");
                 goto out;
         }
 
+        if (rsp.op_ret && strcmp (rsp.op_errstr, "")) {
+                cli_out (rsp.op_errstr);
+        } else {
+                cli_out ("volume top %s ",
+                         (rsp.op_ret) ? "unsuccessful": "successful");
+        }
+
         if (rsp.op_ret) {
-                if (strcmp (rsp.op_errstr, ""))
-                        cli_err ("%s", rsp.op_errstr);
-                cli_err ("volume top unsuccessful");
                 ret = rsp.op_ret;
                 goto out;
         }
@@ -4955,8 +3237,8 @@ gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
                 goto out;
         }
 
-        ret = dict_unserialize (rsp.dict.dict_val,
-                                rsp.dict.dict_len,
+        ret = dict_unserialize (rsp.stats_info.stats_info_val,
+                                rsp.stats_info.stats_info_len,
                                 &dict);
 
         if (ret) {
@@ -4971,54 +3253,26 @@ gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
                 ret = 0;
                 goto out;
         }
+        ret = dict_get_int32 (dict, "count", &brick_count);
+        if (ret)
+                goto out;
 
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_top (dict, rsp.op_ret,
-                                              rsp.op_errno,
-                                              rsp.op_errstr);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                }
+        if (!brick_count) {
+                cli_out ("All bricks of volume %s are down.");
                 goto out;
         }
 
-        ret = dict_get_int32 (dict, "count", &brick_count);
-        if (ret)
-                goto out;
         snprintf (key, sizeof (key), "%d-top-op", 1);
         ret = dict_get_int32 (dict, key, (int32_t*)&top_op);
         if (ret)
                 goto out;
-
-        clear_stats = dict_get_str_boolean (dict, "clear-stats", _gf_false);
-
         while (i < brick_count) {
                 i++;
                 snprintf (brick, sizeof (brick), "%d-brick", i);
                 ret = dict_get_str (dict, brick, &bricks);
                 if (ret)
                         goto out;
-
-                nfs = dict_get_str_boolean (dict, "nfs", _gf_false);
-
-                if (clear_stats) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%d-stats-cleared", i);
-                        ret = dict_get_int32 (dict, key, &stats_cleared);
-                        if (ret)
-                                goto out;
-                        cli_out (stats_cleared ? "Cleared stats for %s %s" :
-                                 "Failed to clear stats for %s %s",
-                                 nfs ? "NFS server on" : "brick", bricks);
-                        continue;
-                }
-
-                if (nfs)
-                        cli_out ("NFS Server : %s", bricks);
-                else
-                        cli_out ("Brick: %s", bricks);
-
+                cli_out ("Brick: %s", bricks);
                 snprintf(key, sizeof (key), "%d-members", i);
                 ret = dict_get_int32 (dict, key, &members);
 
@@ -5032,18 +3286,14 @@ gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
                         ret = dict_get_uint64 (dict, key, &max_nr_open);
                         if (ret)
                                 goto out;
-                        snprintf (key, sizeof (key), "%d-max-openfd-time", i);
-                        ret = dict_get_str (dict, key, &openfd_str);
-                        if (ret)
-                                goto out;
                         cli_out ("Current open fds: %"PRIu64", Max open"
-                                " fds: %"PRIu64", Max openfd time: %s", nr_open,
-                                 max_nr_open, openfd_str);
+                                " fds: %"PRIu64, nr_open, max_nr_open);
                 case GF_CLI_TOP_READ:
                 case GF_CLI_TOP_WRITE:
                 case GF_CLI_TOP_OPENDIR:
                 case GF_CLI_TOP_READDIR:
                         if (!members) {
+                                cli_out ("No entries in list");
                                 continue;
                         }
                         cli_out ("Count\t\tfilename\n=======================");
@@ -5061,6 +3311,7 @@ gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
                                           time / 1e6);
 
                         if (!members) {
+                                cli_out ("No entries in list");
                                 continue;
                         }
                         cli_out ("%*s %-*s %-*s",
@@ -5095,9 +3346,11 @@ gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov,
                                 ret = dict_get_int32 (dict, key, (int32_t *)&time_usec);
                                 if (ret)
                                         goto out;
-                                gf_time_fmt (timestr, sizeof timestr,
-                                             time_sec, gf_timefmt_FT);
-                                snprintf (timestr + strlen (timestr), sizeof timestr - strlen (timestr),
+                                tm    = localtime (&time_sec);
+                                if (!tm)
+                                        goto out;
+                                strftime (timestr, 256, "%Y-%m-%d %H:%M:%S", tm);
+                                snprintf (timestr + strlen (timestr), 256 - strlen (timestr),
                                   ".%"GF_PRI_SUSECONDS, time_usec);
                                 if (strlen (filename) < VOL_TOP_PERF_FILENAME_DEF_WIDTH)
                                         cli_out ("%*"PRIu64" %-*s %-*s",
@@ -5129,15 +3382,16 @@ out:
         if (dict)
                 dict_unref (dict);
 
-        free (rsp.dict.dict_val);
+        if (rsp.stats_info.stats_info_val)
+                free (rsp.stats_info.stats_info_val);
         return ret;
 }
 
 int32_t
-gf_cli_top_volume (call_frame_t *frame, xlator_t *this, void *data)
+gf_cli3_1_top_volume (call_frame_t *frame, xlator_t *this, void *data)
 {
         int                        ret   = -1;
-        gf_cli_req                 req   = {{0,}};
+        gf1_cli_stats_volume_req   req   = {0,};
         dict_t                     *dict = NULL;
 
         GF_ASSERT (frame);
@@ -5147,46 +3401,49 @@ gf_cli_top_volume (call_frame_t *frame, xlator_t *this, void *data)
         if (!frame || !this || !data)
                 goto out;
         dict = data;
+        ret = dict_get_str (dict, "volname", &req.volname);
+        if (ret)
+                goto out;
 
-        ret = cli_to_glusterd (&req, frame, gf_cli_top_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_PROFILE_VOLUME, this, cli_rpc_prog,
-                               NULL);
+        ret = dict_get_int32 (dict, "op", (int32_t*)&req.op);
+        if (ret)
+                goto out;
+
+        ret = dict_allocate_and_serialize (dict,
+                                           &req.dict_req.dict_req_val,
+                                           (size_t *)&req.dict_req.dict_req_len);
+
+        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
+                              GLUSTER_CLI_PROFILE_VOLUME, NULL,
+                              gf_xdr_from_cli_stats_volume_req,
+                              this, gf_cli3_1_top_volume_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        GF_FREE (req.dict.dict_val);
         return ret;
 }
 
 
 int
-gf_cli_getwd_cbk (struct rpc_req *req, struct iovec *iov,
+gf_cli3_1_getwd_cbk (struct rpc_req *req, struct iovec *iov,
                        int count, void *myframe)
 {
         gf1_cli_getwd_rsp rsp   = {0,};
-        int               ret   = -1;
+        int               ret   = 0;
 
         if (-1 == req->rpc_status) {
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf1_cli_getwd_rsp);
-        if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        if (rsp.op_ret == -1) {
-                cli_err ("getwd failed");
-                ret = rsp.op_ret;
+        ret = gf_xdr_to_cli_getwd_rsp (*iov, &rsp);
+        if (ret < 0 || rsp.op_ret == -1) {
+                gf_log ("", GF_LOG_ERROR, "error");
                 goto out;
         }
 
         gf_log ("cli", GF_LOG_INFO, "Received resp to getwd");
 
-        cli_out ("%s", rsp.wd);
+        cli_out (rsp.wd);
 
         ret = 0;
 
@@ -5196,7 +3453,7 @@ out:
 }
 
 int32_t
-gf_cli_getwd (call_frame_t *frame, xlator_t *this, void *data)
+gf_cli3_1_getwd (call_frame_t *frame, xlator_t *this, void *data)
 {
         int                      ret = -1;
         gf1_cli_getwd_req        req = {0,};
@@ -5209,2432 +3466,52 @@ gf_cli_getwd (call_frame_t *frame, xlator_t *this, void *data)
 
         ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
                               GLUSTER_CLI_GETWD, NULL,
-                              this, gf_cli_getwd_cbk,
-                              (xdrproc_t) xdr_gf1_cli_getwd_req);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-
-        return ret;
-}
-
-void
-cli_print_volume_status_mempool (dict_t *dict, char *prefix)
-{
-        int             ret = -1;
-        int32_t         mempool_count = 0;
-        char            *name = NULL;
-        int32_t         hotcount = 0;
-        int32_t         coldcount = 0;
-        uint64_t        paddedsizeof = 0;
-        uint64_t        alloccount = 0;
-        int32_t         maxalloc = 0;
-        uint64_t        pool_misses = 0;
-        int32_t         maxstdalloc = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        GF_ASSERT (dict);
-        GF_ASSERT (prefix);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.mempool-count",prefix);
-        ret = dict_get_int32 (dict, key, &mempool_count);
-        if (ret)
-                goto out;
-
-        cli_out ("Mempool Stats\n-------------");
-        cli_out ("%-30s %9s %9s %12s %10s %8s %8s %12s", "Name", "HotCount",
-                 "ColdCount", "PaddedSizeof", "AllocCount", "MaxAlloc",
-                 "Misses", "Max-StdAlloc");
-        cli_out ("%-30s %9s %9s %12s %10s %8s %8s %12s", "----", "--------",
-                 "---------", "------------", "----------",
-                 "--------", "--------", "------------");
-
-        for (i = 0; i < mempool_count; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.name", prefix, i);
-                ret = dict_get_str (dict, key, &name);
-                if (ret)
-                        goto out;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.hotcount", prefix, i);
-                ret = dict_get_int32 (dict, key, &hotcount);
-                if (ret)
-                        goto out;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.coldcount", prefix, i);
-                ret = dict_get_int32 (dict, key, &coldcount);
-                if (ret)
-                        goto out;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.paddedsizeof",
-                          prefix, i);
-                ret = dict_get_uint64 (dict, key, &paddedsizeof);
-                if (ret)
-                        goto out;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.alloccount", prefix, i);
-                ret = dict_get_uint64 (dict, key, &alloccount);
-                if (ret)
-                        goto out;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.max_alloc", prefix, i);
-                ret = dict_get_int32 (dict, key, &maxalloc);
-                if (ret)
-                        goto out;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.max-stdalloc", prefix, i);
-                ret = dict_get_int32 (dict, key, &maxstdalloc);
-                if (ret)
-                        goto out;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.pool-misses", prefix, i);
-                ret = dict_get_uint64 (dict, key, &pool_misses);
-                if (ret)
-                        goto out;
-
-                cli_out ("%-30s %9d %9d %12"PRIu64" %10"PRIu64" %8d %8"PRIu64
-                         " %12d", name, hotcount, coldcount, paddedsizeof,
-                         alloccount, maxalloc, pool_misses, maxstdalloc);
-        }
-
-out:
-        return;
-
-}
-
-void
-cli_print_volume_status_mem (dict_t *dict, gf_boolean_t notbrick)
-{
-        int             ret = -1;
-        char            *volname = NULL;
-        char            *hostname = NULL;
-        char            *path = NULL;
-        int             online = -1;
-        char            key[1024] = {0,};
-        int             brick_index_max = -1;
-        int             other_count = 0;
-        int             index_max = 0;
-        int             val = 0;
-        int             i = 0;
-
-        GF_ASSERT (dict);
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-        cli_out ("Memory status for volume : %s", volname);
-
-        ret = dict_get_int32 (dict, "brick-index-max", &brick_index_max);
-        if (ret)
-                goto out;
-        ret = dict_get_int32 (dict, "other-count", &other_count);
-        if (ret)
-                goto out;
-
-        index_max = brick_index_max + other_count;
-
-        for (i = 0; i <= index_max; i++) {
-                cli_out ("----------------------------------------------");
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname);
-                if (ret)
-                        continue;
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.path", i);
-                ret = dict_get_str (dict, key, &path);
-                if (ret)
-                        continue;
-                if (notbrick)
-                        cli_out ("%s : %s", hostname, path);
-                else
-                        cli_out ("Brick : %s:%s", hostname, path);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.status", i);
-                ret = dict_get_int32 (dict, key, &online);
-                if (ret)
-                        goto out;
-                if (!online) {
-                        if (notbrick)
-                                cli_out ("%s is offline", hostname);
-                        else
-                                cli_out ("Brick is offline");
-                        continue;
-                }
-
-                cli_out ("Mallinfo\n--------");
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.arena", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if (ret)
-                        goto out;
-                cli_out ("%-8s : %d","Arena", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.ordblks", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if(ret)
-                        goto out;
-                cli_out ("%-8s : %d","Ordblks", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.smblks", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if(ret)
-                        goto out;
-                cli_out ("%-8s : %d","Smblks", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.hblks", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if(ret)
-                        goto out;
-                cli_out ("%-8s : %d", "Hblks", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.hblkhd", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if (ret)
-                        goto out;
-                cli_out ("%-8s : %d", "Hblkhd", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.usmblks", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if (ret)
-                        goto out;
-                cli_out ("%-8s : %d", "Usmblks", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.fsmblks", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if (ret)
-                        goto out;
-                cli_out ("%-8s : %d", "Fsmblks", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.uordblks", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if (ret)
-                        goto out;
-                cli_out ("%-8s : %d", "Uordblks", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.fordblks", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if (ret)
-                        goto out;
-                cli_out ("%-8s : %d", "Fordblks", val);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.mallinfo.keepcost", i);
-                ret = dict_get_int32 (dict, key, &val);
-                if (ret)
-                        goto out;
-                cli_out ("%-8s : %d", "Keepcost", val);
-
-                cli_out (" ");
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d", i);
-                cli_print_volume_status_mempool (dict, key);
-        }
-out:
-        cli_out ("----------------------------------------------\n");
-        return;
-}
-
-void
-cli_print_volume_status_clients (dict_t *dict, gf_boolean_t notbrick)
-{
-        int             ret = -1;
-        char            *volname = NULL;
-        int             brick_index_max = -1;
-        int             other_count = 0;
-        int             index_max = 0;
-        char            *hostname = NULL;
-        char            *path = NULL;
-        int             online = -1;
-        int             client_count = 0;
-        char            *clientname = NULL;
-        uint64_t        bytesread = 0;
-        uint64_t        byteswrite = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-        int             j = 0;
-
-        GF_ASSERT (dict);
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-        cli_out ("Client connections for volume %s", volname);
-
-        ret = dict_get_int32 (dict, "brick-index-max", &brick_index_max);
-        if (ret)
-                goto out;
-        ret = dict_get_int32 (dict, "other-count", &other_count);
-        if (ret)
-                goto out;
-
-        index_max = brick_index_max + other_count;
-
-        for (i = 0; i <= index_max; i++) {
-                cli_out ("----------------------------------------------");
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname);
-                if (ret)
-                        goto out;
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.path", i);
-                ret = dict_get_str (dict, key, &path);
-                if (ret)
-                        goto out;
-
-                if (notbrick)
-                        cli_out ("%s : %s", hostname, path);
-                else
-                        cli_out ("Brick : %s:%s", hostname, path);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.status", i);
-                ret = dict_get_int32 (dict, key, &online);
-                if (ret)
-                        goto out;
-                if (!online) {
-                        if (notbrick)
-                                cli_out ("%s is offline", hostname);
-                        else
-                                cli_out ("Brick is offline");
-                        continue;
-                }
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.clientcount", i);
-                ret = dict_get_int32 (dict, key, &client_count);
-                if (ret)
-                        goto out;
-
-                cli_out ("Clients connected : %d", client_count);
-                if (client_count == 0)
-                        continue;
-
-                cli_out ("%-48s %15s %15s", "Hostname", "BytesRead",
-                         "BytesWritten");
-                cli_out ("%-48s %15s %15s", "--------", "---------",
-                         "------------");
-                for (j =0; j < client_count; j++) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key),
-                                  "brick%d.client%d.hostname", i, j);
-                        ret = dict_get_str (dict, key, &clientname);
-                        if (ret)
-                                goto out;
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key),
-                                  "brick%d.client%d.bytesread", i, j);
-                        ret = dict_get_uint64 (dict, key, &bytesread);
-                        if (ret)
-                                goto out;
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key),
-                                 "brick%d.client%d.byteswrite", i, j);
-                        ret = dict_get_uint64 (dict, key, &byteswrite);
-                        if (ret)
-                                goto out;
-
-                        cli_out ("%-48s %15"PRIu64" %15"PRIu64,
-                                 clientname, bytesread, byteswrite);
-                }
-        }
-out:
-        cli_out ("----------------------------------------------\n");
-        return;
-}
-
-void
-cli_print_volume_status_inode_entry (dict_t *dict, char *prefix)
-{
-        int             ret = -1;
-        char            key[1024] = {0,};
-        char            *gfid = NULL;
-        uint64_t        nlookup = 0;
-        uint32_t        ref = 0;
-        int             ia_type = 0;
-        char            inode_type;
-
-        GF_ASSERT (dict);
-        GF_ASSERT (prefix);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.gfid", prefix);
-        ret = dict_get_str (dict, key, &gfid);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.nlookup", prefix);
-        ret = dict_get_uint64 (dict, key, &nlookup);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.ref", prefix);
-        ret = dict_get_uint32 (dict, key, &ref);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.ia_type", prefix);
-        ret = dict_get_int32 (dict, key, &ia_type);
-        if (ret)
-                goto out;
-
-        switch (ia_type) {
-        case IA_IFREG:
-                inode_type = 'R';
-                break;
-        case IA_IFDIR:
-                inode_type = 'D';
-                break;
-        case IA_IFLNK:
-                inode_type = 'L';
-                break;
-        case IA_IFBLK:
-                inode_type = 'B';
-                break;
-        case IA_IFCHR:
-                inode_type = 'C';
-                break;
-        case IA_IFIFO:
-                inode_type = 'F';
-                break;
-        case IA_IFSOCK:
-                inode_type = 'S';
-                break;
-        default:
-                inode_type = 'I';
-                break;
-        }
-
-        cli_out ("%-40s %14"PRIu64" %14"PRIu32" %9c",
-                 gfid, nlookup, ref, inode_type);
-
-out:
-        return;
-
-}
-
-void
-cli_print_volume_status_itables (dict_t *dict, char *prefix)
-{
-        int             ret = -1;
-        char            key[1024] = {0,};
-        uint32_t        active_size = 0;
-        uint32_t        lru_size = 0;
-        uint32_t        purge_size = 0;
-        int             i =0;
-
-        GF_ASSERT (dict);
-        GF_ASSERT (prefix);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.active_size", prefix);
-        ret = dict_get_uint32 (dict, key, &active_size);
-        if (ret)
-                goto out;
-        if (active_size != 0) {
-                cli_out ("Active inodes:");
-                cli_out ("%-40s %14s %14s %9s", "GFID", "Lookups", "Ref",
-                         "IA type");
-                cli_out ("%-40s %14s %14s %9s", "----", "-------", "---",
-                         "-------");
-        }
-        for (i = 0; i < active_size; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.active%d", prefix, i);
-                cli_print_volume_status_inode_entry (dict, key);
-        }
-        cli_out (" ");
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.lru_size", prefix);
-        ret = dict_get_uint32 (dict, key, &lru_size);
-        if (ret)
-                goto out;
-        if (lru_size != 0) {
-                cli_out ("LRU inodes:");
-                cli_out ("%-40s %14s %14s %9s", "GFID", "Lookups", "Ref",
-                         "IA type");
-                cli_out ("%-40s %14s %14s %9s", "----", "-------", "---",
-                         "-------");
-        }
-        for (i = 0; i < lru_size; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.lru%d", prefix, i);
-                cli_print_volume_status_inode_entry (dict, key);
-        }
-        cli_out (" ");
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.purge_size", prefix);
-        ret = dict_get_uint32 (dict, key, &purge_size);
-        if (ret)
-                goto out;
-        if (purge_size != 0) {
-                cli_out ("Purged inodes:");
-                cli_out ("%-40s %14s %14s %9s", "GFID", "Lookups", "Ref",
-                         "IA type");
-                cli_out ("%-40s %14s %14s %9s", "----", "-------", "---",
-                         "-------");
-        }
-        for (i = 0; i < purge_size; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.purge%d", prefix, i);
-                cli_print_volume_status_inode_entry (dict, key);
-        }
-
-out:
-        return;
-}
-
-void
-cli_print_volume_status_inode (dict_t *dict, gf_boolean_t notbrick)
-{
-        int             ret = -1;
-        char            *volname = NULL;
-        int             brick_index_max = -1;
-        int             other_count = 0;
-        int             index_max = 0;
-        char            *hostname = NULL;
-        char            *path = NULL;
-        int             online = -1;
-        int             conn_count = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-        int             j = 0;
-
-        GF_ASSERT (dict);
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-        cli_out ("Inode tables for volume %s", volname);
-
-        ret = dict_get_int32 (dict, "brick-index-max", &brick_index_max);
-        if (ret)
-                goto out;
-        ret = dict_get_int32 (dict, "other-count", &other_count);
-        if (ret)
-                goto out;
-
-        index_max = brick_index_max + other_count;
-
-        for ( i = 0; i <= index_max; i++) {
-                cli_out ("----------------------------------------------");
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname);
-                if (ret)
-                        goto out;
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.path", i);
-                ret = dict_get_str (dict, key, &path);
-                if (ret)
-                        goto out;
-                if (notbrick)
-                        cli_out ("%s : %s", hostname, path);
-                else
-                        cli_out ("Brick : %s:%s", hostname, path);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.status", i);
-                ret = dict_get_int32 (dict, key, &online);
-                if (ret)
-                        goto out;
-                if (!online) {
-                        if (notbrick)
-                                cli_out ("%s is offline", hostname);
-                        else
-                                cli_out ("Brick is offline");
-                        continue;
-                }
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.conncount", i);
-                ret = dict_get_int32 (dict, key, &conn_count);
-                if (ret)
-                        goto out;
-
-                for (j = 0; j < conn_count; j++) {
-                        if (conn_count > 1)
-                                cli_out ("Connection %d:", j+1);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "brick%d.conn%d.itable",
-                                  i, j);
-                        cli_print_volume_status_itables (dict, key);
-                        cli_out (" ");
-                }
-        }
-out:
-        cli_out ("----------------------------------------------");
-        return;
-}
-
-void
-cli_print_volume_status_fdtable (dict_t *dict, char *prefix)
-{
-        int             ret = -1;
-        char            key[1024] = {0,};
-        int             refcount = 0;
-        uint32_t        maxfds = 0;
-        int             firstfree = 0;
-        int             openfds = 0;
-        int             fd_pid = 0;
-        int             fd_refcount = 0;
-        int             fd_flags = 0;
-        int             i = 0;
-
-        GF_ASSERT (dict);
-        GF_ASSERT (prefix);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.refcount", prefix);
-        ret = dict_get_int32 (dict, key, &refcount);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.maxfds", prefix);
-        ret = dict_get_uint32 (dict, key, &maxfds);
-        if (ret)
-                goto out;
-
-        memset (key, 0 ,sizeof (key));
-        snprintf (key, sizeof (key), "%s.firstfree", prefix);
-        ret = dict_get_int32 (dict, key, &firstfree);
-        if (ret)
-                goto out;
-
-        cli_out ("RefCount = %d  MaxFDs = %d  FirstFree = %d",
-                 refcount, maxfds, firstfree);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.openfds", prefix);
-        ret = dict_get_int32 (dict, key, &openfds);
-        if (ret)
-                goto out;
-        if (0 == openfds) {
-                cli_err ("No open fds");
-                goto out;
-        }
-
-        cli_out ("%-19s %-19s %-19s %-19s", "FD Entry", "PID",
-                 "RefCount", "Flags");
-        cli_out ("%-19s %-19s %-19s %-19s", "--------", "---",
-                 "--------", "-----");
-
-        for (i = 0; i < maxfds ; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.fdentry%d.pid", prefix, i);
-                ret = dict_get_int32 (dict, key, &fd_pid);
-                if (ret)
-                        continue;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.fdentry%d.refcount",
-                          prefix, i);
-                ret = dict_get_int32 (dict, key, &fd_refcount);
-                if (ret)
-                        continue;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.fdentry%d.flags", prefix, i);
-                ret = dict_get_int32 (dict, key, &fd_flags);
-                if (ret)
-                        continue;
-
-                cli_out ("%-19d %-19d %-19d %-19d", i, fd_pid, fd_refcount,
-                         fd_flags);
-        }
-
-out:
-        return;
-}
-
-void
-cli_print_volume_status_fd (dict_t *dict, gf_boolean_t notbrick)
-{
-        int             ret = -1;
-        char            *volname = NULL;
-        int             brick_index_max = -1;
-        int             other_count = 0;
-        int             index_max = 0;
-        char            *hostname = NULL;
-        char            *path = NULL;
-        int             online = -1;
-        int             conn_count = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-        int             j = 0;
-
-        GF_ASSERT (dict);
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-        cli_out ("FD tables for volume %s", volname);
-
-        ret = dict_get_int32 (dict, "brick-index-max", &brick_index_max);
-        if (ret)
-                goto out;
-        ret = dict_get_int32 (dict, "other-count", &other_count);
-        if (ret)
-                goto out;
-
-        index_max = brick_index_max + other_count;
-
-        for (i = 0; i <= index_max; i++) {
-                cli_out ("----------------------------------------------");
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname);
-                if (ret)
-                        goto out;
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.path", i);
-                ret = dict_get_str (dict, key, &path);
-                if (ret)
-                        goto out;
-
-                if (notbrick)
-                        cli_out ("%s : %s", hostname, path);
-                else
-                        cli_out ("Brick : %s:%s", hostname, path);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.status", i);
-                ret = dict_get_int32 (dict, key, &online);
-                if (ret)
-                        goto out;
-                if (!online) {
-                        if (notbrick)
-                                cli_out ("%s is offline", hostname);
-                        else
-                                cli_out ("Brick is offline");
-                        continue;
-                }
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.conncount", i);
-                ret = dict_get_int32 (dict, key, &conn_count);
-                if (ret)
-                        goto out;
-
-                for (j = 0; j < conn_count; j++) {
-                        cli_out ("Connection %d:", j+1);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "brick%d.conn%d.fdtable",
-                                  i, j);
-                        cli_print_volume_status_fdtable (dict, key);
-                        cli_out (" ");
-                }
-        }
-out:
-        cli_out ("----------------------------------------------");
-        return;
-}
-
-void
-cli_print_volume_status_call_frame (dict_t *dict, char *prefix)
-{
-        int             ret = -1;
-        char            key[1024] = {0,};
-        int             ref_count = 0;
-        char            *translator = 0;
-        int             complete = 0;
-        char            *parent = NULL;
-        char            *wind_from = NULL;
-        char            *wind_to = NULL;
-        char            *unwind_from = NULL;
-        char            *unwind_to = NULL;
-
-        if (!dict || !prefix)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.refcount", prefix);
-        ret = dict_get_int32 (dict, key, &ref_count);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.translator", prefix);
-        ret = dict_get_str (dict, key, &translator);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.complete", prefix);
-        ret = dict_get_int32 (dict, key, &complete);
-        if (ret)
-                return;
-
-        cli_out ("  Ref Count   = %d", ref_count);
-        cli_out ("  Translator  = %s", translator);
-        cli_out ("  Completed   = %s", (complete ? "Yes" : "No"));
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.parent", prefix);
-        ret = dict_get_str (dict, key, &parent);
-        if (!ret)
-                cli_out ("  Parent      = %s", parent);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.windfrom", prefix);
-        ret = dict_get_str (dict, key, &wind_from);
-        if (!ret)
-                cli_out ("  Wind From   = %s", wind_from);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.windto", prefix);
-        ret = dict_get_str (dict, key, &wind_to);
-        if (!ret)
-                cli_out ("  Wind To     = %s", wind_to);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.unwindfrom", prefix);
-        ret = dict_get_str (dict, key, &unwind_from);
-        if (!ret)
-                cli_out ("  Unwind From = %s", unwind_from);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.unwindto", prefix);
-        ret = dict_get_str (dict, key, &unwind_to);
-        if (!ret)
-                cli_out ("  Unwind To   = %s", unwind_to);
-}
-
-void
-cli_print_volume_status_call_stack (dict_t *dict, char *prefix)
-{
-        int             ret = -1;
-        char            key[1024] = {0,};
-        int             uid = 0;
-        int             gid = 0;
-        int             pid = 0;
-        uint64_t        unique = 0;
-        //char            *op = NULL;
-        int             count = 0;
-        int             i = 0;
-
-        if (!dict || !prefix)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.uid", prefix);
-        ret = dict_get_int32 (dict, key, &uid);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.gid", prefix);
-        ret = dict_get_int32 (dict, key, &gid);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.pid", prefix);
-        ret = dict_get_int32 (dict, key, &pid);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.unique", prefix);
-        ret = dict_get_uint64 (dict, key, &unique);
-        if (ret)
-                return;
-
-        /*
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.op", prefix);
-        ret = dict_get_str (dict, key, &op);
-        if (ret)
-                return;
-        */
-
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.count", prefix);
-        ret = dict_get_int32 (dict, key, &count);
-        if (ret)
-                return;
-
-        cli_out (" UID    : %d", uid);
-        cli_out (" GID    : %d", gid);
-        cli_out (" PID    : %d", pid);
-        cli_out (" Unique : %"PRIu64, unique);
-        //cli_out ("\tOp     : %s", op);
-        cli_out (" Frames : %d", count);
-
-        for (i = 0; i < count; i++) {
-                cli_out (" Frame %d", i+1);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.frame%d", prefix, i);
-                cli_print_volume_status_call_frame (dict, key);
-        }
-
-        cli_out (" ");
-}
-
-void
-cli_print_volume_status_callpool (dict_t *dict, gf_boolean_t notbrick)
-{
-        int             ret = -1;
-        char            *volname = NULL;
-        int             brick_index_max = -1;
-        int             other_count = 0;
-        int             index_max = 0;
-        char            *hostname = NULL;
-        char            *path = NULL;
-        int             online = -1;
-        int             call_count = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-        int             j = 0;
-
-        GF_ASSERT (dict);
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-        cli_out ("Pending calls for volume %s", volname);
-
-        ret = dict_get_int32 (dict, "brick-index-max", &brick_index_max);
-        if (ret)
-                goto out;
-        ret = dict_get_int32 (dict, "other-count", &other_count);
-        if (ret)
-                goto out;
-
-        index_max = brick_index_max + other_count;
-
-        for (i = 0; i <= index_max; i++) {
-                cli_out ("----------------------------------------------");
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname);
-                if (ret)
-                        goto out;
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.path", i);
-                ret = dict_get_str (dict, key, &path);
-                if (ret)
-                        goto out;
-
-                if (notbrick)
-                        cli_out ("%s : %s", hostname, path);
-                else
-                        cli_out ("Brick : %s:%s", hostname, path);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.status", i);
-                ret = dict_get_int32 (dict, key, &online);
-                if (ret)
-                        goto out;
-                if (!online) {
-                        if (notbrick)
-                                cli_out ("%s is offline", hostname);
-                        else
-                                cli_out ("Brick is offline");
-                        continue;
-                }
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.callpool.count", i);
-                ret = dict_get_int32 (dict, key, &call_count);
-                if (ret)
-                        goto out;
-                cli_out ("Pending calls: %d", call_count);
-
-                if (0 == call_count)
-                        continue;
-
-                for (j = 0; j < call_count; j++) {
-                        cli_out ("Call Stack%d", j+1);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key),
-                                  "brick%d.callpool.stack%d", i, j);
-                        cli_print_volume_status_call_stack (dict, key);
-                }
-        }
-
-out:
-        cli_out ("----------------------------------------------");
-        return;
-}
-
-static void
-cli_print_volume_status_tasks (dict_t *dict)
-{
-        int             ret         = -1;
-        int             i           = 0;
-        int             j           = 0;
-        int             count       = 0;
-        int             task_count  = 0;
-        int             status      = 0;
-        char           *op          = NULL;
-        char           *task_id_str = NULL;
-        char           *volname     = NULL;
-        char            key[1024]   = {0,};
-        char            task[1024]  = {0,};
-        char           *brick       = NULL;
-        char           *src_brick   = NULL;
-        char           *dest_brick  = NULL;
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-
-        ret = dict_get_int32 (dict, "tasks", &task_count);
-        if (ret) {
-                gf_log ("cli", GF_LOG_ERROR, "Failed to get tasks count");
-                return;
-        }
-
-        cli_out ("Task Status of Volume %s", volname);
-        cli_print_line (CLI_BRICK_STATUS_LINE_LEN);
-
-        if (task_count == 0) {
-                cli_out ("There are no active volume tasks");
-                cli_out (" ");
-                return;
-        }
-
-        for (i = 0; i < task_count; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "task%d.type", i);
-                ret = dict_get_str(dict, key, &op);
-                if (ret)
-                        return;
-                cli_out ("%-20s : %-20s", "Task", op);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "task%d.id", i);
-                ret = dict_get_str (dict, key, &task_id_str);
-                if (ret)
-                        return;
-                cli_out ("%-20s : %-20s", "ID", task_id_str);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "task%d.status", i);
-                ret = dict_get_int32 (dict, key, &status);
-                if (ret)
-                        return;
-
-                snprintf (task, sizeof (task), "task%d", i);
-
-                /*
-                   Replace brick only has two states - In progress and Complete
-                   Ref: xlators/mgmt/glusterd/src/glusterd-replace-brick.c
-                */
-
-                if (!strcmp (op, "Replace brick")) {
-                        if (status)
-                                status = GF_DEFRAG_STATUS_COMPLETE;
-                        else
-                                status = GF_DEFRAG_STATUS_STARTED;
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%s.src-brick", task);
-                        ret = dict_get_str (dict, key, &src_brick);
-                        if (ret)
-                                goto out;
-
-                        cli_out ("%-20s : %-20s", "Source Brick", src_brick);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%s.dst-brick", task);
-                        ret = dict_get_str (dict, key, &dest_brick);
-                        if (ret)
-                                goto out;
-
-                        cli_out ("%-20s : %-20s", "Destination Brick",
-                                 dest_brick);
-
-                } else if (!strcmp (op, "Remove brick")) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%s.count", task);
-                        ret = dict_get_int32 (dict, key, &count);
-                        if (ret)
-                                goto out;
-
-                        cli_out ("%-20s", "Removed bricks:");
-
-                        for (j = 1; j <= count; j++) {
-                                memset (key, 0, sizeof (key));
-                                snprintf (key, sizeof (key),"%s.brick%d",
-                                          task, j);
-                                ret = dict_get_str (dict, key, &brick);
-                                if (ret)
-                                        goto out;
-
-                                cli_out ("%-20s", brick);
-                        }
-                }
-                cli_out ("%-20s : %-20s", "Status",
-                         cli_vol_task_status_str[status]);
-                cli_out (" ");
-        }
-
-out:
-        return;
-}
-
-static int
-gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov,
-                      int count, void *myframe)
-{
-        int                             ret             = -1;
-        int                             brick_index_max = -1;
-        int                             other_count     = 0;
-        int                             index_max       = 0;
-        int                             i               = 0;
-        int                             pid             = -1;
-        uint32_t                        cmd             = 0;
-        gf_boolean_t                    notbrick        = _gf_false;
-        char                            key[1024]       = {0,};
-        char                           *hostname        = NULL;
-        char                           *path            = NULL;
-        char                           *volname         = NULL;
-        dict_t                         *dict            = NULL;
-        gf_cli_rsp                      rsp             = {0,};
-        cli_volume_status_t             status          = {0};
-        cli_local_t                    *local           = NULL;
-        gf_boolean_t                    wipe_local      = _gf_false;
-        char                            msg[1024]       = {0,};
-
-        if (req->rpc_status == -1)
-                goto out;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        gf_log ("cli", GF_LOG_DEBUG, "Received response to status cmd");
-
-        local = ((call_frame_t *)myframe)->local;
-        if (!local) {
-                local = cli_local_get ();
-                if (!local) {
-                        ret = -1;
-                        gf_log ("cli", GF_LOG_ERROR, "Failed to get local");
-                        goto out;
-                }
-                wipe_local = _gf_true;
-        }
-
-        if (rsp.op_ret) {
-                if (strcmp (rsp.op_errstr, ""))
-                        snprintf (msg, sizeof (msg), "%s", rsp.op_errstr);
-                else
-                        snprintf (msg, sizeof (msg), "Unable to obtain volume "
-                                  "status information.");
-
-                if (global_state->mode & GLUSTER_MODE_XML) {
-                        if (!local->all)
-                                cli_xml_output_str ("volStatus", msg,
-                                                    rsp.op_ret, rsp.op_errno,
-                                                    rsp.op_errstr);
-                        ret = 0;
-                        goto out;
-                }
-
-                cli_err ("%s", msg);
-                if (local && local->all) {
-                        ret = 0;
-                        cli_out (" ");
-                } else
-                        ret = -1;
-
-                goto out;
-        }
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        ret = dict_unserialize (rsp.dict.dict_val,
-                                rsp.dict.dict_len,
-                                &dict);
-        if (ret)
-                goto out;
-
-        ret = dict_get_uint32 (dict, "cmd", &cmd);
-        if (ret)
-                goto out;
-
-        if ((cmd & GF_CLI_STATUS_ALL)) {
-                if (local && local->dict) {
-                        dict_ref (dict);
-                        ret = dict_set_static_ptr (local->dict, "rsp-dict", dict);
-                        ret = 0;
-                } else {
-                        gf_log ("cli", GF_LOG_ERROR, "local not found");
-                        ret = -1;
-                }
-                goto out;
-        }
-
-        if ((cmd & GF_CLI_STATUS_NFS) || (cmd & GF_CLI_STATUS_SHD))
-                notbrick = _gf_true;
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                if (!local->all) {
-                        ret = cli_xml_output_vol_status_begin (local,
-                                                               rsp.op_ret,
-                                                               rsp.op_errno,
-                                                               rsp.op_errstr);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
-                                goto out;
-                        }
-                }
-                if (cmd & GF_CLI_STATUS_TASKS) {
-                        ret = cli_xml_output_vol_status_tasks_detail (local,
-                                                                      dict);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,"Error outputting "
-                                        "to xml");
-                                goto out;
-                        }
-                } else {
-                        ret = cli_xml_output_vol_status (local, dict);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
-                                goto out;
-                        }
-                }
-
-                if (!local->all) {
-                        ret = cli_xml_output_vol_status_end (local);
-                        if (ret) {
-                                gf_log ("cli", GF_LOG_ERROR,
-                                        "Error outputting to xml");
-                        }
-                }
-                goto out;
-        }
-
-        status.brick = GF_CALLOC (1, PATH_MAX + 256, gf_common_mt_strdup);
-
-        switch (cmd & GF_CLI_STATUS_MASK) {
-                case GF_CLI_STATUS_MEM:
-                        cli_print_volume_status_mem (dict, notbrick);
-                        goto cont;
-                        break;
-                case GF_CLI_STATUS_CLIENTS:
-                        cli_print_volume_status_clients (dict, notbrick);
-                        goto cont;
-                        break;
-                case GF_CLI_STATUS_INODE:
-                        cli_print_volume_status_inode (dict, notbrick);
-                        goto cont;
-                        break;
-                case GF_CLI_STATUS_FD:
-                        cli_print_volume_status_fd (dict, notbrick);
-                        goto cont;
-                        break;
-                case GF_CLI_STATUS_CALLPOOL:
-                        cli_print_volume_status_callpool (dict, notbrick);
-                        goto cont;
-                        break;
-                case GF_CLI_STATUS_TASKS:
-                        cli_print_volume_status_tasks (dict);
-                        goto cont;
-                        break;
-                default:
-                        break;
-        }
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-
-        ret = dict_get_int32 (dict, "brick-index-max", &brick_index_max);
-        if (ret)
-                goto out;
-
-        ret = dict_get_int32 (dict, "other-count", &other_count);
-        if (ret)
-                goto out;
-
-        index_max = brick_index_max + other_count;
-
-
-        cli_out ("Status of volume: %s", volname);
-
-        if ((cmd & GF_CLI_STATUS_DETAIL) == 0) {
-                cli_out ("Gluster process\t\t\t\t\t\tPort\tOnline\tPid");
-                cli_print_line (CLI_BRICK_STATUS_LINE_LEN);
-        }
-
-        for (i = 0; i <= index_max; i++) {
-
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname);
-                if (ret)
-                        continue;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.path", i);
-                ret = dict_get_str (dict, key, &path);
-                if (ret)
-                        continue;
-
-                /* Brick/not-brick is handled seperately here as all
-                 * types of nodes are contained in the default output
-                 */
-                memset (status.brick, 0, PATH_MAX + 255);
-                if (!strcmp (hostname, "NFS Server") ||
-                    !strcmp (hostname, "Self-heal Daemon"))
-                        snprintf (status.brick, PATH_MAX + 255, "%s on %s",
-                                  hostname, path);
-                else
-                        snprintf (status.brick, PATH_MAX + 255, "Brick %s:%s",
-                                  hostname, path);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.port", i);
-                ret = dict_get_int32 (dict, key, &(status.port));
-                if (ret)
-                        continue;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.status", i);
-                ret = dict_get_int32 (dict, key, &(status.online));
-                if (ret)
-                        continue;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.pid", i);
-                ret = dict_get_int32 (dict, key, &pid);
-                if (ret)
-                        continue;
-                if (pid == -1)
-                        ret = gf_asprintf (&(status.pid_str), "%s", "N/A");
-                else
-                        ret = gf_asprintf (&(status.pid_str), "%d", pid);
-
-                if (ret == -1)
-                        goto out;
-
-                if ((cmd & GF_CLI_STATUS_DETAIL)) {
-                        ret = cli_get_detail_status (dict, i, &status);
-                        if (ret)
-                                goto out;
-                        cli_print_line (CLI_BRICK_STATUS_LINE_LEN);
-                        cli_print_detailed_status (&status);
-
-                } else {
-                        cli_print_brick_status (&status);
-                }
-        }
-        cli_out (" ");
-
-        if ((cmd & GF_CLI_STATUS_MASK) == GF_CLI_STATUS_NONE)
-                cli_print_volume_status_tasks (dict);
-cont:
-        ret = rsp.op_ret;
-
-out:
-        if (dict)
-                dict_unref (dict);
-        GF_FREE (status.brick);
-        if (local && wipe_local) {
-                cli_local_wipe (local);
-        }
-
-        cli_cmd_broadcast_response (ret);
-        return ret;
-}
-
-int32_t
-gf_cli_status_volume (call_frame_t *frame, xlator_t *this,
-                         void *data)
-{
-        gf_cli_req                      req  = {{0,}};
-        int                             ret  = -1;
-        dict_t                         *dict = NULL;
-
-        if (!frame || !this || !data)
-                goto out;
-
-        dict = data;
-
-        ret = cli_to_glusterd (&req, frame, gf_cli_status_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_STATUS_VOLUME, this, cli_rpc_prog,
-                               NULL);
- out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning: %d", ret);
-        return ret;
-}
-
-int
-gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data)
-{
-        int              i            = 0;
-        int              ret          = -1;
-        int              vol_count    = -1;
-        uint32_t         cmd          = 0;
-        char             key[1024]    = {0};
-        char            *volname      = NULL;
-        void            *vol_dict     = NULL;
-        dict_t          *dict         = NULL;
-        cli_local_t     *local        = NULL;
-
-        if (frame->local) {
-                local = frame->local;
-                local->all = _gf_true;
-        } else
-                goto out;
-
-        ret = dict_get_uint32 (local->dict, "cmd", &cmd);
-        if (ret)
-                goto out;
-
-
-        ret = gf_cli_status_volume (frame, this, data);
-        if (ret)
-                goto out;
-
-        ret = dict_get_ptr (local->dict, "rsp-dict", &vol_dict);
-        if (ret)
-                goto out;
-
-        ret = dict_get_int32 ((dict_t *)vol_dict, "vol_count", &vol_count);
-        if (ret) {
-                cli_err ("Failed to get names of volumes");
-                goto out;
-        }
-
-        /* remove the "all" flag in cmd */
-        cmd &= ~GF_CLI_STATUS_ALL;
-        cmd |= GF_CLI_STATUS_VOL;
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                //TODO: Pass proper op_* values
-                ret = cli_xml_output_vol_status_begin (local, 0,0, NULL);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                        goto out;
-                }
-        }
-
-        if (vol_count == 0 && !(global_state->mode & GLUSTER_MODE_XML)) {
-                cli_err ("No volumes present");
-                ret = 0;
-                goto out;
-        }
-
-        for (i = 0; i < vol_count; i++) {
-
-                dict = dict_new ();
-                if (!dict)
-                        goto out;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "vol%d", i);
-                ret = dict_get_str (vol_dict, key, &volname);
-                if (ret)
-                        goto out;
-
-                ret = dict_set_str (dict, "volname", volname);
-                if (ret)
-                        goto out;
-
-                ret = dict_set_uint32 (dict, "cmd", cmd);
-                if (ret)
-                        goto out;
-
-                ret = gf_cli_status_volume (frame, this, dict);
-                if (ret)
-                        goto out;
-
-                dict_unref (dict);
-        }
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_status_end (local);
-        }
-
- out:
-        if (ret)
-                gf_log ("cli", GF_LOG_ERROR, "status all failed");
-
-        if (vol_dict)
-                dict_unref (vol_dict);
-
-        if (ret && dict)
-                dict_unref (dict);
-
-        if (local)
-                cli_local_wipe (local);
-
-        if (frame)
-                frame->local = NULL;
-
-        return ret;
-}
-
-static int
-gf_cli_mount_cbk (struct rpc_req *req, struct iovec *iov,
-                  int count, void *myframe)
-{
-        gf1_cli_mount_rsp rsp   = {0,};
-        int               ret   = -1;
-
-        if (-1 == req->rpc_status) {
-                goto out;
-        }
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf1_cli_mount_rsp);
-        if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        gf_log ("cli", GF_LOG_INFO, "Received resp to mount");
-
-        if (rsp.op_ret == 0) {
-                ret = 0;
-                cli_out ("%s", rsp.path);
-        } else {
-                /* weird sounding but easy to parse... */
-                cli_err ("%d : failed with this errno (%s)",
-                         rsp.op_errno, strerror (rsp.op_errno));
-                ret = -1;
-        }
-
-out:
-        cli_cmd_broadcast_response (ret);
-        return ret;
-}
-
-int32_t
-gf_cli_mount (call_frame_t *frame, xlator_t *this, void *data)
-{
-        gf1_cli_mount_req  req  = {0,};
-        int                ret  = -1;
-        void            **dataa = data;
-        char             *label = NULL;
-        dict_t            *dict = NULL;
-
-        if (!frame || !this || !data)
-                goto out;
-
-        label = dataa[0];
-        dict  = dataa[1];
-
-        req.label = label;
-        ret = dict_allocate_and_serialize (dict, &req.dict.dict_val,
-                                           &req.dict.dict_len);
-        if (ret) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
-                              GLUSTER_CLI_MOUNT, NULL,
-                              this, gf_cli_mount_cbk,
-                              (xdrproc_t)xdr_gf1_cli_mount_req);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-static int
-gf_cli_umount_cbk (struct rpc_req *req, struct iovec *iov,
-                   int count, void *myframe)
-{
-        gf1_cli_umount_rsp rsp   = {0,};
-        int               ret   = -1;
-
-        if (-1 == req->rpc_status) {
-                goto out;
-        }
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf1_cli_umount_rsp);
-        if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        gf_log ("cli", GF_LOG_INFO, "Received resp to mount");
-
-        if (rsp.op_ret == 0)
-                ret = 0;
-        else {
-                cli_err ("umount failed");
-                ret = -1;
-        }
-
-out:
-        cli_cmd_broadcast_response (ret);
-        return ret;
-}
-
-int32_t
-gf_cli_umount (call_frame_t *frame, xlator_t *this, void *data)
-{
-        gf1_cli_umount_req  req  = {0,};
-        int                ret  = -1;
-        dict_t            *dict = NULL;
-
-        if (!frame || !this || !data)
-                goto out;
-
-        dict = data;
-
-        ret = dict_get_str (dict, "path", &req.path);
-        if (ret == 0)
-                ret = dict_get_int32 (dict, "lazy", &req.lazy);
-
-        if (ret) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
-                              GLUSTER_CLI_UMOUNT, NULL,
-                              this, gf_cli_umount_cbk,
-                              (xdrproc_t)xdr_gf1_cli_umount_req);
-
- out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-void
-cmd_heal_volume_statistics_out (dict_t *dict, int  brick)
-{
-
-        uint64_t        num_entries = 0;
-        int             ret = 0;
-        char            key[256] = {0};
-        char            *hostname = NULL;
-        uint64_t        i = 0;
-        uint64_t        healed_count = 0;
-        uint64_t        split_brain_count = 0;
-        uint64_t        heal_failed_count = 0;
-        char            *start_time_str = NULL;
-        char            *end_time_str = NULL;
-        char            *crawl_type = NULL;
-        int             progress = -1;
-
-        snprintf (key, sizeof key, "%d-hostname", brick);
-        ret = dict_get_str (dict, key, &hostname);
-        if (ret)
-                goto out;
-        cli_out ("------------------------------------------------");
-        cli_out ("\nCrawl statistics for brick no %d", brick);
-        cli_out ("Hostname of brick %s", hostname);
-
-        snprintf (key, sizeof key, "statistics-%d-count", brick);
-        ret = dict_get_uint64 (dict, key, &num_entries);
-        if (ret)
-                goto out;
-
-        for (i = 0; i < num_entries; i++)
-        {
-                snprintf (key, sizeof key, "statistics_crawl_type-%d-%"PRIu64,
-                          brick, i);
-                ret = dict_get_str (dict, key, &crawl_type);
-                if (ret)
-                        goto out;
-
-                snprintf (key, sizeof key, "statistics_healed_cnt-%d-%"PRIu64,
-                          brick,i);
-                ret = dict_get_uint64 (dict, key, &healed_count);
-                if (ret)
-                        goto out;
-
-                snprintf (key, sizeof key, "statistics_sb_cnt-%d-%"PRIu64,
-                          brick, i);
-                ret = dict_get_uint64 (dict, key, &split_brain_count);
-                if (ret)
-                        goto out;
-                snprintf (key, sizeof key, "statistics_heal_failed_cnt-%d-%"PRIu64,
-                          brick, i);
-                ret = dict_get_uint64 (dict, key, &heal_failed_count);
-                if (ret)
-                        goto out;
-                snprintf (key, sizeof key, "statistics_strt_time-%d-%"PRIu64,
-                          brick, i);
-                ret = dict_get_str (dict, key,  &start_time_str);
-                if (ret)
-                        goto out;
-                snprintf (key, sizeof key, "statistics_end_time-%d-%"PRIu64,
-                          brick, i);
-                ret = dict_get_str (dict, key, &end_time_str);
-                if (ret)
-                        goto out;
-                snprintf (key, sizeof key, "statistics_inprogress-%d-%"PRIu64,
-                          brick, i);
-                ret = dict_get_int32 (dict, key, &progress);
-                if (ret)
-                        goto out;
-
-                cli_out ("\nStarting time of crawl: %s", start_time_str);
-                if (progress == 1)
-                        cli_out ("Crawl is in progress");
-                else
-                        cli_out ("Ending time of crawl: %s", end_time_str);
-
-                cli_out ("Type of crawl: %s", crawl_type);
-                cli_out ("No. of entries healed: %"PRIu64,
-                         healed_count);
-                cli_out ("No. of entries in split-brain: %"PRIu64,
-                        split_brain_count);
-                cli_out ("No. of heal failed entries: %"PRIu64,
-                         heal_failed_count);
-
-        }
-
-
-out:
-        return;
-}
-
-void
-cmd_heal_volume_brick_out (dict_t *dict, int brick)
-{
-        uint64_t        num_entries = 0;
-        int             ret = 0;
-        char            key[256] = {0};
-        char           *hostname = NULL;
-        char           *path = NULL;
-        char           *status = NULL;
-        uint64_t        i = 0;
-        uint32_t        time = 0;
-        char            timestr[32] = {0};
-        char            *shd_status = NULL;
-
-        snprintf (key, sizeof key, "%d-hostname", brick);
-        ret = dict_get_str (dict, key, &hostname);
-        if (ret)
-                goto out;
-        snprintf (key, sizeof key, "%d-path", brick);
-        ret = dict_get_str (dict, key, &path);
-        if (ret)
-                goto out;
-        cli_out ("\nBrick %s:%s", hostname, path);
-
-        snprintf (key, sizeof key, "%d-status", brick);
-        ret = dict_get_str (dict, key, &status);
-        if (status && strlen (status))
-                cli_out ("Status: %s", status);
-
-        snprintf (key, sizeof key, "%d-shd-status",brick);
-        ret = dict_get_str (dict, key, &shd_status);
-
-        if(!shd_status)
-        {
-                snprintf (key, sizeof key, "%d-count", brick);
-                ret = dict_get_uint64 (dict, key, &num_entries);
-                cli_out ("Number of entries: %"PRIu64, num_entries);
-
-
-                for (i = 0; i < num_entries; i++) {
-                        snprintf (key, sizeof key, "%d-%"PRIu64, brick, i);
-                        ret = dict_get_str (dict, key, &path);
-                        if (ret)
-                                continue;
-                        time = 0;
-                        snprintf (key, sizeof key, "%d-%"PRIu64"-time",
-                                  brick, i);
-                        ret = dict_get_uint32 (dict, key, &time);
-                        if (!time) {
-                                cli_out ("%s", path);
-                        } else {
-                                gf_time_fmt (timestr, sizeof timestr,
-                                             time, gf_timefmt_FT);
-                                if (i == 0) {
-                                cli_out ("at                    path on brick");
-                                cli_out ("-----------------------------------");
-                                }
-                                cli_out ("%s %s", timestr, path);
-                        }
-                }
-        }
-
-out:
-        return;
-}
-
-
-void
-cmd_heal_volume_statistics_heal_count_out (dict_t *dict, int brick)
-{
-        uint64_t        num_entries = 0;
-        int             ret = 0;
-        char            key[256] = {0};
-        char           *hostname = NULL;
-        char           *path = NULL;
-        char           *status = NULL;
-        char            *shd_status = NULL;
-
-        snprintf (key, sizeof key, "%d-hostname", brick);
-        ret = dict_get_str (dict, key, &hostname);
-        if (ret)
-                goto out;
-        snprintf (key, sizeof key, "%d-path", brick);
-        ret = dict_get_str (dict, key, &path);
-        if (ret)
-                goto out;
-        cli_out ("\nBrick %s:%s", hostname, path);
-
-        snprintf (key, sizeof key, "%d-status", brick);
-        ret = dict_get_str (dict, key, &status);
-        if (status && strlen (status))
-                cli_out ("Status: %s", status);
-
-        snprintf (key, sizeof key, "%d-shd-status",brick);
-        ret = dict_get_str (dict, key, &shd_status);
-
-        if(!shd_status)
-        {
-                snprintf (key, sizeof key, "%d-hardlinks", brick);
-                ret = dict_get_uint64 (dict, key, &num_entries);
-                if (ret)
-                        cli_out ("No gathered input for this brick");
-                else
-                        cli_out ("Number of entries: %"PRIu64, num_entries);
-
-
-        }
-
-out:
-        return;
-}
-
-
-int
-gf_cli_heal_volume_cbk (struct rpc_req *req, struct iovec *iov,
-                             int count, void *myframe)
-{
-        gf_cli_rsp              rsp   = {0,};
-        int                     ret   = -1;
-        cli_local_t             *local = NULL;
-        char                    *volname = NULL;
-        call_frame_t            *frame = NULL;
-        dict_t                  *input_dict = NULL;
-        dict_t                  *dict = NULL;
-        int                     brick_count = 0;
-        int                     i = 0;
-        gf_xl_afr_op_t          heal_op = GF_AFR_OP_INVALID;
-        char                    *operation = NULL;
-        char                    *substr = NULL;
-        char                    *heal_op_str = NULL;
-
-        if (-1 == req->rpc_status) {
-                goto out;
-        }
-
-        frame = myframe;
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        if (frame)
-                local = frame->local;
-
-        if (local) {
-                input_dict = local->dict;
-                ret = dict_get_int32 (input_dict, "heal-op",
-                                      (int32_t*)&heal_op);
-        }
-//TODO: Proper XML output
-//#if (HAVE_LIB_XML)
-//        if (global_state->mode & GLUSTER_MODE_XML) {
-//                ret = cli_xml_output_dict ("volHeal", dict, rsp.op_ret,
-//                                           rsp.op_errno, rsp.op_errstr);
-//                if (ret)
-//                        gf_log ("cli", GF_LOG_ERROR,
-//                                "Error outputting to xml");
-//                goto out;
-//        }
-//#endif
-
-        ret = dict_get_str (input_dict, "volname", &volname);
-        if (ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR, "failed to get volname");
-                goto out;
-        }
-
-        gf_log ("cli", GF_LOG_INFO, "Received resp to heal volume");
-
-        switch (heal_op) {
-                case    GF_AFR_OP_HEAL_INDEX:
-                        heal_op_str = "to perform index self heal";
-                        break;
-                case    GF_AFR_OP_HEAL_FULL:
-                        heal_op_str = "to perform full self heal";
-                        break;
-                case    GF_AFR_OP_INDEX_SUMMARY:
-                        heal_op_str = "list of entries to be healed";
-                        break;
-                case    GF_AFR_OP_HEALED_FILES:
-                        heal_op_str = "list of healed entries";
-                        break;
-                case    GF_AFR_OP_HEAL_FAILED_FILES:
-                        heal_op_str = "list of heal failed entries";
-                        break;
-                case    GF_AFR_OP_SPLIT_BRAIN_FILES:
-                        heal_op_str = "list of split brain entries";
-                        break;
-                case    GF_AFR_OP_STATISTICS:
-                        heal_op_str =  "crawl statistics";
-                        break;
-                case    GF_AFR_OP_STATISTICS_HEAL_COUNT:
-                        heal_op_str = "count of entries to be healed";
-                        break;
-                case    GF_AFR_OP_STATISTICS_HEAL_COUNT_PER_REPLICA:
-                        heal_op_str = "count of entries to be healed per replica";
-                        break;
-                case    GF_AFR_OP_INVALID:
-                        heal_op_str = "invalid heal op";
-                        break;
-        }
-
-        if ((heal_op == GF_AFR_OP_HEAL_FULL) ||
-            (heal_op == GF_AFR_OP_HEAL_INDEX)) {
-                operation = "Launching heal operation";
-                substr = "\nUse heal info commands to check status";
-        } else {
-                operation = "Gathering";
-                substr = "";
-        }
-
-        if (rsp.op_ret) {
-                if (strcmp (rsp.op_errstr, "")) {
-                        cli_err ("%s", rsp.op_errstr);
-                } else {
-                        cli_err ("%s %s on volume %s has been unsuccessful",
-                                 operation, heal_op_str, volname);
-                }
-
-                ret = rsp.op_ret;
-                goto out;
-        } else {
-                cli_out ("%s %s on volume %s has been successful %s", operation,
-                         heal_op_str, volname, substr);
-        }
-
-        ret = rsp.op_ret;
-        if ((heal_op == GF_AFR_OP_HEAL_FULL) ||
-            (heal_op == GF_AFR_OP_HEAL_INDEX))
-                goto out;
-
-        dict = dict_new ();
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = dict_unserialize (rsp.dict.dict_val,
-                                rsp.dict.dict_len,
-                                &dict);
-
-        if (ret) {
-                gf_log ("", GF_LOG_ERROR,
-                                "Unable to allocate memory");
-                goto out;
-        } else {
-                dict->extra_stdfree = rsp.dict.dict_val;
-        }
-        ret = dict_get_int32 (dict, "count", &brick_count);
-        if (ret)
-                goto out;
-
-        if (!brick_count) {
-                cli_err ("All bricks of volume %s are down.", volname);
-                goto out;
-        }
-
-        switch (heal_op) {
-                case GF_AFR_OP_STATISTICS:
-                        for (i = 0; i < brick_count; i++)
-                                cmd_heal_volume_statistics_out (dict, i);
-                        break;
-                case GF_AFR_OP_STATISTICS_HEAL_COUNT:
-                case GF_AFR_OP_STATISTICS_HEAL_COUNT_PER_REPLICA:
-                        for (i = 0; i < brick_count; i++)
-                                cmd_heal_volume_statistics_heal_count_out (dict,
-                                                                           i);
-                        break;
-                case GF_AFR_OP_INDEX_SUMMARY:
-                case GF_AFR_OP_HEALED_FILES:
-                case GF_AFR_OP_HEAL_FAILED_FILES:
-                case GF_AFR_OP_SPLIT_BRAIN_FILES:
-                        for (i = 0; i < brick_count; i++)
-                                cmd_heal_volume_brick_out (dict, i);
-                        break;
-                default:
-                        break;
-        }
-
-        ret = rsp.op_ret;
-
-out:
-        cli_cmd_broadcast_response (ret);
-        free (rsp.op_errstr);
-        if (dict)
-                dict_unref (dict);
-        return ret;
-}
-
-int32_t
-gf_cli_heal_volume (call_frame_t *frame, xlator_t *this,
-                         void *data)
-{
-        gf_cli_req              req = {{0,}};
-        int                     ret = 0;
-        dict_t                  *dict = NULL;
-
-        if (!frame || !this ||  !data) {
-                ret = -1;
-                goto out;
-        }
-
-        dict = data;
-
-        ret = cli_to_glusterd (&req, frame, gf_cli_heal_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, dict,
-                               GLUSTER_CLI_HEAL_VOLUME, this, cli_rpc_prog,
-                               NULL);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-
-        GF_FREE (req.dict.dict_val);
-
-        return ret;
-}
-
-int32_t
-gf_cli_statedump_volume_cbk (struct rpc_req *req, struct iovec *iov,
-                                int count, void *myframe)
-{
-        gf_cli_rsp                      rsp = {0,};
-        int                             ret = -1;
-        char                            msg[1024] = {0,};
-
-        if (-1 == req->rpc_status)
-                goto out;
-        ret = xdr_to_generic (*iov, &rsp,
-                              (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-        gf_log ("cli", GF_LOG_DEBUG, "Received response to statedump");
-        if (rsp.op_ret)
-                snprintf (msg, sizeof(msg), "%s", rsp.op_errstr);
-        else
-                snprintf (msg, sizeof (msg), "Volume statedump successful");
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_str ("volStatedump", msg, rsp.op_ret,
-                                          rsp.op_errno, rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret)
-                cli_err ("volume statedump: failed: %s", msg);
-        else
-                cli_out ("volume statedump: success");
-        ret = rsp.op_ret;
-
-out:
-        cli_cmd_broadcast_response (ret);
-        return ret;
-}
-
-int32_t
-gf_cli_statedump_volume (call_frame_t *frame, xlator_t *this,
-                            void *data)
-{
-        gf_cli_req                      req = {{0,}};
-        dict_t                          *options = NULL;
-        int                             ret = -1;
-
-        if (!frame || !this || !data)
-                goto out;
-
-        options = data;
-
-        ret = cli_to_glusterd (&req, frame, gf_cli_statedump_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, options,
-                               GLUSTER_CLI_STATEDUMP_VOLUME, this, cli_rpc_prog,
-                               NULL);
+                              gf_xdr_from_cli_getwd_req,
+                              this, gf_cli3_1_getwd_cbk);
 
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
 
-        GF_FREE (req.dict.dict_val);
-        return ret;
-}
-
-int32_t
-gf_cli_list_volume_cbk (struct rpc_req *req, struct iovec *iov,
-                                int count, void *myframe)
-{
-        int             ret = -1;
-        gf_cli_rsp      rsp = {0,};
-        dict_t          *dict = NULL;
-        int             vol_count = 0;;
-        char            *volname = NULL;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        if (-1 == req->rpc_status)
-                goto out;
-        ret = xdr_to_generic (*iov, &rsp,
-                              (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-
-        dict = dict_new ();
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = dict_unserialize (rsp.dict.dict_val, rsp.dict.dict_len, &dict);
-        if (ret) {
-                gf_log ("cli", GF_LOG_ERROR, "Unable to allocate memory");
-                goto out;
-        }
-
-        if (global_state->mode & GLUSTER_MODE_XML) {
-                ret = cli_xml_output_vol_list (dict, rsp.op_ret, rsp.op_errno,
-                                               rsp.op_errstr);
-                if (ret)
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Error outputting to xml");
-                goto out;
-        }
-
-        if (rsp.op_ret)
-                cli_err ("%s", rsp.op_errstr);
-        else {
-                ret = dict_get_int32 (dict, "count", &vol_count);
-                if (ret)
-                        goto out;
-
-                if (vol_count == 0) {
-                        cli_err ("No volumes present in cluster");
-                        goto out;
-                }
-                for (i = 0; i < vol_count; i++) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "volume%d", i);
-                        ret = dict_get_str (dict, key, &volname);
-                        if (ret)
-                                goto out;
-                        cli_out ("%s", volname);
-                }
-        }
-
-        ret = rsp.op_ret;
-
-out:
-        cli_cmd_broadcast_response (ret);
-        return ret;
-}
-
-int32_t
-gf_cli_list_volume (call_frame_t *frame, xlator_t *this, void *data)
-{
-        int             ret = -1;
-        gf_cli_req      req = {{0,}};
-
-        if (!frame || !this)
-                goto out;
-
-        ret = cli_cmd_submit (&req, frame, cli_rpc_prog,
-                              GLUSTER_CLI_LIST_VOLUME, NULL,
-                              this, gf_cli_list_volume_cbk,
-                              (xdrproc_t)xdr_gf_cli_req);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
 }
 
-int32_t
-gf_cli_clearlocks_volume_cbk (struct rpc_req *req, struct iovec *iov,
-                                  int count, void *myframe)
-{
-        gf_cli_rsp                      rsp = {0,};
-        int                             ret = -1;
-        char                            *lk_summary = NULL;
-        char                            *volname = NULL;
-        dict_t                          *dict = NULL;
-
-        if (-1 == req->rpc_status)
-                goto out;
-        ret = xdr_to_generic (*iov, &rsp,
-                              (xdrproc_t)xdr_gf_cli_rsp);
-        if (ret < 0) {
-                gf_log (((call_frame_t *) myframe)->this->name, GF_LOG_ERROR,
-                        "Failed to decode xdr response");
-                goto out;
-        }
-        gf_log ("cli", GF_LOG_DEBUG, "Received response to clear-locks");
-
-        if (rsp.op_ret) {
-                cli_err ("Volume clear-locks unsuccessful");
-                cli_err ("%s", rsp.op_errstr);
-
-        } else {
-                if (!rsp.dict.dict_len) {
-                        cli_err ("Possibly no locks cleared");
-                        ret = 0;
-                        goto out;
-                }
-
-                dict = dict_new ();
-
-                if (!dict) {
-                        ret = -1;
-                        goto out;
-                }
-
-                ret = dict_unserialize (rsp.dict.dict_val,
-                                        rsp.dict.dict_len,
-                                        &dict);
-
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR,
-                                "Unable to serialize response dictionary");
-                        goto out;
-                }
-
-                ret = dict_get_str (dict, "volname", &volname);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR, "Unable to get volname "
-                                "from dictionary");
-                        goto out;
-                }
-
-                ret = dict_get_str (dict, "lk-summary", &lk_summary);
-                if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR, "Unable to get lock "
-                                "summary from dictionary");
-                        goto out;
-                }
-                cli_out ("Volume clear-locks successful");
-                cli_out ("%s", lk_summary);
-
-        }
-
-        ret = rsp.op_ret;
-
-out:
-        if (dict)
-                dict_unref (dict);
-        cli_cmd_broadcast_response (ret);
-        return ret;
-}
-
-int32_t
-gf_cli_clearlocks_volume (call_frame_t *frame, xlator_t *this,
-                             void *data)
-{
-        gf_cli_req                      req = {{0,}};
-        dict_t                          *options = NULL;
-        int                             ret = -1;
-
-        if (!frame || !this || !data)
-                goto out;
-
-        options = data;
-
-        ret = cli_to_glusterd (&req, frame, gf_cli_clearlocks_volume_cbk,
-                               (xdrproc_t) xdr_gf_cli_req, options,
-                               GLUSTER_CLI_CLRLOCKS_VOLUME, this, cli_rpc_prog,
-                               NULL);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-
-        GF_FREE (req.dict.dict_val);
-        return ret;
-}
-
-int
-cli_to_glusterd (gf_cli_req *req, call_frame_t *frame,
-                 fop_cbk_fn_t cbkfn, xdrproc_t xdrproc, dict_t *dict,
-                 int procnum, xlator_t *this, rpc_clnt_prog_t *prog,
-                 struct iobref *iobref)
-{
-        int                ret = 0;
-        size_t             len = 0;
-        char               *cmd = NULL;
-        int                i = 0;
-        const char         **words = NULL;
-        cli_local_t        *local = NULL;
-
-        if (!this || !frame || !dict) {
-                ret = -1;
-                goto out;
-        }
-
-        if (!frame->local) {
-                ret = -1;
-                goto out;
-        }
-
-        local = frame->local;
-
-        if (!local->words) {
-                ret = -1;
-                goto out;
-        }
-
-        words = local->words;
-
-        while (words[i])
-                len += strlen (words[i++]) + 1;
-
-        cmd = GF_CALLOC (1, len, gf_common_mt_char);
-
-        if (!cmd) {
-                ret = -1;
-                goto out;
-        }
-
-        for (i = 0; words[i]; i++) {
-                strncat (cmd, words[i], strlen (words[i]));
-                if (words[i+1] != NULL)
-                        strncat (cmd, " ", strlen (" "));
-        }
-
-        cmd [len - 1] = '\0';
-
-        ret = dict_set_dynstr (dict, "cmd-str", cmd);
-        if (ret)
-                goto out;
-
-        ret = dict_allocate_and_serialize (dict, &(req->dict).dict_val,
-                                           &(req->dict).dict_len);
-
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "failed to get serialized length of dict");
-                goto out;
-        }
-
-        ret = cli_cmd_submit (req, frame, prog, procnum, iobref, this,
-                              cbkfn, (xdrproc_t) xdrproc);
-
-out:
-        return ret;
-
-}
 
 struct rpc_clnt_procedure gluster_cli_actors[GLUSTER_CLI_MAXVALUE] = {
         [GLUSTER_CLI_NULL]             = {"NULL", NULL },
-        [GLUSTER_CLI_PROBE]            = {"PROBE_QUERY", gf_cli_probe},
-        [GLUSTER_CLI_DEPROBE]          = {"DEPROBE_QUERY", gf_cli_deprobe},
-        [GLUSTER_CLI_LIST_FRIENDS]     = {"LIST_FRIENDS", gf_cli_list_friends},
-        [GLUSTER_CLI_UUID_RESET]       = {"UUID_RESET", gf_cli3_1_uuid_reset},
-        [GLUSTER_CLI_UUID_GET]       = {"UUID_GET", gf_cli3_1_uuid_get},
-        [GLUSTER_CLI_CREATE_VOLUME]    = {"CREATE_VOLUME", gf_cli_create_volume},
-        [GLUSTER_CLI_DELETE_VOLUME]    = {"DELETE_VOLUME", gf_cli_delete_volume},
-        [GLUSTER_CLI_START_VOLUME]     = {"START_VOLUME", gf_cli_start_volume},
-        [GLUSTER_CLI_STOP_VOLUME]      = {"STOP_VOLUME", gf_cli_stop_volume},
-        [GLUSTER_CLI_RENAME_VOLUME]    = {"RENAME_VOLUME", gf_cli_rename_volume},
-        [GLUSTER_CLI_DEFRAG_VOLUME]    = {"DEFRAG_VOLUME", gf_cli_defrag_volume},
-        [GLUSTER_CLI_GET_VOLUME]       = {"GET_VOLUME", gf_cli_get_volume},
-        [GLUSTER_CLI_GET_NEXT_VOLUME]  = {"GET_NEXT_VOLUME", gf_cli_get_next_volume},
-        [GLUSTER_CLI_SET_VOLUME]       = {"SET_VOLUME", gf_cli_set_volume},
-        [GLUSTER_CLI_ADD_BRICK]        = {"ADD_BRICK", gf_cli_add_brick},
-        [GLUSTER_CLI_REMOVE_BRICK]     = {"REMOVE_BRICK", gf_cli_remove_brick},
-        [GLUSTER_CLI_REPLACE_BRICK]    = {"REPLACE_BRICK", gf_cli_replace_brick},
-        [GLUSTER_CLI_LOG_ROTATE]       = {"LOG ROTATE", gf_cli_log_rotate},
-        [GLUSTER_CLI_GETSPEC]          = {"GETSPEC", gf_cli_getspec},
-        [GLUSTER_CLI_PMAP_PORTBYBRICK] = {"PMAP PORTBYBRICK", gf_cli_pmap_b2p},
-        [GLUSTER_CLI_SYNC_VOLUME]      = {"SYNC_VOLUME", gf_cli_sync_volume},
-        [GLUSTER_CLI_RESET_VOLUME]     = {"RESET_VOLUME", gf_cli_reset_volume},
-        [GLUSTER_CLI_FSM_LOG]          = {"FSM_LOG", gf_cli_fsm_log},
-        [GLUSTER_CLI_GSYNC_SET]        = {"GSYNC_SET", gf_cli_gsync_set},
-        [GLUSTER_CLI_PROFILE_VOLUME]   = {"PROFILE_VOLUME", gf_cli_profile_volume},
-        [GLUSTER_CLI_QUOTA]            = {"QUOTA", gf_cli_quota},
-        [GLUSTER_CLI_TOP_VOLUME]       = {"TOP_VOLUME", gf_cli_top_volume},
-        [GLUSTER_CLI_GETWD]            = {"GETWD", gf_cli_getwd},
-        [GLUSTER_CLI_STATUS_VOLUME]    = {"STATUS_VOLUME", gf_cli_status_volume},
-        [GLUSTER_CLI_STATUS_ALL]       = {"STATUS_ALL", gf_cli_status_volume_all},
-        [GLUSTER_CLI_MOUNT]            = {"MOUNT", gf_cli_mount},
-        [GLUSTER_CLI_UMOUNT]           = {"UMOUNT", gf_cli_umount},
-        [GLUSTER_CLI_HEAL_VOLUME]      = {"HEAL_VOLUME", gf_cli_heal_volume},
-        [GLUSTER_CLI_STATEDUMP_VOLUME] = {"STATEDUMP_VOLUME", gf_cli_statedump_volume},
-        [GLUSTER_CLI_LIST_VOLUME]      = {"LIST_VOLUME", gf_cli_list_volume},
-        [GLUSTER_CLI_CLRLOCKS_VOLUME]  = {"CLEARLOCKS_VOLUME", gf_cli_clearlocks_volume},
-        [GLUSTER_CLI_COPY_FILE]        = {"COPY_FILE", gf_cli_copy_file},
-        [GLUSTER_CLI_SYS_EXEC]         = {"SYS_EXEC", gf_cli_sys_exec},
+        [GLUSTER_CLI_PROBE]            = {"PROBE_QUERY", gf_cli3_1_probe},
+        [GLUSTER_CLI_DEPROBE]          = {"DEPROBE_QUERY", gf_cli3_1_deprobe},
+        [GLUSTER_CLI_LIST_FRIENDS]     = {"LIST_FRIENDS", gf_cli3_1_list_friends},
+        [GLUSTER_CLI_CREATE_VOLUME]    = {"CREATE_VOLUME", gf_cli3_1_create_volume},
+        [GLUSTER_CLI_DELETE_VOLUME]    = {"DELETE_VOLUME", gf_cli3_1_delete_volume},
+        [GLUSTER_CLI_START_VOLUME]     = {"START_VOLUME", gf_cli3_1_start_volume},
+        [GLUSTER_CLI_STOP_VOLUME]      = {"STOP_VOLUME", gf_cli3_1_stop_volume},
+        [GLUSTER_CLI_RENAME_VOLUME]    = {"RENAME_VOLUME", gf_cli3_1_rename_volume},
+        [GLUSTER_CLI_DEFRAG_VOLUME]    = {"DEFRAG_VOLUME", gf_cli3_1_defrag_volume},
+        [GLUSTER_CLI_GET_VOLUME]       = {"GET_VOLUME", gf_cli3_1_get_volume},
+        [GLUSTER_CLI_GET_NEXT_VOLUME]  = {"GET_NEXT_VOLUME", gf_cli3_1_get_next_volume},
+        [GLUSTER_CLI_SET_VOLUME]       = {"SET_VOLUME", gf_cli3_1_set_volume},
+        [GLUSTER_CLI_ADD_BRICK]        = {"ADD_BRICK", gf_cli3_1_add_brick},
+        [GLUSTER_CLI_REMOVE_BRICK]     = {"REMOVE_BRICK", gf_cli3_1_remove_brick},
+        [GLUSTER_CLI_REPLACE_BRICK]    = {"REPLACE_BRICK", gf_cli3_1_replace_brick},
+        [GLUSTER_CLI_LOG_FILENAME]     = {"LOG FILENAME", gf_cli3_1_log_filename},
+        [GLUSTER_CLI_LOG_LOCATE]       = {"LOG LOCATE", gf_cli3_1_log_locate},
+        [GLUSTER_CLI_LOG_ROTATE]       = {"LOG ROTATE", gf_cli3_1_log_rotate},
+        [GLUSTER_CLI_GETSPEC]          = {"GETSPEC", gf_cli3_1_getspec},
+        [GLUSTER_CLI_PMAP_PORTBYBRICK] = {"PMAP PORTBYBRICK", gf_cli3_1_pmap_b2p},
+        [GLUSTER_CLI_SYNC_VOLUME]      = {"SYNC_VOLUME", gf_cli3_1_sync_volume},
+        [GLUSTER_CLI_RESET_VOLUME]     = {"RESET_VOLUME", gf_cli3_1_reset_volume},
+        [GLUSTER_CLI_FSM_LOG]          = {"FSM_LOG", gf_cli3_1_fsm_log},
+        [GLUSTER_CLI_GSYNC_SET]        = {"GSYNC_SET", gf_cli3_1_gsync_set},
+        [GLUSTER_CLI_PROFILE_VOLUME]   = {"PROFILE_VOLUME", gf_cli3_1_profile_volume},
+        [GLUSTER_CLI_QUOTA]            = {"QUOTA", gf_cli3_1_quota},
+        [GLUSTER_CLI_TOP_VOLUME]       = {"TOP_VOLUME", gf_cli3_1_top_volume},
+        [GLUSTER_CLI_GETWD]            = {"GETWD", gf_cli3_1_getwd}
 };
 
 struct rpc_clnt_program cli_prog = {
         .progname  = "Gluster CLI",
         .prognum   = GLUSTER_CLI_PROGRAM,
         .progver   = GLUSTER_CLI_VERSION,
-        .numproc   = GLUSTER_CLI_MAXVALUE,
+        .numproc   = GLUSTER_CLI_PROCCNT,
         .proctable = gluster_cli_actors,
 };
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
deleted file mode 100644
index 0f837fc74..000000000
--- a/cli/src/cli-xml-output.c
+++ /dev/null
@@ -1,3759 +0,0 @@
-/*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
-*/
-#include <stdlib.h>
-#include "cli.h"
-#include "cli1-xdr.h"
-#include "run.h"
-#include "compat.h"
-#include "syscall.h"
-
-
-enum gf_task_types {
-    GF_TASK_TYPE_REBALANCE,
-    GF_TASK_TYPE_REMOVE_BRICK
-};
-
-/*
- * IMPORTANT NOTE:
- * All exported functions in this file which use libxml need use a
- * #if (HAVE_LIB_XML), #else, #endif
- * For eg,
- *      int exported_func () {
- *              #if (HAVE_LIB_XML)
- *                      <Stuff using libxml>
- *              #else
- *                      return 0;
- *              #endif
- *      }
- *
- *  All other functions, which are called internally within this file need to be
- *  within #if (HAVE_LIB_XML), #endif statements
- *  For eg,
- *      #if (HAVE_LIB_XML)
- *      int internal_func ()
- *      {
- *      }
- *      #endif
- *
- *  Following the above formate ensures that all xml related code is compliled
- *  only when libxml2 is present, and also keeps the rest of the codebase free
- *  of #if (HAVE_LIB_XML)
- */
-
-
-#if (HAVE_LIB_XML)
-
-#include <libxml/encoding.h>
-#include <libxml/xmlwriter.h>
-
-#define XML_RET_CHECK_AND_GOTO(ret, label)      do {            \
-                if (ret < 0) {                                  \
-                        ret = -1;                               \
-                        goto label;                             \
-                }                                               \
-                else                                            \
-                        ret = 0;                                \
-        }while (0)                                              \
-
-int
-cli_begin_xml_output (xmlTextWriterPtr *writer, xmlDocPtr *doc)
-{
-        int             ret = -1;
-
-        *writer = xmlNewTextWriterDoc (doc, 0);
-        if (writer == NULL) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = xmlTextWriterStartDocument (*writer, "1.0", "UTF-8", "yes");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* <cliOutput> */
-        ret = xmlTextWriterStartElement (*writer, (xmlChar *)"cliOutput");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_end_xml_output (xmlTextWriterPtr writer, xmlDocPtr doc)
-{
-        int             ret = -1;
-
-        /* </cliOutput> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterEndDocument (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-
-        /* Dump xml document to stdout and pretty format it */
-        xmlSaveFormatFileEnc ("-", doc, "UTF-8", 1);
-
-        xmlFreeTextWriter (writer);
-        xmlFreeDoc (doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_common (xmlTextWriterPtr writer, int op_ret, int op_errno,
-                       char *op_errstr)
-{
-        int             ret = -1;
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"opRet",
-                                               "%d", op_ret);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"opErrno",
-                                               "%d", op_errno);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"opErrstr",
-                                                "%s", op_errstr);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_str (char *op, char *str, int op_ret, int op_errno,
-                    char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        if (op) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"cliOp",
-                                                       "%s", op);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        if (str) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"output",
-                                                       "%s", str);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-#if (HAVE_LIB_XML)
-int
-cli_xml_output_data_pair (dict_t *this, char *key, data_t *value,
-                          void *data)
-{
-        int                     ret = -1;
-        xmlTextWriterPtr        *writer = NULL;
-
-        writer = (xmlTextWriterPtr *)data;
-
-        ret = xmlTextWriterWriteFormatElement (*writer, (xmlChar *)key,
-                                               "%s", value->data);
-
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_dict ( char *op, dict_t *dict, int op_ret, int op_errno,
-                      char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <"op"> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)op);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        if (dict)
-                dict_foreach (dict, cli_xml_output_data_pair, &writer);
-
-        /* </"op"> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_end_xml_output (writer, doc);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-#if (HAVE_LIB_XML)
-int
-cli_xml_output_vol_status_common (xmlTextWriterPtr writer, dict_t *dict,
-                                  int   brick_index, int *online,
-                                  gf_boolean_t *node_present)
-{
-        int             ret = -1;
-        char            *hostname = NULL;
-        char            *path = NULL;
-        int             port = 0;
-        int             status = 0;
-        int             pid = 0;
-        char            key[1024] = {0,};
-
-        snprintf (key, sizeof (key), "brick%d.hostname", brick_index);
-        ret = dict_get_str (dict, key, &hostname);
-        if (ret) {
-                *node_present = _gf_false;
-                goto out;
-        }
-        *node_present = _gf_true;
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"hostname",
-                                               "%s", hostname);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.path", brick_index);
-        ret = dict_get_str (dict, key, &path);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"path",
-                                               "%s", path);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.status", brick_index);
-        ret = dict_get_int32 (dict, key, &status);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"status",
-                                               "%d", status);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-        *online = status;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.port", brick_index);
-        ret = dict_get_int32 (dict, key, &port);
-        if (ret)
-                goto out;
-
-        /* If the process is either offline or doesn't provide a port (shd)
-         * port = "N/A"
-         * else print the port number of the process.
-         */
-
-        if (*online == 1 && port != 0)
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"port",
-                                                       "%d", port);
-        else
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"port",
-                                                       "%s", "N/A");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.pid", brick_index);
-        ret = dict_get_int32 (dict, key, &pid);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"pid",
-                                               "%d", pid);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_detail (xmlTextWriterPtr writer, dict_t *dict,
-                                  int brick_index)
-{
-        int             ret = -1;
-        uint64_t        size_total = 0;
-        uint64_t        size_free = 0;
-        char            *device = NULL;
-        uint64_t        block_size = 0;
-        char            *mnt_options = NULL;
-        char            *fs_name = NULL;
-        char            *inode_size = NULL;
-        uint64_t        inodes_total = 0;
-        uint64_t        inodes_free = 0;
-        char            key[1024] = {0,};
-
-        snprintf (key, sizeof (key), "brick%d.total", brick_index);
-        ret = dict_get_uint64 (dict, key, &size_total);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"sizeTotal",
-                                               "%"PRIu64, size_total);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.free", brick_index);
-        ret = dict_get_uint64 (dict, key, &size_free);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"sizeFree",
-                                               "%"PRIu64, size_free);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.device", brick_index);
-        ret = dict_get_str (dict, key, &device);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"device",
-                                               "%s", device);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.block_size", brick_index);
-        ret = dict_get_uint64 (dict, key, &block_size);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"blockSize",
-                                               "%"PRIu64, block_size);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mnt_options", brick_index);
-        ret = dict_get_str (dict, key, &mnt_options);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"mntOptions",
-                                               "%s", mnt_options);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.fs_name", brick_index);
-        ret = dict_get_str (dict, key, &fs_name);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"fsName",
-                                               "%s", fs_name);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* inode details are only available for ext 2/3/4 & xfs */
-        if (!IS_EXT_FS(fs_name) || strcmp (fs_name, "xfs")) {
-                        ret = 0;
-                        goto out;
-        }
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.inode_size", brick_index);
-        ret = dict_get_str (dict, key, &inode_size);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"inodeSize",
-                                               "%s", fs_name);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.total_inodes", brick_index);
-        ret = dict_get_uint64 (dict, key, &inodes_total);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"inodesTotal",
-                                               "%"PRIu64, inodes_total);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.free_inodes", brick_index);
-        ret = dict_get_uint64 (dict, key, &inodes_free);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"inodesFree",
-                                               "%"PRIu64, inodes_free);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_mempool (xmlTextWriterPtr writer, dict_t *dict,
-                                   char *prefix)
-{
-        int             ret = -1;
-        int             mempool_count = 0;
-        char            *name = NULL;
-        int             hotcount = 0;
-        int             coldcount = 0;
-        uint64_t        paddedsizeof = 0;
-        uint64_t        alloccount = 0;
-        int             maxalloc = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        /* <mempool> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"mempool");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%s.mempool-count", prefix);
-        ret = dict_get_int32 (dict, key, &mempool_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"count",
-                                               "%d", mempool_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < mempool_count; i++) {
-                /* <pool> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"pool");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.name", prefix, i);
-                ret = dict_get_str (dict, key, &name);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"name",
-                                                       "%s", name);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.hotcount", prefix, i);
-                ret = dict_get_int32 (dict, key, &hotcount);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"hotCount",
-                                                       "%d", hotcount);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.coldcount", prefix, i);
-                ret = dict_get_int32 (dict, key, &coldcount);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"coldCount",
-                                                       "%d", coldcount);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.paddedsizeof",
-                          prefix, i);
-                ret = dict_get_uint64 (dict, key, &paddedsizeof);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"padddedSizeOf", "%"PRIu64,
-                         paddedsizeof);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.alloccount", prefix, i);
-                ret = dict_get_uint64 (dict, key, &alloccount);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"allocCount",
-                                                       "%"PRIu64, alloccount);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.max_alloc", prefix, i);
-                ret = dict_get_int32 (dict, key, &maxalloc);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"maxAlloc",
-                                                       "%d", maxalloc);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.pool-misses", prefix, i);
-                ret = dict_get_uint64 (dict, key, &alloccount);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"poolMisses",
-                                                       "%"PRIu64, alloccount);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pool%d.max-stdalloc", prefix, i);
-                ret = dict_get_int32 (dict, key, &maxalloc);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"maxStdAlloc",
-                                                       "%d", maxalloc);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-
-                /* </pool> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </mempool> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_mem (xmlTextWriterPtr writer, dict_t *dict,
-                               int brick_index)
-{
-        int             ret = -1;
-        int             arena = 0;
-        int             ordblks = 0;
-        int             smblks = 0;
-        int             hblks = 0;
-        int             hblkhd = 0;
-        int             usmblks = 0;
-        int             fsmblks = 0;
-        int             uordblks = 0;
-        int             fordblks = 0;
-        int             keepcost = 0;
-        char            key[1024] = {0,};
-
-        /* <memStatus> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"memStatus");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* <mallinfo> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"mallinfo");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "brick%d.mallinfo.arena", brick_index);
-        ret = dict_get_int32 (dict, key, &arena);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"arena",
-                                               "%d", arena);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.ordblks", brick_index);
-        ret = dict_get_int32 (dict, key, &ordblks);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"ordblks",
-                                               "%d", ordblks);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.smblks", brick_index);
-        ret = dict_get_int32 (dict, key, &smblks);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"smblks",
-                                               "%d", smblks);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.hblks", brick_index);
-        ret = dict_get_int32 (dict, key, &hblks);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"hblks",
-                                               "%d", hblks);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.hblkhd", brick_index);
-        ret = dict_get_int32 (dict, key, &hblkhd);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"hblkhd",
-                                               "%d", hblkhd);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.usmblks", brick_index);
-        ret = dict_get_int32 (dict, key, &usmblks);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"usmblks",
-                                               "%d", usmblks);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.fsmblks", brick_index);
-        ret = dict_get_int32 (dict, key, &fsmblks);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"fsmblks",
-                                               "%d", fsmblks);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.uordblks", brick_index);
-        ret = dict_get_int32 (dict, key, &uordblks);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"uordblks",
-                                               "%d", uordblks);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.fordblks", brick_index);
-        ret = dict_get_int32 (dict, key, &fordblks);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"fordblks",
-                                               "%d", fordblks);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d.mallinfo.keepcost", brick_index);
-        ret = dict_get_int32 (dict, key, &keepcost);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"keepcost",
-                                               "%d", keepcost);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </mallinfo> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "brick%d", brick_index);
-        ret = cli_xml_output_vol_status_mempool (writer, dict, key);
-        if (ret)
-                goto out;
-
-        /* </memStatus> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_clients (xmlTextWriterPtr writer, dict_t *dict,
-                                   int brick_index)
-{
-        int             ret = -1;
-        int             client_count = 0;
-        char            *hostname = NULL;
-        uint64_t        bytes_read = 0;
-        uint64_t        bytes_write = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        /* <clientsStatus> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"clientsStatus");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "brick%d.clientcount", brick_index);
-        ret = dict_get_int32 (dict, key, &client_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer,
-                                               (xmlChar *)"clientCount",
-                                               "%d", client_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < client_count; i++) {
-                /* <client> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"client");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.client%d.hostname",
-                          brick_index, i);
-                ret = dict_get_str (dict, key, &hostname);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"hostname",
-                                                       "%s", hostname);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.client%d.bytesread",
-                          brick_index, i);
-                ret = dict_get_uint64 (dict, key, &bytes_read);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"bytesRead",
-                                                       "%"PRIu64, bytes_read);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.client%d.byteswrite",
-                          brick_index, i);
-                ret = dict_get_uint64 (dict, key, &bytes_write);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"bytesWrite",
-                                                       "%"PRIu64, bytes_write);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </client> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </clientsStatus> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_inode_entry (xmlTextWriterPtr writer, dict_t *dict,
-                                       char *prefix)
-{
-        int             ret = -1;
-        char            *gfid = NULL;
-        uint64_t        nlookup = 0;
-        uint32_t        ref = 0;
-        int             ia_type = 0;
-        char            key[1024] = {0,};
-
-        /* <inode> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"inode");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%s.gfid", prefix);
-        ret = dict_get_str (dict, key, &gfid);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"gfid",
-                                               "%s", gfid);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key,0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.nlookup", prefix);
-        ret = dict_get_uint64 (dict, key, &nlookup);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"nLookup",
-                                               "%"PRIu64, nlookup);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key,0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.ref", prefix);
-        ret = dict_get_uint32 (dict, key, &ref);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"ref",
-                                               "%"PRIu32, ref);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key,0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.ia_type", prefix);
-        ret = dict_get_int32 (dict, key, &ia_type);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"iaType",
-                                               "%d", ia_type);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </inode> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_itable (xmlTextWriterPtr writer, dict_t *dict,
-                                  char *prefix)
-{
-        int             ret = -1;
-        uint32_t        active_size = 0;
-        uint32_t        lru_size = 0;
-        uint32_t        purge_size = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        snprintf (key, sizeof (key), "%s.active_size", prefix);
-        ret = dict_get_uint32 (dict, key, &active_size);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"activeSize",
-                                               "%"PRIu32, active_size);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-        if (active_size != 0) {
-                /* <active> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"active");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                for (i = 0; i < active_size; i++) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%s.active%d", prefix, i);
-                        ret = cli_xml_output_vol_status_inode_entry
-                                (writer, dict, key);
-                        if (ret)
-                                goto out;
-                }
-                /* </active> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.lru_size", prefix);
-        ret = dict_get_uint32 (dict, key, &lru_size);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"lruSize",
-                                               "%"PRIu32, lru_size);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-        if (lru_size != 0) {
-                /* <lru> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"lru");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                for (i = 0; i < lru_size; i++) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%s.lru%d", prefix, i);
-                        ret = cli_xml_output_vol_status_inode_entry
-                                (writer, dict, key);
-                        if (ret)
-                                goto out;
-                }
-                /* </lru> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.purge_size", prefix);
-        ret = dict_get_uint32 (dict, key, &purge_size);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"purgeSize",
-                                               "%"PRIu32, purge_size);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-        if (purge_size != 0) {
-                /* <purge> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"purge");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                for (i = 0; i < purge_size; i++) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%s.purge%d", prefix, i);
-                        ret = cli_xml_output_vol_status_inode_entry
-                                (writer, dict, key);
-                        if (ret)
-                                goto out;
-                }
-                /* </purge> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_inode (xmlTextWriterPtr writer, dict_t *dict,
-                                 int brick_index)
-{
-        int             ret = -1;
-        int             conn_count = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        /* <inodeStatus> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"inodeStatus");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "brick%d.conncount", brick_index);
-        ret = dict_get_int32 (dict, key, &conn_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"connections",
-                                               "%d", conn_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < conn_count; i++) {
-                /* <connection> */
-                ret = xmlTextWriterStartElement (writer,
-                                                 (xmlChar *)"connection");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.conn%d.itable",
-                          brick_index, i);
-                ret = cli_xml_output_vol_status_itable (writer, dict, key);
-                if (ret)
-                        goto out;
-
-                /* </connection> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </inodeStatus> */
-        ret= xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_fdtable (xmlTextWriterPtr writer, dict_t *dict,
-                                   char *prefix)
-{
-        int             ret = -1;
-        int             refcount = 0;
-        uint32_t        maxfds = 0;
-        int             firstfree = 0;
-        int             openfds = 0;
-        int             fd_pid = 0;
-        int             fd_refcount = 0;
-        int             fd_flags = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        /* <fdTable> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"fdTable");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%s.refcount", prefix);
-        ret = dict_get_int32 (dict, key, &refcount);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"refCount",
-                                               "%d", refcount);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.maxfds", prefix);
-        ret = dict_get_uint32 (dict, key, &maxfds);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"maxFds",
-                                               "%"PRIu32, maxfds);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.firstfree", prefix);
-        ret = dict_get_int32 (dict, key, &firstfree);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"firstFree",
-                                               "%d", firstfree);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.openfds", prefix);
-        ret = dict_get_int32 (dict, key, &openfds);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"openFds",
-                                               "%d", openfds);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < maxfds; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.fdentry%d.pid", prefix, i);
-                ret = dict_get_int32 (dict, key, &fd_pid);
-                if (ret)
-                        continue;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.fdentry%d.refcount",
-                          prefix, i);
-                ret = dict_get_int32 (dict, key, &fd_refcount);
-                if (ret)
-                        continue;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.fdentry%d.flags", prefix, i);
-                ret = dict_get_int32 (dict, key, &fd_flags);
-                if (ret)
-                        continue;
-
-                /* <fd> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"fd");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"entry",
-                                                       "%d", i+1);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"pid",
-                                                       "%d", fd_pid);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"refCount",
-                                                       "%d", fd_refcount);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"flags",
-                                                       "%d", fd_flags);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </fd> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </fdTable> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_fd (xmlTextWriterPtr writer, dict_t *dict,
-                              int brick_index)
-{
-        int             ret = -1;
-        int             conn_count = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        /* <fdStatus> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"fdStatus");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "brick%d.conncount", brick_index);
-        ret = dict_get_int32 (dict, key, &conn_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"connections",
-                                               "%d", conn_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < conn_count; i++) {
-                /* <connection> */
-                ret = xmlTextWriterStartElement (writer,
-                                                 (xmlChar *)"connection");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.conn%d.fdtable",
-                          brick_index, i);
-                ret = cli_xml_output_vol_status_fdtable (writer, dict, key);
-                if (ret)
-                        goto out;
-
-                /* </connection> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </fdStatus> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_callframe (xmlTextWriterPtr writer, dict_t *dict,
-                                     char *prefix)
-{
-        int             ret = -1;
-        int             ref_count = 0;
-        char            *translator = NULL;
-        int             complete = 0;
-        char            *parent = NULL;
-        char            *wind_from = NULL;
-        char            *wind_to = NULL;
-        char            *unwind_from = NULL;
-        char            *unwind_to = NULL;
-        char            key[1024] = {0,};
-
-        /* <callFrame> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"callFrame");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%s.refcount", prefix);
-        ret = dict_get_int32 (dict, key, &ref_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"refCount",
-                                               "%d", ref_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.translator", prefix);
-        ret = dict_get_str (dict, key, &translator);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"translator",
-                                               "%s", translator);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.complete", prefix);
-        ret = dict_get_int32 (dict, key, &complete);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"complete",
-                                               "%d", complete);
-        XML_RET_CHECK_AND_GOTO (ret ,out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.parent", prefix);
-        ret = dict_get_str (dict, key, &parent);
-        if (!ret) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"parent",
-                                                       "%s", parent);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.windfrom", prefix);
-        ret = dict_get_str (dict, key, &wind_from);
-        if (!ret) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"windFrom",
-                                                       "%s", wind_from);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.windto", prefix);
-        ret = dict_get_str (dict, key, &wind_to);
-        if (!ret) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"windTo",
-                                                       "%s", wind_to);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.unwindfrom", prefix);
-        ret = dict_get_str (dict, key, &unwind_from);
-        if (!ret) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"unwindFrom",
-                                                       "%s", unwind_from);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.unwindto", prefix);
-        ret = dict_get_str (dict, key, &unwind_to);
-        if (!ret) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"unwindTo",
-                                                       "%s", unwind_to);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </callFrame> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_callstack (xmlTextWriterPtr writer, dict_t *dict,
-                                     char *prefix)
-{
-        int             ret = -1;
-        int             uid = 0;
-        int             gid = 0;
-        int             pid = 0;
-        uint64_t        unique = 0;
-        int             frame_count = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        /* <callStack> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"callStack");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%s.uid", prefix);
-        ret = dict_get_int32 (dict, key, &uid);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"uid",
-                                               "%d", uid);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.gid", prefix);
-        ret = dict_get_int32 (dict, key, &gid);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"gid",
-                                               "%d", gid);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.pid", prefix);
-        ret = dict_get_int32 (dict, key, &pid);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"pid",
-                                               "%d", pid);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.unique", prefix);
-        ret = dict_get_uint64 (dict, key, &unique);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"unique",
-                                               "%"PRIu64, unique);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.count", prefix);
-        ret = dict_get_int32 (dict, key, &frame_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"frameCount",
-                                               "%d", frame_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < frame_count; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.frame%d", prefix, i);
-                ret = cli_xml_output_vol_status_callframe (writer, dict,
-                                                           key);
-                if (ret)
-                        goto out;
-        }
-
-        /* </callStack> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_callpool (xmlTextWriterPtr writer, dict_t *dict,
-                                    int brick_index)
-{
-        int             ret = -1;
-        int             call_count = 0;
-        char            key[1024] = {0,};
-        int             i = 0;
-
-        /* <callpoolStatus> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"callpoolStatus");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "brick%d.callpool.count", brick_index);
-        ret = dict_get_int32 (dict, key, &call_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"count",
-                                               "%d", call_count);
-
-        for (i = 0; i < call_count; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "brick%d.callpool.stack%d",
-                          brick_index, i);
-                ret = cli_xml_output_vol_status_callstack (writer, dict,
-                                                           key);
-                if (ret)
-                        goto out;
-        }
-
-        /* </callpoolStatus> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_vol_status_begin (cli_local_t *local, int op_ret, int op_errno,
-                                 char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-
-        ret = cli_begin_xml_output (&(local->writer), &(local->doc));
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_xml_output_common (local->writer, op_ret, op_errno,
-                                     op_errstr);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* <volStatus> */
-        ret = xmlTextWriterStartElement (local->writer,
-                                         (xmlChar *) "volStatus");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* <volumes> */
-        ret = xmlTextWriterStartElement (local->writer, (xmlChar *)"volumes");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_vol_status_end (cli_local_t *local)
-{
-#if (HAVE_LIB_XML)
-        int     ret = -1;
-
-        /* </volumes> */
-        ret = xmlTextWriterEndElement (local->writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </volStatus> */
-        ret = xmlTextWriterEndElement (local->writer);
-        XML_RET_CHECK_AND_GOTO(ret, out);
-
-        ret = cli_end_xml_output (local->writer, local->doc);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-#if (HAVE_LIB_XML)
-int
-cli_xml_output_remove_brick_task_params (xmlTextWriterPtr writer, dict_t *dict,
-                                         char *prefix)
-{
-        int             ret = -1;
-        char            key[1024] = {0,};
-        int             count = 0;
-        int             i = 0;
-        char            *brick = NULL;
-
-        /* <params> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"params");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%s.count", prefix);
-        ret = dict_get_int32 (dict, key, &count);
-        if (ret)
-                goto out;
-
-        for (i = 1; i <= count; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.brick%d", prefix, i);
-                ret = dict_get_str (dict, key, &brick);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"brick",
-                                                       "%s", brick);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-                brick = NULL;
-        }
-
-        /* </param> */
-        ret = xmlTextWriterEndElement (writer);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_replace_brick_task_params (xmlTextWriterPtr writer, dict_t *dict,
-                                          char *prefix)
-{
-
-        int             ret = -1;
-        char            key[1024] = {0,};
-        char            *brick = NULL;
-
-        /* <params> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"params");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%s.src-brick", prefix);
-        ret = dict_get_str (dict, key, &brick);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"srcBrick",
-                                               "%s", brick);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.dst-brick", prefix);
-        ret = dict_get_str (dict, key, &brick);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"dstBrick",
-                                               "%s", brick);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-
-        /* </param> */
-        ret = xmlTextWriterEndElement (writer);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_tasks (cli_local_t *local, dict_t *dict) {
-        int                     ret = -1;
-        char                    *task_type = NULL;
-        char                    *task_id_str = NULL;
-        int                     status = 0;
-        int                     tasks = 0;
-        char                    key[1024] = {0,};
-        int                     i = 0;
-
-        /* <tasks> */
-        ret = xmlTextWriterStartElement (local->writer, (xmlChar *)"tasks");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_int32 (dict, "tasks", &tasks);
-        if (ret)
-                goto out;
-
-        for (i = 0; i < tasks; i++) {
-                /* <task> */
-                ret = xmlTextWriterStartElement (local->writer,
-                                                 (xmlChar *)"task");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "task%d.type", i);
-                ret = dict_get_str (dict, key, &task_type);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"type",
-                                                       "%s", task_type);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "task%d.id", i);
-                ret = dict_get_str (dict, key, &task_id_str);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"id",
-                                                       "%s", task_id_str);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "task%d.status", i);
-                ret = dict_get_int32 (dict, key, &status);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"status",
-                                                       "%d", status);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                if (!strcmp (task_type, "Replace brick")) {
-                    if (status) {
-                        status = GF_DEFRAG_STATUS_COMPLETE;
-                    } else {
-                        status = GF_DEFRAG_STATUS_STARTED;
-                    }
-                }
-
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"statusStr",
-                                                       "%s",
-                                             cli_vol_task_status_str[status]);
-
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "task%d", i);
-                if (!strcmp (task_type, "Replace brick")) {
-                        ret = cli_xml_output_replace_brick_task_params
-                                (local->writer, dict, key);
-                        if (ret)
-                                goto out;
-                } else if (!strcmp (task_type, "Remove brick")) {
-                        ret = cli_xml_output_remove_brick_task_params
-                                (local->writer, dict, key);
-                        if (ret)
-                                goto out;
-                }
-
-
-                /* </task> */
-                ret = xmlTextWriterEndElement (local->writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </tasks> */
-        ret = xmlTextWriterEndElement (local->writer);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_status_tasks_detail (cli_local_t *local, dict_t *dict)
-{
-        int    ret     = -1;
-        char  *volname = NULL;
-
-        /*<volume>*/
-        ret = xmlTextWriterStartElement (local->writer, (xmlChar *)"volume");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (local->writer,
-                                               (xmlChar *)"volName", "%s",
-                                               volname);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_xml_output_vol_status_tasks (local, dict);
-        if (ret)
-                goto out;
-
-        /* </volume> */
-        ret = xmlTextWriterEndElement (local->writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_vol_status (cli_local_t *local, dict_t *dict)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        char                    *volname = NULL;
-        int                     brick_count = 0;
-        int                     brick_index_max = -1;
-        int                     other_count = 0;
-        int                     index_max = 0;
-        uint32_t                cmd = GF_CLI_STATUS_NONE;
-        int                     online = 0;
-        gf_boolean_t            node_present = _gf_true;
-        int                     i;
-
-
-        /* <volume> */
-        ret = xmlTextWriterStartElement (local->writer, (xmlChar *)"volume");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (local->writer,
-                                               (xmlChar *)"volName", "%s",
-                                               volname);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_int32 (dict, "count", &brick_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (local->writer,
-                                               (xmlChar *)"nodeCount", "%d",
-                                               brick_count);
-        if (ret)
-                goto out;
-
-        ret = dict_get_uint32 (dict, "cmd", &cmd);
-        if (ret)
-                goto out;
-
-        ret = dict_get_int32 (dict, "brick-index-max", &brick_index_max);
-        if (ret)
-                goto out;
-        ret = dict_get_int32 (dict, "other-count", &other_count);
-        if (ret)
-                goto out;
-
-        index_max = brick_index_max + other_count;
-
-        for (i = 0; i <= index_max; i++) {
-                /* <node> */
-                ret = xmlTextWriterStartElement (local->writer,
-                                                 (xmlChar *)"node");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = cli_xml_output_vol_status_common (local->writer, dict, i,
-                                                        &online, &node_present);
-                if (ret) {
-                        if (node_present)
-                                goto out;
-                        else
-                                continue;
-                }
-
-                switch (cmd & GF_CLI_STATUS_MASK) {
-                case GF_CLI_STATUS_DETAIL:
-                        ret = cli_xml_output_vol_status_detail (local->writer,
-                                                                dict, i);
-                        if (ret)
-                                goto out;
-                        break;
-
-                case GF_CLI_STATUS_MEM:
-                        if (online) {
-                                ret = cli_xml_output_vol_status_mem
-                                        (local->writer, dict, i);
-                                if (ret)
-                                        goto out;
-                        }
-                        break;
-
-                case GF_CLI_STATUS_CLIENTS:
-                        if (online) {
-                                ret = cli_xml_output_vol_status_clients
-                                        (local->writer, dict, i);
-                                if (ret)
-                                        goto out;
-                        }
-                        break;
-
-                case GF_CLI_STATUS_INODE:
-                        if (online) {
-                                ret = cli_xml_output_vol_status_inode
-                                        (local->writer, dict, i);
-                                if (ret)
-                                        goto out;
-                        }
-                        break;
-
-                case GF_CLI_STATUS_FD:
-                        if (online) {
-                                ret = cli_xml_output_vol_status_fd
-                                        (local->writer, dict, i);
-                                if (ret)
-                                        goto out;
-                        }
-                        break;
-
-                case GF_CLI_STATUS_CALLPOOL:
-                        if (online) {
-                                ret = cli_xml_output_vol_status_callpool
-                                        (local->writer, dict, i);
-                                if (ret)
-                                        goto out;
-                        }
-                        break;
-                default:
-                        break;
-
-                }
-                /* </node> */
-                ret = xmlTextWriterEndElement (local->writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* Tasks are only present when a normal volume status call is done on a
-         * single volume or on all volumes
-         */
-        if (((cmd & GF_CLI_STATUS_MASK) == GF_CLI_STATUS_NONE) &&
-            (cmd & (GF_CLI_STATUS_VOL|GF_CLI_STATUS_ALL))) {
-                ret = cli_xml_output_vol_status_tasks (local, dict);
-                if (ret)
-                        goto out;
-        }
-
-        /* </volume> */
-        ret = xmlTextWriterEndElement (local->writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-#if (HAVE_LIB_XML)
-int
-cli_xml_output_vol_top_rw_perf (xmlTextWriterPtr writer, dict_t *dict,
-                                int brick_index, int member_index)
-{
-        int        ret = -1;
-        char      *filename = NULL;
-        uint64_t   throughput = 0;
-        long int   time_sec = 0;
-        long int   time_usec = 0;
-        char       timestr[256] = {0,};
-        char       key[1024] = {0,};
-
-        /* <file> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"file");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%d-filename-%d", brick_index,
-                  member_index);
-        ret = dict_get_str (dict, key, &filename);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"filename",
-                                               "%s", filename);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%d-value-%d", brick_index, member_index);
-        ret = dict_get_uint64 (dict, key, &throughput);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"count",
-                                               "%"PRIu64, throughput);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%d-time-sec-%d", brick_index,
-                  member_index);
-        ret = dict_get_int32 (dict, key, (int32_t *)&time_sec);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%d-time-usec-%d", brick_index,
-                  member_index);
-        ret = dict_get_int32 (dict, key, (int32_t *)&time_usec);
-        if (ret)
-                goto out;
-
-        gf_time_fmt (timestr, sizeof timestr, time_sec, gf_timefmt_FT);
-        snprintf (timestr + strlen (timestr),
-                  sizeof timestr - strlen (timestr),
-                  ".%"GF_PRI_SUSECONDS, time_usec);
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"time",
-                                               "%s", timestr);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </file> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-cli_xml_output_vol_top_other (xmlTextWriterPtr writer, dict_t *dict,
-                                int brick_index, int member_index)
-{
-        int             ret = -1;
-        char            *filename = NULL;
-        uint64_t        count = 0;
-        char            key[1024] = {0,};
-
-        /* <file> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"file");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        snprintf (key, sizeof (key), "%d-filename-%d", brick_index,
-                  member_index);
-        ret = dict_get_str (dict, key, &filename);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"filename",
-                                               "%s", filename);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%d-value-%d", brick_index, member_index);
-        ret = dict_get_uint64 (dict, key, &count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"count",
-                                               "%"PRIu64, count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </file> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_vol_top (dict_t *dict, int op_ret, int op_errno,
-                        char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        int                     brick_count = 0;
-        int                     top_op = GF_CLI_TOP_NONE;
-        char                    *brick_name = NULL;
-        int                     members = 0;
-        uint64_t                current_open = 0;
-        uint64_t                max_open = 0;
-        char                    *max_open_time = NULL;
-        double                  throughput = 0.0;
-        double                  time_taken = 0.0;
-        char                    key[1024] = {0,};
-        int                     i = 0;
-        int                     j = 0;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <volTop> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"volTop");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_int32 (dict, "count", &brick_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"brickCount",
-                                               "%d", brick_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_int32 (dict, "1-top-op", &top_op);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"topOp",
-                                               "%d", top_op);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        while (i < brick_count) {
-                i++;
-
-                /* <brick> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"brick");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-brick", i);
-                ret = dict_get_str (dict, key, &brick_name);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"name",
-                                                       "%s", brick_name);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key , sizeof (key), "%d-members", i);
-                ret = dict_get_int32 (dict, key, &members);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"members",
-                                                       "%d", members);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                switch (top_op) {
-                case GF_CLI_TOP_OPEN:
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%d-current-open", i);
-                        ret = dict_get_uint64 (dict, key, &current_open);
-                        if (ret)
-                                goto out;
-                        ret = xmlTextWriterWriteFormatElement
-                                (writer, (xmlChar *)"currentOpen", "%"PRIu64,
-                                 current_open);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%d-max-open", i);
-                        ret = dict_get_uint64 (dict, key, &max_open);
-                        if (ret)
-                                goto out;
-                        ret = xmlTextWriterWriteFormatElement
-                                (writer, (xmlChar *)"maxOpen", "%"PRIu64,
-                                 max_open);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%d-max-openfd-time", i);
-                        ret = dict_get_str (dict, key, &max_open_time);
-                        if (ret)
-                                goto out;
-                        ret = xmlTextWriterWriteFormatElement
-                                (writer, (xmlChar *)"maxOpenTime", "%s",
-                                 max_open_time);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                case GF_CLI_TOP_READ:
-                case GF_CLI_TOP_WRITE:
-                case GF_CLI_TOP_OPENDIR:
-                case GF_CLI_TOP_READDIR:
-
-                        break;
-
-                case GF_CLI_TOP_READ_PERF:
-                case GF_CLI_TOP_WRITE_PERF:
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%d-throughput", i);
-                        ret = dict_get_double (dict, key, &throughput);
-                        if (!ret) {
-                                memset (key, 0, sizeof (key));
-                                snprintf (key, sizeof (key), "%d-time", i);
-                                ret = dict_get_double (dict, key, &time_taken);
-                        }
-
-                        if (!ret) {
-                                ret = xmlTextWriterWriteFormatElement
-                                        (writer, (xmlChar *)"throughput",
-                                         "%f", throughput);
-                                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                                ret = xmlTextWriterWriteFormatElement
-                                        (writer, (xmlChar *)"timeTaken",
-                                         "%f", time_taken);
-                        }
-
-                        break;
-
-                default:
-                        ret = -1;
-                        goto out;
-                }
-
-                for (j = 1; j <= members; j++) {
-                        if (top_op == GF_CLI_TOP_READ_PERF ||
-                            top_op == GF_CLI_TOP_WRITE_PERF) {
-                                ret = cli_xml_output_vol_top_rw_perf
-                                        (writer, dict, i, j);
-                        } else {
-                                ret = cli_xml_output_vol_top_other
-                                        (writer, dict, i, j);
-                        }
-                        if (ret)
-                                goto out;
-                }
-
-
-                /* </brick> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </volTop> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-#if (HAVE_LIB_XML)
-int
-cli_xml_output_vol_profile_stats (xmlTextWriterPtr writer, dict_t *dict,
-                                  int brick_index, int interval)
-{
-        int                     ret = -1;
-        uint64_t                read_count = 0;
-        uint64_t                write_count = 0;
-        uint64_t                hits = 0;
-        double                  avg_latency = 0.0;
-        double                  max_latency = 0.0;
-        double                  min_latency = 0.0;
-        uint64_t                duration = 0;
-        uint64_t                total_read = 0;
-        uint64_t                total_write = 0;
-        char                    key[1024] = {0};
-        int                     i = 0;
-
-        /* <cumulativeStats> || <intervalStats> */
-        if (interval == -1)
-                ret = xmlTextWriterStartElement (writer,
-                                                 (xmlChar *)"cumulativeStats");
-        else
-                ret = xmlTextWriterStartElement (writer,
-                                                 (xmlChar *)"intervalStats");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* <blockStats> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"blockStats");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < 32; i++) {
-                /* <block> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"block");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"size", "%"PRIu32, (1 << i));
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-%d-read-%d", brick_index,
-                          interval, (1 << i));
-                ret = dict_get_uint64 (dict, key, &read_count);
-                if (ret)
-                        read_count = 0;
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"reads", "%"PRIu64, read_count);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-%d-write-%d", brick_index,
-                          interval, (1 << i));
-                ret = dict_get_uint64 (dict, key, &write_count);
-                if (ret)
-                        write_count = 0;
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"writes", "%"PRIu64, write_count);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </block> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </blockStats> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* <fopStats> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"fopStats");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < GF_FOP_MAXVALUE; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-%d-%d-hits", brick_index,
-                          interval, i);
-                ret = dict_get_uint64 (dict, key, &hits);
-                if (ret)
-                        goto cont;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-%d-%d-avglatency", brick_index,
-                          interval, i);
-                ret = dict_get_double (dict, key, &avg_latency);
-                if (ret)
-                        goto cont;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-%d-%d-minlatency", brick_index,
-                          interval, i);
-                ret = dict_get_double (dict, key, &min_latency);
-                if (ret)
-                        goto cont;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-%d-%d-maxlatency", brick_index,
-                          interval, i);
-                ret = dict_get_double (dict, key, &max_latency);
-                if (ret)
-                        goto cont;
-
-                /* <fop> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"fop");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"name","%s", gf_fop_list[i]);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"hits", "%"PRIu64, hits);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"avgLatency", "%f", avg_latency);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"minLatency", "%f", min_latency);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"maxLatency", "%f", max_latency);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </fop> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-cont:
-                hits = 0;
-                avg_latency = 0.0;
-                min_latency = 0.0;
-                max_latency = 0.0;
-        }
-
-        /* </fopStats> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%d-%d-duration", brick_index, interval);
-        ret = dict_get_uint64 (dict, key, &duration);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"duration",
-                                               "%"PRIu64, duration);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%d-%d-total-read", brick_index, interval);
-        ret = dict_get_uint64 (dict, key, &total_read);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"totalRead",
-                                               "%"PRIu64, total_read);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%d-%d-total-write", brick_index, interval);
-        ret = dict_get_uint64 (dict, key, &total_write);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"totalWrite",
-                                               "%"PRIu64, total_write);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </cumulativeStats> || </intervalStats> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_vol_profile (dict_t *dict, int op_ret, int op_errno,
-                            char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        char                    *volname = NULL;
-        int                     op = GF_CLI_STATS_NONE;
-        int                     brick_count = 0;
-        char                    *brick_name = NULL;
-        int                     interval = 0;
-        char                    key[1024] = {0,};
-        int                     i = 0;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <volProfile> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"volProfile");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"volname",
-                                               "%s", volname);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_int32 (dict, "op", &op);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"profileOp",
-                                               "%d", op);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        if (op != GF_CLI_STATS_INFO)
-                goto cont;
-
-        ret = dict_get_int32 (dict, "count", &brick_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"brickCount",
-                                               "%d", brick_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        while (i < brick_count) {
-                i++;
-
-                /* <brick> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"brick");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                snprintf (key, sizeof (key), "%d-brick", i);
-                ret = dict_get_str (dict, key, &brick_name);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"brickName", "%s", brick_name);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                snprintf (key, sizeof (key), "%d-cumulative", i);
-                ret = dict_get_int32 (dict, key, &interval);
-                if (ret == 0) {
-                        ret = cli_xml_output_vol_profile_stats
-                                (writer, dict, i, interval);
-                        if (ret)
-                                goto out;
-                }
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%d-interval", i);
-                ret = dict_get_int32 (dict, key, &interval);
-                if (ret == 0) {
-                        ret = cli_xml_output_vol_profile_stats
-                                (writer, dict, i, interval);
-                        if (ret)
-                                goto out;
-                }
-
-                /* </brick> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-cont:
-        /* </volProfile> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_end_xml_output (writer, doc);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_vol_list (dict_t *dict, int op_ret, int op_errno,
-                         char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        int                     count = 0;
-        char                    *volname = NULL;
-        char                    key[1024] = {0,};
-        int                     i = 0;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <volList> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"volList");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_int32 (dict, "count", &count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"count",
-                                               "%d", count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        for (i = 0; i < count; i++) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d", i);
-                ret = dict_get_str (dict, key, &volname);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"volume",
-                                                       "%s", volname);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* </volList> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_end_xml_output (writer, doc);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-#if (HAVE_LIB_XML)
-int
-cli_xml_output_vol_info_option (xmlTextWriterPtr writer, char *substr,
-                                char *optstr, char *valstr)
-{
-        int             ret = -1;
-        char            *ptr1 = NULL;
-        char            *ptr2 = NULL;
-
-        ptr1 = substr;
-        ptr2 = optstr;
-
-        while (ptr1) {
-                if (*ptr1 != *ptr2)
-                        break;
-                ptr1++;
-                ptr2++;
-                if (!ptr1)
-                        goto out;
-                if (!ptr2)
-                        goto out;
-        }
-        if (*ptr2 == '\0')
-                goto out;
-
-        /* <option> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"option");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"name",
-                                               "%s", ptr2);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"value",
-                                               "%s", valstr);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </option> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-struct tmp_xml_option_logger {
-        char *key;
-        xmlTextWriterPtr writer;
-};
-
-static int
-_output_vol_info_option (dict_t *d, char *k, data_t *v,
-                         void *data)
-{
-        int                           ret   = 0;
-        char                         *ptr   = NULL;
-        struct tmp_xml_option_logger *tmp   = NULL;
-
-        tmp = data;
-
-        ptr = strstr (k, "option.");
-        if (!ptr)
-                goto out;
-
-        if (!v) {
-                ret = -1;
-                goto out;
-        }
-        ret = cli_xml_output_vol_info_option (tmp->writer, tmp->key, k,
-                                              v->data);
-
-out:
-        return ret;
-}
-
-int
-cli_xml_output_vol_info_options (xmlTextWriterPtr writer, dict_t *dict,
-                                 char *prefix)
-{
-        int             ret = -1;
-        int             opt_count = 0;
-        char            key[1024] = {0,};
-        struct tmp_xml_option_logger tmp = {0,};
-
-        snprintf (key, sizeof (key), "%s.opt_count", prefix);
-        ret = dict_get_int32 (dict, key, &opt_count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"optCount",
-                                               "%d", opt_count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* <options> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"options");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-        snprintf (key, sizeof (key), "%s.option.", prefix);
-
-        tmp.key = key;
-        tmp.writer = writer;
-        ret = dict_foreach (dict, _output_vol_info_option, &tmp);
-        if (ret)
-                goto out;
-
-        /* </options> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_vol_info (cli_local_t *local, dict_t *dict)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = 0;
-        int                     count = 0;
-        char                    *volname = NULL;
-        char                    *volume_id = NULL;
-        char                    *uuid = NULL;
-        int                     type = 0;
-        int                     status = 0;
-        int                     brick_count = 0;
-        int                     dist_count = 0;
-        int                     stripe_count = 0;
-        int                     replica_count = 0;
-        int                     transport = 0;
-        char                    *brick = NULL;
-        char                    key[1024] = {0,};
-        int                     i = 0;
-        int                     j = 1;
-        char                    *caps = NULL;
-        int                     k __attribute__((unused)) = 0;
-
-        ret = dict_get_int32 (dict, "count", &count);
-        if (ret)
-                goto out;
-
-        for (i = 0; i < count; i++) {
-                /* <volume> */
-                ret = xmlTextWriterStartElement (local->writer,
-                                                 (xmlChar *)"volume");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.name", i);
-                ret = dict_get_str (dict, key, &volname);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"name",
-                                                       "%s", volname);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.volume_id", i);
-                ret = dict_get_str (dict, key, &volume_id);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"id",
-                                                       "%s", volume_id);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.status", i);
-                ret = dict_get_int32 (dict, key, &status);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"status",
-                                                       "%d", status);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret =xmlTextWriterWriteFormatElement
-                        (local->writer, (xmlChar *)"statusStr", "%s",
-                         cli_vol_status_str[status]);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.brick_count", i);
-                ret = dict_get_int32 (dict, key, &brick_count);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"brickCount",
-                                                       "%d", brick_count);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.dist_count", i);
-                ret = dict_get_int32 (dict, key, &dist_count);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"distCount",
-                                                       "%d", dist_count);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.stripe_count", i);
-                ret = dict_get_int32 (dict, key, &stripe_count);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"stripeCount",
-                                                       "%d", stripe_count);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.replica_count", i);
-                ret = dict_get_int32 (dict, key, &replica_count);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"replicaCount",
-                                                       "%d", replica_count);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.type", i);
-                ret = dict_get_int32 (dict, key, &type);
-                if (ret)
-                        goto out;
-                /* For Distributed-(stripe,replicate,stipe-replicate) types */
-                if ((type > 0) && (dist_count < brick_count))
-                        type += 3;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"type",
-                                                       "%d", type);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"typeStr",
-                                                       "%s",
-                                                       cli_vol_type_str[type]);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d.transport", i);
-                ret = dict_get_int32 (dict, key, &transport);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (local->writer,
-                                                       (xmlChar *)"transport",
-                                                       "%d", transport);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-#ifdef HAVE_BD_XLATOR
-                /* <xlators> */
-                ret = xmlTextWriterStartElement (local->writer,
-                                                 (xmlChar *)"xlators");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                for (k = 0; ; k++) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key),"volume%d.xlator%d", i, k);
-                        ret = dict_get_str (dict, key, &caps);
-                        if (ret)
-                                break;
-
-                        /* <xlator> */
-                        ret = xmlTextWriterStartElement (local->writer,
-                                                         (xmlChar *)"xlator");
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        ret = xmlTextWriterWriteFormatElement
-                                (local->writer, (xmlChar *)"name", "%s", caps);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        /* <capabilities> */
-                        ret = xmlTextWriterStartElement (local->writer,
-                                                         (xmlChar *)
-                                                         "capabilities");
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        j = 0;
-                        for (j = 0; ;j++) {
-                                memset (key, 0, sizeof (key));
-                                snprintf (key, sizeof (key),
-                                          "volume%d.xlator%d.caps%d", i, k, j);
-                                ret = dict_get_str (dict, key, &caps);
-                                if (ret)
-                                        break;
-                                ret = xmlTextWriterWriteFormatElement
-                                        (local->writer, (xmlChar *)"capability",
-                                         "%s", caps);
-                                XML_RET_CHECK_AND_GOTO (ret, out);
-                        }
-                        /* </capabilities> */
-                        ret = xmlTextWriterEndElement (local->writer);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-                        /* </xlator> */
-                        ret = xmlTextWriterEndElement (local->writer);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-                }
-                ret = xmlTextWriterFullEndElement (local->writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-                /* </xlators> */
-#else
-                caps = 0; /* Avoid compiler warnings when BD not enabled */
-#endif
-                j = 1;
-
-                /* <bricks> */
-                ret = xmlTextWriterStartElement (local->writer,
-                                                 (xmlChar *)"bricks");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-                while (j <= brick_count) {
-                        ret = xmlTextWriterStartElement
-                                (local->writer, (xmlChar *)"brick");
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "volume%d.brick%d.uuid",
-                                  i, j);
-                        ret = dict_get_str (dict, key, &uuid);
-                        if (ret)
-                                goto out;
-                        ret = xmlTextWriterWriteFormatAttribute
-                                (local->writer, (xmlChar *)"uuid", "%s",
-                                 uuid);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "volume%d.brick%d", i, j);
-                        ret = dict_get_str (dict, key, &brick);
-                        if (ret)
-                                goto out;
-                        ret = xmlTextWriterWriteFormatString
-                                (local->writer, "%s", brick);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        /* </brick> */
-                        ret = xmlTextWriterEndElement (local->writer);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-
-                        j++;
-                }
-                /* </bricks> */
-                ret = xmlTextWriterEndElement (local->writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "volume%d", i);
-                ret = cli_xml_output_vol_info_options (local->writer, dict,
-                                                       key);
-                if (ret)
-                        goto out;
-
-                /* </volume> */
-                ret = xmlTextWriterEndElement (local->writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        if (volname) {
-                GF_FREE (local->get_vol.volname);
-                local->get_vol.volname = gf_strdup (volname);
-                local->vol_count += count;
-        }
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_vol_info_begin (cli_local_t *local, int op_ret, int op_errno,
-                               char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-
-        GF_ASSERT (local);
-
-        ret = cli_begin_xml_output (&(local->writer), &(local->doc));
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (local->writer, op_ret, op_errno,
-                                     op_errstr);
-        if (ret)
-                goto out;
-
-        /* <volInfo> */
-        ret = xmlTextWriterStartElement (local->writer, (xmlChar *)"volInfo");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* <volumes> */
-        ret = xmlTextWriterStartElement (local->writer, (xmlChar *)"volumes");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* Init vol count */
-        local->vol_count = 0;
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_vol_info_end (cli_local_t *local)
-{
-#if (HAVE_LIB_XML)
-        int             ret = -1;
-
-        GF_ASSERT (local);
-
-        ret = xmlTextWriterWriteFormatElement (local->writer,
-                                               (xmlChar *)"count",
-                                               "%d", local->vol_count);
-
-        /* </volumes> */
-        ret = xmlTextWriterEndElement (local->writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </volInfo> */
-        ret = xmlTextWriterEndElement (local->writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_end_xml_output (local->writer, local->doc);
-
-out:
-        gf_log ("cli", GF_LOG_ERROR, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_vol_quota_limit_list (char *volname, char *limit_list,
-                                     int op_ret, int op_errno,
-                                     char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        int64_t                 size = 0;
-        int64_t                 limit_value = 0;
-        int                     i = 0;
-        int                     j = 0;
-        int                     k = 0;
-        int                     len = 0;
-        char                    *size_str = NULL;
-        char                    path[PATH_MAX] = {0,};
-        char                    ret_str[1024] = {0,};
-        char                    value[1024] = {0,};
-        char                    mountdir[] = "/tmp/mountXXXXXX";
-        char                    abspath[PATH_MAX] = {0,};
-        runner_t                runner = {0,};
-
-        GF_ASSERT (volname);
-        GF_ASSERT (limit_list);
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <volQuota> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"volQuota");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        if (!limit_list)
-                goto cont;
-
-        len = strlen (limit_list);
-        if (len == 0)
-                goto cont;
-
-        if (mkdtemp (mountdir) == NULL) {
-                gf_log ("cli", GF_LOG_ERROR, "failed to create a temporary"
-                        " mount directory");
-                ret = -1;
-                goto out;
-        }
-
-        ret = runcmd (SBIN_DIR"/glusterfs", "-s", "localhost",
-                      "--volfile-id", volname, "-l",
-                      DEFAULT_LOG_FILE_DIRECTORY"/quota-list-xml.log",
-                      mountdir, NULL);
-        if (ret) {
-                gf_log ("cli", GF_LOG_ERROR,
-                        "failed to mount glusterfs client");
-                ret = -1;
-                goto rm_dir;
-        }
-
-        while (i < len) {
-                j = 0;
-                k = 0;
-                size = 0;
-
-                while (limit_list[i] != ':')
-                        path[k++] = limit_list[i++];
-                path[k] = '\0';
-
-                i++;
-
-                while (limit_list[i] != ',' && limit_list[i] != '\0')
-                        value[j++] = limit_list[i++];
-                i++;
-
-                snprintf (abspath, sizeof (abspath), "%s/%s", mountdir, path);
-                ret = sys_lgetxattr (abspath, "trusted.limit.list",
-                                     (void *)ret_str, 4096);
-                if (ret >= 0) {
-                        sscanf (ret_str, "%"SCNd64",%"SCNd64, &size,
-                                &limit_value);
-                        size_str = gf_uint64_2human_readable ((uint64_t)size);
-                }
-
-                /* <quota> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"quota");
-                XML_RET_CHECK_AND_GOTO (ret, unmount);
-
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"path", "%s", path);
-                XML_RET_CHECK_AND_GOTO (ret, unmount);
-
-                ret = xmlTextWriterWriteFormatElement
-                        (writer, (xmlChar *)"limit", "%s", value);
-                XML_RET_CHECK_AND_GOTO (ret, unmount);
-
-                if (size_str) {
-                        ret = xmlTextWriterWriteFormatElement
-                                (writer, (xmlChar *)"size", "%s", size_str);
-                        XML_RET_CHECK_AND_GOTO (ret, unmount);
-                        GF_FREE (size_str);
-                } else {
-                        ret = xmlTextWriterWriteFormatElement
-                                (writer, (xmlChar *)"size", "%"PRId64, size);
-                        XML_RET_CHECK_AND_GOTO (ret, unmount);
-                }
-
-                /* </quota> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, unmount);
-
-        }
-
-unmount:
-        runinit (&runner);
-        runner_add_args (&runner, "umount",
-#if GF_LINUX_HOST_OS
-                         "-l",
-#endif
-                         mountdir, NULL);
-        ret = runner_run_reuse (&runner);
-        if (ret)
-                runner_log (&runner, "cli", GF_LOG_WARNING, "error executing");
-        runner_end (&runner);
-
-rm_dir:
-        rmdir (mountdir);
-
-cont:
-        /* </volQuota> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        GF_FREE (size_str);
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_peer_status (dict_t *dict, int op_ret, int op_errno,
-                            char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        int                     count = 0;
-        char                    *uuid = NULL;
-        char                    *hostname = NULL;
-        int                     connected = 0;
-        int                     state_id = 0;
-        char                    *state_str = NULL;
-        int                     i = 1;
-        char                    key[1024] = {0,};
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <peerStatus> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"peerStatus");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        if (!dict)
-                goto cont;
-
-        ret = dict_get_int32 (dict, "count", &count);
-        if (ret)
-                goto out;
-
-        while (i <= count) {
-                /* <peer> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"peer");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "friend%d.uuid", i);
-                ret = dict_get_str (dict, key, &uuid);
-                if (ret)
-                        goto out;
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"uuid",
-                                                       "%s", uuid);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "friend%d.hostname", i);
-                ret = dict_get_str (dict, key, &hostname);
-                if (ret)
-                        goto out;
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"hostname",
-                                                       "%s", hostname);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "friend%d.connected", i);
-                ret = dict_get_int32 (dict, key, &connected);
-                if (ret)
-                        goto out;
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"connected",
-                                                       "%d", connected);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "friend%d.stateId", i);
-                ret = dict_get_int32 (dict, key, &state_id);
-                if (!ret) {
-                        /* ignore */
-
-                        ret = xmlTextWriterWriteFormatElement (writer,
-                                           (xmlChar *)"state", "%d", state_id);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-                }
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "friend%d.state", i);
-                ret = dict_get_str (dict, key, &state_str);
-                if (!ret) {
-                        /* ignore */
-
-                        ret = xmlTextWriterWriteFormatElement (writer,
-                                       (xmlChar *)"stateStr", "%s", state_str);
-                        XML_RET_CHECK_AND_GOTO (ret, out);
-                }
-
-                /* </peer> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                i++;
-        }
-
-cont:
-        /* </peerStatus> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-#if (HAVE_LIB_XML)
-/* Used for rebalance stop/status, remove-brick status */
-int
-cli_xml_output_vol_rebalance_status (xmlTextWriterPtr writer, dict_t *dict,
-                                     enum gf_task_types task_type)
-{
-        int                     ret = -1;
-        int                     count = 0;
-        char                    *node_name = NULL;
-        char                    *node_uuid = NULL;
-        uint64_t                files = 0;
-        uint64_t                size = 0;
-        uint64_t                lookups = 0;
-        int                     status_rcd = 0;
-        uint64_t                failures = 0;
-        uint64_t                skipped = 0;
-        uint64_t                total_files = 0;
-        uint64_t                total_size = 0;
-        uint64_t                total_lookups = 0;
-        uint64_t                total_failures = 0;
-        uint64_t                total_skipped = 0;
-        char                    key[1024] = {0,};
-        int                     i = 0;
-        int                     overall_status = -1;
-        double                  elapsed = 0;
-        double                  overall_elapsed = 0;
-
-        if (!dict) {
-                ret = 0;
-                goto out;
-        }
-
-        ret = dict_get_int32 (dict, "count", &count);
-        if (ret)
-                goto out;
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"nodeCount",
-                                               "%d", count);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        while (i < count) {
-                i++;
-
-                /* <node> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"node");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "node-name-%d", i);
-                ret = dict_get_str (dict, key, &node_name);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"nodeName",
-                                                       "%s", node_name);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "node-uuid-%d", i);
-                ret = dict_get_str (dict, key, &node_uuid);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"id",
-                                                       "%s", node_uuid);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "files-%d", i);
-                ret = dict_get_uint64 (dict, key, &files);
-                if (ret)
-                        goto out;
-                total_files += files;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"files",
-                                                       "%"PRIu64, files);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "size-%d", i);
-                ret = dict_get_uint64 (dict, key, &size);
-                if (ret)
-                        goto out;
-                total_size += size;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"size",
-                                                       "%"PRIu64,size);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "lookups-%d", i);
-                ret = dict_get_uint64 (dict, key, &lookups);
-                if (ret)
-                        goto out;
-                total_lookups += lookups;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"lookups",
-                                                       "%"PRIu64, lookups);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "failures-%d", i);
-                ret = dict_get_uint64 (dict, key, &failures);
-                if (ret)
-                        goto out;
-                total_failures += failures;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"failures",
-                                                       "%"PRIu64, failures);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* skipped-%d is not available for remove brick in dict,
-                   so using failures as skipped count in case of remove-brick
-                   similar to logic used in CLI(non xml output) */
-                if (task_type == GF_TASK_TYPE_REBALANCE) {
-                    memset (key, 0, sizeof (key));
-                    snprintf (key, sizeof (key), "skipped-%d", i);
-                }
-                else {
-                    memset (key, 0, sizeof (key));
-                    snprintf (key, sizeof (key), "failures-%d", i);
-                }
-
-                ret = dict_get_uint64 (dict, key, &skipped);
-                if (ret)
-                        goto out;
-                total_skipped += skipped;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"skipped",
-                                                       "%"PRIu64, skipped);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "status-%d", i);
-                ret = dict_get_int32 (dict, key, &status_rcd);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"status",
-                                                       "%d", status_rcd);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"statusStr",
-                                                       "%s",
-                                         cli_vol_task_status_str[status_rcd]);
-
-                memset (key, 0, 256);
-                snprintf (key, 256, "run-time-%d", i);
-                ret = dict_get_double (dict, key, &elapsed);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"runtime",
-                                                       "%.2f", elapsed);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                if (elapsed > overall_elapsed) {
-                    overall_elapsed = elapsed;
-                }
-
-                if (-1 == overall_status)
-                        overall_status = status_rcd;
-                else if ((GF_DEFRAG_STATUS_COMPLETE == overall_status ||
-                          status_rcd > overall_status) &&
-                         (status_rcd != GF_DEFRAG_STATUS_COMPLETE))
-                        overall_status = status_rcd;
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </node> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        /* Aggregate status */
-        /* <aggregate> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"aggregate");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"files",
-                                               "%"PRIu64, total_files);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"size",
-                                               "%"PRIu64, total_size);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"lookups",
-                                               "%"PRIu64, total_lookups);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"failures",
-                                               "%"PRIu64, total_failures);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"skipped",
-                                               "%"PRIu64, total_skipped);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"status",
-                                               "%d", overall_status);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"statusStr",
-                                               "%s",
-                                      cli_vol_task_status_str[overall_status]);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = xmlTextWriterWriteFormatElement (writer,(xmlChar *)"runtime",
-                                               "%.2f", overall_elapsed);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        /* </aggregate> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_vol_rebalance (gf_cli_defrag_type op, dict_t *dict, int op_ret,
-                              int op_errno, char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        char                    *task_id_str = NULL;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <volRebalance> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"volRebalance");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_str (dict, GF_REBALANCE_TID_KEY, &task_id_str);
-        if (ret == 0) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"task-id",
-                                                       "%s", task_id_str);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"op",
-                                               "%d", op);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        if ((GF_DEFRAG_CMD_STOP == op) || (GF_DEFRAG_CMD_STATUS == op)) {
-                ret = cli_xml_output_vol_rebalance_status (writer, dict,
-                                                      GF_TASK_TYPE_REBALANCE);
-                if (ret)
-                        goto out;
-        }
-
-        /* </volRebalance> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_vol_remove_brick (gf_boolean_t status_op, dict_t *dict,
-                                 int op_ret, int op_errno, char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        char                    *task_id_str = NULL;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <volRemoveBrick> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"volRemoveBrick");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_str (dict, GF_REMOVE_BRICK_TID_KEY, &task_id_str);
-        if (ret == 0) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"task-id",
-                                                       "%s", task_id_str);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        if (status_op) {
-                ret = cli_xml_output_vol_rebalance_status (writer, dict,
-                                                   GF_TASK_TYPE_REMOVE_BRICK);
-                if (ret)
-                        goto out;
-        }
-
-        /* </volRemoveBrick> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_vol_replace_brick (gf1_cli_replace_op op, dict_t *dict,
-                                  int op_ret, int op_errno, char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        int                     status = 0;
-        uint64_t                files = 0;
-        char                    *current_file = 0;
-        char                    *task_id_str = NULL;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <volReplaceBrick> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"volReplaceBrick");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_str (dict, GF_REPLACE_BRICK_TID_KEY, &task_id_str);
-        if (ret == 0) {
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"task-id",
-                                                       "%s", task_id_str);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"op",
-                                               "%d", op);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        if (GF_REPLACE_OP_STATUS == op) {
-                ret = dict_get_int32 (dict, "status", &status);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"status",
-                                                       "%d", status);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = dict_get_uint64 (dict, "files", &files);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"files",
-                                                       "%"PRIu64, files);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                if (status)
-                        goto cont;
-
-                ret = dict_get_str (dict, "current_file", &current_file);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"currentFile",
-                                                       "%s", current_file);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-cont:
-        /* </volReplaceBrick> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_vol_create (dict_t *dict, int op_ret, int op_errno,
-                           char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        char                    *volname = NULL;
-        char                    *volid = NULL;
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        if (dict) {
-                /* <volCreate> */
-                ret = xmlTextWriterStartElement (writer,
-                                                 (xmlChar *)"volCreate");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* <volume> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"volume");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = dict_get_str (dict, "volname", &volname);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *) "name",
-                                                       "%s", volname);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = dict_get_str (dict, "volume-id", &volid);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"id",
-                                                       "%s", volid);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </volume> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </volCreate> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-int
-cli_xml_output_generic_volume (char *op, dict_t *dict, int op_ret, int op_errno,
-                               char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        char                    *volname = NULL;
-        char                    *volid = NULL;
-
-        GF_ASSERT (op);
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        if (dict) {
-                /* <"op"> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)op);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* <volume> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"volume");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = dict_get_str (dict, "volname", &volname);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *) "name",
-                                                       "%s", volname);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = dict_get_str (dict, "vol-id", &volid);
-                if (ret)
-                        goto out;
-                ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"id",
-                                                       "%s", volid);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </volume> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </"op"> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-        }
-
-        ret = cli_end_xml_output (writer, doc);
-
-out:
-        gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
-
-#if (HAVE_LIB_XML)
-int
-cli_xml_output_vol_gsync_status (dict_t *dict, xmlTextWriterPtr writer)
-{
-        char                    master_key[PATH_MAX] = "";
-        char                    slave_key[PATH_MAX] = "";
-        char                    status_key[PATH_MAX] = "";
-        char                    node_key[PATH_MAX] = "";
-        char                    *master = NULL;
-        char                    *slave = NULL;
-        char                    *status = NULL;
-        char                    *node = NULL;
-        int                     ret = -1;
-        int                     gsync_count = 0;
-        int                     i = 1;
-
-        ret = dict_get_int32 (dict, "gsync-count", &gsync_count);
-        if (ret)
-                goto out;
-
-        for (i=1; i <= gsync_count; i++) {
-                snprintf (node_key, sizeof(node_key), "node%d", i);
-                snprintf (master_key, sizeof(master_key), "master%d", i);
-                snprintf (slave_key, sizeof(slave_key), "slave%d", i);
-                snprintf (status_key, sizeof(status_key), "status%d", i);
-
-                ret = dict_get_str (dict, node_key, &node);
-                if (ret)
-                        goto out;
-
-                ret = dict_get_str (dict, master_key, &master);
-                if (ret)
-                        goto out;
-
-                ret = dict_get_str (dict, slave_key, &slave);
-                if (ret)
-                        goto out;
-
-                ret = dict_get_str (dict, status_key, &status);
-                if (ret)
-                        goto out;
-
-                /* <pair> */
-                ret = xmlTextWriterStartElement (writer, (xmlChar *)"pair");
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"node",
-                                                       "%s", node);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"master",
-                                                       "%s", master);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"slave",
-                                                       "%s", slave);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"status",
-                                                       "%s", status);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                /* </pair> */
-                ret = xmlTextWriterEndElement (writer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-        }
-
-out:
-        gf_log ("cli",GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-#endif
-
-int
-cli_xml_output_vol_gsync (dict_t *dict, int op_ret, int op_errno,
-                          char *op_errstr)
-{
-#if (HAVE_LIB_XML)
-        int                     ret = -1;
-        xmlTextWriterPtr        writer = NULL;
-        xmlDocPtr               doc = NULL;
-        char                    *master = NULL;
-        char                    *slave = NULL;
-        int                     type = 0;
-
-        GF_ASSERT (dict);
-
-        ret = cli_begin_xml_output (&writer, &doc);
-        if (ret)
-                goto out;
-
-        ret = cli_xml_output_common (writer, op_ret, op_errno, op_errstr);
-        if (ret)
-                goto out;
-
-        /* <geoRep> */
-        ret = xmlTextWriterStartElement (writer, (xmlChar *)"geoRep");
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = dict_get_int32 (dict, "type", &type);
-        if (ret) {
-                gf_log ("cli", GF_LOG_ERROR, "Failed to get type");
-                goto out;
-        }
-
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"type",
-                                               "%d", type);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        switch (type) {
-        case GF_GSYNC_OPTION_TYPE_START:
-        case GF_GSYNC_OPTION_TYPE_STOP:
-                if (dict_get_str (dict, "master", &master) != 0)
-                        master = "???";
-                if (dict_get_str (dict, "slave", &slave) != 0)
-                        slave = "???";
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"master",
-                                                       "%s", master);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *)"slave",
-                                                       "%s", slave);
-                XML_RET_CHECK_AND_GOTO (ret, out);
-
-                break;
-
-        case GF_GSYNC_OPTION_TYPE_CONFIG:
-                break;
-        case GF_GSYNC_OPTION_TYPE_STATUS:
-                ret = cli_xml_output_vol_gsync_status(dict, writer);
-                break;
-        default:
-                ret = 0;
-                break;
-        }
-
-        /* </geoRep> */
-        ret = xmlTextWriterEndElement (writer);
-        XML_RET_CHECK_AND_GOTO (ret, out);
-
-        ret = cli_end_xml_output (writer, doc);
-out:
-        gf_log ("cli",GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-#else
-        return 0;
-#endif
-}
diff --git a/cli/src/cli.c b/cli/src/cli.c
index 91b315ff1..7341c7e8f 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -64,10 +74,11 @@
 #include "call-stub.h"
 #include <fnmatch.h>
 
-#include "xdr-generic.h"
-
 extern int connected;
 /* using argp for command line parsing */
+static char gf_doc[] = "";
+
+static char argp_doc[] = "";
 
 const char *argp_program_version = ""                                 \
         PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \
@@ -80,7 +91,10 @@ const char *argp_program_version = ""                                 \
 
 const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
 
-
+static struct argp_option gf_options[] = {
+        {0, 0, 0, 0, "Basic options:"},
+        {0, }
+};
 
 struct rpc_clnt *global_rpc;
 
@@ -89,6 +103,76 @@ rpc_clnt_prog_t *cli_rpc_prog;
 
 extern struct rpc_clnt_program cli_prog;
 
+static error_t
+parse_opts (int key, char *arg, struct argp_state *argp_state)
+{
+        struct cli_state  *state = NULL;
+        char             **argv = NULL;
+
+        state = argp_state->input;
+
+        switch (key) {
+        case ARGP_KEY_ARG:
+                if (!state->argc) {
+                        argv = calloc (state->argc + 2,
+                                       sizeof (*state->argv));
+                } else {
+                        argv = realloc (state->argv, (state->argc + 2) *
+                                        sizeof (*state->argv));
+                }
+                if (!argv)
+                        return -1;
+
+                state->argv = argv;
+
+                argv[state->argc] = strdup (arg);
+                if (!argv[state->argc])
+                        return -1;
+                state->argc++;
+                argv[state->argc] = NULL;
+
+                break;
+        }
+
+        return 0;
+}
+
+
+
+static char *
+generate_uuid ()
+{
+        char           tmp_str[1024] = {0,};
+        char           hostname[256] = {0,};
+        struct timeval tv = {0,};
+        struct tm      now = {0, };
+        char           now_str[32];
+
+        if (gettimeofday (&tv, NULL) == -1) {
+                gf_log ("glusterfsd", GF_LOG_ERROR,
+                        "gettimeofday: failed %s",
+                        strerror (errno));
+        }
+
+        if (gethostname (hostname, 256) == -1) {
+                gf_log ("glusterfsd", GF_LOG_ERROR,
+                        "gethostname: failed %s",
+                        strerror (errno));
+        }
+
+        localtime_r (&tv.tv_sec, &now);
+        strftime (now_str, 32, "%Y/%m/%d-%H:%M:%S", &now);
+        snprintf (tmp_str, 1024, "%s-%d-%s:%"
+#ifdef GF_DARWIN_HOST_OS
+                  PRId32,
+#else
+                  "ld",
+#endif
+                  hostname, getpid(), now_str, tv.tv_usec);
+
+        return gf_strdup (tmp_str);
+}
+
 static int
 glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
 {
@@ -98,13 +182,13 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
 
         xlator_mem_acct_init (THIS, cli_mt_end);
 
-        ctx->process_uuid = generate_glusterfs_ctx_id ();
+        ctx->process_uuid = generate_uuid ();
         if (!ctx->process_uuid)
                 return -1;
 
         ctx->page_size  = 128 * GF_UNIT_KB;
 
-        ctx->iobuf_pool = iobuf_pool_new ();
+        ctx->iobuf_pool = iobuf_pool_new (8 * GF_UNIT_MB, ctx->page_size);
         if (!ctx->iobuf_pool)
                 return -1;
 
@@ -117,33 +201,22 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
         if (!pool)
                 return -1;
 
-        /* frame_mem_pool size 112 * 64 */
-        pool->frame_mem_pool = mem_pool_new (call_frame_t, 32);
+        /* frame_mem_pool size 112 * 16k */
+        pool->frame_mem_pool = mem_pool_new (call_frame_t, 16384);
+
         if (!pool->frame_mem_pool)
                 return -1;
 
-        /* stack_mem_pool size 256 * 128 */
-        pool->stack_mem_pool = mem_pool_new (call_stack_t, 16);
+        /* stack_mem_pool size 256 * 8k */
+        pool->stack_mem_pool = mem_pool_new (call_stack_t, 8192); 
 
         if (!pool->stack_mem_pool)
                 return -1;
 
-        ctx->stub_mem_pool = mem_pool_new (call_stub_t, 16);
+        ctx->stub_mem_pool = mem_pool_new (call_stub_t, 1024);
         if (!ctx->stub_mem_pool)
                 return -1;
 
-        ctx->dict_pool = mem_pool_new (dict_t, 32);
-        if (!ctx->dict_pool)
-                return -1;
-
-        ctx->dict_pair_pool = mem_pool_new (data_pair_t, 512);
-        if (!ctx->dict_pair_pool)
-                return -1;
-
-        ctx->dict_data_pool = mem_pool_new (data_t, 512);
-        if (!ctx->dict_data_pool)
-                return -1;
-
         INIT_LIST_HEAD (&pool->all_frames);
         LOCK_INIT (&pool->lock);
         ctx->pool = pool;
@@ -163,22 +236,27 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
 
 
 static int
-logging_init (glusterfs_ctx_t *ctx, struct cli_state *state)
+logging_init (glusterfs_ctx_t *ctx)
 {
-        char *log_file = state->log_file ? state->log_file :
-                         DEFAULT_CLI_LOG_FILE_DIRECTORY "/cli.log";
+        int         ret      = 0;
+        cmd_args_t *cmd_args = NULL;
+
+        cmd_args = &ctx->cmd_args;
 
-        /* passing ident as NULL means to use default ident for syslog */
-        if (gf_log_init (ctx, log_file, NULL) == -1) {
+        /* CLI should not have something to DEBUG after the release,
+           hence defaulting to INFO loglevel */
+        cmd_args->log_level = GF_LOG_INFO;
+
+        ret = gf_asprintf (&cmd_args->log_file,
+                           DEFAULT_CLI_LOG_FILE_DIRECTORY "/cli.log");
+
+        if (gf_log_init (cmd_args->log_file) == -1) {
                 fprintf (stderr, "ERROR: failed to open logfile %s\n",
-                         log_file);
+                         cmd_args->log_file);
                 return -1;
         }
 
-        /* CLI should not have something to DEBUG after the release,
-           hence defaulting to INFO loglevel */
-        gf_log_set_loglevel ((state->log_level == -1) ? GF_LOG_INFO :
-                             state->log_level);
+        gf_log_set_loglevel (cmd_args->log_level);
 
         return 0;
 }
@@ -187,41 +265,41 @@ int
 cli_submit_request (void *req, call_frame_t *frame,
                     rpc_clnt_prog_t *prog,
                     int procnum, struct iobref *iobref,
-                    xlator_t *this, fop_cbk_fn_t cbkfn, xdrproc_t xdrproc)
+                    cli_serialize_t sfunc, xlator_t *this,
+                    fop_cbk_fn_t cbkfn)
 {
         int                     ret         = -1;
         int                     count      = 0;
+        char                    start_ping = 0;
         struct iovec            iov         = {0, };
         struct iobuf            *iobuf = NULL;
         char                    new_iobref = 0;
-        ssize_t                 xdr_size   = 0;
 
         GF_ASSERT (this);
 
-        if (req) {
-                xdr_size = xdr_sizeof (xdrproc, req);
-                iobuf = iobuf_get2 (this->ctx->iobuf_pool, xdr_size);
-                if (!iobuf) {
-                        goto out;
-                };
+        iobuf = iobuf_get (this->ctx->iobuf_pool);
+        if (!iobuf) {
+                goto out;
+        };
 
+        if (!iobref) {
+                iobref = iobref_new ();
                 if (!iobref) {
-                        iobref = iobref_new ();
-                        if (!iobref) {
-                                goto out;
-                        }
-
-                        new_iobref = 1;
+                        goto out;
                 }
 
-                iobref_add (iobref, iobuf);
+                new_iobref = 1;
+        }
+
+        iobref_add (iobref, iobuf);
 
-                iov.iov_base = iobuf->ptr;
-                iov.iov_len  = iobuf_size (iobuf);
+        iov.iov_base = iobuf->ptr;
+        iov.iov_len  = 128 * GF_UNIT_KB;
 
 
-                /* Create the xdr payload */
-                ret = xdr_serialize_generic (iov, req, xdrproc);
+        /* Create the xdr payload */
+        if (req && sfunc) {
+                ret = sfunc (iov, req);
                 if (ret == -1) {
                         goto out;
                 }
@@ -233,13 +311,22 @@ cli_submit_request (void *req, call_frame_t *frame,
         ret = rpc_clnt_submit (global_rpc, prog, procnum, cbkfn,
                                &iov, count,
                                NULL, 0, iobref, frame, NULL, 0, NULL, 0, NULL);
+
+        if (ret == 0) {
+                pthread_mutex_lock (&global_rpc->conn.lock);
+                {
+                        if (!global_rpc->conn.ping_started) {
+                                start_ping = 1;
+                        }
+                }
+                pthread_mutex_unlock (&global_rpc->conn.lock);
+        }
+
         ret = 0;
 
 out:
         if (new_iobref)
                 iobref_unref (iobref);
-        if (iobuf)
-                iobuf_unref (iobuf);
         return ret;
 }
 
@@ -284,44 +371,11 @@ cli_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
         return ret;
 }
 
-
-/*
- * ret: 0: option successfully processed
- *      1: signalling end of option list
- *     -1: unknown option or other issue
- */
 int
 cli_opt_parse (char *opt, struct cli_state *state)
 {
         char *oarg;
 
-        if (strcmp (opt, "") == 0)
-                return 1;
-
-        if (strcmp (opt, "version") == 0) {
-                cli_out ("%s", argp_program_version);
-                exit (0);
-        }
-
-        if (strcmp (opt, "print-logdir") == 0) {
-                cli_out ("%s", DEFAULT_LOG_FILE_DIRECTORY);
-                exit (0);
-        }
-
-        if (strcmp (opt, "print-statedumpdir") == 0) {
-                cli_out ("%s", DEFAULT_VAR_RUN_DIRECTORY);
-                exit (0);
-        }
-
-        if (strcmp (opt, "xml") == 0) {
-#if (HAVE_LIB_XML)
-                state->mode |= GLUSTER_MODE_XML;
-#else
-                cli_err ("XML output not supported. Ignoring '--xml' option");
-#endif
-                return 0;
-        }
-
         oarg = strtail (opt, "mode=");
         if (oarg) {
                 if (strcmp (oarg, "script") == 0) {
@@ -339,26 +393,6 @@ cli_opt_parse (char *opt, struct cli_state *state)
                 return 0;
         }
 
-        oarg = strtail (opt, "log-file=");
-        if (oarg) {
-                state->log_file = oarg;
-                return 0;
-        }
-
-        oarg = strtail (opt, "log-level=");
-        if (oarg) {
-                state->log_level = glusterd_check_log_level(oarg);
-                if (state->log_level == -1)
-                        return -1;
-                return 0;
-        }
-
-        oarg = strtail (opt, "glusterd-sock=");
-        if (oarg) {
-                state->glusterd_sock = oarg;
-                return 0;
-        }
-
         return -1;
 }
 
@@ -369,32 +403,28 @@ parse_cmdline (int argc, char *argv[], struct cli_state *state)
         int         i = 0;
         int         j = 0;
         char        *opt = NULL;
+        struct argp argp = { 0,};
 
-        state->argc=argc-1;
-        state->argv=&argv[1];
+        argp.options    = gf_options;
+        argp.parser     = parse_opts;
+        argp.args_doc   = argp_doc;
+        argp.doc        = gf_doc;
 
-        for (i = 0; i < state->argc; i++) {
-                opt = strtail (state->argv[i], "--");
+        for (i = 0; i < argc; i++) {
+                opt = strtail (argv[i], "--");
                 if (opt) {
                         ret = cli_opt_parse (opt, state);
                         if (ret == -1) {
-                                cli_out ("unrecognized option --%s", opt);
-                                return ret;
-                        }
-                        for (j = i; j < state->argc - 1; j++)
-                                state->argv[j] = state->argv[j + 1];
-                        state->argc--;
-                        /* argv shifted, next check should be at i again */
-                        i--;
-                        if (ret == 1) {
-                                /* end of cli options */
-                                ret = 0;
                                 break;
                         }
+                        for (j = i; j < argc - 1; j++)
+                                argv[j] = argv[j + 1];
+                        argc--;
                 }
         }
 
-        state->argv[state->argc] = NULL;
+        ret = argp_parse (&argp, argc, argv,
+                          ARGP_IN_ORDER, NULL, state);
 
         return ret;
 }
@@ -420,7 +450,7 @@ cli_state_init (struct cli_state *state)
         int                   ret = 0;
 
 
-        state->log_level = -1;
+        state->remote_host = "localhost";
 
         tree = &state->tree;
         tree->state = state;
@@ -439,36 +469,12 @@ cli_usage_out (const char *usage)
         if (!usage || usage[0] == '\0')
                 return -1;
 
-        cli_err ("Usage: %s", usage);
+        cli_out ("Usage: %s", usage);
         return 0;
 }
 
 int
-_cli_err (const char *fmt, ...)
-{
-        struct cli_state *state = NULL;
-        va_list           ap;
-        int               ret = 0;
-
-        state = global_state;
-
-        va_start (ap, fmt);
-
-#ifdef HAVE_READLINE
-        if (state->rl_enabled && !state->rl_processing)
-                return cli_rl_err(state, fmt, ap);
-#endif
-
-        ret = vfprintf (stderr, fmt, ap);
-        fprintf (stderr, "\n");
-        va_end (ap);
-
-        return ret;
-}
-
-
-int
-_cli_out (const char *fmt, ...)
+cli_out (const char *fmt, ...)
 {
         struct cli_state *state = NULL;
         va_list           ap;
@@ -506,46 +512,23 @@ cli_rpc_init (struct cli_state *state)
         if (!options)
                 goto out;
 
-        /* Connect using to glusterd using the specified method, giving
-         * preference to unix socket connection. If nothing is specified connect
-         * to the default glusterd socket
-         */
-        if (state->glusterd_sock) {
-                gf_log ("cli", GF_LOG_INFO, "Connecting to glusterd using "
-                        "sockfile %s", state->glusterd_sock);
-                ret = rpc_transport_unix_options_build (&options,
-                                                        state->glusterd_sock,
-                                                        0);
-                if (ret)
-                        goto out;
-        } else if (state->remote_host) {
-                gf_log ("cli", GF_LOG_INFO, "Connecting to remote glusterd at "
-                        "%s", state->remote_host);
-                ret = dict_set_str (options, "remote-host", state->remote_host);
-                if (ret)
-                        goto out;
+        ret = dict_set_str (options, "remote-host", state->remote_host);
+        if (ret)
+                goto out;
 
-                if (state->remote_port)
-                        port = state->remote_port;
+        if (state->remote_port)
+                port = state->remote_port;
 
-                ret = dict_set_int32 (options, "remote-port", port);
-                if (ret)
-                        goto out;
+        ret = dict_set_int32 (options, "remote-port", port);
+        if (ret)
+                goto out;
 
-                ret = dict_set_str (options, "transport.address-family",
-                                    "inet");
-                if (ret)
-                        goto out;
-        } else {
-                gf_log ("cli", GF_LOG_DEBUG, "Connecting to glusterd using "
-                        "default socket");
-                ret = rpc_transport_unix_options_build
-                        (&options, DEFAULT_GLUSTERD_SOCKFILE, 0);
-                if (ret)
-                        goto out;
-        }
+        ret = dict_set_str (options, "transport.address-family", "inet");
+        if (ret)
+                goto out;
+
+        rpc = rpc_clnt_new (options, this->ctx, this->name);
 
-        rpc = rpc_clnt_new (options, this->ctx, this->name, 16);
         if (!rpc)
                 goto out;
 
@@ -555,7 +538,7 @@ cli_rpc_init (struct cli_state *state)
                 goto out;
         }
 
-        ret = rpc_clnt_start (rpc);
+        rpc_clnt_start (rpc);
 out:
         if (ret) {
                 if (rpc)
@@ -579,15 +562,32 @@ void
 cli_local_wipe (cli_local_t *local)
 {
         if (local) {
-                GF_FREE (local->get_vol.volname);
-                if (local->dict)
-                        dict_unref (local->dict);
                 GF_FREE (local);
         }
 
         return;
 }
 
+void
+cli_path_strip_trailing_slashes (char *path)
+{
+        int i = 0;
+        int len = 0;
+
+        if (!path)
+                return;
+
+        len = strlen (path);
+        for (i = len - 1; i > 0 ; i--) {
+                if (path[i] != '/')
+                        break;
+
+        }
+
+        if (i < (len - 1))
+                path[i + 1] = '\0';
+}
+
 struct cli_state *global_state;
 
 int
@@ -597,19 +597,13 @@ main (int argc, char *argv[])
         int                ret = -1;
         glusterfs_ctx_t   *ctx = NULL;
 
-        ctx = glusterfs_ctx_new ();
-        if (!ctx)
-                return ENOMEM;
-
-#ifdef DEBUG
-        gf_mem_acct_enable_set (ctx);
-#endif
-
-        ret = glusterfs_globals_init (ctx);
+        ret = glusterfs_globals_init ();
         if (ret)
                 return ret;
 
-	THIS->ctx = ctx;
+        ctx = glusterfs_ctx_get ();
+        if (!ctx)
+                return ENOMEM;
 
         ret = glusterfs_ctx_defaults_init (ctx);
         if (ret)
@@ -626,7 +620,12 @@ main (int argc, char *argv[])
         if (ret)
                 goto out;
 
-        ret = logging_init (ctx, &state);
+        if (geteuid ()) {
+                printf ("Only super user can run this command\n");
+                return EPERM;
+        }
+
+        ret = logging_init (ctx);
         if (ret)
                 goto out;
 
@@ -653,14 +652,3 @@ out:
 
         return ret;
 }
-
-void
-cli_print_line (int len)
-{
-        GF_ASSERT (len > 0);
-
-        while (len--)
-                printf ("-");
-
-        printf ("\n");
-}
diff --git a/cli/src/cli.h b/cli/src/cli.h
index bc71ee2b4..2b599488b 100644
--- a/cli/src/cli.h
+++ b/cli/src/cli.h
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
+
 #ifndef __CLI_H__
 #define __CLI_H__
 
@@ -18,24 +28,12 @@
 #include "rpc-clnt.h"
 #include "glusterfs.h"
 #include "protocol-common.h"
-#include "logging.h"
-
-#include "cli1-xdr.h"
-
-#if (HAVE_LIB_XML)
-#include <libxml/encoding.h>
-#include <libxml/xmlwriter.h>
-#endif
 
 #define DEFAULT_EVENT_POOL_SIZE            16384
 #define CLI_GLUSTERD_PORT                  24007
 #define CLI_DEFAULT_CONN_TIMEOUT             120
 #define CLI_DEFAULT_CMD_TIMEOUT              120
-#define CLI_TEN_MINUTES_TIMEOUT              600 //Longer timeout for volume top
 #define DEFAULT_CLI_LOG_FILE_DIRECTORY     DATADIR "/log/glusterfs"
-#define CLI_VOL_STATUS_BRICK_LEN              55
-#define CLI_TAB_LENGTH                         8
-#define CLI_BRICK_STATUS_LINE_LEN             78
 
 enum argp_option_keys {
 	ARGP_DEBUG_KEY = 133,
@@ -44,16 +42,12 @@ enum argp_option_keys {
 
 #define GLUSTER_MODE_SCRIPT    (1 << 0)
 #define GLUSTER_MODE_ERR_FATAL (1 << 1)
-#define GLUSTER_MODE_XML       (1 << 2)
+
 struct cli_state;
 struct cli_cmd_word;
 struct cli_cmd_tree;
 struct cli_cmd;
 
-extern char *cli_vol_type_str[];
-extern char *cli_vol_status_str[];
-extern char *cli_vol_task_status_str[];
-
 typedef int (cli_cmd_cbk_t)(struct cli_state *state,
                             struct cli_cmd_word *word,
                             const char **words,
@@ -112,74 +106,51 @@ struct cli_state {
         int                   remote_port;
         int                   mode;
         int                   await_connected;
-
-        char                 *log_file;
-        gf_loglevel_t         log_level;
-
-        char                 *glusterd_sock;
 };
 
 struct cli_local {
-        struct {
-                char    *volname;
-                int     flags;
-        } get_vol;
-
-        dict_t          *dict;
-        const char      **words;
-        /* Marker for volume status all */
-        gf_boolean_t    all;
-#if (HAVE_LIB_XML)
-        xmlTextWriterPtr        writer;
-        xmlDocPtr               doc;
-        int                     vol_count;
-#endif
+        union {
+                struct {
+                        dict_t  *dict;
+                } create_vol;
+
+                struct {
+                        char    *volname;
+                        int     flags;
+                } start_vol;
+
+                struct {
+                        char    *volname;
+                        int     flags;
+                } stop_vol;
+
+                struct {
+                        char    *volname;
+                } delete_vol;
+
+                struct {
+                        char    *volname;
+                        int      cmd;
+                } defrag_vol;
+
+                struct {
+                        char    *volname;
+                        dict_t  *dict;
+                } replace_brick;
+
+                struct {
+                        char    *volname;
+                        int     flags;
+                } get_vol;
+        } u;
 };
 
-struct gf_cli_gsync_detailed_status_ {
-        char *node;
-        char *master;
-        char *slave;
-        char *health;
-        char *uptime;
-        char *files_syncd;
-        char *files_pending;
-        char *bytes_pending;
-        char *deletes_pending;
-};
-
-struct cli_volume_status {
-        int            port;
-        int            online;
-        uint64_t       block_size;
-        uint64_t       total_inodes;
-        uint64_t       free_inodes;
-        char          *brick;
-        char          *pid_str;
-        char          *free;
-        char          *total;
-#ifdef GF_LINUX_HOST_OS
-        char          *fs_name;
-        char          *mount_options;
-        char          *device;
-        char          *inode_size;
-#endif
-};
-
-typedef struct gf_cli_gsync_detailed_status_ gf_cli_gsync_status_t;
-
-typedef struct cli_volume_status cli_volume_status_t;
-
 typedef struct cli_local cli_local_t;
 
 typedef ssize_t (*cli_serialize_t) (struct iovec outmsg, void *args);
 
 extern struct cli_state *global_state; /* use only in readline callback */
 
-typedef const char *(*cli_selector_t) (void *wcon);
-
-void *cli_getunamb (const char *tok, void **choices, cli_selector_t sel);
-
 int cli_cmd_register (struct cli_cmd_tree *tree, struct cli_cmd *cmd);
 int cli_cmds_register (struct cli_state *state);
 
@@ -190,32 +161,16 @@ int cli_cmd_process_line (struct cli_state *state, const char *line);
 
 int cli_rl_enable (struct cli_state *state);
 int cli_rl_out (struct cli_state *state, const char *fmt, va_list ap);
-int cli_rl_err (struct cli_state *state, const char *fmt, va_list ap);
 
 int cli_usage_out (const char *usage);
-
-int _cli_out (const char *fmt, ...);
-int _cli_err (const char *fmt, ...);
-
-#define cli_out(fmt...) do {                       \
-                FMT_WARN (fmt);                    \
-                                                   \
-                _cli_out(fmt);                     \
-                                                   \
-        } while (0)
-
-#define cli_err(fmt...) do {                       \
-                FMT_WARN (fmt);                    \
-                                                   \
-                _cli_err(fmt);                     \
-                                                   \
-        } while (0)
+int cli_out (const char *fmt, ...);
 
 int
 cli_submit_request (void *req, call_frame_t *frame,
                     rpc_clnt_prog_t *prog,
                     int procnum, struct iobref *iobref,
-                    xlator_t *this, fop_cbk_fn_t cbkfn, xdrproc_t xdrproc);
+                    cli_serialize_t sfunc, xlator_t *this,
+                    fop_cbk_fn_t cbkfn);
 
 int32_t
 cli_cmd_volume_create_parse (const char **words, int wordcount,
@@ -232,7 +187,7 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **opt);
 
 int32_t
 cli_cmd_volume_set_parse (const char **words, int wordcount,
-                          dict_t **options, char **op_errstr);
+                          dict_t **options);
 
 int32_t
 cli_cmd_volume_add_brick_parse (const char **words, int wordcount,
@@ -240,7 +195,7 @@ cli_cmd_volume_add_brick_parse (const char **words, int wordcount,
 
 int32_t
 cli_cmd_volume_remove_brick_parse (const char **words, int wordcount,
-                                   dict_t **options, int *question);
+                                   dict_t **options);
 
 int32_t
 cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
@@ -253,13 +208,6 @@ cli_cmd_log_locate_parse (const char **words, int wordcount, dict_t **options);
 int32_t
 cli_cmd_log_filename_parse (const char **words, int wordcount, dict_t **options);
 
-int32_t
-cli_cmd_volume_statedump_options_parse (const char **words, int wordcount,
-                                        dict_t **options);
-int32_t
-cli_cmd_volume_clrlks_opts_parse (const char **words, int wordcount,
-                                  dict_t **options);
-
 cli_local_t * cli_local_get ();
 
 void
@@ -274,117 +222,12 @@ cli_cmd_broadcast_connected ();
 int
 cli_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
                 void *data);
-
+void
+cli_path_strip_trailing_slashes (char *path);
 int32_t
 cli_cmd_volume_profile_parse (const char **words, int wordcount,
                               dict_t **options);
 int32_t
 cli_cmd_volume_top_parse (const char **words, int wordcount,
                               dict_t **options);
-
-int32_t
-cli_cmd_log_level_parse (const char **words, int wordcount,
-                         dict_t **options);
-
-int32_t
-cli_cmd_volume_status_parse (const char **words, int wordcount,
-                             dict_t **options);
-
-int
-cli_cmd_volume_heal_options_parse (const char **words, int wordcount,
-                                   dict_t **options);
-
-int
-cli_cmd_volume_defrag_parse (const char **words, int wordcount,
-                             dict_t **options);
-
-int
-cli_print_brick_status (cli_volume_status_t *status);
-
-void
-cli_print_detailed_status (cli_volume_status_t *status);
-
-int
-cli_get_detail_status (dict_t *dict, int i, cli_volume_status_t *status);
-
-void
-cli_print_line (int len);
-
-int
-cli_xml_output_str (char *op, char *str, int op_ret, int op_errno,
-                    char *op_errstr);
-
-int
-cli_xml_output_dict (char *op, dict_t *dict, int op_ret, int op_errno,
-                     char *op_errstr);
-
-int
-cli_xml_output_vol_top (dict_t *dict, int op_ret, int op_errno,
-                        char *op_errstr);
-
-int
-cli_xml_output_vol_profile (dict_t *dict, int op_ret, int op_errno,
-                            char *op_errstr);
-
-int
-cli_xml_output_vol_status_begin (cli_local_t *local, int op_ret, int op_errno,
-                                 char *op_errstr);
-
-int
-cli_xml_output_vol_status_end (cli_local_t *local);
-
-int
-cli_xml_output_vol_status (cli_local_t *local, dict_t *dict);
-
-int
-cli_xml_output_vol_list (dict_t *dict, int op_ret, int op_errno,
-                         char *op_errstr);
-
-int
-cli_xml_output_vol_info_begin (cli_local_t *local, int op_ret, int op_errno,
-                               char *op_errstr);
-
-int
-cli_xml_output_vol_info_end (cli_local_t *local);
-
-int
-cli_xml_output_vol_info (cli_local_t *local, dict_t *dict);
-
-int
-cli_xml_output_vol_quota_limit_list (char *volname, char *limit_list,
-                                      int op_ret, int op_errno,
-                                      char *op_errstr);
-
-int
-cli_xml_output_peer_status (dict_t *dict, int op_ret, int op_errno,
-                            char *op_errstr);
-
-int
-cli_xml_output_vol_rebalance (gf_cli_defrag_type op, dict_t *dict, int op_ret,
-                              int op_errno, char *op_errstr);
-
-int
-cli_xml_output_vol_remove_brick (gf_boolean_t status_op, dict_t *dict,
-                                 int op_ret, int op_errno, char *op_errstr);
-
-int
-cli_xml_output_vol_replace_brick (gf1_cli_replace_op op, dict_t *dict,
-                                  int op_ret, int op_errno, char *op_errstr);
-
-int
-cli_xml_output_vol_create (dict_t *dict, int op_ret, int op_errno,
-                           char *op_errstr);
-
-int
-cli_xml_output_generic_volume (char *op, dict_t *dict, int op_ret, int op_errno,
-                               char *op_errstr);
-
-int
-cli_xml_output_vol_gsync (dict_t *dict, int op_ret, int op_errno,
-                          char *op_errstr);
-int
-cli_xml_output_vol_status_tasks_detail (cli_local_t *local, dict_t *dict);
-
-char *
-is_server_debug_xlator (void *myframe);
 #endif /* __CLI_H__ */
diff --git a/cli/src/input.c b/cli/src/input.c
index a8ea46c6d..a88d35874 100644
--- a/cli/src/input.c
+++ b/cli/src/input.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -34,7 +44,7 @@ cli_batch (void *d)
         ret = cli_cmd_process (state, state->argc, state->argv);
 
         gf_log ("", GF_LOG_INFO, "Exiting with: %d", ret);
-        exit (-ret);
+        exit (ret);
 
         return NULL;
 }
@@ -61,11 +71,11 @@ cli_input (void *d)
                 if (len > 0 && cmd[len - 1] == '\n') //strip trailing \n
                         cmd[len - 1] = '\0';
                 ret = cli_cmd_process_line (state, cmd);
-                if (ret != 0 && state->mode & GLUSTER_MODE_ERR_FATAL)
+                if (ret == -1 && state->mode & GLUSTER_MODE_ERR_FATAL)
                         break;
         }
 
-        exit (-ret);
+        exit (ret);
 
         return NULL;
 }
diff --git a/cli/src/registry.c b/cli/src/registry.c
index c4abe3be0..ea6afef3c 100644
--- a/cli/src/registry.c
+++ b/cli/src/registry.c
@@ -1,13 +1,23 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
+
 #ifndef _CONFIG_H
 #define _CONFIG_H
 #include "config.h"
@@ -250,49 +260,29 @@ err:
         return NULL;
 }
 
-void *
-cli_getunamb (const char *tok, void **choices, cli_selector_t sel)
+
+struct cli_cmd_word *
+cli_cmd_nextword (struct cli_cmd_word *word, const char *token)
 {
-        void  **wcon = NULL;
-        char      *w = NULL;
-        unsigned  mn = 0;
-        void    *ret = NULL;
+        struct cli_cmd_word    *next = NULL;
+        struct cli_cmd_word   **trav = NULL;
+        int                     ret = 0;
 
-        if (!choices || !tok || !*tok)
+        if (!word->nextwords)
                 return NULL;
 
-        for (wcon = choices; *wcon; wcon++) {
-                w = strtail ((char *)sel (*wcon), tok);
-                if (!w)
-                        /* no match */
-                        continue;
-                if (!*w)
-                        /* exact match */
-                        return *wcon;
+        for (trav = word->nextwords; (next = *trav); trav++) {
+                if (next->match) {
+//                        ret = next->match ();
+                } else {
+                        ret = strcmp (next->word, token);
+                }
 
-                ret = *wcon;
-                mn++;
+                if (ret == 0)
+                        break;
         }
 
-#ifdef FORCE_MATCH_EXACT
-        return NULL;
-#else
-        return (mn == 1) ? ret : NULL;
-#endif
-}
-
-static const char *
-sel_cmd_word (void *wcon)
-{
-        return ((struct cli_cmd_word *)wcon)->word;
-}
-
-struct cli_cmd_word *
-cli_cmd_nextword (struct cli_cmd_word *word, const char *token)
-{
-        return (struct cli_cmd_word *)cli_getunamb (token,
-                                                    (void **)word->nextwords,
-                                                    sel_cmd_word);
+        return next;
 }
 
 
@@ -377,7 +367,7 @@ cli_cmd_register (struct cli_cmd_tree *tree, struct cli_cmd *cmd)
         char **tokens = NULL;
         int    ret = 0;
 
-        GF_ASSERT (cmd);
+        GF_ASSERT (cmd)
 
         if (cmd->reg_cbk)
                 cmd->reg_cbk (cmd);
diff --git a/configure.ac b/configure.ac
index b3d1ed184..85296ee23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,20 @@
-dnl  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
-dnl  This file is part of GlusterFS.
+dnl Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+dnl This file is part of GlusterFS.
 dnl
-dnl  This file is licensed to you under your choice of the GNU Lesser
-dnl  General Public License, version 3 or any later version (LGPLv3 or
-dnl  later), or the GNU General Public License, version 2 (GPLv2), in all
-dnl  cases as published by the Free Software Foundation.
+dnl GlusterFS is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl GlusterFS is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([glusterfs],[3git],[gluster-users@gluster.org],,[https://github.com/gluster/glusterfs.git])
+AC_INIT([glusterfs],[3.2git],[gluster-users@gluster.org])
 
 AM_INIT_AUTOMAKE
 
@@ -24,15 +32,13 @@ if libtool --help 2>&1 | grep -q quiet; then
    AM_LIBTOOLFLAGS="--quiet";
 fi
 
-AC_CONFIG_HEADERS([config.h])
+AM_CONFIG_HEADER([config.h])
 
 AC_CONFIG_FILES([Makefile
-                libglusterfs/Makefile
-                libglusterfs/src/Makefile
-                geo-replication/src/peer_gsec_create
-                geo-replication/src/peer_add_secret_pub
-                glusterfsd/Makefile
-                glusterfsd/src/Makefile
+		libglusterfs/Makefile
+		libglusterfs/src/Makefile
+		glusterfsd/Makefile
+		glusterfsd/src/Makefile
                 rpc/Makefile
                 rpc/rpc-lib/Makefile
                 rpc/rpc-lib/src/Makefile
@@ -43,162 +49,111 @@ AC_CONFIG_FILES([Makefile
                 rpc/rpc-transport/rdma/src/Makefile
                 rpc/xdr/Makefile
                 rpc/xdr/src/Makefile
-                xlators/Makefile
-                xlators/mount/Makefile
-                xlators/mount/fuse/Makefile
-                xlators/mount/fuse/src/Makefile
-                xlators/mount/fuse/utils/mount.glusterfs
-                xlators/mount/fuse/utils/mount_glusterfs
-                xlators/mount/fuse/utils/Makefile
-                xlators/storage/Makefile
-                xlators/storage/posix/Makefile
-                xlators/storage/posix/src/Makefile
-                xlators/storage/bd/Makefile
-                xlators/storage/bd/src/Makefile
-                xlators/cluster/Makefile
-                xlators/cluster/afr/Makefile
-                xlators/cluster/afr/src/Makefile
-                xlators/cluster/stripe/Makefile
-                xlators/cluster/stripe/src/Makefile
-                xlators/cluster/dht/Makefile
-                xlators/cluster/dht/src/Makefile
-                xlators/performance/Makefile
-                xlators/performance/write-behind/Makefile
-                xlators/performance/write-behind/src/Makefile
-                xlators/performance/read-ahead/Makefile
-                xlators/performance/read-ahead/src/Makefile
-                xlators/performance/readdir-ahead/Makefile
-                xlators/performance/readdir-ahead/src/Makefile
-                xlators/performance/io-threads/Makefile
-                xlators/performance/io-threads/src/Makefile
-                xlators/performance/io-cache/Makefile
-                xlators/performance/io-cache/src/Makefile
-                xlators/performance/symlink-cache/Makefile
-                xlators/performance/symlink-cache/src/Makefile
-                xlators/performance/quick-read/Makefile
-                xlators/performance/quick-read/src/Makefile
-                xlators/performance/open-behind/Makefile
-                xlators/performance/open-behind/src/Makefile
-                xlators/performance/md-cache/Makefile
-                xlators/performance/md-cache/src/Makefile
-                xlators/debug/Makefile
-                xlators/debug/trace/Makefile
-                xlators/debug/trace/src/Makefile
-                xlators/debug/error-gen/Makefile
-                xlators/debug/error-gen/src/Makefile
-                xlators/debug/io-stats/Makefile
-                xlators/debug/io-stats/src/Makefile
-                xlators/protocol/Makefile
-                xlators/protocol/auth/Makefile
-                xlators/protocol/auth/addr/Makefile
-                xlators/protocol/auth/addr/src/Makefile
-                xlators/protocol/auth/login/Makefile
-                xlators/protocol/auth/login/src/Makefile
-                xlators/protocol/client/Makefile
-                xlators/protocol/client/src/Makefile
-                xlators/protocol/server/Makefile
-                xlators/protocol/server/src/Makefile
-                xlators/features/Makefile
-		xlators/features/changelog/Makefile
-		xlators/features/changelog/src/Makefile
-		xlators/features/changelog/lib/Makefile
-		xlators/features/changelog/lib/src/Makefile
-                xlators/features/glupy/Makefile
-                xlators/features/glupy/src/Makefile
-                xlators/features/locks/Makefile
-                xlators/features/locks/src/Makefile
-                xlators/features/quota/Makefile
-                xlators/features/quota/src/Makefile
+		xlators/Makefile
+		xlators/mount/Makefile
+		xlators/mount/fuse/Makefile
+		xlators/mount/fuse/src/Makefile
+		xlators/mount/fuse/utils/mount.glusterfs
+		xlators/mount/fuse/utils/mount_glusterfs
+		xlators/mount/fuse/utils/Makefile
+		xlators/storage/Makefile
+		xlators/storage/posix/Makefile
+		xlators/storage/posix/src/Makefile
+		xlators/cluster/Makefile
+		xlators/cluster/afr/Makefile
+		xlators/cluster/afr/src/Makefile
+		xlators/cluster/stripe/Makefile
+		xlators/cluster/stripe/src/Makefile
+		xlators/cluster/dht/Makefile
+		xlators/cluster/dht/src/Makefile
+		xlators/performance/Makefile
+		xlators/performance/write-behind/Makefile
+		xlators/performance/write-behind/src/Makefile
+		xlators/performance/read-ahead/Makefile
+		xlators/performance/read-ahead/src/Makefile
+		xlators/performance/io-threads/Makefile
+		xlators/performance/io-threads/src/Makefile
+		xlators/performance/io-cache/Makefile
+		xlators/performance/io-cache/src/Makefile
+		xlators/performance/symlink-cache/Makefile
+		xlators/performance/symlink-cache/src/Makefile
+		xlators/performance/quick-read/Makefile
+		xlators/performance/quick-read/src/Makefile
+                xlators/performance/stat-prefetch/Makefile
+                xlators/performance/stat-prefetch/src/Makefile
+		xlators/debug/Makefile
+		xlators/debug/trace/Makefile
+		xlators/debug/trace/src/Makefile
+		xlators/debug/error-gen/Makefile
+		xlators/debug/error-gen/src/Makefile
+		xlators/debug/io-stats/Makefile
+		xlators/debug/io-stats/src/Makefile
+		xlators/protocol/Makefile
+		xlators/protocol/auth/Makefile
+		xlators/protocol/auth/addr/Makefile
+		xlators/protocol/auth/addr/src/Makefile
+		xlators/protocol/auth/login/Makefile
+		xlators/protocol/auth/login/src/Makefile
+		xlators/protocol/client/Makefile
+		xlators/protocol/client/src/Makefile
+		xlators/protocol/server/Makefile
+		xlators/protocol/server/src/Makefile
+		xlators/features/Makefile
+		xlators/features/locks/Makefile
+		xlators/features/locks/src/Makefile
+		xlators/features/trash/Makefile
+		xlators/features/trash/src/Makefile
+		xlators/features/quota/Makefile
+		xlators/features/quota/src/Makefile
                 xlators/features/marker/Makefile
                 xlators/features/marker/src/Makefile
-                xlators/features/read-only/Makefile
-                xlators/features/read-only/src/Makefile
-                xlators/features/compress/Makefile
-                xlators/features/compress/src/Makefile
-                xlators/features/mac-compat/Makefile
-                xlators/features/mac-compat/src/Makefile
-                xlators/features/quiesce/Makefile
-                xlators/features/quiesce/src/Makefile
-                xlators/features/index/Makefile
-                xlators/features/index/src/Makefile
-                xlators/features/protect/Makefile
-                xlators/features/protect/src/Makefile
-                xlators/features/gfid-access/Makefile
-                xlators/features/gfid-access/src/Makefile
-                xlators/playground/Makefile
-                xlators/playground/template/Makefile
-                xlators/playground/template/src/Makefile
-                xlators/encryption/Makefile
-                xlators/encryption/rot-13/Makefile
-                xlators/encryption/rot-13/src/Makefile
-                xlators/encryption/crypt/Makefile
-                xlators/encryption/crypt/src/Makefile
-		xlators/features/qemu-block/Makefile
-		xlators/features/qemu-block/src/Makefile
+                xlators/features/marker/utils/Makefile
+                xlators/features/marker/utils/gsyncd
+                xlators/features/marker/utils/syncdaemon/Makefile
+		xlators/features/read-only/Makefile
+		xlators/features/read-only/src/Makefile
+		xlators/features/mac-compat/Makefile
+		xlators/features/mac-compat/src/Makefile
+		xlators/features/quiesce/Makefile
+		xlators/features/quiesce/src/Makefile
+		xlators/encryption/Makefile
+		xlators/encryption/rot-13/Makefile
+		xlators/encryption/rot-13/src/Makefile
                 xlators/system/Makefile
                 xlators/system/posix-acl/Makefile
                 xlators/system/posix-acl/src/Makefile
+                cli/Makefile
+                cli/src/Makefile
+		doc/Makefile
+		doc/examples/Makefile
+		doc/hacker-guide/Makefile
+		extras/Makefile
+		extras/init.d/Makefile
+		extras/init.d/glusterd.plist
+                extras/init.d/glusterd-Debian
+                extras/init.d/glusterd-Redhat
+                extras/init.d/glusterd-SuSE
+		extras/benchmarking/Makefile
+		contrib/fuse-util/Makefile
                 xlators/nfs/Makefile
                 xlators/nfs/server/Makefile
                 xlators/nfs/server/src/Makefile
                 xlators/mgmt/Makefile
                 xlators/mgmt/glusterd/Makefile
                 xlators/mgmt/glusterd/src/Makefile
-                cli/Makefile
-                cli/src/Makefile
-                doc/Makefile
-                extras/Makefile
-                extras/init.d/Makefile
-                extras/init.d/glusterd.plist
-                extras/init.d/glusterd-Debian
-                extras/init.d/glusterd-Redhat
-                extras/init.d/glusterd-SuSE
-                extras/systemd/Makefile
-                extras/systemd/glusterd.service
-                extras/benchmarking/Makefile
-                extras/hook-scripts/Makefile
-                extras/ocf/Makefile
-                extras/ocf/glusterd
-                extras/ocf/volume
-                extras/LinuxRPM/Makefile
-                extras/geo-rep/Makefile
-                contrib/fuse-util/Makefile
-                contrib/uuid/uuid_types.h
-                glusterfs-api.pc
-                libgfchangelog.pc
-                api/Makefile
-                api/src/Makefile
-                api/examples/Makefile
-                api/examples/setup.py
-		geo-replication/Makefile
-		geo-replication/src/Makefile
-		geo-replication/syncdaemon/Makefile
-                glusterfs.spec])
+		glusterfs.spec])
 
 AC_CANONICAL_HOST
 
 AC_PROG_CC
-AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-AC_ARG_WITH(pkgconfigdir,
-            [  --with-pkgconfigdir=DIR      pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@],
-            [pkgconfigdir=$withval],
-            [pkgconfigdir='${libdir}/pkgconfig'])
-AC_SUBST(pkgconfigdir)
-
 AC_ARG_WITH(mountutildir,
             [  --with-mountutildir=DIR mount helper utility in DIR @<:@/sbin@:>@],
             [mountutildir=$withval],
             [mountutildir='/sbin'])
 AC_SUBST(mountutildir)
 
-AC_ARG_WITH(systemddir,
-            [  --with-systemddir=DIR systemd service files in DIR @<:@/usr/lib/systemd/system@:>@],
-            [systemddir=$withval],
-            [systemddir='/usr/lib/systemd/system'])
-AC_SUBST(systemddir)
-
 AC_ARG_WITH(initdir,
             [  --with-initdir=DIR init.d scripts in DIR @<:@/etc/init.d@:>@],
             [initdir=$withval],
@@ -211,35 +166,12 @@ AC_ARG_WITH(launchddir,
             [launchddir='/Library/LaunchDaemons'])
 AC_SUBST(launchddir)
 
-AC_ARG_WITH([ocf],
-            [AS_HELP_STRING([--without-ocf], [build OCF-compliant cluster resource agents])],
-            ,
-            [OCF_SUBDIR='ocf'],
-            )
-AC_SUBST(OCF_SUBDIR)
-
 # LEX needs a check
 AC_PROG_LEX
 if test  "x${LEX}" != "xflex" -a "x${FLEX}" != "xlex"; then
    AC_MSG_ERROR([Flex or lex required to build glusterfs.])
 fi
 
-dnl
-dnl Word sizes...
-dnl
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-SIZEOF_SHORT=$ac_cv_sizeof_short
-SIZEOF_INT=$ac_cv_sizeof_int
-SIZEOF_LONG=$ac_cv_sizeof_long
-SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
-AC_SUBST(SIZEOF_SHORT)
-AC_SUBST(SIZEOF_INT)
-AC_SUBST(SIZEOF_LONG)
-AC_SUBST(SIZEOF_LONG_LONG)
-
 # YACC needs a check
 AC_PROG_YACC
 if test "x${YACC}" = "xbyacc" -o "x${YACC}" = "xyacc" -o "x${YACC}" = "x"; then
@@ -248,10 +180,8 @@ fi
 
 AC_CHECK_TOOL([LD],[ld])
 
-AC_CHECK_LIB([crypto], [MD5], , AC_MSG_ERROR([OpenSSL crypto library is required to build glusterfs]))
-
 AC_CHECK_LIB([pthread], [pthread_mutex_init], , AC_MSG_ERROR([Posix threads library is required to build glusterfs]))
-
+		 
 AC_CHECK_FUNC([dlopen], [has_dlopen=yes], AC_CHECK_LIB([dl], [dlopen], , AC_MSG_ERROR([Dynamic linking library required to build glusterfs])))
 
 
@@ -259,10 +189,6 @@ AC_CHECK_HEADERS([sys/xattr.h])
 
 AC_CHECK_HEADERS([sys/extattr.h])
 
-AC_CHECK_HEADERS([openssl/md5.h])
-
-AC_CHECK_HEADERS([linux/falloc.h])
-
 case $host_os in
   darwin*)
     if ! test "`/usr/bin/sw_vers | grep ProductVersion: | cut -f 2 | cut -d. -f2`" -ge 5; then
@@ -296,8 +222,8 @@ fi
 
 # FUSE section
 AC_ARG_ENABLE([fuse-client],
-              AC_HELP_STRING([--disable-fuse-client],
-                             [Do not build the fuse client. NOTE: you cannot mount glusterfs without the client]))
+	      AC_HELP_STRING([--disable-fuse-client],
+			     [Do not build the fuse client. NOTE: you cannot mount glusterfs without the client]))
 
 BUILD_FUSE_CLIENT=no
 if test "x$enable_fuse_client" != "xno"; then
@@ -305,153 +231,60 @@ if test "x$enable_fuse_client" != "xno"; then
    BUILD_FUSE_CLIENT="yes"
 fi
 
-AC_ARG_ENABLE([bd-xlator],
-              AC_HELP_STRING([--enable-bd-xlator], [Build BD xlator]))
-
-if test "x$enable_bd_xlator" != "xno"; then
-  AC_CHECK_LIB([lvm2app],
-               [lvm_init,lvm_lv_from_name],
-               [HAVE_BD_LIB="yes"],
-               [HAVE_BD_LIB="no"])
-
-if test "x$HAVE_BD_LIB" = "xyes"; then
-    # lvm_lv_from_name() has been made public with lvm2-2.02.79
-    AC_CHECK_DECLS(
-                  [lvm_lv_from_name],
-                  [NEED_LVM_LV_FROM_NAME_DECL="no"],
-                  [NEED_LVM_LV_FROM_NAME_DECL="yes"],
-                  [[#include <lvm2app.h>]])
-  fi
-fi
-
-if test "x$enable_bd_xlator" = "xyes" -a "x$HAVE_BD_LIB" = "xno"; then
-   echo "BD xlator requested but required lvm2 development library not found."
-   exit 1
-fi
-
-BUILD_BD_XLATOR=no
-if test "x${enable-bd-xlator}" != "xno" -a "x${HAVE_BD_LIB}" = "xyes"; then
-  BUILD_BD_XLATOR=yes
-  AC_DEFINE(HAVE_BD_XLATOR, 1, [define if lvm2app library found and bd xlator
-                            enabled])
-  if test "x$NEED_LVM_LV_FROM_NAME_DECL" = "xyes"; then
-    AC_DEFINE(NEED_LVM_LV_FROM_NAME_DECL, 1, [defined if lvm_lv_from_name()
-                  was not found in the lvm2app.h header, but can be linked])
-  fi
-fi
-
-AM_CONDITIONAL([ENABLE_BD_XLATOR], [test x$BUILD_BD_XLATOR = xyes])
-
-# start encryption/crypt section
-
-AC_CHECK_HEADERS([openssl/cmac.h], [have_cmac_h=yes], [have_cmac_h=no])
-
-AC_ARG_ENABLE([crypt-xlator],
-	AC_HELP_STRING([--enable-crypt-xlator], [Build crypt encryption xlator]))
-
-if test "x$enable_crypt_xlator" = "xyes" -a "x$have_cmac_h" = "xno"; then
-   echo "Encryption xlator requires OpenSSL with cmac.h"
-   exit 1
-fi
-
-BUILD_CRYPT_XLATOR=no
-if test "x$enable_crypt_xlator" != "xno" -a "x$have_cmac_h" = "xyes"; then
-   BUILD_CRYPT_XLATOR=yes
-   AC_DEFINE(HAVE_CRYPT_XLATOR, 1, [enable building crypt encryption xlator])
-fi
-
-AM_CONDITIONAL([ENABLE_CRYPT_XLATOR], [test x$BUILD_CRYPT_XLATOR = xyes])
-
 AC_SUBST(FUSE_CLIENT_SUBDIR)
 # end FUSE section
 
 
 # FUSERMOUNT section
 AC_ARG_ENABLE([fusermount],
-              AC_HELP_STRING([--disable-fusermount],
-                             [Use system's fusermount]))
+              AC_HELP_STRING([--enable-fusermount],
+                             [Build fusermount]))
 
-BUILD_FUSERMOUNT="yes"
-if test "x$enable_fusermount" = "xno"; then
-  BUILD_FUSERMOUNT="no"
-else
-  AC_DEFINE(GF_FUSERMOUNT, 1, [Use our own fusermount])
+BUILD_FUSERMOUNT="no"
+if test "x$enable_fusermount" = "xyes"; then
   FUSERMOUNT_SUBDIR="contrib/fuse-util"
+  BUILD_FUSERMOUNT="yes"
+  AC_DEFINE(GF_FUSERMOUNT, 1, [Use our own fusermount])
 fi
 
 AC_SUBST(FUSERMOUNT_SUBDIR)
 #end FUSERMOUNT section
 
-# QEMU_BLOCK section
-
-AC_ARG_ENABLE([qemu-block],
-                AC_HELP_STRING([--enable-qemu-block],
-                        [Build QEMU Block formats translator]))
-
-if test "x$enable_qemu_block" != "xno"; then
-  PKG_CHECK_MODULES([GLIB], [glib-2.0],
-                    [HAVE_GLIB_2="yes"],
-  		    [HAVE_GLIB_2="no"])
-fi
-
-if test "x$enable_qemu_block" = "xyes" -a "x$HAVE_GLIB_2" = "xno"; then
-   echo "QEMU Block formats translator requires libglib-2.0, but missing."
-   exit 1
-fi
-
-BUILD_QEMU_BLOCK=no
-if test "x${enable_qemu_block}" != "xno" -a "x${HAVE_GLIB_2}" = "xyes"; then
-  BUILD_QEMU_BLOCK=yes
-  AC_DEFINE(HAVE_QEMU_BLOCK, 1, [define if libglib-2.0 library found and QEMU
-                  	     Block translator enabled])
-fi
-
-AM_CONDITIONAL([ENABLE_QEMU_BLOCK], [test x$BUILD_QEMU_BLOCK = xyes])
-
-# end QEMU_BLOCK section
 
 # EPOLL section
 AC_ARG_ENABLE([epoll],
-              AC_HELP_STRING([--disable-epoll],
-                             [Use poll instead of epoll.]))
+	      AC_HELP_STRING([--disable-epoll],
+			     [Use poll instead of epoll.]))
 
 BUILD_EPOLL=no
 if test "x$enable_epoll" != "xno"; then
    AC_CHECK_HEADERS([sys/epoll.h],
                     [BUILD_EPOLL=yes],
-                    [BUILD_EPOLL=no])
+		    [BUILD_EPOLL=no])
 fi
 # end EPOLL section
 
 
 # IBVERBS section
 AC_ARG_ENABLE([ibverbs],
-              AC_HELP_STRING([--disable-ibverbs],
-                             [Do not build the ibverbs transport]))
+	      AC_HELP_STRING([--disable-ibverbs],
+			     [Do not build the ibverbs transport]))
 
 if test "x$enable_ibverbs" != "xno"; then
   AC_CHECK_LIB([ibverbs],
                [ibv_get_device_list],
-               [HAVE_LIBIBVERBS="yes"],
-               [HAVE_LIBIBVERBS="no"])
-  AC_CHECK_LIB([rdmacm], [rdma_create_id], [HAVE_RDMACM="yes"], [HAVE_RDMACM="no"])
+	       [HAVE_LIBIBVERBS="yes"],
+	       [HAVE_LIBIBVERBS="no"])
 fi
 
-if test "x$enable_ibverbs" = "xyes"; then
-   if test "x$HAVE_LIBIBVERBS" = "xno"; then
-      echo "ibverbs-transport requested, but libibverbs is not present."
-      exit 1
-   fi
-
-   if test "x$HAVE_RDMACM" = "xno"; then
-      echo "ibverbs-transport requested, but librdmacm is not present."
-      exit 1
-   fi
+if test "x$enable_ibverbs" = "xyes" -a "x$HAVE_LIBIBVERBS" = "xno"; then
+   echo "ibverbs requested but not found."
+   exit 1
 fi
 
 BUILD_RDMA=no
 BUILD_IBVERBS=no
-if test "x$enable_ibverbs" != "xno" -a "x$HAVE_LIBIBVERBS" = "xyes" -a "x$HAVE_RDMACM" = "xyes"; then
+if test "x$enable_ibverbs" != "xno" -a "x$HAVE_LIBIBVERBS" = "xyes"; then
   IBVERBS_SUBDIR=ib-verbs
   BUILD_IBVERBS=yes
   RDMA_SUBDIR=rdma
@@ -465,25 +298,22 @@ AC_SUBST(RDMA_SUBDIR)
 
 # SYNCDAEMON section
 AC_ARG_ENABLE([georeplication],
-              AC_HELP_STRING([--disable-georeplication],
-                             [Do not install georeplication components]))
+	      AC_HELP_STRING([--disable-georeplication],
+			     [Do not install georeplication components]))
 
 BUILD_SYNCDAEMON=no
 case $host_os in
      linux*)
 #do nothing
        ;;
-     netbsd*)
-#do nothing
-       ;;
      *)
 #disabling geo replication for non-linux platforms
-        enable_georeplication=no
+	enable_georeplication=no
         ;;
 esac
 SYNCDAEMON_COMPILE=0
 if test "x$enable_georeplication" != "xno"; then
-  SYNCDAEMON_SUBDIR=geo-replication
+  SYNCDAEMON_SUBDIR=utils
   SYNCDAEMON_COMPILE=1
 
   BUILD_SYNCDAEMON="yes"
@@ -507,67 +337,15 @@ AC_SUBST(SYNCDAEMON_COMPILE)
 AC_SUBST(SYNCDAEMON_SUBDIR)
 # end SYNCDAEMON section
 
-# CDC xlator - check if libz is present if so enable HAVE_LIB_Z
-echo -n "checking if libz is present... "
+#check if libxml is present if so enable HAVE_LIB_XML
+echo -n "checking if libxml2 is present... "
 
-PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0],
-                  [echo "yes (features requiring zlib enabled)"  AC_DEFINE(HAVE_LIB_Z, 1, [define if zlib is present])],
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.19],
+                  [echo "yes (features requiring libxml2 enabled)"  AC_DEFINE(HAVE_LIB_XML, 1, [define if libxml2 is present])],
                   [echo "no"] )
 
-AC_SUBST(LIBZ_CFLAGS)
-AC_SUBST(LIBZ_LIBS)
-# end CDC xlator secion
-
-# check for systemtap/dtrace
-BUILD_SYSTEMTAP=no
-AC_MSG_CHECKING([whether to include systemtap tracing support])
-AC_ARG_ENABLE([systemtap],
-              [AS_HELP_STRING([--enable-systemtap],
-              [Enable inclusion of systemtap trace support])],
-              [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP="def"])
-
-AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test "x${ENABLE_SYSTEMTAP}" = "xyes"])
-AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
-
-if test "x${ENABLE_SYSTEMTAP}" != "xno"; then
-    AC_CHECK_PROG(DTRACE, dtrace, "yes", "no")
-    AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND="yes"],
-                    [SDT_H_FOUND="no"])
-fi
-
-if test "x${ENABLE_SYSTEMTAP}" = "xyes"; then
-    if test "x${DTRACE}" = "xno"; then
-        AC_MSG_ERROR([dtrace not found])
-    elif test "$x{SDT_H_FOUND}" = "xno"; then
-        AC_MSG_ERROR([systemtap support needs sys/sdt.h header])
-    fi
-fi
-
-if test "x${DTRACE}" = "xyes" -a "x${SDT_H_FOUND}" = "xyes"; then
-    AC_MSG_CHECKING([x"${DTRACE}"xy"${SDT_H_FOUND}"y])
-    AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using  probes.])
-    BUILD_SYSTEMTAP=yes
-fi
-# end of systemtap/dtrace
-
-# xml-output
-AC_ARG_ENABLE([xml-output],
-              AC_HELP_STRING([--disable-xml-output],
-                             [Disable the xml output]))
-BUILD_XML_OUTPUT="yes"
-if test "x$enable_xml_output" != "xno"; then
-    #check if libxml is present if so enable HAVE_LIB_XML
-    m4_ifdef([AM_PATH_XML2],[AM_PATH_XML2([2.6.19])], [no_xml=yes])
-    if test "x${no_xml}" = "x"; then
-        AC_DEFINE([HAVE_LIB_XML], [1], [Define to 1 if using libxml2.])
-    else
-        AC_MSG_WARN([libxml2 devel libraries not found disabling XML support])
-        BUILD_XML_OUTPUT="no"
-    fi
-else
-    BUILD_XML_OUTPUT="no"
-fi
-# end of xml-output
+AC_SUBST(LIBXML2_CFLAGS)
+AC_SUBST(LIBXML2_LIBS)
 
 dnl FreeBSD > 5 has execinfo as a Ported library for giving a workaround
 dnl solution to GCC backtrace functionality
@@ -592,26 +370,12 @@ dnl Linux, Solaris, Cygwin
 AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec])
 dnl FreeBSD, NetBSD
 AC_CHECK_MEMBERS([struct stat.st_atimespec.tv_nsec])
-case $host_os in
-        *netbsd*)
-        CFLAGS+=" -D_INCOMPLETE_XOPEN_C063"
-        ;;
-esac
-AC_CHECK_FUNC([linkat], [have_linkat=yes])
-if test "x${have_linkat}" = "xyes"; then
-   AC_DEFINE(HAVE_LINKAT, 1, [define if found linkat])
-fi
-AC_SUBST(HAVE_LINKAT)
-
-dnl check for Monotonic clock
-AC_CHECK_FUNC([clock_gettime], [has_monotonic_clock=yes], AC_CHECK_LIB([rt], [clock_gettime], , AC_MSG_WARN([System doesn't have monotonic clock using contrib])))
 
 dnl Check for argp
 AC_CHECK_HEADER([argp.h], AC_DEFINE(HAVE_ARGP, 1, [have argp]))
 AC_CONFIG_SUBDIRS(argp-standalone)
-
 BUILD_ARGP_STANDALONE=no
-if test "x${ac_cv_header_argp_h}" = "xno"; then
+if test "x${ac_cv_header_argp_h}" = "xno"; then 
    BUILD_ARGP_STANDALONE=yes
    ARGP_STANDALONE_CPPFLAGS='-I${top_srcdir}/argp-standalone'
    ARGP_STANDALONE_LDADD='${top_builddir}/argp-standalone/libargp.a'
@@ -632,18 +396,7 @@ if test "x${have_fdatasync}" = "xyes"; then
    AC_DEFINE(HAVE_FDATASYNC, 1, [define if fdatasync exists])
 fi
 
-AC_CHECK_FUNC([fallocate], [have_fallocate=yes])
-if test "x${have_fallocate}" = "xyes"; then
-   AC_DEFINE(HAVE_FALLOCATE, 1, [define if fallocate exists])
-fi
-
-AC_CHECK_FUNC([posix_fallocate], [have_posix_fallocate=yes])
-if test "x${have_posix_fallocate}" = "xyes"; then
-   AC_DEFINE(HAVE_POSIX_FALLOCATE, 1, [define if posix_fallocate exists])
-fi
-
-
-# Check the distribution where you are compiling glusterfs on
+# Check the distribution where you are compiling glusterfs on 
 
 GF_DISTRIBUTION=
 AC_CHECK_FILE([/etc/debian_version])
@@ -665,115 +418,46 @@ AC_SUBST(GF_DISTRIBUTION)
 GF_HOST_OS=""
 GF_LDFLAGS="-rdynamic"
 
-# check for gcc -Werror=format-security
-saved_CFLAGS=$CFLAGS
-CFLAGS="-Wformat -Werror=format-security"
-AC_MSG_CHECKING([whether $CC accepts -Werror=format-security])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [cc_werror_format_security=yes], [cc_werror_format_security=no])
-echo $cc_werror_format_security
-if test "x$cc_werror_format_security" = "xno"; then
-    CFLAGS="$saved_CFLAGS"
-else
-    CFLAGS="$saved_CFLAGS $CFLAGS"
-fi
-
-# check for gcc -Werror=implicit-function-declaration
-saved_CFLAGS=$CFLAGS
-CFLAGS="-Werror=implicit-function-declaration"
-AC_MSG_CHECKING([whether $CC accepts -Werror=implicit-function-declaration])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [cc_werror_implicit=yes], [cc_werror_implicit=no])
-echo $cc_werror_implicit
-if test "x$cc_werror_implicit" = "xno"; then
-    CFLAGS="$saved_CFLAGS"
-else
-    CFLAGS="$saved_CFLAGS $CFLAGS"
-fi
-
+GF_FUSE_LDADD="-lfuse"
 case $host_os in
      linux*)
+     dnl	GF_LINUX_HOST_OS=1
         GF_HOST_OS="GF_LINUX_HOST_OS"
-        GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0"
-        GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
-        GF_LDADD="${ARGP_STANDALONE_LDADD}"
-        GF_FUSE_CFLAGS="-DFUSERMOUNT_DIR=\\\"\$(bindir)\\\""
-        ;;
+	GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0"
+	GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
+	GF_LDADD="${ARGP_STANDALONE_LDADD}"
+	GF_FUSE_CFLAGS="-DFUSERMOUNT_DIR=\\\"\$(bindir)\\\""
+	;;
      solaris*)
         GF_HOST_OS="GF_SOLARIS_HOST_OS"
-        GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O0 -m64"
-        GF_LDFLAGS=""
-        GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
-        GF_LDADD="${ARGP_STANDALONE_LDADD}"
-        GF_GLUSTERFS_LIBS="-lnsl -lresolv -lsocket"
+	GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O0 -m64"
+	GF_LDFLAGS=""
+	GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
+	GF_LDADD="${ARGP_STANDALONE_LDADD}"
+	GF_GLUSTERFS_LDFLAGS="-lnsl -lresolv -lsocket"
         BUILD_FUSE_CLIENT=no
         FUSE_CLIENT_SUBDIR=""
-        ;;
-     *netbsd*)
-        GF_HOST_OS="GF_BSD_HOST_OS"
-        GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D_INCOMPLETE_XOPEN_C063"
-        GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_BASENAME"
-        GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_DIRNAME"
-        GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
-        GF_LDADD="${ARGP_STANDALONE_LDADD}"
-        if test "x$ac_cv_header_execinfo_h" = "xyes"; then
-           GF_GLUSTERFS_LIBS="-lexecinfo"
-        fi
-        GF_FUSE_LDADD="-lperfuse"
-        BUILD_FUSE_CLIENT=yes
-        LEXLIB=""
-        ;;
+	;;
      *bsd*)
         GF_HOST_OS="GF_BSD_HOST_OS"
-        GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0"
-        GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_BASENAME"
-        GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_DIRNAME"
-        GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
-        GF_LDADD="${ARGP_STANDALONE_LDADD}"
-        if test "x$ac_cv_header_execinfo_h" = "xyes"; then
-           GF_GLUSTERFS_LIBS="-lexecinfo"
-        fi
-        BUILD_FUSE_CLIENT=no
-        ;;
+	GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0"
+	GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
+	GF_LDADD="${ARGP_STANDALONE_LDADD}"
+	if test "x$ac_cv_header_execinfo_h" = "xyes"; then
+	   GF_GLUSTERFS_LDFLAGS="-lexecinfo"
+	fi				      
+	BUILD_FUSE_CLIENT=no
+	;;
      darwin*)
         GF_HOST_OS="GF_DARWIN_HOST_OS"
-        LIBTOOL=glibtool
-        GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D__DARWIN_64_BIT_INO_T -bundle -undefined suppress -flat_namespace -D_XOPEN_SOURCE -O0"
-        GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_BASENAME"
-        GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_DIRNAME"
-        GF_GLUSTERFS_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D__DARWIN_64_BIT_INO_T -undefined suppress -flat_namespace -O0"
-        GF_LDADD="${ARGP_STANDALONE_LDADD}"
-        GF_FUSE_CFLAGS="-I\$(CONTRIBDIR)/macfuse"
-        ;;
+	LIBTOOL=glibtool
+	GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D__DARWIN_64_BIT_INO_T -bundle -undefined suppress -flat_namespace -D_XOPEN_SOURCE -O0"
+	GF_GLUSTERFS_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D__DARWIN_64_BIT_INO_T -undefined suppress -flat_namespace -O0"
+	GF_LDADD="${ARGP_STANDALONE_LDADD}"
+	GF_FUSE_CFLAGS="-I\$(CONTRIBDIR)/macfuse"
+	;;
 esac
 
-# enable debug section
-AC_ARG_ENABLE([debug],
-              AC_HELP_STRING([--enable-debug],
-                             [Enable debug build options.]))
-
-BUILD_DEBUG=no
-if test "x$enable_debug" = "xyes"; then
-   BUILD_DEBUG=yes
-   CFLAGS=`echo $CFLAGS | sed -e s/O2/O0/`
-else
-   BUILD_DEBUG=no
-fi
-AC_SUBST(CFLAGS)
-# end enable debug section
-
-# syslog section
-AC_ARG_ENABLE([syslog],
-	      AC_HELP_STRING([--disable-syslog],
-			     [Disable syslog for logging]))
-
-USE_SYSLOG="yes"
-if test "x$enable_syslog" != "xno"; then
-  AC_DEFINE(GF_USE_SYSLOG, 1, [Use syslog for logging])
-else
-  USE_SYSLOG="no"
-fi
-AM_CONDITIONAL([ENABLE_SYSLOG], [test x$USE_SYSLOG = xyes])
-#end syslog section
-
 BUILD_READLINE=no
 AC_CHECK_LIB([readline -lcurses],[readline],[RLLIBS="-lreadline -lcurses"])
 AC_CHECK_LIB([readline -ltermcap],[readline],[RLLIBS="-lreadline -ltermcap"])
@@ -784,108 +468,35 @@ if test "x$RLLIBS" != "x"; then
    BUILD_READLINE=yes
 fi
 
-BUILD_LIBAIO=no
-AC_CHECK_LIB([aio],[io_setup],[LIBAIO="-laio"])
-
-if test "x$LIBAIO" != "x"; then
-   AC_DEFINE(HAVE_LIBAIO, 1, [libaio based POSIX enabled])
-   BUILD_LIBAIO=yes
-fi
-
-# glupy section
-BUILD_GLUPY=no
-have_python2=no
-have_Python_h=no
-
-AM_PATH_PYTHON()
-if echo $PYTHON_VERSION | grep ^2; then
-  have_python2=yes
-fi
-AC_CHECK_HEADERS([python$PYTHON_VERSION/Python.h],[have_Python_h=yes],[])
-AC_ARG_ENABLE([glupy],
-              AS_HELP_STRING([--enable-glupy],
-                             [build glupy]))
-case x$enable_glupy in
-   xyes)
-      if test "x$have_python2" = "xyes" -a "x$have_Python_h" = "xyes"; then
-         BUILD_GLUPY=yes
-      else
-         AC_MSG_ERROR([glupy requires python-devel/python-dev package and python2.x])
-      fi
-      ;;
-   xno)
-      ;;
-   *)
-      if test "x$have_python2" = "xyes" -a "x$have_Python_h" = "xyes"; then
-         BUILD_GLUPY=yes
-      else
-         AC_MSG_WARN([
-        ---------------------------------------------------------------------------------
-         cannot build glupy. python 2.x and python-devel/python-dev package are required.
-        ---------------------------------------------------------------------------------])
-      fi
-      ;;
-esac
-
-if test "x$BUILD_GLUPY" = "xyes"; then
-   BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
-   BUILD_PYTHON_LIB=python$PYTHON_VERSION
-   GLUPY_SUBDIR=glupy
-   GLUPY_SUBDIR_MAKEFILE=xlators/features/glupy/Makefile
-   GLUPY_SUBDIR_SRC_MAKEFILE=xlators/features/glupy/src/Makefile
-   echo "building glupy with -isystem $BUILD_PYTHON_INC -l $BUILD_PYTHON_LIB"
-   AC_SUBST(BUILD_PYTHON_INC)
-   AC_SUBST(BUILD_PYTHON_LIB)
-   AC_SUBST(GLUPY_SUBDIR)
-   AC_SUBST(GLUPY_SUBDIR_MAKEFILE)
-   AC_SUBST(GLUPY_SUBDIR_SRC_MAKEFILE)
-fi
-# end glupy section
-
 AC_SUBST(GF_HOST_OS)
-AC_SUBST([GF_GLUSTERFS_LIBS])
+AC_SUBST(GF_GLUSTERFS_LDFLAGS)
 AC_SUBST(GF_GLUSTERFS_CFLAGS)
 AC_SUBST(GF_CFLAGS)
 AC_SUBST(GF_LDFLAGS)
 AC_SUBST(GF_LDADD)
-AC_SUBST(GF_FUSE_LDADD)
 AC_SUBST(GF_FUSE_CFLAGS)
 AC_SUBST(RLLIBS)
-AC_SUBST(LIBAIO)
 AC_SUBST(AM_MAKEFLAGS)
 AC_SUBST(AM_LIBTOOLFLAGS)
 
 CONTRIBDIR='$(top_srcdir)/contrib'
 AC_SUBST(CONTRIBDIR)
 
-GF_CPPDEFINES='-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)'
-GF_CPPINCLUDES='-I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/uuid'
-GF_CPPFLAGS="$GF_CPPDEFINES $GF_CPPINCLUDES"
-AC_SUBST([GF_CPPFLAGS])
-
-AM_CONDITIONAL([GF_DARWIN_HOST_OS], test "${GF_HOST_OS}" = "GF_DARWIN_HOST_OS")
+INCLUDES='-I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/uuid'
+AC_SUBST(INCLUDES)
 
-AM_CONDITIONAL([GF_INSTALL_VAR_LIB_GLUSTERD], test ! -d ${localstatedir}/lib/glusterd && test -d ${sysconfdir}/glusterd )
+AM_CONDITIONAL([GF_DARWIN_HOST_OS], test "${GF_HOST_OS}" = "GF_DARWIN_HOST_OS")	
 
 AC_OUTPUT
 
 echo
 echo "GlusterFS configure summary"
 echo "==========================="
-echo "FUSE client          : $BUILD_FUSE_CLIENT"
-echo "Infiniband verbs     : $BUILD_IBVERBS"
-echo "epoll IO multiplex   : $BUILD_EPOLL"
-echo "argp-standalone      : $BUILD_ARGP_STANDALONE"
-echo "fusermount           : $BUILD_FUSERMOUNT"
-echo "readline             : $BUILD_READLINE"
-echo "georeplication       : $BUILD_SYNCDAEMON"
-echo "Linux-AIO            : $BUILD_LIBAIO"
-echo "Enable Debug         : $BUILD_DEBUG"
-echo "systemtap            : $BUILD_SYSTEMTAP"
-echo "Block Device xlator  : $BUILD_BD_XLATOR"
-echo "glupy                : $BUILD_GLUPY"
-echo "Use syslog           : $USE_SYSLOG"
-echo "XML output           : $BUILD_XML_OUTPUT"
-echo "QEMU Block formats   : $BUILD_QEMU_BLOCK"
-echo "Encryption xlator    : $BUILD_CRYPT_XLATOR"
+echo "FUSE client        : $BUILD_FUSE_CLIENT"
+echo "Infiniband verbs   : $BUILD_IBVERBS"
+echo "epoll IO multiplex : $BUILD_EPOLL"
+echo "argp-standalone    : $BUILD_ARGP_STANDALONE"
+echo "fusermount         : $BUILD_FUSERMOUNT"
+echo "readline           : $BUILD_READLINE"
+echo "georeplication     : $BUILD_SYNCDAEMON"
 echo
diff --git a/contrib/aclocal/mkdirp.m4 b/contrib/aclocal/mkdirp.m4
deleted file mode 100644
index d2f7edd5c..000000000
--- a/contrib/aclocal/mkdirp.m4
+++ /dev/null
@@ -1,146 +0,0 @@
-# Excerpt from autoconf/autoconf/programs.m4
-# This file is part of Autoconf.                       -*- Autoconf -*-
-# Checking for programs.
-
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-
-# This file is part of Autoconf.  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 3 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.
-#
-# Under Section 7 of GPL version 3, you are granted additional
-# permissions described in the Autoconf Configure Script Exception,
-# version 3.0, as published by the Free Software Foundation.
-#
-# You should have received a copy of the GNU General Public License
-# and a copy of the Autoconf Configure Script Exception along with
-# this program; see the files COPYINGv3 and COPYING.EXCEPTION
-# respectively.  If not, see <http://www.gnu.org/licenses/>.
-
-# Written by David MacKenzie, with help from
-# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
-# Roland McGrath, Noah Friedman, david d zuhn, and many others.
-
-# AC_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is known to be thread-safe, and fall back to
-# install-sh -d otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are vulnerable to race conditions:
-# if a parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to known race-free implementations.
-#
-# Automake used to define mkdir_p as `mkdir -p .', in order to
-# allow $(mkdir_p) to be used without argument.  As in
-#   $(mkdir_p) $(somedir)
-# where $(somedir) is conditionally defined.  However we don't do
-# that for MKDIR_P.
-#  1. before we restricted the check to GNU mkdir, `mkdir -p .' was
-#     reported to fail in read-only directories.  The system where this
-#     happened has been forgotten.
-#  2. in practice we call $(MKDIR_P) on directories such as
-#       $(MKDIR_P) "$(DESTDIR)$(somedir)"
-#     and we don't want to create $(DESTDIR) if $(somedir) is empty.
-#     To support the latter case, we have to write
-#       test -z "$(somedir)" || $(MKDIR_P) "$(DESTDIR)$(somedir)"
-#     so $(MKDIR_P) always has an argument.
-#     We will have better chances of detecting a missing test if
-#     $(MKDIR_P) complains about missing arguments.
-#  3. $(MKDIR_P) is named after `mkdir -p' and we don't expect this
-#     to accept no argument.
-#  4. having something like `mkdir .' in the output is unsightly.
-#
-# On NextStep and OpenStep, the `mkdir' command does not
-# recognize any option.  It will interpret all options as
-# directories to create.
-AN_MAKEVAR([MKDIR_P], [AC_PROG_MKDIR_P])
-AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-
-AC_MSG_CHECKING([for a thread-safe mkdir -p])
-if test -z "$MKDIR_P"; then
-  AC_CACHE_VAL([ac_cv_path_mkdir],
-    [_AS_PATH_WALK([$PATH$PATH_SEPARATOR/opt/sfw/bin],
-      [for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   AS_EXECUTABLE_P(["$as_dir/$ac_prog$ac_exec_ext"]) || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done])])
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-dnl status.m4 does special magic for MKDIR_P instead of AC_SUBST,
-dnl to get relative names right.  However, also AC_SUBST here so
-dnl that Automake versions before 1.10 will pick it up (they do not
-dnl trace AC_SUBST_TRACE).
-dnl FIXME: Remove this once we drop support for Automake < 1.10.
-AC_SUBST([MKDIR_P])dnl
-AC_MSG_RESULT([$MKDIR_P])
-])# AC_PROG_MKDIR_P
-
-
-# From automake/m4/mkdirp.m4
-##                                                          -*- Autoconf -*-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
diff --git a/contrib/aclocal/python.m4 b/contrib/aclocal/python.m4
deleted file mode 100644
index a39a90090..000000000
--- a/contrib/aclocal/python.m4
+++ /dev/null
@@ -1,209 +0,0 @@
-## ------------------------                                 -*- Autoconf -*-
-## Python file handling
-## From Andrew Dalke
-## Updated by James Henstridge
-## ------------------------
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# ---------------------------------------------------------------------------
-# Adds support for distributing Python modules and packages.  To
-# install modules, copy them to $(pythondir), using the python_PYTHON
-# automake variable.  To install a package with the same name as the
-# automake package, install to $(pkgpythondir), or use the
-# pkgpython_PYTHON automake variable.
-#
-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
-# locations to install python extension modules (shared libraries).
-# Another macro is required to find the appropriate flags to compile
-# extension modules.
-#
-# If your package is configured with a different prefix to python,
-# users will have to add the install directory to the PYTHONPATH
-# environment variable, or create a .pth file (see the python
-# documentation for details).
-#
-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
-# cause an error if the version of python installed on the system
-# doesn't meet the requirement.  MINIMUM-VERSION should consist of
-# numbers and dots only.
-AC_DEFUN([AM_PATH_PYTHON],
- [
-  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
-  dnl supported. (2.0 was released on October 16, 2000).
-  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-                    [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0])
-
-  m4_if([$1],[],[
-    dnl No version check is needed.
-    # Find any Python interpreter.
-    if test -z "$PYTHON"; then
-      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
-    fi
-    am_display_PYTHON=python
-  ], [
-    dnl A version check is needed.
-    if test -n "$PYTHON"; then
-      # If the user set $PYTHON, use it and don't search something else.
-      AC_MSG_CHECKING([whether $PYTHON version >= $1])
-      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
-			      [AC_MSG_RESULT(yes)],
-			      [AC_MSG_ERROR(too old)])
-      am_display_PYTHON=$PYTHON
-    else
-      # Otherwise, try each interpreter until we find one that satisfies
-      # VERSION.
-      AC_CACHE_CHECK([for a Python interpreter with version >= $1],
-	[am_cv_pathless_PYTHON],[
-	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
-	  test "$am_cv_pathless_PYTHON" = none && break
-	  AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
-	done])
-      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-      if test "$am_cv_pathless_PYTHON" = none; then
-	PYTHON=:
-      else
-        AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
-      fi
-      am_display_PYTHON=$am_cv_pathless_PYTHON
-    fi
-  ])
-
-  if test "$PYTHON" = :; then
-  dnl Run any user-specified action, or abort.
-    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
-  else
-
-  dnl Query Python for its version number.  Getting [:3] seems to be
-  dnl the best way to do this; it's what "site.py" does in the standard
-  dnl library.
-
-  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
-    [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
-  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
-
-  dnl Use the values of $prefix and $exec_prefix for the corresponding
-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
-  dnl distinct variables so they can be overridden if need be.  However,
-  dnl general consensus is that you shouldn't need this ability.
-
-  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-
-  dnl At times (like when building shared libraries) you may want
-  dnl to know which OS platform Python thinks this is.
-
-  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
-    [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
-  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
-
-
-  dnl Set up 4 directories:
-
-  dnl pythondir -- where to install python scripts.  This is the
-  dnl   site-packages directory, not the python standard library
-  dnl   directory like in previous automake betas.  This behavior
-  dnl   is more consistent with lispdir.m4 for example.
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
-    [am_cv_python_pythondir],
-    [if test "x$prefix" = xNONE
-     then
-       am_py_prefix=$ac_default_prefix
-     else
-       am_py_prefix=$prefix
-     fi
-     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-     case $am_cv_python_pythondir in
-     $am_py_prefix*)
-       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
-       ;;
-     *)
-       case $am_py_prefix in
-         /usr|/System*) ;;
-         *)
-	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
-	  ;;
-       esac
-       ;;
-     esac
-    ])
-  AC_SUBST([pythondir], [$am_cv_python_pythondir])
-
-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
-  dnl   more consistent with the rest of automake.
-
-  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
-
-  dnl pyexecdir -- directory for installing python extension modules
-  dnl   (shared libraries)
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
-    [am_cv_python_pyexecdir],
-    [if test "x$exec_prefix" = xNONE
-     then
-       am_py_exec_prefix=$am_py_prefix
-     else
-       am_py_exec_prefix=$exec_prefix
-     fi
-     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
-     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-     case $am_cv_python_pyexecdir in
-     $am_py_exec_prefix*)
-       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
-       ;;
-     *)
-       case $am_py_exec_prefix in
-         /usr|/System*) ;;
-         *)
-	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
-	   ;;
-       esac
-       ;;
-     esac
-    ])
-  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
-
-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-
-  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
-
-  dnl Run any user-specified action.
-  $2
-  fi
-
-])
-
-
-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------------------------
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
-# Run ACTION-IF-FALSE otherwise.
-# This test uses sys.hexversion instead of the string equivalent (first
-# word of sys.version), in order to cope with versions such as 2.2c1.
-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-# map returns an iterator in Python 3.0 and a list in 2.x
-minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
-minverhex = 0
-# xrange is not present in Python 3.0 and range returns an iterator
-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
-sys.exit(sys.hexversion < minverhex)"
-  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
diff --git a/contrib/fuse-include/fuse-mount.h b/contrib/fuse-include/fuse-mount.h
index 9358ac810..ca571ce5e 100644
--- a/contrib/fuse-include/fuse-mount.h
+++ b/contrib/fuse-include/fuse-mount.h
@@ -8,6 +8,4 @@
 */
 
 void gf_fuse_unmount (const char *mountpoint, int fd);
-int gf_fuse_mount (const char *mountpoint, char *fsname,
-                   unsigned long mountflags, char *mnt_param,
-                   pid_t *mtab_pid, int status_fd);
+int gf_fuse_mount (const char *mountpoint, char *fsname, char *mnt_param);
diff --git a/contrib/fuse-include/fuse_kernel.h b/contrib/fuse-include/fuse_kernel.h
index 60bb2f9f7..9ae25d6f9 100644
--- a/contrib/fuse-include/fuse_kernel.h
+++ b/contrib/fuse-include/fuse_kernel.h
@@ -60,75 +60,23 @@
  * 7.13
  *  - make max number of background requests and congestion threshold
  *    tunables
- *
- * 7.14
- *  - add splice support to fuse device
- *
- * 7.15
- *  - add store notify
- *  - add retrieve notify
- *
- * 7.16
- *  - add BATCH_FORGET request
- *  - FUSE_IOCTL_UNRESTRICTED shall now return with array of 'struct
- *    fuse_ioctl_iovec' instead of ambiguous 'struct iovec'
- *  - add FUSE_IOCTL_32BIT flag
- *
- * 7.17
- *  - add FUSE_FLOCK_LOCKS and FUSE_RELEASE_FLOCK_UNLOCK
- *
- * 7.18
- *  - add FUSE_IOCTL_DIR flag
- *  - add FUSE_NOTIFY_DELETE
- *
- * 7.19
- *  - add FUSE_FALLOCATE
- *
- * 7.20
- *  - add FUSE_AUTO_INVAL_DATA
- *
- * 7.21
- *  - add FUSE_READDIRPLUS
- *  - send the requested events in POLL request
- *
- * 7.22
- *  - add FUSE_ASYNC_DIO
  */
 
 #ifndef _LINUX_FUSE_H
 #define _LINUX_FUSE_H
 
-#ifdef __KERNEL__
-#include <linux/types.h>
-#else
-#include <stdint.h>
-#endif
-
-/*
- * Version negotiation:
- *
- * Both the kernel and userspace send the version they support in the
- * INIT request and reply respectively.
- *
- * If the major versions match then both shall use the smallest
- * of the two minor versions for communication.
- *
- * If the kernel supports a larger major version, then userspace shall
- * reply with the major version it supports, ignore the rest of the
- * INIT message and expect a new INIT message from the kernel with a
- * matching major version.
- *
- * If the library supports a larger major version, then it shall fall
- * back to the major protocol version sent by the kernel for
- * communication and reply with that major version (and an arbitrary
- * supported minor version).
- */
+#include <sys/types.h>
+#define __u64 uint64_t
+#define __s64 int64_t
+#define __u32 uint32_t
+#define __s32 int32_t
+#define __u16 uint16_t
 
 /** Version number of this interface */
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 22
+#define FUSE_KERNEL_MINOR_VERSION 13
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
@@ -137,42 +85,42 @@
    userspace works under 64bit kernels */
 
 struct fuse_attr {
-	uint64_t	ino;
-	uint64_t	size;
-	uint64_t	blocks;
-	uint64_t	atime;
-	uint64_t	mtime;
-	uint64_t	ctime;
-	uint32_t	atimensec;
-	uint32_t	mtimensec;
-	uint32_t	ctimensec;
-	uint32_t	mode;
-	uint32_t	nlink;
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	rdev;
-	uint32_t	blksize;
-	uint32_t	padding;
+	__u64	ino;
+	__u64	size;
+	__u64	blocks;
+	__u64	atime;
+	__u64	mtime;
+	__u64	ctime;
+	__u32	atimensec;
+	__u32	mtimensec;
+	__u32	ctimensec;
+	__u32	mode;
+	__u32	nlink;
+	__u32	uid;
+	__u32	gid;
+	__u32	rdev;
+	__u32	blksize;
+	__u32	padding;
 };
 
 struct fuse_kstatfs {
-	uint64_t	blocks;
-	uint64_t	bfree;
-	uint64_t	bavail;
-	uint64_t	files;
-	uint64_t	ffree;
-	uint32_t	bsize;
-	uint32_t	namelen;
-	uint32_t	frsize;
-	uint32_t	padding;
-	uint32_t	spare[6];
+	__u64	blocks;
+	__u64	bfree;
+	__u64	bavail;
+	__u64	files;
+	__u64	ffree;
+	__u32	bsize;
+	__u32	namelen;
+	__u32	frsize;
+	__u32	padding;
+	__u32	spare[6];
 };
 
 struct fuse_file_lock {
-	uint64_t	start;
-	uint64_t	end;
-	uint32_t	type;
-	uint32_t	pid; /* tgid */
+	__u64	start;
+	__u64	end;
+	__u32	type;
+	__u32	pid; /* tgid */
 };
 
 /**
@@ -203,22 +151,8 @@ struct fuse_file_lock {
 /**
  * INIT request/reply flags
  *
- * FUSE_ASYNC_READ: asynchronous read requests
- * FUSE_POSIX_LOCKS: remote locking for POSIX file locks
- * FUSE_FILE_OPS: kernel sends file handle for fstat, etc... (not yet supported)
- * FUSE_ATOMIC_O_TRUNC: handles the O_TRUNC open flag in the filesystem
  * FUSE_EXPORT_SUPPORT: filesystem handles lookups of "." and ".."
- * FUSE_BIG_WRITES: filesystem can handle write size larger than 4kB
  * FUSE_DONT_MASK: don't apply umask to file mode on create operations
- * FUSE_SPLICE_WRITE: kernel supports splice write on the device
- * FUSE_SPLICE_MOVE: kernel supports splice move on the device
- * FUSE_SPLICE_READ: kernel supports splice read on the device
- * FUSE_FLOCK_LOCKS: remote locking for BSD style file locks
- * FUSE_HAS_IOCTL_DIR: kernel supports ioctl on directories
- * FUSE_AUTO_INVAL_DATA: automatically invalidate cached pages
- * FUSE_DO_READDIRPLUS: do READDIRPLUS (READDIR+LOOKUP in one)
- * FUSE_READDIRPLUS_AUTO: adaptive readdirplus
- * FUSE_ASYNC_DIO: asynchronous direct I/O submission
  */
 #define FUSE_ASYNC_READ		(1 << 0)
 #define FUSE_POSIX_LOCKS	(1 << 1)
@@ -227,15 +161,6 @@ struct fuse_file_lock {
 #define FUSE_EXPORT_SUPPORT	(1 << 4)
 #define FUSE_BIG_WRITES		(1 << 5)
 #define FUSE_DONT_MASK		(1 << 6)
-#define FUSE_SPLICE_WRITE	(1 << 7)
-#define FUSE_SPLICE_MOVE	(1 << 8)
-#define FUSE_SPLICE_READ	(1 << 9)
-#define FUSE_FLOCK_LOCKS	(1 << 10)
-#define FUSE_HAS_IOCTL_DIR	(1 << 11)
-#define FUSE_AUTO_INVAL_DATA	(1 << 12)
-#define FUSE_DO_READDIRPLUS	(1 << 13)
-#define FUSE_READDIRPLUS_AUTO	(1 << 14)
-#define FUSE_ASYNC_DIO		(1 << 15)
 
 /**
  * CUSE INIT request/reply flags
@@ -248,7 +173,6 @@ struct fuse_file_lock {
  * Release flags
  */
 #define FUSE_RELEASE_FLUSH	(1 << 0)
-#define FUSE_RELEASE_FLOCK_UNLOCK	(1 << 1)
 
 /**
  * Getattr flags
@@ -280,16 +204,12 @@ struct fuse_file_lock {
  * FUSE_IOCTL_COMPAT: 32bit compat ioctl on 64bit machine
  * FUSE_IOCTL_UNRESTRICTED: not restricted to well-formed ioctls, retry allowed
  * FUSE_IOCTL_RETRY: retry with new iovecs
- * FUSE_IOCTL_32BIT: 32bit ioctl
- * FUSE_IOCTL_DIR: is a directory
  *
  * FUSE_IOCTL_MAX_IOV: maximum of in_iovecs + out_iovecs
  */
 #define FUSE_IOCTL_COMPAT	(1 << 0)
 #define FUSE_IOCTL_UNRESTRICTED	(1 << 1)
 #define FUSE_IOCTL_RETRY	(1 << 2)
-#define FUSE_IOCTL_32BIT	(1 << 3)
-#define FUSE_IOCTL_DIR		(1 << 4)
 
 #define FUSE_IOCTL_MAX_IOV	256
 
@@ -339,10 +259,6 @@ enum fuse_opcode {
 	FUSE_DESTROY       = 38,
 	FUSE_IOCTL         = 39,
 	FUSE_POLL          = 40,
-	FUSE_NOTIFY_REPLY  = 41,
-	FUSE_BATCH_FORGET  = 42,
-	FUSE_FALLOCATE     = 43,
-	FUSE_READDIRPLUS   = 44,
 
 	/* CUSE specific operations */
 	CUSE_INIT          = 4096,
@@ -352,9 +268,6 @@ enum fuse_notify_code {
 	FUSE_NOTIFY_POLL   = 1,
 	FUSE_NOTIFY_INVAL_INODE = 2,
 	FUSE_NOTIFY_INVAL_ENTRY = 3,
-	FUSE_NOTIFY_STORE = 4,
-	FUSE_NOTIFY_RETRIEVE = 5,
-	FUSE_NOTIFY_DELETE = 6,
 	FUSE_NOTIFY_CODE_MAX,
 };
 
@@ -364,143 +277,133 @@ enum fuse_notify_code {
 #define FUSE_COMPAT_ENTRY_OUT_SIZE 120
 
 struct fuse_entry_out {
-	uint64_t	nodeid;		/* Inode ID */
-	uint64_t	generation;	/* Inode generation: nodeid:gen must
-					   be unique for the fs's lifetime */
-	uint64_t	entry_valid;	/* Cache timeout for the name */
-	uint64_t	attr_valid;	/* Cache timeout for the attributes */
-	uint32_t	entry_valid_nsec;
-	uint32_t	attr_valid_nsec;
+	__u64	nodeid;		/* Inode ID */
+	__u64	generation;	/* Inode generation: nodeid:gen must
+				   be unique for the fs's lifetime */
+	__u64	entry_valid;	/* Cache timeout for the name */
+	__u64	attr_valid;	/* Cache timeout for the attributes */
+	__u32	entry_valid_nsec;
+	__u32	attr_valid_nsec;
 	struct fuse_attr attr;
 };
 
 struct fuse_forget_in {
-	uint64_t	nlookup;
-};
-
-struct fuse_forget_one {
-	uint64_t	nodeid;
-	uint64_t	nlookup;
-};
-
-struct fuse_batch_forget_in {
-	uint32_t	count;
-	uint32_t	dummy;
+	__u64	nlookup;
 };
 
 struct fuse_getattr_in {
-	uint32_t	getattr_flags;
-	uint32_t	dummy;
-	uint64_t	fh;
+	__u32	getattr_flags;
+	__u32	dummy;
+	__u64	fh;
 };
 
 #define FUSE_COMPAT_ATTR_OUT_SIZE 96
 
 struct fuse_attr_out {
-	uint64_t	attr_valid;	/* Cache timeout for the attributes */
-	uint32_t	attr_valid_nsec;
-	uint32_t	dummy;
+	__u64	attr_valid;	/* Cache timeout for the attributes */
+	__u32	attr_valid_nsec;
+	__u32	dummy;
 	struct fuse_attr attr;
 };
 
 #define FUSE_COMPAT_MKNOD_IN_SIZE 8
 
 struct fuse_mknod_in {
-	uint32_t	mode;
-	uint32_t	rdev;
-	uint32_t	umask;
-	uint32_t	padding;
+	__u32	mode;
+	__u32	rdev;
+	__u32	umask;
+	__u32	padding;
 };
 
 struct fuse_mkdir_in {
-	uint32_t	mode;
-	uint32_t	umask;
+	__u32	mode;
+	__u32	umask;
 };
 
 struct fuse_rename_in {
-	uint64_t	newdir;
+	__u64	newdir;
 };
 
 struct fuse_link_in {
-	uint64_t	oldnodeid;
+	__u64	oldnodeid;
 };
 
 struct fuse_setattr_in {
-	uint32_t	valid;
-	uint32_t	padding;
-	uint64_t	fh;
-	uint64_t	size;
-	uint64_t	lock_owner;
-	uint64_t	atime;
-	uint64_t	mtime;
-	uint64_t	unused2;
-	uint32_t	atimensec;
-	uint32_t	mtimensec;
-	uint32_t	unused3;
-	uint32_t	mode;
-	uint32_t	unused4;
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	unused5;
+	__u32	valid;
+	__u32	padding;
+	__u64	fh;
+	__u64	size;
+	__u64	lock_owner;
+	__u64	atime;
+	__u64	mtime;
+	__u64	unused2;
+	__u32	atimensec;
+	__u32	mtimensec;
+	__u32	unused3;
+	__u32	mode;
+	__u32	unused4;
+	__u32	uid;
+	__u32	gid;
+	__u32	unused5;
 };
 
 struct fuse_open_in {
-	uint32_t	flags;
-	uint32_t	unused;
+	__u32	flags;
+	__u32	unused;
 };
 
 struct fuse_create_in {
-	uint32_t	flags;
-	uint32_t	mode;
-	uint32_t	umask;
-	uint32_t	padding;
+	__u32	flags;
+	__u32	mode;
+	__u32	umask;
+	__u32	padding;
 };
 
 struct fuse_open_out {
-	uint64_t	fh;
-	uint32_t	open_flags;
-	uint32_t	padding;
+	__u64	fh;
+	__u32	open_flags;
+	__u32	padding;
 };
 
 struct fuse_release_in {
-	uint64_t	fh;
-	uint32_t	flags;
-	uint32_t	release_flags;
-	uint64_t	lock_owner;
+	__u64	fh;
+	__u32	flags;
+	__u32	release_flags;
+	__u64	lock_owner;
 };
 
 struct fuse_flush_in {
-	uint64_t	fh;
-	uint32_t	unused;
-	uint32_t	padding;
-	uint64_t	lock_owner;
+	__u64	fh;
+	__u32	unused;
+	__u32	padding;
+	__u64	lock_owner;
 };
 
 struct fuse_read_in {
-	uint64_t	fh;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	read_flags;
-	uint64_t	lock_owner;
-	uint32_t	flags;
-	uint32_t	padding;
+	__u64	fh;
+	__u64	offset;
+	__u32	size;
+	__u32	read_flags;
+	__u64	lock_owner;
+	__u32	flags;
+	__u32	padding;
 };
 
 #define FUSE_COMPAT_WRITE_IN_SIZE 24
 
 struct fuse_write_in {
-	uint64_t	fh;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	write_flags;
-	uint64_t	lock_owner;
-	uint32_t	flags;
-	uint32_t	padding;
+	__u64	fh;
+	__u64	offset;
+	__u32	size;
+	__u32	write_flags;
+	__u64	lock_owner;
+	__u32	flags;
+	__u32	padding;
 };
 
 struct fuse_write_out {
-	uint32_t	size;
-	uint32_t	padding;
+	__u32	size;
+	__u32	padding;
 };
 
 #define FUSE_COMPAT_STATFS_SIZE 48
@@ -510,32 +413,32 @@ struct fuse_statfs_out {
 };
 
 struct fuse_fsync_in {
-	uint64_t	fh;
-	uint32_t	fsync_flags;
-	uint32_t	padding;
+	__u64	fh;
+	__u32	fsync_flags;
+	__u32	padding;
 };
 
 struct fuse_setxattr_in {
-	uint32_t	size;
-	uint32_t	flags;
+	__u32	size;
+	__u32	flags;
 };
 
 struct fuse_getxattr_in {
-	uint32_t	size;
-	uint32_t	padding;
+	__u32	size;
+	__u32	padding;
 };
 
 struct fuse_getxattr_out {
-	uint32_t	size;
-	uint32_t	padding;
+	__u32	size;
+	__u32	padding;
 };
 
 struct fuse_lk_in {
-	uint64_t	fh;
-	uint64_t	owner;
+	__u64	fh;
+	__u64	owner;
 	struct fuse_file_lock lk;
-	uint32_t	lk_flags;
-	uint32_t	padding;
+	__u32	lk_flags;
+	__u32	padding;
 };
 
 struct fuse_lk_out {
@@ -543,190 +446,134 @@ struct fuse_lk_out {
 };
 
 struct fuse_access_in {
-	uint32_t	mask;
-	uint32_t	padding;
+	__u32	mask;
+	__u32	padding;
 };
 
 struct fuse_init_in {
-	uint32_t	major;
-	uint32_t	minor;
-	uint32_t	max_readahead;
-	uint32_t	flags;
+	__u32	major;
+	__u32	minor;
+	__u32	max_readahead;
+	__u32	flags;
 };
 
 struct fuse_init_out {
-	uint32_t	major;
-	uint32_t	minor;
-	uint32_t	max_readahead;
-	uint32_t	flags;
-	uint16_t	max_background;
-	uint16_t	congestion_threshold;
-	uint32_t	max_write;
+	__u32	major;
+	__u32	minor;
+	__u32	max_readahead;
+	__u32	flags;
+	__u16   max_background;
+	__u16   congestion_threshold;
+	__u32	max_write;
 };
 
 #define CUSE_INIT_INFO_MAX 4096
 
 struct cuse_init_in {
-	uint32_t	major;
-	uint32_t	minor;
-	uint32_t	unused;
-	uint32_t	flags;
+	__u32	major;
+	__u32	minor;
+	__u32	unused;
+	__u32	flags;
 };
 
 struct cuse_init_out {
-	uint32_t	major;
-	uint32_t	minor;
-	uint32_t	unused;
-	uint32_t	flags;
-	uint32_t	max_read;
-	uint32_t	max_write;
-	uint32_t	dev_major;		/* chardev major */
-	uint32_t	dev_minor;		/* chardev minor */
-	uint32_t	spare[10];
+	__u32	major;
+	__u32	minor;
+	__u32	unused;
+	__u32	flags;
+	__u32	max_read;
+	__u32	max_write;
+	__u32	dev_major;		/* chardev major */
+	__u32	dev_minor;		/* chardev minor */
+	__u32	spare[10];
 };
 
 struct fuse_interrupt_in {
-	uint64_t	unique;
+	__u64	unique;
 };
 
 struct fuse_bmap_in {
-	uint64_t	block;
-	uint32_t	blocksize;
-	uint32_t	padding;
+	__u64	block;
+	__u32	blocksize;
+	__u32	padding;
 };
 
 struct fuse_bmap_out {
-	uint64_t	block;
+	__u64	block;
 };
 
 struct fuse_ioctl_in {
-	uint64_t	fh;
-	uint32_t	flags;
-	uint32_t	cmd;
-	uint64_t	arg;
-	uint32_t	in_size;
-	uint32_t	out_size;
-};
-
-struct fuse_ioctl_iovec {
-	uint64_t	base;
-	uint64_t	len;
+	__u64	fh;
+	__u32	flags;
+	__u32	cmd;
+	__u64	arg;
+	__u32	in_size;
+	__u32	out_size;
 };
 
 struct fuse_ioctl_out {
-	int32_t		result;
-	uint32_t	flags;
-	uint32_t	in_iovs;
-	uint32_t	out_iovs;
+	__s32	result;
+	__u32	flags;
+	__u32	in_iovs;
+	__u32	out_iovs;
 };
 
 struct fuse_poll_in {
-	uint64_t	fh;
-	uint64_t	kh;
-	uint32_t	flags;
-	uint32_t	events;
+	__u64	fh;
+	__u64	kh;
+	__u32	flags;
+	__u32   padding;
 };
 
 struct fuse_poll_out {
-	uint32_t	revents;
-	uint32_t	padding;
+	__u32	revents;
+	__u32	padding;
 };
 
 struct fuse_notify_poll_wakeup_out {
-	uint64_t	kh;
-};
-
-struct fuse_fallocate_in {
-	uint64_t	fh;
-	uint64_t	offset;
-	uint64_t	length;
-	uint32_t	mode;
-	uint32_t	padding;
+	__u64	kh;
 };
 
 struct fuse_in_header {
-	uint32_t	len;
-	uint32_t	opcode;
-	uint64_t	unique;
-	uint64_t	nodeid;
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	pid;
-	uint32_t	padding;
+	__u32	len;
+	__u32	opcode;
+	__u64	unique;
+	__u64	nodeid;
+	__u32	uid;
+	__u32	gid;
+	__u32	pid;
+	__u32	padding;
 };
 
 struct fuse_out_header {
-	uint32_t	len;
-	int32_t		error;
-	uint64_t	unique;
+	__u32	len;
+	__s32	error;
+	__u64	unique;
 };
 
 struct fuse_dirent {
-	uint64_t	ino;
-	uint64_t	off;
-	uint32_t	namelen;
-	uint32_t	type;
-	char name[];
+	__u64	ino;
+	__u64	off;
+	__u32	namelen;
+	__u32	type;
+	char name[0];
 };
 
 #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)
-#define FUSE_DIRENT_ALIGN(x) \
-	(((x) + sizeof(uint64_t) - 1) & ~(sizeof(uint64_t) - 1))
+#define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
 #define FUSE_DIRENT_SIZE(d) \
 	FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)
 
-struct fuse_direntplus {
-	struct fuse_entry_out entry_out;
-	struct fuse_dirent dirent;
-};
-
-#define FUSE_NAME_OFFSET_DIRENTPLUS \
-	offsetof(struct fuse_direntplus, dirent.name)
-#define FUSE_DIRENTPLUS_SIZE(d) \
-	FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET_DIRENTPLUS + (d)->dirent.namelen)
-
 struct fuse_notify_inval_inode_out {
-	uint64_t	ino;
-	int64_t		off;
-	int64_t		len;
+	__u64	ino;
+	__s64	off;
+	__s64	len;
 };
 
 struct fuse_notify_inval_entry_out {
-	uint64_t	parent;
-	uint32_t	namelen;
-	uint32_t	padding;
-};
-
-struct fuse_notify_delete_out {
-	uint64_t	parent;
-	uint64_t	child;
-	uint32_t	namelen;
-	uint32_t	padding;
-};
-
-struct fuse_notify_store_out {
-	uint64_t	nodeid;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	padding;
-};
-
-struct fuse_notify_retrieve_out {
-	uint64_t	notify_unique;
-	uint64_t	nodeid;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	padding;
-};
-
-/* Matches the size of fuse_write_in */
-struct fuse_notify_retrieve_in {
-	uint64_t	dummy1;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	dummy2;
-	uint64_t	dummy3;
-	uint64_t	dummy4;
+	__u64	parent;
+	__u32	namelen;
+	__u32	padding;
 };
 
 #endif /* _LINUX_FUSE_H */
diff --git a/contrib/fuse-lib/misc.c b/contrib/fuse-lib/misc.c
index 0c41b1a19..28a9284bf 100644
--- a/contrib/fuse-lib/misc.c
+++ b/contrib/fuse-lib/misc.c
@@ -50,5 +50,5 @@ convert_fuse_file_lock (struct fuse_file_lock *fl, struct gf_flock *flock,
         else
                 flock->l_len = fl->end - fl->start + 1;
         flock->l_pid = fl->pid;
-        set_lk_owner_from_uint64 (&flock->l_owner, lk_owner);
+        flock->l_owner = lk_owner;
 }
diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c
deleted file mode 100644
index fd6cce44e..000000000
--- a/contrib/fuse-lib/mount-common.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-  FUSE: Filesystem in Userspace
-  Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
-  Copyright (c) 2010 Gluster, Inc. <http://www.gluster.com>
-
-  This program can be distributed under the terms of the GNU LGPLv2.
-  See the file COPYING.LIB.
-*/
-
-#include "mount-gluster-compat.h"
-
-/*
- * These functions (and gf_fuse_umount() in mount.c)
- * were originally taken from libfuse as of commit 7960e99e
- * (http://fuse.git.sourceforge.net/git/gitweb.cgi?p=fuse/fuse;a=commit;h=7960e99e)
- * almost verbatim. What has been changed upon adoption:
- * - style adopted to that of glusterfs
- * - s/fprintf/gf_log/
- * - s/free/FREE/, s/malloc/MALLOC/
- * - there are some other minor things
- *
- * For changes that were made later and syncs with upstream,
- * see the commit log and per-function comments.
- */
-
-#ifndef __NetBSD__
-/* FUSE: cherry-picked bd99f9cf */
-static int
-mtab_needs_update (const char *mnt)
-{
-        int res;
-        struct stat stbuf;
-
-        /* If mtab is within new mount, don't touch it */
-        if (strncmp (mnt, _PATH_MOUNTED, strlen (mnt)) == 0 &&
-            _PATH_MOUNTED[strlen (mnt)] == '/')
-                return 0;
-
-        /*
-         * Skip mtab update if /etc/mtab:
-         *
-         *  - doesn't exist,
-         *  - is a symlink,
-         *  - is on a read-only filesystem.
-         */
-        res = lstat (_PATH_MOUNTED, &stbuf);
-        if (res == -1) {
-                if (errno == ENOENT)
-                        return 0;
-        } else {
-                uid_t ruid;
-                int err;
-
-                if (S_ISLNK (stbuf.st_mode))
-                        return 0;
-
-                ruid = getuid ();
-                if (ruid != 0)
-                        setreuid (0, -1);
-
-                res = access (_PATH_MOUNTED, W_OK);
-                err = (res == -1) ? errno : 0;
-                if (ruid != 0)
-                        setreuid (ruid, -1);
-
-                if (err == EROFS)
-                        return 0;
-        }
-
-        return 1;
-}
-#else /* __NetBSD__ */
-#define mtab_needs_update(x) 1
-#endif /* __NetBSD__ */
-
-/* FUSE: called add_mount_legacy(); R.I.P. as of cbd3a2a8 */
-int
-fuse_mnt_add_mount (const char *progname, const char *fsname,
-                    const char *mnt, const char *type, const char *opts)
-{
-        int res;
-        int status;
-        sigset_t blockmask;
-        sigset_t oldmask;
-
-        if (!mtab_needs_update (mnt))
-                return 0;
-
-        sigemptyset (&blockmask);
-        sigaddset (&blockmask, SIGCHLD);
-        res = sigprocmask (SIG_BLOCK, &blockmask, &oldmask);
-        if (res == -1) {
-                GFFUSE_LOGERR ("%s: sigprocmask: %s",
-                               progname, strerror (errno));
-                return -1;
-        }
-
-        res = fork ();
-        if (res == -1) {
-                GFFUSE_LOGERR ("%s: fork: %s", progname, strerror (errno));
-                goto out_restore;
-        }
-        if (res == 0) {
-                char templ[] = "/tmp/fusermountXXXXXX";
-                char *tmp;
-
-                sigprocmask (SIG_SETMASK, &oldmask, NULL);
-                setuid (geteuid ());
-
-                /*
-                 * hide in a directory, where mount isn't able to resolve
-                 * fsname as a valid path
-                 */
-                tmp = mkdtemp (templ);
-                if (!tmp) {
-                        GFFUSE_LOGERR ("%s: failed to create temporary directory",
-                                       progname);
-                        exit (1);
-                }
-                if (chdir (tmp)) {
-                        GFFUSE_LOGERR ("%s: failed to chdir to %s: %s",
-                                       progname, tmp, strerror (errno));
-                        exit (1);
-                }
-                rmdir (tmp);
-                execl (_PATH_MOUNT, _PATH_MOUNT, "-i", "-f", "-t", type,
-                       "-o", opts, fsname, mnt, NULL);
-                GFFUSE_LOGERR ("%s: failed to execute %s: %s",
-                               progname, _PATH_MOUNT, strerror (errno));
-                exit (1);
-        }
-
-        res = waitpid (res, &status, 0);
-        if (res == -1)
-                GFFUSE_LOGERR ("%s: waitpid: %s", progname, strerror (errno));
-        res = (res != -1 && status == 0) ? 0 : -1;
-
- out_restore:
-        sigprocmask (SIG_SETMASK, &oldmask, NULL);
-        return res;
-}
-
-char *
-fuse_mnt_resolve_path (const char *progname, const char *orig)
-{
-        char buf[PATH_MAX];
-        char *copy;
-        char *dst;
-        char *end;
-        char *lastcomp;
-        const char *toresolv;
-
-        if (!orig[0]) {
-                GFFUSE_LOGERR ("%s: invalid mountpoint '%s'", progname, orig);
-                return NULL;
-        }
-
-        copy = strdup (orig);
-        if (copy == NULL) {
-                GFFUSE_LOGERR ("%s: failed to allocate memory", progname);
-                return NULL;
-        }
-
-        toresolv = copy;
-        lastcomp = NULL;
-        for (end = copy + strlen (copy) - 1; end > copy && *end == '/'; end --);
-        if (end[0] != '/') {
-                char *tmp;
-                end[1] = '\0';
-                tmp = strrchr (copy, '/');
-                if (tmp == NULL) {
-                        lastcomp = copy;
-                        toresolv = ".";
-                } else {
-                        lastcomp = tmp + 1;
-                        if (tmp == copy)
-                                toresolv = "/";
-                }
-                if (strcmp (lastcomp, ".") == 0 || strcmp (lastcomp, "..") == 0) {
-                        lastcomp = NULL;
-                        toresolv = copy;
-                }
-                else if (tmp)
-                        tmp[0] = '\0';
-        }
-        if (realpath (toresolv, buf) == NULL) {
-                GFFUSE_LOGERR ("%s: bad mount point %s: %s", progname, orig,
-                               strerror (errno));
-                FREE (copy);
-                return NULL;
-        }
-        if (lastcomp == NULL)
-                dst = strdup (buf);
-        else {
-                dst = (char *) MALLOC (strlen (buf) + 1 + strlen (lastcomp) + 1);
-                if (dst) {
-                        unsigned buflen = strlen (buf);
-                        if (buflen && buf[buflen-1] == '/')
-                                sprintf (dst, "%s%s", buf, lastcomp);
-                        else
-                                sprintf (dst, "%s/%s", buf, lastcomp);
-                }
-        }
-        FREE (copy);
-        if (dst == NULL)
-                GFFUSE_LOGERR ("%s: failed to allocate memory", progname);
-        return dst;
-}
-
-/* FUSE: to support some changes that were reverted since
- * then, it was split in two (fuse_mnt_umount() and
- * exec_umount()); however the actual code is same as here
- * since 0197ce40
- */
-int
-fuse_mnt_umount (const char *progname, const char *abs_mnt,
-                 const char *rel_mnt, int lazy)
-{
-        int res;
-        int status;
-        sigset_t blockmask;
-        sigset_t oldmask;
-
-        if (!mtab_needs_update (abs_mnt)) {
-                res = umount2 (rel_mnt, lazy ? 2 : 0);
-                if (res == -1)
-                        GFFUSE_LOGERR ("%s: failed to unmount %s: %s",
-                                       progname, abs_mnt, strerror (errno));
-                return res;
-        }
-
-        sigemptyset (&blockmask);
-        sigaddset (&blockmask, SIGCHLD);
-        res = sigprocmask (SIG_BLOCK, &blockmask, &oldmask);
-        if (res == -1) {
-                GFFUSE_LOGERR ("%s: sigprocmask: %s", progname,
-                               strerror (errno));
-                return -1;
-        }
-
-        res = fork ();
-        if (res == -1) {
-                GFFUSE_LOGERR ("%s: fork: %s", progname, strerror (errno));
-                goto out_restore;
-        }
-        if (res == 0) {
-                sigprocmask (SIG_SETMASK, &oldmask, NULL);
-                setuid (geteuid ());
-                execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,
-                      lazy ? "-l" : NULL, NULL);
-                GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",
-                               progname, strerror (errno));
-                exit (1);
-        }
-        res = waitpid (res, &status, 0);
-        if (res == -1)
-                GFFUSE_LOGERR ("%s: waitpid: %s", progname, strerror (errno));
-
-        if (status != 0)
-                res = -1;
-
- out_restore:
-        sigprocmask (SIG_SETMASK, &oldmask, NULL);
-        return res;
-}
diff --git a/contrib/fuse-lib/mount-gluster-compat.h b/contrib/fuse-lib/mount-gluster-compat.h
deleted file mode 100644
index 4fc20623b..000000000
--- a/contrib/fuse-lib/mount-gluster-compat.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-  FUSE: Filesystem in Userspace
-  Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
-  Copyright (c) 2010 Gluster, Inc. <http://www.gluster.com>
-
-  This program can be distributed under the terms of the GNU LGPLv2.
-  See the file COPYING.LIB.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <limits.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <dirent.h>
-#include <signal.h>
-#ifndef __NetBSD__
-#include <mntent.h>
-#endif /* __NetBSD__ */
-#include <sys/stat.h>
-#include <sys/poll.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <sys/mount.h>
-
-#ifdef __NetBSD__
-#include <perfuse.h>
-#define umount2(dir, flags) unmount(dir, ((flags) != 0) ? MNT_FORCE : 0)
-#define MS_RDONLY MNT_RDONLY
-#endif
-
-#ifdef linux
-#define _PATH_MOUNT "/bin/mount"
-#else /* NetBSD, MacOS X */
-#define _PATH_MOUNT "/sbin/mount"
-#endif
-
-#ifdef FUSE_UTIL
-#define MALLOC(size) malloc (size)
-#define FREE(ptr) free (ptr)
-#define GFFUSE_LOGERR(...) fprintf (stderr, ## __VA_ARGS__)
-#else /* FUSE_UTIL */
-#include "glusterfs.h"
-#include "logging.h"
-#include "common-utils.h"
-
-#define GFFUSE_LOGERR(...) \
-        gf_log ("glusterfs-fuse", GF_LOG_ERROR, ## __VA_ARGS__)
-#endif /* !FUSE_UTIL */
diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c
index 922d9e464..47592a62d 100644
--- a/contrib/fuse-lib/mount.c
+++ b/contrib/fuse-lib/mount.c
@@ -7,140 +7,317 @@
   See the file COPYING.LIB.
 */
 
-#include "mount_util.h"
-#include "mount-gluster-compat.h"
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stddef.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <dirent.h>
+#include <mntent.h>
+#include <sys/stat.h>
+#include <sys/poll.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <sys/mount.h>
+
+#ifdef FUSE_UTIL
+#define MALLOC(size) malloc (size)
+#define FREE(ptr) free (ptr)
+#define GFFUSE_LOGERR(...) fprintf (stderr, ## __VA_ARGS__)
+#else /* FUSE_UTIL */
+#include "glusterfs.h"
+#include "logging.h"
+#include "common-utils.h"
 
 #ifdef GF_FUSERMOUNT
 #define FUSERMOUNT_PROG FUSERMOUNT_DIR "/fusermount-glusterfs"
 #else
 #define FUSERMOUNT_PROG "fusermount"
 #endif
-#define FUSE_DEVFD_ENV "_FUSE_DEVFD"
+#define FUSE_COMMFD_ENV "_FUSE_COMMFD"
 
+#define GFFUSE_LOGERR(...) \
+        gf_log ("glusterfs-fuse", GF_LOG_ERROR, ## __VA_ARGS__)
+#endif /* !FUSE_UTIL */
 
-/* FUSE: function is called fuse_kern_unmount() */
-void
-gf_fuse_unmount (const char *mountpoint, int fd)
+/*
+ * Functions below, until following note, were taken from libfuse
+ * (http://git.gluster.com/?p=users/csaba/fuse.git;a=commit;h=b988bbf9)
+ * almost verbatim. What has been changed:
+ * - style adopted to that of glusterfs
+ * - s/fprintf/gf_log/
+ * - s/free/FREE/, s/malloc/MALLOC/
+ * - there are some other minor things
+ */
+
+static int
+mtab_needs_update (const char *mnt)
 {
         int res;
-        int pid;
-
-        if (!mountpoint)
-                return;
-
-        if (fd != -1) {
-                struct pollfd pfd;
+        struct stat stbuf;
+
+        /* If mtab is within new mount, don't touch it */
+        if (strncmp (mnt, _PATH_MOUNTED, strlen (mnt)) == 0 &&
+            _PATH_MOUNTED[strlen (mnt)] == '/')
+                return 0;
+
+        /*
+         * Skip mtab update if /etc/mtab:
+         *
+         *  - doesn't exist,
+         *  - is a symlink,
+         *  - is on a read-only filesystem.
+         */
+        res = lstat (_PATH_MOUNTED, &stbuf);
+        if (res == -1) {
+                if (errno == ENOENT)
+                        return 0;
+        } else {
+                if (S_ISLNK (stbuf.st_mode))
+                        return 0;
+
+                res = access (_PATH_MOUNTED, W_OK);
+                if (res == -1 && errno == EROFS)
+                        return 0;
+        }
 
-                pfd.fd = fd;
-                pfd.events = 0;
-                res = poll (&pfd, 1, 0);
-                /* If file poll returns POLLERR on the device file descriptor,
-                   then the filesystem is already unmounted */
-                if (res == 1 && (pfd.revents & POLLERR))
-                        return;
+        return 1;
+}
 
-                /* Need to close file descriptor, otherwise synchronous umount
-                   would recurse into filesystem, and deadlock */
-                close (fd);
+#ifndef FUSE_UTIL
+static
+#endif
+int
+fuse_mnt_add_mount (const char *progname, const char *fsname,
+                    const char *mnt, const char *type, const char *opts)
+{
+        int res;
+        int status;
+        sigset_t blockmask;
+        sigset_t oldmask;
+
+        if (!mtab_needs_update (mnt))
+                return 0;
+
+        sigemptyset (&blockmask);
+        sigaddset (&blockmask, SIGCHLD);
+        res = sigprocmask (SIG_BLOCK, &blockmask, &oldmask);
+        if (res == -1) {
+                GFFUSE_LOGERR ("%s: sigprocmask: %s",
+                               progname, strerror (errno));
+                return -1;
         }
 
-        if (geteuid () == 0) {
-                fuse_mnt_umount ("fuse", mountpoint, mountpoint, 1);
-                return;
+        res = fork ();
+        if (res == -1) {
+                GFFUSE_LOGERR ("%s: fork: %s", progname, strerror (errno));
+                goto out_restore;
         }
+        if (res == 0) {
+                char templ[] = "/tmp/fusermountXXXXXX";
+                char *tmp;
+
+                /* mtab update done async, just log if fails */
+                res = fork ();
+                if (res)
+                        exit (res == -1 ? 1 : 0);
+                res = fork ();
+                if (res) {
+                        if (res != -1)
+                                res = waitpid (res, &status, 0);
+                        if (res == -1)
+                                GFFUSE_LOGERR ("%s: /etc/mtab update failed",
+                                               progname);
+
+                        exit (0);
+                }
 
-        res = umount2 (mountpoint, 2);
-        if (res == 0)
-                return;
-
-        pid = fork ();
-        if (pid == -1)
-                return;
-
-        if (pid == 0) {
-                const char *argv[] = { FUSERMOUNT_PROG, "-u", "-q", "-z",
-                                       "--", mountpoint, NULL };
-
-                execvp (FUSERMOUNT_PROG, (char **)argv);
-                _exit (1);
+                sigprocmask (SIG_SETMASK, &oldmask, NULL);
+                setuid (geteuid ());
+
+                /*
+                 * hide in a directory, where mount isn't able to resolve
+                 * fsname as a valid path
+                 */
+                tmp = mkdtemp (templ);
+                if (!tmp) {
+                        GFFUSE_LOGERR ("%s: failed to create temporary directory",
+                                       progname);
+                        exit (1);
+                }
+                if (chdir (tmp)) {
+                        GFFUSE_LOGERR ("%s: failed to chdir to %s: %s",
+                                       progname, tmp, strerror (errno));
+                        exit (1);
+                }
+                rmdir (tmp);
+                execl ("/bin/mount", "/bin/mount", "-i", "-f", "-t", type,
+                       "-o", opts, fsname, mnt, NULL);
+                GFFUSE_LOGERR ("%s: failed to execute /bin/mount: %s",
+                               progname, strerror (errno));
+                exit (1);
         }
-        waitpid (pid, NULL, 0);
-}
+        res = waitpid (res, &status, 0);
+        if (res == -1)
+                GFFUSE_LOGERR ("%s: waitpid: %s", progname, strerror (errno));
 
+        if (status != 0)
+                res = -1;
 
-/* gluster-specific routines */
+ out_restore:
+        sigprocmask (SIG_SETMASK, &oldmask, NULL);
+        return res;
+}
 
-static char *
-escape (char *s)
+#ifndef FUSE_UTIL
+static
+#endif
+char
+*fuse_mnt_resolve_path (const char *progname, const char *orig)
 {
-        size_t len = 0;
-        char *p = NULL;
-        char *q = NULL;
-        char *e = NULL;
-
-        for (p = s; *p; p++) {
-                if (*p == ',')
-                       len++;
-                len++;
+        char buf[PATH_MAX];
+        char *copy;
+        char *dst;
+        char *end;
+        char *lastcomp;
+        const char *toresolv;
+
+        if (!orig[0]) {
+                GFFUSE_LOGERR ("%s: invalid mountpoint '%s'", progname, orig);
+                return NULL;
         }
 
-        e = CALLOC (1, len + 1);
-        if (!e)
+        copy = strdup (orig);
+        if (copy == NULL) {
+                GFFUSE_LOGERR ("%s: failed to allocate memory", progname);
                 return NULL;
+        }
 
-        for (p = s, q = e; *p; p++, q++) {
-                if (*p == ',') {
-                        *q = '\\';
-                        q++;
+        toresolv = copy;
+        lastcomp = NULL;
+        for (end = copy + strlen (copy) - 1; end > copy && *end == '/'; end --);
+        if (end[0] != '/') {
+                char *tmp;
+                end[1] = '\0';
+                tmp = strrchr (copy, '/');
+                if (tmp == NULL) {
+                        lastcomp = copy;
+                        toresolv = ".";
+                } else {
+                        lastcomp = tmp + 1;
+                        if (tmp == copy)
+                                toresolv = "/";
                 }
-                *q = *p;
+                if (strcmp (lastcomp, ".") == 0 || strcmp (lastcomp, "..") == 0) {
+                        lastcomp = NULL;
+                        toresolv = copy;
+                }
+                else if (tmp)
+                        tmp[0] = '\0';
         }
-
-        return e;
+        if (realpath (toresolv, buf) == NULL) {
+                GFFUSE_LOGERR ("%s: bad mount point %s: %s", progname, orig,
+                               strerror (errno));
+                FREE (copy);
+                return NULL;
+        }
+        if (lastcomp == NULL)
+                dst = strdup (buf);
+        else {
+                dst = (char *) MALLOC (strlen (buf) + 1 + strlen (lastcomp) + 1);
+                if (dst) {
+                        unsigned buflen = strlen (buf);
+                        if (buflen && buf[buflen-1] == '/')
+                                sprintf (dst, "%s%s", buf, lastcomp);
+                        else
+                                sprintf (dst, "%s/%s", buf, lastcomp);
+                }
+        }
+        FREE (copy);
+        if (dst == NULL)
+                GFFUSE_LOGERR ("%s: failed to allocate memory", progname);
+        return dst;
 }
 
+#ifndef FUSE_UTIL
+/* return value:
+ * >= 0         => fd
+ * -1         => error
+ */
 static int
-fuse_mount_fusermount (const char *mountpoint, char *fsname,
-                       unsigned long mountflags, char *mnt_param,
-                       int fd)
+receive_fd (int fd)
 {
-        int  pid = -1;
-        int  res = 0;
-        int  ret = -1;
-        char *fm_mnt_params = NULL;
-        char *efsname = NULL;
-
-#ifndef GF_FUSERMOUNT
-        GFFUSE_LOGERR ("Mounting via helper utility "
-                       "(unprivileged mounting) is supported "
-                       "only if glusterfs is compiled with "
-                       "--enable-fusermount");
-        return -1;
-#endif
-
-        efsname = escape (fsname);
-        if (!efsname) {
-                GFFUSE_LOGERR ("Out of memory");
+        struct msghdr msg;
+        struct iovec iov;
+        char buf[1];
+        int rv;
+        size_t ccmsg[CMSG_SPACE (sizeof (int)) / sizeof (size_t)];
+        struct cmsghdr *cmsg;
+        int *recv_fd;
+
+        iov.iov_base = buf;
+        iov.iov_len = 1;
+
+        msg.msg_name = 0;
+        msg.msg_namelen = 0;
+        msg.msg_iov = &iov;
+        msg.msg_iovlen = 1;
+        /* old BSD implementations should use msg_accrights instead of
+         * msg_control; the interface is different. */
+        msg.msg_control = ccmsg;
+        msg.msg_controllen = sizeof (ccmsg);
+
+        while (((rv = recvmsg (fd, &msg, 0)) == -1) && errno == EINTR);
+        if (rv == -1) {
+                GFFUSE_LOGERR ("recvmsg failed: %s", strerror (errno));
+                return -1;
+        }
+        if (!rv) {
+                /* EOF */
+                return -1;
+        }
 
+        cmsg = CMSG_FIRSTHDR (&msg);
+        /*
+         * simplify condition expression
+         */
+        if (cmsg->cmsg_type != SCM_RIGHTS) {
+                GFFUSE_LOGERR ("got control message of unknown type %d",
+                               cmsg->cmsg_type);
                 return -1;
         }
-        ret = asprintf (&fm_mnt_params,
-                        "%s%s,fsname=%s,nonempty,subtype=glusterfs",
-                        (mountflags & MS_RDONLY) ? "ro," : "",
-                        mnt_param, efsname);
-        FREE (efsname);
-        if (ret == -1) {
-                GFFUSE_LOGERR ("Out of memory");
 
-                goto out;
+        recv_fd = (int *) CMSG_DATA (cmsg);
+        return (*recv_fd);
+}
+
+static int
+fuse_mount_fusermount (const char *mountpoint, const char *opts)
+{
+        int fds[2], pid;
+        int res;
+        int rv;
+
+        res = socketpair (PF_UNIX, SOCK_STREAM, 0, fds);
+        if (res == -1) {
+                GFFUSE_LOGERR ("socketpair() failed: %s", strerror (errno));
+                return -1;
         }
 
-        /* fork to exec fusermount */
         pid = fork ();
         if (pid == -1) {
                 GFFUSE_LOGERR ("fork() failed: %s", strerror (errno));
-                ret = -1;
-                goto out;
+                close (fds[0]);
+                close (fds[1]);
+                return -1;
         }
 
         if (pid == 0) {
@@ -149,37 +326,214 @@ fuse_mount_fusermount (const char *mountpoint, char *fsname,
                 int a = 0;
 
                 argv[a++] = FUSERMOUNT_PROG;
-                argv[a++] = "-o";
-                argv[a++] = fm_mnt_params;
+                if (opts) {
+                        argv[a++] = "-o";
+                        argv[a++] = opts;
+                }
                 argv[a++] = "--";
                 argv[a++] = mountpoint;
                 argv[a++] = NULL;
 
-                snprintf (env, sizeof (env), "%i", fd);
-                setenv (FUSE_DEVFD_ENV, env, 1);
+                close (fds[1]);
+                fcntl (fds[0], F_SETFD, 0);
+                snprintf (env, sizeof (env), "%i", fds[0]);
+                setenv (FUSE_COMMFD_ENV, env, 1);
                 execvp (FUSERMOUNT_PROG, (char **)argv);
                 GFFUSE_LOGERR ("failed to exec fusermount: %s",
                                strerror (errno));
                 _exit (1);
         }
 
-        ret = waitpid (pid, &res, 0);
-        ret = (ret == pid && res == 0) ? 0 : -1;
- out:
-        FREE (fm_mnt_params);
-        return ret;
+        close (fds[0]);
+        rv = receive_fd (fds[1]);
+        close (fds[1]);
+        waitpid (pid, NULL, 0); /* bury zombie */
+
+        return rv;
 }
+#endif
 
+#ifndef FUSE_UTIL
+static
+#endif
+int
+fuse_mnt_umount (const char *progname, const char *abs_mnt,
+                 const char *rel_mnt, int lazy)
+{
+        int res;
+        int status;
+        sigset_t blockmask;
+        sigset_t oldmask;
+
+        if (!mtab_needs_update (abs_mnt)) {
+                res = umount2 (rel_mnt, lazy ? 2 : 0);
+                if (res == -1)
+                        GFFUSE_LOGERR ("%s: failed to unmount %s: %s",
+                                       progname, abs_mnt, strerror (errno));
+                return res;
+        }
+
+        sigemptyset (&blockmask);
+        sigaddset (&blockmask, SIGCHLD);
+        res = sigprocmask (SIG_BLOCK, &blockmask, &oldmask);
+        if (res == -1) {
+                GFFUSE_LOGERR ("%s: sigprocmask: %s", progname,
+                               strerror (errno));
+                return -1;
+        }
+
+        res = fork ();
+        if (res == -1) {
+                GFFUSE_LOGERR ("%s: fork: %s", progname, strerror (errno));
+                goto out_restore;
+        }
+        if (res == 0) {
+                sigprocmask (SIG_SETMASK, &oldmask, NULL);
+                setuid (geteuid ());
+                execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,
+                      lazy ? "-l" : NULL, NULL);
+                GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",
+                               progname, strerror (errno));
+                exit (1);
+        }
+        res = waitpid (res, &status, 0);
+        if (res == -1)
+                GFFUSE_LOGERR ("%s: waitpid: %s", progname, strerror (errno));
+
+        if (status != 0)
+                res = -1;
+
+ out_restore:
+        sigprocmask (SIG_SETMASK, &oldmask, NULL);
+        return res;
+}
+
+#ifdef FUSE_UTIL
+int
+fuse_mnt_check_empty (const char *progname, const char *mnt,
+                      mode_t rootmode, off_t rootsize)
+{
+        int isempty = 1;
+
+        if (S_ISDIR (rootmode)) {
+                struct dirent *ent;
+                DIR *dp = opendir (mnt);
+                if (dp == NULL) {
+                        fprintf (stderr,
+                                 "%s: failed to open mountpoint for reading: %s\n",
+                                 progname, strerror (errno));
+                        return -1;
+                }
+                while ((ent = readdir (dp)) != NULL) {
+                        if (strcmp (ent->d_name, ".") != 0 &&
+                            strcmp (ent->d_name, "..") != 0) {
+                                isempty = 0;
+                                break;
+                        }
+                }
+                closedir (dp);
+        } else if (rootsize)
+                isempty = 0;
+
+        if (!isempty) {
+                fprintf (stderr, "%s: mountpoint is not empty\n", progname);
+                fprintf (stderr, "%s: if you are sure this is safe, "
+                         "use the 'nonempty' mount option\n", progname);
+                return -1;
+        }
+        return 0;
+}
+
+int
+fuse_mnt_check_fuseblk (void)
+{
+        char buf[256];
+        FILE *f = fopen ("/proc/filesystems", "r");
+        if (!f)
+                return 1;
+
+        while (fgets (buf, sizeof (buf), f))
+                if (strstr (buf, "fuseblk\n")) {
+                        fclose (f);
+                        return 1;
+                }
+
+        fclose (f);
+        return 0;
+}
+#endif
+
+#ifndef FUSE_UTIL
+void
+gf_fuse_unmount (const char *mountpoint, int fd)
+{
+        int res;
+        int pid;
+
+        if (!mountpoint)
+                return;
+
+        if (fd != -1) {
+                struct pollfd pfd;
+
+                pfd.fd = fd;
+                pfd.events = 0;
+                res = poll (&pfd, 1, 0);
+                /* If file poll returns POLLERR on the device file descriptor,
+                   then the filesystem is already unmounted */
+                if (res == 1 && (pfd.revents & POLLERR))
+                        return;
+
+                /* Need to close file descriptor, otherwise synchronous umount
+                   would recurse into filesystem, and deadlock */
+                close (fd);
+        }
+
+        if (geteuid () == 0) {
+                fuse_mnt_umount ("fuse", mountpoint, mountpoint, 1);
+                return;
+        }
+
+        res = umount2 (mountpoint, 2);
+        if (res == 0)
+                return;
+
+        pid = fork ();
+        if (pid == -1)
+                return;
+
+        if (pid == 0) {
+                const char *argv[] = { FUSERMOUNT_PROG, "-u", "-q", "-z",
+                                       "--", mountpoint, NULL };
+
+                execvp (FUSERMOUNT_PROG, (char **)argv);
+                _exit (1);
+        }
+        waitpid (pid, NULL, 0);
+}
+#endif
+
+/*
+ * Functions below are loosely modelled after similar functions of libfuse
+ */
+
+#ifndef FUSE_UTIL
 static int
-fuse_mount_sys (const char *mountpoint, char *fsname,
-                unsigned long mountflags, char *mnt_param, int fd)
+fuse_mount_sys (const char *mountpoint, char *fsname, char *mnt_param)
 {
-        int ret = -1;
+        int fd = -1, ret = -1;
         unsigned mounted = 0;
         char *mnt_param_mnt = NULL;
         char *fstype = "fuse.glusterfs";
         char *source = fsname;
 
+        fd = open ("/dev/fuse", O_RDWR);
+        if (fd == -1) {
+                GFFUSE_LOGERR ("cannot open /dev/fuse (%s)", strerror (errno));
+
+                return -1;
+        }
+
         ret = asprintf (&mnt_param_mnt,
                         "%s,fd=%i,rootmode=%o,user_id=%i,group_id=%i",
                         mnt_param, fd, S_IFDIR, getuid (), getgid ());
@@ -188,7 +542,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
 
                 goto out;
         }
-        ret = mount (source, mountpoint, fstype, mountflags,
+        ret = mount (source, mountpoint, fstype, 0,
                      mnt_param_mnt);
         if (ret == -1 && errno == ENODEV) {
                 /* fs subtype support was added by 79c0b2df aka
@@ -201,7 +555,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
 
                         goto out;
                 }
-                ret = mount (source, mountpoint, fstype, mountflags,
+                ret = mount (source, mountpoint, fstype, 0,
                              mnt_param_mnt);
         }
         if (ret == -1)
@@ -209,10 +563,8 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
         else
                 mounted = 1;
 
-#ifndef __NetBSD__
         if (geteuid () == 0) {
                 char *newmnt = fuse_mnt_resolve_path ("fuse", mountpoint);
-                char *mnt_param_mtab = NULL;
 
                 if (!newmnt) {
                         ret = -1;
@@ -220,17 +572,8 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
                         goto out;
                 }
 
-                ret = asprintf (&mnt_param_mtab, "%s%s",
-                                mountflags & MS_RDONLY ? "ro," : "",
-                                mnt_param);
-                if (ret == -1)
-                        GFFUSE_LOGERR ("Out of memory");
-                else {
-                        ret = fuse_mnt_add_mount ("fuse", source, newmnt,
-                                                  fstype, mnt_param_mtab);
-                        FREE (mnt_param_mtab);
-                }
-
+                ret = fuse_mnt_add_mount ("fuse", source, newmnt, fstype,
+                                          mnt_param);
                 FREE (newmnt);
                 if (ret == -1) {
                         GFFUSE_LOGERR ("failed to add mtab entry");
@@ -238,76 +581,94 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
                         goto out;
                 }
         }
-#endif /* __NetBSD__ */
 
-out:
+ out:
         if (ret == -1) {
                 if (mounted)
                         umount2 (mountpoint, 2); /* lazy umount */
+                close (fd);
+                fd = -1;
         }
         FREE (mnt_param_mnt);
         if (source != fsname)
                 FREE (source);
+        return fd;
+}
 
-        return ret;
+static char *
+escape (char *s)
+{
+        size_t len = 0;
+        char *p = NULL;
+        char *q = NULL;
+        char *e = NULL;
+
+        for (p = s; *p; p++) {
+                if (*p == ',')
+                       len++;
+                len++;
+        }
+
+        e = CALLOC (1, len + 1);
+        if (!e)
+                return NULL;
+
+        for (p = s, q = e; *p; p++, q++) {
+                if (*p == ',') {
+                        *q = '\\';
+                        q++;
+                }
+                *q = *p;
+        }
+
+        return e;
 }
 
 int
-gf_fuse_mount (const char *mountpoint, char *fsname,
-               unsigned long mountflags, char *mnt_param,
-               pid_t *mnt_pid, int status_fd)
+gf_fuse_mount (const char *mountpoint, char *fsname, char *mnt_param)
 {
-        int   fd  = -1;
-        pid_t pid = -1;
-        int   ret = -1;
+        int fd = -1, rv = -1;
+        char *fm_mnt_params = NULL, *p = NULL;
+        char *efsname = NULL;
 
-        fd = open ("/dev/fuse", O_RDWR);
+        fd = fuse_mount_sys (mountpoint, fsname, mnt_param);
         if (fd == -1) {
-                GFFUSE_LOGERR ("cannot open /dev/fuse (%s)",
-                                strerror (errno));
-                return -1;
-        }
+                gf_log ("glusterfs-fuse", GF_LOG_INFO,
+                        "direct mount failed (%s), "
+                        "retry to mount via fusermount",
+                        strerror (errno));
+
+                efsname = escape (fsname);
+                if (!efsname) {
+                        GFFUSE_LOGERR ("Out of memory");
 
-        /* start mount agent */
-        pid = fork();
-        switch (pid) {
-        case 0:
-                /* hello it's mount agent */
-                if (!mnt_pid) {
-                        /* daemonize mount agent, caller is
-                         * not interested in waiting for it
-                         */
-                        pid = fork ();
-                        if (pid)
-                                exit (pid == -1 ? 1 : 0);
+                        return -1;
                 }
+                rv = asprintf (&fm_mnt_params,
+                               "%s,fsname=%s,nonempty,subtype=glusterfs",
+                               mnt_param, efsname);
+                FREE (efsname);
+                if (rv == -1) {
+                        GFFUSE_LOGERR ("Out of memory");
 
-                ret = fuse_mount_sys (mountpoint, fsname, mountflags, mnt_param, fd);
-                if (ret == -1) {
-                        gf_log ("glusterfs-fuse", GF_LOG_INFO,
-                                "direct mount failed (%s), "
-                                "retry to mount via fusermount",
-                                strerror (errno));
+                        return -1;
+                }
 
-                        ret = fuse_mount_fusermount (mountpoint, fsname, mountflags,
-                                                     mnt_param, fd);
+                fd = fuse_mount_fusermount (mountpoint, fm_mnt_params);
+                if (fd == -1) {
+                        p = fm_mnt_params + strlen (fm_mnt_params);
+                        while (*--p != ',');
+                        *p = '\0';
+
+                        fd = fuse_mount_fusermount (mountpoint, fm_mnt_params);
                 }
 
-                if (ret == -1)
-                        GFFUSE_LOGERR ("mount of %s to %s (%s) failed",
-                                       fsname, mountpoint, mnt_param);
+                FREE (fm_mnt_params);
 
-                if (status_fd >= 0)
-                        (void)write (status_fd, &ret, sizeof (ret));
-                exit (!!ret);
-                /* bye mount agent */
-        case -1:
-                close (fd);
-                fd = -1;
+                if (fd == -1)
+                       GFFUSE_LOGERR ("mount failed");
         }
 
-        if (mnt_pid)
-               *mnt_pid = pid;
-
         return fd;
 }
+#endif
diff --git a/contrib/fuse-util/Makefile.am b/contrib/fuse-util/Makefile.am
index 971d3d220..a72e3832b 100644
--- a/contrib/fuse-util/Makefile.am
+++ b/contrib/fuse-util/Makefile.am
@@ -1,11 +1,9 @@
 bin_PROGRAMS = fusermount-glusterfs
 
-fusermount_glusterfs_SOURCES = fusermount.c mount_util.c $(CONTRIBDIR)/fuse-lib/mount-common.c
-noinst_HEADERS = $(CONTRIBDIR)/fuse-include/mount_util.h
+fusermount_glusterfs_SOURCES = fusermount.c $(CONTRIBDIR)/fuse-lib/mount.c
+noinst_HEADERS = mount_util.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) -DFUSE_UTIL -I$(CONTRIBDIR)/fuse-include
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
+AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -DFUSE_UTIL $(GF_CFLAGS) -D_GNU_SOURCE
 
 install-exec-hook:
 	-chown root $(DESTDIR)$(bindir)/fusermount-glusterfs
diff --git a/contrib/fuse-util/fusermount.c b/contrib/fuse-util/fusermount.c
index 0ff8d9039..39da9b6a0 100644
--- a/contrib/fuse-util/fusermount.c
+++ b/contrib/fuse-util/fusermount.c
@@ -19,7 +19,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
-#include <limits.h>
 #include <mntent.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -29,7 +28,6 @@
 #include <sys/utsname.h>
 #include <sched.h>
 
-#define FUSE_DEVFD_ENV		"_FUSE_DEVFD"
 #define FUSE_COMMFD_ENV		"_FUSE_COMMFD"
 
 #define FUSE_DEV_OLD "/proc/fs/fuse/dev"
@@ -116,16 +114,8 @@ static int lock_umount(void)
 
 static void unlock_umount(int mtablock)
 {
-	if (mtablock >= 0) {
-		int res;
-
-		res = lockf(mtablock, F_ULOCK, 0);
-		if (res < 0) {
-			fprintf(stderr, "%s: error releasing lock: %s\n",
-				progname, strerror(errno));
-		}
-		close(mtablock);
-	}
+	lockf(mtablock, F_ULOCK, 0);
+	close(mtablock);
 }
 
 static int add_mount(const char *source, const char *mnt, const char *type,
@@ -248,7 +238,7 @@ static int check_is_mount_child(void *p)
 	}
 
 	count = 0;
-	while (getmntent(fp) != NULL)
+	while ((entp = getmntent(fp)) != NULL)
 		count++;
 	endmntent(fp);
 
@@ -335,7 +325,7 @@ static int check_is_mount(const char *last, const char *mnt)
 	return 0;
 }
 
-static int chdir_to_parent(char *copy, const char **lastp)
+static int chdir_to_parent(char *copy, const char **lastp, int *currdir_fd)
 {
 	char *tmp;
 	const char *parent;
@@ -360,6 +350,14 @@ static int chdir_to_parent(char *copy, const char **lastp)
 		parent = "/";
 	}
 
+	*currdir_fd = open(".", O_RDONLY);
+	if (*currdir_fd == -1) {
+		fprintf(stderr,
+			"%s: failed to open current directory: %s\n",
+			progname, strerror(errno));
+		return -1;
+	}
+
 	res = chdir(parent);
 	if (res == -1) {
 		fprintf(stderr, "%s: failed to chdir to %s: %s\n",
@@ -384,6 +382,7 @@ static int chdir_to_parent(char *copy, const char **lastp)
 
 static int unmount_fuse_locked(const char *mnt, int quiet, int lazy)
 {
+	int currdir_fd = -1;
 	char *copy;
 	const char *last;
 	int res;
@@ -400,7 +399,7 @@ static int unmount_fuse_locked(const char *mnt, int quiet, int lazy)
 		return -1;
 	}
 
-	res = chdir_to_parent(copy, &last);
+	res = chdir_to_parent(copy, &last, &currdir_fd);
 	if (res == -1)
 		goto out;
 
@@ -412,6 +411,10 @@ static int unmount_fuse_locked(const char *mnt, int quiet, int lazy)
 
 out:
 	free(copy);
+	if (currdir_fd != -1) {
+		fchdir(currdir_fd);
+		close(currdir_fd);
+	}
 
 	return res;
 }
@@ -505,13 +508,13 @@ static void read_conf(void)
 		int isnewline = 1;
 		while (fgets(line, sizeof(line), fp) != NULL) {
 			if (isnewline) {
-				if (strlen(line) && line[strlen(line)-1] == '\n') {
+				if (line[strlen(line)-1] == '\n') {
 					strip_line(line);
 					parse_line(line, linenum);
 				} else {
 					isnewline = 0;
 				}
-			} else if(strlen(line) && line[strlen(line)-1] == '\n') {
+			} else if(line[strlen(line)-1] == '\n') {
 				fprintf(stderr, "%s: reading %s: line %i too long\n", progname, FUSE_CONF, linenum);
 
 				isnewline = 1;
@@ -606,7 +609,7 @@ static int add_option(char **optsp, const char *opt, unsigned expand)
 static int get_mnt_opts(int flags, char *opts, char **mnt_optsp)
 {
 	int i;
-	size_t l;
+	int l;
 
 	if (!(flags & MS_RDONLY) && add_option(mnt_optsp, "rw", 0) == -1)
 		return -1;
@@ -621,7 +624,7 @@ static int get_mnt_opts(int flags, char *opts, char **mnt_optsp)
 		return -1;
 	/* remove comma from end of opts*/
 	l = strlen(*mnt_optsp);
-	if (l && (*mnt_optsp)[l-1] == ',')
+	if ((*mnt_optsp)[l-1] == ',')
 		(*mnt_optsp)[l-1] = '\0';
 	if (getuid() != 0) {
 		const char *user = get_user_name();
@@ -650,7 +653,8 @@ static int get_string_opt(const char *s, unsigned len, const char *opt,
 	unsigned opt_len = strlen(opt);
 	char *d;
 
-	free(*val);
+	if (*val)
+		free(*val);
 	*val = (char *) malloc(len - opt_len + 1);
 	if (!*val) {
 		fprintf(stderr, "%s: failed to allocate memory\n", progname);
@@ -819,14 +823,15 @@ static int do_mount(const char *mnt, char **typep, mode_t rootmode,
 			fprintf(stderr, "%s: mount failed: %s\n", progname,
 				strerror(errno_save));
 		goto err;
+	} else {
+		*sourcep = source;
+		*typep = type;
+		*mnt_optsp = mnt_opts;
 	}
-	*sourcep = source;
-	*typep = type;
-	*mnt_optsp = mnt_opts;
 	free(fsname);
 	free(optbuf);
 
-	return 0;
+	return res;
 
 err:
 	free(fsname);
@@ -869,7 +874,8 @@ static int check_version(const char *dev)
 	return 0;
 }
 
-static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
+static int check_perm(const char **mntp, struct stat *stbuf, int *currdir_fd,
+		      int *mountpoint_fd)
 {
 	int res;
 	const char *mnt = *mntp;
@@ -887,6 +893,13 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
 		return 0;
 
 	if (S_ISDIR(stbuf->st_mode)) {
+		*currdir_fd = open(".", O_RDONLY);
+		if (*currdir_fd == -1) {
+			fprintf(stderr,
+				"%s: failed to open current directory: %s\n",
+				progname, strerror(errno));
+			return -1;
+		}
 		res = chdir(mnt);
 		if (res == -1) {
 			fprintf(stderr,
@@ -1003,36 +1016,8 @@ static int open_fuse_device(char **devp)
 	return -1;
 }
 
-static int check_fuse_device(char *devfd, char **devp)
-{
-	int res;
-	char *devlink;
 
-	res = asprintf(&devlink, "/proc/self/fd/%s", devfd);
-	if (res == -1) {
-		fprintf(stderr, "%s: failed to allocate memory\n", progname);
-		return -1;
-	}
-
-	*devp = (char *) calloc(1, PATH_MAX + 1);
-	if (!*devp) {
-		fprintf(stderr, "%s: failed to allocate memory\n", progname);
-		free(devlink);
-		return -1;
-	}
-
-	res = readlink (devlink, *devp, PATH_MAX);
-	free (devlink);
-	if (res == -1) {
-		fprintf(stderr, "%s: specified fuse fd is invalid\n",
-			progname);
-		return -1;
-	}
-
-	return atoi(devfd);
-}
-
-static int mount_fuse(const char *mnt, const char *opts, char *devfd)
+static int mount_fuse(const char *mnt, const char *opts)
 {
 	int res;
 	int fd;
@@ -1042,9 +1027,10 @@ static int mount_fuse(const char *mnt, const char *opts, char *devfd)
 	char *source = NULL;
 	char *mnt_opts = NULL;
 	const char *real_mnt = mnt;
+	int currdir_fd = -1;
 	int mountpoint_fd = -1;
 
-	fd = devfd ? check_fuse_device(devfd, &dev) : open_fuse_device(&dev);
+	fd = open_fuse_device(&dev);
 	if (fd == -1)
 		return -1;
 
@@ -1055,13 +1041,15 @@ static int mount_fuse(const char *mnt, const char *opts, char *devfd)
 		int mount_count = count_fuse_fs();
 		if (mount_count >= mount_max) {
 			fprintf(stderr, "%s: too many FUSE filesystems mounted; mount_max=N can be set in /etc/fuse.conf\n", progname);
-			goto fail_close_fd;
+			close(fd);
+			return -1;
 		}
 	}
 
 	res = check_version(dev);
 	if (res != -1) {
-		res = check_perm(&real_mnt, &stbuf, &mountpoint_fd);
+		res = check_perm(&real_mnt, &stbuf, &currdir_fd,
+				 &mountpoint_fd);
 		restore_privs();
 		if (res != -1)
 			res = do_mount(real_mnt, &type, stbuf.st_mode & S_IFMT,
@@ -1070,38 +1058,33 @@ static int mount_fuse(const char *mnt, const char *opts, char *devfd)
 	} else
 		restore_privs();
 
+	if (currdir_fd != -1) {
+		fchdir(currdir_fd);
+		close(currdir_fd);
+	}
 	if (mountpoint_fd != -1)
 		close(mountpoint_fd);
 
-	if (res == -1)
-		goto fail_close_fd;
-
-	res = chdir("/");
 	if (res == -1) {
-		fprintf(stderr, "%s: failed to chdir to '/'\n", progname);
-		goto fail_close_fd;
+		close(fd);
+		return -1;
 	}
 
 	if (geteuid() == 0) {
 		res = add_mount(source, mnt, type, mnt_opts);
 		if (res == -1) {
-			/* Can't clean up mount in a non-racy way */
-			goto fail_close_fd;
+			umount2(mnt, 2); /* lazy umount */
+			close(fd);
+			return -1;
 		}
 	}
 
-out_free:
 	free(source);
 	free(type);
 	free(mnt_opts);
 	free(dev);
 
 	return fd;
-
-fail_close_fd:
-	close(fd);
-	fd = -1;
-	goto out_free;
 }
 
 static int send_fd(int sock_fd, int fd)
@@ -1171,7 +1154,6 @@ int main(int argc, char *argv[])
 	static int unmount = 0;
 	static int lazy = 0;
 	static int quiet = 0;
-	char *devfd;
 	char *commfd;
 	int cfd;
 	const char *opts = "";
@@ -1240,13 +1222,6 @@ int main(int argc, char *argv[])
 
 	drop_privs();
 	mnt = fuse_mnt_resolve_path(progname, origmnt);
-	if (mnt != NULL) {
-		res = chdir("/");
-		if (res == -1) {
-			fprintf(stderr, "%s: failed to chdir to '/'\n", progname);
-			exit(1);
-		}
-	}
 	restore_privs();
 	if (mnt == NULL)
 		exit(1);
@@ -1267,26 +1242,21 @@ int main(int argc, char *argv[])
 		return 0;
 	}
 
-	devfd = getenv(FUSE_DEVFD_ENV);
-	if (devfd == NULL) {
-		commfd = getenv(FUSE_COMMFD_ENV);
-		if (commfd == NULL) {
-			fprintf(stderr, "%s: old style mounting not supported\n",
-				progname);
-			exit(1);
-		}
+	commfd = getenv(FUSE_COMMFD_ENV);
+	if (commfd == NULL) {
+		fprintf(stderr, "%s: old style mounting not supported\n",
+			progname);
+		exit(1);
 	}
 
-	fd = mount_fuse(mnt, opts, devfd);
+	fd = mount_fuse(mnt, opts);
 	if (fd == -1)
 		exit(1);
 
-	if (devfd == NULL) {
-		cfd = atoi(commfd);
-		res = send_fd(cfd, fd);
-		if (res == -1)
-			exit(1);
-	}
+	cfd = atoi(commfd);
+	res = send_fd(cfd, fd);
+	if (res == -1)
+		exit(1);
 
 	return 0;
 }
diff --git a/contrib/fuse-util/mount_util.c b/contrib/fuse-util/mount_util.c
deleted file mode 100644
index 911b84445..000000000
--- a/contrib/fuse-util/mount_util.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-  FUSE: Filesystem in Userspace
-  Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
-
-  This program can be distributed under the terms of the GNU LGPLv2.
-  See the file COPYING.LIB.
-*/
-
-#include <dirent.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int fuse_mnt_check_empty(const char *progname, const char *mnt,
-			 mode_t rootmode, off_t rootsize)
-{
-	int isempty = 1;
-
-	if (S_ISDIR(rootmode)) {
-		struct dirent *ent;
-		DIR *dp = opendir(mnt);
-		if (dp == NULL) {
-			fprintf(stderr,
-				"%s: failed to open mountpoint for reading: %s\n",
-				progname, strerror(errno));
-			return -1;
-		}
-		while ((ent = readdir(dp)) != NULL) {
-			if (strcmp(ent->d_name, ".") != 0 &&
-			    strcmp(ent->d_name, "..") != 0) {
-				isempty = 0;
-				break;
-			}
-		}
-		closedir(dp);
-	} else if (rootsize)
-		isempty = 0;
-
-	if (!isempty) {
-		fprintf(stderr, "%s: mountpoint is not empty\n", progname);
-		fprintf(stderr, "%s: if you are sure this is safe, use the 'nonempty' mount option\n", progname);
-		return -1;
-	}
-	return 0;
-}
-
-int fuse_mnt_check_fuseblk(void)
-{
-	char buf[256];
-	FILE *f = fopen("/proc/filesystems", "r");
-	if (!f)
-		return 1;
-
-	while (fgets(buf, sizeof(buf), f))
-		if (strstr(buf, "fuseblk\n")) {
-			fclose(f);
-			return 1;
-		}
-
-	fclose(f);
-	return 0;
-}
diff --git a/contrib/fuse-include/mount_util.h b/contrib/fuse-util/mount_util.h
index f392f99f1..f392f99f1 100644
--- a/contrib/fuse-include/mount_util.h
+++ b/contrib/fuse-util/mount_util.h
diff --git a/contrib/ipaddr-py/COPYING b/contrib/ipaddr-py/COPYING
deleted file mode 100644
index d64569567..000000000
--- a/contrib/ipaddr-py/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/contrib/ipaddr-py/MANIFEST.in b/contrib/ipaddr-py/MANIFEST.in
deleted file mode 100644
index f57280444..000000000
--- a/contrib/ipaddr-py/MANIFEST.in
+++ /dev/null
@@ -1,3 +0,0 @@
-include COPYING
-include ipaddr_test.py
-include RELEASENOTES
diff --git a/contrib/ipaddr-py/OWNERS b/contrib/ipaddr-py/OWNERS
deleted file mode 100644
index 501673e03..000000000
--- a/contrib/ipaddr-py/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-pmoody
-harro
-mshields
-smart
diff --git a/contrib/ipaddr-py/README b/contrib/ipaddr-py/README
deleted file mode 100644
index 1b54294bb..000000000
--- a/contrib/ipaddr-py/README
+++ /dev/null
@@ -1,8 +0,0 @@
-ipaddr.py is a library for working with IP addresses, both IPv4 and IPv6.
-It was developed by Google for internal use, and is now open source.
-
-Project home page: http://code.google.com/p/ipaddr-py/
-
-Please send contributions to ipaddr-py-dev@googlegroups.com.  Code should
-include unit tests and follow the Google Python style guide:
-http://code.google.com/p/soc/wiki/PythonStyleGuide
diff --git a/contrib/ipaddr-py/ipaddr.py b/contrib/ipaddr-py/ipaddr.py
deleted file mode 100644
index a89298a31..000000000
--- a/contrib/ipaddr-py/ipaddr.py
+++ /dev/null
@@ -1,1907 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2007 Google Inc.
-#  Licensed to PSF under a Contributor Agreement.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-
-"""A fast, lightweight IPv4/IPv6 manipulation library in Python.
-
-This library is used to create/poke/manipulate IPv4 and IPv6 addresses
-and networks.
-
-"""
-
-__version__ = 'trunk'
-
-import struct
-
-IPV4LENGTH = 32
-IPV6LENGTH = 128
-
-
-class AddressValueError(ValueError):
-    """A Value Error related to the address."""
-
-
-class NetmaskValueError(ValueError):
-    """A Value Error related to the netmask."""
-
-
-def IPAddress(address, version=None):
-    """Take an IP string/int and return an object of the correct type.
-
-    Args:
-        address: A string or integer, the IP address.  Either IPv4 or
-          IPv6 addresses may be supplied; integers less than 2**32 will
-          be considered to be IPv4 by default.
-        version: An Integer, 4 or 6. If set, don't try to automatically
-          determine what the IP address type is. important for things
-          like IPAddress(1), which could be IPv4, '0.0.0.1',  or IPv6,
-          '::1'.
-
-    Returns:
-        An IPv4Address or IPv6Address object.
-
-    Raises:
-        ValueError: if the string passed isn't either a v4 or a v6
-          address.
-
-    """
-    if version:
-        if version == 4:
-            return IPv4Address(address)
-        elif version == 6:
-            return IPv6Address(address)
-
-    try:
-        return IPv4Address(address)
-    except (AddressValueError, NetmaskValueError):
-        pass
-
-    try:
-        return IPv6Address(address)
-    except (AddressValueError, NetmaskValueError):
-        pass
-
-    raise ValueError('%r does not appear to be an IPv4 or IPv6 address' %
-                     address)
-
-
-def IPNetwork(address, version=None, strict=False):
-    """Take an IP string/int and return an object of the correct type.
-
-    Args:
-        address: A string or integer, the IP address.  Either IPv4 or
-          IPv6 addresses may be supplied; integers less than 2**32 will
-          be considered to be IPv4 by default.
-        version: An Integer, if set, don't try to automatically
-          determine what the IP address type is. important for things
-          like IPNetwork(1), which could be IPv4, '0.0.0.1/32', or IPv6,
-          '::1/128'.
-
-    Returns:
-        An IPv4Network or IPv6Network object.
-
-    Raises:
-        ValueError: if the string passed isn't either a v4 or a v6
-          address. Or if a strict network was requested and a strict
-          network wasn't given.
-
-    """
-    if version:
-        if version == 4:
-            return IPv4Network(address, strict)
-        elif version == 6:
-            return IPv6Network(address, strict)
-
-    try:
-        return IPv4Network(address, strict)
-    except (AddressValueError, NetmaskValueError):
-        pass
-
-    try:
-        return IPv6Network(address, strict)
-    except (AddressValueError, NetmaskValueError):
-        pass
-
-    raise ValueError('%r does not appear to be an IPv4 or IPv6 network' %
-                     address)
-
-
-def v4_int_to_packed(address):
-    """The binary representation of this address.
-
-    Args:
-        address: An integer representation of an IPv4 IP address.
-
-    Returns:
-        The binary representation of this address.
-
-    Raises:
-        ValueError: If the integer is too large to be an IPv4 IP
-          address.
-    """
-    if address > _BaseV4._ALL_ONES:
-        raise ValueError('Address too large for IPv4')
-    return struct.pack('!I', address)
-
-
-def v6_int_to_packed(address):
-    """The binary representation of this address.
-
-    Args:
-        address: An integer representation of an IPv4 IP address.
-
-    Returns:
-        The binary representation of this address.
-    """
-    return struct.pack('!QQ', address >> 64, address & (2**64 - 1))
-
-
-def _find_address_range(addresses):
-    """Find a sequence of addresses.
-
-    Args:
-        addresses: a list of IPv4 or IPv6 addresses.
-
-    Returns:
-        A tuple containing the first and last IP addresses in the sequence.
-
-    """
-    first = last = addresses[0]
-    for ip in addresses[1:]:
-        if ip._ip == last._ip + 1:
-            last = ip
-        else:
-            break
-    return (first, last)
-
-def _get_prefix_length(number1, number2, bits):
-    """Get the number of leading bits that are same for two numbers.
-
-    Args:
-        number1: an integer.
-        number2: another integer.
-        bits: the maximum number of bits to compare.
-
-    Returns:
-        The number of leading bits that are the same for two numbers.
-
-    """
-    for i in range(bits):
-        if number1 >> i == number2 >> i:
-            return bits - i
-    return 0
-
-def _count_righthand_zero_bits(number, bits):
-    """Count the number of zero bits on the right hand side.
-
-    Args:
-        number: an integer.
-        bits: maximum number of bits to count.
-
-    Returns:
-        The number of zero bits on the right hand side of the number.
-
-    """
-    if number == 0:
-        return bits
-    for i in range(bits):
-        if (number >> i) % 2:
-            return i
-
-def summarize_address_range(first, last):
-    """Summarize a network range given the first and last IP addresses.
-
-    Example:
-        >>> summarize_address_range(IPv4Address('1.1.1.0'),
-            IPv4Address('1.1.1.130'))
-        [IPv4Network('1.1.1.0/25'), IPv4Network('1.1.1.128/31'),
-        IPv4Network('1.1.1.130/32')]
-
-    Args:
-        first: the first IPv4Address or IPv6Address in the range.
-        last: the last IPv4Address or IPv6Address in the range.
-
-    Returns:
-        The address range collapsed to a list of IPv4Network's or
-        IPv6Network's.
-
-    Raise:
-        TypeError:
-            If the first and last objects are not IP addresses.
-            If the first and last objects are not the same version.
-        ValueError:
-            If the last object is not greater than the first.
-            If the version is not 4 or 6.
-
-    """
-    if not (isinstance(first, _BaseIP) and isinstance(last, _BaseIP)):
-        raise TypeError('first and last must be IP addresses, not networks')
-    if first.version != last.version:
-        raise TypeError("%s and %s are not of the same version" % (
-                str(first), str(last)))
-    if first > last:
-        raise ValueError('last IP address must be greater than first')
-
-    networks = []
-
-    if first.version == 4:
-        ip = IPv4Network
-    elif first.version == 6:
-        ip = IPv6Network
-    else:
-        raise ValueError('unknown IP version')
-
-    ip_bits = first._max_prefixlen
-    first_int = first._ip
-    last_int = last._ip
-    while first_int <= last_int:
-        nbits = _count_righthand_zero_bits(first_int, ip_bits)
-        current = None
-        while nbits >= 0:
-            addend = 2**nbits - 1
-            current = first_int + addend
-            nbits -= 1
-            if current <= last_int:
-                break
-        prefix = _get_prefix_length(first_int, current, ip_bits)
-        net = ip('%s/%d' % (str(first), prefix))
-        networks.append(net)
-        if current == ip._ALL_ONES:
-            break
-        first_int = current + 1
-        first = IPAddress(first_int, version=first._version)
-    return networks
-
-def _collapse_address_list_recursive(addresses):
-    """Loops through the addresses, collapsing concurrent netblocks.
-
-    Example:
-
-        ip1 = IPv4Network('1.1.0.0/24')
-        ip2 = IPv4Network('1.1.1.0/24')
-        ip3 = IPv4Network('1.1.2.0/24')
-        ip4 = IPv4Network('1.1.3.0/24')
-        ip5 = IPv4Network('1.1.4.0/24')
-        ip6 = IPv4Network('1.1.0.1/22')
-
-        _collapse_address_list_recursive([ip1, ip2, ip3, ip4, ip5, ip6]) ->
-          [IPv4Network('1.1.0.0/22'), IPv4Network('1.1.4.0/24')]
-
-        This shouldn't be called directly; it is called via
-          collapse_address_list([]).
-
-    Args:
-        addresses: A list of IPv4Network's or IPv6Network's
-
-    Returns:
-        A list of IPv4Network's or IPv6Network's depending on what we were
-        passed.
-
-    """
-    ret_array = []
-    optimized = False
-
-    for cur_addr in addresses:
-        if not ret_array:
-            ret_array.append(cur_addr)
-            continue
-        if cur_addr in ret_array[-1]:
-            optimized = True
-        elif cur_addr == ret_array[-1].supernet().subnet()[1]:
-            ret_array.append(ret_array.pop().supernet())
-            optimized = True
-        else:
-            ret_array.append(cur_addr)
-
-    if optimized:
-        return _collapse_address_list_recursive(ret_array)
-
-    return ret_array
-
-
-def collapse_address_list(addresses):
-    """Collapse a list of IP objects.
-
-    Example:
-        collapse_address_list([IPv4('1.1.0.0/24'), IPv4('1.1.1.0/24')]) ->
-          [IPv4('1.1.0.0/23')]
-
-    Args:
-        addresses: A list of IPv4Network or IPv6Network objects.
-
-    Returns:
-        A list of IPv4Network or IPv6Network objects depending on what we
-        were passed.
-
-    Raises:
-        TypeError: If passed a list of mixed version objects.
-
-    """
-    i = 0
-    addrs = []
-    ips = []
-    nets = []
-
-    # split IP addresses and networks
-    for ip in addresses:
-        if isinstance(ip, _BaseIP):
-            if ips and ips[-1]._version != ip._version:
-                raise TypeError("%s and %s are not of the same version" % (
-                        str(ip), str(ips[-1])))
-            ips.append(ip)
-        elif ip._prefixlen == ip._max_prefixlen:
-            if ips and ips[-1]._version != ip._version:
-                raise TypeError("%s and %s are not of the same version" % (
-                        str(ip), str(ips[-1])))
-            ips.append(ip.ip)
-        else:
-            if nets and nets[-1]._version != ip._version:
-                raise TypeError("%s and %s are not of the same version" % (
-                        str(ip), str(ips[-1])))
-            nets.append(ip)
-
-    # sort and dedup
-    ips = sorted(set(ips))
-    nets = sorted(set(nets))
-
-    while i < len(ips):
-        (first, last) = _find_address_range(ips[i:])
-        i = ips.index(last) + 1
-        addrs.extend(summarize_address_range(first, last))
-
-    return _collapse_address_list_recursive(sorted(
-        addrs + nets, key=_BaseNet._get_networks_key))
-
-# backwards compatibility
-CollapseAddrList = collapse_address_list
-
-# Test whether this Python implementation supports byte objects that
-# are not identical to str ones.
-# We need to exclude platforms where bytes == str so that we can
-# distinguish between packed representations and strings, for example
-# b'12::' (the IPv4 address 49.50.58.58) and '12::' (an IPv6 address).
-try:
-    _compat_has_real_bytes = bytes is not str
-except NameError: # <Python2.6
-    _compat_has_real_bytes = False
-
-def get_mixed_type_key(obj):
-    """Return a key suitable for sorting between networks and addresses.
-
-    Address and Network objects are not sortable by default; they're
-    fundamentally different so the expression
-
-        IPv4Address('1.1.1.1') <= IPv4Network('1.1.1.1/24')
-
-    doesn't make any sense.  There are some times however, where you may wish
-    to have ipaddr sort these for you anyway. If you need to do this, you
-    can use this function as the key= argument to sorted().
-
-    Args:
-      obj: either a Network or Address object.
-    Returns:
-      appropriate key.
-
-    """
-    if isinstance(obj, _BaseNet):
-        return obj._get_networks_key()
-    elif isinstance(obj, _BaseIP):
-        return obj._get_address_key()
-    return NotImplemented
-
-class _IPAddrBase(object):
-
-    """The mother class."""
-
-    def __index__(self):
-        return self._ip
-
-    def __int__(self):
-        return self._ip
-
-    def __hex__(self):
-        return hex(self._ip)
-
-    @property
-    def exploded(self):
-        """Return the longhand version of the IP address as a string."""
-        return self._explode_shorthand_ip_string()
-
-    @property
-    def compressed(self):
-        """Return the shorthand version of the IP address as a string."""
-        return str(self)
-
-
-class _BaseIP(_IPAddrBase):
-
-    """A generic IP object.
-
-    This IP class contains the version independent methods which are
-    used by single IP addresses.
-
-    """
-
-    def __init__(self, address):
-        if (not (_compat_has_real_bytes and isinstance(address, bytes))
-            and '/' in str(address)):
-            raise AddressValueError(address)
-
-    def __eq__(self, other):
-        try:
-            return (self._ip == other._ip
-                    and self._version == other._version)
-        except AttributeError:
-            return NotImplemented
-
-    def __ne__(self, other):
-        eq = self.__eq__(other)
-        if eq is NotImplemented:
-            return NotImplemented
-        return not eq
-
-    def __le__(self, other):
-        gt = self.__gt__(other)
-        if gt is NotImplemented:
-            return NotImplemented
-        return not gt
-
-    def __ge__(self, other):
-        lt = self.__lt__(other)
-        if lt is NotImplemented:
-            return NotImplemented
-        return not lt
-
-    def __lt__(self, other):
-        if self._version != other._version:
-            raise TypeError('%s and %s are not of the same version' % (
-                    str(self), str(other)))
-        if not isinstance(other, _BaseIP):
-            raise TypeError('%s and %s are not of the same type' % (
-                    str(self), str(other)))
-        if self._ip != other._ip:
-            return self._ip < other._ip
-        return False
-
-    def __gt__(self, other):
-        if self._version != other._version:
-            raise TypeError('%s and %s are not of the same version' % (
-                    str(self), str(other)))
-        if not isinstance(other, _BaseIP):
-            raise TypeError('%s and %s are not of the same type' % (
-                    str(self), str(other)))
-        if self._ip != other._ip:
-            return self._ip > other._ip
-        return False
-
-    # Shorthand for Integer addition and subtraction. This is not
-    # meant to ever support addition/subtraction of addresses.
-    def __add__(self, other):
-        if not isinstance(other, int):
-            return NotImplemented
-        return IPAddress(int(self) + other, version=self._version)
-
-    def __sub__(self, other):
-        if not isinstance(other, int):
-            return NotImplemented
-        return IPAddress(int(self) - other, version=self._version)
-
-    def __repr__(self):
-        return '%s(%r)' % (self.__class__.__name__, str(self))
-
-    def __str__(self):
-        return  '%s' % self._string_from_ip_int(self._ip)
-
-    def __hash__(self):
-        return hash(hex(long(self._ip)))
-
-    def _get_address_key(self):
-        return (self._version, self)
-
-    @property
-    def version(self):
-        raise NotImplementedError('BaseIP has no version')
-
-
-class _BaseNet(_IPAddrBase):
-
-    """A generic IP object.
-
-    This IP class contains the version independent methods which are
-    used by networks.
-
-    """
-
-    def __init__(self, address):
-        self._cache = {}
-
-    def __repr__(self):
-        return '%s(%r)' % (self.__class__.__name__, str(self))
-
-    def iterhosts(self):
-        """Generate Iterator over usable hosts in a network.
-
-           This is like __iter__ except it doesn't return the network
-           or broadcast addresses.
-
-        """
-        cur = int(self.network) + 1
-        bcast = int(self.broadcast) - 1
-        while cur <= bcast:
-            cur += 1
-            yield IPAddress(cur - 1, version=self._version)
-
-    def __iter__(self):
-        cur = int(self.network)
-        bcast = int(self.broadcast)
-        while cur <= bcast:
-            cur += 1
-            yield IPAddress(cur - 1, version=self._version)
-
-    def __getitem__(self, n):
-        network = int(self.network)
-        broadcast = int(self.broadcast)
-        if n >= 0:
-            if network + n > broadcast:
-                raise IndexError
-            return IPAddress(network + n, version=self._version)
-        else:
-            n += 1
-            if broadcast + n < network:
-                raise IndexError
-            return IPAddress(broadcast + n, version=self._version)
-
-    def __lt__(self, other):
-        if self._version != other._version:
-            raise TypeError('%s and %s are not of the same version' % (
-                    str(self), str(other)))
-        if not isinstance(other, _BaseNet):
-            raise TypeError('%s and %s are not of the same type' % (
-                    str(self), str(other)))
-        if self.network != other.network:
-            return self.network < other.network
-        if self.netmask != other.netmask:
-            return self.netmask < other.netmask
-        return False
-
-    def __gt__(self, other):
-        if self._version != other._version:
-            raise TypeError('%s and %s are not of the same version' % (
-                    str(self), str(other)))
-        if not isinstance(other, _BaseNet):
-            raise TypeError('%s and %s are not of the same type' % (
-                    str(self), str(other)))
-        if self.network != other.network:
-            return self.network > other.network
-        if self.netmask != other.netmask:
-            return self.netmask > other.netmask
-        return False
-
-    def __le__(self, other):
-        gt = self.__gt__(other)
-        if gt is NotImplemented:
-            return NotImplemented
-        return not gt
-
-    def __ge__(self, other):
-        lt = self.__lt__(other)
-        if lt is NotImplemented:
-            return NotImplemented
-        return not lt
-
-    def __eq__(self, other):
-        try:
-            return (self._version == other._version
-                    and self.network == other.network
-                    and int(self.netmask) == int(other.netmask))
-        except AttributeError:
-            if isinstance(other, _BaseIP):
-                return (self._version == other._version
-                        and self._ip == other._ip)
-
-    def __ne__(self, other):
-        eq = self.__eq__(other)
-        if eq is NotImplemented:
-            return NotImplemented
-        return not eq
-
-    def __str__(self):
-        return  '%s/%s' % (str(self.ip),
-                           str(self._prefixlen))
-
-    def __hash__(self):
-        return hash(int(self.network) ^ int(self.netmask))
-
-    def __contains__(self, other):
-        # always false if one is v4 and the other is v6.
-        if self._version != other._version:
-          return False
-        # dealing with another network.
-        if isinstance(other, _BaseNet):
-            return (self.network <= other.network and
-                    self.broadcast >= other.broadcast)
-        # dealing with another address
-        else:
-            return (int(self.network) <= int(other._ip) <=
-                    int(self.broadcast))
-
-    def overlaps(self, other):
-        """Tell if self is partly contained in other."""
-        return self.network in other or self.broadcast in other or (
-            other.network in self or other.broadcast in self)
-
-    @property
-    def network(self):
-        x = self._cache.get('network')
-        if x is None:
-            x = IPAddress(self._ip & int(self.netmask), version=self._version)
-            self._cache['network'] = x
-        return x
-
-    @property
-    def broadcast(self):
-        x = self._cache.get('broadcast')
-        if x is None:
-            x = IPAddress(self._ip | int(self.hostmask), version=self._version)
-            self._cache['broadcast'] = x
-        return x
-
-    @property
-    def hostmask(self):
-        x = self._cache.get('hostmask')
-        if x is None:
-            x = IPAddress(int(self.netmask) ^ self._ALL_ONES,
-                          version=self._version)
-            self._cache['hostmask'] = x
-        return x
-
-    @property
-    def with_prefixlen(self):
-        return '%s/%d' % (str(self.ip), self._prefixlen)
-
-    @property
-    def with_netmask(self):
-        return '%s/%s' % (str(self.ip), str(self.netmask))
-
-    @property
-    def with_hostmask(self):
-        return '%s/%s' % (str(self.ip), str(self.hostmask))
-
-    @property
-    def numhosts(self):
-        """Number of hosts in the current subnet."""
-        return int(self.broadcast) - int(self.network) + 1
-
-    @property
-    def version(self):
-        raise NotImplementedError('BaseNet has no version')
-
-    @property
-    def prefixlen(self):
-        return self._prefixlen
-
-    def address_exclude(self, other):
-        """Remove an address from a larger block.
-
-        For example:
-
-            addr1 = IPNetwork('10.1.1.0/24')
-            addr2 = IPNetwork('10.1.1.0/26')
-            addr1.address_exclude(addr2) =
-                [IPNetwork('10.1.1.64/26'), IPNetwork('10.1.1.128/25')]
-
-        or IPv6:
-
-            addr1 = IPNetwork('::1/32')
-            addr2 = IPNetwork('::1/128')
-            addr1.address_exclude(addr2) = [IPNetwork('::0/128'),
-                IPNetwork('::2/127'),
-                IPNetwork('::4/126'),
-                IPNetwork('::8/125'),
-                ...
-                IPNetwork('0:0:8000::/33')]
-
-        Args:
-            other: An IPvXNetwork object of the same type.
-
-        Returns:
-            A sorted list of IPvXNetwork objects addresses which is self
-            minus other.
-
-        Raises:
-            TypeError: If self and other are of difffering address
-              versions, or if other is not a network object.
-            ValueError: If other is not completely contained by self.
-
-        """
-        if not self._version == other._version:
-            raise TypeError("%s and %s are not of the same version" % (
-                str(self), str(other)))
-
-        if not isinstance(other, _BaseNet):
-            raise TypeError("%s is not a network object" % str(other))
-
-        if other not in self:
-            raise ValueError('%s not contained in %s' % (str(other),
-                                                         str(self)))
-        if other == self:
-            return []
-
-        ret_addrs = []
-
-        # Make sure we're comparing the network of other.
-        other = IPNetwork('%s/%s' % (str(other.network), str(other.prefixlen)),
-                   version=other._version)
-
-        s1, s2 = self.subnet()
-        while s1 != other and s2 != other:
-            if other in s1:
-                ret_addrs.append(s2)
-                s1, s2 = s1.subnet()
-            elif other in s2:
-                ret_addrs.append(s1)
-                s1, s2 = s2.subnet()
-            else:
-                # If we got here, there's a bug somewhere.
-                assert True == False, ('Error performing exclusion: '
-                                       's1: %s s2: %s other: %s' %
-                                       (str(s1), str(s2), str(other)))
-        if s1 == other:
-            ret_addrs.append(s2)
-        elif s2 == other:
-            ret_addrs.append(s1)
-        else:
-            # If we got here, there's a bug somewhere.
-            assert True == False, ('Error performing exclusion: '
-                                   's1: %s s2: %s other: %s' %
-                                   (str(s1), str(s2), str(other)))
-
-        return sorted(ret_addrs, key=_BaseNet._get_networks_key)
-
-    def compare_networks(self, other):
-        """Compare two IP objects.
-
-        This is only concerned about the comparison of the integer
-        representation of the network addresses.  This means that the
-        host bits aren't considered at all in this method.  If you want
-        to compare host bits, you can easily enough do a
-        'HostA._ip < HostB._ip'
-
-        Args:
-            other: An IP object.
-
-        Returns:
-            If the IP versions of self and other are the same, returns:
-
-            -1 if self < other:
-              eg: IPv4('1.1.1.0/24') < IPv4('1.1.2.0/24')
-              IPv6('1080::200C:417A') < IPv6('1080::200B:417B')
-            0 if self == other
-              eg: IPv4('1.1.1.1/24') == IPv4('1.1.1.2/24')
-              IPv6('1080::200C:417A/96') == IPv6('1080::200C:417B/96')
-            1 if self > other
-              eg: IPv4('1.1.1.0/24') > IPv4('1.1.0.0/24')
-              IPv6('1080::1:200C:417A/112') >
-              IPv6('1080::0:200C:417A/112')
-
-            If the IP versions of self and other are different, returns:
-
-            -1 if self._version < other._version
-              eg: IPv4('10.0.0.1/24') < IPv6('::1/128')
-            1 if self._version > other._version
-              eg: IPv6('::1/128') > IPv4('255.255.255.0/24')
-
-        """
-        if self._version < other._version:
-            return -1
-        if self._version > other._version:
-            return 1
-        # self._version == other._version below here:
-        if self.network < other.network:
-            return -1
-        if self.network > other.network:
-            return 1
-        # self.network == other.network below here:
-        if self.netmask < other.netmask:
-            return -1
-        if self.netmask > other.netmask:
-            return 1
-        # self.network == other.network and self.netmask == other.netmask
-        return 0
-
-    def _get_networks_key(self):
-        """Network-only key function.
-
-        Returns an object that identifies this address' network and
-        netmask. This function is a suitable "key" argument for sorted()
-        and list.sort().
-
-        """
-        return (self._version, self.network, self.netmask)
-
-    def _ip_int_from_prefix(self, prefixlen=None):
-        """Turn the prefix length netmask into a int for comparison.
-
-        Args:
-            prefixlen: An integer, the prefix length.
-
-        Returns:
-            An integer.
-
-        """
-        if not prefixlen and prefixlen != 0:
-            prefixlen = self._prefixlen
-        return self._ALL_ONES ^ (self._ALL_ONES >> prefixlen)
-
-    def _prefix_from_ip_int(self, ip_int, mask=32):
-        """Return prefix length from the decimal netmask.
-
-        Args:
-            ip_int: An integer, the IP address.
-            mask: The netmask.  Defaults to 32.
-
-        Returns:
-            An integer, the prefix length.
-
-        """
-        while mask:
-            if ip_int & 1 == 1:
-                break
-            ip_int >>= 1
-            mask -= 1
-
-        return mask
-
-    def _ip_string_from_prefix(self, prefixlen=None):
-        """Turn a prefix length into a dotted decimal string.
-
-        Args:
-            prefixlen: An integer, the netmask prefix length.
-
-        Returns:
-            A string, the dotted decimal netmask string.
-
-        """
-        if not prefixlen:
-            prefixlen = self._prefixlen
-        return self._string_from_ip_int(self._ip_int_from_prefix(prefixlen))
-
-    def iter_subnets(self, prefixlen_diff=1, new_prefix=None):
-        """The subnets which join to make the current subnet.
-
-        In the case that self contains only one IP
-        (self._prefixlen == 32 for IPv4 or self._prefixlen == 128
-        for IPv6), return a list with just ourself.
-
-        Args:
-            prefixlen_diff: An integer, the amount the prefix length
-              should be increased by. This should not be set if
-              new_prefix is also set.
-            new_prefix: The desired new prefix length. This must be a
-              larger number (smaller prefix) than the existing prefix.
-              This should not be set if prefixlen_diff is also set.
-
-        Returns:
-            An iterator of IPv(4|6) objects.
-
-        Raises:
-            ValueError: The prefixlen_diff is too small or too large.
-                OR
-            prefixlen_diff and new_prefix are both set or new_prefix
-              is a smaller number than the current prefix (smaller
-              number means a larger network)
-
-        """
-        if self._prefixlen == self._max_prefixlen:
-            yield self
-            return
-
-        if new_prefix is not None:
-            if new_prefix < self._prefixlen:
-                raise ValueError('new prefix must be longer')
-            if prefixlen_diff != 1:
-                raise ValueError('cannot set prefixlen_diff and new_prefix')
-            prefixlen_diff = new_prefix - self._prefixlen
-
-        if prefixlen_diff < 0:
-            raise ValueError('prefix length diff must be > 0')
-        new_prefixlen = self._prefixlen + prefixlen_diff
-
-        if not self._is_valid_netmask(str(new_prefixlen)):
-            raise ValueError(
-                'prefix length diff %d is invalid for netblock %s' % (
-                    new_prefixlen, str(self)))
-
-        first = IPNetwork('%s/%s' % (str(self.network),
-                                     str(self._prefixlen + prefixlen_diff)),
-                         version=self._version)
-
-        yield first
-        current = first
-        while True:
-            broadcast = current.broadcast
-            if broadcast == self.broadcast:
-                return
-            new_addr = IPAddress(int(broadcast) + 1, version=self._version)
-            current = IPNetwork('%s/%s' % (str(new_addr), str(new_prefixlen)),
-                                version=self._version)
-
-            yield current
-
-    def masked(self):
-        """Return the network object with the host bits masked out."""
-        return IPNetwork('%s/%d' % (self.network, self._prefixlen),
-                         version=self._version)
-
-    def subnet(self, prefixlen_diff=1, new_prefix=None):
-        """Return a list of subnets, rather than an iterator."""
-        return list(self.iter_subnets(prefixlen_diff, new_prefix))
-
-    def supernet(self, prefixlen_diff=1, new_prefix=None):
-        """The supernet containing the current network.
-
-        Args:
-            prefixlen_diff: An integer, the amount the prefix length of
-              the network should be decreased by.  For example, given a
-              /24 network and a prefixlen_diff of 3, a supernet with a
-              /21 netmask is returned.
-
-        Returns:
-            An IPv4 network object.
-
-        Raises:
-            ValueError: If self.prefixlen - prefixlen_diff < 0. I.e., you have a
-              negative prefix length.
-                OR
-            If prefixlen_diff and new_prefix are both set or new_prefix is a
-              larger number than the current prefix (larger number means a
-              smaller network)
-
-        """
-        if self._prefixlen == 0:
-            return self
-
-        if new_prefix is not None:
-            if new_prefix > self._prefixlen:
-                raise ValueError('new prefix must be shorter')
-            if prefixlen_diff != 1:
-                raise ValueError('cannot set prefixlen_diff and new_prefix')
-            prefixlen_diff = self._prefixlen - new_prefix
-
-
-        if self.prefixlen - prefixlen_diff < 0:
-            raise ValueError(
-                'current prefixlen is %d, cannot have a prefixlen_diff of %d' %
-                (self.prefixlen, prefixlen_diff))
-        return IPNetwork('%s/%s' % (str(self.network),
-                                    str(self.prefixlen - prefixlen_diff)),
-                         version=self._version)
-
-    # backwards compatibility
-    Subnet = subnet
-    Supernet = supernet
-    AddressExclude = address_exclude
-    CompareNetworks = compare_networks
-    Contains = __contains__
-
-
-class _BaseV4(object):
-
-    """Base IPv4 object.
-
-    The following methods are used by IPv4 objects in both single IP
-    addresses and networks.
-
-    """
-
-    # Equivalent to 255.255.255.255 or 32 bits of 1's.
-    _ALL_ONES = (2**IPV4LENGTH) - 1
-    _DECIMAL_DIGITS = frozenset('0123456789')
-
-    def __init__(self, address):
-        self._version = 4
-        self._max_prefixlen = IPV4LENGTH
-
-    def _explode_shorthand_ip_string(self, ip_str=None):
-        if not ip_str:
-            ip_str = str(self)
-        return ip_str
-
-    def _ip_int_from_string(self, ip_str):
-        """Turn the given IP string into an integer for comparison.
-
-        Args:
-            ip_str: A string, the IP ip_str.
-
-        Returns:
-            The IP ip_str as an integer.
-
-        Raises:
-            AddressValueError: if ip_str isn't a valid IPv4 Address.
-
-        """
-        octets = ip_str.split('.')
-        if len(octets) != 4:
-            raise AddressValueError(ip_str)
-
-        packed_ip = 0
-        for oc in octets:
-            try:
-                packed_ip = (packed_ip << 8) | self._parse_octet(oc)
-            except ValueError:
-                raise AddressValueError(ip_str)
-        return packed_ip
-
-    def _parse_octet(self, octet_str):
-        """Convert a decimal octet into an integer.
-
-        Args:
-            octet_str: A string, the number to parse.
-
-        Returns:
-            The octet as an integer.
-
-        Raises:
-            ValueError: if the octet isn't strictly a decimal from [0..255].
-
-        """
-        # Whitelist the characters, since int() allows a lot of bizarre stuff.
-        if not self._DECIMAL_DIGITS.issuperset(octet_str):
-            raise ValueError
-        octet_int = int(octet_str, 10)
-        # Disallow leading zeroes, because no clear standard exists on
-        # whether these should be interpreted as decimal or octal.
-        if octet_int > 255 or (octet_str[0] == '0' and len(octet_str) > 1):
-            raise ValueError
-        return octet_int
-
-    def _string_from_ip_int(self, ip_int):
-        """Turns a 32-bit integer into dotted decimal notation.
-
-        Args:
-            ip_int: An integer, the IP address.
-
-        Returns:
-            The IP address as a string in dotted decimal notation.
-
-        """
-        octets = []
-        for _ in xrange(4):
-            octets.insert(0, str(ip_int & 0xFF))
-            ip_int >>= 8
-        return '.'.join(octets)
-
-    @property
-    def max_prefixlen(self):
-        return self._max_prefixlen
-
-    @property
-    def packed(self):
-        """The binary representation of this address."""
-        return v4_int_to_packed(self._ip)
-
-    @property
-    def version(self):
-        return self._version
-
-    @property
-    def is_reserved(self):
-       """Test if the address is otherwise IETF reserved.
-
-        Returns:
-            A boolean, True if the address is within the
-            reserved IPv4 Network range.
-
-       """
-       return self in IPv4Network('240.0.0.0/4')
-
-    @property
-    def is_private(self):
-        """Test if this address is allocated for private networks.
-
-        Returns:
-            A boolean, True if the address is reserved per RFC 1918.
-
-        """
-        return (self in IPv4Network('10.0.0.0/8') or
-                self in IPv4Network('172.16.0.0/12') or
-                self in IPv4Network('192.168.0.0/16'))
-
-    @property
-    def is_multicast(self):
-        """Test if the address is reserved for multicast use.
-
-        Returns:
-            A boolean, True if the address is multicast.
-            See RFC 3171 for details.
-
-        """
-        return self in IPv4Network('224.0.0.0/4')
-
-    @property
-    def is_unspecified(self):
-        """Test if the address is unspecified.
-
-        Returns:
-            A boolean, True if this is the unspecified address as defined in
-            RFC 5735 3.
-
-        """
-        return self in IPv4Network('0.0.0.0')
-
-    @property
-    def is_loopback(self):
-        """Test if the address is a loopback address.
-
-        Returns:
-            A boolean, True if the address is a loopback per RFC 3330.
-
-        """
-        return self in IPv4Network('127.0.0.0/8')
-
-    @property
-    def is_link_local(self):
-        """Test if the address is reserved for link-local.
-
-        Returns:
-            A boolean, True if the address is link-local per RFC 3927.
-
-        """
-        return self in IPv4Network('169.254.0.0/16')
-
-
-class IPv4Address(_BaseV4, _BaseIP):
-
-    """Represent and manipulate single IPv4 Addresses."""
-
-    def __init__(self, address):
-
-        """
-        Args:
-            address: A string or integer representing the IP
-              '192.168.1.1'
-
-              Additionally, an integer can be passed, so
-              IPv4Address('192.168.1.1') == IPv4Address(3232235777).
-              or, more generally
-              IPv4Address(int(IPv4Address('192.168.1.1'))) ==
-                IPv4Address('192.168.1.1')
-
-        Raises:
-            AddressValueError: If ipaddr isn't a valid IPv4 address.
-
-        """
-        _BaseIP.__init__(self, address)
-        _BaseV4.__init__(self, address)
-
-        # Efficient constructor from integer.
-        if isinstance(address, (int, long)):
-            self._ip = address
-            if address < 0 or address > self._ALL_ONES:
-                raise AddressValueError(address)
-            return
-
-        # Constructing from a packed address
-        if _compat_has_real_bytes:
-            if isinstance(address, bytes) and len(address) == 4:
-                self._ip = struct.unpack('!I', address)[0]
-                return
-
-        # Assume input argument to be string or any object representation
-        # which converts into a formatted IP string.
-        addr_str = str(address)
-        self._ip = self._ip_int_from_string(addr_str)
-
-
-class IPv4Network(_BaseV4, _BaseNet):
-
-    """This class represents and manipulates 32-bit IPv4 networks.
-
-    Attributes: [examples for IPv4Network('1.2.3.4/27')]
-        ._ip: 16909060
-        .ip: IPv4Address('1.2.3.4')
-        .network: IPv4Address('1.2.3.0')
-        .hostmask: IPv4Address('0.0.0.31')
-        .broadcast: IPv4Address('1.2.3.31')
-        .netmask: IPv4Address('255.255.255.224')
-        .prefixlen: 27
-
-    """
-
-    # the valid octets for host and netmasks. only useful for IPv4.
-    _valid_mask_octets = set((255, 254, 252, 248, 240, 224, 192, 128, 0))
-
-    def __init__(self, address, strict=False):
-        """Instantiate a new IPv4 network object.
-
-        Args:
-            address: A string or integer representing the IP [& network].
-              '192.168.1.1/24'
-              '192.168.1.1/255.255.255.0'
-              '192.168.1.1/0.0.0.255'
-              are all functionally the same in IPv4. Similarly,
-              '192.168.1.1'
-              '192.168.1.1/255.255.255.255'
-              '192.168.1.1/32'
-              are also functionaly equivalent. That is to say, failing to
-              provide a subnetmask will create an object with a mask of /32.
-
-              If the mask (portion after the / in the argument) is given in
-              dotted quad form, it is treated as a netmask if it starts with a
-              non-zero field (e.g. /255.0.0.0 == /8) and as a hostmask if it
-              starts with a zero field (e.g. 0.255.255.255 == /8), with the
-              single exception of an all-zero mask which is treated as a
-              netmask == /0. If no mask is given, a default of /32 is used.
-
-              Additionally, an integer can be passed, so
-              IPv4Network('192.168.1.1') == IPv4Network(3232235777).
-              or, more generally
-              IPv4Network(int(IPv4Network('192.168.1.1'))) ==
-                IPv4Network('192.168.1.1')
-
-            strict: A boolean. If true, ensure that we have been passed
-              A true network address, eg, 192.168.1.0/24 and not an
-              IP address on a network, eg, 192.168.1.1/24.
-
-        Raises:
-            AddressValueError: If ipaddr isn't a valid IPv4 address.
-            NetmaskValueError: If the netmask isn't valid for
-              an IPv4 address.
-            ValueError: If strict was True and a network address was not
-              supplied.
-
-        """
-        _BaseNet.__init__(self, address)
-        _BaseV4.__init__(self, address)
-
-        # Efficient constructor from integer.
-        if isinstance(address, (int, long)):
-            self._ip = address
-            self.ip = IPv4Address(self._ip)
-            self._prefixlen = self._max_prefixlen
-            self.netmask = IPv4Address(self._ALL_ONES)
-            if address < 0 or address > self._ALL_ONES:
-                raise AddressValueError(address)
-            return
-
-        # Constructing from a packed address
-        if _compat_has_real_bytes:
-            if isinstance(address, bytes) and len(address) == 4:
-                self._ip = struct.unpack('!I', address)[0]
-                self.ip = IPv4Address(self._ip)
-                self._prefixlen = self._max_prefixlen
-                self.netmask = IPv4Address(self._ALL_ONES)
-                return
-
-        # Assume input argument to be string or any object representation
-        # which converts into a formatted IP prefix string.
-        addr = str(address).split('/')
-
-        if len(addr) > 2:
-            raise AddressValueError(address)
-
-        self._ip = self._ip_int_from_string(addr[0])
-        self.ip = IPv4Address(self._ip)
-
-        if len(addr) == 2:
-            mask = addr[1].split('.')
-            if len(mask) == 4:
-                # We have dotted decimal netmask.
-                if self._is_valid_netmask(addr[1]):
-                    self.netmask = IPv4Address(self._ip_int_from_string(
-                            addr[1]))
-                elif self._is_hostmask(addr[1]):
-                    self.netmask = IPv4Address(
-                        self._ip_int_from_string(addr[1]) ^ self._ALL_ONES)
-                else:
-                    raise NetmaskValueError('%s is not a valid netmask'
-                                                     % addr[1])
-
-                self._prefixlen = self._prefix_from_ip_int(int(self.netmask))
-            else:
-                # We have a netmask in prefix length form.
-                if not self._is_valid_netmask(addr[1]):
-                    raise NetmaskValueError(addr[1])
-                self._prefixlen = int(addr[1])
-                self.netmask = IPv4Address(self._ip_int_from_prefix(
-                    self._prefixlen))
-        else:
-            self._prefixlen = self._max_prefixlen
-            self.netmask = IPv4Address(self._ip_int_from_prefix(
-                self._prefixlen))
-        if strict:
-            if self.ip != self.network:
-                raise ValueError('%s has host bits set' %
-                                 self.ip)
-
-    def _is_hostmask(self, ip_str):
-        """Test if the IP string is a hostmask (rather than a netmask).
-
-        Args:
-            ip_str: A string, the potential hostmask.
-
-        Returns:
-            A boolean, True if the IP string is a hostmask.
-
-        """
-        bits = ip_str.split('.')
-        try:
-            parts = [int(x) for x in bits if int(x) in self._valid_mask_octets]
-        except ValueError:
-            return False
-        if len(parts) != len(bits):
-            return False
-        if parts[0] < parts[-1]:
-            return True
-        return False
-
-    def _is_valid_netmask(self, netmask):
-        """Verify that the netmask is valid.
-
-        Args:
-            netmask: A string, either a prefix or dotted decimal
-              netmask.
-
-        Returns:
-            A boolean, True if the prefix represents a valid IPv4
-            netmask.
-
-        """
-        mask = netmask.split('.')
-        if len(mask) == 4:
-            if [x for x in mask if int(x) not in self._valid_mask_octets]:
-                return False
-            if [y for idx, y in enumerate(mask) if idx > 0 and
-                y > mask[idx - 1]]:
-                return False
-            return True
-        try:
-            netmask = int(netmask)
-        except ValueError:
-            return False
-        return 0 <= netmask <= self._max_prefixlen
-
-    # backwards compatibility
-    IsRFC1918 = lambda self: self.is_private
-    IsMulticast = lambda self: self.is_multicast
-    IsLoopback = lambda self: self.is_loopback
-    IsLinkLocal = lambda self: self.is_link_local
-
-
-class _BaseV6(object):
-
-    """Base IPv6 object.
-
-    The following methods are used by IPv6 objects in both single IP
-    addresses and networks.
-
-    """
-
-    _ALL_ONES = (2**IPV6LENGTH) - 1
-    _HEXTET_COUNT = 8
-    _HEX_DIGITS = frozenset('0123456789ABCDEFabcdef')
-
-    def __init__(self, address):
-        self._version = 6
-        self._max_prefixlen = IPV6LENGTH
-
-    def _ip_int_from_string(self, ip_str):
-        """Turn an IPv6 ip_str into an integer.
-
-        Args:
-            ip_str: A string, the IPv6 ip_str.
-
-        Returns:
-            A long, the IPv6 ip_str.
-
-        Raises:
-            AddressValueError: if ip_str isn't a valid IPv6 Address.
-
-        """
-        parts = ip_str.split(':')
-
-        # An IPv6 address needs at least 2 colons (3 parts).
-        if len(parts) < 3:
-            raise AddressValueError(ip_str)
-
-        # If the address has an IPv4-style suffix, convert it to hexadecimal.
-        if '.' in parts[-1]:
-            ipv4_int = IPv4Address(parts.pop())._ip
-            parts.append('%x' % ((ipv4_int >> 16) & 0xFFFF))
-            parts.append('%x' % (ipv4_int & 0xFFFF))
-
-        # An IPv6 address can't have more than 8 colons (9 parts).
-        if len(parts) > self._HEXTET_COUNT + 1:
-            raise AddressValueError(ip_str)
-
-        # Disregarding the endpoints, find '::' with nothing in between.
-        # This indicates that a run of zeroes has been skipped.
-        try:
-            skip_index, = (
-                [i for i in xrange(1, len(parts) - 1) if not parts[i]] or
-                [None])
-        except ValueError:
-            # Can't have more than one '::'
-            raise AddressValueError(ip_str)
-
-        # parts_hi is the number of parts to copy from above/before the '::'
-        # parts_lo is the number of parts to copy from below/after the '::'
-        if skip_index is not None:
-            # If we found a '::', then check if it also covers the endpoints.
-            parts_hi = skip_index
-            parts_lo = len(parts) - skip_index - 1
-            if not parts[0]:
-                parts_hi -= 1
-                if parts_hi:
-                    raise AddressValueError(ip_str)  # ^: requires ^::
-            if not parts[-1]:
-                parts_lo -= 1
-                if parts_lo:
-                    raise AddressValueError(ip_str)  # :$ requires ::$
-            parts_skipped = self._HEXTET_COUNT - (parts_hi + parts_lo)
-            if parts_skipped < 1:
-                raise AddressValueError(ip_str)
-        else:
-            # Otherwise, allocate the entire address to parts_hi.  The endpoints
-            # could still be empty, but _parse_hextet() will check for that.
-            if len(parts) != self._HEXTET_COUNT:
-                raise AddressValueError(ip_str)
-            parts_hi = len(parts)
-            parts_lo = 0
-            parts_skipped = 0
-
-        try:
-            # Now, parse the hextets into a 128-bit integer.
-            ip_int = 0L
-            for i in xrange(parts_hi):
-                ip_int <<= 16
-                ip_int |= self._parse_hextet(parts[i])
-            ip_int <<= 16 * parts_skipped
-            for i in xrange(-parts_lo, 0):
-                ip_int <<= 16
-                ip_int |= self._parse_hextet(parts[i])
-            return ip_int
-        except ValueError:
-            raise AddressValueError(ip_str)
-
-    def _parse_hextet(self, hextet_str):
-        """Convert an IPv6 hextet string into an integer.
-
-        Args:
-            hextet_str: A string, the number to parse.
-
-        Returns:
-            The hextet as an integer.
-
-        Raises:
-            ValueError: if the input isn't strictly a hex number from [0..FFFF].
-
-        """
-        # Whitelist the characters, since int() allows a lot of bizarre stuff.
-        if not self._HEX_DIGITS.issuperset(hextet_str):
-            raise ValueError
-        hextet_int = int(hextet_str, 16)
-        if hextet_int > 0xFFFF:
-            raise ValueError
-        return hextet_int
-
-    def _compress_hextets(self, hextets):
-        """Compresses a list of hextets.
-
-        Compresses a list of strings, replacing the longest continuous
-        sequence of "0" in the list with "" and adding empty strings at
-        the beginning or at the end of the string such that subsequently
-        calling ":".join(hextets) will produce the compressed version of
-        the IPv6 address.
-
-        Args:
-            hextets: A list of strings, the hextets to compress.
-
-        Returns:
-            A list of strings.
-
-        """
-        best_doublecolon_start = -1
-        best_doublecolon_len = 0
-        doublecolon_start = -1
-        doublecolon_len = 0
-        for index in range(len(hextets)):
-            if hextets[index] == '0':
-                doublecolon_len += 1
-                if doublecolon_start == -1:
-                    # Start of a sequence of zeros.
-                    doublecolon_start = index
-                if doublecolon_len > best_doublecolon_len:
-                    # This is the longest sequence of zeros so far.
-                    best_doublecolon_len = doublecolon_len
-                    best_doublecolon_start = doublecolon_start
-            else:
-                doublecolon_len = 0
-                doublecolon_start = -1
-
-        if best_doublecolon_len > 1:
-            best_doublecolon_end = (best_doublecolon_start +
-                                    best_doublecolon_len)
-            # For zeros at the end of the address.
-            if best_doublecolon_end == len(hextets):
-                hextets += ['']
-            hextets[best_doublecolon_start:best_doublecolon_end] = ['']
-            # For zeros at the beginning of the address.
-            if best_doublecolon_start == 0:
-                hextets = [''] + hextets
-
-        return hextets
-
-    def _string_from_ip_int(self, ip_int=None):
-        """Turns a 128-bit integer into hexadecimal notation.
-
-        Args:
-            ip_int: An integer, the IP address.
-
-        Returns:
-            A string, the hexadecimal representation of the address.
-
-        Raises:
-            ValueError: The address is bigger than 128 bits of all ones.
-
-        """
-        if not ip_int and ip_int != 0:
-            ip_int = int(self._ip)
-
-        if ip_int > self._ALL_ONES:
-            raise ValueError('IPv6 address is too large')
-
-        hex_str = '%032x' % ip_int
-        hextets = []
-        for x in range(0, 32, 4):
-            hextets.append('%x' % int(hex_str[x:x+4], 16))
-
-        hextets = self._compress_hextets(hextets)
-        return ':'.join(hextets)
-
-    def _explode_shorthand_ip_string(self, ip_str=None):
-        """Expand a shortened IPv6 address.
-
-        Args:
-            ip_str: A string, the IPv6 address.
-
-        Returns:
-            A string, the expanded IPv6 address.
-
-        """
-        if not ip_str:
-            ip_str = str(self)
-            if isinstance(self, _BaseNet):
-                ip_str = str(self.ip)
-
-        ip_int = self._ip_int_from_string(ip_str)
-        parts = []
-        for i in xrange(self._HEXTET_COUNT):
-            parts.append('%04x' % (ip_int & 0xFFFF))
-            ip_int >>= 16
-        parts.reverse()
-        return ':'.join(parts)
-
-    @property
-    def max_prefixlen(self):
-        return self._max_prefixlen
-
-    @property
-    def packed(self):
-        """The binary representation of this address."""
-        return v6_int_to_packed(self._ip)
-
-    @property
-    def version(self):
-        return self._version
-
-    @property
-    def is_multicast(self):
-        """Test if the address is reserved for multicast use.
-
-        Returns:
-            A boolean, True if the address is a multicast address.
-            See RFC 2373 2.7 for details.
-
-        """
-        return self in IPv6Network('ff00::/8')
-
-    @property
-    def is_reserved(self):
-        """Test if the address is otherwise IETF reserved.
-
-        Returns:
-            A boolean, True if the address is within one of the
-            reserved IPv6 Network ranges.
-
-        """
-        return (self in IPv6Network('::/8') or
-                self in IPv6Network('100::/8') or
-                self in IPv6Network('200::/7') or
-                self in IPv6Network('400::/6') or
-                self in IPv6Network('800::/5') or
-                self in IPv6Network('1000::/4') or
-                self in IPv6Network('4000::/3') or
-                self in IPv6Network('6000::/3') or
-                self in IPv6Network('8000::/3') or
-                self in IPv6Network('A000::/3') or
-                self in IPv6Network('C000::/3') or
-                self in IPv6Network('E000::/4') or
-                self in IPv6Network('F000::/5') or
-                self in IPv6Network('F800::/6') or
-                self in IPv6Network('FE00::/9'))
-
-    @property
-    def is_unspecified(self):
-        """Test if the address is unspecified.
-
-        Returns:
-            A boolean, True if this is the unspecified address as defined in
-            RFC 2373 2.5.2.
-
-        """
-        return self._ip == 0 and getattr(self, '_prefixlen', 128) == 128
-
-    @property
-    def is_loopback(self):
-        """Test if the address is a loopback address.
-
-        Returns:
-            A boolean, True if the address is a loopback address as defined in
-            RFC 2373 2.5.3.
-
-        """
-        return self._ip == 1 and getattr(self, '_prefixlen', 128) == 128
-
-    @property
-    def is_link_local(self):
-        """Test if the address is reserved for link-local.
-
-        Returns:
-            A boolean, True if the address is reserved per RFC 4291.
-
-        """
-        return self in IPv6Network('fe80::/10')
-
-    @property
-    def is_site_local(self):
-        """Test if the address is reserved for site-local.
-
-        Note that the site-local address space has been deprecated by RFC 3879.
-        Use is_private to test if this address is in the space of unique local
-        addresses as defined by RFC 4193.
-
-        Returns:
-            A boolean, True if the address is reserved per RFC 3513 2.5.6.
-
-        """
-        return self in IPv6Network('fec0::/10')
-
-    @property
-    def is_private(self):
-        """Test if this address is allocated for private networks.
-
-        Returns:
-            A boolean, True if the address is reserved per RFC 4193.
-
-        """
-        return self in IPv6Network('fc00::/7')
-
-    @property
-    def ipv4_mapped(self):
-        """Return the IPv4 mapped address.
-
-        Returns:
-            If the IPv6 address is a v4 mapped address, return the
-            IPv4 mapped address. Return None otherwise.
-
-        """
-        if (self._ip >> 32) != 0xFFFF:
-            return None
-        return IPv4Address(self._ip & 0xFFFFFFFF)
-
-    @property
-    def teredo(self):
-        """Tuple of embedded teredo IPs.
-
-        Returns:
-            Tuple of the (server, client) IPs or None if the address
-            doesn't appear to be a teredo address (doesn't start with
-            2001::/32)
-
-        """
-        if (self._ip >> 96) != 0x20010000:
-            return None
-        return (IPv4Address((self._ip >> 64) & 0xFFFFFFFF),
-                IPv4Address(~self._ip & 0xFFFFFFFF))
-
-    @property
-    def sixtofour(self):
-        """Return the IPv4 6to4 embedded address.
-
-        Returns:
-            The IPv4 6to4-embedded address if present or None if the
-            address doesn't appear to contain a 6to4 embedded address.
-
-        """
-        if (self._ip >> 112) != 0x2002:
-            return None
-        return IPv4Address((self._ip >> 80) & 0xFFFFFFFF)
-
-
-class IPv6Address(_BaseV6, _BaseIP):
-
-    """Represent and manipulate single IPv6 Addresses.
-    """
-
-    def __init__(self, address):
-        """Instantiate a new IPv6 address object.
-
-        Args:
-            address: A string or integer representing the IP
-
-              Additionally, an integer can be passed, so
-              IPv6Address('2001:4860::') ==
-                IPv6Address(42541956101370907050197289607612071936L).
-              or, more generally
-              IPv6Address(IPv6Address('2001:4860::')._ip) ==
-                IPv6Address('2001:4860::')
-
-        Raises:
-            AddressValueError: If address isn't a valid IPv6 address.
-
-        """
-        _BaseIP.__init__(self, address)
-        _BaseV6.__init__(self, address)
-
-        # Efficient constructor from integer.
-        if isinstance(address, (int, long)):
-            self._ip = address
-            if address < 0 or address > self._ALL_ONES:
-                raise AddressValueError(address)
-            return
-
-        # Constructing from a packed address
-        if _compat_has_real_bytes:
-            if isinstance(address, bytes) and len(address) == 16:
-                tmp = struct.unpack('!QQ', address)
-                self._ip = (tmp[0] << 64) | tmp[1]
-                return
-
-        # Assume input argument to be string or any object representation
-        # which converts into a formatted IP string.
-        addr_str = str(address)
-        if not addr_str:
-            raise AddressValueError('')
-
-        self._ip = self._ip_int_from_string(addr_str)
-
-
-class IPv6Network(_BaseV6, _BaseNet):
-
-    """This class represents and manipulates 128-bit IPv6 networks.
-
-    Attributes: [examples for IPv6('2001:658:22A:CAFE:200::1/64')]
-        .ip: IPv6Address('2001:658:22a:cafe:200::1')
-        .network: IPv6Address('2001:658:22a:cafe::')
-        .hostmask: IPv6Address('::ffff:ffff:ffff:ffff')
-        .broadcast: IPv6Address('2001:658:22a:cafe:ffff:ffff:ffff:ffff')
-        .netmask: IPv6Address('ffff:ffff:ffff:ffff::')
-        .prefixlen: 64
-
-    """
-
-
-    def __init__(self, address, strict=False):
-        """Instantiate a new IPv6 Network object.
-
-        Args:
-            address: A string or integer representing the IPv6 network or the IP
-              and prefix/netmask.
-              '2001:4860::/128'
-              '2001:4860:0000:0000:0000:0000:0000:0000/128'
-              '2001:4860::'
-              are all functionally the same in IPv6.  That is to say,
-              failing to provide a subnetmask will create an object with
-              a mask of /128.
-
-              Additionally, an integer can be passed, so
-              IPv6Network('2001:4860::') ==
-                IPv6Network(42541956101370907050197289607612071936L).
-              or, more generally
-              IPv6Network(IPv6Network('2001:4860::')._ip) ==
-                IPv6Network('2001:4860::')
-
-            strict: A boolean. If true, ensure that we have been passed
-              A true network address, eg, 192.168.1.0/24 and not an
-              IP address on a network, eg, 192.168.1.1/24.
-
-        Raises:
-            AddressValueError: If address isn't a valid IPv6 address.
-            NetmaskValueError: If the netmask isn't valid for
-              an IPv6 address.
-            ValueError: If strict was True and a network address was not
-              supplied.
-
-        """
-        _BaseNet.__init__(self, address)
-        _BaseV6.__init__(self, address)
-
-        # Efficient constructor from integer.
-        if isinstance(address, (int, long)):
-            self._ip = address
-            self.ip = IPv6Address(self._ip)
-            self._prefixlen = self._max_prefixlen
-            self.netmask = IPv6Address(self._ALL_ONES)
-            if address < 0 or address > self._ALL_ONES:
-                raise AddressValueError(address)
-            return
-
-        # Constructing from a packed address
-        if _compat_has_real_bytes:
-            if isinstance(address, bytes) and len(address) == 16:
-                tmp = struct.unpack('!QQ', address)
-                self._ip = (tmp[0] << 64) | tmp[1]
-                self.ip = IPv6Address(self._ip)
-                self._prefixlen = self._max_prefixlen
-                self.netmask = IPv6Address(self._ALL_ONES)
-                return
-
-        # Assume input argument to be string or any object representation
-        # which converts into a formatted IP prefix string.
-        addr = str(address).split('/')
-
-        if len(addr) > 2:
-            raise AddressValueError(address)
-
-        self._ip = self._ip_int_from_string(addr[0])
-        self.ip = IPv6Address(self._ip)
-
-        if len(addr) == 2:
-            if self._is_valid_netmask(addr[1]):
-                self._prefixlen = int(addr[1])
-            else:
-                raise NetmaskValueError(addr[1])
-        else:
-            self._prefixlen = self._max_prefixlen
-
-        self.netmask = IPv6Address(self._ip_int_from_prefix(self._prefixlen))
-
-        if strict:
-            if self.ip != self.network:
-                raise ValueError('%s has host bits set' %
-                                 self.ip)
-
-    def _is_valid_netmask(self, prefixlen):
-        """Verify that the netmask/prefixlen is valid.
-
-        Args:
-            prefixlen: A string, the netmask in prefix length format.
-
-        Returns:
-            A boolean, True if the prefix represents a valid IPv6
-            netmask.
-
-        """
-        try:
-            prefixlen = int(prefixlen)
-        except ValueError:
-            return False
-        return 0 <= prefixlen <= self._max_prefixlen
-
-    @property
-    def with_netmask(self):
-        return self.with_prefixlen
diff --git a/contrib/ipaddr-py/ipaddr_test.py b/contrib/ipaddr-py/ipaddr_test.py
deleted file mode 100755
index 09bece0e7..000000000
--- a/contrib/ipaddr-py/ipaddr_test.py
+++ /dev/null
@@ -1,1099 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2007 Google Inc.
-#  Licensed to PSF under a Contributor Agreement.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Unittest for ipaddr module."""
-
-
-import unittest
-import time
-import ipaddr
-
-# Compatibility function to cast str to bytes objects
-if ipaddr._compat_has_real_bytes:
-    _cb = lambda bytestr: bytes(bytestr, 'charmap')
-else:
-    _cb = str
-
-class IpaddrUnitTest(unittest.TestCase):
-
-    def setUp(self):
-        self.ipv4 = ipaddr.IPv4Network('1.2.3.4/24')
-        self.ipv4_hostmask = ipaddr.IPv4Network('10.0.0.1/0.255.255.255')
-        self.ipv6 = ipaddr.IPv6Network('2001:658:22a:cafe:200:0:0:1/64')
-
-    def tearDown(self):
-        del(self.ipv4)
-        del(self.ipv4_hostmask)
-        del(self.ipv6)
-        del(self)
-
-    def testRepr(self):
-        self.assertEqual("IPv4Network('1.2.3.4/32')",
-                         repr(ipaddr.IPv4Network('1.2.3.4')))
-        self.assertEqual("IPv6Network('::1/128')",
-                         repr(ipaddr.IPv6Network('::1')))
-
-    def testAutoMasking(self):
-        addr1 = ipaddr.IPv4Network('1.1.1.255/24')
-        addr1_masked = ipaddr.IPv4Network('1.1.1.0/24')
-        self.assertEqual(addr1_masked, addr1.masked())
-
-        addr2 = ipaddr.IPv6Network('2000:cafe::efac:100/96')
-        addr2_masked = ipaddr.IPv6Network('2000:cafe::/96')
-        self.assertEqual(addr2_masked, addr2.masked())
-
-    # issue57
-    def testAddressIntMath(self):
-        self.assertEqual(ipaddr.IPv4Address('1.1.1.1') + 255,
-                         ipaddr.IPv4Address('1.1.2.0'))
-        self.assertEqual(ipaddr.IPv4Address('1.1.1.1') - 256,
-                         ipaddr.IPv4Address('1.1.0.1'))
-        self.assertEqual(ipaddr.IPv6Address('::1') + (2**16 - 2),
-                         ipaddr.IPv6Address('::ffff'))
-        self.assertEqual(ipaddr.IPv6Address('::ffff') - (2**16 - 2),
-                         ipaddr.IPv6Address('::1'))
-
-    def testInvalidStrings(self):
-        def AssertInvalidIP(ip_str):
-            self.assertRaises(ValueError, ipaddr.IPAddress, ip_str)
-        AssertInvalidIP("")
-        AssertInvalidIP("016.016.016.016")
-        AssertInvalidIP("016.016.016")
-        AssertInvalidIP("016.016")
-        AssertInvalidIP("016")
-        AssertInvalidIP("000.000.000.000")
-        AssertInvalidIP("000")
-        AssertInvalidIP("0x0a.0x0a.0x0a.0x0a")
-        AssertInvalidIP("0x0a.0x0a.0x0a")
-        AssertInvalidIP("0x0a.0x0a")
-        AssertInvalidIP("0x0a")
-        AssertInvalidIP("42.42.42.42.42")
-        AssertInvalidIP("42.42.42")
-        AssertInvalidIP("42.42")
-        AssertInvalidIP("42")
-        AssertInvalidIP("42..42.42")
-        AssertInvalidIP("42..42.42.42")
-        AssertInvalidIP("42.42.42.42.")
-        AssertInvalidIP("42.42.42.42...")
-        AssertInvalidIP(".42.42.42.42")
-        AssertInvalidIP("...42.42.42.42")
-        AssertInvalidIP("42.42.42.-0")
-        AssertInvalidIP("42.42.42.+0")
-        AssertInvalidIP(".")
-        AssertInvalidIP("...")
-        AssertInvalidIP("bogus")
-        AssertInvalidIP("bogus.com")
-        AssertInvalidIP("192.168.0.1.com")
-        AssertInvalidIP("12345.67899.-54321.-98765")
-        AssertInvalidIP("257.0.0.0")
-        AssertInvalidIP("42.42.42.-42")
-        AssertInvalidIP("3ffe::1.net")
-        AssertInvalidIP("3ffe::1::1")
-        AssertInvalidIP("1::2::3::4:5")
-        AssertInvalidIP("::7:6:5:4:3:2:")
-        AssertInvalidIP(":6:5:4:3:2:1::")
-        AssertInvalidIP("2001::db:::1")
-        AssertInvalidIP("FEDC:9878")
-        AssertInvalidIP("+1.+2.+3.4")
-        AssertInvalidIP("1.2.3.4e0")
-        AssertInvalidIP("::7:6:5:4:3:2:1:0")
-        AssertInvalidIP("7:6:5:4:3:2:1:0::")
-        AssertInvalidIP("9:8:7:6:5:4:3::2:1")
-        AssertInvalidIP("0:1:2:3::4:5:6:7")
-        AssertInvalidIP("3ffe:0:0:0:0:0:0:0:1")
-        AssertInvalidIP("3ffe::10000")
-        AssertInvalidIP("3ffe::goog")
-        AssertInvalidIP("3ffe::-0")
-        AssertInvalidIP("3ffe::+0")
-        AssertInvalidIP("3ffe::-1")
-        AssertInvalidIP(":")
-        AssertInvalidIP(":::")
-        AssertInvalidIP("::1.2.3")
-        AssertInvalidIP("::1.2.3.4.5")
-        AssertInvalidIP("::1.2.3.4:")
-        AssertInvalidIP("1.2.3.4::")
-        AssertInvalidIP("2001:db8::1:")
-        AssertInvalidIP(":2001:db8::1")
-        AssertInvalidIP(":1:2:3:4:5:6:7")
-        AssertInvalidIP("1:2:3:4:5:6:7:")
-        AssertInvalidIP(":1:2:3:4:5:6:")
-
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv4Network, '')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv4Network,
-                          'google.com')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv4Network,
-                          '::1.2.3.4')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network, '')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
-                          'google.com')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
-                          '1.2.3.4')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
-                          'cafe:cafe::/128/190')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
-                          '1234:axy::b')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Address,
-                          '1234:axy::b')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Address,
-                          '2001:db8:::1')
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Address,
-                          '2001:888888::1')
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv4Address(1)._ip_int_from_string,
-                          '1.a.2.3')
-        self.assertEqual(False, ipaddr.IPv4Network(1)._is_hostmask('1.a.2.3'))
-
-    def testGetNetwork(self):
-        self.assertEqual(int(self.ipv4.network), 16909056)
-        self.assertEqual(str(self.ipv4.network), '1.2.3.0')
-        self.assertEqual(str(self.ipv4_hostmask.network), '10.0.0.0')
-
-        self.assertEqual(int(self.ipv6.network),
-                         42540616829182469433403647294022090752)
-        self.assertEqual(str(self.ipv6.network),
-                         '2001:658:22a:cafe::')
-        self.assertEqual(str(self.ipv6.hostmask),
-                         '::ffff:ffff:ffff:ffff')
-
-    def testBadVersionComparison(self):
-        # These should always raise TypeError
-        v4addr = ipaddr.IPAddress('1.1.1.1')
-        v4net = ipaddr.IPNetwork('1.1.1.1')
-        v6addr = ipaddr.IPAddress('::1')
-        v6net = ipaddr.IPAddress('::1')
-
-        self.assertRaises(TypeError, v4addr.__lt__, v6addr)
-        self.assertRaises(TypeError, v4addr.__gt__, v6addr)
-        self.assertRaises(TypeError, v4net.__lt__, v6net)
-        self.assertRaises(TypeError, v4net.__gt__, v6net)
-
-        self.assertRaises(TypeError, v6addr.__lt__, v4addr)
-        self.assertRaises(TypeError, v6addr.__gt__, v4addr)
-        self.assertRaises(TypeError, v6net.__lt__, v4net)
-        self.assertRaises(TypeError, v6net.__gt__, v4net)
-
-    def testMixedTypeComparison(self):
-        v4addr = ipaddr.IPAddress('1.1.1.1')
-        v4net = ipaddr.IPNetwork('1.1.1.1/32')
-        v6addr = ipaddr.IPAddress('::1')
-        v6net = ipaddr.IPNetwork('::1/128')
-
-        self.assertFalse(v4net.__contains__(v6net))
-        self.assertFalse(v6net.__contains__(v4net))
-
-        self.assertRaises(TypeError, lambda: v4addr < v4net)
-        self.assertRaises(TypeError, lambda: v4addr > v4net)
-        self.assertRaises(TypeError, lambda: v4net < v4addr)
-        self.assertRaises(TypeError, lambda: v4net > v4addr)
-
-        self.assertRaises(TypeError, lambda: v6addr < v6net)
-        self.assertRaises(TypeError, lambda: v6addr > v6net)
-        self.assertRaises(TypeError, lambda: v6net < v6addr)
-        self.assertRaises(TypeError, lambda: v6net > v6addr)
-
-        # with get_mixed_type_key, you can sort addresses and network.
-        self.assertEqual([v4addr, v4net], sorted([v4net, v4addr],
-                                                 key=ipaddr.get_mixed_type_key))
-        self.assertEqual([v6addr, v6net], sorted([v6net, v6addr],
-                                                 key=ipaddr.get_mixed_type_key))
-
-    def testIpFromInt(self):
-        self.assertEqual(self.ipv4.ip, ipaddr.IPv4Network(16909060).ip)
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv4Network, 2**32)
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv4Network, -1)
-
-        ipv4 = ipaddr.IPNetwork('1.2.3.4')
-        ipv6 = ipaddr.IPNetwork('2001:658:22a:cafe:200:0:0:1')
-        self.assertEqual(ipv4, ipaddr.IPNetwork(int(ipv4)))
-        self.assertEqual(ipv6, ipaddr.IPNetwork(int(ipv6)))
-
-        v6_int = 42540616829182469433547762482097946625
-        self.assertEqual(self.ipv6.ip, ipaddr.IPv6Network(v6_int).ip)
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv6Network, 2**128)
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv6Network, -1)
-
-        self.assertEqual(ipaddr.IPNetwork(self.ipv4.ip).version, 4)
-        self.assertEqual(ipaddr.IPNetwork(self.ipv6.ip).version, 6)
-
-    if ipaddr._compat_has_real_bytes: # on python3+
-        def testIpFromPacked(self):
-            ip = ipaddr.IPNetwork
-
-            self.assertEqual(self.ipv4.ip,
-                             ip(_cb('\x01\x02\x03\x04')).ip)
-            self.assertEqual(ip('255.254.253.252'),
-                             ip(_cb('\xff\xfe\xfd\xfc')))
-            self.assertRaises(ValueError, ipaddr.IPNetwork, _cb('\x00' * 3))
-            self.assertRaises(ValueError, ipaddr.IPNetwork, _cb('\x00' * 5))
-            self.assertEqual(self.ipv6.ip,
-                             ip(_cb('\x20\x01\x06\x58\x02\x2a\xca\xfe'
-                               '\x02\x00\x00\x00\x00\x00\x00\x01')).ip)
-            self.assertEqual(ip('ffff:2:3:4:ffff::'),
-                             ip(_cb('\xff\xff\x00\x02\x00\x03\x00\x04' +
-                                   '\xff\xff' + '\x00' * 6)))
-            self.assertEqual(ip('::'),
-                             ip(_cb('\x00' * 16)))
-            self.assertRaises(ValueError, ip, _cb('\x00' * 15))
-            self.assertRaises(ValueError, ip, _cb('\x00' * 17))
-
-    def testGetIp(self):
-        self.assertEqual(int(self.ipv4.ip), 16909060)
-        self.assertEqual(str(self.ipv4.ip), '1.2.3.4')
-        self.assertEqual(str(self.ipv4_hostmask.ip), '10.0.0.1')
-
-        self.assertEqual(int(self.ipv6.ip),
-                         42540616829182469433547762482097946625)
-        self.assertEqual(str(self.ipv6.ip),
-                         '2001:658:22a:cafe:200::1')
-
-    def testGetNetmask(self):
-        self.assertEqual(int(self.ipv4.netmask), 4294967040L)
-        self.assertEqual(str(self.ipv4.netmask), '255.255.255.0')
-        self.assertEqual(str(self.ipv4_hostmask.netmask), '255.0.0.0')
-        self.assertEqual(int(self.ipv6.netmask),
-                         340282366920938463444927863358058659840)
-        self.assertEqual(self.ipv6.prefixlen, 64)
-
-    def testZeroNetmask(self):
-        ipv4_zero_netmask = ipaddr.IPv4Network('1.2.3.4/0')
-        self.assertEqual(int(ipv4_zero_netmask.netmask), 0)
-        self.assertTrue(ipv4_zero_netmask._is_valid_netmask(str(0)))
-
-        ipv6_zero_netmask = ipaddr.IPv6Network('::1/0')
-        self.assertEqual(int(ipv6_zero_netmask.netmask), 0)
-        self.assertTrue(ipv6_zero_netmask._is_valid_netmask(str(0)))
-
-    def testGetBroadcast(self):
-        self.assertEqual(int(self.ipv4.broadcast), 16909311L)
-        self.assertEqual(str(self.ipv4.broadcast), '1.2.3.255')
-
-        self.assertEqual(int(self.ipv6.broadcast),
-                         42540616829182469451850391367731642367)
-        self.assertEqual(str(self.ipv6.broadcast),
-                         '2001:658:22a:cafe:ffff:ffff:ffff:ffff')
-
-    def testGetPrefixlen(self):
-        self.assertEqual(self.ipv4.prefixlen, 24)
-
-        self.assertEqual(self.ipv6.prefixlen, 64)
-
-    def testGetSupernet(self):
-        self.assertEqual(self.ipv4.supernet().prefixlen, 23)
-        self.assertEqual(str(self.ipv4.supernet().network), '1.2.2.0')
-        self.assertEqual(ipaddr.IPv4Network('0.0.0.0/0').supernet(),
-                         ipaddr.IPv4Network('0.0.0.0/0'))
-
-        self.assertEqual(self.ipv6.supernet().prefixlen, 63)
-        self.assertEqual(str(self.ipv6.supernet().network),
-                         '2001:658:22a:cafe::')
-        self.assertEqual(ipaddr.IPv6Network('::0/0').supernet(),
-                         ipaddr.IPv6Network('::0/0'))
-
-    def testGetSupernet3(self):
-        self.assertEqual(self.ipv4.supernet(3).prefixlen, 21)
-        self.assertEqual(str(self.ipv4.supernet(3).network), '1.2.0.0')
-
-        self.assertEqual(self.ipv6.supernet(3).prefixlen, 61)
-        self.assertEqual(str(self.ipv6.supernet(3).network),
-                         '2001:658:22a:caf8::')
-
-    def testGetSupernet4(self):
-        self.assertRaises(ValueError, self.ipv4.supernet, prefixlen_diff=2,
-                          new_prefix=1)
-        self.assertRaises(ValueError, self.ipv4.supernet, new_prefix=25)
-        self.assertEqual(self.ipv4.supernet(prefixlen_diff=2),
-                         self.ipv4.supernet(new_prefix=22))
-
-        self.assertRaises(ValueError, self.ipv6.supernet, prefixlen_diff=2,
-                          new_prefix=1)
-        self.assertRaises(ValueError, self.ipv6.supernet, new_prefix=65)
-        self.assertEqual(self.ipv6.supernet(prefixlen_diff=2),
-                         self.ipv6.supernet(new_prefix=62))
-
-    def testIterSubnets(self):
-        self.assertEqual(self.ipv4.subnet(), list(self.ipv4.iter_subnets()))
-        self.assertEqual(self.ipv6.subnet(), list(self.ipv6.iter_subnets()))
-
-    def testFancySubnetting(self):
-        self.assertEqual(sorted(self.ipv4.subnet(prefixlen_diff=3)),
-                         sorted(self.ipv4.subnet(new_prefix=27)))
-        self.assertRaises(ValueError, self.ipv4.subnet, new_prefix=23)
-        self.assertRaises(ValueError, self.ipv4.subnet,
-                          prefixlen_diff=3, new_prefix=27)
-        self.assertEqual(sorted(self.ipv6.subnet(prefixlen_diff=4)),
-                         sorted(self.ipv6.subnet(new_prefix=68)))
-        self.assertRaises(ValueError, self.ipv6.subnet, new_prefix=63)
-        self.assertRaises(ValueError, self.ipv6.subnet,
-                          prefixlen_diff=4, new_prefix=68)
-
-    def testGetSubnet(self):
-        self.assertEqual(self.ipv4.subnet()[0].prefixlen, 25)
-        self.assertEqual(str(self.ipv4.subnet()[0].network), '1.2.3.0')
-        self.assertEqual(str(self.ipv4.subnet()[1].network), '1.2.3.128')
-
-        self.assertEqual(self.ipv6.subnet()[0].prefixlen, 65)
-
-    def testGetSubnetForSingle32(self):
-        ip = ipaddr.IPv4Network('1.2.3.4/32')
-        subnets1 = [str(x) for x in ip.subnet()]
-        subnets2 = [str(x) for x in ip.subnet(2)]
-        self.assertEqual(subnets1, ['1.2.3.4/32'])
-        self.assertEqual(subnets1, subnets2)
-
-    def testGetSubnetForSingle128(self):
-        ip = ipaddr.IPv6Network('::1/128')
-        subnets1 = [str(x) for x in ip.subnet()]
-        subnets2 = [str(x) for x in ip.subnet(2)]
-        self.assertEqual(subnets1, ['::1/128'])
-        self.assertEqual(subnets1, subnets2)
-
-    def testSubnet2(self):
-        ips = [str(x) for x in self.ipv4.subnet(2)]
-        self.assertEqual(
-            ips,
-            ['1.2.3.0/26', '1.2.3.64/26', '1.2.3.128/26', '1.2.3.192/26'])
-
-        ipsv6 = [str(x) for x in self.ipv6.subnet(2)]
-        self.assertEqual(
-            ipsv6,
-            ['2001:658:22a:cafe::/66',
-             '2001:658:22a:cafe:4000::/66',
-             '2001:658:22a:cafe:8000::/66',
-             '2001:658:22a:cafe:c000::/66'])
-
-    def testSubnetFailsForLargeCidrDiff(self):
-        self.assertRaises(ValueError, self.ipv4.subnet, 9)
-        self.assertRaises(ValueError, self.ipv6.subnet, 65)
-
-    def testSupernetFailsForLargeCidrDiff(self):
-        self.assertRaises(ValueError, self.ipv4.supernet, 25)
-        self.assertRaises(ValueError, self.ipv6.supernet, 65)
-
-    def testSubnetFailsForNegativeCidrDiff(self):
-        self.assertRaises(ValueError, self.ipv4.subnet, -1)
-        self.assertRaises(ValueError, self.ipv6.subnet, -1)
-
-    def testGetNumHosts(self):
-        self.assertEqual(self.ipv4.numhosts, 256)
-        self.assertEqual(self.ipv4.subnet()[0].numhosts, 128)
-        self.assertEqual(self.ipv4.supernet().numhosts, 512)
-
-        self.assertEqual(self.ipv6.numhosts, 18446744073709551616)
-        self.assertEqual(self.ipv6.subnet()[0].numhosts, 9223372036854775808)
-        self.assertEqual(self.ipv6.supernet().numhosts, 36893488147419103232)
-
-    def testContains(self):
-        self.assertTrue(ipaddr.IPv4Network('1.2.3.128/25') in self.ipv4)
-        self.assertFalse(ipaddr.IPv4Network('1.2.4.1/24') in self.ipv4)
-        self.assertTrue(self.ipv4 in self.ipv4)
-        self.assertTrue(self.ipv6 in self.ipv6)
-        # We can test addresses and string as well.
-        addr1 = ipaddr.IPv4Address('1.2.3.37')
-        self.assertTrue(addr1 in self.ipv4)
-        # issue 61, bad network comparison on like-ip'd network objects
-        # with identical broadcast addresses.
-        self.assertFalse(ipaddr.IPv4Network('1.1.0.0/16').__contains__(
-                ipaddr.IPv4Network('1.0.0.0/15')))
-
-    def testBadAddress(self):
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv4Network,
-                          'poop')
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv4Network, '1.2.3.256')
-
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
-                          'poopv6')
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv4Network, '1.2.3.4/32/24')
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv4Network, '10/8')
-        self.assertRaises(ipaddr.AddressValueError,
-                          ipaddr.IPv6Network, '10/8')
-
-
-    def testBadNetMask(self):
-        self.assertRaises(ipaddr.NetmaskValueError,
-                          ipaddr.IPv4Network, '1.2.3.4/')
-        self.assertRaises(ipaddr.NetmaskValueError,
-                          ipaddr.IPv4Network, '1.2.3.4/33')
-        self.assertRaises(ipaddr.NetmaskValueError,
-                          ipaddr.IPv4Network, '1.2.3.4/254.254.255.256')
-        self.assertRaises(ipaddr.NetmaskValueError,
-                          ipaddr.IPv4Network, '1.1.1.1/240.255.0.0')
-        self.assertRaises(ipaddr.NetmaskValueError,
-                          ipaddr.IPv6Network, '::1/')
-        self.assertRaises(ipaddr.NetmaskValueError,
-                          ipaddr.IPv6Network, '::1/129')
-
-    def testNth(self):
-        self.assertEqual(str(self.ipv4[5]), '1.2.3.5')
-        self.assertRaises(IndexError, self.ipv4.__getitem__, 256)
-
-        self.assertEqual(str(self.ipv6[5]),
-                         '2001:658:22a:cafe::5')
-
-    def testGetitem(self):
-        # http://code.google.com/p/ipaddr-py/issues/detail?id=15
-        addr = ipaddr.IPv4Network('172.31.255.128/255.255.255.240')
-        self.assertEqual(28, addr.prefixlen)
-        addr_list = list(addr)
-        self.assertEqual('172.31.255.128', str(addr_list[0]))
-        self.assertEqual('172.31.255.128', str(addr[0]))
-        self.assertEqual('172.31.255.143', str(addr_list[-1]))
-        self.assertEqual('172.31.255.143', str(addr[-1]))
-        self.assertEqual(addr_list[-1], addr[-1])
-
-    def testEqual(self):
-        self.assertTrue(self.ipv4 == ipaddr.IPv4Network('1.2.3.4/24'))
-        self.assertFalse(self.ipv4 == ipaddr.IPv4Network('1.2.3.4/23'))
-        self.assertFalse(self.ipv4 == ipaddr.IPv6Network('::1.2.3.4/24'))
-        self.assertFalse(self.ipv4 == '')
-        self.assertFalse(self.ipv4 == [])
-        self.assertFalse(self.ipv4 == 2)
-        self.assertTrue(ipaddr.IPNetwork('1.1.1.1/32') ==
-                        ipaddr.IPAddress('1.1.1.1'))
-        self.assertTrue(ipaddr.IPNetwork('1.1.1.1/24') ==
-                        ipaddr.IPAddress('1.1.1.1'))
-        self.assertFalse(ipaddr.IPNetwork('1.1.1.0/24') ==
-                         ipaddr.IPAddress('1.1.1.1'))
-
-        self.assertTrue(self.ipv6 ==
-            ipaddr.IPv6Network('2001:658:22a:cafe:200::1/64'))
-        self.assertTrue(ipaddr.IPNetwork('::1/128') ==
-                        ipaddr.IPAddress('::1'))
-        self.assertTrue(ipaddr.IPNetwork('::1/127') ==
-                        ipaddr.IPAddress('::1'))
-        self.assertFalse(ipaddr.IPNetwork('::0/127') ==
-                         ipaddr.IPAddress('::1'))
-        self.assertFalse(self.ipv6 ==
-            ipaddr.IPv6Network('2001:658:22a:cafe:200::1/63'))
-        self.assertFalse(self.ipv6 == ipaddr.IPv4Network('1.2.3.4/23'))
-        self.assertFalse(self.ipv6 == '')
-        self.assertFalse(self.ipv6 == [])
-        self.assertFalse(self.ipv6 == 2)
-
-    def testNotEqual(self):
-        self.assertFalse(self.ipv4 != ipaddr.IPv4Network('1.2.3.4/24'))
-        self.assertTrue(self.ipv4 != ipaddr.IPv4Network('1.2.3.4/23'))
-        self.assertTrue(self.ipv4 != ipaddr.IPv6Network('::1.2.3.4/24'))
-        self.assertTrue(self.ipv4 != '')
-        self.assertTrue(self.ipv4 != [])
-        self.assertTrue(self.ipv4 != 2)
-
-        addr2 = ipaddr.IPAddress('2001:658:22a:cafe:200::1')
-        self.assertFalse(self.ipv6 !=
-            ipaddr.IPv6Network('2001:658:22a:cafe:200::1/64'))
-        self.assertTrue(self.ipv6 !=
-            ipaddr.IPv6Network('2001:658:22a:cafe:200::1/63'))
-        self.assertTrue(self.ipv6 != ipaddr.IPv4Network('1.2.3.4/23'))
-        self.assertTrue(self.ipv6 != '')
-        self.assertTrue(self.ipv6 != [])
-        self.assertTrue(self.ipv6 != 2)
-
-    def testSlash32Constructor(self):
-        self.assertEqual(str(ipaddr.IPv4Network('1.2.3.4/255.255.255.255')),
-                          '1.2.3.4/32')
-
-    def testSlash128Constructor(self):
-        self.assertEqual(str(ipaddr.IPv6Network('::1/128')),
-                                  '::1/128')
-
-    def testSlash0Constructor(self):
-        self.assertEqual(str(ipaddr.IPv4Network('1.2.3.4/0.0.0.0')),
-                          '1.2.3.4/0')
-
-    def testCollapsing(self):
-        # test only IP addresses including some duplicates
-        ip1 = ipaddr.IPv4Address('1.1.1.0')
-        ip2 = ipaddr.IPv4Address('1.1.1.1')
-        ip3 = ipaddr.IPv4Address('1.1.1.2')
-        ip4 = ipaddr.IPv4Address('1.1.1.3')
-        ip5 = ipaddr.IPv4Address('1.1.1.4')
-        ip6 = ipaddr.IPv4Address('1.1.1.0')
-        # check that addreses are subsumed properly.
-        collapsed = ipaddr.collapse_address_list([ip1, ip2, ip3, ip4, ip5, ip6])
-        self.assertEqual(collapsed, [ipaddr.IPv4Network('1.1.1.0/30'),
-                                     ipaddr.IPv4Network('1.1.1.4/32')])
-
-        # test a mix of IP addresses and networks including some duplicates
-        ip1 = ipaddr.IPv4Address('1.1.1.0')
-        ip2 = ipaddr.IPv4Address('1.1.1.1')
-        ip3 = ipaddr.IPv4Address('1.1.1.2')
-        ip4 = ipaddr.IPv4Address('1.1.1.3')
-        ip5 = ipaddr.IPv4Network('1.1.1.4/30')
-        ip6 = ipaddr.IPv4Network('1.1.1.4/30')
-        # check that addreses are subsumed properly.
-        collapsed = ipaddr.collapse_address_list([ip5, ip1, ip2, ip3, ip4, ip6])
-        self.assertEqual(collapsed, [ipaddr.IPv4Network('1.1.1.0/29')])
-
-        # test only IP networks
-        ip1 = ipaddr.IPv4Network('1.1.0.0/24')
-        ip2 = ipaddr.IPv4Network('1.1.1.0/24')
-        ip3 = ipaddr.IPv4Network('1.1.2.0/24')
-        ip4 = ipaddr.IPv4Network('1.1.3.0/24')
-        ip5 = ipaddr.IPv4Network('1.1.4.0/24')
-        # stored in no particular order b/c we want CollapseAddr to call [].sort
-        ip6 = ipaddr.IPv4Network('1.1.0.0/22')
-        # check that addreses are subsumed properly.
-        collapsed = ipaddr.collapse_address_list([ip1, ip2, ip3, ip4, ip5, ip6])
-        self.assertEqual(collapsed, [ipaddr.IPv4Network('1.1.0.0/22'),
-                                     ipaddr.IPv4Network('1.1.4.0/24')])
-
-        # test that two addresses are supernet'ed properly
-        collapsed = ipaddr.collapse_address_list([ip1, ip2])
-        self.assertEqual(collapsed, [ipaddr.IPv4Network('1.1.0.0/23')])
-
-        # test same IP networks
-        ip_same1 = ip_same2 = ipaddr.IPv4Network('1.1.1.1/32')
-        self.assertEqual(ipaddr.collapse_address_list([ip_same1, ip_same2]),
-                         [ip_same1])
-
-        # test same IP addresses
-        ip_same1 = ip_same2 = ipaddr.IPv4Address('1.1.1.1')
-        self.assertEqual(ipaddr.collapse_address_list([ip_same1, ip_same2]),
-                         [ipaddr.IPNetwork('1.1.1.1/32')])
-        ip1 = ipaddr.IPv6Network('::2001:1/100')
-        ip2 = ipaddr.IPv6Network('::2002:1/120')
-        ip3 = ipaddr.IPv6Network('::2001:1/96')
-        # test that ipv6 addresses are subsumed properly.
-        collapsed = ipaddr.collapse_address_list([ip1, ip2, ip3])
-        self.assertEqual(collapsed, [ip3])
-
-        # the toejam test
-        ip1 = ipaddr.IPAddress('1.1.1.1')
-        ip2 = ipaddr.IPAddress('::1')
-        self.assertRaises(TypeError, ipaddr.collapse_address_list,
-                          [ip1, ip2])
-
-    def testSummarizing(self):
-        #ip = ipaddr.IPAddress
-        #ipnet = ipaddr.IPNetwork
-        summarize = ipaddr.summarize_address_range
-        ip1 = ipaddr.IPAddress('1.1.1.0')
-        ip2 = ipaddr.IPAddress('1.1.1.255')
-        # test a /24 is sumamrized properly
-        self.assertEqual(summarize(ip1, ip2)[0], ipaddr.IPNetwork('1.1.1.0/24'))
-        # test an  IPv4 range that isn't on a network byte boundary
-        ip2 = ipaddr.IPAddress('1.1.1.8')
-        self.assertEqual(summarize(ip1, ip2), [ipaddr.IPNetwork('1.1.1.0/29'),
-                                               ipaddr.IPNetwork('1.1.1.8')])
-
-        ip1 = ipaddr.IPAddress('1::')
-        ip2 = ipaddr.IPAddress('1:ffff:ffff:ffff:ffff:ffff:ffff:ffff')
-        # test a IPv6 is sumamrized properly
-        self.assertEqual(summarize(ip1, ip2)[0], ipaddr.IPNetwork('1::/16'))
-        # test an IPv6 range that isn't on a network byte boundary
-        ip2 = ipaddr.IPAddress('2::')
-        self.assertEqual(summarize(ip1, ip2), [ipaddr.IPNetwork('1::/16'),
-                                               ipaddr.IPNetwork('2::/128')])
-
-        # test exception raised when first is greater than last
-        self.assertRaises(ValueError, summarize, ipaddr.IPAddress('1.1.1.0'),
-            ipaddr.IPAddress('1.1.0.0'))
-        # test exception raised when first and last aren't IP addresses
-        self.assertRaises(TypeError, summarize,
-                          ipaddr.IPNetwork('1.1.1.0'),
-                          ipaddr.IPNetwork('1.1.0.0'))
-        self.assertRaises(TypeError, summarize,
-            ipaddr.IPNetwork('1.1.1.0'), ipaddr.IPNetwork('1.1.0.0'))
-        # test exception raised when first and last are not same version
-        self.assertRaises(TypeError, summarize, ipaddr.IPAddress('::'),
-            ipaddr.IPNetwork('1.1.0.0'))
-
-    def testAddressComparison(self):
-        self.assertTrue(ipaddr.IPAddress('1.1.1.1') <=
-                        ipaddr.IPAddress('1.1.1.1'))
-        self.assertTrue(ipaddr.IPAddress('1.1.1.1') <=
-                        ipaddr.IPAddress('1.1.1.2'))
-        self.assertTrue(ipaddr.IPAddress('::1') <= ipaddr.IPAddress('::1'))
-        self.assertTrue(ipaddr.IPAddress('::1') <= ipaddr.IPAddress('::2'))
-
-    def testNetworkComparison(self):
-        # ip1 and ip2 have the same network address
-        ip1 = ipaddr.IPv4Network('1.1.1.0/24')
-        ip2 = ipaddr.IPv4Network('1.1.1.1/24')
-        ip3 = ipaddr.IPv4Network('1.1.2.0/24')
-
-        self.assertTrue(ip1 < ip3)
-        self.assertTrue(ip3 > ip2)
-
-        self.assertEqual(ip1.compare_networks(ip2), 0)
-        self.assertTrue(ip1._get_networks_key() == ip2._get_networks_key())
-        self.assertEqual(ip1.compare_networks(ip3), -1)
-        self.assertTrue(ip1._get_networks_key() < ip3._get_networks_key())
-
-        ip1 = ipaddr.IPv6Network('2001::2000/96')
-        ip2 = ipaddr.IPv6Network('2001::2001/96')
-        ip3 = ipaddr.IPv6Network('2001:ffff::2000/96')
-
-        self.assertTrue(ip1 < ip3)
-        self.assertTrue(ip3 > ip2)
-        self.assertEqual(ip1.compare_networks(ip2), 0)
-        self.assertTrue(ip1._get_networks_key() == ip2._get_networks_key())
-        self.assertEqual(ip1.compare_networks(ip3), -1)
-        self.assertTrue(ip1._get_networks_key() < ip3._get_networks_key())
-
-        # Test comparing different protocols.
-        # Should always raise a TypeError.
-        ipv6 = ipaddr.IPv6Network('::/0')
-        ipv4 = ipaddr.IPv4Network('0.0.0.0/0')
-        self.assertRaises(TypeError, ipv4.__lt__, ipv6)
-        self.assertRaises(TypeError, ipv4.__gt__, ipv6)
-        self.assertRaises(TypeError, ipv6.__lt__, ipv4)
-        self.assertRaises(TypeError, ipv6.__gt__, ipv4)
-
-        # Regression test for issue 19.
-        ip1 = ipaddr.IPNetwork('10.1.2.128/25')
-        self.assertFalse(ip1 < ip1)
-        self.assertFalse(ip1 > ip1)
-        ip2 = ipaddr.IPNetwork('10.1.3.0/24')
-        self.assertTrue(ip1 < ip2)
-        self.assertFalse(ip2 < ip1)
-        self.assertFalse(ip1 > ip2)
-        self.assertTrue(ip2 > ip1)
-        ip3 = ipaddr.IPNetwork('10.1.3.0/25')
-        self.assertTrue(ip2 < ip3)
-        self.assertFalse(ip3 < ip2)
-        self.assertFalse(ip2 > ip3)
-        self.assertTrue(ip3 > ip2)
-
-        # Regression test for issue 28.
-        ip1 = ipaddr.IPNetwork('10.10.10.0/31')
-        ip2 = ipaddr.IPNetwork('10.10.10.0')
-        ip3 = ipaddr.IPNetwork('10.10.10.2/31')
-        ip4 = ipaddr.IPNetwork('10.10.10.2')
-        sorted = [ip1, ip2, ip3, ip4]
-        unsorted = [ip2, ip4, ip1, ip3]
-        unsorted.sort()
-        self.assertEqual(sorted, unsorted)
-        unsorted = [ip4, ip1, ip3, ip2]
-        unsorted.sort()
-        self.assertEqual(sorted, unsorted)
-        self.assertRaises(TypeError, ip1.__lt__, ipaddr.IPAddress('10.10.10.0'))
-        self.assertRaises(TypeError, ip2.__lt__, ipaddr.IPAddress('10.10.10.0'))
-
-        # <=, >=
-        self.assertTrue(ipaddr.IPNetwork('1.1.1.1') <=
-                        ipaddr.IPNetwork('1.1.1.1'))
-        self.assertTrue(ipaddr.IPNetwork('1.1.1.1') <=
-                        ipaddr.IPNetwork('1.1.1.2'))
-        self.assertFalse(ipaddr.IPNetwork('1.1.1.2') <=
-                        ipaddr.IPNetwork('1.1.1.1'))
-        self.assertTrue(ipaddr.IPNetwork('::1') <= ipaddr.IPNetwork('::1'))
-        self.assertTrue(ipaddr.IPNetwork('::1') <= ipaddr.IPNetwork('::2'))
-        self.assertFalse(ipaddr.IPNetwork('::2') <= ipaddr.IPNetwork('::1'))
-
-    def testStrictNetworks(self):
-        self.assertRaises(ValueError, ipaddr.IPNetwork, '192.168.1.1/24',
-                          strict=True)
-        self.assertRaises(ValueError, ipaddr.IPNetwork, '::1/120', strict=True)
-
-    def testOverlaps(self):
-        other = ipaddr.IPv4Network('1.2.3.0/30')
-        other2 = ipaddr.IPv4Network('1.2.2.0/24')
-        other3 = ipaddr.IPv4Network('1.2.2.64/26')
-        self.assertTrue(self.ipv4.overlaps(other))
-        self.assertFalse(self.ipv4.overlaps(other2))
-        self.assertTrue(other2.overlaps(other3))
-
-    def testEmbeddedIpv4(self):
-        ipv4_string = '192.168.0.1'
-        ipv4 = ipaddr.IPv4Network(ipv4_string)
-        v4compat_ipv6 = ipaddr.IPv6Network('::%s' % ipv4_string)
-        self.assertEqual(int(v4compat_ipv6.ip), int(ipv4.ip))
-        v4mapped_ipv6 = ipaddr.IPv6Network('::ffff:%s' % ipv4_string)
-        self.assertNotEqual(v4mapped_ipv6.ip, ipv4.ip)
-        self.assertRaises(ipaddr.AddressValueError, ipaddr.IPv6Network,
-                          '2001:1.1.1.1:1.1.1.1')
-
-    # Issue 67: IPv6 with embedded IPv4 address not recognized.
-    def testIPv6AddressTooLarge(self):
-        # RFC4291 2.5.5.2
-        self.assertEqual(ipaddr.IPAddress('::FFFF:192.0.2.1'),
-                          ipaddr.IPAddress('::FFFF:c000:201'))
-        # RFC4291 2.2 (part 3) x::d.d.d.d 
-        self.assertEqual(ipaddr.IPAddress('FFFF::192.0.2.1'),
-                          ipaddr.IPAddress('FFFF::c000:201'))
-
-    def testIPVersion(self):
-        self.assertEqual(self.ipv4.version, 4)
-        self.assertEqual(self.ipv6.version, 6)
-
-    def testMaxPrefixLength(self):
-        self.assertEqual(self.ipv4.max_prefixlen, 32)
-        self.assertEqual(self.ipv6.max_prefixlen, 128)
-
-    def testPacked(self):
-        self.assertEqual(self.ipv4.packed,
-                         _cb('\x01\x02\x03\x04'))
-        self.assertEqual(ipaddr.IPv4Network('255.254.253.252').packed,
-                         _cb('\xff\xfe\xfd\xfc'))
-        self.assertEqual(self.ipv6.packed,
-                         _cb('\x20\x01\x06\x58\x02\x2a\xca\xfe'
-                             '\x02\x00\x00\x00\x00\x00\x00\x01'))
-        self.assertEqual(ipaddr.IPv6Network('ffff:2:3:4:ffff::').packed,
-                         _cb('\xff\xff\x00\x02\x00\x03\x00\x04\xff\xff'
-                            + '\x00' * 6))
-        self.assertEqual(ipaddr.IPv6Network('::1:0:0:0:0').packed,
-                         _cb('\x00' * 6 + '\x00\x01' + '\x00' * 8))
-
-    def testIpStrFromPrefixlen(self):
-        ipv4 = ipaddr.IPv4Network('1.2.3.4/24')
-        self.assertEqual(ipv4._ip_string_from_prefix(), '255.255.255.0')
-        self.assertEqual(ipv4._ip_string_from_prefix(28), '255.255.255.240')
-
-    def testIpType(self):
-        ipv4net = ipaddr.IPNetwork('1.2.3.4')
-        ipv4addr = ipaddr.IPAddress('1.2.3.4')
-        ipv6net = ipaddr.IPNetwork('::1.2.3.4')
-        ipv6addr = ipaddr.IPAddress('::1.2.3.4')
-        self.assertEqual(ipaddr.IPv4Network, type(ipv4net))
-        self.assertEqual(ipaddr.IPv4Address, type(ipv4addr))
-        self.assertEqual(ipaddr.IPv6Network, type(ipv6net))
-        self.assertEqual(ipaddr.IPv6Address, type(ipv6addr))
-
-    def testReservedIpv4(self):
-        # test networks
-        self.assertEqual(True, ipaddr.IPNetwork('224.1.1.1/31').is_multicast)
-        self.assertEqual(False, ipaddr.IPNetwork('240.0.0.0').is_multicast)
-
-        self.assertEqual(True, ipaddr.IPNetwork('192.168.1.1/17').is_private)
-        self.assertEqual(False, ipaddr.IPNetwork('192.169.0.0').is_private)
-        self.assertEqual(True, ipaddr.IPNetwork('10.255.255.255').is_private)
-        self.assertEqual(False, ipaddr.IPNetwork('11.0.0.0').is_private)
-        self.assertEqual(True, ipaddr.IPNetwork('172.31.255.255').is_private)
-        self.assertEqual(False, ipaddr.IPNetwork('172.32.0.0').is_private)
-
-        self.assertEqual(True,
-                          ipaddr.IPNetwork('169.254.100.200/24').is_link_local)
-        self.assertEqual(False,
-                          ipaddr.IPNetwork('169.255.100.200/24').is_link_local)
-
-        self.assertEqual(True,
-                          ipaddr.IPNetwork('127.100.200.254/32').is_loopback)
-        self.assertEqual(True, ipaddr.IPNetwork('127.42.0.0/16').is_loopback)
-        self.assertEqual(False, ipaddr.IPNetwork('128.0.0.0').is_loopback)
-
-        # test addresses
-        self.assertEqual(True, ipaddr.IPAddress('224.1.1.1').is_multicast)
-        self.assertEqual(False, ipaddr.IPAddress('240.0.0.0').is_multicast)
-
-        self.assertEqual(True, ipaddr.IPAddress('192.168.1.1').is_private)
-        self.assertEqual(False, ipaddr.IPAddress('192.169.0.0').is_private)
-        self.assertEqual(True, ipaddr.IPAddress('10.255.255.255').is_private)
-        self.assertEqual(False, ipaddr.IPAddress('11.0.0.0').is_private)
-        self.assertEqual(True, ipaddr.IPAddress('172.31.255.255').is_private)
-        self.assertEqual(False, ipaddr.IPAddress('172.32.0.0').is_private)
-
-        self.assertEqual(True,
-                          ipaddr.IPAddress('169.254.100.200').is_link_local)
-        self.assertEqual(False,
-                          ipaddr.IPAddress('169.255.100.200').is_link_local)
-
-        self.assertEqual(True,
-                          ipaddr.IPAddress('127.100.200.254').is_loopback)
-        self.assertEqual(True, ipaddr.IPAddress('127.42.0.0').is_loopback)
-        self.assertEqual(False, ipaddr.IPAddress('128.0.0.0').is_loopback)
-        self.assertEqual(True, ipaddr.IPNetwork('0.0.0.0').is_unspecified)
-
-    def testReservedIpv6(self):
-
-        self.assertEqual(True, ipaddr.IPNetwork('ffff::').is_multicast)
-        self.assertEqual(True, ipaddr.IPNetwork(2**128-1).is_multicast)
-        self.assertEqual(True, ipaddr.IPNetwork('ff00::').is_multicast)
-        self.assertEqual(False, ipaddr.IPNetwork('fdff::').is_multicast)
-
-        self.assertEqual(True, ipaddr.IPNetwork('fecf::').is_site_local)
-        self.assertEqual(True, ipaddr.IPNetwork(
-                'feff:ffff:ffff:ffff::').is_site_local)
-        self.assertEqual(False, ipaddr.IPNetwork('fbf:ffff::').is_site_local)
-        self.assertEqual(False, ipaddr.IPNetwork('ff00::').is_site_local)
-
-        self.assertEqual(True, ipaddr.IPNetwork('fc00::').is_private)
-        self.assertEqual(True, ipaddr.IPNetwork(
-                'fc00:ffff:ffff:ffff::').is_private)
-        self.assertEqual(False, ipaddr.IPNetwork('fbff:ffff::').is_private)
-        self.assertEqual(False, ipaddr.IPNetwork('fe00::').is_private)
-
-        self.assertEqual(True, ipaddr.IPNetwork('fea0::').is_link_local)
-        self.assertEqual(True, ipaddr.IPNetwork('febf:ffff::').is_link_local)
-        self.assertEqual(False, ipaddr.IPNetwork('fe7f:ffff::').is_link_local)
-        self.assertEqual(False, ipaddr.IPNetwork('fec0::').is_link_local)
-
-        self.assertEqual(True, ipaddr.IPNetwork('0:0::0:01').is_loopback)
-        self.assertEqual(False, ipaddr.IPNetwork('::1/127').is_loopback)
-        self.assertEqual(False, ipaddr.IPNetwork('::').is_loopback)
-        self.assertEqual(False, ipaddr.IPNetwork('::2').is_loopback)
-
-        self.assertEqual(True, ipaddr.IPNetwork('0::0').is_unspecified)
-        self.assertEqual(False, ipaddr.IPNetwork('::1').is_unspecified)
-        self.assertEqual(False, ipaddr.IPNetwork('::/127').is_unspecified)
-
-        # test addresses
-        self.assertEqual(True, ipaddr.IPAddress('ffff::').is_multicast)
-        self.assertEqual(True, ipaddr.IPAddress(2**128-1).is_multicast)
-        self.assertEqual(True, ipaddr.IPAddress('ff00::').is_multicast)
-        self.assertEqual(False, ipaddr.IPAddress('fdff::').is_multicast)
-
-        self.assertEqual(True, ipaddr.IPAddress('fecf::').is_site_local)
-        self.assertEqual(True, ipaddr.IPAddress(
-                'feff:ffff:ffff:ffff::').is_site_local)
-        self.assertEqual(False, ipaddr.IPAddress('fbf:ffff::').is_site_local)
-        self.assertEqual(False, ipaddr.IPAddress('ff00::').is_site_local)
-
-        self.assertEqual(True, ipaddr.IPAddress('fc00::').is_private)
-        self.assertEqual(True, ipaddr.IPAddress(
-                'fc00:ffff:ffff:ffff::').is_private)
-        self.assertEqual(False, ipaddr.IPAddress('fbff:ffff::').is_private)
-        self.assertEqual(False, ipaddr.IPAddress('fe00::').is_private)
-
-        self.assertEqual(True, ipaddr.IPAddress('fea0::').is_link_local)
-        self.assertEqual(True, ipaddr.IPAddress('febf:ffff::').is_link_local)
-        self.assertEqual(False, ipaddr.IPAddress('fe7f:ffff::').is_link_local)
-        self.assertEqual(False, ipaddr.IPAddress('fec0::').is_link_local)
-
-        self.assertEqual(True, ipaddr.IPAddress('0:0::0:01').is_loopback)
-        self.assertEqual(True, ipaddr.IPAddress('::1').is_loopback)
-        self.assertEqual(False, ipaddr.IPAddress('::2').is_loopback)
-
-        self.assertEqual(True, ipaddr.IPAddress('0::0').is_unspecified)
-        self.assertEqual(False, ipaddr.IPAddress('::1').is_unspecified)
-
-        # some generic IETF reserved addresses
-        self.assertEqual(True, ipaddr.IPAddress('100::').is_reserved)
-        self.assertEqual(True, ipaddr.IPNetwork('4000::1/128').is_reserved)
-
-    def testIpv4Mapped(self):
-        self.assertEqual(ipaddr.IPAddress('::ffff:192.168.1.1').ipv4_mapped,
-                         ipaddr.IPAddress('192.168.1.1'))
-        self.assertEqual(ipaddr.IPAddress('::c0a8:101').ipv4_mapped, None)
-        self.assertEqual(ipaddr.IPAddress('::ffff:c0a8:101').ipv4_mapped,
-                         ipaddr.IPAddress('192.168.1.1'))
-
-    def testAddrExclude(self):
-        addr1 = ipaddr.IPNetwork('10.1.1.0/24')
-        addr2 = ipaddr.IPNetwork('10.1.1.0/26')
-        addr3 = ipaddr.IPNetwork('10.2.1.0/24')
-        addr4 = ipaddr.IPAddress('10.1.1.0')
-        self.assertEqual(addr1.address_exclude(addr2),
-                         [ipaddr.IPNetwork('10.1.1.64/26'),
-                          ipaddr.IPNetwork('10.1.1.128/25')])
-        self.assertRaises(ValueError, addr1.address_exclude, addr3)
-        self.assertRaises(TypeError, addr1.address_exclude, addr4)
-        self.assertEqual(addr1.address_exclude(addr1), [])
-
-    def testHash(self):
-        self.assertEqual(hash(ipaddr.IPNetwork('10.1.1.0/24')),
-                          hash(ipaddr.IPNetwork('10.1.1.0/24')))
-        self.assertEqual(hash(ipaddr.IPAddress('10.1.1.0')),
-                          hash(ipaddr.IPAddress('10.1.1.0')))
-        # i70
-        self.assertEqual(hash(ipaddr.IPAddress('1.2.3.4')),
-                          hash(ipaddr.IPAddress(
-                    long(ipaddr.IPAddress('1.2.3.4')._ip))))
-        ip1 = ipaddr.IPAddress('10.1.1.0')
-        ip2 = ipaddr.IPAddress('1::')
-        dummy = {}
-        dummy[self.ipv4] = None
-        dummy[self.ipv6] = None
-        dummy[ip1] = None
-        dummy[ip2] = None
-        self.assertTrue(self.ipv4 in dummy)
-        self.assertTrue(ip2 in dummy)
-
-    def testCopyConstructor(self):
-        addr1 = ipaddr.IPNetwork('10.1.1.0/24')
-        addr2 = ipaddr.IPNetwork(addr1)
-        addr3 = ipaddr.IPNetwork('2001:658:22a:cafe:200::1/64')
-        addr4 = ipaddr.IPNetwork(addr3)
-        addr5 = ipaddr.IPv4Address('1.1.1.1')
-        addr6 = ipaddr.IPv6Address('2001:658:22a:cafe:200::1')
-
-        self.assertEqual(addr1, addr2)
-        self.assertEqual(addr3, addr4)
-        self.assertEqual(addr5, ipaddr.IPv4Address(addr5))
-        self.assertEqual(addr6, ipaddr.IPv6Address(addr6))
-
-    def testCompressIPv6Address(self):
-        test_addresses = {
-            '1:2:3:4:5:6:7:8': '1:2:3:4:5:6:7:8/128',
-            '2001:0:0:4:0:0:0:8': '2001:0:0:4::8/128',
-            '2001:0:0:4:5:6:7:8': '2001::4:5:6:7:8/128',
-            '2001:0:3:4:5:6:7:8': '2001:0:3:4:5:6:7:8/128',
-            '2001:0:3:4:5:6:7:8': '2001:0:3:4:5:6:7:8/128',
-            '0:0:3:0:0:0:0:ffff': '0:0:3::ffff/128',
-            '0:0:0:4:0:0:0:ffff': '::4:0:0:0:ffff/128',
-            '0:0:0:0:5:0:0:ffff': '::5:0:0:ffff/128',
-            '1:0:0:4:0:0:7:8': '1::4:0:0:7:8/128',
-            '0:0:0:0:0:0:0:0': '::/128',
-            '0:0:0:0:0:0:0:0/0': '::/0',
-            '0:0:0:0:0:0:0:1': '::1/128',
-            '2001:0658:022a:cafe:0000:0000:0000:0000/66':
-            '2001:658:22a:cafe::/66',
-            '::1.2.3.4': '::102:304/128',
-            '1:2:3:4:5:ffff:1.2.3.4': '1:2:3:4:5:ffff:102:304/128',
-            '::7:6:5:4:3:2:1': '0:7:6:5:4:3:2:1/128',
-            '::7:6:5:4:3:2:0': '0:7:6:5:4:3:2:0/128',
-            '7:6:5:4:3:2:1::': '7:6:5:4:3:2:1:0/128',
-            '0:6:5:4:3:2:1::': '0:6:5:4:3:2:1:0/128',
-            }
-        for uncompressed, compressed in test_addresses.items():
-            self.assertEqual(compressed, str(ipaddr.IPv6Network(uncompressed)))
-
-    def testExplodeShortHandIpStr(self):
-        addr1 = ipaddr.IPv6Network('2001::1')
-        addr2 = ipaddr.IPv6Address('2001:0:5ef5:79fd:0:59d:a0e5:ba1')
-        self.assertEqual('2001:0000:0000:0000:0000:0000:0000:0001',
-                         addr1._explode_shorthand_ip_string(str(addr1.ip)))
-        self.assertEqual('0000:0000:0000:0000:0000:0000:0000:0001',
-                         ipaddr.IPv6Network('::1/128').exploded)
-        # issue 77
-        self.assertEqual('2001:0000:5ef5:79fd:0000:059d:a0e5:0ba1',
-                         addr2.exploded)
-
-    def testIntRepresentation(self):
-        self.assertEqual(16909060, int(self.ipv4))
-        self.assertEqual(42540616829182469433547762482097946625, int(self.ipv6))
-
-    def testHexRepresentation(self):
-        self.assertEqual(hex(0x1020304),
-                         hex(self.ipv4))
-
-        self.assertEqual(hex(0x20010658022ACAFE0200000000000001),
-                         hex(self.ipv6))
-
-    # backwards compatibility
-    def testBackwardsCompability(self):
-        self.assertEqual(ipaddr.CollapseAddrList(
-            [ipaddr.IPNetwork('1.1.0.0/24'), ipaddr.IPNetwork('1.1.1.0/24')]),
-                         [ipaddr.IPNetwork('1.1.0.0/23')])
-
-        self.assertEqual(ipaddr.IPNetwork('::42:0/112').AddressExclude(
-            ipaddr.IPNetwork('::42:8000/113')),
-                         [ipaddr.IPNetwork('::42:0/113')])
-
-        self.assertTrue(ipaddr.IPNetwork('1::/8').CompareNetworks(
-            ipaddr.IPNetwork('2::/9')) < 0)
-
-        self.assertEqual(ipaddr.IPNetwork('1::/16').Contains(
-            ipaddr.IPNetwork('2::/16')), False)
-
-        self.assertEqual(ipaddr.IPNetwork('0.0.0.0/0').Subnet(),
-                         [ipaddr.IPNetwork('0.0.0.0/1'),
-                          ipaddr.IPNetwork('128.0.0.0/1')])
-        self.assertEqual(ipaddr.IPNetwork('::/127').Subnet(),
-                         [ipaddr.IPNetwork('::/128'),
-                          ipaddr.IPNetwork('::1/128')])
-
-        self.assertEqual(ipaddr.IPNetwork('1.0.0.0/32').Supernet(),
-                         ipaddr.IPNetwork('1.0.0.0/31'))
-        self.assertEqual(ipaddr.IPNetwork('::/121').Supernet(),
-                         ipaddr.IPNetwork('::/120'))
-
-        self.assertEqual(ipaddr.IPNetwork('10.0.0.2').IsRFC1918(), True)
-        self.assertEqual(ipaddr.IPNetwork('10.0.0.0').IsMulticast(), False)
-        self.assertEqual(ipaddr.IPNetwork('127.255.255.255').IsLoopback(), True)
-        self.assertEqual(ipaddr.IPNetwork('169.255.255.255').IsLinkLocal(),
-                         False)
-
-    def testForceVersion(self):
-        self.assertEqual(ipaddr.IPNetwork(1).version, 4)
-        self.assertEqual(ipaddr.IPNetwork(1, version=6).version, 6)
-
-    def testWithStar(self):
-        self.assertEqual(str(self.ipv4.with_prefixlen), "1.2.3.4/24")
-        self.assertEqual(str(self.ipv4.with_netmask), "1.2.3.4/255.255.255.0")
-        self.assertEqual(str(self.ipv4.with_hostmask), "1.2.3.4/0.0.0.255")
-
-        self.assertEqual(str(self.ipv6.with_prefixlen),
-                         '2001:658:22a:cafe:200::1/64')
-        # rfc3513 sec 2.3 says that ipv6 only uses cidr notation for
-        # subnets
-        self.assertEqual(str(self.ipv6.with_netmask),
-                         '2001:658:22a:cafe:200::1/64')
-        # this probably don't make much sense, but it's included for
-        # compatibility with ipv4
-        self.assertEqual(str(self.ipv6.with_hostmask),
-                         '2001:658:22a:cafe:200::1/::ffff:ffff:ffff:ffff')
-
-    def testNetworkElementCaching(self):
-        # V4 - make sure we're empty
-        self.assertFalse(self.ipv4._cache.has_key('network'))
-        self.assertFalse(self.ipv4._cache.has_key('broadcast'))
-        self.assertFalse(self.ipv4._cache.has_key('hostmask'))
-
-        # V4 - populate and test
-        self.assertEqual(self.ipv4.network, ipaddr.IPv4Address('1.2.3.0'))
-        self.assertEqual(self.ipv4.broadcast, ipaddr.IPv4Address('1.2.3.255'))
-        self.assertEqual(self.ipv4.hostmask, ipaddr.IPv4Address('0.0.0.255'))
-
-        # V4 - check we're cached
-        self.assertTrue(self.ipv4._cache.has_key('network'))
-        self.assertTrue(self.ipv4._cache.has_key('broadcast'))
-        self.assertTrue(self.ipv4._cache.has_key('hostmask'))
-
-        # V6 - make sure we're empty
-        self.assertFalse(self.ipv6._cache.has_key('network'))
-        self.assertFalse(self.ipv6._cache.has_key('broadcast'))
-        self.assertFalse(self.ipv6._cache.has_key('hostmask'))
-
-        # V6 - populate and test
-        self.assertEqual(self.ipv6.network,
-                         ipaddr.IPv6Address('2001:658:22a:cafe::'))
-        self.assertEqual(self.ipv6.broadcast, ipaddr.IPv6Address(
-            '2001:658:22a:cafe:ffff:ffff:ffff:ffff'))
-        self.assertEqual(self.ipv6.hostmask,
-                         ipaddr.IPv6Address('::ffff:ffff:ffff:ffff'))
-
-        # V6 - check we're cached
-        self.assertTrue(self.ipv6._cache.has_key('network'))
-        self.assertTrue(self.ipv6._cache.has_key('broadcast'))
-        self.assertTrue(self.ipv6._cache.has_key('hostmask'))
-
-    def testTeredo(self):
-        # stolen from wikipedia
-        server = ipaddr.IPv4Address('65.54.227.120')
-        client = ipaddr.IPv4Address('192.0.2.45')
-        teredo_addr = '2001:0000:4136:e378:8000:63bf:3fff:fdd2'
-        self.assertEqual((server, client),
-                         ipaddr.IPAddress(teredo_addr).teredo)
-        bad_addr = '2000::4136:e378:8000:63bf:3fff:fdd2'
-        self.assertFalse(ipaddr.IPAddress(bad_addr).teredo)
-        bad_addr = '2001:0001:4136:e378:8000:63bf:3fff:fdd2'
-        self.assertFalse(ipaddr.IPAddress(bad_addr).teredo)
-
-        # i77
-        teredo_addr = ipaddr.IPv6Address('2001:0:5ef5:79fd:0:59d:a0e5:ba1')
-        self.assertEqual((ipaddr.IPv4Address('94.245.121.253'),
-                          ipaddr.IPv4Address('95.26.244.94')),
-                         teredo_addr.teredo)
-
-
-    def testsixtofour(self):
-        sixtofouraddr = ipaddr.IPAddress('2002:ac1d:2d64::1')
-        bad_addr = ipaddr.IPAddress('2000:ac1d:2d64::1')
-        self.assertEqual(ipaddr.IPv4Address('172.29.45.100'),
-                         sixtofouraddr.sixtofour)
-        self.assertFalse(bad_addr.sixtofour)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/contrib/ipaddr-py/setup.py b/contrib/ipaddr-py/setup.py
deleted file mode 100755
index 33564320e..000000000
--- a/contrib/ipaddr-py/setup.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2008 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from distutils.core import setup
-
-import ipaddr
-
-
-setup(name='ipaddr',
-      maintainer='Google',
-      maintainer_email='ipaddr-py-dev@googlegroups.com',
-      version=ipaddr.__version__,
-      url='http://code.google.com/p/ipaddr-py/',
-      license='Apache License, Version 2.0',
-      classifiers=[
-          'Development Status :: 5 - Production/Stable',
-          'Intended Audience :: Developers',
-          'License :: OSI Approved :: Apache Software License',
-          'Operating System :: OS Independent',
-          'Topic :: Internet',
-          'Topic :: Software Development :: Libraries',
-          'Topic :: System :: Networking'],
-      py_modules=['ipaddr'])
diff --git a/contrib/ipaddr-py/test-2to3.sh b/contrib/ipaddr-py/test-2to3.sh
deleted file mode 100755
index 408d665bc..000000000
--- a/contrib/ipaddr-py/test-2to3.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Converts the python2 ipaddr files to python3 and runs the unit tests
-# with both python versions.
-
-mkdir -p 2to3output && \
-cp -f *.py 2to3output && \
-( cd 2to3output && 2to3 . | patch -p0 ) && \
-py3version=$(python3 --version 2>&1) && \
-echo -e "\nTesting with ${py3version}" && \
-python3 2to3output/ipaddr_test.py && \
-rm -r 2to3output && \
-pyversion=$(python --version 2>&1) && \
-echo -e "\nTesting with ${pyversion}" && \
-./ipaddr_test.py
diff --git a/contrib/libgen/basename_r.c b/contrib/libgen/basename_r.c
deleted file mode 100644
index 2c3a87afe..000000000
--- a/contrib/libgen/basename_r.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * borrowed from glibc-2.12.1/string/basename.c
- * Modified to return "." for NULL or "", as required for SUSv2.
- */
-#include <string.h>
-#include <stdlib.h>
-#ifdef THREAD_UNSAFE_BASENAME
-
-/* Return the name-within-directory of a file name.
-   Copyright (C) 1996,97,98,2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-char *
-basename_r (filename)
-     const char *filename;
-{
-  char *p;
-
-  if ((filename == NULL) || (*filename == '\0'))
-    return ".";
-
-  p = strrchr (filename, '/');
-  return p ? p + 1 : (char *) filename;
-}
-#endif /* THREAD_UNSAFE_BASENAME */
diff --git a/contrib/libgen/dirname_r.c b/contrib/libgen/dirname_r.c
deleted file mode 100644
index 131cbcf2a..000000000
--- a/contrib/libgen/dirname_r.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Borrowed from glibc-2.12.1/string/memrchr.c
- * Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
- * Removed code for long bigger than 32 bytes, renamed __ptr_t as void *
- * changed reg_char type to char.
- */
-#include <string.h>
-#include <stdlib.h>
-#ifdef THREAD_UNSAFE_DIRNAME
-
-/* memrchr -- find the last occurrence of a byte in a memory block
-   Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
-   with help from Dan Sahlin (dan@sics.se) and
-   commentary by Jim Blandy (jimb@ai.mit.edu);
-   adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
-   and implemented by Roland McGrath (roland@ai.mit.edu).
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-void *
-__memrchr (s, c_in, n)
-     const void * s;
-     int c_in;
-     size_t n;
-{
-  const unsigned char *char_ptr;
-  const unsigned long int *longword_ptr;
-  unsigned long int longword, magic_bits, charmask;
-  unsigned char c;
-
-  c = (unsigned char) c_in;
-
-  /* Handle the last few characters by reading one character at a time.
-     Do this until CHAR_PTR is aligned on a longword boundary.  */
-  for (char_ptr = (const unsigned char *) s + n;
-       n > 0 && ((unsigned long int) char_ptr
-		 & (sizeof (longword) - 1)) != 0;
-       --n)
-    if (*--char_ptr == c)
-      return (void *) char_ptr;
-
-  /* All these elucidatory comments refer to 4-byte longwords,
-     but the theory applies equally well to 8-byte longwords.  */
-
-  longword_ptr = (const unsigned long int *) char_ptr;
-
-  /* Bits 31, 24, 16, and 8 of this number are zero.  Call these bits
-     the "holes."  Note that there is a hole just to the left of
-     each byte, with an extra at the end:
-
-     bits:  01111110 11111110 11111110 11111111
-     bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
-
-     The 1-bits make sure that carries propagate to the next 0-bit.
-     The 0-bits provide holes for carries to fall into.  */
-
-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
-    abort ();
-
-  magic_bits = 0x7efefeff;
-
-  /* Set up a longword, each of whose bytes is C.  */
-  charmask = c | (c << 8);
-  charmask |= charmask << 16;
-
-  /* Instead of the traditional loop which tests each character,
-     we will test a longword at a time.  The tricky part is testing
-     if *any of the four* bytes in the longword in question are zero.  */
-  while (n >= sizeof (longword))
-    {
-      /* We tentatively exit the loop if adding MAGIC_BITS to
-	 LONGWORD fails to change any of the hole bits of LONGWORD.
-
-	 1) Is this safe?  Will it catch all the zero bytes?
-	 Suppose there is a byte with all zeros.  Any carry bits
-	 propagating from its left will fall into the hole at its
-	 least significant bit and stop.  Since there will be no
-	 carry from its most significant bit, the LSB of the
-	 byte to the left will be unchanged, and the zero will be
-	 detected.
-
-	 2) Is this worthwhile?  Will it ignore everything except
-	 zero bytes?  Suppose every byte of LONGWORD has a bit set
-	 somewhere.  There will be a carry into bit 8.  If bit 8
-	 is set, this will carry into bit 16.  If bit 8 is clear,
-	 one of bits 9-15 must be set, so there will be a carry
-	 into bit 16.  Similarly, there will be a carry into bit
-	 24.  If one of bits 24-30 is set, there will be a carry
-	 into bit 31, so all of the hole bits will be changed.
-
-	 The one misfire occurs when bits 24-30 are clear and bit
-	 31 is set; in this case, the hole at bit 31 is not
-	 changed.  If we had access to the processor carry flag,
-	 we could close this loophole by putting the fourth hole
-	 at bit 32!
-
-	 So it ignores everything except 128's, when they're aligned
-	 properly.
-
-	 3) But wait!  Aren't we looking for C, not zero?
-	 Good point.  So what we do is XOR LONGWORD with a longword,
-	 each of whose bytes is C.  This turns each byte that is C
-	 into a zero.  */
-
-      longword = *--longword_ptr ^ charmask;
-
-      /* Add MAGIC_BITS to LONGWORD.  */
-      if ((((longword + magic_bits)
-
-	    /* Set those bits that were unchanged by the addition.  */
-	    ^ ~longword)
-
-	   /* Look at only the hole bits.  If any of the hole bits
-	      are unchanged, most likely one of the bytes was a
-	      zero.  */
-	   & ~magic_bits) != 0)
-	{
-	  /* Which of the bytes was C?  If none of them were, it was
-	     a misfire; continue the search.  */
-
-	  const unsigned char *cp = (const unsigned char *) longword_ptr;
-
-	  if (cp[3] == c)
-	    return (void *) &cp[3];
-	  if (cp[2] == c)
-	    return (void *) &cp[2];
-	  if (cp[1] == c)
-	    return (void *) &cp[1];
-	  if (cp[0] == c)
-	    return (void *) cp;
-	}
-
-      n -= sizeof (longword);
-    }
-
-  char_ptr = (const unsigned char *) longword_ptr;
-
-  while (n-- > 0)
-    {
-      if (*--char_ptr == c)
-	return (void *) char_ptr;
-    }
-
-  return 0;
-}
-
-/*
- * Borrowed from glibc-2.12.1/misc/dirname.c
- */
-
-/* dirname - return directory part of PATH.
-   Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-char *
-dirname_r (char *path)
-{
-  static const char dot[] = ".";
-  char *last_slash;
-
-  /* Find last '/'.  */
-  last_slash = path != NULL ? strrchr (path, '/') : NULL;
-
-  if (last_slash != NULL && last_slash != path && last_slash[1] == '\0')
-    {
-      /* Determine whether all remaining characters are slashes.  */
-      char *runp;
-
-      for (runp = last_slash; runp != path; --runp)
-        if (runp[-1] != '/')
-          break;
-
-      /* The '/' is the last character, we have to look further.  */
-      if (runp != path)
-        last_slash = __memrchr (path, '/', runp - path);
-    }
-
-  if (last_slash != NULL)
-    {
-      /* Determine whether all remaining characters are slashes.  */
-      char *runp;
-
-      for (runp = last_slash; runp != path; --runp)
-        if (runp[-1] != '/')
-          break;
-
-      /* Terminate the path.  */
-      if (runp == path)
-        {
-          /* The last slash is the first character in the string.  We have to
-             return "/".  As a special case we have to return "//" if there
-             are exactly two slashes at the beginning of the string.  See
-             XBD 4.10 Path Name Resolution for more information.  */
-          if (last_slash == path + 1)
-            ++last_slash;
-          else
-            last_slash = path + 1;
-        }
-      else
-        last_slash = runp;
-
-      last_slash[0] = '\0';
-    }
-  else
-    /* This assignment is ill-designed but the XPG specs require to
-       return a string containing "." in any case no directory part is
-       found and so a static and constant string is required.  */
-    path = (char *) dot;
-
-  return path;
-}
-#endif /* THREAD_UNSAFE_DIRNAME */
diff --git a/contrib/macfuse/mount_darwin.c b/contrib/macfuse/mount_darwin.c
index c485583e9..9d87fca35 100644
--- a/contrib/macfuse/mount_darwin.c
+++ b/contrib/macfuse/mount_darwin.c
@@ -133,8 +133,7 @@ Return:
 }
 
 int
-gf_fuse_mount (const char *mountpoint, char *fsname, char *mnt_param,
-               pid_t *mtab_pid /* not used on OS X */)
+gf_fuse_mount (const char *mountpoint, char *fsname, char *mnt_param)
 {
     int fd, pid;
     int result;
diff --git a/contrib/md5/md5.c b/contrib/md5/md5.c
new file mode 100644
index 000000000..5f0d0d157
--- /dev/null
+++ b/contrib/md5/md5.c
@@ -0,0 +1,310 @@
+/*
+ * RFC 1321 compliant MD5 implementation
+ *
+ * Copyright (C) 2001-2003 Christophe Devine
+ *
+ * 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 3 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, visit the http://fsf.org website.
+ */
+
+
+#include <inttypes.h>
+#include <string.h>
+
+#include "md5.h"
+
+void md5_begin(md_context *ctx)
+{
+	ctx->A = 0x67452301;
+	ctx->B = 0xEFCDAB89;
+	ctx->C = 0x98BADCFE;
+	ctx->D = 0x10325476;
+
+	ctx->totalN = ctx->totalN2 = 0;
+}
+
+static void md5_process(md_context *ctx, const uint8_t data[CSUM_CHUNK])
+{
+	uint32_t X[16], A, B, C, D;
+
+	A = ctx->A;
+	B = ctx->B;
+	C = ctx->C;
+	D = ctx->D;
+
+	X[0] = IVAL(data, 0);
+	X[1] = IVAL(data, 4);
+	X[2] = IVAL(data, 8);
+	X[3] = IVAL(data, 12);
+	X[4] = IVAL(data, 16);
+	X[5] = IVAL(data, 20);
+	X[6] = IVAL(data, 24);
+	X[7] = IVAL(data, 28);
+	X[8] = IVAL(data, 32);
+	X[9] = IVAL(data, 36);
+	X[10] = IVAL(data, 40);
+	X[11] = IVAL(data, 44);
+	X[12] = IVAL(data, 48);
+	X[13] = IVAL(data, 52);
+	X[14] = IVAL(data, 56);
+	X[15] = IVAL(data, 60);
+
+#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
+
+#define P(a,b,c,d,k,s,t) a += F(b,c,d) + X[k] + t, a = S(a,s) + b
+
+#define F(x,y,z) (z ^ (x & (y ^ z)))
+
+	P(A, B, C, D,  0,  7, 0xD76AA478);
+	P(D, A, B, C,  1, 12, 0xE8C7B756);
+	P(C, D, A, B,  2, 17, 0x242070DB);
+	P(B, C, D, A,  3, 22, 0xC1BDCEEE);
+	P(A, B, C, D,  4,  7, 0xF57C0FAF);
+	P(D, A, B, C,  5, 12, 0x4787C62A);
+	P(C, D, A, B,  6, 17, 0xA8304613);
+	P(B, C, D, A,  7, 22, 0xFD469501);
+	P(A, B, C, D,  8,  7, 0x698098D8);
+	P(D, A, B, C,  9, 12, 0x8B44F7AF);
+	P(C, D, A, B, 10, 17, 0xFFFF5BB1);
+	P(B, C, D, A, 11, 22, 0x895CD7BE);
+	P(A, B, C, D, 12,  7, 0x6B901122);
+	P(D, A, B, C, 13, 12, 0xFD987193);
+	P(C, D, A, B, 14, 17, 0xA679438E);
+	P(B, C, D, A, 15, 22, 0x49B40821);
+
+#undef F
+#define F(x,y,z) (y ^ (z & (x ^ y)))
+
+	P(A, B, C, D,  1,  5, 0xF61E2562);
+	P(D, A, B, C,  6,  9, 0xC040B340);
+	P(C, D, A, B, 11, 14, 0x265E5A51);
+	P(B, C, D, A,  0, 20, 0xE9B6C7AA);
+	P(A, B, C, D,  5,  5, 0xD62F105D);
+	P(D, A, B, C, 10,  9, 0x02441453);
+	P(C, D, A, B, 15, 14, 0xD8A1E681);
+	P(B, C, D, A,  4, 20, 0xE7D3FBC8);
+	P(A, B, C, D,  9,  5, 0x21E1CDE6);
+	P(D, A, B, C, 14,  9, 0xC33707D6);
+	P(C, D, A, B,  3, 14, 0xF4D50D87);
+	P(B, C, D, A,  8, 20, 0x455A14ED);
+	P(A, B, C, D, 13,  5, 0xA9E3E905);
+	P(D, A, B, C,  2,  9, 0xFCEFA3F8);
+	P(C, D, A, B,  7, 14, 0x676F02D9);
+	P(B, C, D, A, 12, 20, 0x8D2A4C8A);
+
+#undef F
+#define F(x,y,z) (x ^ y ^ z)
+
+	P(A, B, C, D,  5,  4, 0xFFFA3942);
+	P(D, A, B, C,  8, 11, 0x8771F681);
+	P(C, D, A, B, 11, 16, 0x6D9D6122);
+	P(B, C, D, A, 14, 23, 0xFDE5380C);
+	P(A, B, C, D,  1,  4, 0xA4BEEA44);
+	P(D, A, B, C,  4, 11, 0x4BDECFA9);
+	P(C, D, A, B,  7, 16, 0xF6BB4B60);
+	P(B, C, D, A, 10, 23, 0xBEBFBC70);
+	P(A, B, C, D, 13,  4, 0x289B7EC6);
+	P(D, A, B, C,  0, 11, 0xEAA127FA);
+	P(C, D, A, B,  3, 16, 0xD4EF3085);
+	P(B, C, D, A,  6, 23, 0x04881D05);
+	P(A, B, C, D,  9,  4, 0xD9D4D039);
+	P(D, A, B, C, 12, 11, 0xE6DB99E5);
+	P(C, D, A, B, 15, 16, 0x1FA27CF8);
+	P(B, C, D, A,  2, 23, 0xC4AC5665);
+
+#undef F
+#define F(x,y,z) (y ^ (x | ~z))
+
+	P(A, B, C, D,  0,  6, 0xF4292244);
+	P(D, A, B, C,  7, 10, 0x432AFF97);
+	P(C, D, A, B, 14, 15, 0xAB9423A7);
+	P(B, C, D, A,  5, 21, 0xFC93A039);
+	P(A, B, C, D, 12,  6, 0x655B59C3);
+	P(D, A, B, C,  3, 10, 0x8F0CCC92);
+	P(C, D, A, B, 10, 15, 0xFFEFF47D);
+	P(B, C, D, A,  1, 21, 0x85845DD1);
+	P(A, B, C, D,  8,  6, 0x6FA87E4F);
+	P(D, A, B, C, 15, 10, 0xFE2CE6E0);
+	P(C, D, A, B,  6, 15, 0xA3014314);
+	P(B, C, D, A, 13, 21, 0x4E0811A1);
+	P(A, B, C, D,  4,  6, 0xF7537E82);
+	P(D, A, B, C, 11, 10, 0xBD3AF235);
+	P(C, D, A, B,  2, 15, 0x2AD7D2BB);
+	P(B, C, D, A,  9, 21, 0xEB86D391);
+
+#undef F
+
+	ctx->A += A;
+	ctx->B += B;
+	ctx->C += C;
+	ctx->D += D;
+}
+
+void md5_update(md_context *ctx, const uint8_t *input, uint32_t length)
+{
+	uint32_t left, fill;
+
+	if (!length)
+		return;
+
+	left = ctx->totalN & 0x3F;
+	fill = CSUM_CHUNK - left;
+
+	ctx->totalN += length;
+	ctx->totalN &= 0xFFFFFFFF;
+
+	if (ctx->totalN < length)
+		ctx->totalN2++;
+
+	if (left && length >= fill) {
+		memcpy(ctx->buffer + left, input, fill);
+		md5_process(ctx, ctx->buffer);
+		length -= fill;
+		input  += fill;
+		left = 0;
+	}
+
+	while (length >= CSUM_CHUNK) {
+		md5_process(ctx, input);
+		length -= CSUM_CHUNK;
+		input  += CSUM_CHUNK;
+	}
+
+	if (length)
+		memcpy(ctx->buffer + left, input, length);
+}
+
+static uint8_t md5_padding[CSUM_CHUNK] = { 0x80 };
+
+void md5_result(md_context *ctx, uint8_t digest[MD5_DIGEST_LEN])
+{
+	uint32_t last, padn;
+	uint32_t high, low;
+	uint8_t msglen[8];
+
+	high = (ctx->totalN >> 29)
+	     | (ctx->totalN2 <<  3);
+	low  = (ctx->totalN <<  3);
+
+	SIVAL(msglen, 0, low);
+	SIVAL(msglen, 4, high);
+
+	last = ctx->totalN & 0x3F;
+	padn = last < 56 ? 56 - last : 120 - last;
+
+	md5_update(ctx, md5_padding, padn);
+	md5_update(ctx, msglen, 8);
+
+	SIVAL(digest, 0, ctx->A);
+	SIVAL(digest, 4, ctx->B);
+	SIVAL(digest, 8, ctx->C);
+	SIVAL(digest, 12, ctx->D);
+}
+
+void get_md5(uint8_t *out, const uint8_t *input, int n)
+{
+	md_context ctx;
+	md5_begin(&ctx);
+	md5_update(&ctx, input, n);
+	md5_result(&ctx, out);
+}
+
+#ifdef TEST_MD5
+
+#include <stdlib.h>
+#include <stdio.h>
+
+/*
+ * those are the standard RFC 1321 test vectors
+ */
+
+static struct {
+    char *str, *md5;
+} tests[] = {
+ { "",
+   "d41d8cd98f00b204e9800998ecf8427e" },
+ { "a",
+   "0cc175b9c0f1b6a831c399e269772661" },
+ { "abc",
+   "900150983cd24fb0d6963f7d28e17f72" },
+ { "message digest",
+   "f96b697d7cb7938d525a2f31aaf161d0" },
+ { "abcdefghijklmnopqrstuvwxyz",
+   "c3fcd3d76192e4007dfb496cca67e13b" },
+ { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+   "d174ab98d277d9f5a5611c2c9f419d9f" },
+ { "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
+   "57edf4a22be3c955ac49da2e2107b67a" },
+ { NULL, NULL }
+};
+
+int main(int argc, char *argv[])
+{
+	FILE *f;
+	int i, j;
+	char output[33];
+	md_context ctx;
+	uint8_t buf[1000];
+	uint8_t md5sum[MD5_DIGEST_LEN];
+
+	if (argc < 2) {
+		printf("\nMD5 Validation Tests:\n\n");
+
+		for (i = 0; tests[i].str; i++) {
+			char *str = tests[i].str;
+			char *chk = tests[i].md5;
+
+			printf("  Test %d ", i + 1);
+
+			get_md5(md5sum, str, strlen(str));
+
+			for (j = 0; j < MD5_DIGEST_LEN; j++)
+				sprintf(output + j * 2, "%02x", md5sum[j]);
+
+			if (memcmp(output, chk, 32)) {
+				printf("failed!\n");
+				return 1;
+			}
+
+			printf("passed.\n");
+		}
+
+		printf("\n");
+		return 0;
+	}
+
+	while (--argc) {
+		if (!(f = fopen(*++argv, "rb"))) {
+			perror("fopen");
+			return 1;
+		}
+
+		md5_begin(&ctx);
+
+		while ((i = fread(buf, 1, sizeof buf, f)) > 0)
+			md5_update(&ctx, buf, i);
+
+		fclose(f);
+
+		md5_result(&ctx, md5sum);
+
+		for (j = 0; j < MD5_DIGEST_LEN; j++)
+			printf("%02x", md5sum[j]);
+
+		printf("  %s\n", *argv);
+	}
+
+	return 0;
+}
+
+#endif
diff --git a/contrib/md5/md5.h b/contrib/md5/md5.h
new file mode 100644
index 000000000..ba8f08dbc
--- /dev/null
+++ b/contrib/md5/md5.h
@@ -0,0 +1,78 @@
+/* rsync-3.0.6/byteorder.h */
+
+/*
+ * Simple byteorder handling.
+ *
+ * Copyright (C) 1992-1995 Andrew Tridgell
+ * Copyright (C) 2007-2008 Wayne Davison
+ *
+ * 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 3 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, visit the http://fsf.org website.
+ */
+
+#undef CAREFUL_ALIGNMENT
+
+/* We know that the x86 can handle misalignment and has the same
+ * byte order (LSB-first) as the 32-bit numbers we transmit. */
+
+#ifdef __i386__
+#define CAREFUL_ALIGNMENT 0
+#endif
+
+#ifndef CAREFUL_ALIGNMENT
+#define CAREFUL_ALIGNMENT 1
+#endif
+
+#define CVAL(buf,pos) (((unsigned char *)(buf))[pos])
+#define UVAL(buf,pos) ((uint32_t)CVAL(buf,pos))
+#define SCVAL(buf,pos,val) (CVAL(buf,pos) = (val))
+
+#if CAREFUL_ALIGNMENT
+#define PVAL(buf,pos) (UVAL(buf,pos)|UVAL(buf,(pos)+1)<<8)
+#define IVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+2)<<16)
+#define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8)
+#define SIVALX(buf,pos,val) (SSVALX(buf,pos,val&0xFFFF),SSVALX(buf,pos+2,val>>16))
+#define SIVAL(buf,pos,val) SIVALX((buf),(pos),((uint32_t)(val)))
+#else
+
+/* this handles things for architectures like the 386 that can handle
+   alignment errors */
+
+/*
+   WARNING: This section is dependent on the length of int32
+   being correct. set CAREFUL_ALIGNMENT if it is not.
+*/
+
+#define IVAL(buf,pos) (*(uint32_t *)((char *)(buf) + (pos)))
+#define SIVAL(buf,pos,val) IVAL(buf,pos)=((uint32_t)(val))
+#endif
+
+/* The include file for both the MD4 and MD5 routines. */
+
+#define MD5_DIGEST_LEN 16
+#define MAX_DIGEST_LEN MD5_DIGEST_LEN
+
+#define CSUM_CHUNK 64
+
+typedef struct {
+	uint32_t A, B, C, D;
+	uint32_t totalN;          /* bit count, lower 32 bits */
+	uint32_t totalN2;         /* bit count, upper 32 bits */
+	uint8_t buffer[CSUM_CHUNK];
+} md_context;
+
+void md5_begin(md_context *ctx);
+void md5_update(md_context *ctx, const uint8_t *input, uint32_t length);
+void md5_result(md_context *ctx, uint8_t digest[MD5_DIGEST_LEN]);
+
+void get_md5(uint8_t digest[MD5_DIGEST_LEN], const uint8_t *input, int n);
diff --git a/contrib/qemu/block.c b/contrib/qemu/block.c
deleted file mode 100644
index b56024113..000000000
--- a/contrib/qemu/block.c
+++ /dev/null
@@ -1,4604 +0,0 @@
-/*
- * QEMU System Emulator block driver
- *
- * Copyright (c) 2003 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#include "config-host.h"
-#include "qemu-common.h"
-#include "trace.h"
-#include "monitor/monitor.h"
-#include "block/block_int.h"
-#include "block/blockjob.h"
-#include "qemu/module.h"
-#include "qapi/qmp/qjson.h"
-#include "sysemu/sysemu.h"
-#include "qemu/notify.h"
-#include "block/coroutine.h"
-#include "qmp-commands.h"
-#include "qemu/timer.h"
-
-#ifdef CONFIG_BSD
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/queue.h>
-#ifndef __DragonFly__
-#include <sys/disk.h>
-#endif
-#endif
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
-
-typedef enum {
-    BDRV_REQ_COPY_ON_READ = 0x1,
-    BDRV_REQ_ZERO_WRITE   = 0x2,
-} BdrvRequestFlags;
-
-static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load);
-static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs,
-        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque);
-static BlockDriverAIOCB *bdrv_aio_writev_em(BlockDriverState *bs,
-        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque);
-static int coroutine_fn bdrv_co_readv_em(BlockDriverState *bs,
-                                         int64_t sector_num, int nb_sectors,
-                                         QEMUIOVector *iov);
-static int coroutine_fn bdrv_co_writev_em(BlockDriverState *bs,
-                                         int64_t sector_num, int nb_sectors,
-                                         QEMUIOVector *iov);
-static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
-    BdrvRequestFlags flags);
-static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
-    BdrvRequestFlags flags);
-static BlockDriverAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs,
-                                               int64_t sector_num,
-                                               QEMUIOVector *qiov,
-                                               int nb_sectors,
-                                               BlockDriverCompletionFunc *cb,
-                                               void *opaque,
-                                               bool is_write);
-static void coroutine_fn bdrv_co_do_rw(void *opaque);
-static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors);
-
-static bool bdrv_exceed_bps_limits(BlockDriverState *bs, int nb_sectors,
-        bool is_write, double elapsed_time, uint64_t *wait);
-static bool bdrv_exceed_iops_limits(BlockDriverState *bs, bool is_write,
-        double elapsed_time, uint64_t *wait);
-static bool bdrv_exceed_io_limits(BlockDriverState *bs, int nb_sectors,
-        bool is_write, int64_t *wait);
-
-static QTAILQ_HEAD(, BlockDriverState) bdrv_states =
-    QTAILQ_HEAD_INITIALIZER(bdrv_states);
-
-static QLIST_HEAD(, BlockDriver) bdrv_drivers =
-    QLIST_HEAD_INITIALIZER(bdrv_drivers);
-
-/* If non-zero, use only whitelisted block drivers */
-static int use_bdrv_whitelist;
-
-#ifdef _WIN32
-static int is_windows_drive_prefix(const char *filename)
-{
-    return (((filename[0] >= 'a' && filename[0] <= 'z') ||
-             (filename[0] >= 'A' && filename[0] <= 'Z')) &&
-            filename[1] == ':');
-}
-
-int is_windows_drive(const char *filename)
-{
-    if (is_windows_drive_prefix(filename) &&
-        filename[2] == '\0')
-        return 1;
-    if (strstart(filename, "\\\\.\\", NULL) ||
-        strstart(filename, "//./", NULL))
-        return 1;
-    return 0;
-}
-#endif
-
-/* throttling disk I/O limits */
-void bdrv_io_limits_disable(BlockDriverState *bs)
-{
-    bs->io_limits_enabled = false;
-
-    while (qemu_co_queue_next(&bs->throttled_reqs));
-
-    if (bs->block_timer) {
-        qemu_del_timer(bs->block_timer);
-        qemu_free_timer(bs->block_timer);
-        bs->block_timer = NULL;
-    }
-
-    bs->slice_start = 0;
-    bs->slice_end   = 0;
-}
-
-static void bdrv_block_timer(void *opaque)
-{
-    BlockDriverState *bs = opaque;
-
-    qemu_co_queue_next(&bs->throttled_reqs);
-}
-
-void bdrv_io_limits_enable(BlockDriverState *bs)
-{
-    qemu_co_queue_init(&bs->throttled_reqs);
-    bs->block_timer = qemu_new_timer_ns(vm_clock, bdrv_block_timer, bs);
-    bs->io_limits_enabled = true;
-}
-
-bool bdrv_io_limits_enabled(BlockDriverState *bs)
-{
-    BlockIOLimit *io_limits = &bs->io_limits;
-    return io_limits->bps[BLOCK_IO_LIMIT_READ]
-         || io_limits->bps[BLOCK_IO_LIMIT_WRITE]
-         || io_limits->bps[BLOCK_IO_LIMIT_TOTAL]
-         || io_limits->iops[BLOCK_IO_LIMIT_READ]
-         || io_limits->iops[BLOCK_IO_LIMIT_WRITE]
-         || io_limits->iops[BLOCK_IO_LIMIT_TOTAL];
-}
-
-static void bdrv_io_limits_intercept(BlockDriverState *bs,
-                                     bool is_write, int nb_sectors)
-{
-    int64_t wait_time = -1;
-
-    if (!qemu_co_queue_empty(&bs->throttled_reqs)) {
-        qemu_co_queue_wait(&bs->throttled_reqs);
-    }
-
-    /* In fact, we hope to keep each request's timing, in FIFO mode. The next
-     * throttled requests will not be dequeued until the current request is
-     * allowed to be serviced. So if the current request still exceeds the
-     * limits, it will be inserted to the head. All requests followed it will
-     * be still in throttled_reqs queue.
-     */
-
-    while (bdrv_exceed_io_limits(bs, nb_sectors, is_write, &wait_time)) {
-        qemu_mod_timer(bs->block_timer,
-                       wait_time + qemu_get_clock_ns(vm_clock));
-        qemu_co_queue_wait_insert_head(&bs->throttled_reqs);
-    }
-
-    qemu_co_queue_next(&bs->throttled_reqs);
-}
-
-/* check if the path starts with "<protocol>:" */
-static int path_has_protocol(const char *path)
-{
-    const char *p;
-
-#ifdef _WIN32
-    if (is_windows_drive(path) ||
-        is_windows_drive_prefix(path)) {
-        return 0;
-    }
-    p = path + strcspn(path, ":/\\");
-#else
-    p = path + strcspn(path, ":/");
-#endif
-
-    return *p == ':';
-}
-
-int path_is_absolute(const char *path)
-{
-#ifdef _WIN32
-    /* specific case for names like: "\\.\d:" */
-    if (is_windows_drive(path) || is_windows_drive_prefix(path)) {
-        return 1;
-    }
-    return (*path == '/' || *path == '\\');
-#else
-    return (*path == '/');
-#endif
-}
-
-/* if filename is absolute, just copy it to dest. Otherwise, build a
-   path to it by considering it is relative to base_path. URL are
-   supported. */
-void path_combine(char *dest, int dest_size,
-                  const char *base_path,
-                  const char *filename)
-{
-    const char *p, *p1;
-    int len;
-
-    if (dest_size <= 0)
-        return;
-    if (path_is_absolute(filename)) {
-        pstrcpy(dest, dest_size, filename);
-    } else {
-        p = strchr(base_path, ':');
-        if (p)
-            p++;
-        else
-            p = base_path;
-        p1 = strrchr(base_path, '/');
-#ifdef _WIN32
-        {
-            const char *p2;
-            p2 = strrchr(base_path, '\\');
-            if (!p1 || p2 > p1)
-                p1 = p2;
-        }
-#endif
-        if (p1)
-            p1++;
-        else
-            p1 = base_path;
-        if (p1 > p)
-            p = p1;
-        len = p - base_path;
-        if (len > dest_size - 1)
-            len = dest_size - 1;
-        memcpy(dest, base_path, len);
-        dest[len] = '\0';
-        pstrcat(dest, dest_size, filename);
-    }
-}
-
-void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz)
-{
-    if (bs->backing_file[0] == '\0' || path_has_protocol(bs->backing_file)) {
-        pstrcpy(dest, sz, bs->backing_file);
-    } else {
-        path_combine(dest, sz, bs->filename, bs->backing_file);
-    }
-}
-
-void bdrv_register(BlockDriver *bdrv)
-{
-    /* Block drivers without coroutine functions need emulation */
-    if (!bdrv->bdrv_co_readv) {
-        bdrv->bdrv_co_readv = bdrv_co_readv_em;
-        bdrv->bdrv_co_writev = bdrv_co_writev_em;
-
-        /* bdrv_co_readv_em()/brdv_co_writev_em() work in terms of aio, so if
-         * the block driver lacks aio we need to emulate that too.
-         */
-        if (!bdrv->bdrv_aio_readv) {
-            /* add AIO emulation layer */
-            bdrv->bdrv_aio_readv = bdrv_aio_readv_em;
-            bdrv->bdrv_aio_writev = bdrv_aio_writev_em;
-        }
-    }
-
-    QLIST_INSERT_HEAD(&bdrv_drivers, bdrv, list);
-}
-
-/* create a new block device (by default it is empty) */
-BlockDriverState *bdrv_new(const char *device_name)
-{
-    BlockDriverState *bs;
-
-    bs = g_malloc0(sizeof(BlockDriverState));
-    pstrcpy(bs->device_name, sizeof(bs->device_name), device_name);
-    if (device_name[0] != '\0') {
-        QTAILQ_INSERT_TAIL(&bdrv_states, bs, list);
-    }
-    bdrv_iostatus_disable(bs);
-    notifier_list_init(&bs->close_notifiers);
-    notifier_with_return_list_init(&bs->before_write_notifiers);
-
-    return bs;
-}
-
-void bdrv_add_close_notifier(BlockDriverState *bs, Notifier *notify)
-{
-    notifier_list_add(&bs->close_notifiers, notify);
-}
-
-BlockDriver *bdrv_find_format(const char *format_name)
-{
-    BlockDriver *drv1;
-    QLIST_FOREACH(drv1, &bdrv_drivers, list) {
-        if (!strcmp(drv1->format_name, format_name)) {
-            return drv1;
-        }
-    }
-    return NULL;
-}
-
-static int bdrv_is_whitelisted(BlockDriver *drv, bool read_only)
-{
-    static const char *whitelist_rw[] = {
-        CONFIG_BDRV_RW_WHITELIST
-    };
-    static const char *whitelist_ro[] = {
-        CONFIG_BDRV_RO_WHITELIST
-    };
-    const char **p;
-
-    if (!whitelist_rw[0] && !whitelist_ro[0]) {
-        return 1;               /* no whitelist, anything goes */
-    }
-
-    for (p = whitelist_rw; *p; p++) {
-        if (!strcmp(drv->format_name, *p)) {
-            return 1;
-        }
-    }
-    if (read_only) {
-        for (p = whitelist_ro; *p; p++) {
-            if (!strcmp(drv->format_name, *p)) {
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-BlockDriver *bdrv_find_whitelisted_format(const char *format_name,
-                                          bool read_only)
-{
-    BlockDriver *drv = bdrv_find_format(format_name);
-    return drv && bdrv_is_whitelisted(drv, read_only) ? drv : NULL;
-}
-
-typedef struct CreateCo {
-    BlockDriver *drv;
-    char *filename;
-    QEMUOptionParameter *options;
-    int ret;
-} CreateCo;
-
-static void coroutine_fn bdrv_create_co_entry(void *opaque)
-{
-    CreateCo *cco = opaque;
-    assert(cco->drv);
-
-    cco->ret = cco->drv->bdrv_create(cco->filename, cco->options);
-}
-
-int bdrv_create(BlockDriver *drv, const char* filename,
-    QEMUOptionParameter *options)
-{
-    int ret;
-
-    Coroutine *co;
-    CreateCo cco = {
-        .drv = drv,
-        .filename = g_strdup(filename),
-        .options = options,
-        .ret = NOT_DONE,
-    };
-
-    if (!drv->bdrv_create) {
-        ret = -ENOTSUP;
-        goto out;
-    }
-
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_create_co_entry(&cco);
-    } else {
-        co = qemu_coroutine_create(bdrv_create_co_entry);
-        qemu_coroutine_enter(co, &cco);
-        while (cco.ret == NOT_DONE) {
-            qemu_aio_wait();
-        }
-    }
-
-    ret = cco.ret;
-
-out:
-    g_free(cco.filename);
-    return ret;
-}
-
-int bdrv_create_file(const char* filename, QEMUOptionParameter *options)
-{
-    BlockDriver *drv;
-
-    drv = bdrv_find_protocol(filename, true);
-    if (drv == NULL) {
-        return -ENOENT;
-    }
-
-    return bdrv_create(drv, filename, options);
-}
-
-/*
- * Create a uniquely-named empty temporary file.
- * Return 0 upon success, otherwise a negative errno value.
- */
-int get_tmp_filename(char *filename, int size)
-{
-#ifdef _WIN32
-    char temp_dir[MAX_PATH];
-    /* GetTempFileName requires that its output buffer (4th param)
-       have length MAX_PATH or greater.  */
-    assert(size >= MAX_PATH);
-    return (GetTempPath(MAX_PATH, temp_dir)
-            && GetTempFileName(temp_dir, "qem", 0, filename)
-            ? 0 : -GetLastError());
-#else
-    int fd;
-    const char *tmpdir;
-    tmpdir = getenv("TMPDIR");
-    if (!tmpdir)
-        tmpdir = "/tmp";
-    if (snprintf(filename, size, "%s/vl.XXXXXX", tmpdir) >= size) {
-        return -EOVERFLOW;
-    }
-    fd = mkstemp(filename);
-    if (fd < 0) {
-        return -errno;
-    }
-    if (close(fd) != 0) {
-        unlink(filename);
-        return -errno;
-    }
-    return 0;
-#endif
-}
-
-/*
- * Detect host devices. By convention, /dev/cdrom[N] is always
- * recognized as a host CDROM.
- */
-static BlockDriver *find_hdev_driver(const char *filename)
-{
-    int score_max = 0, score;
-    BlockDriver *drv = NULL, *d;
-
-    QLIST_FOREACH(d, &bdrv_drivers, list) {
-        if (d->bdrv_probe_device) {
-            score = d->bdrv_probe_device(filename);
-            if (score > score_max) {
-                score_max = score;
-                drv = d;
-            }
-        }
-    }
-
-    return drv;
-}
-
-BlockDriver *bdrv_find_protocol(const char *filename,
-                                bool allow_protocol_prefix)
-{
-    BlockDriver *drv1;
-    char protocol[128];
-    int len;
-    const char *p;
-
-    /* TODO Drivers without bdrv_file_open must be specified explicitly */
-
-    /*
-     * XXX(hch): we really should not let host device detection
-     * override an explicit protocol specification, but moving this
-     * later breaks access to device names with colons in them.
-     * Thanks to the brain-dead persistent naming schemes on udev-
-     * based Linux systems those actually are quite common.
-     */
-    drv1 = find_hdev_driver(filename);
-    if (drv1) {
-        return drv1;
-    }
-
-    if (!path_has_protocol(filename) || !allow_protocol_prefix) {
-        return bdrv_find_format("file");
-    }
-
-    p = strchr(filename, ':');
-    assert(p != NULL);
-    len = p - filename;
-    if (len > sizeof(protocol) - 1)
-        len = sizeof(protocol) - 1;
-    memcpy(protocol, filename, len);
-    protocol[len] = '\0';
-    QLIST_FOREACH(drv1, &bdrv_drivers, list) {
-        if (drv1->protocol_name &&
-            !strcmp(drv1->protocol_name, protocol)) {
-            return drv1;
-        }
-    }
-    return NULL;
-}
-
-static int find_image_format(BlockDriverState *bs, const char *filename,
-                             BlockDriver **pdrv)
-{
-    int score, score_max;
-    BlockDriver *drv1, *drv;
-    uint8_t buf[2048];
-    int ret = 0;
-
-    /* Return the raw BlockDriver * to scsi-generic devices or empty drives */
-    if (bs->sg || !bdrv_is_inserted(bs) || bdrv_getlength(bs) == 0) {
-        drv = bdrv_find_format("raw");
-        if (!drv) {
-            ret = -ENOENT;
-        }
-        *pdrv = drv;
-        return ret;
-    }
-
-    ret = bdrv_pread(bs, 0, buf, sizeof(buf));
-    if (ret < 0) {
-        *pdrv = NULL;
-        return ret;
-    }
-
-    score_max = 0;
-    drv = NULL;
-    QLIST_FOREACH(drv1, &bdrv_drivers, list) {
-        if (drv1->bdrv_probe) {
-            score = drv1->bdrv_probe(buf, ret, filename);
-            if (score > score_max) {
-                score_max = score;
-                drv = drv1;
-            }
-        }
-    }
-    if (!drv) {
-        ret = -ENOENT;
-    }
-    *pdrv = drv;
-    return ret;
-}
-
-/**
- * Set the current 'total_sectors' value
- */
-static int refresh_total_sectors(BlockDriverState *bs, int64_t hint)
-{
-    BlockDriver *drv = bs->drv;
-
-    /* Do not attempt drv->bdrv_getlength() on scsi-generic devices */
-    if (bs->sg)
-        return 0;
-
-    /* query actual device if possible, otherwise just trust the hint */
-    if (drv->bdrv_getlength) {
-        int64_t length = drv->bdrv_getlength(bs);
-        if (length < 0) {
-            return length;
-        }
-        hint = length >> BDRV_SECTOR_BITS;
-    }
-
-    bs->total_sectors = hint;
-    return 0;
-}
-
-/**
- * Set open flags for a given discard mode
- *
- * Return 0 on success, -1 if the discard mode was invalid.
- */
-int bdrv_parse_discard_flags(const char *mode, int *flags)
-{
-    *flags &= ~BDRV_O_UNMAP;
-
-    if (!strcmp(mode, "off") || !strcmp(mode, "ignore")) {
-        /* do nothing */
-    } else if (!strcmp(mode, "on") || !strcmp(mode, "unmap")) {
-        *flags |= BDRV_O_UNMAP;
-    } else {
-        return -1;
-    }
-
-    return 0;
-}
-
-/**
- * Set open flags for a given cache mode
- *
- * Return 0 on success, -1 if the cache mode was invalid.
- */
-int bdrv_parse_cache_flags(const char *mode, int *flags)
-{
-    *flags &= ~BDRV_O_CACHE_MASK;
-
-    if (!strcmp(mode, "off") || !strcmp(mode, "none")) {
-        *flags |= BDRV_O_NOCACHE | BDRV_O_CACHE_WB;
-    } else if (!strcmp(mode, "directsync")) {
-        *flags |= BDRV_O_NOCACHE;
-    } else if (!strcmp(mode, "writeback")) {
-        *flags |= BDRV_O_CACHE_WB;
-    } else if (!strcmp(mode, "unsafe")) {
-        *flags |= BDRV_O_CACHE_WB;
-        *flags |= BDRV_O_NO_FLUSH;
-    } else if (!strcmp(mode, "writethrough")) {
-        /* this is the default */
-    } else {
-        return -1;
-    }
-
-    return 0;
-}
-
-/**
- * The copy-on-read flag is actually a reference count so multiple users may
- * use the feature without worrying about clobbering its previous state.
- * Copy-on-read stays enabled until all users have called to disable it.
- */
-void bdrv_enable_copy_on_read(BlockDriverState *bs)
-{
-    bs->copy_on_read++;
-}
-
-void bdrv_disable_copy_on_read(BlockDriverState *bs)
-{
-    assert(bs->copy_on_read > 0);
-    bs->copy_on_read--;
-}
-
-static int bdrv_open_flags(BlockDriverState *bs, int flags)
-{
-    int open_flags = flags | BDRV_O_CACHE_WB;
-
-    /*
-     * Clear flags that are internal to the block layer before opening the
-     * image.
-     */
-    open_flags &= ~(BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING);
-
-    /*
-     * Snapshots should be writable.
-     */
-    if (bs->is_temporary) {
-        open_flags |= BDRV_O_RDWR;
-    }
-
-    return open_flags;
-}
-
-/*
- * Common part for opening disk images and files
- *
- * Removes all processed options from *options.
- */
-static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file,
-    QDict *options, int flags, BlockDriver *drv)
-{
-    int ret, open_flags;
-    const char *filename;
-
-    assert(drv != NULL);
-    assert(bs->file == NULL);
-    assert(options != NULL && bs->options != options);
-
-    if (file != NULL) {
-        filename = file->filename;
-    } else {
-        filename = qdict_get_try_str(options, "filename");
-    }
-
-    trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name);
-
-    /* bdrv_open() with directly using a protocol as drv. This layer is already
-     * opened, so assign it to bs (while file becomes a closed BlockDriverState)
-     * and return immediately. */
-    if (file != NULL && drv->bdrv_file_open) {
-        bdrv_swap(file, bs);
-        return 0;
-    }
-
-    bs->open_flags = flags;
-    bs->buffer_alignment = 512;
-    open_flags = bdrv_open_flags(bs, flags);
-    bs->read_only = !(open_flags & BDRV_O_RDWR);
-
-    if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, bs->read_only)) {
-        return -ENOTSUP;
-    }
-
-    assert(bs->copy_on_read == 0); /* bdrv_new() and bdrv_close() make it so */
-    if (!bs->read_only && (flags & BDRV_O_COPY_ON_READ)) {
-        bdrv_enable_copy_on_read(bs);
-    }
-
-    if (filename != NULL) {
-        pstrcpy(bs->filename, sizeof(bs->filename), filename);
-    } else {
-        bs->filename[0] = '\0';
-    }
-
-    bs->drv = drv;
-    bs->opaque = g_malloc0(drv->instance_size);
-
-    bs->enable_write_cache = !!(flags & BDRV_O_CACHE_WB);
-
-    /* Open the image, either directly or using a protocol */
-    if (drv->bdrv_file_open) {
-        assert(file == NULL);
-        assert(drv->bdrv_parse_filename || filename != NULL);
-        ret = drv->bdrv_file_open(bs, options, open_flags);
-    } else {
-        if (file == NULL) {
-            qerror_report(ERROR_CLASS_GENERIC_ERROR, "Can't use '%s' as a "
-                          "block driver for the protocol level",
-                          drv->format_name);
-            ret = -EINVAL;
-            goto free_and_fail;
-        }
-        assert(file != NULL);
-        bs->file = file;
-        ret = drv->bdrv_open(bs, options, open_flags);
-    }
-
-    if (ret < 0) {
-        goto free_and_fail;
-    }
-
-    ret = refresh_total_sectors(bs, bs->total_sectors);
-    if (ret < 0) {
-        goto free_and_fail;
-    }
-
-#ifndef _WIN32
-    if (bs->is_temporary) {
-        assert(filename != NULL);
-        unlink(filename);
-    }
-#endif
-    return 0;
-
-free_and_fail:
-    bs->file = NULL;
-    g_free(bs->opaque);
-    bs->opaque = NULL;
-    bs->drv = NULL;
-    return ret;
-}
-
-/*
- * Opens a file using a protocol (file, host_device, nbd, ...)
- *
- * options is a QDict of options to pass to the block drivers, or NULL for an
- * empty set of options. The reference to the QDict belongs to the block layer
- * after the call (even on failure), so if the caller intends to reuse the
- * dictionary, it needs to use QINCREF() before calling bdrv_file_open.
- */
-int bdrv_file_open(BlockDriverState **pbs, const char *filename,
-                   QDict *options, int flags)
-{
-    BlockDriverState *bs;
-    BlockDriver *drv;
-    const char *drvname;
-    bool allow_protocol_prefix = false;
-    int ret;
-
-    /* NULL means an empty set of options */
-    if (options == NULL) {
-        options = qdict_new();
-    }
-
-    bs = bdrv_new("");
-    bs->options = options;
-    options = qdict_clone_shallow(options);
-
-    /* Fetch the file name from the options QDict if necessary */
-    if (!filename) {
-        filename = qdict_get_try_str(options, "filename");
-    } else if (filename && !qdict_haskey(options, "filename")) {
-        qdict_put(options, "filename", qstring_from_str(filename));
-        allow_protocol_prefix = true;
-    } else {
-        qerror_report(ERROR_CLASS_GENERIC_ERROR, "Can't specify 'file' and "
-                      "'filename' options at the same time");
-        ret = -EINVAL;
-        goto fail;
-    }
-
-    /* Find the right block driver */
-    drvname = qdict_get_try_str(options, "driver");
-    if (drvname) {
-        drv = bdrv_find_whitelisted_format(drvname, !(flags & BDRV_O_RDWR));
-        qdict_del(options, "driver");
-    } else if (filename) {
-        drv = bdrv_find_protocol(filename, allow_protocol_prefix);
-        if (!drv) {
-            qerror_report(ERROR_CLASS_GENERIC_ERROR, "Unknown protocol");
-        }
-    } else {
-        qerror_report(ERROR_CLASS_GENERIC_ERROR,
-                      "Must specify either driver or file");
-        drv = NULL;
-    }
-
-    if (!drv) {
-        ret = -ENOENT;
-        goto fail;
-    }
-
-    /* Parse the filename and open it */
-    if (drv->bdrv_parse_filename && filename) {
-        Error *local_err = NULL;
-        drv->bdrv_parse_filename(filename, options, &local_err);
-        if (error_is_set(&local_err)) {
-            qerror_report_err(local_err);
-            error_free(local_err);
-            ret = -EINVAL;
-            goto fail;
-        }
-        qdict_del(options, "filename");
-    } else if (!drv->bdrv_parse_filename && !filename) {
-        qerror_report(ERROR_CLASS_GENERIC_ERROR,
-                      "The '%s' block driver requires a file name",
-                      drv->format_name);
-        ret = -EINVAL;
-        goto fail;
-    }
-
-    ret = bdrv_open_common(bs, NULL, options, flags, drv);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* Check if any unknown options were used */
-    if (qdict_size(options) != 0) {
-        const QDictEntry *entry = qdict_first(options);
-        qerror_report(ERROR_CLASS_GENERIC_ERROR, "Block protocol '%s' doesn't "
-                      "support the option '%s'",
-                      drv->format_name, entry->key);
-        ret = -EINVAL;
-        goto fail;
-    }
-    QDECREF(options);
-
-    bs->growable = 1;
-    *pbs = bs;
-    return 0;
-
-fail:
-    QDECREF(options);
-    if (!bs->drv) {
-        QDECREF(bs->options);
-    }
-    bdrv_delete(bs);
-    return ret;
-}
-
-/*
- * Opens the backing file for a BlockDriverState if not yet open
- *
- * options is a QDict of options to pass to the block drivers, or NULL for an
- * empty set of options. The reference to the QDict is transferred to this
- * function (even on failure), so if the caller intends to reuse the dictionary,
- * it needs to use QINCREF() before calling bdrv_file_open.
- */
-int bdrv_open_backing_file(BlockDriverState *bs, QDict *options)
-{
-    char backing_filename[PATH_MAX];
-    int back_flags, ret;
-    BlockDriver *back_drv = NULL;
-
-    if (bs->backing_hd != NULL) {
-        QDECREF(options);
-        return 0;
-    }
-
-    /* NULL means an empty set of options */
-    if (options == NULL) {
-        options = qdict_new();
-    }
-
-    bs->open_flags &= ~BDRV_O_NO_BACKING;
-    if (qdict_haskey(options, "file.filename")) {
-        backing_filename[0] = '\0';
-    } else if (bs->backing_file[0] == '\0' && qdict_size(options) == 0) {
-        QDECREF(options);
-        return 0;
-    }
-
-    bs->backing_hd = bdrv_new("");
-    bdrv_get_full_backing_filename(bs, backing_filename,
-                                   sizeof(backing_filename));
-
-    if (bs->backing_format[0] != '\0') {
-        back_drv = bdrv_find_format(bs->backing_format);
-    }
-
-    /* backing files always opened read-only */
-    back_flags = bs->open_flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT);
-
-    ret = bdrv_open(bs->backing_hd,
-                    *backing_filename ? backing_filename : NULL, options,
-                    back_flags, back_drv);
-    if (ret < 0) {
-        bdrv_delete(bs->backing_hd);
-        bs->backing_hd = NULL;
-        bs->open_flags |= BDRV_O_NO_BACKING;
-        return ret;
-    }
-    return 0;
-}
-
-static void extract_subqdict(QDict *src, QDict **dst, const char *start)
-{
-    const QDictEntry *entry, *next;
-    const char *p;
-
-    *dst = qdict_new();
-    entry = qdict_first(src);
-
-    while (entry != NULL) {
-        next = qdict_next(src, entry);
-        if (strstart(entry->key, start, &p)) {
-            qobject_incref(entry->value);
-            qdict_put_obj(*dst, p, entry->value);
-            qdict_del(src, entry->key);
-        }
-        entry = next;
-    }
-}
-
-/*
- * Opens a disk image (raw, qcow2, vmdk, ...)
- *
- * options is a QDict of options to pass to the block drivers, or NULL for an
- * empty set of options. The reference to the QDict belongs to the block layer
- * after the call (even on failure), so if the caller intends to reuse the
- * dictionary, it needs to use QINCREF() before calling bdrv_open.
- */
-int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options,
-              int flags, BlockDriver *drv)
-{
-    int ret;
-    /* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */
-    char tmp_filename[PATH_MAX + 1];
-    BlockDriverState *file = NULL;
-    QDict *file_options = NULL;
-
-    /* NULL means an empty set of options */
-    if (options == NULL) {
-        options = qdict_new();
-    }
-
-    bs->options = options;
-    options = qdict_clone_shallow(options);
-
-    /* For snapshot=on, create a temporary qcow2 overlay */
-    if (flags & BDRV_O_SNAPSHOT) {
-        BlockDriverState *bs1;
-        int64_t total_size;
-        BlockDriver *bdrv_qcow2;
-        QEMUOptionParameter *create_options;
-        char backing_filename[PATH_MAX];
-
-        if (qdict_size(options) != 0) {
-            error_report("Can't use snapshot=on with driver-specific options");
-            ret = -EINVAL;
-            goto fail;
-        }
-        assert(filename != NULL);
-
-        /* if snapshot, we create a temporary backing file and open it
-           instead of opening 'filename' directly */
-
-        /* if there is a backing file, use it */
-        bs1 = bdrv_new("");
-        ret = bdrv_open(bs1, filename, NULL, 0, drv);
-        if (ret < 0) {
-            bdrv_delete(bs1);
-            goto fail;
-        }
-        total_size = bdrv_getlength(bs1) & BDRV_SECTOR_MASK;
-
-        bdrv_delete(bs1);
-
-        ret = get_tmp_filename(tmp_filename, sizeof(tmp_filename));
-        if (ret < 0) {
-            goto fail;
-        }
-
-        /* Real path is meaningless for protocols */
-        if (path_has_protocol(filename)) {
-            snprintf(backing_filename, sizeof(backing_filename),
-                     "%s", filename);
-        } else if (!realpath(filename, backing_filename)) {
-            ret = -errno;
-            goto fail;
-        }
-
-        bdrv_qcow2 = bdrv_find_format("qcow2");
-        create_options = parse_option_parameters("", bdrv_qcow2->create_options,
-                                                 NULL);
-
-        set_option_parameter_int(create_options, BLOCK_OPT_SIZE, total_size);
-        set_option_parameter(create_options, BLOCK_OPT_BACKING_FILE,
-                             backing_filename);
-        if (drv) {
-            set_option_parameter(create_options, BLOCK_OPT_BACKING_FMT,
-                drv->format_name);
-        }
-
-        ret = bdrv_create(bdrv_qcow2, tmp_filename, create_options);
-        free_option_parameters(create_options);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        filename = tmp_filename;
-        drv = bdrv_qcow2;
-        bs->is_temporary = 1;
-    }
-
-    /* Open image file without format layer */
-    if (flags & BDRV_O_RDWR) {
-        flags |= BDRV_O_ALLOW_RDWR;
-    }
-
-    extract_subqdict(options, &file_options, "file.");
-
-    ret = bdrv_file_open(&file, filename, file_options,
-                         bdrv_open_flags(bs, flags | BDRV_O_UNMAP));
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* Find the right image format driver */
-    if (!drv) {
-        ret = find_image_format(file, filename, &drv);
-    }
-
-    if (!drv) {
-        goto unlink_and_fail;
-    }
-
-    /* Open the image */
-    ret = bdrv_open_common(bs, file, options, flags, drv);
-    if (ret < 0) {
-        goto unlink_and_fail;
-    }
-
-    if (bs->file != file) {
-        bdrv_delete(file);
-        file = NULL;
-    }
-
-    /* If there is a backing file, use it */
-    if ((flags & BDRV_O_NO_BACKING) == 0) {
-        QDict *backing_options;
-
-        extract_subqdict(options, &backing_options, "backing.");
-        ret = bdrv_open_backing_file(bs, backing_options);
-        if (ret < 0) {
-            goto close_and_fail;
-        }
-    }
-
-    /* Check if any unknown options were used */
-    if (qdict_size(options) != 0) {
-        const QDictEntry *entry = qdict_first(options);
-        qerror_report(ERROR_CLASS_GENERIC_ERROR, "Block format '%s' used by "
-            "device '%s' doesn't support the option '%s'",
-            drv->format_name, bs->device_name, entry->key);
-
-        ret = -EINVAL;
-        goto close_and_fail;
-    }
-    QDECREF(options);
-
-    if (!bdrv_key_required(bs)) {
-        bdrv_dev_change_media_cb(bs, true);
-    }
-
-    /* throttling disk I/O limits */
-    if (bs->io_limits_enabled) {
-        bdrv_io_limits_enable(bs);
-    }
-
-    return 0;
-
-unlink_and_fail:
-    if (file != NULL) {
-        bdrv_delete(file);
-    }
-    if (bs->is_temporary) {
-        unlink(filename);
-    }
-fail:
-    QDECREF(bs->options);
-    QDECREF(options);
-    bs->options = NULL;
-    return ret;
-
-close_and_fail:
-    bdrv_close(bs);
-    QDECREF(options);
-    return ret;
-}
-
-typedef struct BlockReopenQueueEntry {
-     bool prepared;
-     BDRVReopenState state;
-     QSIMPLEQ_ENTRY(BlockReopenQueueEntry) entry;
-} BlockReopenQueueEntry;
-
-/*
- * Adds a BlockDriverState to a simple queue for an atomic, transactional
- * reopen of multiple devices.
- *
- * bs_queue can either be an existing BlockReopenQueue that has had QSIMPLE_INIT
- * already performed, or alternatively may be NULL a new BlockReopenQueue will
- * be created and initialized. This newly created BlockReopenQueue should be
- * passed back in for subsequent calls that are intended to be of the same
- * atomic 'set'.
- *
- * bs is the BlockDriverState to add to the reopen queue.
- *
- * flags contains the open flags for the associated bs
- *
- * returns a pointer to bs_queue, which is either the newly allocated
- * bs_queue, or the existing bs_queue being used.
- *
- */
-BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
-                                    BlockDriverState *bs, int flags)
-{
-    assert(bs != NULL);
-
-    BlockReopenQueueEntry *bs_entry;
-    if (bs_queue == NULL) {
-        bs_queue = g_new0(BlockReopenQueue, 1);
-        QSIMPLEQ_INIT(bs_queue);
-    }
-
-    if (bs->file) {
-        bdrv_reopen_queue(bs_queue, bs->file, flags);
-    }
-
-    bs_entry = g_new0(BlockReopenQueueEntry, 1);
-    QSIMPLEQ_INSERT_TAIL(bs_queue, bs_entry, entry);
-
-    bs_entry->state.bs = bs;
-    bs_entry->state.flags = flags;
-
-    return bs_queue;
-}
-
-/*
- * Reopen multiple BlockDriverStates atomically & transactionally.
- *
- * The queue passed in (bs_queue) must have been built up previous
- * via bdrv_reopen_queue().
- *
- * Reopens all BDS specified in the queue, with the appropriate
- * flags.  All devices are prepared for reopen, and failure of any
- * device will cause all device changes to be abandonded, and intermediate
- * data cleaned up.
- *
- * If all devices prepare successfully, then the changes are committed
- * to all devices.
- *
- */
-int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp)
-{
-    int ret = -1;
-    BlockReopenQueueEntry *bs_entry, *next;
-    Error *local_err = NULL;
-
-    assert(bs_queue != NULL);
-
-    bdrv_drain_all();
-
-    QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {
-        if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, &local_err)) {
-            error_propagate(errp, local_err);
-            goto cleanup;
-        }
-        bs_entry->prepared = true;
-    }
-
-    /* If we reach this point, we have success and just need to apply the
-     * changes
-     */
-    QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {
-        bdrv_reopen_commit(&bs_entry->state);
-    }
-
-    ret = 0;
-
-cleanup:
-    QSIMPLEQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) {
-        if (ret && bs_entry->prepared) {
-            bdrv_reopen_abort(&bs_entry->state);
-        }
-        g_free(bs_entry);
-    }
-    g_free(bs_queue);
-    return ret;
-}
-
-
-/* Reopen a single BlockDriverState with the specified flags. */
-int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp)
-{
-    int ret = -1;
-    Error *local_err = NULL;
-    BlockReopenQueue *queue = bdrv_reopen_queue(NULL, bs, bdrv_flags);
-
-    ret = bdrv_reopen_multiple(queue, &local_err);
-    if (local_err != NULL) {
-        error_propagate(errp, local_err);
-    }
-    return ret;
-}
-
-
-/*
- * Prepares a BlockDriverState for reopen. All changes are staged in the
- * 'opaque' field of the BDRVReopenState, which is used and allocated by
- * the block driver layer .bdrv_reopen_prepare()
- *
- * bs is the BlockDriverState to reopen
- * flags are the new open flags
- * queue is the reopen queue
- *
- * Returns 0 on success, non-zero on error.  On error errp will be set
- * as well.
- *
- * On failure, bdrv_reopen_abort() will be called to clean up any data.
- * It is the responsibility of the caller to then call the abort() or
- * commit() for any other BDS that have been left in a prepare() state
- *
- */
-int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
-                        Error **errp)
-{
-    int ret = -1;
-    Error *local_err = NULL;
-    BlockDriver *drv;
-
-    assert(reopen_state != NULL);
-    assert(reopen_state->bs->drv != NULL);
-    drv = reopen_state->bs->drv;
-
-    /* if we are to stay read-only, do not allow permission change
-     * to r/w */
-    if (!(reopen_state->bs->open_flags & BDRV_O_ALLOW_RDWR) &&
-        reopen_state->flags & BDRV_O_RDWR) {
-        error_set(errp, QERR_DEVICE_IS_READ_ONLY,
-                  reopen_state->bs->device_name);
-        goto error;
-    }
-
-
-    ret = bdrv_flush(reopen_state->bs);
-    if (ret) {
-        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "Error (%s) flushing drive",
-                  strerror(-ret));
-        goto error;
-    }
-
-    if (drv->bdrv_reopen_prepare) {
-        ret = drv->bdrv_reopen_prepare(reopen_state, queue, &local_err);
-        if (ret) {
-            if (local_err != NULL) {
-                error_propagate(errp, local_err);
-            } else {
-                error_setg(errp, "failed while preparing to reopen image '%s'",
-                           reopen_state->bs->filename);
-            }
-            goto error;
-        }
-    } else {
-        /* It is currently mandatory to have a bdrv_reopen_prepare()
-         * handler for each supported drv. */
-        error_set(errp, QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
-                  drv->format_name, reopen_state->bs->device_name,
-                 "reopening of file");
-        ret = -1;
-        goto error;
-    }
-
-    ret = 0;
-
-error:
-    return ret;
-}
-
-/*
- * Takes the staged changes for the reopen from bdrv_reopen_prepare(), and
- * makes them final by swapping the staging BlockDriverState contents into
- * the active BlockDriverState contents.
- */
-void bdrv_reopen_commit(BDRVReopenState *reopen_state)
-{
-    BlockDriver *drv;
-
-    assert(reopen_state != NULL);
-    drv = reopen_state->bs->drv;
-    assert(drv != NULL);
-
-    /* If there are any driver level actions to take */
-    if (drv->bdrv_reopen_commit) {
-        drv->bdrv_reopen_commit(reopen_state);
-    }
-
-    /* set BDS specific flags now */
-    reopen_state->bs->open_flags         = reopen_state->flags;
-    reopen_state->bs->enable_write_cache = !!(reopen_state->flags &
-                                              BDRV_O_CACHE_WB);
-    reopen_state->bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
-}
-
-/*
- * Abort the reopen, and delete and free the staged changes in
- * reopen_state
- */
-void bdrv_reopen_abort(BDRVReopenState *reopen_state)
-{
-    BlockDriver *drv;
-
-    assert(reopen_state != NULL);
-    drv = reopen_state->bs->drv;
-    assert(drv != NULL);
-
-    if (drv->bdrv_reopen_abort) {
-        drv->bdrv_reopen_abort(reopen_state);
-    }
-}
-
-
-void bdrv_close(BlockDriverState *bs)
-{
-    if (bs->job) {
-        block_job_cancel_sync(bs->job);
-    }
-    bdrv_drain_all(); /* complete I/O */
-    bdrv_flush(bs);
-    bdrv_drain_all(); /* in case flush left pending I/O */
-    notifier_list_notify(&bs->close_notifiers, bs);
-
-    if (bs->drv) {
-        if (bs->backing_hd) {
-            bdrv_delete(bs->backing_hd);
-            bs->backing_hd = NULL;
-        }
-        bs->drv->bdrv_close(bs);
-        g_free(bs->opaque);
-#ifdef _WIN32
-        if (bs->is_temporary) {
-            unlink(bs->filename);
-        }
-#endif
-        bs->opaque = NULL;
-        bs->drv = NULL;
-        bs->copy_on_read = 0;
-        bs->backing_file[0] = '\0';
-        bs->backing_format[0] = '\0';
-        bs->total_sectors = 0;
-        bs->encrypted = 0;
-        bs->valid_key = 0;
-        bs->sg = 0;
-        bs->growable = 0;
-        QDECREF(bs->options);
-        bs->options = NULL;
-
-        if (bs->file != NULL) {
-            bdrv_delete(bs->file);
-            bs->file = NULL;
-        }
-    }
-
-    bdrv_dev_change_media_cb(bs, false);
-
-    /*throttling disk I/O limits*/
-    if (bs->io_limits_enabled) {
-        bdrv_io_limits_disable(bs);
-    }
-}
-
-void bdrv_close_all(void)
-{
-    BlockDriverState *bs;
-
-    QTAILQ_FOREACH(bs, &bdrv_states, list) {
-        bdrv_close(bs);
-    }
-}
-
-/*
- * Wait for pending requests to complete across all BlockDriverStates
- *
- * This function does not flush data to disk, use bdrv_flush_all() for that
- * after calling this function.
- *
- * Note that completion of an asynchronous I/O operation can trigger any
- * number of other I/O operations on other devices---for example a coroutine
- * can be arbitrarily complex and a constant flow of I/O can come until the
- * coroutine is complete.  Because of this, it is not possible to have a
- * function to drain a single device's I/O queue.
- */
-void bdrv_drain_all(void)
-{
-    BlockDriverState *bs;
-    bool busy;
-
-    do {
-        busy = qemu_aio_wait();
-
-        /* FIXME: We do not have timer support here, so this is effectively
-         * a busy wait.
-         */
-        QTAILQ_FOREACH(bs, &bdrv_states, list) {
-            if (!qemu_co_queue_empty(&bs->throttled_reqs)) {
-                qemu_co_queue_restart_all(&bs->throttled_reqs);
-                busy = true;
-            }
-        }
-    } while (busy);
-
-    /* If requests are still pending there is a bug somewhere */
-    QTAILQ_FOREACH(bs, &bdrv_states, list) {
-        assert(QLIST_EMPTY(&bs->tracked_requests));
-        assert(qemu_co_queue_empty(&bs->throttled_reqs));
-    }
-}
-
-/* make a BlockDriverState anonymous by removing from bdrv_state list.
-   Also, NULL terminate the device_name to prevent double remove */
-void bdrv_make_anon(BlockDriverState *bs)
-{
-    if (bs->device_name[0] != '\0') {
-        QTAILQ_REMOVE(&bdrv_states, bs, list);
-    }
-    bs->device_name[0] = '\0';
-}
-
-static void bdrv_rebind(BlockDriverState *bs)
-{
-    if (bs->drv && bs->drv->bdrv_rebind) {
-        bs->drv->bdrv_rebind(bs);
-    }
-}
-
-static void bdrv_move_feature_fields(BlockDriverState *bs_dest,
-                                     BlockDriverState *bs_src)
-{
-    /* move some fields that need to stay attached to the device */
-    bs_dest->open_flags         = bs_src->open_flags;
-
-    /* dev info */
-    bs_dest->dev_ops            = bs_src->dev_ops;
-    bs_dest->dev_opaque         = bs_src->dev_opaque;
-    bs_dest->dev                = bs_src->dev;
-    bs_dest->buffer_alignment   = bs_src->buffer_alignment;
-    bs_dest->copy_on_read       = bs_src->copy_on_read;
-
-    bs_dest->enable_write_cache = bs_src->enable_write_cache;
-
-    /* i/o timing parameters */
-    bs_dest->slice_start        = bs_src->slice_start;
-    bs_dest->slice_end          = bs_src->slice_end;
-    bs_dest->slice_submitted    = bs_src->slice_submitted;
-    bs_dest->io_limits          = bs_src->io_limits;
-    bs_dest->throttled_reqs     = bs_src->throttled_reqs;
-    bs_dest->block_timer        = bs_src->block_timer;
-    bs_dest->io_limits_enabled  = bs_src->io_limits_enabled;
-
-    /* r/w error */
-    bs_dest->on_read_error      = bs_src->on_read_error;
-    bs_dest->on_write_error     = bs_src->on_write_error;
-
-    /* i/o status */
-    bs_dest->iostatus_enabled   = bs_src->iostatus_enabled;
-    bs_dest->iostatus           = bs_src->iostatus;
-
-    /* dirty bitmap */
-    bs_dest->dirty_bitmap       = bs_src->dirty_bitmap;
-
-    /* job */
-    bs_dest->in_use             = bs_src->in_use;
-    bs_dest->job                = bs_src->job;
-
-    /* keep the same entry in bdrv_states */
-    pstrcpy(bs_dest->device_name, sizeof(bs_dest->device_name),
-            bs_src->device_name);
-    bs_dest->list = bs_src->list;
-}
-
-/*
- * Swap bs contents for two image chains while they are live,
- * while keeping required fields on the BlockDriverState that is
- * actually attached to a device.
- *
- * This will modify the BlockDriverState fields, and swap contents
- * between bs_new and bs_old. Both bs_new and bs_old are modified.
- *
- * bs_new is required to be anonymous.
- *
- * This function does not create any image files.
- */
-void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old)
-{
-    BlockDriverState tmp;
-
-    /* bs_new must be anonymous and shouldn't have anything fancy enabled */
-    assert(bs_new->device_name[0] == '\0');
-    assert(bs_new->dirty_bitmap == NULL);
-    assert(bs_new->job == NULL);
-    assert(bs_new->dev == NULL);
-    assert(bs_new->in_use == 0);
-    assert(bs_new->io_limits_enabled == false);
-    assert(bs_new->block_timer == NULL);
-
-    tmp = *bs_new;
-    *bs_new = *bs_old;
-    *bs_old = tmp;
-
-    /* there are some fields that should not be swapped, move them back */
-    bdrv_move_feature_fields(&tmp, bs_old);
-    bdrv_move_feature_fields(bs_old, bs_new);
-    bdrv_move_feature_fields(bs_new, &tmp);
-
-    /* bs_new shouldn't be in bdrv_states even after the swap!  */
-    assert(bs_new->device_name[0] == '\0');
-
-    /* Check a few fields that should remain attached to the device */
-    assert(bs_new->dev == NULL);
-    assert(bs_new->job == NULL);
-    assert(bs_new->in_use == 0);
-    assert(bs_new->io_limits_enabled == false);
-    assert(bs_new->block_timer == NULL);
-
-    bdrv_rebind(bs_new);
-    bdrv_rebind(bs_old);
-}
-
-/*
- * Add new bs contents at the top of an image chain while the chain is
- * live, while keeping required fields on the top layer.
- *
- * This will modify the BlockDriverState fields, and swap contents
- * between bs_new and bs_top. Both bs_new and bs_top are modified.
- *
- * bs_new is required to be anonymous.
- *
- * This function does not create any image files.
- */
-void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top)
-{
-    bdrv_swap(bs_new, bs_top);
-
-    /* The contents of 'tmp' will become bs_top, as we are
-     * swapping bs_new and bs_top contents. */
-    bs_top->backing_hd = bs_new;
-    bs_top->open_flags &= ~BDRV_O_NO_BACKING;
-    pstrcpy(bs_top->backing_file, sizeof(bs_top->backing_file),
-            bs_new->filename);
-    pstrcpy(bs_top->backing_format, sizeof(bs_top->backing_format),
-            bs_new->drv ? bs_new->drv->format_name : "");
-}
-
-void bdrv_delete(BlockDriverState *bs)
-{
-    assert(!bs->dev);
-    assert(!bs->job);
-    assert(!bs->in_use);
-
-    /* remove from list, if necessary */
-    bdrv_make_anon(bs);
-
-    bdrv_close(bs);
-
-    g_free(bs);
-}
-
-int bdrv_attach_dev(BlockDriverState *bs, void *dev)
-/* TODO change to DeviceState *dev when all users are qdevified */
-{
-    if (bs->dev) {
-        return -EBUSY;
-    }
-    bs->dev = dev;
-    bdrv_iostatus_reset(bs);
-    return 0;
-}
-
-/* TODO qdevified devices don't use this, remove when devices are qdevified */
-void bdrv_attach_dev_nofail(BlockDriverState *bs, void *dev)
-{
-    if (bdrv_attach_dev(bs, dev) < 0) {
-        abort();
-    }
-}
-
-void bdrv_detach_dev(BlockDriverState *bs, void *dev)
-/* TODO change to DeviceState *dev when all users are qdevified */
-{
-    assert(bs->dev == dev);
-    bs->dev = NULL;
-    bs->dev_ops = NULL;
-    bs->dev_opaque = NULL;
-    bs->buffer_alignment = 512;
-}
-
-/* TODO change to return DeviceState * when all users are qdevified */
-void *bdrv_get_attached_dev(BlockDriverState *bs)
-{
-    return bs->dev;
-}
-
-void bdrv_set_dev_ops(BlockDriverState *bs, const BlockDevOps *ops,
-                      void *opaque)
-{
-    bs->dev_ops = ops;
-    bs->dev_opaque = opaque;
-}
-
-void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv,
-                               enum MonitorEvent ev,
-                               BlockErrorAction action, bool is_read)
-{
-    QObject *data;
-    const char *action_str;
-
-    switch (action) {
-    case BDRV_ACTION_REPORT:
-        action_str = "report";
-        break;
-    case BDRV_ACTION_IGNORE:
-        action_str = "ignore";
-        break;
-    case BDRV_ACTION_STOP:
-        action_str = "stop";
-        break;
-    default:
-        abort();
-    }
-
-    data = qobject_from_jsonf("{ 'device': %s, 'action': %s, 'operation': %s }",
-                              bdrv->device_name,
-                              action_str,
-                              is_read ? "read" : "write");
-    monitor_protocol_event(ev, data);
-
-    qobject_decref(data);
-}
-
-static void bdrv_emit_qmp_eject_event(BlockDriverState *bs, bool ejected)
-{
-    QObject *data;
-
-    data = qobject_from_jsonf("{ 'device': %s, 'tray-open': %i }",
-                              bdrv_get_device_name(bs), ejected);
-    monitor_protocol_event(QEVENT_DEVICE_TRAY_MOVED, data);
-
-    qobject_decref(data);
-}
-
-static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load)
-{
-    if (bs->dev_ops && bs->dev_ops->change_media_cb) {
-        bool tray_was_closed = !bdrv_dev_is_tray_open(bs);
-        bs->dev_ops->change_media_cb(bs->dev_opaque, load);
-        if (tray_was_closed) {
-            /* tray open */
-            bdrv_emit_qmp_eject_event(bs, true);
-        }
-        if (load) {
-            /* tray close */
-            bdrv_emit_qmp_eject_event(bs, false);
-        }
-    }
-}
-
-bool bdrv_dev_has_removable_media(BlockDriverState *bs)
-{
-    return !bs->dev || (bs->dev_ops && bs->dev_ops->change_media_cb);
-}
-
-void bdrv_dev_eject_request(BlockDriverState *bs, bool force)
-{
-    if (bs->dev_ops && bs->dev_ops->eject_request_cb) {
-        bs->dev_ops->eject_request_cb(bs->dev_opaque, force);
-    }
-}
-
-bool bdrv_dev_is_tray_open(BlockDriverState *bs)
-{
-    if (bs->dev_ops && bs->dev_ops->is_tray_open) {
-        return bs->dev_ops->is_tray_open(bs->dev_opaque);
-    }
-    return false;
-}
-
-static void bdrv_dev_resize_cb(BlockDriverState *bs)
-{
-    if (bs->dev_ops && bs->dev_ops->resize_cb) {
-        bs->dev_ops->resize_cb(bs->dev_opaque);
-    }
-}
-
-bool bdrv_dev_is_medium_locked(BlockDriverState *bs)
-{
-    if (bs->dev_ops && bs->dev_ops->is_medium_locked) {
-        return bs->dev_ops->is_medium_locked(bs->dev_opaque);
-    }
-    return false;
-}
-
-/*
- * Run consistency checks on an image
- *
- * Returns 0 if the check could be completed (it doesn't mean that the image is
- * free of errors) or -errno when an internal error occurred. The results of the
- * check are stored in res.
- */
-int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix)
-{
-    if (bs->drv->bdrv_check == NULL) {
-        return -ENOTSUP;
-    }
-
-    memset(res, 0, sizeof(*res));
-    return bs->drv->bdrv_check(bs, res, fix);
-}
-
-#define COMMIT_BUF_SECTORS 2048
-
-/* commit COW file into the raw image */
-int bdrv_commit(BlockDriverState *bs)
-{
-    BlockDriver *drv = bs->drv;
-    int64_t sector, total_sectors;
-    int n, ro, open_flags;
-    int ret = 0;
-    uint8_t *buf;
-    char filename[PATH_MAX];
-
-    if (!drv)
-        return -ENOMEDIUM;
-    
-    if (!bs->backing_hd) {
-        return -ENOTSUP;
-    }
-
-    if (bdrv_in_use(bs) || bdrv_in_use(bs->backing_hd)) {
-        return -EBUSY;
-    }
-
-    ro = bs->backing_hd->read_only;
-    /* Use pstrcpy (not strncpy): filename must be NUL-terminated. */
-    pstrcpy(filename, sizeof(filename), bs->backing_hd->filename);
-    open_flags =  bs->backing_hd->open_flags;
-
-    if (ro) {
-        if (bdrv_reopen(bs->backing_hd, open_flags | BDRV_O_RDWR, NULL)) {
-            return -EACCES;
-        }
-    }
-
-    total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
-    buf = g_malloc(COMMIT_BUF_SECTORS * BDRV_SECTOR_SIZE);
-
-    for (sector = 0; sector < total_sectors; sector += n) {
-        if (bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n)) {
-
-            if (bdrv_read(bs, sector, buf, n) != 0) {
-                ret = -EIO;
-                goto ro_cleanup;
-            }
-
-            if (bdrv_write(bs->backing_hd, sector, buf, n) != 0) {
-                ret = -EIO;
-                goto ro_cleanup;
-            }
-        }
-    }
-
-    if (drv->bdrv_make_empty) {
-        ret = drv->bdrv_make_empty(bs);
-        bdrv_flush(bs);
-    }
-
-    /*
-     * Make sure all data we wrote to the backing device is actually
-     * stable on disk.
-     */
-    if (bs->backing_hd)
-        bdrv_flush(bs->backing_hd);
-
-ro_cleanup:
-    g_free(buf);
-
-    if (ro) {
-        /* ignoring error return here */
-        bdrv_reopen(bs->backing_hd, open_flags & ~BDRV_O_RDWR, NULL);
-    }
-
-    return ret;
-}
-
-int bdrv_commit_all(void)
-{
-    BlockDriverState *bs;
-
-    QTAILQ_FOREACH(bs, &bdrv_states, list) {
-        if (bs->drv && bs->backing_hd) {
-            int ret = bdrv_commit(bs);
-            if (ret < 0) {
-                return ret;
-            }
-        }
-    }
-    return 0;
-}
-
-/**
- * Remove an active request from the tracked requests list
- *
- * This function should be called when a tracked request is completing.
- */
-static void tracked_request_end(BdrvTrackedRequest *req)
-{
-    QLIST_REMOVE(req, list);
-    qemu_co_queue_restart_all(&req->wait_queue);
-}
-
-/**
- * Add an active request to the tracked requests list
- */
-static void tracked_request_begin(BdrvTrackedRequest *req,
-                                  BlockDriverState *bs,
-                                  int64_t sector_num,
-                                  int nb_sectors, bool is_write)
-{
-    *req = (BdrvTrackedRequest){
-        .bs = bs,
-        .sector_num = sector_num,
-        .nb_sectors = nb_sectors,
-        .is_write = is_write,
-        .co = qemu_coroutine_self(),
-    };
-
-    qemu_co_queue_init(&req->wait_queue);
-
-    QLIST_INSERT_HEAD(&bs->tracked_requests, req, list);
-}
-
-/**
- * Round a region to cluster boundaries
- */
-void bdrv_round_to_clusters(BlockDriverState *bs,
-                            int64_t sector_num, int nb_sectors,
-                            int64_t *cluster_sector_num,
-                            int *cluster_nb_sectors)
-{
-    BlockDriverInfo bdi;
-
-    if (bdrv_get_info(bs, &bdi) < 0 || bdi.cluster_size == 0) {
-        *cluster_sector_num = sector_num;
-        *cluster_nb_sectors = nb_sectors;
-    } else {
-        int64_t c = bdi.cluster_size / BDRV_SECTOR_SIZE;
-        *cluster_sector_num = QEMU_ALIGN_DOWN(sector_num, c);
-        *cluster_nb_sectors = QEMU_ALIGN_UP(sector_num - *cluster_sector_num +
-                                            nb_sectors, c);
-    }
-}
-
-static bool tracked_request_overlaps(BdrvTrackedRequest *req,
-                                     int64_t sector_num, int nb_sectors) {
-    /*        aaaa   bbbb */
-    if (sector_num >= req->sector_num + req->nb_sectors) {
-        return false;
-    }
-    /* bbbb   aaaa        */
-    if (req->sector_num >= sector_num + nb_sectors) {
-        return false;
-    }
-    return true;
-}
-
-static void coroutine_fn wait_for_overlapping_requests(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors)
-{
-    BdrvTrackedRequest *req;
-    int64_t cluster_sector_num;
-    int cluster_nb_sectors;
-    bool retry;
-
-    /* If we touch the same cluster it counts as an overlap.  This guarantees
-     * that allocating writes will be serialized and not race with each other
-     * for the same cluster.  For example, in copy-on-read it ensures that the
-     * CoR read and write operations are atomic and guest writes cannot
-     * interleave between them.
-     */
-    bdrv_round_to_clusters(bs, sector_num, nb_sectors,
-                           &cluster_sector_num, &cluster_nb_sectors);
-
-    do {
-        retry = false;
-        QLIST_FOREACH(req, &bs->tracked_requests, list) {
-            if (tracked_request_overlaps(req, cluster_sector_num,
-                                         cluster_nb_sectors)) {
-                /* Hitting this means there was a reentrant request, for
-                 * example, a block driver issuing nested requests.  This must
-                 * never happen since it means deadlock.
-                 */
-                assert(qemu_coroutine_self() != req->co);
-
-                qemu_co_queue_wait(&req->wait_queue);
-                retry = true;
-                break;
-            }
-        }
-    } while (retry);
-}
-
-/*
- * Return values:
- * 0        - success
- * -EINVAL  - backing format specified, but no file
- * -ENOSPC  - can't update the backing file because no space is left in the
- *            image file header
- * -ENOTSUP - format driver doesn't support changing the backing file
- */
-int bdrv_change_backing_file(BlockDriverState *bs,
-    const char *backing_file, const char *backing_fmt)
-{
-    BlockDriver *drv = bs->drv;
-    int ret;
-
-    /* Backing file format doesn't make sense without a backing file */
-    if (backing_fmt && !backing_file) {
-        return -EINVAL;
-    }
-
-    if (drv->bdrv_change_backing_file != NULL) {
-        ret = drv->bdrv_change_backing_file(bs, backing_file, backing_fmt);
-    } else {
-        ret = -ENOTSUP;
-    }
-
-    if (ret == 0) {
-        pstrcpy(bs->backing_file, sizeof(bs->backing_file), backing_file ?: "");
-        pstrcpy(bs->backing_format, sizeof(bs->backing_format), backing_fmt ?: "");
-    }
-    return ret;
-}
-
-/*
- * Finds the image layer in the chain that has 'bs' as its backing file.
- *
- * active is the current topmost image.
- *
- * Returns NULL if bs is not found in active's image chain,
- * or if active == bs.
- */
-BlockDriverState *bdrv_find_overlay(BlockDriverState *active,
-                                    BlockDriverState *bs)
-{
-    BlockDriverState *overlay = NULL;
-    BlockDriverState *intermediate;
-
-    assert(active != NULL);
-    assert(bs != NULL);
-
-    /* if bs is the same as active, then by definition it has no overlay
-     */
-    if (active == bs) {
-        return NULL;
-    }
-
-    intermediate = active;
-    while (intermediate->backing_hd) {
-        if (intermediate->backing_hd == bs) {
-            overlay = intermediate;
-            break;
-        }
-        intermediate = intermediate->backing_hd;
-    }
-
-    return overlay;
-}
-
-typedef struct BlkIntermediateStates {
-    BlockDriverState *bs;
-    QSIMPLEQ_ENTRY(BlkIntermediateStates) entry;
-} BlkIntermediateStates;
-
-
-/*
- * Drops images above 'base' up to and including 'top', and sets the image
- * above 'top' to have base as its backing file.
- *
- * Requires that the overlay to 'top' is opened r/w, so that the backing file
- * information in 'bs' can be properly updated.
- *
- * E.g., this will convert the following chain:
- * bottom <- base <- intermediate <- top <- active
- *
- * to
- *
- * bottom <- base <- active
- *
- * It is allowed for bottom==base, in which case it converts:
- *
- * base <- intermediate <- top <- active
- *
- * to
- *
- * base <- active
- *
- * Error conditions:
- *  if active == top, that is considered an error
- *
- */
-int bdrv_drop_intermediate(BlockDriverState *active, BlockDriverState *top,
-                           BlockDriverState *base)
-{
-    BlockDriverState *intermediate;
-    BlockDriverState *base_bs = NULL;
-    BlockDriverState *new_top_bs = NULL;
-    BlkIntermediateStates *intermediate_state, *next;
-    int ret = -EIO;
-
-    QSIMPLEQ_HEAD(states_to_delete, BlkIntermediateStates) states_to_delete;
-    QSIMPLEQ_INIT(&states_to_delete);
-
-    if (!top->drv || !base->drv) {
-        goto exit;
-    }
-
-    new_top_bs = bdrv_find_overlay(active, top);
-
-    if (new_top_bs == NULL) {
-        /* we could not find the image above 'top', this is an error */
-        goto exit;
-    }
-
-    /* special case of new_top_bs->backing_hd already pointing to base - nothing
-     * to do, no intermediate images */
-    if (new_top_bs->backing_hd == base) {
-        ret = 0;
-        goto exit;
-    }
-
-    intermediate = top;
-
-    /* now we will go down through the list, and add each BDS we find
-     * into our deletion queue, until we hit the 'base'
-     */
-    while (intermediate) {
-        intermediate_state = g_malloc0(sizeof(BlkIntermediateStates));
-        intermediate_state->bs = intermediate;
-        QSIMPLEQ_INSERT_TAIL(&states_to_delete, intermediate_state, entry);
-
-        if (intermediate->backing_hd == base) {
-            base_bs = intermediate->backing_hd;
-            break;
-        }
-        intermediate = intermediate->backing_hd;
-    }
-    if (base_bs == NULL) {
-        /* something went wrong, we did not end at the base. safely
-         * unravel everything, and exit with error */
-        goto exit;
-    }
-
-    /* success - we can delete the intermediate states, and link top->base */
-    ret = bdrv_change_backing_file(new_top_bs, base_bs->filename,
-                                   base_bs->drv ? base_bs->drv->format_name : "");
-    if (ret) {
-        goto exit;
-    }
-    new_top_bs->backing_hd = base_bs;
-
-
-    QSIMPLEQ_FOREACH_SAFE(intermediate_state, &states_to_delete, entry, next) {
-        /* so that bdrv_close() does not recursively close the chain */
-        intermediate_state->bs->backing_hd = NULL;
-        bdrv_delete(intermediate_state->bs);
-    }
-    ret = 0;
-
-exit:
-    QSIMPLEQ_FOREACH_SAFE(intermediate_state, &states_to_delete, entry, next) {
-        g_free(intermediate_state);
-    }
-    return ret;
-}
-
-
-static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,
-                                   size_t size)
-{
-    int64_t len;
-
-    if (!bdrv_is_inserted(bs))
-        return -ENOMEDIUM;
-
-    if (bs->growable)
-        return 0;
-
-    len = bdrv_getlength(bs);
-
-    if (offset < 0)
-        return -EIO;
-
-    if ((offset > len) || (len - offset < size))
-        return -EIO;
-
-    return 0;
-}
-
-static int bdrv_check_request(BlockDriverState *bs, int64_t sector_num,
-                              int nb_sectors)
-{
-    return bdrv_check_byte_request(bs, sector_num * BDRV_SECTOR_SIZE,
-                                   nb_sectors * BDRV_SECTOR_SIZE);
-}
-
-typedef struct RwCo {
-    BlockDriverState *bs;
-    int64_t sector_num;
-    int nb_sectors;
-    QEMUIOVector *qiov;
-    bool is_write;
-    int ret;
-} RwCo;
-
-static void coroutine_fn bdrv_rw_co_entry(void *opaque)
-{
-    RwCo *rwco = opaque;
-
-    if (!rwco->is_write) {
-        rwco->ret = bdrv_co_do_readv(rwco->bs, rwco->sector_num,
-                                     rwco->nb_sectors, rwco->qiov, 0);
-    } else {
-        rwco->ret = bdrv_co_do_writev(rwco->bs, rwco->sector_num,
-                                      rwco->nb_sectors, rwco->qiov, 0);
-    }
-}
-
-/*
- * Process a vectored synchronous request using coroutines
- */
-static int bdrv_rwv_co(BlockDriverState *bs, int64_t sector_num,
-                       QEMUIOVector *qiov, bool is_write)
-{
-    Coroutine *co;
-    RwCo rwco = {
-        .bs = bs,
-        .sector_num = sector_num,
-        .nb_sectors = qiov->size >> BDRV_SECTOR_BITS,
-        .qiov = qiov,
-        .is_write = is_write,
-        .ret = NOT_DONE,
-    };
-    assert((qiov->size & (BDRV_SECTOR_SIZE - 1)) == 0);
-
-    /**
-     * In sync call context, when the vcpu is blocked, this throttling timer
-     * will not fire; so the I/O throttling function has to be disabled here
-     * if it has been enabled.
-     */
-    if (bs->io_limits_enabled) {
-        fprintf(stderr, "Disabling I/O throttling on '%s' due "
-                        "to synchronous I/O.\n", bdrv_get_device_name(bs));
-        bdrv_io_limits_disable(bs);
-    }
-
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_rw_co_entry(&rwco);
-    } else {
-        co = qemu_coroutine_create(bdrv_rw_co_entry);
-        qemu_coroutine_enter(co, &rwco);
-        while (rwco.ret == NOT_DONE) {
-            qemu_aio_wait();
-        }
-    }
-    return rwco.ret;
-}
-
-/*
- * Process a synchronous request using coroutines
- */
-static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,
-                      int nb_sectors, bool is_write)
-{
-    QEMUIOVector qiov;
-    struct iovec iov = {
-        .iov_base = (void *)buf,
-        .iov_len = nb_sectors * BDRV_SECTOR_SIZE,
-    };
-
-    qemu_iovec_init_external(&qiov, &iov, 1);
-    return bdrv_rwv_co(bs, sector_num, &qiov, is_write);
-}
-
-/* return < 0 if error. See bdrv_write() for the return codes */
-int bdrv_read(BlockDriverState *bs, int64_t sector_num,
-              uint8_t *buf, int nb_sectors)
-{
-    return bdrv_rw_co(bs, sector_num, buf, nb_sectors, false);
-}
-
-/* Just like bdrv_read(), but with I/O throttling temporarily disabled */
-int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num,
-                          uint8_t *buf, int nb_sectors)
-{
-    bool enabled;
-    int ret;
-
-    enabled = bs->io_limits_enabled;
-    bs->io_limits_enabled = false;
-    ret = bdrv_read(bs, 0, buf, 1);
-    bs->io_limits_enabled = enabled;
-    return ret;
-}
-
-/* Return < 0 if error. Important errors are:
-  -EIO         generic I/O error (may happen for all errors)
-  -ENOMEDIUM   No media inserted.
-  -EINVAL      Invalid sector number or nb_sectors
-  -EACCES      Trying to write a read-only device
-*/
-int bdrv_write(BlockDriverState *bs, int64_t sector_num,
-               const uint8_t *buf, int nb_sectors)
-{
-    return bdrv_rw_co(bs, sector_num, (uint8_t *)buf, nb_sectors, true);
-}
-
-int bdrv_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov)
-{
-    return bdrv_rwv_co(bs, sector_num, qiov, true);
-}
-
-int bdrv_pread(BlockDriverState *bs, int64_t offset,
-               void *buf, int count1)
-{
-    uint8_t tmp_buf[BDRV_SECTOR_SIZE];
-    int len, nb_sectors, count;
-    int64_t sector_num;
-    int ret;
-
-    count = count1;
-    /* first read to align to sector start */
-    len = (BDRV_SECTOR_SIZE - offset) & (BDRV_SECTOR_SIZE - 1);
-    if (len > count)
-        len = count;
-    sector_num = offset >> BDRV_SECTOR_BITS;
-    if (len > 0) {
-        if ((ret = bdrv_read(bs, sector_num, tmp_buf, 1)) < 0)
-            return ret;
-        memcpy(buf, tmp_buf + (offset & (BDRV_SECTOR_SIZE - 1)), len);
-        count -= len;
-        if (count == 0)
-            return count1;
-        sector_num++;
-        buf += len;
-    }
-
-    /* read the sectors "in place" */
-    nb_sectors = count >> BDRV_SECTOR_BITS;
-    if (nb_sectors > 0) {
-        if ((ret = bdrv_read(bs, sector_num, buf, nb_sectors)) < 0)
-            return ret;
-        sector_num += nb_sectors;
-        len = nb_sectors << BDRV_SECTOR_BITS;
-        buf += len;
-        count -= len;
-    }
-
-    /* add data from the last sector */
-    if (count > 0) {
-        if ((ret = bdrv_read(bs, sector_num, tmp_buf, 1)) < 0)
-            return ret;
-        memcpy(buf, tmp_buf, count);
-    }
-    return count1;
-}
-
-int bdrv_pwritev(BlockDriverState *bs, int64_t offset, QEMUIOVector *qiov)
-{
-    uint8_t tmp_buf[BDRV_SECTOR_SIZE];
-    int len, nb_sectors, count;
-    int64_t sector_num;
-    int ret;
-
-    count = qiov->size;
-
-    /* first write to align to sector start */
-    len = (BDRV_SECTOR_SIZE - offset) & (BDRV_SECTOR_SIZE - 1);
-    if (len > count)
-        len = count;
-    sector_num = offset >> BDRV_SECTOR_BITS;
-    if (len > 0) {
-        if ((ret = bdrv_read(bs, sector_num, tmp_buf, 1)) < 0)
-            return ret;
-        qemu_iovec_to_buf(qiov, 0, tmp_buf + (offset & (BDRV_SECTOR_SIZE - 1)),
-                          len);
-        if ((ret = bdrv_write(bs, sector_num, tmp_buf, 1)) < 0)
-            return ret;
-        count -= len;
-        if (count == 0)
-            return qiov->size;
-        sector_num++;
-    }
-
-    /* write the sectors "in place" */
-    nb_sectors = count >> BDRV_SECTOR_BITS;
-    if (nb_sectors > 0) {
-        QEMUIOVector qiov_inplace;
-
-        qemu_iovec_init(&qiov_inplace, qiov->niov);
-        qemu_iovec_concat(&qiov_inplace, qiov, len,
-                          nb_sectors << BDRV_SECTOR_BITS);
-        ret = bdrv_writev(bs, sector_num, &qiov_inplace);
-        qemu_iovec_destroy(&qiov_inplace);
-        if (ret < 0) {
-            return ret;
-        }
-
-        sector_num += nb_sectors;
-        len = nb_sectors << BDRV_SECTOR_BITS;
-        count -= len;
-    }
-
-    /* add data from the last sector */
-    if (count > 0) {
-        if ((ret = bdrv_read(bs, sector_num, tmp_buf, 1)) < 0)
-            return ret;
-        qemu_iovec_to_buf(qiov, qiov->size - count, tmp_buf, count);
-        if ((ret = bdrv_write(bs, sector_num, tmp_buf, 1)) < 0)
-            return ret;
-    }
-    return qiov->size;
-}
-
-int bdrv_pwrite(BlockDriverState *bs, int64_t offset,
-                const void *buf, int count1)
-{
-    QEMUIOVector qiov;
-    struct iovec iov = {
-        .iov_base   = (void *) buf,
-        .iov_len    = count1,
-    };
-
-    qemu_iovec_init_external(&qiov, &iov, 1);
-    return bdrv_pwritev(bs, offset, &qiov);
-}
-
-/*
- * Writes to the file and ensures that no writes are reordered across this
- * request (acts as a barrier)
- *
- * Returns 0 on success, -errno in error cases.
- */
-int bdrv_pwrite_sync(BlockDriverState *bs, int64_t offset,
-    const void *buf, int count)
-{
-    int ret;
-
-    ret = bdrv_pwrite(bs, offset, buf, count);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* No flush needed for cache modes that already do it */
-    if (bs->enable_write_cache) {
-        bdrv_flush(bs);
-    }
-
-    return 0;
-}
-
-static int coroutine_fn bdrv_co_do_copy_on_readv(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors, QEMUIOVector *qiov)
-{
-    /* Perform I/O through a temporary buffer so that users who scribble over
-     * their read buffer while the operation is in progress do not end up
-     * modifying the image file.  This is critical for zero-copy guest I/O
-     * where anything might happen inside guest memory.
-     */
-    void *bounce_buffer;
-
-    BlockDriver *drv = bs->drv;
-    struct iovec iov;
-    QEMUIOVector bounce_qiov;
-    int64_t cluster_sector_num;
-    int cluster_nb_sectors;
-    size_t skip_bytes;
-    int ret;
-
-    /* Cover entire cluster so no additional backing file I/O is required when
-     * allocating cluster in the image file.
-     */
-    bdrv_round_to_clusters(bs, sector_num, nb_sectors,
-                           &cluster_sector_num, &cluster_nb_sectors);
-
-    trace_bdrv_co_do_copy_on_readv(bs, sector_num, nb_sectors,
-                                   cluster_sector_num, cluster_nb_sectors);
-
-    iov.iov_len = cluster_nb_sectors * BDRV_SECTOR_SIZE;
-    iov.iov_base = bounce_buffer = qemu_blockalign(bs, iov.iov_len);
-    qemu_iovec_init_external(&bounce_qiov, &iov, 1);
-
-    ret = drv->bdrv_co_readv(bs, cluster_sector_num, cluster_nb_sectors,
-                             &bounce_qiov);
-    if (ret < 0) {
-        goto err;
-    }
-
-    if (drv->bdrv_co_write_zeroes &&
-        buffer_is_zero(bounce_buffer, iov.iov_len)) {
-        ret = bdrv_co_do_write_zeroes(bs, cluster_sector_num,
-                                      cluster_nb_sectors);
-    } else {
-        /* This does not change the data on the disk, it is not necessary
-         * to flush even in cache=writethrough mode.
-         */
-        ret = drv->bdrv_co_writev(bs, cluster_sector_num, cluster_nb_sectors,
-                                  &bounce_qiov);
-    }
-
-    if (ret < 0) {
-        /* It might be okay to ignore write errors for guest requests.  If this
-         * is a deliberate copy-on-read then we don't want to ignore the error.
-         * Simply report it in all cases.
-         */
-        goto err;
-    }
-
-    skip_bytes = (sector_num - cluster_sector_num) * BDRV_SECTOR_SIZE;
-    qemu_iovec_from_buf(qiov, 0, bounce_buffer + skip_bytes,
-                        nb_sectors * BDRV_SECTOR_SIZE);
-
-err:
-    qemu_vfree(bounce_buffer);
-    return ret;
-}
-
-/*
- * Handle a read request in coroutine context
- */
-static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
-    BdrvRequestFlags flags)
-{
-    BlockDriver *drv = bs->drv;
-    BdrvTrackedRequest req;
-    int ret;
-
-    if (!drv) {
-        return -ENOMEDIUM;
-    }
-    if (bdrv_check_request(bs, sector_num, nb_sectors)) {
-        return -EIO;
-    }
-
-    /* throttling disk read I/O */
-    if (bs->io_limits_enabled) {
-        bdrv_io_limits_intercept(bs, false, nb_sectors);
-    }
-
-    if (bs->copy_on_read) {
-        flags |= BDRV_REQ_COPY_ON_READ;
-    }
-    if (flags & BDRV_REQ_COPY_ON_READ) {
-        bs->copy_on_read_in_flight++;
-    }
-
-    if (bs->copy_on_read_in_flight) {
-        wait_for_overlapping_requests(bs, sector_num, nb_sectors);
-    }
-
-    tracked_request_begin(&req, bs, sector_num, nb_sectors, false);
-
-    if (flags & BDRV_REQ_COPY_ON_READ) {
-        int pnum;
-
-        ret = bdrv_co_is_allocated(bs, sector_num, nb_sectors, &pnum);
-        if (ret < 0) {
-            goto out;
-        }
-
-        if (!ret || pnum != nb_sectors) {
-            ret = bdrv_co_do_copy_on_readv(bs, sector_num, nb_sectors, qiov);
-            goto out;
-        }
-    }
-
-    ret = drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov);
-
-out:
-    tracked_request_end(&req);
-
-    if (flags & BDRV_REQ_COPY_ON_READ) {
-        bs->copy_on_read_in_flight--;
-    }
-
-    return ret;
-}
-
-int coroutine_fn bdrv_co_readv(BlockDriverState *bs, int64_t sector_num,
-    int nb_sectors, QEMUIOVector *qiov)
-{
-    trace_bdrv_co_readv(bs, sector_num, nb_sectors);
-
-    return bdrv_co_do_readv(bs, sector_num, nb_sectors, qiov, 0);
-}
-
-int coroutine_fn bdrv_co_copy_on_readv(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov)
-{
-    trace_bdrv_co_copy_on_readv(bs, sector_num, nb_sectors);
-
-    return bdrv_co_do_readv(bs, sector_num, nb_sectors, qiov,
-                            BDRV_REQ_COPY_ON_READ);
-}
-
-static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors)
-{
-    BlockDriver *drv = bs->drv;
-    QEMUIOVector qiov;
-    struct iovec iov;
-    int ret;
-
-    /* TODO Emulate only part of misaligned requests instead of letting block
-     * drivers return -ENOTSUP and emulate everything */
-
-    /* First try the efficient write zeroes operation */
-    if (drv->bdrv_co_write_zeroes) {
-        ret = drv->bdrv_co_write_zeroes(bs, sector_num, nb_sectors);
-        if (ret != -ENOTSUP) {
-            return ret;
-        }
-    }
-
-    /* Fall back to bounce buffer if write zeroes is unsupported */
-    iov.iov_len  = nb_sectors * BDRV_SECTOR_SIZE;
-    iov.iov_base = qemu_blockalign(bs, iov.iov_len);
-    memset(iov.iov_base, 0, iov.iov_len);
-    qemu_iovec_init_external(&qiov, &iov, 1);
-
-    ret = drv->bdrv_co_writev(bs, sector_num, nb_sectors, &qiov);
-
-    qemu_vfree(iov.iov_base);
-    return ret;
-}
-
-/*
- * Handle a write request in coroutine context
- */
-static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
-    BdrvRequestFlags flags)
-{
-    BlockDriver *drv = bs->drv;
-    BdrvTrackedRequest req;
-    int ret;
-
-    if (!bs->drv) {
-        return -ENOMEDIUM;
-    }
-    if (bs->read_only) {
-        return -EACCES;
-    }
-    if (bdrv_check_request(bs, sector_num, nb_sectors)) {
-        return -EIO;
-    }
-
-    /* throttling disk write I/O */
-    if (bs->io_limits_enabled) {
-        bdrv_io_limits_intercept(bs, true, nb_sectors);
-    }
-
-    if (bs->copy_on_read_in_flight) {
-        wait_for_overlapping_requests(bs, sector_num, nb_sectors);
-    }
-
-    tracked_request_begin(&req, bs, sector_num, nb_sectors, true);
-
-    ret = notifier_with_return_list_notify(&bs->before_write_notifiers, &req);
-
-    if (ret < 0) {
-        /* Do nothing, write notifier decided to fail this request */
-    } else if (flags & BDRV_REQ_ZERO_WRITE) {
-        ret = bdrv_co_do_write_zeroes(bs, sector_num, nb_sectors);
-    } else {
-        ret = drv->bdrv_co_writev(bs, sector_num, nb_sectors, qiov);
-    }
-
-    if (ret == 0 && !bs->enable_write_cache) {
-        ret = bdrv_co_flush(bs);
-    }
-
-    if (bs->dirty_bitmap) {
-        bdrv_set_dirty(bs, sector_num, nb_sectors);
-    }
-
-    if (bs->wr_highest_sector < sector_num + nb_sectors - 1) {
-        bs->wr_highest_sector = sector_num + nb_sectors - 1;
-    }
-
-    tracked_request_end(&req);
-
-    return ret;
-}
-
-int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num,
-    int nb_sectors, QEMUIOVector *qiov)
-{
-    trace_bdrv_co_writev(bs, sector_num, nb_sectors);
-
-    return bdrv_co_do_writev(bs, sector_num, nb_sectors, qiov, 0);
-}
-
-int coroutine_fn bdrv_co_write_zeroes(BlockDriverState *bs,
-                                      int64_t sector_num, int nb_sectors)
-{
-    trace_bdrv_co_write_zeroes(bs, sector_num, nb_sectors);
-
-    return bdrv_co_do_writev(bs, sector_num, nb_sectors, NULL,
-                             BDRV_REQ_ZERO_WRITE);
-}
-
-/**
- * Truncate file to 'offset' bytes (needed only for file protocols)
- */
-int bdrv_truncate(BlockDriverState *bs, int64_t offset)
-{
-    BlockDriver *drv = bs->drv;
-    int ret;
-    if (!drv)
-        return -ENOMEDIUM;
-    if (!drv->bdrv_truncate)
-        return -ENOTSUP;
-    if (bs->read_only)
-        return -EACCES;
-    if (bdrv_in_use(bs))
-        return -EBUSY;
-    ret = drv->bdrv_truncate(bs, offset);
-    if (ret == 0) {
-        ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
-        bdrv_dev_resize_cb(bs);
-    }
-    return ret;
-}
-
-/**
- * Length of a allocated file in bytes. Sparse files are counted by actual
- * allocated space. Return < 0 if error or unknown.
- */
-int64_t bdrv_get_allocated_file_size(BlockDriverState *bs)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv) {
-        return -ENOMEDIUM;
-    }
-    if (drv->bdrv_get_allocated_file_size) {
-        return drv->bdrv_get_allocated_file_size(bs);
-    }
-    if (bs->file) {
-        return bdrv_get_allocated_file_size(bs->file);
-    }
-    return -ENOTSUP;
-}
-
-/**
- * Length of a file in bytes. Return < 0 if error or unknown.
- */
-int64_t bdrv_getlength(BlockDriverState *bs)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv)
-        return -ENOMEDIUM;
-
-    if (bs->growable || bdrv_dev_has_removable_media(bs)) {
-        if (drv->bdrv_getlength) {
-            return drv->bdrv_getlength(bs);
-        }
-    }
-    return bs->total_sectors * BDRV_SECTOR_SIZE;
-}
-
-/* return 0 as number of sectors if no device present or error */
-void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr)
-{
-    int64_t length;
-    length = bdrv_getlength(bs);
-    if (length < 0)
-        length = 0;
-    else
-        length = length >> BDRV_SECTOR_BITS;
-    *nb_sectors_ptr = length;
-}
-
-/* throttling disk io limits */
-void bdrv_set_io_limits(BlockDriverState *bs,
-                        BlockIOLimit *io_limits)
-{
-    bs->io_limits = *io_limits;
-    bs->io_limits_enabled = bdrv_io_limits_enabled(bs);
-}
-
-void bdrv_set_on_error(BlockDriverState *bs, BlockdevOnError on_read_error,
-                       BlockdevOnError on_write_error)
-{
-    bs->on_read_error = on_read_error;
-    bs->on_write_error = on_write_error;
-}
-
-BlockdevOnError bdrv_get_on_error(BlockDriverState *bs, bool is_read)
-{
-    return is_read ? bs->on_read_error : bs->on_write_error;
-}
-
-BlockErrorAction bdrv_get_error_action(BlockDriverState *bs, bool is_read, int error)
-{
-    BlockdevOnError on_err = is_read ? bs->on_read_error : bs->on_write_error;
-
-    switch (on_err) {
-    case BLOCKDEV_ON_ERROR_ENOSPC:
-        return (error == ENOSPC) ? BDRV_ACTION_STOP : BDRV_ACTION_REPORT;
-    case BLOCKDEV_ON_ERROR_STOP:
-        return BDRV_ACTION_STOP;
-    case BLOCKDEV_ON_ERROR_REPORT:
-        return BDRV_ACTION_REPORT;
-    case BLOCKDEV_ON_ERROR_IGNORE:
-        return BDRV_ACTION_IGNORE;
-    default:
-        abort();
-    }
-}
-
-/* This is done by device models because, while the block layer knows
- * about the error, it does not know whether an operation comes from
- * the device or the block layer (from a job, for example).
- */
-void bdrv_error_action(BlockDriverState *bs, BlockErrorAction action,
-                       bool is_read, int error)
-{
-    assert(error >= 0);
-    bdrv_emit_qmp_error_event(bs, QEVENT_BLOCK_IO_ERROR, action, is_read);
-    if (action == BDRV_ACTION_STOP) {
-        vm_stop(RUN_STATE_IO_ERROR);
-        bdrv_iostatus_set_err(bs, error);
-    }
-}
-
-int bdrv_is_read_only(BlockDriverState *bs)
-{
-    return bs->read_only;
-}
-
-int bdrv_is_sg(BlockDriverState *bs)
-{
-    return bs->sg;
-}
-
-int bdrv_enable_write_cache(BlockDriverState *bs)
-{
-    return bs->enable_write_cache;
-}
-
-void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce)
-{
-    bs->enable_write_cache = wce;
-
-    /* so a reopen() will preserve wce */
-    if (wce) {
-        bs->open_flags |= BDRV_O_CACHE_WB;
-    } else {
-        bs->open_flags &= ~BDRV_O_CACHE_WB;
-    }
-}
-
-int bdrv_is_encrypted(BlockDriverState *bs)
-{
-    if (bs->backing_hd && bs->backing_hd->encrypted)
-        return 1;
-    return bs->encrypted;
-}
-
-int bdrv_key_required(BlockDriverState *bs)
-{
-    BlockDriverState *backing_hd = bs->backing_hd;
-
-    if (backing_hd && backing_hd->encrypted && !backing_hd->valid_key)
-        return 1;
-    return (bs->encrypted && !bs->valid_key);
-}
-
-int bdrv_set_key(BlockDriverState *bs, const char *key)
-{
-    int ret;
-    if (bs->backing_hd && bs->backing_hd->encrypted) {
-        ret = bdrv_set_key(bs->backing_hd, key);
-        if (ret < 0)
-            return ret;
-        if (!bs->encrypted)
-            return 0;
-    }
-    if (!bs->encrypted) {
-        return -EINVAL;
-    } else if (!bs->drv || !bs->drv->bdrv_set_key) {
-        return -ENOMEDIUM;
-    }
-    ret = bs->drv->bdrv_set_key(bs, key);
-    if (ret < 0) {
-        bs->valid_key = 0;
-    } else if (!bs->valid_key) {
-        bs->valid_key = 1;
-        /* call the change callback now, we skipped it on open */
-        bdrv_dev_change_media_cb(bs, true);
-    }
-    return ret;
-}
-
-const char *bdrv_get_format_name(BlockDriverState *bs)
-{
-    return bs->drv ? bs->drv->format_name : NULL;
-}
-
-void bdrv_iterate_format(void (*it)(void *opaque, const char *name),
-                         void *opaque)
-{
-    BlockDriver *drv;
-
-    QLIST_FOREACH(drv, &bdrv_drivers, list) {
-        it(opaque, drv->format_name);
-    }
-}
-
-BlockDriverState *bdrv_find(const char *name)
-{
-    BlockDriverState *bs;
-
-    QTAILQ_FOREACH(bs, &bdrv_states, list) {
-        if (!strcmp(name, bs->device_name)) {
-            return bs;
-        }
-    }
-    return NULL;
-}
-
-BlockDriverState *bdrv_next(BlockDriverState *bs)
-{
-    if (!bs) {
-        return QTAILQ_FIRST(&bdrv_states);
-    }
-    return QTAILQ_NEXT(bs, list);
-}
-
-void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque)
-{
-    BlockDriverState *bs;
-
-    QTAILQ_FOREACH(bs, &bdrv_states, list) {
-        it(opaque, bs);
-    }
-}
-
-const char *bdrv_get_device_name(BlockDriverState *bs)
-{
-    return bs->device_name;
-}
-
-int bdrv_get_flags(BlockDriverState *bs)
-{
-    return bs->open_flags;
-}
-
-int bdrv_flush_all(void)
-{
-    BlockDriverState *bs;
-    int result = 0;
-
-    QTAILQ_FOREACH(bs, &bdrv_states, list) {
-        int ret = bdrv_flush(bs);
-        if (ret < 0 && !result) {
-            result = ret;
-        }
-    }
-
-    return result;
-}
-
-int bdrv_has_zero_init_1(BlockDriverState *bs)
-{
-    return 1;
-}
-
-int bdrv_has_zero_init(BlockDriverState *bs)
-{
-    assert(bs->drv);
-
-    if (bs->drv->bdrv_has_zero_init) {
-        return bs->drv->bdrv_has_zero_init(bs);
-    }
-
-    /* safe default */
-    return 0;
-}
-
-typedef struct BdrvCoIsAllocatedData {
-    BlockDriverState *bs;
-    BlockDriverState *base;
-    int64_t sector_num;
-    int nb_sectors;
-    int *pnum;
-    int ret;
-    bool done;
-} BdrvCoIsAllocatedData;
-
-/*
- * Returns true iff the specified sector is present in the disk image. Drivers
- * not implementing the functionality are assumed to not support backing files,
- * hence all their sectors are reported as allocated.
- *
- * If 'sector_num' is beyond the end of the disk image the return value is 0
- * and 'pnum' is set to 0.
- *
- * 'pnum' is set to the number of sectors (including and immediately following
- * the specified sector) that are known to be in the same
- * allocated/unallocated state.
- *
- * 'nb_sectors' is the max value 'pnum' should be set to.  If nb_sectors goes
- * beyond the end of the disk image it will be clamped.
- */
-int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t sector_num,
-                                      int nb_sectors, int *pnum)
-{
-    int64_t n;
-
-    if (sector_num >= bs->total_sectors) {
-        *pnum = 0;
-        return 0;
-    }
-
-    n = bs->total_sectors - sector_num;
-    if (n < nb_sectors) {
-        nb_sectors = n;
-    }
-
-    if (!bs->drv->bdrv_co_is_allocated) {
-        *pnum = nb_sectors;
-        return 1;
-    }
-
-    return bs->drv->bdrv_co_is_allocated(bs, sector_num, nb_sectors, pnum);
-}
-
-/* Coroutine wrapper for bdrv_is_allocated() */
-static void coroutine_fn bdrv_is_allocated_co_entry(void *opaque)
-{
-    BdrvCoIsAllocatedData *data = opaque;
-    BlockDriverState *bs = data->bs;
-
-    data->ret = bdrv_co_is_allocated(bs, data->sector_num, data->nb_sectors,
-                                     data->pnum);
-    data->done = true;
-}
-
-/*
- * Synchronous wrapper around bdrv_co_is_allocated().
- *
- * See bdrv_co_is_allocated() for details.
- */
-int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors,
-                      int *pnum)
-{
-    Coroutine *co;
-    BdrvCoIsAllocatedData data = {
-        .bs = bs,
-        .sector_num = sector_num,
-        .nb_sectors = nb_sectors,
-        .pnum = pnum,
-        .done = false,
-    };
-
-    co = qemu_coroutine_create(bdrv_is_allocated_co_entry);
-    qemu_coroutine_enter(co, &data);
-    while (!data.done) {
-        qemu_aio_wait();
-    }
-    return data.ret;
-}
-
-/*
- * Given an image chain: ... -> [BASE] -> [INTER1] -> [INTER2] -> [TOP]
- *
- * Return true if the given sector is allocated in any image between
- * BASE and TOP (inclusive).  BASE can be NULL to check if the given
- * sector is allocated in any image of the chain.  Return false otherwise.
- *
- * 'pnum' is set to the number of sectors (including and immediately following
- *  the specified sector) that are known to be in the same
- *  allocated/unallocated state.
- *
- */
-int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
-                                            BlockDriverState *base,
-                                            int64_t sector_num,
-                                            int nb_sectors, int *pnum)
-{
-    BlockDriverState *intermediate;
-    int ret, n = nb_sectors;
-
-    intermediate = top;
-    while (intermediate && intermediate != base) {
-        int pnum_inter;
-        ret = bdrv_co_is_allocated(intermediate, sector_num, nb_sectors,
-                                   &pnum_inter);
-        if (ret < 0) {
-            return ret;
-        } else if (ret) {
-            *pnum = pnum_inter;
-            return 1;
-        }
-
-        /*
-         * [sector_num, nb_sectors] is unallocated on top but intermediate
-         * might have
-         *
-         * [sector_num+x, nr_sectors] allocated.
-         */
-        if (n > pnum_inter &&
-            (intermediate == top ||
-             sector_num + pnum_inter < intermediate->total_sectors)) {
-            n = pnum_inter;
-        }
-
-        intermediate = intermediate->backing_hd;
-    }
-
-    *pnum = n;
-    return 0;
-}
-
-/* Coroutine wrapper for bdrv_is_allocated_above() */
-static void coroutine_fn bdrv_is_allocated_above_co_entry(void *opaque)
-{
-    BdrvCoIsAllocatedData *data = opaque;
-    BlockDriverState *top = data->bs;
-    BlockDriverState *base = data->base;
-
-    data->ret = bdrv_co_is_allocated_above(top, base, data->sector_num,
-                                           data->nb_sectors, data->pnum);
-    data->done = true;
-}
-
-/*
- * Synchronous wrapper around bdrv_co_is_allocated_above().
- *
- * See bdrv_co_is_allocated_above() for details.
- */
-int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
-                            int64_t sector_num, int nb_sectors, int *pnum)
-{
-    Coroutine *co;
-    BdrvCoIsAllocatedData data = {
-        .bs = top,
-        .base = base,
-        .sector_num = sector_num,
-        .nb_sectors = nb_sectors,
-        .pnum = pnum,
-        .done = false,
-    };
-
-    co = qemu_coroutine_create(bdrv_is_allocated_above_co_entry);
-    qemu_coroutine_enter(co, &data);
-    while (!data.done) {
-        qemu_aio_wait();
-    }
-    return data.ret;
-}
-
-const char *bdrv_get_encrypted_filename(BlockDriverState *bs)
-{
-    if (bs->backing_hd && bs->backing_hd->encrypted)
-        return bs->backing_file;
-    else if (bs->encrypted)
-        return bs->filename;
-    else
-        return NULL;
-}
-
-void bdrv_get_backing_filename(BlockDriverState *bs,
-                               char *filename, int filename_size)
-{
-    pstrcpy(filename, filename_size, bs->backing_file);
-}
-
-int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,
-                          const uint8_t *buf, int nb_sectors)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv)
-        return -ENOMEDIUM;
-    if (!drv->bdrv_write_compressed)
-        return -ENOTSUP;
-    if (bdrv_check_request(bs, sector_num, nb_sectors))
-        return -EIO;
-
-    assert(!bs->dirty_bitmap);
-
-    return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
-}
-
-int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv)
-        return -ENOMEDIUM;
-    if (!drv->bdrv_get_info)
-        return -ENOTSUP;
-    memset(bdi, 0, sizeof(*bdi));
-    return drv->bdrv_get_info(bs, bdi);
-}
-
-int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
-                      int64_t pos, int size)
-{
-    QEMUIOVector qiov;
-    struct iovec iov = {
-        .iov_base   = (void *) buf,
-        .iov_len    = size,
-    };
-
-    qemu_iovec_init_external(&qiov, &iov, 1);
-    return bdrv_writev_vmstate(bs, &qiov, pos);
-}
-
-int bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
-{
-    BlockDriver *drv = bs->drv;
-
-    if (!drv) {
-        return -ENOMEDIUM;
-    } else if (drv->bdrv_save_vmstate) {
-        return drv->bdrv_save_vmstate(bs, qiov, pos);
-    } else if (bs->file) {
-        return bdrv_writev_vmstate(bs->file, qiov, pos);
-    }
-
-    return -ENOTSUP;
-}
-
-int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf,
-                      int64_t pos, int size)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv)
-        return -ENOMEDIUM;
-    if (drv->bdrv_load_vmstate)
-        return drv->bdrv_load_vmstate(bs, buf, pos, size);
-    if (bs->file)
-        return bdrv_load_vmstate(bs->file, buf, pos, size);
-    return -ENOTSUP;
-}
-
-void bdrv_debug_event(BlockDriverState *bs, BlkDebugEvent event)
-{
-    if (!bs || !bs->drv || !bs->drv->bdrv_debug_event) {
-        return;
-    }
-
-    bs->drv->bdrv_debug_event(bs, event);
-}
-
-int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
-                          const char *tag)
-{
-    while (bs && bs->drv && !bs->drv->bdrv_debug_breakpoint) {
-        bs = bs->file;
-    }
-
-    if (bs && bs->drv && bs->drv->bdrv_debug_breakpoint) {
-        return bs->drv->bdrv_debug_breakpoint(bs, event, tag);
-    }
-
-    return -ENOTSUP;
-}
-
-int bdrv_debug_resume(BlockDriverState *bs, const char *tag)
-{
-    while (bs && bs->drv && !bs->drv->bdrv_debug_resume) {
-        bs = bs->file;
-    }
-
-    if (bs && bs->drv && bs->drv->bdrv_debug_resume) {
-        return bs->drv->bdrv_debug_resume(bs, tag);
-    }
-
-    return -ENOTSUP;
-}
-
-bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag)
-{
-    while (bs && bs->drv && !bs->drv->bdrv_debug_is_suspended) {
-        bs = bs->file;
-    }
-
-    if (bs && bs->drv && bs->drv->bdrv_debug_is_suspended) {
-        return bs->drv->bdrv_debug_is_suspended(bs, tag);
-    }
-
-    return false;
-}
-
-int bdrv_is_snapshot(BlockDriverState *bs)
-{
-    return !!(bs->open_flags & BDRV_O_SNAPSHOT);
-}
-
-/* backing_file can either be relative, or absolute, or a protocol.  If it is
- * relative, it must be relative to the chain.  So, passing in bs->filename
- * from a BDS as backing_file should not be done, as that may be relative to
- * the CWD rather than the chain. */
-BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
-        const char *backing_file)
-{
-    char *filename_full = NULL;
-    char *backing_file_full = NULL;
-    char *filename_tmp = NULL;
-    int is_protocol = 0;
-    BlockDriverState *curr_bs = NULL;
-    BlockDriverState *retval = NULL;
-
-    if (!bs || !bs->drv || !backing_file) {
-        return NULL;
-    }
-
-    filename_full     = g_malloc(PATH_MAX);
-    backing_file_full = g_malloc(PATH_MAX);
-    filename_tmp      = g_malloc(PATH_MAX);
-
-    is_protocol = path_has_protocol(backing_file);
-
-    for (curr_bs = bs; curr_bs->backing_hd; curr_bs = curr_bs->backing_hd) {
-
-        /* If either of the filename paths is actually a protocol, then
-         * compare unmodified paths; otherwise make paths relative */
-        if (is_protocol || path_has_protocol(curr_bs->backing_file)) {
-            if (strcmp(backing_file, curr_bs->backing_file) == 0) {
-                retval = curr_bs->backing_hd;
-                break;
-            }
-        } else {
-            /* If not an absolute filename path, make it relative to the current
-             * image's filename path */
-            path_combine(filename_tmp, PATH_MAX, curr_bs->filename,
-                         backing_file);
-
-            /* We are going to compare absolute pathnames */
-            if (!realpath(filename_tmp, filename_full)) {
-                continue;
-            }
-
-            /* We need to make sure the backing filename we are comparing against
-             * is relative to the current image filename (or absolute) */
-            path_combine(filename_tmp, PATH_MAX, curr_bs->filename,
-                         curr_bs->backing_file);
-
-            if (!realpath(filename_tmp, backing_file_full)) {
-                continue;
-            }
-
-            if (strcmp(backing_file_full, filename_full) == 0) {
-                retval = curr_bs->backing_hd;
-                break;
-            }
-        }
-    }
-
-    g_free(filename_full);
-    g_free(backing_file_full);
-    g_free(filename_tmp);
-    return retval;
-}
-
-int bdrv_get_backing_file_depth(BlockDriverState *bs)
-{
-    if (!bs->drv) {
-        return 0;
-    }
-
-    if (!bs->backing_hd) {
-        return 0;
-    }
-
-    return 1 + bdrv_get_backing_file_depth(bs->backing_hd);
-}
-
-BlockDriverState *bdrv_find_base(BlockDriverState *bs)
-{
-    BlockDriverState *curr_bs = NULL;
-
-    if (!bs) {
-        return NULL;
-    }
-
-    curr_bs = bs;
-
-    while (curr_bs->backing_hd) {
-        curr_bs = curr_bs->backing_hd;
-    }
-    return curr_bs;
-}
-
-/**************************************************************/
-/* async I/Os */
-
-BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,
-                                 QEMUIOVector *qiov, int nb_sectors,
-                                 BlockDriverCompletionFunc *cb, void *opaque)
-{
-    trace_bdrv_aio_readv(bs, sector_num, nb_sectors, opaque);
-
-    return bdrv_co_aio_rw_vector(bs, sector_num, qiov, nb_sectors,
-                                 cb, opaque, false);
-}
-
-BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,
-                                  QEMUIOVector *qiov, int nb_sectors,
-                                  BlockDriverCompletionFunc *cb, void *opaque)
-{
-    trace_bdrv_aio_writev(bs, sector_num, nb_sectors, opaque);
-
-    return bdrv_co_aio_rw_vector(bs, sector_num, qiov, nb_sectors,
-                                 cb, opaque, true);
-}
-
-
-typedef struct MultiwriteCB {
-    int error;
-    int num_requests;
-    int num_callbacks;
-    struct {
-        BlockDriverCompletionFunc *cb;
-        void *opaque;
-        QEMUIOVector *free_qiov;
-    } callbacks[];
-} MultiwriteCB;
-
-static void multiwrite_user_cb(MultiwriteCB *mcb)
-{
-    int i;
-
-    for (i = 0; i < mcb->num_callbacks; i++) {
-        mcb->callbacks[i].cb(mcb->callbacks[i].opaque, mcb->error);
-        if (mcb->callbacks[i].free_qiov) {
-            qemu_iovec_destroy(mcb->callbacks[i].free_qiov);
-        }
-        g_free(mcb->callbacks[i].free_qiov);
-    }
-}
-
-static void multiwrite_cb(void *opaque, int ret)
-{
-    MultiwriteCB *mcb = opaque;
-
-    trace_multiwrite_cb(mcb, ret);
-
-    if (ret < 0 && !mcb->error) {
-        mcb->error = ret;
-    }
-
-    mcb->num_requests--;
-    if (mcb->num_requests == 0) {
-        multiwrite_user_cb(mcb);
-        g_free(mcb);
-    }
-}
-
-static int multiwrite_req_compare(const void *a, const void *b)
-{
-    const BlockRequest *req1 = a, *req2 = b;
-
-    /*
-     * Note that we can't simply subtract req2->sector from req1->sector
-     * here as that could overflow the return value.
-     */
-    if (req1->sector > req2->sector) {
-        return 1;
-    } else if (req1->sector < req2->sector) {
-        return -1;
-    } else {
-        return 0;
-    }
-}
-
-/*
- * Takes a bunch of requests and tries to merge them. Returns the number of
- * requests that remain after merging.
- */
-static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs,
-    int num_reqs, MultiwriteCB *mcb)
-{
-    int i, outidx;
-
-    // Sort requests by start sector
-    qsort(reqs, num_reqs, sizeof(*reqs), &multiwrite_req_compare);
-
-    // Check if adjacent requests touch the same clusters. If so, combine them,
-    // filling up gaps with zero sectors.
-    outidx = 0;
-    for (i = 1; i < num_reqs; i++) {
-        int merge = 0;
-        int64_t oldreq_last = reqs[outidx].sector + reqs[outidx].nb_sectors;
-
-        // Handle exactly sequential writes and overlapping writes.
-        if (reqs[i].sector <= oldreq_last) {
-            merge = 1;
-        }
-
-        if (reqs[outidx].qiov->niov + reqs[i].qiov->niov + 1 > IOV_MAX) {
-            merge = 0;
-        }
-
-        if (merge) {
-            size_t size;
-            QEMUIOVector *qiov = g_malloc0(sizeof(*qiov));
-            qemu_iovec_init(qiov,
-                reqs[outidx].qiov->niov + reqs[i].qiov->niov + 1);
-
-            // Add the first request to the merged one. If the requests are
-            // overlapping, drop the last sectors of the first request.
-            size = (reqs[i].sector - reqs[outidx].sector) << 9;
-            qemu_iovec_concat(qiov, reqs[outidx].qiov, 0, size);
-
-            // We should need to add any zeros between the two requests
-            assert (reqs[i].sector <= oldreq_last);
-
-            // Add the second request
-            qemu_iovec_concat(qiov, reqs[i].qiov, 0, reqs[i].qiov->size);
-
-            reqs[outidx].nb_sectors = qiov->size >> 9;
-            reqs[outidx].qiov = qiov;
-
-            mcb->callbacks[i].free_qiov = reqs[outidx].qiov;
-        } else {
-            outidx++;
-            reqs[outidx].sector     = reqs[i].sector;
-            reqs[outidx].nb_sectors = reqs[i].nb_sectors;
-            reqs[outidx].qiov       = reqs[i].qiov;
-        }
-    }
-
-    return outidx + 1;
-}
-
-/*
- * Submit multiple AIO write requests at once.
- *
- * On success, the function returns 0 and all requests in the reqs array have
- * been submitted. In error case this function returns -1, and any of the
- * requests may or may not be submitted yet. In particular, this means that the
- * callback will be called for some of the requests, for others it won't. The
- * caller must check the error field of the BlockRequest to wait for the right
- * callbacks (if error != 0, no callback will be called).
- *
- * The implementation may modify the contents of the reqs array, e.g. to merge
- * requests. However, the fields opaque and error are left unmodified as they
- * are used to signal failure for a single request to the caller.
- */
-int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs, int num_reqs)
-{
-    MultiwriteCB *mcb;
-    int i;
-
-    /* don't submit writes if we don't have a medium */
-    if (bs->drv == NULL) {
-        for (i = 0; i < num_reqs; i++) {
-            reqs[i].error = -ENOMEDIUM;
-        }
-        return -1;
-    }
-
-    if (num_reqs == 0) {
-        return 0;
-    }
-
-    // Create MultiwriteCB structure
-    mcb = g_malloc0(sizeof(*mcb) + num_reqs * sizeof(*mcb->callbacks));
-    mcb->num_requests = 0;
-    mcb->num_callbacks = num_reqs;
-
-    for (i = 0; i < num_reqs; i++) {
-        mcb->callbacks[i].cb = reqs[i].cb;
-        mcb->callbacks[i].opaque = reqs[i].opaque;
-    }
-
-    // Check for mergable requests
-    num_reqs = multiwrite_merge(bs, reqs, num_reqs, mcb);
-
-    trace_bdrv_aio_multiwrite(mcb, mcb->num_callbacks, num_reqs);
-
-    /* Run the aio requests. */
-    mcb->num_requests = num_reqs;
-    for (i = 0; i < num_reqs; i++) {
-        bdrv_aio_writev(bs, reqs[i].sector, reqs[i].qiov,
-            reqs[i].nb_sectors, multiwrite_cb, mcb);
-    }
-
-    return 0;
-}
-
-void bdrv_aio_cancel(BlockDriverAIOCB *acb)
-{
-    acb->aiocb_info->cancel(acb);
-}
-
-/* block I/O throttling */
-static bool bdrv_exceed_bps_limits(BlockDriverState *bs, int nb_sectors,
-                 bool is_write, double elapsed_time, uint64_t *wait)
-{
-    uint64_t bps_limit = 0;
-    uint64_t extension;
-    double   bytes_limit, bytes_base, bytes_res;
-    double   slice_time, wait_time;
-
-    if (bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL]) {
-        bps_limit = bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL];
-    } else if (bs->io_limits.bps[is_write]) {
-        bps_limit = bs->io_limits.bps[is_write];
-    } else {
-        if (wait) {
-            *wait = 0;
-        }
-
-        return false;
-    }
-
-    slice_time = bs->slice_end - bs->slice_start;
-    slice_time /= (NANOSECONDS_PER_SECOND);
-    bytes_limit = bps_limit * slice_time;
-    bytes_base  = bs->slice_submitted.bytes[is_write];
-    if (bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL]) {
-        bytes_base += bs->slice_submitted.bytes[!is_write];
-    }
-
-    /* bytes_base: the bytes of data which have been read/written; and
-     *             it is obtained from the history statistic info.
-     * bytes_res: the remaining bytes of data which need to be read/written.
-     * (bytes_base + bytes_res) / bps_limit: used to calcuate
-     *             the total time for completing reading/writting all data.
-     */
-    bytes_res   = (unsigned) nb_sectors * BDRV_SECTOR_SIZE;
-
-    if (bytes_base + bytes_res <= bytes_limit) {
-        if (wait) {
-            *wait = 0;
-        }
-
-        return false;
-    }
-
-    /* Calc approx time to dispatch */
-    wait_time = (bytes_base + bytes_res) / bps_limit - elapsed_time;
-
-    /* When the I/O rate at runtime exceeds the limits,
-     * bs->slice_end need to be extended in order that the current statistic
-     * info can be kept until the timer fire, so it is increased and tuned
-     * based on the result of experiment.
-     */
-    extension = wait_time * NANOSECONDS_PER_SECOND;
-    extension = DIV_ROUND_UP(extension, BLOCK_IO_SLICE_TIME) *
-                BLOCK_IO_SLICE_TIME;
-    bs->slice_end += extension;
-    if (wait) {
-        *wait = wait_time * NANOSECONDS_PER_SECOND;
-    }
-
-    return true;
-}
-
-static bool bdrv_exceed_iops_limits(BlockDriverState *bs, bool is_write,
-                             double elapsed_time, uint64_t *wait)
-{
-    uint64_t iops_limit = 0;
-    double   ios_limit, ios_base;
-    double   slice_time, wait_time;
-
-    if (bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL]) {
-        iops_limit = bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL];
-    } else if (bs->io_limits.iops[is_write]) {
-        iops_limit = bs->io_limits.iops[is_write];
-    } else {
-        if (wait) {
-            *wait = 0;
-        }
-
-        return false;
-    }
-
-    slice_time = bs->slice_end - bs->slice_start;
-    slice_time /= (NANOSECONDS_PER_SECOND);
-    ios_limit  = iops_limit * slice_time;
-    ios_base   = bs->slice_submitted.ios[is_write];
-    if (bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL]) {
-        ios_base += bs->slice_submitted.ios[!is_write];
-    }
-
-    if (ios_base + 1 <= ios_limit) {
-        if (wait) {
-            *wait = 0;
-        }
-
-        return false;
-    }
-
-    /* Calc approx time to dispatch, in seconds */
-    wait_time = (ios_base + 1) / iops_limit;
-    if (wait_time > elapsed_time) {
-        wait_time = wait_time - elapsed_time;
-    } else {
-        wait_time = 0;
-    }
-
-    /* Exceeded current slice, extend it by another slice time */
-    bs->slice_end += BLOCK_IO_SLICE_TIME;
-    if (wait) {
-        *wait = wait_time * NANOSECONDS_PER_SECOND;
-    }
-
-    return true;
-}
-
-static bool bdrv_exceed_io_limits(BlockDriverState *bs, int nb_sectors,
-                           bool is_write, int64_t *wait)
-{
-    int64_t  now, max_wait;
-    uint64_t bps_wait = 0, iops_wait = 0;
-    double   elapsed_time;
-    int      bps_ret, iops_ret;
-
-    now = qemu_get_clock_ns(vm_clock);
-    if (now > bs->slice_end) {
-        bs->slice_start = now;
-        bs->slice_end   = now + BLOCK_IO_SLICE_TIME;
-        memset(&bs->slice_submitted, 0, sizeof(bs->slice_submitted));
-    }
-
-    elapsed_time  = now - bs->slice_start;
-    elapsed_time  /= (NANOSECONDS_PER_SECOND);
-
-    bps_ret  = bdrv_exceed_bps_limits(bs, nb_sectors,
-                                      is_write, elapsed_time, &bps_wait);
-    iops_ret = bdrv_exceed_iops_limits(bs, is_write,
-                                      elapsed_time, &iops_wait);
-    if (bps_ret || iops_ret) {
-        max_wait = bps_wait > iops_wait ? bps_wait : iops_wait;
-        if (wait) {
-            *wait = max_wait;
-        }
-
-        now = qemu_get_clock_ns(vm_clock);
-        if (bs->slice_end < now + max_wait) {
-            bs->slice_end = now + max_wait;
-        }
-
-        return true;
-    }
-
-    if (wait) {
-        *wait = 0;
-    }
-
-    bs->slice_submitted.bytes[is_write] += (int64_t)nb_sectors *
-                                           BDRV_SECTOR_SIZE;
-    bs->slice_submitted.ios[is_write]++;
-
-    return false;
-}
-
-/**************************************************************/
-/* async block device emulation */
-
-typedef struct BlockDriverAIOCBSync {
-    BlockDriverAIOCB common;
-    QEMUBH *bh;
-    int ret;
-    /* vector translation state */
-    QEMUIOVector *qiov;
-    uint8_t *bounce;
-    int is_write;
-} BlockDriverAIOCBSync;
-
-static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)
-{
-    BlockDriverAIOCBSync *acb =
-        container_of(blockacb, BlockDriverAIOCBSync, common);
-    qemu_bh_delete(acb->bh);
-    acb->bh = NULL;
-    qemu_aio_release(acb);
-}
-
-static const AIOCBInfo bdrv_em_aiocb_info = {
-    .aiocb_size         = sizeof(BlockDriverAIOCBSync),
-    .cancel             = bdrv_aio_cancel_em,
-};
-
-static void bdrv_aio_bh_cb(void *opaque)
-{
-    BlockDriverAIOCBSync *acb = opaque;
-
-    if (!acb->is_write)
-        qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);
-    qemu_vfree(acb->bounce);
-    acb->common.cb(acb->common.opaque, acb->ret);
-    qemu_bh_delete(acb->bh);
-    acb->bh = NULL;
-    qemu_aio_release(acb);
-}
-
-static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,
-                                            int64_t sector_num,
-                                            QEMUIOVector *qiov,
-                                            int nb_sectors,
-                                            BlockDriverCompletionFunc *cb,
-                                            void *opaque,
-                                            int is_write)
-
-{
-    BlockDriverAIOCBSync *acb;
-
-    acb = qemu_aio_get(&bdrv_em_aiocb_info, bs, cb, opaque);
-    acb->is_write = is_write;
-    acb->qiov = qiov;
-    acb->bounce = qemu_blockalign(bs, qiov->size);
-    acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb);
-
-    if (is_write) {
-        qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size);
-        acb->ret = bs->drv->bdrv_write(bs, sector_num, acb->bounce, nb_sectors);
-    } else {
-        acb->ret = bs->drv->bdrv_read(bs, sector_num, acb->bounce, nb_sectors);
-    }
-
-    qemu_bh_schedule(acb->bh);
-
-    return &acb->common;
-}
-
-static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs,
-        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    return bdrv_aio_rw_vector(bs, sector_num, qiov, nb_sectors, cb, opaque, 0);
-}
-
-static BlockDriverAIOCB *bdrv_aio_writev_em(BlockDriverState *bs,
-        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    return bdrv_aio_rw_vector(bs, sector_num, qiov, nb_sectors, cb, opaque, 1);
-}
-
-
-typedef struct BlockDriverAIOCBCoroutine {
-    BlockDriverAIOCB common;
-    BlockRequest req;
-    bool is_write;
-    bool *done;
-    QEMUBH* bh;
-} BlockDriverAIOCBCoroutine;
-
-static void bdrv_aio_co_cancel_em(BlockDriverAIOCB *blockacb)
-{
-    BlockDriverAIOCBCoroutine *acb =
-        container_of(blockacb, BlockDriverAIOCBCoroutine, common);
-    bool done = false;
-
-    acb->done = &done;
-    while (!done) {
-        qemu_aio_wait();
-    }
-}
-
-static const AIOCBInfo bdrv_em_co_aiocb_info = {
-    .aiocb_size         = sizeof(BlockDriverAIOCBCoroutine),
-    .cancel             = bdrv_aio_co_cancel_em,
-};
-
-static void bdrv_co_em_bh(void *opaque)
-{
-    BlockDriverAIOCBCoroutine *acb = opaque;
-
-    acb->common.cb(acb->common.opaque, acb->req.error);
-
-    if (acb->done) {
-        *acb->done = true;
-    }
-
-    qemu_bh_delete(acb->bh);
-    qemu_aio_release(acb);
-}
-
-/* Invoke bdrv_co_do_readv/bdrv_co_do_writev */
-static void coroutine_fn bdrv_co_do_rw(void *opaque)
-{
-    BlockDriverAIOCBCoroutine *acb = opaque;
-    BlockDriverState *bs = acb->common.bs;
-
-    if (!acb->is_write) {
-        acb->req.error = bdrv_co_do_readv(bs, acb->req.sector,
-            acb->req.nb_sectors, acb->req.qiov, 0);
-    } else {
-        acb->req.error = bdrv_co_do_writev(bs, acb->req.sector,
-            acb->req.nb_sectors, acb->req.qiov, 0);
-    }
-
-    acb->bh = qemu_bh_new(bdrv_co_em_bh, acb);
-    qemu_bh_schedule(acb->bh);
-}
-
-static BlockDriverAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs,
-                                               int64_t sector_num,
-                                               QEMUIOVector *qiov,
-                                               int nb_sectors,
-                                               BlockDriverCompletionFunc *cb,
-                                               void *opaque,
-                                               bool is_write)
-{
-    Coroutine *co;
-    BlockDriverAIOCBCoroutine *acb;
-
-    acb = qemu_aio_get(&bdrv_em_co_aiocb_info, bs, cb, opaque);
-    acb->req.sector = sector_num;
-    acb->req.nb_sectors = nb_sectors;
-    acb->req.qiov = qiov;
-    acb->is_write = is_write;
-    acb->done = NULL;
-
-    co = qemu_coroutine_create(bdrv_co_do_rw);
-    qemu_coroutine_enter(co, acb);
-
-    return &acb->common;
-}
-
-static void coroutine_fn bdrv_aio_flush_co_entry(void *opaque)
-{
-    BlockDriverAIOCBCoroutine *acb = opaque;
-    BlockDriverState *bs = acb->common.bs;
-
-    acb->req.error = bdrv_co_flush(bs);
-    acb->bh = qemu_bh_new(bdrv_co_em_bh, acb);
-    qemu_bh_schedule(acb->bh);
-}
-
-BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs,
-        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    trace_bdrv_aio_flush(bs, opaque);
-
-    Coroutine *co;
-    BlockDriverAIOCBCoroutine *acb;
-
-    acb = qemu_aio_get(&bdrv_em_co_aiocb_info, bs, cb, opaque);
-    acb->done = NULL;
-
-    co = qemu_coroutine_create(bdrv_aio_flush_co_entry);
-    qemu_coroutine_enter(co, acb);
-
-    return &acb->common;
-}
-
-static void coroutine_fn bdrv_aio_discard_co_entry(void *opaque)
-{
-    BlockDriverAIOCBCoroutine *acb = opaque;
-    BlockDriverState *bs = acb->common.bs;
-
-    acb->req.error = bdrv_co_discard(bs, acb->req.sector, acb->req.nb_sectors);
-    acb->bh = qemu_bh_new(bdrv_co_em_bh, acb);
-    qemu_bh_schedule(acb->bh);
-}
-
-BlockDriverAIOCB *bdrv_aio_discard(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    Coroutine *co;
-    BlockDriverAIOCBCoroutine *acb;
-
-    trace_bdrv_aio_discard(bs, sector_num, nb_sectors, opaque);
-
-    acb = qemu_aio_get(&bdrv_em_co_aiocb_info, bs, cb, opaque);
-    acb->req.sector = sector_num;
-    acb->req.nb_sectors = nb_sectors;
-    acb->done = NULL;
-    co = qemu_coroutine_create(bdrv_aio_discard_co_entry);
-    qemu_coroutine_enter(co, acb);
-
-    return &acb->common;
-}
-
-void bdrv_init(void)
-{
-    module_call_init(MODULE_INIT_BLOCK);
-}
-
-void bdrv_init_with_whitelist(void)
-{
-    use_bdrv_whitelist = 1;
-    bdrv_init();
-}
-
-void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,
-                   BlockDriverCompletionFunc *cb, void *opaque)
-{
-    BlockDriverAIOCB *acb;
-
-    acb = g_slice_alloc(aiocb_info->aiocb_size);
-    acb->aiocb_info = aiocb_info;
-    acb->bs = bs;
-    acb->cb = cb;
-    acb->opaque = opaque;
-    return acb;
-}
-
-void qemu_aio_release(void *p)
-{
-    BlockDriverAIOCB *acb = p;
-    g_slice_free1(acb->aiocb_info->aiocb_size, acb);
-}
-
-/**************************************************************/
-/* Coroutine block device emulation */
-
-typedef struct CoroutineIOCompletion {
-    Coroutine *coroutine;
-    int ret;
-} CoroutineIOCompletion;
-
-static void bdrv_co_io_em_complete(void *opaque, int ret)
-{
-    CoroutineIOCompletion *co = opaque;
-
-    co->ret = ret;
-    qemu_coroutine_enter(co->coroutine, NULL);
-}
-
-static int coroutine_fn bdrv_co_io_em(BlockDriverState *bs, int64_t sector_num,
-                                      int nb_sectors, QEMUIOVector *iov,
-                                      bool is_write)
-{
-    CoroutineIOCompletion co = {
-        .coroutine = qemu_coroutine_self(),
-    };
-    BlockDriverAIOCB *acb;
-
-    if (is_write) {
-        acb = bs->drv->bdrv_aio_writev(bs, sector_num, iov, nb_sectors,
-                                       bdrv_co_io_em_complete, &co);
-    } else {
-        acb = bs->drv->bdrv_aio_readv(bs, sector_num, iov, nb_sectors,
-                                      bdrv_co_io_em_complete, &co);
-    }
-
-    trace_bdrv_co_io_em(bs, sector_num, nb_sectors, is_write, acb);
-    if (!acb) {
-        return -EIO;
-    }
-    qemu_coroutine_yield();
-
-    return co.ret;
-}
-
-static int coroutine_fn bdrv_co_readv_em(BlockDriverState *bs,
-                                         int64_t sector_num, int nb_sectors,
-                                         QEMUIOVector *iov)
-{
-    return bdrv_co_io_em(bs, sector_num, nb_sectors, iov, false);
-}
-
-static int coroutine_fn bdrv_co_writev_em(BlockDriverState *bs,
-                                         int64_t sector_num, int nb_sectors,
-                                         QEMUIOVector *iov)
-{
-    return bdrv_co_io_em(bs, sector_num, nb_sectors, iov, true);
-}
-
-static void coroutine_fn bdrv_flush_co_entry(void *opaque)
-{
-    RwCo *rwco = opaque;
-
-    rwco->ret = bdrv_co_flush(rwco->bs);
-}
-
-int coroutine_fn bdrv_co_flush(BlockDriverState *bs)
-{
-    int ret;
-
-    if (!bs || !bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
-        return 0;
-    }
-
-    /* Write back cached data to the OS even with cache=unsafe */
-    BLKDBG_EVENT(bs->file, BLKDBG_FLUSH_TO_OS);
-    if (bs->drv->bdrv_co_flush_to_os) {
-        ret = bs->drv->bdrv_co_flush_to_os(bs);
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
-    /* But don't actually force it to the disk with cache=unsafe */
-    if (bs->open_flags & BDRV_O_NO_FLUSH) {
-        goto flush_parent;
-    }
-
-    BLKDBG_EVENT(bs->file, BLKDBG_FLUSH_TO_DISK);
-    if (bs->drv->bdrv_co_flush_to_disk) {
-        ret = bs->drv->bdrv_co_flush_to_disk(bs);
-    } else if (bs->drv->bdrv_aio_flush) {
-        BlockDriverAIOCB *acb;
-        CoroutineIOCompletion co = {
-            .coroutine = qemu_coroutine_self(),
-        };
-
-        acb = bs->drv->bdrv_aio_flush(bs, bdrv_co_io_em_complete, &co);
-        if (acb == NULL) {
-            ret = -EIO;
-        } else {
-            qemu_coroutine_yield();
-            ret = co.ret;
-        }
-    } else {
-        /*
-         * Some block drivers always operate in either writethrough or unsafe
-         * mode and don't support bdrv_flush therefore. Usually qemu doesn't
-         * know how the server works (because the behaviour is hardcoded or
-         * depends on server-side configuration), so we can't ensure that
-         * everything is safe on disk. Returning an error doesn't work because
-         * that would break guests even if the server operates in writethrough
-         * mode.
-         *
-         * Let's hope the user knows what he's doing.
-         */
-        ret = 0;
-    }
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* Now flush the underlying protocol.  It will also have BDRV_O_NO_FLUSH
-     * in the case of cache=unsafe, so there are no useless flushes.
-     */
-flush_parent:
-    return bdrv_co_flush(bs->file);
-}
-
-void bdrv_invalidate_cache(BlockDriverState *bs)
-{
-    if (bs->drv && bs->drv->bdrv_invalidate_cache) {
-        bs->drv->bdrv_invalidate_cache(bs);
-    }
-}
-
-void bdrv_invalidate_cache_all(void)
-{
-    BlockDriverState *bs;
-
-    QTAILQ_FOREACH(bs, &bdrv_states, list) {
-        bdrv_invalidate_cache(bs);
-    }
-}
-
-void bdrv_clear_incoming_migration_all(void)
-{
-    BlockDriverState *bs;
-
-    QTAILQ_FOREACH(bs, &bdrv_states, list) {
-        bs->open_flags = bs->open_flags & ~(BDRV_O_INCOMING);
-    }
-}
-
-int bdrv_flush(BlockDriverState *bs)
-{
-    Coroutine *co;
-    RwCo rwco = {
-        .bs = bs,
-        .ret = NOT_DONE,
-    };
-
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_flush_co_entry(&rwco);
-    } else {
-        co = qemu_coroutine_create(bdrv_flush_co_entry);
-        qemu_coroutine_enter(co, &rwco);
-        while (rwco.ret == NOT_DONE) {
-            qemu_aio_wait();
-        }
-    }
-
-    return rwco.ret;
-}
-
-static void coroutine_fn bdrv_discard_co_entry(void *opaque)
-{
-    RwCo *rwco = opaque;
-
-    rwco->ret = bdrv_co_discard(rwco->bs, rwco->sector_num, rwco->nb_sectors);
-}
-
-int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,
-                                 int nb_sectors)
-{
-    if (!bs->drv) {
-        return -ENOMEDIUM;
-    } else if (bdrv_check_request(bs, sector_num, nb_sectors)) {
-        return -EIO;
-    } else if (bs->read_only) {
-        return -EROFS;
-    }
-
-    if (bs->dirty_bitmap) {
-        bdrv_reset_dirty(bs, sector_num, nb_sectors);
-    }
-
-    /* Do nothing if disabled.  */
-    if (!(bs->open_flags & BDRV_O_UNMAP)) {
-        return 0;
-    }
-
-    if (bs->drv->bdrv_co_discard) {
-        return bs->drv->bdrv_co_discard(bs, sector_num, nb_sectors);
-    } else if (bs->drv->bdrv_aio_discard) {
-        BlockDriverAIOCB *acb;
-        CoroutineIOCompletion co = {
-            .coroutine = qemu_coroutine_self(),
-        };
-
-        acb = bs->drv->bdrv_aio_discard(bs, sector_num, nb_sectors,
-                                        bdrv_co_io_em_complete, &co);
-        if (acb == NULL) {
-            return -EIO;
-        } else {
-            qemu_coroutine_yield();
-            return co.ret;
-        }
-    } else {
-        return 0;
-    }
-}
-
-int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors)
-{
-    Coroutine *co;
-    RwCo rwco = {
-        .bs = bs,
-        .sector_num = sector_num,
-        .nb_sectors = nb_sectors,
-        .ret = NOT_DONE,
-    };
-
-    if (qemu_in_coroutine()) {
-        /* Fast-path if already in coroutine context */
-        bdrv_discard_co_entry(&rwco);
-    } else {
-        co = qemu_coroutine_create(bdrv_discard_co_entry);
-        qemu_coroutine_enter(co, &rwco);
-        while (rwco.ret == NOT_DONE) {
-            qemu_aio_wait();
-        }
-    }
-
-    return rwco.ret;
-}
-
-/**************************************************************/
-/* removable device support */
-
-/**
- * Return TRUE if the media is present
- */
-int bdrv_is_inserted(BlockDriverState *bs)
-{
-    BlockDriver *drv = bs->drv;
-
-    if (!drv)
-        return 0;
-    if (!drv->bdrv_is_inserted)
-        return 1;
-    return drv->bdrv_is_inserted(bs);
-}
-
-/**
- * Return whether the media changed since the last call to this
- * function, or -ENOTSUP if we don't know.  Most drivers don't know.
- */
-int bdrv_media_changed(BlockDriverState *bs)
-{
-    BlockDriver *drv = bs->drv;
-
-    if (drv && drv->bdrv_media_changed) {
-        return drv->bdrv_media_changed(bs);
-    }
-    return -ENOTSUP;
-}
-
-/**
- * If eject_flag is TRUE, eject the media. Otherwise, close the tray
- */
-void bdrv_eject(BlockDriverState *bs, bool eject_flag)
-{
-    BlockDriver *drv = bs->drv;
-
-    if (drv && drv->bdrv_eject) {
-        drv->bdrv_eject(bs, eject_flag);
-    }
-
-    if (bs->device_name[0] != '\0') {
-        bdrv_emit_qmp_eject_event(bs, eject_flag);
-    }
-}
-
-/**
- * Lock or unlock the media (if it is locked, the user won't be able
- * to eject it manually).
- */
-void bdrv_lock_medium(BlockDriverState *bs, bool locked)
-{
-    BlockDriver *drv = bs->drv;
-
-    trace_bdrv_lock_medium(bs, locked);
-
-    if (drv && drv->bdrv_lock_medium) {
-        drv->bdrv_lock_medium(bs, locked);
-    }
-}
-
-/* needed for generic scsi interface */
-
-int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
-{
-    BlockDriver *drv = bs->drv;
-
-    if (drv && drv->bdrv_ioctl)
-        return drv->bdrv_ioctl(bs, req, buf);
-    return -ENOTSUP;
-}
-
-BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs,
-        unsigned long int req, void *buf,
-        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    BlockDriver *drv = bs->drv;
-
-    if (drv && drv->bdrv_aio_ioctl)
-        return drv->bdrv_aio_ioctl(bs, req, buf, cb, opaque);
-    return NULL;
-}
-
-void bdrv_set_buffer_alignment(BlockDriverState *bs, int align)
-{
-    bs->buffer_alignment = align;
-}
-
-void *qemu_blockalign(BlockDriverState *bs, size_t size)
-{
-    return qemu_memalign((bs && bs->buffer_alignment) ? bs->buffer_alignment : 512, size);
-}
-
-/*
- * Check if all memory in this vector is sector aligned.
- */
-bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov)
-{
-    int i;
-
-    for (i = 0; i < qiov->niov; i++) {
-        if ((uintptr_t) qiov->iov[i].iov_base % bs->buffer_alignment) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void bdrv_set_dirty_tracking(BlockDriverState *bs, int granularity)
-{
-    int64_t bitmap_size;
-
-    assert((granularity & (granularity - 1)) == 0);
-
-    if (granularity) {
-        granularity >>= BDRV_SECTOR_BITS;
-        assert(!bs->dirty_bitmap);
-        bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS);
-        bs->dirty_bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1);
-    } else {
-        if (bs->dirty_bitmap) {
-            hbitmap_free(bs->dirty_bitmap);
-            bs->dirty_bitmap = NULL;
-        }
-    }
-}
-
-int bdrv_get_dirty(BlockDriverState *bs, int64_t sector)
-{
-    if (bs->dirty_bitmap) {
-        return hbitmap_get(bs->dirty_bitmap, sector);
-    } else {
-        return 0;
-    }
-}
-
-void bdrv_dirty_iter_init(BlockDriverState *bs, HBitmapIter *hbi)
-{
-    hbitmap_iter_init(hbi, bs->dirty_bitmap, 0);
-}
-
-void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector,
-                    int nr_sectors)
-{
-    hbitmap_set(bs->dirty_bitmap, cur_sector, nr_sectors);
-}
-
-void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector,
-                      int nr_sectors)
-{
-    hbitmap_reset(bs->dirty_bitmap, cur_sector, nr_sectors);
-}
-
-int64_t bdrv_get_dirty_count(BlockDriverState *bs)
-{
-    if (bs->dirty_bitmap) {
-        return hbitmap_count(bs->dirty_bitmap);
-    } else {
-        return 0;
-    }
-}
-
-void bdrv_set_in_use(BlockDriverState *bs, int in_use)
-{
-    assert(bs->in_use != in_use);
-    bs->in_use = in_use;
-}
-
-int bdrv_in_use(BlockDriverState *bs)
-{
-    return bs->in_use;
-}
-
-void bdrv_iostatus_enable(BlockDriverState *bs)
-{
-    bs->iostatus_enabled = true;
-    bs->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
-}
-
-/* The I/O status is only enabled if the drive explicitly
- * enables it _and_ the VM is configured to stop on errors */
-bool bdrv_iostatus_is_enabled(const BlockDriverState *bs)
-{
-    return (bs->iostatus_enabled &&
-           (bs->on_write_error == BLOCKDEV_ON_ERROR_ENOSPC ||
-            bs->on_write_error == BLOCKDEV_ON_ERROR_STOP   ||
-            bs->on_read_error == BLOCKDEV_ON_ERROR_STOP));
-}
-
-void bdrv_iostatus_disable(BlockDriverState *bs)
-{
-    bs->iostatus_enabled = false;
-}
-
-void bdrv_iostatus_reset(BlockDriverState *bs)
-{
-    if (bdrv_iostatus_is_enabled(bs)) {
-        bs->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
-        if (bs->job) {
-            block_job_iostatus_reset(bs->job);
-        }
-    }
-}
-
-void bdrv_iostatus_set_err(BlockDriverState *bs, int error)
-{
-    assert(bdrv_iostatus_is_enabled(bs));
-    if (bs->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
-        bs->iostatus = error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE :
-                                         BLOCK_DEVICE_IO_STATUS_FAILED;
-    }
-}
-
-void
-bdrv_acct_start(BlockDriverState *bs, BlockAcctCookie *cookie, int64_t bytes,
-        enum BlockAcctType type)
-{
-    assert(type < BDRV_MAX_IOTYPE);
-
-    cookie->bytes = bytes;
-    cookie->start_time_ns = get_clock();
-    cookie->type = type;
-}
-
-void
-bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie)
-{
-    assert(cookie->type < BDRV_MAX_IOTYPE);
-
-    bs->nr_bytes[cookie->type] += cookie->bytes;
-    bs->nr_ops[cookie->type]++;
-    bs->total_time_ns[cookie->type] += get_clock() - cookie->start_time_ns;
-}
-
-void bdrv_img_create(const char *filename, const char *fmt,
-                     const char *base_filename, const char *base_fmt,
-                     char *options, uint64_t img_size, int flags,
-                     Error **errp, bool quiet)
-{
-    QEMUOptionParameter *param = NULL, *create_options = NULL;
-    QEMUOptionParameter *backing_fmt, *backing_file, *size;
-    BlockDriverState *bs = NULL;
-    BlockDriver *drv, *proto_drv;
-    BlockDriver *backing_drv = NULL;
-    int ret = 0;
-
-    /* Find driver and parse its options */
-    drv = bdrv_find_format(fmt);
-    if (!drv) {
-        error_setg(errp, "Unknown file format '%s'", fmt);
-        return;
-    }
-
-    proto_drv = bdrv_find_protocol(filename, true);
-    if (!proto_drv) {
-        error_setg(errp, "Unknown protocol '%s'", filename);
-        return;
-    }
-
-    create_options = append_option_parameters(create_options,
-                                              drv->create_options);
-    create_options = append_option_parameters(create_options,
-                                              proto_drv->create_options);
-
-    /* Create parameter list with default values */
-    param = parse_option_parameters("", create_options, param);
-
-    set_option_parameter_int(param, BLOCK_OPT_SIZE, img_size);
-
-    /* Parse -o options */
-    if (options) {
-        param = parse_option_parameters(options, create_options, param);
-        if (param == NULL) {
-            error_setg(errp, "Invalid options for file format '%s'.", fmt);
-            goto out;
-        }
-    }
-
-    if (base_filename) {
-        if (set_option_parameter(param, BLOCK_OPT_BACKING_FILE,
-                                 base_filename)) {
-            error_setg(errp, "Backing file not supported for file format '%s'",
-                       fmt);
-            goto out;
-        }
-    }
-
-    if (base_fmt) {
-        if (set_option_parameter(param, BLOCK_OPT_BACKING_FMT, base_fmt)) {
-            error_setg(errp, "Backing file format not supported for file "
-                             "format '%s'", fmt);
-            goto out;
-        }
-    }
-
-    backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE);
-    if (backing_file && backing_file->value.s) {
-        if (!strcmp(filename, backing_file->value.s)) {
-            error_setg(errp, "Error: Trying to create an image with the "
-                             "same filename as the backing file");
-            goto out;
-        }
-    }
-
-    backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT);
-    if (backing_fmt && backing_fmt->value.s) {
-        backing_drv = bdrv_find_format(backing_fmt->value.s);
-        if (!backing_drv) {
-            error_setg(errp, "Unknown backing file format '%s'",
-                       backing_fmt->value.s);
-            goto out;
-        }
-    }
-
-    // The size for the image must always be specified, with one exception:
-    // If we are using a backing file, we can obtain the size from there
-    size = get_option_parameter(param, BLOCK_OPT_SIZE);
-    if (size && size->value.n == -1) {
-        if (backing_file && backing_file->value.s) {
-            uint64_t size;
-            char buf[32];
-            int back_flags;
-
-            /* backing files always opened read-only */
-            back_flags =
-                flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING);
-
-            bs = bdrv_new("");
-
-            ret = bdrv_open(bs, backing_file->value.s, NULL, back_flags,
-                            backing_drv);
-            if (ret < 0) {
-                error_setg_errno(errp, -ret, "Could not open '%s'",
-                                 backing_file->value.s);
-                goto out;
-            }
-            bdrv_get_geometry(bs, &size);
-            size *= 512;
-
-            snprintf(buf, sizeof(buf), "%" PRId64, size);
-            set_option_parameter(param, BLOCK_OPT_SIZE, buf);
-        } else {
-            error_setg(errp, "Image creation needs a size parameter");
-            goto out;
-        }
-    }
-
-    if (!quiet) {
-        printf("Formatting '%s', fmt=%s ", filename, fmt);
-        print_option_parameters(param);
-        puts("");
-    }
-    ret = bdrv_create(drv, filename, param);
-    if (ret < 0) {
-        if (ret == -ENOTSUP) {
-            error_setg(errp,"Formatting or formatting option not supported for "
-                            "file format '%s'", fmt);
-        } else if (ret == -EFBIG) {
-            const char *cluster_size_hint = "";
-            if (get_option_parameter(create_options, BLOCK_OPT_CLUSTER_SIZE)) {
-                cluster_size_hint = " (try using a larger cluster size)";
-            }
-            error_setg(errp, "The image size is too large for file format '%s'%s",
-                       fmt, cluster_size_hint);
-        } else {
-            error_setg(errp, "%s: error while creating %s: %s", filename, fmt,
-                       strerror(-ret));
-        }
-    }
-
-out:
-    free_option_parameters(create_options);
-    free_option_parameters(param);
-
-    if (bs) {
-        bdrv_delete(bs);
-    }
-}
-
-AioContext *bdrv_get_aio_context(BlockDriverState *bs)
-{
-    /* Currently BlockDriverState always uses the main loop AioContext */
-    return qemu_get_aio_context();
-}
-
-void bdrv_add_before_write_notifier(BlockDriverState *bs,
-                                    NotifierWithReturn *notifier)
-{
-    notifier_with_return_list_add(&bs->before_write_notifiers, notifier);
-}
diff --git a/contrib/qemu/block/qcow.c b/contrib/qemu/block/qcow.c
deleted file mode 100644
index 5239bd68f..000000000
--- a/contrib/qemu/block/qcow.c
+++ /dev/null
@@ -1,914 +0,0 @@
-/*
- * Block driver for the QCOW format
- *
- * Copyright (c) 2004-2006 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#include "qemu-common.h"
-#include "block/block_int.h"
-#include "qemu/module.h"
-#include <zlib.h>
-#include "qemu/aes.h"
-#include "migration/migration.h"
-
-/**************************************************************/
-/* QEMU COW block driver with compression and encryption support */
-
-#define QCOW_MAGIC (('Q' << 24) | ('F' << 16) | ('I' << 8) | 0xfb)
-#define QCOW_VERSION 1
-
-#define QCOW_CRYPT_NONE 0
-#define QCOW_CRYPT_AES  1
-
-#define QCOW_OFLAG_COMPRESSED (1LL << 63)
-
-typedef struct QCowHeader {
-    uint32_t magic;
-    uint32_t version;
-    uint64_t backing_file_offset;
-    uint32_t backing_file_size;
-    uint32_t mtime;
-    uint64_t size; /* in bytes */
-    uint8_t cluster_bits;
-    uint8_t l2_bits;
-    uint32_t crypt_method;
-    uint64_t l1_table_offset;
-} QCowHeader;
-
-#define L2_CACHE_SIZE 16
-
-typedef struct BDRVQcowState {
-    int cluster_bits;
-    int cluster_size;
-    int cluster_sectors;
-    int l2_bits;
-    int l2_size;
-    int l1_size;
-    uint64_t cluster_offset_mask;
-    uint64_t l1_table_offset;
-    uint64_t *l1_table;
-    uint64_t *l2_cache;
-    uint64_t l2_cache_offsets[L2_CACHE_SIZE];
-    uint32_t l2_cache_counts[L2_CACHE_SIZE];
-    uint8_t *cluster_cache;
-    uint8_t *cluster_data;
-    uint64_t cluster_cache_offset;
-    uint32_t crypt_method; /* current crypt method, 0 if no key yet */
-    uint32_t crypt_method_header;
-    AES_KEY aes_encrypt_key;
-    AES_KEY aes_decrypt_key;
-    CoMutex lock;
-    Error *migration_blocker;
-} BDRVQcowState;
-
-static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset);
-
-static int qcow_probe(const uint8_t *buf, int buf_size, const char *filename)
-{
-    const QCowHeader *cow_header = (const void *)buf;
-
-    if (buf_size >= sizeof(QCowHeader) &&
-        be32_to_cpu(cow_header->magic) == QCOW_MAGIC &&
-        be32_to_cpu(cow_header->version) == QCOW_VERSION)
-        return 100;
-    else
-        return 0;
-}
-
-static int qcow_open(BlockDriverState *bs, QDict *options, int flags)
-{
-    BDRVQcowState *s = bs->opaque;
-    int len, i, shift, ret;
-    QCowHeader header;
-
-    ret = bdrv_pread(bs->file, 0, &header, sizeof(header));
-    if (ret < 0) {
-        goto fail;
-    }
-    be32_to_cpus(&header.magic);
-    be32_to_cpus(&header.version);
-    be64_to_cpus(&header.backing_file_offset);
-    be32_to_cpus(&header.backing_file_size);
-    be32_to_cpus(&header.mtime);
-    be64_to_cpus(&header.size);
-    be32_to_cpus(&header.crypt_method);
-    be64_to_cpus(&header.l1_table_offset);
-
-    if (header.magic != QCOW_MAGIC) {
-        ret = -EMEDIUMTYPE;
-        goto fail;
-    }
-    if (header.version != QCOW_VERSION) {
-        char version[64];
-        snprintf(version, sizeof(version), "QCOW version %d", header.version);
-        qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
-            bs->device_name, "qcow", version);
-        ret = -ENOTSUP;
-        goto fail;
-    }
-
-    if (header.size <= 1 || header.cluster_bits < 9) {
-        ret = -EINVAL;
-        goto fail;
-    }
-    if (header.crypt_method > QCOW_CRYPT_AES) {
-        ret = -EINVAL;
-        goto fail;
-    }
-    s->crypt_method_header = header.crypt_method;
-    if (s->crypt_method_header) {
-        bs->encrypted = 1;
-    }
-    s->cluster_bits = header.cluster_bits;
-    s->cluster_size = 1 << s->cluster_bits;
-    s->cluster_sectors = 1 << (s->cluster_bits - 9);
-    s->l2_bits = header.l2_bits;
-    s->l2_size = 1 << s->l2_bits;
-    bs->total_sectors = header.size / 512;
-    s->cluster_offset_mask = (1LL << (63 - s->cluster_bits)) - 1;
-
-    /* read the level 1 table */
-    shift = s->cluster_bits + s->l2_bits;
-    s->l1_size = (header.size + (1LL << shift) - 1) >> shift;
-
-    s->l1_table_offset = header.l1_table_offset;
-    s->l1_table = g_malloc(s->l1_size * sizeof(uint64_t));
-
-    ret = bdrv_pread(bs->file, s->l1_table_offset, s->l1_table,
-               s->l1_size * sizeof(uint64_t));
-    if (ret < 0) {
-        goto fail;
-    }
-
-    for(i = 0;i < s->l1_size; i++) {
-        be64_to_cpus(&s->l1_table[i]);
-    }
-    /* alloc L2 cache */
-    s->l2_cache = g_malloc(s->l2_size * L2_CACHE_SIZE * sizeof(uint64_t));
-    s->cluster_cache = g_malloc(s->cluster_size);
-    s->cluster_data = g_malloc(s->cluster_size);
-    s->cluster_cache_offset = -1;
-
-    /* read the backing file name */
-    if (header.backing_file_offset != 0) {
-        len = header.backing_file_size;
-        if (len > 1023) {
-            len = 1023;
-        }
-        ret = bdrv_pread(bs->file, header.backing_file_offset,
-                   bs->backing_file, len);
-        if (ret < 0) {
-            goto fail;
-        }
-        bs->backing_file[len] = '\0';
-    }
-
-    /* Disable migration when qcow images are used */
-    error_set(&s->migration_blocker,
-              QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
-              "qcow", bs->device_name, "live migration");
-    migrate_add_blocker(s->migration_blocker);
-
-    qemu_co_mutex_init(&s->lock);
-    return 0;
-
- fail:
-    g_free(s->l1_table);
-    g_free(s->l2_cache);
-    g_free(s->cluster_cache);
-    g_free(s->cluster_data);
-    return ret;
-}
-
-
-/* We have nothing to do for QCOW reopen, stubs just return
- * success */
-static int qcow_reopen_prepare(BDRVReopenState *state,
-                               BlockReopenQueue *queue, Error **errp)
-{
-    return 0;
-}
-
-static int qcow_set_key(BlockDriverState *bs, const char *key)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint8_t keybuf[16];
-    int len, i;
-
-    memset(keybuf, 0, 16);
-    len = strlen(key);
-    if (len > 16)
-        len = 16;
-    /* XXX: we could compress the chars to 7 bits to increase
-       entropy */
-    for(i = 0;i < len;i++) {
-        keybuf[i] = key[i];
-    }
-    s->crypt_method = s->crypt_method_header;
-
-    if (AES_set_encrypt_key(keybuf, 128, &s->aes_encrypt_key) != 0)
-        return -1;
-    if (AES_set_decrypt_key(keybuf, 128, &s->aes_decrypt_key) != 0)
-        return -1;
-    return 0;
-}
-
-/* The crypt function is compatible with the linux cryptoloop
-   algorithm for < 4 GB images. NOTE: out_buf == in_buf is
-   supported */
-static void encrypt_sectors(BDRVQcowState *s, int64_t sector_num,
-                            uint8_t *out_buf, const uint8_t *in_buf,
-                            int nb_sectors, int enc,
-                            const AES_KEY *key)
-{
-    union {
-        uint64_t ll[2];
-        uint8_t b[16];
-    } ivec;
-    int i;
-
-    for(i = 0; i < nb_sectors; i++) {
-        ivec.ll[0] = cpu_to_le64(sector_num);
-        ivec.ll[1] = 0;
-        AES_cbc_encrypt(in_buf, out_buf, 512, key,
-                        ivec.b, enc);
-        sector_num++;
-        in_buf += 512;
-        out_buf += 512;
-    }
-}
-
-/* 'allocate' is:
- *
- * 0 to not allocate.
- *
- * 1 to allocate a normal cluster (for sector indexes 'n_start' to
- * 'n_end')
- *
- * 2 to allocate a compressed cluster of size
- * 'compressed_size'. 'compressed_size' must be > 0 and <
- * cluster_size
- *
- * return 0 if not allocated.
- */
-static uint64_t get_cluster_offset(BlockDriverState *bs,
-                                   uint64_t offset, int allocate,
-                                   int compressed_size,
-                                   int n_start, int n_end)
-{
-    BDRVQcowState *s = bs->opaque;
-    int min_index, i, j, l1_index, l2_index;
-    uint64_t l2_offset, *l2_table, cluster_offset, tmp;
-    uint32_t min_count;
-    int new_l2_table;
-
-    l1_index = offset >> (s->l2_bits + s->cluster_bits);
-    l2_offset = s->l1_table[l1_index];
-    new_l2_table = 0;
-    if (!l2_offset) {
-        if (!allocate)
-            return 0;
-        /* allocate a new l2 entry */
-        l2_offset = bdrv_getlength(bs->file);
-        /* round to cluster size */
-        l2_offset = (l2_offset + s->cluster_size - 1) & ~(s->cluster_size - 1);
-        /* update the L1 entry */
-        s->l1_table[l1_index] = l2_offset;
-        tmp = cpu_to_be64(l2_offset);
-        if (bdrv_pwrite_sync(bs->file,
-                s->l1_table_offset + l1_index * sizeof(tmp),
-                &tmp, sizeof(tmp)) < 0)
-            return 0;
-        new_l2_table = 1;
-    }
-    for(i = 0; i < L2_CACHE_SIZE; i++) {
-        if (l2_offset == s->l2_cache_offsets[i]) {
-            /* increment the hit count */
-            if (++s->l2_cache_counts[i] == 0xffffffff) {
-                for(j = 0; j < L2_CACHE_SIZE; j++) {
-                    s->l2_cache_counts[j] >>= 1;
-                }
-            }
-            l2_table = s->l2_cache + (i << s->l2_bits);
-            goto found;
-        }
-    }
-    /* not found: load a new entry in the least used one */
-    min_index = 0;
-    min_count = 0xffffffff;
-    for(i = 0; i < L2_CACHE_SIZE; i++) {
-        if (s->l2_cache_counts[i] < min_count) {
-            min_count = s->l2_cache_counts[i];
-            min_index = i;
-        }
-    }
-    l2_table = s->l2_cache + (min_index << s->l2_bits);
-    if (new_l2_table) {
-        memset(l2_table, 0, s->l2_size * sizeof(uint64_t));
-        if (bdrv_pwrite_sync(bs->file, l2_offset, l2_table,
-                s->l2_size * sizeof(uint64_t)) < 0)
-            return 0;
-    } else {
-        if (bdrv_pread(bs->file, l2_offset, l2_table, s->l2_size * sizeof(uint64_t)) !=
-            s->l2_size * sizeof(uint64_t))
-            return 0;
-    }
-    s->l2_cache_offsets[min_index] = l2_offset;
-    s->l2_cache_counts[min_index] = 1;
- found:
-    l2_index = (offset >> s->cluster_bits) & (s->l2_size - 1);
-    cluster_offset = be64_to_cpu(l2_table[l2_index]);
-    if (!cluster_offset ||
-        ((cluster_offset & QCOW_OFLAG_COMPRESSED) && allocate == 1)) {
-        if (!allocate)
-            return 0;
-        /* allocate a new cluster */
-        if ((cluster_offset & QCOW_OFLAG_COMPRESSED) &&
-            (n_end - n_start) < s->cluster_sectors) {
-            /* if the cluster is already compressed, we must
-               decompress it in the case it is not completely
-               overwritten */
-            if (decompress_cluster(bs, cluster_offset) < 0)
-                return 0;
-            cluster_offset = bdrv_getlength(bs->file);
-            cluster_offset = (cluster_offset + s->cluster_size - 1) &
-                ~(s->cluster_size - 1);
-            /* write the cluster content */
-            if (bdrv_pwrite(bs->file, cluster_offset, s->cluster_cache, s->cluster_size) !=
-                s->cluster_size)
-                return -1;
-        } else {
-            cluster_offset = bdrv_getlength(bs->file);
-            if (allocate == 1) {
-                /* round to cluster size */
-                cluster_offset = (cluster_offset + s->cluster_size - 1) &
-                    ~(s->cluster_size - 1);
-                bdrv_truncate(bs->file, cluster_offset + s->cluster_size);
-                /* if encrypted, we must initialize the cluster
-                   content which won't be written */
-                if (s->crypt_method &&
-                    (n_end - n_start) < s->cluster_sectors) {
-                    uint64_t start_sect;
-                    start_sect = (offset & ~(s->cluster_size - 1)) >> 9;
-                    memset(s->cluster_data + 512, 0x00, 512);
-                    for(i = 0; i < s->cluster_sectors; i++) {
-                        if (i < n_start || i >= n_end) {
-                            encrypt_sectors(s, start_sect + i,
-                                            s->cluster_data,
-                                            s->cluster_data + 512, 1, 1,
-                                            &s->aes_encrypt_key);
-                            if (bdrv_pwrite(bs->file, cluster_offset + i * 512,
-                                            s->cluster_data, 512) != 512)
-                                return -1;
-                        }
-                    }
-                }
-            } else if (allocate == 2) {
-                cluster_offset |= QCOW_OFLAG_COMPRESSED |
-                    (uint64_t)compressed_size << (63 - s->cluster_bits);
-            }
-        }
-        /* update L2 table */
-        tmp = cpu_to_be64(cluster_offset);
-        l2_table[l2_index] = tmp;
-        if (bdrv_pwrite_sync(bs->file, l2_offset + l2_index * sizeof(tmp),
-                &tmp, sizeof(tmp)) < 0)
-            return 0;
-    }
-    return cluster_offset;
-}
-
-static int coroutine_fn qcow_co_is_allocated(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors, int *pnum)
-{
-    BDRVQcowState *s = bs->opaque;
-    int index_in_cluster, n;
-    uint64_t cluster_offset;
-
-    qemu_co_mutex_lock(&s->lock);
-    cluster_offset = get_cluster_offset(bs, sector_num << 9, 0, 0, 0, 0);
-    qemu_co_mutex_unlock(&s->lock);
-    index_in_cluster = sector_num & (s->cluster_sectors - 1);
-    n = s->cluster_sectors - index_in_cluster;
-    if (n > nb_sectors)
-        n = nb_sectors;
-    *pnum = n;
-    return (cluster_offset != 0);
-}
-
-static int decompress_buffer(uint8_t *out_buf, int out_buf_size,
-                             const uint8_t *buf, int buf_size)
-{
-    z_stream strm1, *strm = &strm1;
-    int ret, out_len;
-
-    memset(strm, 0, sizeof(*strm));
-
-    strm->next_in = (uint8_t *)buf;
-    strm->avail_in = buf_size;
-    strm->next_out = out_buf;
-    strm->avail_out = out_buf_size;
-
-    ret = inflateInit2(strm, -12);
-    if (ret != Z_OK)
-        return -1;
-    ret = inflate(strm, Z_FINISH);
-    out_len = strm->next_out - out_buf;
-    if ((ret != Z_STREAM_END && ret != Z_BUF_ERROR) ||
-        out_len != out_buf_size) {
-        inflateEnd(strm);
-        return -1;
-    }
-    inflateEnd(strm);
-    return 0;
-}
-
-static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret, csize;
-    uint64_t coffset;
-
-    coffset = cluster_offset & s->cluster_offset_mask;
-    if (s->cluster_cache_offset != coffset) {
-        csize = cluster_offset >> (63 - s->cluster_bits);
-        csize &= (s->cluster_size - 1);
-        ret = bdrv_pread(bs->file, coffset, s->cluster_data, csize);
-        if (ret != csize)
-            return -1;
-        if (decompress_buffer(s->cluster_cache, s->cluster_size,
-                              s->cluster_data, csize) < 0) {
-            return -1;
-        }
-        s->cluster_cache_offset = coffset;
-    }
-    return 0;
-}
-
-static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
-                         int nb_sectors, QEMUIOVector *qiov)
-{
-    BDRVQcowState *s = bs->opaque;
-    int index_in_cluster;
-    int ret = 0, n;
-    uint64_t cluster_offset;
-    struct iovec hd_iov;
-    QEMUIOVector hd_qiov;
-    uint8_t *buf;
-    void *orig_buf;
-
-    if (qiov->niov > 1) {
-        buf = orig_buf = qemu_blockalign(bs, qiov->size);
-    } else {
-        orig_buf = NULL;
-        buf = (uint8_t *)qiov->iov->iov_base;
-    }
-
-    qemu_co_mutex_lock(&s->lock);
-
-    while (nb_sectors != 0) {
-        /* prepare next request */
-        cluster_offset = get_cluster_offset(bs, sector_num << 9,
-                                                 0, 0, 0, 0);
-        index_in_cluster = sector_num & (s->cluster_sectors - 1);
-        n = s->cluster_sectors - index_in_cluster;
-        if (n > nb_sectors) {
-            n = nb_sectors;
-        }
-
-        if (!cluster_offset) {
-            if (bs->backing_hd) {
-                /* read from the base image */
-                hd_iov.iov_base = (void *)buf;
-                hd_iov.iov_len = n * 512;
-                qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
-                qemu_co_mutex_unlock(&s->lock);
-                ret = bdrv_co_readv(bs->backing_hd, sector_num,
-                                    n, &hd_qiov);
-                qemu_co_mutex_lock(&s->lock);
-                if (ret < 0) {
-                    goto fail;
-                }
-            } else {
-                /* Note: in this case, no need to wait */
-                memset(buf, 0, 512 * n);
-            }
-        } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) {
-            /* add AIO support for compressed blocks ? */
-            if (decompress_cluster(bs, cluster_offset) < 0) {
-                goto fail;
-            }
-            memcpy(buf,
-                   s->cluster_cache + index_in_cluster * 512, 512 * n);
-        } else {
-            if ((cluster_offset & 511) != 0) {
-                goto fail;
-            }
-            hd_iov.iov_base = (void *)buf;
-            hd_iov.iov_len = n * 512;
-            qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
-            qemu_co_mutex_unlock(&s->lock);
-            ret = bdrv_co_readv(bs->file,
-                                (cluster_offset >> 9) + index_in_cluster,
-                                n, &hd_qiov);
-            qemu_co_mutex_lock(&s->lock);
-            if (ret < 0) {
-                break;
-            }
-            if (s->crypt_method) {
-                encrypt_sectors(s, sector_num, buf, buf,
-                                n, 0,
-                                &s->aes_decrypt_key);
-            }
-        }
-        ret = 0;
-
-        nb_sectors -= n;
-        sector_num += n;
-        buf += n * 512;
-    }
-
-done:
-    qemu_co_mutex_unlock(&s->lock);
-
-    if (qiov->niov > 1) {
-        qemu_iovec_from_buf(qiov, 0, orig_buf, qiov->size);
-        qemu_vfree(orig_buf);
-    }
-
-    return ret;
-
-fail:
-    ret = -EIO;
-    goto done;
-}
-
-static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
-                          int nb_sectors, QEMUIOVector *qiov)
-{
-    BDRVQcowState *s = bs->opaque;
-    int index_in_cluster;
-    uint64_t cluster_offset;
-    const uint8_t *src_buf;
-    int ret = 0, n;
-    uint8_t *cluster_data = NULL;
-    struct iovec hd_iov;
-    QEMUIOVector hd_qiov;
-    uint8_t *buf;
-    void *orig_buf;
-
-    s->cluster_cache_offset = -1; /* disable compressed cache */
-
-    if (qiov->niov > 1) {
-        buf = orig_buf = qemu_blockalign(bs, qiov->size);
-        qemu_iovec_to_buf(qiov, 0, buf, qiov->size);
-    } else {
-        orig_buf = NULL;
-        buf = (uint8_t *)qiov->iov->iov_base;
-    }
-
-    qemu_co_mutex_lock(&s->lock);
-
-    while (nb_sectors != 0) {
-
-        index_in_cluster = sector_num & (s->cluster_sectors - 1);
-        n = s->cluster_sectors - index_in_cluster;
-        if (n > nb_sectors) {
-            n = nb_sectors;
-        }
-        cluster_offset = get_cluster_offset(bs, sector_num << 9, 1, 0,
-                                            index_in_cluster,
-                                            index_in_cluster + n);
-        if (!cluster_offset || (cluster_offset & 511) != 0) {
-            ret = -EIO;
-            break;
-        }
-        if (s->crypt_method) {
-            if (!cluster_data) {
-                cluster_data = g_malloc0(s->cluster_size);
-            }
-            encrypt_sectors(s, sector_num, cluster_data, buf,
-                            n, 1, &s->aes_encrypt_key);
-            src_buf = cluster_data;
-        } else {
-            src_buf = buf;
-        }
-
-        hd_iov.iov_base = (void *)src_buf;
-        hd_iov.iov_len = n * 512;
-        qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
-        qemu_co_mutex_unlock(&s->lock);
-        ret = bdrv_co_writev(bs->file,
-                             (cluster_offset >> 9) + index_in_cluster,
-                             n, &hd_qiov);
-        qemu_co_mutex_lock(&s->lock);
-        if (ret < 0) {
-            break;
-        }
-        ret = 0;
-
-        nb_sectors -= n;
-        sector_num += n;
-        buf += n * 512;
-    }
-    qemu_co_mutex_unlock(&s->lock);
-
-    if (qiov->niov > 1) {
-        qemu_vfree(orig_buf);
-    }
-    g_free(cluster_data);
-
-    return ret;
-}
-
-static void qcow_close(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-
-    g_free(s->l1_table);
-    g_free(s->l2_cache);
-    g_free(s->cluster_cache);
-    g_free(s->cluster_data);
-
-    migrate_del_blocker(s->migration_blocker);
-    error_free(s->migration_blocker);
-}
-
-static int qcow_create(const char *filename, QEMUOptionParameter *options)
-{
-    int header_size, backing_filename_len, l1_size, shift, i;
-    QCowHeader header;
-    uint8_t *tmp;
-    int64_t total_size = 0;
-    const char *backing_file = NULL;
-    int flags = 0;
-    int ret;
-    BlockDriverState *qcow_bs;
-
-    /* Read out options */
-    while (options && options->name) {
-        if (!strcmp(options->name, BLOCK_OPT_SIZE)) {
-            total_size = options->value.n / 512;
-        } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) {
-            backing_file = options->value.s;
-        } else if (!strcmp(options->name, BLOCK_OPT_ENCRYPT)) {
-            flags |= options->value.n ? BLOCK_FLAG_ENCRYPT : 0;
-        }
-        options++;
-    }
-
-    ret = bdrv_create_file(filename, options);
-    if (ret < 0) {
-        return ret;
-    }
-
-    ret = bdrv_file_open(&qcow_bs, filename, NULL, BDRV_O_RDWR);
-    if (ret < 0) {
-        return ret;
-    }
-
-    ret = bdrv_truncate(qcow_bs, 0);
-    if (ret < 0) {
-        goto exit;
-    }
-
-    memset(&header, 0, sizeof(header));
-    header.magic = cpu_to_be32(QCOW_MAGIC);
-    header.version = cpu_to_be32(QCOW_VERSION);
-    header.size = cpu_to_be64(total_size * 512);
-    header_size = sizeof(header);
-    backing_filename_len = 0;
-    if (backing_file) {
-        if (strcmp(backing_file, "fat:")) {
-            header.backing_file_offset = cpu_to_be64(header_size);
-            backing_filename_len = strlen(backing_file);
-            header.backing_file_size = cpu_to_be32(backing_filename_len);
-            header_size += backing_filename_len;
-        } else {
-            /* special backing file for vvfat */
-            backing_file = NULL;
-        }
-        header.cluster_bits = 9; /* 512 byte cluster to avoid copying
-                                    unmodifyed sectors */
-        header.l2_bits = 12; /* 32 KB L2 tables */
-    } else {
-        header.cluster_bits = 12; /* 4 KB clusters */
-        header.l2_bits = 9; /* 4 KB L2 tables */
-    }
-    header_size = (header_size + 7) & ~7;
-    shift = header.cluster_bits + header.l2_bits;
-    l1_size = ((total_size * 512) + (1LL << shift) - 1) >> shift;
-
-    header.l1_table_offset = cpu_to_be64(header_size);
-    if (flags & BLOCK_FLAG_ENCRYPT) {
-        header.crypt_method = cpu_to_be32(QCOW_CRYPT_AES);
-    } else {
-        header.crypt_method = cpu_to_be32(QCOW_CRYPT_NONE);
-    }
-
-    /* write all the data */
-    ret = bdrv_pwrite(qcow_bs, 0, &header, sizeof(header));
-    if (ret != sizeof(header)) {
-        goto exit;
-    }
-
-    if (backing_file) {
-        ret = bdrv_pwrite(qcow_bs, sizeof(header),
-            backing_file, backing_filename_len);
-        if (ret != backing_filename_len) {
-            goto exit;
-        }
-    }
-
-    tmp = g_malloc0(BDRV_SECTOR_SIZE);
-    for (i = 0; i < ((sizeof(uint64_t)*l1_size + BDRV_SECTOR_SIZE - 1)/
-        BDRV_SECTOR_SIZE); i++) {
-        ret = bdrv_pwrite(qcow_bs, header_size +
-            BDRV_SECTOR_SIZE*i, tmp, BDRV_SECTOR_SIZE);
-        if (ret != BDRV_SECTOR_SIZE) {
-            g_free(tmp);
-            goto exit;
-        }
-    }
-
-    g_free(tmp);
-    ret = 0;
-exit:
-    bdrv_delete(qcow_bs);
-    return ret;
-}
-
-static int qcow_make_empty(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint32_t l1_length = s->l1_size * sizeof(uint64_t);
-    int ret;
-
-    memset(s->l1_table, 0, l1_length);
-    if (bdrv_pwrite_sync(bs->file, s->l1_table_offset, s->l1_table,
-            l1_length) < 0)
-        return -1;
-    ret = bdrv_truncate(bs->file, s->l1_table_offset + l1_length);
-    if (ret < 0)
-        return ret;
-
-    memset(s->l2_cache, 0, s->l2_size * L2_CACHE_SIZE * sizeof(uint64_t));
-    memset(s->l2_cache_offsets, 0, L2_CACHE_SIZE * sizeof(uint64_t));
-    memset(s->l2_cache_counts, 0, L2_CACHE_SIZE * sizeof(uint32_t));
-
-    return 0;
-}
-
-/* XXX: put compressed sectors first, then all the cluster aligned
-   tables to avoid losing bytes in alignment */
-static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num,
-                                 const uint8_t *buf, int nb_sectors)
-{
-    BDRVQcowState *s = bs->opaque;
-    z_stream strm;
-    int ret, out_len;
-    uint8_t *out_buf;
-    uint64_t cluster_offset;
-
-    if (nb_sectors != s->cluster_sectors) {
-        ret = -EINVAL;
-
-        /* Zero-pad last write if image size is not cluster aligned */
-        if (sector_num + nb_sectors == bs->total_sectors &&
-            nb_sectors < s->cluster_sectors) {
-            uint8_t *pad_buf = qemu_blockalign(bs, s->cluster_size);
-            memset(pad_buf, 0, s->cluster_size);
-            memcpy(pad_buf, buf, nb_sectors * BDRV_SECTOR_SIZE);
-            ret = qcow_write_compressed(bs, sector_num,
-                                        pad_buf, s->cluster_sectors);
-            qemu_vfree(pad_buf);
-        }
-        return ret;
-    }
-
-    out_buf = g_malloc(s->cluster_size + (s->cluster_size / 1000) + 128);
-
-    /* best compression, small window, no zlib header */
-    memset(&strm, 0, sizeof(strm));
-    ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION,
-                       Z_DEFLATED, -12,
-                       9, Z_DEFAULT_STRATEGY);
-    if (ret != 0) {
-        ret = -EINVAL;
-        goto fail;
-    }
-
-    strm.avail_in = s->cluster_size;
-    strm.next_in = (uint8_t *)buf;
-    strm.avail_out = s->cluster_size;
-    strm.next_out = out_buf;
-
-    ret = deflate(&strm, Z_FINISH);
-    if (ret != Z_STREAM_END && ret != Z_OK) {
-        deflateEnd(&strm);
-        ret = -EINVAL;
-        goto fail;
-    }
-    out_len = strm.next_out - out_buf;
-
-    deflateEnd(&strm);
-
-    if (ret != Z_STREAM_END || out_len >= s->cluster_size) {
-        /* could not compress: write normal cluster */
-        ret = bdrv_write(bs, sector_num, buf, s->cluster_sectors);
-        if (ret < 0) {
-            goto fail;
-        }
-    } else {
-        cluster_offset = get_cluster_offset(bs, sector_num << 9, 2,
-                                            out_len, 0, 0);
-        if (cluster_offset == 0) {
-            ret = -EIO;
-            goto fail;
-        }
-
-        cluster_offset &= s->cluster_offset_mask;
-        ret = bdrv_pwrite(bs->file, cluster_offset, out_buf, out_len);
-        if (ret < 0) {
-            goto fail;
-        }
-    }
-
-    ret = 0;
-fail:
-    g_free(out_buf);
-    return ret;
-}
-
-static int qcow_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
-{
-    BDRVQcowState *s = bs->opaque;
-    bdi->cluster_size = s->cluster_size;
-    return 0;
-}
-
-
-static QEMUOptionParameter qcow_create_options[] = {
-    {
-        .name = BLOCK_OPT_SIZE,
-        .type = OPT_SIZE,
-        .help = "Virtual disk size"
-    },
-    {
-        .name = BLOCK_OPT_BACKING_FILE,
-        .type = OPT_STRING,
-        .help = "File name of a base image"
-    },
-    {
-        .name = BLOCK_OPT_ENCRYPT,
-        .type = OPT_FLAG,
-        .help = "Encrypt the image"
-    },
-    { NULL }
-};
-
-static BlockDriver bdrv_qcow = {
-    .format_name	= "qcow",
-    .instance_size	= sizeof(BDRVQcowState),
-    .bdrv_probe		= qcow_probe,
-    .bdrv_open		= qcow_open,
-    .bdrv_close		= qcow_close,
-    .bdrv_reopen_prepare = qcow_reopen_prepare,
-    .bdrv_create	= qcow_create,
-    .bdrv_has_zero_init     = bdrv_has_zero_init_1,
-
-    .bdrv_co_readv          = qcow_co_readv,
-    .bdrv_co_writev         = qcow_co_writev,
-    .bdrv_co_is_allocated   = qcow_co_is_allocated,
-
-    .bdrv_set_key           = qcow_set_key,
-    .bdrv_make_empty        = qcow_make_empty,
-    .bdrv_write_compressed  = qcow_write_compressed,
-    .bdrv_get_info          = qcow_get_info,
-
-    .create_options = qcow_create_options,
-};
-
-static void bdrv_qcow_init(void)
-{
-    bdrv_register(&bdrv_qcow);
-}
-
-block_init(bdrv_qcow_init);
diff --git a/contrib/qemu/block/qcow2-cache.c b/contrib/qemu/block/qcow2-cache.c
deleted file mode 100644
index 2f3114ecc..000000000
--- a/contrib/qemu/block/qcow2-cache.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * L2/refcount table cache for the QCOW2 format
- *
- * Copyright (c) 2010 Kevin Wolf <kwolf@redhat.com>
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "block/block_int.h"
-#include "qemu-common.h"
-#include "qcow2.h"
-#include "trace.h"
-
-typedef struct Qcow2CachedTable {
-    void*   table;
-    int64_t offset;
-    bool    dirty;
-    int     cache_hits;
-    int     ref;
-} Qcow2CachedTable;
-
-struct Qcow2Cache {
-    Qcow2CachedTable*       entries;
-    struct Qcow2Cache*      depends;
-    int                     size;
-    bool                    depends_on_flush;
-};
-
-Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables)
-{
-    BDRVQcowState *s = bs->opaque;
-    Qcow2Cache *c;
-    int i;
-
-    c = g_malloc0(sizeof(*c));
-    c->size = num_tables;
-    c->entries = g_malloc0(sizeof(*c->entries) * num_tables);
-
-    for (i = 0; i < c->size; i++) {
-        c->entries[i].table = qemu_blockalign(bs, s->cluster_size);
-    }
-
-    return c;
-}
-
-int qcow2_cache_destroy(BlockDriverState* bs, Qcow2Cache *c)
-{
-    int i;
-
-    for (i = 0; i < c->size; i++) {
-        assert(c->entries[i].ref == 0);
-        qemu_vfree(c->entries[i].table);
-    }
-
-    g_free(c->entries);
-    g_free(c);
-
-    return 0;
-}
-
-static int qcow2_cache_flush_dependency(BlockDriverState *bs, Qcow2Cache *c)
-{
-    int ret;
-
-    ret = qcow2_cache_flush(bs, c->depends);
-    if (ret < 0) {
-        return ret;
-    }
-
-    c->depends = NULL;
-    c->depends_on_flush = false;
-
-    return 0;
-}
-
-static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret = 0;
-
-    if (!c->entries[i].dirty || !c->entries[i].offset) {
-        return 0;
-    }
-
-    trace_qcow2_cache_entry_flush(qemu_coroutine_self(),
-                                  c == s->l2_table_cache, i);
-
-    if (c->depends) {
-        ret = qcow2_cache_flush_dependency(bs, c);
-    } else if (c->depends_on_flush) {
-        ret = bdrv_flush(bs->file);
-        if (ret >= 0) {
-            c->depends_on_flush = false;
-        }
-    }
-
-    if (ret < 0) {
-        return ret;
-    }
-
-    if (c == s->refcount_block_cache) {
-        BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_UPDATE_PART);
-    } else if (c == s->l2_table_cache) {
-        BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE);
-    }
-
-    ret = bdrv_pwrite(bs->file, c->entries[i].offset, c->entries[i].table,
-        s->cluster_size);
-    if (ret < 0) {
-        return ret;
-    }
-
-    c->entries[i].dirty = false;
-
-    return 0;
-}
-
-int qcow2_cache_flush(BlockDriverState *bs, Qcow2Cache *c)
-{
-    BDRVQcowState *s = bs->opaque;
-    int result = 0;
-    int ret;
-    int i;
-
-    trace_qcow2_cache_flush(qemu_coroutine_self(), c == s->l2_table_cache);
-
-    for (i = 0; i < c->size; i++) {
-        ret = qcow2_cache_entry_flush(bs, c, i);
-        if (ret < 0 && result != -ENOSPC) {
-            result = ret;
-        }
-    }
-
-    if (result == 0) {
-        ret = bdrv_flush(bs->file);
-        if (ret < 0) {
-            result = ret;
-        }
-    }
-
-    return result;
-}
-
-int qcow2_cache_set_dependency(BlockDriverState *bs, Qcow2Cache *c,
-    Qcow2Cache *dependency)
-{
-    int ret;
-
-    if (dependency->depends) {
-        ret = qcow2_cache_flush_dependency(bs, dependency);
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
-    if (c->depends && (c->depends != dependency)) {
-        ret = qcow2_cache_flush_dependency(bs, c);
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
-    c->depends = dependency;
-    return 0;
-}
-
-void qcow2_cache_depends_on_flush(Qcow2Cache *c)
-{
-    c->depends_on_flush = true;
-}
-
-static int qcow2_cache_find_entry_to_replace(Qcow2Cache *c)
-{
-    int i;
-    int min_count = INT_MAX;
-    int min_index = -1;
-
-
-    for (i = 0; i < c->size; i++) {
-        if (c->entries[i].ref) {
-            continue;
-        }
-
-        if (c->entries[i].cache_hits < min_count) {
-            min_index = i;
-            min_count = c->entries[i].cache_hits;
-        }
-
-        /* Give newer hits priority */
-        /* TODO Check how to optimize the replacement strategy */
-        c->entries[i].cache_hits /= 2;
-    }
-
-    if (min_index == -1) {
-        /* This can't happen in current synchronous code, but leave the check
-         * here as a reminder for whoever starts using AIO with the cache */
-        abort();
-    }
-    return min_index;
-}
-
-static int qcow2_cache_do_get(BlockDriverState *bs, Qcow2Cache *c,
-    uint64_t offset, void **table, bool read_from_disk)
-{
-    BDRVQcowState *s = bs->opaque;
-    int i;
-    int ret;
-
-    trace_qcow2_cache_get(qemu_coroutine_self(), c == s->l2_table_cache,
-                          offset, read_from_disk);
-
-    /* Check if the table is already cached */
-    for (i = 0; i < c->size; i++) {
-        if (c->entries[i].offset == offset) {
-            goto found;
-        }
-    }
-
-    /* If not, write a table back and replace it */
-    i = qcow2_cache_find_entry_to_replace(c);
-    trace_qcow2_cache_get_replace_entry(qemu_coroutine_self(),
-                                        c == s->l2_table_cache, i);
-    if (i < 0) {
-        return i;
-    }
-
-    ret = qcow2_cache_entry_flush(bs, c, i);
-    if (ret < 0) {
-        return ret;
-    }
-
-    trace_qcow2_cache_get_read(qemu_coroutine_self(),
-                               c == s->l2_table_cache, i);
-    c->entries[i].offset = 0;
-    if (read_from_disk) {
-        if (c == s->l2_table_cache) {
-            BLKDBG_EVENT(bs->file, BLKDBG_L2_LOAD);
-        }
-
-        ret = bdrv_pread(bs->file, offset, c->entries[i].table, s->cluster_size);
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
-    /* Give the table some hits for the start so that it won't be replaced
-     * immediately. The number 32 is completely arbitrary. */
-    c->entries[i].cache_hits = 32;
-    c->entries[i].offset = offset;
-
-    /* And return the right table */
-found:
-    c->entries[i].cache_hits++;
-    c->entries[i].ref++;
-    *table = c->entries[i].table;
-
-    trace_qcow2_cache_get_done(qemu_coroutine_self(),
-                               c == s->l2_table_cache, i);
-
-    return 0;
-}
-
-int qcow2_cache_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
-    void **table)
-{
-    return qcow2_cache_do_get(bs, c, offset, table, true);
-}
-
-int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
-    void **table)
-{
-    return qcow2_cache_do_get(bs, c, offset, table, false);
-}
-
-int qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table)
-{
-    int i;
-
-    for (i = 0; i < c->size; i++) {
-        if (c->entries[i].table == *table) {
-            goto found;
-        }
-    }
-    return -ENOENT;
-
-found:
-    c->entries[i].ref--;
-    *table = NULL;
-
-    assert(c->entries[i].ref >= 0);
-    return 0;
-}
-
-void qcow2_cache_entry_mark_dirty(Qcow2Cache *c, void *table)
-{
-    int i;
-
-    for (i = 0; i < c->size; i++) {
-        if (c->entries[i].table == table) {
-            goto found;
-        }
-    }
-    abort();
-
-found:
-    c->entries[i].dirty = true;
-}
diff --git a/contrib/qemu/block/qcow2-cluster.c b/contrib/qemu/block/qcow2-cluster.c
deleted file mode 100644
index cca76d4fc..000000000
--- a/contrib/qemu/block/qcow2-cluster.c
+++ /dev/null
@@ -1,1478 +0,0 @@
-/*
- * Block driver for the QCOW version 2 format
- *
- * Copyright (c) 2004-2006 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <zlib.h>
-
-#include "qemu-common.h"
-#include "block/block_int.h"
-#include "block/qcow2.h"
-#include "trace.h"
-
-int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
-                        bool exact_size)
-{
-    BDRVQcowState *s = bs->opaque;
-    int new_l1_size2, ret, i;
-    uint64_t *new_l1_table;
-    int64_t new_l1_table_offset, new_l1_size;
-    uint8_t data[12];
-
-    if (min_size <= s->l1_size)
-        return 0;
-
-    if (exact_size) {
-        new_l1_size = min_size;
-    } else {
-        /* Bump size up to reduce the number of times we have to grow */
-        new_l1_size = s->l1_size;
-        if (new_l1_size == 0) {
-            new_l1_size = 1;
-        }
-        while (min_size > new_l1_size) {
-            new_l1_size = (new_l1_size * 3 + 1) / 2;
-        }
-    }
-
-    if (new_l1_size > INT_MAX) {
-        return -EFBIG;
-    }
-
-#ifdef DEBUG_ALLOC2
-    fprintf(stderr, "grow l1_table from %d to %" PRId64 "\n",
-            s->l1_size, new_l1_size);
-#endif
-
-    new_l1_size2 = sizeof(uint64_t) * new_l1_size;
-    new_l1_table = g_malloc0(align_offset(new_l1_size2, 512));
-    memcpy(new_l1_table, s->l1_table, s->l1_size * sizeof(uint64_t));
-
-    /* write new table (align to cluster) */
-    BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_ALLOC_TABLE);
-    new_l1_table_offset = qcow2_alloc_clusters(bs, new_l1_size2);
-    if (new_l1_table_offset < 0) {
-        g_free(new_l1_table);
-        return new_l1_table_offset;
-    }
-
-    ret = qcow2_cache_flush(bs, s->refcount_block_cache);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_WRITE_TABLE);
-    for(i = 0; i < s->l1_size; i++)
-        new_l1_table[i] = cpu_to_be64(new_l1_table[i]);
-    ret = bdrv_pwrite_sync(bs->file, new_l1_table_offset, new_l1_table, new_l1_size2);
-    if (ret < 0)
-        goto fail;
-    for(i = 0; i < s->l1_size; i++)
-        new_l1_table[i] = be64_to_cpu(new_l1_table[i]);
-
-    /* set new table */
-    BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_ACTIVATE_TABLE);
-    cpu_to_be32w((uint32_t*)data, new_l1_size);
-    cpu_to_be64wu((uint64_t*)(data + 4), new_l1_table_offset);
-    ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, l1_size), data,sizeof(data));
-    if (ret < 0) {
-        goto fail;
-    }
-    g_free(s->l1_table);
-    qcow2_free_clusters(bs, s->l1_table_offset, s->l1_size * sizeof(uint64_t),
-                        QCOW2_DISCARD_OTHER);
-    s->l1_table_offset = new_l1_table_offset;
-    s->l1_table = new_l1_table;
-    s->l1_size = new_l1_size;
-    return 0;
- fail:
-    g_free(new_l1_table);
-    qcow2_free_clusters(bs, new_l1_table_offset, new_l1_size2,
-                        QCOW2_DISCARD_OTHER);
-    return ret;
-}
-
-/*
- * l2_load
- *
- * Loads a L2 table into memory. If the table is in the cache, the cache
- * is used; otherwise the L2 table is loaded from the image file.
- *
- * Returns a pointer to the L2 table on success, or NULL if the read from
- * the image file failed.
- */
-
-static int l2_load(BlockDriverState *bs, uint64_t l2_offset,
-    uint64_t **l2_table)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret;
-
-    ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset, (void**) l2_table);
-
-    return ret;
-}
-
-/*
- * Writes one sector of the L1 table to the disk (can't update single entries
- * and we really don't want bdrv_pread to perform a read-modify-write)
- */
-#define L1_ENTRIES_PER_SECTOR (512 / 8)
-static int write_l1_entry(BlockDriverState *bs, int l1_index)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t buf[L1_ENTRIES_PER_SECTOR];
-    int l1_start_index;
-    int i, ret;
-
-    l1_start_index = l1_index & ~(L1_ENTRIES_PER_SECTOR - 1);
-    for (i = 0; i < L1_ENTRIES_PER_SECTOR; i++) {
-        buf[i] = cpu_to_be64(s->l1_table[l1_start_index + i]);
-    }
-
-    BLKDBG_EVENT(bs->file, BLKDBG_L1_UPDATE);
-    ret = bdrv_pwrite_sync(bs->file, s->l1_table_offset + 8 * l1_start_index,
-        buf, sizeof(buf));
-    if (ret < 0) {
-        return ret;
-    }
-
-    return 0;
-}
-
-/*
- * l2_allocate
- *
- * Allocate a new l2 entry in the file. If l1_index points to an already
- * used entry in the L2 table (i.e. we are doing a copy on write for the L2
- * table) copy the contents of the old L2 table into the newly allocated one.
- * Otherwise the new table is initialized with zeros.
- *
- */
-
-static int l2_allocate(BlockDriverState *bs, int l1_index, uint64_t **table)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t old_l2_offset;
-    uint64_t *l2_table;
-    int64_t l2_offset;
-    int ret;
-
-    old_l2_offset = s->l1_table[l1_index];
-
-    trace_qcow2_l2_allocate(bs, l1_index);
-
-    /* allocate a new l2 entry */
-
-    l2_offset = qcow2_alloc_clusters(bs, s->l2_size * sizeof(uint64_t));
-    if (l2_offset < 0) {
-        return l2_offset;
-    }
-
-    ret = qcow2_cache_flush(bs, s->refcount_block_cache);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* allocate a new entry in the l2 cache */
-
-    trace_qcow2_l2_allocate_get_empty(bs, l1_index);
-    ret = qcow2_cache_get_empty(bs, s->l2_table_cache, l2_offset, (void**) table);
-    if (ret < 0) {
-        return ret;
-    }
-
-    l2_table = *table;
-
-    if ((old_l2_offset & L1E_OFFSET_MASK) == 0) {
-        /* if there was no old l2 table, clear the new table */
-        memset(l2_table, 0, s->l2_size * sizeof(uint64_t));
-    } else {
-        uint64_t* old_table;
-
-        /* if there was an old l2 table, read it from the disk */
-        BLKDBG_EVENT(bs->file, BLKDBG_L2_ALLOC_COW_READ);
-        ret = qcow2_cache_get(bs, s->l2_table_cache,
-            old_l2_offset & L1E_OFFSET_MASK,
-            (void**) &old_table);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        memcpy(l2_table, old_table, s->cluster_size);
-
-        ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &old_table);
-        if (ret < 0) {
-            goto fail;
-        }
-    }
-
-    /* write the l2 table to the file */
-    BLKDBG_EVENT(bs->file, BLKDBG_L2_ALLOC_WRITE);
-
-    trace_qcow2_l2_allocate_write_l2(bs, l1_index);
-    qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
-    ret = qcow2_cache_flush(bs, s->l2_table_cache);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* update the L1 entry */
-    trace_qcow2_l2_allocate_write_l1(bs, l1_index);
-    s->l1_table[l1_index] = l2_offset | QCOW_OFLAG_COPIED;
-    ret = write_l1_entry(bs, l1_index);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    *table = l2_table;
-    trace_qcow2_l2_allocate_done(bs, l1_index, 0);
-    return 0;
-
-fail:
-    trace_qcow2_l2_allocate_done(bs, l1_index, ret);
-    qcow2_cache_put(bs, s->l2_table_cache, (void**) table);
-    s->l1_table[l1_index] = old_l2_offset;
-    return ret;
-}
-
-/*
- * Checks how many clusters in a given L2 table are contiguous in the image
- * file. As soon as one of the flags in the bitmask stop_flags changes compared
- * to the first cluster, the search is stopped and the cluster is not counted
- * as contiguous. (This allows it, for example, to stop at the first compressed
- * cluster which may require a different handling)
- */
-static int count_contiguous_clusters(uint64_t nb_clusters, int cluster_size,
-        uint64_t *l2_table, uint64_t start, uint64_t stop_flags)
-{
-    int i;
-    uint64_t mask = stop_flags | L2E_OFFSET_MASK;
-    uint64_t offset = be64_to_cpu(l2_table[0]) & mask;
-
-    if (!offset)
-        return 0;
-
-    for (i = start; i < start + nb_clusters; i++) {
-        uint64_t l2_entry = be64_to_cpu(l2_table[i]) & mask;
-        if (offset + (uint64_t) i * cluster_size != l2_entry) {
-            break;
-        }
-    }
-
-	return (i - start);
-}
-
-static int count_contiguous_free_clusters(uint64_t nb_clusters, uint64_t *l2_table)
-{
-    int i;
-
-    for (i = 0; i < nb_clusters; i++) {
-        int type = qcow2_get_cluster_type(be64_to_cpu(l2_table[i]));
-
-        if (type != QCOW2_CLUSTER_UNALLOCATED) {
-            break;
-        }
-    }
-
-    return i;
-}
-
-/* The crypt function is compatible with the linux cryptoloop
-   algorithm for < 4 GB images. NOTE: out_buf == in_buf is
-   supported */
-void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num,
-                           uint8_t *out_buf, const uint8_t *in_buf,
-                           int nb_sectors, int enc,
-                           const AES_KEY *key)
-{
-    union {
-        uint64_t ll[2];
-        uint8_t b[16];
-    } ivec;
-    int i;
-
-    for(i = 0; i < nb_sectors; i++) {
-        ivec.ll[0] = cpu_to_le64(sector_num);
-        ivec.ll[1] = 0;
-        AES_cbc_encrypt(in_buf, out_buf, 512, key,
-                        ivec.b, enc);
-        sector_num++;
-        in_buf += 512;
-        out_buf += 512;
-    }
-}
-
-static int coroutine_fn copy_sectors(BlockDriverState *bs,
-                                     uint64_t start_sect,
-                                     uint64_t cluster_offset,
-                                     int n_start, int n_end)
-{
-    BDRVQcowState *s = bs->opaque;
-    QEMUIOVector qiov;
-    struct iovec iov;
-    int n, ret;
-
-    /*
-     * If this is the last cluster and it is only partially used, we must only
-     * copy until the end of the image, or bdrv_check_request will fail for the
-     * bdrv_read/write calls below.
-     */
-    if (start_sect + n_end > bs->total_sectors) {
-        n_end = bs->total_sectors - start_sect;
-    }
-
-    n = n_end - n_start;
-    if (n <= 0) {
-        return 0;
-    }
-
-    iov.iov_len = n * BDRV_SECTOR_SIZE;
-    iov.iov_base = qemu_blockalign(bs, iov.iov_len);
-
-    qemu_iovec_init_external(&qiov, &iov, 1);
-
-    BLKDBG_EVENT(bs->file, BLKDBG_COW_READ);
-
-    /* Call .bdrv_co_readv() directly instead of using the public block-layer
-     * interface.  This avoids double I/O throttling and request tracking,
-     * which can lead to deadlock when block layer copy-on-read is enabled.
-     */
-    ret = bs->drv->bdrv_co_readv(bs, start_sect + n_start, n, &qiov);
-    if (ret < 0) {
-        goto out;
-    }
-
-    if (s->crypt_method) {
-        qcow2_encrypt_sectors(s, start_sect + n_start,
-                        iov.iov_base, iov.iov_base, n, 1,
-                        &s->aes_encrypt_key);
-    }
-
-    BLKDBG_EVENT(bs->file, BLKDBG_COW_WRITE);
-    ret = bdrv_co_writev(bs->file, (cluster_offset >> 9) + n_start, n, &qiov);
-    if (ret < 0) {
-        goto out;
-    }
-
-    ret = 0;
-out:
-    qemu_vfree(iov.iov_base);
-    return ret;
-}
-
-
-/*
- * get_cluster_offset
- *
- * For a given offset of the disk image, find the cluster offset in
- * qcow2 file. The offset is stored in *cluster_offset.
- *
- * on entry, *num is the number of contiguous sectors we'd like to
- * access following offset.
- *
- * on exit, *num is the number of contiguous sectors we can read.
- *
- * Returns the cluster type (QCOW2_CLUSTER_*) on success, -errno in error
- * cases.
- */
-int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
-    int *num, uint64_t *cluster_offset)
-{
-    BDRVQcowState *s = bs->opaque;
-    unsigned int l2_index;
-    uint64_t l1_index, l2_offset, *l2_table;
-    int l1_bits, c;
-    unsigned int index_in_cluster, nb_clusters;
-    uint64_t nb_available, nb_needed;
-    int ret;
-
-    index_in_cluster = (offset >> 9) & (s->cluster_sectors - 1);
-    nb_needed = *num + index_in_cluster;
-
-    l1_bits = s->l2_bits + s->cluster_bits;
-
-    /* compute how many bytes there are between the offset and
-     * the end of the l1 entry
-     */
-
-    nb_available = (1ULL << l1_bits) - (offset & ((1ULL << l1_bits) - 1));
-
-    /* compute the number of available sectors */
-
-    nb_available = (nb_available >> 9) + index_in_cluster;
-
-    if (nb_needed > nb_available) {
-        nb_needed = nb_available;
-    }
-
-    *cluster_offset = 0;
-
-    /* seek the the l2 offset in the l1 table */
-
-    l1_index = offset >> l1_bits;
-    if (l1_index >= s->l1_size) {
-        ret = QCOW2_CLUSTER_UNALLOCATED;
-        goto out;
-    }
-
-    l2_offset = s->l1_table[l1_index] & L1E_OFFSET_MASK;
-    if (!l2_offset) {
-        ret = QCOW2_CLUSTER_UNALLOCATED;
-        goto out;
-    }
-
-    /* load the l2 table in memory */
-
-    ret = l2_load(bs, l2_offset, &l2_table);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* find the cluster offset for the given disk offset */
-
-    l2_index = (offset >> s->cluster_bits) & (s->l2_size - 1);
-    *cluster_offset = be64_to_cpu(l2_table[l2_index]);
-    nb_clusters = size_to_clusters(s, nb_needed << 9);
-
-    ret = qcow2_get_cluster_type(*cluster_offset);
-    switch (ret) {
-    case QCOW2_CLUSTER_COMPRESSED:
-        /* Compressed clusters can only be processed one by one */
-        c = 1;
-        *cluster_offset &= L2E_COMPRESSED_OFFSET_SIZE_MASK;
-        break;
-    case QCOW2_CLUSTER_ZERO:
-        if (s->qcow_version < 3) {
-            return -EIO;
-        }
-        c = count_contiguous_clusters(nb_clusters, s->cluster_size,
-                &l2_table[l2_index], 0,
-                QCOW_OFLAG_COMPRESSED | QCOW_OFLAG_ZERO);
-        *cluster_offset = 0;
-        break;
-    case QCOW2_CLUSTER_UNALLOCATED:
-        /* how many empty clusters ? */
-        c = count_contiguous_free_clusters(nb_clusters, &l2_table[l2_index]);
-        *cluster_offset = 0;
-        break;
-    case QCOW2_CLUSTER_NORMAL:
-        /* how many allocated clusters ? */
-        c = count_contiguous_clusters(nb_clusters, s->cluster_size,
-                &l2_table[l2_index], 0,
-                QCOW_OFLAG_COMPRESSED | QCOW_OFLAG_ZERO);
-        *cluster_offset &= L2E_OFFSET_MASK;
-        break;
-    default:
-        abort();
-    }
-
-    qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-
-    nb_available = (c * s->cluster_sectors);
-
-out:
-    if (nb_available > nb_needed)
-        nb_available = nb_needed;
-
-    *num = nb_available - index_in_cluster;
-
-    return ret;
-}
-
-/*
- * get_cluster_table
- *
- * for a given disk offset, load (and allocate if needed)
- * the l2 table.
- *
- * the l2 table offset in the qcow2 file and the cluster index
- * in the l2 table are given to the caller.
- *
- * Returns 0 on success, -errno in failure case
- */
-static int get_cluster_table(BlockDriverState *bs, uint64_t offset,
-                             uint64_t **new_l2_table,
-                             int *new_l2_index)
-{
-    BDRVQcowState *s = bs->opaque;
-    unsigned int l2_index;
-    uint64_t l1_index, l2_offset;
-    uint64_t *l2_table = NULL;
-    int ret;
-
-    /* seek the the l2 offset in the l1 table */
-
-    l1_index = offset >> (s->l2_bits + s->cluster_bits);
-    if (l1_index >= s->l1_size) {
-        ret = qcow2_grow_l1_table(bs, l1_index + 1, false);
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
-    assert(l1_index < s->l1_size);
-    l2_offset = s->l1_table[l1_index] & L1E_OFFSET_MASK;
-
-    /* seek the l2 table of the given l2 offset */
-
-    if (s->l1_table[l1_index] & QCOW_OFLAG_COPIED) {
-        /* load the l2 table in memory */
-        ret = l2_load(bs, l2_offset, &l2_table);
-        if (ret < 0) {
-            return ret;
-        }
-    } else {
-        /* First allocate a new L2 table (and do COW if needed) */
-        ret = l2_allocate(bs, l1_index, &l2_table);
-        if (ret < 0) {
-            return ret;
-        }
-
-        /* Then decrease the refcount of the old table */
-        if (l2_offset) {
-            qcow2_free_clusters(bs, l2_offset, s->l2_size * sizeof(uint64_t),
-                                QCOW2_DISCARD_OTHER);
-        }
-    }
-
-    /* find the cluster offset for the given disk offset */
-
-    l2_index = (offset >> s->cluster_bits) & (s->l2_size - 1);
-
-    *new_l2_table = l2_table;
-    *new_l2_index = l2_index;
-
-    return 0;
-}
-
-/*
- * alloc_compressed_cluster_offset
- *
- * For a given offset of the disk image, return cluster offset in
- * qcow2 file.
- *
- * If the offset is not found, allocate a new compressed cluster.
- *
- * Return the cluster offset if successful,
- * Return 0, otherwise.
- *
- */
-
-uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
-                                               uint64_t offset,
-                                               int compressed_size)
-{
-    BDRVQcowState *s = bs->opaque;
-    int l2_index, ret;
-    uint64_t *l2_table;
-    int64_t cluster_offset;
-    int nb_csectors;
-
-    ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
-    if (ret < 0) {
-        return 0;
-    }
-
-    /* Compression can't overwrite anything. Fail if the cluster was already
-     * allocated. */
-    cluster_offset = be64_to_cpu(l2_table[l2_index]);
-    if (cluster_offset & L2E_OFFSET_MASK) {
-        qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-        return 0;
-    }
-
-    cluster_offset = qcow2_alloc_bytes(bs, compressed_size);
-    if (cluster_offset < 0) {
-        qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-        return 0;
-    }
-
-    nb_csectors = ((cluster_offset + compressed_size - 1) >> 9) -
-                  (cluster_offset >> 9);
-
-    cluster_offset |= QCOW_OFLAG_COMPRESSED |
-                      ((uint64_t)nb_csectors << s->csize_shift);
-
-    /* update L2 table */
-
-    /* compressed clusters never have the copied flag */
-
-    BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE_COMPRESSED);
-    qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
-    l2_table[l2_index] = cpu_to_be64(cluster_offset);
-    ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-    if (ret < 0) {
-        return 0;
-    }
-
-    return cluster_offset;
-}
-
-static int perform_cow(BlockDriverState *bs, QCowL2Meta *m, Qcow2COWRegion *r)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret;
-
-    if (r->nb_sectors == 0) {
-        return 0;
-    }
-
-    qemu_co_mutex_unlock(&s->lock);
-    ret = copy_sectors(bs, m->offset / BDRV_SECTOR_SIZE, m->alloc_offset,
-                       r->offset / BDRV_SECTOR_SIZE,
-                       r->offset / BDRV_SECTOR_SIZE + r->nb_sectors);
-    qemu_co_mutex_lock(&s->lock);
-
-    if (ret < 0) {
-        return ret;
-    }
-
-    /*
-     * Before we update the L2 table to actually point to the new cluster, we
-     * need to be sure that the refcounts have been increased and COW was
-     * handled.
-     */
-    qcow2_cache_depends_on_flush(s->l2_table_cache);
-
-    return 0;
-}
-
-int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m)
-{
-    BDRVQcowState *s = bs->opaque;
-    int i, j = 0, l2_index, ret;
-    uint64_t *old_cluster, *l2_table;
-    uint64_t cluster_offset = m->alloc_offset;
-
-    trace_qcow2_cluster_link_l2(qemu_coroutine_self(), m->nb_clusters);
-    assert(m->nb_clusters > 0);
-
-    old_cluster = g_malloc(m->nb_clusters * sizeof(uint64_t));
-
-    /* copy content of unmodified sectors */
-    ret = perform_cow(bs, m, &m->cow_start);
-    if (ret < 0) {
-        goto err;
-    }
-
-    ret = perform_cow(bs, m, &m->cow_end);
-    if (ret < 0) {
-        goto err;
-    }
-
-    /* Update L2 table. */
-    if (s->use_lazy_refcounts) {
-        qcow2_mark_dirty(bs);
-    }
-    if (qcow2_need_accurate_refcounts(s)) {
-        qcow2_cache_set_dependency(bs, s->l2_table_cache,
-                                   s->refcount_block_cache);
-    }
-
-    ret = get_cluster_table(bs, m->offset, &l2_table, &l2_index);
-    if (ret < 0) {
-        goto err;
-    }
-    qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
-
-    for (i = 0; i < m->nb_clusters; i++) {
-        /* if two concurrent writes happen to the same unallocated cluster
-	 * each write allocates separate cluster and writes data concurrently.
-	 * The first one to complete updates l2 table with pointer to its
-	 * cluster the second one has to do RMW (which is done above by
-	 * copy_sectors()), update l2 table with its cluster pointer and free
-	 * old cluster. This is what this loop does */
-        if(l2_table[l2_index + i] != 0)
-            old_cluster[j++] = l2_table[l2_index + i];
-
-        l2_table[l2_index + i] = cpu_to_be64((cluster_offset +
-                    (i << s->cluster_bits)) | QCOW_OFLAG_COPIED);
-     }
-
-
-    ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-    if (ret < 0) {
-        goto err;
-    }
-
-    /*
-     * If this was a COW, we need to decrease the refcount of the old cluster.
-     * Also flush bs->file to get the right order for L2 and refcount update.
-     *
-     * Don't discard clusters that reach a refcount of 0 (e.g. compressed
-     * clusters), the next write will reuse them anyway.
-     */
-    if (j != 0) {
-        for (i = 0; i < j; i++) {
-            qcow2_free_any_clusters(bs, be64_to_cpu(old_cluster[i]), 1,
-                                    QCOW2_DISCARD_NEVER);
-        }
-    }
-
-    ret = 0;
-err:
-    g_free(old_cluster);
-    return ret;
- }
-
-/*
- * Returns the number of contiguous clusters that can be used for an allocating
- * write, but require COW to be performed (this includes yet unallocated space,
- * which must copy from the backing file)
- */
-static int count_cow_clusters(BDRVQcowState *s, int nb_clusters,
-    uint64_t *l2_table, int l2_index)
-{
-    int i;
-
-    for (i = 0; i < nb_clusters; i++) {
-        uint64_t l2_entry = be64_to_cpu(l2_table[l2_index + i]);
-        int cluster_type = qcow2_get_cluster_type(l2_entry);
-
-        switch(cluster_type) {
-        case QCOW2_CLUSTER_NORMAL:
-            if (l2_entry & QCOW_OFLAG_COPIED) {
-                goto out;
-            }
-            break;
-        case QCOW2_CLUSTER_UNALLOCATED:
-        case QCOW2_CLUSTER_COMPRESSED:
-        case QCOW2_CLUSTER_ZERO:
-            break;
-        default:
-            abort();
-        }
-    }
-
-out:
-    assert(i <= nb_clusters);
-    return i;
-}
-
-/*
- * Check if there already is an AIO write request in flight which allocates
- * the same cluster. In this case we need to wait until the previous
- * request has completed and updated the L2 table accordingly.
- *
- * Returns:
- *   0       if there was no dependency. *cur_bytes indicates the number of
- *           bytes from guest_offset that can be read before the next
- *           dependency must be processed (or the request is complete)
- *
- *   -EAGAIN if we had to wait for another request, previously gathered
- *           information on cluster allocation may be invalid now. The caller
- *           must start over anyway, so consider *cur_bytes undefined.
- */
-static int handle_dependencies(BlockDriverState *bs, uint64_t guest_offset,
-    uint64_t *cur_bytes, QCowL2Meta **m)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowL2Meta *old_alloc;
-    uint64_t bytes = *cur_bytes;
-
-    QLIST_FOREACH(old_alloc, &s->cluster_allocs, next_in_flight) {
-
-        uint64_t start = guest_offset;
-        uint64_t end = start + bytes;
-        uint64_t old_start = l2meta_cow_start(old_alloc);
-        uint64_t old_end = l2meta_cow_end(old_alloc);
-
-        if (end <= old_start || start >= old_end) {
-            /* No intersection */
-        } else {
-            if (start < old_start) {
-                /* Stop at the start of a running allocation */
-                bytes = old_start - start;
-            } else {
-                bytes = 0;
-            }
-
-            /* Stop if already an l2meta exists. After yielding, it wouldn't
-             * be valid any more, so we'd have to clean up the old L2Metas
-             * and deal with requests depending on them before starting to
-             * gather new ones. Not worth the trouble. */
-            if (bytes == 0 && *m) {
-                *cur_bytes = 0;
-                return 0;
-            }
-
-            if (bytes == 0) {
-                /* Wait for the dependency to complete. We need to recheck
-                 * the free/allocated clusters when we continue. */
-                qemu_co_mutex_unlock(&s->lock);
-                qemu_co_queue_wait(&old_alloc->dependent_requests);
-                qemu_co_mutex_lock(&s->lock);
-                return -EAGAIN;
-            }
-        }
-    }
-
-    /* Make sure that existing clusters and new allocations are only used up to
-     * the next dependency if we shortened the request above */
-    *cur_bytes = bytes;
-
-    return 0;
-}
-
-/*
- * Checks how many already allocated clusters that don't require a copy on
- * write there are at the given guest_offset (up to *bytes). If
- * *host_offset is not zero, only physically contiguous clusters beginning at
- * this host offset are counted.
- *
- * Note that guest_offset may not be cluster aligned. In this case, the
- * returned *host_offset points to exact byte referenced by guest_offset and
- * therefore isn't cluster aligned as well.
- *
- * Returns:
- *   0:     if no allocated clusters are available at the given offset.
- *          *bytes is normally unchanged. It is set to 0 if the cluster
- *          is allocated and doesn't need COW, but doesn't have the right
- *          physical offset.
- *
- *   1:     if allocated clusters that don't require a COW are available at
- *          the requested offset. *bytes may have decreased and describes
- *          the length of the area that can be written to.
- *
- *  -errno: in error cases
- */
-static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
-    uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
-{
-    BDRVQcowState *s = bs->opaque;
-    int l2_index;
-    uint64_t cluster_offset;
-    uint64_t *l2_table;
-    unsigned int nb_clusters;
-    unsigned int keep_clusters;
-    int ret, pret;
-
-    trace_qcow2_handle_copied(qemu_coroutine_self(), guest_offset, *host_offset,
-                              *bytes);
-
-    assert(*host_offset == 0 ||    offset_into_cluster(s, guest_offset)
-                                == offset_into_cluster(s, *host_offset));
-
-    /*
-     * Calculate the number of clusters to look for. We stop at L2 table
-     * boundaries to keep things simple.
-     */
-    nb_clusters =
-        size_to_clusters(s, offset_into_cluster(s, guest_offset) + *bytes);
-
-    l2_index = offset_to_l2_index(s, guest_offset);
-    nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
-
-    /* Find L2 entry for the first involved cluster */
-    ret = get_cluster_table(bs, guest_offset, &l2_table, &l2_index);
-    if (ret < 0) {
-        return ret;
-    }
-
-    cluster_offset = be64_to_cpu(l2_table[l2_index]);
-
-    /* Check how many clusters are already allocated and don't need COW */
-    if (qcow2_get_cluster_type(cluster_offset) == QCOW2_CLUSTER_NORMAL
-        && (cluster_offset & QCOW_OFLAG_COPIED))
-    {
-        /* If a specific host_offset is required, check it */
-        bool offset_matches =
-            (cluster_offset & L2E_OFFSET_MASK) == *host_offset;
-
-        if (*host_offset != 0 && !offset_matches) {
-            *bytes = 0;
-            ret = 0;
-            goto out;
-        }
-
-        /* We keep all QCOW_OFLAG_COPIED clusters */
-        keep_clusters =
-            count_contiguous_clusters(nb_clusters, s->cluster_size,
-                                      &l2_table[l2_index], 0,
-                                      QCOW_OFLAG_COPIED | QCOW_OFLAG_ZERO);
-        assert(keep_clusters <= nb_clusters);
-
-        *bytes = MIN(*bytes,
-                 keep_clusters * s->cluster_size
-                 - offset_into_cluster(s, guest_offset));
-
-        ret = 1;
-    } else {
-        ret = 0;
-    }
-
-    /* Cleanup */
-out:
-    pret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-    if (pret < 0) {
-        return pret;
-    }
-
-    /* Only return a host offset if we actually made progress. Otherwise we
-     * would make requirements for handle_alloc() that it can't fulfill */
-    if (ret) {
-        *host_offset = (cluster_offset & L2E_OFFSET_MASK)
-                     + offset_into_cluster(s, guest_offset);
-    }
-
-    return ret;
-}
-
-/*
- * Allocates new clusters for the given guest_offset.
- *
- * At most *nb_clusters are allocated, and on return *nb_clusters is updated to
- * contain the number of clusters that have been allocated and are contiguous
- * in the image file.
- *
- * If *host_offset is non-zero, it specifies the offset in the image file at
- * which the new clusters must start. *nb_clusters can be 0 on return in this
- * case if the cluster at host_offset is already in use. If *host_offset is
- * zero, the clusters can be allocated anywhere in the image file.
- *
- * *host_offset is updated to contain the offset into the image file at which
- * the first allocated cluster starts.
- *
- * Return 0 on success and -errno in error cases. -EAGAIN means that the
- * function has been waiting for another request and the allocation must be
- * restarted, but the whole request should not be failed.
- */
-static int do_alloc_cluster_offset(BlockDriverState *bs, uint64_t guest_offset,
-    uint64_t *host_offset, unsigned int *nb_clusters)
-{
-    BDRVQcowState *s = bs->opaque;
-
-    trace_qcow2_do_alloc_clusters_offset(qemu_coroutine_self(), guest_offset,
-                                         *host_offset, *nb_clusters);
-
-    /* Allocate new clusters */
-    trace_qcow2_cluster_alloc_phys(qemu_coroutine_self());
-    if (*host_offset == 0) {
-        int64_t cluster_offset =
-            qcow2_alloc_clusters(bs, *nb_clusters * s->cluster_size);
-        if (cluster_offset < 0) {
-            return cluster_offset;
-        }
-        *host_offset = cluster_offset;
-        return 0;
-    } else {
-        int ret = qcow2_alloc_clusters_at(bs, *host_offset, *nb_clusters);
-        if (ret < 0) {
-            return ret;
-        }
-        *nb_clusters = ret;
-        return 0;
-    }
-}
-
-/*
- * Allocates new clusters for an area that either is yet unallocated or needs a
- * copy on write. If *host_offset is non-zero, clusters are only allocated if
- * the new allocation can match the specified host offset.
- *
- * Note that guest_offset may not be cluster aligned. In this case, the
- * returned *host_offset points to exact byte referenced by guest_offset and
- * therefore isn't cluster aligned as well.
- *
- * Returns:
- *   0:     if no clusters could be allocated. *bytes is set to 0,
- *          *host_offset is left unchanged.
- *
- *   1:     if new clusters were allocated. *bytes may be decreased if the
- *          new allocation doesn't cover all of the requested area.
- *          *host_offset is updated to contain the host offset of the first
- *          newly allocated cluster.
- *
- *  -errno: in error cases
- */
-static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
-    uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
-{
-    BDRVQcowState *s = bs->opaque;
-    int l2_index;
-    uint64_t *l2_table;
-    uint64_t entry;
-    unsigned int nb_clusters;
-    int ret;
-
-    uint64_t alloc_cluster_offset;
-
-    trace_qcow2_handle_alloc(qemu_coroutine_self(), guest_offset, *host_offset,
-                             *bytes);
-    assert(*bytes > 0);
-
-    /*
-     * Calculate the number of clusters to look for. We stop at L2 table
-     * boundaries to keep things simple.
-     */
-    nb_clusters =
-        size_to_clusters(s, offset_into_cluster(s, guest_offset) + *bytes);
-
-    l2_index = offset_to_l2_index(s, guest_offset);
-    nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
-
-    /* Find L2 entry for the first involved cluster */
-    ret = get_cluster_table(bs, guest_offset, &l2_table, &l2_index);
-    if (ret < 0) {
-        return ret;
-    }
-
-    entry = be64_to_cpu(l2_table[l2_index]);
-
-    /* For the moment, overwrite compressed clusters one by one */
-    if (entry & QCOW_OFLAG_COMPRESSED) {
-        nb_clusters = 1;
-    } else {
-        nb_clusters = count_cow_clusters(s, nb_clusters, l2_table, l2_index);
-    }
-
-    /* This function is only called when there were no non-COW clusters, so if
-     * we can't find any unallocated or COW clusters either, something is
-     * wrong with our code. */
-    assert(nb_clusters > 0);
-
-    ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* Allocate, if necessary at a given offset in the image file */
-    alloc_cluster_offset = start_of_cluster(s, *host_offset);
-    ret = do_alloc_cluster_offset(bs, guest_offset, &alloc_cluster_offset,
-                                  &nb_clusters);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* Can't extend contiguous allocation */
-    if (nb_clusters == 0) {
-        *bytes = 0;
-        return 0;
-    }
-
-    /*
-     * Save info needed for meta data update.
-     *
-     * requested_sectors: Number of sectors from the start of the first
-     * newly allocated cluster to the end of the (possibly shortened
-     * before) write request.
-     *
-     * avail_sectors: Number of sectors from the start of the first
-     * newly allocated to the end of the last newly allocated cluster.
-     *
-     * nb_sectors: The number of sectors from the start of the first
-     * newly allocated cluster to the end of the area that the write
-     * request actually writes to (excluding COW at the end)
-     */
-    int requested_sectors =
-        (*bytes + offset_into_cluster(s, guest_offset))
-        >> BDRV_SECTOR_BITS;
-    int avail_sectors = nb_clusters
-                        << (s->cluster_bits - BDRV_SECTOR_BITS);
-    int alloc_n_start = offset_into_cluster(s, guest_offset)
-                        >> BDRV_SECTOR_BITS;
-    int nb_sectors = MIN(requested_sectors, avail_sectors);
-    QCowL2Meta *old_m = *m;
-
-    *m = g_malloc0(sizeof(**m));
-
-    **m = (QCowL2Meta) {
-        .next           = old_m,
-
-        .alloc_offset   = alloc_cluster_offset,
-        .offset         = start_of_cluster(s, guest_offset),
-        .nb_clusters    = nb_clusters,
-        .nb_available   = nb_sectors,
-
-        .cow_start = {
-            .offset     = 0,
-            .nb_sectors = alloc_n_start,
-        },
-        .cow_end = {
-            .offset     = nb_sectors * BDRV_SECTOR_SIZE,
-            .nb_sectors = avail_sectors - nb_sectors,
-        },
-    };
-    qemu_co_queue_init(&(*m)->dependent_requests);
-    QLIST_INSERT_HEAD(&s->cluster_allocs, *m, next_in_flight);
-
-    *host_offset = alloc_cluster_offset + offset_into_cluster(s, guest_offset);
-    *bytes = MIN(*bytes, (nb_sectors * BDRV_SECTOR_SIZE)
-                         - offset_into_cluster(s, guest_offset));
-    assert(*bytes != 0);
-
-    return 1;
-
-fail:
-    if (*m && (*m)->nb_clusters > 0) {
-        QLIST_REMOVE(*m, next_in_flight);
-    }
-    return ret;
-}
-
-/*
- * alloc_cluster_offset
- *
- * For a given offset on the virtual disk, find the cluster offset in qcow2
- * file. If the offset is not found, allocate a new cluster.
- *
- * If the cluster was already allocated, m->nb_clusters is set to 0 and
- * other fields in m are meaningless.
- *
- * If the cluster is newly allocated, m->nb_clusters is set to the number of
- * contiguous clusters that have been allocated. In this case, the other
- * fields of m are valid and contain information about the first allocated
- * cluster.
- *
- * If the request conflicts with another write request in flight, the coroutine
- * is queued and will be reentered when the dependency has completed.
- *
- * Return 0 on success and -errno in error cases
- */
-int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,
-    int n_start, int n_end, int *num, uint64_t *host_offset, QCowL2Meta **m)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t start, remaining;
-    uint64_t cluster_offset;
-    uint64_t cur_bytes;
-    int ret;
-
-    trace_qcow2_alloc_clusters_offset(qemu_coroutine_self(), offset,
-                                      n_start, n_end);
-
-    assert(n_start * BDRV_SECTOR_SIZE == offset_into_cluster(s, offset));
-    offset = start_of_cluster(s, offset);
-
-again:
-    start = offset + (n_start << BDRV_SECTOR_BITS);
-    remaining = (n_end - n_start) << BDRV_SECTOR_BITS;
-    cluster_offset = 0;
-    *host_offset = 0;
-    cur_bytes = 0;
-    *m = NULL;
-
-    while (true) {
-
-        if (!*host_offset) {
-            *host_offset = start_of_cluster(s, cluster_offset);
-        }
-
-        assert(remaining >= cur_bytes);
-
-        start           += cur_bytes;
-        remaining       -= cur_bytes;
-        cluster_offset  += cur_bytes;
-
-        if (remaining == 0) {
-            break;
-        }
-
-        cur_bytes = remaining;
-
-        /*
-         * Now start gathering as many contiguous clusters as possible:
-         *
-         * 1. Check for overlaps with in-flight allocations
-         *
-         *      a) Overlap not in the first cluster -> shorten this request and
-         *         let the caller handle the rest in its next loop iteration.
-         *
-         *      b) Real overlaps of two requests. Yield and restart the search
-         *         for contiguous clusters (the situation could have changed
-         *         while we were sleeping)
-         *
-         *      c) TODO: Request starts in the same cluster as the in-flight
-         *         allocation ends. Shorten the COW of the in-fight allocation,
-         *         set cluster_offset to write to the same cluster and set up
-         *         the right synchronisation between the in-flight request and
-         *         the new one.
-         */
-        ret = handle_dependencies(bs, start, &cur_bytes, m);
-        if (ret == -EAGAIN) {
-            /* Currently handle_dependencies() doesn't yield if we already had
-             * an allocation. If it did, we would have to clean up the L2Meta
-             * structs before starting over. */
-            assert(*m == NULL);
-            goto again;
-        } else if (ret < 0) {
-            return ret;
-        } else if (cur_bytes == 0) {
-            break;
-        } else {
-            /* handle_dependencies() may have decreased cur_bytes (shortened
-             * the allocations below) so that the next dependency is processed
-             * correctly during the next loop iteration. */
-        }
-
-        /*
-         * 2. Count contiguous COPIED clusters.
-         */
-        ret = handle_copied(bs, start, &cluster_offset, &cur_bytes, m);
-        if (ret < 0) {
-            return ret;
-        } else if (ret) {
-            continue;
-        } else if (cur_bytes == 0) {
-            break;
-        }
-
-        /*
-         * 3. If the request still hasn't completed, allocate new clusters,
-         *    considering any cluster_offset of steps 1c or 2.
-         */
-        ret = handle_alloc(bs, start, &cluster_offset, &cur_bytes, m);
-        if (ret < 0) {
-            return ret;
-        } else if (ret) {
-            continue;
-        } else {
-            assert(cur_bytes == 0);
-            break;
-        }
-    }
-
-    *num = (n_end - n_start) - (remaining >> BDRV_SECTOR_BITS);
-    assert(*num > 0);
-    assert(*host_offset != 0);
-
-    return 0;
-}
-
-static int decompress_buffer(uint8_t *out_buf, int out_buf_size,
-                             const uint8_t *buf, int buf_size)
-{
-    z_stream strm1, *strm = &strm1;
-    int ret, out_len;
-
-    memset(strm, 0, sizeof(*strm));
-
-    strm->next_in = (uint8_t *)buf;
-    strm->avail_in = buf_size;
-    strm->next_out = out_buf;
-    strm->avail_out = out_buf_size;
-
-    ret = inflateInit2(strm, -12);
-    if (ret != Z_OK)
-        return -1;
-    ret = inflate(strm, Z_FINISH);
-    out_len = strm->next_out - out_buf;
-    if ((ret != Z_STREAM_END && ret != Z_BUF_ERROR) ||
-        out_len != out_buf_size) {
-        inflateEnd(strm);
-        return -1;
-    }
-    inflateEnd(strm);
-    return 0;
-}
-
-int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret, csize, nb_csectors, sector_offset;
-    uint64_t coffset;
-
-    coffset = cluster_offset & s->cluster_offset_mask;
-    if (s->cluster_cache_offset != coffset) {
-        nb_csectors = ((cluster_offset >> s->csize_shift) & s->csize_mask) + 1;
-        sector_offset = coffset & 511;
-        csize = nb_csectors * 512 - sector_offset;
-        BLKDBG_EVENT(bs->file, BLKDBG_READ_COMPRESSED);
-        ret = bdrv_read(bs->file, coffset >> 9, s->cluster_data, nb_csectors);
-        if (ret < 0) {
-            return ret;
-        }
-        if (decompress_buffer(s->cluster_cache, s->cluster_size,
-                              s->cluster_data + sector_offset, csize) < 0) {
-            return -EIO;
-        }
-        s->cluster_cache_offset = coffset;
-    }
-    return 0;
-}
-
-/*
- * This discards as many clusters of nb_clusters as possible at once (i.e.
- * all clusters in the same L2 table) and returns the number of discarded
- * clusters.
- */
-static int discard_single_l2(BlockDriverState *bs, uint64_t offset,
-    unsigned int nb_clusters)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t *l2_table;
-    int l2_index;
-    int ret;
-    int i;
-
-    ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* Limit nb_clusters to one L2 table */
-    nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
-
-    for (i = 0; i < nb_clusters; i++) {
-        uint64_t old_offset;
-
-        old_offset = be64_to_cpu(l2_table[l2_index + i]);
-        if ((old_offset & L2E_OFFSET_MASK) == 0) {
-            continue;
-        }
-
-        /* First remove L2 entries */
-        qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
-        l2_table[l2_index + i] = cpu_to_be64(0);
-
-        /* Then decrease the refcount */
-        qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST);
-    }
-
-    ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-    if (ret < 0) {
-        return ret;
-    }
-
-    return nb_clusters;
-}
-
-int qcow2_discard_clusters(BlockDriverState *bs, uint64_t offset,
-    int nb_sectors)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t end_offset;
-    unsigned int nb_clusters;
-    int ret;
-
-    end_offset = offset + (nb_sectors << BDRV_SECTOR_BITS);
-
-    /* Round start up and end down */
-    offset = align_offset(offset, s->cluster_size);
-    end_offset &= ~(s->cluster_size - 1);
-
-    if (offset > end_offset) {
-        return 0;
-    }
-
-    nb_clusters = size_to_clusters(s, end_offset - offset);
-
-    s->cache_discards = true;
-
-    /* Each L2 table is handled by its own loop iteration */
-    while (nb_clusters > 0) {
-        ret = discard_single_l2(bs, offset, nb_clusters);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        nb_clusters -= ret;
-        offset += (ret * s->cluster_size);
-    }
-
-    ret = 0;
-fail:
-    s->cache_discards = false;
-    qcow2_process_discards(bs, ret);
-
-    return ret;
-}
-
-/*
- * This zeroes as many clusters of nb_clusters as possible at once (i.e.
- * all clusters in the same L2 table) and returns the number of zeroed
- * clusters.
- */
-static int zero_single_l2(BlockDriverState *bs, uint64_t offset,
-    unsigned int nb_clusters)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t *l2_table;
-    int l2_index;
-    int ret;
-    int i;
-
-    ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* Limit nb_clusters to one L2 table */
-    nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
-
-    for (i = 0; i < nb_clusters; i++) {
-        uint64_t old_offset;
-
-        old_offset = be64_to_cpu(l2_table[l2_index + i]);
-
-        /* Update L2 entries */
-        qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
-        if (old_offset & QCOW_OFLAG_COMPRESSED) {
-            l2_table[l2_index + i] = cpu_to_be64(QCOW_OFLAG_ZERO);
-            qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST);
-        } else {
-            l2_table[l2_index + i] |= cpu_to_be64(QCOW_OFLAG_ZERO);
-        }
-    }
-
-    ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-    if (ret < 0) {
-        return ret;
-    }
-
-    return nb_clusters;
-}
-
-int qcow2_zero_clusters(BlockDriverState *bs, uint64_t offset, int nb_sectors)
-{
-    BDRVQcowState *s = bs->opaque;
-    unsigned int nb_clusters;
-    int ret;
-
-    /* The zero flag is only supported by version 3 and newer */
-    if (s->qcow_version < 3) {
-        return -ENOTSUP;
-    }
-
-    /* Each L2 table is handled by its own loop iteration */
-    nb_clusters = size_to_clusters(s, nb_sectors << BDRV_SECTOR_BITS);
-
-    s->cache_discards = true;
-
-    while (nb_clusters > 0) {
-        ret = zero_single_l2(bs, offset, nb_clusters);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        nb_clusters -= ret;
-        offset += (ret * s->cluster_size);
-    }
-
-    ret = 0;
-fail:
-    s->cache_discards = false;
-    qcow2_process_discards(bs, ret);
-
-    return ret;
-}
diff --git a/contrib/qemu/block/qcow2-refcount.c b/contrib/qemu/block/qcow2-refcount.c
deleted file mode 100644
index 1244693f3..000000000
--- a/contrib/qemu/block/qcow2-refcount.c
+++ /dev/null
@@ -1,1374 +0,0 @@
-/*
- * Block driver for the QCOW version 2 format
- *
- * Copyright (c) 2004-2006 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "qemu-common.h"
-#include "block/block_int.h"
-#include "block/qcow2.h"
-
-static int64_t alloc_clusters_noref(BlockDriverState *bs, int64_t size);
-static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
-                            int64_t offset, int64_t length,
-                            int addend, enum qcow2_discard_type type);
-
-
-/*********************************************************/
-/* refcount handling */
-
-int qcow2_refcount_init(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret, refcount_table_size2, i;
-
-    refcount_table_size2 = s->refcount_table_size * sizeof(uint64_t);
-    s->refcount_table = g_malloc(refcount_table_size2);
-    if (s->refcount_table_size > 0) {
-        BLKDBG_EVENT(bs->file, BLKDBG_REFTABLE_LOAD);
-        ret = bdrv_pread(bs->file, s->refcount_table_offset,
-                         s->refcount_table, refcount_table_size2);
-        if (ret != refcount_table_size2)
-            goto fail;
-        for(i = 0; i < s->refcount_table_size; i++)
-            be64_to_cpus(&s->refcount_table[i]);
-    }
-    return 0;
- fail:
-    return -ENOMEM;
-}
-
-void qcow2_refcount_close(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    g_free(s->refcount_table);
-}
-
-
-static int load_refcount_block(BlockDriverState *bs,
-                               int64_t refcount_block_offset,
-                               void **refcount_block)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret;
-
-    BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_LOAD);
-    ret = qcow2_cache_get(bs, s->refcount_block_cache, refcount_block_offset,
-        refcount_block);
-
-    return ret;
-}
-
-/*
- * Returns the refcount of the cluster given by its index. Any non-negative
- * return value is the refcount of the cluster, negative values are -errno
- * and indicate an error.
- */
-static int get_refcount(BlockDriverState *bs, int64_t cluster_index)
-{
-    BDRVQcowState *s = bs->opaque;
-    int refcount_table_index, block_index;
-    int64_t refcount_block_offset;
-    int ret;
-    uint16_t *refcount_block;
-    uint16_t refcount;
-
-    refcount_table_index = cluster_index >> (s->cluster_bits - REFCOUNT_SHIFT);
-    if (refcount_table_index >= s->refcount_table_size)
-        return 0;
-    refcount_block_offset = s->refcount_table[refcount_table_index];
-    if (!refcount_block_offset)
-        return 0;
-
-    ret = qcow2_cache_get(bs, s->refcount_block_cache, refcount_block_offset,
-        (void**) &refcount_block);
-    if (ret < 0) {
-        return ret;
-    }
-
-    block_index = cluster_index &
-        ((1 << (s->cluster_bits - REFCOUNT_SHIFT)) - 1);
-    refcount = be16_to_cpu(refcount_block[block_index]);
-
-    ret = qcow2_cache_put(bs, s->refcount_block_cache,
-        (void**) &refcount_block);
-    if (ret < 0) {
-        return ret;
-    }
-
-    return refcount;
-}
-
-/*
- * Rounds the refcount table size up to avoid growing the table for each single
- * refcount block that is allocated.
- */
-static unsigned int next_refcount_table_size(BDRVQcowState *s,
-    unsigned int min_size)
-{
-    unsigned int min_clusters = (min_size >> (s->cluster_bits - 3)) + 1;
-    unsigned int refcount_table_clusters =
-        MAX(1, s->refcount_table_size >> (s->cluster_bits - 3));
-
-    while (min_clusters > refcount_table_clusters) {
-        refcount_table_clusters = (refcount_table_clusters * 3 + 1) / 2;
-    }
-
-    return refcount_table_clusters << (s->cluster_bits - 3);
-}
-
-
-/* Checks if two offsets are described by the same refcount block */
-static int in_same_refcount_block(BDRVQcowState *s, uint64_t offset_a,
-    uint64_t offset_b)
-{
-    uint64_t block_a = offset_a >> (2 * s->cluster_bits - REFCOUNT_SHIFT);
-    uint64_t block_b = offset_b >> (2 * s->cluster_bits - REFCOUNT_SHIFT);
-
-    return (block_a == block_b);
-}
-
-/*
- * Loads a refcount block. If it doesn't exist yet, it is allocated first
- * (including growing the refcount table if needed).
- *
- * Returns 0 on success or -errno in error case
- */
-static int alloc_refcount_block(BlockDriverState *bs,
-    int64_t cluster_index, uint16_t **refcount_block)
-{
-    BDRVQcowState *s = bs->opaque;
-    unsigned int refcount_table_index;
-    int ret;
-
-    BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_ALLOC);
-
-    /* Find the refcount block for the given cluster */
-    refcount_table_index = cluster_index >> (s->cluster_bits - REFCOUNT_SHIFT);
-
-    if (refcount_table_index < s->refcount_table_size) {
-
-        uint64_t refcount_block_offset =
-            s->refcount_table[refcount_table_index] & REFT_OFFSET_MASK;
-
-        /* If it's already there, we're done */
-        if (refcount_block_offset) {
-             return load_refcount_block(bs, refcount_block_offset,
-                 (void**) refcount_block);
-        }
-    }
-
-    /*
-     * If we came here, we need to allocate something. Something is at least
-     * a cluster for the new refcount block. It may also include a new refcount
-     * table if the old refcount table is too small.
-     *
-     * Note that allocating clusters here needs some special care:
-     *
-     * - We can't use the normal qcow2_alloc_clusters(), it would try to
-     *   increase the refcount and very likely we would end up with an endless
-     *   recursion. Instead we must place the refcount blocks in a way that
-     *   they can describe them themselves.
-     *
-     * - We need to consider that at this point we are inside update_refcounts
-     *   and doing the initial refcount increase. This means that some clusters
-     *   have already been allocated by the caller, but their refcount isn't
-     *   accurate yet. free_cluster_index tells us where this allocation ends
-     *   as long as we don't overwrite it by freeing clusters.
-     *
-     * - alloc_clusters_noref and qcow2_free_clusters may load a different
-     *   refcount block into the cache
-     */
-
-    *refcount_block = NULL;
-
-    /* We write to the refcount table, so we might depend on L2 tables */
-    ret = qcow2_cache_flush(bs, s->l2_table_cache);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* Allocate the refcount block itself and mark it as used */
-    int64_t new_block = alloc_clusters_noref(bs, s->cluster_size);
-    if (new_block < 0) {
-        return new_block;
-    }
-
-#ifdef DEBUG_ALLOC2
-    fprintf(stderr, "qcow2: Allocate refcount block %d for %" PRIx64
-        " at %" PRIx64 "\n",
-        refcount_table_index, cluster_index << s->cluster_bits, new_block);
-#endif
-
-    if (in_same_refcount_block(s, new_block, cluster_index << s->cluster_bits)) {
-        /* Zero the new refcount block before updating it */
-        ret = qcow2_cache_get_empty(bs, s->refcount_block_cache, new_block,
-            (void**) refcount_block);
-        if (ret < 0) {
-            goto fail_block;
-        }
-
-        memset(*refcount_block, 0, s->cluster_size);
-
-        /* The block describes itself, need to update the cache */
-        int block_index = (new_block >> s->cluster_bits) &
-            ((1 << (s->cluster_bits - REFCOUNT_SHIFT)) - 1);
-        (*refcount_block)[block_index] = cpu_to_be16(1);
-    } else {
-        /* Described somewhere else. This can recurse at most twice before we
-         * arrive at a block that describes itself. */
-        ret = update_refcount(bs, new_block, s->cluster_size, 1,
-                              QCOW2_DISCARD_NEVER);
-        if (ret < 0) {
-            goto fail_block;
-        }
-
-        ret = qcow2_cache_flush(bs, s->refcount_block_cache);
-        if (ret < 0) {
-            goto fail_block;
-        }
-
-        /* Initialize the new refcount block only after updating its refcount,
-         * update_refcount uses the refcount cache itself */
-        ret = qcow2_cache_get_empty(bs, s->refcount_block_cache, new_block,
-            (void**) refcount_block);
-        if (ret < 0) {
-            goto fail_block;
-        }
-
-        memset(*refcount_block, 0, s->cluster_size);
-    }
-
-    /* Now the new refcount block needs to be written to disk */
-    BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_ALLOC_WRITE);
-    qcow2_cache_entry_mark_dirty(s->refcount_block_cache, *refcount_block);
-    ret = qcow2_cache_flush(bs, s->refcount_block_cache);
-    if (ret < 0) {
-        goto fail_block;
-    }
-
-    /* If the refcount table is big enough, just hook the block up there */
-    if (refcount_table_index < s->refcount_table_size) {
-        uint64_t data64 = cpu_to_be64(new_block);
-        BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_ALLOC_HOOKUP);
-        ret = bdrv_pwrite_sync(bs->file,
-            s->refcount_table_offset + refcount_table_index * sizeof(uint64_t),
-            &data64, sizeof(data64));
-        if (ret < 0) {
-            goto fail_block;
-        }
-
-        s->refcount_table[refcount_table_index] = new_block;
-        return 0;
-    }
-
-    ret = qcow2_cache_put(bs, s->refcount_block_cache, (void**) refcount_block);
-    if (ret < 0) {
-        goto fail_block;
-    }
-
-    /*
-     * If we come here, we need to grow the refcount table. Again, a new
-     * refcount table needs some space and we can't simply allocate to avoid
-     * endless recursion.
-     *
-     * Therefore let's grab new refcount blocks at the end of the image, which
-     * will describe themselves and the new refcount table. This way we can
-     * reference them only in the new table and do the switch to the new
-     * refcount table at once without producing an inconsistent state in
-     * between.
-     */
-    BLKDBG_EVENT(bs->file, BLKDBG_REFTABLE_GROW);
-
-    /* Calculate the number of refcount blocks needed so far */
-    uint64_t refcount_block_clusters = 1 << (s->cluster_bits - REFCOUNT_SHIFT);
-    uint64_t blocks_used = (s->free_cluster_index +
-        refcount_block_clusters - 1) / refcount_block_clusters;
-
-    /* And now we need at least one block more for the new metadata */
-    uint64_t table_size = next_refcount_table_size(s, blocks_used + 1);
-    uint64_t last_table_size;
-    uint64_t blocks_clusters;
-    do {
-        uint64_t table_clusters =
-            size_to_clusters(s, table_size * sizeof(uint64_t));
-        blocks_clusters = 1 +
-            ((table_clusters + refcount_block_clusters - 1)
-            / refcount_block_clusters);
-        uint64_t meta_clusters = table_clusters + blocks_clusters;
-
-        last_table_size = table_size;
-        table_size = next_refcount_table_size(s, blocks_used +
-            ((meta_clusters + refcount_block_clusters - 1)
-            / refcount_block_clusters));
-
-    } while (last_table_size != table_size);
-
-#ifdef DEBUG_ALLOC2
-    fprintf(stderr, "qcow2: Grow refcount table %" PRId32 " => %" PRId64 "\n",
-        s->refcount_table_size, table_size);
-#endif
-
-    /* Create the new refcount table and blocks */
-    uint64_t meta_offset = (blocks_used * refcount_block_clusters) *
-        s->cluster_size;
-    uint64_t table_offset = meta_offset + blocks_clusters * s->cluster_size;
-    uint16_t *new_blocks = g_malloc0(blocks_clusters * s->cluster_size);
-    uint64_t *new_table = g_malloc0(table_size * sizeof(uint64_t));
-
-    assert(meta_offset >= (s->free_cluster_index * s->cluster_size));
-
-    /* Fill the new refcount table */
-    memcpy(new_table, s->refcount_table,
-        s->refcount_table_size * sizeof(uint64_t));
-    new_table[refcount_table_index] = new_block;
-
-    int i;
-    for (i = 0; i < blocks_clusters; i++) {
-        new_table[blocks_used + i] = meta_offset + (i * s->cluster_size);
-    }
-
-    /* Fill the refcount blocks */
-    uint64_t table_clusters = size_to_clusters(s, table_size * sizeof(uint64_t));
-    int block = 0;
-    for (i = 0; i < table_clusters + blocks_clusters; i++) {
-        new_blocks[block++] = cpu_to_be16(1);
-    }
-
-    /* Write refcount blocks to disk */
-    BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_ALLOC_WRITE_BLOCKS);
-    ret = bdrv_pwrite_sync(bs->file, meta_offset, new_blocks,
-        blocks_clusters * s->cluster_size);
-    g_free(new_blocks);
-    if (ret < 0) {
-        goto fail_table;
-    }
-
-    /* Write refcount table to disk */
-    for(i = 0; i < table_size; i++) {
-        cpu_to_be64s(&new_table[i]);
-    }
-
-    BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_ALLOC_WRITE_TABLE);
-    ret = bdrv_pwrite_sync(bs->file, table_offset, new_table,
-        table_size * sizeof(uint64_t));
-    if (ret < 0) {
-        goto fail_table;
-    }
-
-    for(i = 0; i < table_size; i++) {
-        be64_to_cpus(&new_table[i]);
-    }
-
-    /* Hook up the new refcount table in the qcow2 header */
-    uint8_t data[12];
-    cpu_to_be64w((uint64_t*)data, table_offset);
-    cpu_to_be32w((uint32_t*)(data + 8), table_clusters);
-    BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_ALLOC_SWITCH_TABLE);
-    ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, refcount_table_offset),
-        data, sizeof(data));
-    if (ret < 0) {
-        goto fail_table;
-    }
-
-    /* And switch it in memory */
-    uint64_t old_table_offset = s->refcount_table_offset;
-    uint64_t old_table_size = s->refcount_table_size;
-
-    g_free(s->refcount_table);
-    s->refcount_table = new_table;
-    s->refcount_table_size = table_size;
-    s->refcount_table_offset = table_offset;
-
-    /* Free old table. Remember, we must not change free_cluster_index */
-    uint64_t old_free_cluster_index = s->free_cluster_index;
-    qcow2_free_clusters(bs, old_table_offset, old_table_size * sizeof(uint64_t),
-                        QCOW2_DISCARD_OTHER);
-    s->free_cluster_index = old_free_cluster_index;
-
-    ret = load_refcount_block(bs, new_block, (void**) refcount_block);
-    if (ret < 0) {
-        return ret;
-    }
-
-    return 0;
-
-fail_table:
-    g_free(new_table);
-fail_block:
-    if (*refcount_block != NULL) {
-        qcow2_cache_put(bs, s->refcount_block_cache, (void**) refcount_block);
-    }
-    return ret;
-}
-
-void qcow2_process_discards(BlockDriverState *bs, int ret)
-{
-    BDRVQcowState *s = bs->opaque;
-    Qcow2DiscardRegion *d, *next;
-
-    QTAILQ_FOREACH_SAFE(d, &s->discards, next, next) {
-        QTAILQ_REMOVE(&s->discards, d, next);
-
-        /* Discard is optional, ignore the return value */
-        if (ret >= 0) {
-            bdrv_discard(bs->file,
-                         d->offset >> BDRV_SECTOR_BITS,
-                         d->bytes >> BDRV_SECTOR_BITS);
-        }
-
-        g_free(d);
-    }
-}
-
-static void update_refcount_discard(BlockDriverState *bs,
-                                    uint64_t offset, uint64_t length)
-{
-    BDRVQcowState *s = bs->opaque;
-    Qcow2DiscardRegion *d, *p, *next;
-
-    QTAILQ_FOREACH(d, &s->discards, next) {
-        uint64_t new_start = MIN(offset, d->offset);
-        uint64_t new_end = MAX(offset + length, d->offset + d->bytes);
-
-        if (new_end - new_start <= length + d->bytes) {
-            /* There can't be any overlap, areas ending up here have no
-             * references any more and therefore shouldn't get freed another
-             * time. */
-            assert(d->bytes + length == new_end - new_start);
-            d->offset = new_start;
-            d->bytes = new_end - new_start;
-            goto found;
-        }
-    }
-
-    d = g_malloc(sizeof(*d));
-    *d = (Qcow2DiscardRegion) {
-        .bs     = bs,
-        .offset = offset,
-        .bytes  = length,
-    };
-    QTAILQ_INSERT_TAIL(&s->discards, d, next);
-
-found:
-    /* Merge discard requests if they are adjacent now */
-    QTAILQ_FOREACH_SAFE(p, &s->discards, next, next) {
-        if (p == d
-            || p->offset > d->offset + d->bytes
-            || d->offset > p->offset + p->bytes)
-        {
-            continue;
-        }
-
-        /* Still no overlap possible */
-        assert(p->offset == d->offset + d->bytes
-            || d->offset == p->offset + p->bytes);
-
-        QTAILQ_REMOVE(&s->discards, p, next);
-        d->offset = MIN(d->offset, p->offset);
-        d->bytes += p->bytes;
-    }
-}
-
-/* XXX: cache several refcount block clusters ? */
-static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
-    int64_t offset, int64_t length, int addend, enum qcow2_discard_type type)
-{
-    BDRVQcowState *s = bs->opaque;
-    int64_t start, last, cluster_offset;
-    uint16_t *refcount_block = NULL;
-    int64_t old_table_index = -1;
-    int ret;
-
-#ifdef DEBUG_ALLOC2
-    fprintf(stderr, "update_refcount: offset=%" PRId64 " size=%" PRId64 " addend=%d\n",
-           offset, length, addend);
-#endif
-    if (length < 0) {
-        return -EINVAL;
-    } else if (length == 0) {
-        return 0;
-    }
-
-    if (addend < 0) {
-        qcow2_cache_set_dependency(bs, s->refcount_block_cache,
-            s->l2_table_cache);
-    }
-
-    start = offset & ~(s->cluster_size - 1);
-    last = (offset + length - 1) & ~(s->cluster_size - 1);
-    for(cluster_offset = start; cluster_offset <= last;
-        cluster_offset += s->cluster_size)
-    {
-        int block_index, refcount;
-        int64_t cluster_index = cluster_offset >> s->cluster_bits;
-        int64_t table_index =
-            cluster_index >> (s->cluster_bits - REFCOUNT_SHIFT);
-
-        /* Load the refcount block and allocate it if needed */
-        if (table_index != old_table_index) {
-            if (refcount_block) {
-                ret = qcow2_cache_put(bs, s->refcount_block_cache,
-                    (void**) &refcount_block);
-                if (ret < 0) {
-                    goto fail;
-                }
-            }
-
-            ret = alloc_refcount_block(bs, cluster_index, &refcount_block);
-            if (ret < 0) {
-                goto fail;
-            }
-        }
-        old_table_index = table_index;
-
-        qcow2_cache_entry_mark_dirty(s->refcount_block_cache, refcount_block);
-
-        /* we can update the count and save it */
-        block_index = cluster_index &
-            ((1 << (s->cluster_bits - REFCOUNT_SHIFT)) - 1);
-
-        refcount = be16_to_cpu(refcount_block[block_index]);
-        refcount += addend;
-        if (refcount < 0 || refcount > 0xffff) {
-            ret = -EINVAL;
-            goto fail;
-        }
-        if (refcount == 0 && cluster_index < s->free_cluster_index) {
-            s->free_cluster_index = cluster_index;
-        }
-        refcount_block[block_index] = cpu_to_be16(refcount);
-
-        if (refcount == 0 && s->discard_passthrough[type]) {
-            update_refcount_discard(bs, cluster_offset, s->cluster_size);
-        }
-    }
-
-    ret = 0;
-fail:
-    if (!s->cache_discards) {
-        qcow2_process_discards(bs, ret);
-    }
-
-    /* Write last changed block to disk */
-    if (refcount_block) {
-        int wret;
-        wret = qcow2_cache_put(bs, s->refcount_block_cache,
-            (void**) &refcount_block);
-        if (wret < 0) {
-            return ret < 0 ? ret : wret;
-        }
-    }
-
-    /*
-     * Try do undo any updates if an error is returned (This may succeed in
-     * some cases like ENOSPC for allocating a new refcount block)
-     */
-    if (ret < 0) {
-        int dummy;
-        dummy = update_refcount(bs, offset, cluster_offset - offset, -addend,
-                                QCOW2_DISCARD_NEVER);
-        (void)dummy;
-    }
-
-    return ret;
-}
-
-/*
- * Increases or decreases the refcount of a given cluster by one.
- * addend must be 1 or -1.
- *
- * If the return value is non-negative, it is the new refcount of the cluster.
- * If it is negative, it is -errno and indicates an error.
- */
-static int update_cluster_refcount(BlockDriverState *bs,
-                                   int64_t cluster_index,
-                                   int addend,
-                                   enum qcow2_discard_type type)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret;
-
-    ret = update_refcount(bs, cluster_index << s->cluster_bits, 1, addend,
-                          type);
-    if (ret < 0) {
-        return ret;
-    }
-
-    return get_refcount(bs, cluster_index);
-}
-
-
-
-/*********************************************************/
-/* cluster allocation functions */
-
-
-
-/* return < 0 if error */
-static int64_t alloc_clusters_noref(BlockDriverState *bs, int64_t size)
-{
-    BDRVQcowState *s = bs->opaque;
-    int i, nb_clusters, refcount;
-
-    nb_clusters = size_to_clusters(s, size);
-retry:
-    for(i = 0; i < nb_clusters; i++) {
-        int64_t next_cluster_index = s->free_cluster_index++;
-        refcount = get_refcount(bs, next_cluster_index);
-
-        if (refcount < 0) {
-            return refcount;
-        } else if (refcount != 0) {
-            goto retry;
-        }
-    }
-#ifdef DEBUG_ALLOC2
-    fprintf(stderr, "alloc_clusters: size=%" PRId64 " -> %" PRId64 "\n",
-            size,
-            (s->free_cluster_index - nb_clusters) << s->cluster_bits);
-#endif
-    return (s->free_cluster_index - nb_clusters) << s->cluster_bits;
-}
-
-int64_t qcow2_alloc_clusters(BlockDriverState *bs, int64_t size)
-{
-    int64_t offset;
-    int ret;
-
-    BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_ALLOC);
-    offset = alloc_clusters_noref(bs, size);
-    if (offset < 0) {
-        return offset;
-    }
-
-    ret = update_refcount(bs, offset, size, 1, QCOW2_DISCARD_NEVER);
-    if (ret < 0) {
-        return ret;
-    }
-
-    return offset;
-}
-
-int qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
-    int nb_clusters)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t cluster_index;
-    uint64_t old_free_cluster_index;
-    int i, refcount, ret;
-
-    /* Check how many clusters there are free */
-    cluster_index = offset >> s->cluster_bits;
-    for(i = 0; i < nb_clusters; i++) {
-        refcount = get_refcount(bs, cluster_index++);
-
-        if (refcount < 0) {
-            return refcount;
-        } else if (refcount != 0) {
-            break;
-        }
-    }
-
-    /* And then allocate them */
-    old_free_cluster_index = s->free_cluster_index;
-    s->free_cluster_index = cluster_index + i;
-
-    ret = update_refcount(bs, offset, i << s->cluster_bits, 1,
-                          QCOW2_DISCARD_NEVER);
-    if (ret < 0) {
-        return ret;
-    }
-
-    s->free_cluster_index = old_free_cluster_index;
-
-    return i;
-}
-
-/* only used to allocate compressed sectors. We try to allocate
-   contiguous sectors. size must be <= cluster_size */
-int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size)
-{
-    BDRVQcowState *s = bs->opaque;
-    int64_t offset, cluster_offset;
-    int free_in_cluster;
-
-    BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_ALLOC_BYTES);
-    assert(size > 0 && size <= s->cluster_size);
-    if (s->free_byte_offset == 0) {
-        offset = qcow2_alloc_clusters(bs, s->cluster_size);
-        if (offset < 0) {
-            return offset;
-        }
-        s->free_byte_offset = offset;
-    }
- redo:
-    free_in_cluster = s->cluster_size -
-        (s->free_byte_offset & (s->cluster_size - 1));
-    if (size <= free_in_cluster) {
-        /* enough space in current cluster */
-        offset = s->free_byte_offset;
-        s->free_byte_offset += size;
-        free_in_cluster -= size;
-        if (free_in_cluster == 0)
-            s->free_byte_offset = 0;
-        if ((offset & (s->cluster_size - 1)) != 0)
-            update_cluster_refcount(bs, offset >> s->cluster_bits, 1,
-                                    QCOW2_DISCARD_NEVER);
-    } else {
-        offset = qcow2_alloc_clusters(bs, s->cluster_size);
-        if (offset < 0) {
-            return offset;
-        }
-        cluster_offset = s->free_byte_offset & ~(s->cluster_size - 1);
-        if ((cluster_offset + s->cluster_size) == offset) {
-            /* we are lucky: contiguous data */
-            offset = s->free_byte_offset;
-            update_cluster_refcount(bs, offset >> s->cluster_bits, 1,
-                                    QCOW2_DISCARD_NEVER);
-            s->free_byte_offset += size;
-        } else {
-            s->free_byte_offset = offset;
-            goto redo;
-        }
-    }
-
-    /* The cluster refcount was incremented, either by qcow2_alloc_clusters()
-     * or explicitly by update_cluster_refcount().  Refcount blocks must be
-     * flushed before the caller's L2 table updates.
-     */
-    qcow2_cache_set_dependency(bs, s->l2_table_cache, s->refcount_block_cache);
-    return offset;
-}
-
-void qcow2_free_clusters(BlockDriverState *bs,
-                          int64_t offset, int64_t size,
-                          enum qcow2_discard_type type)
-{
-    int ret;
-
-    BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_FREE);
-    ret = update_refcount(bs, offset, size, -1, type);
-    if (ret < 0) {
-        fprintf(stderr, "qcow2_free_clusters failed: %s\n", strerror(-ret));
-        /* TODO Remember the clusters to free them later and avoid leaking */
-    }
-}
-
-/*
- * Free a cluster using its L2 entry (handles clusters of all types, e.g.
- * normal cluster, compressed cluster, etc.)
- */
-void qcow2_free_any_clusters(BlockDriverState *bs, uint64_t l2_entry,
-                             int nb_clusters, enum qcow2_discard_type type)
-{
-    BDRVQcowState *s = bs->opaque;
-
-    switch (qcow2_get_cluster_type(l2_entry)) {
-    case QCOW2_CLUSTER_COMPRESSED:
-        {
-            int nb_csectors;
-            nb_csectors = ((l2_entry >> s->csize_shift) &
-                           s->csize_mask) + 1;
-            qcow2_free_clusters(bs,
-                (l2_entry & s->cluster_offset_mask) & ~511,
-                nb_csectors * 512, type);
-        }
-        break;
-    case QCOW2_CLUSTER_NORMAL:
-        qcow2_free_clusters(bs, l2_entry & L2E_OFFSET_MASK,
-                            nb_clusters << s->cluster_bits, type);
-        break;
-    case QCOW2_CLUSTER_UNALLOCATED:
-    case QCOW2_CLUSTER_ZERO:
-        break;
-    default:
-        abort();
-    }
-}
-
-
-
-/*********************************************************/
-/* snapshots and image creation */
-
-
-
-/* update the refcounts of snapshots and the copied flag */
-int qcow2_update_snapshot_refcount(BlockDriverState *bs,
-    int64_t l1_table_offset, int l1_size, int addend)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t *l1_table, *l2_table, l2_offset, offset, l1_size2, l1_allocated;
-    int64_t old_offset, old_l2_offset;
-    int i, j, l1_modified = 0, nb_csectors, refcount;
-    int ret;
-
-    l2_table = NULL;
-    l1_table = NULL;
-    l1_size2 = l1_size * sizeof(uint64_t);
-
-    s->cache_discards = true;
-
-    /* WARNING: qcow2_snapshot_goto relies on this function not using the
-     * l1_table_offset when it is the current s->l1_table_offset! Be careful
-     * when changing this! */
-    if (l1_table_offset != s->l1_table_offset) {
-        l1_table = g_malloc0(align_offset(l1_size2, 512));
-        l1_allocated = 1;
-
-        ret = bdrv_pread(bs->file, l1_table_offset, l1_table, l1_size2);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        for(i = 0;i < l1_size; i++)
-            be64_to_cpus(&l1_table[i]);
-    } else {
-        assert(l1_size == s->l1_size);
-        l1_table = s->l1_table;
-        l1_allocated = 0;
-    }
-
-    for(i = 0; i < l1_size; i++) {
-        l2_offset = l1_table[i];
-        if (l2_offset) {
-            old_l2_offset = l2_offset;
-            l2_offset &= L1E_OFFSET_MASK;
-
-            ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset,
-                (void**) &l2_table);
-            if (ret < 0) {
-                goto fail;
-            }
-
-            for(j = 0; j < s->l2_size; j++) {
-                offset = be64_to_cpu(l2_table[j]);
-                if (offset != 0) {
-                    old_offset = offset;
-                    offset &= ~QCOW_OFLAG_COPIED;
-                    if (offset & QCOW_OFLAG_COMPRESSED) {
-                        nb_csectors = ((offset >> s->csize_shift) &
-                                       s->csize_mask) + 1;
-                        if (addend != 0) {
-                            int ret;
-                            ret = update_refcount(bs,
-                                (offset & s->cluster_offset_mask) & ~511,
-                                nb_csectors * 512, addend,
-                                QCOW2_DISCARD_SNAPSHOT);
-                            if (ret < 0) {
-                                goto fail;
-                            }
-                        }
-                        /* compressed clusters are never modified */
-                        refcount = 2;
-                    } else {
-                        uint64_t cluster_index = (offset & L2E_OFFSET_MASK) >> s->cluster_bits;
-                        if (addend != 0) {
-                            refcount = update_cluster_refcount(bs, cluster_index, addend,
-                                                               QCOW2_DISCARD_SNAPSHOT);
-                        } else {
-                            refcount = get_refcount(bs, cluster_index);
-                        }
-
-                        if (refcount < 0) {
-                            ret = refcount;
-                            goto fail;
-                        }
-                    }
-
-                    if (refcount == 1) {
-                        offset |= QCOW_OFLAG_COPIED;
-                    }
-                    if (offset != old_offset) {
-                        if (addend > 0) {
-                            qcow2_cache_set_dependency(bs, s->l2_table_cache,
-                                s->refcount_block_cache);
-                        }
-                        l2_table[j] = cpu_to_be64(offset);
-                        qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
-                    }
-                }
-            }
-
-            ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-            if (ret < 0) {
-                goto fail;
-            }
-
-
-            if (addend != 0) {
-                refcount = update_cluster_refcount(bs, l2_offset >> s->cluster_bits, addend,
-                                                   QCOW2_DISCARD_SNAPSHOT);
-            } else {
-                refcount = get_refcount(bs, l2_offset >> s->cluster_bits);
-            }
-            if (refcount < 0) {
-                ret = refcount;
-                goto fail;
-            } else if (refcount == 1) {
-                l2_offset |= QCOW_OFLAG_COPIED;
-            }
-            if (l2_offset != old_l2_offset) {
-                l1_table[i] = l2_offset;
-                l1_modified = 1;
-            }
-        }
-    }
-
-    ret = bdrv_flush(bs);
-fail:
-    if (l2_table) {
-        qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
-    }
-
-    s->cache_discards = false;
-    qcow2_process_discards(bs, ret);
-
-    /* Update L1 only if it isn't deleted anyway (addend = -1) */
-    if (ret == 0 && addend >= 0 && l1_modified) {
-        for (i = 0; i < l1_size; i++) {
-            cpu_to_be64s(&l1_table[i]);
-        }
-
-        ret = bdrv_pwrite_sync(bs->file, l1_table_offset, l1_table, l1_size2);
-
-        for (i = 0; i < l1_size; i++) {
-            be64_to_cpus(&l1_table[i]);
-        }
-    }
-    if (l1_allocated)
-        g_free(l1_table);
-    return ret;
-}
-
-
-
-
-/*********************************************************/
-/* refcount checking functions */
-
-
-
-/*
- * Increases the refcount for a range of clusters in a given refcount table.
- * This is used to construct a temporary refcount table out of L1 and L2 tables
- * which can be compared the the refcount table saved in the image.
- *
- * Modifies the number of errors in res.
- */
-static void inc_refcounts(BlockDriverState *bs,
-                          BdrvCheckResult *res,
-                          uint16_t *refcount_table,
-                          int refcount_table_size,
-                          int64_t offset, int64_t size)
-{
-    BDRVQcowState *s = bs->opaque;
-    int64_t start, last, cluster_offset;
-    int k;
-
-    if (size <= 0)
-        return;
-
-    start = offset & ~(s->cluster_size - 1);
-    last = (offset + size - 1) & ~(s->cluster_size - 1);
-    for(cluster_offset = start; cluster_offset <= last;
-        cluster_offset += s->cluster_size) {
-        k = cluster_offset >> s->cluster_bits;
-        if (k < 0) {
-            fprintf(stderr, "ERROR: invalid cluster offset=0x%" PRIx64 "\n",
-                cluster_offset);
-            res->corruptions++;
-        } else if (k >= refcount_table_size) {
-            fprintf(stderr, "Warning: cluster offset=0x%" PRIx64 " is after "
-                "the end of the image file, can't properly check refcounts.\n",
-                cluster_offset);
-            res->check_errors++;
-        } else {
-            if (++refcount_table[k] == 0) {
-                fprintf(stderr, "ERROR: overflow cluster offset=0x%" PRIx64
-                    "\n", cluster_offset);
-                res->corruptions++;
-            }
-        }
-    }
-}
-
-/* Flags for check_refcounts_l1() and check_refcounts_l2() */
-enum {
-    CHECK_OFLAG_COPIED = 0x1,   /* check QCOW_OFLAG_COPIED matches refcount */
-    CHECK_FRAG_INFO = 0x2,      /* update BlockFragInfo counters */
-};
-
-/*
- * Increases the refcount in the given refcount table for the all clusters
- * referenced in the L2 table. While doing so, performs some checks on L2
- * entries.
- *
- * Returns the number of errors found by the checks or -errno if an internal
- * error occurred.
- */
-static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
-    uint16_t *refcount_table, int refcount_table_size, int64_t l2_offset,
-    int flags)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t *l2_table, l2_entry;
-    uint64_t next_contiguous_offset = 0;
-    int i, l2_size, nb_csectors, refcount;
-
-    /* Read L2 table from disk */
-    l2_size = s->l2_size * sizeof(uint64_t);
-    l2_table = g_malloc(l2_size);
-
-    if (bdrv_pread(bs->file, l2_offset, l2_table, l2_size) != l2_size)
-        goto fail;
-
-    /* Do the actual checks */
-    for(i = 0; i < s->l2_size; i++) {
-        l2_entry = be64_to_cpu(l2_table[i]);
-
-        switch (qcow2_get_cluster_type(l2_entry)) {
-        case QCOW2_CLUSTER_COMPRESSED:
-            /* Compressed clusters don't have QCOW_OFLAG_COPIED */
-            if (l2_entry & QCOW_OFLAG_COPIED) {
-                fprintf(stderr, "ERROR: cluster %" PRId64 ": "
-                    "copied flag must never be set for compressed "
-                    "clusters\n", l2_entry >> s->cluster_bits);
-                l2_entry &= ~QCOW_OFLAG_COPIED;
-                res->corruptions++;
-            }
-
-            /* Mark cluster as used */
-            nb_csectors = ((l2_entry >> s->csize_shift) &
-                           s->csize_mask) + 1;
-            l2_entry &= s->cluster_offset_mask;
-            inc_refcounts(bs, res, refcount_table, refcount_table_size,
-                l2_entry & ~511, nb_csectors * 512);
-
-            if (flags & CHECK_FRAG_INFO) {
-                res->bfi.allocated_clusters++;
-                res->bfi.compressed_clusters++;
-
-                /* Compressed clusters are fragmented by nature.  Since they
-                 * take up sub-sector space but we only have sector granularity
-                 * I/O we need to re-read the same sectors even for adjacent
-                 * compressed clusters.
-                 */
-                res->bfi.fragmented_clusters++;
-            }
-            break;
-
-        case QCOW2_CLUSTER_ZERO:
-            if ((l2_entry & L2E_OFFSET_MASK) == 0) {
-                break;
-            }
-            /* fall through */
-
-        case QCOW2_CLUSTER_NORMAL:
-        {
-            /* QCOW_OFLAG_COPIED must be set iff refcount == 1 */
-            uint64_t offset = l2_entry & L2E_OFFSET_MASK;
-
-            if (flags & CHECK_OFLAG_COPIED) {
-                refcount = get_refcount(bs, offset >> s->cluster_bits);
-                if (refcount < 0) {
-                    fprintf(stderr, "Can't get refcount for offset %"
-                        PRIx64 ": %s\n", l2_entry, strerror(-refcount));
-                    goto fail;
-                }
-                if ((refcount == 1) != ((l2_entry & QCOW_OFLAG_COPIED) != 0)) {
-                    fprintf(stderr, "ERROR OFLAG_COPIED: offset=%"
-                        PRIx64 " refcount=%d\n", l2_entry, refcount);
-                    res->corruptions++;
-                }
-            }
-
-            if (flags & CHECK_FRAG_INFO) {
-                res->bfi.allocated_clusters++;
-                if (next_contiguous_offset &&
-                    offset != next_contiguous_offset) {
-                    res->bfi.fragmented_clusters++;
-                }
-                next_contiguous_offset = offset + s->cluster_size;
-            }
-
-            /* Mark cluster as used */
-            inc_refcounts(bs, res, refcount_table,refcount_table_size,
-                offset, s->cluster_size);
-
-            /* Correct offsets are cluster aligned */
-            if (offset & (s->cluster_size - 1)) {
-                fprintf(stderr, "ERROR offset=%" PRIx64 ": Cluster is not "
-                    "properly aligned; L2 entry corrupted.\n", offset);
-                res->corruptions++;
-            }
-            break;
-        }
-
-        case QCOW2_CLUSTER_UNALLOCATED:
-            break;
-
-        default:
-            abort();
-        }
-    }
-
-    g_free(l2_table);
-    return 0;
-
-fail:
-    fprintf(stderr, "ERROR: I/O error in check_refcounts_l2\n");
-    g_free(l2_table);
-    return -EIO;
-}
-
-/*
- * Increases the refcount for the L1 table, its L2 tables and all referenced
- * clusters in the given refcount table. While doing so, performs some checks
- * on L1 and L2 entries.
- *
- * Returns the number of errors found by the checks or -errno if an internal
- * error occurred.
- */
-static int check_refcounts_l1(BlockDriverState *bs,
-                              BdrvCheckResult *res,
-                              uint16_t *refcount_table,
-                              int refcount_table_size,
-                              int64_t l1_table_offset, int l1_size,
-                              int flags)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t *l1_table, l2_offset, l1_size2;
-    int i, refcount, ret;
-
-    l1_size2 = l1_size * sizeof(uint64_t);
-
-    /* Mark L1 table as used */
-    inc_refcounts(bs, res, refcount_table, refcount_table_size,
-        l1_table_offset, l1_size2);
-
-    /* Read L1 table entries from disk */
-    if (l1_size2 == 0) {
-        l1_table = NULL;
-    } else {
-        l1_table = g_malloc(l1_size2);
-        if (bdrv_pread(bs->file, l1_table_offset,
-                       l1_table, l1_size2) != l1_size2)
-            goto fail;
-        for(i = 0;i < l1_size; i++)
-            be64_to_cpus(&l1_table[i]);
-    }
-
-    /* Do the actual checks */
-    for(i = 0; i < l1_size; i++) {
-        l2_offset = l1_table[i];
-        if (l2_offset) {
-            /* QCOW_OFLAG_COPIED must be set iff refcount == 1 */
-            if (flags & CHECK_OFLAG_COPIED) {
-                refcount = get_refcount(bs, (l2_offset & ~QCOW_OFLAG_COPIED)
-                    >> s->cluster_bits);
-                if (refcount < 0) {
-                    fprintf(stderr, "Can't get refcount for l2_offset %"
-                        PRIx64 ": %s\n", l2_offset, strerror(-refcount));
-                    goto fail;
-                }
-                if ((refcount == 1) != ((l2_offset & QCOW_OFLAG_COPIED) != 0)) {
-                    fprintf(stderr, "ERROR OFLAG_COPIED: l2_offset=%" PRIx64
-                        " refcount=%d\n", l2_offset, refcount);
-                    res->corruptions++;
-                }
-            }
-
-            /* Mark L2 table as used */
-            l2_offset &= L1E_OFFSET_MASK;
-            inc_refcounts(bs, res, refcount_table, refcount_table_size,
-                l2_offset, s->cluster_size);
-
-            /* L2 tables are cluster aligned */
-            if (l2_offset & (s->cluster_size - 1)) {
-                fprintf(stderr, "ERROR l2_offset=%" PRIx64 ": Table is not "
-                    "cluster aligned; L1 entry corrupted\n", l2_offset);
-                res->corruptions++;
-            }
-
-            /* Process and check L2 entries */
-            ret = check_refcounts_l2(bs, res, refcount_table,
-                                     refcount_table_size, l2_offset, flags);
-            if (ret < 0) {
-                goto fail;
-            }
-        }
-    }
-    g_free(l1_table);
-    return 0;
-
-fail:
-    fprintf(stderr, "ERROR: I/O error in check_refcounts_l1\n");
-    res->check_errors++;
-    g_free(l1_table);
-    return -EIO;
-}
-
-/*
- * Checks an image for refcount consistency.
- *
- * Returns 0 if no errors are found, the number of errors in case the image is
- * detected as corrupted, and -errno when an internal error occurred.
- */
-int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
-                          BdrvCheckMode fix)
-{
-    BDRVQcowState *s = bs->opaque;
-    int64_t size, i, highest_cluster;
-    int nb_clusters, refcount1, refcount2;
-    QCowSnapshot *sn;
-    uint16_t *refcount_table;
-    int ret;
-
-    size = bdrv_getlength(bs->file);
-    nb_clusters = size_to_clusters(s, size);
-    refcount_table = g_malloc0(nb_clusters * sizeof(uint16_t));
-
-    res->bfi.total_clusters =
-        size_to_clusters(s, bs->total_sectors * BDRV_SECTOR_SIZE);
-
-    /* header */
-    inc_refcounts(bs, res, refcount_table, nb_clusters,
-        0, s->cluster_size);
-
-    /* current L1 table */
-    ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,
-                             s->l1_table_offset, s->l1_size,
-                             CHECK_OFLAG_COPIED | CHECK_FRAG_INFO);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* snapshots */
-    for(i = 0; i < s->nb_snapshots; i++) {
-        sn = s->snapshots + i;
-        ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,
-            sn->l1_table_offset, sn->l1_size, 0);
-        if (ret < 0) {
-            goto fail;
-        }
-    }
-    inc_refcounts(bs, res, refcount_table, nb_clusters,
-        s->snapshots_offset, s->snapshots_size);
-
-    /* refcount data */
-    inc_refcounts(bs, res, refcount_table, nb_clusters,
-        s->refcount_table_offset,
-        s->refcount_table_size * sizeof(uint64_t));
-
-    for(i = 0; i < s->refcount_table_size; i++) {
-        uint64_t offset, cluster;
-        offset = s->refcount_table[i];
-        cluster = offset >> s->cluster_bits;
-
-        /* Refcount blocks are cluster aligned */
-        if (offset & (s->cluster_size - 1)) {
-            fprintf(stderr, "ERROR refcount block %" PRId64 " is not "
-                "cluster aligned; refcount table entry corrupted\n", i);
-            res->corruptions++;
-            continue;
-        }
-
-        if (cluster >= nb_clusters) {
-            fprintf(stderr, "ERROR refcount block %" PRId64
-                    " is outside image\n", i);
-            res->corruptions++;
-            continue;
-        }
-
-        if (offset != 0) {
-            inc_refcounts(bs, res, refcount_table, nb_clusters,
-                offset, s->cluster_size);
-            if (refcount_table[cluster] != 1) {
-                fprintf(stderr, "ERROR refcount block %" PRId64
-                    " refcount=%d\n",
-                    i, refcount_table[cluster]);
-                res->corruptions++;
-            }
-        }
-    }
-
-    /* compare ref counts */
-    for (i = 0, highest_cluster = 0; i < nb_clusters; i++) {
-        refcount1 = get_refcount(bs, i);
-        if (refcount1 < 0) {
-            fprintf(stderr, "Can't get refcount for cluster %" PRId64 ": %s\n",
-                i, strerror(-refcount1));
-            res->check_errors++;
-            continue;
-        }
-
-        refcount2 = refcount_table[i];
-
-        if (refcount1 > 0 || refcount2 > 0) {
-            highest_cluster = i;
-        }
-
-        if (refcount1 != refcount2) {
-
-            /* Check if we're allowed to fix the mismatch */
-            int *num_fixed = NULL;
-            if (refcount1 > refcount2 && (fix & BDRV_FIX_LEAKS)) {
-                num_fixed = &res->leaks_fixed;
-            } else if (refcount1 < refcount2 && (fix & BDRV_FIX_ERRORS)) {
-                num_fixed = &res->corruptions_fixed;
-            }
-
-            fprintf(stderr, "%s cluster %" PRId64 " refcount=%d reference=%d\n",
-                   num_fixed != NULL     ? "Repairing" :
-                   refcount1 < refcount2 ? "ERROR" :
-                                           "Leaked",
-                   i, refcount1, refcount2);
-
-            if (num_fixed) {
-                ret = update_refcount(bs, i << s->cluster_bits, 1,
-                                      refcount2 - refcount1,
-                                      QCOW2_DISCARD_ALWAYS);
-                if (ret >= 0) {
-                    (*num_fixed)++;
-                    continue;
-                }
-            }
-
-            /* And if we couldn't, print an error */
-            if (refcount1 < refcount2) {
-                res->corruptions++;
-            } else {
-                res->leaks++;
-            }
-        }
-    }
-
-    res->image_end_offset = (highest_cluster + 1) * s->cluster_size;
-    ret = 0;
-
-fail:
-    g_free(refcount_table);
-
-    return ret;
-}
-
diff --git a/contrib/qemu/block/qcow2-snapshot.c b/contrib/qemu/block/qcow2-snapshot.c
deleted file mode 100644
index 0caac9055..000000000
--- a/contrib/qemu/block/qcow2-snapshot.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
- * Block driver for the QCOW version 2 format
- *
- * Copyright (c) 2004-2006 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "qemu-common.h"
-#include "block/block_int.h"
-#include "block/qcow2.h"
-
-typedef struct QEMU_PACKED QCowSnapshotHeader {
-    /* header is 8 byte aligned */
-    uint64_t l1_table_offset;
-
-    uint32_t l1_size;
-    uint16_t id_str_size;
-    uint16_t name_size;
-
-    uint32_t date_sec;
-    uint32_t date_nsec;
-
-    uint64_t vm_clock_nsec;
-
-    uint32_t vm_state_size;
-    uint32_t extra_data_size; /* for extension */
-    /* extra data follows */
-    /* id_str follows */
-    /* name follows  */
-} QCowSnapshotHeader;
-
-typedef struct QEMU_PACKED QCowSnapshotExtraData {
-    uint64_t vm_state_size_large;
-    uint64_t disk_size;
-} QCowSnapshotExtraData;
-
-void qcow2_free_snapshots(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    int i;
-
-    for(i = 0; i < s->nb_snapshots; i++) {
-        g_free(s->snapshots[i].name);
-        g_free(s->snapshots[i].id_str);
-    }
-    g_free(s->snapshots);
-    s->snapshots = NULL;
-    s->nb_snapshots = 0;
-}
-
-int qcow2_read_snapshots(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowSnapshotHeader h;
-    QCowSnapshotExtraData extra;
-    QCowSnapshot *sn;
-    int i, id_str_size, name_size;
-    int64_t offset;
-    uint32_t extra_data_size;
-    int ret;
-
-    if (!s->nb_snapshots) {
-        s->snapshots = NULL;
-        s->snapshots_size = 0;
-        return 0;
-    }
-
-    offset = s->snapshots_offset;
-    s->snapshots = g_malloc0(s->nb_snapshots * sizeof(QCowSnapshot));
-
-    for(i = 0; i < s->nb_snapshots; i++) {
-        /* Read statically sized part of the snapshot header */
-        offset = align_offset(offset, 8);
-        ret = bdrv_pread(bs->file, offset, &h, sizeof(h));
-        if (ret < 0) {
-            goto fail;
-        }
-
-        offset += sizeof(h);
-        sn = s->snapshots + i;
-        sn->l1_table_offset = be64_to_cpu(h.l1_table_offset);
-        sn->l1_size = be32_to_cpu(h.l1_size);
-        sn->vm_state_size = be32_to_cpu(h.vm_state_size);
-        sn->date_sec = be32_to_cpu(h.date_sec);
-        sn->date_nsec = be32_to_cpu(h.date_nsec);
-        sn->vm_clock_nsec = be64_to_cpu(h.vm_clock_nsec);
-        extra_data_size = be32_to_cpu(h.extra_data_size);
-
-        id_str_size = be16_to_cpu(h.id_str_size);
-        name_size = be16_to_cpu(h.name_size);
-
-        /* Read extra data */
-        ret = bdrv_pread(bs->file, offset, &extra,
-                         MIN(sizeof(extra), extra_data_size));
-        if (ret < 0) {
-            goto fail;
-        }
-        offset += extra_data_size;
-
-        if (extra_data_size >= 8) {
-            sn->vm_state_size = be64_to_cpu(extra.vm_state_size_large);
-        }
-
-        if (extra_data_size >= 16) {
-            sn->disk_size = be64_to_cpu(extra.disk_size);
-        } else {
-            sn->disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;
-        }
-
-        /* Read snapshot ID */
-        sn->id_str = g_malloc(id_str_size + 1);
-        ret = bdrv_pread(bs->file, offset, sn->id_str, id_str_size);
-        if (ret < 0) {
-            goto fail;
-        }
-        offset += id_str_size;
-        sn->id_str[id_str_size] = '\0';
-
-        /* Read snapshot name */
-        sn->name = g_malloc(name_size + 1);
-        ret = bdrv_pread(bs->file, offset, sn->name, name_size);
-        if (ret < 0) {
-            goto fail;
-        }
-        offset += name_size;
-        sn->name[name_size] = '\0';
-    }
-
-    s->snapshots_size = offset - s->snapshots_offset;
-    return 0;
-
-fail:
-    qcow2_free_snapshots(bs);
-    return ret;
-}
-
-/* add at the end of the file a new list of snapshots */
-static int qcow2_write_snapshots(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowSnapshot *sn;
-    QCowSnapshotHeader h;
-    QCowSnapshotExtraData extra;
-    int i, name_size, id_str_size, snapshots_size;
-    struct {
-        uint32_t nb_snapshots;
-        uint64_t snapshots_offset;
-    } QEMU_PACKED header_data;
-    int64_t offset, snapshots_offset;
-    int ret;
-
-    /* compute the size of the snapshots */
-    offset = 0;
-    for(i = 0; i < s->nb_snapshots; i++) {
-        sn = s->snapshots + i;
-        offset = align_offset(offset, 8);
-        offset += sizeof(h);
-        offset += sizeof(extra);
-        offset += strlen(sn->id_str);
-        offset += strlen(sn->name);
-    }
-    snapshots_size = offset;
-
-    /* Allocate space for the new snapshot list */
-    snapshots_offset = qcow2_alloc_clusters(bs, snapshots_size);
-    offset = snapshots_offset;
-    if (offset < 0) {
-        return offset;
-    }
-    ret = bdrv_flush(bs);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* Write all snapshots to the new list */
-    for(i = 0; i < s->nb_snapshots; i++) {
-        sn = s->snapshots + i;
-        memset(&h, 0, sizeof(h));
-        h.l1_table_offset = cpu_to_be64(sn->l1_table_offset);
-        h.l1_size = cpu_to_be32(sn->l1_size);
-        /* If it doesn't fit in 32 bit, older implementations should treat it
-         * as a disk-only snapshot rather than truncate the VM state */
-        if (sn->vm_state_size <= 0xffffffff) {
-            h.vm_state_size = cpu_to_be32(sn->vm_state_size);
-        }
-        h.date_sec = cpu_to_be32(sn->date_sec);
-        h.date_nsec = cpu_to_be32(sn->date_nsec);
-        h.vm_clock_nsec = cpu_to_be64(sn->vm_clock_nsec);
-        h.extra_data_size = cpu_to_be32(sizeof(extra));
-
-        memset(&extra, 0, sizeof(extra));
-        extra.vm_state_size_large = cpu_to_be64(sn->vm_state_size);
-        extra.disk_size = cpu_to_be64(sn->disk_size);
-
-        id_str_size = strlen(sn->id_str);
-        name_size = strlen(sn->name);
-        h.id_str_size = cpu_to_be16(id_str_size);
-        h.name_size = cpu_to_be16(name_size);
-        offset = align_offset(offset, 8);
-
-        ret = bdrv_pwrite(bs->file, offset, &h, sizeof(h));
-        if (ret < 0) {
-            goto fail;
-        }
-        offset += sizeof(h);
-
-        ret = bdrv_pwrite(bs->file, offset, &extra, sizeof(extra));
-        if (ret < 0) {
-            goto fail;
-        }
-        offset += sizeof(extra);
-
-        ret = bdrv_pwrite(bs->file, offset, sn->id_str, id_str_size);
-        if (ret < 0) {
-            goto fail;
-        }
-        offset += id_str_size;
-
-        ret = bdrv_pwrite(bs->file, offset, sn->name, name_size);
-        if (ret < 0) {
-            goto fail;
-        }
-        offset += name_size;
-    }
-
-    /*
-     * Update the header to point to the new snapshot table. This requires the
-     * new table and its refcounts to be stable on disk.
-     */
-    ret = bdrv_flush(bs);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    QEMU_BUILD_BUG_ON(offsetof(QCowHeader, snapshots_offset) !=
-        offsetof(QCowHeader, nb_snapshots) + sizeof(header_data.nb_snapshots));
-
-    header_data.nb_snapshots        = cpu_to_be32(s->nb_snapshots);
-    header_data.snapshots_offset    = cpu_to_be64(snapshots_offset);
-
-    ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, nb_snapshots),
-                           &header_data, sizeof(header_data));
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* free the old snapshot table */
-    qcow2_free_clusters(bs, s->snapshots_offset, s->snapshots_size,
-                        QCOW2_DISCARD_SNAPSHOT);
-    s->snapshots_offset = snapshots_offset;
-    s->snapshots_size = snapshots_size;
-    return 0;
-
-fail:
-    return ret;
-}
-
-static void find_new_snapshot_id(BlockDriverState *bs,
-                                 char *id_str, int id_str_size)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowSnapshot *sn;
-    int i, id, id_max = 0;
-
-    for(i = 0; i < s->nb_snapshots; i++) {
-        sn = s->snapshots + i;
-        id = strtoul(sn->id_str, NULL, 10);
-        if (id > id_max)
-            id_max = id;
-    }
-    snprintf(id_str, id_str_size, "%d", id_max + 1);
-}
-
-static int find_snapshot_by_id(BlockDriverState *bs, const char *id_str)
-{
-    BDRVQcowState *s = bs->opaque;
-    int i;
-
-    for(i = 0; i < s->nb_snapshots; i++) {
-        if (!strcmp(s->snapshots[i].id_str, id_str))
-            return i;
-    }
-    return -1;
-}
-
-static int find_snapshot_by_id_or_name(BlockDriverState *bs, const char *name)
-{
-    BDRVQcowState *s = bs->opaque;
-    int i, ret;
-
-    ret = find_snapshot_by_id(bs, name);
-    if (ret >= 0)
-        return ret;
-    for(i = 0; i < s->nb_snapshots; i++) {
-        if (!strcmp(s->snapshots[i].name, name))
-            return i;
-    }
-    return -1;
-}
-
-/* if no id is provided, a new one is constructed */
-int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowSnapshot *new_snapshot_list = NULL;
-    QCowSnapshot *old_snapshot_list = NULL;
-    QCowSnapshot sn1, *sn = &sn1;
-    int i, ret;
-    uint64_t *l1_table = NULL;
-    int64_t l1_table_offset;
-
-    memset(sn, 0, sizeof(*sn));
-
-    /* Generate an ID if it wasn't passed */
-    if (sn_info->id_str[0] == '\0') {
-        find_new_snapshot_id(bs, sn_info->id_str, sizeof(sn_info->id_str));
-    }
-
-    /* Check that the ID is unique */
-    if (find_snapshot_by_id(bs, sn_info->id_str) >= 0) {
-        return -EEXIST;
-    }
-
-    /* Populate sn with passed data */
-    sn->id_str = g_strdup(sn_info->id_str);
-    sn->name = g_strdup(sn_info->name);
-
-    sn->disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;
-    sn->vm_state_size = sn_info->vm_state_size;
-    sn->date_sec = sn_info->date_sec;
-    sn->date_nsec = sn_info->date_nsec;
-    sn->vm_clock_nsec = sn_info->vm_clock_nsec;
-
-    /* Allocate the L1 table of the snapshot and copy the current one there. */
-    l1_table_offset = qcow2_alloc_clusters(bs, s->l1_size * sizeof(uint64_t));
-    if (l1_table_offset < 0) {
-        ret = l1_table_offset;
-        goto fail;
-    }
-
-    sn->l1_table_offset = l1_table_offset;
-    sn->l1_size = s->l1_size;
-
-    l1_table = g_malloc(s->l1_size * sizeof(uint64_t));
-    for(i = 0; i < s->l1_size; i++) {
-        l1_table[i] = cpu_to_be64(s->l1_table[i]);
-    }
-
-    ret = bdrv_pwrite(bs->file, sn->l1_table_offset, l1_table,
-                      s->l1_size * sizeof(uint64_t));
-    if (ret < 0) {
-        goto fail;
-    }
-
-    g_free(l1_table);
-    l1_table = NULL;
-
-    /*
-     * Increase the refcounts of all clusters and make sure everything is
-     * stable on disk before updating the snapshot table to contain a pointer
-     * to the new L1 table.
-     */
-    ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, 1);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* Append the new snapshot to the snapshot list */
-    new_snapshot_list = g_malloc((s->nb_snapshots + 1) * sizeof(QCowSnapshot));
-    if (s->snapshots) {
-        memcpy(new_snapshot_list, s->snapshots,
-               s->nb_snapshots * sizeof(QCowSnapshot));
-        old_snapshot_list = s->snapshots;
-    }
-    s->snapshots = new_snapshot_list;
-    s->snapshots[s->nb_snapshots++] = *sn;
-
-    ret = qcow2_write_snapshots(bs);
-    if (ret < 0) {
-        g_free(s->snapshots);
-        s->snapshots = old_snapshot_list;
-        goto fail;
-    }
-
-    g_free(old_snapshot_list);
-
-#ifdef DEBUG_ALLOC
-    {
-      BdrvCheckResult result = {0};
-      qcow2_check_refcounts(bs, &result, 0);
-    }
-#endif
-    return 0;
-
-fail:
-    g_free(sn->id_str);
-    g_free(sn->name);
-    g_free(l1_table);
-
-    return ret;
-}
-
-/* copy the snapshot 'snapshot_name' into the current disk image */
-int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowSnapshot *sn;
-    int i, snapshot_index;
-    int cur_l1_bytes, sn_l1_bytes;
-    int ret;
-    uint64_t *sn_l1_table = NULL;
-
-    /* Search the snapshot */
-    snapshot_index = find_snapshot_by_id_or_name(bs, snapshot_id);
-    if (snapshot_index < 0) {
-        return -ENOENT;
-    }
-    sn = &s->snapshots[snapshot_index];
-
-    if (sn->disk_size != bs->total_sectors * BDRV_SECTOR_SIZE) {
-        error_report("qcow2: Loading snapshots with different disk "
-            "size is not implemented");
-        ret = -ENOTSUP;
-        goto fail;
-    }
-
-    /*
-     * Make sure that the current L1 table is big enough to contain the whole
-     * L1 table of the snapshot. If the snapshot L1 table is smaller, the
-     * current one must be padded with zeros.
-     */
-    ret = qcow2_grow_l1_table(bs, sn->l1_size, true);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    cur_l1_bytes = s->l1_size * sizeof(uint64_t);
-    sn_l1_bytes = sn->l1_size * sizeof(uint64_t);
-
-    /*
-     * Copy the snapshot L1 table to the current L1 table.
-     *
-     * Before overwriting the old current L1 table on disk, make sure to
-     * increase all refcounts for the clusters referenced by the new one.
-     * Decrease the refcount referenced by the old one only when the L1
-     * table is overwritten.
-     */
-    sn_l1_table = g_malloc0(cur_l1_bytes);
-
-    ret = bdrv_pread(bs->file, sn->l1_table_offset, sn_l1_table, sn_l1_bytes);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    ret = qcow2_update_snapshot_refcount(bs, sn->l1_table_offset,
-                                         sn->l1_size, 1);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    ret = bdrv_pwrite_sync(bs->file, s->l1_table_offset, sn_l1_table,
-                           cur_l1_bytes);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /*
-     * Decrease refcount of clusters of current L1 table.
-     *
-     * At this point, the in-memory s->l1_table points to the old L1 table,
-     * whereas on disk we already have the new one.
-     *
-     * qcow2_update_snapshot_refcount special cases the current L1 table to use
-     * the in-memory data instead of really using the offset to load a new one,
-     * which is why this works.
-     */
-    ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset,
-                                         s->l1_size, -1);
-
-    /*
-     * Now update the in-memory L1 table to be in sync with the on-disk one. We
-     * need to do this even if updating refcounts failed.
-     */
-    for(i = 0;i < s->l1_size; i++) {
-        s->l1_table[i] = be64_to_cpu(sn_l1_table[i]);
-    }
-
-    if (ret < 0) {
-        goto fail;
-    }
-
-    g_free(sn_l1_table);
-    sn_l1_table = NULL;
-
-    /*
-     * Update QCOW_OFLAG_COPIED in the active L1 table (it may have changed
-     * when we decreased the refcount of the old snapshot.
-     */
-    ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, 0);
-    if (ret < 0) {
-        goto fail;
-    }
-
-#ifdef DEBUG_ALLOC
-    {
-        BdrvCheckResult result = {0};
-        qcow2_check_refcounts(bs, &result, 0);
-    }
-#endif
-    return 0;
-
-fail:
-    g_free(sn_l1_table);
-    return ret;
-}
-
-int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowSnapshot sn;
-    int snapshot_index, ret;
-
-    /* Search the snapshot */
-    snapshot_index = find_snapshot_by_id_or_name(bs, snapshot_id);
-    if (snapshot_index < 0) {
-        return -ENOENT;
-    }
-    sn = s->snapshots[snapshot_index];
-
-    /* Remove it from the snapshot list */
-    memmove(s->snapshots + snapshot_index,
-            s->snapshots + snapshot_index + 1,
-            (s->nb_snapshots - snapshot_index - 1) * sizeof(sn));
-    s->nb_snapshots--;
-    ret = qcow2_write_snapshots(bs);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /*
-     * The snapshot is now unused, clean up. If we fail after this point, we
-     * won't recover but just leak clusters.
-     */
-    g_free(sn.id_str);
-    g_free(sn.name);
-
-    /*
-     * Now decrease the refcounts of clusters referenced by the snapshot and
-     * free the L1 table.
-     */
-    ret = qcow2_update_snapshot_refcount(bs, sn.l1_table_offset,
-                                         sn.l1_size, -1);
-    if (ret < 0) {
-        return ret;
-    }
-    qcow2_free_clusters(bs, sn.l1_table_offset, sn.l1_size * sizeof(uint64_t),
-                        QCOW2_DISCARD_SNAPSHOT);
-
-    /* must update the copied flag on the current cluster offsets */
-    ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, 0);
-    if (ret < 0) {
-        return ret;
-    }
-
-#ifdef DEBUG_ALLOC
-    {
-        BdrvCheckResult result = {0};
-        qcow2_check_refcounts(bs, &result, 0);
-    }
-#endif
-    return 0;
-}
-
-int qcow2_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
-{
-    BDRVQcowState *s = bs->opaque;
-    QEMUSnapshotInfo *sn_tab, *sn_info;
-    QCowSnapshot *sn;
-    int i;
-
-    if (!s->nb_snapshots) {
-        *psn_tab = NULL;
-        return s->nb_snapshots;
-    }
-
-    sn_tab = g_malloc0(s->nb_snapshots * sizeof(QEMUSnapshotInfo));
-    for(i = 0; i < s->nb_snapshots; i++) {
-        sn_info = sn_tab + i;
-        sn = s->snapshots + i;
-        pstrcpy(sn_info->id_str, sizeof(sn_info->id_str),
-                sn->id_str);
-        pstrcpy(sn_info->name, sizeof(sn_info->name),
-                sn->name);
-        sn_info->vm_state_size = sn->vm_state_size;
-        sn_info->date_sec = sn->date_sec;
-        sn_info->date_nsec = sn->date_nsec;
-        sn_info->vm_clock_nsec = sn->vm_clock_nsec;
-    }
-    *psn_tab = sn_tab;
-    return s->nb_snapshots;
-}
-
-int qcow2_snapshot_load_tmp(BlockDriverState *bs, const char *snapshot_name)
-{
-    int i, snapshot_index;
-    BDRVQcowState *s = bs->opaque;
-    QCowSnapshot *sn;
-    uint64_t *new_l1_table;
-    int new_l1_bytes;
-    int ret;
-
-    assert(bs->read_only);
-
-    /* Search the snapshot */
-    snapshot_index = find_snapshot_by_id_or_name(bs, snapshot_name);
-    if (snapshot_index < 0) {
-        return -ENOENT;
-    }
-    sn = &s->snapshots[snapshot_index];
-
-    /* Allocate and read in the snapshot's L1 table */
-    new_l1_bytes = s->l1_size * sizeof(uint64_t);
-    new_l1_table = g_malloc0(align_offset(new_l1_bytes, 512));
-
-    ret = bdrv_pread(bs->file, sn->l1_table_offset, new_l1_table, new_l1_bytes);
-    if (ret < 0) {
-        g_free(new_l1_table);
-        return ret;
-    }
-
-    /* Switch the L1 table */
-    g_free(s->l1_table);
-
-    s->l1_size = sn->l1_size;
-    s->l1_table_offset = sn->l1_table_offset;
-    s->l1_table = new_l1_table;
-
-    for(i = 0;i < s->l1_size; i++) {
-        be64_to_cpus(&s->l1_table[i]);
-    }
-
-    return 0;
-}
diff --git a/contrib/qemu/block/qcow2.c b/contrib/qemu/block/qcow2.c
deleted file mode 100644
index 0eceefe2c..000000000
--- a/contrib/qemu/block/qcow2.c
+++ /dev/null
@@ -1,1825 +0,0 @@
-/*
- * Block driver for the QCOW version 2 format
- *
- * Copyright (c) 2004-2006 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#include "qemu-common.h"
-#include "block/block_int.h"
-#include "qemu/module.h"
-#include <zlib.h>
-#include "qemu/aes.h"
-#include "block/qcow2.h"
-#include "qemu/error-report.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qbool.h"
-#include "trace.h"
-
-/*
-  Differences with QCOW:
-
-  - Support for multiple incremental snapshots.
-  - Memory management by reference counts.
-  - Clusters which have a reference count of one have the bit
-    QCOW_OFLAG_COPIED to optimize write performance.
-  - Size of compressed clusters is stored in sectors to reduce bit usage
-    in the cluster offsets.
-  - Support for storing additional data (such as the VM state) in the
-    snapshots.
-  - If a backing store is used, the cluster size is not constrained
-    (could be backported to QCOW).
-  - L2 tables have always a size of one cluster.
-*/
-
-
-typedef struct {
-    uint32_t magic;
-    uint32_t len;
-} QCowExtension;
-
-#define  QCOW2_EXT_MAGIC_END 0
-#define  QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA
-#define  QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857
-
-static int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename)
-{
-    const QCowHeader *cow_header = (const void *)buf;
-
-    if (buf_size >= sizeof(QCowHeader) &&
-        be32_to_cpu(cow_header->magic) == QCOW_MAGIC &&
-        be32_to_cpu(cow_header->version) >= 2)
-        return 100;
-    else
-        return 0;
-}
-
-
-/* 
- * read qcow2 extension and fill bs
- * start reading from start_offset
- * finish reading upon magic of value 0 or when end_offset reached
- * unknown magic is skipped (future extension this version knows nothing about)
- * return 0 upon success, non-0 otherwise
- */
-static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
-                                 uint64_t end_offset, void **p_feature_table)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowExtension ext;
-    uint64_t offset;
-    int ret;
-
-#ifdef DEBUG_EXT
-    printf("qcow2_read_extensions: start=%ld end=%ld\n", start_offset, end_offset);
-#endif
-    offset = start_offset;
-    while (offset < end_offset) {
-
-#ifdef DEBUG_EXT
-        /* Sanity check */
-        if (offset > s->cluster_size)
-            printf("qcow2_read_extension: suspicious offset %lu\n", offset);
-
-        printf("attempting to read extended header in offset %lu\n", offset);
-#endif
-
-        if (bdrv_pread(bs->file, offset, &ext, sizeof(ext)) != sizeof(ext)) {
-            fprintf(stderr, "qcow2_read_extension: ERROR: "
-                    "pread fail from offset %" PRIu64 "\n",
-                    offset);
-            return 1;
-        }
-        be32_to_cpus(&ext.magic);
-        be32_to_cpus(&ext.len);
-        offset += sizeof(ext);
-#ifdef DEBUG_EXT
-        printf("ext.magic = 0x%x\n", ext.magic);
-#endif
-        if (ext.len > end_offset - offset) {
-            error_report("Header extension too large");
-            return -EINVAL;
-        }
-
-        switch (ext.magic) {
-        case QCOW2_EXT_MAGIC_END:
-            return 0;
-
-        case QCOW2_EXT_MAGIC_BACKING_FORMAT:
-            if (ext.len >= sizeof(bs->backing_format)) {
-                fprintf(stderr, "ERROR: ext_backing_format: len=%u too large"
-                        " (>=%zu)\n",
-                        ext.len, sizeof(bs->backing_format));
-                return 2;
-            }
-            if (bdrv_pread(bs->file, offset , bs->backing_format,
-                           ext.len) != ext.len)
-                return 3;
-            bs->backing_format[ext.len] = '\0';
-#ifdef DEBUG_EXT
-            printf("Qcow2: Got format extension %s\n", bs->backing_format);
-#endif
-            break;
-
-        case QCOW2_EXT_MAGIC_FEATURE_TABLE:
-            if (p_feature_table != NULL) {
-                void* feature_table = g_malloc0(ext.len + 2 * sizeof(Qcow2Feature));
-                ret = bdrv_pread(bs->file, offset , feature_table, ext.len);
-                if (ret < 0) {
-                    return ret;
-                }
-
-                *p_feature_table = feature_table;
-            }
-            break;
-
-        default:
-            /* unknown magic - save it in case we need to rewrite the header */
-            {
-                Qcow2UnknownHeaderExtension *uext;
-
-                uext = g_malloc0(sizeof(*uext)  + ext.len);
-                uext->magic = ext.magic;
-                uext->len = ext.len;
-                QLIST_INSERT_HEAD(&s->unknown_header_ext, uext, next);
-
-                ret = bdrv_pread(bs->file, offset , uext->data, uext->len);
-                if (ret < 0) {
-                    return ret;
-                }
-            }
-            break;
-        }
-
-        offset += ((ext.len + 7) & ~7);
-    }
-
-    return 0;
-}
-
-static void cleanup_unknown_header_ext(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    Qcow2UnknownHeaderExtension *uext, *next;
-
-    QLIST_FOREACH_SAFE(uext, &s->unknown_header_ext, next, next) {
-        QLIST_REMOVE(uext, next);
-        g_free(uext);
-    }
-}
-
-static void GCC_FMT_ATTR(2, 3) report_unsupported(BlockDriverState *bs,
-    const char *fmt, ...)
-{
-    char msg[64];
-    va_list ap;
-
-    va_start(ap, fmt);
-    vsnprintf(msg, sizeof(msg), fmt, ap);
-    va_end(ap);
-
-    qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
-        bs->device_name, "qcow2", msg);
-}
-
-static void report_unsupported_feature(BlockDriverState *bs,
-    Qcow2Feature *table, uint64_t mask)
-{
-    while (table && table->name[0] != '\0') {
-        if (table->type == QCOW2_FEAT_TYPE_INCOMPATIBLE) {
-            if (mask & (1 << table->bit)) {
-                report_unsupported(bs, "%.46s",table->name);
-                mask &= ~(1 << table->bit);
-            }
-        }
-        table++;
-    }
-
-    if (mask) {
-        report_unsupported(bs, "Unknown incompatible feature: %" PRIx64, mask);
-    }
-}
-
-/*
- * Sets the dirty bit and flushes afterwards if necessary.
- *
- * The incompatible_features bit is only set if the image file header was
- * updated successfully.  Therefore it is not required to check the return
- * value of this function.
- */
-int qcow2_mark_dirty(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t val;
-    int ret;
-
-    assert(s->qcow_version >= 3);
-
-    if (s->incompatible_features & QCOW2_INCOMPAT_DIRTY) {
-        return 0; /* already dirty */
-    }
-
-    val = cpu_to_be64(s->incompatible_features | QCOW2_INCOMPAT_DIRTY);
-    ret = bdrv_pwrite(bs->file, offsetof(QCowHeader, incompatible_features),
-                      &val, sizeof(val));
-    if (ret < 0) {
-        return ret;
-    }
-    ret = bdrv_flush(bs->file);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* Only treat image as dirty if the header was updated successfully */
-    s->incompatible_features |= QCOW2_INCOMPAT_DIRTY;
-    return 0;
-}
-
-/*
- * Clears the dirty bit and flushes before if necessary.  Only call this
- * function when there are no pending requests, it does not guard against
- * concurrent requests dirtying the image.
- */
-static int qcow2_mark_clean(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-
-    if (s->incompatible_features & QCOW2_INCOMPAT_DIRTY) {
-        int ret = bdrv_flush(bs);
-        if (ret < 0) {
-            return ret;
-        }
-
-        s->incompatible_features &= ~QCOW2_INCOMPAT_DIRTY;
-        return qcow2_update_header(bs);
-    }
-    return 0;
-}
-
-static int qcow2_check(BlockDriverState *bs, BdrvCheckResult *result,
-                       BdrvCheckMode fix)
-{
-    int ret = qcow2_check_refcounts(bs, result, fix);
-    if (ret < 0) {
-        return ret;
-    }
-
-    if (fix && result->check_errors == 0 && result->corruptions == 0) {
-        return qcow2_mark_clean(bs);
-    }
-    return ret;
-}
-
-static QemuOptsList qcow2_runtime_opts = {
-    .name = "qcow2",
-    .head = QTAILQ_HEAD_INITIALIZER(qcow2_runtime_opts.head),
-    .desc = {
-        {
-            .name = "lazy_refcounts",
-            .type = QEMU_OPT_BOOL,
-            .help = "Postpone refcount updates",
-        },
-        {
-            .name = QCOW2_OPT_DISCARD_REQUEST,
-            .type = QEMU_OPT_BOOL,
-            .help = "Pass guest discard requests to the layer below",
-        },
-        {
-            .name = QCOW2_OPT_DISCARD_SNAPSHOT,
-            .type = QEMU_OPT_BOOL,
-            .help = "Generate discard requests when snapshot related space "
-                    "is freed",
-        },
-        {
-            .name = QCOW2_OPT_DISCARD_OTHER,
-            .type = QEMU_OPT_BOOL,
-            .help = "Generate discard requests when other clusters are freed",
-        },
-        { /* end of list */ }
-    },
-};
-
-static int qcow2_open(BlockDriverState *bs, QDict *options, int flags)
-{
-    BDRVQcowState *s = bs->opaque;
-    int len, i, ret = 0;
-    QCowHeader header;
-    QemuOpts *opts;
-    Error *local_err = NULL;
-    uint64_t ext_end;
-    uint64_t l1_vm_state_index;
-
-    ret = bdrv_pread(bs->file, 0, &header, sizeof(header));
-    if (ret < 0) {
-        goto fail;
-    }
-    be32_to_cpus(&header.magic);
-    be32_to_cpus(&header.version);
-    be64_to_cpus(&header.backing_file_offset);
-    be32_to_cpus(&header.backing_file_size);
-    be64_to_cpus(&header.size);
-    be32_to_cpus(&header.cluster_bits);
-    be32_to_cpus(&header.crypt_method);
-    be64_to_cpus(&header.l1_table_offset);
-    be32_to_cpus(&header.l1_size);
-    be64_to_cpus(&header.refcount_table_offset);
-    be32_to_cpus(&header.refcount_table_clusters);
-    be64_to_cpus(&header.snapshots_offset);
-    be32_to_cpus(&header.nb_snapshots);
-
-    if (header.magic != QCOW_MAGIC) {
-        ret = -EMEDIUMTYPE;
-        goto fail;
-    }
-    if (header.version < 2 || header.version > 3) {
-        report_unsupported(bs, "QCOW version %d", header.version);
-        ret = -ENOTSUP;
-        goto fail;
-    }
-
-    s->qcow_version = header.version;
-
-    /* Initialise version 3 header fields */
-    if (header.version == 2) {
-        header.incompatible_features    = 0;
-        header.compatible_features      = 0;
-        header.autoclear_features       = 0;
-        header.refcount_order           = 4;
-        header.header_length            = 72;
-    } else {
-        be64_to_cpus(&header.incompatible_features);
-        be64_to_cpus(&header.compatible_features);
-        be64_to_cpus(&header.autoclear_features);
-        be32_to_cpus(&header.refcount_order);
-        be32_to_cpus(&header.header_length);
-    }
-
-    if (header.header_length > sizeof(header)) {
-        s->unknown_header_fields_size = header.header_length - sizeof(header);
-        s->unknown_header_fields = g_malloc(s->unknown_header_fields_size);
-        ret = bdrv_pread(bs->file, sizeof(header), s->unknown_header_fields,
-                         s->unknown_header_fields_size);
-        if (ret < 0) {
-            goto fail;
-        }
-    }
-
-    if (header.backing_file_offset) {
-        ext_end = header.backing_file_offset;
-    } else {
-        ext_end = 1 << header.cluster_bits;
-    }
-
-    /* Handle feature bits */
-    s->incompatible_features    = header.incompatible_features;
-    s->compatible_features      = header.compatible_features;
-    s->autoclear_features       = header.autoclear_features;
-
-    if (s->incompatible_features & ~QCOW2_INCOMPAT_MASK) {
-        void *feature_table = NULL;
-        qcow2_read_extensions(bs, header.header_length, ext_end,
-                              &feature_table);
-        report_unsupported_feature(bs, feature_table,
-                                   s->incompatible_features &
-                                   ~QCOW2_INCOMPAT_MASK);
-        ret = -ENOTSUP;
-        goto fail;
-    }
-
-    /* Check support for various header values */
-    if (header.refcount_order != 4) {
-        report_unsupported(bs, "%d bit reference counts",
-                           1 << header.refcount_order);
-        ret = -ENOTSUP;
-        goto fail;
-    }
-
-    if (header.cluster_bits < MIN_CLUSTER_BITS ||
-        header.cluster_bits > MAX_CLUSTER_BITS) {
-        ret = -EINVAL;
-        goto fail;
-    }
-    if (header.crypt_method > QCOW_CRYPT_AES) {
-        ret = -EINVAL;
-        goto fail;
-    }
-    s->crypt_method_header = header.crypt_method;
-    if (s->crypt_method_header) {
-        bs->encrypted = 1;
-    }
-    s->cluster_bits = header.cluster_bits;
-    s->cluster_size = 1 << s->cluster_bits;
-    s->cluster_sectors = 1 << (s->cluster_bits - 9);
-    s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */
-    s->l2_size = 1 << s->l2_bits;
-    bs->total_sectors = header.size / 512;
-    s->csize_shift = (62 - (s->cluster_bits - 8));
-    s->csize_mask = (1 << (s->cluster_bits - 8)) - 1;
-    s->cluster_offset_mask = (1LL << s->csize_shift) - 1;
-    s->refcount_table_offset = header.refcount_table_offset;
-    s->refcount_table_size =
-        header.refcount_table_clusters << (s->cluster_bits - 3);
-
-    s->snapshots_offset = header.snapshots_offset;
-    s->nb_snapshots = header.nb_snapshots;
-
-    /* read the level 1 table */
-    s->l1_size = header.l1_size;
-
-    l1_vm_state_index = size_to_l1(s, header.size);
-    if (l1_vm_state_index > INT_MAX) {
-        ret = -EFBIG;
-        goto fail;
-    }
-    s->l1_vm_state_index = l1_vm_state_index;
-
-    /* the L1 table must contain at least enough entries to put
-       header.size bytes */
-    if (s->l1_size < s->l1_vm_state_index) {
-        ret = -EINVAL;
-        goto fail;
-    }
-    s->l1_table_offset = header.l1_table_offset;
-    if (s->l1_size > 0) {
-        s->l1_table = g_malloc0(
-            align_offset(s->l1_size * sizeof(uint64_t), 512));
-        ret = bdrv_pread(bs->file, s->l1_table_offset, s->l1_table,
-                         s->l1_size * sizeof(uint64_t));
-        if (ret < 0) {
-            goto fail;
-        }
-        for(i = 0;i < s->l1_size; i++) {
-            be64_to_cpus(&s->l1_table[i]);
-        }
-    }
-
-    /* alloc L2 table/refcount block cache */
-    s->l2_table_cache = qcow2_cache_create(bs, L2_CACHE_SIZE);
-    s->refcount_block_cache = qcow2_cache_create(bs, REFCOUNT_CACHE_SIZE);
-
-    s->cluster_cache = g_malloc(s->cluster_size);
-    /* one more sector for decompressed data alignment */
-    s->cluster_data = qemu_blockalign(bs, QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size
-                                  + 512);
-    s->cluster_cache_offset = -1;
-    s->flags = flags;
-
-    ret = qcow2_refcount_init(bs);
-    if (ret != 0) {
-        goto fail;
-    }
-
-    QLIST_INIT(&s->cluster_allocs);
-    QTAILQ_INIT(&s->discards);
-
-    /* read qcow2 extensions */
-    if (qcow2_read_extensions(bs, header.header_length, ext_end, NULL)) {
-        ret = -EINVAL;
-        goto fail;
-    }
-
-    /* read the backing file name */
-    if (header.backing_file_offset != 0) {
-        len = header.backing_file_size;
-        if (len > 1023) {
-            len = 1023;
-        }
-        ret = bdrv_pread(bs->file, header.backing_file_offset,
-                         bs->backing_file, len);
-        if (ret < 0) {
-            goto fail;
-        }
-        bs->backing_file[len] = '\0';
-    }
-
-    ret = qcow2_read_snapshots(bs);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    /* Clear unknown autoclear feature bits */
-    if (!bs->read_only && s->autoclear_features != 0) {
-        s->autoclear_features = 0;
-        ret = qcow2_update_header(bs);
-        if (ret < 0) {
-            goto fail;
-        }
-    }
-
-    /* Initialise locks */
-    qemu_co_mutex_init(&s->lock);
-
-    /* Repair image if dirty */
-    if (!(flags & BDRV_O_CHECK) && !bs->read_only &&
-        (s->incompatible_features & QCOW2_INCOMPAT_DIRTY)) {
-        BdrvCheckResult result = {0};
-
-        ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS);
-        if (ret < 0) {
-            goto fail;
-        }
-    }
-
-    /* Enable lazy_refcounts according to image and command line options */
-    opts = qemu_opts_create_nofail(&qcow2_runtime_opts);
-    qemu_opts_absorb_qdict(opts, options, &local_err);
-    if (error_is_set(&local_err)) {
-        qerror_report_err(local_err);
-        error_free(local_err);
-        ret = -EINVAL;
-        goto fail;
-    }
-
-    s->use_lazy_refcounts = qemu_opt_get_bool(opts, QCOW2_OPT_LAZY_REFCOUNTS,
-        (s->compatible_features & QCOW2_COMPAT_LAZY_REFCOUNTS));
-
-    s->discard_passthrough[QCOW2_DISCARD_NEVER] = false;
-    s->discard_passthrough[QCOW2_DISCARD_ALWAYS] = true;
-    s->discard_passthrough[QCOW2_DISCARD_REQUEST] =
-        qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_REQUEST,
-                          flags & BDRV_O_UNMAP);
-    s->discard_passthrough[QCOW2_DISCARD_SNAPSHOT] =
-        qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_SNAPSHOT, true);
-    s->discard_passthrough[QCOW2_DISCARD_OTHER] =
-        qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_OTHER, false);
-
-    qemu_opts_del(opts);
-
-    if (s->use_lazy_refcounts && s->qcow_version < 3) {
-        qerror_report(ERROR_CLASS_GENERIC_ERROR, "Lazy refcounts require "
-            "a qcow2 image with at least qemu 1.1 compatibility level");
-        ret = -EINVAL;
-        goto fail;
-    }
-
-#ifdef DEBUG_ALLOC
-    {
-        BdrvCheckResult result = {0};
-        qcow2_check_refcounts(bs, &result, 0);
-    }
-#endif
-    return ret;
-
- fail:
-    g_free(s->unknown_header_fields);
-    cleanup_unknown_header_ext(bs);
-    qcow2_free_snapshots(bs);
-    qcow2_refcount_close(bs);
-    g_free(s->l1_table);
-    if (s->l2_table_cache) {
-        qcow2_cache_destroy(bs, s->l2_table_cache);
-    }
-    g_free(s->cluster_cache);
-    qemu_vfree(s->cluster_data);
-    return ret;
-}
-
-static int qcow2_set_key(BlockDriverState *bs, const char *key)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint8_t keybuf[16];
-    int len, i;
-
-    memset(keybuf, 0, 16);
-    len = strlen(key);
-    if (len > 16)
-        len = 16;
-    /* XXX: we could compress the chars to 7 bits to increase
-       entropy */
-    for(i = 0;i < len;i++) {
-        keybuf[i] = key[i];
-    }
-    s->crypt_method = s->crypt_method_header;
-
-    if (AES_set_encrypt_key(keybuf, 128, &s->aes_encrypt_key) != 0)
-        return -1;
-    if (AES_set_decrypt_key(keybuf, 128, &s->aes_decrypt_key) != 0)
-        return -1;
-#if 0
-    /* test */
-    {
-        uint8_t in[16];
-        uint8_t out[16];
-        uint8_t tmp[16];
-        for(i=0;i<16;i++)
-            in[i] = i;
-        AES_encrypt(in, tmp, &s->aes_encrypt_key);
-        AES_decrypt(tmp, out, &s->aes_decrypt_key);
-        for(i = 0; i < 16; i++)
-            printf(" %02x", tmp[i]);
-        printf("\n");
-        for(i = 0; i < 16; i++)
-            printf(" %02x", out[i]);
-        printf("\n");
-    }
-#endif
-    return 0;
-}
-
-/* We have nothing to do for QCOW2 reopen, stubs just return
- * success */
-static int qcow2_reopen_prepare(BDRVReopenState *state,
-                                BlockReopenQueue *queue, Error **errp)
-{
-    return 0;
-}
-
-static int coroutine_fn qcow2_co_is_allocated(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors, int *pnum)
-{
-    BDRVQcowState *s = bs->opaque;
-    uint64_t cluster_offset;
-    int ret;
-
-    *pnum = nb_sectors;
-    /* FIXME We can get errors here, but the bdrv_co_is_allocated interface
-     * can't pass them on today */
-    qemu_co_mutex_lock(&s->lock);
-    ret = qcow2_get_cluster_offset(bs, sector_num << 9, pnum, &cluster_offset);
-    qemu_co_mutex_unlock(&s->lock);
-    if (ret < 0) {
-        *pnum = 0;
-    }
-
-    return (cluster_offset != 0) || (ret == QCOW2_CLUSTER_ZERO);
-}
-
-/* handle reading after the end of the backing file */
-int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector *qiov,
-                  int64_t sector_num, int nb_sectors)
-{
-    int n1;
-    if ((sector_num + nb_sectors) <= bs->total_sectors)
-        return nb_sectors;
-    if (sector_num >= bs->total_sectors)
-        n1 = 0;
-    else
-        n1 = bs->total_sectors - sector_num;
-
-    qemu_iovec_memset(qiov, 512 * n1, 0, 512 * (nb_sectors - n1));
-
-    return n1;
-}
-
-static coroutine_fn int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num,
-                          int remaining_sectors, QEMUIOVector *qiov)
-{
-    BDRVQcowState *s = bs->opaque;
-    int index_in_cluster, n1;
-    int ret;
-    int cur_nr_sectors; /* number of sectors in current iteration */
-    uint64_t cluster_offset = 0;
-    uint64_t bytes_done = 0;
-    QEMUIOVector hd_qiov;
-    uint8_t *cluster_data = NULL;
-
-    qemu_iovec_init(&hd_qiov, qiov->niov);
-
-    qemu_co_mutex_lock(&s->lock);
-
-    while (remaining_sectors != 0) {
-
-        /* prepare next request */
-        cur_nr_sectors = remaining_sectors;
-        if (s->crypt_method) {
-            cur_nr_sectors = MIN(cur_nr_sectors,
-                QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors);
-        }
-
-        ret = qcow2_get_cluster_offset(bs, sector_num << 9,
-            &cur_nr_sectors, &cluster_offset);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        index_in_cluster = sector_num & (s->cluster_sectors - 1);
-
-        qemu_iovec_reset(&hd_qiov);
-        qemu_iovec_concat(&hd_qiov, qiov, bytes_done,
-            cur_nr_sectors * 512);
-
-        switch (ret) {
-        case QCOW2_CLUSTER_UNALLOCATED:
-
-            if (bs->backing_hd) {
-                /* read from the base image */
-                n1 = qcow2_backing_read1(bs->backing_hd, &hd_qiov,
-                    sector_num, cur_nr_sectors);
-                if (n1 > 0) {
-                    BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
-                    qemu_co_mutex_unlock(&s->lock);
-                    ret = bdrv_co_readv(bs->backing_hd, sector_num,
-                                        n1, &hd_qiov);
-                    qemu_co_mutex_lock(&s->lock);
-                    if (ret < 0) {
-                        goto fail;
-                    }
-                }
-            } else {
-                /* Note: in this case, no need to wait */
-                qemu_iovec_memset(&hd_qiov, 0, 0, 512 * cur_nr_sectors);
-            }
-            break;
-
-        case QCOW2_CLUSTER_ZERO:
-            qemu_iovec_memset(&hd_qiov, 0, 0, 512 * cur_nr_sectors);
-            break;
-
-        case QCOW2_CLUSTER_COMPRESSED:
-            /* add AIO support for compressed blocks ? */
-            ret = qcow2_decompress_cluster(bs, cluster_offset);
-            if (ret < 0) {
-                goto fail;
-            }
-
-            qemu_iovec_from_buf(&hd_qiov, 0,
-                s->cluster_cache + index_in_cluster * 512,
-                512 * cur_nr_sectors);
-            break;
-
-        case QCOW2_CLUSTER_NORMAL:
-            if ((cluster_offset & 511) != 0) {
-                ret = -EIO;
-                goto fail;
-            }
-
-            if (s->crypt_method) {
-                /*
-                 * For encrypted images, read everything into a temporary
-                 * contiguous buffer on which the AES functions can work.
-                 */
-                if (!cluster_data) {
-                    cluster_data =
-                        qemu_blockalign(bs, QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
-                }
-
-                assert(cur_nr_sectors <=
-                    QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors);
-                qemu_iovec_reset(&hd_qiov);
-                qemu_iovec_add(&hd_qiov, cluster_data,
-                    512 * cur_nr_sectors);
-            }
-
-            BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
-            qemu_co_mutex_unlock(&s->lock);
-            ret = bdrv_co_readv(bs->file,
-                                (cluster_offset >> 9) + index_in_cluster,
-                                cur_nr_sectors, &hd_qiov);
-            qemu_co_mutex_lock(&s->lock);
-            if (ret < 0) {
-                goto fail;
-            }
-            if (s->crypt_method) {
-                qcow2_encrypt_sectors(s, sector_num,  cluster_data,
-                    cluster_data, cur_nr_sectors, 0, &s->aes_decrypt_key);
-                qemu_iovec_from_buf(qiov, bytes_done,
-                    cluster_data, 512 * cur_nr_sectors);
-            }
-            break;
-
-        default:
-            g_assert_not_reached();
-            ret = -EIO;
-            goto fail;
-        }
-
-        remaining_sectors -= cur_nr_sectors;
-        sector_num += cur_nr_sectors;
-        bytes_done += cur_nr_sectors * 512;
-    }
-    ret = 0;
-
-fail:
-    qemu_co_mutex_unlock(&s->lock);
-
-    qemu_iovec_destroy(&hd_qiov);
-    qemu_vfree(cluster_data);
-
-    return ret;
-}
-
-static coroutine_fn int qcow2_co_writev(BlockDriverState *bs,
-                           int64_t sector_num,
-                           int remaining_sectors,
-                           QEMUIOVector *qiov)
-{
-    BDRVQcowState *s = bs->opaque;
-    int index_in_cluster;
-    int n_end;
-    int ret;
-    int cur_nr_sectors; /* number of sectors in current iteration */
-    uint64_t cluster_offset;
-    QEMUIOVector hd_qiov;
-    uint64_t bytes_done = 0;
-    uint8_t *cluster_data = NULL;
-    QCowL2Meta *l2meta = NULL;
-
-    trace_qcow2_writev_start_req(qemu_coroutine_self(), sector_num,
-                                 remaining_sectors);
-
-    qemu_iovec_init(&hd_qiov, qiov->niov);
-
-    s->cluster_cache_offset = -1; /* disable compressed cache */
-
-    qemu_co_mutex_lock(&s->lock);
-
-    while (remaining_sectors != 0) {
-
-        l2meta = NULL;
-
-        trace_qcow2_writev_start_part(qemu_coroutine_self());
-        index_in_cluster = sector_num & (s->cluster_sectors - 1);
-        n_end = index_in_cluster + remaining_sectors;
-        if (s->crypt_method &&
-            n_end > QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors) {
-            n_end = QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors;
-        }
-
-        ret = qcow2_alloc_cluster_offset(bs, sector_num << 9,
-            index_in_cluster, n_end, &cur_nr_sectors, &cluster_offset, &l2meta);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        assert((cluster_offset & 511) == 0);
-
-        qemu_iovec_reset(&hd_qiov);
-        qemu_iovec_concat(&hd_qiov, qiov, bytes_done,
-            cur_nr_sectors * 512);
-
-        if (s->crypt_method) {
-            if (!cluster_data) {
-                cluster_data = qemu_blockalign(bs, QCOW_MAX_CRYPT_CLUSTERS *
-                                                 s->cluster_size);
-            }
-
-            assert(hd_qiov.size <=
-                   QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
-            qemu_iovec_to_buf(&hd_qiov, 0, cluster_data, hd_qiov.size);
-
-            qcow2_encrypt_sectors(s, sector_num, cluster_data,
-                cluster_data, cur_nr_sectors, 1, &s->aes_encrypt_key);
-
-            qemu_iovec_reset(&hd_qiov);
-            qemu_iovec_add(&hd_qiov, cluster_data,
-                cur_nr_sectors * 512);
-        }
-
-        qemu_co_mutex_unlock(&s->lock);
-        BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
-        trace_qcow2_writev_data(qemu_coroutine_self(),
-                                (cluster_offset >> 9) + index_in_cluster);
-        ret = bdrv_co_writev(bs->file,
-                             (cluster_offset >> 9) + index_in_cluster,
-                             cur_nr_sectors, &hd_qiov);
-        qemu_co_mutex_lock(&s->lock);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        while (l2meta != NULL) {
-            QCowL2Meta *next;
-
-            ret = qcow2_alloc_cluster_link_l2(bs, l2meta);
-            if (ret < 0) {
-                goto fail;
-            }
-
-            /* Take the request off the list of running requests */
-            if (l2meta->nb_clusters != 0) {
-                QLIST_REMOVE(l2meta, next_in_flight);
-            }
-
-            qemu_co_queue_restart_all(&l2meta->dependent_requests);
-
-            next = l2meta->next;
-            g_free(l2meta);
-            l2meta = next;
-        }
-
-        remaining_sectors -= cur_nr_sectors;
-        sector_num += cur_nr_sectors;
-        bytes_done += cur_nr_sectors * 512;
-        trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_nr_sectors);
-    }
-    ret = 0;
-
-fail:
-    qemu_co_mutex_unlock(&s->lock);
-
-    while (l2meta != NULL) {
-        QCowL2Meta *next;
-
-        if (l2meta->nb_clusters != 0) {
-            QLIST_REMOVE(l2meta, next_in_flight);
-        }
-        qemu_co_queue_restart_all(&l2meta->dependent_requests);
-
-        next = l2meta->next;
-        g_free(l2meta);
-        l2meta = next;
-    }
-
-    qemu_iovec_destroy(&hd_qiov);
-    qemu_vfree(cluster_data);
-    trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);
-
-    return ret;
-}
-
-static void qcow2_close(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    g_free(s->l1_table);
-
-    qcow2_cache_flush(bs, s->l2_table_cache);
-    qcow2_cache_flush(bs, s->refcount_block_cache);
-
-    qcow2_mark_clean(bs);
-
-    qcow2_cache_destroy(bs, s->l2_table_cache);
-    qcow2_cache_destroy(bs, s->refcount_block_cache);
-
-    g_free(s->unknown_header_fields);
-    cleanup_unknown_header_ext(bs);
-
-    g_free(s->cluster_cache);
-    qemu_vfree(s->cluster_data);
-    qcow2_refcount_close(bs);
-    qcow2_free_snapshots(bs);
-}
-
-static void qcow2_invalidate_cache(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    int flags = s->flags;
-    AES_KEY aes_encrypt_key;
-    AES_KEY aes_decrypt_key;
-    uint32_t crypt_method = 0;
-    QDict *options;
-
-    /*
-     * Backing files are read-only which makes all of their metadata immutable,
-     * that means we don't have to worry about reopening them here.
-     */
-
-    if (s->crypt_method) {
-        crypt_method = s->crypt_method;
-        memcpy(&aes_encrypt_key, &s->aes_encrypt_key, sizeof(aes_encrypt_key));
-        memcpy(&aes_decrypt_key, &s->aes_decrypt_key, sizeof(aes_decrypt_key));
-    }
-
-    qcow2_close(bs);
-
-    options = qdict_new();
-    qdict_put(options, QCOW2_OPT_LAZY_REFCOUNTS,
-              qbool_from_int(s->use_lazy_refcounts));
-
-    memset(s, 0, sizeof(BDRVQcowState));
-    qcow2_open(bs, options, flags);
-
-    QDECREF(options);
-
-    if (crypt_method) {
-        s->crypt_method = crypt_method;
-        memcpy(&s->aes_encrypt_key, &aes_encrypt_key, sizeof(aes_encrypt_key));
-        memcpy(&s->aes_decrypt_key, &aes_decrypt_key, sizeof(aes_decrypt_key));
-    }
-}
-
-static size_t header_ext_add(char *buf, uint32_t magic, const void *s,
-    size_t len, size_t buflen)
-{
-    QCowExtension *ext_backing_fmt = (QCowExtension*) buf;
-    size_t ext_len = sizeof(QCowExtension) + ((len + 7) & ~7);
-
-    if (buflen < ext_len) {
-        return -ENOSPC;
-    }
-
-    *ext_backing_fmt = (QCowExtension) {
-        .magic  = cpu_to_be32(magic),
-        .len    = cpu_to_be32(len),
-    };
-    memcpy(buf + sizeof(QCowExtension), s, len);
-
-    return ext_len;
-}
-
-/*
- * Updates the qcow2 header, including the variable length parts of it, i.e.
- * the backing file name and all extensions. qcow2 was not designed to allow
- * such changes, so if we run out of space (we can only use the first cluster)
- * this function may fail.
- *
- * Returns 0 on success, -errno in error cases.
- */
-int qcow2_update_header(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    QCowHeader *header;
-    char *buf;
-    size_t buflen = s->cluster_size;
-    int ret;
-    uint64_t total_size;
-    uint32_t refcount_table_clusters;
-    size_t header_length;
-    Qcow2UnknownHeaderExtension *uext;
-
-    buf = qemu_blockalign(bs, buflen);
-
-    /* Header structure */
-    header = (QCowHeader*) buf;
-
-    if (buflen < sizeof(*header)) {
-        ret = -ENOSPC;
-        goto fail;
-    }
-
-    header_length = sizeof(*header) + s->unknown_header_fields_size;
-    total_size = bs->total_sectors * BDRV_SECTOR_SIZE;
-    refcount_table_clusters = s->refcount_table_size >> (s->cluster_bits - 3);
-
-    *header = (QCowHeader) {
-        /* Version 2 fields */
-        .magic                  = cpu_to_be32(QCOW_MAGIC),
-        .version                = cpu_to_be32(s->qcow_version),
-        .backing_file_offset    = 0,
-        .backing_file_size      = 0,
-        .cluster_bits           = cpu_to_be32(s->cluster_bits),
-        .size                   = cpu_to_be64(total_size),
-        .crypt_method           = cpu_to_be32(s->crypt_method_header),
-        .l1_size                = cpu_to_be32(s->l1_size),
-        .l1_table_offset        = cpu_to_be64(s->l1_table_offset),
-        .refcount_table_offset  = cpu_to_be64(s->refcount_table_offset),
-        .refcount_table_clusters = cpu_to_be32(refcount_table_clusters),
-        .nb_snapshots           = cpu_to_be32(s->nb_snapshots),
-        .snapshots_offset       = cpu_to_be64(s->snapshots_offset),
-
-        /* Version 3 fields */
-        .incompatible_features  = cpu_to_be64(s->incompatible_features),
-        .compatible_features    = cpu_to_be64(s->compatible_features),
-        .autoclear_features     = cpu_to_be64(s->autoclear_features),
-        .refcount_order         = cpu_to_be32(3 + REFCOUNT_SHIFT),
-        .header_length          = cpu_to_be32(header_length),
-    };
-
-    /* For older versions, write a shorter header */
-    switch (s->qcow_version) {
-    case 2:
-        ret = offsetof(QCowHeader, incompatible_features);
-        break;
-    case 3:
-        ret = sizeof(*header);
-        break;
-    default:
-        ret = -EINVAL;
-        goto fail;
-    }
-
-    buf += ret;
-    buflen -= ret;
-    memset(buf, 0, buflen);
-
-    /* Preserve any unknown field in the header */
-    if (s->unknown_header_fields_size) {
-        if (buflen < s->unknown_header_fields_size) {
-            ret = -ENOSPC;
-            goto fail;
-        }
-
-        memcpy(buf, s->unknown_header_fields, s->unknown_header_fields_size);
-        buf += s->unknown_header_fields_size;
-        buflen -= s->unknown_header_fields_size;
-    }
-
-    /* Backing file format header extension */
-    if (*bs->backing_format) {
-        ret = header_ext_add(buf, QCOW2_EXT_MAGIC_BACKING_FORMAT,
-                             bs->backing_format, strlen(bs->backing_format),
-                             buflen);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        buf += ret;
-        buflen -= ret;
-    }
-
-    /* Feature table */
-    Qcow2Feature features[] = {
-        {
-            .type = QCOW2_FEAT_TYPE_INCOMPATIBLE,
-            .bit  = QCOW2_INCOMPAT_DIRTY_BITNR,
-            .name = "dirty bit",
-        },
-        {
-            .type = QCOW2_FEAT_TYPE_COMPATIBLE,
-            .bit  = QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR,
-            .name = "lazy refcounts",
-        },
-    };
-
-    ret = header_ext_add(buf, QCOW2_EXT_MAGIC_FEATURE_TABLE,
-                         features, sizeof(features), buflen);
-    if (ret < 0) {
-        goto fail;
-    }
-    buf += ret;
-    buflen -= ret;
-
-    /* Keep unknown header extensions */
-    QLIST_FOREACH(uext, &s->unknown_header_ext, next) {
-        ret = header_ext_add(buf, uext->magic, uext->data, uext->len, buflen);
-        if (ret < 0) {
-            goto fail;
-        }
-
-        buf += ret;
-        buflen -= ret;
-    }
-
-    /* End of header extensions */
-    ret = header_ext_add(buf, QCOW2_EXT_MAGIC_END, NULL, 0, buflen);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    buf += ret;
-    buflen -= ret;
-
-    /* Backing file name */
-    if (*bs->backing_file) {
-        size_t backing_file_len = strlen(bs->backing_file);
-
-        if (buflen < backing_file_len) {
-            ret = -ENOSPC;
-            goto fail;
-        }
-
-        /* Using strncpy is ok here, since buf is not NUL-terminated. */
-        strncpy(buf, bs->backing_file, buflen);
-
-        header->backing_file_offset = cpu_to_be64(buf - ((char*) header));
-        header->backing_file_size   = cpu_to_be32(backing_file_len);
-    }
-
-    /* Write the new header */
-    ret = bdrv_pwrite(bs->file, 0, header, s->cluster_size);
-    if (ret < 0) {
-        goto fail;
-    }
-
-    ret = 0;
-fail:
-    qemu_vfree(header);
-    return ret;
-}
-
-static int qcow2_change_backing_file(BlockDriverState *bs,
-    const char *backing_file, const char *backing_fmt)
-{
-    pstrcpy(bs->backing_file, sizeof(bs->backing_file), backing_file ?: "");
-    pstrcpy(bs->backing_format, sizeof(bs->backing_format), backing_fmt ?: "");
-
-    return qcow2_update_header(bs);
-}
-
-static int preallocate(BlockDriverState *bs)
-{
-    uint64_t nb_sectors;
-    uint64_t offset;
-    uint64_t host_offset = 0;
-    int num;
-    int ret;
-    QCowL2Meta *meta;
-
-    nb_sectors = bdrv_getlength(bs) >> 9;
-    offset = 0;
-
-    while (nb_sectors) {
-        num = MIN(nb_sectors, INT_MAX >> 9);
-        ret = qcow2_alloc_cluster_offset(bs, offset, 0, num, &num,
-                                         &host_offset, &meta);
-        if (ret < 0) {
-            return ret;
-        }
-
-        ret = qcow2_alloc_cluster_link_l2(bs, meta);
-        if (ret < 0) {
-            qcow2_free_any_clusters(bs, meta->alloc_offset, meta->nb_clusters,
-                                    QCOW2_DISCARD_NEVER);
-            return ret;
-        }
-
-        /* There are no dependent requests, but we need to remove our request
-         * from the list of in-flight requests */
-        if (meta != NULL) {
-            QLIST_REMOVE(meta, next_in_flight);
-        }
-
-        /* TODO Preallocate data if requested */
-
-        nb_sectors -= num;
-        offset += num << 9;
-    }
-
-    /*
-     * It is expected that the image file is large enough to actually contain
-     * all of the allocated clusters (otherwise we get failing reads after
-     * EOF). Extend the image to the last allocated sector.
-     */
-    if (host_offset != 0) {
-        uint8_t buf[512];
-        memset(buf, 0, 512);
-        ret = bdrv_write(bs->file, (host_offset >> 9) + num - 1, buf, 1);
-        if (ret < 0) {
-            return ret;
-        }
-    }
-
-    return 0;
-}
-
-static int qcow2_create2(const char *filename, int64_t total_size,
-                         const char *backing_file, const char *backing_format,
-                         int flags, size_t cluster_size, int prealloc,
-                         QEMUOptionParameter *options, int version)
-{
-    /* Calculate cluster_bits */
-    int cluster_bits;
-    cluster_bits = ffs(cluster_size) - 1;
-    if (cluster_bits < MIN_CLUSTER_BITS || cluster_bits > MAX_CLUSTER_BITS ||
-        (1 << cluster_bits) != cluster_size)
-    {
-        error_report(
-            "Cluster size must be a power of two between %d and %dk",
-            1 << MIN_CLUSTER_BITS, 1 << (MAX_CLUSTER_BITS - 10));
-        return -EINVAL;
-    }
-
-    /*
-     * Open the image file and write a minimal qcow2 header.
-     *
-     * We keep things simple and start with a zero-sized image. We also
-     * do without refcount blocks or a L1 table for now. We'll fix the
-     * inconsistency later.
-     *
-     * We do need a refcount table because growing the refcount table means
-     * allocating two new refcount blocks - the seconds of which would be at
-     * 2 GB for 64k clusters, and we don't want to have a 2 GB initial file
-     * size for any qcow2 image.
-     */
-    BlockDriverState* bs;
-    QCowHeader header;
-    uint8_t* refcount_table;
-    int ret;
-
-    ret = bdrv_create_file(filename, options);
-    if (ret < 0) {
-        return ret;
-    }
-
-    ret = bdrv_file_open(&bs, filename, NULL, BDRV_O_RDWR);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* Write the header */
-    memset(&header, 0, sizeof(header));
-    header.magic = cpu_to_be32(QCOW_MAGIC);
-    header.version = cpu_to_be32(version);
-    header.cluster_bits = cpu_to_be32(cluster_bits);
-    header.size = cpu_to_be64(0);
-    header.l1_table_offset = cpu_to_be64(0);
-    header.l1_size = cpu_to_be32(0);
-    header.refcount_table_offset = cpu_to_be64(cluster_size);
-    header.refcount_table_clusters = cpu_to_be32(1);
-    header.refcount_order = cpu_to_be32(3 + REFCOUNT_SHIFT);
-    header.header_length = cpu_to_be32(sizeof(header));
-
-    if (flags & BLOCK_FLAG_ENCRYPT) {
-        header.crypt_method = cpu_to_be32(QCOW_CRYPT_AES);
-    } else {
-        header.crypt_method = cpu_to_be32(QCOW_CRYPT_NONE);
-    }
-
-    if (flags & BLOCK_FLAG_LAZY_REFCOUNTS) {
-        header.compatible_features |=
-            cpu_to_be64(QCOW2_COMPAT_LAZY_REFCOUNTS);
-    }
-
-    ret = bdrv_pwrite(bs, 0, &header, sizeof(header));
-    if (ret < 0) {
-        goto out;
-    }
-
-    /* Write an empty refcount table */
-    refcount_table = g_malloc0(cluster_size);
-    ret = bdrv_pwrite(bs, cluster_size, refcount_table, cluster_size);
-    g_free(refcount_table);
-
-    if (ret < 0) {
-        goto out;
-    }
-
-    bdrv_close(bs);
-
-    /*
-     * And now open the image and make it consistent first (i.e. increase the
-     * refcount of the cluster that is occupied by the header and the refcount
-     * table)
-     */
-    BlockDriver* drv = bdrv_find_format("qcow2");
-    assert(drv != NULL);
-    ret = bdrv_open(bs, filename, NULL,
-        BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, drv);
-    if (ret < 0) {
-        goto out;
-    }
-
-    ret = qcow2_alloc_clusters(bs, 2 * cluster_size);
-    if (ret < 0) {
-        goto out;
-
-    } else if (ret != 0) {
-        error_report("Huh, first cluster in empty image is already in use?");
-        abort();
-    }
-
-    /* Okay, now that we have a valid image, let's give it the right size */
-    ret = bdrv_truncate(bs, total_size * BDRV_SECTOR_SIZE);
-    if (ret < 0) {
-        goto out;
-    }
-
-    /* Want a backing file? There you go.*/
-    if (backing_file) {
-        ret = bdrv_change_backing_file(bs, backing_file, backing_format);
-        if (ret < 0) {
-            goto out;
-        }
-    }
-
-    /* And if we're supposed to preallocate metadata, do that now */
-    if (prealloc) {
-        BDRVQcowState *s = bs->opaque;
-        qemu_co_mutex_lock(&s->lock);
-        ret = preallocate(bs);
-        qemu_co_mutex_unlock(&s->lock);
-        if (ret < 0) {
-            goto out;
-        }
-    }
-
-    ret = 0;
-out:
-    bdrv_delete(bs);
-    return ret;
-}
-
-static int qcow2_create(const char *filename, QEMUOptionParameter *options)
-{
-    const char *backing_file = NULL;
-    const char *backing_fmt = NULL;
-    uint64_t sectors = 0;
-    int flags = 0;
-    size_t cluster_size = DEFAULT_CLUSTER_SIZE;
-    int prealloc = 0;
-    int version = 2;
-
-    /* Read out options */
-    while (options && options->name) {
-        if (!strcmp(options->name, BLOCK_OPT_SIZE)) {
-            sectors = options->value.n / 512;
-        } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) {
-            backing_file = options->value.s;
-        } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FMT)) {
-            backing_fmt = options->value.s;
-        } else if (!strcmp(options->name, BLOCK_OPT_ENCRYPT)) {
-            flags |= options->value.n ? BLOCK_FLAG_ENCRYPT : 0;
-        } else if (!strcmp(options->name, BLOCK_OPT_CLUSTER_SIZE)) {
-            if (options->value.n) {
-                cluster_size = options->value.n;
-            }
-        } else if (!strcmp(options->name, BLOCK_OPT_PREALLOC)) {
-            if (!options->value.s || !strcmp(options->value.s, "off")) {
-                prealloc = 0;
-            } else if (!strcmp(options->value.s, "metadata")) {
-                prealloc = 1;
-            } else {
-                fprintf(stderr, "Invalid preallocation mode: '%s'\n",
-                    options->value.s);
-                return -EINVAL;
-            }
-        } else if (!strcmp(options->name, BLOCK_OPT_COMPAT_LEVEL)) {
-            if (!options->value.s || !strcmp(options->value.s, "0.10")) {
-                version = 2;
-            } else if (!strcmp(options->value.s, "1.1")) {
-                version = 3;
-            } else {
-                fprintf(stderr, "Invalid compatibility level: '%s'\n",
-                    options->value.s);
-                return -EINVAL;
-            }
-        } else if (!strcmp(options->name, BLOCK_OPT_LAZY_REFCOUNTS)) {
-            flags |= options->value.n ? BLOCK_FLAG_LAZY_REFCOUNTS : 0;
-        }
-        options++;
-    }
-
-    if (backing_file && prealloc) {
-        fprintf(stderr, "Backing file and preallocation cannot be used at "
-            "the same time\n");
-        return -EINVAL;
-    }
-
-    if (version < 3 && (flags & BLOCK_FLAG_LAZY_REFCOUNTS)) {
-        fprintf(stderr, "Lazy refcounts only supported with compatibility "
-                "level 1.1 and above (use compat=1.1 or greater)\n");
-        return -EINVAL;
-    }
-
-    return qcow2_create2(filename, sectors, backing_file, backing_fmt, flags,
-                         cluster_size, prealloc, options, version);
-}
-
-static int qcow2_make_empty(BlockDriverState *bs)
-{
-#if 0
-    /* XXX: not correct */
-    BDRVQcowState *s = bs->opaque;
-    uint32_t l1_length = s->l1_size * sizeof(uint64_t);
-    int ret;
-
-    memset(s->l1_table, 0, l1_length);
-    if (bdrv_pwrite(bs->file, s->l1_table_offset, s->l1_table, l1_length) < 0)
-        return -1;
-    ret = bdrv_truncate(bs->file, s->l1_table_offset + l1_length);
-    if (ret < 0)
-        return ret;
-
-    l2_cache_reset(bs);
-#endif
-    return 0;
-}
-
-static coroutine_fn int qcow2_co_write_zeroes(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors)
-{
-    int ret;
-    BDRVQcowState *s = bs->opaque;
-
-    /* Emulate misaligned zero writes */
-    if (sector_num % s->cluster_sectors || nb_sectors % s->cluster_sectors) {
-        return -ENOTSUP;
-    }
-
-    /* Whatever is left can use real zero clusters */
-    qemu_co_mutex_lock(&s->lock);
-    ret = qcow2_zero_clusters(bs, sector_num << BDRV_SECTOR_BITS,
-        nb_sectors);
-    qemu_co_mutex_unlock(&s->lock);
-
-    return ret;
-}
-
-static coroutine_fn int qcow2_co_discard(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors)
-{
-    int ret;
-    BDRVQcowState *s = bs->opaque;
-
-    qemu_co_mutex_lock(&s->lock);
-    ret = qcow2_discard_clusters(bs, sector_num << BDRV_SECTOR_BITS,
-        nb_sectors);
-    qemu_co_mutex_unlock(&s->lock);
-    return ret;
-}
-
-static int qcow2_truncate(BlockDriverState *bs, int64_t offset)
-{
-    BDRVQcowState *s = bs->opaque;
-    int64_t new_l1_size;
-    int ret;
-
-    if (offset & 511) {
-        error_report("The new size must be a multiple of 512");
-        return -EINVAL;
-    }
-
-    /* cannot proceed if image has snapshots */
-    if (s->nb_snapshots) {
-        error_report("Can't resize an image which has snapshots");
-        return -ENOTSUP;
-    }
-
-    /* shrinking is currently not supported */
-    if (offset < bs->total_sectors * 512) {
-        error_report("qcow2 doesn't support shrinking images yet");
-        return -ENOTSUP;
-    }
-
-    new_l1_size = size_to_l1(s, offset);
-    ret = qcow2_grow_l1_table(bs, new_l1_size, true);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* write updated header.size */
-    offset = cpu_to_be64(offset);
-    ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size),
-                           &offset, sizeof(uint64_t));
-    if (ret < 0) {
-        return ret;
-    }
-
-    s->l1_vm_state_index = new_l1_size;
-    return 0;
-}
-
-/* XXX: put compressed sectors first, then all the cluster aligned
-   tables to avoid losing bytes in alignment */
-static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num,
-                                  const uint8_t *buf, int nb_sectors)
-{
-    BDRVQcowState *s = bs->opaque;
-    z_stream strm;
-    int ret, out_len;
-    uint8_t *out_buf;
-    uint64_t cluster_offset;
-
-    if (nb_sectors == 0) {
-        /* align end of file to a sector boundary to ease reading with
-           sector based I/Os */
-        cluster_offset = bdrv_getlength(bs->file);
-        cluster_offset = (cluster_offset + 511) & ~511;
-        bdrv_truncate(bs->file, cluster_offset);
-        return 0;
-    }
-
-    if (nb_sectors != s->cluster_sectors) {
-        ret = -EINVAL;
-
-        /* Zero-pad last write if image size is not cluster aligned */
-        if (sector_num + nb_sectors == bs->total_sectors &&
-            nb_sectors < s->cluster_sectors) {
-            uint8_t *pad_buf = qemu_blockalign(bs, s->cluster_size);
-            memset(pad_buf, 0, s->cluster_size);
-            memcpy(pad_buf, buf, nb_sectors * BDRV_SECTOR_SIZE);
-            ret = qcow2_write_compressed(bs, sector_num,
-                                         pad_buf, s->cluster_sectors);
-            qemu_vfree(pad_buf);
-        }
-        return ret;
-    }
-
-    out_buf = g_malloc(s->cluster_size + (s->cluster_size / 1000) + 128);
-
-    /* best compression, small window, no zlib header */
-    memset(&strm, 0, sizeof(strm));
-    ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION,
-                       Z_DEFLATED, -12,
-                       9, Z_DEFAULT_STRATEGY);
-    if (ret != 0) {
-        ret = -EINVAL;
-        goto fail;
-    }
-
-    strm.avail_in = s->cluster_size;
-    strm.next_in = (uint8_t *)buf;
-    strm.avail_out = s->cluster_size;
-    strm.next_out = out_buf;
-
-    ret = deflate(&strm, Z_FINISH);
-    if (ret != Z_STREAM_END && ret != Z_OK) {
-        deflateEnd(&strm);
-        ret = -EINVAL;
-        goto fail;
-    }
-    out_len = strm.next_out - out_buf;
-
-    deflateEnd(&strm);
-
-    if (ret != Z_STREAM_END || out_len >= s->cluster_size) {
-        /* could not compress: write normal cluster */
-        ret = bdrv_write(bs, sector_num, buf, s->cluster_sectors);
-        if (ret < 0) {
-            goto fail;
-        }
-    } else {
-        cluster_offset = qcow2_alloc_compressed_cluster_offset(bs,
-            sector_num << 9, out_len);
-        if (!cluster_offset) {
-            ret = -EIO;
-            goto fail;
-        }
-        cluster_offset &= s->cluster_offset_mask;
-        BLKDBG_EVENT(bs->file, BLKDBG_WRITE_COMPRESSED);
-        ret = bdrv_pwrite(bs->file, cluster_offset, out_buf, out_len);
-        if (ret < 0) {
-            goto fail;
-        }
-    }
-
-    ret = 0;
-fail:
-    g_free(out_buf);
-    return ret;
-}
-
-static coroutine_fn int qcow2_co_flush_to_os(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    int ret;
-
-    qemu_co_mutex_lock(&s->lock);
-    ret = qcow2_cache_flush(bs, s->l2_table_cache);
-    if (ret < 0) {
-        qemu_co_mutex_unlock(&s->lock);
-        return ret;
-    }
-
-    if (qcow2_need_accurate_refcounts(s)) {
-        ret = qcow2_cache_flush(bs, s->refcount_block_cache);
-        if (ret < 0) {
-            qemu_co_mutex_unlock(&s->lock);
-            return ret;
-        }
-    }
-    qemu_co_mutex_unlock(&s->lock);
-
-    return 0;
-}
-
-static int64_t qcow2_vm_state_offset(BDRVQcowState *s)
-{
-	return (int64_t)s->l1_vm_state_index << (s->cluster_bits + s->l2_bits);
-}
-
-static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
-{
-    BDRVQcowState *s = bs->opaque;
-    bdi->cluster_size = s->cluster_size;
-    bdi->vm_state_offset = qcow2_vm_state_offset(s);
-    return 0;
-}
-
-#if 0
-static void dump_refcounts(BlockDriverState *bs)
-{
-    BDRVQcowState *s = bs->opaque;
-    int64_t nb_clusters, k, k1, size;
-    int refcount;
-
-    size = bdrv_getlength(bs->file);
-    nb_clusters = size_to_clusters(s, size);
-    for(k = 0; k < nb_clusters;) {
-        k1 = k;
-        refcount = get_refcount(bs, k);
-        k++;
-        while (k < nb_clusters && get_refcount(bs, k) == refcount)
-            k++;
-        printf("%" PRId64 ": refcount=%d nb=%" PRId64 "\n", k, refcount,
-               k - k1);
-    }
-}
-#endif
-
-static int qcow2_save_vmstate(BlockDriverState *bs, QEMUIOVector *qiov,
-                              int64_t pos)
-{
-    BDRVQcowState *s = bs->opaque;
-    int growable = bs->growable;
-    int ret;
-
-    BLKDBG_EVENT(bs->file, BLKDBG_VMSTATE_SAVE);
-    bs->growable = 1;
-    ret = bdrv_pwritev(bs, qcow2_vm_state_offset(s) + pos, qiov);
-    bs->growable = growable;
-
-    return ret;
-}
-
-static int qcow2_load_vmstate(BlockDriverState *bs, uint8_t *buf,
-                              int64_t pos, int size)
-{
-    BDRVQcowState *s = bs->opaque;
-    int growable = bs->growable;
-    int ret;
-
-    BLKDBG_EVENT(bs->file, BLKDBG_VMSTATE_LOAD);
-    bs->growable = 1;
-    ret = bdrv_pread(bs, qcow2_vm_state_offset(s) + pos, buf, size);
-    bs->growable = growable;
-
-    return ret;
-}
-
-static QEMUOptionParameter qcow2_create_options[] = {
-    {
-        .name = BLOCK_OPT_SIZE,
-        .type = OPT_SIZE,
-        .help = "Virtual disk size"
-    },
-    {
-        .name = BLOCK_OPT_COMPAT_LEVEL,
-        .type = OPT_STRING,
-        .help = "Compatibility level (0.10 or 1.1)"
-    },
-    {
-        .name = BLOCK_OPT_BACKING_FILE,
-        .type = OPT_STRING,
-        .help = "File name of a base image"
-    },
-    {
-        .name = BLOCK_OPT_BACKING_FMT,
-        .type = OPT_STRING,
-        .help = "Image format of the base image"
-    },
-    {
-        .name = BLOCK_OPT_ENCRYPT,
-        .type = OPT_FLAG,
-        .help = "Encrypt the image"
-    },
-    {
-        .name = BLOCK_OPT_CLUSTER_SIZE,
-        .type = OPT_SIZE,
-        .help = "qcow2 cluster size",
-        .value = { .n = DEFAULT_CLUSTER_SIZE },
-    },
-    {
-        .name = BLOCK_OPT_PREALLOC,
-        .type = OPT_STRING,
-        .help = "Preallocation mode (allowed values: off, metadata)"
-    },
-    {
-        .name = BLOCK_OPT_LAZY_REFCOUNTS,
-        .type = OPT_FLAG,
-        .help = "Postpone refcount updates",
-    },
-    { NULL }
-};
-
-static BlockDriver bdrv_qcow2 = {
-    .format_name        = "qcow2",
-    .instance_size      = sizeof(BDRVQcowState),
-    .bdrv_probe         = qcow2_probe,
-    .bdrv_open          = qcow2_open,
-    .bdrv_close         = qcow2_close,
-    .bdrv_reopen_prepare  = qcow2_reopen_prepare,
-    .bdrv_create        = qcow2_create,
-    .bdrv_has_zero_init = bdrv_has_zero_init_1,
-    .bdrv_co_is_allocated = qcow2_co_is_allocated,
-    .bdrv_set_key       = qcow2_set_key,
-    .bdrv_make_empty    = qcow2_make_empty,
-
-    .bdrv_co_readv          = qcow2_co_readv,
-    .bdrv_co_writev         = qcow2_co_writev,
-    .bdrv_co_flush_to_os    = qcow2_co_flush_to_os,
-
-    .bdrv_co_write_zeroes   = qcow2_co_write_zeroes,
-    .bdrv_co_discard        = qcow2_co_discard,
-    .bdrv_truncate          = qcow2_truncate,
-    .bdrv_write_compressed  = qcow2_write_compressed,
-
-    .bdrv_snapshot_create   = qcow2_snapshot_create,
-    .bdrv_snapshot_goto     = qcow2_snapshot_goto,
-    .bdrv_snapshot_delete   = qcow2_snapshot_delete,
-    .bdrv_snapshot_list     = qcow2_snapshot_list,
-    .bdrv_snapshot_load_tmp     = qcow2_snapshot_load_tmp,
-    .bdrv_get_info      = qcow2_get_info,
-
-    .bdrv_save_vmstate    = qcow2_save_vmstate,
-    .bdrv_load_vmstate    = qcow2_load_vmstate,
-
-    .bdrv_change_backing_file   = qcow2_change_backing_file,
-
-    .bdrv_invalidate_cache      = qcow2_invalidate_cache,
-
-    .create_options = qcow2_create_options,
-    .bdrv_check = qcow2_check,
-};
-
-static void bdrv_qcow2_init(void)
-{
-    bdrv_register(&bdrv_qcow2);
-}
-
-block_init(bdrv_qcow2_init);
diff --git a/contrib/qemu/block/qcow2.h b/contrib/qemu/block/qcow2.h
deleted file mode 100644
index 3b2d5cda7..000000000
--- a/contrib/qemu/block/qcow2.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Block driver for the QCOW version 2 format
- *
- * Copyright (c) 2004-2006 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef BLOCK_QCOW2_H
-#define BLOCK_QCOW2_H
-
-#include "qemu/aes.h"
-#include "block/coroutine.h"
-
-//#define DEBUG_ALLOC
-//#define DEBUG_ALLOC2
-//#define DEBUG_EXT
-
-#define QCOW_MAGIC (('Q' << 24) | ('F' << 16) | ('I' << 8) | 0xfb)
-
-#define QCOW_CRYPT_NONE 0
-#define QCOW_CRYPT_AES  1
-
-#define QCOW_MAX_CRYPT_CLUSTERS 32
-
-/* indicate that the refcount of the referenced cluster is exactly one. */
-#define QCOW_OFLAG_COPIED     (1LL << 63)
-/* indicate that the cluster is compressed (they never have the copied flag) */
-#define QCOW_OFLAG_COMPRESSED (1LL << 62)
-/* The cluster reads as all zeros */
-#define QCOW_OFLAG_ZERO (1LL << 0)
-
-#define REFCOUNT_SHIFT 1 /* refcount size is 2 bytes */
-
-#define MIN_CLUSTER_BITS 9
-#define MAX_CLUSTER_BITS 21
-
-#define L2_CACHE_SIZE 16
-
-/* Must be at least 4 to cover all cases of refcount table growth */
-#define REFCOUNT_CACHE_SIZE 4
-
-#define DEFAULT_CLUSTER_SIZE 65536
-
-
-#define QCOW2_OPT_LAZY_REFCOUNTS "lazy_refcounts"
-#define QCOW2_OPT_DISCARD_REQUEST "pass_discard_request"
-#define QCOW2_OPT_DISCARD_SNAPSHOT "pass_discard_snapshot"
-#define QCOW2_OPT_DISCARD_OTHER "pass_discard_other"
-
-typedef struct QCowHeader {
-    uint32_t magic;
-    uint32_t version;
-    uint64_t backing_file_offset;
-    uint32_t backing_file_size;
-    uint32_t cluster_bits;
-    uint64_t size; /* in bytes */
-    uint32_t crypt_method;
-    uint32_t l1_size; /* XXX: save number of clusters instead ? */
-    uint64_t l1_table_offset;
-    uint64_t refcount_table_offset;
-    uint32_t refcount_table_clusters;
-    uint32_t nb_snapshots;
-    uint64_t snapshots_offset;
-
-    /* The following fields are only valid for version >= 3 */
-    uint64_t incompatible_features;
-    uint64_t compatible_features;
-    uint64_t autoclear_features;
-
-    uint32_t refcount_order;
-    uint32_t header_length;
-} QCowHeader;
-
-typedef struct QCowSnapshot {
-    uint64_t l1_table_offset;
-    uint32_t l1_size;
-    char *id_str;
-    char *name;
-    uint64_t disk_size;
-    uint64_t vm_state_size;
-    uint32_t date_sec;
-    uint32_t date_nsec;
-    uint64_t vm_clock_nsec;
-} QCowSnapshot;
-
-struct Qcow2Cache;
-typedef struct Qcow2Cache Qcow2Cache;
-
-typedef struct Qcow2UnknownHeaderExtension {
-    uint32_t magic;
-    uint32_t len;
-    QLIST_ENTRY(Qcow2UnknownHeaderExtension) next;
-    uint8_t data[];
-} Qcow2UnknownHeaderExtension;
-
-enum {
-    QCOW2_FEAT_TYPE_INCOMPATIBLE    = 0,
-    QCOW2_FEAT_TYPE_COMPATIBLE      = 1,
-    QCOW2_FEAT_TYPE_AUTOCLEAR       = 2,
-};
-
-/* Incompatible feature bits */
-enum {
-    QCOW2_INCOMPAT_DIRTY_BITNR   = 0,
-    QCOW2_INCOMPAT_DIRTY         = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
-
-    QCOW2_INCOMPAT_MASK          = QCOW2_INCOMPAT_DIRTY,
-};
-
-/* Compatible feature bits */
-enum {
-    QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR = 0,
-    QCOW2_COMPAT_LAZY_REFCOUNTS       = 1 << QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR,
-
-    QCOW2_COMPAT_FEAT_MASK            = QCOW2_COMPAT_LAZY_REFCOUNTS,
-};
-
-enum qcow2_discard_type {
-    QCOW2_DISCARD_NEVER = 0,
-    QCOW2_DISCARD_ALWAYS,
-    QCOW2_DISCARD_REQUEST,
-    QCOW2_DISCARD_SNAPSHOT,
-    QCOW2_DISCARD_OTHER,
-    QCOW2_DISCARD_MAX
-};
-
-typedef struct Qcow2Feature {
-    uint8_t type;
-    uint8_t bit;
-    char    name[46];
-} QEMU_PACKED Qcow2Feature;
-
-typedef struct Qcow2DiscardRegion {
-    BlockDriverState *bs;
-    uint64_t offset;
-    uint64_t bytes;
-    QTAILQ_ENTRY(Qcow2DiscardRegion) next;
-} Qcow2DiscardRegion;
-
-typedef struct BDRVQcowState {
-    int cluster_bits;
-    int cluster_size;
-    int cluster_sectors;
-    int l2_bits;
-    int l2_size;
-    int l1_size;
-    int l1_vm_state_index;
-    int csize_shift;
-    int csize_mask;
-    uint64_t cluster_offset_mask;
-    uint64_t l1_table_offset;
-    uint64_t *l1_table;
-
-    Qcow2Cache* l2_table_cache;
-    Qcow2Cache* refcount_block_cache;
-
-    uint8_t *cluster_cache;
-    uint8_t *cluster_data;
-    uint64_t cluster_cache_offset;
-    QLIST_HEAD(QCowClusterAlloc, QCowL2Meta) cluster_allocs;
-
-    uint64_t *refcount_table;
-    uint64_t refcount_table_offset;
-    uint32_t refcount_table_size;
-    int64_t free_cluster_index;
-    int64_t free_byte_offset;
-
-    CoMutex lock;
-
-    uint32_t crypt_method; /* current crypt method, 0 if no key yet */
-    uint32_t crypt_method_header;
-    AES_KEY aes_encrypt_key;
-    AES_KEY aes_decrypt_key;
-    uint64_t snapshots_offset;
-    int snapshots_size;
-    int nb_snapshots;
-    QCowSnapshot *snapshots;
-
-    int flags;
-    int qcow_version;
-    bool use_lazy_refcounts;
-
-    bool discard_passthrough[QCOW2_DISCARD_MAX];
-
-    uint64_t incompatible_features;
-    uint64_t compatible_features;
-    uint64_t autoclear_features;
-
-    size_t unknown_header_fields_size;
-    void* unknown_header_fields;
-    QLIST_HEAD(, Qcow2UnknownHeaderExtension) unknown_header_ext;
-    QTAILQ_HEAD (, Qcow2DiscardRegion) discards;
-    bool cache_discards;
-} BDRVQcowState;
-
-/* XXX: use std qcow open function ? */
-typedef struct QCowCreateState {
-    int cluster_size;
-    int cluster_bits;
-    uint16_t *refcount_block;
-    uint64_t *refcount_table;
-    int64_t l1_table_offset;
-    int64_t refcount_table_offset;
-    int64_t refcount_block_offset;
-} QCowCreateState;
-
-struct QCowAIOCB;
-
-typedef struct Qcow2COWRegion {
-    /**
-     * Offset of the COW region in bytes from the start of the first cluster
-     * touched by the request.
-     */
-    uint64_t    offset;
-
-    /** Number of sectors to copy */
-    int         nb_sectors;
-} Qcow2COWRegion;
-
-/**
- * Describes an in-flight (part of a) write request that writes to clusters
- * that are not referenced in their L2 table yet.
- */
-typedef struct QCowL2Meta
-{
-    /** Guest offset of the first newly allocated cluster */
-    uint64_t offset;
-
-    /** Host offset of the first newly allocated cluster */
-    uint64_t alloc_offset;
-
-    /**
-     * Number of sectors from the start of the first allocated cluster to
-     * the end of the (possibly shortened) request
-     */
-    int nb_available;
-
-    /** Number of newly allocated clusters */
-    int nb_clusters;
-
-    /**
-     * Requests that overlap with this allocation and wait to be restarted
-     * when the allocating request has completed.
-     */
-    CoQueue dependent_requests;
-
-    /**
-     * The COW Region between the start of the first allocated cluster and the
-     * area the guest actually writes to.
-     */
-    Qcow2COWRegion cow_start;
-
-    /**
-     * The COW Region between the area the guest actually writes to and the
-     * end of the last allocated cluster.
-     */
-    Qcow2COWRegion cow_end;
-
-    /** Pointer to next L2Meta of the same write request */
-    struct QCowL2Meta *next;
-
-    QLIST_ENTRY(QCowL2Meta) next_in_flight;
-} QCowL2Meta;
-
-enum {
-    QCOW2_CLUSTER_UNALLOCATED,
-    QCOW2_CLUSTER_NORMAL,
-    QCOW2_CLUSTER_COMPRESSED,
-    QCOW2_CLUSTER_ZERO
-};
-
-#define L1E_OFFSET_MASK 0x00ffffffffffff00ULL
-#define L2E_OFFSET_MASK 0x00ffffffffffff00ULL
-#define L2E_COMPRESSED_OFFSET_SIZE_MASK 0x3fffffffffffffffULL
-
-#define REFT_OFFSET_MASK 0xffffffffffffff00ULL
-
-static inline int64_t start_of_cluster(BDRVQcowState *s, int64_t offset)
-{
-    return offset & ~(s->cluster_size - 1);
-}
-
-static inline int64_t offset_into_cluster(BDRVQcowState *s, int64_t offset)
-{
-    return offset & (s->cluster_size - 1);
-}
-
-static inline int size_to_clusters(BDRVQcowState *s, int64_t size)
-{
-    return (size + (s->cluster_size - 1)) >> s->cluster_bits;
-}
-
-static inline int64_t size_to_l1(BDRVQcowState *s, int64_t size)
-{
-    int shift = s->cluster_bits + s->l2_bits;
-    return (size + (1ULL << shift) - 1) >> shift;
-}
-
-static inline int offset_to_l2_index(BDRVQcowState *s, int64_t offset)
-{
-    return (offset >> s->cluster_bits) & (s->l2_size - 1);
-}
-
-static inline int64_t align_offset(int64_t offset, int n)
-{
-    offset = (offset + n - 1) & ~(n - 1);
-    return offset;
-}
-
-static inline int qcow2_get_cluster_type(uint64_t l2_entry)
-{
-    if (l2_entry & QCOW_OFLAG_COMPRESSED) {
-        return QCOW2_CLUSTER_COMPRESSED;
-    } else if (l2_entry & QCOW_OFLAG_ZERO) {
-        return QCOW2_CLUSTER_ZERO;
-    } else if (!(l2_entry & L2E_OFFSET_MASK)) {
-        return QCOW2_CLUSTER_UNALLOCATED;
-    } else {
-        return QCOW2_CLUSTER_NORMAL;
-    }
-}
-
-/* Check whether refcounts are eager or lazy */
-static inline bool qcow2_need_accurate_refcounts(BDRVQcowState *s)
-{
-    return !(s->incompatible_features & QCOW2_INCOMPAT_DIRTY);
-}
-
-static inline uint64_t l2meta_cow_start(QCowL2Meta *m)
-{
-    return m->offset + m->cow_start.offset;
-}
-
-static inline uint64_t l2meta_cow_end(QCowL2Meta *m)
-{
-    return m->offset + m->cow_end.offset
-        + (m->cow_end.nb_sectors << BDRV_SECTOR_BITS);
-}
-
-// FIXME Need qcow2_ prefix to global functions
-
-/* qcow2.c functions */
-int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector *qiov,
-                  int64_t sector_num, int nb_sectors);
-
-int qcow2_mark_dirty(BlockDriverState *bs);
-int qcow2_update_header(BlockDriverState *bs);
-
-/* qcow2-refcount.c functions */
-int qcow2_refcount_init(BlockDriverState *bs);
-void qcow2_refcount_close(BlockDriverState *bs);
-
-int64_t qcow2_alloc_clusters(BlockDriverState *bs, int64_t size);
-int qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
-    int nb_clusters);
-int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size);
-void qcow2_free_clusters(BlockDriverState *bs,
-                          int64_t offset, int64_t size,
-                          enum qcow2_discard_type type);
-void qcow2_free_any_clusters(BlockDriverState *bs, uint64_t l2_entry,
-                             int nb_clusters, enum qcow2_discard_type type);
-
-int qcow2_update_snapshot_refcount(BlockDriverState *bs,
-    int64_t l1_table_offset, int l1_size, int addend);
-
-int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
-                          BdrvCheckMode fix);
-
-void qcow2_process_discards(BlockDriverState *bs, int ret);
-
-/* qcow2-cluster.c functions */
-int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
-                        bool exact_size);
-void qcow2_l2_cache_reset(BlockDriverState *bs);
-int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset);
-void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num,
-                     uint8_t *out_buf, const uint8_t *in_buf,
-                     int nb_sectors, int enc,
-                     const AES_KEY *key);
-
-int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
-    int *num, uint64_t *cluster_offset);
-int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,
-    int n_start, int n_end, int *num, uint64_t *host_offset, QCowL2Meta **m);
-uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
-                                         uint64_t offset,
-                                         int compressed_size);
-
-int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m);
-int qcow2_discard_clusters(BlockDriverState *bs, uint64_t offset,
-    int nb_sectors);
-int qcow2_zero_clusters(BlockDriverState *bs, uint64_t offset, int nb_sectors);
-
-/* qcow2-snapshot.c functions */
-int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
-int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id);
-int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id);
-int qcow2_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab);
-int qcow2_snapshot_load_tmp(BlockDriverState *bs, const char *snapshot_name);
-
-void qcow2_free_snapshots(BlockDriverState *bs);
-int qcow2_read_snapshots(BlockDriverState *bs);
-
-/* qcow2-cache.c functions */
-Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables);
-int qcow2_cache_destroy(BlockDriverState* bs, Qcow2Cache *c);
-
-void qcow2_cache_entry_mark_dirty(Qcow2Cache *c, void *table);
-int qcow2_cache_flush(BlockDriverState *bs, Qcow2Cache *c);
-int qcow2_cache_set_dependency(BlockDriverState *bs, Qcow2Cache *c,
-    Qcow2Cache *dependency);
-void qcow2_cache_depends_on_flush(Qcow2Cache *c);
-
-int qcow2_cache_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
-    void **table);
-int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
-    void **table);
-int qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table);
-
-#endif
diff --git a/contrib/qemu/block/qed-check.c b/contrib/qemu/block/qed-check.c
deleted file mode 100644
index b473dcd61..000000000
--- a/contrib/qemu/block/qed-check.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * QEMU Enhanced Disk Format Consistency Check
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Stefan Hajnoczi   <stefanha@linux.vnet.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qed.h"
-
-typedef struct {
-    BDRVQEDState *s;
-    BdrvCheckResult *result;
-    bool fix;                           /* whether to fix invalid offsets */
-
-    uint64_t nclusters;
-    uint32_t *used_clusters;            /* referenced cluster bitmap */
-
-    QEDRequest request;
-} QEDCheck;
-
-static bool qed_test_bit(uint32_t *bitmap, uint64_t n) {
-    return !!(bitmap[n / 32] & (1 << (n % 32)));
-}
-
-static void qed_set_bit(uint32_t *bitmap, uint64_t n) {
-    bitmap[n / 32] |= 1 << (n % 32);
-}
-
-/**
- * Set bitmap bits for clusters
- *
- * @check:          Check structure
- * @offset:         Starting offset in bytes
- * @n:              Number of clusters
- */
-static bool qed_set_used_clusters(QEDCheck *check, uint64_t offset,
-                                  unsigned int n)
-{
-    uint64_t cluster = qed_bytes_to_clusters(check->s, offset);
-    unsigned int corruptions = 0;
-
-    while (n-- != 0) {
-        /* Clusters should only be referenced once */
-        if (qed_test_bit(check->used_clusters, cluster)) {
-            corruptions++;
-        }
-
-        qed_set_bit(check->used_clusters, cluster);
-        cluster++;
-    }
-
-    check->result->corruptions += corruptions;
-    return corruptions == 0;
-}
-
-/**
- * Check an L2 table
- *
- * @ret:            Number of invalid cluster offsets
- */
-static unsigned int qed_check_l2_table(QEDCheck *check, QEDTable *table)
-{
-    BDRVQEDState *s = check->s;
-    unsigned int i, num_invalid = 0;
-    uint64_t last_offset = 0;
-
-    for (i = 0; i < s->table_nelems; i++) {
-        uint64_t offset = table->offsets[i];
-
-        if (qed_offset_is_unalloc_cluster(offset) ||
-            qed_offset_is_zero_cluster(offset)) {
-            continue;
-        }
-        check->result->bfi.allocated_clusters++;
-        if (last_offset && (last_offset + s->header.cluster_size != offset)) {
-            check->result->bfi.fragmented_clusters++;
-        }
-        last_offset = offset;
-
-        /* Detect invalid cluster offset */
-        if (!qed_check_cluster_offset(s, offset)) {
-            if (check->fix) {
-                table->offsets[i] = 0;
-                check->result->corruptions_fixed++;
-            } else {
-                check->result->corruptions++;
-            }
-
-            num_invalid++;
-            continue;
-        }
-
-        qed_set_used_clusters(check, offset, 1);
-    }
-
-    return num_invalid;
-}
-
-/**
- * Descend tables and check each cluster is referenced once only
- */
-static int qed_check_l1_table(QEDCheck *check, QEDTable *table)
-{
-    BDRVQEDState *s = check->s;
-    unsigned int i, num_invalid_l1 = 0;
-    int ret, last_error = 0;
-
-    /* Mark L1 table clusters used */
-    qed_set_used_clusters(check, s->header.l1_table_offset,
-                          s->header.table_size);
-
-    for (i = 0; i < s->table_nelems; i++) {
-        unsigned int num_invalid_l2;
-        uint64_t offset = table->offsets[i];
-
-        if (qed_offset_is_unalloc_cluster(offset)) {
-            continue;
-        }
-
-        /* Detect invalid L2 offset */
-        if (!qed_check_table_offset(s, offset)) {
-            /* Clear invalid offset */
-            if (check->fix) {
-                table->offsets[i] = 0;
-                check->result->corruptions_fixed++;
-            } else {
-                check->result->corruptions++;
-            }
-
-            num_invalid_l1++;
-            continue;
-        }
-
-        if (!qed_set_used_clusters(check, offset, s->header.table_size)) {
-            continue; /* skip an invalid table */
-        }
-
-        ret = qed_read_l2_table_sync(s, &check->request, offset);
-        if (ret) {
-            check->result->check_errors++;
-            last_error = ret;
-            continue;
-        }
-
-        num_invalid_l2 = qed_check_l2_table(check,
-                                            check->request.l2_table->table);
-
-        /* Write out fixed L2 table */
-        if (num_invalid_l2 > 0 && check->fix) {
-            ret = qed_write_l2_table_sync(s, &check->request, 0,
-                                          s->table_nelems, false);
-            if (ret) {
-                check->result->check_errors++;
-                last_error = ret;
-                continue;
-            }
-        }
-    }
-
-    /* Drop reference to final table */
-    qed_unref_l2_cache_entry(check->request.l2_table);
-    check->request.l2_table = NULL;
-
-    /* Write out fixed L1 table */
-    if (num_invalid_l1 > 0 && check->fix) {
-        ret = qed_write_l1_table_sync(s, 0, s->table_nelems);
-        if (ret) {
-            check->result->check_errors++;
-            last_error = ret;
-        }
-    }
-
-    return last_error;
-}
-
-/**
- * Check for unreferenced (leaked) clusters
- */
-static void qed_check_for_leaks(QEDCheck *check)
-{
-    BDRVQEDState *s = check->s;
-    uint64_t i;
-
-    for (i = s->header.header_size; i < check->nclusters; i++) {
-        if (!qed_test_bit(check->used_clusters, i)) {
-            check->result->leaks++;
-        }
-    }
-}
-
-/**
- * Mark an image clean once it passes check or has been repaired
- */
-static void qed_check_mark_clean(BDRVQEDState *s, BdrvCheckResult *result)
-{
-    /* Skip if there were unfixable corruptions or I/O errors */
-    if (result->corruptions > 0 || result->check_errors > 0) {
-        return;
-    }
-
-    /* Skip if image is already marked clean */
-    if (!(s->header.features & QED_F_NEED_CHECK)) {
-        return;
-    }
-
-    /* Ensure fixes reach storage before clearing check bit */
-    bdrv_flush(s->bs);
-
-    s->header.features &= ~QED_F_NEED_CHECK;
-    qed_write_header_sync(s);
-}
-
-int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix)
-{
-    QEDCheck check = {
-        .s = s,
-        .result = result,
-        .nclusters = qed_bytes_to_clusters(s, s->file_size),
-        .request = { .l2_table = NULL },
-        .fix = fix,
-    };
-    int ret;
-
-    check.used_clusters = g_malloc0(((check.nclusters + 31) / 32) *
-                                       sizeof(check.used_clusters[0]));
-
-    check.result->bfi.total_clusters =
-        (s->header.image_size + s->header.cluster_size - 1) /
-            s->header.cluster_size;
-    ret = qed_check_l1_table(&check, s->l1_table);
-    if (ret == 0) {
-        /* Only check for leaks if entire image was scanned successfully */
-        qed_check_for_leaks(&check);
-
-        if (fix) {
-            qed_check_mark_clean(s, result);
-        }
-    }
-
-    g_free(check.used_clusters);
-    return ret;
-}
diff --git a/contrib/qemu/block/qed-cluster.c b/contrib/qemu/block/qed-cluster.c
deleted file mode 100644
index f64b2af8f..000000000
--- a/contrib/qemu/block/qed-cluster.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * QEMU Enhanced Disk Format Cluster functions
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Stefan Hajnoczi   <stefanha@linux.vnet.ibm.com>
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qed.h"
-
-/**
- * Count the number of contiguous data clusters
- *
- * @s:              QED state
- * @table:          L2 table
- * @index:          First cluster index
- * @n:              Maximum number of clusters
- * @offset:         Set to first cluster offset
- *
- * This function scans tables for contiguous clusters.  A contiguous run of
- * clusters may be allocated, unallocated, or zero.
- */
-static unsigned int qed_count_contiguous_clusters(BDRVQEDState *s,
-                                                  QEDTable *table,
-                                                  unsigned int index,
-                                                  unsigned int n,
-                                                  uint64_t *offset)
-{
-    unsigned int end = MIN(index + n, s->table_nelems);
-    uint64_t last = table->offsets[index];
-    unsigned int i;
-
-    *offset = last;
-
-    for (i = index + 1; i < end; i++) {
-        if (qed_offset_is_unalloc_cluster(last)) {
-            /* Counting unallocated clusters */
-            if (!qed_offset_is_unalloc_cluster(table->offsets[i])) {
-                break;
-            }
-        } else if (qed_offset_is_zero_cluster(last)) {
-            /* Counting zero clusters */
-            if (!qed_offset_is_zero_cluster(table->offsets[i])) {
-                break;
-            }
-        } else {
-            /* Counting allocated clusters */
-            if (table->offsets[i] != last + s->header.cluster_size) {
-                break;
-            }
-            last = table->offsets[i];
-        }
-    }
-    return i - index;
-}
-
-typedef struct {
-    BDRVQEDState *s;
-    uint64_t pos;
-    size_t len;
-
-    QEDRequest *request;
-
-    /* User callback */
-    QEDFindClusterFunc *cb;
-    void *opaque;
-} QEDFindClusterCB;
-
-static void qed_find_cluster_cb(void *opaque, int ret)
-{
-    QEDFindClusterCB *find_cluster_cb = opaque;
-    BDRVQEDState *s = find_cluster_cb->s;
-    QEDRequest *request = find_cluster_cb->request;
-    uint64_t offset = 0;
-    size_t len = 0;
-    unsigned int index;
-    unsigned int n;
-
-    if (ret) {
-        goto out;
-    }
-
-    index = qed_l2_index(s, find_cluster_cb->pos);
-    n = qed_bytes_to_clusters(s,
-                              qed_offset_into_cluster(s, find_cluster_cb->pos) +
-                              find_cluster_cb->len);
-    n = qed_count_contiguous_clusters(s, request->l2_table->table,
-                                      index, n, &offset);
-
-    if (qed_offset_is_unalloc_cluster(offset)) {
-        ret = QED_CLUSTER_L2;
-    } else if (qed_offset_is_zero_cluster(offset)) {
-        ret = QED_CLUSTER_ZERO;
-    } else if (qed_check_cluster_offset(s, offset)) {
-        ret = QED_CLUSTER_FOUND;
-    } else {
-        ret = -EINVAL;
-    }
-
-    len = MIN(find_cluster_cb->len, n * s->header.cluster_size -
-              qed_offset_into_cluster(s, find_cluster_cb->pos));
-
-out:
-    find_cluster_cb->cb(find_cluster_cb->opaque, ret, offset, len);
-    g_free(find_cluster_cb);
-}
-
-/**
- * Find the offset of a data cluster
- *
- * @s:          QED state
- * @request:    L2 cache entry
- * @pos:        Byte position in device
- * @len:        Number of bytes
- * @cb:         Completion function
- * @opaque:     User data for completion function
- *
- * This function translates a position in the block device to an offset in the
- * image file.  It invokes the cb completion callback to report back the
- * translated offset or unallocated range in the image file.
- *
- * If the L2 table exists, request->l2_table points to the L2 table cache entry
- * and the caller must free the reference when they are finished.  The cache
- * entry is exposed in this way to avoid callers having to read the L2 table
- * again later during request processing.  If request->l2_table is non-NULL it
- * will be unreferenced before taking on the new cache entry.
- */
-void qed_find_cluster(BDRVQEDState *s, QEDRequest *request, uint64_t pos,
-                      size_t len, QEDFindClusterFunc *cb, void *opaque)
-{
-    QEDFindClusterCB *find_cluster_cb;
-    uint64_t l2_offset;
-
-    /* Limit length to L2 boundary.  Requests are broken up at the L2 boundary
-     * so that a request acts on one L2 table at a time.
-     */
-    len = MIN(len, (((pos >> s->l1_shift) + 1) << s->l1_shift) - pos);
-
-    l2_offset = s->l1_table->offsets[qed_l1_index(s, pos)];
-    if (qed_offset_is_unalloc_cluster(l2_offset)) {
-        cb(opaque, QED_CLUSTER_L1, 0, len);
-        return;
-    }
-    if (!qed_check_table_offset(s, l2_offset)) {
-        cb(opaque, -EINVAL, 0, 0);
-        return;
-    }
-
-    find_cluster_cb = g_malloc(sizeof(*find_cluster_cb));
-    find_cluster_cb->s = s;
-    find_cluster_cb->pos = pos;
-    find_cluster_cb->len = len;
-    find_cluster_cb->cb = cb;
-    find_cluster_cb->opaque = opaque;
-    find_cluster_cb->request = request;
-
-    qed_read_l2_table(s, request, l2_offset,
-                      qed_find_cluster_cb, find_cluster_cb);
-}
diff --git a/contrib/qemu/block/qed-gencb.c b/contrib/qemu/block/qed-gencb.c
deleted file mode 100644
index 7d7ac1ffc..000000000
--- a/contrib/qemu/block/qed-gencb.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * QEMU Enhanced Disk Format
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Stefan Hajnoczi   <stefanha@linux.vnet.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qed.h"
-
-void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque)
-{
-    GenericCB *gencb = g_malloc(len);
-    gencb->cb = cb;
-    gencb->opaque = opaque;
-    return gencb;
-}
-
-void gencb_complete(void *opaque, int ret)
-{
-    GenericCB *gencb = opaque;
-    BlockDriverCompletionFunc *cb = gencb->cb;
-    void *user_opaque = gencb->opaque;
-
-    g_free(gencb);
-    cb(user_opaque, ret);
-}
diff --git a/contrib/qemu/block/qed-l2-cache.c b/contrib/qemu/block/qed-l2-cache.c
deleted file mode 100644
index e9b2aae44..000000000
--- a/contrib/qemu/block/qed-l2-cache.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * QEMU Enhanced Disk Format L2 Cache
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-/*
- * L2 table cache usage is as follows:
- *
- * An open image has one L2 table cache that is used to avoid accessing the
- * image file for recently referenced L2 tables.
- *
- * Cluster offset lookup translates the logical offset within the block device
- * to a cluster offset within the image file.  This is done by indexing into
- * the L1 and L2 tables which store cluster offsets.  It is here where the L2
- * table cache serves up recently referenced L2 tables.
- *
- * If there is a cache miss, that L2 table is read from the image file and
- * committed to the cache.  Subsequent accesses to that L2 table will be served
- * from the cache until the table is evicted from the cache.
- *
- * L2 tables are also committed to the cache when new L2 tables are allocated
- * in the image file.  Since the L2 table cache is write-through, the new L2
- * table is first written out to the image file and then committed to the
- * cache.
- *
- * Multiple I/O requests may be using an L2 table cache entry at any given
- * time.  That means an entry may be in use across several requests and
- * reference counting is needed to free the entry at the correct time.  In
- * particular, an entry evicted from the cache will only be freed once all
- * references are dropped.
- *
- * An in-flight I/O request will hold a reference to a L2 table cache entry for
- * the period during which it needs to access the L2 table.  This includes
- * cluster offset lookup, L2 table allocation, and L2 table update when a new
- * data cluster has been allocated.
- *
- * An interesting case occurs when two requests need to access an L2 table that
- * is not in the cache.  Since the operation to read the table from the image
- * file takes some time to complete, both requests may see a cache miss and
- * start reading the L2 table from the image file.  The first to finish will
- * commit its L2 table into the cache.  When the second tries to commit its
- * table will be deleted in favor of the existing cache entry.
- */
-
-#include "trace.h"
-#include "qed.h"
-
-/* Each L2 holds 2GB so this let's us fully cache a 100GB disk */
-#define MAX_L2_CACHE_SIZE 50
-
-/**
- * Initialize the L2 cache
- */
-void qed_init_l2_cache(L2TableCache *l2_cache)
-{
-    QTAILQ_INIT(&l2_cache->entries);
-    l2_cache->n_entries = 0;
-}
-
-/**
- * Free the L2 cache
- */
-void qed_free_l2_cache(L2TableCache *l2_cache)
-{
-    CachedL2Table *entry, *next_entry;
-
-    QTAILQ_FOREACH_SAFE(entry, &l2_cache->entries, node, next_entry) {
-        qemu_vfree(entry->table);
-        g_free(entry);
-    }
-}
-
-/**
- * Allocate an uninitialized entry from the cache
- *
- * The returned entry has a reference count of 1 and is owned by the caller.
- * The caller must allocate the actual table field for this entry and it must
- * be freeable using qemu_vfree().
- */
-CachedL2Table *qed_alloc_l2_cache_entry(L2TableCache *l2_cache)
-{
-    CachedL2Table *entry;
-
-    entry = g_malloc0(sizeof(*entry));
-    entry->ref++;
-
-    trace_qed_alloc_l2_cache_entry(l2_cache, entry);
-
-    return entry;
-}
-
-/**
- * Decrease an entry's reference count and free if necessary when the reference
- * count drops to zero.
- */
-void qed_unref_l2_cache_entry(CachedL2Table *entry)
-{
-    if (!entry) {
-        return;
-    }
-
-    entry->ref--;
-    trace_qed_unref_l2_cache_entry(entry, entry->ref);
-    if (entry->ref == 0) {
-        qemu_vfree(entry->table);
-        g_free(entry);
-    }
-}
-
-/**
- * Find an entry in the L2 cache.  This may return NULL and it's up to the
- * caller to satisfy the cache miss.
- *
- * For a cached entry, this function increases the reference count and returns
- * the entry.
- */
-CachedL2Table *qed_find_l2_cache_entry(L2TableCache *l2_cache, uint64_t offset)
-{
-    CachedL2Table *entry;
-
-    QTAILQ_FOREACH(entry, &l2_cache->entries, node) {
-        if (entry->offset == offset) {
-            trace_qed_find_l2_cache_entry(l2_cache, entry, offset, entry->ref);
-            entry->ref++;
-            return entry;
-        }
-    }
-    return NULL;
-}
-
-/**
- * Commit an L2 cache entry into the cache.  This is meant to be used as part of
- * the process to satisfy a cache miss.  A caller would allocate an entry which
- * is not actually in the L2 cache and then once the entry was valid and
- * present on disk, the entry can be committed into the cache.
- *
- * Since the cache is write-through, it's important that this function is not
- * called until the entry is present on disk and the L1 has been updated to
- * point to the entry.
- *
- * N.B. This function steals a reference to the l2_table from the caller so the
- * caller must obtain a new reference by issuing a call to
- * qed_find_l2_cache_entry().
- */
-void qed_commit_l2_cache_entry(L2TableCache *l2_cache, CachedL2Table *l2_table)
-{
-    CachedL2Table *entry;
-
-    entry = qed_find_l2_cache_entry(l2_cache, l2_table->offset);
-    if (entry) {
-        qed_unref_l2_cache_entry(entry);
-        qed_unref_l2_cache_entry(l2_table);
-        return;
-    }
-
-    /* Evict an unused cache entry so we have space.  If all entries are in use
-     * we can grow the cache temporarily and we try to shrink back down later.
-     */
-    if (l2_cache->n_entries >= MAX_L2_CACHE_SIZE) {
-        CachedL2Table *next;
-        QTAILQ_FOREACH_SAFE(entry, &l2_cache->entries, node, next) {
-            if (entry->ref > 1) {
-                continue;
-            }
-
-            QTAILQ_REMOVE(&l2_cache->entries, entry, node);
-            l2_cache->n_entries--;
-            qed_unref_l2_cache_entry(entry);
-
-            /* Stop evicting when we've shrunk back to max size */
-            if (l2_cache->n_entries < MAX_L2_CACHE_SIZE) {
-                break;
-            }
-        }
-    }
-
-    l2_cache->n_entries++;
-    QTAILQ_INSERT_TAIL(&l2_cache->entries, l2_table, node);
-}
diff --git a/contrib/qemu/block/qed-table.c b/contrib/qemu/block/qed-table.c
deleted file mode 100644
index 76d2dcccf..000000000
--- a/contrib/qemu/block/qed-table.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * QEMU Enhanced Disk Format Table I/O
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Stefan Hajnoczi   <stefanha@linux.vnet.ibm.com>
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "trace.h"
-#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
-#include "qed.h"
-
-typedef struct {
-    GenericCB gencb;
-    BDRVQEDState *s;
-    QEDTable *table;
-
-    struct iovec iov;
-    QEMUIOVector qiov;
-} QEDReadTableCB;
-
-static void qed_read_table_cb(void *opaque, int ret)
-{
-    QEDReadTableCB *read_table_cb = opaque;
-    QEDTable *table = read_table_cb->table;
-    int noffsets = read_table_cb->qiov.size / sizeof(uint64_t);
-    int i;
-
-    /* Handle I/O error */
-    if (ret) {
-        goto out;
-    }
-
-    /* Byteswap offsets */
-    for (i = 0; i < noffsets; i++) {
-        table->offsets[i] = le64_to_cpu(table->offsets[i]);
-    }
-
-out:
-    /* Completion */
-    trace_qed_read_table_cb(read_table_cb->s, read_table_cb->table, ret);
-    gencb_complete(&read_table_cb->gencb, ret);
-}
-
-static void qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
-                           BlockDriverCompletionFunc *cb, void *opaque)
-{
-    QEDReadTableCB *read_table_cb = gencb_alloc(sizeof(*read_table_cb),
-                                                cb, opaque);
-    QEMUIOVector *qiov = &read_table_cb->qiov;
-
-    trace_qed_read_table(s, offset, table);
-
-    read_table_cb->s = s;
-    read_table_cb->table = table;
-    read_table_cb->iov.iov_base = table->offsets,
-    read_table_cb->iov.iov_len = s->header.cluster_size * s->header.table_size,
-
-    qemu_iovec_init_external(qiov, &read_table_cb->iov, 1);
-    bdrv_aio_readv(s->bs->file, offset / BDRV_SECTOR_SIZE, qiov,
-                   qiov->size / BDRV_SECTOR_SIZE,
-                   qed_read_table_cb, read_table_cb);
-}
-
-typedef struct {
-    GenericCB gencb;
-    BDRVQEDState *s;
-    QEDTable *orig_table;
-    QEDTable *table;
-    bool flush;             /* flush after write? */
-
-    struct iovec iov;
-    QEMUIOVector qiov;
-} QEDWriteTableCB;
-
-static void qed_write_table_cb(void *opaque, int ret)
-{
-    QEDWriteTableCB *write_table_cb = opaque;
-
-    trace_qed_write_table_cb(write_table_cb->s,
-                             write_table_cb->orig_table,
-                             write_table_cb->flush,
-                             ret);
-
-    if (ret) {
-        goto out;
-    }
-
-    if (write_table_cb->flush) {
-        /* We still need to flush first */
-        write_table_cb->flush = false;
-        bdrv_aio_flush(write_table_cb->s->bs, qed_write_table_cb,
-                       write_table_cb);
-        return;
-    }
-
-out:
-    qemu_vfree(write_table_cb->table);
-    gencb_complete(&write_table_cb->gencb, ret);
-}
-
-/**
- * Write out an updated part or all of a table
- *
- * @s:          QED state
- * @offset:     Offset of table in image file, in bytes
- * @table:      Table
- * @index:      Index of first element
- * @n:          Number of elements
- * @flush:      Whether or not to sync to disk
- * @cb:         Completion function
- * @opaque:     Argument for completion function
- */
-static void qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
-                            unsigned int index, unsigned int n, bool flush,
-                            BlockDriverCompletionFunc *cb, void *opaque)
-{
-    QEDWriteTableCB *write_table_cb;
-    unsigned int sector_mask = BDRV_SECTOR_SIZE / sizeof(uint64_t) - 1;
-    unsigned int start, end, i;
-    size_t len_bytes;
-
-    trace_qed_write_table(s, offset, table, index, n);
-
-    /* Calculate indices of the first and one after last elements */
-    start = index & ~sector_mask;
-    end = (index + n + sector_mask) & ~sector_mask;
-
-    len_bytes = (end - start) * sizeof(uint64_t);
-
-    write_table_cb = gencb_alloc(sizeof(*write_table_cb), cb, opaque);
-    write_table_cb->s = s;
-    write_table_cb->orig_table = table;
-    write_table_cb->flush = flush;
-    write_table_cb->table = qemu_blockalign(s->bs, len_bytes);
-    write_table_cb->iov.iov_base = write_table_cb->table->offsets;
-    write_table_cb->iov.iov_len = len_bytes;
-    qemu_iovec_init_external(&write_table_cb->qiov, &write_table_cb->iov, 1);
-
-    /* Byteswap table */
-    for (i = start; i < end; i++) {
-        uint64_t le_offset = cpu_to_le64(table->offsets[i]);
-        write_table_cb->table->offsets[i - start] = le_offset;
-    }
-
-    /* Adjust for offset into table */
-    offset += start * sizeof(uint64_t);
-
-    bdrv_aio_writev(s->bs->file, offset / BDRV_SECTOR_SIZE,
-                    &write_table_cb->qiov,
-                    write_table_cb->qiov.size / BDRV_SECTOR_SIZE,
-                    qed_write_table_cb, write_table_cb);
-}
-
-/**
- * Propagate return value from async callback
- */
-static void qed_sync_cb(void *opaque, int ret)
-{
-    *(int *)opaque = ret;
-}
-
-int qed_read_l1_table_sync(BDRVQEDState *s)
-{
-    int ret = -EINPROGRESS;
-
-    qed_read_table(s, s->header.l1_table_offset,
-                   s->l1_table, qed_sync_cb, &ret);
-    while (ret == -EINPROGRESS) {
-        qemu_aio_wait();
-    }
-
-    return ret;
-}
-
-void qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n,
-                        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    BLKDBG_EVENT(s->bs->file, BLKDBG_L1_UPDATE);
-    qed_write_table(s, s->header.l1_table_offset,
-                    s->l1_table, index, n, false, cb, opaque);
-}
-
-int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
-                            unsigned int n)
-{
-    int ret = -EINPROGRESS;
-
-    qed_write_l1_table(s, index, n, qed_sync_cb, &ret);
-    while (ret == -EINPROGRESS) {
-        qemu_aio_wait();
-    }
-
-    return ret;
-}
-
-typedef struct {
-    GenericCB gencb;
-    BDRVQEDState *s;
-    uint64_t l2_offset;
-    QEDRequest *request;
-} QEDReadL2TableCB;
-
-static void qed_read_l2_table_cb(void *opaque, int ret)
-{
-    QEDReadL2TableCB *read_l2_table_cb = opaque;
-    QEDRequest *request = read_l2_table_cb->request;
-    BDRVQEDState *s = read_l2_table_cb->s;
-    CachedL2Table *l2_table = request->l2_table;
-    uint64_t l2_offset = read_l2_table_cb->l2_offset;
-
-    if (ret) {
-        /* can't trust loaded L2 table anymore */
-        qed_unref_l2_cache_entry(l2_table);
-        request->l2_table = NULL;
-    } else {
-        l2_table->offset = l2_offset;
-
-        qed_commit_l2_cache_entry(&s->l2_cache, l2_table);
-
-        /* This is guaranteed to succeed because we just committed the entry
-         * to the cache.
-         */
-        request->l2_table = qed_find_l2_cache_entry(&s->l2_cache, l2_offset);
-        assert(request->l2_table != NULL);
-    }
-
-    gencb_complete(&read_l2_table_cb->gencb, ret);
-}
-
-void qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset,
-                       BlockDriverCompletionFunc *cb, void *opaque)
-{
-    QEDReadL2TableCB *read_l2_table_cb;
-
-    qed_unref_l2_cache_entry(request->l2_table);
-
-    /* Check for cached L2 entry */
-    request->l2_table = qed_find_l2_cache_entry(&s->l2_cache, offset);
-    if (request->l2_table) {
-        cb(opaque, 0);
-        return;
-    }
-
-    request->l2_table = qed_alloc_l2_cache_entry(&s->l2_cache);
-    request->l2_table->table = qed_alloc_table(s);
-
-    read_l2_table_cb = gencb_alloc(sizeof(*read_l2_table_cb), cb, opaque);
-    read_l2_table_cb->s = s;
-    read_l2_table_cb->l2_offset = offset;
-    read_l2_table_cb->request = request;
-
-    BLKDBG_EVENT(s->bs->file, BLKDBG_L2_LOAD);
-    qed_read_table(s, offset, request->l2_table->table,
-                   qed_read_l2_table_cb, read_l2_table_cb);
-}
-
-int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
-{
-    int ret = -EINPROGRESS;
-
-    qed_read_l2_table(s, request, offset, qed_sync_cb, &ret);
-    while (ret == -EINPROGRESS) {
-        qemu_aio_wait();
-    }
-
-    return ret;
-}
-
-void qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
-                        unsigned int index, unsigned int n, bool flush,
-                        BlockDriverCompletionFunc *cb, void *opaque)
-{
-    BLKDBG_EVENT(s->bs->file, BLKDBG_L2_UPDATE);
-    qed_write_table(s, request->l2_table->offset,
-                    request->l2_table->table, index, n, flush, cb, opaque);
-}
-
-int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
-                            unsigned int index, unsigned int n, bool flush)
-{
-    int ret = -EINPROGRESS;
-
-    qed_write_l2_table(s, request, index, n, flush, qed_sync_cb, &ret);
-    while (ret == -EINPROGRESS) {
-        qemu_aio_wait();
-    }
-
-    return ret;
-}
diff --git a/contrib/qemu/block/qed.c b/contrib/qemu/block/qed.c
deleted file mode 100644
index f767b0528..000000000
--- a/contrib/qemu/block/qed.c
+++ /dev/null
@@ -1,1596 +0,0 @@
-/*
- * QEMU Enhanced Disk Format
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Stefan Hajnoczi   <stefanha@linux.vnet.ibm.com>
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qemu/timer.h"
-#include "trace.h"
-#include "qed.h"
-#include "qapi/qmp/qerror.h"
-#include "migration/migration.h"
-
-static void qed_aio_cancel(BlockDriverAIOCB *blockacb)
-{
-    QEDAIOCB *acb = (QEDAIOCB *)blockacb;
-    bool finished = false;
-
-    /* Wait for the request to finish */
-    acb->finished = &finished;
-    while (!finished) {
-        qemu_aio_wait();
-    }
-}
-
-static const AIOCBInfo qed_aiocb_info = {
-    .aiocb_size         = sizeof(QEDAIOCB),
-    .cancel             = qed_aio_cancel,
-};
-
-static int bdrv_qed_probe(const uint8_t *buf, int buf_size,
-                          const char *filename)
-{
-    const QEDHeader *header = (const QEDHeader *)buf;
-
-    if (buf_size < sizeof(*header)) {
-        return 0;
-    }
-    if (le32_to_cpu(header->magic) != QED_MAGIC) {
-        return 0;
-    }
-    return 100;
-}
-
-/**
- * Check whether an image format is raw
- *
- * @fmt:    Backing file format, may be NULL
- */
-static bool qed_fmt_is_raw(const char *fmt)
-{
-    return fmt && strcmp(fmt, "raw") == 0;
-}
-
-static void qed_header_le_to_cpu(const QEDHeader *le, QEDHeader *cpu)
-{
-    cpu->magic = le32_to_cpu(le->magic);
-    cpu->cluster_size = le32_to_cpu(le->cluster_size);
-    cpu->table_size = le32_to_cpu(le->table_size);
-    cpu->header_size = le32_to_cpu(le->header_size);
-    cpu->features = le64_to_cpu(le->features);
-    cpu->compat_features = le64_to_cpu(le->compat_features);
-    cpu->autoclear_features = le64_to_cpu(le->autoclear_features);
-    cpu->l1_table_offset = le64_to_cpu(le->l1_table_offset);
-    cpu->image_size = le64_to_cpu(le->image_size);
-    cpu->backing_filename_offset = le32_to_cpu(le->backing_filename_offset);
-    cpu->backing_filename_size = le32_to_cpu(le->backing_filename_size);
-}
-
-static void qed_header_cpu_to_le(const QEDHeader *cpu, QEDHeader *le)
-{
-    le->magic = cpu_to_le32(cpu->magic);
-    le->cluster_size = cpu_to_le32(cpu->cluster_size);
-    le->table_size = cpu_to_le32(cpu->table_size);
-    le->header_size = cpu_to_le32(cpu->header_size);
-    le->features = cpu_to_le64(cpu->features);
-    le->compat_features = cpu_to_le64(cpu->compat_features);
-    le->autoclear_features = cpu_to_le64(cpu->autoclear_features);
-    le->l1_table_offset = cpu_to_le64(cpu->l1_table_offset);
-    le->image_size = cpu_to_le64(cpu->image_size);
-    le->backing_filename_offset = cpu_to_le32(cpu->backing_filename_offset);
-    le->backing_filename_size = cpu_to_le32(cpu->backing_filename_size);
-}
-
-int qed_write_header_sync(BDRVQEDState *s)
-{
-    QEDHeader le;
-    int ret;
-
-    qed_header_cpu_to_le(&s->header, &le);
-    ret = bdrv_pwrite(s->bs->file, 0, &le, sizeof(le));
-    if (ret != sizeof(le)) {
-        return ret;
-    }
-    return 0;
-}
-
-typedef struct {
-    GenericCB gencb;
-    BDRVQEDState *s;
-    struct iovec iov;
-    QEMUIOVector qiov;
-    int nsectors;
-    uint8_t *buf;
-} QEDWriteHeaderCB;
-
-static void qed_write_header_cb(void *opaque, int ret)
-{
-    QEDWriteHeaderCB *write_header_cb = opaque;
-
-    qemu_vfree(write_header_cb->buf);
-    gencb_complete(write_header_cb, ret);
-}
-
-static void qed_write_header_read_cb(void *opaque, int ret)
-{
-    QEDWriteHeaderCB *write_header_cb = opaque;
-    BDRVQEDState *s = write_header_cb->s;
-
-    if (ret) {
-        qed_write_header_cb(write_header_cb, ret);
-        return;
-    }
-
-    /* Update header */
-    qed_header_cpu_to_le(&s->header, (QEDHeader *)write_header_cb->buf);
-
-    bdrv_aio_writev(s->bs->file, 0, &write_header_cb->qiov,
-                    write_header_cb->nsectors, qed_write_header_cb,
-                    write_header_cb);
-}
-
-/**
- * Update header in-place (does not rewrite backing filename or other strings)
- *
- * This function only updates known header fields in-place and does not affect
- * extra data after the QED header.
- */
-static void qed_write_header(BDRVQEDState *s, BlockDriverCompletionFunc cb,
-                             void *opaque)
-{
-    /* We must write full sectors for O_DIRECT but cannot necessarily generate
-     * the data following the header if an unrecognized compat feature is
-     * active.  Therefore, first read the sectors containing the header, update
-     * them, and write back.
-     */
-
-    int nsectors = (sizeof(QEDHeader) + BDRV_SECTOR_SIZE - 1) /
-                   BDRV_SECTOR_SIZE;
-    size_t len = nsectors * BDRV_SECTOR_SIZE;
-    QEDWriteHeaderCB *write_header_cb = gencb_alloc(sizeof(*write_header_cb),
-                                                    cb, opaque);
-
-    write_header_cb->s = s;
-    write_header_cb->nsectors = nsectors;
-    write_header_cb->buf = qemu_blockalign(s->bs, len);
-    write_header_cb->iov.iov_base = write_header_cb->buf;
-    write_header_cb->iov.iov_len = len;
-    qemu_iovec_init_external(&write_header_cb->qiov, &write_header_cb->iov, 1);
-
-    bdrv_aio_readv(s->bs->file, 0, &write_header_cb->qiov, nsectors,
-                   qed_write_header_read_cb, write_header_cb);
-}
-
-static uint64_t qed_max_image_size(uint32_t cluster_size, uint32_t table_size)
-{
-    uint64_t table_entries;
-    uint64_t l2_size;
-
-    table_entries = (table_size * cluster_size) / sizeof(uint64_t);
-    l2_size = table_entries * cluster_size;
-
-    return l2_size * table_entries;
-}
-
-static bool qed_is_cluster_size_valid(uint32_t cluster_size)
-{
-    if (cluster_size < QED_MIN_CLUSTER_SIZE ||
-        cluster_size > QED_MAX_CLUSTER_SIZE) {
-        return false;
-    }
-    if (cluster_size & (cluster_size - 1)) {
-        return false; /* not power of 2 */
-    }
-    return true;
-}
-
-static bool qed_is_table_size_valid(uint32_t table_size)
-{
-    if (table_size < QED_MIN_TABLE_SIZE ||
-        table_size > QED_MAX_TABLE_SIZE) {
-        return false;
-    }
-    if (table_size & (table_size - 1)) {
-        return false; /* not power of 2 */
-    }
-    return true;
-}
-
-static bool qed_is_image_size_valid(uint64_t image_size, uint32_t cluster_size,
-                                    uint32_t table_size)
-{
-    if (image_size % BDRV_SECTOR_SIZE != 0) {
-        return false; /* not multiple of sector size */
-    }
-    if (image_size > qed_max_image_size(cluster_size, table_size)) {
-        return false; /* image is too large */
-    }
-    return true;
-}
-
-/**
- * Read a string of known length from the image file
- *
- * @file:       Image file
- * @offset:     File offset to start of string, in bytes
- * @n:          String length in bytes
- * @buf:        Destination buffer
- * @buflen:     Destination buffer length in bytes
- * @ret:        0 on success, -errno on failure
- *
- * The string is NUL-terminated.
- */
-static int qed_read_string(BlockDriverState *file, uint64_t offset, size_t n,
-                           char *buf, size_t buflen)
-{
-    int ret;
-    if (n >= buflen) {
-        return -EINVAL;
-    }
-    ret = bdrv_pread(file, offset, buf, n);
-    if (ret < 0) {
-        return ret;
-    }
-    buf[n] = '\0';
-    return 0;
-}
-
-/**
- * Allocate new clusters
- *
- * @s:          QED state
- * @n:          Number of contiguous clusters to allocate
- * @ret:        Offset of first allocated cluster
- *
- * This function only produces the offset where the new clusters should be
- * written.  It updates BDRVQEDState but does not make any changes to the image
- * file.
- */
-static uint64_t qed_alloc_clusters(BDRVQEDState *s, unsigned int n)
-{
-    uint64_t offset = s->file_size;
-    s->file_size += n * s->header.cluster_size;
-    return offset;
-}
-
-QEDTable *qed_alloc_table(BDRVQEDState *s)
-{
-    /* Honor O_DIRECT memory alignment requirements */
-    return qemu_blockalign(s->bs,
-                           s->header.cluster_size * s->header.table_size);
-}
-
-/**
- * Allocate a new zeroed L2 table
- */
-static CachedL2Table *qed_new_l2_table(BDRVQEDState *s)
-{
-    CachedL2Table *l2_table = qed_alloc_l2_cache_entry(&s->l2_cache);
-
-    l2_table->table = qed_alloc_table(s);
-    l2_table->offset = qed_alloc_clusters(s, s->header.table_size);
-
-    memset(l2_table->table->offsets, 0,
-           s->header.cluster_size * s->header.table_size);
-    return l2_table;
-}
-
-static void qed_aio_next_io(void *opaque, int ret);
-
-static void qed_plug_allocating_write_reqs(BDRVQEDState *s)
-{
-    assert(!s->allocating_write_reqs_plugged);
-
-    s->allocating_write_reqs_plugged = true;
-}
-
-static void qed_unplug_allocating_write_reqs(BDRVQEDState *s)
-{
-    QEDAIOCB *acb;
-
-    assert(s->allocating_write_reqs_plugged);
-
-    s->allocating_write_reqs_plugged = false;
-
-    acb = QSIMPLEQ_FIRST(&s->allocating_write_reqs);
-    if (acb) {
-        qed_aio_next_io(acb, 0);
-    }
-}
-
-static void qed_finish_clear_need_check(void *opaque, int ret)
-{
-    /* Do nothing */
-}
-
-static void qed_flush_after_clear_need_check(void *opaque, int ret)
-{
-    BDRVQEDState *s = opaque;
-
-    bdrv_aio_flush(s->bs, qed_finish_clear_need_check, s);
-
-    /* No need to wait until flush completes */
-    qed_unplug_allocating_write_reqs(s);
-}
-
-static void qed_clear_need_check(void *opaque, int ret)
-{
-    BDRVQEDState *s = opaque;
-
-    if (ret) {
-        qed_unplug_allocating_write_reqs(s);
-        return;
-    }
-
-    s->header.features &= ~QED_F_NEED_CHECK;
-    qed_write_header(s, qed_flush_after_clear_need_check, s);
-}
-
-static void qed_need_check_timer_cb(void *opaque)
-{
-    BDRVQEDState *s = opaque;
-
-    /* The timer should only fire when allocating writes have drained */
-    assert(!QSIMPLEQ_FIRST(&s->allocating_write_reqs));
-
-    trace_qed_need_check_timer_cb(s);
-
-    qed_plug_allocating_write_reqs(s);
-
-    /* Ensure writes are on disk before clearing flag */
-    bdrv_aio_flush(s->bs, qed_clear_need_check, s);
-}
-
-static void qed_start_need_check_timer(BDRVQEDState *s)
-{
-    trace_qed_start_need_check_timer(s);
-
-    /* Use vm_clock so we don't alter the image file while suspended for
-     * migration.
-     */
-    qemu_mod_timer(s->need_check_timer, qemu_get_clock_ns(vm_clock) +
-                   get_ticks_per_sec() * QED_NEED_CHECK_TIMEOUT);
-}
-
-/* It's okay to call this multiple times or when no timer is started */
-static void qed_cancel_need_check_timer(BDRVQEDState *s)
-{
-    trace_qed_cancel_need_check_timer(s);
-    qemu_del_timer(s->need_check_timer);
-}
-
-static void bdrv_qed_rebind(BlockDriverState *bs)
-{
-    BDRVQEDState *s = bs->opaque;
-    s->bs = bs;
-}
-
-static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags)
-{
-    BDRVQEDState *s = bs->opaque;
-    QEDHeader le_header;
-    int64_t file_size;
-    int ret;
-
-    s->bs = bs;
-    QSIMPLEQ_INIT(&s->allocating_write_reqs);
-
-    ret = bdrv_pread(bs->file, 0, &le_header, sizeof(le_header));
-    if (ret < 0) {
-        return ret;
-    }
-    qed_header_le_to_cpu(&le_header, &s->header);
-
-    if (s->header.magic != QED_MAGIC) {
-        return -EMEDIUMTYPE;
-    }
-    if (s->header.features & ~QED_FEATURE_MASK) {
-        /* image uses unsupported feature bits */
-        char buf[64];
-        snprintf(buf, sizeof(buf), "%" PRIx64,
-            s->header.features & ~QED_FEATURE_MASK);
-        qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
-            bs->device_name, "QED", buf);
-        return -ENOTSUP;
-    }
-    if (!qed_is_cluster_size_valid(s->header.cluster_size)) {
-        return -EINVAL;
-    }
-
-    /* Round down file size to the last cluster */
-    file_size = bdrv_getlength(bs->file);
-    if (file_size < 0) {
-        return file_size;
-    }
-    s->file_size = qed_start_of_cluster(s, file_size);
-
-    if (!qed_is_table_size_valid(s->header.table_size)) {
-        return -EINVAL;
-    }
-    if (!qed_is_image_size_valid(s->header.image_size,
-                                 s->header.cluster_size,
-                                 s->header.table_size)) {
-        return -EINVAL;
-    }
-    if (!qed_check_table_offset(s, s->header.l1_table_offset)) {
-        return -EINVAL;
-    }
-
-    s->table_nelems = (s->header.cluster_size * s->header.table_size) /
-                      sizeof(uint64_t);
-    s->l2_shift = ffs(s->header.cluster_size) - 1;
-    s->l2_mask = s->table_nelems - 1;
-    s->l1_shift = s->l2_shift + ffs(s->table_nelems) - 1;
-
-    if ((s->header.features & QED_F_BACKING_FILE)) {
-        if ((uint64_t)s->header.backing_filename_offset +
-            s->header.backing_filename_size >
-            s->header.cluster_size * s->header.header_size) {
-            return -EINVAL;
-        }
-
-        ret = qed_read_string(bs->file, s->header.backing_filename_offset,
-                              s->header.backing_filename_size, bs->backing_file,
-                              sizeof(bs->backing_file));
-        if (ret < 0) {
-            return ret;
-        }
-
-        if (s->header.features & QED_F_BACKING_FORMAT_NO_PROBE) {
-            pstrcpy(bs->backing_format, sizeof(bs->backing_format), "raw");
-        }
-    }
-
-    /* Reset unknown autoclear feature bits.  This is a backwards
-     * compatibility mechanism that allows images to be opened by older
-     * programs, which "knock out" unknown feature bits.  When an image is
-     * opened by a newer program again it can detect that the autoclear
-     * feature is no longer valid.
-     */
-    if ((s->header.autoclear_features & ~QED_AUTOCLEAR_FEATURE_MASK) != 0 &&
-        !bdrv_is_read_only(bs->file) && !(flags & BDRV_O_INCOMING)) {
-        s->header.autoclear_features &= QED_AUTOCLEAR_FEATURE_MASK;
-
-        ret = qed_write_header_sync(s);
-        if (ret) {
-            return ret;
-        }
-
-        /* From here on only known autoclear feature bits are valid */
-        bdrv_flush(bs->file);
-    }
-
-    s->l1_table = qed_alloc_table(s);
-    qed_init_l2_cache(&s->l2_cache);
-
-    ret = qed_read_l1_table_sync(s);
-    if (ret) {
-        goto out;
-    }
-
-    /* If image was not closed cleanly, check consistency */
-    if (!(flags & BDRV_O_CHECK) && (s->header.features & QED_F_NEED_CHECK)) {
-        /* Read-only images cannot be fixed.  There is no risk of corruption
-         * since write operations are not possible.  Therefore, allow
-         * potentially inconsistent images to be opened read-only.  This can
-         * aid data recovery from an otherwise inconsistent image.
-         */
-        if (!bdrv_is_read_only(bs->file) &&
-            !(flags & BDRV_O_INCOMING)) {
-            BdrvCheckResult result = {0};
-
-            ret = qed_check(s, &result, true);
-            if (ret) {
-                goto out;
-            }
-        }
-    }
-
-    s->need_check_timer = qemu_new_timer_ns(vm_clock,
-                                            qed_need_check_timer_cb, s);
-
-out:
-    if (ret) {
-        qed_free_l2_cache(&s->l2_cache);
-        qemu_vfree(s->l1_table);
-    }
-    return ret;
-}
-
-/* We have nothing to do for QED reopen, stubs just return
- * success */
-static int bdrv_qed_reopen_prepare(BDRVReopenState *state,
-                                   BlockReopenQueue *queue, Error **errp)
-{
-    return 0;
-}
-
-static void bdrv_qed_close(BlockDriverState *bs)
-{
-    BDRVQEDState *s = bs->opaque;
-
-    qed_cancel_need_check_timer(s);
-    qemu_free_timer(s->need_check_timer);
-
-    /* Ensure writes reach stable storage */
-    bdrv_flush(bs->file);
-
-    /* Clean shutdown, no check required on next open */
-    if (s->header.features & QED_F_NEED_CHECK) {
-        s->header.features &= ~QED_F_NEED_CHECK;
-        qed_write_header_sync(s);
-    }
-
-    qed_free_l2_cache(&s->l2_cache);
-    qemu_vfree(s->l1_table);
-}
-
-static int qed_create(const char *filename, uint32_t cluster_size,
-                      uint64_t image_size, uint32_t table_size,
-                      const char *backing_file, const char *backing_fmt)
-{
-    QEDHeader header = {
-        .magic = QED_MAGIC,
-        .cluster_size = cluster_size,
-        .table_size = table_size,
-        .header_size = 1,
-        .features = 0,
-        .compat_features = 0,
-        .l1_table_offset = cluster_size,
-        .image_size = image_size,
-    };
-    QEDHeader le_header;
-    uint8_t *l1_table = NULL;
-    size_t l1_size = header.cluster_size * header.table_size;
-    int ret = 0;
-    BlockDriverState *bs = NULL;
-
-    ret = bdrv_create_file(filename, NULL);
-    if (ret < 0) {
-        return ret;
-    }
-
-    ret = bdrv_file_open(&bs, filename, NULL, BDRV_O_RDWR | BDRV_O_CACHE_WB);
-    if (ret < 0) {
-        return ret;
-    }
-
-    /* File must start empty and grow, check truncate is supported */
-    ret = bdrv_truncate(bs, 0);
-    if (ret < 0) {
-        goto out;
-    }
-
-    if (backing_file) {
-        header.features |= QED_F_BACKING_FILE;
-        header.backing_filename_offset = sizeof(le_header);
-        header.backing_filename_size = strlen(backing_file);
-
-        if (qed_fmt_is_raw(backing_fmt)) {
-            header.features |= QED_F_BACKING_FORMAT_NO_PROBE;
-        }
-    }
-
-    qed_header_cpu_to_le(&header, &le_header);
-    ret = bdrv_pwrite(bs, 0, &le_header, sizeof(le_header));
-    if (ret < 0) {
-        goto out;
-    }
-    ret = bdrv_pwrite(bs, sizeof(le_header), backing_file,
-                      header.backing_filename_size);
-    if (ret < 0) {
-        goto out;
-    }
-
-    l1_table = g_malloc0(l1_size);
-    ret = bdrv_pwrite(bs, header.l1_table_offset, l1_table, l1_size);
-    if (ret < 0) {
-        goto out;
-    }
-
-    ret = 0; /* success */
-out:
-    g_free(l1_table);
-    bdrv_delete(bs);
-    return ret;
-}
-
-static int bdrv_qed_create(const char *filename, QEMUOptionParameter *options)
-{
-    uint64_t image_size = 0;
-    uint32_t cluster_size = QED_DEFAULT_CLUSTER_SIZE;
-    uint32_t table_size = QED_DEFAULT_TABLE_SIZE;
-    const char *backing_file = NULL;
-    const char *backing_fmt = NULL;
-
-    while (options && options->name) {
-        if (!strcmp(options->name, BLOCK_OPT_SIZE)) {
-            image_size = options->value.n;
-        } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) {
-            backing_file = options->value.s;
-        } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FMT)) {
-            backing_fmt = options->value.s;
-        } else if (!strcmp(options->name, BLOCK_OPT_CLUSTER_SIZE)) {
-            if (options->value.n) {
-                cluster_size = options->value.n;
-            }
-        } else if (!strcmp(options->name, BLOCK_OPT_TABLE_SIZE)) {
-            if (options->value.n) {
-                table_size = options->value.n;
-            }
-        }
-        options++;
-    }
-
-    if (!qed_is_cluster_size_valid(cluster_size)) {
-        fprintf(stderr, "QED cluster size must be within range [%u, %u] and power of 2\n",
-                QED_MIN_CLUSTER_SIZE, QED_MAX_CLUSTER_SIZE);
-        return -EINVAL;
-    }
-    if (!qed_is_table_size_valid(table_size)) {
-        fprintf(stderr, "QED table size must be within range [%u, %u] and power of 2\n",
-                QED_MIN_TABLE_SIZE, QED_MAX_TABLE_SIZE);
-        return -EINVAL;
-    }
-    if (!qed_is_image_size_valid(image_size, cluster_size, table_size)) {
-        fprintf(stderr, "QED image size must be a non-zero multiple of "
-                        "cluster size and less than %" PRIu64 " bytes\n",
-                qed_max_image_size(cluster_size, table_size));
-        return -EINVAL;
-    }
-
-    return qed_create(filename, cluster_size, image_size, table_size,
-                      backing_file, backing_fmt);
-}
-
-typedef struct {
-    Coroutine *co;
-    int is_allocated;
-    int *pnum;
-} QEDIsAllocatedCB;
-
-static void qed_is_allocated_cb(void *opaque, int ret, uint64_t offset, size_t len)
-{
-    QEDIsAllocatedCB *cb = opaque;
-    *cb->pnum = len / BDRV_SECTOR_SIZE;
-    cb->is_allocated = (ret == QED_CLUSTER_FOUND || ret == QED_CLUSTER_ZERO);
-    if (cb->co) {
-        qemu_coroutine_enter(cb->co, NULL);
-    }
-}
-
-static int coroutine_fn bdrv_qed_co_is_allocated(BlockDriverState *bs,
-                                                 int64_t sector_num,
-                                                 int nb_sectors, int *pnum)
-{
-    BDRVQEDState *s = bs->opaque;
-    uint64_t pos = (uint64_t)sector_num * BDRV_SECTOR_SIZE;
-    size_t len = (size_t)nb_sectors * BDRV_SECTOR_SIZE;
-    QEDIsAllocatedCB cb = {
-        .is_allocated = -1,
-        .pnum = pnum,
-    };
-    QEDRequest request = { .l2_table = NULL };
-
-    qed_find_cluster(s, &request, pos, len, qed_is_allocated_cb, &cb);
-
-    /* Now sleep if the callback wasn't invoked immediately */
-    while (cb.is_allocated == -1) {
-        cb.co = qemu_coroutine_self();
-        qemu_coroutine_yield();
-    }
-
-    qed_unref_l2_cache_entry(request.l2_table);
-
-    return cb.is_allocated;
-}
-
-static int bdrv_qed_make_empty(BlockDriverState *bs)
-{
-    return -ENOTSUP;
-}
-
-static BDRVQEDState *acb_to_s(QEDAIOCB *acb)
-{
-    return acb->common.bs->opaque;
-}
-
-/**
- * Read from the backing file or zero-fill if no backing file
- *
- * @s:          QED state
- * @pos:        Byte position in device
- * @qiov:       Destination I/O vector
- * @cb:         Completion function
- * @opaque:     User data for completion function
- *
- * This function reads qiov->size bytes starting at pos from the backing file.
- * If there is no backing file then zeroes are read.
- */
-static void qed_read_backing_file(BDRVQEDState *s, uint64_t pos,
-                                  QEMUIOVector *qiov,
-                                  BlockDriverCompletionFunc *cb, void *opaque)
-{
-    uint64_t backing_length = 0;
-    size_t size;
-
-    /* If there is a backing file, get its length.  Treat the absence of a
-     * backing file like a zero length backing file.
-     */
-    if (s->bs->backing_hd) {
-        int64_t l = bdrv_getlength(s->bs->backing_hd);
-        if (l < 0) {
-            cb(opaque, l);
-            return;
-        }
-        backing_length = l;
-    }
-
-    /* Zero all sectors if reading beyond the end of the backing file */
-    if (pos >= backing_length ||
-        pos + qiov->size > backing_length) {
-        qemu_iovec_memset(qiov, 0, 0, qiov->size);
-    }
-
-    /* Complete now if there are no backing file sectors to read */
-    if (pos >= backing_length) {
-        cb(opaque, 0);
-        return;
-    }
-
-    /* If the read straddles the end of the backing file, shorten it */
-    size = MIN((uint64_t)backing_length - pos, qiov->size);
-
-    BLKDBG_EVENT(s->bs->file, BLKDBG_READ_BACKING_AIO);
-    bdrv_aio_readv(s->bs->backing_hd, pos / BDRV_SECTOR_SIZE,
-                   qiov, size / BDRV_SECTOR_SIZE, cb, opaque);
-}
-
-typedef struct {
-    GenericCB gencb;
-    BDRVQEDState *s;
-    QEMUIOVector qiov;
-    struct iovec iov;
-    uint64_t offset;
-} CopyFromBackingFileCB;
-
-static void qed_copy_from_backing_file_cb(void *opaque, int ret)
-{
-    CopyFromBackingFileCB *copy_cb = opaque;
-    qemu_vfree(copy_cb->iov.iov_base);
-    gencb_complete(&copy_cb->gencb, ret);
-}
-
-static void qed_copy_from_backing_file_write(void *opaque, int ret)
-{
-    CopyFromBackingFileCB *copy_cb = opaque;
-    BDRVQEDState *s = copy_cb->s;
-
-    if (ret) {
-        qed_copy_from_backing_file_cb(copy_cb, ret);
-        return;
-    }
-
-    BLKDBG_EVENT(s->bs->file, BLKDBG_COW_WRITE);
-    bdrv_aio_writev(s->bs->file, copy_cb->offset / BDRV_SECTOR_SIZE,
-                    &copy_cb->qiov, copy_cb->qiov.size / BDRV_SECTOR_SIZE,
-                    qed_copy_from_backing_file_cb, copy_cb);
-}
-
-/**
- * Copy data from backing file into the image
- *
- * @s:          QED state
- * @pos:        Byte position in device
- * @len:        Number of bytes
- * @offset:     Byte offset in image file
- * @cb:         Completion function
- * @opaque:     User data for completion function
- */
-static void qed_copy_from_backing_file(BDRVQEDState *s, uint64_t pos,
-                                       uint64_t len, uint64_t offset,
-                                       BlockDriverCompletionFunc *cb,
-                                       void *opaque)
-{
-    CopyFromBackingFileCB *copy_cb;
-
-    /* Skip copy entirely if there is no work to do */
-    if (len == 0) {
-        cb(opaque, 0);
-        return;
-    }
-
-    copy_cb = gencb_alloc(sizeof(*copy_cb), cb, opaque);
-    copy_cb->s = s;
-    copy_cb->offset = offset;
-    copy_cb->iov.iov_base = qemu_blockalign(s->bs, len);
-    copy_cb->iov.iov_len = len;
-    qemu_iovec_init_external(&copy_cb->qiov, &copy_cb->iov, 1);
-
-    qed_read_backing_file(s, pos, &copy_cb->qiov,
-                          qed_copy_from_backing_file_write, copy_cb);
-}
-
-/**
- * Link one or more contiguous clusters into a table
- *
- * @s:              QED state
- * @table:          L2 table
- * @index:          First cluster index
- * @n:              Number of contiguous clusters
- * @cluster:        First cluster offset
- *
- * The cluster offset may be an allocated byte offset in the image file, the
- * zero cluster marker, or the unallocated cluster marker.
- */
-static void qed_update_l2_table(BDRVQEDState *s, QEDTable *table, int index,
-                                unsigned int n, uint64_t cluster)
-{
-    int i;
-    for (i = index; i < index + n; i++) {
-        table->offsets[i] = cluster;
-        if (!qed_offset_is_unalloc_cluster(cluster) &&
-            !qed_offset_is_zero_cluster(cluster)) {
-            cluster += s->header.cluster_size;
-        }
-    }
-}
-
-static void qed_aio_complete_bh(void *opaque)
-{
-    QEDAIOCB *acb = opaque;
-    BlockDriverCompletionFunc *cb = acb->common.cb;
-    void *user_opaque = acb->common.opaque;
-    int ret = acb->bh_ret;
-    bool *finished = acb->finished;
-
-    qemu_bh_delete(acb->bh);
-    qemu_aio_release(acb);
-
-    /* Invoke callback */
-    cb(user_opaque, ret);
-
-    /* Signal cancel completion */
-    if (finished) {
-        *finished = true;
-    }
-}
-
-static void qed_aio_complete(QEDAIOCB *acb, int ret)
-{
-    BDRVQEDState *s = acb_to_s(acb);
-
-    trace_qed_aio_complete(s, acb, ret);
-
-    /* Free resources */
-    qemu_iovec_destroy(&acb->cur_qiov);
-    qed_unref_l2_cache_entry(acb->request.l2_table);
-
-    /* Free the buffer we may have allocated for zero writes */
-    if (acb->flags & QED_AIOCB_ZERO) {
-        qemu_vfree(acb->qiov->iov[0].iov_base);
-        acb->qiov->iov[0].iov_base = NULL;
-    }
-
-    /* Arrange for a bh to invoke the completion function */
-    acb->bh_ret = ret;
-    acb->bh = qemu_bh_new(qed_aio_complete_bh, acb);
-    qemu_bh_schedule(acb->bh);
-
-    /* Start next allocating write request waiting behind this one.  Note that
-     * requests enqueue themselves when they first hit an unallocated cluster
-     * but they wait until the entire request is finished before waking up the
-     * next request in the queue.  This ensures that we don't cycle through
-     * requests multiple times but rather finish one at a time completely.
-     */
-    if (acb == QSIMPLEQ_FIRST(&s->allocating_write_reqs)) {
-        QSIMPLEQ_REMOVE_HEAD(&s->allocating_write_reqs, next);
-        acb = QSIMPLEQ_FIRST(&s->allocating_write_reqs);
-        if (acb) {
-            qed_aio_next_io(acb, 0);
-        } else if (s->header.features & QED_F_NEED_CHECK) {
-            qed_start_need_check_timer(s);
-        }
-    }
-}
-
-/**
- * Commit the current L2 table to the cache
- */
-static void qed_commit_l2_update(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-    BDRVQEDState *s = acb_to_s(acb);
-    CachedL2Table *l2_table = acb->request.l2_table;
-    uint64_t l2_offset = l2_table->offset;
-
-    qed_commit_l2_cache_entry(&s->l2_cache, l2_table);
-
-    /* This is guaranteed to succeed because we just committed the entry to the
-     * cache.
-     */
-    acb->request.l2_table = qed_find_l2_cache_entry(&s->l2_cache, l2_offset);
-    assert(acb->request.l2_table != NULL);
-
-    qed_aio_next_io(opaque, ret);
-}
-
-/**
- * Update L1 table with new L2 table offset and write it out
- */
-static void qed_aio_write_l1_update(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-    BDRVQEDState *s = acb_to_s(acb);
-    int index;
-
-    if (ret) {
-        qed_aio_complete(acb, ret);
-        return;
-    }
-
-    index = qed_l1_index(s, acb->cur_pos);
-    s->l1_table->offsets[index] = acb->request.l2_table->offset;
-
-    qed_write_l1_table(s, index, 1, qed_commit_l2_update, acb);
-}
-
-/**
- * Update L2 table with new cluster offsets and write them out
- */
-static void qed_aio_write_l2_update(QEDAIOCB *acb, int ret, uint64_t offset)
-{
-    BDRVQEDState *s = acb_to_s(acb);
-    bool need_alloc = acb->find_cluster_ret == QED_CLUSTER_L1;
-    int index;
-
-    if (ret) {
-        goto err;
-    }
-
-    if (need_alloc) {
-        qed_unref_l2_cache_entry(acb->request.l2_table);
-        acb->request.l2_table = qed_new_l2_table(s);
-    }
-
-    index = qed_l2_index(s, acb->cur_pos);
-    qed_update_l2_table(s, acb->request.l2_table->table, index, acb->cur_nclusters,
-                         offset);
-
-    if (need_alloc) {
-        /* Write out the whole new L2 table */
-        qed_write_l2_table(s, &acb->request, 0, s->table_nelems, true,
-                            qed_aio_write_l1_update, acb);
-    } else {
-        /* Write out only the updated part of the L2 table */
-        qed_write_l2_table(s, &acb->request, index, acb->cur_nclusters, false,
-                            qed_aio_next_io, acb);
-    }
-    return;
-
-err:
-    qed_aio_complete(acb, ret);
-}
-
-static void qed_aio_write_l2_update_cb(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-    qed_aio_write_l2_update(acb, ret, acb->cur_cluster);
-}
-
-/**
- * Flush new data clusters before updating the L2 table
- *
- * This flush is necessary when a backing file is in use.  A crash during an
- * allocating write could result in empty clusters in the image.  If the write
- * only touched a subregion of the cluster, then backing image sectors have
- * been lost in the untouched region.  The solution is to flush after writing a
- * new data cluster and before updating the L2 table.
- */
-static void qed_aio_write_flush_before_l2_update(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-    BDRVQEDState *s = acb_to_s(acb);
-
-    if (!bdrv_aio_flush(s->bs->file, qed_aio_write_l2_update_cb, opaque)) {
-        qed_aio_complete(acb, -EIO);
-    }
-}
-
-/**
- * Write data to the image file
- */
-static void qed_aio_write_main(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-    BDRVQEDState *s = acb_to_s(acb);
-    uint64_t offset = acb->cur_cluster +
-                      qed_offset_into_cluster(s, acb->cur_pos);
-    BlockDriverCompletionFunc *next_fn;
-
-    trace_qed_aio_write_main(s, acb, ret, offset, acb->cur_qiov.size);
-
-    if (ret) {
-        qed_aio_complete(acb, ret);
-        return;
-    }
-
-    if (acb->find_cluster_ret == QED_CLUSTER_FOUND) {
-        next_fn = qed_aio_next_io;
-    } else {
-        if (s->bs->backing_hd) {
-            next_fn = qed_aio_write_flush_before_l2_update;
-        } else {
-            next_fn = qed_aio_write_l2_update_cb;
-        }
-    }
-
-    BLKDBG_EVENT(s->bs->file, BLKDBG_WRITE_AIO);
-    bdrv_aio_writev(s->bs->file, offset / BDRV_SECTOR_SIZE,
-                    &acb->cur_qiov, acb->cur_qiov.size / BDRV_SECTOR_SIZE,
-                    next_fn, acb);
-}
-
-/**
- * Populate back untouched region of new data cluster
- */
-static void qed_aio_write_postfill(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-    BDRVQEDState *s = acb_to_s(acb);
-    uint64_t start = acb->cur_pos + acb->cur_qiov.size;
-    uint64_t len =
-        qed_start_of_cluster(s, start + s->header.cluster_size - 1) - start;
-    uint64_t offset = acb->cur_cluster +
-                      qed_offset_into_cluster(s, acb->cur_pos) +
-                      acb->cur_qiov.size;
-
-    if (ret) {
-        qed_aio_complete(acb, ret);
-        return;
-    }
-
-    trace_qed_aio_write_postfill(s, acb, start, len, offset);
-    qed_copy_from_backing_file(s, start, len, offset,
-                                qed_aio_write_main, acb);
-}
-
-/**
- * Populate front untouched region of new data cluster
- */
-static void qed_aio_write_prefill(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-    BDRVQEDState *s = acb_to_s(acb);
-    uint64_t start = qed_start_of_cluster(s, acb->cur_pos);
-    uint64_t len = qed_offset_into_cluster(s, acb->cur_pos);
-
-    trace_qed_aio_write_prefill(s, acb, start, len, acb->cur_cluster);
-    qed_copy_from_backing_file(s, start, len, acb->cur_cluster,
-                                qed_aio_write_postfill, acb);
-}
-
-/**
- * Check if the QED_F_NEED_CHECK bit should be set during allocating write
- */
-static bool qed_should_set_need_check(BDRVQEDState *s)
-{
-    /* The flush before L2 update path ensures consistency */
-    if (s->bs->backing_hd) {
-        return false;
-    }
-
-    return !(s->header.features & QED_F_NEED_CHECK);
-}
-
-static void qed_aio_write_zero_cluster(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-
-    if (ret) {
-        qed_aio_complete(acb, ret);
-        return;
-    }
-
-    qed_aio_write_l2_update(acb, 0, 1);
-}
-
-/**
- * Write new data cluster
- *
- * @acb:        Write request
- * @len:        Length in bytes
- *
- * This path is taken when writing to previously unallocated clusters.
- */
-static void qed_aio_write_alloc(QEDAIOCB *acb, size_t len)
-{
-    BDRVQEDState *s = acb_to_s(acb);
-    BlockDriverCompletionFunc *cb;
-
-    /* Cancel timer when the first allocating request comes in */
-    if (QSIMPLEQ_EMPTY(&s->allocating_write_reqs)) {
-        qed_cancel_need_check_timer(s);
-    }
-
-    /* Freeze this request if another allocating write is in progress */
-    if (acb != QSIMPLEQ_FIRST(&s->allocating_write_reqs)) {
-        QSIMPLEQ_INSERT_TAIL(&s->allocating_write_reqs, acb, next);
-    }
-    if (acb != QSIMPLEQ_FIRST(&s->allocating_write_reqs) ||
-        s->allocating_write_reqs_plugged) {
-        return; /* wait for existing request to finish */
-    }
-
-    acb->cur_nclusters = qed_bytes_to_clusters(s,
-            qed_offset_into_cluster(s, acb->cur_pos) + len);
-    qemu_iovec_concat(&acb->cur_qiov, acb->qiov, acb->qiov_offset, len);
-
-    if (acb->flags & QED_AIOCB_ZERO) {
-        /* Skip ahead if the clusters are already zero */
-        if (acb->find_cluster_ret == QED_CLUSTER_ZERO) {
-            qed_aio_next_io(acb, 0);
-            return;
-        }
-
-        cb = qed_aio_write_zero_cluster;
-    } else {
-        cb = qed_aio_write_prefill;
-        acb->cur_cluster = qed_alloc_clusters(s, acb->cur_nclusters);
-    }
-
-    if (qed_should_set_need_check(s)) {
-        s->header.features |= QED_F_NEED_CHECK;
-        qed_write_header(s, cb, acb);
-    } else {
-        cb(acb, 0);
-    }
-}
-
-/**
- * Write data cluster in place
- *
- * @acb:        Write request
- * @offset:     Cluster offset in bytes
- * @len:        Length in bytes
- *
- * This path is taken when writing to already allocated clusters.
- */
-static void qed_aio_write_inplace(QEDAIOCB *acb, uint64_t offset, size_t len)
-{
-    /* Allocate buffer for zero writes */
-    if (acb->flags & QED_AIOCB_ZERO) {
-        struct iovec *iov = acb->qiov->iov;
-
-        if (!iov->iov_base) {
-            iov->iov_base = qemu_blockalign(acb->common.bs, iov->iov_len);
-            memset(iov->iov_base, 0, iov->iov_len);
-        }
-    }
-
-    /* Calculate the I/O vector */
-    acb->cur_cluster = offset;
-    qemu_iovec_concat(&acb->cur_qiov, acb->qiov, acb->qiov_offset, len);
-
-    /* Do the actual write */
-    qed_aio_write_main(acb, 0);
-}
-
-/**
- * Write data cluster
- *
- * @opaque:     Write request
- * @ret:        QED_CLUSTER_FOUND, QED_CLUSTER_L2, QED_CLUSTER_L1,
- *              or -errno
- * @offset:     Cluster offset in bytes
- * @len:        Length in bytes
- *
- * Callback from qed_find_cluster().
- */
-static void qed_aio_write_data(void *opaque, int ret,
-                               uint64_t offset, size_t len)
-{
-    QEDAIOCB *acb = opaque;
-
-    trace_qed_aio_write_data(acb_to_s(acb), acb, ret, offset, len);
-
-    acb->find_cluster_ret = ret;
-
-    switch (ret) {
-    case QED_CLUSTER_FOUND:
-        qed_aio_write_inplace(acb, offset, len);
-        break;
-
-    case QED_CLUSTER_L2:
-    case QED_CLUSTER_L1:
-    case QED_CLUSTER_ZERO:
-        qed_aio_write_alloc(acb, len);
-        break;
-
-    default:
-        qed_aio_complete(acb, ret);
-        break;
-    }
-}
-
-/**
- * Read data cluster
- *
- * @opaque:     Read request
- * @ret:        QED_CLUSTER_FOUND, QED_CLUSTER_L2, QED_CLUSTER_L1,
- *              or -errno
- * @offset:     Cluster offset in bytes
- * @len:        Length in bytes
- *
- * Callback from qed_find_cluster().
- */
-static void qed_aio_read_data(void *opaque, int ret,
-                              uint64_t offset, size_t len)
-{
-    QEDAIOCB *acb = opaque;
-    BDRVQEDState *s = acb_to_s(acb);
-    BlockDriverState *bs = acb->common.bs;
-
-    /* Adjust offset into cluster */
-    offset += qed_offset_into_cluster(s, acb->cur_pos);
-
-    trace_qed_aio_read_data(s, acb, ret, offset, len);
-
-    if (ret < 0) {
-        goto err;
-    }
-
-    qemu_iovec_concat(&acb->cur_qiov, acb->qiov, acb->qiov_offset, len);
-
-    /* Handle zero cluster and backing file reads */
-    if (ret == QED_CLUSTER_ZERO) {
-        qemu_iovec_memset(&acb->cur_qiov, 0, 0, acb->cur_qiov.size);
-        qed_aio_next_io(acb, 0);
-        return;
-    } else if (ret != QED_CLUSTER_FOUND) {
-        qed_read_backing_file(s, acb->cur_pos, &acb->cur_qiov,
-                              qed_aio_next_io, acb);
-        return;
-    }
-
-    BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
-    bdrv_aio_readv(bs->file, offset / BDRV_SECTOR_SIZE,
-                   &acb->cur_qiov, acb->cur_qiov.size / BDRV_SECTOR_SIZE,
-                   qed_aio_next_io, acb);
-    return;
-
-err:
-    qed_aio_complete(acb, ret);
-}
-
-/**
- * Begin next I/O or complete the request
- */
-static void qed_aio_next_io(void *opaque, int ret)
-{
-    QEDAIOCB *acb = opaque;
-    BDRVQEDState *s = acb_to_s(acb);
-    QEDFindClusterFunc *io_fn = (acb->flags & QED_AIOCB_WRITE) ?
-                                qed_aio_write_data : qed_aio_read_data;
-
-    trace_qed_aio_next_io(s, acb, ret, acb->cur_pos + acb->cur_qiov.size);
-
-    /* Handle I/O error */
-    if (ret) {
-        qed_aio_complete(acb, ret);
-        return;
-    }
-
-    acb->qiov_offset += acb->cur_qiov.size;
-    acb->cur_pos += acb->cur_qiov.size;
-    qemu_iovec_reset(&acb->cur_qiov);
-
-    /* Complete request */
-    if (acb->cur_pos >= acb->end_pos) {
-        qed_aio_complete(acb, 0);
-        return;
-    }
-
-    /* Find next cluster and start I/O */
-    qed_find_cluster(s, &acb->request,
-                      acb->cur_pos, acb->end_pos - acb->cur_pos,
-                      io_fn, acb);
-}
-
-static BlockDriverAIOCB *qed_aio_setup(BlockDriverState *bs,
-                                       int64_t sector_num,
-                                       QEMUIOVector *qiov, int nb_sectors,
-                                       BlockDriverCompletionFunc *cb,
-                                       void *opaque, int flags)
-{
-    QEDAIOCB *acb = qemu_aio_get(&qed_aiocb_info, bs, cb, opaque);
-
-    trace_qed_aio_setup(bs->opaque, acb, sector_num, nb_sectors,
-                        opaque, flags);
-
-    acb->flags = flags;
-    acb->finished = NULL;
-    acb->qiov = qiov;
-    acb->qiov_offset = 0;
-    acb->cur_pos = (uint64_t)sector_num * BDRV_SECTOR_SIZE;
-    acb->end_pos = acb->cur_pos + nb_sectors * BDRV_SECTOR_SIZE;
-    acb->request.l2_table = NULL;
-    qemu_iovec_init(&acb->cur_qiov, qiov->niov);
-
-    /* Start request */
-    qed_aio_next_io(acb, 0);
-    return &acb->common;
-}
-
-static BlockDriverAIOCB *bdrv_qed_aio_readv(BlockDriverState *bs,
-                                            int64_t sector_num,
-                                            QEMUIOVector *qiov, int nb_sectors,
-                                            BlockDriverCompletionFunc *cb,
-                                            void *opaque)
-{
-    return qed_aio_setup(bs, sector_num, qiov, nb_sectors, cb, opaque, 0);
-}
-
-static BlockDriverAIOCB *bdrv_qed_aio_writev(BlockDriverState *bs,
-                                             int64_t sector_num,
-                                             QEMUIOVector *qiov, int nb_sectors,
-                                             BlockDriverCompletionFunc *cb,
-                                             void *opaque)
-{
-    return qed_aio_setup(bs, sector_num, qiov, nb_sectors, cb,
-                         opaque, QED_AIOCB_WRITE);
-}
-
-typedef struct {
-    Coroutine *co;
-    int ret;
-    bool done;
-} QEDWriteZeroesCB;
-
-static void coroutine_fn qed_co_write_zeroes_cb(void *opaque, int ret)
-{
-    QEDWriteZeroesCB *cb = opaque;
-
-    cb->done = true;
-    cb->ret = ret;
-    if (cb->co) {
-        qemu_coroutine_enter(cb->co, NULL);
-    }
-}
-
-static int coroutine_fn bdrv_qed_co_write_zeroes(BlockDriverState *bs,
-                                                 int64_t sector_num,
-                                                 int nb_sectors)
-{
-    BlockDriverAIOCB *blockacb;
-    BDRVQEDState *s = bs->opaque;
-    QEDWriteZeroesCB cb = { .done = false };
-    QEMUIOVector qiov;
-    struct iovec iov;
-
-    /* Refuse if there are untouched backing file sectors */
-    if (bs->backing_hd) {
-        if (qed_offset_into_cluster(s, sector_num * BDRV_SECTOR_SIZE) != 0) {
-            return -ENOTSUP;
-        }
-        if (qed_offset_into_cluster(s, nb_sectors * BDRV_SECTOR_SIZE) != 0) {
-            return -ENOTSUP;
-        }
-    }
-
-    /* Zero writes start without an I/O buffer.  If a buffer becomes necessary
-     * then it will be allocated during request processing.
-     */
-    iov.iov_base = NULL,
-    iov.iov_len  = nb_sectors * BDRV_SECTOR_SIZE,
-
-    qemu_iovec_init_external(&qiov, &iov, 1);
-    blockacb = qed_aio_setup(bs, sector_num, &qiov, nb_sectors,
-                             qed_co_write_zeroes_cb, &cb,
-                             QED_AIOCB_WRITE | QED_AIOCB_ZERO);
-    if (!blockacb) {
-        return -EIO;
-    }
-    if (!cb.done) {
-        cb.co = qemu_coroutine_self();
-        qemu_coroutine_yield();
-    }
-    assert(cb.done);
-    return cb.ret;
-}
-
-static int bdrv_qed_truncate(BlockDriverState *bs, int64_t offset)
-{
-    BDRVQEDState *s = bs->opaque;
-    uint64_t old_image_size;
-    int ret;
-
-    if (!qed_is_image_size_valid(offset, s->header.cluster_size,
-                                 s->header.table_size)) {
-        return -EINVAL;
-    }
-
-    /* Shrinking is currently not supported */
-    if ((uint64_t)offset < s->header.image_size) {
-        return -ENOTSUP;
-    }
-
-    old_image_size = s->header.image_size;
-    s->header.image_size = offset;
-    ret = qed_write_header_sync(s);
-    if (ret < 0) {
-        s->header.image_size = old_image_size;
-    }
-    return ret;
-}
-
-static int64_t bdrv_qed_getlength(BlockDriverState *bs)
-{
-    BDRVQEDState *s = bs->opaque;
-    return s->header.image_size;
-}
-
-static int bdrv_qed_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
-{
-    BDRVQEDState *s = bs->opaque;
-
-    memset(bdi, 0, sizeof(*bdi));
-    bdi->cluster_size = s->header.cluster_size;
-    bdi->is_dirty = s->header.features & QED_F_NEED_CHECK;
-    return 0;
-}
-
-static int bdrv_qed_change_backing_file(BlockDriverState *bs,
-                                        const char *backing_file,
-                                        const char *backing_fmt)
-{
-    BDRVQEDState *s = bs->opaque;
-    QEDHeader new_header, le_header;
-    void *buffer;
-    size_t buffer_len, backing_file_len;
-    int ret;
-
-    /* Refuse to set backing filename if unknown compat feature bits are
-     * active.  If the image uses an unknown compat feature then we may not
-     * know the layout of data following the header structure and cannot safely
-     * add a new string.
-     */
-    if (backing_file && (s->header.compat_features &
-                         ~QED_COMPAT_FEATURE_MASK)) {
-        return -ENOTSUP;
-    }
-
-    memcpy(&new_header, &s->header, sizeof(new_header));
-
-    new_header.features &= ~(QED_F_BACKING_FILE |
-                             QED_F_BACKING_FORMAT_NO_PROBE);
-
-    /* Adjust feature flags */
-    if (backing_file) {
-        new_header.features |= QED_F_BACKING_FILE;
-
-        if (qed_fmt_is_raw(backing_fmt)) {
-            new_header.features |= QED_F_BACKING_FORMAT_NO_PROBE;
-        }
-    }
-
-    /* Calculate new header size */
-    backing_file_len = 0;
-
-    if (backing_file) {
-        backing_file_len = strlen(backing_file);
-    }
-
-    buffer_len = sizeof(new_header);
-    new_header.backing_filename_offset = buffer_len;
-    new_header.backing_filename_size = backing_file_len;
-    buffer_len += backing_file_len;
-
-    /* Make sure we can rewrite header without failing */
-    if (buffer_len > new_header.header_size * new_header.cluster_size) {
-        return -ENOSPC;
-    }
-
-    /* Prepare new header */
-    buffer = g_malloc(buffer_len);
-
-    qed_header_cpu_to_le(&new_header, &le_header);
-    memcpy(buffer, &le_header, sizeof(le_header));
-    buffer_len = sizeof(le_header);
-
-    if (backing_file) {
-        memcpy(buffer + buffer_len, backing_file, backing_file_len);
-        buffer_len += backing_file_len;
-    }
-
-    /* Write new header */
-    ret = bdrv_pwrite_sync(bs->file, 0, buffer, buffer_len);
-    g_free(buffer);
-    if (ret == 0) {
-        memcpy(&s->header, &new_header, sizeof(new_header));
-    }
-    return ret;
-}
-
-static void bdrv_qed_invalidate_cache(BlockDriverState *bs)
-{
-    BDRVQEDState *s = bs->opaque;
-
-    bdrv_qed_close(bs);
-    memset(s, 0, sizeof(BDRVQEDState));
-    bdrv_qed_open(bs, NULL, bs->open_flags);
-}
-
-static int bdrv_qed_check(BlockDriverState *bs, BdrvCheckResult *result,
-                          BdrvCheckMode fix)
-{
-    BDRVQEDState *s = bs->opaque;
-
-    return qed_check(s, result, !!fix);
-}
-
-static QEMUOptionParameter qed_create_options[] = {
-    {
-        .name = BLOCK_OPT_SIZE,
-        .type = OPT_SIZE,
-        .help = "Virtual disk size (in bytes)"
-    }, {
-        .name = BLOCK_OPT_BACKING_FILE,
-        .type = OPT_STRING,
-        .help = "File name of a base image"
-    }, {
-        .name = BLOCK_OPT_BACKING_FMT,
-        .type = OPT_STRING,
-        .help = "Image format of the base image"
-    }, {
-        .name = BLOCK_OPT_CLUSTER_SIZE,
-        .type = OPT_SIZE,
-        .help = "Cluster size (in bytes)",
-        .value = { .n = QED_DEFAULT_CLUSTER_SIZE },
-    }, {
-        .name = BLOCK_OPT_TABLE_SIZE,
-        .type = OPT_SIZE,
-        .help = "L1/L2 table size (in clusters)"
-    },
-    { /* end of list */ }
-};
-
-static BlockDriver bdrv_qed = {
-    .format_name              = "qed",
-    .instance_size            = sizeof(BDRVQEDState),
-    .create_options           = qed_create_options,
-
-    .bdrv_probe               = bdrv_qed_probe,
-    .bdrv_rebind              = bdrv_qed_rebind,
-    .bdrv_open                = bdrv_qed_open,
-    .bdrv_close               = bdrv_qed_close,
-    .bdrv_reopen_prepare      = bdrv_qed_reopen_prepare,
-    .bdrv_create              = bdrv_qed_create,
-    .bdrv_has_zero_init       = bdrv_has_zero_init_1,
-    .bdrv_co_is_allocated     = bdrv_qed_co_is_allocated,
-    .bdrv_make_empty          = bdrv_qed_make_empty,
-    .bdrv_aio_readv           = bdrv_qed_aio_readv,
-    .bdrv_aio_writev          = bdrv_qed_aio_writev,
-    .bdrv_co_write_zeroes     = bdrv_qed_co_write_zeroes,
-    .bdrv_truncate            = bdrv_qed_truncate,
-    .bdrv_getlength           = bdrv_qed_getlength,
-    .bdrv_get_info            = bdrv_qed_get_info,
-    .bdrv_change_backing_file = bdrv_qed_change_backing_file,
-    .bdrv_invalidate_cache    = bdrv_qed_invalidate_cache,
-    .bdrv_check               = bdrv_qed_check,
-};
-
-static void bdrv_qed_init(void)
-{
-    bdrv_register(&bdrv_qed);
-}
-
-block_init(bdrv_qed_init);
diff --git a/contrib/qemu/block/qed.h b/contrib/qemu/block/qed.h
deleted file mode 100644
index 2b4ddedf3..000000000
--- a/contrib/qemu/block/qed.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * QEMU Enhanced Disk Format
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Stefan Hajnoczi   <stefanha@linux.vnet.ibm.com>
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef BLOCK_QED_H
-#define BLOCK_QED_H
-
-#include "block/block_int.h"
-
-/* The layout of a QED file is as follows:
- *
- * +--------+----------+----------+----------+-----+
- * | header | L1 table | cluster0 | cluster1 | ... |
- * +--------+----------+----------+----------+-----+
- *
- * There is a 2-level pagetable for cluster allocation:
- *
- *                     +----------+
- *                     | L1 table |
- *                     +----------+
- *                ,------'  |  '------.
- *           +----------+   |    +----------+
- *           | L2 table |  ...   | L2 table |
- *           +----------+        +----------+
- *       ,------'  |  '------.
- *  +----------+   |    +----------+
- *  |   Data   |  ...   |   Data   |
- *  +----------+        +----------+
- *
- * The L1 table is fixed size and always present.  L2 tables are allocated on
- * demand.  The L1 table size determines the maximum possible image size; it
- * can be influenced using the cluster_size and table_size values.
- *
- * All fields are little-endian on disk.
- */
-
-enum {
-    QED_MAGIC = 'Q' | 'E' << 8 | 'D' << 16 | '\0' << 24,
-
-    /* The image supports a backing file */
-    QED_F_BACKING_FILE = 0x01,
-
-    /* The image needs a consistency check before use */
-    QED_F_NEED_CHECK = 0x02,
-
-    /* The backing file format must not be probed, treat as raw image */
-    QED_F_BACKING_FORMAT_NO_PROBE = 0x04,
-
-    /* Feature bits must be used when the on-disk format changes */
-    QED_FEATURE_MASK = QED_F_BACKING_FILE | /* supported feature bits */
-                       QED_F_NEED_CHECK |
-                       QED_F_BACKING_FORMAT_NO_PROBE,
-    QED_COMPAT_FEATURE_MASK = 0,            /* supported compat feature bits */
-    QED_AUTOCLEAR_FEATURE_MASK = 0,         /* supported autoclear feature bits */
-
-    /* Data is stored in groups of sectors called clusters.  Cluster size must
-     * be large to avoid keeping too much metadata.  I/O requests that have
-     * sub-cluster size will require read-modify-write.
-     */
-    QED_MIN_CLUSTER_SIZE = 4 * 1024, /* in bytes */
-    QED_MAX_CLUSTER_SIZE = 64 * 1024 * 1024,
-    QED_DEFAULT_CLUSTER_SIZE = 64 * 1024,
-
-    /* Allocated clusters are tracked using a 2-level pagetable.  Table size is
-     * a multiple of clusters so large maximum image sizes can be supported
-     * without jacking up the cluster size too much.
-     */
-    QED_MIN_TABLE_SIZE = 1,        /* in clusters */
-    QED_MAX_TABLE_SIZE = 16,
-    QED_DEFAULT_TABLE_SIZE = 4,
-
-    /* Delay to flush and clean image after last allocating write completes */
-    QED_NEED_CHECK_TIMEOUT = 5,    /* in seconds */
-};
-
-typedef struct {
-    uint32_t magic;                 /* QED\0 */
-
-    uint32_t cluster_size;          /* in bytes */
-    uint32_t table_size;            /* for L1 and L2 tables, in clusters */
-    uint32_t header_size;           /* in clusters */
-
-    uint64_t features;              /* format feature bits */
-    uint64_t compat_features;       /* compatible feature bits */
-    uint64_t autoclear_features;    /* self-resetting feature bits */
-
-    uint64_t l1_table_offset;       /* in bytes */
-    uint64_t image_size;            /* total logical image size, in bytes */
-
-    /* if (features & QED_F_BACKING_FILE) */
-    uint32_t backing_filename_offset; /* in bytes from start of header */
-    uint32_t backing_filename_size;   /* in bytes */
-} QEDHeader;
-
-typedef struct {
-    uint64_t offsets[0];            /* in bytes */
-} QEDTable;
-
-/* The L2 cache is a simple write-through cache for L2 structures */
-typedef struct CachedL2Table {
-    QEDTable *table;
-    uint64_t offset;    /* offset=0 indicates an invalidate entry */
-    QTAILQ_ENTRY(CachedL2Table) node;
-    int ref;
-} CachedL2Table;
-
-typedef struct {
-    QTAILQ_HEAD(, CachedL2Table) entries;
-    unsigned int n_entries;
-} L2TableCache;
-
-typedef struct QEDRequest {
-    CachedL2Table *l2_table;
-} QEDRequest;
-
-enum {
-    QED_AIOCB_WRITE = 0x0001,       /* read or write? */
-    QED_AIOCB_ZERO  = 0x0002,       /* zero write, used with QED_AIOCB_WRITE */
-};
-
-typedef struct QEDAIOCB {
-    BlockDriverAIOCB common;
-    QEMUBH *bh;
-    int bh_ret;                     /* final return status for completion bh */
-    QSIMPLEQ_ENTRY(QEDAIOCB) next;  /* next request */
-    int flags;                      /* QED_AIOCB_* bits ORed together */
-    bool *finished;                 /* signal for cancel completion */
-    uint64_t end_pos;               /* request end on block device, in bytes */
-
-    /* User scatter-gather list */
-    QEMUIOVector *qiov;
-    size_t qiov_offset;             /* byte count already processed */
-
-    /* Current cluster scatter-gather list */
-    QEMUIOVector cur_qiov;
-    uint64_t cur_pos;               /* position on block device, in bytes */
-    uint64_t cur_cluster;           /* cluster offset in image file */
-    unsigned int cur_nclusters;     /* number of clusters being accessed */
-    int find_cluster_ret;           /* used for L1/L2 update */
-
-    QEDRequest request;
-} QEDAIOCB;
-
-typedef struct {
-    BlockDriverState *bs;           /* device */
-    uint64_t file_size;             /* length of image file, in bytes */
-
-    QEDHeader header;               /* always cpu-endian */
-    QEDTable *l1_table;
-    L2TableCache l2_cache;          /* l2 table cache */
-    uint32_t table_nelems;
-    uint32_t l1_shift;
-    uint32_t l2_shift;
-    uint32_t l2_mask;
-
-    /* Allocating write request queue */
-    QSIMPLEQ_HEAD(, QEDAIOCB) allocating_write_reqs;
-    bool allocating_write_reqs_plugged;
-
-    /* Periodic flush and clear need check flag */
-    QEMUTimer *need_check_timer;
-} BDRVQEDState;
-
-enum {
-    QED_CLUSTER_FOUND,         /* cluster found */
-    QED_CLUSTER_ZERO,          /* zero cluster found */
-    QED_CLUSTER_L2,            /* cluster missing in L2 */
-    QED_CLUSTER_L1,            /* cluster missing in L1 */
-};
-
-/**
- * qed_find_cluster() completion callback
- *
- * @opaque:     User data for completion callback
- * @ret:        QED_CLUSTER_FOUND   Success
- *              QED_CLUSTER_L2      Data cluster unallocated in L2
- *              QED_CLUSTER_L1      L2 unallocated in L1
- *              -errno              POSIX error occurred
- * @offset:     Data cluster offset
- * @len:        Contiguous bytes starting from cluster offset
- *
- * This function is invoked when qed_find_cluster() completes.
- *
- * On success ret is QED_CLUSTER_FOUND and offset/len are a contiguous range
- * in the image file.
- *
- * On failure ret is QED_CLUSTER_L2 or QED_CLUSTER_L1 for missing L2 or L1
- * table offset, respectively.  len is number of contiguous unallocated bytes.
- */
-typedef void QEDFindClusterFunc(void *opaque, int ret, uint64_t offset, size_t len);
-
-/**
- * Generic callback for chaining async callbacks
- */
-typedef struct {
-    BlockDriverCompletionFunc *cb;
-    void *opaque;
-} GenericCB;
-
-void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque);
-void gencb_complete(void *opaque, int ret);
-
-/**
- * Header functions
- */
-int qed_write_header_sync(BDRVQEDState *s);
-
-/**
- * L2 cache functions
- */
-void qed_init_l2_cache(L2TableCache *l2_cache);
-void qed_free_l2_cache(L2TableCache *l2_cache);
-CachedL2Table *qed_alloc_l2_cache_entry(L2TableCache *l2_cache);
-void qed_unref_l2_cache_entry(CachedL2Table *entry);
-CachedL2Table *qed_find_l2_cache_entry(L2TableCache *l2_cache, uint64_t offset);
-void qed_commit_l2_cache_entry(L2TableCache *l2_cache, CachedL2Table *l2_table);
-
-/**
- * Table I/O functions
- */
-int qed_read_l1_table_sync(BDRVQEDState *s);
-void qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n,
-                        BlockDriverCompletionFunc *cb, void *opaque);
-int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
-                            unsigned int n);
-int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
-                           uint64_t offset);
-void qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset,
-                       BlockDriverCompletionFunc *cb, void *opaque);
-void qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
-                        unsigned int index, unsigned int n, bool flush,
-                        BlockDriverCompletionFunc *cb, void *opaque);
-int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
-                            unsigned int index, unsigned int n, bool flush);
-
-/**
- * Cluster functions
- */
-void qed_find_cluster(BDRVQEDState *s, QEDRequest *request, uint64_t pos,
-                      size_t len, QEDFindClusterFunc *cb, void *opaque);
-
-/**
- * Consistency check
- */
-int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix);
-
-QEDTable *qed_alloc_table(BDRVQEDState *s);
-
-/**
- * Round down to the start of a cluster
- */
-static inline uint64_t qed_start_of_cluster(BDRVQEDState *s, uint64_t offset)
-{
-    return offset & ~(uint64_t)(s->header.cluster_size - 1);
-}
-
-static inline uint64_t qed_offset_into_cluster(BDRVQEDState *s, uint64_t offset)
-{
-    return offset & (s->header.cluster_size - 1);
-}
-
-static inline uint64_t qed_bytes_to_clusters(BDRVQEDState *s, uint64_t bytes)
-{
-    return qed_start_of_cluster(s, bytes + (s->header.cluster_size - 1)) /
-           (s->header.cluster_size - 1);
-}
-
-static inline unsigned int qed_l1_index(BDRVQEDState *s, uint64_t pos)
-{
-    return pos >> s->l1_shift;
-}
-
-static inline unsigned int qed_l2_index(BDRVQEDState *s, uint64_t pos)
-{
-    return (pos >> s->l2_shift) & s->l2_mask;
-}
-
-/**
- * Test if a cluster offset is valid
- */
-static inline bool qed_check_cluster_offset(BDRVQEDState *s, uint64_t offset)
-{
-    uint64_t header_size = (uint64_t)s->header.header_size *
-                           s->header.cluster_size;
-
-    if (offset & (s->header.cluster_size - 1)) {
-        return false;
-    }
-    return offset >= header_size && offset < s->file_size;
-}
-
-/**
- * Test if a table offset is valid
- */
-static inline bool qed_check_table_offset(BDRVQEDState *s, uint64_t offset)
-{
-    uint64_t end_offset = offset + (s->header.table_size - 1) *
-                          s->header.cluster_size;
-
-    /* Overflow check */
-    if (end_offset <= offset) {
-        return false;
-    }
-
-    return qed_check_cluster_offset(s, offset) &&
-           qed_check_cluster_offset(s, end_offset);
-}
-
-static inline bool qed_offset_is_cluster_aligned(BDRVQEDState *s,
-                                                 uint64_t offset)
-{
-    if (qed_offset_into_cluster(s, offset)) {
-        return false;
-    }
-    return true;
-}
-
-static inline bool qed_offset_is_unalloc_cluster(uint64_t offset)
-{
-    if (offset == 0) {
-        return true;
-    }
-    return false;
-}
-
-static inline bool qed_offset_is_zero_cluster(uint64_t offset)
-{
-    if (offset == 1) {
-        return true;
-    }
-    return false;
-}
-
-#endif /* BLOCK_QED_H */
diff --git a/contrib/qemu/block/snapshot.c b/contrib/qemu/block/snapshot.c
deleted file mode 100644
index 6c6d9deea..000000000
--- a/contrib/qemu/block/snapshot.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Block layer snapshot related functions
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "block/snapshot.h"
-#include "block/block_int.h"
-
-int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info,
-                       const char *name)
-{
-    QEMUSnapshotInfo *sn_tab, *sn;
-    int nb_sns, i, ret;
-
-    ret = -ENOENT;
-    nb_sns = bdrv_snapshot_list(bs, &sn_tab);
-    if (nb_sns < 0) {
-        return ret;
-    }
-    for (i = 0; i < nb_sns; i++) {
-        sn = &sn_tab[i];
-        if (!strcmp(sn->id_str, name) || !strcmp(sn->name, name)) {
-            *sn_info = *sn;
-            ret = 0;
-            break;
-        }
-    }
-    g_free(sn_tab);
-    return ret;
-}
-
-int bdrv_can_snapshot(BlockDriverState *bs)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv || !bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
-        return 0;
-    }
-
-    if (!drv->bdrv_snapshot_create) {
-        if (bs->file != NULL) {
-            return bdrv_can_snapshot(bs->file);
-        }
-        return 0;
-    }
-
-    return 1;
-}
-
-int bdrv_snapshot_create(BlockDriverState *bs,
-                         QEMUSnapshotInfo *sn_info)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv) {
-        return -ENOMEDIUM;
-    }
-    if (drv->bdrv_snapshot_create) {
-        return drv->bdrv_snapshot_create(bs, sn_info);
-    }
-    if (bs->file) {
-        return bdrv_snapshot_create(bs->file, sn_info);
-    }
-    return -ENOTSUP;
-}
-
-int bdrv_snapshot_goto(BlockDriverState *bs,
-                       const char *snapshot_id)
-{
-    BlockDriver *drv = bs->drv;
-    int ret, open_ret;
-
-    if (!drv) {
-        return -ENOMEDIUM;
-    }
-    if (drv->bdrv_snapshot_goto) {
-        return drv->bdrv_snapshot_goto(bs, snapshot_id);
-    }
-
-    if (bs->file) {
-        drv->bdrv_close(bs);
-        ret = bdrv_snapshot_goto(bs->file, snapshot_id);
-        open_ret = drv->bdrv_open(bs, NULL, bs->open_flags);
-        if (open_ret < 0) {
-            bdrv_delete(bs->file);
-            bs->drv = NULL;
-            return open_ret;
-        }
-        return ret;
-    }
-
-    return -ENOTSUP;
-}
-
-int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv) {
-        return -ENOMEDIUM;
-    }
-    if (drv->bdrv_snapshot_delete) {
-        return drv->bdrv_snapshot_delete(bs, snapshot_id);
-    }
-    if (bs->file) {
-        return bdrv_snapshot_delete(bs->file, snapshot_id);
-    }
-    return -ENOTSUP;
-}
-
-int bdrv_snapshot_list(BlockDriverState *bs,
-                       QEMUSnapshotInfo **psn_info)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv) {
-        return -ENOMEDIUM;
-    }
-    if (drv->bdrv_snapshot_list) {
-        return drv->bdrv_snapshot_list(bs, psn_info);
-    }
-    if (bs->file) {
-        return bdrv_snapshot_list(bs->file, psn_info);
-    }
-    return -ENOTSUP;
-}
-
-int bdrv_snapshot_load_tmp(BlockDriverState *bs,
-        const char *snapshot_name)
-{
-    BlockDriver *drv = bs->drv;
-    if (!drv) {
-        return -ENOMEDIUM;
-    }
-    if (!bs->read_only) {
-        return -EINVAL;
-    }
-    if (drv->bdrv_snapshot_load_tmp) {
-        return drv->bdrv_snapshot_load_tmp(bs, snapshot_name);
-    }
-    return -ENOTSUP;
-}
diff --git a/contrib/qemu/config-host.h b/contrib/qemu/config-host.h
deleted file mode 100644
index 46b1595a8..000000000
--- a/contrib/qemu/config-host.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Automatically generated by create_config - do not modify */
-#define CONFIG_QEMU_CONFDIR "/usr/local/etc/qemu"
-#define CONFIG_QEMU_DATADIR "/usr/local/share/qemu"
-#define CONFIG_QEMU_DOCDIR "/usr/local/share/doc/qemu"
-#define CONFIG_QEMU_LOCALSTATEDIR "/usr/local/var"
-#define CONFIG_QEMU_HELPERDIR "/usr/local/libexec"
-#define CONFIG_QEMU_LOCALEDIR "/usr/local/share/locale"
-#define HOST_X86_64 1
-#define CONFIG_QEMU_LDST_OPTIMIZATION 1
-#define CONFIG_POSIX 1
-#define CONFIG_LINUX 1
-#define CONFIG_SLIRP 1
-#define CONFIG_SMBD_COMMAND "/usr/sbin/smbd"
-#define CONFIG_AUDIO_DRIVERS \
-    &oss_audio_driver,\
-
-#define CONFIG_OSS 1
-#define CONFIG_BDRV_RW_WHITELIST\
-    NULL
-#define CONFIG_BDRV_RO_WHITELIST\
-    NULL
-#define CONFIG_VNC 1
-#define CONFIG_VNC_TLS 1
-#define CONFIG_VNC_SASL 1
-#define CONFIG_VNC_WS 1
-#define CONFIG_FNMATCH 1
-#define CONFIG_UUID 1
-#define CONFIG_XFS 1
-#define QEMU_VERSION "1.5.50"
-#define QEMU_PKGVERSION ""
-#define CONFIG_CURSES 1
-#define CONFIG_UTIMENSAT 1
-#define CONFIG_PIPE2 1
-#define CONFIG_ACCEPT4 1
-#define CONFIG_SPLICE 1
-#define CONFIG_EVENTFD 1
-#define CONFIG_FALLOCATE 1
-#define CONFIG_FALLOCATE_PUNCH_HOLE 1
-#define CONFIG_SYNC_FILE_RANGE 1
-#define CONFIG_FIEMAP 1
-#define CONFIG_DUP3 1
-#define CONFIG_EPOLL 1
-#define CONFIG_EPOLL_CREATE1 1
-#define CONFIG_EPOLL_PWAIT 1
-#define CONFIG_SENDFILE 1
-#define CONFIG_INOTIFY 1
-#define CONFIG_INOTIFY1 1
-#define CONFIG_BYTESWAP_H 1
-#define CONFIG_CURL 1
-#define CONFIG_LINUX_AIO 1
-#define CONFIG_ATTR 1
-#define CONFIG_VHOST_SCSI 1
-#define CONFIG_IOVEC 1
-#define CONFIG_PREADV 1
-#define CONFIG_FDT 1
-#define CONFIG_SIGNALFD 1
-#define CONFIG_FDATASYNC 1
-#define CONFIG_MADVISE 1
-#define CONFIG_POSIX_MADVISE 1
-#define CONFIG_SIGEV_THREAD_ID 1
-#define CONFIG_UNAME_RELEASE ""
-#define CONFIG_QOM_CAST_DEBUG 1
-#define CONFIG_COROUTINE_BACKEND ucontext
-#define CONFIG_OPEN_BY_HANDLE 1
-#define CONFIG_LINUX_MAGIC_H 1
-#define CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE 1
-#define CONFIG_HAS_ENVIRON 1
-#define CONFIG_CPUID_H 1
-#define CONFIG_INT128 1
-#define CONFIG_VIRTIO_BLK_DATA_PLANE $(CONFIG_VIRTIO)
-#define CONFIG_TRACE_NOP 1
-#define CONFIG_TRACE_FILE trace
-#define CONFIG_TRACE_DEFAULT 1
diff --git a/contrib/qemu/coroutine-ucontext.c b/contrib/qemu/coroutine-ucontext.c
deleted file mode 100644
index 4bf2cde27..000000000
--- a/contrib/qemu/coroutine-ucontext.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * ucontext coroutine initialization code
- *
- * Copyright (C) 2006  Anthony Liguori <anthony@codemonkey.ws>
- * Copyright (C) 2011  Kevin Wolf <kwolf@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.0 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/* XXX Is there a nicer way to disable glibc's stack check for longjmp? */
-#ifdef _FORTIFY_SOURCE
-#undef _FORTIFY_SOURCE
-#endif
-#include <stdlib.h>
-#include <setjmp.h>
-#include <stdint.h>
-#include <pthread.h>
-#include <ucontext.h>
-#include "qemu-common.h"
-#include "block/coroutine_int.h"
-
-#ifdef CONFIG_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
-
-typedef struct {
-    Coroutine base;
-    void *stack;
-    sigjmp_buf env;
-
-#ifdef CONFIG_VALGRIND_H
-    unsigned int valgrind_stack_id;
-#endif
-
-} CoroutineUContext;
-
-/**
- * Per-thread coroutine bookkeeping
- */
-typedef struct {
-    /** Currently executing coroutine */
-    Coroutine *current;
-
-    /** The default coroutine */
-    CoroutineUContext leader;
-} CoroutineThreadState;
-
-static pthread_key_t thread_state_key;
-
-/*
- * va_args to makecontext() must be type 'int', so passing
- * the pointer we need may require several int args. This
- * union is a quick hack to let us do that
- */
-union cc_arg {
-    void *p;
-    int i[2];
-};
-
-static CoroutineThreadState *coroutine_get_thread_state(void)
-{
-    CoroutineThreadState *s = pthread_getspecific(thread_state_key);
-
-    if (!s) {
-        s = g_malloc0(sizeof(*s));
-        s->current = &s->leader.base;
-        pthread_setspecific(thread_state_key, s);
-    }
-    return s;
-}
-
-static void qemu_coroutine_thread_cleanup(void *opaque)
-{
-    CoroutineThreadState *s = opaque;
-
-    g_free(s);
-}
-
-static void __attribute__((constructor)) coroutine_init(void)
-{
-    int ret;
-
-    ret = pthread_key_create(&thread_state_key, qemu_coroutine_thread_cleanup);
-    if (ret != 0) {
-        fprintf(stderr, "unable to create leader key: %s\n", strerror(errno));
-        abort();
-    }
-}
-
-static void coroutine_trampoline(int i0, int i1)
-{
-    union cc_arg arg;
-    CoroutineUContext *self;
-    Coroutine *co;
-
-    arg.i[0] = i0;
-    arg.i[1] = i1;
-    self = arg.p;
-    co = &self->base;
-
-    /* Initialize longjmp environment and switch back the caller */
-    if (!sigsetjmp(self->env, 0)) {
-        siglongjmp(*(sigjmp_buf *)co->entry_arg, 1);
-    }
-
-    while (true) {
-        co->entry(co->entry_arg);
-        qemu_coroutine_switch(co, co->caller, COROUTINE_TERMINATE);
-    }
-}
-
-Coroutine *qemu_coroutine_new(void)
-{
-    const size_t stack_size = 1 << 20;
-    CoroutineUContext *co;
-    ucontext_t old_uc, uc;
-    sigjmp_buf old_env;
-    union cc_arg arg = {0};
-
-    /* The ucontext functions preserve signal masks which incurs a
-     * system call overhead.  sigsetjmp(buf, 0)/siglongjmp() does not
-     * preserve signal masks but only works on the current stack.
-     * Since we need a way to create and switch to a new stack, use
-     * the ucontext functions for that but sigsetjmp()/siglongjmp() for
-     * everything else.
-     */
-
-    if (getcontext(&uc) == -1) {
-        abort();
-    }
-
-    co = g_malloc0(sizeof(*co));
-    co->stack = g_malloc(stack_size);
-    co->base.entry_arg = &old_env; /* stash away our jmp_buf */
-
-    uc.uc_link = &old_uc;
-    uc.uc_stack.ss_sp = co->stack;
-    uc.uc_stack.ss_size = stack_size;
-    uc.uc_stack.ss_flags = 0;
-
-#ifdef CONFIG_VALGRIND_H
-    co->valgrind_stack_id =
-        VALGRIND_STACK_REGISTER(co->stack, co->stack + stack_size);
-#endif
-
-    arg.p = co;
-
-    makecontext(&uc, (void (*)(void))coroutine_trampoline,
-                2, arg.i[0], arg.i[1]);
-
-    /* swapcontext() in, siglongjmp() back out */
-    if (!sigsetjmp(old_env, 0)) {
-        swapcontext(&old_uc, &uc);
-    }
-    return &co->base;
-}
-
-#ifdef CONFIG_VALGRIND_H
-#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
-/* Work around an unused variable in the valgrind.h macro... */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-static inline void valgrind_stack_deregister(CoroutineUContext *co)
-{
-    VALGRIND_STACK_DEREGISTER(co->valgrind_stack_id);
-}
-#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-void qemu_coroutine_delete(Coroutine *co_)
-{
-    CoroutineUContext *co = DO_UPCAST(CoroutineUContext, base, co_);
-
-#ifdef CONFIG_VALGRIND_H
-    valgrind_stack_deregister(co);
-#endif
-
-    g_free(co->stack);
-    g_free(co);
-}
-
-CoroutineAction qemu_coroutine_switch(Coroutine *from_, Coroutine *to_,
-                                      CoroutineAction action)
-{
-    CoroutineUContext *from = DO_UPCAST(CoroutineUContext, base, from_);
-    CoroutineUContext *to = DO_UPCAST(CoroutineUContext, base, to_);
-    CoroutineThreadState *s = coroutine_get_thread_state();
-    int ret;
-
-    s->current = to_;
-
-    ret = sigsetjmp(from->env, 0);
-    if (ret == 0) {
-        siglongjmp(to->env, action);
-    }
-    return ret;
-}
-
-Coroutine *qemu_coroutine_self(void)
-{
-    CoroutineThreadState *s = coroutine_get_thread_state();
-
-    return s->current;
-}
-
-bool qemu_in_coroutine(void)
-{
-    CoroutineThreadState *s = pthread_getspecific(thread_state_key);
-
-    return s && s->current->caller;
-}
diff --git a/contrib/qemu/include/block/aio.h b/contrib/qemu/include/block/aio.h
deleted file mode 100644
index 183679374..000000000
--- a/contrib/qemu/include/block/aio.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * QEMU aio implementation
- *
- * Copyright IBM, Corp. 2008
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- */
-
-#ifndef QEMU_AIO_H
-#define QEMU_AIO_H
-
-#include "qemu-common.h"
-#include "qemu/queue.h"
-#include "qemu/event_notifier.h"
-
-typedef struct BlockDriverAIOCB BlockDriverAIOCB;
-typedef void BlockDriverCompletionFunc(void *opaque, int ret);
-
-typedef struct AIOCBInfo {
-    void (*cancel)(BlockDriverAIOCB *acb);
-    size_t aiocb_size;
-} AIOCBInfo;
-
-struct BlockDriverAIOCB {
-    const AIOCBInfo *aiocb_info;
-    BlockDriverState *bs;
-    BlockDriverCompletionFunc *cb;
-    void *opaque;
-};
-
-void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,
-                   BlockDriverCompletionFunc *cb, void *opaque);
-void qemu_aio_release(void *p);
-
-typedef struct AioHandler AioHandler;
-typedef void QEMUBHFunc(void *opaque);
-typedef void IOHandler(void *opaque);
-
-typedef struct AioContext {
-    GSource source;
-
-    /* The list of registered AIO handlers */
-    QLIST_HEAD(, AioHandler) aio_handlers;
-
-    /* This is a simple lock used to protect the aio_handlers list.
-     * Specifically, it's used to ensure that no callbacks are removed while
-     * we're walking and dispatching callbacks.
-     */
-    int walking_handlers;
-
-    /* Anchor of the list of Bottom Halves belonging to the context */
-    struct QEMUBH *first_bh;
-
-    /* A simple lock used to protect the first_bh list, and ensure that
-     * no callbacks are removed while we're walking and dispatching callbacks.
-     */
-    int walking_bh;
-
-    /* Used for aio_notify.  */
-    EventNotifier notifier;
-
-    /* GPollFDs for aio_poll() */
-    GArray *pollfds;
-
-    /* Thread pool for performing work and receiving completion callbacks */
-    struct ThreadPool *thread_pool;
-} AioContext;
-
-/* Returns 1 if there are still outstanding AIO requests; 0 otherwise */
-typedef int (AioFlushEventNotifierHandler)(EventNotifier *e);
-
-/**
- * aio_context_new: Allocate a new AioContext.
- *
- * AioContext provide a mini event-loop that can be waited on synchronously.
- * They also provide bottom halves, a service to execute a piece of code
- * as soon as possible.
- */
-AioContext *aio_context_new(void);
-
-/**
- * aio_context_ref:
- * @ctx: The AioContext to operate on.
- *
- * Add a reference to an AioContext.
- */
-void aio_context_ref(AioContext *ctx);
-
-/**
- * aio_context_unref:
- * @ctx: The AioContext to operate on.
- *
- * Drop a reference to an AioContext.
- */
-void aio_context_unref(AioContext *ctx);
-
-/**
- * aio_bh_new: Allocate a new bottom half structure.
- *
- * Bottom halves are lightweight callbacks whose invocation is guaranteed
- * to be wait-free, thread-safe and signal-safe.  The #QEMUBH structure
- * is opaque and must be allocated prior to its use.
- */
-QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
-
-/**
- * aio_notify: Force processing of pending events.
- *
- * Similar to signaling a condition variable, aio_notify forces
- * aio_wait to exit, so that the next call will re-examine pending events.
- * The caller of aio_notify will usually call aio_wait again very soon,
- * or go through another iteration of the GLib main loop.  Hence, aio_notify
- * also has the side effect of recalculating the sets of file descriptors
- * that the main loop waits for.
- *
- * Calling aio_notify is rarely necessary, because for example scheduling
- * a bottom half calls it already.
- */
-void aio_notify(AioContext *ctx);
-
-/**
- * aio_bh_poll: Poll bottom halves for an AioContext.
- *
- * These are internal functions used by the QEMU main loop.
- */
-int aio_bh_poll(AioContext *ctx);
-
-/**
- * qemu_bh_schedule: Schedule a bottom half.
- *
- * Scheduling a bottom half interrupts the main loop and causes the
- * execution of the callback that was passed to qemu_bh_new.
- *
- * Bottom halves that are scheduled from a bottom half handler are instantly
- * invoked.  This can create an infinite loop if a bottom half handler
- * schedules itself.
- *
- * @bh: The bottom half to be scheduled.
- */
-void qemu_bh_schedule(QEMUBH *bh);
-
-/**
- * qemu_bh_cancel: Cancel execution of a bottom half.
- *
- * Canceling execution of a bottom half undoes the effect of calls to
- * qemu_bh_schedule without freeing its resources yet.  While cancellation
- * itself is also wait-free and thread-safe, it can of course race with the
- * loop that executes bottom halves unless you are holding the iothread
- * mutex.  This makes it mostly useless if you are not holding the mutex.
- *
- * @bh: The bottom half to be canceled.
- */
-void qemu_bh_cancel(QEMUBH *bh);
-
-/**
- *qemu_bh_delete: Cancel execution of a bottom half and free its resources.
- *
- * Deleting a bottom half frees the memory that was allocated for it by
- * qemu_bh_new.  It also implies canceling the bottom half if it was
- * scheduled.
- *
- * @bh: The bottom half to be deleted.
- */
-void qemu_bh_delete(QEMUBH *bh);
-
-/* Return whether there are any pending callbacks from the GSource
- * attached to the AioContext.
- *
- * This is used internally in the implementation of the GSource.
- */
-bool aio_pending(AioContext *ctx);
-
-/* Progress in completing AIO work to occur.  This can issue new pending
- * aio as a result of executing I/O completion or bh callbacks.
- *
- * If there is no pending AIO operation or completion (bottom half),
- * return false.  If there are pending AIO operations of bottom halves,
- * return true.
- *
- * If there are no pending bottom halves, but there are pending AIO
- * operations, it may not be possible to make any progress without
- * blocking.  If @blocking is true, this function will wait until one
- * or more AIO events have completed, to ensure something has moved
- * before returning.
- */
-bool aio_poll(AioContext *ctx, bool blocking);
-
-#ifdef CONFIG_POSIX
-/* Returns 1 if there are still outstanding AIO requests; 0 otherwise */
-typedef int (AioFlushHandler)(void *opaque);
-
-/* Register a file descriptor and associated callbacks.  Behaves very similarly
- * to qemu_set_fd_handler2.  Unlike qemu_set_fd_handler2, these callbacks will
- * be invoked when using qemu_aio_wait().
- *
- * Code that invokes AIO completion functions should rely on this function
- * instead of qemu_set_fd_handler[2].
- */
-void aio_set_fd_handler(AioContext *ctx,
-                        int fd,
-                        IOHandler *io_read,
-                        IOHandler *io_write,
-                        AioFlushHandler *io_flush,
-                        void *opaque);
-#endif
-
-/* Register an event notifier and associated callbacks.  Behaves very similarly
- * to event_notifier_set_handler.  Unlike event_notifier_set_handler, these callbacks
- * will be invoked when using qemu_aio_wait().
- *
- * Code that invokes AIO completion functions should rely on this function
- * instead of event_notifier_set_handler.
- */
-void aio_set_event_notifier(AioContext *ctx,
-                            EventNotifier *notifier,
-                            EventNotifierHandler *io_read,
-                            AioFlushEventNotifierHandler *io_flush);
-
-/* Return a GSource that lets the main loop poll the file descriptors attached
- * to this AioContext.
- */
-GSource *aio_get_g_source(AioContext *ctx);
-
-/* Return the ThreadPool bound to this AioContext */
-struct ThreadPool *aio_get_thread_pool(AioContext *ctx);
-
-/* Functions to operate on the main QEMU AioContext.  */
-
-bool qemu_aio_wait(void);
-void qemu_aio_set_event_notifier(EventNotifier *notifier,
-                                 EventNotifierHandler *io_read,
-                                 AioFlushEventNotifierHandler *io_flush);
-
-#ifdef CONFIG_POSIX
-void qemu_aio_set_fd_handler(int fd,
-                             IOHandler *io_read,
-                             IOHandler *io_write,
-                             AioFlushHandler *io_flush,
-                             void *opaque);
-#endif
-
-#endif
diff --git a/contrib/qemu/include/block/block.h b/contrib/qemu/include/block/block.h
deleted file mode 100644
index b6b9014a9..000000000
--- a/contrib/qemu/include/block/block.h
+++ /dev/null
@@ -1,443 +0,0 @@
-#ifndef BLOCK_H
-#define BLOCK_H
-
-#include "block/aio.h"
-#include "qemu-common.h"
-#include "qemu/option.h"
-#include "block/coroutine.h"
-#include "qapi/qmp/qobject.h"
-#include "qapi-types.h"
-
-/* block.c */
-typedef struct BlockDriver BlockDriver;
-typedef struct BlockJob BlockJob;
-
-typedef struct BlockDriverInfo {
-    /* in bytes, 0 if irrelevant */
-    int cluster_size;
-    /* offset at which the VM state can be saved (0 if not possible) */
-    int64_t vm_state_offset;
-    bool is_dirty;
-} BlockDriverInfo;
-
-typedef struct BlockFragInfo {
-    uint64_t allocated_clusters;
-    uint64_t total_clusters;
-    uint64_t fragmented_clusters;
-    uint64_t compressed_clusters;
-} BlockFragInfo;
-
-/* Callbacks for block device models */
-typedef struct BlockDevOps {
-    /*
-     * Runs when virtual media changed (monitor commands eject, change)
-     * Argument load is true on load and false on eject.
-     * Beware: doesn't run when a host device's physical media
-     * changes.  Sure would be useful if it did.
-     * Device models with removable media must implement this callback.
-     */
-    void (*change_media_cb)(void *opaque, bool load);
-    /*
-     * Runs when an eject request is issued from the monitor, the tray
-     * is closed, and the medium is locked.
-     * Device models that do not implement is_medium_locked will not need
-     * this callback.  Device models that can lock the medium or tray might
-     * want to implement the callback and unlock the tray when "force" is
-     * true, even if they do not support eject requests.
-     */
-    void (*eject_request_cb)(void *opaque, bool force);
-    /*
-     * Is the virtual tray open?
-     * Device models implement this only when the device has a tray.
-     */
-    bool (*is_tray_open)(void *opaque);
-    /*
-     * Is the virtual medium locked into the device?
-     * Device models implement this only when device has such a lock.
-     */
-    bool (*is_medium_locked)(void *opaque);
-    /*
-     * Runs when the size changed (e.g. monitor command block_resize)
-     */
-    void (*resize_cb)(void *opaque);
-} BlockDevOps;
-
-#define BDRV_O_RDWR        0x0002
-#define BDRV_O_SNAPSHOT    0x0008 /* open the file read only and save writes in a snapshot */
-#define BDRV_O_NOCACHE     0x0020 /* do not use the host page cache */
-#define BDRV_O_CACHE_WB    0x0040 /* use write-back caching */
-#define BDRV_O_NATIVE_AIO  0x0080 /* use native AIO instead of the thread pool */
-#define BDRV_O_NO_BACKING  0x0100 /* don't open the backing file */
-#define BDRV_O_NO_FLUSH    0x0200 /* disable flushing on this disk */
-#define BDRV_O_COPY_ON_READ 0x0400 /* copy read backing sectors into image */
-#define BDRV_O_INCOMING    0x0800  /* consistency hint for incoming migration */
-#define BDRV_O_CHECK       0x1000  /* open solely for consistency check */
-#define BDRV_O_ALLOW_RDWR  0x2000  /* allow reopen to change from r/o to r/w */
-#define BDRV_O_UNMAP       0x4000  /* execute guest UNMAP/TRIM operations */
-
-#define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH)
-
-#define BDRV_SECTOR_BITS   9
-#define BDRV_SECTOR_SIZE   (1ULL << BDRV_SECTOR_BITS)
-#define BDRV_SECTOR_MASK   ~(BDRV_SECTOR_SIZE - 1)
-
-typedef enum {
-    BDRV_ACTION_REPORT, BDRV_ACTION_IGNORE, BDRV_ACTION_STOP
-} BlockErrorAction;
-
-typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;
-
-typedef struct BDRVReopenState {
-    BlockDriverState *bs;
-    int flags;
-    void *opaque;
-} BDRVReopenState;
-
-
-void bdrv_iostatus_enable(BlockDriverState *bs);
-void bdrv_iostatus_reset(BlockDriverState *bs);
-void bdrv_iostatus_disable(BlockDriverState *bs);
-bool bdrv_iostatus_is_enabled(const BlockDriverState *bs);
-void bdrv_iostatus_set_err(BlockDriverState *bs, int error);
-void bdrv_info_print(Monitor *mon, const QObject *data);
-void bdrv_info(Monitor *mon, QObject **ret_data);
-void bdrv_stats_print(Monitor *mon, const QObject *data);
-void bdrv_info_stats(Monitor *mon, QObject **ret_data);
-
-/* disk I/O throttling */
-void bdrv_io_limits_enable(BlockDriverState *bs);
-void bdrv_io_limits_disable(BlockDriverState *bs);
-bool bdrv_io_limits_enabled(BlockDriverState *bs);
-
-void bdrv_init(void);
-void bdrv_init_with_whitelist(void);
-BlockDriver *bdrv_find_protocol(const char *filename,
-                                bool allow_protocol_prefix);
-BlockDriver *bdrv_find_format(const char *format_name);
-BlockDriver *bdrv_find_whitelisted_format(const char *format_name,
-                                          bool readonly);
-int bdrv_create(BlockDriver *drv, const char* filename,
-    QEMUOptionParameter *options);
-int bdrv_create_file(const char* filename, QEMUOptionParameter *options);
-BlockDriverState *bdrv_new(const char *device_name);
-void bdrv_make_anon(BlockDriverState *bs);
-void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old);
-void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top);
-void bdrv_delete(BlockDriverState *bs);
-int bdrv_parse_cache_flags(const char *mode, int *flags);
-int bdrv_parse_discard_flags(const char *mode, int *flags);
-int bdrv_file_open(BlockDriverState **pbs, const char *filename,
-                   QDict *options, int flags);
-int bdrv_open_backing_file(BlockDriverState *bs, QDict *options);
-int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options,
-              int flags, BlockDriver *drv);
-BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
-                                    BlockDriverState *bs, int flags);
-int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp);
-int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp);
-int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
-                        BlockReopenQueue *queue, Error **errp);
-void bdrv_reopen_commit(BDRVReopenState *reopen_state);
-void bdrv_reopen_abort(BDRVReopenState *reopen_state);
-void bdrv_close(BlockDriverState *bs);
-void bdrv_add_close_notifier(BlockDriverState *bs, Notifier *notify);
-int bdrv_attach_dev(BlockDriverState *bs, void *dev);
-void bdrv_attach_dev_nofail(BlockDriverState *bs, void *dev);
-void bdrv_detach_dev(BlockDriverState *bs, void *dev);
-void *bdrv_get_attached_dev(BlockDriverState *bs);
-void bdrv_set_dev_ops(BlockDriverState *bs, const BlockDevOps *ops,
-                      void *opaque);
-void bdrv_dev_eject_request(BlockDriverState *bs, bool force);
-bool bdrv_dev_has_removable_media(BlockDriverState *bs);
-bool bdrv_dev_is_tray_open(BlockDriverState *bs);
-bool bdrv_dev_is_medium_locked(BlockDriverState *bs);
-int bdrv_read(BlockDriverState *bs, int64_t sector_num,
-              uint8_t *buf, int nb_sectors);
-int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num,
-                          uint8_t *buf, int nb_sectors);
-int bdrv_write(BlockDriverState *bs, int64_t sector_num,
-               const uint8_t *buf, int nb_sectors);
-int bdrv_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov);
-int bdrv_pread(BlockDriverState *bs, int64_t offset,
-               void *buf, int count);
-int bdrv_pwrite(BlockDriverState *bs, int64_t offset,
-                const void *buf, int count);
-int bdrv_pwritev(BlockDriverState *bs, int64_t offset, QEMUIOVector *qiov);
-int bdrv_pwrite_sync(BlockDriverState *bs, int64_t offset,
-    const void *buf, int count);
-int coroutine_fn bdrv_co_readv(BlockDriverState *bs, int64_t sector_num,
-    int nb_sectors, QEMUIOVector *qiov);
-int coroutine_fn bdrv_co_copy_on_readv(BlockDriverState *bs,
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov);
-int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num,
-    int nb_sectors, QEMUIOVector *qiov);
-/*
- * Efficiently zero a region of the disk image.  Note that this is a regular
- * I/O request like read or write and should have a reasonable size.  This
- * function is not suitable for zeroing the entire image in a single request
- * because it may allocate memory for the entire region.
- */
-int coroutine_fn bdrv_co_write_zeroes(BlockDriverState *bs, int64_t sector_num,
-    int nb_sectors);
-int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t sector_num,
-    int nb_sectors, int *pnum);
-int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
-                                            BlockDriverState *base,
-                                            int64_t sector_num,
-                                            int nb_sectors, int *pnum);
-BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
-    const char *backing_file);
-int bdrv_get_backing_file_depth(BlockDriverState *bs);
-int bdrv_truncate(BlockDriverState *bs, int64_t offset);
-int64_t bdrv_getlength(BlockDriverState *bs);
-int64_t bdrv_get_allocated_file_size(BlockDriverState *bs);
-void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr);
-int bdrv_commit(BlockDriverState *bs);
-int bdrv_commit_all(void);
-int bdrv_change_backing_file(BlockDriverState *bs,
-    const char *backing_file, const char *backing_fmt);
-void bdrv_register(BlockDriver *bdrv);
-int bdrv_drop_intermediate(BlockDriverState *active, BlockDriverState *top,
-                           BlockDriverState *base);
-BlockDriverState *bdrv_find_overlay(BlockDriverState *active,
-                                    BlockDriverState *bs);
-BlockDriverState *bdrv_find_base(BlockDriverState *bs);
-
-
-typedef struct BdrvCheckResult {
-    int corruptions;
-    int leaks;
-    int check_errors;
-    int corruptions_fixed;
-    int leaks_fixed;
-    int64_t image_end_offset;
-    BlockFragInfo bfi;
-} BdrvCheckResult;
-
-typedef enum {
-    BDRV_FIX_LEAKS    = 1,
-    BDRV_FIX_ERRORS   = 2,
-} BdrvCheckMode;
-
-int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix);
-
-/* async block I/O */
-typedef void BlockDriverDirtyHandler(BlockDriverState *bs, int64_t sector,
-                                     int sector_num);
-BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,
-                                 QEMUIOVector *iov, int nb_sectors,
-                                 BlockDriverCompletionFunc *cb, void *opaque);
-BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,
-                                  QEMUIOVector *iov, int nb_sectors,
-                                  BlockDriverCompletionFunc *cb, void *opaque);
-BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs,
-                                 BlockDriverCompletionFunc *cb, void *opaque);
-BlockDriverAIOCB *bdrv_aio_discard(BlockDriverState *bs,
-                                   int64_t sector_num, int nb_sectors,
-                                   BlockDriverCompletionFunc *cb, void *opaque);
-void bdrv_aio_cancel(BlockDriverAIOCB *acb);
-
-typedef struct BlockRequest {
-    /* Fields to be filled by multiwrite caller */
-    int64_t sector;
-    int nb_sectors;
-    QEMUIOVector *qiov;
-    BlockDriverCompletionFunc *cb;
-    void *opaque;
-
-    /* Filled by multiwrite implementation */
-    int error;
-} BlockRequest;
-
-int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs,
-    int num_reqs);
-
-/* sg packet commands */
-int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf);
-BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs,
-        unsigned long int req, void *buf,
-        BlockDriverCompletionFunc *cb, void *opaque);
-
-/* Invalidate any cached metadata used by image formats */
-void bdrv_invalidate_cache(BlockDriverState *bs);
-void bdrv_invalidate_cache_all(void);
-
-void bdrv_clear_incoming_migration_all(void);
-
-/* Ensure contents are flushed to disk.  */
-int bdrv_flush(BlockDriverState *bs);
-int coroutine_fn bdrv_co_flush(BlockDriverState *bs);
-int bdrv_flush_all(void);
-void bdrv_close_all(void);
-void bdrv_drain_all(void);
-
-int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors);
-int bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors);
-int bdrv_has_zero_init_1(BlockDriverState *bs);
-int bdrv_has_zero_init(BlockDriverState *bs);
-int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors,
-                      int *pnum);
-int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
-                            int64_t sector_num, int nb_sectors, int *pnum);
-
-void bdrv_set_on_error(BlockDriverState *bs, BlockdevOnError on_read_error,
-                       BlockdevOnError on_write_error);
-BlockdevOnError bdrv_get_on_error(BlockDriverState *bs, bool is_read);
-BlockErrorAction bdrv_get_error_action(BlockDriverState *bs, bool is_read, int error);
-void bdrv_error_action(BlockDriverState *bs, BlockErrorAction action,
-                       bool is_read, int error);
-int bdrv_is_read_only(BlockDriverState *bs);
-int bdrv_is_sg(BlockDriverState *bs);
-int bdrv_enable_write_cache(BlockDriverState *bs);
-void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce);
-int bdrv_is_inserted(BlockDriverState *bs);
-int bdrv_media_changed(BlockDriverState *bs);
-void bdrv_lock_medium(BlockDriverState *bs, bool locked);
-void bdrv_eject(BlockDriverState *bs, bool eject_flag);
-const char *bdrv_get_format_name(BlockDriverState *bs);
-BlockDriverState *bdrv_find(const char *name);
-BlockDriverState *bdrv_next(BlockDriverState *bs);
-void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs),
-                  void *opaque);
-int bdrv_is_encrypted(BlockDriverState *bs);
-int bdrv_key_required(BlockDriverState *bs);
-int bdrv_set_key(BlockDriverState *bs, const char *key);
-int bdrv_query_missing_keys(void);
-void bdrv_iterate_format(void (*it)(void *opaque, const char *name),
-                         void *opaque);
-const char *bdrv_get_device_name(BlockDriverState *bs);
-int bdrv_get_flags(BlockDriverState *bs);
-int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,
-                          const uint8_t *buf, int nb_sectors);
-int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
-void bdrv_round_to_clusters(BlockDriverState *bs,
-                            int64_t sector_num, int nb_sectors,
-                            int64_t *cluster_sector_num,
-                            int *cluster_nb_sectors);
-
-const char *bdrv_get_encrypted_filename(BlockDriverState *bs);
-void bdrv_get_backing_filename(BlockDriverState *bs,
-                               char *filename, int filename_size);
-void bdrv_get_full_backing_filename(BlockDriverState *bs,
-                                    char *dest, size_t sz);
-int bdrv_is_snapshot(BlockDriverState *bs);
-
-int path_is_absolute(const char *path);
-void path_combine(char *dest, int dest_size,
-                  const char *base_path,
-                  const char *filename);
-
-int bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
-int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
-                      int64_t pos, int size);
-
-int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf,
-                      int64_t pos, int size);
-
-void bdrv_img_create(const char *filename, const char *fmt,
-                     const char *base_filename, const char *base_fmt,
-                     char *options, uint64_t img_size, int flags,
-                     Error **errp, bool quiet);
-
-void bdrv_set_buffer_alignment(BlockDriverState *bs, int align);
-void *qemu_blockalign(BlockDriverState *bs, size_t size);
-bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov);
-
-struct HBitmapIter;
-void bdrv_set_dirty_tracking(BlockDriverState *bs, int granularity);
-int bdrv_get_dirty(BlockDriverState *bs, int64_t sector);
-void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors);
-void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors);
-void bdrv_dirty_iter_init(BlockDriverState *bs, struct HBitmapIter *hbi);
-int64_t bdrv_get_dirty_count(BlockDriverState *bs);
-
-void bdrv_enable_copy_on_read(BlockDriverState *bs);
-void bdrv_disable_copy_on_read(BlockDriverState *bs);
-
-void bdrv_set_in_use(BlockDriverState *bs, int in_use);
-int bdrv_in_use(BlockDriverState *bs);
-
-#ifdef CONFIG_LINUX_AIO
-int raw_get_aio_fd(BlockDriverState *bs);
-#else
-static inline int raw_get_aio_fd(BlockDriverState *bs)
-{
-    return -ENOTSUP;
-}
-#endif
-
-enum BlockAcctType {
-    BDRV_ACCT_READ,
-    BDRV_ACCT_WRITE,
-    BDRV_ACCT_FLUSH,
-    BDRV_MAX_IOTYPE,
-};
-
-typedef struct BlockAcctCookie {
-    int64_t bytes;
-    int64_t start_time_ns;
-    enum BlockAcctType type;
-} BlockAcctCookie;
-
-void bdrv_acct_start(BlockDriverState *bs, BlockAcctCookie *cookie,
-        int64_t bytes, enum BlockAcctType type);
-void bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie);
-
-typedef enum {
-    BLKDBG_L1_UPDATE,
-
-    BLKDBG_L1_GROW_ALLOC_TABLE,
-    BLKDBG_L1_GROW_WRITE_TABLE,
-    BLKDBG_L1_GROW_ACTIVATE_TABLE,
-
-    BLKDBG_L2_LOAD,
-    BLKDBG_L2_UPDATE,
-    BLKDBG_L2_UPDATE_COMPRESSED,
-    BLKDBG_L2_ALLOC_COW_READ,
-    BLKDBG_L2_ALLOC_WRITE,
-
-    BLKDBG_READ_AIO,
-    BLKDBG_READ_BACKING_AIO,
-    BLKDBG_READ_COMPRESSED,
-
-    BLKDBG_WRITE_AIO,
-    BLKDBG_WRITE_COMPRESSED,
-
-    BLKDBG_VMSTATE_LOAD,
-    BLKDBG_VMSTATE_SAVE,
-
-    BLKDBG_COW_READ,
-    BLKDBG_COW_WRITE,
-
-    BLKDBG_REFTABLE_LOAD,
-    BLKDBG_REFTABLE_GROW,
-
-    BLKDBG_REFBLOCK_LOAD,
-    BLKDBG_REFBLOCK_UPDATE,
-    BLKDBG_REFBLOCK_UPDATE_PART,
-    BLKDBG_REFBLOCK_ALLOC,
-    BLKDBG_REFBLOCK_ALLOC_HOOKUP,
-    BLKDBG_REFBLOCK_ALLOC_WRITE,
-    BLKDBG_REFBLOCK_ALLOC_WRITE_BLOCKS,
-    BLKDBG_REFBLOCK_ALLOC_WRITE_TABLE,
-    BLKDBG_REFBLOCK_ALLOC_SWITCH_TABLE,
-
-    BLKDBG_CLUSTER_ALLOC,
-    BLKDBG_CLUSTER_ALLOC_BYTES,
-    BLKDBG_CLUSTER_FREE,
-
-    BLKDBG_FLUSH_TO_OS,
-    BLKDBG_FLUSH_TO_DISK,
-
-    BLKDBG_EVENT_MAX,
-} BlkDebugEvent;
-
-#define BLKDBG_EVENT(bs, evt) bdrv_debug_event(bs, evt)
-void bdrv_debug_event(BlockDriverState *bs, BlkDebugEvent event);
-
-int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
-                           const char *tag);
-int bdrv_debug_resume(BlockDriverState *bs, const char *tag);
-bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag);
-
-#endif
diff --git a/contrib/qemu/include/block/block_int.h b/contrib/qemu/include/block/block_int.h
deleted file mode 100644
index c6ac871e2..000000000
--- a/contrib/qemu/include/block/block_int.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * QEMU System Emulator block driver
- *
- * Copyright (c) 2003 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef BLOCK_INT_H
-#define BLOCK_INT_H
-
-#include "block/block.h"
-#include "qemu/option.h"
-#include "qemu/queue.h"
-#include "block/coroutine.h"
-#include "qemu/timer.h"
-#include "qapi-types.h"
-#include "qapi/qmp/qerror.h"
-#include "monitor/monitor.h"
-#include "qemu/hbitmap.h"
-#include "block/snapshot.h"
-
-#define BLOCK_FLAG_ENCRYPT          1
-#define BLOCK_FLAG_COMPAT6          4
-#define BLOCK_FLAG_LAZY_REFCOUNTS   8
-
-#define BLOCK_IO_LIMIT_READ     0
-#define BLOCK_IO_LIMIT_WRITE    1
-#define BLOCK_IO_LIMIT_TOTAL    2
-
-#define BLOCK_IO_SLICE_TIME     100000000
-#define NANOSECONDS_PER_SECOND  1000000000.0
-
-#define BLOCK_OPT_SIZE              "size"
-#define BLOCK_OPT_ENCRYPT           "encryption"
-#define BLOCK_OPT_COMPAT6           "compat6"
-#define BLOCK_OPT_BACKING_FILE      "backing_file"
-#define BLOCK_OPT_BACKING_FMT       "backing_fmt"
-#define BLOCK_OPT_CLUSTER_SIZE      "cluster_size"
-#define BLOCK_OPT_TABLE_SIZE        "table_size"
-#define BLOCK_OPT_PREALLOC          "preallocation"
-#define BLOCK_OPT_SUBFMT            "subformat"
-#define BLOCK_OPT_COMPAT_LEVEL      "compat"
-#define BLOCK_OPT_LAZY_REFCOUNTS    "lazy_refcounts"
-#define BLOCK_OPT_ADAPTER_TYPE      "adapter_type"
-
-typedef struct BdrvTrackedRequest {
-    BlockDriverState *bs;
-    int64_t sector_num;
-    int nb_sectors;
-    bool is_write;
-    QLIST_ENTRY(BdrvTrackedRequest) list;
-    Coroutine *co; /* owner, used for deadlock detection */
-    CoQueue wait_queue; /* coroutines blocked on this request */
-} BdrvTrackedRequest;
-
-
-typedef struct BlockIOLimit {
-    int64_t bps[3];
-    int64_t iops[3];
-} BlockIOLimit;
-
-typedef struct BlockIOBaseValue {
-    uint64_t bytes[2];
-    uint64_t ios[2];
-} BlockIOBaseValue;
-
-struct BlockDriver {
-    const char *format_name;
-    int instance_size;
-    int (*bdrv_probe)(const uint8_t *buf, int buf_size, const char *filename);
-    int (*bdrv_probe_device)(const char *filename);
-
-    /* Any driver implementing this callback is expected to be able to handle
-     * NULL file names in its .bdrv_open() implementation */
-    void (*bdrv_parse_filename)(const char *filename, QDict *options, Error **errp);
-
-    /* For handling image reopen for split or non-split files */
-    int (*bdrv_reopen_prepare)(BDRVReopenState *reopen_state,
-                               BlockReopenQueue *queue, Error **errp);
-    void (*bdrv_reopen_commit)(BDRVReopenState *reopen_state);
-    void (*bdrv_reopen_abort)(BDRVReopenState *reopen_state);
-
-    int (*bdrv_open)(BlockDriverState *bs, QDict *options, int flags);
-    int (*bdrv_file_open)(BlockDriverState *bs, QDict *options, int flags);
-    int (*bdrv_read)(BlockDriverState *bs, int64_t sector_num,
-                     uint8_t *buf, int nb_sectors);
-    int (*bdrv_write)(BlockDriverState *bs, int64_t sector_num,
-                      const uint8_t *buf, int nb_sectors);
-    void (*bdrv_close)(BlockDriverState *bs);
-    void (*bdrv_rebind)(BlockDriverState *bs);
-    int (*bdrv_create)(const char *filename, QEMUOptionParameter *options);
-    int (*bdrv_set_key)(BlockDriverState *bs, const char *key);
-    int (*bdrv_make_empty)(BlockDriverState *bs);
-    /* aio */
-    BlockDriverAIOCB *(*bdrv_aio_readv)(BlockDriverState *bs,
-        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque);
-    BlockDriverAIOCB *(*bdrv_aio_writev)(BlockDriverState *bs,
-        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque);
-    BlockDriverAIOCB *(*bdrv_aio_flush)(BlockDriverState *bs,
-        BlockDriverCompletionFunc *cb, void *opaque);
-    BlockDriverAIOCB *(*bdrv_aio_discard)(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors,
-        BlockDriverCompletionFunc *cb, void *opaque);
-
-    int coroutine_fn (*bdrv_co_readv)(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors, QEMUIOVector *qiov);
-    int coroutine_fn (*bdrv_co_writev)(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors, QEMUIOVector *qiov);
-    /*
-     * Efficiently zero a region of the disk image.  Typically an image format
-     * would use a compact metadata representation to implement this.  This
-     * function pointer may be NULL and .bdrv_co_writev() will be called
-     * instead.
-     */
-    int coroutine_fn (*bdrv_co_write_zeroes)(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors);
-    int coroutine_fn (*bdrv_co_discard)(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors);
-    int coroutine_fn (*bdrv_co_is_allocated)(BlockDriverState *bs,
-        int64_t sector_num, int nb_sectors, int *pnum);
-
-    /*
-     * Invalidate any cached meta-data.
-     */
-    void (*bdrv_invalidate_cache)(BlockDriverState *bs);
-
-    /*
-     * Flushes all data that was already written to the OS all the way down to
-     * the disk (for example raw-posix calls fsync()).
-     */
-    int coroutine_fn (*bdrv_co_flush_to_disk)(BlockDriverState *bs);
-
-    /*
-     * Flushes all internal caches to the OS. The data may still sit in a
-     * writeback cache of the host OS, but it will survive a crash of the qemu
-     * process.
-     */
-    int coroutine_fn (*bdrv_co_flush_to_os)(BlockDriverState *bs);
-
-    const char *protocol_name;
-    int (*bdrv_truncate)(BlockDriverState *bs, int64_t offset);
-    int64_t (*bdrv_getlength)(BlockDriverState *bs);
-    int64_t (*bdrv_get_allocated_file_size)(BlockDriverState *bs);
-    int (*bdrv_write_compressed)(BlockDriverState *bs, int64_t sector_num,
-                                 const uint8_t *buf, int nb_sectors);
-
-    int (*bdrv_snapshot_create)(BlockDriverState *bs,
-                                QEMUSnapshotInfo *sn_info);
-    int (*bdrv_snapshot_goto)(BlockDriverState *bs,
-                              const char *snapshot_id);
-    int (*bdrv_snapshot_delete)(BlockDriverState *bs, const char *snapshot_id);
-    int (*bdrv_snapshot_list)(BlockDriverState *bs,
-                              QEMUSnapshotInfo **psn_info);
-    int (*bdrv_snapshot_load_tmp)(BlockDriverState *bs,
-                                  const char *snapshot_name);
-    int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi);
-
-    int (*bdrv_save_vmstate)(BlockDriverState *bs, QEMUIOVector *qiov,
-                             int64_t pos);
-    int (*bdrv_load_vmstate)(BlockDriverState *bs, uint8_t *buf,
-                             int64_t pos, int size);
-
-    int (*bdrv_change_backing_file)(BlockDriverState *bs,
-        const char *backing_file, const char *backing_fmt);
-
-    /* removable device specific */
-    int (*bdrv_is_inserted)(BlockDriverState *bs);
-    int (*bdrv_media_changed)(BlockDriverState *bs);
-    void (*bdrv_eject)(BlockDriverState *bs, bool eject_flag);
-    void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked);
-
-    /* to control generic scsi devices */
-    int (*bdrv_ioctl)(BlockDriverState *bs, unsigned long int req, void *buf);
-    BlockDriverAIOCB *(*bdrv_aio_ioctl)(BlockDriverState *bs,
-        unsigned long int req, void *buf,
-        BlockDriverCompletionFunc *cb, void *opaque);
-
-    /* List of options for creating images, terminated by name == NULL */
-    QEMUOptionParameter *create_options;
-
-
-    /*
-     * Returns 0 for completed check, -errno for internal errors.
-     * The check results are stored in result.
-     */
-    int (*bdrv_check)(BlockDriverState* bs, BdrvCheckResult *result,
-        BdrvCheckMode fix);
-
-    void (*bdrv_debug_event)(BlockDriverState *bs, BlkDebugEvent event);
-
-    /* TODO Better pass a option string/QDict/QemuOpts to add any rule? */
-    int (*bdrv_debug_breakpoint)(BlockDriverState *bs, const char *event,
-        const char *tag);
-    int (*bdrv_debug_resume)(BlockDriverState *bs, const char *tag);
-    bool (*bdrv_debug_is_suspended)(BlockDriverState *bs, const char *tag);
-
-    /*
-     * Returns 1 if newly created images are guaranteed to contain only
-     * zeros, 0 otherwise.
-     */
-    int (*bdrv_has_zero_init)(BlockDriverState *bs);
-
-    QLIST_ENTRY(BlockDriver) list;
-};
-
-/*
- * Note: the function bdrv_append() copies and swaps contents of
- * BlockDriverStates, so if you add new fields to this struct, please
- * inspect bdrv_append() to determine if the new fields need to be
- * copied as well.
- */
-struct BlockDriverState {
-    int64_t total_sectors; /* if we are reading a disk image, give its
-                              size in sectors */
-    int read_only; /* if true, the media is read only */
-    int open_flags; /* flags used to open the file, re-used for re-open */
-    int encrypted; /* if true, the media is encrypted */
-    int valid_key; /* if true, a valid encryption key has been set */
-    int sg;        /* if true, the device is a /dev/sg* */
-    int copy_on_read; /* if true, copy read backing sectors into image
-                         note this is a reference count */
-
-    BlockDriver *drv; /* NULL means no media */
-    void *opaque;
-
-    void *dev;                  /* attached device model, if any */
-    /* TODO change to DeviceState when all users are qdevified */
-    const BlockDevOps *dev_ops;
-    void *dev_opaque;
-
-    char filename[1024];
-    char backing_file[1024]; /* if non zero, the image is a diff of
-                                this file image */
-    char backing_format[16]; /* if non-zero and backing_file exists */
-    int is_temporary;
-
-    BlockDriverState *backing_hd;
-    BlockDriverState *file;
-
-    NotifierList close_notifiers;
-
-    /* Callback before write request is processed */
-    NotifierWithReturnList before_write_notifiers;
-
-    /* number of in-flight copy-on-read requests */
-    unsigned int copy_on_read_in_flight;
-
-    /* the time for latest disk I/O */
-    int64_t slice_start;
-    int64_t slice_end;
-    BlockIOLimit io_limits;
-    BlockIOBaseValue slice_submitted;
-    CoQueue      throttled_reqs;
-    QEMUTimer    *block_timer;
-    bool         io_limits_enabled;
-
-    /* I/O stats (display with "info blockstats"). */
-    uint64_t nr_bytes[BDRV_MAX_IOTYPE];
-    uint64_t nr_ops[BDRV_MAX_IOTYPE];
-    uint64_t total_time_ns[BDRV_MAX_IOTYPE];
-    uint64_t wr_highest_sector;
-
-    /* Whether the disk can expand beyond total_sectors */
-    int growable;
-
-    /* the memory alignment required for the buffers handled by this driver */
-    int buffer_alignment;
-
-    /* do we need to tell the quest if we have a volatile write cache? */
-    int enable_write_cache;
-
-    /* NOTE: the following infos are only hints for real hardware
-       drivers. They are not used by the block driver */
-    BlockdevOnError on_read_error, on_write_error;
-    bool iostatus_enabled;
-    BlockDeviceIoStatus iostatus;
-    char device_name[32];
-    HBitmap *dirty_bitmap;
-    int in_use; /* users other than guest access, eg. block migration */
-    QTAILQ_ENTRY(BlockDriverState) list;
-
-    QLIST_HEAD(, BdrvTrackedRequest) tracked_requests;
-
-    /* long-running background operation */
-    BlockJob *job;
-
-    QDict *options;
-};
-
-int get_tmp_filename(char *filename, int size);
-
-void bdrv_set_io_limits(BlockDriverState *bs,
-                        BlockIOLimit *io_limits);
-
-/**
- * bdrv_add_before_write_notifier:
- *
- * Register a callback that is invoked before write requests are processed but
- * after any throttling or waiting for overlapping requests.
- */
-void bdrv_add_before_write_notifier(BlockDriverState *bs,
-                                    NotifierWithReturn *notifier);
-
-/**
- * bdrv_get_aio_context:
- *
- * Returns: the currently bound #AioContext
- */
-AioContext *bdrv_get_aio_context(BlockDriverState *bs);
-
-#ifdef _WIN32
-int is_windows_drive(const char *filename);
-#endif
-void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv,
-                               enum MonitorEvent ev,
-                               BlockErrorAction action, bool is_read);
-
-/**
- * stream_start:
- * @bs: Block device to operate on.
- * @base: Block device that will become the new base, or %NULL to
- * flatten the whole backing file chain onto @bs.
- * @base_id: The file name that will be written to @bs as the new
- * backing file if the job completes.  Ignored if @base is %NULL.
- * @speed: The maximum speed, in bytes per second, or 0 for unlimited.
- * @on_error: The action to take upon error.
- * @cb: Completion function for the job.
- * @opaque: Opaque pointer value passed to @cb.
- * @errp: Error object.
- *
- * Start a streaming operation on @bs.  Clusters that are unallocated
- * in @bs, but allocated in any image between @base and @bs (both
- * exclusive) will be written to @bs.  At the end of a successful
- * streaming job, the backing file of @bs will be changed to
- * @base_id in the written image and to @base in the live BlockDriverState.
- */
-void stream_start(BlockDriverState *bs, BlockDriverState *base,
-                  const char *base_id, int64_t speed, BlockdevOnError on_error,
-                  BlockDriverCompletionFunc *cb,
-                  void *opaque, Error **errp);
-
-/**
- * commit_start:
- * @bs: Top Block device
- * @base: Block device that will be written into, and become the new top
- * @speed: The maximum speed, in bytes per second, or 0 for unlimited.
- * @on_error: The action to take upon error.
- * @cb: Completion function for the job.
- * @opaque: Opaque pointer value passed to @cb.
- * @errp: Error object.
- *
- */
-void commit_start(BlockDriverState *bs, BlockDriverState *base,
-                 BlockDriverState *top, int64_t speed,
-                 BlockdevOnError on_error, BlockDriverCompletionFunc *cb,
-                 void *opaque, Error **errp);
-
-/*
- * mirror_start:
- * @bs: Block device to operate on.
- * @target: Block device to write to.
- * @speed: The maximum speed, in bytes per second, or 0 for unlimited.
- * @granularity: The chosen granularity for the dirty bitmap.
- * @buf_size: The amount of data that can be in flight at one time.
- * @mode: Whether to collapse all images in the chain to the target.
- * @on_source_error: The action to take upon error reading from the source.
- * @on_target_error: The action to take upon error writing to the target.
- * @cb: Completion function for the job.
- * @opaque: Opaque pointer value passed to @cb.
- * @errp: Error object.
- *
- * Start a mirroring operation on @bs.  Clusters that are allocated
- * in @bs will be written to @bs until the job is cancelled or
- * manually completed.  At the end of a successful mirroring job,
- * @bs will be switched to read from @target.
- */
-void mirror_start(BlockDriverState *bs, BlockDriverState *target,
-                  int64_t speed, int64_t granularity, int64_t buf_size,
-                  MirrorSyncMode mode, BlockdevOnError on_source_error,
-                  BlockdevOnError on_target_error,
-                  BlockDriverCompletionFunc *cb,
-                  void *opaque, Error **errp);
-
-/*
- * backup_start:
- * @bs: Block device to operate on.
- * @target: Block device to write to.
- * @speed: The maximum speed, in bytes per second, or 0 for unlimited.
- * @on_source_error: The action to take upon error reading from the source.
- * @on_target_error: The action to take upon error writing to the target.
- * @cb: Completion function for the job.
- * @opaque: Opaque pointer value passed to @cb.
- *
- * Start a backup operation on @bs.  Clusters in @bs are written to @target
- * until the job is cancelled or manually completed.
- */
-void backup_start(BlockDriverState *bs, BlockDriverState *target,
-                  int64_t speed, BlockdevOnError on_source_error,
-                  BlockdevOnError on_target_error,
-                  BlockDriverCompletionFunc *cb, void *opaque,
-                  Error **errp);
-
-#endif /* BLOCK_INT_H */
diff --git a/contrib/qemu/include/block/blockjob.h b/contrib/qemu/include/block/blockjob.h
deleted file mode 100644
index c290d07bb..000000000
--- a/contrib/qemu/include/block/blockjob.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Declarations for long-running block device operations
- *
- * Copyright (c) 2011 IBM Corp.
- * Copyright (c) 2012 Red Hat, Inc.
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef BLOCKJOB_H
-#define BLOCKJOB_H 1
-
-#include "block/block.h"
-
-/**
- * BlockJobType:
- *
- * A class type for block job objects.
- */
-typedef struct BlockJobType {
-    /** Derived BlockJob struct size */
-    size_t instance_size;
-
-    /** String describing the operation, part of query-block-jobs QMP API */
-    const char *job_type;
-
-    /** Optional callback for job types that support setting a speed limit */
-    void (*set_speed)(BlockJob *job, int64_t speed, Error **errp);
-
-    /** Optional callback for job types that need to forward I/O status reset */
-    void (*iostatus_reset)(BlockJob *job);
-
-    /**
-     * Optional callback for job types whose completion must be triggered
-     * manually.
-     */
-    void (*complete)(BlockJob *job, Error **errp);
-} BlockJobType;
-
-/**
- * BlockJob:
- *
- * Long-running operation on a BlockDriverState.
- */
-struct BlockJob {
-    /** The job type, including the job vtable.  */
-    const BlockJobType *job_type;
-
-    /** The block device on which the job is operating.  */
-    BlockDriverState *bs;
-
-    /**
-     * The coroutine that executes the job.  If not NULL, it is
-     * reentered when busy is false and the job is cancelled.
-     */
-    Coroutine *co;
-
-    /**
-     * Set to true if the job should cancel itself.  The flag must
-     * always be tested just before toggling the busy flag from false
-     * to true.  After a job has been cancelled, it should only yield
-     * if #qemu_aio_wait will ("sooner or later") reenter the coroutine.
-     */
-    bool cancelled;
-
-    /**
-     * Set to true if the job is either paused, or will pause itself
-     * as soon as possible (if busy == true).
-     */
-    bool paused;
-
-    /**
-     * Set to false by the job while it is in a quiescent state, where
-     * no I/O is pending and the job has yielded on any condition
-     * that is not detected by #qemu_aio_wait, such as a timer.
-     */
-    bool busy;
-
-    /** Status that is published by the query-block-jobs QMP API */
-    BlockDeviceIoStatus iostatus;
-
-    /** Offset that is published by the query-block-jobs QMP API */
-    int64_t offset;
-
-    /** Length that is published by the query-block-jobs QMP API */
-    int64_t len;
-
-    /** Speed that was set with @block_job_set_speed.  */
-    int64_t speed;
-
-    /** The completion function that will be called when the job completes.  */
-    BlockDriverCompletionFunc *cb;
-
-    /** The opaque value that is passed to the completion function.  */
-    void *opaque;
-};
-
-/**
- * block_job_create:
- * @job_type: The class object for the newly-created job.
- * @bs: The block
- * @speed: The maximum speed, in bytes per second, or 0 for unlimited.
- * @cb: Completion function for the job.
- * @opaque: Opaque pointer value passed to @cb.
- * @errp: Error object.
- *
- * Create a new long-running block device job and return it.  The job
- * will call @cb asynchronously when the job completes.  Note that
- * @bs may have been closed at the time the @cb it is called.  If
- * this is the case, the job may be reported as either cancelled or
- * completed.
- *
- * This function is not part of the public job interface; it should be
- * called from a wrapper that is specific to the job type.
- */
-void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs,
-                       int64_t speed, BlockDriverCompletionFunc *cb,
-                       void *opaque, Error **errp);
-
-/**
- * block_job_sleep_ns:
- * @job: The job that calls the function.
- * @clock: The clock to sleep on.
- * @ns: How many nanoseconds to stop for.
- *
- * Put the job to sleep (assuming that it wasn't canceled) for @ns
- * nanoseconds.  Canceling the job will interrupt the wait immediately.
- */
-void block_job_sleep_ns(BlockJob *job, QEMUClock *clock, int64_t ns);
-
-/**
- * block_job_completed:
- * @job: The job being completed.
- * @ret: The status code.
- *
- * Call the completion function that was registered at creation time, and
- * free @job.
- */
-void block_job_completed(BlockJob *job, int ret);
-
-/**
- * block_job_set_speed:
- * @job: The job to set the speed for.
- * @speed: The new value
- * @errp: Error object.
- *
- * Set a rate-limiting parameter for the job; the actual meaning may
- * vary depending on the job type.
- */
-void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp);
-
-/**
- * block_job_cancel:
- * @job: The job to be canceled.
- *
- * Asynchronously cancel the specified job.
- */
-void block_job_cancel(BlockJob *job);
-
-/**
- * block_job_complete:
- * @job: The job to be completed.
- * @errp: Error object.
- *
- * Asynchronously complete the specified job.
- */
-void block_job_complete(BlockJob *job, Error **errp);
-
-/**
- * block_job_is_cancelled:
- * @job: The job being queried.
- *
- * Returns whether the job is scheduled for cancellation.
- */
-bool block_job_is_cancelled(BlockJob *job);
-
-/**
- * block_job_query:
- * @job: The job to get information about.
- *
- * Return information about a job.
- */
-BlockJobInfo *block_job_query(BlockJob *job);
-
-/**
- * block_job_pause:
- * @job: The job to be paused.
- *
- * Asynchronously pause the specified job.
- */
-void block_job_pause(BlockJob *job);
-
-/**
- * block_job_resume:
- * @job: The job to be resumed.
- *
- * Resume the specified job.
- */
-void block_job_resume(BlockJob *job);
-
-/**
- * qobject_from_block_job:
- * @job: The job whose information is requested.
- *
- * Return a QDict corresponding to @job's query-block-jobs entry.
- */
-QObject *qobject_from_block_job(BlockJob *job);
-
-/**
- * block_job_ready:
- * @job: The job which is now ready to complete.
- *
- * Send a BLOCK_JOB_READY event for the specified job.
- */
-void block_job_ready(BlockJob *job);
-
-/**
- * block_job_is_paused:
- * @job: The job being queried.
- *
- * Returns whether the job is currently paused, or will pause
- * as soon as it reaches a sleeping point.
- */
-bool block_job_is_paused(BlockJob *job);
-
-/**
- * block_job_cancel_sync:
- * @job: The job to be canceled.
- *
- * Synchronously cancel the job.  The completion callback is called
- * before the function returns.  The job may actually complete
- * instead of canceling itself; the circumstances under which this
- * happens depend on the kind of job that is active.
- *
- * Returns the return value from the job if the job actually completed
- * during the call, or -ECANCELED if it was canceled.
- */
-int block_job_cancel_sync(BlockJob *job);
-
-/**
- * block_job_iostatus_reset:
- * @job: The job whose I/O status should be reset.
- *
- * Reset I/O status on @job and on BlockDriverState objects it uses,
- * other than job->bs.
- */
-void block_job_iostatus_reset(BlockJob *job);
-
-/**
- * block_job_error_action:
- * @job: The job to signal an error for.
- * @bs: The block device on which to set an I/O error.
- * @on_err: The error action setting.
- * @is_read: Whether the operation was a read.
- * @error: The error that was reported.
- *
- * Report an I/O error for a block job and possibly stop the VM.  Return the
- * action that was selected based on @on_err and @error.
- */
-BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
-                                        BlockdevOnError on_err,
-                                        int is_read, int error);
-#endif
diff --git a/contrib/qemu/include/block/coroutine.h b/contrib/qemu/include/block/coroutine.h
deleted file mode 100644
index 377805a3b..000000000
--- a/contrib/qemu/include/block/coroutine.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * QEMU coroutine implementation
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Stefan Hajnoczi    <stefanha@linux.vnet.ibm.com>
- *  Kevin Wolf         <kwolf@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QEMU_COROUTINE_H
-#define QEMU_COROUTINE_H
-
-#include <stdbool.h>
-#include "qemu/queue.h"
-#include "qemu/timer.h"
-
-/**
- * Coroutines are a mechanism for stack switching and can be used for
- * cooperative userspace threading.  These functions provide a simple but
- * useful flavor of coroutines that is suitable for writing sequential code,
- * rather than callbacks, for operations that need to give up control while
- * waiting for events to complete.
- *
- * These functions are re-entrant and may be used outside the global mutex.
- */
-
-/**
- * Mark a function that executes in coroutine context
- *
- * Functions that execute in coroutine context cannot be called directly from
- * normal functions.  In the future it would be nice to enable compiler or
- * static checker support for catching such errors.  This annotation might make
- * it possible and in the meantime it serves as documentation.
- *
- * For example:
- *
- *   static void coroutine_fn foo(void) {
- *       ....
- *   }
- */
-#define coroutine_fn
-
-typedef struct Coroutine Coroutine;
-
-/**
- * Coroutine entry point
- *
- * When the coroutine is entered for the first time, opaque is passed in as an
- * argument.
- *
- * When this function returns, the coroutine is destroyed automatically and
- * execution continues in the caller who last entered the coroutine.
- */
-typedef void coroutine_fn CoroutineEntry(void *opaque);
-
-/**
- * Create a new coroutine
- *
- * Use qemu_coroutine_enter() to actually transfer control to the coroutine.
- */
-Coroutine *qemu_coroutine_create(CoroutineEntry *entry);
-
-/**
- * Transfer control to a coroutine
- *
- * The opaque argument is passed as the argument to the entry point when
- * entering the coroutine for the first time.  It is subsequently ignored.
- */
-void qemu_coroutine_enter(Coroutine *coroutine, void *opaque);
-
-/**
- * Transfer control back to a coroutine's caller
- *
- * This function does not return until the coroutine is re-entered using
- * qemu_coroutine_enter().
- */
-void coroutine_fn qemu_coroutine_yield(void);
-
-/**
- * Get the currently executing coroutine
- */
-Coroutine *coroutine_fn qemu_coroutine_self(void);
-
-/**
- * Return whether or not currently inside a coroutine
- *
- * This can be used to write functions that work both when in coroutine context
- * and when not in coroutine context.  Note that such functions cannot use the
- * coroutine_fn annotation since they work outside coroutine context.
- */
-bool qemu_in_coroutine(void);
-
-
-
-/**
- * CoQueues are a mechanism to queue coroutines in order to continue executing
- * them later. They provide the fundamental primitives on which coroutine locks
- * are built.
- */
-typedef struct CoQueue {
-    QTAILQ_HEAD(, Coroutine) entries;
-    AioContext *ctx;
-} CoQueue;
-
-/**
- * Initialise a CoQueue. This must be called before any other operation is used
- * on the CoQueue.
- */
-void qemu_co_queue_init(CoQueue *queue);
-
-/**
- * Adds the current coroutine to the CoQueue and transfers control to the
- * caller of the coroutine.
- */
-void coroutine_fn qemu_co_queue_wait(CoQueue *queue);
-
-/**
- * Adds the current coroutine to the head of the CoQueue and transfers control to the
- * caller of the coroutine.
- */
-void coroutine_fn qemu_co_queue_wait_insert_head(CoQueue *queue);
-
-/**
- * Restarts the next coroutine in the CoQueue and removes it from the queue.
- *
- * Returns true if a coroutine was restarted, false if the queue is empty.
- */
-bool qemu_co_queue_next(CoQueue *queue);
-
-/**
- * Restarts all coroutines in the CoQueue and leaves the queue empty.
- */
-void qemu_co_queue_restart_all(CoQueue *queue);
-
-/**
- * Checks if the CoQueue is empty.
- */
-bool qemu_co_queue_empty(CoQueue *queue);
-
-
-/**
- * Provides a mutex that can be used to synchronise coroutines
- */
-typedef struct CoMutex {
-    bool locked;
-    CoQueue queue;
-} CoMutex;
-
-/**
- * Initialises a CoMutex. This must be called before any other operation is used
- * on the CoMutex.
- */
-void qemu_co_mutex_init(CoMutex *mutex);
-
-/**
- * Locks the mutex. If the lock cannot be taken immediately, control is
- * transferred to the caller of the current coroutine.
- */
-void coroutine_fn qemu_co_mutex_lock(CoMutex *mutex);
-
-/**
- * Unlocks the mutex and schedules the next coroutine that was waiting for this
- * lock to be run.
- */
-void coroutine_fn qemu_co_mutex_unlock(CoMutex *mutex);
-
-typedef struct CoRwlock {
-    bool writer;
-    int reader;
-    CoQueue queue;
-} CoRwlock;
-
-/**
- * Initialises a CoRwlock. This must be called before any other operation
- * is used on the CoRwlock
- */
-void qemu_co_rwlock_init(CoRwlock *lock);
-
-/**
- * Read locks the CoRwlock. If the lock cannot be taken immediately because
- * of a parallel writer, control is transferred to the caller of the current
- * coroutine.
- */
-void qemu_co_rwlock_rdlock(CoRwlock *lock);
-
-/**
- * Write Locks the mutex. If the lock cannot be taken immediately because
- * of a parallel reader, control is transferred to the caller of the current
- * coroutine.
- */
-void qemu_co_rwlock_wrlock(CoRwlock *lock);
-
-/**
- * Unlocks the read/write lock and schedules the next coroutine that was
- * waiting for this lock to be run.
- */
-void qemu_co_rwlock_unlock(CoRwlock *lock);
-
-/**
- * Yield the coroutine for a given duration
- *
- * Note this function uses timers and hence only works when a main loop is in
- * use.  See main-loop.h and do not use from qemu-tool programs.
- */
-void coroutine_fn co_sleep_ns(QEMUClock *clock, int64_t ns);
-
-/**
- * Yield until a file descriptor becomes readable
- *
- * Note that this function clobbers the handlers for the file descriptor.
- */
-void coroutine_fn yield_until_fd_readable(int fd);
-#endif /* QEMU_COROUTINE_H */
diff --git a/contrib/qemu/include/block/coroutine_int.h b/contrib/qemu/include/block/coroutine_int.h
deleted file mode 100644
index f133d65af..000000000
--- a/contrib/qemu/include/block/coroutine_int.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Coroutine internals
- *
- * Copyright (c) 2011 Kevin Wolf <kwolf@redhat.com>
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef QEMU_COROUTINE_INT_H
-#define QEMU_COROUTINE_INT_H
-
-#include "qemu/queue.h"
-#include "block/coroutine.h"
-
-typedef enum {
-    COROUTINE_YIELD = 1,
-    COROUTINE_TERMINATE = 2,
-} CoroutineAction;
-
-struct Coroutine {
-    CoroutineEntry *entry;
-    void *entry_arg;
-    Coroutine *caller;
-    QSLIST_ENTRY(Coroutine) pool_next;
-
-    /* Coroutines that should be woken up when we yield or terminate */
-    QTAILQ_HEAD(, Coroutine) co_queue_wakeup;
-    QTAILQ_ENTRY(Coroutine) co_queue_next;
-};
-
-Coroutine *qemu_coroutine_new(void);
-void qemu_coroutine_delete(Coroutine *co);
-CoroutineAction qemu_coroutine_switch(Coroutine *from, Coroutine *to,
-                                      CoroutineAction action);
-void coroutine_fn qemu_co_queue_run_restart(Coroutine *co);
-
-#endif
diff --git a/contrib/qemu/include/block/snapshot.h b/contrib/qemu/include/block/snapshot.h
deleted file mode 100644
index eaf61f032..000000000
--- a/contrib/qemu/include/block/snapshot.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Block layer snapshot related functions
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef SNAPSHOT_H
-#define SNAPSHOT_H
-
-#include "qemu-common.h"
-
-typedef struct QEMUSnapshotInfo {
-    char id_str[128]; /* unique snapshot id */
-    /* the following fields are informative. They are not needed for
-       the consistency of the snapshot */
-    char name[256]; /* user chosen name */
-    uint64_t vm_state_size; /* VM state info size */
-    uint32_t date_sec; /* UTC date of the snapshot */
-    uint32_t date_nsec;
-    uint64_t vm_clock_nsec; /* VM clock relative to boot */
-} QEMUSnapshotInfo;
-
-int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info,
-                       const char *name);
-int bdrv_can_snapshot(BlockDriverState *bs);
-int bdrv_snapshot_create(BlockDriverState *bs,
-                         QEMUSnapshotInfo *sn_info);
-int bdrv_snapshot_goto(BlockDriverState *bs,
-                       const char *snapshot_id);
-int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id);
-int bdrv_snapshot_list(BlockDriverState *bs,
-                       QEMUSnapshotInfo **psn_info);
-int bdrv_snapshot_load_tmp(BlockDriverState *bs,
-                           const char *snapshot_name);
-#endif
diff --git a/contrib/qemu/include/config.h b/contrib/qemu/include/config.h
deleted file mode 100644
index e20f78696..000000000
--- a/contrib/qemu/include/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "config-host.h"
-#include "config-target.h"
diff --git a/contrib/qemu/include/exec/cpu-common.h b/contrib/qemu/include/exec/cpu-common.h
deleted file mode 100644
index e4996e19c..000000000
--- a/contrib/qemu/include/exec/cpu-common.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef CPU_COMMON_H
-#define CPU_COMMON_H 1
-
-/* CPU interfaces that are target independent.  */
-
-#ifndef CONFIG_USER_ONLY
-#include "exec/hwaddr.h"
-#endif
-
-#ifndef NEED_CPU_H
-#include "exec/poison.h"
-#endif
-
-#include "qemu/bswap.h"
-#include "qemu/queue.h"
-
-/**
- * CPUListState:
- * @cpu_fprintf: Print function.
- * @file: File to print to using @cpu_fprint.
- *
- * State commonly used for iterating over CPU models.
- */
-typedef struct CPUListState {
-    fprintf_function cpu_fprintf;
-    FILE *file;
-} CPUListState;
-
-#if !defined(CONFIG_USER_ONLY)
-
-enum device_endian {
-    DEVICE_NATIVE_ENDIAN,
-    DEVICE_BIG_ENDIAN,
-    DEVICE_LITTLE_ENDIAN,
-};
-
-/* address in the RAM (different from a physical address) */
-#if defined(CONFIG_XEN_BACKEND)
-typedef uint64_t ram_addr_t;
-#  define RAM_ADDR_MAX UINT64_MAX
-#  define RAM_ADDR_FMT "%" PRIx64
-#else
-typedef uintptr_t ram_addr_t;
-#  define RAM_ADDR_MAX UINTPTR_MAX
-#  define RAM_ADDR_FMT "%" PRIxPTR
-#endif
-
-/* memory API */
-
-typedef void CPUWriteMemoryFunc(void *opaque, hwaddr addr, uint32_t value);
-typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr);
-
-void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);
-/* This should not be used by devices.  */
-MemoryRegion *qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr);
-void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev);
-
-void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,
-                            int len, int is_write);
-static inline void cpu_physical_memory_read(hwaddr addr,
-                                            void *buf, int len)
-{
-    cpu_physical_memory_rw(addr, buf, len, 0);
-}
-static inline void cpu_physical_memory_write(hwaddr addr,
-                                             const void *buf, int len)
-{
-    cpu_physical_memory_rw(addr, (void *)buf, len, 1);
-}
-void *cpu_physical_memory_map(hwaddr addr,
-                              hwaddr *plen,
-                              int is_write);
-void cpu_physical_memory_unmap(void *buffer, hwaddr len,
-                               int is_write, hwaddr access_len);
-void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque));
-
-bool cpu_physical_memory_is_io(hwaddr phys_addr);
-
-/* Coalesced MMIO regions are areas where write operations can be reordered.
- * This usually implies that write operations are side-effect free.  This allows
- * batching which can make a major impact on performance when using
- * virtualization.
- */
-void qemu_flush_coalesced_mmio_buffer(void);
-
-uint32_t ldub_phys(hwaddr addr);
-uint32_t lduw_le_phys(hwaddr addr);
-uint32_t lduw_be_phys(hwaddr addr);
-uint32_t ldl_le_phys(hwaddr addr);
-uint32_t ldl_be_phys(hwaddr addr);
-uint64_t ldq_le_phys(hwaddr addr);
-uint64_t ldq_be_phys(hwaddr addr);
-void stb_phys(hwaddr addr, uint32_t val);
-void stw_le_phys(hwaddr addr, uint32_t val);
-void stw_be_phys(hwaddr addr, uint32_t val);
-void stl_le_phys(hwaddr addr, uint32_t val);
-void stl_be_phys(hwaddr addr, uint32_t val);
-void stq_le_phys(hwaddr addr, uint64_t val);
-void stq_be_phys(hwaddr addr, uint64_t val);
-
-#ifdef NEED_CPU_H
-uint32_t lduw_phys(hwaddr addr);
-uint32_t ldl_phys(hwaddr addr);
-uint64_t ldq_phys(hwaddr addr);
-void stl_phys_notdirty(hwaddr addr, uint32_t val);
-void stw_phys(hwaddr addr, uint32_t val);
-void stl_phys(hwaddr addr, uint32_t val);
-void stq_phys(hwaddr addr, uint64_t val);
-#endif
-
-void cpu_physical_memory_write_rom(hwaddr addr,
-                                   const uint8_t *buf, int len);
-
-extern struct MemoryRegion io_mem_rom;
-extern struct MemoryRegion io_mem_notdirty;
-
-typedef void (RAMBlockIterFunc)(void *host_addr,
-    ram_addr_t offset, ram_addr_t length, void *opaque);
-
-void qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque);
-
-#endif
-
-#endif /* !CPU_COMMON_H */
diff --git a/contrib/qemu/include/exec/hwaddr.h b/contrib/qemu/include/exec/hwaddr.h
deleted file mode 100644
index c9eb78fba..000000000
--- a/contrib/qemu/include/exec/hwaddr.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Define hwaddr if it exists.  */
-
-#ifndef HWADDR_H
-#define HWADDR_H
-
-#define HWADDR_BITS 64
-/* hwaddr is the type of a physical address (its size can
-   be different from 'target_ulong').  */
-
-typedef uint64_t hwaddr;
-#define HWADDR_MAX UINT64_MAX
-#define TARGET_FMT_plx "%016" PRIx64
-#define HWADDR_PRId PRId64
-#define HWADDR_PRIi PRIi64
-#define HWADDR_PRIo PRIo64
-#define HWADDR_PRIu PRIu64
-#define HWADDR_PRIx PRIx64
-#define HWADDR_PRIX PRIX64
-
-#endif
diff --git a/contrib/qemu/include/exec/poison.h b/contrib/qemu/include/exec/poison.h
deleted file mode 100644
index 2341a7504..000000000
--- a/contrib/qemu/include/exec/poison.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Poison identifiers that should not be used when building
-   target independent device code.  */
-
-#ifndef HW_POISON_H
-#define HW_POISON_H
-#ifdef __GNUC__
-
-#pragma GCC poison TARGET_I386
-#pragma GCC poison TARGET_X86_64
-#pragma GCC poison TARGET_ALPHA
-#pragma GCC poison TARGET_ARM
-#pragma GCC poison TARGET_CRIS
-#pragma GCC poison TARGET_LM32
-#pragma GCC poison TARGET_M68K
-#pragma GCC poison TARGET_MIPS
-#pragma GCC poison TARGET_MIPS64
-#pragma GCC poison TARGET_OPENRISC
-#pragma GCC poison TARGET_PPC
-#pragma GCC poison TARGET_PPCEMB
-#pragma GCC poison TARGET_PPC64
-#pragma GCC poison TARGET_ABI32
-#pragma GCC poison TARGET_SH4
-#pragma GCC poison TARGET_SPARC
-#pragma GCC poison TARGET_SPARC64
-
-#pragma GCC poison TARGET_WORDS_BIGENDIAN
-#pragma GCC poison BSWAP_NEEDED
-
-#pragma GCC poison TARGET_LONG_BITS
-#pragma GCC poison TARGET_FMT_lx
-#pragma GCC poison TARGET_FMT_ld
-
-#pragma GCC poison TARGET_PAGE_SIZE
-#pragma GCC poison TARGET_PAGE_MASK
-#pragma GCC poison TARGET_PAGE_BITS
-#pragma GCC poison TARGET_PAGE_ALIGN
-
-#pragma GCC poison CPUArchState
-#pragma GCC poison env
-
-#pragma GCC poison lduw_phys
-#pragma GCC poison ldl_phys
-#pragma GCC poison ldq_phys
-#pragma GCC poison stl_phys_notdirty
-#pragma GCC poison stw_phys
-#pragma GCC poison stl_phys
-#pragma GCC poison stq_phys
-
-#pragma GCC poison CPU_INTERRUPT_HARD
-#pragma GCC poison CPU_INTERRUPT_EXITTB
-#pragma GCC poison CPU_INTERRUPT_HALT
-#pragma GCC poison CPU_INTERRUPT_DEBUG
-#pragma GCC poison CPU_INTERRUPT_TGT_EXT_0
-#pragma GCC poison CPU_INTERRUPT_TGT_EXT_1
-#pragma GCC poison CPU_INTERRUPT_TGT_EXT_2
-#pragma GCC poison CPU_INTERRUPT_TGT_EXT_3
-#pragma GCC poison CPU_INTERRUPT_TGT_EXT_4
-#pragma GCC poison CPU_INTERRUPT_TGT_INT_0
-#pragma GCC poison CPU_INTERRUPT_TGT_INT_1
-#pragma GCC poison CPU_INTERRUPT_TGT_INT_2
-
-#endif
-#endif
diff --git a/contrib/qemu/include/fpu/softfloat.h b/contrib/qemu/include/fpu/softfloat.h
deleted file mode 100644
index f3927e241..000000000
--- a/contrib/qemu/include/fpu/softfloat.h
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
- * QEMU float support
- *
- * Derived from SoftFloat.
- */
-
-/*============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic
-Package, Release 2b.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
-been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
-RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
-AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
-COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
-EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
-INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
-OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) the source code for the derivative work includes prominent notice that
-the work is derivative, and (2) the source code includes prominent notice with
-these four paragraphs for those parts of this code that are retained.
-
-=============================================================================*/
-
-#ifndef SOFTFLOAT_H
-#define SOFTFLOAT_H
-
-#if defined(CONFIG_SOLARIS) && defined(CONFIG_NEEDS_LIBSUNMATH)
-#include <sunmath.h>
-#endif
-
-#include <inttypes.h>
-#include "config-host.h"
-#include "qemu/osdep.h"
-
-/*----------------------------------------------------------------------------
-| Each of the following `typedef's defines the most convenient type that holds
-| integers of at least as many bits as specified.  For example, `uint8' should
-| be the most convenient type that can hold unsigned integers of as many as
-| 8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-| implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-| to the same as `int'.
-*----------------------------------------------------------------------------*/
-typedef uint8_t flag;
-typedef uint8_t uint8;
-typedef int8_t int8;
-typedef unsigned int uint32;
-typedef signed int int32;
-typedef uint64_t uint64;
-typedef int64_t int64;
-
-#define LIT64( a ) a##LL
-#define INLINE static inline
-
-#define STATUS_PARAM , float_status *status
-#define STATUS(field) status->field
-#define STATUS_VAR , status
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point ordering relations
-*----------------------------------------------------------------------------*/
-enum {
-    float_relation_less      = -1,
-    float_relation_equal     =  0,
-    float_relation_greater   =  1,
-    float_relation_unordered =  2
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point types.
-*----------------------------------------------------------------------------*/
-/* Use structures for soft-float types.  This prevents accidentally mixing
-   them with native int/float types.  A sufficiently clever compiler and
-   sane ABI should be able to see though these structs.  However
-   x86/gcc 3.x seems to struggle a bit, so leave them disabled by default.  */
-//#define USE_SOFTFLOAT_STRUCT_TYPES
-#ifdef USE_SOFTFLOAT_STRUCT_TYPES
-typedef struct {
-    uint16_t v;
-} float16;
-#define float16_val(x) (((float16)(x)).v)
-#define make_float16(x) __extension__ ({ float16 f16_val = {x}; f16_val; })
-#define const_float16(x) { x }
-typedef struct {
-    uint32_t v;
-} float32;
-/* The cast ensures an error if the wrong type is passed.  */
-#define float32_val(x) (((float32)(x)).v)
-#define make_float32(x) __extension__ ({ float32 f32_val = {x}; f32_val; })
-#define const_float32(x) { x }
-typedef struct {
-    uint64_t v;
-} float64;
-#define float64_val(x) (((float64)(x)).v)
-#define make_float64(x) __extension__ ({ float64 f64_val = {x}; f64_val; })
-#define const_float64(x) { x }
-#else
-typedef uint16_t float16;
-typedef uint32_t float32;
-typedef uint64_t float64;
-#define float16_val(x) (x)
-#define float32_val(x) (x)
-#define float64_val(x) (x)
-#define make_float16(x) (x)
-#define make_float32(x) (x)
-#define make_float64(x) (x)
-#define const_float16(x) (x)
-#define const_float32(x) (x)
-#define const_float64(x) (x)
-#endif
-typedef struct {
-    uint64_t low;
-    uint16_t high;
-} floatx80;
-#define make_floatx80(exp, mant) ((floatx80) { mant, exp })
-#define make_floatx80_init(exp, mant) { .low = mant, .high = exp }
-typedef struct {
-#ifdef HOST_WORDS_BIGENDIAN
-    uint64_t high, low;
-#else
-    uint64_t low, high;
-#endif
-} float128;
-#define make_float128(high_, low_) ((float128) { .high = high_, .low = low_ })
-#define make_float128_init(high_, low_) { .high = high_, .low = low_ }
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point underflow tininess-detection mode.
-*----------------------------------------------------------------------------*/
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point rounding mode.
-*----------------------------------------------------------------------------*/
-enum {
-    float_round_nearest_even = 0,
-    float_round_down         = 1,
-    float_round_up           = 2,
-    float_round_to_zero      = 3
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point exception flags.
-*----------------------------------------------------------------------------*/
-enum {
-    float_flag_invalid   =  1,
-    float_flag_divbyzero =  4,
-    float_flag_overflow  =  8,
-    float_flag_underflow = 16,
-    float_flag_inexact   = 32,
-    float_flag_input_denormal = 64,
-    float_flag_output_denormal = 128
-};
-
-typedef struct float_status {
-    signed char float_detect_tininess;
-    signed char float_rounding_mode;
-    signed char float_exception_flags;
-    signed char floatx80_rounding_precision;
-    /* should denormalised results go to zero and set the inexact flag? */
-    flag flush_to_zero;
-    /* should denormalised inputs go to zero and set the input_denormal flag? */
-    flag flush_inputs_to_zero;
-    flag default_nan_mode;
-} float_status;
-
-void set_float_rounding_mode(int val STATUS_PARAM);
-void set_float_exception_flags(int val STATUS_PARAM);
-INLINE void set_float_detect_tininess(int val STATUS_PARAM)
-{
-    STATUS(float_detect_tininess) = val;
-}
-INLINE void set_flush_to_zero(flag val STATUS_PARAM)
-{
-    STATUS(flush_to_zero) = val;
-}
-INLINE void set_flush_inputs_to_zero(flag val STATUS_PARAM)
-{
-    STATUS(flush_inputs_to_zero) = val;
-}
-INLINE void set_default_nan_mode(flag val STATUS_PARAM)
-{
-    STATUS(default_nan_mode) = val;
-}
-INLINE int get_float_exception_flags(float_status *status)
-{
-    return STATUS(float_exception_flags);
-}
-void set_floatx80_rounding_precision(int val STATUS_PARAM);
-
-/*----------------------------------------------------------------------------
-| Routine to raise any or all of the software IEC/IEEE floating-point
-| exception flags.
-*----------------------------------------------------------------------------*/
-void float_raise( int8 flags STATUS_PARAM);
-
-/*----------------------------------------------------------------------------
-| Options to indicate which negations to perform in float*_muladd()
-| Using these differs from negating an input or output before calling
-| the muladd function in that this means that a NaN doesn't have its
-| sign bit inverted before it is propagated.
-*----------------------------------------------------------------------------*/
-enum {
-    float_muladd_negate_c = 1,
-    float_muladd_negate_product = 2,
-    float_muladd_negate_result = 4,
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE integer-to-floating-point conversion routines.
-*----------------------------------------------------------------------------*/
-float32 int32_to_float32( int32 STATUS_PARAM );
-float64 int32_to_float64( int32 STATUS_PARAM );
-float32 uint32_to_float32( uint32 STATUS_PARAM );
-float64 uint32_to_float64( uint32 STATUS_PARAM );
-floatx80 int32_to_floatx80( int32 STATUS_PARAM );
-float128 int32_to_float128( int32 STATUS_PARAM );
-float32 int64_to_float32( int64 STATUS_PARAM );
-float32 uint64_to_float32( uint64 STATUS_PARAM );
-float64 int64_to_float64( int64 STATUS_PARAM );
-float64 uint64_to_float64( uint64 STATUS_PARAM );
-floatx80 int64_to_floatx80( int64 STATUS_PARAM );
-float128 int64_to_float128( int64 STATUS_PARAM );
-float128 uint64_to_float128( uint64 STATUS_PARAM );
-
-/*----------------------------------------------------------------------------
-| Software half-precision conversion routines.
-*----------------------------------------------------------------------------*/
-float16 float32_to_float16( float32, flag STATUS_PARAM );
-float32 float16_to_float32( float16, flag STATUS_PARAM );
-
-/*----------------------------------------------------------------------------
-| Software half-precision operations.
-*----------------------------------------------------------------------------*/
-int float16_is_quiet_nan( float16 );
-int float16_is_signaling_nan( float16 );
-float16 float16_maybe_silence_nan( float16 );
-
-INLINE int float16_is_any_nan(float16 a)
-{
-    return ((float16_val(a) & ~0x8000) > 0x7c00);
-}
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated half-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const float16 float16_default_nan;
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE single-precision conversion routines.
-*----------------------------------------------------------------------------*/
-int_fast16_t float32_to_int16_round_to_zero(float32 STATUS_PARAM);
-uint_fast16_t float32_to_uint16_round_to_zero(float32 STATUS_PARAM);
-int32 float32_to_int32( float32 STATUS_PARAM );
-int32 float32_to_int32_round_to_zero( float32 STATUS_PARAM );
-uint32 float32_to_uint32( float32 STATUS_PARAM );
-uint32 float32_to_uint32_round_to_zero( float32 STATUS_PARAM );
-int64 float32_to_int64( float32 STATUS_PARAM );
-int64 float32_to_int64_round_to_zero( float32 STATUS_PARAM );
-float64 float32_to_float64( float32 STATUS_PARAM );
-floatx80 float32_to_floatx80( float32 STATUS_PARAM );
-float128 float32_to_float128( float32 STATUS_PARAM );
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE single-precision operations.
-*----------------------------------------------------------------------------*/
-float32 float32_round_to_int( float32 STATUS_PARAM );
-float32 float32_add( float32, float32 STATUS_PARAM );
-float32 float32_sub( float32, float32 STATUS_PARAM );
-float32 float32_mul( float32, float32 STATUS_PARAM );
-float32 float32_div( float32, float32 STATUS_PARAM );
-float32 float32_rem( float32, float32 STATUS_PARAM );
-float32 float32_muladd(float32, float32, float32, int STATUS_PARAM);
-float32 float32_sqrt( float32 STATUS_PARAM );
-float32 float32_exp2( float32 STATUS_PARAM );
-float32 float32_log2( float32 STATUS_PARAM );
-int float32_eq( float32, float32 STATUS_PARAM );
-int float32_le( float32, float32 STATUS_PARAM );
-int float32_lt( float32, float32 STATUS_PARAM );
-int float32_unordered( float32, float32 STATUS_PARAM );
-int float32_eq_quiet( float32, float32 STATUS_PARAM );
-int float32_le_quiet( float32, float32 STATUS_PARAM );
-int float32_lt_quiet( float32, float32 STATUS_PARAM );
-int float32_unordered_quiet( float32, float32 STATUS_PARAM );
-int float32_compare( float32, float32 STATUS_PARAM );
-int float32_compare_quiet( float32, float32 STATUS_PARAM );
-float32 float32_min(float32, float32 STATUS_PARAM);
-float32 float32_max(float32, float32 STATUS_PARAM);
-int float32_is_quiet_nan( float32 );
-int float32_is_signaling_nan( float32 );
-float32 float32_maybe_silence_nan( float32 );
-float32 float32_scalbn( float32, int STATUS_PARAM );
-
-INLINE float32 float32_abs(float32 a)
-{
-    /* Note that abs does *not* handle NaN specially, nor does
-     * it flush denormal inputs to zero.
-     */
-    return make_float32(float32_val(a) & 0x7fffffff);
-}
-
-INLINE float32 float32_chs(float32 a)
-{
-    /* Note that chs does *not* handle NaN specially, nor does
-     * it flush denormal inputs to zero.
-     */
-    return make_float32(float32_val(a) ^ 0x80000000);
-}
-
-INLINE int float32_is_infinity(float32 a)
-{
-    return (float32_val(a) & 0x7fffffff) == 0x7f800000;
-}
-
-INLINE int float32_is_neg(float32 a)
-{
-    return float32_val(a) >> 31;
-}
-
-INLINE int float32_is_zero(float32 a)
-{
-    return (float32_val(a) & 0x7fffffff) == 0;
-}
-
-INLINE int float32_is_any_nan(float32 a)
-{
-    return ((float32_val(a) & ~(1 << 31)) > 0x7f800000UL);
-}
-
-INLINE int float32_is_zero_or_denormal(float32 a)
-{
-    return (float32_val(a) & 0x7f800000) == 0;
-}
-
-INLINE float32 float32_set_sign(float32 a, int sign)
-{
-    return make_float32((float32_val(a) & 0x7fffffff) | (sign << 31));
-}
-
-#define float32_zero make_float32(0)
-#define float32_one make_float32(0x3f800000)
-#define float32_ln2 make_float32(0x3f317218)
-#define float32_pi make_float32(0x40490fdb)
-#define float32_half make_float32(0x3f000000)
-#define float32_infinity make_float32(0x7f800000)
-
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated single-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const float32 float32_default_nan;
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE double-precision conversion routines.
-*----------------------------------------------------------------------------*/
-int_fast16_t float64_to_int16_round_to_zero(float64 STATUS_PARAM);
-uint_fast16_t float64_to_uint16_round_to_zero(float64 STATUS_PARAM);
-int32 float64_to_int32( float64 STATUS_PARAM );
-int32 float64_to_int32_round_to_zero( float64 STATUS_PARAM );
-uint32 float64_to_uint32( float64 STATUS_PARAM );
-uint32 float64_to_uint32_round_to_zero( float64 STATUS_PARAM );
-int64 float64_to_int64( float64 STATUS_PARAM );
-int64 float64_to_int64_round_to_zero( float64 STATUS_PARAM );
-uint64 float64_to_uint64 (float64 a STATUS_PARAM);
-uint64 float64_to_uint64_round_to_zero (float64 a STATUS_PARAM);
-float32 float64_to_float32( float64 STATUS_PARAM );
-floatx80 float64_to_floatx80( float64 STATUS_PARAM );
-float128 float64_to_float128( float64 STATUS_PARAM );
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE double-precision operations.
-*----------------------------------------------------------------------------*/
-float64 float64_round_to_int( float64 STATUS_PARAM );
-float64 float64_trunc_to_int( float64 STATUS_PARAM );
-float64 float64_add( float64, float64 STATUS_PARAM );
-float64 float64_sub( float64, float64 STATUS_PARAM );
-float64 float64_mul( float64, float64 STATUS_PARAM );
-float64 float64_div( float64, float64 STATUS_PARAM );
-float64 float64_rem( float64, float64 STATUS_PARAM );
-float64 float64_muladd(float64, float64, float64, int STATUS_PARAM);
-float64 float64_sqrt( float64 STATUS_PARAM );
-float64 float64_log2( float64 STATUS_PARAM );
-int float64_eq( float64, float64 STATUS_PARAM );
-int float64_le( float64, float64 STATUS_PARAM );
-int float64_lt( float64, float64 STATUS_PARAM );
-int float64_unordered( float64, float64 STATUS_PARAM );
-int float64_eq_quiet( float64, float64 STATUS_PARAM );
-int float64_le_quiet( float64, float64 STATUS_PARAM );
-int float64_lt_quiet( float64, float64 STATUS_PARAM );
-int float64_unordered_quiet( float64, float64 STATUS_PARAM );
-int float64_compare( float64, float64 STATUS_PARAM );
-int float64_compare_quiet( float64, float64 STATUS_PARAM );
-float64 float64_min(float64, float64 STATUS_PARAM);
-float64 float64_max(float64, float64 STATUS_PARAM);
-int float64_is_quiet_nan( float64 a );
-int float64_is_signaling_nan( float64 );
-float64 float64_maybe_silence_nan( float64 );
-float64 float64_scalbn( float64, int STATUS_PARAM );
-
-INLINE float64 float64_abs(float64 a)
-{
-    /* Note that abs does *not* handle NaN specially, nor does
-     * it flush denormal inputs to zero.
-     */
-    return make_float64(float64_val(a) & 0x7fffffffffffffffLL);
-}
-
-INLINE float64 float64_chs(float64 a)
-{
-    /* Note that chs does *not* handle NaN specially, nor does
-     * it flush denormal inputs to zero.
-     */
-    return make_float64(float64_val(a) ^ 0x8000000000000000LL);
-}
-
-INLINE int float64_is_infinity(float64 a)
-{
-    return (float64_val(a) & 0x7fffffffffffffffLL ) == 0x7ff0000000000000LL;
-}
-
-INLINE int float64_is_neg(float64 a)
-{
-    return float64_val(a) >> 63;
-}
-
-INLINE int float64_is_zero(float64 a)
-{
-    return (float64_val(a) & 0x7fffffffffffffffLL) == 0;
-}
-
-INLINE int float64_is_any_nan(float64 a)
-{
-    return ((float64_val(a) & ~(1ULL << 63)) > 0x7ff0000000000000ULL);
-}
-
-INLINE int float64_is_zero_or_denormal(float64 a)
-{
-    return (float64_val(a) & 0x7ff0000000000000LL) == 0;
-}
-
-INLINE float64 float64_set_sign(float64 a, int sign)
-{
-    return make_float64((float64_val(a) & 0x7fffffffffffffffULL)
-                        | ((int64_t)sign << 63));
-}
-
-#define float64_zero make_float64(0)
-#define float64_one make_float64(0x3ff0000000000000LL)
-#define float64_ln2 make_float64(0x3fe62e42fefa39efLL)
-#define float64_pi make_float64(0x400921fb54442d18LL)
-#define float64_half make_float64(0x3fe0000000000000LL)
-#define float64_infinity make_float64(0x7ff0000000000000LL)
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated double-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const float64 float64_default_nan;
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE extended double-precision conversion routines.
-*----------------------------------------------------------------------------*/
-int32 floatx80_to_int32( floatx80 STATUS_PARAM );
-int32 floatx80_to_int32_round_to_zero( floatx80 STATUS_PARAM );
-int64 floatx80_to_int64( floatx80 STATUS_PARAM );
-int64 floatx80_to_int64_round_to_zero( floatx80 STATUS_PARAM );
-float32 floatx80_to_float32( floatx80 STATUS_PARAM );
-float64 floatx80_to_float64( floatx80 STATUS_PARAM );
-float128 floatx80_to_float128( floatx80 STATUS_PARAM );
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE extended double-precision operations.
-*----------------------------------------------------------------------------*/
-floatx80 floatx80_round_to_int( floatx80 STATUS_PARAM );
-floatx80 floatx80_add( floatx80, floatx80 STATUS_PARAM );
-floatx80 floatx80_sub( floatx80, floatx80 STATUS_PARAM );
-floatx80 floatx80_mul( floatx80, floatx80 STATUS_PARAM );
-floatx80 floatx80_div( floatx80, floatx80 STATUS_PARAM );
-floatx80 floatx80_rem( floatx80, floatx80 STATUS_PARAM );
-floatx80 floatx80_sqrt( floatx80 STATUS_PARAM );
-int floatx80_eq( floatx80, floatx80 STATUS_PARAM );
-int floatx80_le( floatx80, floatx80 STATUS_PARAM );
-int floatx80_lt( floatx80, floatx80 STATUS_PARAM );
-int floatx80_unordered( floatx80, floatx80 STATUS_PARAM );
-int floatx80_eq_quiet( floatx80, floatx80 STATUS_PARAM );
-int floatx80_le_quiet( floatx80, floatx80 STATUS_PARAM );
-int floatx80_lt_quiet( floatx80, floatx80 STATUS_PARAM );
-int floatx80_unordered_quiet( floatx80, floatx80 STATUS_PARAM );
-int floatx80_compare( floatx80, floatx80 STATUS_PARAM );
-int floatx80_compare_quiet( floatx80, floatx80 STATUS_PARAM );
-int floatx80_is_quiet_nan( floatx80 );
-int floatx80_is_signaling_nan( floatx80 );
-floatx80 floatx80_maybe_silence_nan( floatx80 );
-floatx80 floatx80_scalbn( floatx80, int STATUS_PARAM );
-
-INLINE floatx80 floatx80_abs(floatx80 a)
-{
-    a.high &= 0x7fff;
-    return a;
-}
-
-INLINE floatx80 floatx80_chs(floatx80 a)
-{
-    a.high ^= 0x8000;
-    return a;
-}
-
-INLINE int floatx80_is_infinity(floatx80 a)
-{
-    return (a.high & 0x7fff) == 0x7fff && a.low == 0x8000000000000000LL;
-}
-
-INLINE int floatx80_is_neg(floatx80 a)
-{
-    return a.high >> 15;
-}
-
-INLINE int floatx80_is_zero(floatx80 a)
-{
-    return (a.high & 0x7fff) == 0 && a.low == 0;
-}
-
-INLINE int floatx80_is_zero_or_denormal(floatx80 a)
-{
-    return (a.high & 0x7fff) == 0;
-}
-
-INLINE int floatx80_is_any_nan(floatx80 a)
-{
-    return ((a.high & 0x7fff) == 0x7fff) && (a.low<<1);
-}
-
-#define floatx80_zero make_floatx80(0x0000, 0x0000000000000000LL)
-#define floatx80_one make_floatx80(0x3fff, 0x8000000000000000LL)
-#define floatx80_ln2 make_floatx80(0x3ffe, 0xb17217f7d1cf79acLL)
-#define floatx80_pi make_floatx80(0x4000, 0xc90fdaa22168c235LL)
-#define floatx80_half make_floatx80(0x3ffe, 0x8000000000000000LL)
-#define floatx80_infinity make_floatx80(0x7fff, 0x8000000000000000LL)
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated extended double-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const floatx80 floatx80_default_nan;
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE quadruple-precision conversion routines.
-*----------------------------------------------------------------------------*/
-int32 float128_to_int32( float128 STATUS_PARAM );
-int32 float128_to_int32_round_to_zero( float128 STATUS_PARAM );
-int64 float128_to_int64( float128 STATUS_PARAM );
-int64 float128_to_int64_round_to_zero( float128 STATUS_PARAM );
-float32 float128_to_float32( float128 STATUS_PARAM );
-float64 float128_to_float64( float128 STATUS_PARAM );
-floatx80 float128_to_floatx80( float128 STATUS_PARAM );
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE quadruple-precision operations.
-*----------------------------------------------------------------------------*/
-float128 float128_round_to_int( float128 STATUS_PARAM );
-float128 float128_add( float128, float128 STATUS_PARAM );
-float128 float128_sub( float128, float128 STATUS_PARAM );
-float128 float128_mul( float128, float128 STATUS_PARAM );
-float128 float128_div( float128, float128 STATUS_PARAM );
-float128 float128_rem( float128, float128 STATUS_PARAM );
-float128 float128_sqrt( float128 STATUS_PARAM );
-int float128_eq( float128, float128 STATUS_PARAM );
-int float128_le( float128, float128 STATUS_PARAM );
-int float128_lt( float128, float128 STATUS_PARAM );
-int float128_unordered( float128, float128 STATUS_PARAM );
-int float128_eq_quiet( float128, float128 STATUS_PARAM );
-int float128_le_quiet( float128, float128 STATUS_PARAM );
-int float128_lt_quiet( float128, float128 STATUS_PARAM );
-int float128_unordered_quiet( float128, float128 STATUS_PARAM );
-int float128_compare( float128, float128 STATUS_PARAM );
-int float128_compare_quiet( float128, float128 STATUS_PARAM );
-int float128_is_quiet_nan( float128 );
-int float128_is_signaling_nan( float128 );
-float128 float128_maybe_silence_nan( float128 );
-float128 float128_scalbn( float128, int STATUS_PARAM );
-
-INLINE float128 float128_abs(float128 a)
-{
-    a.high &= 0x7fffffffffffffffLL;
-    return a;
-}
-
-INLINE float128 float128_chs(float128 a)
-{
-    a.high ^= 0x8000000000000000LL;
-    return a;
-}
-
-INLINE int float128_is_infinity(float128 a)
-{
-    return (a.high & 0x7fffffffffffffffLL) == 0x7fff000000000000LL && a.low == 0;
-}
-
-INLINE int float128_is_neg(float128 a)
-{
-    return a.high >> 63;
-}
-
-INLINE int float128_is_zero(float128 a)
-{
-    return (a.high & 0x7fffffffffffffffLL) == 0 && a.low == 0;
-}
-
-INLINE int float128_is_zero_or_denormal(float128 a)
-{
-    return (a.high & 0x7fff000000000000LL) == 0;
-}
-
-INLINE int float128_is_any_nan(float128 a)
-{
-    return ((a.high >> 48) & 0x7fff) == 0x7fff &&
-        ((a.low != 0) || ((a.high & 0xffffffffffffLL) != 0));
-}
-
-#define float128_zero make_float128(0, 0)
-
-/*----------------------------------------------------------------------------
-| The pattern for a default generated quadruple-precision NaN.
-*----------------------------------------------------------------------------*/
-extern const float128 float128_default_nan;
-
-#endif /* !SOFTFLOAT_H */
diff --git a/contrib/qemu/include/glib-compat.h b/contrib/qemu/include/glib-compat.h
deleted file mode 100644
index 8aa77afd6..000000000
--- a/contrib/qemu/include/glib-compat.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * GLIB Compatibility Functions
- *
- * Copyright IBM, Corp. 2013
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#ifndef QEMU_GLIB_COMPAT_H
-#define QEMU_GLIB_COMPAT_H
-
-#include <glib.h>
-
-#if !GLIB_CHECK_VERSION(2, 14, 0)
-static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function,
-                                          gpointer data)
-{
-    return g_timeout_add(interval * 1000, function, data);
-}
-#endif
-
-#endif
diff --git a/contrib/qemu/include/migration/migration.h b/contrib/qemu/include/migration/migration.h
deleted file mode 100644
index bc9fde0b2..000000000
--- a/contrib/qemu/include/migration/migration.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * QEMU live migration
- *
- * Copyright IBM, Corp. 2008
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- */
-
-#ifndef QEMU_MIGRATION_H
-#define QEMU_MIGRATION_H
-
-#include "qapi/qmp/qdict.h"
-#include "qemu-common.h"
-#include "qemu/thread.h"
-#include "qemu/notify.h"
-#include "qapi/error.h"
-#include "migration/vmstate.h"
-#include "qapi-types.h"
-#include "exec/cpu-common.h"
-
-struct MigrationParams {
-    bool blk;
-    bool shared;
-};
-
-typedef struct MigrationState MigrationState;
-
-struct MigrationState
-{
-    int64_t bandwidth_limit;
-    size_t bytes_xfer;
-    size_t xfer_limit;
-    QemuThread thread;
-    QEMUBH *cleanup_bh;
-    QEMUFile *file;
-
-    int state;
-    MigrationParams params;
-    double mbps;
-    int64_t total_time;
-    int64_t downtime;
-    int64_t expected_downtime;
-    int64_t dirty_pages_rate;
-    int64_t dirty_bytes_rate;
-    bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
-    int64_t xbzrle_cache_size;
-};
-
-void process_incoming_migration(QEMUFile *f);
-
-void qemu_start_incoming_migration(const char *uri, Error **errp);
-
-uint64_t migrate_max_downtime(void);
-
-void do_info_migrate_print(Monitor *mon, const QObject *data);
-
-void do_info_migrate(Monitor *mon, QObject **ret_data);
-
-void exec_start_incoming_migration(const char *host_port, Error **errp);
-
-void exec_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
-
-void tcp_start_incoming_migration(const char *host_port, Error **errp);
-
-void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp);
-
-void unix_start_incoming_migration(const char *path, Error **errp);
-
-void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp);
-
-void fd_start_incoming_migration(const char *path, Error **errp);
-
-void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp);
-
-void migrate_fd_error(MigrationState *s);
-
-void migrate_fd_connect(MigrationState *s);
-
-int migrate_fd_close(MigrationState *s);
-
-void add_migration_state_change_notifier(Notifier *notify);
-void remove_migration_state_change_notifier(Notifier *notify);
-bool migration_is_active(MigrationState *);
-bool migration_has_finished(MigrationState *);
-bool migration_has_failed(MigrationState *);
-MigrationState *migrate_get_current(void);
-
-uint64_t ram_bytes_remaining(void);
-uint64_t ram_bytes_transferred(void);
-uint64_t ram_bytes_total(void);
-
-void acct_update_position(QEMUFile *f, size_t size, bool zero);
-
-extern SaveVMHandlers savevm_ram_handlers;
-
-uint64_t dup_mig_bytes_transferred(void);
-uint64_t dup_mig_pages_transferred(void);
-uint64_t skipped_mig_bytes_transferred(void);
-uint64_t skipped_mig_pages_transferred(void);
-uint64_t norm_mig_bytes_transferred(void);
-uint64_t norm_mig_pages_transferred(void);
-uint64_t xbzrle_mig_bytes_transferred(void);
-uint64_t xbzrle_mig_pages_transferred(void);
-uint64_t xbzrle_mig_pages_overflow(void);
-uint64_t xbzrle_mig_pages_cache_miss(void);
-
-/**
- * @migrate_add_blocker - prevent migration from proceeding
- *
- * @reason - an error to be returned whenever migration is attempted
- */
-void migrate_add_blocker(Error *reason);
-
-/**
- * @migrate_del_blocker - remove a blocking error from migration
- *
- * @reason - the error blocking migration
- */
-void migrate_del_blocker(Error *reason);
-
-bool migrate_rdma_pin_all(void);
-
-bool migrate_auto_converge(void);
-
-int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen,
-                         uint8_t *dst, int dlen);
-int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen);
-
-int migrate_use_xbzrle(void);
-int64_t migrate_xbzrle_cache_size(void);
-
-int64_t xbzrle_cache_resize(int64_t new_size);
-
-void ram_control_before_iterate(QEMUFile *f, uint64_t flags);
-void ram_control_after_iterate(QEMUFile *f, uint64_t flags);
-void ram_control_load_hook(QEMUFile *f, uint64_t flags);
-
-/* Whenever this is found in the data stream, the flags
- * will be passed to ram_control_load_hook in the incoming-migration
- * side. This lets before_ram_iterate/after_ram_iterate add
- * transport-specific sections to the RAM migration data.
- */
-#define RAM_SAVE_FLAG_HOOK     0x80
-
-#define RAM_SAVE_CONTROL_NOT_SUPP -1000
-#define RAM_SAVE_CONTROL_DELAYED  -2000
-
-size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
-                             ram_addr_t offset, size_t size,
-                             int *bytes_sent);
-
-#endif
diff --git a/contrib/qemu/include/migration/qemu-file.h b/contrib/qemu/include/migration/qemu-file.h
deleted file mode 100644
index 0f757fbeb..000000000
--- a/contrib/qemu/include/migration/qemu-file.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * QEMU System Emulator
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef QEMU_FILE_H
-#define QEMU_FILE_H 1
-#include "exec/cpu-common.h"
-
-/* This function writes a chunk of data to a file at the given position.
- * The pos argument can be ignored if the file is only being used for
- * streaming.  The handler should try to write all of the data it can.
- */
-typedef int (QEMUFilePutBufferFunc)(void *opaque, const uint8_t *buf,
-                                    int64_t pos, int size);
-
-/* Read a chunk of data from a file at the given position.  The pos argument
- * can be ignored if the file is only be used for streaming.  The number of
- * bytes actually read should be returned.
- */
-typedef int (QEMUFileGetBufferFunc)(void *opaque, uint8_t *buf,
-                                    int64_t pos, int size);
-
-/* Close a file
- *
- * Return negative error number on error, 0 or positive value on success.
- *
- * The meaning of return value on success depends on the specific back-end being
- * used.
- */
-typedef int (QEMUFileCloseFunc)(void *opaque);
-
-/* Called to return the OS file descriptor associated to the QEMUFile.
- */
-typedef int (QEMUFileGetFD)(void *opaque);
-
-/*
- * This function writes an iovec to file.
- */
-typedef ssize_t (QEMUFileWritevBufferFunc)(void *opaque, struct iovec *iov,
-                                           int iovcnt, int64_t pos);
-
-/*
- * This function provides hooks around different
- * stages of RAM migration.
- */
-typedef int (QEMURamHookFunc)(QEMUFile *f, void *opaque, uint64_t flags);
-
-/*
- * Constants used by ram_control_* hooks
- */
-#define RAM_CONTROL_SETUP    0
-#define RAM_CONTROL_ROUND    1
-#define RAM_CONTROL_HOOK     2
-#define RAM_CONTROL_FINISH   3
-
-/*
- * This function allows override of where the RAM page
- * is saved (such as RDMA, for example.)
- */
-typedef size_t (QEMURamSaveFunc)(QEMUFile *f, void *opaque,
-                               ram_addr_t block_offset,
-                               ram_addr_t offset,
-                               size_t size,
-                               int *bytes_sent);
-
-typedef struct QEMUFileOps {
-    QEMUFilePutBufferFunc *put_buffer;
-    QEMUFileGetBufferFunc *get_buffer;
-    QEMUFileCloseFunc *close;
-    QEMUFileGetFD *get_fd;
-    QEMUFileWritevBufferFunc *writev_buffer;
-    QEMURamHookFunc *before_ram_iterate;
-    QEMURamHookFunc *after_ram_iterate;
-    QEMURamHookFunc *hook_ram_load;
-    QEMURamSaveFunc *save_page;
-} QEMUFileOps;
-
-QEMUFile *qemu_fopen_ops(void *opaque, const QEMUFileOps *ops);
-QEMUFile *qemu_fopen(const char *filename, const char *mode);
-QEMUFile *qemu_fdopen(int fd, const char *mode);
-QEMUFile *qemu_fopen_socket(int fd, const char *mode);
-QEMUFile *qemu_popen_cmd(const char *command, const char *mode);
-int qemu_get_fd(QEMUFile *f);
-int qemu_fclose(QEMUFile *f);
-int64_t qemu_ftell(QEMUFile *f);
-void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size);
-void qemu_put_byte(QEMUFile *f, int v);
-/*
- * put_buffer without copying the buffer.
- * The buffer should be available till it is sent asynchronously.
- */
-void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size);
-bool qemu_file_mode_is_not_valid(const char *mode);
-
-static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v)
-{
-    qemu_put_byte(f, (int)v);
-}
-
-#define qemu_put_sbyte qemu_put_byte
-
-void qemu_put_be16(QEMUFile *f, unsigned int v);
-void qemu_put_be32(QEMUFile *f, unsigned int v);
-void qemu_put_be64(QEMUFile *f, uint64_t v);
-int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size);
-int qemu_get_byte(QEMUFile *f);
-void qemu_update_position(QEMUFile *f, size_t size);
-
-static inline unsigned int qemu_get_ubyte(QEMUFile *f)
-{
-    return (unsigned int)qemu_get_byte(f);
-}
-
-#define qemu_get_sbyte qemu_get_byte
-
-unsigned int qemu_get_be16(QEMUFile *f);
-unsigned int qemu_get_be32(QEMUFile *f);
-uint64_t qemu_get_be64(QEMUFile *f);
-
-int qemu_file_rate_limit(QEMUFile *f);
-void qemu_file_reset_rate_limit(QEMUFile *f);
-void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate);
-int64_t qemu_file_get_rate_limit(QEMUFile *f);
-int qemu_file_get_error(QEMUFile *f);
-void qemu_fflush(QEMUFile *f);
-
-static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv)
-{
-    qemu_put_be64(f, *pv);
-}
-
-static inline void qemu_put_be32s(QEMUFile *f, const uint32_t *pv)
-{
-    qemu_put_be32(f, *pv);
-}
-
-static inline void qemu_put_be16s(QEMUFile *f, const uint16_t *pv)
-{
-    qemu_put_be16(f, *pv);
-}
-
-static inline void qemu_put_8s(QEMUFile *f, const uint8_t *pv)
-{
-    qemu_put_byte(f, *pv);
-}
-
-static inline void qemu_get_be64s(QEMUFile *f, uint64_t *pv)
-{
-    *pv = qemu_get_be64(f);
-}
-
-static inline void qemu_get_be32s(QEMUFile *f, uint32_t *pv)
-{
-    *pv = qemu_get_be32(f);
-}
-
-static inline void qemu_get_be16s(QEMUFile *f, uint16_t *pv)
-{
-    *pv = qemu_get_be16(f);
-}
-
-static inline void qemu_get_8s(QEMUFile *f, uint8_t *pv)
-{
-    *pv = qemu_get_byte(f);
-}
-
-// Signed versions for type safety
-static inline void qemu_put_sbuffer(QEMUFile *f, const int8_t *buf, int size)
-{
-    qemu_put_buffer(f, (const uint8_t *)buf, size);
-}
-
-static inline void qemu_put_sbe16(QEMUFile *f, int v)
-{
-    qemu_put_be16(f, (unsigned int)v);
-}
-
-static inline void qemu_put_sbe32(QEMUFile *f, int v)
-{
-    qemu_put_be32(f, (unsigned int)v);
-}
-
-static inline void qemu_put_sbe64(QEMUFile *f, int64_t v)
-{
-    qemu_put_be64(f, (uint64_t)v);
-}
-
-static inline size_t qemu_get_sbuffer(QEMUFile *f, int8_t *buf, int size)
-{
-    return qemu_get_buffer(f, (uint8_t *)buf, size);
-}
-
-static inline int qemu_get_sbe16(QEMUFile *f)
-{
-    return (int)qemu_get_be16(f);
-}
-
-static inline int qemu_get_sbe32(QEMUFile *f)
-{
-    return (int)qemu_get_be32(f);
-}
-
-static inline int64_t qemu_get_sbe64(QEMUFile *f)
-{
-    return (int64_t)qemu_get_be64(f);
-}
-
-static inline void qemu_put_s8s(QEMUFile *f, const int8_t *pv)
-{
-    qemu_put_8s(f, (const uint8_t *)pv);
-}
-
-static inline void qemu_put_sbe16s(QEMUFile *f, const int16_t *pv)
-{
-    qemu_put_be16s(f, (const uint16_t *)pv);
-}
-
-static inline void qemu_put_sbe32s(QEMUFile *f, const int32_t *pv)
-{
-    qemu_put_be32s(f, (const uint32_t *)pv);
-}
-
-static inline void qemu_put_sbe64s(QEMUFile *f, const int64_t *pv)
-{
-    qemu_put_be64s(f, (const uint64_t *)pv);
-}
-
-static inline void qemu_get_s8s(QEMUFile *f, int8_t *pv)
-{
-    qemu_get_8s(f, (uint8_t *)pv);
-}
-
-static inline void qemu_get_sbe16s(QEMUFile *f, int16_t *pv)
-{
-    qemu_get_be16s(f, (uint16_t *)pv);
-}
-
-static inline void qemu_get_sbe32s(QEMUFile *f, int32_t *pv)
-{
-    qemu_get_be32s(f, (uint32_t *)pv);
-}
-
-static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv)
-{
-    qemu_get_be64s(f, (uint64_t *)pv);
-}
-#endif
diff --git a/contrib/qemu/include/migration/vmstate.h b/contrib/qemu/include/migration/vmstate.h
deleted file mode 100644
index 1c31b5d6f..000000000
--- a/contrib/qemu/include/migration/vmstate.h
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * QEMU migration/snapshot declarations
- *
- * Copyright (c) 2009-2011 Red Hat, Inc.
- *
- * Original author: Juan Quintela <quintela@redhat.com>
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef QEMU_VMSTATE_H
-#define QEMU_VMSTATE_H 1
-
-#ifndef CONFIG_USER_ONLY
-#include <migration/qemu-file.h>
-#endif
-
-typedef void SaveStateHandler(QEMUFile *f, void *opaque);
-typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
-
-typedef struct SaveVMHandlers {
-    /* This runs inside the iothread lock.  */
-    void (*set_params)(const MigrationParams *params, void * opaque);
-    SaveStateHandler *save_state;
-
-    void (*cancel)(void *opaque);
-    int (*save_live_complete)(QEMUFile *f, void *opaque);
-
-    /* This runs both outside and inside the iothread lock.  */
-    bool (*is_active)(void *opaque);
-
-    /* This runs outside the iothread lock in the migration case, and
-     * within the lock in the savevm case.  The callback had better only
-     * use data that is local to the migration thread or protected
-     * by other locks.
-     */
-    int (*save_live_iterate)(QEMUFile *f, void *opaque);
-
-    /* This runs outside the iothread lock!  */
-    int (*save_live_setup)(QEMUFile *f, void *opaque);
-    uint64_t (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size);
-
-    LoadStateHandler *load_state;
-} SaveVMHandlers;
-
-int register_savevm(DeviceState *dev,
-                    const char *idstr,
-                    int instance_id,
-                    int version_id,
-                    SaveStateHandler *save_state,
-                    LoadStateHandler *load_state,
-                    void *opaque);
-
-int register_savevm_live(DeviceState *dev,
-                         const char *idstr,
-                         int instance_id,
-                         int version_id,
-                         SaveVMHandlers *ops,
-                         void *opaque);
-
-void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque);
-void register_device_unmigratable(DeviceState *dev, const char *idstr,
-                                                                void *opaque);
-
-
-typedef struct VMStateInfo VMStateInfo;
-typedef struct VMStateDescription VMStateDescription;
-
-struct VMStateInfo {
-    const char *name;
-    int (*get)(QEMUFile *f, void *pv, size_t size);
-    void (*put)(QEMUFile *f, void *pv, size_t size);
-};
-
-enum VMStateFlags {
-    VMS_SINGLE           = 0x001,
-    VMS_POINTER          = 0x002,
-    VMS_ARRAY            = 0x004,
-    VMS_STRUCT           = 0x008,
-    VMS_VARRAY_INT32     = 0x010,  /* Array with size in int32_t field*/
-    VMS_BUFFER           = 0x020,  /* static sized buffer */
-    VMS_ARRAY_OF_POINTER = 0x040,
-    VMS_VARRAY_UINT16    = 0x080,  /* Array with size in uint16_t field */
-    VMS_VBUFFER          = 0x100,  /* Buffer with size in int32_t field */
-    VMS_MULTIPLY         = 0x200,  /* multiply "size" field by field_size */
-    VMS_VARRAY_UINT8     = 0x400,  /* Array with size in uint8_t field*/
-    VMS_VARRAY_UINT32    = 0x800,  /* Array with size in uint32_t field*/
-};
-
-typedef struct {
-    const char *name;
-    size_t offset;
-    size_t size;
-    size_t start;
-    int num;
-    size_t num_offset;
-    size_t size_offset;
-    const VMStateInfo *info;
-    enum VMStateFlags flags;
-    const VMStateDescription *vmsd;
-    int version_id;
-    bool (*field_exists)(void *opaque, int version_id);
-} VMStateField;
-
-typedef struct VMStateSubsection {
-    const VMStateDescription *vmsd;
-    bool (*needed)(void *opaque);
-} VMStateSubsection;
-
-struct VMStateDescription {
-    const char *name;
-    int unmigratable;
-    int version_id;
-    int minimum_version_id;
-    int minimum_version_id_old;
-    LoadStateHandler *load_state_old;
-    int (*pre_load)(void *opaque);
-    int (*post_load)(void *opaque, int version_id);
-    void (*pre_save)(void *opaque);
-    VMStateField *fields;
-    const VMStateSubsection *subsections;
-};
-
-#ifdef CONFIG_USER_ONLY
-extern const VMStateDescription vmstate_dummy;
-#endif
-
-extern const VMStateInfo vmstate_info_bool;
-
-extern const VMStateInfo vmstate_info_int8;
-extern const VMStateInfo vmstate_info_int16;
-extern const VMStateInfo vmstate_info_int32;
-extern const VMStateInfo vmstate_info_int64;
-
-extern const VMStateInfo vmstate_info_uint8_equal;
-extern const VMStateInfo vmstate_info_uint16_equal;
-extern const VMStateInfo vmstate_info_int32_equal;
-extern const VMStateInfo vmstate_info_uint32_equal;
-extern const VMStateInfo vmstate_info_uint64_equal;
-extern const VMStateInfo vmstate_info_int32_le;
-
-extern const VMStateInfo vmstate_info_uint8;
-extern const VMStateInfo vmstate_info_uint16;
-extern const VMStateInfo vmstate_info_uint32;
-extern const VMStateInfo vmstate_info_uint64;
-
-extern const VMStateInfo vmstate_info_float64;
-
-extern const VMStateInfo vmstate_info_timer;
-extern const VMStateInfo vmstate_info_buffer;
-extern const VMStateInfo vmstate_info_unused_buffer;
-extern const VMStateInfo vmstate_info_bitmap;
-
-#define type_check_2darray(t1,t2,n,m) ((t1(*)[n][m])0 - (t2*)0)
-#define type_check_array(t1,t2,n) ((t1(*)[n])0 - (t2*)0)
-#define type_check_pointer(t1,t2) ((t1**)0 - (t2*)0)
-
-#define vmstate_offset_value(_state, _field, _type)                  \
-    (offsetof(_state, _field) +                                      \
-     type_check(_type, typeof_field(_state, _field)))
-
-#define vmstate_offset_pointer(_state, _field, _type)                \
-    (offsetof(_state, _field) +                                      \
-     type_check_pointer(_type, typeof_field(_state, _field)))
-
-#define vmstate_offset_array(_state, _field, _type, _num)            \
-    (offsetof(_state, _field) +                                      \
-     type_check_array(_type, typeof_field(_state, _field), _num))
-
-#define vmstate_offset_2darray(_state, _field, _type, _n1, _n2)      \
-    (offsetof(_state, _field) +                                      \
-     type_check_2darray(_type, typeof_field(_state, _field), _n1, _n2))
-
-#define vmstate_offset_sub_array(_state, _field, _type, _start)      \
-    (offsetof(_state, _field[_start]))
-
-#define vmstate_offset_buffer(_state, _field)                        \
-    vmstate_offset_array(_state, _field, uint8_t,                    \
-                         sizeof(typeof_field(_state, _field)))
-
-#define VMSTATE_SINGLE_TEST(_field, _state, _test, _version, _info, _type) { \
-    .name         = (stringify(_field)),                             \
-    .version_id   = (_version),                                      \
-    .field_exists = (_test),                                         \
-    .size         = sizeof(_type),                                   \
-    .info         = &(_info),                                        \
-    .flags        = VMS_SINGLE,                                      \
-    .offset       = vmstate_offset_value(_state, _field, _type),     \
-}
-
-#define VMSTATE_POINTER(_field, _state, _version, _info, _type) {    \
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .info       = &(_info),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_SINGLE|VMS_POINTER,                            \
-    .offset     = vmstate_offset_value(_state, _field, _type),       \
-}
-
-#define VMSTATE_POINTER_TEST(_field, _state, _test, _info, _type) {  \
-    .name       = (stringify(_field)),                               \
-    .info       = &(_info),                                          \
-    .field_exists = (_test),                                         \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_SINGLE|VMS_POINTER,                            \
-    .offset     = vmstate_offset_value(_state, _field, _type),       \
-}
-
-#define VMSTATE_ARRAY(_field, _state, _num, _version, _info, _type) {\
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .num        = (_num),                                            \
-    .info       = &(_info),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_ARRAY,                                         \
-    .offset     = vmstate_offset_array(_state, _field, _type, _num), \
-}
-
-#define VMSTATE_2DARRAY(_field, _state, _n1, _n2, _version, _info, _type) { \
-    .name       = (stringify(_field)),                                      \
-    .version_id = (_version),                                               \
-    .num        = (_n1) * (_n2),                                            \
-    .info       = &(_info),                                                 \
-    .size       = sizeof(_type),                                            \
-    .flags      = VMS_ARRAY,                                                \
-    .offset     = vmstate_offset_2darray(_state, _field, _type, _n1, _n2),  \
-}
-
-#define VMSTATE_ARRAY_TEST(_field, _state, _num, _test, _info, _type) {\
-    .name         = (stringify(_field)),                              \
-    .field_exists = (_test),                                          \
-    .num          = (_num),                                           \
-    .info         = &(_info),                                         \
-    .size         = sizeof(_type),                                    \
-    .flags        = VMS_ARRAY,                                        \
-    .offset       = vmstate_offset_array(_state, _field, _type, _num),\
-}
-
-#define VMSTATE_SUB_ARRAY(_field, _state, _start, _num, _version, _info, _type) { \
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .num        = (_num),                                            \
-    .info       = &(_info),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_ARRAY,                                         \
-    .offset     = vmstate_offset_sub_array(_state, _field, _type, _start), \
-}
-
-#define VMSTATE_ARRAY_INT32_UNSAFE(_field, _state, _field_num, _info, _type) {\
-    .name       = (stringify(_field)),                               \
-    .num_offset = vmstate_offset_value(_state, _field_num, int32_t), \
-    .info       = &(_info),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_VARRAY_INT32,                                  \
-    .offset     = offsetof(_state, _field),                          \
-}
-
-#define VMSTATE_VARRAY_INT32(_field, _state, _field_num, _version, _info, _type) {\
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .num_offset = vmstate_offset_value(_state, _field_num, int32_t), \
-    .info       = &(_info),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_VARRAY_INT32|VMS_POINTER,                      \
-    .offset     = vmstate_offset_pointer(_state, _field, _type),     \
-}
-
-#define VMSTATE_VARRAY_UINT32(_field, _state, _field_num, _version, _info, _type) {\
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .num_offset = vmstate_offset_value(_state, _field_num, uint32_t),\
-    .info       = &(_info),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_VARRAY_UINT32|VMS_POINTER,                     \
-    .offset     = vmstate_offset_pointer(_state, _field, _type),     \
-}
-
-#define VMSTATE_VARRAY_UINT16_UNSAFE(_field, _state, _field_num, _version, _info, _type) {\
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .num_offset = vmstate_offset_value(_state, _field_num, uint16_t),\
-    .info       = &(_info),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_VARRAY_UINT16,                                 \
-    .offset     = offsetof(_state, _field),                          \
-}
-
-#define VMSTATE_STRUCT_TEST(_field, _state, _test, _version, _vmsd, _type) { \
-    .name         = (stringify(_field)),                             \
-    .version_id   = (_version),                                      \
-    .field_exists = (_test),                                         \
-    .vmsd         = &(_vmsd),                                        \
-    .size         = sizeof(_type),                                   \
-    .flags        = VMS_STRUCT,                                      \
-    .offset       = vmstate_offset_value(_state, _field, _type),     \
-}
-
-#define VMSTATE_STRUCT_POINTER_TEST(_field, _state, _test, _vmsd, _type) { \
-    .name         = (stringify(_field)),                             \
-    .field_exists = (_test),                                         \
-    .vmsd         = &(_vmsd),                                        \
-    .size         = sizeof(_type),                                   \
-    .flags        = VMS_STRUCT|VMS_POINTER,                          \
-    .offset       = vmstate_offset_value(_state, _field, _type),     \
-}
-
-#define VMSTATE_ARRAY_OF_POINTER(_field, _state, _num, _version, _info, _type) {\
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .num        = (_num),                                            \
-    .info       = &(_info),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_ARRAY|VMS_ARRAY_OF_POINTER,                    \
-    .offset     = vmstate_offset_array(_state, _field, _type, _num), \
-}
-
-#define VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, _test, _version, _vmsd, _type) { \
-    .name         = (stringify(_field)),                             \
-    .num          = (_num),                                          \
-    .field_exists = (_test),                                         \
-    .version_id   = (_version),                                      \
-    .vmsd         = &(_vmsd),                                        \
-    .size         = sizeof(_type),                                   \
-    .flags        = VMS_STRUCT|VMS_ARRAY,                            \
-    .offset       = vmstate_offset_array(_state, _field, _type, _num),\
-}
-
-#define VMSTATE_STRUCT_VARRAY_UINT8(_field, _state, _field_num, _version, _vmsd, _type) { \
-    .name       = (stringify(_field)),                               \
-    .num_offset = vmstate_offset_value(_state, _field_num, uint8_t), \
-    .version_id = (_version),                                        \
-    .vmsd       = &(_vmsd),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_STRUCT|VMS_VARRAY_UINT8,                       \
-    .offset     = offsetof(_state, _field),                          \
-}
-
-#define VMSTATE_STRUCT_VARRAY_POINTER_INT32(_field, _state, _field_num, _vmsd, _type) { \
-    .name       = (stringify(_field)),                               \
-    .version_id = 0,                                                 \
-    .num_offset = vmstate_offset_value(_state, _field_num, int32_t), \
-    .size       = sizeof(_type),                                     \
-    .vmsd       = &(_vmsd),                                          \
-    .flags      = VMS_POINTER | VMS_VARRAY_INT32 | VMS_STRUCT,       \
-    .offset     = vmstate_offset_pointer(_state, _field, _type),     \
-}
-
-#define VMSTATE_STRUCT_VARRAY_POINTER_UINT32(_field, _state, _field_num, _vmsd, _type) { \
-    .name       = (stringify(_field)),                               \
-    .version_id = 0,                                                 \
-    .num_offset = vmstate_offset_value(_state, _field_num, uint32_t),\
-    .size       = sizeof(_type),                                     \
-    .vmsd       = &(_vmsd),                                          \
-    .flags      = VMS_POINTER | VMS_VARRAY_INT32 | VMS_STRUCT,       \
-    .offset     = vmstate_offset_pointer(_state, _field, _type),     \
-}
-
-#define VMSTATE_STRUCT_VARRAY_POINTER_UINT16(_field, _state, _field_num, _vmsd, _type) { \
-    .name       = (stringify(_field)),                               \
-    .version_id = 0,                                                 \
-    .num_offset = vmstate_offset_value(_state, _field_num, uint16_t),\
-    .size       = sizeof(_type),                                     \
-    .vmsd       = &(_vmsd),                                          \
-    .flags      = VMS_POINTER | VMS_VARRAY_UINT16 | VMS_STRUCT,      \
-    .offset     = vmstate_offset_pointer(_state, _field, _type),     \
-}
-
-#define VMSTATE_STRUCT_VARRAY_INT32(_field, _state, _field_num, _version, _vmsd, _type) { \
-    .name       = (stringify(_field)),                               \
-    .num_offset = vmstate_offset_value(_state, _field_num, int32_t), \
-    .version_id = (_version),                                        \
-    .vmsd       = &(_vmsd),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_STRUCT|VMS_VARRAY_INT32,                       \
-    .offset     = offsetof(_state, _field),                          \
-}
-
-#define VMSTATE_STRUCT_VARRAY_UINT32(_field, _state, _field_num, _version, _vmsd, _type) { \
-    .name       = (stringify(_field)),                               \
-    .num_offset = vmstate_offset_value(_state, _field_num, uint32_t), \
-    .version_id = (_version),                                        \
-    .vmsd       = &(_vmsd),                                          \
-    .size       = sizeof(_type),                                     \
-    .flags      = VMS_STRUCT|VMS_VARRAY_UINT32,                      \
-    .offset     = offsetof(_state, _field),                          \
-}
-
-#define VMSTATE_STATIC_BUFFER(_field, _state, _version, _test, _start, _size) { \
-    .name         = (stringify(_field)),                             \
-    .version_id   = (_version),                                      \
-    .field_exists = (_test),                                         \
-    .size         = (_size - _start),                                \
-    .info         = &vmstate_info_buffer,                            \
-    .flags        = VMS_BUFFER,                                      \
-    .offset       = vmstate_offset_buffer(_state, _field) + _start,  \
-}
-
-#define VMSTATE_VBUFFER_MULTIPLY(_field, _state, _version, _test, _start, _field_size, _multiply) { \
-    .name         = (stringify(_field)),                             \
-    .version_id   = (_version),                                      \
-    .field_exists = (_test),                                         \
-    .size_offset  = vmstate_offset_value(_state, _field_size, uint32_t),\
-    .size         = (_multiply),                                      \
-    .info         = &vmstate_info_buffer,                            \
-    .flags        = VMS_VBUFFER|VMS_POINTER|VMS_MULTIPLY,            \
-    .offset       = offsetof(_state, _field),                        \
-    .start        = (_start),                                        \
-}
-
-#define VMSTATE_VBUFFER(_field, _state, _version, _test, _start, _field_size) { \
-    .name         = (stringify(_field)),                             \
-    .version_id   = (_version),                                      \
-    .field_exists = (_test),                                         \
-    .size_offset  = vmstate_offset_value(_state, _field_size, int32_t),\
-    .info         = &vmstate_info_buffer,                            \
-    .flags        = VMS_VBUFFER|VMS_POINTER,                         \
-    .offset       = offsetof(_state, _field),                        \
-    .start        = (_start),                                        \
-}
-
-#define VMSTATE_VBUFFER_UINT32(_field, _state, _version, _test, _start, _field_size) { \
-    .name         = (stringify(_field)),                             \
-    .version_id   = (_version),                                      \
-    .field_exists = (_test),                                         \
-    .size_offset  = vmstate_offset_value(_state, _field_size, uint32_t),\
-    .info         = &vmstate_info_buffer,                            \
-    .flags        = VMS_VBUFFER|VMS_POINTER,                         \
-    .offset       = offsetof(_state, _field),                        \
-    .start        = (_start),                                        \
-}
-
-#define VMSTATE_BUFFER_UNSAFE_INFO(_field, _state, _version, _info, _size) { \
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .size       = (_size),                                           \
-    .info       = &(_info),                                          \
-    .flags      = VMS_BUFFER,                                        \
-    .offset     = offsetof(_state, _field),                          \
-}
-
-#define VMSTATE_BUFFER_POINTER_UNSAFE(_field, _state, _version, _size) { \
-    .name       = (stringify(_field)),                               \
-    .version_id = (_version),                                        \
-    .size       = (_size),                                           \
-    .info       = &vmstate_info_buffer,                              \
-    .flags      = VMS_BUFFER|VMS_POINTER,                            \
-    .offset     = offsetof(_state, _field),                          \
-}
-
-#define VMSTATE_UNUSED_BUFFER(_test, _version, _size) {              \
-    .name         = "unused",                                        \
-    .field_exists = (_test),                                         \
-    .version_id   = (_version),                                      \
-    .size         = (_size),                                         \
-    .info         = &vmstate_info_unused_buffer,                     \
-    .flags        = VMS_BUFFER,                                      \
-}
-
-/* _field_size should be a int32_t field in the _state struct giving the
- * size of the bitmap _field in bits.
- */
-#define VMSTATE_BITMAP(_field, _state, _version, _field_size) {      \
-    .name         = (stringify(_field)),                             \
-    .version_id   = (_version),                                      \
-    .size_offset  = vmstate_offset_value(_state, _field_size, int32_t),\
-    .info         = &vmstate_info_bitmap,                            \
-    .flags        = VMS_VBUFFER|VMS_POINTER,                         \
-    .offset       = offsetof(_state, _field),                        \
-}
-
-/* _f : field name
-   _f_n : num of elements field_name
-   _n : num of elements
-   _s : struct state name
-   _v : version
-*/
-
-#define VMSTATE_SINGLE(_field, _state, _version, _info, _type)        \
-    VMSTATE_SINGLE_TEST(_field, _state, NULL, _version, _info, _type)
-
-#define VMSTATE_STRUCT(_field, _state, _version, _vmsd, _type)        \
-    VMSTATE_STRUCT_TEST(_field, _state, NULL, _version, _vmsd, _type)
-
-#define VMSTATE_STRUCT_POINTER(_field, _state, _vmsd, _type)          \
-    VMSTATE_STRUCT_POINTER_TEST(_field, _state, NULL, _vmsd, _type)
-
-#define VMSTATE_STRUCT_ARRAY(_field, _state, _num, _version, _vmsd, _type) \
-    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _version,   \
-            _vmsd, _type)
-
-#define VMSTATE_BOOL_V(_f, _s, _v)                                    \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_bool, bool)
-
-#define VMSTATE_INT8_V(_f, _s, _v)                                    \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int8, int8_t)
-#define VMSTATE_INT16_V(_f, _s, _v)                                   \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int16, int16_t)
-#define VMSTATE_INT32_V(_f, _s, _v)                                   \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int32, int32_t)
-#define VMSTATE_INT64_V(_f, _s, _v)                                   \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int64, int64_t)
-
-#define VMSTATE_UINT8_V(_f, _s, _v)                                   \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint8, uint8_t)
-#define VMSTATE_UINT16_V(_f, _s, _v)                                  \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint16, uint16_t)
-#define VMSTATE_UINT32_V(_f, _s, _v)                                  \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint32, uint32_t)
-#define VMSTATE_UINT64_V(_f, _s, _v)                                  \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64, uint64_t)
-
-#define VMSTATE_BOOL(_f, _s)                                          \
-    VMSTATE_BOOL_V(_f, _s, 0)
-
-#define VMSTATE_INT8(_f, _s)                                          \
-    VMSTATE_INT8_V(_f, _s, 0)
-#define VMSTATE_INT16(_f, _s)                                         \
-    VMSTATE_INT16_V(_f, _s, 0)
-#define VMSTATE_INT32(_f, _s)                                         \
-    VMSTATE_INT32_V(_f, _s, 0)
-#define VMSTATE_INT64(_f, _s)                                         \
-    VMSTATE_INT64_V(_f, _s, 0)
-
-#define VMSTATE_UINT8(_f, _s)                                         \
-    VMSTATE_UINT8_V(_f, _s, 0)
-#define VMSTATE_UINT16(_f, _s)                                        \
-    VMSTATE_UINT16_V(_f, _s, 0)
-#define VMSTATE_UINT32(_f, _s)                                        \
-    VMSTATE_UINT32_V(_f, _s, 0)
-#define VMSTATE_UINT64(_f, _s)                                        \
-    VMSTATE_UINT64_V(_f, _s, 0)
-
-#define VMSTATE_UINT8_EQUAL(_f, _s)                                   \
-    VMSTATE_SINGLE(_f, _s, 0, vmstate_info_uint8_equal, uint8_t)
-
-#define VMSTATE_UINT16_EQUAL(_f, _s)                                  \
-    VMSTATE_SINGLE(_f, _s, 0, vmstate_info_uint16_equal, uint16_t)
-
-#define VMSTATE_UINT16_EQUAL_V(_f, _s, _v)                            \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint16_equal, uint16_t)
-
-#define VMSTATE_INT32_EQUAL(_f, _s)                                   \
-    VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_equal, int32_t)
-
-#define VMSTATE_UINT32_EQUAL_V(_f, _s, _v)                            \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint32_equal, uint32_t)
-
-#define VMSTATE_UINT32_EQUAL(_f, _s)                                  \
-    VMSTATE_UINT32_EQUAL_V(_f, _s, 0)
-
-#define VMSTATE_UINT64_EQUAL_V(_f, _s, _v)                            \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64_equal, uint64_t)
-
-#define VMSTATE_UINT64_EQUAL(_f, _s)                                  \
-    VMSTATE_UINT64_EQUAL_V(_f, _s, 0)
-
-#define VMSTATE_INT32_LE(_f, _s)                                   \
-    VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_t)
-
-#define VMSTATE_UINT8_TEST(_f, _s, _t)                               \
-    VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint8, uint8_t)
-
-#define VMSTATE_UINT16_TEST(_f, _s, _t)                               \
-    VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint16, uint16_t)
-
-#define VMSTATE_UINT32_TEST(_f, _s, _t)                                  \
-    VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint32, uint32_t)
-
-
-#define VMSTATE_FLOAT64_V(_f, _s, _v)                                 \
-    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_float64, float64)
-
-#define VMSTATE_FLOAT64(_f, _s)                                       \
-    VMSTATE_FLOAT64_V(_f, _s, 0)
-
-#define VMSTATE_TIMER_TEST(_f, _s, _test)                             \
-    VMSTATE_POINTER_TEST(_f, _s, _test, vmstate_info_timer, QEMUTimer *)
-
-#define VMSTATE_TIMER_V(_f, _s, _v)                                   \
-    VMSTATE_POINTER(_f, _s, _v, vmstate_info_timer, QEMUTimer *)
-
-#define VMSTATE_TIMER(_f, _s)                                         \
-    VMSTATE_TIMER_V(_f, _s, 0)
-
-#define VMSTATE_TIMER_ARRAY(_f, _s, _n)                              \
-    VMSTATE_ARRAY_OF_POINTER(_f, _s, _n, 0, vmstate_info_timer, QEMUTimer *)
-
-#define VMSTATE_BOOL_ARRAY_V(_f, _s, _n, _v)                         \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_bool, bool)
-
-#define VMSTATE_BOOL_ARRAY(_f, _s, _n)                               \
-    VMSTATE_BOOL_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_UINT16_ARRAY_V(_f, _s, _n, _v)                         \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_uint16, uint16_t)
-
-#define VMSTATE_UINT16_2DARRAY_V(_f, _s, _n1, _n2, _v)                \
-    VMSTATE_2DARRAY(_f, _s, _n1, _n2, _v, vmstate_info_uint16, uint16_t)
-
-#define VMSTATE_UINT16_ARRAY(_f, _s, _n)                               \
-    VMSTATE_UINT16_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_UINT16_2DARRAY(_f, _s, _n1, _n2)                      \
-    VMSTATE_UINT16_2DARRAY_V(_f, _s, _n1, _n2, 0)
-
-#define VMSTATE_UINT8_2DARRAY_V(_f, _s, _n1, _n2, _v)                 \
-    VMSTATE_2DARRAY(_f, _s, _n1, _n2, _v, vmstate_info_uint8, uint8_t)
-
-#define VMSTATE_UINT8_ARRAY_V(_f, _s, _n, _v)                         \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_uint8, uint8_t)
-
-#define VMSTATE_UINT8_ARRAY(_f, _s, _n)                               \
-    VMSTATE_UINT8_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_UINT8_2DARRAY(_f, _s, _n1, _n2)                       \
-    VMSTATE_UINT8_2DARRAY_V(_f, _s, _n1, _n2, 0)
-
-#define VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v)                        \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_uint32, uint32_t)
-
-#define VMSTATE_UINT32_ARRAY(_f, _s, _n)                              \
-    VMSTATE_UINT32_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v)                        \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_uint64, uint64_t)
-
-#define VMSTATE_UINT64_ARRAY(_f, _s, _n)                              \
-    VMSTATE_UINT64_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_INT16_ARRAY_V(_f, _s, _n, _v)                         \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int16, int16_t)
-
-#define VMSTATE_INT16_ARRAY(_f, _s, _n)                               \
-    VMSTATE_INT16_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_INT32_ARRAY_V(_f, _s, _n, _v)                         \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int32, int32_t)
-
-#define VMSTATE_INT32_ARRAY(_f, _s, _n)                               \
-    VMSTATE_INT32_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num)                \
-    VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint32, uint32_t)
-
-#define VMSTATE_UINT32_ARRAY(_f, _s, _n)                              \
-    VMSTATE_UINT32_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_INT64_ARRAY_V(_f, _s, _n, _v)                         \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_int64, int64_t)
-
-#define VMSTATE_INT64_ARRAY(_f, _s, _n)                               \
-    VMSTATE_INT64_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_FLOAT64_ARRAY_V(_f, _s, _n, _v)                       \
-    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_float64, float64)
-
-#define VMSTATE_FLOAT64_ARRAY(_f, _s, _n)                             \
-    VMSTATE_FLOAT64_ARRAY_V(_f, _s, _n, 0)
-
-#define VMSTATE_BUFFER_V(_f, _s, _v)                                  \
-    VMSTATE_STATIC_BUFFER(_f, _s, _v, NULL, 0, sizeof(typeof_field(_s, _f)))
-
-#define VMSTATE_BUFFER(_f, _s)                                        \
-    VMSTATE_BUFFER_V(_f, _s, 0)
-
-#define VMSTATE_PARTIAL_BUFFER(_f, _s, _size)                         \
-    VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, 0, _size)
-
-#define VMSTATE_BUFFER_START_MIDDLE(_f, _s, _start) \
-    VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, _start, sizeof(typeof_field(_s, _f)))
-
-#define VMSTATE_PARTIAL_VBUFFER(_f, _s, _size)                        \
-    VMSTATE_VBUFFER(_f, _s, 0, NULL, 0, _size)
-
-#define VMSTATE_PARTIAL_VBUFFER_UINT32(_f, _s, _size)                        \
-    VMSTATE_VBUFFER_UINT32(_f, _s, 0, NULL, 0, _size)
-
-#define VMSTATE_SUB_VBUFFER(_f, _s, _start, _size)                    \
-    VMSTATE_VBUFFER(_f, _s, 0, NULL, _start, _size)
-
-#define VMSTATE_BUFFER_TEST(_f, _s, _test)                            \
-    VMSTATE_STATIC_BUFFER(_f, _s, 0, _test, 0, sizeof(typeof_field(_s, _f)))
-
-#define VMSTATE_BUFFER_UNSAFE(_field, _state, _version, _size)        \
-    VMSTATE_BUFFER_UNSAFE_INFO(_field, _state, _version, vmstate_info_buffer, _size)
-
-#define VMSTATE_UNUSED_V(_v, _size)                                   \
-    VMSTATE_UNUSED_BUFFER(NULL, _v, _size)
-
-#define VMSTATE_UNUSED(_size)                                         \
-    VMSTATE_UNUSED_V(0, _size)
-
-#define VMSTATE_UNUSED_TEST(_test, _size)                             \
-    VMSTATE_UNUSED_BUFFER(_test, 0, _size)
-
-#define VMSTATE_END_OF_LIST()                                         \
-    {}
-
-int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
-                       void *opaque, int version_id);
-void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
-                        void *opaque);
-
-int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
-                                   const VMStateDescription *vmsd,
-                                   void *base, int alias_id,
-                                   int required_for_version);
-
-static inline int vmstate_register(DeviceState *dev, int instance_id,
-                                   const VMStateDescription *vmsd,
-                                   void *opaque)
-{
-    return vmstate_register_with_alias_id(dev, instance_id, vmsd,
-                                          opaque, -1, 0);
-}
-
-void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd,
-                        void *opaque);
-
-struct MemoryRegion;
-void vmstate_register_ram(struct MemoryRegion *memory, DeviceState *dev);
-void vmstate_unregister_ram(struct MemoryRegion *memory, DeviceState *dev);
-void vmstate_register_ram_global(struct MemoryRegion *memory);
-
-#endif
diff --git a/contrib/qemu/include/monitor/monitor.h b/contrib/qemu/include/monitor/monitor.h
deleted file mode 100644
index 1942cc42f..000000000
--- a/contrib/qemu/include/monitor/monitor.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef MONITOR_H
-#define MONITOR_H
-
-#include "qemu-common.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qdict.h"
-#include "block/block.h"
-#include "monitor/readline.h"
-
-extern Monitor *cur_mon;
-extern Monitor *default_mon;
-
-/* flags for monitor_init */
-#define MONITOR_IS_DEFAULT    0x01
-#define MONITOR_USE_READLINE  0x02
-#define MONITOR_USE_CONTROL   0x04
-#define MONITOR_USE_PRETTY    0x08
-
-/* flags for monitor commands */
-#define MONITOR_CMD_ASYNC       0x0001
-
-/* QMP events */
-typedef enum MonitorEvent {
-    QEVENT_SHUTDOWN,
-    QEVENT_RESET,
-    QEVENT_POWERDOWN,
-    QEVENT_STOP,
-    QEVENT_RESUME,
-    QEVENT_VNC_CONNECTED,
-    QEVENT_VNC_INITIALIZED,
-    QEVENT_VNC_DISCONNECTED,
-    QEVENT_BLOCK_IO_ERROR,
-    QEVENT_RTC_CHANGE,
-    QEVENT_WATCHDOG,
-    QEVENT_SPICE_CONNECTED,
-    QEVENT_SPICE_INITIALIZED,
-    QEVENT_SPICE_DISCONNECTED,
-    QEVENT_BLOCK_JOB_COMPLETED,
-    QEVENT_BLOCK_JOB_CANCELLED,
-    QEVENT_BLOCK_JOB_ERROR,
-    QEVENT_BLOCK_JOB_READY,
-    QEVENT_DEVICE_DELETED,
-    QEVENT_DEVICE_TRAY_MOVED,
-    QEVENT_NIC_RX_FILTER_CHANGED,
-    QEVENT_SUSPEND,
-    QEVENT_SUSPEND_DISK,
-    QEVENT_WAKEUP,
-    QEVENT_BALLOON_CHANGE,
-    QEVENT_SPICE_MIGRATE_COMPLETED,
-    QEVENT_GUEST_PANICKED,
-
-    /* Add to 'monitor_event_names' array in monitor.c when
-     * defining new events here */
-
-    QEVENT_MAX,
-} MonitorEvent;
-
-int monitor_cur_is_qmp(void);
-
-void monitor_protocol_event(MonitorEvent event, QObject *data);
-void monitor_init(CharDriverState *chr, int flags);
-
-int monitor_suspend(Monitor *mon);
-void monitor_resume(Monitor *mon);
-
-int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
-                                BlockDriverCompletionFunc *completion_cb,
-                                void *opaque);
-int monitor_read_block_device_key(Monitor *mon, const char *device,
-                                  BlockDriverCompletionFunc *completion_cb,
-                                  void *opaque);
-
-int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
-int monitor_handle_fd_param(Monitor *mon, const char *fdname);
-
-void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
-    GCC_FMT_ATTR(2, 0);
-void monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
-void monitor_print_filename(Monitor *mon, const char *filename);
-void monitor_flush(Monitor *mon);
-int monitor_set_cpu(int cpu_index);
-int monitor_get_cpu_index(void);
-
-typedef void (MonitorCompletion)(void *opaque, QObject *ret_data);
-
-void monitor_set_error(Monitor *mon, QError *qerror);
-void monitor_read_command(Monitor *mon, int show_prompt);
-ReadLineState *monitor_get_rs(Monitor *mon);
-int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
-                          void *opaque);
-
-int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret);
-
-int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret);
-
-AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,
-                                bool has_opaque, const char *opaque,
-                                Error **errp);
-int monitor_fdset_get_fd(int64_t fdset_id, int flags);
-int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd);
-int monitor_fdset_dup_fd_remove(int dup_fd);
-int monitor_fdset_dup_fd_find(int dup_fd);
-
-#endif /* !MONITOR_H */
diff --git a/contrib/qemu/include/monitor/readline.h b/contrib/qemu/include/monitor/readline.h
deleted file mode 100644
index fc9806ecf..000000000
--- a/contrib/qemu/include/monitor/readline.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef READLINE_H
-#define READLINE_H
-
-#include "qemu-common.h"
-
-#define READLINE_CMD_BUF_SIZE 4095
-#define READLINE_MAX_CMDS 64
-#define READLINE_MAX_COMPLETIONS 256
-
-typedef void ReadLineFunc(Monitor *mon, const char *str, void *opaque);
-typedef void ReadLineCompletionFunc(const char *cmdline);
-
-typedef struct ReadLineState {
-    char cmd_buf[READLINE_CMD_BUF_SIZE + 1];
-    int cmd_buf_index;
-    int cmd_buf_size;
-
-    char last_cmd_buf[READLINE_CMD_BUF_SIZE + 1];
-    int last_cmd_buf_index;
-    int last_cmd_buf_size;
-
-    int esc_state;
-    int esc_param;
-
-    char *history[READLINE_MAX_CMDS];
-    int hist_entry;
-
-    ReadLineCompletionFunc *completion_finder;
-    char *completions[READLINE_MAX_COMPLETIONS];
-    int nb_completions;
-    int completion_index;
-
-    ReadLineFunc *readline_func;
-    void *readline_opaque;
-    int read_password;
-    char prompt[256];
-    Monitor *mon;
-} ReadLineState;
-
-void readline_add_completion(ReadLineState *rs, const char *str);
-void readline_set_completion_index(ReadLineState *rs, int completion_index);
-
-const char *readline_get_history(ReadLineState *rs, unsigned int index);
-
-void readline_handle_byte(ReadLineState *rs, int ch);
-
-void readline_start(ReadLineState *rs, const char *prompt, int read_password,
-                    ReadLineFunc *readline_func, void *opaque);
-void readline_restart(ReadLineState *rs);
-void readline_show_prompt(ReadLineState *rs);
-
-ReadLineState *readline_init(Monitor *mon,
-                             ReadLineCompletionFunc *completion_finder);
-
-#endif /* !READLINE_H */
diff --git a/contrib/qemu/include/qapi/error.h b/contrib/qemu/include/qapi/error.h
deleted file mode 100644
index ffd1cea47..000000000
--- a/contrib/qemu/include/qapi/error.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * QEMU Error Objects
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.  See
- * the COPYING.LIB file in the top-level directory.
- */
-#ifndef ERROR_H
-#define ERROR_H
-
-#include "qemu/compiler.h"
-#include "qapi-types.h"
-#include <stdbool.h>
-
-/**
- * A class representing internal errors within QEMU.  An error has a ErrorClass
- * code and a human message.
- */
-typedef struct Error Error;
-
-/**
- * Set an indirect pointer to an error given a ErrorClass value and a
- * printf-style human message.  This function is not meant to be used outside
- * of QEMU.
- */
-void error_set(Error **err, ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(3, 4);
-
-/**
- * Set an indirect pointer to an error given a ErrorClass value and a
- * printf-style human message, followed by a strerror() string if
- * @os_error is not zero.
- */
-void error_set_errno(Error **err, int os_error, ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(4, 5);
-
-/**
- * Same as error_set(), but sets a generic error
- */
-#define error_setg(err, fmt, ...) \
-    error_set(err, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__)
-#define error_setg_errno(err, os_error, fmt, ...) \
-    error_set_errno(err, os_error, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__)
-
-/**
- * Helper for open() errors
- */
-void error_setg_file_open(Error **errp, int os_errno, const char *filename);
-
-/**
- * Returns true if an indirect pointer to an error is pointing to a valid
- * error object.
- */
-bool error_is_set(Error **err);
-
-/*
- * Get the error class of an error object.
- */
-ErrorClass error_get_class(const Error *err);
-
-/**
- * Returns an exact copy of the error passed as an argument.
- */
-Error *error_copy(const Error *err);
-
-/**
- * Get a human readable representation of an error object.
- */
-const char *error_get_pretty(Error *err);
-
-/**
- * Propagate an error to an indirect pointer to an error.  This function will
- * always transfer ownership of the error reference and handles the case where
- * dst_err is NULL correctly.  Errors after the first are discarded.
- */
-void error_propagate(Error **dst_err, Error *local_err);
-
-/**
- * Free an error object.
- */
-void error_free(Error *err);
-
-#endif
diff --git a/contrib/qemu/include/qapi/qmp/json-lexer.h b/contrib/qemu/include/qapi/qmp/json-lexer.h
deleted file mode 100644
index cdff0460a..000000000
--- a/contrib/qemu/include/qapi/qmp/json-lexer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * JSON lexer
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QEMU_JSON_LEXER_H
-#define QEMU_JSON_LEXER_H
-
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qlist.h"
-
-typedef enum json_token_type {
-    JSON_OPERATOR = 100,
-    JSON_INTEGER,
-    JSON_FLOAT,
-    JSON_KEYWORD,
-    JSON_STRING,
-    JSON_ESCAPE,
-    JSON_SKIP,
-    JSON_ERROR,
-} JSONTokenType;
-
-typedef struct JSONLexer JSONLexer;
-
-typedef void (JSONLexerEmitter)(JSONLexer *, QString *, JSONTokenType, int x, int y);
-
-struct JSONLexer
-{
-    JSONLexerEmitter *emit;
-    int state;
-    QString *token;
-    int x, y;
-};
-
-void json_lexer_init(JSONLexer *lexer, JSONLexerEmitter func);
-
-int json_lexer_feed(JSONLexer *lexer, const char *buffer, size_t size);
-
-int json_lexer_flush(JSONLexer *lexer);
-
-void json_lexer_destroy(JSONLexer *lexer);
-
-#endif
diff --git a/contrib/qemu/include/qapi/qmp/json-parser.h b/contrib/qemu/include/qapi/qmp/json-parser.h
deleted file mode 100644
index 44d88f346..000000000
--- a/contrib/qemu/include/qapi/qmp/json-parser.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * JSON Parser 
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QEMU_JSON_PARSER_H
-#define QEMU_JSON_PARSER_H
-
-#include "qemu-common.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/error.h"
-
-QObject *json_parser_parse(QList *tokens, va_list *ap);
-QObject *json_parser_parse_err(QList *tokens, va_list *ap, Error **errp);
-
-#endif
diff --git a/contrib/qemu/include/qapi/qmp/json-streamer.h b/contrib/qemu/include/qapi/qmp/json-streamer.h
deleted file mode 100644
index 823f7d7fa..000000000
--- a/contrib/qemu/include/qapi/qmp/json-streamer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * JSON streaming support
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QEMU_JSON_STREAMER_H
-#define QEMU_JSON_STREAMER_H
-
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/json-lexer.h"
-
-typedef struct JSONMessageParser
-{
-    void (*emit)(struct JSONMessageParser *parser, QList *tokens);
-    JSONLexer lexer;
-    int brace_count;
-    int bracket_count;
-    QList *tokens;
-    uint64_t token_size;
-} JSONMessageParser;
-
-void json_message_parser_init(JSONMessageParser *parser,
-                              void (*func)(JSONMessageParser *, QList *));
-
-int json_message_parser_feed(JSONMessageParser *parser,
-                             const char *buffer, size_t size);
-
-int json_message_parser_flush(JSONMessageParser *parser);
-
-void json_message_parser_destroy(JSONMessageParser *parser);
-
-#endif
diff --git a/contrib/qemu/include/qapi/qmp/qbool.h b/contrib/qemu/include/qapi/qmp/qbool.h
deleted file mode 100644
index c4eaab9bb..000000000
--- a/contrib/qemu/include/qapi/qmp/qbool.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * QBool Module
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QBOOL_H
-#define QBOOL_H
-
-#include <stdint.h>
-#include "qapi/qmp/qobject.h"
-
-typedef struct QBool {
-    QObject_HEAD;
-    int value;
-} QBool;
-
-QBool *qbool_from_int(int value);
-int qbool_get_int(const QBool *qb);
-QBool *qobject_to_qbool(const QObject *obj);
-
-#endif /* QBOOL_H */
diff --git a/contrib/qemu/include/qapi/qmp/qdict.h b/contrib/qemu/include/qapi/qmp/qdict.h
deleted file mode 100644
index 685b2e3fc..000000000
--- a/contrib/qemu/include/qapi/qmp/qdict.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * QDict Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#ifndef QDICT_H
-#define QDICT_H
-
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qlist.h"
-#include "qemu/queue.h"
-#include <stdint.h>
-
-#define QDICT_BUCKET_MAX 512
-
-typedef struct QDictEntry {
-    char *key;
-    QObject *value;
-    QLIST_ENTRY(QDictEntry) next;
-} QDictEntry;
-
-typedef struct QDict {
-    QObject_HEAD;
-    size_t size;
-    QLIST_HEAD(,QDictEntry) table[QDICT_BUCKET_MAX];
-} QDict;
-
-/* Object API */
-QDict *qdict_new(void);
-const char *qdict_entry_key(const QDictEntry *entry);
-QObject *qdict_entry_value(const QDictEntry *entry);
-size_t qdict_size(const QDict *qdict);
-void qdict_put_obj(QDict *qdict, const char *key, QObject *value);
-void qdict_del(QDict *qdict, const char *key);
-int qdict_haskey(const QDict *qdict, const char *key);
-QObject *qdict_get(const QDict *qdict, const char *key);
-QDict *qobject_to_qdict(const QObject *obj);
-void qdict_iter(const QDict *qdict,
-                void (*iter)(const char *key, QObject *obj, void *opaque),
-                void *opaque);
-const QDictEntry *qdict_first(const QDict *qdict);
-const QDictEntry *qdict_next(const QDict *qdict, const QDictEntry *entry);
-
-/* Helper to qdict_put_obj(), accepts any object */
-#define qdict_put(qdict, key, obj) \
-        qdict_put_obj(qdict, key, QOBJECT(obj))
-
-/* High level helpers */
-double qdict_get_double(const QDict *qdict, const char *key);
-int64_t qdict_get_int(const QDict *qdict, const char *key);
-int qdict_get_bool(const QDict *qdict, const char *key);
-QList *qdict_get_qlist(const QDict *qdict, const char *key);
-QDict *qdict_get_qdict(const QDict *qdict, const char *key);
-const char *qdict_get_str(const QDict *qdict, const char *key);
-int64_t qdict_get_try_int(const QDict *qdict, const char *key,
-                          int64_t def_value);
-int qdict_get_try_bool(const QDict *qdict, const char *key, int def_value);
-const char *qdict_get_try_str(const QDict *qdict, const char *key);
-
-QDict *qdict_clone_shallow(const QDict *src);
-
-#endif /* QDICT_H */
diff --git a/contrib/qemu/include/qapi/qmp/qerror.h b/contrib/qemu/include/qapi/qmp/qerror.h
deleted file mode 100644
index c30c2f6d7..000000000
--- a/contrib/qemu/include/qapi/qmp/qerror.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * QError Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-#ifndef QERROR_H
-#define QERROR_H
-
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
-#include "qemu/error-report.h"
-#include "qapi/error.h"
-#include "qapi-types.h"
-#include <stdarg.h>
-
-typedef struct QError {
-    QObject_HEAD;
-    Location loc;
-    char *err_msg;
-    ErrorClass err_class;
-} QError;
-
-QString *qerror_human(const QError *qerror);
-void qerror_report(ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
-void qerror_report_err(Error *err);
-void assert_no_error(Error *err);
-
-/*
- * QError class list
- * Please keep the definitions in alphabetical order.
- * Use scripts/check-qerror.sh to check.
- */
-#define QERR_ADD_CLIENT_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Could not add client"
-
-#define QERR_AMBIGUOUS_PATH \
-    ERROR_CLASS_GENERIC_ERROR, "Path '%s' does not uniquely identify an object"
-
-#define QERR_BAD_BUS_FOR_DEVICE \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' can't go on a %s bus"
-
-#define QERR_BASE_NOT_FOUND \
-    ERROR_CLASS_GENERIC_ERROR, "Base '%s' not found"
-
-#define QERR_BLOCK_JOB_NOT_ACTIVE \
-    ERROR_CLASS_DEVICE_NOT_ACTIVE, "No active block job on device '%s'"
-
-#define QERR_BLOCK_JOB_PAUSED \
-    ERROR_CLASS_GENERIC_ERROR, "The block job for device '%s' is currently paused"
-
-#define QERR_BLOCK_JOB_NOT_READY \
-    ERROR_CLASS_GENERIC_ERROR, "The active block job for device '%s' cannot be completed"
-
-#define QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED \
-    ERROR_CLASS_GENERIC_ERROR, "Block format '%s' used by device '%s' does not support feature '%s'"
-
-#define QERR_BUFFER_OVERRUN \
-    ERROR_CLASS_GENERIC_ERROR, "An internal buffer overran"
-
-#define QERR_BUS_NO_HOTPLUG \
-    ERROR_CLASS_GENERIC_ERROR, "Bus '%s' does not support hotplugging"
-
-#define QERR_BUS_NOT_FOUND \
-    ERROR_CLASS_GENERIC_ERROR, "Bus '%s' not found"
-
-#define QERR_COMMAND_DISABLED \
-    ERROR_CLASS_GENERIC_ERROR, "The command %s has been disabled for this instance"
-
-#define QERR_COMMAND_NOT_FOUND \
-    ERROR_CLASS_COMMAND_NOT_FOUND, "The command %s has not been found"
-
-#define QERR_DEVICE_ENCRYPTED \
-    ERROR_CLASS_DEVICE_ENCRYPTED, "'%s' (%s) is encrypted"
-
-#define QERR_DEVICE_FEATURE_BLOCKS_MIGRATION \
-    ERROR_CLASS_GENERIC_ERROR, "Migration is disabled when using feature '%s' in device '%s'"
-
-#define QERR_DEVICE_HAS_NO_MEDIUM \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' has no medium"
-
-#define QERR_DEVICE_INIT_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' could not be initialized"
-
-#define QERR_DEVICE_IN_USE \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' is in use"
-
-#define QERR_DEVICE_IS_READ_ONLY \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' is read only"
-
-#define QERR_DEVICE_LOCKED \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' is locked"
-
-#define QERR_DEVICE_MULTIPLE_BUSSES \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' has multiple child busses"
-
-#define QERR_DEVICE_NO_BUS \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' has no child bus"
-
-#define QERR_DEVICE_NO_HOTPLUG \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' does not support hotplugging"
-
-#define QERR_DEVICE_NOT_ACTIVE \
-    ERROR_CLASS_DEVICE_NOT_ACTIVE, "Device '%s' has not been activated"
-
-#define QERR_DEVICE_NOT_ENCRYPTED \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' is not encrypted"
-
-#define QERR_DEVICE_NOT_FOUND \
-    ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found"
-
-#define QERR_DEVICE_NOT_REMOVABLE \
-    ERROR_CLASS_GENERIC_ERROR, "Device '%s' is not removable"
-
-#define QERR_DUPLICATE_ID \
-    ERROR_CLASS_GENERIC_ERROR, "Duplicate ID '%s' for %s"
-
-#define QERR_FD_NOT_FOUND \
-    ERROR_CLASS_GENERIC_ERROR, "File descriptor named '%s' not found"
-
-#define QERR_FD_NOT_SUPPLIED \
-    ERROR_CLASS_GENERIC_ERROR, "No file descriptor supplied via SCM_RIGHTS"
-
-#define QERR_FEATURE_DISABLED \
-    ERROR_CLASS_GENERIC_ERROR, "The feature '%s' is not enabled"
-
-#define QERR_INVALID_BLOCK_FORMAT \
-    ERROR_CLASS_GENERIC_ERROR, "Invalid block format '%s'"
-
-#define QERR_INVALID_OPTION_GROUP \
-    ERROR_CLASS_GENERIC_ERROR, "There is no option group '%s'"
-
-#define QERR_INVALID_PARAMETER \
-    ERROR_CLASS_GENERIC_ERROR, "Invalid parameter '%s'"
-
-#define QERR_INVALID_PARAMETER_COMBINATION \
-    ERROR_CLASS_GENERIC_ERROR, "Invalid parameter combination"
-
-#define QERR_INVALID_PARAMETER_TYPE \
-    ERROR_CLASS_GENERIC_ERROR, "Invalid parameter type for '%s', expected: %s"
-
-#define QERR_INVALID_PARAMETER_VALUE \
-    ERROR_CLASS_GENERIC_ERROR, "Parameter '%s' expects %s"
-
-#define QERR_INVALID_PASSWORD \
-    ERROR_CLASS_GENERIC_ERROR, "Password incorrect"
-
-#define QERR_IO_ERROR \
-    ERROR_CLASS_GENERIC_ERROR, "An IO error has occurred"
-
-#define QERR_JSON_PARSE_ERROR \
-    ERROR_CLASS_GENERIC_ERROR, "JSON parse error, %s"
-
-#define QERR_JSON_PARSING \
-    ERROR_CLASS_GENERIC_ERROR, "Invalid JSON syntax"
-
-#define QERR_KVM_MISSING_CAP \
-    ERROR_CLASS_K_V_M_MISSING_CAP, "Using KVM without %s, %s unavailable"
-
-#define QERR_MIGRATION_ACTIVE \
-    ERROR_CLASS_GENERIC_ERROR, "There's a migration process in progress"
-
-#define QERR_MIGRATION_NOT_SUPPORTED \
-    ERROR_CLASS_GENERIC_ERROR, "State blocked by non-migratable device '%s'"
-
-#define QERR_MISSING_PARAMETER \
-    ERROR_CLASS_GENERIC_ERROR, "Parameter '%s' is missing"
-
-#define QERR_NO_BUS_FOR_DEVICE \
-    ERROR_CLASS_GENERIC_ERROR, "No '%s' bus found for device '%s'"
-
-#define QERR_NOT_SUPPORTED \
-    ERROR_CLASS_GENERIC_ERROR, "Not supported"
-
-#define QERR_PERMISSION_DENIED \
-    ERROR_CLASS_GENERIC_ERROR, "Insufficient permission to perform this operation"
-
-#define QERR_PROPERTY_NOT_FOUND \
-    ERROR_CLASS_GENERIC_ERROR, "Property '%s.%s' not found"
-
-#define QERR_PROPERTY_VALUE_BAD \
-    ERROR_CLASS_GENERIC_ERROR, "Property '%s.%s' doesn't take value '%s'"
-
-#define QERR_PROPERTY_VALUE_IN_USE \
-    ERROR_CLASS_GENERIC_ERROR, "Property '%s.%s' can't take value '%s', it's in use"
-
-#define QERR_PROPERTY_VALUE_NOT_FOUND \
-    ERROR_CLASS_GENERIC_ERROR, "Property '%s.%s' can't find value '%s'"
-
-#define QERR_PROPERTY_VALUE_NOT_POWER_OF_2 \
-    ERROR_CLASS_GENERIC_ERROR, "Property %s.%s doesn't take value '%" PRId64 "', it's not a power of 2"
-
-#define QERR_PROPERTY_VALUE_OUT_OF_RANGE \
-    ERROR_CLASS_GENERIC_ERROR, "Property %s.%s doesn't take value %" PRId64 " (minimum: %" PRId64 ", maximum: %" PRId64 ")"
-
-#define QERR_QGA_COMMAND_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Guest agent command failed, error was '%s'"
-
-#define QERR_QGA_LOGGING_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Guest agent failed to log non-optional log statement"
-
-#define QERR_QMP_BAD_INPUT_OBJECT \
-    ERROR_CLASS_GENERIC_ERROR, "Expected '%s' in QMP input"
-
-#define QERR_QMP_BAD_INPUT_OBJECT_MEMBER \
-    ERROR_CLASS_GENERIC_ERROR, "QMP input object member '%s' expects '%s'"
-
-#define QERR_QMP_EXTRA_MEMBER \
-    ERROR_CLASS_GENERIC_ERROR, "QMP input object member '%s' is unexpected"
-
-#define QERR_RESET_REQUIRED \
-    ERROR_CLASS_GENERIC_ERROR, "Resetting the Virtual Machine is required"
-
-#define QERR_SET_PASSWD_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Could not set password"
-
-#define QERR_TOO_MANY_FILES \
-    ERROR_CLASS_GENERIC_ERROR, "Too many open files"
-
-#define QERR_UNDEFINED_ERROR \
-    ERROR_CLASS_GENERIC_ERROR, "An undefined error has occurred"
-
-#define QERR_UNKNOWN_BLOCK_FORMAT_FEATURE \
-    ERROR_CLASS_GENERIC_ERROR, "'%s' uses a %s feature which is not supported by this qemu version: %s"
-
-#define QERR_UNSUPPORTED \
-    ERROR_CLASS_GENERIC_ERROR, "this feature or command is not currently supported"
-
-#define QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION \
-    ERROR_CLASS_GENERIC_ERROR, "Migration is disabled when VirtFS export path '%s' is mounted in the guest using mount_tag '%s'"
-
-#define QERR_SOCKET_CONNECT_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket"
-
-#define QERR_SOCKET_LISTEN_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Failed to set socket to listening mode"
-
-#define QERR_SOCKET_BIND_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Failed to bind socket"
-
-#define QERR_SOCKET_CREATE_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Failed to create socket"
-
-#endif /* QERROR_H */
diff --git a/contrib/qemu/include/qapi/qmp/qfloat.h b/contrib/qemu/include/qapi/qmp/qfloat.h
deleted file mode 100644
index a8658443d..000000000
--- a/contrib/qemu/include/qapi/qmp/qfloat.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * QFloat Module
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QFLOAT_H
-#define QFLOAT_H
-
-#include <stdint.h>
-#include "qapi/qmp/qobject.h"
-
-typedef struct QFloat {
-    QObject_HEAD;
-    double value;
-} QFloat;
-
-QFloat *qfloat_from_double(double value);
-double qfloat_get_double(const QFloat *qi);
-QFloat *qobject_to_qfloat(const QObject *obj);
-
-#endif /* QFLOAT_H */
diff --git a/contrib/qemu/include/qapi/qmp/qint.h b/contrib/qemu/include/qapi/qmp/qint.h
deleted file mode 100644
index 48a41b0f2..000000000
--- a/contrib/qemu/include/qapi/qmp/qint.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * QInt Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#ifndef QINT_H
-#define QINT_H
-
-#include <stdint.h>
-#include "qapi/qmp/qobject.h"
-
-typedef struct QInt {
-    QObject_HEAD;
-    int64_t value;
-} QInt;
-
-QInt *qint_from_int(int64_t value);
-int64_t qint_get_int(const QInt *qi);
-QInt *qobject_to_qint(const QObject *obj);
-
-#endif /* QINT_H */
diff --git a/contrib/qemu/include/qapi/qmp/qjson.h b/contrib/qemu/include/qapi/qmp/qjson.h
deleted file mode 100644
index 73351ed6d..000000000
--- a/contrib/qemu/include/qapi/qmp/qjson.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * QObject JSON integration
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QJSON_H
-#define QJSON_H
-
-#include <stdarg.h>
-#include "qemu/compiler.h"
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qstring.h"
-
-QObject *qobject_from_json(const char *string) GCC_FMT_ATTR(1, 0);
-QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);
-QObject *qobject_from_jsonv(const char *string, va_list *ap) GCC_FMT_ATTR(1, 0);
-
-QString *qobject_to_json(const QObject *obj);
-QString *qobject_to_json_pretty(const QObject *obj);
-
-#endif /* QJSON_H */
diff --git a/contrib/qemu/include/qapi/qmp/qlist.h b/contrib/qemu/include/qapi/qmp/qlist.h
deleted file mode 100644
index 6cc4831df..000000000
--- a/contrib/qemu/include/qapi/qmp/qlist.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * QList Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#ifndef QLIST_H
-#define QLIST_H
-
-#include "qapi/qmp/qobject.h"
-#include "qemu/queue.h"
-
-typedef struct QListEntry {
-    QObject *value;
-    QTAILQ_ENTRY(QListEntry) next;
-} QListEntry;
-
-typedef struct QList {
-    QObject_HEAD;
-    QTAILQ_HEAD(,QListEntry) head;
-} QList;
-
-#define qlist_append(qlist, obj) \
-        qlist_append_obj(qlist, QOBJECT(obj))
-
-#define QLIST_FOREACH_ENTRY(qlist, var)             \
-        for ((var) = ((qlist)->head.tqh_first);     \
-            (var);                                  \
-            (var) = ((var)->next.tqe_next))
-
-static inline QObject *qlist_entry_obj(const QListEntry *entry)
-{
-    return entry->value;
-}
-
-QList *qlist_new(void);
-QList *qlist_copy(QList *src);
-void qlist_append_obj(QList *qlist, QObject *obj);
-void qlist_iter(const QList *qlist,
-                void (*iter)(QObject *obj, void *opaque), void *opaque);
-QObject *qlist_pop(QList *qlist);
-QObject *qlist_peek(QList *qlist);
-int qlist_empty(const QList *qlist);
-size_t qlist_size(const QList *qlist);
-QList *qobject_to_qlist(const QObject *obj);
-
-static inline const QListEntry *qlist_first(const QList *qlist)
-{
-    return QTAILQ_FIRST(&qlist->head);
-}
-
-static inline const QListEntry *qlist_next(const QListEntry *entry)
-{
-    return QTAILQ_NEXT(entry, next);
-}
-
-#endif /* QLIST_H */
diff --git a/contrib/qemu/include/qapi/qmp/qobject.h b/contrib/qemu/include/qapi/qmp/qobject.h
deleted file mode 100644
index 9124649ed..000000000
--- a/contrib/qemu/include/qapi/qmp/qobject.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * QEMU Object Model.
- *
- * Based on ideas by Avi Kivity <avi@redhat.com>
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- * QObject Reference Counts Terminology
- * ------------------------------------
- *
- *  - Returning references: A function that returns an object may
- *  return it as either a weak or a strong reference.  If the reference
- *  is strong, you are responsible for calling QDECREF() on the reference
- *  when you are done.
- *
- *  If the reference is weak, the owner of the reference may free it at
- *  any time in the future.  Before storing the reference anywhere, you
- *  should call QINCREF() to make the reference strong.
- *
- *  - Transferring ownership: when you transfer ownership of a reference
- *  by calling a function, you are no longer responsible for calling
- *  QDECREF() when the reference is no longer needed.  In other words,
- *  when the function returns you must behave as if the reference to the
- *  passed object was weak.
- */
-#ifndef QOBJECT_H
-#define QOBJECT_H
-
-#include <stddef.h>
-#include <assert.h>
-
-typedef enum {
-    QTYPE_NONE,
-    QTYPE_QINT,
-    QTYPE_QSTRING,
-    QTYPE_QDICT,
-    QTYPE_QLIST,
-    QTYPE_QFLOAT,
-    QTYPE_QBOOL,
-    QTYPE_QERROR,
-} qtype_code;
-
-struct QObject;
-
-typedef struct QType {
-    qtype_code code;
-    void (*destroy)(struct QObject *);
-} QType;
-
-typedef struct QObject {
-    const QType *type;
-    size_t refcnt;
-} QObject;
-
-/* Objects definitions must include this */
-#define QObject_HEAD  \
-    QObject base
-
-/* Get the 'base' part of an object */
-#define QOBJECT(obj) (&(obj)->base)
-
-/* High-level interface for qobject_incref() */
-#define QINCREF(obj)      \
-    qobject_incref(QOBJECT(obj))
-
-/* High-level interface for qobject_decref() */
-#define QDECREF(obj)              \
-    qobject_decref(obj ? QOBJECT(obj) : NULL)
-
-/* Initialize an object to default values */
-#define QOBJECT_INIT(obj, qtype_type)   \
-    obj->base.refcnt = 1;               \
-    obj->base.type   = qtype_type
-
-/**
- * qobject_incref(): Increment QObject's reference count
- */
-static inline void qobject_incref(QObject *obj)
-{
-    if (obj)
-        obj->refcnt++;
-}
-
-/**
- * qobject_decref(): Decrement QObject's reference count, deallocate
- * when it reaches zero
- */
-static inline void qobject_decref(QObject *obj)
-{
-    if (obj && --obj->refcnt == 0) {
-        assert(obj->type != NULL);
-        assert(obj->type->destroy != NULL);
-        obj->type->destroy(obj);
-    }
-}
-
-/**
- * qobject_type(): Return the QObject's type
- */
-static inline qtype_code qobject_type(const QObject *obj)
-{
-    assert(obj->type != NULL);
-    return obj->type->code;
-}
-
-#endif /* QOBJECT_H */
diff --git a/contrib/qemu/include/qapi/qmp/qstring.h b/contrib/qemu/include/qapi/qmp/qstring.h
deleted file mode 100644
index 1bc366610..000000000
--- a/contrib/qemu/include/qapi/qmp/qstring.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * QString Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#ifndef QSTRING_H
-#define QSTRING_H
-
-#include <stdint.h>
-#include "qapi/qmp/qobject.h"
-
-typedef struct QString {
-    QObject_HEAD;
-    char *string;
-    size_t length;
-    size_t capacity;
-} QString;
-
-QString *qstring_new(void);
-QString *qstring_from_str(const char *str);
-QString *qstring_from_substr(const char *str, int start, int end);
-size_t qstring_get_length(const QString *qstring);
-const char *qstring_get_str(const QString *qstring);
-void qstring_append_int(QString *qstring, int64_t value);
-void qstring_append(QString *qstring, const char *str);
-void qstring_append_chr(QString *qstring, int c);
-QString *qobject_to_qstring(const QObject *obj);
-
-#endif /* QSTRING_H */
diff --git a/contrib/qemu/include/qapi/qmp/types.h b/contrib/qemu/include/qapi/qmp/types.h
deleted file mode 100644
index 7782ec5a6..000000000
--- a/contrib/qemu/include/qapi/qmp/types.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Include all QEMU objects.
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#ifndef QEMU_OBJECTS_H
-#define QEMU_OBJECTS_H
-
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qint.h"
-#include "qapi/qmp/qfloat.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qjson.h"
-
-#endif /* QEMU_OBJECTS_H */
diff --git a/contrib/qemu/include/qemu-common.h b/contrib/qemu/include/qemu-common.h
deleted file mode 100644
index 6948bb917..000000000
--- a/contrib/qemu/include/qemu-common.h
+++ /dev/null
@@ -1,478 +0,0 @@
-
-/* Common header file that is included by all of QEMU.
- *
- * This file is supposed to be included only by .c files. No header file should
- * depend on qemu-common.h, as this would easily lead to circular header
- * dependencies.
- *
- * If a header file uses a definition from qemu-common.h, that definition
- * must be moved to a separate header file, and the header that uses it
- * must include that header.
- */
-#ifndef QEMU_COMMON_H
-#define QEMU_COMMON_H
-
-#include "qemu/compiler.h"
-#include "config-host.h"
-#include "qemu/typedefs.h"
-
-#if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__)
-#define WORDS_ALIGNED
-#endif
-
-#define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
-
-/* we put basic includes here to avoid repeating them in device drivers */
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <string.h>
-#include <strings.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <time.h>
-#include <ctype.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <assert.h>
-#include <signal.h>
-#include "glib-compat.h"
-
-#ifdef _WIN32
-#include "sysemu/os-win32.h"
-#endif
-
-#ifdef CONFIG_POSIX
-#include "sysemu/os-posix.h"
-#endif
-
-#ifndef O_LARGEFILE
-#define O_LARGEFILE 0
-#endif
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-#ifndef MAP_ANONYMOUS
-#define MAP_ANONYMOUS MAP_ANON
-#endif
-#ifndef ENOMEDIUM
-#define ENOMEDIUM ENODEV
-#endif
-#if !defined(ENOTSUP)
-#define ENOTSUP 4096
-#endif
-#if !defined(ECANCELED)
-#define ECANCELED 4097
-#endif
-#if !defined(EMEDIUMTYPE)
-#define EMEDIUMTYPE 4098
-#endif
-#ifndef TIME_MAX
-#define TIME_MAX LONG_MAX
-#endif
-
-/* HOST_LONG_BITS is the size of a native pointer in bits. */
-#if UINTPTR_MAX == UINT32_MAX
-# define HOST_LONG_BITS 32
-#elif UINTPTR_MAX == UINT64_MAX
-# define HOST_LONG_BITS 64
-#else
-# error Unknown pointer size
-#endif
-
-typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
-    GCC_FMT_ATTR(2, 3);
-
-#ifdef _WIN32
-#define fsync _commit
-#if !defined(lseek)
-# define lseek _lseeki64
-#endif
-int qemu_ftruncate64(int, int64_t);
-#if !defined(ftruncate)
-# define ftruncate qemu_ftruncate64
-#endif
-
-static inline char *realpath(const char *path, char *resolved_path)
-{
-    _fullpath(resolved_path, path, _MAX_PATH);
-    return resolved_path;
-}
-#endif
-
-/* icount */
-void configure_icount(const char *option);
-extern int use_icount;
-
-#include "qemu/osdep.h"
-#include "qemu/bswap.h"
-
-/* FIXME: Remove NEED_CPU_H.  */
-#ifdef NEED_CPU_H
-#include "cpu.h"
-#endif /* !defined(NEED_CPU_H) */
-
-/* main function, renamed */
-#if defined(CONFIG_COCOA)
-int qemu_main(int argc, char **argv, char **envp);
-#endif
-
-void qemu_get_timedate(struct tm *tm, int offset);
-int qemu_timedate_diff(struct tm *tm);
-
-#if !GLIB_CHECK_VERSION(2, 20, 0)
-/*
- * Glib before 2.20.0 doesn't implement g_poll, so wrap it to compile properly
- * on older systems.
- */
-static inline gint g_poll(GPollFD *fds, guint nfds, gint timeout)
-{
-    GMainContext *ctx = g_main_context_default();
-    return g_main_context_get_poll_func(ctx)(fds, nfds, timeout);
-}
-#endif
-
-/**
- * is_help_option:
- * @s: string to test
- *
- * Check whether @s is one of the standard strings which indicate
- * that the user is asking for a list of the valid values for a
- * command option like -cpu or -M. The current accepted strings
- * are 'help' and '?'. '?' is deprecated (it is a shell wildcard
- * which makes it annoying to use in a reliable way) but provided
- * for backwards compatibility.
- *
- * Returns: true if @s is a request for a list.
- */
-static inline bool is_help_option(const char *s)
-{
-    return !strcmp(s, "?") || !strcmp(s, "help");
-}
-
-/* cutils.c */
-void pstrcpy(char *buf, int buf_size, const char *str);
-void strpadcpy(char *buf, int buf_size, const char *str, char pad);
-char *pstrcat(char *buf, int buf_size, const char *s);
-int strstart(const char *str, const char *val, const char **ptr);
-int stristart(const char *str, const char *val, const char **ptr);
-int qemu_strnlen(const char *s, int max_len);
-char *qemu_strsep(char **input, const char *delim);
-time_t mktimegm(struct tm *tm);
-int qemu_fls(int i);
-int qemu_fdatasync(int fd);
-int fcntl_setfl(int fd, int flag);
-int qemu_parse_fd(const char *param);
-
-int parse_uint(const char *s, unsigned long long *value, char **endptr,
-               int base);
-int parse_uint_full(const char *s, unsigned long long *value, int base);
-
-/*
- * strtosz() suffixes used to specify the default treatment of an
- * argument passed to strtosz() without an explicit suffix.
- * These should be defined using upper case characters in the range
- * A-Z, as strtosz() will use qemu_toupper() on the given argument
- * prior to comparison.
- */
-#define STRTOSZ_DEFSUFFIX_EB	'E'
-#define STRTOSZ_DEFSUFFIX_PB	'P'
-#define STRTOSZ_DEFSUFFIX_TB	'T'
-#define STRTOSZ_DEFSUFFIX_GB	'G'
-#define STRTOSZ_DEFSUFFIX_MB	'M'
-#define STRTOSZ_DEFSUFFIX_KB	'K'
-#define STRTOSZ_DEFSUFFIX_B	'B'
-int64_t strtosz(const char *nptr, char **end);
-int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix);
-int64_t strtosz_suffix_unit(const char *nptr, char **end,
-                            const char default_suffix, int64_t unit);
-
-/* path.c */
-void init_paths(const char *prefix);
-const char *path(const char *pathname);
-
-#define qemu_isalnum(c)		isalnum((unsigned char)(c))
-#define qemu_isalpha(c)		isalpha((unsigned char)(c))
-#define qemu_iscntrl(c)		iscntrl((unsigned char)(c))
-#define qemu_isdigit(c)		isdigit((unsigned char)(c))
-#define qemu_isgraph(c)		isgraph((unsigned char)(c))
-#define qemu_islower(c)		islower((unsigned char)(c))
-#define qemu_isprint(c)		isprint((unsigned char)(c))
-#define qemu_ispunct(c)		ispunct((unsigned char)(c))
-#define qemu_isspace(c)		isspace((unsigned char)(c))
-#define qemu_isupper(c)		isupper((unsigned char)(c))
-#define qemu_isxdigit(c)	isxdigit((unsigned char)(c))
-#define qemu_tolower(c)		tolower((unsigned char)(c))
-#define qemu_toupper(c)		toupper((unsigned char)(c))
-#define qemu_isascii(c)		isascii((unsigned char)(c))
-#define qemu_toascii(c)		toascii((unsigned char)(c))
-
-void *qemu_oom_check(void *ptr);
-
-ssize_t qemu_write_full(int fd, const void *buf, size_t count)
-    QEMU_WARN_UNUSED_RESULT;
-ssize_t qemu_send_full(int fd, const void *buf, size_t count, int flags)
-    QEMU_WARN_UNUSED_RESULT;
-ssize_t qemu_recv_full(int fd, void *buf, size_t count, int flags)
-    QEMU_WARN_UNUSED_RESULT;
-
-#ifndef _WIN32
-int qemu_pipe(int pipefd[2]);
-/* like openpty() but also makes it raw; return master fd */
-int qemu_openpty_raw(int *aslave, char *pty_name);
-#endif
-
-#ifdef _WIN32
-/* MinGW needs type casts for the 'buf' and 'optval' arguments. */
-#define qemu_getsockopt(sockfd, level, optname, optval, optlen) \
-    getsockopt(sockfd, level, optname, (void *)optval, optlen)
-#define qemu_setsockopt(sockfd, level, optname, optval, optlen) \
-    setsockopt(sockfd, level, optname, (const void *)optval, optlen)
-#define qemu_recv(sockfd, buf, len, flags) recv(sockfd, (void *)buf, len, flags)
-#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \
-    sendto(sockfd, (const void *)buf, len, flags, destaddr, addrlen)
-#else
-#define qemu_getsockopt(sockfd, level, optname, optval, optlen) \
-    getsockopt(sockfd, level, optname, optval, optlen)
-#define qemu_setsockopt(sockfd, level, optname, optval, optlen) \
-    setsockopt(sockfd, level, optname, optval, optlen)
-#define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags)
-#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \
-    sendto(sockfd, buf, len, flags, destaddr, addrlen)
-#endif
-
-/* Error handling.  */
-
-void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
-
-struct ParallelIOArg {
-    void *buffer;
-    int count;
-};
-
-typedef int (*DMA_transfer_handler) (void *opaque, int nchan, int pos, int size);
-
-typedef uint64_t pcibus_t;
-
-typedef enum LostTickPolicy {
-    LOST_TICK_DISCARD,
-    LOST_TICK_DELAY,
-    LOST_TICK_MERGE,
-    LOST_TICK_SLEW,
-    LOST_TICK_MAX
-} LostTickPolicy;
-
-typedef struct PCIHostDeviceAddress {
-    unsigned int domain;
-    unsigned int bus;
-    unsigned int slot;
-    unsigned int function;
-} PCIHostDeviceAddress;
-
-void tcg_exec_init(unsigned long tb_size);
-bool tcg_enabled(void);
-
-void cpu_exec_init_all(void);
-
-/* CPU save/load.  */
-#ifdef CPU_SAVE_VERSION
-void cpu_save(QEMUFile *f, void *opaque);
-int cpu_load(QEMUFile *f, void *opaque, int version_id);
-#endif
-
-/* Unblock cpu */
-void qemu_cpu_kick_self(void);
-
-/* work queue */
-struct qemu_work_item {
-    struct qemu_work_item *next;
-    void (*func)(void *data);
-    void *data;
-    int done;
-    bool free;
-};
-
-
-/**
- * Sends a (part of) iovec down a socket, yielding when the socket is full, or
- * Receives data into a (part of) iovec from a socket,
- * yielding when there is no data in the socket.
- * The same interface as qemu_sendv_recvv(), with added yielding.
- * XXX should mark these as coroutine_fn
- */
-ssize_t qemu_co_sendv_recvv(int sockfd, struct iovec *iov, unsigned iov_cnt,
-                            size_t offset, size_t bytes, bool do_send);
-#define qemu_co_recvv(sockfd, iov, iov_cnt, offset, bytes) \
-  qemu_co_sendv_recvv(sockfd, iov, iov_cnt, offset, bytes, false)
-#define qemu_co_sendv(sockfd, iov, iov_cnt, offset, bytes) \
-  qemu_co_sendv_recvv(sockfd, iov, iov_cnt, offset, bytes, true)
-
-/**
- * The same as above, but with just a single buffer
- */
-ssize_t qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send);
-#define qemu_co_recv(sockfd, buf, bytes) \
-  qemu_co_send_recv(sockfd, buf, bytes, false)
-#define qemu_co_send(sockfd, buf, bytes) \
-  qemu_co_send_recv(sockfd, buf, bytes, true)
-
-typedef struct QEMUIOVector {
-    struct iovec *iov;
-    int niov;
-    int nalloc;
-    size_t size;
-} QEMUIOVector;
-
-void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint);
-void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov);
-void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len);
-void qemu_iovec_concat(QEMUIOVector *dst,
-                       QEMUIOVector *src, size_t soffset, size_t sbytes);
-void qemu_iovec_concat_iov(QEMUIOVector *dst,
-                           struct iovec *src_iov, unsigned int src_cnt,
-                           size_t soffset, size_t sbytes);
-void qemu_iovec_destroy(QEMUIOVector *qiov);
-void qemu_iovec_reset(QEMUIOVector *qiov);
-size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset,
-                         void *buf, size_t bytes);
-size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
-                           const void *buf, size_t bytes);
-size_t qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
-                         int fillc, size_t bytes);
-
-bool buffer_is_zero(const void *buf, size_t len);
-
-void qemu_progress_init(int enabled, float min_skip);
-void qemu_progress_end(void);
-void qemu_progress_print(float delta, int max);
-const char *qemu_get_vm_name(void);
-
-#define QEMU_FILE_TYPE_BIOS   0
-#define QEMU_FILE_TYPE_KEYMAP 1
-char *qemu_find_file(int type, const char *name);
-
-/* OS specific functions */
-void os_setup_early_signal_handling(void);
-char *os_find_datadir(const char *argv0);
-void os_parse_cmd_args(int index, const char *optarg);
-void os_pidfile_error(void);
-
-/* Convert a byte between binary and BCD.  */
-static inline uint8_t to_bcd(uint8_t val)
-{
-    return ((val / 10) << 4) | (val % 10);
-}
-
-static inline uint8_t from_bcd(uint8_t val)
-{
-    return ((val >> 4) * 10) + (val & 0x0f);
-}
-
-/* compute with 96 bit intermediate result: (a*b)/c */
-static inline uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
-{
-    union {
-        uint64_t ll;
-        struct {
-#ifdef HOST_WORDS_BIGENDIAN
-            uint32_t high, low;
-#else
-            uint32_t low, high;
-#endif
-        } l;
-    } u, res;
-    uint64_t rl, rh;
-
-    u.ll = a;
-    rl = (uint64_t)u.l.low * (uint64_t)b;
-    rh = (uint64_t)u.l.high * (uint64_t)b;
-    rh += (rl >> 32);
-    res.l.high = rh / c;
-    res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c;
-    return res.ll;
-}
-
-/* Round number down to multiple */
-#define QEMU_ALIGN_DOWN(n, m) ((n) / (m) * (m))
-
-/* Round number up to multiple */
-#define QEMU_ALIGN_UP(n, m) QEMU_ALIGN_DOWN((n) + (m) - 1, (m))
-
-static inline bool is_power_of_2(uint64_t value)
-{
-    if (!value) {
-        return 0;
-    }
-
-    return !(value & (value - 1));
-}
-
-/* round down to the nearest power of 2*/
-int64_t pow2floor(int64_t value);
-
-#include "qemu/module.h"
-
-/*
- * Implementation of ULEB128 (http://en.wikipedia.org/wiki/LEB128)
- * Input is limited to 14-bit numbers
- */
-
-int uleb128_encode_small(uint8_t *out, uint32_t n);
-int uleb128_decode_small(const uint8_t *in, uint32_t *n);
-
-/* unicode.c */
-int mod_utf8_codepoint(const char *s, size_t n, char **end);
-
-/*
- * Hexdump a buffer to a file. An optional string prefix is added to every line
- */
-
-void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
-
-/* vector definitions */
-#ifdef __ALTIVEC__
-#include <altivec.h>
-/* The altivec.h header says we're allowed to undef these for
- * C++ compatibility.  Here we don't care about C++, but we
- * undef them anyway to avoid namespace pollution.
- */
-#undef vector
-#undef pixel
-#undef bool
-#define VECTYPE        __vector unsigned char
-#define SPLAT(p)       vec_splat(vec_ld(0, p), 0)
-#define ALL_EQ(v1, v2) vec_all_eq(v1, v2)
-/* altivec.h may redefine the bool macro as vector type.
- * Reset it to POSIX semantics. */
-#define bool _Bool
-#elif defined __SSE2__
-#include <emmintrin.h>
-#define VECTYPE        __m128i
-#define SPLAT(p)       _mm_set1_epi8(*(p))
-#define ALL_EQ(v1, v2) (_mm_movemask_epi8(_mm_cmpeq_epi8(v1, v2)) == 0xFFFF)
-#else
-#define VECTYPE        unsigned long
-#define SPLAT(p)       (*(p) * (~0UL / 255))
-#define ALL_EQ(v1, v2) ((v1) == (v2))
-#endif
-
-#define BUFFER_FIND_NONZERO_OFFSET_UNROLL_FACTOR 8
-static inline bool
-can_use_buffer_find_nonzero_offset(const void *buf, size_t len)
-{
-    return (len % (BUFFER_FIND_NONZERO_OFFSET_UNROLL_FACTOR
-                   * sizeof(VECTYPE)) == 0
-            && ((uintptr_t) buf) % sizeof(VECTYPE) == 0);
-}
-size_t buffer_find_nonzero_offset(const void *buf, size_t len);
-
-/*
- * helper to parse debug environment variables
- */
-int parse_debug_env(const char *name, int max, int initial);
-
-#endif
diff --git a/contrib/qemu/include/qemu/aes.h b/contrib/qemu/include/qemu/aes.h
deleted file mode 100644
index e79c70743..000000000
--- a/contrib/qemu/include/qemu/aes.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef QEMU_AES_H
-#define QEMU_AES_H
-
-#define AES_MAXNR 14
-#define AES_BLOCK_SIZE 16
-
-struct aes_key_st {
-    uint32_t rd_key[4 *(AES_MAXNR + 1)];
-    int rounds;
-};
-typedef struct aes_key_st AES_KEY;
-
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-	AES_KEY *key);
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-	AES_KEY *key);
-
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-	const AES_KEY *key);
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-	const AES_KEY *key);
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-		     const unsigned long length, const AES_KEY *key,
-		     unsigned char *ivec, const int enc);
-
-/*
-AES_Te0[x] = S [x].[02, 01, 01, 03];
-AES_Te1[x] = S [x].[03, 02, 01, 01];
-AES_Te2[x] = S [x].[01, 03, 02, 01];
-AES_Te3[x] = S [x].[01, 01, 03, 02];
-AES_Te4[x] = S [x].[01, 01, 01, 01];
-
-AES_Td0[x] = Si[x].[0e, 09, 0d, 0b];
-AES_Td1[x] = Si[x].[0b, 0e, 09, 0d];
-AES_Td2[x] = Si[x].[0d, 0b, 0e, 09];
-AES_Td3[x] = Si[x].[09, 0d, 0b, 0e];
-AES_Td4[x] = Si[x].[01, 01, 01, 01];
-*/
-
-extern const uint32_t AES_Te0[256], AES_Te1[256], AES_Te2[256],
-                      AES_Te3[256], AES_Te4[256];
-extern const uint32_t AES_Td0[256], AES_Td1[256], AES_Td2[256],
-                      AES_Td3[256], AES_Td4[256];
-
-#endif
diff --git a/contrib/qemu/include/qemu/atomic.h b/contrib/qemu/include/qemu/atomic.h
deleted file mode 100644
index 0aa891330..000000000
--- a/contrib/qemu/include/qemu/atomic.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Simple interface for atomic operations.
- *
- * Copyright (C) 2013 Red Hat, Inc.
- *
- * Author: Paolo Bonzini <pbonzini@redhat.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#ifndef __QEMU_ATOMIC_H
-#define __QEMU_ATOMIC_H 1
-
-#include "qemu/compiler.h"
-
-/* For C11 atomic ops */
-
-/* Compiler barrier */
-#define barrier()   ({ asm volatile("" ::: "memory"); (void)0; })
-
-#ifndef __ATOMIC_RELAXED
-
-/*
- * We use GCC builtin if it's available, as that can use mfence on
- * 32-bit as well, e.g. if built with -march=pentium-m. However, on
- * i386 the spec is buggy, and the implementation followed it until
- * 4.3 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36793).
- */
-#if defined(__i386__) || defined(__x86_64__)
-#if !QEMU_GNUC_PREREQ(4, 4)
-#if defined __x86_64__
-#define smp_mb()    ({ asm volatile("mfence" ::: "memory"); (void)0; })
-#else
-#define smp_mb()    ({ asm volatile("lock; addl $0,0(%%esp) " ::: "memory"); (void)0; })
-#endif
-#endif
-#endif
-
-
-#ifdef __alpha__
-#define smp_read_barrier_depends()   asm volatile("mb":::"memory")
-#endif
-
-#if defined(__i386__) || defined(__x86_64__) || defined(__s390x__)
-
-/*
- * Because of the strongly ordered storage model, wmb() and rmb() are nops
- * here (a compiler barrier only).  QEMU doesn't do accesses to write-combining
- * qemu memory or non-temporal load/stores from C code.
- */
-#define smp_wmb()   barrier()
-#define smp_rmb()   barrier()
-
-/*
- * __sync_lock_test_and_set() is documented to be an acquire barrier only,
- * but it is a full barrier at the hardware level.  Add a compiler barrier
- * to make it a full barrier also at the compiler level.
- */
-#define atomic_xchg(ptr, i)    (barrier(), __sync_lock_test_and_set(ptr, i))
-
-/*
- * Load/store with Java volatile semantics.
- */
-#define atomic_mb_set(ptr, i)  ((void)atomic_xchg(ptr, i))
-
-#elif defined(_ARCH_PPC)
-
-/*
- * We use an eieio() for wmb() on powerpc.  This assumes we don't
- * need to order cacheable and non-cacheable stores with respect to
- * each other.
- *
- * smp_mb has the same problem as on x86 for not-very-new GCC
- * (http://patchwork.ozlabs.org/patch/126184/, Nov 2011).
- */
-#define smp_wmb()   ({ asm volatile("eieio" ::: "memory"); (void)0; })
-#if defined(__powerpc64__)
-#define smp_rmb()   ({ asm volatile("lwsync" ::: "memory"); (void)0; })
-#else
-#define smp_rmb()   ({ asm volatile("sync" ::: "memory"); (void)0; })
-#endif
-#define smp_mb()    ({ asm volatile("sync" ::: "memory"); (void)0; })
-
-#endif /* _ARCH_PPC */
-
-#endif /* C11 atomics */
-
-/*
- * For (host) platforms we don't have explicit barrier definitions
- * for, we use the gcc __sync_synchronize() primitive to generate a
- * full barrier.  This should be safe on all platforms, though it may
- * be overkill for smp_wmb() and smp_rmb().
- */
-#ifndef smp_mb
-#define smp_mb()    __sync_synchronize()
-#endif
-
-#ifndef smp_wmb
-#ifdef __ATOMIC_RELEASE
-#define smp_wmb()   __atomic_thread_fence(__ATOMIC_RELEASE)
-#else
-#define smp_wmb()   __sync_synchronize()
-#endif
-#endif
-
-#ifndef smp_rmb
-#ifdef __ATOMIC_ACQUIRE
-#define smp_rmb()   __atomic_thread_fence(__ATOMIC_ACQUIRE)
-#else
-#define smp_rmb()   __sync_synchronize()
-#endif
-#endif
-
-#ifndef smp_read_barrier_depends
-#ifdef __ATOMIC_CONSUME
-#define smp_read_barrier_depends()   __atomic_thread_fence(__ATOMIC_CONSUME)
-#else
-#define smp_read_barrier_depends()   barrier()
-#endif
-#endif
-
-#ifndef atomic_read
-#define atomic_read(ptr)       (*(__typeof__(*ptr) *volatile) (ptr))
-#endif
-
-#ifndef atomic_set
-#define atomic_set(ptr, i)     ((*(__typeof__(*ptr) *volatile) (ptr)) = (i))
-#endif
-
-/* These have the same semantics as Java volatile variables.
- * See http://gee.cs.oswego.edu/dl/jmm/cookbook.html:
- * "1. Issue a StoreStore barrier (wmb) before each volatile store."
- *  2. Issue a StoreLoad barrier after each volatile store.
- *     Note that you could instead issue one before each volatile load, but
- *     this would be slower for typical programs using volatiles in which
- *     reads greatly outnumber writes. Alternatively, if available, you
- *     can implement volatile store as an atomic instruction (for example
- *     XCHG on x86) and omit the barrier. This may be more efficient if
- *     atomic instructions are cheaper than StoreLoad barriers.
- *  3. Issue LoadLoad and LoadStore barriers after each volatile load."
- *
- * If you prefer to think in terms of "pairing" of memory barriers,
- * an atomic_mb_read pairs with an atomic_mb_set.
- *
- * And for the few ia64 lovers that exist, an atomic_mb_read is a ld.acq,
- * while an atomic_mb_set is a st.rel followed by a memory barrier.
- *
- * These are a bit weaker than __atomic_load/store with __ATOMIC_SEQ_CST
- * (see docs/atomics.txt), and I'm not sure that __ATOMIC_ACQ_REL is enough.
- * Just always use the barriers manually by the rules above.
- */
-#ifndef atomic_mb_read
-#define atomic_mb_read(ptr)    ({           \
-    typeof(*ptr) _val = atomic_read(ptr);   \
-    smp_rmb();                              \
-    _val;                                   \
-})
-#endif
-
-#ifndef atomic_mb_set
-#define atomic_mb_set(ptr, i)  do {         \
-    smp_wmb();                              \
-    atomic_set(ptr, i);                     \
-    smp_mb();                               \
-} while (0)
-#endif
-
-#ifndef atomic_xchg
-#ifdef __ATOMIC_SEQ_CST
-#define atomic_xchg(ptr, i)    ({                           \
-    typeof(*ptr) _new = (i), _old;                          \
-    __atomic_exchange(ptr, &_new, &_old, __ATOMIC_SEQ_CST); \
-    _old;                                                   \
-})
-#elif defined __clang__
-#define atomic_xchg(ptr, i)    __sync_exchange(ptr, i)
-#else
-/* __sync_lock_test_and_set() is documented to be an acquire barrier only.  */
-#define atomic_xchg(ptr, i)    (smp_mb(), __sync_lock_test_and_set(ptr, i))
-#endif
-#endif
-
-/* Provide shorter names for GCC atomic builtins.  */
-#define atomic_fetch_inc(ptr)  __sync_fetch_and_add(ptr, 1)
-#define atomic_fetch_dec(ptr)  __sync_fetch_and_add(ptr, -1)
-#define atomic_fetch_add       __sync_fetch_and_add
-#define atomic_fetch_sub       __sync_fetch_and_sub
-#define atomic_fetch_and       __sync_fetch_and_and
-#define atomic_fetch_or        __sync_fetch_and_or
-#define atomic_cmpxchg         __sync_val_compare_and_swap
-
-/* And even shorter names that return void.  */
-#define atomic_inc(ptr)        ((void) __sync_fetch_and_add(ptr, 1))
-#define atomic_dec(ptr)        ((void) __sync_fetch_and_add(ptr, -1))
-#define atomic_add(ptr, n)     ((void) __sync_fetch_and_add(ptr, n))
-#define atomic_sub(ptr, n)     ((void) __sync_fetch_and_sub(ptr, n))
-#define atomic_and(ptr, n)     ((void) __sync_fetch_and_and(ptr, n))
-#define atomic_or(ptr, n)      ((void) __sync_fetch_and_or(ptr, n))
-
-#endif
diff --git a/contrib/qemu/include/qemu/bitmap.h b/contrib/qemu/include/qemu/bitmap.h
deleted file mode 100644
index 308bbb71e..000000000
--- a/contrib/qemu/include/qemu/bitmap.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Bitmap Module
- *
- * Copyright (C) 2010 Corentin Chary <corentin.chary@gmail.com>
- *
- * Mostly inspired by (stolen from) linux/bitmap.h and linux/bitops.h
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#ifndef BITMAP_H
-#define BITMAP_H
-
-#include "qemu-common.h"
-#include "qemu/bitops.h"
-
-/*
- * The available bitmap operations and their rough meaning in the
- * case that the bitmap is a single unsigned long are thus:
- *
- * Note that nbits should be always a compile time evaluable constant.
- * Otherwise many inlines will generate horrible code.
- *
- * bitmap_zero(dst, nbits)			*dst = 0UL
- * bitmap_fill(dst, nbits)			*dst = ~0UL
- * bitmap_copy(dst, src, nbits)			*dst = *src
- * bitmap_and(dst, src1, src2, nbits)		*dst = *src1 & *src2
- * bitmap_or(dst, src1, src2, nbits)		*dst = *src1 | *src2
- * bitmap_xor(dst, src1, src2, nbits)		*dst = *src1 ^ *src2
- * bitmap_andnot(dst, src1, src2, nbits)	*dst = *src1 & ~(*src2)
- * bitmap_complement(dst, src, nbits)		*dst = ~(*src)
- * bitmap_equal(src1, src2, nbits)		Are *src1 and *src2 equal?
- * bitmap_intersects(src1, src2, nbits) 	Do *src1 and *src2 overlap?
- * bitmap_empty(src, nbits)			Are all bits zero in *src?
- * bitmap_full(src, nbits)			Are all bits set in *src?
- * bitmap_set(dst, pos, nbits)			Set specified bit area
- * bitmap_clear(dst, pos, nbits)		Clear specified bit area
- * bitmap_find_next_zero_area(buf, len, pos, n, mask)	Find bit free area
- */
-
-/*
- * Also the following operations apply to bitmaps.
- *
- * set_bit(bit, addr)			*addr |= bit
- * clear_bit(bit, addr)			*addr &= ~bit
- * change_bit(bit, addr)		*addr ^= bit
- * test_bit(bit, addr)			Is bit set in *addr?
- * test_and_set_bit(bit, addr)		Set bit and return old value
- * test_and_clear_bit(bit, addr)	Clear bit and return old value
- * test_and_change_bit(bit, addr)	Change bit and return old value
- * find_first_zero_bit(addr, nbits)	Position first zero bit in *addr
- * find_first_bit(addr, nbits)		Position first set bit in *addr
- * find_next_zero_bit(addr, nbits, bit)	Position next zero bit in *addr >= bit
- * find_next_bit(addr, nbits, bit)	Position next set bit in *addr >= bit
- */
-
-#define BITMAP_LAST_WORD_MASK(nbits)                                    \
-    (                                                                   \
-        ((nbits) % BITS_PER_LONG) ?                                     \
-        (1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL                       \
-        )
-
-#define DECLARE_BITMAP(name,bits)                  \
-	unsigned long name[BITS_TO_LONGS(bits)]
-
-#define small_nbits(nbits)                      \
-	((nbits) <= BITS_PER_LONG)
-
-int slow_bitmap_empty(const unsigned long *bitmap, int bits);
-int slow_bitmap_full(const unsigned long *bitmap, int bits);
-int slow_bitmap_equal(const unsigned long *bitmap1,
-                   const unsigned long *bitmap2, int bits);
-void slow_bitmap_complement(unsigned long *dst, const unsigned long *src,
-                         int bits);
-void slow_bitmap_shift_right(unsigned long *dst,
-                          const unsigned long *src, int shift, int bits);
-void slow_bitmap_shift_left(unsigned long *dst,
-                         const unsigned long *src, int shift, int bits);
-int slow_bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
-                 const unsigned long *bitmap2, int bits);
-void slow_bitmap_or(unsigned long *dst, const unsigned long *bitmap1,
-                 const unsigned long *bitmap2, int bits);
-void slow_bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,
-                  const unsigned long *bitmap2, int bits);
-int slow_bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
-                    const unsigned long *bitmap2, int bits);
-int slow_bitmap_intersects(const unsigned long *bitmap1,
-			const unsigned long *bitmap2, int bits);
-
-static inline unsigned long *bitmap_new(int nbits)
-{
-    int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
-    return g_malloc0(len);
-}
-
-static inline void bitmap_zero(unsigned long *dst, int nbits)
-{
-    if (small_nbits(nbits)) {
-        *dst = 0UL;
-    } else {
-        int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
-        memset(dst, 0, len);
-    }
-}
-
-static inline void bitmap_fill(unsigned long *dst, int nbits)
-{
-    size_t nlongs = BITS_TO_LONGS(nbits);
-    if (!small_nbits(nbits)) {
-        int len = (nlongs - 1) * sizeof(unsigned long);
-        memset(dst, 0xff,  len);
-    }
-    dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits);
-}
-
-static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,
-                               int nbits)
-{
-    if (small_nbits(nbits)) {
-        *dst = *src;
-    } else {
-        int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
-        memcpy(dst, src, len);
-    }
-}
-
-static inline int bitmap_and(unsigned long *dst, const unsigned long *src1,
-                             const unsigned long *src2, int nbits)
-{
-    if (small_nbits(nbits)) {
-        return (*dst = *src1 & *src2) != 0;
-    }
-    return slow_bitmap_and(dst, src1, src2, nbits);
-}
-
-static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
-			const unsigned long *src2, int nbits)
-{
-    if (small_nbits(nbits)) {
-        *dst = *src1 | *src2;
-    } else {
-        slow_bitmap_or(dst, src1, src2, nbits);
-    }
-}
-
-static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,
-			const unsigned long *src2, int nbits)
-{
-    if (small_nbits(nbits)) {
-        *dst = *src1 ^ *src2;
-    } else {
-        slow_bitmap_xor(dst, src1, src2, nbits);
-    }
-}
-
-static inline int bitmap_andnot(unsigned long *dst, const unsigned long *src1,
-			const unsigned long *src2, int nbits)
-{
-    if (small_nbits(nbits)) {
-        return (*dst = *src1 & ~(*src2)) != 0;
-    }
-    return slow_bitmap_andnot(dst, src1, src2, nbits);
-}
-
-static inline void bitmap_complement(unsigned long *dst, const unsigned long *src,
-			int nbits)
-{
-    if (small_nbits(nbits)) {
-        *dst = ~(*src) & BITMAP_LAST_WORD_MASK(nbits);
-    } else {
-        slow_bitmap_complement(dst, src, nbits);
-    }
-}
-
-static inline int bitmap_equal(const unsigned long *src1,
-			const unsigned long *src2, int nbits)
-{
-    if (small_nbits(nbits)) {
-        return ! ((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits));
-    } else {
-        return slow_bitmap_equal(src1, src2, nbits);
-    }
-}
-
-static inline int bitmap_empty(const unsigned long *src, int nbits)
-{
-    if (small_nbits(nbits)) {
-        return ! (*src & BITMAP_LAST_WORD_MASK(nbits));
-    } else {
-        return slow_bitmap_empty(src, nbits);
-    }
-}
-
-static inline int bitmap_full(const unsigned long *src, int nbits)
-{
-    if (small_nbits(nbits)) {
-        return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
-    } else {
-        return slow_bitmap_full(src, nbits);
-    }
-}
-
-static inline int bitmap_intersects(const unsigned long *src1,
-			const unsigned long *src2, int nbits)
-{
-    if (small_nbits(nbits)) {
-        return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0;
-    } else {
-        return slow_bitmap_intersects(src1, src2, nbits);
-    }
-}
-
-void bitmap_set(unsigned long *map, int i, int len);
-void bitmap_clear(unsigned long *map, int start, int nr);
-unsigned long bitmap_find_next_zero_area(unsigned long *map,
-					 unsigned long size,
-					 unsigned long start,
-					 unsigned int nr,
-					 unsigned long align_mask);
-
-#endif /* BITMAP_H */
diff --git a/contrib/qemu/include/qemu/bitops.h b/contrib/qemu/include/qemu/bitops.h
deleted file mode 100644
index affcc969d..000000000
--- a/contrib/qemu/include/qemu/bitops.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Bitops Module
- *
- * Copyright (C) 2010 Corentin Chary <corentin.chary@gmail.com>
- *
- * Mostly inspired by (stolen from) linux/bitmap.h and linux/bitops.h
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#ifndef BITOPS_H
-#define BITOPS_H
-
-#include "qemu-common.h"
-#include "host-utils.h"
-
-#define BITS_PER_BYTE           CHAR_BIT
-#define BITS_PER_LONG           (sizeof (unsigned long) * BITS_PER_BYTE)
-
-#define BIT(nr)			(1UL << (nr))
-#define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))
-#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
-#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
-
-/**
- * set_bit - Set a bit in memory
- * @nr: the bit to set
- * @addr: the address to start counting from
- */
-static inline void set_bit(int nr, unsigned long *addr)
-{
-	unsigned long mask = BIT_MASK(nr);
-        unsigned long *p = addr + BIT_WORD(nr);
-
-	*p  |= mask;
-}
-
-/**
- * clear_bit - Clears a bit in memory
- * @nr: Bit to clear
- * @addr: Address to start counting from
- */
-static inline void clear_bit(int nr, unsigned long *addr)
-{
-	unsigned long mask = BIT_MASK(nr);
-        unsigned long *p = addr + BIT_WORD(nr);
-
-	*p &= ~mask;
-}
-
-/**
- * change_bit - Toggle a bit in memory
- * @nr: Bit to change
- * @addr: Address to start counting from
- */
-static inline void change_bit(int nr, unsigned long *addr)
-{
-	unsigned long mask = BIT_MASK(nr);
-        unsigned long *p = addr + BIT_WORD(nr);
-
-	*p ^= mask;
-}
-
-/**
- * test_and_set_bit - Set a bit and return its old value
- * @nr: Bit to set
- * @addr: Address to count from
- */
-static inline int test_and_set_bit(int nr, unsigned long *addr)
-{
-	unsigned long mask = BIT_MASK(nr);
-        unsigned long *p = addr + BIT_WORD(nr);
-	unsigned long old = *p;
-
-	*p = old | mask;
-	return (old & mask) != 0;
-}
-
-/**
- * test_and_clear_bit - Clear a bit and return its old value
- * @nr: Bit to clear
- * @addr: Address to count from
- */
-static inline int test_and_clear_bit(int nr, unsigned long *addr)
-{
-	unsigned long mask = BIT_MASK(nr);
-        unsigned long *p = addr + BIT_WORD(nr);
-	unsigned long old = *p;
-
-	*p = old & ~mask;
-	return (old & mask) != 0;
-}
-
-/**
- * test_and_change_bit - Change a bit and return its old value
- * @nr: Bit to change
- * @addr: Address to count from
- */
-static inline int test_and_change_bit(int nr, unsigned long *addr)
-{
-	unsigned long mask = BIT_MASK(nr);
-        unsigned long *p = addr + BIT_WORD(nr);
-	unsigned long old = *p;
-
-	*p = old ^ mask;
-	return (old & mask) != 0;
-}
-
-/**
- * test_bit - Determine whether a bit is set
- * @nr: bit number to test
- * @addr: Address to start counting from
- */
-static inline int test_bit(int nr, const unsigned long *addr)
-{
-	return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1)));
-}
-
-/**
- * find_last_bit - find the last set bit in a memory region
- * @addr: The address to start the search at
- * @size: The maximum size to search
- *
- * Returns the bit number of the first set bit, or size.
- */
-unsigned long find_last_bit(const unsigned long *addr,
-                            unsigned long size);
-
-/**
- * find_next_bit - find the next set bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The bitmap size in bits
- */
-unsigned long find_next_bit(const unsigned long *addr,
-				   unsigned long size, unsigned long offset);
-
-/**
- * find_next_zero_bit - find the next cleared bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The bitmap size in bits
- */
-
-unsigned long find_next_zero_bit(const unsigned long *addr,
-                                 unsigned long size,
-                                 unsigned long offset);
-
-/**
- * find_first_bit - find the first set bit in a memory region
- * @addr: The address to start the search at
- * @size: The maximum size to search
- *
- * Returns the bit number of the first set bit.
- */
-static inline unsigned long find_first_bit(const unsigned long *addr,
-                                           unsigned long size)
-{
-    return find_next_bit(addr, size, 0);
-}
-
-/**
- * find_first_zero_bit - find the first cleared bit in a memory region
- * @addr: The address to start the search at
- * @size: The maximum size to search
- *
- * Returns the bit number of the first cleared bit.
- */
-static inline unsigned long find_first_zero_bit(const unsigned long *addr,
-                                                unsigned long size)
-{
-    return find_next_zero_bit(addr, size, 0);
-}
-
-static inline unsigned long hweight_long(unsigned long w)
-{
-    unsigned long count;
-
-    for (count = 0; w; w >>= 1) {
-        count += w & 1;
-    }
-    return count;
-}
-
-/**
- * extract32:
- * @value: the value to extract the bit field from
- * @start: the lowest bit in the bit field (numbered from 0)
- * @length: the length of the bit field
- *
- * Extract from the 32 bit input @value the bit field specified by the
- * @start and @length parameters, and return it. The bit field must
- * lie entirely within the 32 bit word. It is valid to request that
- * all 32 bits are returned (ie @length 32 and @start 0).
- *
- * Returns: the value of the bit field extracted from the input value.
- */
-static inline uint32_t extract32(uint32_t value, int start, int length)
-{
-    assert(start >= 0 && length > 0 && length <= 32 - start);
-    return (value >> start) & (~0U >> (32 - length));
-}
-
-/**
- * extract64:
- * @value: the value to extract the bit field from
- * @start: the lowest bit in the bit field (numbered from 0)
- * @length: the length of the bit field
- *
- * Extract from the 64 bit input @value the bit field specified by the
- * @start and @length parameters, and return it. The bit field must
- * lie entirely within the 64 bit word. It is valid to request that
- * all 64 bits are returned (ie @length 64 and @start 0).
- *
- * Returns: the value of the bit field extracted from the input value.
- */
-static inline uint64_t extract64(uint64_t value, int start, int length)
-{
-    assert(start >= 0 && length > 0 && length <= 64 - start);
-    return (value >> start) & (~0ULL >> (64 - length));
-}
-
-/**
- * deposit32:
- * @value: initial value to insert bit field into
- * @start: the lowest bit in the bit field (numbered from 0)
- * @length: the length of the bit field
- * @fieldval: the value to insert into the bit field
- *
- * Deposit @fieldval into the 32 bit @value at the bit field specified
- * by the @start and @length parameters, and return the modified
- * @value. Bits of @value outside the bit field are not modified.
- * Bits of @fieldval above the least significant @length bits are
- * ignored. The bit field must lie entirely within the 32 bit word.
- * It is valid to request that all 32 bits are modified (ie @length
- * 32 and @start 0).
- *
- * Returns: the modified @value.
- */
-static inline uint32_t deposit32(uint32_t value, int start, int length,
-                                 uint32_t fieldval)
-{
-    uint32_t mask;
-    assert(start >= 0 && length > 0 && length <= 32 - start);
-    mask = (~0U >> (32 - length)) << start;
-    return (value & ~mask) | ((fieldval << start) & mask);
-}
-
-/**
- * deposit64:
- * @value: initial value to insert bit field into
- * @start: the lowest bit in the bit field (numbered from 0)
- * @length: the length of the bit field
- * @fieldval: the value to insert into the bit field
- *
- * Deposit @fieldval into the 64 bit @value at the bit field specified
- * by the @start and @length parameters, and return the modified
- * @value. Bits of @value outside the bit field are not modified.
- * Bits of @fieldval above the least significant @length bits are
- * ignored. The bit field must lie entirely within the 64 bit word.
- * It is valid to request that all 64 bits are modified (ie @length
- * 64 and @start 0).
- *
- * Returns: the modified @value.
- */
-static inline uint64_t deposit64(uint64_t value, int start, int length,
-                                 uint64_t fieldval)
-{
-    uint64_t mask;
-    assert(start >= 0 && length > 0 && length <= 64 - start);
-    mask = (~0ULL >> (64 - length)) << start;
-    return (value & ~mask) | ((fieldval << start) & mask);
-}
-
-#endif
diff --git a/contrib/qemu/include/qemu/bswap.h b/contrib/qemu/include/qemu/bswap.h
deleted file mode 100644
index 14a5f657c..000000000
--- a/contrib/qemu/include/qemu/bswap.h
+++ /dev/null
@@ -1,478 +0,0 @@
-#ifndef BSWAP_H
-#define BSWAP_H
-
-#include "config-host.h"
-#include <inttypes.h>
-#include <limits.h>
-#include <string.h>
-#include "fpu/softfloat.h"
-
-#ifdef CONFIG_MACHINE_BSWAP_H
-# include <sys/endian.h>
-# include <sys/types.h>
-# include <machine/bswap.h>
-#elif defined(CONFIG_BYTESWAP_H)
-# include <byteswap.h>
-
-static inline uint16_t bswap16(uint16_t x)
-{
-    return bswap_16(x);
-}
-
-static inline uint32_t bswap32(uint32_t x)
-{
-    return bswap_32(x);
-}
-
-static inline uint64_t bswap64(uint64_t x)
-{
-    return bswap_64(x);
-}
-# else
-static inline uint16_t bswap16(uint16_t x)
-{
-    return (((x & 0x00ff) << 8) |
-            ((x & 0xff00) >> 8));
-}
-
-static inline uint32_t bswap32(uint32_t x)
-{
-    return (((x & 0x000000ffU) << 24) |
-            ((x & 0x0000ff00U) <<  8) |
-            ((x & 0x00ff0000U) >>  8) |
-            ((x & 0xff000000U) >> 24));
-}
-
-static inline uint64_t bswap64(uint64_t x)
-{
-    return (((x & 0x00000000000000ffULL) << 56) |
-            ((x & 0x000000000000ff00ULL) << 40) |
-            ((x & 0x0000000000ff0000ULL) << 24) |
-            ((x & 0x00000000ff000000ULL) <<  8) |
-            ((x & 0x000000ff00000000ULL) >>  8) |
-            ((x & 0x0000ff0000000000ULL) >> 24) |
-            ((x & 0x00ff000000000000ULL) >> 40) |
-            ((x & 0xff00000000000000ULL) >> 56));
-}
-#endif /* ! CONFIG_MACHINE_BSWAP_H */
-
-static inline void bswap16s(uint16_t *s)
-{
-    *s = bswap16(*s);
-}
-
-static inline void bswap32s(uint32_t *s)
-{
-    *s = bswap32(*s);
-}
-
-static inline void bswap64s(uint64_t *s)
-{
-    *s = bswap64(*s);
-}
-
-#if defined(HOST_WORDS_BIGENDIAN)
-#define be_bswap(v, size) (v)
-#define le_bswap(v, size) glue(bswap, size)(v)
-#define be_bswaps(v, size)
-#define le_bswaps(p, size) do { *p = glue(bswap, size)(*p); } while(0)
-#else
-#define le_bswap(v, size) (v)
-#define be_bswap(v, size) glue(bswap, size)(v)
-#define le_bswaps(v, size)
-#define be_bswaps(p, size) do { *p = glue(bswap, size)(*p); } while(0)
-#endif
-
-#define CPU_CONVERT(endian, size, type)\
-static inline type endian ## size ## _to_cpu(type v)\
-{\
-    return glue(endian, _bswap)(v, size);\
-}\
-\
-static inline type cpu_to_ ## endian ## size(type v)\
-{\
-    return glue(endian, _bswap)(v, size);\
-}\
-\
-static inline void endian ## size ## _to_cpus(type *p)\
-{\
-    glue(endian, _bswaps)(p, size);\
-}\
-\
-static inline void cpu_to_ ## endian ## size ## s(type *p)\
-{\
-    glue(endian, _bswaps)(p, size);\
-}\
-\
-static inline type endian ## size ## _to_cpup(const type *p)\
-{\
-    return glue(glue(endian, size), _to_cpu)(*p);\
-}\
-\
-static inline void cpu_to_ ## endian ## size ## w(type *p, type v)\
-{\
-    *p = glue(glue(cpu_to_, endian), size)(v);\
-}
-
-CPU_CONVERT(be, 16, uint16_t)
-CPU_CONVERT(be, 32, uint32_t)
-CPU_CONVERT(be, 64, uint64_t)
-
-CPU_CONVERT(le, 16, uint16_t)
-CPU_CONVERT(le, 32, uint32_t)
-CPU_CONVERT(le, 64, uint64_t)
-
-/* len must be one of 1, 2, 4 */
-static inline uint32_t qemu_bswap_len(uint32_t value, int len)
-{
-    return bswap32(value) >> (32 - 8 * len);
-}
-
-/* Unions for reinterpreting between floats and integers.  */
-
-typedef union {
-    float32 f;
-    uint32_t l;
-} CPU_FloatU;
-
-typedef union {
-    float64 d;
-#if defined(HOST_WORDS_BIGENDIAN)
-    struct {
-        uint32_t upper;
-        uint32_t lower;
-    } l;
-#else
-    struct {
-        uint32_t lower;
-        uint32_t upper;
-    } l;
-#endif
-    uint64_t ll;
-} CPU_DoubleU;
-
-typedef union {
-     floatx80 d;
-     struct {
-         uint64_t lower;
-         uint16_t upper;
-     } l;
-} CPU_LDoubleU;
-
-typedef union {
-    float128 q;
-#if defined(HOST_WORDS_BIGENDIAN)
-    struct {
-        uint32_t upmost;
-        uint32_t upper;
-        uint32_t lower;
-        uint32_t lowest;
-    } l;
-    struct {
-        uint64_t upper;
-        uint64_t lower;
-    } ll;
-#else
-    struct {
-        uint32_t lowest;
-        uint32_t lower;
-        uint32_t upper;
-        uint32_t upmost;
-    } l;
-    struct {
-        uint64_t lower;
-        uint64_t upper;
-    } ll;
-#endif
-} CPU_QuadU;
-
-/* unaligned/endian-independent pointer access */
-
-/*
- * the generic syntax is:
- *
- * load: ld{type}{sign}{size}{endian}_p(ptr)
- *
- * store: st{type}{size}{endian}_p(ptr, val)
- *
- * Note there are small differences with the softmmu access API!
- *
- * type is:
- * (empty): integer access
- *   f    : float access
- *
- * sign is:
- * (empty): for floats or 32 bit size
- *   u    : unsigned
- *   s    : signed
- *
- * size is:
- *   b: 8 bits
- *   w: 16 bits
- *   l: 32 bits
- *   q: 64 bits
- *
- * endian is:
- * (empty): host endian
- *   be   : big endian
- *   le   : little endian
- */
-
-static inline int ldub_p(const void *ptr)
-{
-    return *(uint8_t *)ptr;
-}
-
-static inline int ldsb_p(const void *ptr)
-{
-    return *(int8_t *)ptr;
-}
-
-static inline void stb_p(void *ptr, int v)
-{
-    *(uint8_t *)ptr = v;
-}
-
-/* Any compiler worth its salt will turn these memcpy into native unaligned
-   operations.  Thus we don't need to play games with packed attributes, or
-   inline byte-by-byte stores.  */
-
-static inline int lduw_p(const void *ptr)
-{
-    uint16_t r;
-    memcpy(&r, ptr, sizeof(r));
-    return r;
-}
-
-static inline int ldsw_p(const void *ptr)
-{
-    int16_t r;
-    memcpy(&r, ptr, sizeof(r));
-    return r;
-}
-
-static inline void stw_p(void *ptr, uint16_t v)
-{
-    memcpy(ptr, &v, sizeof(v));
-}
-
-static inline int ldl_p(const void *ptr)
-{
-    int32_t r;
-    memcpy(&r, ptr, sizeof(r));
-    return r;
-}
-
-static inline void stl_p(void *ptr, uint32_t v)
-{
-    memcpy(ptr, &v, sizeof(v));
-}
-
-static inline uint64_t ldq_p(const void *ptr)
-{
-    uint64_t r;
-    memcpy(&r, ptr, sizeof(r));
-    return r;
-}
-
-static inline void stq_p(void *ptr, uint64_t v)
-{
-    memcpy(ptr, &v, sizeof(v));
-}
-
-static inline int lduw_le_p(const void *ptr)
-{
-    return (uint16_t)le_bswap(lduw_p(ptr), 16);
-}
-
-static inline int ldsw_le_p(const void *ptr)
-{
-    return (int16_t)le_bswap(lduw_p(ptr), 16);
-}
-
-static inline int ldl_le_p(const void *ptr)
-{
-    return le_bswap(ldl_p(ptr), 32);
-}
-
-static inline uint64_t ldq_le_p(const void *ptr)
-{
-    return le_bswap(ldq_p(ptr), 64);
-}
-
-static inline void stw_le_p(void *ptr, int v)
-{
-    stw_p(ptr, le_bswap(v, 16));
-}
-
-static inline void stl_le_p(void *ptr, int v)
-{
-    stl_p(ptr, le_bswap(v, 32));
-}
-
-static inline void stq_le_p(void *ptr, uint64_t v)
-{
-    stq_p(ptr, le_bswap(v, 64));
-}
-
-/* float access */
-
-static inline float32 ldfl_le_p(const void *ptr)
-{
-    CPU_FloatU u;
-    u.l = ldl_le_p(ptr);
-    return u.f;
-}
-
-static inline void stfl_le_p(void *ptr, float32 v)
-{
-    CPU_FloatU u;
-    u.f = v;
-    stl_le_p(ptr, u.l);
-}
-
-static inline float64 ldfq_le_p(const void *ptr)
-{
-    CPU_DoubleU u;
-    u.ll = ldq_le_p(ptr);
-    return u.d;
-}
-
-static inline void stfq_le_p(void *ptr, float64 v)
-{
-    CPU_DoubleU u;
-    u.d = v;
-    stq_le_p(ptr, u.ll);
-}
-
-static inline int lduw_be_p(const void *ptr)
-{
-    return (uint16_t)be_bswap(lduw_p(ptr), 16);
-}
-
-static inline int ldsw_be_p(const void *ptr)
-{
-    return (int16_t)be_bswap(lduw_p(ptr), 16);
-}
-
-static inline int ldl_be_p(const void *ptr)
-{
-    return be_bswap(ldl_p(ptr), 32);
-}
-
-static inline uint64_t ldq_be_p(const void *ptr)
-{
-    return be_bswap(ldq_p(ptr), 64);
-}
-
-static inline void stw_be_p(void *ptr, int v)
-{
-    stw_p(ptr, be_bswap(v, 16));
-}
-
-static inline void stl_be_p(void *ptr, int v)
-{
-    stl_p(ptr, be_bswap(v, 32));
-}
-
-static inline void stq_be_p(void *ptr, uint64_t v)
-{
-    stq_p(ptr, be_bswap(v, 64));
-}
-
-/* float access */
-
-static inline float32 ldfl_be_p(const void *ptr)
-{
-    CPU_FloatU u;
-    u.l = ldl_be_p(ptr);
-    return u.f;
-}
-
-static inline void stfl_be_p(void *ptr, float32 v)
-{
-    CPU_FloatU u;
-    u.f = v;
-    stl_be_p(ptr, u.l);
-}
-
-static inline float64 ldfq_be_p(const void *ptr)
-{
-    CPU_DoubleU u;
-    u.ll = ldq_be_p(ptr);
-    return u.d;
-}
-
-static inline void stfq_be_p(void *ptr, float64 v)
-{
-    CPU_DoubleU u;
-    u.d = v;
-    stq_be_p(ptr, u.ll);
-}
-
-/* Legacy unaligned versions.  Note that we never had a complete set.  */
-
-static inline void cpu_to_le16wu(uint16_t *p, uint16_t v)
-{
-    stw_le_p(p, v);
-}
-
-static inline void cpu_to_le32wu(uint32_t *p, uint32_t v)
-{
-    stl_le_p(p, v);
-}
-
-static inline uint16_t le16_to_cpupu(const uint16_t *p)
-{
-    return lduw_le_p(p);
-}
-
-static inline uint32_t le32_to_cpupu(const uint32_t *p)
-{
-    return ldl_le_p(p);
-}
-
-static inline uint32_t be32_to_cpupu(const uint32_t *p)
-{
-    return ldl_be_p(p);
-}
-
-static inline void cpu_to_be16wu(uint16_t *p, uint16_t v)
-{
-    stw_be_p(p, v);
-}
-
-static inline void cpu_to_be32wu(uint32_t *p, uint32_t v)
-{
-    stl_be_p(p, v);
-}
-
-static inline void cpu_to_be64wu(uint64_t *p, uint64_t v)
-{
-    stq_be_p(p, v);
-}
-
-static inline void cpu_to_32wu(uint32_t *p, uint32_t v)
-{
-    stl_p(p, v);
-}
-
-static inline unsigned long leul_to_cpu(unsigned long v)
-{
-    /* In order to break an include loop between here and
-       qemu-common.h, don't rely on HOST_LONG_BITS.  */
-#if ULONG_MAX == UINT32_MAX
-    return le_bswap(v, 32);
-#elif ULONG_MAX == UINT64_MAX
-    return le_bswap(v, 64);
-#else
-# error Unknown sizeof long
-#endif
-}
-
-#undef le_bswap
-#undef be_bswap
-#undef le_bswaps
-#undef be_bswaps
-
-#endif /* BSWAP_H */
diff --git a/contrib/qemu/include/qemu/compiler.h b/contrib/qemu/include/qemu/compiler.h
deleted file mode 100644
index 155b35896..000000000
--- a/contrib/qemu/include/qemu/compiler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* public domain */
-
-#ifndef COMPILER_H
-#define COMPILER_H
-
-#include "config-host.h"
-
-/*----------------------------------------------------------------------------
-| The macro QEMU_GNUC_PREREQ tests for minimum version of the GNU C compiler.
-| The code is a copy of SOFTFLOAT_GNUC_PREREQ, see softfloat-macros.h.
-*----------------------------------------------------------------------------*/
-#if defined(__GNUC__) && defined(__GNUC_MINOR__)
-# define QEMU_GNUC_PREREQ(maj, min) \
-         ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-# define QEMU_GNUC_PREREQ(maj, min) 0
-#endif
-
-#define QEMU_NORETURN __attribute__ ((__noreturn__))
-
-#if QEMU_GNUC_PREREQ(3, 4)
-#define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#else
-#define QEMU_WARN_UNUSED_RESULT
-#endif
-
-#if defined(_WIN32)
-# define QEMU_PACKED __attribute__((gcc_struct, packed))
-#else
-# define QEMU_PACKED __attribute__((packed))
-#endif
-
-#define cat(x,y) x ## y
-#define cat2(x,y) cat(x,y)
-#define QEMU_BUILD_BUG_ON(x) \
-    typedef char cat2(qemu_build_bug_on__,__LINE__)[(x)?-1:1] __attribute__((unused));
-
-#if defined __GNUC__
-# if !QEMU_GNUC_PREREQ(4, 4)
-   /* gcc versions before 4.4.x don't support gnu_printf, so use printf. */
-#  define GCC_FMT_ATTR(n, m) __attribute__((format(printf, n, m)))
-# else
-   /* Use gnu_printf when supported (qemu uses standard format strings). */
-#  define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m)))
-#  if defined(_WIN32)
-    /* Map __printf__ to __gnu_printf__ because we want standard format strings
-     * even when MinGW or GLib include files use __printf__. */
-#   define __printf__ __gnu_printf__
-#  endif
-# endif
-#else
-#define GCC_FMT_ATTR(n, m)
-#endif
-
-#endif /* COMPILER_H */
diff --git a/contrib/qemu/include/qemu/error-report.h b/contrib/qemu/include/qemu/error-report.h
deleted file mode 100644
index 3b098a917..000000000
--- a/contrib/qemu/include/qemu/error-report.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Error reporting
- *
- * Copyright (C) 2010 Red Hat Inc.
- *
- * Authors:
- *  Markus Armbruster <armbru@redhat.com>,
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#ifndef QEMU_ERROR_H
-#define QEMU_ERROR_H
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include "qemu/compiler.h"
-
-typedef struct Location {
-    /* all members are private to qemu-error.c */
-    enum { LOC_NONE, LOC_CMDLINE, LOC_FILE } kind;
-    int num;
-    const void *ptr;
-    struct Location *prev;
-} Location;
-
-Location *loc_push_restore(Location *loc);
-Location *loc_push_none(Location *loc);
-Location *loc_pop(Location *loc);
-Location *loc_save(Location *loc);
-void loc_restore(Location *loc);
-void loc_set_none(void);
-void loc_set_cmdline(char **argv, int idx, int cnt);
-void loc_set_file(const char *fname, int lno);
-
-void error_vprintf(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0);
-void error_printf(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
-void error_printf_unless_qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
-void error_print_loc(void);
-void error_set_progname(const char *argv0);
-void error_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
-const char *error_get_progname(void);
-extern bool enable_timestamp_msg;
-
-#endif
diff --git a/contrib/qemu/include/qemu/event_notifier.h b/contrib/qemu/include/qemu/event_notifier.h
deleted file mode 100644
index 88b57af7c..000000000
--- a/contrib/qemu/include/qemu/event_notifier.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * event notifier support
- *
- * Copyright Red Hat, Inc. 2010
- *
- * Authors:
- *  Michael S. Tsirkin <mst@redhat.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#ifndef QEMU_EVENT_NOTIFIER_H
-#define QEMU_EVENT_NOTIFIER_H
-
-#include "qemu-common.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-struct EventNotifier {
-#ifdef _WIN32
-    HANDLE event;
-#else
-    int rfd;
-    int wfd;
-#endif
-};
-
-typedef void EventNotifierHandler(EventNotifier *);
-
-int event_notifier_init(EventNotifier *, int active);
-void event_notifier_cleanup(EventNotifier *);
-int event_notifier_set(EventNotifier *);
-int event_notifier_test_and_clear(EventNotifier *);
-int event_notifier_set_handler(EventNotifier *, EventNotifierHandler *);
-
-#ifdef CONFIG_POSIX
-void event_notifier_init_fd(EventNotifier *, int fd);
-int event_notifier_get_fd(EventNotifier *);
-#else
-HANDLE event_notifier_get_handle(EventNotifier *);
-#endif
-
-#endif
diff --git a/contrib/qemu/include/qemu/hbitmap.h b/contrib/qemu/include/qemu/hbitmap.h
deleted file mode 100644
index 550d7ce2c..000000000
--- a/contrib/qemu/include/qemu/hbitmap.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Hierarchical Bitmap Data Type
- *
- * Copyright Red Hat, Inc., 2012
- *
- * Author: Paolo Bonzini <pbonzini@redhat.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or
- * later.  See the COPYING file in the top-level directory.
- */
-
-#ifndef HBITMAP_H
-#define HBITMAP_H 1
-
-#include <limits.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include "bitops.h"
-#include "host-utils.h"
-
-typedef struct HBitmap HBitmap;
-typedef struct HBitmapIter HBitmapIter;
-
-#define BITS_PER_LEVEL         (BITS_PER_LONG == 32 ? 5 : 6)
-
-/* For 32-bit, the largest that fits in a 4 GiB address space.
- * For 64-bit, the number of sectors in 1 PiB.  Good luck, in
- * either case... :)
- */
-#define HBITMAP_LOG_MAX_SIZE   (BITS_PER_LONG == 32 ? 34 : 41)
-
-/* We need to place a sentinel in level 0 to speed up iteration.  Thus,
- * we do this instead of HBITMAP_LOG_MAX_SIZE / BITS_PER_LEVEL.  The
- * difference is that it allocates an extra level when HBITMAP_LOG_MAX_SIZE
- * is an exact multiple of BITS_PER_LEVEL.
- */
-#define HBITMAP_LEVELS         ((HBITMAP_LOG_MAX_SIZE / BITS_PER_LEVEL) + 1)
-
-struct HBitmapIter {
-    const HBitmap *hb;
-
-    /* Copied from hb for access in the inline functions (hb is opaque).  */
-    int granularity;
-
-    /* Entry offset into the last-level array of longs.  */
-    size_t pos;
-
-    /* The currently-active path in the tree.  Each item of cur[i] stores
-     * the bits (i.e. the subtrees) yet to be processed under that node.
-     */
-    unsigned long cur[HBITMAP_LEVELS];
-};
-
-/**
- * hbitmap_alloc:
- * @size: Number of bits in the bitmap.
- * @granularity: Granularity of the bitmap.  Aligned groups of 2^@granularity
- * bits will be represented by a single bit.  Each operation on a
- * range of bits first rounds the bits to determine which group they land
- * in, and then affect the entire set; iteration will only visit the first
- * bit of each group.
- *
- * Allocate a new HBitmap.
- */
-HBitmap *hbitmap_alloc(uint64_t size, int granularity);
-
-/**
- * hbitmap_empty:
- * @hb: HBitmap to operate on.
- *
- * Return whether the bitmap is empty.
- */
-bool hbitmap_empty(const HBitmap *hb);
-
-/**
- * hbitmap_granularity:
- * @hb: HBitmap to operate on.
- *
- * Return the granularity of the HBitmap.
- */
-int hbitmap_granularity(const HBitmap *hb);
-
-/**
- * hbitmap_count:
- * @hb: HBitmap to operate on.
- *
- * Return the number of bits set in the HBitmap.
- */
-uint64_t hbitmap_count(const HBitmap *hb);
-
-/**
- * hbitmap_set:
- * @hb: HBitmap to operate on.
- * @start: First bit to set (0-based).
- * @count: Number of bits to set.
- *
- * Set a consecutive range of bits in an HBitmap.
- */
-void hbitmap_set(HBitmap *hb, uint64_t start, uint64_t count);
-
-/**
- * hbitmap_reset:
- * @hb: HBitmap to operate on.
- * @start: First bit to reset (0-based).
- * @count: Number of bits to reset.
- *
- * Reset a consecutive range of bits in an HBitmap.
- */
-void hbitmap_reset(HBitmap *hb, uint64_t start, uint64_t count);
-
-/**
- * hbitmap_get:
- * @hb: HBitmap to operate on.
- * @item: Bit to query (0-based).
- *
- * Return whether the @item-th bit in an HBitmap is set.
- */
-bool hbitmap_get(const HBitmap *hb, uint64_t item);
-
-/**
- * hbitmap_free:
- * @hb: HBitmap to operate on.
- *
- * Free an HBitmap and all of its associated memory.
- */
-void hbitmap_free(HBitmap *hb);
-
-/**
- * hbitmap_iter_init:
- * @hbi: HBitmapIter to initialize.
- * @hb: HBitmap to iterate on.
- * @first: First bit to visit (0-based, must be strictly less than the
- * size of the bitmap).
- *
- * Set up @hbi to iterate on the HBitmap @hb.  hbitmap_iter_next will return
- * the lowest-numbered bit that is set in @hb, starting at @first.
- *
- * Concurrent setting of bits is acceptable, and will at worst cause the
- * iteration to miss some of those bits.  Resetting bits before the current
- * position of the iterator is also okay.  However, concurrent resetting of
- * bits can lead to unexpected behavior if the iterator has not yet reached
- * those bits.
- */
-void hbitmap_iter_init(HBitmapIter *hbi, const HBitmap *hb, uint64_t first);
-
-/* hbitmap_iter_skip_words:
- * @hbi: HBitmapIter to operate on.
- *
- * Internal function used by hbitmap_iter_next and hbitmap_iter_next_word.
- */
-unsigned long hbitmap_iter_skip_words(HBitmapIter *hbi);
-
-/**
- * hbitmap_iter_next:
- * @hbi: HBitmapIter to operate on.
- *
- * Return the next bit that is set in @hbi's associated HBitmap,
- * or -1 if all remaining bits are zero.
- */
-static inline int64_t hbitmap_iter_next(HBitmapIter *hbi)
-{
-    unsigned long cur = hbi->cur[HBITMAP_LEVELS - 1];
-    int64_t item;
-
-    if (cur == 0) {
-        cur = hbitmap_iter_skip_words(hbi);
-        if (cur == 0) {
-            return -1;
-        }
-    }
-
-    /* The next call will resume work from the next bit.  */
-    hbi->cur[HBITMAP_LEVELS - 1] = cur & (cur - 1);
-    item = ((uint64_t)hbi->pos << BITS_PER_LEVEL) + ctzl(cur);
-
-    return item << hbi->granularity;
-}
-
-/**
- * hbitmap_iter_next_word:
- * @hbi: HBitmapIter to operate on.
- * @p_cur: Location where to store the next non-zero word.
- *
- * Return the index of the next nonzero word that is set in @hbi's
- * associated HBitmap, and set *p_cur to the content of that word
- * (bits before the index that was passed to hbitmap_iter_init are
- * trimmed on the first call).  Return -1, and set *p_cur to zero,
- * if all remaining words are zero.
- */
-static inline size_t hbitmap_iter_next_word(HBitmapIter *hbi, unsigned long *p_cur)
-{
-    unsigned long cur = hbi->cur[HBITMAP_LEVELS - 1];
-
-    if (cur == 0) {
-        cur = hbitmap_iter_skip_words(hbi);
-        if (cur == 0) {
-            *p_cur = 0;
-            return -1;
-        }
-    }
-
-    /* The next call will resume work from the next word.  */
-    hbi->cur[HBITMAP_LEVELS - 1] = 0;
-    *p_cur = cur;
-    return hbi->pos;
-}
-
-
-#endif
diff --git a/contrib/qemu/include/qemu/host-utils.h b/contrib/qemu/include/qemu/host-utils.h
deleted file mode 100644
index 0f688c1c0..000000000
--- a/contrib/qemu/include/qemu/host-utils.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Utility compute operations used by translated code.
- *
- * Copyright (c) 2007 Thiemo Seufer
- * Copyright (c) 2007 Jocelyn Mayer
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef HOST_UTILS_H
-#define HOST_UTILS_H 1
-
-#include "qemu/compiler.h"   /* QEMU_GNUC_PREREQ */
-#include <limits.h>
-
-#ifdef CONFIG_INT128
-static inline void mulu64(uint64_t *plow, uint64_t *phigh,
-                          uint64_t a, uint64_t b)
-{
-    __uint128_t r = (__uint128_t)a * b;
-    *plow = r;
-    *phigh = r >> 64;
-}
-
-static inline void muls64(uint64_t *plow, uint64_t *phigh,
-                          int64_t a, int64_t b)
-{
-    __int128_t r = (__int128_t)a * b;
-    *plow = r;
-    *phigh = r >> 64;
-}
-#else
-void muls64(uint64_t *phigh, uint64_t *plow, int64_t a, int64_t b);
-void mulu64(uint64_t *phigh, uint64_t *plow, uint64_t a, uint64_t b);
-#endif
-
-/**
- * clz32 - count leading zeros in a 32-bit value.
- * @val: The value to search
- *
- * Returns 32 if the value is zero.  Note that the GCC builtin is
- * undefined if the value is zero.
- */
-static inline int clz32(uint32_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    return val ? __builtin_clz(val) : 32;
-#else
-    /* Binary search for the leading one bit.  */
-    int cnt = 0;
-
-    if (!(val & 0xFFFF0000U)) {
-        cnt += 16;
-        val <<= 16;
-    }
-    if (!(val & 0xFF000000U)) {
-        cnt += 8;
-        val <<= 8;
-    }
-    if (!(val & 0xF0000000U)) {
-        cnt += 4;
-        val <<= 4;
-    }
-    if (!(val & 0xC0000000U)) {
-        cnt += 2;
-        val <<= 2;
-    }
-    if (!(val & 0x80000000U)) {
-        cnt++;
-        val <<= 1;
-    }
-    if (!(val & 0x80000000U)) {
-        cnt++;
-    }
-    return cnt;
-#endif
-}
-
-/**
- * clo32 - count leading ones in a 32-bit value.
- * @val: The value to search
- *
- * Returns 32 if the value is -1.
- */
-static inline int clo32(uint32_t val)
-{
-    return clz32(~val);
-}
-
-/**
- * clz64 - count leading zeros in a 64-bit value.
- * @val: The value to search
- *
- * Returns 64 if the value is zero.  Note that the GCC builtin is
- * undefined if the value is zero.
- */
-static inline int clz64(uint64_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    return val ? __builtin_clzll(val) : 64;
-#else
-    int cnt = 0;
-
-    if (!(val >> 32)) {
-        cnt += 32;
-    } else {
-        val >>= 32;
-    }
-
-    return cnt + clz32(val);
-#endif
-}
-
-/**
- * clo64 - count leading ones in a 64-bit value.
- * @val: The value to search
- *
- * Returns 64 if the value is -1.
- */
-static inline int clo64(uint64_t val)
-{
-    return clz64(~val);
-}
-
-/**
- * ctz32 - count trailing zeros in a 32-bit value.
- * @val: The value to search
- *
- * Returns 32 if the value is zero.  Note that the GCC builtin is
- * undefined if the value is zero.
- */
-static inline int ctz32(uint32_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    return val ? __builtin_ctz(val) : 32;
-#else
-    /* Binary search for the trailing one bit.  */
-    int cnt;
-
-    cnt = 0;
-    if (!(val & 0x0000FFFFUL)) {
-        cnt += 16;
-        val >>= 16;
-    }
-    if (!(val & 0x000000FFUL)) {
-        cnt += 8;
-        val >>= 8;
-    }
-    if (!(val & 0x0000000FUL)) {
-        cnt += 4;
-        val >>= 4;
-    }
-    if (!(val & 0x00000003UL)) {
-        cnt += 2;
-        val >>= 2;
-    }
-    if (!(val & 0x00000001UL)) {
-        cnt++;
-        val >>= 1;
-    }
-    if (!(val & 0x00000001UL)) {
-        cnt++;
-    }
-
-    return cnt;
-#endif
-}
-
-/**
- * cto32 - count trailing ones in a 32-bit value.
- * @val: The value to search
- *
- * Returns 32 if the value is -1.
- */
-static inline int cto32(uint32_t val)
-{
-    return ctz32(~val);
-}
-
-/**
- * ctz64 - count trailing zeros in a 64-bit value.
- * @val: The value to search
- *
- * Returns 64 if the value is zero.  Note that the GCC builtin is
- * undefined if the value is zero.
- */
-static inline int ctz64(uint64_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    return val ? __builtin_ctzll(val) : 64;
-#else
-    int cnt;
-
-    cnt = 0;
-    if (!((uint32_t)val)) {
-        cnt += 32;
-        val >>= 32;
-    }
-
-    return cnt + ctz32(val);
-#endif
-}
-
-/**
- * ctz64 - count trailing ones in a 64-bit value.
- * @val: The value to search
- *
- * Returns 64 if the value is -1.
- */
-static inline int cto64(uint64_t val)
-{
-    return ctz64(~val);
-}
-
-/**
- * ctpop8 - count the population of one bits in an 8-bit value.
- * @val: The value to search
- */
-static inline int ctpop8(uint8_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    return __builtin_popcount(val);
-#else
-    val = (val & 0x55) + ((val >> 1) & 0x55);
-    val = (val & 0x33) + ((val >> 2) & 0x33);
-    val = (val & 0x0f) + ((val >> 4) & 0x0f);
-
-    return val;
-#endif
-}
-
-/**
- * ctpop16 - count the population of one bits in a 16-bit value.
- * @val: The value to search
- */
-static inline int ctpop16(uint16_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    return __builtin_popcount(val);
-#else
-    val = (val & 0x5555) + ((val >> 1) & 0x5555);
-    val = (val & 0x3333) + ((val >> 2) & 0x3333);
-    val = (val & 0x0f0f) + ((val >> 4) & 0x0f0f);
-    val = (val & 0x00ff) + ((val >> 8) & 0x00ff);
-
-    return val;
-#endif
-}
-
-/**
- * ctpop32 - count the population of one bits in a 32-bit value.
- * @val: The value to search
- */
-static inline int ctpop32(uint32_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    return __builtin_popcount(val);
-#else
-    val = (val & 0x55555555) + ((val >>  1) & 0x55555555);
-    val = (val & 0x33333333) + ((val >>  2) & 0x33333333);
-    val = (val & 0x0f0f0f0f) + ((val >>  4) & 0x0f0f0f0f);
-    val = (val & 0x00ff00ff) + ((val >>  8) & 0x00ff00ff);
-    val = (val & 0x0000ffff) + ((val >> 16) & 0x0000ffff);
-
-    return val;
-#endif
-}
-
-/**
- * ctpop64 - count the population of one bits in a 64-bit value.
- * @val: The value to search
- */
-static inline int ctpop64(uint64_t val)
-{
-#if QEMU_GNUC_PREREQ(3, 4)
-    return __builtin_popcountll(val);
-#else
-    val = (val & 0x5555555555555555ULL) + ((val >>  1) & 0x5555555555555555ULL);
-    val = (val & 0x3333333333333333ULL) + ((val >>  2) & 0x3333333333333333ULL);
-    val = (val & 0x0f0f0f0f0f0f0f0fULL) + ((val >>  4) & 0x0f0f0f0f0f0f0f0fULL);
-    val = (val & 0x00ff00ff00ff00ffULL) + ((val >>  8) & 0x00ff00ff00ff00ffULL);
-    val = (val & 0x0000ffff0000ffffULL) + ((val >> 16) & 0x0000ffff0000ffffULL);
-    val = (val & 0x00000000ffffffffULL) + ((val >> 32) & 0x00000000ffffffffULL);
-
-    return val;
-#endif
-}
-
-/* Host type specific sizes of these routines.  */
-
-#if ULONG_MAX == UINT32_MAX
-# define clzl   clz32
-# define ctzl   ctz32
-# define clol   clo32
-# define ctol   cto32
-# define ctpopl ctpop32
-#elif ULONG_MAX == UINT64_MAX
-# define clzl   clz64
-# define ctzl   ctz64
-# define clol   clo64
-# define ctol   cto64
-# define ctpopl ctpop64
-#else
-# error Unknown sizeof long
-#endif
-
-#endif
diff --git a/contrib/qemu/include/qemu/iov.h b/contrib/qemu/include/qemu/iov.h
deleted file mode 100644
index 68d25f29b..000000000
--- a/contrib/qemu/include/qemu/iov.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Helpers for using (partial) iovecs.
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * Author(s):
- *  Amit Shah <amit.shah@redhat.com>
- *  Michael Tokarev <mjt@tls.msk.ru>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- */
-
-#ifndef IOV_H
-#define IOV_H
-
-#include "qemu-common.h"
-
-/**
- * count and return data size, in bytes, of an iovec
- * starting at `iov' of `iov_cnt' number of elements.
- */
-size_t iov_size(const struct iovec *iov, const unsigned int iov_cnt);
-
-/**
- * Copy from single continuous buffer to scatter-gather vector of buffers
- * (iovec) and back like memcpy() between two continuous memory regions.
- * Data in single continuous buffer starting at address `buf' and
- * `bytes' bytes long will be copied to/from an iovec `iov' with
- * `iov_cnt' number of elements, starting at byte position `offset'
- * within the iovec.  If the iovec does not contain enough space,
- * only part of data will be copied, up to the end of the iovec.
- * Number of bytes actually copied will be returned, which is
- *  min(bytes, iov_size(iov)-offset)
- * `Offset' must point to the inside of iovec.
- * It is okay to use very large value for `bytes' since we're
- * limited by the size of the iovec anyway, provided that the
- * buffer pointed to by buf has enough space.  One possible
- * such "large" value is -1 (sinice size_t is unsigned),
- * so specifying `-1' as `bytes' means 'up to the end of iovec'.
- */
-size_t iov_from_buf(const struct iovec *iov, unsigned int iov_cnt,
-                    size_t offset, const void *buf, size_t bytes);
-size_t iov_to_buf(const struct iovec *iov, const unsigned int iov_cnt,
-                  size_t offset, void *buf, size_t bytes);
-
-/**
- * Set data bytes pointed out by iovec `iov' of size `iov_cnt' elements,
- * starting at byte offset `start', to value `fillc', repeating it
- * `bytes' number of times.  `Offset' must point to the inside of iovec.
- * If `bytes' is large enough, only last bytes portion of iovec,
- * up to the end of it, will be filled with the specified value.
- * Function return actual number of bytes processed, which is
- * min(size, iov_size(iov) - offset).
- * Again, it is okay to use large value for `bytes' to mean "up to the end".
- */
-size_t iov_memset(const struct iovec *iov, const unsigned int iov_cnt,
-                  size_t offset, int fillc, size_t bytes);
-
-/*
- * Send/recv data from/to iovec buffers directly
- *
- * `offset' bytes in the beginning of iovec buffer are skipped and
- * next `bytes' bytes are used, which must be within data of iovec.
- *
- *   r = iov_send_recv(sockfd, iov, iovcnt, offset, bytes, true);
- *
- * is logically equivalent to
- *
- *   char *buf = malloc(bytes);
- *   iov_to_buf(iov, iovcnt, offset, buf, bytes);
- *   r = send(sockfd, buf, bytes, 0);
- *   free(buf);
- *
- * For iov_send_recv() _whole_ area being sent or received
- * should be within the iovec, not only beginning of it.
- */
-ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
-                      size_t offset, size_t bytes, bool do_send);
-#define iov_recv(sockfd, iov, iov_cnt, offset, bytes) \
-  iov_send_recv(sockfd, iov, iov_cnt, offset, bytes, false)
-#define iov_send(sockfd, iov, iov_cnt, offset, bytes) \
-  iov_send_recv(sockfd, iov, iov_cnt, offset, bytes, true)
-
-/**
- * Produce a text hexdump of iovec `iov' with `iov_cnt' number of elements
- * in file `fp', prefixing each line with `prefix' and processing not more
- * than `limit' data bytes.
- */
-void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt,
-                 FILE *fp, const char *prefix, size_t limit);
-
-/*
- * Partial copy of vector from iov to dst_iov (data is not copied).
- * dst_iov overlaps iov at a specified offset.
- * size of dst_iov is at most bytes. dst vector count is returned.
- */
-unsigned iov_copy(struct iovec *dst_iov, unsigned int dst_iov_cnt,
-                 const struct iovec *iov, unsigned int iov_cnt,
-                 size_t offset, size_t bytes);
-
-/*
- * Remove a given number of bytes from the front or back of a vector.
- * This may update iov and/or iov_cnt to exclude iovec elements that are
- * no longer required.
- *
- * The number of bytes actually discarded is returned.  This number may be
- * smaller than requested if the vector is too small.
- */
-size_t iov_discard_front(struct iovec **iov, unsigned int *iov_cnt,
-                         size_t bytes);
-size_t iov_discard_back(struct iovec *iov, unsigned int *iov_cnt,
-                        size_t bytes);
-
-#endif
diff --git a/contrib/qemu/include/qemu/main-loop.h b/contrib/qemu/include/qemu/main-loop.h
deleted file mode 100644
index 6f0200a7a..000000000
--- a/contrib/qemu/include/qemu/main-loop.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * QEMU System Emulator
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef QEMU_MAIN_LOOP_H
-#define QEMU_MAIN_LOOP_H 1
-
-#include "block/aio.h"
-
-#define SIG_IPI SIGUSR1
-
-/**
- * qemu_init_main_loop: Set up the process so that it can run the main loop.
- *
- * This includes setting up signal handlers.  It should be called before
- * any other threads are created.  In addition, threads other than the
- * main one should block signals that are trapped by the main loop.
- * For simplicity, you can consider these signals to be safe: SIGUSR1,
- * SIGUSR2, thread signals (SIGFPE, SIGILL, SIGSEGV, SIGBUS) and real-time
- * signals if available.  Remember that Windows in practice does not have
- * signals, though.
- *
- * In the case of QEMU tools, this will also start/initialize timers.
- */
-int qemu_init_main_loop(void);
-
-/**
- * main_loop_wait: Run one iteration of the main loop.
- *
- * If @nonblocking is true, poll for events, otherwise suspend until
- * one actually occurs.  The main loop usually consists of a loop that
- * repeatedly calls main_loop_wait(false).
- *
- * Main loop services include file descriptor callbacks, bottom halves
- * and timers (defined in qemu-timer.h).  Bottom halves are similar to timers
- * that execute immediately, but have a lower overhead and scheduling them
- * is wait-free, thread-safe and signal-safe.
- *
- * It is sometimes useful to put a whole program in a coroutine.  In this
- * case, the coroutine actually should be started from within the main loop,
- * so that the main loop can run whenever the coroutine yields.  To do this,
- * you can use a bottom half to enter the coroutine as soon as the main loop
- * starts:
- *
- *     void enter_co_bh(void *opaque) {
- *         QEMUCoroutine *co = opaque;
- *         qemu_coroutine_enter(co, NULL);
- *     }
- *
- *     ...
- *     QEMUCoroutine *co = qemu_coroutine_create(coroutine_entry);
- *     QEMUBH *start_bh = qemu_bh_new(enter_co_bh, co);
- *     qemu_bh_schedule(start_bh);
- *     while (...) {
- *         main_loop_wait(false);
- *     }
- *
- * (In the future we may provide a wrapper for this).
- *
- * @nonblocking: Whether the caller should block until an event occurs.
- */
-int main_loop_wait(int nonblocking);
-
-/**
- * qemu_get_aio_context: Return the main loop's AioContext
- */
-AioContext *qemu_get_aio_context(void);
-
-/**
- * qemu_notify_event: Force processing of pending events.
- *
- * Similar to signaling a condition variable, qemu_notify_event forces
- * main_loop_wait to look at pending events and exit.  The caller of
- * main_loop_wait will usually call it again very soon, so qemu_notify_event
- * also has the side effect of recalculating the sets of file descriptors
- * that the main loop waits for.
- *
- * Calling qemu_notify_event is rarely necessary, because main loop
- * services (bottom halves and timers) call it themselves.  One notable
- * exception occurs when using qemu_set_fd_handler2 (see below).
- */
-void qemu_notify_event(void);
-
-#ifdef _WIN32
-/* return TRUE if no sleep should be done afterwards */
-typedef int PollingFunc(void *opaque);
-
-/**
- * qemu_add_polling_cb: Register a Windows-specific polling callback
- *
- * Currently, under Windows some events are polled rather than waited for.
- * Polling callbacks do not ensure that @func is called timely, because
- * the main loop might wait for an arbitrarily long time.  If possible,
- * you should instead create a separate thread that does a blocking poll
- * and set a Win32 event object.  The event can then be passed to
- * qemu_add_wait_object.
- *
- * Polling callbacks really have nothing Windows specific in them, but
- * as they are a hack and are currently not necessary under POSIX systems,
- * they are only available when QEMU is running under Windows.
- *
- * @func: The function that does the polling, and returns 1 to force
- * immediate completion of main_loop_wait.
- * @opaque: A pointer-size value that is passed to @func.
- */
-int qemu_add_polling_cb(PollingFunc *func, void *opaque);
-
-/**
- * qemu_del_polling_cb: Unregister a Windows-specific polling callback
- *
- * This function removes a callback that was registered with
- * qemu_add_polling_cb.
- *
- * @func: The function that was passed to qemu_add_polling_cb.
- * @opaque: A pointer-size value that was passed to qemu_add_polling_cb.
- */
-void qemu_del_polling_cb(PollingFunc *func, void *opaque);
-
-/* Wait objects handling */
-typedef void WaitObjectFunc(void *opaque);
-
-/**
- * qemu_add_wait_object: Register a callback for a Windows handle
- *
- * Under Windows, the iohandler mechanism can only be used with sockets.
- * QEMU must use the WaitForMultipleObjects API to wait on other handles.
- * This function registers a #HANDLE with QEMU, so that it will be included
- * in the main loop's calls to WaitForMultipleObjects.  When the handle
- * is in a signaled state, QEMU will call @func.
- *
- * @handle: The Windows handle to be observed.
- * @func: A function to be called when @handle is in a signaled state.
- * @opaque: A pointer-size value that is passed to @func.
- */
-int qemu_add_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque);
-
-/**
- * qemu_del_wait_object: Unregister a callback for a Windows handle
- *
- * This function removes a callback that was registered with
- * qemu_add_wait_object.
- *
- * @func: The function that was passed to qemu_add_wait_object.
- * @opaque: A pointer-size value that was passed to qemu_add_wait_object.
- */
-void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque);
-#endif
-
-/* async I/O support */
-
-typedef void IOReadHandler(void *opaque, const uint8_t *buf, int size);
-typedef int IOCanReadHandler(void *opaque);
-
-/**
- * qemu_set_fd_handler2: Register a file descriptor with the main loop
- *
- * This function tells the main loop to wake up whenever one of the
- * following conditions is true:
- *
- * 1) if @fd_write is not %NULL, when the file descriptor is writable;
- *
- * 2) if @fd_read is not %NULL, when the file descriptor is readable.
- *
- * @fd_read_poll can be used to disable the @fd_read callback temporarily.
- * This is useful to avoid calling qemu_set_fd_handler2 every time the
- * client becomes interested in reading (or dually, stops being interested).
- * A typical example is when @fd is a listening socket and you want to bound
- * the number of active clients.  Remember to call qemu_notify_event whenever
- * the condition may change from %false to %true.
- *
- * The callbacks that are set up by qemu_set_fd_handler2 are level-triggered.
- * If @fd_read does not read from @fd, or @fd_write does not write to @fd
- * until its buffers are full, they will be called again on the next
- * iteration.
- *
- * @fd: The file descriptor to be observed.  Under Windows it must be
- * a #SOCKET.
- *
- * @fd_read_poll: A function that returns 1 if the @fd_read callback
- * should be fired.  If the function returns 0, the main loop will not
- * end its iteration even if @fd becomes readable.
- *
- * @fd_read: A level-triggered callback that is fired if @fd is readable
- * at the beginning of a main loop iteration, or if it becomes readable
- * during one.
- *
- * @fd_write: A level-triggered callback that is fired when @fd is writable
- * at the beginning of a main loop iteration, or if it becomes writable
- * during one.
- *
- * @opaque: A pointer-sized value that is passed to @fd_read_poll,
- * @fd_read and @fd_write.
- */
-int qemu_set_fd_handler2(int fd,
-                         IOCanReadHandler *fd_read_poll,
-                         IOHandler *fd_read,
-                         IOHandler *fd_write,
-                         void *opaque);
-
-/**
- * qemu_set_fd_handler: Register a file descriptor with the main loop
- *
- * This function tells the main loop to wake up whenever one of the
- * following conditions is true:
- *
- * 1) if @fd_write is not %NULL, when the file descriptor is writable;
- *
- * 2) if @fd_read is not %NULL, when the file descriptor is readable.
- *
- * The callbacks that are set up by qemu_set_fd_handler are level-triggered.
- * If @fd_read does not read from @fd, or @fd_write does not write to @fd
- * until its buffers are full, they will be called again on the next
- * iteration.
- *
- * @fd: The file descriptor to be observed.  Under Windows it must be
- * a #SOCKET.
- *
- * @fd_read: A level-triggered callback that is fired if @fd is readable
- * at the beginning of a main loop iteration, or if it becomes readable
- * during one.
- *
- * @fd_write: A level-triggered callback that is fired when @fd is writable
- * at the beginning of a main loop iteration, or if it becomes writable
- * during one.
- *
- * @opaque: A pointer-sized value that is passed to @fd_read and @fd_write.
- */
-int qemu_set_fd_handler(int fd,
-                        IOHandler *fd_read,
-                        IOHandler *fd_write,
-                        void *opaque);
-
-#ifdef CONFIG_POSIX
-/**
- * qemu_add_child_watch: Register a child process for reaping.
- *
- * Under POSIX systems, a parent process must read the exit status of
- * its child processes using waitpid, or the operating system will not
- * free some of the resources attached to that process.
- *
- * This function directs the QEMU main loop to observe a child process
- * and call waitpid as soon as it exits; the watch is then removed
- * automatically.  It is useful whenever QEMU forks a child process
- * but will find out about its termination by other means such as a
- * "broken pipe".
- *
- * @pid: The pid that QEMU should observe.
- */
-int qemu_add_child_watch(pid_t pid);
-#endif
-
-/**
- * qemu_mutex_lock_iothread: Lock the main loop mutex.
- *
- * This function locks the main loop mutex.  The mutex is taken by
- * qemu_init_main_loop and always taken except while waiting on
- * external events (such as with select).  The mutex should be taken
- * by threads other than the main loop thread when calling
- * qemu_bh_new(), qemu_set_fd_handler() and basically all other
- * functions documented in this file.
- *
- * NOTE: tools currently are single-threaded and qemu_mutex_lock_iothread
- * is a no-op there.
- */
-void qemu_mutex_lock_iothread(void);
-
-/**
- * qemu_mutex_unlock_iothread: Unlock the main loop mutex.
- *
- * This function unlocks the main loop mutex.  The mutex is taken by
- * qemu_init_main_loop and always taken except while waiting on
- * external events (such as with select).  The mutex should be unlocked
- * as soon as possible by threads other than the main loop thread,
- * because it prevents the main loop from processing callbacks,
- * including timers and bottom halves.
- *
- * NOTE: tools currently are single-threaded and qemu_mutex_unlock_iothread
- * is a no-op there.
- */
-void qemu_mutex_unlock_iothread(void);
-
-/* internal interfaces */
-
-void qemu_fd_register(int fd);
-void qemu_iohandler_fill(GArray *pollfds);
-void qemu_iohandler_poll(GArray *pollfds, int rc);
-
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);
-void qemu_bh_schedule_idle(QEMUBH *bh);
-
-#endif
diff --git a/contrib/qemu/include/qemu/module.h b/contrib/qemu/include/qemu/module.h
deleted file mode 100644
index c4ccd5716..000000000
--- a/contrib/qemu/include/qemu/module.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * QEMU Module Infrastructure
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- */
-
-#ifndef QEMU_MODULE_H
-#define QEMU_MODULE_H
-
-/* This should not be used directly.  Use block_init etc. instead.  */
-#define module_init(function, type)                                         \
-static void __attribute__((constructor)) do_qemu_init_ ## function(void) {  \
-    register_module_init(function, type);                                   \
-}
-
-typedef enum {
-    MODULE_INIT_BLOCK,
-    MODULE_INIT_MACHINE,
-    MODULE_INIT_QAPI,
-    MODULE_INIT_QOM,
-    MODULE_INIT_MAX
-} module_init_type;
-
-#define block_init(function) module_init(function, MODULE_INIT_BLOCK)
-#define machine_init(function) module_init(function, MODULE_INIT_MACHINE)
-#define qapi_init(function) module_init(function, MODULE_INIT_QAPI)
-#define type_init(function) module_init(function, MODULE_INIT_QOM)
-
-void register_module_init(void (*fn)(void), module_init_type type);
-
-void module_call_init(module_init_type type);
-
-#endif
diff --git a/contrib/qemu/include/qemu/notify.h b/contrib/qemu/include/qemu/notify.h
deleted file mode 100644
index a3d73e4bc..000000000
--- a/contrib/qemu/include/qemu/notify.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Notifier lists
- *
- * Copyright IBM, Corp. 2010
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- */
-
-#ifndef QEMU_NOTIFY_H
-#define QEMU_NOTIFY_H
-
-#include "qemu/queue.h"
-
-typedef struct Notifier Notifier;
-
-struct Notifier
-{
-    void (*notify)(Notifier *notifier, void *data);
-    QLIST_ENTRY(Notifier) node;
-};
-
-typedef struct NotifierList
-{
-    QLIST_HEAD(, Notifier) notifiers;
-} NotifierList;
-
-#define NOTIFIER_LIST_INITIALIZER(head) \
-    { QLIST_HEAD_INITIALIZER((head).notifiers) }
-
-void notifier_list_init(NotifierList *list);
-
-void notifier_list_add(NotifierList *list, Notifier *notifier);
-
-void notifier_remove(Notifier *notifier);
-
-void notifier_list_notify(NotifierList *list, void *data);
-
-/* Same as Notifier but allows .notify() to return errors */
-typedef struct NotifierWithReturn NotifierWithReturn;
-
-struct NotifierWithReturn {
-    /**
-     * Return 0 on success (next notifier will be invoked), otherwise
-     * notifier_with_return_list_notify() will stop and return the value.
-     */
-    int (*notify)(NotifierWithReturn *notifier, void *data);
-    QLIST_ENTRY(NotifierWithReturn) node;
-};
-
-typedef struct NotifierWithReturnList {
-    QLIST_HEAD(, NotifierWithReturn) notifiers;
-} NotifierWithReturnList;
-
-#define NOTIFIER_WITH_RETURN_LIST_INITIALIZER(head) \
-    { QLIST_HEAD_INITIALIZER((head).notifiers) }
-
-void notifier_with_return_list_init(NotifierWithReturnList *list);
-
-void notifier_with_return_list_add(NotifierWithReturnList *list,
-                                   NotifierWithReturn *notifier);
-
-void notifier_with_return_remove(NotifierWithReturn *notifier);
-
-int notifier_with_return_list_notify(NotifierWithReturnList *list,
-                                     void *data);
-
-#endif
diff --git a/contrib/qemu/include/qemu/option.h b/contrib/qemu/include/qemu/option.h
deleted file mode 100644
index a83c70032..000000000
--- a/contrib/qemu/include/qemu/option.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Commandline option parsing functions
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- * Copyright (c) 2009 Kevin Wolf <kwolf@redhat.com>
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef QEMU_OPTIONS_H
-#define QEMU_OPTIONS_H
-
-#include <stdint.h>
-#include "qemu/queue.h"
-#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-
-enum QEMUOptionParType {
-    OPT_FLAG,
-    OPT_NUMBER,
-    OPT_SIZE,
-    OPT_STRING,
-};
-
-typedef struct QEMUOptionParameter {
-    const char *name;
-    enum QEMUOptionParType type;
-    union {
-        uint64_t n;
-        char* s;
-    } value;
-    const char *help;
-} QEMUOptionParameter;
-
-
-const char *get_opt_name(char *buf, int buf_size, const char *p, char delim);
-const char *get_opt_value(char *buf, int buf_size, const char *p);
-int get_next_param_value(char *buf, int buf_size,
-                         const char *tag, const char **pstr);
-int get_param_value(char *buf, int buf_size,
-                    const char *tag, const char *str);
-
-
-/*
- * The following functions take a parameter list as input. This is a pointer to
- * the first element of a QEMUOptionParameter array which is terminated by an
- * entry with entry->name == NULL.
- */
-
-QEMUOptionParameter *get_option_parameter(QEMUOptionParameter *list,
-    const char *name);
-int set_option_parameter(QEMUOptionParameter *list, const char *name,
-    const char *value);
-int set_option_parameter_int(QEMUOptionParameter *list, const char *name,
-    uint64_t value);
-QEMUOptionParameter *append_option_parameters(QEMUOptionParameter *dest,
-    QEMUOptionParameter *list);
-QEMUOptionParameter *parse_option_parameters(const char *param,
-    QEMUOptionParameter *list, QEMUOptionParameter *dest);
-void free_option_parameters(QEMUOptionParameter *list);
-void print_option_parameters(QEMUOptionParameter *list);
-void print_option_help(QEMUOptionParameter *list);
-
-/* ------------------------------------------------------------------ */
-
-typedef struct QemuOpt QemuOpt;
-typedef struct QemuOpts QemuOpts;
-typedef struct QemuOptsList QemuOptsList;
-
-enum QemuOptType {
-    QEMU_OPT_STRING = 0,  /* no parsing (use string as-is)                        */
-    QEMU_OPT_BOOL,        /* on/off                                               */
-    QEMU_OPT_NUMBER,      /* simple number                                        */
-    QEMU_OPT_SIZE,        /* size, accepts (K)ilo, (M)ega, (G)iga, (T)era postfix */
-};
-
-typedef struct QemuOptDesc {
-    const char *name;
-    enum QemuOptType type;
-    const char *help;
-} QemuOptDesc;
-
-struct QemuOptsList {
-    const char *name;
-    const char *implied_opt_name;
-    bool merge_lists;  /* Merge multiple uses of option into a single list? */
-    QTAILQ_HEAD(, QemuOpts) head;
-    QemuOptDesc desc[];
-};
-
-const char *qemu_opt_get(QemuOpts *opts, const char *name);
-/**
- * qemu_opt_has_help_opt:
- * @opts: options to search for a help request
- *
- * Check whether the options specified by @opts include one of the
- * standard strings which indicate that the user is asking for a
- * list of the valid values for a command line option (as defined
- * by is_help_option()).
- *
- * Returns: true if @opts includes 'help' or equivalent.
- */
-bool qemu_opt_has_help_opt(QemuOpts *opts);
-bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval);
-uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval);
-uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval);
-int qemu_opt_set(QemuOpts *opts, const char *name, const char *value);
-void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value,
-                      Error **errp);
-int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val);
-int qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val);
-typedef int (*qemu_opt_loopfunc)(const char *name, const char *value, void *opaque);
-int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,
-                     int abort_on_failure);
-
-QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id);
-QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,
-                           int fail_if_exists, Error **errp);
-QemuOpts *qemu_opts_create_nofail(QemuOptsList *list);
-void qemu_opts_reset(QemuOptsList *list);
-void qemu_opts_loc_restore(QemuOpts *opts);
-int qemu_opts_set(QemuOptsList *list, const char *id,
-                  const char *name, const char *value);
-const char *qemu_opts_id(QemuOpts *opts);
-void qemu_opts_del(QemuOpts *opts);
-void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp);
-int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname);
-QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int permit_abbrev);
-void qemu_opts_set_defaults(QemuOptsList *list, const char *params,
-                            int permit_abbrev);
-QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict,
-                               Error **errp);
-QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict);
-void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp);
-
-typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque);
-int qemu_opts_print(QemuOpts *opts, void *dummy);
-int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque,
-                      int abort_on_failure);
-
-#endif
diff --git a/contrib/qemu/include/qemu/option_int.h b/contrib/qemu/include/qemu/option_int.h
deleted file mode 100644
index 8212fa4a4..000000000
--- a/contrib/qemu/include/qemu/option_int.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Commandline option parsing functions
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- * Copyright (c) 2009 Kevin Wolf <kwolf@redhat.com>
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef QEMU_OPTIONS_INTERNAL_H
-#define QEMU_OPTIONS_INTERNAL_H
-
-#include "qemu/option.h"
-#include "qemu/error-report.h"
-
-struct QemuOpt {
-    const char   *name;
-    const char   *str;
-
-    const QemuOptDesc *desc;
-    union {
-        bool boolean;
-        uint64_t uint;
-    } value;
-
-    QemuOpts     *opts;
-    QTAILQ_ENTRY(QemuOpt) next;
-};
-
-struct QemuOpts {
-    char *id;
-    QemuOptsList *list;
-    Location loc;
-    QTAILQ_HEAD(QemuOptHead, QemuOpt) head;
-    QTAILQ_ENTRY(QemuOpts) next;
-};
-
-#endif
diff --git a/contrib/qemu/include/qemu/osdep.h b/contrib/qemu/include/qemu/osdep.h
deleted file mode 100644
index 26136f16e..000000000
--- a/contrib/qemu/include/qemu/osdep.h
+++ /dev/null
@@ -1,218 +0,0 @@
-#ifndef QEMU_OSDEP_H
-#define QEMU_OSDEP_H
-
-#include "config-host.h"
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include <sys/types.h>
-#ifdef __OpenBSD__
-#include <sys/signal.h>
-#endif
-
-#ifndef _WIN32
-#include <sys/wait.h>
-#else
-#define WIFEXITED(x)   1
-#define WEXITSTATUS(x) (x)
-#endif
-
-#include <sys/time.h>
-
-#if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10
-/* [u]int_fast*_t not in <sys/int_types.h> */
-typedef unsigned char           uint_fast8_t;
-typedef unsigned int            uint_fast16_t;
-typedef signed int              int_fast16_t;
-#endif
-
-#ifndef glue
-#define xglue(x, y) x ## y
-#define glue(x, y) xglue(x, y)
-#define stringify(s)	tostring(s)
-#define tostring(s)	#s
-#endif
-
-#ifndef likely
-#if __GNUC__ < 3
-#define __builtin_expect(x, n) (x)
-#endif
-
-#define likely(x)   __builtin_expect(!!(x), 1)
-#define unlikely(x)   __builtin_expect(!!(x), 0)
-#endif
-
-#ifndef container_of
-#define container_of(ptr, type, member) ({                      \
-        const typeof(((type *) 0)->member) *__mptr = (ptr);     \
-        (type *) ((char *) __mptr - offsetof(type, member));})
-#endif
-
-/* Convert from a base type to a parent type, with compile time checking.  */
-#ifdef __GNUC__
-#define DO_UPCAST(type, field, dev) ( __extension__ ( { \
-    char __attribute__((unused)) offset_must_be_zero[ \
-        -offsetof(type, field)]; \
-    container_of(dev, type, field);}))
-#else
-#define DO_UPCAST(type, field, dev) container_of(dev, type, field)
-#endif
-
-#define typeof_field(type, field) typeof(((type *)0)->field)
-#define type_check(t1,t2) ((t1*)0 - (t2*)0)
-
-#ifndef MIN
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-#ifndef MAX
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
-#endif
-
-#ifndef ROUND_UP
-#define ROUND_UP(n,d) (((n) + (d) - 1) & -(d))
-#endif
-
-#ifndef DIV_ROUND_UP
-#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
-#endif
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
-#ifndef always_inline
-#if !((__GNUC__ < 3) || defined(__APPLE__))
-#ifdef __OPTIMIZE__
-#undef inline
-#define inline __attribute__ (( always_inline )) __inline__
-#endif
-#endif
-#else
-#undef inline
-#define inline always_inline
-#endif
-
-#define qemu_printf printf
-
-int qemu_daemon(int nochdir, int noclose);
-void *qemu_memalign(size_t alignment, size_t size);
-void *qemu_anon_ram_alloc(size_t size);
-void qemu_vfree(void *ptr);
-void qemu_anon_ram_free(void *ptr, size_t size);
-
-#define QEMU_MADV_INVALID -1
-
-#if defined(CONFIG_MADVISE)
-
-#define QEMU_MADV_WILLNEED  MADV_WILLNEED
-#define QEMU_MADV_DONTNEED  MADV_DONTNEED
-#ifdef MADV_DONTFORK
-#define QEMU_MADV_DONTFORK  MADV_DONTFORK
-#else
-#define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
-#endif
-#ifdef MADV_MERGEABLE
-#define QEMU_MADV_MERGEABLE MADV_MERGEABLE
-#else
-#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
-#endif
-#ifdef MADV_DONTDUMP
-#define QEMU_MADV_DONTDUMP MADV_DONTDUMP
-#else
-#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
-#endif
-#ifdef MADV_HUGEPAGE
-#define QEMU_MADV_HUGEPAGE MADV_HUGEPAGE
-#else
-#define QEMU_MADV_HUGEPAGE QEMU_MADV_INVALID
-#endif
-
-#elif defined(CONFIG_POSIX_MADVISE)
-
-#define QEMU_MADV_WILLNEED  POSIX_MADV_WILLNEED
-#define QEMU_MADV_DONTNEED  POSIX_MADV_DONTNEED
-#define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
-#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
-#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
-#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
-
-#else /* no-op */
-
-#define QEMU_MADV_WILLNEED  QEMU_MADV_INVALID
-#define QEMU_MADV_DONTNEED  QEMU_MADV_INVALID
-#define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
-#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
-#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
-#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
-
-#endif
-
-int qemu_madvise(void *addr, size_t len, int advice);
-
-int qemu_open(const char *name, int flags, ...);
-int qemu_close(int fd);
-
-#if defined(__HAIKU__) && defined(__i386__)
-#define FMT_pid "%ld"
-#elif defined(WIN64)
-#define FMT_pid "%" PRId64
-#else
-#define FMT_pid "%d"
-#endif
-
-int qemu_create_pidfile(const char *filename);
-int qemu_get_thread_id(void);
-
-#ifndef CONFIG_IOVEC
-struct iovec {
-    void *iov_base;
-    size_t iov_len;
-};
-/*
- * Use the same value as Linux for now.
- */
-#define IOV_MAX 1024
-
-ssize_t readv(int fd, const struct iovec *iov, int iov_cnt);
-ssize_t writev(int fd, const struct iovec *iov, int iov_cnt);
-#else
-#include <sys/uio.h>
-#endif
-
-#ifdef _WIN32
-static inline void qemu_timersub(const struct timeval *val1,
-                                 const struct timeval *val2,
-                                 struct timeval *res)
-{
-    res->tv_sec = val1->tv_sec - val2->tv_sec;
-    if (val1->tv_usec < val2->tv_usec) {
-        res->tv_sec--;
-        res->tv_usec = val1->tv_usec - val2->tv_usec + 1000 * 1000;
-    } else {
-        res->tv_usec = val1->tv_usec - val2->tv_usec;
-    }
-}
-#else
-#define qemu_timersub timersub
-#endif
-
-void qemu_set_cloexec(int fd);
-
-void qemu_set_version(const char *);
-const char *qemu_get_version(void);
-
-void fips_set_state(bool requested);
-bool fips_get_state(void);
-
-/* Return a dynamically allocated pathname denoting a file or directory that is
- * appropriate for storing local state.
- *
- * @relative_pathname need not start with a directory separator; one will be
- * added automatically.
- *
- * The caller is responsible for releasing the value returned with g_free()
- * after use.
- */
-char *qemu_get_local_state_pathname(const char *relative_pathname);
-
-#endif
diff --git a/contrib/qemu/include/qemu/queue.h b/contrib/qemu/include/qemu/queue.h
deleted file mode 100644
index d433b9017..000000000
--- a/contrib/qemu/include/qemu/queue.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*      $NetBSD: queue.h,v 1.52 2009/04/20 09:56:08 mschuett Exp $ */
-
-/*
- * QEMU version: Copy from netbsd, removed debug code, removed some of
- * the implementations.  Left in singly-linked lists, lists, simple
- * queues, and tail queues.
- */
-
-/*
- * Copyright (c) 1991, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)queue.h     8.5 (Berkeley) 8/20/94
- */
-
-#ifndef QEMU_SYS_QUEUE_H_
-#define QEMU_SYS_QUEUE_H_
-
-/*
- * This file defines four types of data structures: singly-linked lists,
- * lists, simple queues, and tail queues.
- *
- * A singly-linked list is headed by a single forward pointer. The
- * elements are singly linked for minimum space and pointer manipulation
- * overhead at the expense of O(n) removal for arbitrary elements. New
- * elements can be added to the list after an existing element or at the
- * head of the list.  Elements being removed from the head of the list
- * should use the explicit macro for this purpose for optimum
- * efficiency. A singly-linked list may only be traversed in the forward
- * direction.  Singly-linked lists are ideal for applications with large
- * datasets and few or no removals or for implementing a LIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A simple queue is headed by a pair of pointers, one the head of the
- * list and the other to the tail of the list. The elements are singly
- * linked to save space, so elements can only be removed from the
- * head of the list. New elements can be added to the list after
- * an existing element, at the head of the list, or at the end of the
- * list. A simple queue may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- */
-
-#include "qemu/atomic.h" /* for smp_wmb() */
-
-/*
- * List definitions.
- */
-#define QLIST_HEAD(name, type)                                          \
-struct name {                                                           \
-        struct type *lh_first;  /* first element */                     \
-}
-
-#define QLIST_HEAD_INITIALIZER(head)                                    \
-        { NULL }
-
-#define QLIST_ENTRY(type)                                               \
-struct {                                                                \
-        struct type *le_next;   /* next element */                      \
-        struct type **le_prev;  /* address of previous next element */  \
-}
-
-/*
- * List functions.
- */
-#define QLIST_INIT(head) do {                                           \
-        (head)->lh_first = NULL;                                        \
-} while (/*CONSTCOND*/0)
-
-#define QLIST_INSERT_AFTER(listelm, elm, field) do {                    \
-        if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)  \
-                (listelm)->field.le_next->field.le_prev =               \
-                    &(elm)->field.le_next;                              \
-        (listelm)->field.le_next = (elm);                               \
-        (elm)->field.le_prev = &(listelm)->field.le_next;               \
-} while (/*CONSTCOND*/0)
-
-#define QLIST_INSERT_BEFORE(listelm, elm, field) do {                   \
-        (elm)->field.le_prev = (listelm)->field.le_prev;                \
-        (elm)->field.le_next = (listelm);                               \
-        *(listelm)->field.le_prev = (elm);                              \
-        (listelm)->field.le_prev = &(elm)->field.le_next;               \
-} while (/*CONSTCOND*/0)
-
-#define QLIST_INSERT_HEAD(head, elm, field) do {                        \
-        if (((elm)->field.le_next = (head)->lh_first) != NULL)          \
-                (head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-        (head)->lh_first = (elm);                                       \
-        (elm)->field.le_prev = &(head)->lh_first;                       \
-} while (/*CONSTCOND*/0)
-
-#define QLIST_INSERT_HEAD_RCU(head, elm, field) do {                    \
-        (elm)->field.le_prev = &(head)->lh_first;                       \
-        (elm)->field.le_next = (head)->lh_first;                        \
-        smp_wmb(); /* fill elm before linking it */                     \
-        if ((head)->lh_first != NULL)  {                                \
-            (head)->lh_first->field.le_prev = &(elm)->field.le_next;    \
-        }                                                               \
-        (head)->lh_first = (elm);                                       \
-        smp_wmb();                                                      \
-} while (/* CONSTCOND*/0)
-
-#define QLIST_REMOVE(elm, field) do {                                   \
-        if ((elm)->field.le_next != NULL)                               \
-                (elm)->field.le_next->field.le_prev =                   \
-                    (elm)->field.le_prev;                               \
-        *(elm)->field.le_prev = (elm)->field.le_next;                   \
-} while (/*CONSTCOND*/0)
-
-#define QLIST_FOREACH(var, head, field)                                 \
-        for ((var) = ((head)->lh_first);                                \
-                (var);                                                  \
-                (var) = ((var)->field.le_next))
-
-#define QLIST_FOREACH_SAFE(var, head, field, next_var)                  \
-        for ((var) = ((head)->lh_first);                                \
-                (var) && ((next_var) = ((var)->field.le_next), 1);      \
-                (var) = (next_var))
-
-/*
- * List access methods.
- */
-#define QLIST_EMPTY(head)                ((head)->lh_first == NULL)
-#define QLIST_FIRST(head)                ((head)->lh_first)
-#define QLIST_NEXT(elm, field)           ((elm)->field.le_next)
-
-
-/*
- * Singly-linked List definitions.
- */
-#define QSLIST_HEAD(name, type)                                          \
-struct name {                                                           \
-        struct type *slh_first; /* first element */                     \
-}
-
-#define QSLIST_HEAD_INITIALIZER(head)                                    \
-        { NULL }
-
-#define QSLIST_ENTRY(type)                                               \
-struct {                                                                \
-        struct type *sle_next;  /* next element */                      \
-}
-
-/*
- * Singly-linked List functions.
- */
-#define QSLIST_INIT(head) do {                                           \
-        (head)->slh_first = NULL;                                       \
-} while (/*CONSTCOND*/0)
-
-#define QSLIST_INSERT_AFTER(slistelm, elm, field) do {                   \
-        (elm)->field.sle_next = (slistelm)->field.sle_next;             \
-        (slistelm)->field.sle_next = (elm);                             \
-} while (/*CONSTCOND*/0)
-
-#define QSLIST_INSERT_HEAD(head, elm, field) do {                        \
-        (elm)->field.sle_next = (head)->slh_first;                      \
-        (head)->slh_first = (elm);                                      \
-} while (/*CONSTCOND*/0)
-
-#define QSLIST_REMOVE_HEAD(head, field) do {                             \
-        (head)->slh_first = (head)->slh_first->field.sle_next;          \
-} while (/*CONSTCOND*/0)
-
-#define QSLIST_REMOVE_AFTER(slistelm, field) do {                        \
-        (slistelm)->field.sle_next =                                    \
-            QSLIST_NEXT(QSLIST_NEXT((slistelm), field), field);           \
-} while (/*CONSTCOND*/0)
-
-#define QSLIST_FOREACH(var, head, field)                                 \
-        for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
-
-#define QSLIST_FOREACH_SAFE(var, head, field, tvar)                      \
-        for ((var) = QSLIST_FIRST((head));                               \
-            (var) && ((tvar) = QSLIST_NEXT((var), field), 1);            \
-            (var) = (tvar))
-
-/*
- * Singly-linked List access methods.
- */
-#define QSLIST_EMPTY(head)       ((head)->slh_first == NULL)
-#define QSLIST_FIRST(head)       ((head)->slh_first)
-#define QSLIST_NEXT(elm, field)  ((elm)->field.sle_next)
-
-
-/*
- * Simple queue definitions.
- */
-#define QSIMPLEQ_HEAD(name, type)                                       \
-struct name {                                                           \
-    struct type *sqh_first;    /* first element */                      \
-    struct type **sqh_last;    /* addr of last next element */          \
-}
-
-#define QSIMPLEQ_HEAD_INITIALIZER(head)                                 \
-    { NULL, &(head).sqh_first }
-
-#define QSIMPLEQ_ENTRY(type)                                            \
-struct {                                                                \
-    struct type *sqe_next;    /* next element */                        \
-}
-
-/*
- * Simple queue functions.
- */
-#define QSIMPLEQ_INIT(head) do {                                        \
-    (head)->sqh_first = NULL;                                           \
-    (head)->sqh_last = &(head)->sqh_first;                              \
-} while (/*CONSTCOND*/0)
-
-#define QSIMPLEQ_INSERT_HEAD(head, elm, field) do {                     \
-    if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)            \
-        (head)->sqh_last = &(elm)->field.sqe_next;                      \
-    (head)->sqh_first = (elm);                                          \
-} while (/*CONSTCOND*/0)
-
-#define QSIMPLEQ_INSERT_TAIL(head, elm, field) do {                     \
-    (elm)->field.sqe_next = NULL;                                       \
-    *(head)->sqh_last = (elm);                                          \
-    (head)->sqh_last = &(elm)->field.sqe_next;                          \
-} while (/*CONSTCOND*/0)
-
-#define QSIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {           \
-    if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)    \
-        (head)->sqh_last = &(elm)->field.sqe_next;                      \
-    (listelm)->field.sqe_next = (elm);                                  \
-} while (/*CONSTCOND*/0)
-
-#define QSIMPLEQ_REMOVE_HEAD(head, field) do {                          \
-    if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL)\
-        (head)->sqh_last = &(head)->sqh_first;                          \
-} while (/*CONSTCOND*/0)
-
-#define QSIMPLEQ_REMOVE(head, elm, type, field) do {                    \
-    if ((head)->sqh_first == (elm)) {                                   \
-        QSIMPLEQ_REMOVE_HEAD((head), field);                            \
-    } else {                                                            \
-        struct type *curelm = (head)->sqh_first;                        \
-        while (curelm->field.sqe_next != (elm))                         \
-            curelm = curelm->field.sqe_next;                            \
-        if ((curelm->field.sqe_next =                                   \
-            curelm->field.sqe_next->field.sqe_next) == NULL)            \
-                (head)->sqh_last = &(curelm)->field.sqe_next;           \
-    }                                                                   \
-} while (/*CONSTCOND*/0)
-
-#define QSIMPLEQ_FOREACH(var, head, field)                              \
-    for ((var) = ((head)->sqh_first);                                   \
-        (var);                                                          \
-        (var) = ((var)->field.sqe_next))
-
-#define QSIMPLEQ_FOREACH_SAFE(var, head, field, next)                   \
-    for ((var) = ((head)->sqh_first);                                   \
-        (var) && ((next = ((var)->field.sqe_next)), 1);                 \
-        (var) = (next))
-
-#define QSIMPLEQ_CONCAT(head1, head2) do {                              \
-    if (!QSIMPLEQ_EMPTY((head2))) {                                     \
-        *(head1)->sqh_last = (head2)->sqh_first;                        \
-        (head1)->sqh_last = (head2)->sqh_last;                          \
-        QSIMPLEQ_INIT((head2));                                         \
-    }                                                                   \
-} while (/*CONSTCOND*/0)
-
-#define QSIMPLEQ_LAST(head, type, field)                                \
-    (QSIMPLEQ_EMPTY((head)) ?                                           \
-        NULL :                                                          \
-            ((struct type *)(void *)                                    \
-        ((char *)((head)->sqh_last) - offsetof(struct type, field))))
-
-/*
- * Simple queue access methods.
- */
-#define QSIMPLEQ_EMPTY(head)        ((head)->sqh_first == NULL)
-#define QSIMPLEQ_FIRST(head)        ((head)->sqh_first)
-#define QSIMPLEQ_NEXT(elm, field)   ((elm)->field.sqe_next)
-
-
-/*
- * Tail queue definitions.
- */
-#define Q_TAILQ_HEAD(name, type, qual)                                  \
-struct name {                                                           \
-        qual type *tqh_first;           /* first element */             \
-        qual type *qual *tqh_last;      /* addr of last next element */ \
-}
-#define QTAILQ_HEAD(name, type)  Q_TAILQ_HEAD(name, struct type,)
-
-#define QTAILQ_HEAD_INITIALIZER(head)                                   \
-        { NULL, &(head).tqh_first }
-
-#define Q_TAILQ_ENTRY(type, qual)                                       \
-struct {                                                                \
-        qual type *tqe_next;            /* next element */              \
-        qual type *qual *tqe_prev;      /* address of previous next element */\
-}
-#define QTAILQ_ENTRY(type)       Q_TAILQ_ENTRY(struct type,)
-
-/*
- * Tail queue functions.
- */
-#define QTAILQ_INIT(head) do {                                          \
-        (head)->tqh_first = NULL;                                       \
-        (head)->tqh_last = &(head)->tqh_first;                          \
-} while (/*CONSTCOND*/0)
-
-#define QTAILQ_INSERT_HEAD(head, elm, field) do {                       \
-        if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)        \
-                (head)->tqh_first->field.tqe_prev =                     \
-                    &(elm)->field.tqe_next;                             \
-        else                                                            \
-                (head)->tqh_last = &(elm)->field.tqe_next;              \
-        (head)->tqh_first = (elm);                                      \
-        (elm)->field.tqe_prev = &(head)->tqh_first;                     \
-} while (/*CONSTCOND*/0)
-
-#define QTAILQ_INSERT_TAIL(head, elm, field) do {                       \
-        (elm)->field.tqe_next = NULL;                                   \
-        (elm)->field.tqe_prev = (head)->tqh_last;                       \
-        *(head)->tqh_last = (elm);                                      \
-        (head)->tqh_last = &(elm)->field.tqe_next;                      \
-} while (/*CONSTCOND*/0)
-
-#define QTAILQ_INSERT_AFTER(head, listelm, elm, field) do {             \
-        if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-                (elm)->field.tqe_next->field.tqe_prev =                 \
-                    &(elm)->field.tqe_next;                             \
-        else                                                            \
-                (head)->tqh_last = &(elm)->field.tqe_next;              \
-        (listelm)->field.tqe_next = (elm);                              \
-        (elm)->field.tqe_prev = &(listelm)->field.tqe_next;             \
-} while (/*CONSTCOND*/0)
-
-#define QTAILQ_INSERT_BEFORE(listelm, elm, field) do {                  \
-        (elm)->field.tqe_prev = (listelm)->field.tqe_prev;              \
-        (elm)->field.tqe_next = (listelm);                              \
-        *(listelm)->field.tqe_prev = (elm);                             \
-        (listelm)->field.tqe_prev = &(elm)->field.tqe_next;             \
-} while (/*CONSTCOND*/0)
-
-#define QTAILQ_REMOVE(head, elm, field) do {                            \
-        if (((elm)->field.tqe_next) != NULL)                            \
-                (elm)->field.tqe_next->field.tqe_prev =                 \
-                    (elm)->field.tqe_prev;                              \
-        else                                                            \
-                (head)->tqh_last = (elm)->field.tqe_prev;               \
-        *(elm)->field.tqe_prev = (elm)->field.tqe_next;                 \
-} while (/*CONSTCOND*/0)
-
-#define QTAILQ_FOREACH(var, head, field)                                \
-        for ((var) = ((head)->tqh_first);                               \
-                (var);                                                  \
-                (var) = ((var)->field.tqe_next))
-
-#define QTAILQ_FOREACH_SAFE(var, head, field, next_var)                 \
-        for ((var) = ((head)->tqh_first);                               \
-                (var) && ((next_var) = ((var)->field.tqe_next), 1);     \
-                (var) = (next_var))
-
-#define QTAILQ_FOREACH_REVERSE(var, head, headname, field)              \
-        for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));    \
-                (var);                                                  \
-                (var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
-
-/*
- * Tail queue access methods.
- */
-#define QTAILQ_EMPTY(head)               ((head)->tqh_first == NULL)
-#define QTAILQ_FIRST(head)               ((head)->tqh_first)
-#define QTAILQ_NEXT(elm, field)          ((elm)->field.tqe_next)
-
-#define QTAILQ_LAST(head, headname) \
-        (*(((struct headname *)((head)->tqh_last))->tqh_last))
-#define QTAILQ_PREV(elm, headname, field) \
-        (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-#endif  /* !QEMU_SYS_QUEUE_H_ */
diff --git a/contrib/qemu/include/qemu/sockets.h b/contrib/qemu/include/qemu/sockets.h
deleted file mode 100644
index c5174d76a..000000000
--- a/contrib/qemu/include/qemu/sockets.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* headers to use the BSD sockets */
-#ifndef QEMU_SOCKET_H
-#define QEMU_SOCKET_H
-
-#ifdef _WIN32
-#include <windows.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-
-#define socket_error() WSAGetLastError()
-
-int inet_aton(const char *cp, struct in_addr *ia);
-
-#else
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/un.h>
-
-#define socket_error() errno
-#define closesocket(s) close(s)
-
-#endif /* !_WIN32 */
-
-#include "qemu/option.h"
-#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
-
-extern QemuOptsList socket_optslist;
-
-/* misc helpers */
-int qemu_socket(int domain, int type, int protocol);
-int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
-int socket_set_cork(int fd, int v);
-int socket_set_nodelay(int fd);
-void qemu_set_block(int fd);
-void qemu_set_nonblock(int fd);
-int send_all(int fd, const void *buf, int len1);
-int recv_all(int fd, void *buf, int len1, bool single_read);
-
-/* callback function for nonblocking connect
- * valid fd on success, negative error code on failure
- */
-typedef void NonBlockingConnectHandler(int fd, void *opaque);
-
-InetSocketAddress *inet_parse(const char *str, Error **errp);
-int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp);
-int inet_listen(const char *str, char *ostr, int olen,
-                int socktype, int port_offset, Error **errp);
-int inet_connect_opts(QemuOpts *opts, Error **errp,
-                      NonBlockingConnectHandler *callback, void *opaque);
-int inet_connect(const char *str, Error **errp);
-int inet_nonblocking_connect(const char *str,
-                             NonBlockingConnectHandler *callback,
-                             void *opaque, Error **errp);
-
-int inet_dgram_opts(QemuOpts *opts, Error **errp);
-const char *inet_strfamily(int family);
-
-int unix_listen_opts(QemuOpts *opts, Error **errp);
-int unix_listen(const char *path, char *ostr, int olen, Error **errp);
-int unix_connect_opts(QemuOpts *opts, Error **errp,
-                      NonBlockingConnectHandler *callback, void *opaque);
-int unix_connect(const char *path, Error **errp);
-int unix_nonblocking_connect(const char *str,
-                             NonBlockingConnectHandler *callback,
-                             void *opaque, Error **errp);
-
-SocketAddress *socket_parse(const char *str, Error **errp);
-int socket_connect(SocketAddress *addr, Error **errp,
-                   NonBlockingConnectHandler *callback, void *opaque);
-int socket_listen(SocketAddress *addr, Error **errp);
-int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
-
-/* Old, ipv4 only bits.  Don't use for new code. */
-int parse_host_port(struct sockaddr_in *saddr, const char *str);
-int socket_init(void);
-
-#endif /* QEMU_SOCKET_H */
diff --git a/contrib/qemu/include/qemu/thread-posix.h b/contrib/qemu/include/qemu/thread-posix.h
deleted file mode 100644
index 0f30dccb5..000000000
--- a/contrib/qemu/include/qemu/thread-posix.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __QEMU_THREAD_POSIX_H
-#define __QEMU_THREAD_POSIX_H 1
-#include "pthread.h"
-#include <semaphore.h>
-
-struct QemuMutex {
-    pthread_mutex_t lock;
-};
-
-struct QemuCond {
-    pthread_cond_t cond;
-};
-
-struct QemuSemaphore {
-#if defined(__APPLE__) || defined(__NetBSD__)
-    pthread_mutex_t lock;
-    pthread_cond_t cond;
-    int count;
-#else
-    sem_t sem;
-#endif
-};
-
-struct QemuThread {
-    pthread_t thread;
-};
-
-#endif
diff --git a/contrib/qemu/include/qemu/thread.h b/contrib/qemu/include/qemu/thread.h
deleted file mode 100644
index c02404b9f..000000000
--- a/contrib/qemu/include/qemu/thread.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef __QEMU_THREAD_H
-#define __QEMU_THREAD_H 1
-
-#include <inttypes.h>
-#include <stdbool.h>
-
-typedef struct QemuMutex QemuMutex;
-typedef struct QemuCond QemuCond;
-typedef struct QemuSemaphore QemuSemaphore;
-typedef struct QemuThread QemuThread;
-
-#ifdef _WIN32
-#include "qemu/thread-win32.h"
-#else
-#include "qemu/thread-posix.h"
-#endif
-
-#define QEMU_THREAD_JOINABLE 0
-#define QEMU_THREAD_DETACHED 1
-
-void qemu_mutex_init(QemuMutex *mutex);
-void qemu_mutex_destroy(QemuMutex *mutex);
-void qemu_mutex_lock(QemuMutex *mutex);
-int qemu_mutex_trylock(QemuMutex *mutex);
-void qemu_mutex_unlock(QemuMutex *mutex);
-
-#define rcu_read_lock() do { } while (0)
-#define rcu_read_unlock() do { } while (0)
-
-void qemu_cond_init(QemuCond *cond);
-void qemu_cond_destroy(QemuCond *cond);
-
-/*
- * IMPORTANT: The implementation does not guarantee that pthread_cond_signal
- * and pthread_cond_broadcast can be called except while the same mutex is
- * held as in the corresponding pthread_cond_wait calls!
- */
-void qemu_cond_signal(QemuCond *cond);
-void qemu_cond_broadcast(QemuCond *cond);
-void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex);
-
-void qemu_sem_init(QemuSemaphore *sem, int init);
-void qemu_sem_post(QemuSemaphore *sem);
-void qemu_sem_wait(QemuSemaphore *sem);
-int qemu_sem_timedwait(QemuSemaphore *sem, int ms);
-void qemu_sem_destroy(QemuSemaphore *sem);
-
-void qemu_thread_create(QemuThread *thread,
-                        void *(*start_routine)(void *),
-                        void *arg, int mode);
-void *qemu_thread_join(QemuThread *thread);
-void qemu_thread_get_self(QemuThread *thread);
-bool qemu_thread_is_self(QemuThread *thread);
-void qemu_thread_exit(void *retval);
-
-#endif
diff --git a/contrib/qemu/include/qemu/timer.h b/contrib/qemu/include/qemu/timer.h
deleted file mode 100644
index 9dd206ce7..000000000
--- a/contrib/qemu/include/qemu/timer.h
+++ /dev/null
@@ -1,305 +0,0 @@
-#ifndef QEMU_TIMER_H
-#define QEMU_TIMER_H
-
-#include "qemu-common.h"
-#include "qemu/main-loop.h"
-#include "qemu/notify.h"
-
-/* timers */
-
-#define SCALE_MS 1000000
-#define SCALE_US 1000
-#define SCALE_NS 1
-
-typedef struct QEMUClock QEMUClock;
-typedef void QEMUTimerCB(void *opaque);
-
-/* The real time clock should be used only for stuff which does not
-   change the virtual machine state, as it is run even if the virtual
-   machine is stopped. The real time clock has a frequency of 1000
-   Hz. */
-extern QEMUClock *rt_clock;
-
-/* The virtual clock is only run during the emulation. It is stopped
-   when the virtual machine is stopped. Virtual timers use a high
-   precision clock, usually cpu cycles (use ticks_per_sec). */
-extern QEMUClock *vm_clock;
-
-/* The host clock should be use for device models that emulate accurate
-   real time sources. It will continue to run when the virtual machine
-   is suspended, and it will reflect system time changes the host may
-   undergo (e.g. due to NTP). The host clock has the same precision as
-   the virtual clock. */
-extern QEMUClock *host_clock;
-
-int64_t qemu_get_clock_ns(QEMUClock *clock);
-int64_t qemu_clock_has_timers(QEMUClock *clock);
-int64_t qemu_clock_expired(QEMUClock *clock);
-int64_t qemu_clock_deadline(QEMUClock *clock);
-void qemu_clock_enable(QEMUClock *clock, bool enabled);
-void qemu_clock_warp(QEMUClock *clock);
-
-void qemu_register_clock_reset_notifier(QEMUClock *clock, Notifier *notifier);
-void qemu_unregister_clock_reset_notifier(QEMUClock *clock,
-                                          Notifier *notifier);
-
-QEMUTimer *qemu_new_timer(QEMUClock *clock, int scale,
-                          QEMUTimerCB *cb, void *opaque);
-void qemu_free_timer(QEMUTimer *ts);
-void qemu_del_timer(QEMUTimer *ts);
-void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time);
-void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time);
-bool qemu_timer_pending(QEMUTimer *ts);
-bool qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time);
-uint64_t qemu_timer_expire_time_ns(QEMUTimer *ts);
-
-void qemu_run_timers(QEMUClock *clock);
-void qemu_run_all_timers(void);
-void configure_alarms(char const *opt);
-void init_clocks(void);
-int init_timer_alarm(void);
-
-int64_t cpu_get_ticks(void);
-void cpu_enable_ticks(void);
-void cpu_disable_ticks(void);
-
-static inline QEMUTimer *qemu_new_timer_ns(QEMUClock *clock, QEMUTimerCB *cb,
-                                           void *opaque)
-{
-    return qemu_new_timer(clock, SCALE_NS, cb, opaque);
-}
-
-static inline QEMUTimer *qemu_new_timer_ms(QEMUClock *clock, QEMUTimerCB *cb,
-                                           void *opaque)
-{
-    return qemu_new_timer(clock, SCALE_MS, cb, opaque);
-}
-
-static inline int64_t qemu_get_clock_ms(QEMUClock *clock)
-{
-    return qemu_get_clock_ns(clock) / SCALE_MS;
-}
-
-static inline int64_t get_ticks_per_sec(void)
-{
-    return 1000000000LL;
-}
-
-/* real time host monotonic timer */
-static inline int64_t get_clock_realtime(void)
-{
-    struct timeval tv;
-
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000);
-}
-
-/* Warning: don't insert tracepoints into these functions, they are
-   also used by simpletrace backend and tracepoints would cause
-   an infinite recursion! */
-#ifdef _WIN32
-extern int64_t clock_freq;
-
-static inline int64_t get_clock(void)
-{
-    LARGE_INTEGER ti;
-    QueryPerformanceCounter(&ti);
-    return muldiv64(ti.QuadPart, get_ticks_per_sec(), clock_freq);
-}
-
-#else
-
-extern int use_rt_clock;
-
-static inline int64_t get_clock(void)
-{
-#ifdef CLOCK_MONOTONIC
-    if (use_rt_clock) {
-        struct timespec ts;
-        clock_gettime(CLOCK_MONOTONIC, &ts);
-        return ts.tv_sec * 1000000000LL + ts.tv_nsec;
-    } else
-#endif
-    {
-        /* XXX: using gettimeofday leads to problems if the date
-           changes, so it should be avoided. */
-        return get_clock_realtime();
-    }
-}
-#endif
-
-void qemu_get_timer(QEMUFile *f, QEMUTimer *ts);
-void qemu_put_timer(QEMUFile *f, QEMUTimer *ts);
-
-/* icount */
-int64_t cpu_get_icount(void);
-int64_t cpu_get_clock(void);
-
-/*******************************************/
-/* host CPU ticks (if available) */
-
-#if defined(_ARCH_PPC)
-
-static inline int64_t cpu_get_real_ticks(void)
-{
-    int64_t retval;
-#ifdef _ARCH_PPC64
-    /* This reads timebase in one 64bit go and includes Cell workaround from:
-       http://ozlabs.org/pipermail/linuxppc-dev/2006-October/027052.html
-    */
-    __asm__ __volatile__ ("mftb    %0\n\t"
-                          "cmpwi   %0,0\n\t"
-                          "beq-    $-8"
-                          : "=r" (retval));
-#else
-    /* http://ozlabs.org/pipermail/linuxppc-dev/1999-October/003889.html */
-    unsigned long junk;
-    __asm__ __volatile__ ("mfspr   %1,269\n\t"  /* mftbu */
-                          "mfspr   %L0,268\n\t" /* mftb */
-                          "mfspr   %0,269\n\t"  /* mftbu */
-                          "cmpw    %0,%1\n\t"
-                          "bne     $-16"
-                          : "=r" (retval), "=r" (junk));
-#endif
-    return retval;
-}
-
-#elif defined(__i386__)
-
-static inline int64_t cpu_get_real_ticks(void)
-{
-    int64_t val;
-    asm volatile ("rdtsc" : "=A" (val));
-    return val;
-}
-
-#elif defined(__x86_64__)
-
-static inline int64_t cpu_get_real_ticks(void)
-{
-    uint32_t low,high;
-    int64_t val;
-    asm volatile("rdtsc" : "=a" (low), "=d" (high));
-    val = high;
-    val <<= 32;
-    val |= low;
-    return val;
-}
-
-#elif defined(__hppa__)
-
-static inline int64_t cpu_get_real_ticks(void)
-{
-    int val;
-    asm volatile ("mfctl %%cr16, %0" : "=r"(val));
-    return val;
-}
-
-#elif defined(__ia64)
-
-static inline int64_t cpu_get_real_ticks(void)
-{
-    int64_t val;
-    asm volatile ("mov %0 = ar.itc" : "=r"(val) :: "memory");
-    return val;
-}
-
-#elif defined(__s390__)
-
-static inline int64_t cpu_get_real_ticks(void)
-{
-    int64_t val;
-    asm volatile("stck 0(%1)" : "=m" (val) : "a" (&val) : "cc");
-    return val;
-}
-
-#elif defined(__sparc__)
-
-static inline int64_t cpu_get_real_ticks (void)
-{
-#if defined(_LP64)
-    uint64_t        rval;
-    asm volatile("rd %%tick,%0" : "=r"(rval));
-    return rval;
-#else
-    /* We need an %o or %g register for this.  For recent enough gcc
-       there is an "h" constraint for that.  Don't bother with that.  */
-    union {
-        uint64_t i64;
-        struct {
-            uint32_t high;
-            uint32_t low;
-        }       i32;
-    } rval;
-    asm volatile("rd %%tick,%%g1; srlx %%g1,32,%0; mov %%g1,%1"
-                 : "=r"(rval.i32.high), "=r"(rval.i32.low) : : "g1");
-    return rval.i64;
-#endif
-}
-
-#elif defined(__mips__) && \
-    ((defined(__mips_isa_rev) && __mips_isa_rev >= 2) || defined(__linux__))
-/*
- * binutils wants to use rdhwr only on mips32r2
- * but as linux kernel emulate it, it's fine
- * to use it.
- *
- */
-#define MIPS_RDHWR(rd, value) {                         \
-        __asm__ __volatile__ (".set   push\n\t"         \
-                              ".set mips32r2\n\t"       \
-                              "rdhwr  %0, "rd"\n\t"     \
-                              ".set   pop"              \
-                              : "=r" (value));          \
-    }
-
-static inline int64_t cpu_get_real_ticks(void)
-{
-    /* On kernels >= 2.6.25 rdhwr <reg>, $2 and $3 are emulated */
-    uint32_t count;
-    static uint32_t cyc_per_count = 0;
-
-    if (!cyc_per_count) {
-        MIPS_RDHWR("$3", cyc_per_count);
-    }
-
-    MIPS_RDHWR("$2", count);
-    return (int64_t)(count * cyc_per_count);
-}
-
-#elif defined(__alpha__)
-
-static inline int64_t cpu_get_real_ticks(void)
-{
-    uint64_t cc;
-    uint32_t cur, ofs;
-
-    asm volatile("rpcc %0" : "=r"(cc));
-    cur = cc;
-    ofs = cc >> 32;
-    return cur - ofs;
-}
-
-#else
-/* The host CPU doesn't have an easily accessible cycle counter.
-   Just return a monotonically increasing value.  This will be
-   totally wrong, but hopefully better than nothing.  */
-static inline int64_t cpu_get_real_ticks (void)
-{
-    static int64_t ticks = 0;
-    return ticks++;
-}
-#endif
-
-#ifdef CONFIG_PROFILER
-static inline int64_t profile_getclock(void)
-{
-    return cpu_get_real_ticks();
-}
-
-extern int64_t qemu_time, qemu_time_start;
-extern int64_t tlb_flush_time;
-extern int64_t dev_time;
-#endif
-
-#endif
diff --git a/contrib/qemu/include/qemu/typedefs.h b/contrib/qemu/include/qemu/typedefs.h
deleted file mode 100644
index ac9f8d41a..000000000
--- a/contrib/qemu/include/qemu/typedefs.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef QEMU_TYPEDEFS_H
-#define QEMU_TYPEDEFS_H
-
-/* A load of opaque types so that device init declarations don't have to
-   pull in all the real definitions.  */
-typedef struct QEMUTimer QEMUTimer;
-typedef struct QEMUFile QEMUFile;
-typedef struct QEMUBH QEMUBH;
-
-struct Monitor;
-typedef struct Monitor Monitor;
-typedef struct MigrationParams MigrationParams;
-
-typedef struct Property Property;
-typedef struct PropertyInfo PropertyInfo;
-typedef struct CompatProperty CompatProperty;
-typedef struct DeviceState DeviceState;
-typedef struct BusState BusState;
-typedef struct BusClass BusClass;
-
-typedef struct AddressSpace AddressSpace;
-typedef struct MemoryRegion MemoryRegion;
-typedef struct MemoryRegionSection MemoryRegionSection;
-
-typedef struct MemoryMappingList MemoryMappingList;
-
-typedef struct NICInfo NICInfo;
-typedef struct HCIInfo HCIInfo;
-typedef struct AudioState AudioState;
-typedef struct BlockDriverState BlockDriverState;
-typedef struct DriveInfo DriveInfo;
-typedef struct DisplayState DisplayState;
-typedef struct DisplayChangeListener DisplayChangeListener;
-typedef struct DisplaySurface DisplaySurface;
-typedef struct PixelFormat PixelFormat;
-typedef struct QemuConsole QemuConsole;
-typedef struct CharDriverState CharDriverState;
-typedef struct MACAddr MACAddr;
-typedef struct NetClientState NetClientState;
-typedef struct i2c_bus i2c_bus;
-typedef struct ISABus ISABus;
-typedef struct ISADevice ISADevice;
-typedef struct SMBusDevice SMBusDevice;
-typedef struct PCIHostState PCIHostState;
-typedef struct PCIExpressHost PCIExpressHost;
-typedef struct PCIBus PCIBus;
-typedef struct PCIDevice PCIDevice;
-typedef struct PCIExpressDevice PCIExpressDevice;
-typedef struct PCIBridge PCIBridge;
-typedef struct PCIEAERMsg PCIEAERMsg;
-typedef struct PCIEAERLog PCIEAERLog;
-typedef struct PCIEAERErr PCIEAERErr;
-typedef struct PCIEPort PCIEPort;
-typedef struct PCIESlot PCIESlot;
-typedef struct MSIMessage MSIMessage;
-typedef struct SerialState SerialState;
-typedef struct PCMCIACardState PCMCIACardState;
-typedef struct MouseTransformInfo MouseTransformInfo;
-typedef struct uWireSlave uWireSlave;
-typedef struct I2SCodec I2SCodec;
-typedef struct SSIBus SSIBus;
-typedef struct EventNotifier EventNotifier;
-typedef struct VirtIODevice VirtIODevice;
-typedef struct QEMUSGList QEMUSGList;
-typedef struct SHPCDevice SHPCDevice;
-typedef struct FWCfgState FWCfgState;
-typedef struct PcGuestInfo PcGuestInfo;
-
-#endif /* QEMU_TYPEDEFS_H */
diff --git a/contrib/qemu/include/sysemu/os-posix.h b/contrib/qemu/include/sysemu/os-posix.h
deleted file mode 100644
index 25d0b2a73..000000000
--- a/contrib/qemu/include/sysemu/os-posix.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * posix specific declarations
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- * Copyright (c) 2010 Jes Sorensen <Jes.Sorensen@redhat.com>
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef QEMU_OS_POSIX_H
-#define QEMU_OS_POSIX_H
-
-void os_set_line_buffering(void);
-void os_set_proc_name(const char *s);
-void os_setup_signal_handling(void);
-void os_daemonize(void);
-void os_setup_post(void);
-int os_mlock(void);
-
-typedef struct timeval qemu_timeval;
-#define qemu_gettimeofday(tp) gettimeofday(tp, NULL)
-
-#ifndef CONFIG_UTIMENSAT
-#ifndef UTIME_NOW
-# define UTIME_NOW     ((1l << 30) - 1l)
-#endif
-#ifndef UTIME_OMIT
-# define UTIME_OMIT    ((1l << 30) - 2l)
-#endif
-#endif
-typedef struct timespec qemu_timespec;
-int qemu_utimens(const char *path, const qemu_timespec *times);
-
-bool is_daemonized(void);
-
-#endif
diff --git a/contrib/qemu/include/sysemu/sysemu.h b/contrib/qemu/include/sysemu/sysemu.h
deleted file mode 100644
index 3caeb66eb..000000000
--- a/contrib/qemu/include/sysemu/sysemu.h
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef SYSEMU_H
-#define SYSEMU_H
-/* Misc. things related to the system emulator.  */
-
-#include "qemu/typedefs.h"
-#include "qemu/option.h"
-#include "qemu/queue.h"
-#include "qemu/timer.h"
-#include "qapi-types.h"
-#include "qemu/notify.h"
-#include "qemu/main-loop.h"
-
-/* vl.c */
-
-extern const char *bios_name;
-
-extern const char *qemu_name;
-extern uint8_t qemu_uuid[];
-int qemu_uuid_parse(const char *str, uint8_t *uuid);
-#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
-
-bool runstate_check(RunState state);
-void runstate_set(RunState new_state);
-int runstate_is_running(void);
-bool runstate_needs_reset(void);
-typedef struct vm_change_state_entry VMChangeStateEntry;
-typedef void VMChangeStateHandler(void *opaque, int running, RunState state);
-
-VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
-                                                     void *opaque);
-void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
-void vm_state_notify(int running, RunState state);
-
-#define VMRESET_SILENT   false
-#define VMRESET_REPORT   true
-
-void vm_start(void);
-int vm_stop(RunState state);
-int vm_stop_force_state(RunState state);
-
-typedef enum WakeupReason {
-    QEMU_WAKEUP_REASON_OTHER = 0,
-    QEMU_WAKEUP_REASON_RTC,
-    QEMU_WAKEUP_REASON_PMTIMER,
-} WakeupReason;
-
-void qemu_system_reset_request(void);
-void qemu_system_suspend_request(void);
-void qemu_register_suspend_notifier(Notifier *notifier);
-void qemu_system_wakeup_request(WakeupReason reason);
-void qemu_system_wakeup_enable(WakeupReason reason, bool enabled);
-void qemu_register_wakeup_notifier(Notifier *notifier);
-void qemu_system_shutdown_request(void);
-void qemu_system_powerdown_request(void);
-void qemu_register_powerdown_notifier(Notifier *notifier);
-void qemu_system_debug_request(void);
-void qemu_system_vmstop_request(RunState reason);
-int qemu_shutdown_requested_get(void);
-int qemu_reset_requested_get(void);
-void qemu_system_killed(int signal, pid_t pid);
-void qemu_devices_reset(void);
-void qemu_system_reset(bool report);
-
-void qemu_add_exit_notifier(Notifier *notify);
-void qemu_remove_exit_notifier(Notifier *notify);
-
-void qemu_add_machine_init_done_notifier(Notifier *notify);
-
-void do_savevm(Monitor *mon, const QDict *qdict);
-int load_vmstate(const char *name);
-void do_delvm(Monitor *mon, const QDict *qdict);
-void do_info_snapshots(Monitor *mon, const QDict *qdict);
-
-void qemu_announce_self(void);
-
-bool qemu_savevm_state_blocked(Error **errp);
-void qemu_savevm_state_begin(QEMUFile *f,
-                             const MigrationParams *params);
-int qemu_savevm_state_iterate(QEMUFile *f);
-void qemu_savevm_state_complete(QEMUFile *f);
-void qemu_savevm_state_cancel(void);
-uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
-int qemu_loadvm_state(QEMUFile *f);
-
-/* SLIRP */
-void do_info_slirp(Monitor *mon);
-
-typedef enum DisplayType
-{
-    DT_DEFAULT,
-    DT_CURSES,
-    DT_SDL,
-    DT_GTK,
-    DT_NOGRAPHIC,
-    DT_NONE,
-} DisplayType;
-
-extern int autostart;
-
-typedef enum {
-    VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
-} VGAInterfaceType;
-
-extern int vga_interface_type;
-#define xenfb_enabled (vga_interface_type == VGA_XENFB)
-#define qxl_enabled (vga_interface_type == VGA_QXL)
-
-extern int graphic_width;
-extern int graphic_height;
-extern int graphic_depth;
-extern DisplayType display_type;
-extern const char *keyboard_layout;
-extern int win2k_install_hack;
-extern int alt_grab;
-extern int ctrl_grab;
-extern int smp_cpus;
-extern int max_cpus;
-extern int cursor_hide;
-extern int graphic_rotate;
-extern int no_quit;
-extern int no_shutdown;
-extern int semihosting_enabled;
-extern int old_param;
-extern int boot_menu;
-extern uint8_t *boot_splash_filedata;
-extern size_t boot_splash_filedata_size;
-extern uint8_t qemu_extra_params_fw[2];
-extern QEMUClock *rtc_clock;
-
-#define MAX_NODES 64
-#define MAX_CPUMASK_BITS 255
-extern int nb_numa_nodes;
-extern uint64_t node_mem[MAX_NODES];
-extern unsigned long *node_cpumask[MAX_NODES];
-
-#define MAX_OPTION_ROMS 16
-typedef struct QEMUOptionRom {
-    const char *name;
-    int32_t bootindex;
-} QEMUOptionRom;
-extern QEMUOptionRom option_rom[MAX_OPTION_ROMS];
-extern int nb_option_roms;
-
-#define MAX_PROM_ENVS 128
-extern const char *prom_envs[MAX_PROM_ENVS];
-extern unsigned int nb_prom_envs;
-
-/* pci-hotplug */
-void pci_device_hot_add(Monitor *mon, const QDict *qdict);
-int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo);
-void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);
-
-/* generic hotplug */
-void drive_hot_add(Monitor *mon, const QDict *qdict);
-
-/* CPU hotplug */
-void qemu_register_cpu_added_notifier(Notifier *notifier);
-
-/* pcie aer error injection */
-void pcie_aer_inject_error_print(Monitor *mon, const QObject *data);
-int do_pcie_aer_inject_error(Monitor *mon,
-                             const QDict *qdict, QObject **ret_data);
-
-/* serial ports */
-
-#define MAX_SERIAL_PORTS 4
-
-extern CharDriverState *serial_hds[MAX_SERIAL_PORTS];
-
-/* parallel ports */
-
-#define MAX_PARALLEL_PORTS 3
-
-extern CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];
-
-void do_usb_add(Monitor *mon, const QDict *qdict);
-void do_usb_del(Monitor *mon, const QDict *qdict);
-void usb_info(Monitor *mon, const QDict *qdict);
-
-void rtc_change_mon_event(struct tm *tm);
-
-void add_boot_device_path(int32_t bootindex, DeviceState *dev,
-                          const char *suffix);
-char *get_boot_devices_list(size_t *size);
-
-DeviceState *get_boot_device(uint32_t position);
-
-QemuOpts *qemu_get_machine_opts(void);
-
-bool usb_enabled(bool default_usb);
-
-extern QemuOptsList qemu_drive_opts;
-extern QemuOptsList qemu_chardev_opts;
-extern QemuOptsList qemu_device_opts;
-extern QemuOptsList qemu_netdev_opts;
-extern QemuOptsList qemu_net_opts;
-extern QemuOptsList qemu_global_opts;
-extern QemuOptsList qemu_mon_opts;
-
-#endif
diff --git a/contrib/qemu/include/trace.h b/contrib/qemu/include/trace.h
deleted file mode 100644
index c15f49812..000000000
--- a/contrib/qemu/include/trace.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef TRACE_H
-#define TRACE_H
-
-#include "trace/generated-tracers.h"
-
-#endif  /* TRACE_H */
diff --git a/contrib/qemu/nop-symbols.c b/contrib/qemu/nop-symbols.c
deleted file mode 100644
index ae93a3d3b..000000000
--- a/contrib/qemu/nop-symbols.c
+++ /dev/null
@@ -1,12 +0,0 @@
-int notifier_with_return_list_init () { return 0; }
-int notifier_with_return_list_notify () { return 0; }
-int notifier_with_return_list_add () { return 0; }
-int notifier_list_init () { return 0; }
-int notifier_list_notify () { return 0; }
-int notifier_list_add () { return 0; }
-int monitor_protocol_event () { return 0; }
-int block_job_cancel_sync () { return 0; }
-int block_job_iostatus_reset () { return 0; }
-int vm_stop () { return 0; }
-int qemu_get_aio_context () { return 0; }
-
diff --git a/contrib/qemu/qapi-types.h b/contrib/qemu/qapi-types.h
deleted file mode 100644
index 082b06d1c..000000000
--- a/contrib/qemu/qapi-types.h
+++ /dev/null
@@ -1,2746 +0,0 @@
-/* AUTOMATICALLY GENERATED, DO NOT MODIFY */
-
-/*
- * schema-defined QAPI types
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QAPI_TYPES_H
-#define QAPI_TYPES_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-
-#ifndef QAPI_TYPES_BUILTIN_STRUCT_DECL_H
-#define QAPI_TYPES_BUILTIN_STRUCT_DECL_H
-
-
-typedef struct strList
-{
-    union {
-        char * value;
-        uint64_t padding;
-    };
-    struct strList *next;
-} strList;
-
-typedef struct intList
-{
-    union {
-        int64_t value;
-        uint64_t padding;
-    };
-    struct intList *next;
-} intList;
-
-typedef struct numberList
-{
-    union {
-        double value;
-        uint64_t padding;
-    };
-    struct numberList *next;
-} numberList;
-
-typedef struct boolList
-{
-    union {
-        bool value;
-        uint64_t padding;
-    };
-    struct boolList *next;
-} boolList;
-
-typedef struct int8List
-{
-    union {
-        int8_t value;
-        uint64_t padding;
-    };
-    struct int8List *next;
-} int8List;
-
-typedef struct int16List
-{
-    union {
-        int16_t value;
-        uint64_t padding;
-    };
-    struct int16List *next;
-} int16List;
-
-typedef struct int32List
-{
-    union {
-        int32_t value;
-        uint64_t padding;
-    };
-    struct int32List *next;
-} int32List;
-
-typedef struct int64List
-{
-    union {
-        int64_t value;
-        uint64_t padding;
-    };
-    struct int64List *next;
-} int64List;
-
-typedef struct uint8List
-{
-    union {
-        uint8_t value;
-        uint64_t padding;
-    };
-    struct uint8List *next;
-} uint8List;
-
-typedef struct uint16List
-{
-    union {
-        uint16_t value;
-        uint64_t padding;
-    };
-    struct uint16List *next;
-} uint16List;
-
-typedef struct uint32List
-{
-    union {
-        uint32_t value;
-        uint64_t padding;
-    };
-    struct uint32List *next;
-} uint32List;
-
-typedef struct uint64List
-{
-    union {
-        uint64_t value;
-        uint64_t padding;
-    };
-    struct uint64List *next;
-} uint64List;
-
-#endif /* QAPI_TYPES_BUILTIN_STRUCT_DECL_H */
-
-
-extern const char *ErrorClass_lookup[];
-typedef enum ErrorClass
-{
-    ERROR_CLASS_GENERIC_ERROR = 0,
-    ERROR_CLASS_COMMAND_NOT_FOUND = 1,
-    ERROR_CLASS_DEVICE_ENCRYPTED = 2,
-    ERROR_CLASS_DEVICE_NOT_ACTIVE = 3,
-    ERROR_CLASS_DEVICE_NOT_FOUND = 4,
-    ERROR_CLASS_K_V_M_MISSING_CAP = 5,
-    ERROR_CLASS_MAX = 6,
-} ErrorClass;
-
-typedef struct ErrorClassList
-{
-    ErrorClass value;
-    struct ErrorClassList *next;
-} ErrorClassList;
-
-
-typedef struct NameInfo NameInfo;
-
-typedef struct NameInfoList
-{
-    union {
-        NameInfo *value;
-        uint64_t padding;
-    };
-    struct NameInfoList *next;
-} NameInfoList;
-
-
-typedef struct VersionInfo VersionInfo;
-
-typedef struct VersionInfoList
-{
-    union {
-        VersionInfo *value;
-        uint64_t padding;
-    };
-    struct VersionInfoList *next;
-} VersionInfoList;
-
-
-typedef struct KvmInfo KvmInfo;
-
-typedef struct KvmInfoList
-{
-    union {
-        KvmInfo *value;
-        uint64_t padding;
-    };
-    struct KvmInfoList *next;
-} KvmInfoList;
-
-extern const char *RunState_lookup[];
-typedef enum RunState
-{
-    RUN_STATE_DEBUG = 0,
-    RUN_STATE_INMIGRATE = 1,
-    RUN_STATE_INTERNAL_ERROR = 2,
-    RUN_STATE_IO_ERROR = 3,
-    RUN_STATE_PAUSED = 4,
-    RUN_STATE_POSTMIGRATE = 5,
-    RUN_STATE_PRELAUNCH = 6,
-    RUN_STATE_FINISH_MIGRATE = 7,
-    RUN_STATE_RESTORE_VM = 8,
-    RUN_STATE_RUNNING = 9,
-    RUN_STATE_SAVE_VM = 10,
-    RUN_STATE_SHUTDOWN = 11,
-    RUN_STATE_SUSPENDED = 12,
-    RUN_STATE_WATCHDOG = 13,
-    RUN_STATE_GUEST_PANICKED = 14,
-    RUN_STATE_MAX = 15,
-} RunState;
-
-typedef struct RunStateList
-{
-    RunState value;
-    struct RunStateList *next;
-} RunStateList;
-
-
-typedef struct SnapshotInfo SnapshotInfo;
-
-typedef struct SnapshotInfoList
-{
-    union {
-        SnapshotInfo *value;
-        uint64_t padding;
-    };
-    struct SnapshotInfoList *next;
-} SnapshotInfoList;
-
-
-typedef struct ImageInfo ImageInfo;
-
-typedef struct ImageInfoList
-{
-    union {
-        ImageInfo *value;
-        uint64_t padding;
-    };
-    struct ImageInfoList *next;
-} ImageInfoList;
-
-
-typedef struct ImageCheck ImageCheck;
-
-typedef struct ImageCheckList
-{
-    union {
-        ImageCheck *value;
-        uint64_t padding;
-    };
-    struct ImageCheckList *next;
-} ImageCheckList;
-
-
-typedef struct StatusInfo StatusInfo;
-
-typedef struct StatusInfoList
-{
-    union {
-        StatusInfo *value;
-        uint64_t padding;
-    };
-    struct StatusInfoList *next;
-} StatusInfoList;
-
-
-typedef struct UuidInfo UuidInfo;
-
-typedef struct UuidInfoList
-{
-    union {
-        UuidInfo *value;
-        uint64_t padding;
-    };
-    struct UuidInfoList *next;
-} UuidInfoList;
-
-
-typedef struct ChardevInfo ChardevInfo;
-
-typedef struct ChardevInfoList
-{
-    union {
-        ChardevInfo *value;
-        uint64_t padding;
-    };
-    struct ChardevInfoList *next;
-} ChardevInfoList;
-
-extern const char *DataFormat_lookup[];
-typedef enum DataFormat
-{
-    DATA_FORMAT_UTF8 = 0,
-    DATA_FORMAT_BASE64 = 1,
-    DATA_FORMAT_MAX = 2,
-} DataFormat;
-
-typedef struct DataFormatList
-{
-    DataFormat value;
-    struct DataFormatList *next;
-} DataFormatList;
-
-
-typedef struct CommandInfo CommandInfo;
-
-typedef struct CommandInfoList
-{
-    union {
-        CommandInfo *value;
-        uint64_t padding;
-    };
-    struct CommandInfoList *next;
-} CommandInfoList;
-
-
-typedef struct EventInfo EventInfo;
-
-typedef struct EventInfoList
-{
-    union {
-        EventInfo *value;
-        uint64_t padding;
-    };
-    struct EventInfoList *next;
-} EventInfoList;
-
-
-typedef struct MigrationStats MigrationStats;
-
-typedef struct MigrationStatsList
-{
-    union {
-        MigrationStats *value;
-        uint64_t padding;
-    };
-    struct MigrationStatsList *next;
-} MigrationStatsList;
-
-
-typedef struct XBZRLECacheStats XBZRLECacheStats;
-
-typedef struct XBZRLECacheStatsList
-{
-    union {
-        XBZRLECacheStats *value;
-        uint64_t padding;
-    };
-    struct XBZRLECacheStatsList *next;
-} XBZRLECacheStatsList;
-
-
-typedef struct MigrationInfo MigrationInfo;
-
-typedef struct MigrationInfoList
-{
-    union {
-        MigrationInfo *value;
-        uint64_t padding;
-    };
-    struct MigrationInfoList *next;
-} MigrationInfoList;
-
-extern const char *MigrationCapability_lookup[];
-typedef enum MigrationCapability
-{
-    MIGRATION_CAPABILITY_XBZRLE = 0,
-    MIGRATION_CAPABILITY_X_RDMA_PIN_ALL = 1,
-    MIGRATION_CAPABILITY_AUTO_CONVERGE = 2,
-    MIGRATION_CAPABILITY_MAX = 3,
-} MigrationCapability;
-
-typedef struct MigrationCapabilityList
-{
-    MigrationCapability value;
-    struct MigrationCapabilityList *next;
-} MigrationCapabilityList;
-
-
-typedef struct MigrationCapabilityStatus MigrationCapabilityStatus;
-
-typedef struct MigrationCapabilityStatusList
-{
-    union {
-        MigrationCapabilityStatus *value;
-        uint64_t padding;
-    };
-    struct MigrationCapabilityStatusList *next;
-} MigrationCapabilityStatusList;
-
-
-typedef struct MouseInfo MouseInfo;
-
-typedef struct MouseInfoList
-{
-    union {
-        MouseInfo *value;
-        uint64_t padding;
-    };
-    struct MouseInfoList *next;
-} MouseInfoList;
-
-
-typedef struct CpuInfo CpuInfo;
-
-typedef struct CpuInfoList
-{
-    union {
-        CpuInfo *value;
-        uint64_t padding;
-    };
-    struct CpuInfoList *next;
-} CpuInfoList;
-
-
-typedef struct BlockDeviceInfo BlockDeviceInfo;
-
-typedef struct BlockDeviceInfoList
-{
-    union {
-        BlockDeviceInfo *value;
-        uint64_t padding;
-    };
-    struct BlockDeviceInfoList *next;
-} BlockDeviceInfoList;
-
-extern const char *BlockDeviceIoStatus_lookup[];
-typedef enum BlockDeviceIoStatus
-{
-    BLOCK_DEVICE_IO_STATUS_OK = 0,
-    BLOCK_DEVICE_IO_STATUS_FAILED = 1,
-    BLOCK_DEVICE_IO_STATUS_NOSPACE = 2,
-    BLOCK_DEVICE_IO_STATUS_MAX = 3,
-} BlockDeviceIoStatus;
-
-typedef struct BlockDeviceIoStatusList
-{
-    BlockDeviceIoStatus value;
-    struct BlockDeviceIoStatusList *next;
-} BlockDeviceIoStatusList;
-
-
-typedef struct BlockDirtyInfo BlockDirtyInfo;
-
-typedef struct BlockDirtyInfoList
-{
-    union {
-        BlockDirtyInfo *value;
-        uint64_t padding;
-    };
-    struct BlockDirtyInfoList *next;
-} BlockDirtyInfoList;
-
-
-typedef struct BlockInfo BlockInfo;
-
-typedef struct BlockInfoList
-{
-    union {
-        BlockInfo *value;
-        uint64_t padding;
-    };
-    struct BlockInfoList *next;
-} BlockInfoList;
-
-
-typedef struct BlockDeviceStats BlockDeviceStats;
-
-typedef struct BlockDeviceStatsList
-{
-    union {
-        BlockDeviceStats *value;
-        uint64_t padding;
-    };
-    struct BlockDeviceStatsList *next;
-} BlockDeviceStatsList;
-
-
-typedef struct BlockStats BlockStats;
-
-typedef struct BlockStatsList
-{
-    union {
-        BlockStats *value;
-        uint64_t padding;
-    };
-    struct BlockStatsList *next;
-} BlockStatsList;
-
-
-typedef struct VncClientInfo VncClientInfo;
-
-typedef struct VncClientInfoList
-{
-    union {
-        VncClientInfo *value;
-        uint64_t padding;
-    };
-    struct VncClientInfoList *next;
-} VncClientInfoList;
-
-
-typedef struct VncInfo VncInfo;
-
-typedef struct VncInfoList
-{
-    union {
-        VncInfo *value;
-        uint64_t padding;
-    };
-    struct VncInfoList *next;
-} VncInfoList;
-
-
-typedef struct SpiceChannel SpiceChannel;
-
-typedef struct SpiceChannelList
-{
-    union {
-        SpiceChannel *value;
-        uint64_t padding;
-    };
-    struct SpiceChannelList *next;
-} SpiceChannelList;
-
-extern const char *SpiceQueryMouseMode_lookup[];
-typedef enum SpiceQueryMouseMode
-{
-    SPICE_QUERY_MOUSE_MODE_CLIENT = 0,
-    SPICE_QUERY_MOUSE_MODE_SERVER = 1,
-    SPICE_QUERY_MOUSE_MODE_UNKNOWN = 2,
-    SPICE_QUERY_MOUSE_MODE_MAX = 3,
-} SpiceQueryMouseMode;
-
-typedef struct SpiceQueryMouseModeList
-{
-    SpiceQueryMouseMode value;
-    struct SpiceQueryMouseModeList *next;
-} SpiceQueryMouseModeList;
-
-
-typedef struct SpiceInfo SpiceInfo;
-
-typedef struct SpiceInfoList
-{
-    union {
-        SpiceInfo *value;
-        uint64_t padding;
-    };
-    struct SpiceInfoList *next;
-} SpiceInfoList;
-
-
-typedef struct BalloonInfo BalloonInfo;
-
-typedef struct BalloonInfoList
-{
-    union {
-        BalloonInfo *value;
-        uint64_t padding;
-    };
-    struct BalloonInfoList *next;
-} BalloonInfoList;
-
-
-typedef struct PciMemoryRange PciMemoryRange;
-
-typedef struct PciMemoryRangeList
-{
-    union {
-        PciMemoryRange *value;
-        uint64_t padding;
-    };
-    struct PciMemoryRangeList *next;
-} PciMemoryRangeList;
-
-
-typedef struct PciMemoryRegion PciMemoryRegion;
-
-typedef struct PciMemoryRegionList
-{
-    union {
-        PciMemoryRegion *value;
-        uint64_t padding;
-    };
-    struct PciMemoryRegionList *next;
-} PciMemoryRegionList;
-
-
-typedef struct PciBridgeInfo PciBridgeInfo;
-
-typedef struct PciBridgeInfoList
-{
-    union {
-        PciBridgeInfo *value;
-        uint64_t padding;
-    };
-    struct PciBridgeInfoList *next;
-} PciBridgeInfoList;
-
-
-typedef struct PciDeviceInfo PciDeviceInfo;
-
-typedef struct PciDeviceInfoList
-{
-    union {
-        PciDeviceInfo *value;
-        uint64_t padding;
-    };
-    struct PciDeviceInfoList *next;
-} PciDeviceInfoList;
-
-
-typedef struct PciInfo PciInfo;
-
-typedef struct PciInfoList
-{
-    union {
-        PciInfo *value;
-        uint64_t padding;
-    };
-    struct PciInfoList *next;
-} PciInfoList;
-
-extern const char *BlockdevOnError_lookup[];
-typedef enum BlockdevOnError
-{
-    BLOCKDEV_ON_ERROR_REPORT = 0,
-    BLOCKDEV_ON_ERROR_IGNORE = 1,
-    BLOCKDEV_ON_ERROR_ENOSPC = 2,
-    BLOCKDEV_ON_ERROR_STOP = 3,
-    BLOCKDEV_ON_ERROR_MAX = 4,
-} BlockdevOnError;
-
-typedef struct BlockdevOnErrorList
-{
-    BlockdevOnError value;
-    struct BlockdevOnErrorList *next;
-} BlockdevOnErrorList;
-
-extern const char *MirrorSyncMode_lookup[];
-typedef enum MirrorSyncMode
-{
-    MIRROR_SYNC_MODE_TOP = 0,
-    MIRROR_SYNC_MODE_FULL = 1,
-    MIRROR_SYNC_MODE_NONE = 2,
-    MIRROR_SYNC_MODE_MAX = 3,
-} MirrorSyncMode;
-
-typedef struct MirrorSyncModeList
-{
-    MirrorSyncMode value;
-    struct MirrorSyncModeList *next;
-} MirrorSyncModeList;
-
-
-typedef struct BlockJobInfo BlockJobInfo;
-
-typedef struct BlockJobInfoList
-{
-    union {
-        BlockJobInfo *value;
-        uint64_t padding;
-    };
-    struct BlockJobInfoList *next;
-} BlockJobInfoList;
-
-extern const char *NewImageMode_lookup[];
-typedef enum NewImageMode
-{
-    NEW_IMAGE_MODE_EXISTING = 0,
-    NEW_IMAGE_MODE_ABSOLUTE_PATHS = 1,
-    NEW_IMAGE_MODE_MAX = 2,
-} NewImageMode;
-
-typedef struct NewImageModeList
-{
-    NewImageMode value;
-    struct NewImageModeList *next;
-} NewImageModeList;
-
-
-typedef struct BlockdevSnapshot BlockdevSnapshot;
-
-typedef struct BlockdevSnapshotList
-{
-    union {
-        BlockdevSnapshot *value;
-        uint64_t padding;
-    };
-    struct BlockdevSnapshotList *next;
-} BlockdevSnapshotList;
-
-
-typedef struct DriveBackup DriveBackup;
-
-typedef struct DriveBackupList
-{
-    union {
-        DriveBackup *value;
-        uint64_t padding;
-    };
-    struct DriveBackupList *next;
-} DriveBackupList;
-
-
-typedef struct Abort Abort;
-
-typedef struct AbortList
-{
-    union {
-        Abort *value;
-        uint64_t padding;
-    };
-    struct AbortList *next;
-} AbortList;
-
-
-typedef struct TransactionAction TransactionAction;
-
-typedef struct TransactionActionList
-{
-    union {
-        TransactionAction *value;
-        uint64_t padding;
-    };
-    struct TransactionActionList *next;
-} TransactionActionList;
-
-extern const char *TransactionActionKind_lookup[];
-typedef enum TransactionActionKind
-{
-    TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC = 0,
-    TRANSACTION_ACTION_KIND_DRIVE_BACKUP = 1,
-    TRANSACTION_ACTION_KIND_ABORT = 2,
-    TRANSACTION_ACTION_KIND_MAX = 3,
-} TransactionActionKind;
-
-
-typedef struct ObjectPropertyInfo ObjectPropertyInfo;
-
-typedef struct ObjectPropertyInfoList
-{
-    union {
-        ObjectPropertyInfo *value;
-        uint64_t padding;
-    };
-    struct ObjectPropertyInfoList *next;
-} ObjectPropertyInfoList;
-
-
-typedef struct ObjectTypeInfo ObjectTypeInfo;
-
-typedef struct ObjectTypeInfoList
-{
-    union {
-        ObjectTypeInfo *value;
-        uint64_t padding;
-    };
-    struct ObjectTypeInfoList *next;
-} ObjectTypeInfoList;
-
-
-typedef struct DevicePropertyInfo DevicePropertyInfo;
-
-typedef struct DevicePropertyInfoList
-{
-    union {
-        DevicePropertyInfo *value;
-        uint64_t padding;
-    };
-    struct DevicePropertyInfoList *next;
-} DevicePropertyInfoList;
-
-
-typedef struct NetdevNoneOptions NetdevNoneOptions;
-
-typedef struct NetdevNoneOptionsList
-{
-    union {
-        NetdevNoneOptions *value;
-        uint64_t padding;
-    };
-    struct NetdevNoneOptionsList *next;
-} NetdevNoneOptionsList;
-
-
-typedef struct NetLegacyNicOptions NetLegacyNicOptions;
-
-typedef struct NetLegacyNicOptionsList
-{
-    union {
-        NetLegacyNicOptions *value;
-        uint64_t padding;
-    };
-    struct NetLegacyNicOptionsList *next;
-} NetLegacyNicOptionsList;
-
-
-typedef struct String String;
-
-typedef struct StringList
-{
-    union {
-        String *value;
-        uint64_t padding;
-    };
-    struct StringList *next;
-} StringList;
-
-
-typedef struct NetdevUserOptions NetdevUserOptions;
-
-typedef struct NetdevUserOptionsList
-{
-    union {
-        NetdevUserOptions *value;
-        uint64_t padding;
-    };
-    struct NetdevUserOptionsList *next;
-} NetdevUserOptionsList;
-
-
-typedef struct NetdevTapOptions NetdevTapOptions;
-
-typedef struct NetdevTapOptionsList
-{
-    union {
-        NetdevTapOptions *value;
-        uint64_t padding;
-    };
-    struct NetdevTapOptionsList *next;
-} NetdevTapOptionsList;
-
-
-typedef struct NetdevSocketOptions NetdevSocketOptions;
-
-typedef struct NetdevSocketOptionsList
-{
-    union {
-        NetdevSocketOptions *value;
-        uint64_t padding;
-    };
-    struct NetdevSocketOptionsList *next;
-} NetdevSocketOptionsList;
-
-
-typedef struct NetdevVdeOptions NetdevVdeOptions;
-
-typedef struct NetdevVdeOptionsList
-{
-    union {
-        NetdevVdeOptions *value;
-        uint64_t padding;
-    };
-    struct NetdevVdeOptionsList *next;
-} NetdevVdeOptionsList;
-
-
-typedef struct NetdevDumpOptions NetdevDumpOptions;
-
-typedef struct NetdevDumpOptionsList
-{
-    union {
-        NetdevDumpOptions *value;
-        uint64_t padding;
-    };
-    struct NetdevDumpOptionsList *next;
-} NetdevDumpOptionsList;
-
-
-typedef struct NetdevBridgeOptions NetdevBridgeOptions;
-
-typedef struct NetdevBridgeOptionsList
-{
-    union {
-        NetdevBridgeOptions *value;
-        uint64_t padding;
-    };
-    struct NetdevBridgeOptionsList *next;
-} NetdevBridgeOptionsList;
-
-
-typedef struct NetdevHubPortOptions NetdevHubPortOptions;
-
-typedef struct NetdevHubPortOptionsList
-{
-    union {
-        NetdevHubPortOptions *value;
-        uint64_t padding;
-    };
-    struct NetdevHubPortOptionsList *next;
-} NetdevHubPortOptionsList;
-
-
-typedef struct NetClientOptions NetClientOptions;
-
-typedef struct NetClientOptionsList
-{
-    union {
-        NetClientOptions *value;
-        uint64_t padding;
-    };
-    struct NetClientOptionsList *next;
-} NetClientOptionsList;
-
-extern const char *NetClientOptionsKind_lookup[];
-typedef enum NetClientOptionsKind
-{
-    NET_CLIENT_OPTIONS_KIND_NONE = 0,
-    NET_CLIENT_OPTIONS_KIND_NIC = 1,
-    NET_CLIENT_OPTIONS_KIND_USER = 2,
-    NET_CLIENT_OPTIONS_KIND_TAP = 3,
-    NET_CLIENT_OPTIONS_KIND_SOCKET = 4,
-    NET_CLIENT_OPTIONS_KIND_VDE = 5,
-    NET_CLIENT_OPTIONS_KIND_DUMP = 6,
-    NET_CLIENT_OPTIONS_KIND_BRIDGE = 7,
-    NET_CLIENT_OPTIONS_KIND_HUBPORT = 8,
-    NET_CLIENT_OPTIONS_KIND_MAX = 9,
-} NetClientOptionsKind;
-
-
-typedef struct NetLegacy NetLegacy;
-
-typedef struct NetLegacyList
-{
-    union {
-        NetLegacy *value;
-        uint64_t padding;
-    };
-    struct NetLegacyList *next;
-} NetLegacyList;
-
-
-typedef struct Netdev Netdev;
-
-typedef struct NetdevList
-{
-    union {
-        Netdev *value;
-        uint64_t padding;
-    };
-    struct NetdevList *next;
-} NetdevList;
-
-
-typedef struct InetSocketAddress InetSocketAddress;
-
-typedef struct InetSocketAddressList
-{
-    union {
-        InetSocketAddress *value;
-        uint64_t padding;
-    };
-    struct InetSocketAddressList *next;
-} InetSocketAddressList;
-
-
-typedef struct UnixSocketAddress UnixSocketAddress;
-
-typedef struct UnixSocketAddressList
-{
-    union {
-        UnixSocketAddress *value;
-        uint64_t padding;
-    };
-    struct UnixSocketAddressList *next;
-} UnixSocketAddressList;
-
-
-typedef struct SocketAddress SocketAddress;
-
-typedef struct SocketAddressList
-{
-    union {
-        SocketAddress *value;
-        uint64_t padding;
-    };
-    struct SocketAddressList *next;
-} SocketAddressList;
-
-extern const char *SocketAddressKind_lookup[];
-typedef enum SocketAddressKind
-{
-    SOCKET_ADDRESS_KIND_INET = 0,
-    SOCKET_ADDRESS_KIND_UNIX = 1,
-    SOCKET_ADDRESS_KIND_FD = 2,
-    SOCKET_ADDRESS_KIND_MAX = 3,
-} SocketAddressKind;
-
-
-typedef struct MachineInfo MachineInfo;
-
-typedef struct MachineInfoList
-{
-    union {
-        MachineInfo *value;
-        uint64_t padding;
-    };
-    struct MachineInfoList *next;
-} MachineInfoList;
-
-
-typedef struct CpuDefinitionInfo CpuDefinitionInfo;
-
-typedef struct CpuDefinitionInfoList
-{
-    union {
-        CpuDefinitionInfo *value;
-        uint64_t padding;
-    };
-    struct CpuDefinitionInfoList *next;
-} CpuDefinitionInfoList;
-
-
-typedef struct AddfdInfo AddfdInfo;
-
-typedef struct AddfdInfoList
-{
-    union {
-        AddfdInfo *value;
-        uint64_t padding;
-    };
-    struct AddfdInfoList *next;
-} AddfdInfoList;
-
-
-typedef struct FdsetFdInfo FdsetFdInfo;
-
-typedef struct FdsetFdInfoList
-{
-    union {
-        FdsetFdInfo *value;
-        uint64_t padding;
-    };
-    struct FdsetFdInfoList *next;
-} FdsetFdInfoList;
-
-
-typedef struct FdsetInfo FdsetInfo;
-
-typedef struct FdsetInfoList
-{
-    union {
-        FdsetInfo *value;
-        uint64_t padding;
-    };
-    struct FdsetInfoList *next;
-} FdsetInfoList;
-
-
-typedef struct TargetInfo TargetInfo;
-
-typedef struct TargetInfoList
-{
-    union {
-        TargetInfo *value;
-        uint64_t padding;
-    };
-    struct TargetInfoList *next;
-} TargetInfoList;
-
-extern const char *QKeyCode_lookup[];
-typedef enum QKeyCode
-{
-    Q_KEY_CODE_SHIFT = 0,
-    Q_KEY_CODE_SHIFT_R = 1,
-    Q_KEY_CODE_ALT = 2,
-    Q_KEY_CODE_ALT_R = 3,
-    Q_KEY_CODE_ALTGR = 4,
-    Q_KEY_CODE_ALTGR_R = 5,
-    Q_KEY_CODE_CTRL = 6,
-    Q_KEY_CODE_CTRL_R = 7,
-    Q_KEY_CODE_MENU = 8,
-    Q_KEY_CODE_ESC = 9,
-    Q_KEY_CODE_1 = 10,
-    Q_KEY_CODE_2 = 11,
-    Q_KEY_CODE_3 = 12,
-    Q_KEY_CODE_4 = 13,
-    Q_KEY_CODE_5 = 14,
-    Q_KEY_CODE_6 = 15,
-    Q_KEY_CODE_7 = 16,
-    Q_KEY_CODE_8 = 17,
-    Q_KEY_CODE_9 = 18,
-    Q_KEY_CODE_0 = 19,
-    Q_KEY_CODE_MINUS = 20,
-    Q_KEY_CODE_EQUAL = 21,
-    Q_KEY_CODE_BACKSPACE = 22,
-    Q_KEY_CODE_TAB = 23,
-    Q_KEY_CODE_Q = 24,
-    Q_KEY_CODE_W = 25,
-    Q_KEY_CODE_E = 26,
-    Q_KEY_CODE_R = 27,
-    Q_KEY_CODE_T = 28,
-    Q_KEY_CODE_Y = 29,
-    Q_KEY_CODE_U = 30,
-    Q_KEY_CODE_I = 31,
-    Q_KEY_CODE_O = 32,
-    Q_KEY_CODE_P = 33,
-    Q_KEY_CODE_BRACKET_LEFT = 34,
-    Q_KEY_CODE_BRACKET_RIGHT = 35,
-    Q_KEY_CODE_RET = 36,
-    Q_KEY_CODE_A = 37,
-    Q_KEY_CODE_S = 38,
-    Q_KEY_CODE_D = 39,
-    Q_KEY_CODE_F = 40,
-    Q_KEY_CODE_G = 41,
-    Q_KEY_CODE_H = 42,
-    Q_KEY_CODE_J = 43,
-    Q_KEY_CODE_K = 44,
-    Q_KEY_CODE_L = 45,
-    Q_KEY_CODE_SEMICOLON = 46,
-    Q_KEY_CODE_APOSTROPHE = 47,
-    Q_KEY_CODE_GRAVE_ACCENT = 48,
-    Q_KEY_CODE_BACKSLASH = 49,
-    Q_KEY_CODE_Z = 50,
-    Q_KEY_CODE_X = 51,
-    Q_KEY_CODE_C = 52,
-    Q_KEY_CODE_V = 53,
-    Q_KEY_CODE_B = 54,
-    Q_KEY_CODE_N = 55,
-    Q_KEY_CODE_M = 56,
-    Q_KEY_CODE_COMMA = 57,
-    Q_KEY_CODE_DOT = 58,
-    Q_KEY_CODE_SLASH = 59,
-    Q_KEY_CODE_ASTERISK = 60,
-    Q_KEY_CODE_SPC = 61,
-    Q_KEY_CODE_CAPS_LOCK = 62,
-    Q_KEY_CODE_F1 = 63,
-    Q_KEY_CODE_F2 = 64,
-    Q_KEY_CODE_F3 = 65,
-    Q_KEY_CODE_F4 = 66,
-    Q_KEY_CODE_F5 = 67,
-    Q_KEY_CODE_F6 = 68,
-    Q_KEY_CODE_F7 = 69,
-    Q_KEY_CODE_F8 = 70,
-    Q_KEY_CODE_F9 = 71,
-    Q_KEY_CODE_F10 = 72,
-    Q_KEY_CODE_NUM_LOCK = 73,
-    Q_KEY_CODE_SCROLL_LOCK = 74,
-    Q_KEY_CODE_KP_DIVIDE = 75,
-    Q_KEY_CODE_KP_MULTIPLY = 76,
-    Q_KEY_CODE_KP_SUBTRACT = 77,
-    Q_KEY_CODE_KP_ADD = 78,
-    Q_KEY_CODE_KP_ENTER = 79,
-    Q_KEY_CODE_KP_DECIMAL = 80,
-    Q_KEY_CODE_SYSRQ = 81,
-    Q_KEY_CODE_KP_0 = 82,
-    Q_KEY_CODE_KP_1 = 83,
-    Q_KEY_CODE_KP_2 = 84,
-    Q_KEY_CODE_KP_3 = 85,
-    Q_KEY_CODE_KP_4 = 86,
-    Q_KEY_CODE_KP_5 = 87,
-    Q_KEY_CODE_KP_6 = 88,
-    Q_KEY_CODE_KP_7 = 89,
-    Q_KEY_CODE_KP_8 = 90,
-    Q_KEY_CODE_KP_9 = 91,
-    Q_KEY_CODE_LESS = 92,
-    Q_KEY_CODE_F11 = 93,
-    Q_KEY_CODE_F12 = 94,
-    Q_KEY_CODE_PRINT = 95,
-    Q_KEY_CODE_HOME = 96,
-    Q_KEY_CODE_PGUP = 97,
-    Q_KEY_CODE_PGDN = 98,
-    Q_KEY_CODE_END = 99,
-    Q_KEY_CODE_LEFT = 100,
-    Q_KEY_CODE_UP = 101,
-    Q_KEY_CODE_DOWN = 102,
-    Q_KEY_CODE_RIGHT = 103,
-    Q_KEY_CODE_INSERT = 104,
-    Q_KEY_CODE_DELETE = 105,
-    Q_KEY_CODE_STOP = 106,
-    Q_KEY_CODE_AGAIN = 107,
-    Q_KEY_CODE_PROPS = 108,
-    Q_KEY_CODE_UNDO = 109,
-    Q_KEY_CODE_FRONT = 110,
-    Q_KEY_CODE_COPY = 111,
-    Q_KEY_CODE_OPEN = 112,
-    Q_KEY_CODE_PASTE = 113,
-    Q_KEY_CODE_FIND = 114,
-    Q_KEY_CODE_CUT = 115,
-    Q_KEY_CODE_LF = 116,
-    Q_KEY_CODE_HELP = 117,
-    Q_KEY_CODE_META_L = 118,
-    Q_KEY_CODE_META_R = 119,
-    Q_KEY_CODE_COMPOSE = 120,
-    Q_KEY_CODE_MAX = 121,
-} QKeyCode;
-
-typedef struct QKeyCodeList
-{
-    QKeyCode value;
-    struct QKeyCodeList *next;
-} QKeyCodeList;
-
-
-typedef struct KeyValue KeyValue;
-
-typedef struct KeyValueList
-{
-    union {
-        KeyValue *value;
-        uint64_t padding;
-    };
-    struct KeyValueList *next;
-} KeyValueList;
-
-extern const char *KeyValueKind_lookup[];
-typedef enum KeyValueKind
-{
-    KEY_VALUE_KIND_NUMBER = 0,
-    KEY_VALUE_KIND_QCODE = 1,
-    KEY_VALUE_KIND_MAX = 2,
-} KeyValueKind;
-
-
-typedef struct ChardevFile ChardevFile;
-
-typedef struct ChardevFileList
-{
-    union {
-        ChardevFile *value;
-        uint64_t padding;
-    };
-    struct ChardevFileList *next;
-} ChardevFileList;
-
-
-typedef struct ChardevHostdev ChardevHostdev;
-
-typedef struct ChardevHostdevList
-{
-    union {
-        ChardevHostdev *value;
-        uint64_t padding;
-    };
-    struct ChardevHostdevList *next;
-} ChardevHostdevList;
-
-
-typedef struct ChardevSocket ChardevSocket;
-
-typedef struct ChardevSocketList
-{
-    union {
-        ChardevSocket *value;
-        uint64_t padding;
-    };
-    struct ChardevSocketList *next;
-} ChardevSocketList;
-
-
-typedef struct ChardevUdp ChardevUdp;
-
-typedef struct ChardevUdpList
-{
-    union {
-        ChardevUdp *value;
-        uint64_t padding;
-    };
-    struct ChardevUdpList *next;
-} ChardevUdpList;
-
-
-typedef struct ChardevMux ChardevMux;
-
-typedef struct ChardevMuxList
-{
-    union {
-        ChardevMux *value;
-        uint64_t padding;
-    };
-    struct ChardevMuxList *next;
-} ChardevMuxList;
-
-
-typedef struct ChardevStdio ChardevStdio;
-
-typedef struct ChardevStdioList
-{
-    union {
-        ChardevStdio *value;
-        uint64_t padding;
-    };
-    struct ChardevStdioList *next;
-} ChardevStdioList;
-
-
-typedef struct ChardevSpiceChannel ChardevSpiceChannel;
-
-typedef struct ChardevSpiceChannelList
-{
-    union {
-        ChardevSpiceChannel *value;
-        uint64_t padding;
-    };
-    struct ChardevSpiceChannelList *next;
-} ChardevSpiceChannelList;
-
-
-typedef struct ChardevSpicePort ChardevSpicePort;
-
-typedef struct ChardevSpicePortList
-{
-    union {
-        ChardevSpicePort *value;
-        uint64_t padding;
-    };
-    struct ChardevSpicePortList *next;
-} ChardevSpicePortList;
-
-
-typedef struct ChardevVC ChardevVC;
-
-typedef struct ChardevVCList
-{
-    union {
-        ChardevVC *value;
-        uint64_t padding;
-    };
-    struct ChardevVCList *next;
-} ChardevVCList;
-
-
-typedef struct ChardevMemory ChardevMemory;
-
-typedef struct ChardevMemoryList
-{
-    union {
-        ChardevMemory *value;
-        uint64_t padding;
-    };
-    struct ChardevMemoryList *next;
-} ChardevMemoryList;
-
-
-typedef struct ChardevDummy ChardevDummy;
-
-typedef struct ChardevDummyList
-{
-    union {
-        ChardevDummy *value;
-        uint64_t padding;
-    };
-    struct ChardevDummyList *next;
-} ChardevDummyList;
-
-
-typedef struct ChardevBackend ChardevBackend;
-
-typedef struct ChardevBackendList
-{
-    union {
-        ChardevBackend *value;
-        uint64_t padding;
-    };
-    struct ChardevBackendList *next;
-} ChardevBackendList;
-
-extern const char *ChardevBackendKind_lookup[];
-typedef enum ChardevBackendKind
-{
-    CHARDEV_BACKEND_KIND_FILE = 0,
-    CHARDEV_BACKEND_KIND_SERIAL = 1,
-    CHARDEV_BACKEND_KIND_PARALLEL = 2,
-    CHARDEV_BACKEND_KIND_PIPE = 3,
-    CHARDEV_BACKEND_KIND_SOCKET = 4,
-    CHARDEV_BACKEND_KIND_UDP = 5,
-    CHARDEV_BACKEND_KIND_PTY = 6,
-    CHARDEV_BACKEND_KIND_NULL = 7,
-    CHARDEV_BACKEND_KIND_MUX = 8,
-    CHARDEV_BACKEND_KIND_MSMOUSE = 9,
-    CHARDEV_BACKEND_KIND_BRAILLE = 10,
-    CHARDEV_BACKEND_KIND_STDIO = 11,
-    CHARDEV_BACKEND_KIND_CONSOLE = 12,
-    CHARDEV_BACKEND_KIND_SPICEVMC = 13,
-    CHARDEV_BACKEND_KIND_SPICEPORT = 14,
-    CHARDEV_BACKEND_KIND_VC = 15,
-    CHARDEV_BACKEND_KIND_MEMORY = 16,
-    CHARDEV_BACKEND_KIND_MAX = 17,
-} ChardevBackendKind;
-
-
-typedef struct ChardevReturn ChardevReturn;
-
-typedef struct ChardevReturnList
-{
-    union {
-        ChardevReturn *value;
-        uint64_t padding;
-    };
-    struct ChardevReturnList *next;
-} ChardevReturnList;
-
-extern const char *TpmModel_lookup[];
-typedef enum TpmModel
-{
-    TPM_MODEL_TPM_TIS = 0,
-    TPM_MODEL_MAX = 1,
-} TpmModel;
-
-typedef struct TpmModelList
-{
-    TpmModel value;
-    struct TpmModelList *next;
-} TpmModelList;
-
-extern const char *TpmType_lookup[];
-typedef enum TpmType
-{
-    TPM_TYPE_PASSTHROUGH = 0,
-    TPM_TYPE_MAX = 1,
-} TpmType;
-
-typedef struct TpmTypeList
-{
-    TpmType value;
-    struct TpmTypeList *next;
-} TpmTypeList;
-
-
-typedef struct TPMPassthroughOptions TPMPassthroughOptions;
-
-typedef struct TPMPassthroughOptionsList
-{
-    union {
-        TPMPassthroughOptions *value;
-        uint64_t padding;
-    };
-    struct TPMPassthroughOptionsList *next;
-} TPMPassthroughOptionsList;
-
-
-typedef struct TpmTypeOptions TpmTypeOptions;
-
-typedef struct TpmTypeOptionsList
-{
-    union {
-        TpmTypeOptions *value;
-        uint64_t padding;
-    };
-    struct TpmTypeOptionsList *next;
-} TpmTypeOptionsList;
-
-extern const char *TpmTypeOptionsKind_lookup[];
-typedef enum TpmTypeOptionsKind
-{
-    TPM_TYPE_OPTIONS_KIND_PASSTHROUGH = 0,
-    TPM_TYPE_OPTIONS_KIND_MAX = 1,
-} TpmTypeOptionsKind;
-
-
-typedef struct TPMInfo TPMInfo;
-
-typedef struct TPMInfoList
-{
-    union {
-        TPMInfo *value;
-        uint64_t padding;
-    };
-    struct TPMInfoList *next;
-} TPMInfoList;
-
-
-typedef struct AcpiTableOptions AcpiTableOptions;
-
-typedef struct AcpiTableOptionsList
-{
-    union {
-        AcpiTableOptions *value;
-        uint64_t padding;
-    };
-    struct AcpiTableOptionsList *next;
-} AcpiTableOptionsList;
-
-extern const char *CommandLineParameterType_lookup[];
-typedef enum CommandLineParameterType
-{
-    COMMAND_LINE_PARAMETER_TYPE_STRING = 0,
-    COMMAND_LINE_PARAMETER_TYPE_BOOLEAN = 1,
-    COMMAND_LINE_PARAMETER_TYPE_NUMBER = 2,
-    COMMAND_LINE_PARAMETER_TYPE_SIZE = 3,
-    COMMAND_LINE_PARAMETER_TYPE_MAX = 4,
-} CommandLineParameterType;
-
-typedef struct CommandLineParameterTypeList
-{
-    CommandLineParameterType value;
-    struct CommandLineParameterTypeList *next;
-} CommandLineParameterTypeList;
-
-
-typedef struct CommandLineParameterInfo CommandLineParameterInfo;
-
-typedef struct CommandLineParameterInfoList
-{
-    union {
-        CommandLineParameterInfo *value;
-        uint64_t padding;
-    };
-    struct CommandLineParameterInfoList *next;
-} CommandLineParameterInfoList;
-
-
-typedef struct CommandLineOptionInfo CommandLineOptionInfo;
-
-typedef struct CommandLineOptionInfoList
-{
-    union {
-        CommandLineOptionInfo *value;
-        uint64_t padding;
-    };
-    struct CommandLineOptionInfoList *next;
-} CommandLineOptionInfoList;
-
-extern const char *X86CPURegister32_lookup[];
-typedef enum X86CPURegister32
-{
-    X86_C_P_U_REGISTER32_EAX = 0,
-    X86_C_P_U_REGISTER32_EBX = 1,
-    X86_C_P_U_REGISTER32_ECX = 2,
-    X86_C_P_U_REGISTER32_EDX = 3,
-    X86_C_P_U_REGISTER32_ESP = 4,
-    X86_C_P_U_REGISTER32_EBP = 5,
-    X86_C_P_U_REGISTER32_ESI = 6,
-    X86_C_P_U_REGISTER32_EDI = 7,
-    X86_C_P_U_REGISTER32_MAX = 8,
-} X86CPURegister32;
-
-typedef struct X86CPURegister32List
-{
-    X86CPURegister32 value;
-    struct X86CPURegister32List *next;
-} X86CPURegister32List;
-
-
-typedef struct X86CPUFeatureWordInfo X86CPUFeatureWordInfo;
-
-typedef struct X86CPUFeatureWordInfoList
-{
-    union {
-        X86CPUFeatureWordInfo *value;
-        uint64_t padding;
-    };
-    struct X86CPUFeatureWordInfoList *next;
-} X86CPUFeatureWordInfoList;
-
-extern const char *RxState_lookup[];
-typedef enum RxState
-{
-    RX_STATE_NORMAL = 0,
-    RX_STATE_NONE = 1,
-    RX_STATE_ALL = 2,
-    RX_STATE_MAX = 3,
-} RxState;
-
-typedef struct RxStateList
-{
-    RxState value;
-    struct RxStateList *next;
-} RxStateList;
-
-
-typedef struct RxFilterInfo RxFilterInfo;
-
-typedef struct RxFilterInfoList
-{
-    union {
-        RxFilterInfo *value;
-        uint64_t padding;
-    };
-    struct RxFilterInfoList *next;
-} RxFilterInfoList;
-
-#ifndef QAPI_TYPES_BUILTIN_CLEANUP_DECL_H
-#define QAPI_TYPES_BUILTIN_CLEANUP_DECL_H
-
-void qapi_free_strList(strList * obj);
-void qapi_free_intList(intList * obj);
-void qapi_free_numberList(numberList * obj);
-void qapi_free_boolList(boolList * obj);
-void qapi_free_int8List(int8List * obj);
-void qapi_free_int16List(int16List * obj);
-void qapi_free_int32List(int32List * obj);
-void qapi_free_int64List(int64List * obj);
-void qapi_free_uint8List(uint8List * obj);
-void qapi_free_uint16List(uint16List * obj);
-void qapi_free_uint32List(uint32List * obj);
-void qapi_free_uint64List(uint64List * obj);
-
-#endif /* QAPI_TYPES_BUILTIN_CLEANUP_DECL_H */
-
-
-void qapi_free_ErrorClassList(ErrorClassList * obj);
-
-struct NameInfo
-{
-    bool has_name;
-    char * name;
-};
-
-void qapi_free_NameInfoList(NameInfoList * obj);
-void qapi_free_NameInfo(NameInfo * obj);
-
-struct VersionInfo
-{
-    struct 
-    {
-        int64_t major;
-        int64_t minor;
-        int64_t micro;
-    } qemu;
-    char * package;
-};
-
-void qapi_free_VersionInfoList(VersionInfoList * obj);
-void qapi_free_VersionInfo(VersionInfo * obj);
-
-struct KvmInfo
-{
-    bool enabled;
-    bool present;
-};
-
-void qapi_free_KvmInfoList(KvmInfoList * obj);
-void qapi_free_KvmInfo(KvmInfo * obj);
-
-void qapi_free_RunStateList(RunStateList * obj);
-
-struct SnapshotInfo
-{
-    char * id;
-    char * name;
-    int64_t vm_state_size;
-    int64_t date_sec;
-    int64_t date_nsec;
-    int64_t vm_clock_sec;
-    int64_t vm_clock_nsec;
-};
-
-void qapi_free_SnapshotInfoList(SnapshotInfoList * obj);
-void qapi_free_SnapshotInfo(SnapshotInfo * obj);
-
-struct ImageInfo
-{
-    char * filename;
-    char * format;
-    bool has_dirty_flag;
-    bool dirty_flag;
-    bool has_actual_size;
-    int64_t actual_size;
-    int64_t virtual_size;
-    bool has_cluster_size;
-    int64_t cluster_size;
-    bool has_encrypted;
-    bool encrypted;
-    bool has_backing_filename;
-    char * backing_filename;
-    bool has_full_backing_filename;
-    char * full_backing_filename;
-    bool has_backing_filename_format;
-    char * backing_filename_format;
-    bool has_snapshots;
-    SnapshotInfoList * snapshots;
-    bool has_backing_image;
-    ImageInfo * backing_image;
-};
-
-void qapi_free_ImageInfoList(ImageInfoList * obj);
-void qapi_free_ImageInfo(ImageInfo * obj);
-
-struct ImageCheck
-{
-    char * filename;
-    char * format;
-    int64_t check_errors;
-    bool has_image_end_offset;
-    int64_t image_end_offset;
-    bool has_corruptions;
-    int64_t corruptions;
-    bool has_leaks;
-    int64_t leaks;
-    bool has_corruptions_fixed;
-    int64_t corruptions_fixed;
-    bool has_leaks_fixed;
-    int64_t leaks_fixed;
-    bool has_total_clusters;
-    int64_t total_clusters;
-    bool has_allocated_clusters;
-    int64_t allocated_clusters;
-    bool has_fragmented_clusters;
-    int64_t fragmented_clusters;
-    bool has_compressed_clusters;
-    int64_t compressed_clusters;
-};
-
-void qapi_free_ImageCheckList(ImageCheckList * obj);
-void qapi_free_ImageCheck(ImageCheck * obj);
-
-struct StatusInfo
-{
-    bool running;
-    bool singlestep;
-    RunState status;
-};
-
-void qapi_free_StatusInfoList(StatusInfoList * obj);
-void qapi_free_StatusInfo(StatusInfo * obj);
-
-struct UuidInfo
-{
-    char * UUID;
-};
-
-void qapi_free_UuidInfoList(UuidInfoList * obj);
-void qapi_free_UuidInfo(UuidInfo * obj);
-
-struct ChardevInfo
-{
-    char * label;
-    char * filename;
-};
-
-void qapi_free_ChardevInfoList(ChardevInfoList * obj);
-void qapi_free_ChardevInfo(ChardevInfo * obj);
-
-void qapi_free_DataFormatList(DataFormatList * obj);
-
-struct CommandInfo
-{
-    char * name;
-};
-
-void qapi_free_CommandInfoList(CommandInfoList * obj);
-void qapi_free_CommandInfo(CommandInfo * obj);
-
-struct EventInfo
-{
-    char * name;
-};
-
-void qapi_free_EventInfoList(EventInfoList * obj);
-void qapi_free_EventInfo(EventInfo * obj);
-
-struct MigrationStats
-{
-    int64_t transferred;
-    int64_t remaining;
-    int64_t total;
-    int64_t duplicate;
-    int64_t skipped;
-    int64_t normal;
-    int64_t normal_bytes;
-    int64_t dirty_pages_rate;
-    double mbps;
-};
-
-void qapi_free_MigrationStatsList(MigrationStatsList * obj);
-void qapi_free_MigrationStats(MigrationStats * obj);
-
-struct XBZRLECacheStats
-{
-    int64_t cache_size;
-    int64_t bytes;
-    int64_t pages;
-    int64_t cache_miss;
-    int64_t overflow;
-};
-
-void qapi_free_XBZRLECacheStatsList(XBZRLECacheStatsList * obj);
-void qapi_free_XBZRLECacheStats(XBZRLECacheStats * obj);
-
-struct MigrationInfo
-{
-    bool has_status;
-    char * status;
-    bool has_ram;
-    MigrationStats * ram;
-    bool has_disk;
-    MigrationStats * disk;
-    bool has_xbzrle_cache;
-    XBZRLECacheStats * xbzrle_cache;
-    bool has_total_time;
-    int64_t total_time;
-    bool has_expected_downtime;
-    int64_t expected_downtime;
-    bool has_downtime;
-    int64_t downtime;
-};
-
-void qapi_free_MigrationInfoList(MigrationInfoList * obj);
-void qapi_free_MigrationInfo(MigrationInfo * obj);
-
-void qapi_free_MigrationCapabilityList(MigrationCapabilityList * obj);
-
-struct MigrationCapabilityStatus
-{
-    MigrationCapability capability;
-    bool state;
-};
-
-void qapi_free_MigrationCapabilityStatusList(MigrationCapabilityStatusList * obj);
-void qapi_free_MigrationCapabilityStatus(MigrationCapabilityStatus * obj);
-
-struct MouseInfo
-{
-    char * name;
-    int64_t index;
-    bool current;
-    bool absolute;
-};
-
-void qapi_free_MouseInfoList(MouseInfoList * obj);
-void qapi_free_MouseInfo(MouseInfo * obj);
-
-struct CpuInfo
-{
-    int64_t CPU;
-    bool current;
-    bool halted;
-    bool has_pc;
-    int64_t pc;
-    bool has_nip;
-    int64_t nip;
-    bool has_npc;
-    int64_t npc;
-    bool has_PC;
-    int64_t PC;
-    int64_t thread_id;
-};
-
-void qapi_free_CpuInfoList(CpuInfoList * obj);
-void qapi_free_CpuInfo(CpuInfo * obj);
-
-struct BlockDeviceInfo
-{
-    char * file;
-    bool ro;
-    char * drv;
-    bool has_backing_file;
-    char * backing_file;
-    int64_t backing_file_depth;
-    bool encrypted;
-    bool encryption_key_missing;
-    int64_t bps;
-    int64_t bps_rd;
-    int64_t bps_wr;
-    int64_t iops;
-    int64_t iops_rd;
-    int64_t iops_wr;
-    ImageInfo * image;
-};
-
-void qapi_free_BlockDeviceInfoList(BlockDeviceInfoList * obj);
-void qapi_free_BlockDeviceInfo(BlockDeviceInfo * obj);
-
-void qapi_free_BlockDeviceIoStatusList(BlockDeviceIoStatusList * obj);
-
-struct BlockDirtyInfo
-{
-    int64_t count;
-    int64_t granularity;
-};
-
-void qapi_free_BlockDirtyInfoList(BlockDirtyInfoList * obj);
-void qapi_free_BlockDirtyInfo(BlockDirtyInfo * obj);
-
-struct BlockInfo
-{
-    char * device;
-    char * type;
-    bool removable;
-    bool locked;
-    bool has_inserted;
-    BlockDeviceInfo * inserted;
-    bool has_tray_open;
-    bool tray_open;
-    bool has_io_status;
-    BlockDeviceIoStatus io_status;
-    bool has_dirty;
-    BlockDirtyInfo * dirty;
-};
-
-void qapi_free_BlockInfoList(BlockInfoList * obj);
-void qapi_free_BlockInfo(BlockInfo * obj);
-
-struct BlockDeviceStats
-{
-    int64_t rd_bytes;
-    int64_t wr_bytes;
-    int64_t rd_operations;
-    int64_t wr_operations;
-    int64_t flush_operations;
-    int64_t flush_total_time_ns;
-    int64_t wr_total_time_ns;
-    int64_t rd_total_time_ns;
-    int64_t wr_highest_offset;
-};
-
-void qapi_free_BlockDeviceStatsList(BlockDeviceStatsList * obj);
-void qapi_free_BlockDeviceStats(BlockDeviceStats * obj);
-
-struct BlockStats
-{
-    bool has_device;
-    char * device;
-    BlockDeviceStats * stats;
-    bool has_parent;
-    BlockStats * parent;
-};
-
-void qapi_free_BlockStatsList(BlockStatsList * obj);
-void qapi_free_BlockStats(BlockStats * obj);
-
-struct VncClientInfo
-{
-    char * host;
-    char * family;
-    char * service;
-    bool has_x509_dname;
-    char * x509_dname;
-    bool has_sasl_username;
-    char * sasl_username;
-};
-
-void qapi_free_VncClientInfoList(VncClientInfoList * obj);
-void qapi_free_VncClientInfo(VncClientInfo * obj);
-
-struct VncInfo
-{
-    bool enabled;
-    bool has_host;
-    char * host;
-    bool has_family;
-    char * family;
-    bool has_service;
-    char * service;
-    bool has_auth;
-    char * auth;
-    bool has_clients;
-    VncClientInfoList * clients;
-};
-
-void qapi_free_VncInfoList(VncInfoList * obj);
-void qapi_free_VncInfo(VncInfo * obj);
-
-struct SpiceChannel
-{
-    char * host;
-    char * family;
-    char * port;
-    int64_t connection_id;
-    int64_t channel_type;
-    int64_t channel_id;
-    bool tls;
-};
-
-void qapi_free_SpiceChannelList(SpiceChannelList * obj);
-void qapi_free_SpiceChannel(SpiceChannel * obj);
-
-void qapi_free_SpiceQueryMouseModeList(SpiceQueryMouseModeList * obj);
-
-struct SpiceInfo
-{
-    bool enabled;
-    bool migrated;
-    bool has_host;
-    char * host;
-    bool has_port;
-    int64_t port;
-    bool has_tls_port;
-    int64_t tls_port;
-    bool has_auth;
-    char * auth;
-    bool has_compiled_version;
-    char * compiled_version;
-    SpiceQueryMouseMode mouse_mode;
-    bool has_channels;
-    SpiceChannelList * channels;
-};
-
-void qapi_free_SpiceInfoList(SpiceInfoList * obj);
-void qapi_free_SpiceInfo(SpiceInfo * obj);
-
-struct BalloonInfo
-{
-    int64_t actual;
-};
-
-void qapi_free_BalloonInfoList(BalloonInfoList * obj);
-void qapi_free_BalloonInfo(BalloonInfo * obj);
-
-struct PciMemoryRange
-{
-    int64_t base;
-    int64_t limit;
-};
-
-void qapi_free_PciMemoryRangeList(PciMemoryRangeList * obj);
-void qapi_free_PciMemoryRange(PciMemoryRange * obj);
-
-struct PciMemoryRegion
-{
-    int64_t bar;
-    char * type;
-    int64_t address;
-    int64_t size;
-    bool has_prefetch;
-    bool prefetch;
-    bool has_mem_type_64;
-    bool mem_type_64;
-};
-
-void qapi_free_PciMemoryRegionList(PciMemoryRegionList * obj);
-void qapi_free_PciMemoryRegion(PciMemoryRegion * obj);
-
-struct PciBridgeInfo
-{
-    struct 
-    {
-        int64_t number;
-        int64_t secondary;
-        int64_t subordinate;
-        PciMemoryRange * io_range;
-        PciMemoryRange * memory_range;
-        PciMemoryRange * prefetchable_range;
-    } bus;
-    bool has_devices;
-    PciDeviceInfoList * devices;
-};
-
-void qapi_free_PciBridgeInfoList(PciBridgeInfoList * obj);
-void qapi_free_PciBridgeInfo(PciBridgeInfo * obj);
-
-struct PciDeviceInfo
-{
-    int64_t bus;
-    int64_t slot;
-    int64_t function;
-    struct 
-    {
-        bool has_desc;
-        char * desc;
-        int64_t class;
-    } class_info;
-    struct 
-    {
-        int64_t device;
-        int64_t vendor;
-    } id;
-    bool has_irq;
-    int64_t irq;
-    char * qdev_id;
-    bool has_pci_bridge;
-    PciBridgeInfo * pci_bridge;
-    PciMemoryRegionList * regions;
-};
-
-void qapi_free_PciDeviceInfoList(PciDeviceInfoList * obj);
-void qapi_free_PciDeviceInfo(PciDeviceInfo * obj);
-
-struct PciInfo
-{
-    int64_t bus;
-    PciDeviceInfoList * devices;
-};
-
-void qapi_free_PciInfoList(PciInfoList * obj);
-void qapi_free_PciInfo(PciInfo * obj);
-
-void qapi_free_BlockdevOnErrorList(BlockdevOnErrorList * obj);
-
-void qapi_free_MirrorSyncModeList(MirrorSyncModeList * obj);
-
-struct BlockJobInfo
-{
-    char * type;
-    char * device;
-    int64_t len;
-    int64_t offset;
-    bool busy;
-    bool paused;
-    int64_t speed;
-    BlockDeviceIoStatus io_status;
-};
-
-void qapi_free_BlockJobInfoList(BlockJobInfoList * obj);
-void qapi_free_BlockJobInfo(BlockJobInfo * obj);
-
-void qapi_free_NewImageModeList(NewImageModeList * obj);
-
-struct BlockdevSnapshot
-{
-    char * device;
-    char * snapshot_file;
-    bool has_format;
-    char * format;
-    bool has_mode;
-    NewImageMode mode;
-};
-
-void qapi_free_BlockdevSnapshotList(BlockdevSnapshotList * obj);
-void qapi_free_BlockdevSnapshot(BlockdevSnapshot * obj);
-
-struct DriveBackup
-{
-    char * device;
-    char * target;
-    bool has_format;
-    char * format;
-    MirrorSyncMode sync;
-    bool has_mode;
-    NewImageMode mode;
-    bool has_speed;
-    int64_t speed;
-    bool has_on_source_error;
-    BlockdevOnError on_source_error;
-    bool has_on_target_error;
-    BlockdevOnError on_target_error;
-};
-
-void qapi_free_DriveBackupList(DriveBackupList * obj);
-void qapi_free_DriveBackup(DriveBackup * obj);
-
-struct Abort
-{
-};
-
-void qapi_free_AbortList(AbortList * obj);
-void qapi_free_Abort(Abort * obj);
-
-struct TransactionAction
-{
-    TransactionActionKind kind;
-    union {
-        void *data;
-        BlockdevSnapshot * blockdev_snapshot_sync;
-        DriveBackup * drive_backup;
-        Abort * abort;
-    };
-};
-void qapi_free_TransactionActionList(TransactionActionList * obj);
-void qapi_free_TransactionAction(TransactionAction * obj);
-
-struct ObjectPropertyInfo
-{
-    char * name;
-    char * type;
-};
-
-void qapi_free_ObjectPropertyInfoList(ObjectPropertyInfoList * obj);
-void qapi_free_ObjectPropertyInfo(ObjectPropertyInfo * obj);
-
-struct ObjectTypeInfo
-{
-    char * name;
-};
-
-void qapi_free_ObjectTypeInfoList(ObjectTypeInfoList * obj);
-void qapi_free_ObjectTypeInfo(ObjectTypeInfo * obj);
-
-struct DevicePropertyInfo
-{
-    char * name;
-    char * type;
-};
-
-void qapi_free_DevicePropertyInfoList(DevicePropertyInfoList * obj);
-void qapi_free_DevicePropertyInfo(DevicePropertyInfo * obj);
-
-struct NetdevNoneOptions
-{
-};
-
-void qapi_free_NetdevNoneOptionsList(NetdevNoneOptionsList * obj);
-void qapi_free_NetdevNoneOptions(NetdevNoneOptions * obj);
-
-struct NetLegacyNicOptions
-{
-    bool has_netdev;
-    char * netdev;
-    bool has_macaddr;
-    char * macaddr;
-    bool has_model;
-    char * model;
-    bool has_addr;
-    char * addr;
-    bool has_vectors;
-    uint32_t vectors;
-};
-
-void qapi_free_NetLegacyNicOptionsList(NetLegacyNicOptionsList * obj);
-void qapi_free_NetLegacyNicOptions(NetLegacyNicOptions * obj);
-
-struct String
-{
-    char * str;
-};
-
-void qapi_free_StringList(StringList * obj);
-void qapi_free_String(String * obj);
-
-struct NetdevUserOptions
-{
-    bool has_hostname;
-    char * hostname;
-    bool has_q_restrict;
-    bool q_restrict;
-    bool has_ip;
-    char * ip;
-    bool has_net;
-    char * net;
-    bool has_host;
-    char * host;
-    bool has_tftp;
-    char * tftp;
-    bool has_bootfile;
-    char * bootfile;
-    bool has_dhcpstart;
-    char * dhcpstart;
-    bool has_dns;
-    char * dns;
-    bool has_dnssearch;
-    StringList * dnssearch;
-    bool has_smb;
-    char * smb;
-    bool has_smbserver;
-    char * smbserver;
-    bool has_hostfwd;
-    StringList * hostfwd;
-    bool has_guestfwd;
-    StringList * guestfwd;
-};
-
-void qapi_free_NetdevUserOptionsList(NetdevUserOptionsList * obj);
-void qapi_free_NetdevUserOptions(NetdevUserOptions * obj);
-
-struct NetdevTapOptions
-{
-    bool has_ifname;
-    char * ifname;
-    bool has_fd;
-    char * fd;
-    bool has_fds;
-    char * fds;
-    bool has_script;
-    char * script;
-    bool has_downscript;
-    char * downscript;
-    bool has_helper;
-    char * helper;
-    bool has_sndbuf;
-    uint64_t sndbuf;
-    bool has_vnet_hdr;
-    bool vnet_hdr;
-    bool has_vhost;
-    bool vhost;
-    bool has_vhostfd;
-    char * vhostfd;
-    bool has_vhostfds;
-    char * vhostfds;
-    bool has_vhostforce;
-    bool vhostforce;
-    bool has_queues;
-    uint32_t queues;
-};
-
-void qapi_free_NetdevTapOptionsList(NetdevTapOptionsList * obj);
-void qapi_free_NetdevTapOptions(NetdevTapOptions * obj);
-
-struct NetdevSocketOptions
-{
-    bool has_fd;
-    char * fd;
-    bool has_listen;
-    char * listen;
-    bool has_connect;
-    char * connect;
-    bool has_mcast;
-    char * mcast;
-    bool has_localaddr;
-    char * localaddr;
-    bool has_udp;
-    char * udp;
-};
-
-void qapi_free_NetdevSocketOptionsList(NetdevSocketOptionsList * obj);
-void qapi_free_NetdevSocketOptions(NetdevSocketOptions * obj);
-
-struct NetdevVdeOptions
-{
-    bool has_sock;
-    char * sock;
-    bool has_port;
-    uint16_t port;
-    bool has_group;
-    char * group;
-    bool has_mode;
-    uint16_t mode;
-};
-
-void qapi_free_NetdevVdeOptionsList(NetdevVdeOptionsList * obj);
-void qapi_free_NetdevVdeOptions(NetdevVdeOptions * obj);
-
-struct NetdevDumpOptions
-{
-    bool has_len;
-    uint64_t len;
-    bool has_file;
-    char * file;
-};
-
-void qapi_free_NetdevDumpOptionsList(NetdevDumpOptionsList * obj);
-void qapi_free_NetdevDumpOptions(NetdevDumpOptions * obj);
-
-struct NetdevBridgeOptions
-{
-    bool has_br;
-    char * br;
-    bool has_helper;
-    char * helper;
-};
-
-void qapi_free_NetdevBridgeOptionsList(NetdevBridgeOptionsList * obj);
-void qapi_free_NetdevBridgeOptions(NetdevBridgeOptions * obj);
-
-struct NetdevHubPortOptions
-{
-    int32_t hubid;
-};
-
-void qapi_free_NetdevHubPortOptionsList(NetdevHubPortOptionsList * obj);
-void qapi_free_NetdevHubPortOptions(NetdevHubPortOptions * obj);
-
-struct NetClientOptions
-{
-    NetClientOptionsKind kind;
-    union {
-        void *data;
-        NetdevNoneOptions * none;
-        NetLegacyNicOptions * nic;
-        NetdevUserOptions * user;
-        NetdevTapOptions * tap;
-        NetdevSocketOptions * socket;
-        NetdevVdeOptions * vde;
-        NetdevDumpOptions * dump;
-        NetdevBridgeOptions * bridge;
-        NetdevHubPortOptions * hubport;
-    };
-};
-void qapi_free_NetClientOptionsList(NetClientOptionsList * obj);
-void qapi_free_NetClientOptions(NetClientOptions * obj);
-
-struct NetLegacy
-{
-    bool has_vlan;
-    int32_t vlan;
-    bool has_id;
-    char * id;
-    bool has_name;
-    char * name;
-    NetClientOptions * opts;
-};
-
-void qapi_free_NetLegacyList(NetLegacyList * obj);
-void qapi_free_NetLegacy(NetLegacy * obj);
-
-struct Netdev
-{
-    char * id;
-    NetClientOptions * opts;
-};
-
-void qapi_free_NetdevList(NetdevList * obj);
-void qapi_free_Netdev(Netdev * obj);
-
-struct InetSocketAddress
-{
-    char * host;
-    char * port;
-    bool has_to;
-    uint16_t to;
-    bool has_ipv4;
-    bool ipv4;
-    bool has_ipv6;
-    bool ipv6;
-};
-
-void qapi_free_InetSocketAddressList(InetSocketAddressList * obj);
-void qapi_free_InetSocketAddress(InetSocketAddress * obj);
-
-struct UnixSocketAddress
-{
-    char * path;
-};
-
-void qapi_free_UnixSocketAddressList(UnixSocketAddressList * obj);
-void qapi_free_UnixSocketAddress(UnixSocketAddress * obj);
-
-struct SocketAddress
-{
-    SocketAddressKind kind;
-    union {
-        void *data;
-        InetSocketAddress * inet;
-        UnixSocketAddress * q_unix;
-        String * fd;
-    };
-};
-void qapi_free_SocketAddressList(SocketAddressList * obj);
-void qapi_free_SocketAddress(SocketAddress * obj);
-
-struct MachineInfo
-{
-    char * name;
-    bool has_alias;
-    char * alias;
-    bool has_is_default;
-    bool is_default;
-    int64_t cpu_max;
-};
-
-void qapi_free_MachineInfoList(MachineInfoList * obj);
-void qapi_free_MachineInfo(MachineInfo * obj);
-
-struct CpuDefinitionInfo
-{
-    char * name;
-};
-
-void qapi_free_CpuDefinitionInfoList(CpuDefinitionInfoList * obj);
-void qapi_free_CpuDefinitionInfo(CpuDefinitionInfo * obj);
-
-struct AddfdInfo
-{
-    int64_t fdset_id;
-    int64_t fd;
-};
-
-void qapi_free_AddfdInfoList(AddfdInfoList * obj);
-void qapi_free_AddfdInfo(AddfdInfo * obj);
-
-struct FdsetFdInfo
-{
-    int64_t fd;
-    bool has_opaque;
-    char * opaque;
-};
-
-void qapi_free_FdsetFdInfoList(FdsetFdInfoList * obj);
-void qapi_free_FdsetFdInfo(FdsetFdInfo * obj);
-
-struct FdsetInfo
-{
-    int64_t fdset_id;
-    FdsetFdInfoList * fds;
-};
-
-void qapi_free_FdsetInfoList(FdsetInfoList * obj);
-void qapi_free_FdsetInfo(FdsetInfo * obj);
-
-struct TargetInfo
-{
-    char * arch;
-};
-
-void qapi_free_TargetInfoList(TargetInfoList * obj);
-void qapi_free_TargetInfo(TargetInfo * obj);
-
-void qapi_free_QKeyCodeList(QKeyCodeList * obj);
-
-struct KeyValue
-{
-    KeyValueKind kind;
-    union {
-        void *data;
-        int64_t number;
-        QKeyCode qcode;
-    };
-};
-void qapi_free_KeyValueList(KeyValueList * obj);
-void qapi_free_KeyValue(KeyValue * obj);
-
-struct ChardevFile
-{
-    bool has_in;
-    char * in;
-    char * out;
-};
-
-void qapi_free_ChardevFileList(ChardevFileList * obj);
-void qapi_free_ChardevFile(ChardevFile * obj);
-
-struct ChardevHostdev
-{
-    char * device;
-};
-
-void qapi_free_ChardevHostdevList(ChardevHostdevList * obj);
-void qapi_free_ChardevHostdev(ChardevHostdev * obj);
-
-struct ChardevSocket
-{
-    SocketAddress * addr;
-    bool has_server;
-    bool server;
-    bool has_wait;
-    bool wait;
-    bool has_nodelay;
-    bool nodelay;
-    bool has_telnet;
-    bool telnet;
-};
-
-void qapi_free_ChardevSocketList(ChardevSocketList * obj);
-void qapi_free_ChardevSocket(ChardevSocket * obj);
-
-struct ChardevUdp
-{
-    SocketAddress * remote;
-    bool has_local;
-    SocketAddress * local;
-};
-
-void qapi_free_ChardevUdpList(ChardevUdpList * obj);
-void qapi_free_ChardevUdp(ChardevUdp * obj);
-
-struct ChardevMux
-{
-    char * chardev;
-};
-
-void qapi_free_ChardevMuxList(ChardevMuxList * obj);
-void qapi_free_ChardevMux(ChardevMux * obj);
-
-struct ChardevStdio
-{
-    bool has_signal;
-    bool signal;
-};
-
-void qapi_free_ChardevStdioList(ChardevStdioList * obj);
-void qapi_free_ChardevStdio(ChardevStdio * obj);
-
-struct ChardevSpiceChannel
-{
-    char * type;
-};
-
-void qapi_free_ChardevSpiceChannelList(ChardevSpiceChannelList * obj);
-void qapi_free_ChardevSpiceChannel(ChardevSpiceChannel * obj);
-
-struct ChardevSpicePort
-{
-    char * fqdn;
-};
-
-void qapi_free_ChardevSpicePortList(ChardevSpicePortList * obj);
-void qapi_free_ChardevSpicePort(ChardevSpicePort * obj);
-
-struct ChardevVC
-{
-    bool has_width;
-    int64_t width;
-    bool has_height;
-    int64_t height;
-    bool has_cols;
-    int64_t cols;
-    bool has_rows;
-    int64_t rows;
-};
-
-void qapi_free_ChardevVCList(ChardevVCList * obj);
-void qapi_free_ChardevVC(ChardevVC * obj);
-
-struct ChardevMemory
-{
-    bool has_size;
-    int64_t size;
-};
-
-void qapi_free_ChardevMemoryList(ChardevMemoryList * obj);
-void qapi_free_ChardevMemory(ChardevMemory * obj);
-
-struct ChardevDummy
-{
-};
-
-void qapi_free_ChardevDummyList(ChardevDummyList * obj);
-void qapi_free_ChardevDummy(ChardevDummy * obj);
-
-struct ChardevBackend
-{
-    ChardevBackendKind kind;
-    union {
-        void *data;
-        ChardevFile * file;
-        ChardevHostdev * serial;
-        ChardevHostdev * parallel;
-        ChardevHostdev * pipe;
-        ChardevSocket * socket;
-        ChardevUdp * udp;
-        ChardevDummy * pty;
-        ChardevDummy * null;
-        ChardevMux * mux;
-        ChardevDummy * msmouse;
-        ChardevDummy * braille;
-        ChardevStdio * stdio;
-        ChardevDummy * console;
-        ChardevSpiceChannel * spicevmc;
-        ChardevSpicePort * spiceport;
-        ChardevVC * vc;
-        ChardevMemory * memory;
-    };
-};
-void qapi_free_ChardevBackendList(ChardevBackendList * obj);
-void qapi_free_ChardevBackend(ChardevBackend * obj);
-
-struct ChardevReturn
-{
-    bool has_pty;
-    char * pty;
-};
-
-void qapi_free_ChardevReturnList(ChardevReturnList * obj);
-void qapi_free_ChardevReturn(ChardevReturn * obj);
-
-void qapi_free_TpmModelList(TpmModelList * obj);
-
-void qapi_free_TpmTypeList(TpmTypeList * obj);
-
-struct TPMPassthroughOptions
-{
-    bool has_path;
-    char * path;
-    bool has_cancel_path;
-    char * cancel_path;
-};
-
-void qapi_free_TPMPassthroughOptionsList(TPMPassthroughOptionsList * obj);
-void qapi_free_TPMPassthroughOptions(TPMPassthroughOptions * obj);
-
-struct TpmTypeOptions
-{
-    TpmTypeOptionsKind kind;
-    union {
-        void *data;
-        TPMPassthroughOptions * passthrough;
-    };
-};
-void qapi_free_TpmTypeOptionsList(TpmTypeOptionsList * obj);
-void qapi_free_TpmTypeOptions(TpmTypeOptions * obj);
-
-struct TPMInfo
-{
-    char * id;
-    TpmModel model;
-    TpmTypeOptions * options;
-};
-
-void qapi_free_TPMInfoList(TPMInfoList * obj);
-void qapi_free_TPMInfo(TPMInfo * obj);
-
-struct AcpiTableOptions
-{
-    bool has_sig;
-    char * sig;
-    bool has_rev;
-    uint8_t rev;
-    bool has_oem_id;
-    char * oem_id;
-    bool has_oem_table_id;
-    char * oem_table_id;
-    bool has_oem_rev;
-    uint32_t oem_rev;
-    bool has_asl_compiler_id;
-    char * asl_compiler_id;
-    bool has_asl_compiler_rev;
-    uint32_t asl_compiler_rev;
-    bool has_file;
-    char * file;
-    bool has_data;
-    char * data;
-};
-
-void qapi_free_AcpiTableOptionsList(AcpiTableOptionsList * obj);
-void qapi_free_AcpiTableOptions(AcpiTableOptions * obj);
-
-void qapi_free_CommandLineParameterTypeList(CommandLineParameterTypeList * obj);
-
-struct CommandLineParameterInfo
-{
-    char * name;
-    CommandLineParameterType type;
-    bool has_help;
-    char * help;
-};
-
-void qapi_free_CommandLineParameterInfoList(CommandLineParameterInfoList * obj);
-void qapi_free_CommandLineParameterInfo(CommandLineParameterInfo * obj);
-
-struct CommandLineOptionInfo
-{
-    char * option;
-    CommandLineParameterInfoList * parameters;
-};
-
-void qapi_free_CommandLineOptionInfoList(CommandLineOptionInfoList * obj);
-void qapi_free_CommandLineOptionInfo(CommandLineOptionInfo * obj);
-
-void qapi_free_X86CPURegister32List(X86CPURegister32List * obj);
-
-struct X86CPUFeatureWordInfo
-{
-    int64_t cpuid_input_eax;
-    bool has_cpuid_input_ecx;
-    int64_t cpuid_input_ecx;
-    X86CPURegister32 cpuid_register;
-    int64_t features;
-};
-
-void qapi_free_X86CPUFeatureWordInfoList(X86CPUFeatureWordInfoList * obj);
-void qapi_free_X86CPUFeatureWordInfo(X86CPUFeatureWordInfo * obj);
-
-void qapi_free_RxStateList(RxStateList * obj);
-
-struct RxFilterInfo
-{
-    char * name;
-    bool promiscuous;
-    RxState multicast;
-    RxState unicast;
-    bool broadcast_allowed;
-    bool multicast_overflow;
-    bool unicast_overflow;
-    char * main_mac;
-    intList * vlan_table;
-    strList * unicast_table;
-    strList * multicast_table;
-};
-
-void qapi_free_RxFilterInfoList(RxFilterInfoList * obj);
-void qapi_free_RxFilterInfo(RxFilterInfo * obj);
-
-#endif
diff --git a/contrib/qemu/qemu-coroutine-lock.c b/contrib/qemu/qemu-coroutine-lock.c
deleted file mode 100644
index d9fea4989..000000000
--- a/contrib/qemu/qemu-coroutine-lock.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * coroutine queues and locks
- *
- * Copyright (c) 2011 Kevin Wolf <kwolf@redhat.com>
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "qemu-common.h"
-#include "block/coroutine.h"
-#include "block/coroutine_int.h"
-#include "qemu/queue.h"
-#include "trace.h"
-
-void qemu_co_queue_init(CoQueue *queue)
-{
-    QTAILQ_INIT(&queue->entries);
-}
-
-void coroutine_fn qemu_co_queue_wait(CoQueue *queue)
-{
-    Coroutine *self = qemu_coroutine_self();
-    QTAILQ_INSERT_TAIL(&queue->entries, self, co_queue_next);
-    qemu_coroutine_yield();
-    assert(qemu_in_coroutine());
-}
-
-void coroutine_fn qemu_co_queue_wait_insert_head(CoQueue *queue)
-{
-    Coroutine *self = qemu_coroutine_self();
-    QTAILQ_INSERT_HEAD(&queue->entries, self, co_queue_next);
-    qemu_coroutine_yield();
-    assert(qemu_in_coroutine());
-}
-
-/**
- * qemu_co_queue_run_restart:
- *
- * Enter each coroutine that was previously marked for restart by
- * qemu_co_queue_next() or qemu_co_queue_restart_all().  This function is
- * invoked by the core coroutine code when the current coroutine yields or
- * terminates.
- */
-void qemu_co_queue_run_restart(Coroutine *co)
-{
-    Coroutine *next;
-
-    trace_qemu_co_queue_run_restart(co);
-    while ((next = QTAILQ_FIRST(&co->co_queue_wakeup))) {
-        QTAILQ_REMOVE(&co->co_queue_wakeup, next, co_queue_next);
-        qemu_coroutine_enter(next, NULL);
-    }
-}
-
-static bool qemu_co_queue_do_restart(CoQueue *queue, bool single)
-{
-    Coroutine *self = qemu_coroutine_self();
-    Coroutine *next;
-
-    if (QTAILQ_EMPTY(&queue->entries)) {
-        return false;
-    }
-
-    while ((next = QTAILQ_FIRST(&queue->entries)) != NULL) {
-        QTAILQ_REMOVE(&queue->entries, next, co_queue_next);
-        QTAILQ_INSERT_TAIL(&self->co_queue_wakeup, next, co_queue_next);
-        trace_qemu_co_queue_next(next);
-        if (single) {
-            break;
-        }
-    }
-    return true;
-}
-
-bool qemu_co_queue_next(CoQueue *queue)
-{
-    return qemu_co_queue_do_restart(queue, true);
-}
-
-void qemu_co_queue_restart_all(CoQueue *queue)
-{
-    qemu_co_queue_do_restart(queue, false);
-}
-
-bool qemu_co_queue_empty(CoQueue *queue)
-{
-    return (QTAILQ_FIRST(&queue->entries) == NULL);
-}
-
-void qemu_co_mutex_init(CoMutex *mutex)
-{
-    memset(mutex, 0, sizeof(*mutex));
-    qemu_co_queue_init(&mutex->queue);
-}
-
-void coroutine_fn qemu_co_mutex_lock(CoMutex *mutex)
-{
-    Coroutine *self = qemu_coroutine_self();
-
-    trace_qemu_co_mutex_lock_entry(mutex, self);
-
-    while (mutex->locked) {
-        qemu_co_queue_wait(&mutex->queue);
-    }
-
-    mutex->locked = true;
-
-    trace_qemu_co_mutex_lock_return(mutex, self);
-}
-
-void coroutine_fn qemu_co_mutex_unlock(CoMutex *mutex)
-{
-    Coroutine *self = qemu_coroutine_self();
-
-    trace_qemu_co_mutex_unlock_entry(mutex, self);
-
-    assert(mutex->locked == true);
-    assert(qemu_in_coroutine());
-
-    mutex->locked = false;
-    qemu_co_queue_next(&mutex->queue);
-
-    trace_qemu_co_mutex_unlock_return(mutex, self);
-}
-
-void qemu_co_rwlock_init(CoRwlock *lock)
-{
-    memset(lock, 0, sizeof(*lock));
-    qemu_co_queue_init(&lock->queue);
-}
-
-void qemu_co_rwlock_rdlock(CoRwlock *lock)
-{
-    while (lock->writer) {
-        qemu_co_queue_wait(&lock->queue);
-    }
-    lock->reader++;
-}
-
-void qemu_co_rwlock_unlock(CoRwlock *lock)
-{
-    assert(qemu_in_coroutine());
-    if (lock->writer) {
-        lock->writer = false;
-        qemu_co_queue_restart_all(&lock->queue);
-    } else {
-        lock->reader--;
-        assert(lock->reader >= 0);
-        /* Wakeup only one waiting writer */
-        if (!lock->reader) {
-            qemu_co_queue_next(&lock->queue);
-        }
-    }
-}
-
-void qemu_co_rwlock_wrlock(CoRwlock *lock)
-{
-    while (lock->writer || lock->reader) {
-        qemu_co_queue_wait(&lock->queue);
-    }
-    lock->writer = true;
-}
diff --git a/contrib/qemu/qemu-coroutine-sleep.c b/contrib/qemu/qemu-coroutine-sleep.c
deleted file mode 100644
index 169ce5ccc..000000000
--- a/contrib/qemu/qemu-coroutine-sleep.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * QEMU coroutine sleep
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Stefan Hajnoczi    <stefanha@linux.vnet.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "block/coroutine.h"
-#include "qemu/timer.h"
-
-typedef struct CoSleepCB {
-    QEMUTimer *ts;
-    Coroutine *co;
-} CoSleepCB;
-
-static void co_sleep_cb(void *opaque)
-{
-    CoSleepCB *sleep_cb = opaque;
-
-    qemu_coroutine_enter(sleep_cb->co, NULL);
-}
-
-void coroutine_fn co_sleep_ns(QEMUClock *clock, int64_t ns)
-{
-    CoSleepCB sleep_cb = {
-        .co = qemu_coroutine_self(),
-    };
-    sleep_cb.ts = qemu_new_timer(clock, SCALE_NS, co_sleep_cb, &sleep_cb);
-    qemu_mod_timer(sleep_cb.ts, qemu_get_clock_ns(clock) + ns);
-    qemu_coroutine_yield();
-    qemu_del_timer(sleep_cb.ts);
-    qemu_free_timer(sleep_cb.ts);
-}
diff --git a/contrib/qemu/qemu-coroutine.c b/contrib/qemu/qemu-coroutine.c
deleted file mode 100644
index 5e19307ee..000000000
--- a/contrib/qemu/qemu-coroutine.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * QEMU coroutines
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Stefan Hajnoczi    <stefanha@linux.vnet.ibm.com>
- *  Kevin Wolf         <kwolf@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "trace.h"
-#include "qemu-common.h"
-#include "qemu/thread.h"
-#include "block/coroutine.h"
-#include "block/coroutine_int.h"
-
-enum {
-    /* Maximum free pool size prevents holding too many freed coroutines */
-    POOL_MAX_SIZE = 0,
-};
-
-/** Free list to speed up creation */
-static QemuMutex pool_lock;
-static QSLIST_HEAD(, Coroutine) pool = QSLIST_HEAD_INITIALIZER(pool);
-static unsigned int pool_size;
-
-Coroutine *qemu_coroutine_create(CoroutineEntry *entry)
-{
-    Coroutine *co;
-
-    qemu_mutex_lock(&pool_lock);
-    co = QSLIST_FIRST(&pool);
-    if (co) {
-        QSLIST_REMOVE_HEAD(&pool, pool_next);
-        pool_size--;
-    }
-    qemu_mutex_unlock(&pool_lock);
-
-    if (!co) {
-        co = qemu_coroutine_new();
-    }
-
-    co->entry = entry;
-    QTAILQ_INIT(&co->co_queue_wakeup);
-    return co;
-}
-
-static void coroutine_delete(Coroutine *co)
-{
-    qemu_mutex_lock(&pool_lock);
-    if (pool_size < POOL_MAX_SIZE) {
-        QSLIST_INSERT_HEAD(&pool, co, pool_next);
-        co->caller = NULL;
-        pool_size++;
-        qemu_mutex_unlock(&pool_lock);
-        return;
-    }
-    qemu_mutex_unlock(&pool_lock);
-
-    qemu_coroutine_delete(co);
-}
-
-static void __attribute__((constructor)) coroutine_pool_init(void)
-{
-    qemu_mutex_init(&pool_lock);
-}
-
-static void __attribute__((destructor)) coroutine_pool_cleanup(void)
-{
-    Coroutine *co;
-    Coroutine *tmp;
-
-    QSLIST_FOREACH_SAFE(co, &pool, pool_next, tmp) {
-        QSLIST_REMOVE_HEAD(&pool, pool_next);
-        qemu_coroutine_delete(co);
-    }
-
-    qemu_mutex_destroy(&pool_lock);
-}
-
-static void coroutine_swap(Coroutine *from, Coroutine *to)
-{
-    CoroutineAction ret;
-
-    ret = qemu_coroutine_switch(from, to, COROUTINE_YIELD);
-
-    qemu_co_queue_run_restart(to);
-
-    switch (ret) {
-    case COROUTINE_YIELD:
-        return;
-    case COROUTINE_TERMINATE:
-        trace_qemu_coroutine_terminate(to);
-        coroutine_delete(to);
-        return;
-    default:
-        abort();
-    }
-}
-
-void qemu_coroutine_enter(Coroutine *co, void *opaque)
-{
-    Coroutine *self = qemu_coroutine_self();
-
-    trace_qemu_coroutine_enter(self, co, opaque);
-
-    if (co->caller) {
-        fprintf(stderr, "Co-routine re-entered recursively\n");
-        abort();
-    }
-
-    co->caller = self;
-    co->entry_arg = opaque;
-    coroutine_swap(self, co);
-}
-
-void coroutine_fn qemu_coroutine_yield(void)
-{
-    Coroutine *self = qemu_coroutine_self();
-    Coroutine *to = self->caller;
-
-    trace_qemu_coroutine_yield(self, to);
-
-    if (!to) {
-        fprintf(stderr, "Co-routine is yielding to no one\n");
-        abort();
-    }
-
-    self->caller = NULL;
-    coroutine_swap(self, to);
-}
diff --git a/contrib/qemu/qmp-commands.h b/contrib/qemu/qmp-commands.h
deleted file mode 100644
index fcc0ff0f7..000000000
--- a/contrib/qemu/qmp-commands.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */
-
-/*
- * schema-defined QAPI function prototypes
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QMP_COMMANDS_H
-#define QMP_COMMANDS_H
-
-#include "qapi-types.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/error.h"
-
-void qmp_add_client(const char * protocol, const char * fdname, bool has_skipauth, bool skipauth, bool has_tls, bool tls, Error **errp);
-int qmp_marshal_input_add_client(Monitor *mon, const QDict *qdict, QObject **ret);
-NameInfo * qmp_query_name(Error **errp);
-int qmp_marshal_input_query_name(Monitor *mon, const QDict *qdict, QObject **ret);
-VersionInfo * qmp_query_version(Error **errp);
-int qmp_marshal_input_query_version(Monitor *mon, const QDict *qdict, QObject **ret);
-KvmInfo * qmp_query_kvm(Error **errp);
-int qmp_marshal_input_query_kvm(Monitor *mon, const QDict *qdict, QObject **ret);
-StatusInfo * qmp_query_status(Error **errp);
-int qmp_marshal_input_query_status(Monitor *mon, const QDict *qdict, QObject **ret);
-UuidInfo * qmp_query_uuid(Error **errp);
-int qmp_marshal_input_query_uuid(Monitor *mon, const QDict *qdict, QObject **ret);
-ChardevInfoList * qmp_query_chardev(Error **errp);
-int qmp_marshal_input_query_chardev(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_ringbuf_write(const char * device, const char * data, bool has_format, DataFormat format, Error **errp);
-int qmp_marshal_input_ringbuf_write(Monitor *mon, const QDict *qdict, QObject **ret);
-char * qmp_ringbuf_read(const char * device, int64_t size, bool has_format, DataFormat format, Error **errp);
-int qmp_marshal_input_ringbuf_read(Monitor *mon, const QDict *qdict, QObject **ret);
-CommandInfoList * qmp_query_commands(Error **errp);
-int qmp_marshal_input_query_commands(Monitor *mon, const QDict *qdict, QObject **ret);
-EventInfoList * qmp_query_events(Error **errp);
-int qmp_marshal_input_query_events(Monitor *mon, const QDict *qdict, QObject **ret);
-MigrationInfo * qmp_query_migrate(Error **errp);
-int qmp_marshal_input_query_migrate(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_migrate_set_capabilities(MigrationCapabilityStatusList * capabilities, Error **errp);
-int qmp_marshal_input_migrate_set_capabilities(Monitor *mon, const QDict *qdict, QObject **ret);
-MigrationCapabilityStatusList * qmp_query_migrate_capabilities(Error **errp);
-int qmp_marshal_input_query_migrate_capabilities(Monitor *mon, const QDict *qdict, QObject **ret);
-MouseInfoList * qmp_query_mice(Error **errp);
-int qmp_marshal_input_query_mice(Monitor *mon, const QDict *qdict, QObject **ret);
-CpuInfoList * qmp_query_cpus(Error **errp);
-int qmp_marshal_input_query_cpus(Monitor *mon, const QDict *qdict, QObject **ret);
-BlockInfoList * qmp_query_block(Error **errp);
-int qmp_marshal_input_query_block(Monitor *mon, const QDict *qdict, QObject **ret);
-BlockStatsList * qmp_query_blockstats(Error **errp);
-int qmp_marshal_input_query_blockstats(Monitor *mon, const QDict *qdict, QObject **ret);
-VncInfo * qmp_query_vnc(Error **errp);
-int qmp_marshal_input_query_vnc(Monitor *mon, const QDict *qdict, QObject **ret);
-SpiceInfo * qmp_query_spice(Error **errp);
-int qmp_marshal_input_query_spice(Monitor *mon, const QDict *qdict, QObject **ret);
-BalloonInfo * qmp_query_balloon(Error **errp);
-int qmp_marshal_input_query_balloon(Monitor *mon, const QDict *qdict, QObject **ret);
-PciInfoList * qmp_query_pci(Error **errp);
-int qmp_marshal_input_query_pci(Monitor *mon, const QDict *qdict, QObject **ret);
-BlockJobInfoList * qmp_query_block_jobs(Error **errp);
-int qmp_marshal_input_query_block_jobs(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_quit(Error **errp);
-int qmp_marshal_input_quit(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_stop(Error **errp);
-int qmp_marshal_input_stop(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_system_reset(Error **errp);
-int qmp_marshal_input_system_reset(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_system_powerdown(Error **errp);
-int qmp_marshal_input_system_powerdown(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_cpu(int64_t index, Error **errp);
-int qmp_marshal_input_cpu(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_cpu_add(int64_t id, Error **errp);
-int qmp_marshal_input_cpu_add(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_memsave(int64_t val, int64_t size, const char * filename, bool has_cpu_index, int64_t cpu_index, Error **errp);
-int qmp_marshal_input_memsave(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_pmemsave(int64_t val, int64_t size, const char * filename, Error **errp);
-int qmp_marshal_input_pmemsave(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_cont(Error **errp);
-int qmp_marshal_input_cont(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_system_wakeup(Error **errp);
-int qmp_marshal_input_system_wakeup(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_inject_nmi(Error **errp);
-int qmp_marshal_input_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_set_link(const char * name, bool up, Error **errp);
-int qmp_marshal_input_set_link(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_passwd(const char * device, const char * password, Error **errp);
-int qmp_marshal_input_block_passwd(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_balloon(int64_t value, Error **errp);
-int qmp_marshal_input_balloon(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_resize(const char * device, int64_t size, Error **errp);
-int qmp_marshal_input_block_resize(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_transaction(TransactionActionList * actions, Error **errp);
-int qmp_marshal_input_transaction(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_blockdev_snapshot_sync(const char * device, const char * snapshot_file, bool has_format, const char * format, bool has_mode, NewImageMode mode, Error **errp);
-int qmp_marshal_input_blockdev_snapshot_sync(Monitor *mon, const QDict *qdict, QObject **ret);
-char * qmp_human_monitor_command(const char * command_line, bool has_cpu_index, int64_t cpu_index, Error **errp);
-int qmp_marshal_input_human_monitor_command(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_commit(const char * device, bool has_base, const char * base, const char * top, bool has_speed, int64_t speed, Error **errp);
-int qmp_marshal_input_block_commit(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_drive_backup(const char * device, const char * target, bool has_format, const char * format, MirrorSyncMode sync, bool has_mode, NewImageMode mode, bool has_speed, int64_t speed, bool has_on_source_error, BlockdevOnError on_source_error, bool has_on_target_error, BlockdevOnError on_target_error, Error **errp);
-int qmp_marshal_input_drive_backup(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_drive_mirror(const char * device, const char * target, bool has_format, const char * format, MirrorSyncMode sync, bool has_mode, NewImageMode mode, bool has_speed, int64_t speed, bool has_granularity, uint32_t granularity, bool has_buf_size, int64_t buf_size, bool has_on_source_error, BlockdevOnError on_source_error, bool has_on_target_error, BlockdevOnError on_target_error, Error **errp);
-int qmp_marshal_input_drive_mirror(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_migrate_cancel(Error **errp);
-int qmp_marshal_input_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_migrate_set_downtime(double value, Error **errp);
-int qmp_marshal_input_migrate_set_downtime(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_migrate_set_speed(int64_t value, Error **errp);
-int qmp_marshal_input_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_migrate_set_cache_size(int64_t value, Error **errp);
-int qmp_marshal_input_migrate_set_cache_size(Monitor *mon, const QDict *qdict, QObject **ret);
-int64_t qmp_query_migrate_cache_size(Error **errp);
-int qmp_marshal_input_query_migrate_cache_size(Monitor *mon, const QDict *qdict, QObject **ret);
-ObjectPropertyInfoList * qmp_qom_list(const char * path, Error **errp);
-int qmp_marshal_input_qom_list(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_set_password(const char * protocol, const char * password, bool has_connected, const char * connected, Error **errp);
-int qmp_marshal_input_set_password(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_expire_password(const char * protocol, const char * time, Error **errp);
-int qmp_marshal_input_expire_password(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_eject(const char * device, bool has_force, bool force, Error **errp);
-int qmp_marshal_input_eject(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_change_vnc_password(const char * password, Error **errp);
-int qmp_marshal_input_change_vnc_password(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_change(const char * device, const char * target, bool has_arg, const char * arg, Error **errp);
-int qmp_marshal_input_change(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_set_io_throttle(const char * device, int64_t bps, int64_t bps_rd, int64_t bps_wr, int64_t iops, int64_t iops_rd, int64_t iops_wr, Error **errp);
-int qmp_marshal_input_block_set_io_throttle(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_stream(const char * device, bool has_base, const char * base, bool has_speed, int64_t speed, bool has_on_error, BlockdevOnError on_error, Error **errp);
-int qmp_marshal_input_block_stream(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_job_set_speed(const char * device, int64_t speed, Error **errp);
-int qmp_marshal_input_block_job_set_speed(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_job_cancel(const char * device, bool has_force, bool force, Error **errp);
-int qmp_marshal_input_block_job_cancel(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_job_pause(const char * device, Error **errp);
-int qmp_marshal_input_block_job_pause(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_job_resume(const char * device, Error **errp);
-int qmp_marshal_input_block_job_resume(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_block_job_complete(const char * device, Error **errp);
-int qmp_marshal_input_block_job_complete(Monitor *mon, const QDict *qdict, QObject **ret);
-ObjectTypeInfoList * qmp_qom_list_types(bool has_implements, const char * implements, bool has_abstract, bool abstract, Error **errp);
-int qmp_marshal_input_qom_list_types(Monitor *mon, const QDict *qdict, QObject **ret);
-DevicePropertyInfoList * qmp_device_list_properties(const char * typename, Error **errp);
-int qmp_marshal_input_device_list_properties(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_migrate(const char * uri, bool has_blk, bool blk, bool has_inc, bool inc, bool has_detach, bool detach, Error **errp);
-int qmp_marshal_input_migrate(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_xen_save_devices_state(const char * filename, Error **errp);
-int qmp_marshal_input_xen_save_devices_state(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_xen_set_global_dirty_log(bool enable, Error **errp);
-int qmp_marshal_input_xen_set_global_dirty_log(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_device_del(const char * id, Error **errp);
-int qmp_marshal_input_device_del(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_dump_guest_memory(bool paging, const char * protocol, bool has_begin, int64_t begin, bool has_length, int64_t length, Error **errp);
-int qmp_marshal_input_dump_guest_memory(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_netdev_del(const char * id, Error **errp);
-int qmp_marshal_input_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_getfd(const char * fdname, Error **errp);
-int qmp_marshal_input_getfd(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_closefd(const char * fdname, Error **errp);
-int qmp_marshal_input_closefd(Monitor *mon, const QDict *qdict, QObject **ret);
-MachineInfoList * qmp_query_machines(Error **errp);
-int qmp_marshal_input_query_machines(Monitor *mon, const QDict *qdict, QObject **ret);
-CpuDefinitionInfoList * qmp_query_cpu_definitions(Error **errp);
-int qmp_marshal_input_query_cpu_definitions(Monitor *mon, const QDict *qdict, QObject **ret);
-AddfdInfo * qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, const char * opaque, Error **errp);
-int qmp_marshal_input_add_fd(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_remove_fd(int64_t fdset_id, bool has_fd, int64_t fd, Error **errp);
-int qmp_marshal_input_remove_fd(Monitor *mon, const QDict *qdict, QObject **ret);
-FdsetInfoList * qmp_query_fdsets(Error **errp);
-int qmp_marshal_input_query_fdsets(Monitor *mon, const QDict *qdict, QObject **ret);
-TargetInfo * qmp_query_target(Error **errp);
-int qmp_marshal_input_query_target(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_send_key(KeyValueList * keys, bool has_hold_time, int64_t hold_time, Error **errp);
-int qmp_marshal_input_send_key(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_screendump(const char * filename, Error **errp);
-int qmp_marshal_input_screendump(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_nbd_server_start(SocketAddress * addr, Error **errp);
-int qmp_marshal_input_nbd_server_start(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_nbd_server_add(const char * device, bool has_writable, bool writable, Error **errp);
-int qmp_marshal_input_nbd_server_add(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_nbd_server_stop(Error **errp);
-int qmp_marshal_input_nbd_server_stop(Monitor *mon, const QDict *qdict, QObject **ret);
-ChardevReturn * qmp_chardev_add(const char * id, ChardevBackend * backend, Error **errp);
-int qmp_marshal_input_chardev_add(Monitor *mon, const QDict *qdict, QObject **ret);
-void qmp_chardev_remove(const char * id, Error **errp);
-int qmp_marshal_input_chardev_remove(Monitor *mon, const QDict *qdict, QObject **ret);
-TpmModelList * qmp_query_tpm_models(Error **errp);
-int qmp_marshal_input_query_tpm_models(Monitor *mon, const QDict *qdict, QObject **ret);
-TpmTypeList * qmp_query_tpm_types(Error **errp);
-int qmp_marshal_input_query_tpm_types(Monitor *mon, const QDict *qdict, QObject **ret);
-TPMInfoList * qmp_query_tpm(Error **errp);
-int qmp_marshal_input_query_tpm(Monitor *mon, const QDict *qdict, QObject **ret);
-CommandLineOptionInfoList * qmp_query_command_line_options(bool has_option, const char * option, Error **errp);
-int qmp_marshal_input_query_command_line_options(Monitor *mon, const QDict *qdict, QObject **ret);
-RxFilterInfoList * qmp_query_rx_filter(bool has_name, const char * name, Error **errp);
-int qmp_marshal_input_query_rx_filter(Monitor *mon, const QDict *qdict, QObject **ret);
-
-#endif
diff --git a/contrib/qemu/qobject/json-lexer.c b/contrib/qemu/qobject/json-lexer.c
deleted file mode 100644
index 440df6039..000000000
--- a/contrib/qemu/qobject/json-lexer.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * JSON lexer
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qint.h"
-#include "qemu-common.h"
-#include "qapi/qmp/json-lexer.h"
-
-#define MAX_TOKEN_SIZE (64ULL << 20)
-
-/*
- * \"([^\\\"]|(\\\"\\'\\\\\\/\\b\\f\\n\\r\\t\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]))*\"
- * '([^\\']|(\\\"\\'\\\\\\/\\b\\f\\n\\r\\t\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]))*'
- * 0|([1-9][0-9]*(.[0-9]+)?([eE]([-+])?[0-9]+))
- * [{}\[\],:]
- * [a-z]+
- *
- */
-
-enum json_lexer_state {
-    IN_ERROR = 0,
-    IN_DQ_UCODE3,
-    IN_DQ_UCODE2,
-    IN_DQ_UCODE1,
-    IN_DQ_UCODE0,
-    IN_DQ_STRING_ESCAPE,
-    IN_DQ_STRING,
-    IN_SQ_UCODE3,
-    IN_SQ_UCODE2,
-    IN_SQ_UCODE1,
-    IN_SQ_UCODE0,
-    IN_SQ_STRING_ESCAPE,
-    IN_SQ_STRING,
-    IN_ZERO,
-    IN_DIGITS,
-    IN_DIGIT,
-    IN_EXP_E,
-    IN_MANTISSA,
-    IN_MANTISSA_DIGITS,
-    IN_NONZERO_NUMBER,
-    IN_NEG_NONZERO_NUMBER,
-    IN_KEYWORD,
-    IN_ESCAPE,
-    IN_ESCAPE_L,
-    IN_ESCAPE_LL,
-    IN_ESCAPE_I,
-    IN_ESCAPE_I6,
-    IN_ESCAPE_I64,
-    IN_WHITESPACE,
-    IN_START,
-};
-
-#define TERMINAL(state) [0 ... 0x7F] = (state)
-
-/* Return whether TERMINAL is a terminal state and the transition to it
-   from OLD_STATE required lookahead.  This happens whenever the table
-   below uses the TERMINAL macro.  */
-#define TERMINAL_NEEDED_LOOKAHEAD(old_state, terminal) \
-            (json_lexer[(old_state)][0] == (terminal))
-
-static const uint8_t json_lexer[][256] =  {
-    /* double quote string */
-    [IN_DQ_UCODE3] = {
-        ['0' ... '9'] = IN_DQ_STRING,
-        ['a' ... 'f'] = IN_DQ_STRING,
-        ['A' ... 'F'] = IN_DQ_STRING,
-    },
-    [IN_DQ_UCODE2] = {
-        ['0' ... '9'] = IN_DQ_UCODE3,
-        ['a' ... 'f'] = IN_DQ_UCODE3,
-        ['A' ... 'F'] = IN_DQ_UCODE3,
-    },
-    [IN_DQ_UCODE1] = {
-        ['0' ... '9'] = IN_DQ_UCODE2,
-        ['a' ... 'f'] = IN_DQ_UCODE2,
-        ['A' ... 'F'] = IN_DQ_UCODE2,
-    },
-    [IN_DQ_UCODE0] = {
-        ['0' ... '9'] = IN_DQ_UCODE1,
-        ['a' ... 'f'] = IN_DQ_UCODE1,
-        ['A' ... 'F'] = IN_DQ_UCODE1,
-    },
-    [IN_DQ_STRING_ESCAPE] = {
-        ['b'] = IN_DQ_STRING,
-        ['f'] =  IN_DQ_STRING,
-        ['n'] =  IN_DQ_STRING,
-        ['r'] =  IN_DQ_STRING,
-        ['t'] =  IN_DQ_STRING,
-        ['/'] = IN_DQ_STRING,
-        ['\\'] = IN_DQ_STRING,
-        ['\''] = IN_DQ_STRING,
-        ['\"'] = IN_DQ_STRING,
-        ['u'] = IN_DQ_UCODE0,
-    },
-    [IN_DQ_STRING] = {
-        [1 ... 0xBF] = IN_DQ_STRING,
-        [0xC2 ... 0xF4] = IN_DQ_STRING,
-        ['\\'] = IN_DQ_STRING_ESCAPE,
-        ['"'] = JSON_STRING,
-    },
-
-    /* single quote string */
-    [IN_SQ_UCODE3] = {
-        ['0' ... '9'] = IN_SQ_STRING,
-        ['a' ... 'f'] = IN_SQ_STRING,
-        ['A' ... 'F'] = IN_SQ_STRING,
-    },
-    [IN_SQ_UCODE2] = {
-        ['0' ... '9'] = IN_SQ_UCODE3,
-        ['a' ... 'f'] = IN_SQ_UCODE3,
-        ['A' ... 'F'] = IN_SQ_UCODE3,
-    },
-    [IN_SQ_UCODE1] = {
-        ['0' ... '9'] = IN_SQ_UCODE2,
-        ['a' ... 'f'] = IN_SQ_UCODE2,
-        ['A' ... 'F'] = IN_SQ_UCODE2,
-    },
-    [IN_SQ_UCODE0] = {
-        ['0' ... '9'] = IN_SQ_UCODE1,
-        ['a' ... 'f'] = IN_SQ_UCODE1,
-        ['A' ... 'F'] = IN_SQ_UCODE1,
-    },
-    [IN_SQ_STRING_ESCAPE] = {
-        ['b'] = IN_SQ_STRING,
-        ['f'] =  IN_SQ_STRING,
-        ['n'] =  IN_SQ_STRING,
-        ['r'] =  IN_SQ_STRING,
-        ['t'] =  IN_SQ_STRING,
-        ['/'] = IN_DQ_STRING,
-        ['\\'] = IN_DQ_STRING,
-        ['\''] = IN_SQ_STRING,
-        ['\"'] = IN_SQ_STRING,
-        ['u'] = IN_SQ_UCODE0,
-    },
-    [IN_SQ_STRING] = {
-        [1 ... 0xBF] = IN_SQ_STRING,
-        [0xC2 ... 0xF4] = IN_SQ_STRING,
-        ['\\'] = IN_SQ_STRING_ESCAPE,
-        ['\''] = JSON_STRING,
-    },
-
-    /* Zero */
-    [IN_ZERO] = {
-        TERMINAL(JSON_INTEGER),
-        ['0' ... '9'] = IN_ERROR,
-        ['.'] = IN_MANTISSA,
-    },
-
-    /* Float */
-    [IN_DIGITS] = {
-        TERMINAL(JSON_FLOAT),
-        ['0' ... '9'] = IN_DIGITS,
-    },
-
-    [IN_DIGIT] = {
-        ['0' ... '9'] = IN_DIGITS,
-    },
-
-    [IN_EXP_E] = {
-        ['-'] = IN_DIGIT,
-        ['+'] = IN_DIGIT,
-        ['0' ... '9'] = IN_DIGITS,
-    },
-
-    [IN_MANTISSA_DIGITS] = {
-        TERMINAL(JSON_FLOAT),
-        ['0' ... '9'] = IN_MANTISSA_DIGITS,
-        ['e'] = IN_EXP_E,
-        ['E'] = IN_EXP_E,
-    },
-
-    [IN_MANTISSA] = {
-        ['0' ... '9'] = IN_MANTISSA_DIGITS,
-    },
-
-    /* Number */
-    [IN_NONZERO_NUMBER] = {
-        TERMINAL(JSON_INTEGER),
-        ['0' ... '9'] = IN_NONZERO_NUMBER,
-        ['e'] = IN_EXP_E,
-        ['E'] = IN_EXP_E,
-        ['.'] = IN_MANTISSA,
-    },
-
-    [IN_NEG_NONZERO_NUMBER] = {
-        ['0'] = IN_ZERO,
-        ['1' ... '9'] = IN_NONZERO_NUMBER,
-    },
-
-    /* keywords */
-    [IN_KEYWORD] = {
-        TERMINAL(JSON_KEYWORD),
-        ['a' ... 'z'] = IN_KEYWORD,
-    },
-
-    /* whitespace */
-    [IN_WHITESPACE] = {
-        TERMINAL(JSON_SKIP),
-        [' '] = IN_WHITESPACE,
-        ['\t'] = IN_WHITESPACE,
-        ['\r'] = IN_WHITESPACE,
-        ['\n'] = IN_WHITESPACE,
-    },        
-
-    /* escape */
-    [IN_ESCAPE_LL] = {
-        ['d'] = JSON_ESCAPE,
-    },
-
-    [IN_ESCAPE_L] = {
-        ['d'] = JSON_ESCAPE,
-        ['l'] = IN_ESCAPE_LL,
-    },
-
-    [IN_ESCAPE_I64] = {
-        ['d'] = JSON_ESCAPE,
-    },
-
-    [IN_ESCAPE_I6] = {
-        ['4'] = IN_ESCAPE_I64,
-    },
-
-    [IN_ESCAPE_I] = {
-        ['6'] = IN_ESCAPE_I6,
-    },
-
-    [IN_ESCAPE] = {
-        ['d'] = JSON_ESCAPE,
-        ['i'] = JSON_ESCAPE,
-        ['p'] = JSON_ESCAPE,
-        ['s'] = JSON_ESCAPE,
-        ['f'] = JSON_ESCAPE,
-        ['l'] = IN_ESCAPE_L,
-        ['I'] = IN_ESCAPE_I,
-    },
-
-    /* top level rule */
-    [IN_START] = {
-        ['"'] = IN_DQ_STRING,
-        ['\''] = IN_SQ_STRING,
-        ['0'] = IN_ZERO,
-        ['1' ... '9'] = IN_NONZERO_NUMBER,
-        ['-'] = IN_NEG_NONZERO_NUMBER,
-        ['{'] = JSON_OPERATOR,
-        ['}'] = JSON_OPERATOR,
-        ['['] = JSON_OPERATOR,
-        [']'] = JSON_OPERATOR,
-        [','] = JSON_OPERATOR,
-        [':'] = JSON_OPERATOR,
-        ['a' ... 'z'] = IN_KEYWORD,
-        ['%'] = IN_ESCAPE,
-        [' '] = IN_WHITESPACE,
-        ['\t'] = IN_WHITESPACE,
-        ['\r'] = IN_WHITESPACE,
-        ['\n'] = IN_WHITESPACE,
-    },
-};
-
-void json_lexer_init(JSONLexer *lexer, JSONLexerEmitter func)
-{
-    lexer->emit = func;
-    lexer->state = IN_START;
-    lexer->token = qstring_new();
-    lexer->x = lexer->y = 0;
-}
-
-static int json_lexer_feed_char(JSONLexer *lexer, char ch, bool flush)
-{
-    int char_consumed, new_state;
-
-    lexer->x++;
-    if (ch == '\n') {
-        lexer->x = 0;
-        lexer->y++;
-    }
-
-    do {
-        new_state = json_lexer[lexer->state][(uint8_t)ch];
-        char_consumed = !TERMINAL_NEEDED_LOOKAHEAD(lexer->state, new_state);
-        if (char_consumed) {
-            qstring_append_chr(lexer->token, ch);
-        }
-
-        switch (new_state) {
-        case JSON_OPERATOR:
-        case JSON_ESCAPE:
-        case JSON_INTEGER:
-        case JSON_FLOAT:
-        case JSON_KEYWORD:
-        case JSON_STRING:
-            lexer->emit(lexer, lexer->token, new_state, lexer->x, lexer->y);
-            /* fall through */
-        case JSON_SKIP:
-            QDECREF(lexer->token);
-            lexer->token = qstring_new();
-            new_state = IN_START;
-            break;
-        case IN_ERROR:
-            /* XXX: To avoid having previous bad input leaving the parser in an
-             * unresponsive state where we consume unpredictable amounts of
-             * subsequent "good" input, percolate this error state up to the
-             * tokenizer/parser by forcing a NULL object to be emitted, then
-             * reset state.
-             *
-             * Also note that this handling is required for reliable channel
-             * negotiation between QMP and the guest agent, since chr(0xFF)
-             * is placed at the beginning of certain events to ensure proper
-             * delivery when the channel is in an unknown state. chr(0xFF) is
-             * never a valid ASCII/UTF-8 sequence, so this should reliably
-             * induce an error/flush state.
-             */
-            lexer->emit(lexer, lexer->token, JSON_ERROR, lexer->x, lexer->y);
-            QDECREF(lexer->token);
-            lexer->token = qstring_new();
-            new_state = IN_START;
-            lexer->state = new_state;
-            return 0;
-        default:
-            break;
-        }
-        lexer->state = new_state;
-    } while (!char_consumed && !flush);
-
-    /* Do not let a single token grow to an arbitrarily large size,
-     * this is a security consideration.
-     */
-    if (lexer->token->length > MAX_TOKEN_SIZE) {
-        lexer->emit(lexer, lexer->token, lexer->state, lexer->x, lexer->y);
-        QDECREF(lexer->token);
-        lexer->token = qstring_new();
-        lexer->state = IN_START;
-    }
-
-    return 0;
-}
-
-int json_lexer_feed(JSONLexer *lexer, const char *buffer, size_t size)
-{
-    size_t i;
-
-    for (i = 0; i < size; i++) {
-        int err;
-
-        err = json_lexer_feed_char(lexer, buffer[i], false);
-        if (err < 0) {
-            return err;
-        }
-    }
-
-    return 0;
-}
-
-int json_lexer_flush(JSONLexer *lexer)
-{
-    return lexer->state == IN_START ? 0 : json_lexer_feed_char(lexer, 0, true);
-}
-
-void json_lexer_destroy(JSONLexer *lexer)
-{
-    QDECREF(lexer->token);
-}
diff --git a/contrib/qemu/qobject/json-parser.c b/contrib/qemu/qobject/json-parser.c
deleted file mode 100644
index e7947b340..000000000
--- a/contrib/qemu/qobject/json-parser.c
+++ /dev/null
@@ -1,724 +0,0 @@
-/*
- * JSON Parser 
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include <stdarg.h>
-
-#include "qemu-common.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qint.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qfloat.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/json-parser.h"
-#include "qapi/qmp/json-lexer.h"
-#include "qapi/qmp/qerror.h"
-
-typedef struct JSONParserContext
-{
-    Error *err;
-    struct {
-        QObject **buf;
-        size_t pos;
-        size_t count;
-    } tokens;
-} JSONParserContext;
-
-#define BUG_ON(cond) assert(!(cond))
-
-/**
- * TODO
- *
- * 0) make errors meaningful again
- * 1) add geometry information to tokens
- * 3) should we return a parsed size?
- * 4) deal with premature EOI
- */
-
-static QObject *parse_value(JSONParserContext *ctxt, va_list *ap);
-
-/**
- * Token manipulators
- *
- * tokens are dictionaries that contain a type, a string value, and geometry information
- * about a token identified by the lexer.  These are routines that make working with
- * these objects a bit easier.
- */
-static const char *token_get_value(QObject *obj)
-{
-    return qdict_get_str(qobject_to_qdict(obj), "token");
-}
-
-static JSONTokenType token_get_type(QObject *obj)
-{
-    return qdict_get_int(qobject_to_qdict(obj), "type");
-}
-
-static int token_is_operator(QObject *obj, char op)
-{
-    const char *val;
-
-    if (token_get_type(obj) != JSON_OPERATOR) {
-        return 0;
-    }
-
-    val = token_get_value(obj);
-
-    return (val[0] == op) && (val[1] == 0);
-}
-
-static int token_is_keyword(QObject *obj, const char *value)
-{
-    if (token_get_type(obj) != JSON_KEYWORD) {
-        return 0;
-    }
-
-    return strcmp(token_get_value(obj), value) == 0;
-}
-
-static int token_is_escape(QObject *obj, const char *value)
-{
-    if (token_get_type(obj) != JSON_ESCAPE) {
-        return 0;
-    }
-
-    return (strcmp(token_get_value(obj), value) == 0);
-}
-
-/**
- * Error handler
- */
-static void GCC_FMT_ATTR(3, 4) parse_error(JSONParserContext *ctxt,
-                                           QObject *token, const char *msg, ...)
-{
-    va_list ap;
-    char message[1024];
-    va_start(ap, msg);
-    vsnprintf(message, sizeof(message), msg, ap);
-    va_end(ap);
-    if (ctxt->err) {
-        error_free(ctxt->err);
-        ctxt->err = NULL;
-    }
-    error_set(&ctxt->err, QERR_JSON_PARSE_ERROR, message);
-}
-
-/**
- * String helpers
- *
- * These helpers are used to unescape strings.
- */
-static void wchar_to_utf8(uint16_t wchar, char *buffer, size_t buffer_length)
-{
-    if (wchar <= 0x007F) {
-        BUG_ON(buffer_length < 2);
-
-        buffer[0] = wchar & 0x7F;
-        buffer[1] = 0;
-    } else if (wchar <= 0x07FF) {
-        BUG_ON(buffer_length < 3);
-
-        buffer[0] = 0xC0 | ((wchar >> 6) & 0x1F);
-        buffer[1] = 0x80 | (wchar & 0x3F);
-        buffer[2] = 0;
-    } else {
-        BUG_ON(buffer_length < 4);
-
-        buffer[0] = 0xE0 | ((wchar >> 12) & 0x0F);
-        buffer[1] = 0x80 | ((wchar >> 6) & 0x3F);
-        buffer[2] = 0x80 | (wchar & 0x3F);
-        buffer[3] = 0;
-    }
-}
-
-static int hex2decimal(char ch)
-{
-    if (ch >= '0' && ch <= '9') {
-        return (ch - '0');
-    } else if (ch >= 'a' && ch <= 'f') {
-        return 10 + (ch - 'a');
-    } else if (ch >= 'A' && ch <= 'F') {
-        return 10 + (ch - 'A');
-    }
-
-    return -1;
-}
-
-/**
- * parse_string(): Parse a json string and return a QObject
- *
- *  string
- *      ""
- *      " chars "
- *  chars
- *      char
- *      char chars
- *  char
- *      any-Unicode-character-
- *          except-"-or-\-or-
- *          control-character
- *      \"
- *      \\
- *      \/
- *      \b
- *      \f
- *      \n
- *      \r
- *      \t
- *      \u four-hex-digits 
- */
-static QString *qstring_from_escaped_str(JSONParserContext *ctxt, QObject *token)
-{
-    const char *ptr = token_get_value(token);
-    QString *str;
-    int double_quote = 1;
-
-    if (*ptr == '"') {
-        double_quote = 1;
-    } else {
-        double_quote = 0;
-    }
-    ptr++;
-
-    str = qstring_new();
-    while (*ptr && 
-           ((double_quote && *ptr != '"') || (!double_quote && *ptr != '\''))) {
-        if (*ptr == '\\') {
-            ptr++;
-
-            switch (*ptr) {
-            case '"':
-                qstring_append(str, "\"");
-                ptr++;
-                break;
-            case '\'':
-                qstring_append(str, "'");
-                ptr++;
-                break;
-            case '\\':
-                qstring_append(str, "\\");
-                ptr++;
-                break;
-            case '/':
-                qstring_append(str, "/");
-                ptr++;
-                break;
-            case 'b':
-                qstring_append(str, "\b");
-                ptr++;
-                break;
-            case 'f':
-                qstring_append(str, "\f");
-                ptr++;
-                break;
-            case 'n':
-                qstring_append(str, "\n");
-                ptr++;
-                break;
-            case 'r':
-                qstring_append(str, "\r");
-                ptr++;
-                break;
-            case 't':
-                qstring_append(str, "\t");
-                ptr++;
-                break;
-            case 'u': {
-                uint16_t unicode_char = 0;
-                char utf8_char[4];
-                int i = 0;
-
-                ptr++;
-
-                for (i = 0; i < 4; i++) {
-                    if (qemu_isxdigit(*ptr)) {
-                        unicode_char |= hex2decimal(*ptr) << ((3 - i) * 4);
-                    } else {
-                        parse_error(ctxt, token,
-                                    "invalid hex escape sequence in string");
-                        goto out;
-                    }
-                    ptr++;
-                }
-
-                wchar_to_utf8(unicode_char, utf8_char, sizeof(utf8_char));
-                qstring_append(str, utf8_char);
-            }   break;
-            default:
-                parse_error(ctxt, token, "invalid escape sequence in string");
-                goto out;
-            }
-        } else {
-            char dummy[2];
-
-            dummy[0] = *ptr++;
-            dummy[1] = 0;
-
-            qstring_append(str, dummy);
-        }
-    }
-
-    return str;
-
-out:
-    QDECREF(str);
-    return NULL;
-}
-
-static QObject *parser_context_pop_token(JSONParserContext *ctxt)
-{
-    QObject *token;
-    g_assert(ctxt->tokens.pos < ctxt->tokens.count);
-    token = ctxt->tokens.buf[ctxt->tokens.pos];
-    ctxt->tokens.pos++;
-    return token;
-}
-
-/* Note: parser_context_{peek|pop}_token do not increment the
- * token object's refcount. In both cases the references will continue
- * to be tracked and cleaned up in parser_context_free(), so do not
- * attempt to free the token object.
- */
-static QObject *parser_context_peek_token(JSONParserContext *ctxt)
-{
-    QObject *token;
-    g_assert(ctxt->tokens.pos < ctxt->tokens.count);
-    token = ctxt->tokens.buf[ctxt->tokens.pos];
-    return token;
-}
-
-static JSONParserContext parser_context_save(JSONParserContext *ctxt)
-{
-    JSONParserContext saved_ctxt = {0};
-    saved_ctxt.tokens.pos = ctxt->tokens.pos;
-    saved_ctxt.tokens.count = ctxt->tokens.count;
-    saved_ctxt.tokens.buf = ctxt->tokens.buf;
-    return saved_ctxt;
-}
-
-static void parser_context_restore(JSONParserContext *ctxt,
-                                   JSONParserContext saved_ctxt)
-{
-    ctxt->tokens.pos = saved_ctxt.tokens.pos;
-    ctxt->tokens.count = saved_ctxt.tokens.count;
-    ctxt->tokens.buf = saved_ctxt.tokens.buf;
-}
-
-static void tokens_append_from_iter(QObject *obj, void *opaque)
-{
-    JSONParserContext *ctxt = opaque;
-    g_assert(ctxt->tokens.pos < ctxt->tokens.count);
-    ctxt->tokens.buf[ctxt->tokens.pos++] = obj;
-    qobject_incref(obj);
-}
-
-static JSONParserContext *parser_context_new(QList *tokens)
-{
-    JSONParserContext *ctxt;
-    size_t count;
-
-    if (!tokens) {
-        return NULL;
-    }
-
-    count = qlist_size(tokens);
-    if (count == 0) {
-        return NULL;
-    }
-
-    ctxt = g_malloc0(sizeof(JSONParserContext));
-    ctxt->tokens.pos = 0;
-    ctxt->tokens.count = count;
-    ctxt->tokens.buf = g_malloc(count * sizeof(QObject *));
-    qlist_iter(tokens, tokens_append_from_iter, ctxt);
-    ctxt->tokens.pos = 0;
-
-    return ctxt;
-}
-
-/* to support error propagation, ctxt->err must be freed separately */
-static void parser_context_free(JSONParserContext *ctxt)
-{
-    int i;
-    if (ctxt) {
-        for (i = 0; i < ctxt->tokens.count; i++) {
-            qobject_decref(ctxt->tokens.buf[i]);
-        }
-        g_free(ctxt->tokens.buf);
-        g_free(ctxt);
-    }
-}
-
-/**
- * Parsing rules
- */
-static int parse_pair(JSONParserContext *ctxt, QDict *dict, va_list *ap)
-{
-    QObject *key = NULL, *token = NULL, *value, *peek;
-    JSONParserContext saved_ctxt = parser_context_save(ctxt);
-
-    peek = parser_context_peek_token(ctxt);
-    if (peek == NULL) {
-        parse_error(ctxt, NULL, "premature EOI");
-        goto out;
-    }
-
-    key = parse_value(ctxt, ap);
-    if (!key || qobject_type(key) != QTYPE_QSTRING) {
-        parse_error(ctxt, peek, "key is not a string in object");
-        goto out;
-    }
-
-    token = parser_context_pop_token(ctxt);
-    if (token == NULL) {
-        parse_error(ctxt, NULL, "premature EOI");
-        goto out;
-    }
-
-    if (!token_is_operator(token, ':')) {
-        parse_error(ctxt, token, "missing : in object pair");
-        goto out;
-    }
-
-    value = parse_value(ctxt, ap);
-    if (value == NULL) {
-        parse_error(ctxt, token, "Missing value in dict");
-        goto out;
-    }
-
-    qdict_put_obj(dict, qstring_get_str(qobject_to_qstring(key)), value);
-
-    qobject_decref(key);
-
-    return 0;
-
-out:
-    parser_context_restore(ctxt, saved_ctxt);
-    qobject_decref(key);
-
-    return -1;
-}
-
-static QObject *parse_object(JSONParserContext *ctxt, va_list *ap)
-{
-    QDict *dict = NULL;
-    QObject *token, *peek;
-    JSONParserContext saved_ctxt = parser_context_save(ctxt);
-
-    token = parser_context_pop_token(ctxt);
-    if (token == NULL) {
-        goto out;
-    }
-
-    if (!token_is_operator(token, '{')) {
-        goto out;
-    }
-    token = NULL;
-
-    dict = qdict_new();
-
-    peek = parser_context_peek_token(ctxt);
-    if (peek == NULL) {
-        parse_error(ctxt, NULL, "premature EOI");
-        goto out;
-    }
-
-    if (!token_is_operator(peek, '}')) {
-        if (parse_pair(ctxt, dict, ap) == -1) {
-            goto out;
-        }
-
-        token = parser_context_pop_token(ctxt);
-        if (token == NULL) {
-            parse_error(ctxt, NULL, "premature EOI");
-            goto out;
-        }
-
-        while (!token_is_operator(token, '}')) {
-            if (!token_is_operator(token, ',')) {
-                parse_error(ctxt, token, "expected separator in dict");
-                goto out;
-            }
-            token = NULL;
-
-            if (parse_pair(ctxt, dict, ap) == -1) {
-                goto out;
-            }
-
-            token = parser_context_pop_token(ctxt);
-            if (token == NULL) {
-                parse_error(ctxt, NULL, "premature EOI");
-                goto out;
-            }
-        }
-        token = NULL;
-    } else {
-        token = parser_context_pop_token(ctxt);
-        token = NULL;
-    }
-
-    return QOBJECT(dict);
-
-out:
-    parser_context_restore(ctxt, saved_ctxt);
-    QDECREF(dict);
-    return NULL;
-}
-
-static QObject *parse_array(JSONParserContext *ctxt, va_list *ap)
-{
-    QList *list = NULL;
-    QObject *token, *peek;
-    JSONParserContext saved_ctxt = parser_context_save(ctxt);
-
-    token = parser_context_pop_token(ctxt);
-    if (token == NULL) {
-        goto out;
-    }
-
-    if (!token_is_operator(token, '[')) {
-        token = NULL;
-        goto out;
-    }
-    token = NULL;
-
-    list = qlist_new();
-
-    peek = parser_context_peek_token(ctxt);
-    if (peek == NULL) {
-        parse_error(ctxt, NULL, "premature EOI");
-        goto out;
-    }
-
-    if (!token_is_operator(peek, ']')) {
-        QObject *obj;
-
-        obj = parse_value(ctxt, ap);
-        if (obj == NULL) {
-            parse_error(ctxt, token, "expecting value");
-            goto out;
-        }
-
-        qlist_append_obj(list, obj);
-
-        token = parser_context_pop_token(ctxt);
-        if (token == NULL) {
-            parse_error(ctxt, NULL, "premature EOI");
-            goto out;
-        }
-
-        while (!token_is_operator(token, ']')) {
-            if (!token_is_operator(token, ',')) {
-                parse_error(ctxt, token, "expected separator in list");
-                goto out;
-            }
-
-            token = NULL;
-
-            obj = parse_value(ctxt, ap);
-            if (obj == NULL) {
-                parse_error(ctxt, token, "expecting value");
-                goto out;
-            }
-
-            qlist_append_obj(list, obj);
-
-            token = parser_context_pop_token(ctxt);
-            if (token == NULL) {
-                parse_error(ctxt, NULL, "premature EOI");
-                goto out;
-            }
-        }
-
-        token = NULL;
-    } else {
-        token = parser_context_pop_token(ctxt);
-        token = NULL;
-    }
-
-    return QOBJECT(list);
-
-out:
-    parser_context_restore(ctxt, saved_ctxt);
-    QDECREF(list);
-    return NULL;
-}
-
-static QObject *parse_keyword(JSONParserContext *ctxt)
-{
-    QObject *token, *ret;
-    JSONParserContext saved_ctxt = parser_context_save(ctxt);
-
-    token = parser_context_pop_token(ctxt);
-    if (token == NULL) {
-        goto out;
-    }
-
-    if (token_get_type(token) != JSON_KEYWORD) {
-        goto out;
-    }
-
-    if (token_is_keyword(token, "true")) {
-        ret = QOBJECT(qbool_from_int(true));
-    } else if (token_is_keyword(token, "false")) {
-        ret = QOBJECT(qbool_from_int(false));
-    } else {
-        parse_error(ctxt, token, "invalid keyword `%s'", token_get_value(token));
-        goto out;
-    }
-
-    return ret;
-
-out: 
-    parser_context_restore(ctxt, saved_ctxt);
-
-    return NULL;
-}
-
-static QObject *parse_escape(JSONParserContext *ctxt, va_list *ap)
-{
-    QObject *token = NULL, *obj;
-    JSONParserContext saved_ctxt = parser_context_save(ctxt);
-
-    if (ap == NULL) {
-        goto out;
-    }
-
-    token = parser_context_pop_token(ctxt);
-    if (token == NULL) {
-        goto out;
-    }
-
-    if (token_is_escape(token, "%p")) {
-        obj = va_arg(*ap, QObject *);
-    } else if (token_is_escape(token, "%i")) {
-        obj = QOBJECT(qbool_from_int(va_arg(*ap, int)));
-    } else if (token_is_escape(token, "%d")) {
-        obj = QOBJECT(qint_from_int(va_arg(*ap, int)));
-    } else if (token_is_escape(token, "%ld")) {
-        obj = QOBJECT(qint_from_int(va_arg(*ap, long)));
-    } else if (token_is_escape(token, "%lld") ||
-               token_is_escape(token, "%I64d")) {
-        obj = QOBJECT(qint_from_int(va_arg(*ap, long long)));
-    } else if (token_is_escape(token, "%s")) {
-        obj = QOBJECT(qstring_from_str(va_arg(*ap, const char *)));
-    } else if (token_is_escape(token, "%f")) {
-        obj = QOBJECT(qfloat_from_double(va_arg(*ap, double)));
-    } else {
-        goto out;
-    }
-
-    return obj;
-
-out:
-    parser_context_restore(ctxt, saved_ctxt);
-
-    return NULL;
-}
-
-static QObject *parse_literal(JSONParserContext *ctxt)
-{
-    QObject *token, *obj;
-    JSONParserContext saved_ctxt = parser_context_save(ctxt);
-
-    token = parser_context_pop_token(ctxt);
-    if (token == NULL) {
-        goto out;
-    }
-
-    switch (token_get_type(token)) {
-    case JSON_STRING:
-        obj = QOBJECT(qstring_from_escaped_str(ctxt, token));
-        break;
-    case JSON_INTEGER: {
-        /* A possibility exists that this is a whole-valued float where the
-         * fractional part was left out due to being 0 (.0). It's not a big
-         * deal to treat these as ints in the parser, so long as users of the
-         * resulting QObject know to expect a QInt in place of a QFloat in
-         * cases like these.
-         *
-         * However, in some cases these values will overflow/underflow a
-         * QInt/int64 container, thus we should assume these are to be handled
-         * as QFloats/doubles rather than silently changing their values.
-         *
-         * strtoll() indicates these instances by setting errno to ERANGE
-         */
-        int64_t value;
-
-        errno = 0; /* strtoll doesn't set errno on success */
-        value = strtoll(token_get_value(token), NULL, 10);
-        if (errno != ERANGE) {
-            obj = QOBJECT(qint_from_int(value));
-            break;
-        }
-        /* fall through to JSON_FLOAT */
-    }
-    case JSON_FLOAT:
-        /* FIXME dependent on locale */
-        obj = QOBJECT(qfloat_from_double(strtod(token_get_value(token), NULL)));
-        break;
-    default:
-        goto out;
-    }
-
-    return obj;
-
-out:
-    parser_context_restore(ctxt, saved_ctxt);
-
-    return NULL;
-}
-
-static QObject *parse_value(JSONParserContext *ctxt, va_list *ap)
-{
-    QObject *obj;
-
-    obj = parse_object(ctxt, ap);
-    if (obj == NULL) {
-        obj = parse_array(ctxt, ap);
-    }
-    if (obj == NULL) {
-        obj = parse_escape(ctxt, ap);
-    }
-    if (obj == NULL) {
-        obj = parse_keyword(ctxt);
-    } 
-    if (obj == NULL) {
-        obj = parse_literal(ctxt);
-    }
-
-    return obj;
-}
-
-QObject *json_parser_parse(QList *tokens, va_list *ap)
-{
-    return json_parser_parse_err(tokens, ap, NULL);
-}
-
-QObject *json_parser_parse_err(QList *tokens, va_list *ap, Error **errp)
-{
-    JSONParserContext *ctxt = parser_context_new(tokens);
-    QObject *result;
-
-    if (!ctxt) {
-        return NULL;
-    }
-
-    result = parse_value(ctxt, ap);
-
-    error_propagate(errp, ctxt->err);
-
-    parser_context_free(ctxt);
-
-    return result;
-}
diff --git a/contrib/qemu/qobject/json-streamer.c b/contrib/qemu/qobject/json-streamer.c
deleted file mode 100644
index 1b2f9b1d1..000000000
--- a/contrib/qemu/qobject/json-streamer.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * JSON streaming support
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qint.h"
-#include "qapi/qmp/qdict.h"
-#include "qemu-common.h"
-#include "qapi/qmp/json-lexer.h"
-#include "qapi/qmp/json-streamer.h"
-
-#define MAX_TOKEN_SIZE (64ULL << 20)
-#define MAX_NESTING (1ULL << 10)
-
-static void json_message_process_token(JSONLexer *lexer, QString *token, JSONTokenType type, int x, int y)
-{
-    JSONMessageParser *parser = container_of(lexer, JSONMessageParser, lexer);
-    QDict *dict;
-
-    if (type == JSON_OPERATOR) {
-        switch (qstring_get_str(token)[0]) {
-        case '{':
-            parser->brace_count++;
-            break;
-        case '}':
-            parser->brace_count--;
-            break;
-        case '[':
-            parser->bracket_count++;
-            break;
-        case ']':
-            parser->bracket_count--;
-            break;
-        default:
-            break;
-        }
-    }
-
-    dict = qdict_new();
-    qdict_put(dict, "type", qint_from_int(type));
-    QINCREF(token);
-    qdict_put(dict, "token", token);
-    qdict_put(dict, "x", qint_from_int(x));
-    qdict_put(dict, "y", qint_from_int(y));
-
-    parser->token_size += token->length;
-
-    qlist_append(parser->tokens, dict);
-
-    if (type == JSON_ERROR) {
-        goto out_emit_bad;
-    } else if (parser->brace_count < 0 ||
-        parser->bracket_count < 0 ||
-        (parser->brace_count == 0 &&
-         parser->bracket_count == 0)) {
-        goto out_emit;
-    } else if (parser->token_size > MAX_TOKEN_SIZE ||
-               parser->bracket_count > MAX_NESTING ||
-               parser->brace_count > MAX_NESTING) {
-        /* Security consideration, we limit total memory allocated per object
-         * and the maximum recursion depth that a message can force.
-         */
-        goto out_emit;
-    }
-
-    return;
-
-out_emit_bad:
-    /* clear out token list and tell the parser to emit and error
-     * indication by passing it a NULL list
-     */
-    QDECREF(parser->tokens);
-    parser->tokens = NULL;
-out_emit:
-    /* send current list of tokens to parser and reset tokenizer */
-    parser->brace_count = 0;
-    parser->bracket_count = 0;
-    parser->emit(parser, parser->tokens);
-    if (parser->tokens) {
-        QDECREF(parser->tokens);
-    }
-    parser->tokens = qlist_new();
-    parser->token_size = 0;
-}
-
-void json_message_parser_init(JSONMessageParser *parser,
-                              void (*func)(JSONMessageParser *, QList *))
-{
-    parser->emit = func;
-    parser->brace_count = 0;
-    parser->bracket_count = 0;
-    parser->tokens = qlist_new();
-    parser->token_size = 0;
-
-    json_lexer_init(&parser->lexer, json_message_process_token);
-}
-
-int json_message_parser_feed(JSONMessageParser *parser,
-                             const char *buffer, size_t size)
-{
-    return json_lexer_feed(&parser->lexer, buffer, size);
-}
-
-int json_message_parser_flush(JSONMessageParser *parser)
-{
-    return json_lexer_flush(&parser->lexer);
-}
-
-void json_message_parser_destroy(JSONMessageParser *parser)
-{
-    json_lexer_destroy(&parser->lexer);
-    QDECREF(parser->tokens);
-}
diff --git a/contrib/qemu/qobject/qbool.c b/contrib/qemu/qobject/qbool.c
deleted file mode 100644
index a3d2afa82..000000000
--- a/contrib/qemu/qobject/qbool.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * QBool Module
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qobject.h"
-#include "qemu-common.h"
-
-static void qbool_destroy_obj(QObject *obj);
-
-static const QType qbool_type = {
-    .code = QTYPE_QBOOL,
-    .destroy = qbool_destroy_obj,
-};
-
-/**
- * qbool_from_int(): Create a new QBool from an int
- *
- * Return strong reference.
- */
-QBool *qbool_from_int(int value)
-{
-    QBool *qb;
-
-    qb = g_malloc(sizeof(*qb));
-    qb->value = value;
-    QOBJECT_INIT(qb, &qbool_type);
-
-    return qb;
-}
-
-/**
- * qbool_get_int(): Get the stored int
- */
-int qbool_get_int(const QBool *qb)
-{
-    return qb->value;
-}
-
-/**
- * qobject_to_qbool(): Convert a QObject into a QBool
- */
-QBool *qobject_to_qbool(const QObject *obj)
-{
-    if (qobject_type(obj) != QTYPE_QBOOL)
-        return NULL;
-
-    return container_of(obj, QBool, base);
-}
-
-/**
- * qbool_destroy_obj(): Free all memory allocated by a
- * QBool object
- */
-static void qbool_destroy_obj(QObject *obj)
-{
-    assert(obj != NULL);
-    g_free(qobject_to_qbool(obj));
-}
diff --git a/contrib/qemu/qobject/qdict.c b/contrib/qemu/qobject/qdict.c
deleted file mode 100644
index ed381f9a5..000000000
--- a/contrib/qemu/qobject/qdict.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * QDict Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#include "qapi/qmp/qint.h"
-#include "qapi/qmp/qfloat.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qobject.h"
-#include "qemu/queue.h"
-#include "qemu-common.h"
-
-static void qdict_destroy_obj(QObject *obj);
-
-static const QType qdict_type = {
-    .code = QTYPE_QDICT,
-    .destroy = qdict_destroy_obj,
-};
-
-/**
- * qdict_new(): Create a new QDict
- *
- * Return strong reference.
- */
-QDict *qdict_new(void)
-{
-    QDict *qdict;
-
-    qdict = g_malloc0(sizeof(*qdict));
-    QOBJECT_INIT(qdict, &qdict_type);
-
-    return qdict;
-}
-
-/**
- * qobject_to_qdict(): Convert a QObject into a QDict
- */
-QDict *qobject_to_qdict(const QObject *obj)
-{
-    if (qobject_type(obj) != QTYPE_QDICT)
-        return NULL;
-
-    return container_of(obj, QDict, base);
-}
-
-/**
- * tdb_hash(): based on the hash agorithm from gdbm, via tdb
- * (from module-init-tools)
- */
-static unsigned int tdb_hash(const char *name)
-{
-    unsigned value;	/* Used to compute the hash value.  */
-    unsigned   i;	/* Used to cycle through random values. */
-
-    /* Set the initial value from the key size. */
-    for (value = 0x238F13AF * strlen(name), i=0; name[i]; i++)
-        value = (value + (((const unsigned char *)name)[i] << (i*5 % 24)));
-
-    return (1103515243 * value + 12345);
-}
-
-/**
- * alloc_entry(): allocate a new QDictEntry
- */
-static QDictEntry *alloc_entry(const char *key, QObject *value)
-{
-    QDictEntry *entry;
-
-    entry = g_malloc0(sizeof(*entry));
-    entry->key = g_strdup(key);
-    entry->value = value;
-
-    return entry;
-}
-
-/**
- * qdict_entry_value(): Return qdict entry value
- *
- * Return weak reference.
- */
-QObject *qdict_entry_value(const QDictEntry *entry)
-{
-    return entry->value;
-}
-
-/**
- * qdict_entry_key(): Return qdict entry key
- *
- * Return a *pointer* to the string, it has to be duplicated before being
- * stored.
- */
-const char *qdict_entry_key(const QDictEntry *entry)
-{
-    return entry->key;
-}
-
-/**
- * qdict_find(): List lookup function
- */
-static QDictEntry *qdict_find(const QDict *qdict,
-                              const char *key, unsigned int bucket)
-{
-    QDictEntry *entry;
-
-    QLIST_FOREACH(entry, &qdict->table[bucket], next)
-        if (!strcmp(entry->key, key))
-            return entry;
-
-    return NULL;
-}
-
-/**
- * qdict_put_obj(): Put a new QObject into the dictionary
- *
- * Insert the pair 'key:value' into 'qdict', if 'key' already exists
- * its 'value' will be replaced.
- *
- * This is done by freeing the reference to the stored QObject and
- * storing the new one in the same entry.
- *
- * NOTE: ownership of 'value' is transferred to the QDict
- */
-void qdict_put_obj(QDict *qdict, const char *key, QObject *value)
-{
-    unsigned int bucket;
-    QDictEntry *entry;
-
-    bucket = tdb_hash(key) % QDICT_BUCKET_MAX;
-    entry = qdict_find(qdict, key, bucket);
-    if (entry) {
-        /* replace key's value */
-        qobject_decref(entry->value);
-        entry->value = value;
-    } else {
-        /* allocate a new entry */
-        entry = alloc_entry(key, value);
-        QLIST_INSERT_HEAD(&qdict->table[bucket], entry, next);
-        qdict->size++;
-    }
-}
-
-/**
- * qdict_get(): Lookup for a given 'key'
- *
- * Return a weak reference to the QObject associated with 'key' if
- * 'key' is present in the dictionary, NULL otherwise.
- */
-QObject *qdict_get(const QDict *qdict, const char *key)
-{
-    QDictEntry *entry;
-
-    entry = qdict_find(qdict, key, tdb_hash(key) % QDICT_BUCKET_MAX);
-    return (entry == NULL ? NULL : entry->value);
-}
-
-/**
- * qdict_haskey(): Check if 'key' exists
- *
- * Return 1 if 'key' exists in the dict, 0 otherwise
- */
-int qdict_haskey(const QDict *qdict, const char *key)
-{
-    unsigned int bucket = tdb_hash(key) % QDICT_BUCKET_MAX;
-    return (qdict_find(qdict, key, bucket) == NULL ? 0 : 1);
-}
-
-/**
- * qdict_size(): Return the size of the dictionary
- */
-size_t qdict_size(const QDict *qdict)
-{
-    return qdict->size;
-}
-
-/**
- * qdict_get_obj(): Get a QObject of a specific type
- */
-static QObject *qdict_get_obj(const QDict *qdict, const char *key,
-                              qtype_code type)
-{
-    QObject *obj;
-
-    obj = qdict_get(qdict, key);
-    assert(obj != NULL);
-    assert(qobject_type(obj) == type);
-
-    return obj;
-}
-
-/**
- * qdict_get_double(): Get an number mapped by 'key'
- *
- * This function assumes that 'key' exists and it stores a
- * QFloat or QInt object.
- *
- * Return number mapped by 'key'.
- */
-double qdict_get_double(const QDict *qdict, const char *key)
-{
-    QObject *obj = qdict_get(qdict, key);
-
-    assert(obj);
-    switch (qobject_type(obj)) {
-    case QTYPE_QFLOAT:
-        return qfloat_get_double(qobject_to_qfloat(obj));
-    case QTYPE_QINT:
-        return qint_get_int(qobject_to_qint(obj));
-    default:
-        abort();
-    }
-}
-
-/**
- * qdict_get_int(): Get an integer mapped by 'key'
- *
- * This function assumes that 'key' exists and it stores a
- * QInt object.
- *
- * Return integer mapped by 'key'.
- */
-int64_t qdict_get_int(const QDict *qdict, const char *key)
-{
-    QObject *obj = qdict_get_obj(qdict, key, QTYPE_QINT);
-    return qint_get_int(qobject_to_qint(obj));
-}
-
-/**
- * qdict_get_bool(): Get a bool mapped by 'key'
- *
- * This function assumes that 'key' exists and it stores a
- * QBool object.
- *
- * Return bool mapped by 'key'.
- */
-int qdict_get_bool(const QDict *qdict, const char *key)
-{
-    QObject *obj = qdict_get_obj(qdict, key, QTYPE_QBOOL);
-    return qbool_get_int(qobject_to_qbool(obj));
-}
-
-/**
- * qdict_get_qlist(): Get the QList mapped by 'key'
- *
- * This function assumes that 'key' exists and it stores a
- * QList object.
- *
- * Return QList mapped by 'key'.
- */
-QList *qdict_get_qlist(const QDict *qdict, const char *key)
-{
-    return qobject_to_qlist(qdict_get_obj(qdict, key, QTYPE_QLIST));
-}
-
-/**
- * qdict_get_qdict(): Get the QDict mapped by 'key'
- *
- * This function assumes that 'key' exists and it stores a
- * QDict object.
- *
- * Return QDict mapped by 'key'.
- */
-QDict *qdict_get_qdict(const QDict *qdict, const char *key)
-{
-    return qobject_to_qdict(qdict_get_obj(qdict, key, QTYPE_QDICT));
-}
-
-/**
- * qdict_get_str(): Get a pointer to the stored string mapped
- * by 'key'
- *
- * This function assumes that 'key' exists and it stores a
- * QString object.
- *
- * Return pointer to the string mapped by 'key'.
- */
-const char *qdict_get_str(const QDict *qdict, const char *key)
-{
-    QObject *obj = qdict_get_obj(qdict, key, QTYPE_QSTRING);
-    return qstring_get_str(qobject_to_qstring(obj));
-}
-
-/**
- * qdict_get_try_int(): Try to get integer mapped by 'key'
- *
- * Return integer mapped by 'key', if it is not present in
- * the dictionary or if the stored object is not of QInt type
- * 'def_value' will be returned.
- */
-int64_t qdict_get_try_int(const QDict *qdict, const char *key,
-                          int64_t def_value)
-{
-    QObject *obj;
-
-    obj = qdict_get(qdict, key);
-    if (!obj || qobject_type(obj) != QTYPE_QINT)
-        return def_value;
-
-    return qint_get_int(qobject_to_qint(obj));
-}
-
-/**
- * qdict_get_try_bool(): Try to get a bool mapped by 'key'
- *
- * Return bool mapped by 'key', if it is not present in the
- * dictionary or if the stored object is not of QBool type
- * 'def_value' will be returned.
- */
-int qdict_get_try_bool(const QDict *qdict, const char *key, int def_value)
-{
-    QObject *obj;
-
-    obj = qdict_get(qdict, key);
-    if (!obj || qobject_type(obj) != QTYPE_QBOOL)
-        return def_value;
-
-    return qbool_get_int(qobject_to_qbool(obj));
-}
-
-/**
- * qdict_get_try_str(): Try to get a pointer to the stored string
- * mapped by 'key'
- *
- * Return a pointer to the string mapped by 'key', if it is not present
- * in the dictionary or if the stored object is not of QString type
- * NULL will be returned.
- */
-const char *qdict_get_try_str(const QDict *qdict, const char *key)
-{
-    QObject *obj;
-
-    obj = qdict_get(qdict, key);
-    if (!obj || qobject_type(obj) != QTYPE_QSTRING)
-        return NULL;
-
-    return qstring_get_str(qobject_to_qstring(obj));
-}
-
-/**
- * qdict_iter(): Iterate over all the dictionary's stored values.
- *
- * This function allows the user to provide an iterator, which will be
- * called for each stored value in the dictionary.
- */
-void qdict_iter(const QDict *qdict,
-                void (*iter)(const char *key, QObject *obj, void *opaque),
-                void *opaque)
-{
-    int i;
-    QDictEntry *entry;
-
-    for (i = 0; i < QDICT_BUCKET_MAX; i++) {
-        QLIST_FOREACH(entry, &qdict->table[i], next)
-            iter(entry->key, entry->value, opaque);
-    }
-}
-
-static QDictEntry *qdict_next_entry(const QDict *qdict, int first_bucket)
-{
-    int i;
-
-    for (i = first_bucket; i < QDICT_BUCKET_MAX; i++) {
-        if (!QLIST_EMPTY(&qdict->table[i])) {
-            return QLIST_FIRST(&qdict->table[i]);
-        }
-    }
-
-    return NULL;
-}
-
-/**
- * qdict_first(): Return first qdict entry for iteration.
- */
-const QDictEntry *qdict_first(const QDict *qdict)
-{
-    return qdict_next_entry(qdict, 0);
-}
-
-/**
- * qdict_next(): Return next qdict entry in an iteration.
- */
-const QDictEntry *qdict_next(const QDict *qdict, const QDictEntry *entry)
-{
-    QDictEntry *ret;
-
-    ret = QLIST_NEXT(entry, next);
-    if (!ret) {
-        unsigned int bucket = tdb_hash(entry->key) % QDICT_BUCKET_MAX;
-        ret = qdict_next_entry(qdict, bucket + 1);
-    }
-
-    return ret;
-}
-
-/**
- * qdict_clone_shallow(): Clones a given QDict. Its entries are not copied, but
- * another reference is added.
- */
-QDict *qdict_clone_shallow(const QDict *src)
-{
-    QDict *dest;
-    QDictEntry *entry;
-    int i;
-
-    dest = qdict_new();
-
-    for (i = 0; i < QDICT_BUCKET_MAX; i++) {
-        QLIST_FOREACH(entry, &src->table[i], next) {
-            qobject_incref(entry->value);
-            qdict_put_obj(dest, entry->key, entry->value);
-        }
-    }
-
-    return dest;
-}
-
-/**
- * qentry_destroy(): Free all the memory allocated by a QDictEntry
- */
-static void qentry_destroy(QDictEntry *e)
-{
-    assert(e != NULL);
-    assert(e->key != NULL);
-    assert(e->value != NULL);
-
-    qobject_decref(e->value);
-    g_free(e->key);
-    g_free(e);
-}
-
-/**
- * qdict_del(): Delete a 'key:value' pair from the dictionary
- *
- * This will destroy all data allocated by this entry.
- */
-void qdict_del(QDict *qdict, const char *key)
-{
-    QDictEntry *entry;
-
-    entry = qdict_find(qdict, key, tdb_hash(key) % QDICT_BUCKET_MAX);
-    if (entry) {
-        QLIST_REMOVE(entry, next);
-        qentry_destroy(entry);
-        qdict->size--;
-    }
-}
-
-/**
- * qdict_destroy_obj(): Free all the memory allocated by a QDict
- */
-static void qdict_destroy_obj(QObject *obj)
-{
-    int i;
-    QDict *qdict;
-
-    assert(obj != NULL);
-    qdict = qobject_to_qdict(obj);
-
-    for (i = 0; i < QDICT_BUCKET_MAX; i++) {
-        QDictEntry *entry = QLIST_FIRST(&qdict->table[i]);
-        while (entry) {
-            QDictEntry *tmp = QLIST_NEXT(entry, next);
-            QLIST_REMOVE(entry, next);
-            qentry_destroy(entry);
-            entry = tmp;
-        }
-    }
-
-    g_free(qdict);
-}
diff --git a/contrib/qemu/qobject/qerror.c b/contrib/qemu/qobject/qerror.c
deleted file mode 100644
index 3aee1cf6a..000000000
--- a/contrib/qemu/qobject/qerror.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * QError Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#include "monitor/monitor.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qerror.h"
-#include "qemu-common.h"
-
-static void qerror_destroy_obj(QObject *obj);
-
-static const QType qerror_type = {
-    .code = QTYPE_QERROR,
-    .destroy = qerror_destroy_obj,
-};
-
-/**
- * qerror_new(): Create a new QError
- *
- * Return strong reference.
- */
-static QError *qerror_new(void)
-{
-    QError *qerr;
-
-    qerr = g_malloc0(sizeof(*qerr));
-    QOBJECT_INIT(qerr, &qerror_type);
-
-    return qerr;
-}
-
-/**
- * qerror_from_info(): Create a new QError from error information
- *
- * Return strong reference.
- */
-static QError *qerror_from_info(ErrorClass err_class, const char *fmt,
-                                va_list *va)
-{
-    QError *qerr;
-
-    qerr = qerror_new();
-    loc_save(&qerr->loc);
-
-    qerr->err_msg = g_strdup_vprintf(fmt, *va);
-    qerr->err_class = err_class;
-
-    return qerr;
-}
-
-/**
- * qerror_human(): Format QError data into human-readable string.
- */
-QString *qerror_human(const QError *qerror)
-{
-    return qstring_from_str(qerror->err_msg);
-}
-
-/**
- * qerror_print(): Print QError data
- *
- * This function will print the member 'desc' of the specified QError object,
- * it uses error_report() for this, so that the output is routed to the right
- * place (ie. stderr or Monitor's device).
- */
-static void qerror_print(QError *qerror)
-{
-    QString *qstring = qerror_human(qerror);
-    loc_push_restore(&qerror->loc);
-    error_report("%s", qstring_get_str(qstring));
-    loc_pop(&qerror->loc);
-    QDECREF(qstring);
-}
-
-void qerror_report(ErrorClass eclass, const char *fmt, ...)
-{
-    va_list va;
-    QError *qerror;
-
-    va_start(va, fmt);
-    qerror = qerror_from_info(eclass, fmt, &va);
-    va_end(va);
-
-    if (monitor_cur_is_qmp()) {
-        monitor_set_error(cur_mon, qerror);
-    } else {
-        qerror_print(qerror);
-        QDECREF(qerror);
-    }
-}
-
-/* Evil... */
-struct Error
-{
-    char *msg;
-    ErrorClass err_class;
-};
-
-void qerror_report_err(Error *err)
-{
-    QError *qerr;
-
-    qerr = qerror_new();
-    loc_save(&qerr->loc);
-    qerr->err_msg = g_strdup(err->msg);
-    qerr->err_class = err->err_class;
-
-    if (monitor_cur_is_qmp()) {
-        monitor_set_error(cur_mon, qerr);
-    } else {
-        qerror_print(qerr);
-        QDECREF(qerr);
-    }
-}
-
-void assert_no_error(Error *err)
-{
-    if (err) {
-        qerror_report_err(err);
-        abort();
-    }
-}
-
-/**
- * qobject_to_qerror(): Convert a QObject into a QError
- */
-static QError *qobject_to_qerror(const QObject *obj)
-{
-    if (qobject_type(obj) != QTYPE_QERROR) {
-        return NULL;
-    }
-
-    return container_of(obj, QError, base);
-}
-
-/**
- * qerror_destroy_obj(): Free all memory allocated by a QError
- */
-static void qerror_destroy_obj(QObject *obj)
-{
-    QError *qerr;
-
-    assert(obj != NULL);
-    qerr = qobject_to_qerror(obj);
-
-    g_free(qerr->err_msg);
-    g_free(qerr);
-}
diff --git a/contrib/qemu/qobject/qfloat.c b/contrib/qemu/qobject/qfloat.c
deleted file mode 100644
index 7de0992db..000000000
--- a/contrib/qemu/qobject/qfloat.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * QFloat Module
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qapi/qmp/qfloat.h"
-#include "qapi/qmp/qobject.h"
-#include "qemu-common.h"
-
-static void qfloat_destroy_obj(QObject *obj);
-
-static const QType qfloat_type = {
-    .code = QTYPE_QFLOAT,
-    .destroy = qfloat_destroy_obj,
-};
-
-/**
- * qfloat_from_int(): Create a new QFloat from a float
- *
- * Return strong reference.
- */
-QFloat *qfloat_from_double(double value)
-{
-    QFloat *qf;
-
-    qf = g_malloc(sizeof(*qf));
-    qf->value = value;
-    QOBJECT_INIT(qf, &qfloat_type);
-
-    return qf;
-}
-
-/**
- * qfloat_get_double(): Get the stored float
- */
-double qfloat_get_double(const QFloat *qf)
-{
-    return qf->value;
-}
-
-/**
- * qobject_to_qfloat(): Convert a QObject into a QFloat
- */
-QFloat *qobject_to_qfloat(const QObject *obj)
-{
-    if (qobject_type(obj) != QTYPE_QFLOAT)
-        return NULL;
-
-    return container_of(obj, QFloat, base);
-}
-
-/**
- * qfloat_destroy_obj(): Free all memory allocated by a
- * QFloat object
- */
-static void qfloat_destroy_obj(QObject *obj)
-{
-    assert(obj != NULL);
-    g_free(qobject_to_qfloat(obj));
-}
diff --git a/contrib/qemu/qobject/qint.c b/contrib/qemu/qobject/qint.c
deleted file mode 100644
index 86b9b04f0..000000000
--- a/contrib/qemu/qobject/qint.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * QInt Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#include "qapi/qmp/qint.h"
-#include "qapi/qmp/qobject.h"
-#include "qemu-common.h"
-
-static void qint_destroy_obj(QObject *obj);
-
-static const QType qint_type = {
-    .code = QTYPE_QINT,
-    .destroy = qint_destroy_obj,
-};
-
-/**
- * qint_from_int(): Create a new QInt from an int64_t
- *
- * Return strong reference.
- */
-QInt *qint_from_int(int64_t value)
-{
-    QInt *qi;
-
-    qi = g_malloc(sizeof(*qi));
-    qi->value = value;
-    QOBJECT_INIT(qi, &qint_type);
-
-    return qi;
-}
-
-/**
- * qint_get_int(): Get the stored integer
- */
-int64_t qint_get_int(const QInt *qi)
-{
-    return qi->value;
-}
-
-/**
- * qobject_to_qint(): Convert a QObject into a QInt
- */
-QInt *qobject_to_qint(const QObject *obj)
-{
-    if (qobject_type(obj) != QTYPE_QINT)
-        return NULL;
-
-    return container_of(obj, QInt, base);
-}
-
-/**
- * qint_destroy_obj(): Free all memory allocated by a
- * QInt object
- */
-static void qint_destroy_obj(QObject *obj)
-{
-    assert(obj != NULL);
-    g_free(qobject_to_qint(obj));
-}
diff --git a/contrib/qemu/qobject/qjson.c b/contrib/qemu/qobject/qjson.c
deleted file mode 100644
index 19085a1bb..000000000
--- a/contrib/qemu/qobject/qjson.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * QObject JSON integration
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#include "qapi/qmp/json-lexer.h"
-#include "qapi/qmp/json-parser.h"
-#include "qapi/qmp/json-streamer.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qint.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qfloat.h"
-#include "qapi/qmp/qdict.h"
-
-typedef struct JSONParsingState
-{
-    JSONMessageParser parser;
-    va_list *ap;
-    QObject *result;
-} JSONParsingState;
-
-static void parse_json(JSONMessageParser *parser, QList *tokens)
-{
-    JSONParsingState *s = container_of(parser, JSONParsingState, parser);
-    s->result = json_parser_parse(tokens, s->ap);
-}
-
-QObject *qobject_from_jsonv(const char *string, va_list *ap)
-{
-    JSONParsingState state = {};
-
-    state.ap = ap;
-
-    json_message_parser_init(&state.parser, parse_json);
-    json_message_parser_feed(&state.parser, string, strlen(string));
-    json_message_parser_flush(&state.parser);
-    json_message_parser_destroy(&state.parser);
-
-    return state.result;
-}
-
-QObject *qobject_from_json(const char *string)
-{
-    return qobject_from_jsonv(string, NULL);
-}
-
-/*
- * IMPORTANT: This function aborts on error, thus it must not
- * be used with untrusted arguments.
- */
-QObject *qobject_from_jsonf(const char *string, ...)
-{
-    QObject *obj;
-    va_list ap;
-
-    va_start(ap, string);
-    obj = qobject_from_jsonv(string, &ap);
-    va_end(ap);
-
-    assert(obj != NULL);
-    return obj;
-}
-
-typedef struct ToJsonIterState
-{
-    int indent;
-    int pretty;
-    int count;
-    QString *str;
-} ToJsonIterState;
-
-static void to_json(const QObject *obj, QString *str, int pretty, int indent);
-
-static void to_json_dict_iter(const char *key, QObject *obj, void *opaque)
-{
-    ToJsonIterState *s = opaque;
-    QString *qkey;
-    int j;
-
-    if (s->count)
-        qstring_append(s->str, ", ");
-
-    if (s->pretty) {
-        qstring_append(s->str, "\n");
-        for (j = 0 ; j < s->indent ; j++)
-            qstring_append(s->str, "    ");
-    }
-
-    qkey = qstring_from_str(key);
-    to_json(QOBJECT(qkey), s->str, s->pretty, s->indent);
-    QDECREF(qkey);
-
-    qstring_append(s->str, ": ");
-    to_json(obj, s->str, s->pretty, s->indent);
-    s->count++;
-}
-
-static void to_json_list_iter(QObject *obj, void *opaque)
-{
-    ToJsonIterState *s = opaque;
-    int j;
-
-    if (s->count)
-        qstring_append(s->str, ", ");
-
-    if (s->pretty) {
-        qstring_append(s->str, "\n");
-        for (j = 0 ; j < s->indent ; j++)
-            qstring_append(s->str, "    ");
-    }
-
-    to_json(obj, s->str, s->pretty, s->indent);
-    s->count++;
-}
-
-static void to_json(const QObject *obj, QString *str, int pretty, int indent)
-{
-    switch (qobject_type(obj)) {
-    case QTYPE_QINT: {
-        QInt *val = qobject_to_qint(obj);
-        char buffer[1024];
-
-        snprintf(buffer, sizeof(buffer), "%" PRId64, qint_get_int(val));
-        qstring_append(str, buffer);
-        break;
-    }
-    case QTYPE_QSTRING: {
-        QString *val = qobject_to_qstring(obj);
-        const char *ptr;
-        int cp;
-        char buf[16];
-        char *end;
-
-        ptr = qstring_get_str(val);
-        qstring_append(str, "\"");
-
-        for (; *ptr; ptr = end) {
-            cp = mod_utf8_codepoint(ptr, 6, &end);
-            switch (cp) {
-            case '\"':
-                qstring_append(str, "\\\"");
-                break;
-            case '\\':
-                qstring_append(str, "\\\\");
-                break;
-            case '\b':
-                qstring_append(str, "\\b");
-                break;
-            case '\f':
-                qstring_append(str, "\\f");
-                break;
-            case '\n':
-                qstring_append(str, "\\n");
-                break;
-            case '\r':
-                qstring_append(str, "\\r");
-                break;
-            case '\t':
-                qstring_append(str, "\\t");
-                break;
-            default:
-                if (cp < 0) {
-                    cp = 0xFFFD; /* replacement character */
-                }
-                if (cp > 0xFFFF) {
-                    /* beyond BMP; need a surrogate pair */
-                    snprintf(buf, sizeof(buf), "\\u%04X\\u%04X",
-                             0xD800 + ((cp - 0x10000) >> 10),
-                             0xDC00 + ((cp - 0x10000) & 0x3FF));
-                } else if (cp < 0x20 || cp >= 0x7F) {
-                    snprintf(buf, sizeof(buf), "\\u%04X", cp);
-                } else {
-                    buf[0] = cp;
-                    buf[1] = 0;
-                }
-                qstring_append(str, buf);
-            }
-        };
-
-        qstring_append(str, "\"");
-        break;
-    }
-    case QTYPE_QDICT: {
-        ToJsonIterState s;
-        QDict *val = qobject_to_qdict(obj);
-
-        s.count = 0;
-        s.str = str;
-        s.indent = indent + 1;
-        s.pretty = pretty;
-        qstring_append(str, "{");
-        qdict_iter(val, to_json_dict_iter, &s);
-        if (pretty) {
-            int j;
-            qstring_append(str, "\n");
-            for (j = 0 ; j < indent ; j++)
-                qstring_append(str, "    ");
-        }
-        qstring_append(str, "}");
-        break;
-    }
-    case QTYPE_QLIST: {
-        ToJsonIterState s;
-        QList *val = qobject_to_qlist(obj);
-
-        s.count = 0;
-        s.str = str;
-        s.indent = indent + 1;
-        s.pretty = pretty;
-        qstring_append(str, "[");
-        qlist_iter(val, (void *)to_json_list_iter, &s);
-        if (pretty) {
-            int j;
-            qstring_append(str, "\n");
-            for (j = 0 ; j < indent ; j++)
-                qstring_append(str, "    ");
-        }
-        qstring_append(str, "]");
-        break;
-    }
-    case QTYPE_QFLOAT: {
-        QFloat *val = qobject_to_qfloat(obj);
-        char buffer[1024];
-        int len;
-
-        len = snprintf(buffer, sizeof(buffer), "%f", qfloat_get_double(val));
-        while (len > 0 && buffer[len - 1] == '0') {
-            len--;
-        }
-
-        if (len && buffer[len - 1] == '.') {
-            buffer[len - 1] = 0;
-        } else {
-            buffer[len] = 0;
-        }
-        
-        qstring_append(str, buffer);
-        break;
-    }
-    case QTYPE_QBOOL: {
-        QBool *val = qobject_to_qbool(obj);
-
-        if (qbool_get_int(val)) {
-            qstring_append(str, "true");
-        } else {
-            qstring_append(str, "false");
-        }
-        break;
-    }
-    case QTYPE_QERROR:
-        /* XXX: should QError be emitted? */
-    case QTYPE_NONE:
-        break;
-    }
-}
-
-QString *qobject_to_json(const QObject *obj)
-{
-    QString *str = qstring_new();
-
-    to_json(obj, str, 0, 0);
-
-    return str;
-}
-
-QString *qobject_to_json_pretty(const QObject *obj)
-{
-    QString *str = qstring_new();
-
-    to_json(obj, str, 1, 0);
-
-    return str;
-}
diff --git a/contrib/qemu/qobject/qlist.c b/contrib/qemu/qobject/qlist.c
deleted file mode 100644
index 1ced0de58..000000000
--- a/contrib/qemu/qobject/qlist.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * QList Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qobject.h"
-#include "qemu/queue.h"
-#include "qemu-common.h"
-
-static void qlist_destroy_obj(QObject *obj);
-
-static const QType qlist_type = {
-    .code = QTYPE_QLIST,
-    .destroy = qlist_destroy_obj,
-};
- 
-/**
- * qlist_new(): Create a new QList
- *
- * Return strong reference.
- */
-QList *qlist_new(void)
-{
-    QList *qlist;
-
-    qlist = g_malloc(sizeof(*qlist));
-    QTAILQ_INIT(&qlist->head);
-    QOBJECT_INIT(qlist, &qlist_type);
-
-    return qlist;
-}
-
-static void qlist_copy_elem(QObject *obj, void *opaque)
-{
-    QList *dst = opaque;
-
-    qobject_incref(obj);
-    qlist_append_obj(dst, obj);
-}
-
-QList *qlist_copy(QList *src)
-{
-    QList *dst = qlist_new();
-
-    qlist_iter(src, qlist_copy_elem, dst);
-
-    return dst;
-}
-
-/**
- * qlist_append_obj(): Append an QObject into QList
- *
- * NOTE: ownership of 'value' is transferred to the QList
- */
-void qlist_append_obj(QList *qlist, QObject *value)
-{
-    QListEntry *entry;
-
-    entry = g_malloc(sizeof(*entry));
-    entry->value = value;
-
-    QTAILQ_INSERT_TAIL(&qlist->head, entry, next);
-}
-
-/**
- * qlist_iter(): Iterate over all the list's stored values.
- *
- * This function allows the user to provide an iterator, which will be
- * called for each stored value in the list.
- */
-void qlist_iter(const QList *qlist,
-                void (*iter)(QObject *obj, void *opaque), void *opaque)
-{
-    QListEntry *entry;
-
-    QTAILQ_FOREACH(entry, &qlist->head, next)
-        iter(entry->value, opaque);
-}
-
-QObject *qlist_pop(QList *qlist)
-{
-    QListEntry *entry;
-    QObject *ret;
-
-    if (qlist == NULL || QTAILQ_EMPTY(&qlist->head)) {
-        return NULL;
-    }
-
-    entry = QTAILQ_FIRST(&qlist->head);
-    QTAILQ_REMOVE(&qlist->head, entry, next);
-
-    ret = entry->value;
-    g_free(entry);
-
-    return ret;
-}
-
-QObject *qlist_peek(QList *qlist)
-{
-    QListEntry *entry;
-    QObject *ret;
-
-    if (qlist == NULL || QTAILQ_EMPTY(&qlist->head)) {
-        return NULL;
-    }
-
-    entry = QTAILQ_FIRST(&qlist->head);
-
-    ret = entry->value;
-
-    return ret;
-}
-
-int qlist_empty(const QList *qlist)
-{
-    return QTAILQ_EMPTY(&qlist->head);
-}
-
-static void qlist_size_iter(QObject *obj, void *opaque)
-{
-    size_t *count = opaque;
-    (*count)++;
-}
-
-size_t qlist_size(const QList *qlist)
-{
-    size_t count = 0;
-    qlist_iter(qlist, qlist_size_iter, &count);
-    return count;
-}
-
-/**
- * qobject_to_qlist(): Convert a QObject into a QList
- */
-QList *qobject_to_qlist(const QObject *obj)
-{
-    if (qobject_type(obj) != QTYPE_QLIST) {
-        return NULL;
-    }
-
-    return container_of(obj, QList, base);
-}
-
-/**
- * qlist_destroy_obj(): Free all the memory allocated by a QList
- */
-static void qlist_destroy_obj(QObject *obj)
-{
-    QList *qlist;
-    QListEntry *entry, *next_entry;
-
-    assert(obj != NULL);
-    qlist = qobject_to_qlist(obj);
-
-    QTAILQ_FOREACH_SAFE(entry, &qlist->head, next, next_entry) {
-        QTAILQ_REMOVE(&qlist->head, entry, next);
-        qobject_decref(entry->value);
-        g_free(entry);
-    }
-
-    g_free(qlist);
-}
diff --git a/contrib/qemu/qobject/qstring.c b/contrib/qemu/qobject/qstring.c
deleted file mode 100644
index 607b7a142..000000000
--- a/contrib/qemu/qobject/qstring.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * QString Module
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qstring.h"
-#include "qemu-common.h"
-
-static void qstring_destroy_obj(QObject *obj);
-
-static const QType qstring_type = {
-    .code = QTYPE_QSTRING,
-    .destroy = qstring_destroy_obj,
-};
-
-/**
- * qstring_new(): Create a new empty QString
- *
- * Return strong reference.
- */
-QString *qstring_new(void)
-{
-    return qstring_from_str("");
-}
-
-/**
- * qstring_get_length(): Get the length of a QString
- */
-size_t qstring_get_length(const QString *qstring)
-{
-    return qstring->length;
-}
-
-/**
- * qstring_from_substr(): Create a new QString from a C string substring
- *
- * Return string reference
- */
-QString *qstring_from_substr(const char *str, int start, int end)
-{
-    QString *qstring;
-
-    qstring = g_malloc(sizeof(*qstring));
-
-    qstring->length = end - start + 1;
-    qstring->capacity = qstring->length;
-
-    qstring->string = g_malloc(qstring->capacity + 1);
-    memcpy(qstring->string, str + start, qstring->length);
-    qstring->string[qstring->length] = 0;
-
-    QOBJECT_INIT(qstring, &qstring_type);
-
-    return qstring;
-}
-
-/**
- * qstring_from_str(): Create a new QString from a regular C string
- *
- * Return strong reference.
- */
-QString *qstring_from_str(const char *str)
-{
-    return qstring_from_substr(str, 0, strlen(str) - 1);
-}
-
-static void capacity_increase(QString *qstring, size_t len)
-{
-    if (qstring->capacity < (qstring->length + len)) {
-        qstring->capacity += len;
-        qstring->capacity *= 2; /* use exponential growth */
-
-        qstring->string = g_realloc(qstring->string, qstring->capacity + 1);
-    }
-}
-
-/* qstring_append(): Append a C string to a QString
- */
-void qstring_append(QString *qstring, const char *str)
-{
-    size_t len = strlen(str);
-
-    capacity_increase(qstring, len);
-    memcpy(qstring->string + qstring->length, str, len);
-    qstring->length += len;
-    qstring->string[qstring->length] = 0;
-}
-
-void qstring_append_int(QString *qstring, int64_t value)
-{
-    char num[32];
-
-    snprintf(num, sizeof(num), "%" PRId64, value);
-    qstring_append(qstring, num);
-}
-
-/**
- * qstring_append_chr(): Append a C char to a QString
- */
-void qstring_append_chr(QString *qstring, int c)
-{
-    capacity_increase(qstring, 1);
-    qstring->string[qstring->length++] = c;
-    qstring->string[qstring->length] = 0;
-}
-
-/**
- * qobject_to_qstring(): Convert a QObject to a QString
- */
-QString *qobject_to_qstring(const QObject *obj)
-{
-    if (qobject_type(obj) != QTYPE_QSTRING)
-        return NULL;
-
-    return container_of(obj, QString, base);
-}
-
-/**
- * qstring_get_str(): Return a pointer to the stored string
- *
- * NOTE: Should be used with caution, if the object is deallocated
- * this pointer becomes invalid.
- */
-const char *qstring_get_str(const QString *qstring)
-{
-    return qstring->string;
-}
-
-/**
- * qstring_destroy_obj(): Free all memory allocated by a QString
- * object
- */
-static void qstring_destroy_obj(QObject *obj)
-{
-    QString *qs;
-
-    assert(obj != NULL);
-    qs = qobject_to_qstring(obj);
-    g_free(qs->string);
-    g_free(qs);
-}
diff --git a/contrib/qemu/trace/generated-tracers.h b/contrib/qemu/trace/generated-tracers.h
deleted file mode 100644
index b512660f3..000000000
--- a/contrib/qemu/trace/generated-tracers.h
+++ /dev/null
@@ -1,3759 +0,0 @@
-/* This file is autogenerated by tracetool, do not edit. */
-
-#ifndef TRACE__GENERATED_TRACERS_H
-#define TRACE__GENERATED_TRACERS_H
-
-#include "qemu-common.h"
-
-static inline void trace_qxl_interface_set_mm_time(int qid, uint32_t mm_time)
-{
-}
-
-static inline void trace_qxl_io_write_vga(int qid, const char * mode, uint32_t addr, uint32_t val)
-{
-}
-
-static inline void trace_g_malloc(size_t size, void * ptr)
-{
-}
-
-static inline void trace_g_realloc(void * ptr, size_t size, void * newptr)
-{
-}
-
-static inline void trace_g_free(void * ptr)
-{
-}
-
-static inline void trace_qemu_memalign(size_t alignment, size_t size, void * ptr)
-{
-}
-
-static inline void trace_qemu_anon_ram_alloc(size_t size, void * ptr)
-{
-}
-
-static inline void trace_qemu_vfree(void * ptr)
-{
-}
-
-static inline void trace_qemu_anon_ram_free(void * ptr, size_t size)
-{
-}
-
-static inline void trace_virtqueue_fill(void * vq, const void * elem, unsigned int len, unsigned int idx)
-{
-}
-
-static inline void trace_virtqueue_flush(void * vq, unsigned int count)
-{
-}
-
-static inline void trace_virtqueue_pop(void * vq, void * elem, unsigned int in_num, unsigned int out_num)
-{
-}
-
-static inline void trace_virtio_queue_notify(void * vdev, int n, void * vq)
-{
-}
-
-static inline void trace_virtio_irq(void * vq)
-{
-}
-
-static inline void trace_virtio_notify(void * vdev, void * vq)
-{
-}
-
-static inline void trace_virtio_set_status(void * vdev, uint8_t val)
-{
-}
-
-static inline void trace_virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16_t value)
-{
-}
-
-static inline void trace_virtio_serial_throttle_port(unsigned int port, bool throttle)
-{
-}
-
-static inline void trace_virtio_serial_handle_control_message(uint16_t event, uint16_t value)
-{
-}
-
-static inline void trace_virtio_serial_handle_control_message_port(unsigned int port)
-{
-}
-
-static inline void trace_virtio_console_flush_buf(unsigned int port, size_t len, ssize_t ret)
-{
-}
-
-static inline void trace_virtio_console_chr_read(unsigned int port, int size)
-{
-}
-
-static inline void trace_virtio_console_chr_event(unsigned int port, int event)
-{
-}
-
-static inline void trace_bdrv_open_common(void * bs, const char * filename, int flags, const char * format_name)
-{
-}
-
-static inline void trace_multiwrite_cb(void * mcb, int ret)
-{
-}
-
-static inline void trace_bdrv_aio_multiwrite(void * mcb, int num_callbacks, int num_reqs)
-{
-}
-
-static inline void trace_bdrv_aio_discard(void * bs, int64_t sector_num, int nb_sectors, void * opaque)
-{
-}
-
-static inline void trace_bdrv_aio_flush(void * bs, void * opaque)
-{
-}
-
-static inline void trace_bdrv_aio_readv(void * bs, int64_t sector_num, int nb_sectors, void * opaque)
-{
-}
-
-static inline void trace_bdrv_aio_writev(void * bs, int64_t sector_num, int nb_sectors, void * opaque)
-{
-}
-
-static inline void trace_bdrv_lock_medium(void * bs, bool locked)
-{
-}
-
-static inline void trace_bdrv_co_readv(void * bs, int64_t sector_num, int nb_sector)
-{
-}
-
-static inline void trace_bdrv_co_copy_on_readv(void * bs, int64_t sector_num, int nb_sector)
-{
-}
-
-static inline void trace_bdrv_co_writev(void * bs, int64_t sector_num, int nb_sector)
-{
-}
-
-static inline void trace_bdrv_co_write_zeroes(void * bs, int64_t sector_num, int nb_sector)
-{
-}
-
-static inline void trace_bdrv_co_io_em(void * bs, int64_t sector_num, int nb_sectors, int is_write, void * acb)
-{
-}
-
-static inline void trace_bdrv_co_do_copy_on_readv(void * bs, int64_t sector_num, int nb_sectors, int64_t cluster_sector_num, int cluster_nb_sectors)
-{
-}
-
-static inline void trace_stream_one_iteration(void * s, int64_t sector_num, int nb_sectors, int is_allocated)
-{
-}
-
-static inline void trace_stream_start(void * bs, void * base, void * s, void * co, void * opaque)
-{
-}
-
-static inline void trace_commit_one_iteration(void * s, int64_t sector_num, int nb_sectors, int is_allocated)
-{
-}
-
-static inline void trace_commit_start(void * bs, void * base, void * top, void * s, void * co, void * opaque)
-{
-}
-
-static inline void trace_mirror_start(void * bs, void * s, void * co, void * opaque)
-{
-}
-
-static inline void trace_mirror_restart_iter(void * s, int64_t cnt)
-{
-}
-
-static inline void trace_mirror_before_flush(void * s)
-{
-}
-
-static inline void trace_mirror_before_drain(void * s, int64_t cnt)
-{
-}
-
-static inline void trace_mirror_before_sleep(void * s, int64_t cnt, int synced)
-{
-}
-
-static inline void trace_mirror_one_iteration(void * s, int64_t sector_num, int nb_sectors)
-{
-}
-
-static inline void trace_mirror_cow(void * s, int64_t sector_num)
-{
-}
-
-static inline void trace_mirror_iteration_done(void * s, int64_t sector_num, int nb_sectors, int ret)
-{
-}
-
-static inline void trace_mirror_yield(void * s, int64_t cnt, int buf_free_count, int in_flight)
-{
-}
-
-static inline void trace_mirror_yield_in_flight(void * s, int64_t sector_num, int in_flight)
-{
-}
-
-static inline void trace_mirror_yield_buf_busy(void * s, int nb_chunks, int in_flight)
-{
-}
-
-static inline void trace_mirror_break_buf_busy(void * s, int nb_chunks, int in_flight)
-{
-}
-
-static inline void trace_backup_do_cow_enter(void * job, int64_t start, int64_t sector_num, int nb_sectors)
-{
-}
-
-static inline void trace_backup_do_cow_return(void * job, int64_t sector_num, int nb_sectors, int ret)
-{
-}
-
-static inline void trace_backup_do_cow_skip(void * job, int64_t start)
-{
-}
-
-static inline void trace_backup_do_cow_process(void * job, int64_t start)
-{
-}
-
-static inline void trace_backup_do_cow_read_fail(void * job, int64_t start, int ret)
-{
-}
-
-static inline void trace_backup_do_cow_write_fail(void * job, int64_t start, int ret)
-{
-}
-
-static inline void trace_qmp_block_job_cancel(void * job)
-{
-}
-
-static inline void trace_qmp_block_job_pause(void * job)
-{
-}
-
-static inline void trace_qmp_block_job_resume(void * job)
-{
-}
-
-static inline void trace_qmp_block_job_complete(void * job)
-{
-}
-
-static inline void trace_block_job_cb(void * bs, void * job, int ret)
-{
-}
-
-static inline void trace_qmp_block_stream(void * bs, void * job)
-{
-}
-
-static inline void trace_virtio_blk_req_complete(void * req, int status)
-{
-}
-
-static inline void trace_virtio_blk_rw_complete(void * req, int ret)
-{
-}
-
-static inline void trace_virtio_blk_handle_write(void * req, uint64_t sector, size_t nsectors)
-{
-}
-
-static inline void trace_virtio_blk_handle_read(void * req, uint64_t sector, size_t nsectors)
-{
-}
-
-static inline void trace_virtio_blk_data_plane_start(void * s)
-{
-}
-
-static inline void trace_virtio_blk_data_plane_stop(void * s)
-{
-}
-
-static inline void trace_virtio_blk_data_plane_process_request(void * s, unsigned int out_num, unsigned int in_num, unsigned int head)
-{
-}
-
-static inline void trace_virtio_blk_data_plane_complete_request(void * s, unsigned int head, int ret)
-{
-}
-
-static inline void trace_vring_setup(uint64_t physical, void * desc, void * avail, void * used)
-{
-}
-
-static inline void trace_thread_pool_submit(void * pool, void * req, void * opaque)
-{
-}
-
-static inline void trace_thread_pool_complete(void * pool, void * req, void * opaque, int ret)
-{
-}
-
-static inline void trace_thread_pool_cancel(void * req, void * opaque)
-{
-}
-
-static inline void trace_paio_submit(void * acb, void * opaque, int64_t sector_num, int nb_sectors, int type)
-{
-}
-
-static inline void trace_paio_complete(void * acb, void * opaque, int ret)
-{
-}
-
-static inline void trace_paio_cancel(void * acb, void * opaque)
-{
-}
-
-static inline void trace_cpu_in(unsigned int addr, unsigned int val)
-{
-}
-
-static inline void trace_cpu_out(unsigned int addr, unsigned int val)
-{
-}
-
-static inline void trace_balloon_event(void * opaque, unsigned long addr)
-{
-}
-
-static inline void trace_apic_local_deliver(int vector, uint32_t lvt)
-{
-}
-
-static inline void trace_apic_deliver_irq(uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode, uint8_t vector_num, uint8_t trigger_mode)
-{
-}
-
-static inline void trace_cpu_set_apic_base(uint64_t val)
-{
-}
-
-static inline void trace_cpu_get_apic_base(uint64_t val)
-{
-}
-
-static inline void trace_apic_mem_readl(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_apic_mem_writel(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_apic_report_irq_delivered(int apic_irq_delivered)
-{
-}
-
-static inline void trace_apic_reset_irq_delivered(int apic_irq_delivered)
-{
-}
-
-static inline void trace_apic_get_irq_delivered(int apic_irq_delivered)
-{
-}
-
-static inline void trace_cs4231_mem_readl_dreg(uint32_t reg, uint32_t ret)
-{
-}
-
-static inline void trace_cs4231_mem_readl_reg(uint32_t reg, uint32_t ret)
-{
-}
-
-static inline void trace_cs4231_mem_writel_reg(uint32_t reg, uint32_t old, uint32_t val)
-{
-}
-
-static inline void trace_cs4231_mem_writel_dreg(uint32_t reg, uint32_t old, uint32_t val)
-{
-}
-
-static inline void trace_nvram_read(uint32_t addr, uint32_t ret)
-{
-}
-
-static inline void trace_nvram_write(uint32_t addr, uint32_t old, uint32_t val)
-{
-}
-
-static inline void trace_ecc_mem_writel_mer(uint32_t val)
-{
-}
-
-static inline void trace_ecc_mem_writel_mdr(uint32_t val)
-{
-}
-
-static inline void trace_ecc_mem_writel_mfsr(uint32_t val)
-{
-}
-
-static inline void trace_ecc_mem_writel_vcr(uint32_t val)
-{
-}
-
-static inline void trace_ecc_mem_writel_dr(uint32_t val)
-{
-}
-
-static inline void trace_ecc_mem_writel_ecr0(uint32_t val)
-{
-}
-
-static inline void trace_ecc_mem_writel_ecr1(uint32_t val)
-{
-}
-
-static inline void trace_ecc_mem_readl_mer(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_mem_readl_mdr(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_mem_readl_mfsr(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_mem_readl_vcr(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_mem_readl_mfar0(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_mem_readl_mfar1(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_mem_readl_dr(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_mem_readl_ecr0(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_mem_readl_ecr1(uint32_t ret)
-{
-}
-
-static inline void trace_ecc_diag_mem_writeb(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_ecc_diag_mem_readb(uint64_t addr, uint32_t ret)
-{
-}
-
-static inline void trace_fw_cfg_write(void * s, uint8_t value)
-{
-}
-
-static inline void trace_fw_cfg_select(void * s, uint16_t key, int ret)
-{
-}
-
-static inline void trace_fw_cfg_read(void * s, uint8_t ret)
-{
-}
-
-static inline void trace_fw_cfg_add_file_dupe(void * s, char * name)
-{
-}
-
-static inline void trace_fw_cfg_add_file(void * s, int index, char * name, size_t len)
-{
-}
-
-static inline void trace_hd_geometry_lchs_guess(void * bs, int cyls, int heads, int secs)
-{
-}
-
-static inline void trace_hd_geometry_guess(void * bs, uint32_t cyls, uint32_t heads, uint32_t secs, int trans)
-{
-}
-
-static inline void trace_jazz_led_read(uint64_t addr, uint8_t val)
-{
-}
-
-static inline void trace_jazz_led_write(uint64_t addr, uint8_t new)
-{
-}
-
-static inline void trace_lance_mem_readw(uint64_t addr, uint32_t ret)
-{
-}
-
-static inline void trace_lance_mem_writew(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_slavio_intctl_mem_readl(uint32_t cpu, uint64_t addr, uint32_t ret)
-{
-}
-
-static inline void trace_slavio_intctl_mem_writel(uint32_t cpu, uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_slavio_intctl_mem_writel_clear(uint32_t cpu, uint32_t val, uint32_t intreg_pending)
-{
-}
-
-static inline void trace_slavio_intctl_mem_writel_set(uint32_t cpu, uint32_t val, uint32_t intreg_pending)
-{
-}
-
-static inline void trace_slavio_intctlm_mem_readl(uint64_t addr, uint32_t ret)
-{
-}
-
-static inline void trace_slavio_intctlm_mem_writel(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_slavio_intctlm_mem_writel_enable(uint32_t val, uint32_t intregm_disabled)
-{
-}
-
-static inline void trace_slavio_intctlm_mem_writel_disable(uint32_t val, uint32_t intregm_disabled)
-{
-}
-
-static inline void trace_slavio_intctlm_mem_writel_target(uint32_t cpu)
-{
-}
-
-static inline void trace_slavio_check_interrupts(uint32_t pending, uint32_t intregm_disabled)
-{
-}
-
-static inline void trace_slavio_set_irq(uint32_t target_cpu, int irq, uint32_t pil, int level)
-{
-}
-
-static inline void trace_slavio_set_timer_irq_cpu(int cpu, int level)
-{
-}
-
-static inline void trace_slavio_misc_update_irq_raise(void)
-{
-}
-
-static inline void trace_slavio_misc_update_irq_lower(void)
-{
-}
-
-static inline void trace_slavio_set_power_fail(int power_failing, uint8_t config)
-{
-}
-
-static inline void trace_slavio_cfg_mem_writeb(uint32_t val)
-{
-}
-
-static inline void trace_slavio_cfg_mem_readb(uint32_t ret)
-{
-}
-
-static inline void trace_slavio_diag_mem_writeb(uint32_t val)
-{
-}
-
-static inline void trace_slavio_diag_mem_readb(uint32_t ret)
-{
-}
-
-static inline void trace_slavio_mdm_mem_writeb(uint32_t val)
-{
-}
-
-static inline void trace_slavio_mdm_mem_readb(uint32_t ret)
-{
-}
-
-static inline void trace_slavio_aux1_mem_writeb(uint32_t val)
-{
-}
-
-static inline void trace_slavio_aux1_mem_readb(uint32_t ret)
-{
-}
-
-static inline void trace_slavio_aux2_mem_writeb(uint32_t val)
-{
-}
-
-static inline void trace_slavio_aux2_mem_readb(uint32_t ret)
-{
-}
-
-static inline void trace_apc_mem_writeb(uint32_t val)
-{
-}
-
-static inline void trace_apc_mem_readb(uint32_t ret)
-{
-}
-
-static inline void trace_slavio_sysctrl_mem_writel(uint32_t val)
-{
-}
-
-static inline void trace_slavio_sysctrl_mem_readl(uint32_t ret)
-{
-}
-
-static inline void trace_slavio_led_mem_writew(uint32_t val)
-{
-}
-
-static inline void trace_slavio_led_mem_readw(uint32_t ret)
-{
-}
-
-static inline void trace_slavio_timer_get_out(uint64_t limit, uint32_t counthigh, uint32_t count)
-{
-}
-
-static inline void trace_slavio_timer_irq(uint32_t counthigh, uint32_t count)
-{
-}
-
-static inline void trace_slavio_timer_mem_readl_invalid(uint64_t addr)
-{
-}
-
-static inline void trace_slavio_timer_mem_readl(uint64_t addr, uint32_t ret)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel_limit(unsigned int timer_index, uint64_t count)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel_counter_invalid(void)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel_status_start(unsigned int timer_index)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel_status_stop(unsigned int timer_index)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel_mode_user(unsigned int timer_index)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel_mode_counter(unsigned int timer_index)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel_mode_invalid(void)
-{
-}
-
-static inline void trace_slavio_timer_mem_writel_invalid(uint64_t addr)
-{
-}
-
-static inline void trace_ledma_memory_read(uint64_t addr)
-{
-}
-
-static inline void trace_ledma_memory_write(uint64_t addr)
-{
-}
-
-static inline void trace_sparc32_dma_set_irq_raise(void)
-{
-}
-
-static inline void trace_sparc32_dma_set_irq_lower(void)
-{
-}
-
-static inline void trace_espdma_memory_read(uint32_t addr)
-{
-}
-
-static inline void trace_espdma_memory_write(uint32_t addr)
-{
-}
-
-static inline void trace_sparc32_dma_mem_readl(uint64_t addr, uint32_t ret)
-{
-}
-
-static inline void trace_sparc32_dma_mem_writel(uint64_t addr, uint32_t old, uint32_t val)
-{
-}
-
-static inline void trace_sparc32_dma_enable_raise(void)
-{
-}
-
-static inline void trace_sparc32_dma_enable_lower(void)
-{
-}
-
-static inline void trace_sun4m_cpu_interrupt(unsigned int level)
-{
-}
-
-static inline void trace_sun4m_cpu_reset_interrupt(unsigned int level)
-{
-}
-
-static inline void trace_sun4m_cpu_set_irq_raise(int level)
-{
-}
-
-static inline void trace_sun4m_cpu_set_irq_lower(int level)
-{
-}
-
-static inline void trace_sun4m_iommu_mem_readl(uint64_t addr, uint32_t ret)
-{
-}
-
-static inline void trace_sun4m_iommu_mem_writel(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_sun4m_iommu_mem_writel_ctrl(uint64_t iostart)
-{
-}
-
-static inline void trace_sun4m_iommu_mem_writel_tlbflush(uint32_t val)
-{
-}
-
-static inline void trace_sun4m_iommu_mem_writel_pgflush(uint32_t val)
-{
-}
-
-static inline void trace_sun4m_iommu_page_get_flags(uint64_t pa, uint64_t iopte, uint32_t ret)
-{
-}
-
-static inline void trace_sun4m_iommu_translate_pa(uint64_t addr, uint64_t pa, uint32_t iopte)
-{
-}
-
-static inline void trace_sun4m_iommu_bad_addr(uint64_t addr)
-{
-}
-
-static inline void trace_usb_packet_state_change(int bus, const char * port, int ep, void * p, const char * o, const char * n)
-{
-}
-
-static inline void trace_usb_packet_state_fault(int bus, const char * port, int ep, void * p, const char * o, const char * n)
-{
-}
-
-static inline void trace_usb_port_claim(int bus, const char * port)
-{
-}
-
-static inline void trace_usb_port_attach(int bus, const char * port, const char * devspeed, const char * portspeed)
-{
-}
-
-static inline void trace_usb_port_detach(int bus, const char * port)
-{
-}
-
-static inline void trace_usb_port_release(int bus, const char * port)
-{
-}
-
-static inline void trace_usb_ehci_reset(void)
-{
-}
-
-static inline void trace_usb_ehci_opreg_read(uint32_t addr, const char * str, uint32_t val)
-{
-}
-
-static inline void trace_usb_ehci_opreg_write(uint32_t addr, const char * str, uint32_t val)
-{
-}
-
-static inline void trace_usb_ehci_opreg_change(uint32_t addr, const char * str, uint32_t new, uint32_t old)
-{
-}
-
-static inline void trace_usb_ehci_portsc_read(uint32_t addr, uint32_t port, uint32_t val)
-{
-}
-
-static inline void trace_usb_ehci_portsc_write(uint32_t addr, uint32_t port, uint32_t val)
-{
-}
-
-static inline void trace_usb_ehci_portsc_change(uint32_t addr, uint32_t port, uint32_t new, uint32_t old)
-{
-}
-
-static inline void trace_usb_ehci_usbsts(const char * sts, int state)
-{
-}
-
-static inline void trace_usb_ehci_state(const char * schedule, const char * state)
-{
-}
-
-static inline void trace_usb_ehci_qh_ptrs(void * q, uint32_t addr, uint32_t nxt, uint32_t c_qtd, uint32_t n_qtd, uint32_t a_qtd)
-{
-}
-
-static inline void trace_usb_ehci_qh_fields(uint32_t addr, int rl, int mplen, int eps, int ep, int devaddr)
-{
-}
-
-static inline void trace_usb_ehci_qh_bits(uint32_t addr, int c, int h, int dtc, int i)
-{
-}
-
-static inline void trace_usb_ehci_qtd_ptrs(void * q, uint32_t addr, uint32_t nxt, uint32_t altnext)
-{
-}
-
-static inline void trace_usb_ehci_qtd_fields(uint32_t addr, int tbytes, int cpage, int cerr, int pid)
-{
-}
-
-static inline void trace_usb_ehci_qtd_bits(uint32_t addr, int ioc, int active, int halt, int babble, int xacterr)
-{
-}
-
-static inline void trace_usb_ehci_itd(uint32_t addr, uint32_t nxt, uint32_t mplen, uint32_t mult, uint32_t ep, uint32_t devaddr)
-{
-}
-
-static inline void trace_usb_ehci_sitd(uint32_t addr, uint32_t nxt, uint32_t active)
-{
-}
-
-static inline void trace_usb_ehci_port_attach(uint32_t port, const char * owner, const char * device)
-{
-}
-
-static inline void trace_usb_ehci_port_detach(uint32_t port, const char * owner)
-{
-}
-
-static inline void trace_usb_ehci_port_reset(uint32_t port, int enable)
-{
-}
-
-static inline void trace_usb_ehci_data(int rw, uint32_t cpage, uint32_t offset, uint32_t addr, uint32_t len, uint32_t bufpos)
-{
-}
-
-static inline void trace_usb_ehci_queue_action(void * q, const char * action)
-{
-}
-
-static inline void trace_usb_ehci_packet_action(void * q, void * p, const char * action)
-{
-}
-
-static inline void trace_usb_ehci_irq(uint32_t level, uint32_t frindex, uint32_t sts, uint32_t mask)
-{
-}
-
-static inline void trace_usb_ehci_guest_bug(const char * reason)
-{
-}
-
-static inline void trace_usb_ehci_doorbell_ring(void)
-{
-}
-
-static inline void trace_usb_ehci_doorbell_ack(void)
-{
-}
-
-static inline void trace_usb_ehci_dma_error(void)
-{
-}
-
-static inline void trace_usb_uhci_reset(void)
-{
-}
-
-static inline void trace_usb_uhci_schedule_start(void)
-{
-}
-
-static inline void trace_usb_uhci_schedule_stop(void)
-{
-}
-
-static inline void trace_usb_uhci_frame_start(uint32_t num)
-{
-}
-
-static inline void trace_usb_uhci_frame_stop_bandwidth(void)
-{
-}
-
-static inline void trace_usb_uhci_frame_loop_stop_idle(void)
-{
-}
-
-static inline void trace_usb_uhci_frame_loop_continue(void)
-{
-}
-
-static inline void trace_usb_uhci_mmio_readw(uint32_t addr, uint32_t val)
-{
-}
-
-static inline void trace_usb_uhci_mmio_writew(uint32_t addr, uint32_t val)
-{
-}
-
-static inline void trace_usb_uhci_queue_add(uint32_t token)
-{
-}
-
-static inline void trace_usb_uhci_queue_del(uint32_t token, const char * reason)
-{
-}
-
-static inline void trace_usb_uhci_packet_add(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_packet_link_async(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_packet_unlink_async(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_packet_cancel(uint32_t token, uint32_t addr, int done)
-{
-}
-
-static inline void trace_usb_uhci_packet_complete_success(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_packet_complete_shortxfer(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_packet_complete_stall(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_packet_complete_babble(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_packet_complete_error(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_packet_del(uint32_t token, uint32_t addr)
-{
-}
-
-static inline void trace_usb_uhci_qh_load(uint32_t qh)
-{
-}
-
-static inline void trace_usb_uhci_td_load(uint32_t qh, uint32_t td, uint32_t ctrl, uint32_t token)
-{
-}
-
-static inline void trace_usb_uhci_td_queue(uint32_t td, uint32_t ctrl, uint32_t token)
-{
-}
-
-static inline void trace_usb_uhci_td_nextqh(uint32_t qh, uint32_t td)
-{
-}
-
-static inline void trace_usb_uhci_td_async(uint32_t qh, uint32_t td)
-{
-}
-
-static inline void trace_usb_uhci_td_complete(uint32_t qh, uint32_t td)
-{
-}
-
-static inline void trace_usb_xhci_reset(void)
-{
-}
-
-static inline void trace_usb_xhci_run(void)
-{
-}
-
-static inline void trace_usb_xhci_stop(void)
-{
-}
-
-static inline void trace_usb_xhci_cap_read(uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_oper_read(uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_port_read(uint32_t port, uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_runtime_read(uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_doorbell_read(uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_oper_write(uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_port_write(uint32_t port, uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_runtime_write(uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_doorbell_write(uint32_t off, uint32_t val)
-{
-}
-
-static inline void trace_usb_xhci_irq_intx(uint32_t level)
-{
-}
-
-static inline void trace_usb_xhci_irq_msi(uint32_t nr)
-{
-}
-
-static inline void trace_usb_xhci_irq_msix(uint32_t nr)
-{
-}
-
-static inline void trace_usb_xhci_irq_msix_use(uint32_t nr)
-{
-}
-
-static inline void trace_usb_xhci_irq_msix_unuse(uint32_t nr)
-{
-}
-
-static inline void trace_usb_xhci_queue_event(uint32_t vector, uint32_t idx, const char * trb, const char * evt, uint64_t param, uint32_t status, uint32_t control)
-{
-}
-
-static inline void trace_usb_xhci_fetch_trb(uint64_t addr, const char * name, uint64_t param, uint32_t status, uint32_t control)
-{
-}
-
-static inline void trace_usb_xhci_port_reset(uint32_t port)
-{
-}
-
-static inline void trace_usb_xhci_port_link(uint32_t port, uint32_t pls)
-{
-}
-
-static inline void trace_usb_xhci_port_notify(uint32_t port, uint32_t pls)
-{
-}
-
-static inline void trace_usb_xhci_slot_enable(uint32_t slotid)
-{
-}
-
-static inline void trace_usb_xhci_slot_disable(uint32_t slotid)
-{
-}
-
-static inline void trace_usb_xhci_slot_address(uint32_t slotid)
-{
-}
-
-static inline void trace_usb_xhci_slot_configure(uint32_t slotid)
-{
-}
-
-static inline void trace_usb_xhci_slot_evaluate(uint32_t slotid)
-{
-}
-
-static inline void trace_usb_xhci_slot_reset(uint32_t slotid)
-{
-}
-
-static inline void trace_usb_xhci_ep_enable(uint32_t slotid, uint32_t epid)
-{
-}
-
-static inline void trace_usb_xhci_ep_disable(uint32_t slotid, uint32_t epid)
-{
-}
-
-static inline void trace_usb_xhci_ep_set_dequeue(uint32_t slotid, uint32_t epid, uint32_t streamid, uint64_t param)
-{
-}
-
-static inline void trace_usb_xhci_ep_kick(uint32_t slotid, uint32_t epid, uint32_t streamid)
-{
-}
-
-static inline void trace_usb_xhci_ep_stop(uint32_t slotid, uint32_t epid)
-{
-}
-
-static inline void trace_usb_xhci_ep_reset(uint32_t slotid, uint32_t epid)
-{
-}
-
-static inline void trace_usb_xhci_xfer_start(void * xfer, uint32_t slotid, uint32_t epid, uint32_t streamid)
-{
-}
-
-static inline void trace_usb_xhci_xfer_async(void * xfer)
-{
-}
-
-static inline void trace_usb_xhci_xfer_nak(void * xfer)
-{
-}
-
-static inline void trace_usb_xhci_xfer_retry(void * xfer)
-{
-}
-
-static inline void trace_usb_xhci_xfer_success(void * xfer, uint32_t bytes)
-{
-}
-
-static inline void trace_usb_xhci_xfer_error(void * xfer, uint32_t ret)
-{
-}
-
-static inline void trace_usb_xhci_unimplemented(const char * item, int nr)
-{
-}
-
-static inline void trace_usb_desc_device(int addr, int len, int ret)
-{
-}
-
-static inline void trace_usb_desc_device_qualifier(int addr, int len, int ret)
-{
-}
-
-static inline void trace_usb_desc_config(int addr, int index, int len, int ret)
-{
-}
-
-static inline void trace_usb_desc_other_speed_config(int addr, int index, int len, int ret)
-{
-}
-
-static inline void trace_usb_desc_string(int addr, int index, int len, int ret)
-{
-}
-
-static inline void trace_usb_desc_bos(int addr, int len, int ret)
-{
-}
-
-static inline void trace_usb_set_addr(int addr)
-{
-}
-
-static inline void trace_usb_set_config(int addr, int config, int ret)
-{
-}
-
-static inline void trace_usb_set_interface(int addr, int iface, int alt, int ret)
-{
-}
-
-static inline void trace_usb_clear_device_feature(int addr, int feature, int ret)
-{
-}
-
-static inline void trace_usb_set_device_feature(int addr, int feature, int ret)
-{
-}
-
-static inline void trace_usb_hub_reset(int addr)
-{
-}
-
-static inline void trace_usb_hub_control(int addr, int request, int value, int index, int length)
-{
-}
-
-static inline void trace_usb_hub_get_port_status(int addr, int nr, int status, int changed)
-{
-}
-
-static inline void trace_usb_hub_set_port_feature(int addr, int nr, const char * f)
-{
-}
-
-static inline void trace_usb_hub_clear_port_feature(int addr, int nr, const char * f)
-{
-}
-
-static inline void trace_usb_hub_attach(int addr, int nr)
-{
-}
-
-static inline void trace_usb_hub_detach(int addr, int nr)
-{
-}
-
-static inline void trace_usb_uas_reset(int addr)
-{
-}
-
-static inline void trace_usb_uas_command(int addr, uint16_t tag, int lun, uint32_t lun64_1, uint32_t lun64_2)
-{
-}
-
-static inline void trace_usb_uas_response(int addr, uint16_t tag, uint8_t code)
-{
-}
-
-static inline void trace_usb_uas_sense(int addr, uint16_t tag, uint8_t status)
-{
-}
-
-static inline void trace_usb_uas_read_ready(int addr, uint16_t tag)
-{
-}
-
-static inline void trace_usb_uas_write_ready(int addr, uint16_t tag)
-{
-}
-
-static inline void trace_usb_uas_xfer_data(int addr, uint16_t tag, uint32_t copy, uint32_t uoff, uint32_t usize, uint32_t soff, uint32_t ssize)
-{
-}
-
-static inline void trace_usb_uas_scsi_data(int addr, uint16_t tag, uint32_t bytes)
-{
-}
-
-static inline void trace_usb_uas_scsi_complete(int addr, uint16_t tag, uint32_t status, uint32_t resid)
-{
-}
-
-static inline void trace_usb_uas_tmf_abort_task(int addr, uint16_t tag, uint16_t task_tag)
-{
-}
-
-static inline void trace_usb_uas_tmf_logical_unit_reset(int addr, uint16_t tag, int lun)
-{
-}
-
-static inline void trace_usb_uas_tmf_unsupported(int addr, uint16_t tag, uint32_t function)
-{
-}
-
-static inline void trace_usb_host_open_started(int bus, int addr)
-{
-}
-
-static inline void trace_usb_host_open_success(int bus, int addr)
-{
-}
-
-static inline void trace_usb_host_open_failure(int bus, int addr)
-{
-}
-
-static inline void trace_usb_host_disconnect(int bus, int addr)
-{
-}
-
-static inline void trace_usb_host_close(int bus, int addr)
-{
-}
-
-static inline void trace_usb_host_attach_kernel(int bus, int addr, int interface)
-{
-}
-
-static inline void trace_usb_host_detach_kernel(int bus, int addr, int interface)
-{
-}
-
-static inline void trace_usb_host_set_address(int bus, int addr, int config)
-{
-}
-
-static inline void trace_usb_host_set_config(int bus, int addr, int config)
-{
-}
-
-static inline void trace_usb_host_set_interface(int bus, int addr, int interface, int alt)
-{
-}
-
-static inline void trace_usb_host_claim_interfaces(int bus, int addr, int config, int nif)
-{
-}
-
-static inline void trace_usb_host_claim_interface(int bus, int addr, int config, int interface)
-{
-}
-
-static inline void trace_usb_host_release_interfaces(int bus, int addr)
-{
-}
-
-static inline void trace_usb_host_release_interface(int bus, int addr, int interface)
-{
-}
-
-static inline void trace_usb_host_req_control(int bus, int addr, void * p, int req, int value, int index)
-{
-}
-
-static inline void trace_usb_host_req_data(int bus, int addr, void * p, int in, int ep, int size)
-{
-}
-
-static inline void trace_usb_host_req_complete(int bus, int addr, void * p, int status, int length)
-{
-}
-
-static inline void trace_usb_host_req_emulated(int bus, int addr, void * p, int status)
-{
-}
-
-static inline void trace_usb_host_req_canceled(int bus, int addr, void * p)
-{
-}
-
-static inline void trace_usb_host_urb_submit(int bus, int addr, void * aurb, int length, int more)
-{
-}
-
-static inline void trace_usb_host_urb_complete(int bus, int addr, void * aurb, int status, int length, int more)
-{
-}
-
-static inline void trace_usb_host_urb_canceled(int bus, int addr, void * aurb)
-{
-}
-
-static inline void trace_usb_host_ep_set_halt(int bus, int addr, int ep)
-{
-}
-
-static inline void trace_usb_host_ep_clear_halt(int bus, int addr, int ep)
-{
-}
-
-static inline void trace_usb_host_iso_start(int bus, int addr, int ep)
-{
-}
-
-static inline void trace_usb_host_iso_stop(int bus, int addr, int ep)
-{
-}
-
-static inline void trace_usb_host_iso_out_of_bufs(int bus, int addr, int ep)
-{
-}
-
-static inline void trace_usb_host_iso_many_urbs(int bus, int addr, int count)
-{
-}
-
-static inline void trace_usb_host_reset(int bus, int addr)
-{
-}
-
-static inline void trace_usb_host_auto_scan_enabled(void)
-{
-}
-
-static inline void trace_usb_host_auto_scan_disabled(void)
-{
-}
-
-static inline void trace_usb_host_claim_port(int bus, int hub, int port)
-{
-}
-
-static inline void trace_usb_host_parse_device(int bus, int addr, int vendor, int product)
-{
-}
-
-static inline void trace_usb_host_parse_config(int bus, int addr, int value, int active)
-{
-}
-
-static inline void trace_usb_host_parse_interface(int bus, int addr, int num, int alt, int active)
-{
-}
-
-static inline void trace_usb_host_parse_endpoint(int bus, int addr, int ep, const char * dir, const char * type, int active)
-{
-}
-
-static inline void trace_usb_host_parse_unknown(int bus, int addr, int len, int type)
-{
-}
-
-static inline void trace_usb_host_parse_error(int bus, int addr, const char * errmsg)
-{
-}
-
-static inline void trace_scsi_req_alloc(int target, int lun, int tag)
-{
-}
-
-static inline void trace_scsi_req_cancel(int target, int lun, int tag)
-{
-}
-
-static inline void trace_scsi_req_data(int target, int lun, int tag, int len)
-{
-}
-
-static inline void trace_scsi_req_data_canceled(int target, int lun, int tag, int len)
-{
-}
-
-static inline void trace_scsi_req_dequeue(int target, int lun, int tag)
-{
-}
-
-static inline void trace_scsi_req_continue(int target, int lun, int tag)
-{
-}
-
-static inline void trace_scsi_req_continue_canceled(int target, int lun, int tag)
-{
-}
-
-static inline void trace_scsi_req_parsed(int target, int lun, int tag, int cmd, int mode, int xfer)
-{
-}
-
-static inline void trace_scsi_req_parsed_lba(int target, int lun, int tag, int cmd, uint64_t lba)
-{
-}
-
-static inline void trace_scsi_req_parse_bad(int target, int lun, int tag, int cmd)
-{
-}
-
-static inline void trace_scsi_req_build_sense(int target, int lun, int tag, int key, int asc, int ascq)
-{
-}
-
-static inline void trace_scsi_device_set_ua(int target, int lun, int key, int asc, int ascq)
-{
-}
-
-static inline void trace_scsi_report_luns(int target, int lun, int tag)
-{
-}
-
-static inline void trace_scsi_inquiry(int target, int lun, int tag, int cdb1, int cdb2)
-{
-}
-
-static inline void trace_scsi_test_unit_ready(int target, int lun, int tag)
-{
-}
-
-static inline void trace_scsi_request_sense(int target, int lun, int tag)
-{
-}
-
-static inline void trace_vm_state_notify(int running, int reason)
-{
-}
-
-static inline void trace_load_file(const char * name, const char * path)
-{
-}
-
-static inline void trace_runstate_set(int new_state)
-{
-}
-
-static inline void trace_qcow2_writev_start_req(void * co, int64_t sector, int nb_sectors)
-{
-}
-
-static inline void trace_qcow2_writev_done_req(void * co, int ret)
-{
-}
-
-static inline void trace_qcow2_writev_start_part(void * co)
-{
-}
-
-static inline void trace_qcow2_writev_done_part(void * co, int cur_nr_sectors)
-{
-}
-
-static inline void trace_qcow2_writev_data(void * co, uint64_t offset)
-{
-}
-
-static inline void trace_qcow2_alloc_clusters_offset(void * co, uint64_t offset, int n_start, int n_end)
-{
-}
-
-static inline void trace_qcow2_handle_copied(void * co, uint64_t guest_offset, uint64_t host_offset, uint64_t bytes)
-{
-}
-
-static inline void trace_qcow2_handle_alloc(void * co, uint64_t guest_offset, uint64_t host_offset, uint64_t bytes)
-{
-}
-
-static inline void trace_qcow2_do_alloc_clusters_offset(void * co, uint64_t guest_offset, uint64_t host_offset, int nb_clusters)
-{
-}
-
-static inline void trace_qcow2_cluster_alloc_phys(void * co)
-{
-}
-
-static inline void trace_qcow2_cluster_link_l2(void * co, int nb_clusters)
-{
-}
-
-static inline void trace_qcow2_l2_allocate(void * bs, int l1_index)
-{
-}
-
-static inline void trace_qcow2_l2_allocate_get_empty(void * bs, int l1_index)
-{
-}
-
-static inline void trace_qcow2_l2_allocate_write_l2(void * bs, int l1_index)
-{
-}
-
-static inline void trace_qcow2_l2_allocate_write_l1(void * bs, int l1_index)
-{
-}
-
-static inline void trace_qcow2_l2_allocate_done(void * bs, int l1_index, int ret)
-{
-}
-
-static inline void trace_qcow2_cache_get(void * co, int c, uint64_t offset, bool read_from_disk)
-{
-}
-
-static inline void trace_qcow2_cache_get_replace_entry(void * co, int c, int i)
-{
-}
-
-static inline void trace_qcow2_cache_get_read(void * co, int c, int i)
-{
-}
-
-static inline void trace_qcow2_cache_get_done(void * co, int c, int i)
-{
-}
-
-static inline void trace_qcow2_cache_flush(void * co, int c)
-{
-}
-
-static inline void trace_qcow2_cache_entry_flush(void * co, int c, int i)
-{
-}
-
-static inline void trace_qed_alloc_l2_cache_entry(void * l2_cache, void * entry)
-{
-}
-
-static inline void trace_qed_unref_l2_cache_entry(void * entry, int ref)
-{
-}
-
-static inline void trace_qed_find_l2_cache_entry(void * l2_cache, void * entry, uint64_t offset, int ref)
-{
-}
-
-static inline void trace_qed_read_table(void * s, uint64_t offset, void * table)
-{
-}
-
-static inline void trace_qed_read_table_cb(void * s, void * table, int ret)
-{
-}
-
-static inline void trace_qed_write_table(void * s, uint64_t offset, void * table, unsigned int index, unsigned int n)
-{
-}
-
-static inline void trace_qed_write_table_cb(void * s, void * table, int flush, int ret)
-{
-}
-
-static inline void trace_qed_need_check_timer_cb(void * s)
-{
-}
-
-static inline void trace_qed_start_need_check_timer(void * s)
-{
-}
-
-static inline void trace_qed_cancel_need_check_timer(void * s)
-{
-}
-
-static inline void trace_qed_aio_complete(void * s, void * acb, int ret)
-{
-}
-
-static inline void trace_qed_aio_setup(void * s, void * acb, int64_t sector_num, int nb_sectors, void * opaque, int flags)
-{
-}
-
-static inline void trace_qed_aio_next_io(void * s, void * acb, int ret, uint64_t cur_pos)
-{
-}
-
-static inline void trace_qed_aio_read_data(void * s, void * acb, int ret, uint64_t offset, size_t len)
-{
-}
-
-static inline void trace_qed_aio_write_data(void * s, void * acb, int ret, uint64_t offset, size_t len)
-{
-}
-
-static inline void trace_qed_aio_write_prefill(void * s, void * acb, uint64_t start, size_t len, uint64_t offset)
-{
-}
-
-static inline void trace_qed_aio_write_postfill(void * s, void * acb, uint64_t start, size_t len, uint64_t offset)
-{
-}
-
-static inline void trace_qed_aio_write_main(void * s, void * acb, int ret, uint64_t offset, size_t len)
-{
-}
-
-static inline void trace_g364fb_read(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_g364fb_write(uint64_t addr, uint32_t new)
-{
-}
-
-static inline void trace_grlib_gptimer_enable(int id, uint32_t count)
-{
-}
-
-static inline void trace_grlib_gptimer_disabled(int id, uint32_t config)
-{
-}
-
-static inline void trace_grlib_gptimer_restart(int id, uint32_t reload)
-{
-}
-
-static inline void trace_grlib_gptimer_set_scaler(uint32_t scaler, uint32_t freq)
-{
-}
-
-static inline void trace_grlib_gptimer_hit(int id)
-{
-}
-
-static inline void trace_grlib_gptimer_readl(int id, uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_grlib_gptimer_writel(int id, uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_grlib_irqmp_check_irqs(uint32_t pend, uint32_t force, uint32_t mask, uint32_t lvl1, uint32_t lvl2)
-{
-}
-
-static inline void trace_grlib_irqmp_ack(int intno)
-{
-}
-
-static inline void trace_grlib_irqmp_set_irq(int irq)
-{
-}
-
-static inline void trace_grlib_irqmp_readl_unknown(uint64_t addr)
-{
-}
-
-static inline void trace_grlib_irqmp_writel_unknown(uint64_t addr, uint32_t value)
-{
-}
-
-static inline void trace_grlib_apbuart_event(int event)
-{
-}
-
-static inline void trace_grlib_apbuart_writel_unknown(uint64_t addr, uint32_t value)
-{
-}
-
-static inline void trace_grlib_apbuart_readl_unknown(uint64_t addr)
-{
-}
-
-static inline void trace_leon3_set_irq(int intno)
-{
-}
-
-static inline void trace_leon3_reset_irq(int intno)
-{
-}
-
-static inline void trace_spice_vmc_write(ssize_t out, int len)
-{
-}
-
-static inline void trace_spice_vmc_read(int bytes, int len)
-{
-}
-
-static inline void trace_spice_vmc_register_interface(void * scd)
-{
-}
-
-static inline void trace_spice_vmc_unregister_interface(void * scd)
-{
-}
-
-static inline void trace_spice_vmc_event(int event)
-{
-}
-
-static inline void trace_lm32_pic_raise_irq(void)
-{
-}
-
-static inline void trace_lm32_pic_lower_irq(void)
-{
-}
-
-static inline void trace_lm32_pic_interrupt(int irq, int level)
-{
-}
-
-static inline void trace_lm32_pic_set_im(uint32_t im)
-{
-}
-
-static inline void trace_lm32_pic_set_ip(uint32_t ip)
-{
-}
-
-static inline void trace_lm32_pic_get_im(uint32_t im)
-{
-}
-
-static inline void trace_lm32_pic_get_ip(uint32_t ip)
-{
-}
-
-static inline void trace_lm32_juart_get_jtx(uint32_t value)
-{
-}
-
-static inline void trace_lm32_juart_set_jtx(uint32_t value)
-{
-}
-
-static inline void trace_lm32_juart_get_jrx(uint32_t value)
-{
-}
-
-static inline void trace_lm32_juart_set_jrx(uint32_t value)
-{
-}
-
-static inline void trace_lm32_timer_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_lm32_timer_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_lm32_timer_hit(void)
-{
-}
-
-static inline void trace_lm32_timer_irq_state(int level)
-{
-}
-
-static inline void trace_lm32_uart_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_lm32_uart_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_lm32_uart_irq_state(int level)
-{
-}
-
-static inline void trace_lm32_sys_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_megasas_init_firmware(uint64_t pa)
-{
-}
-
-static inline void trace_megasas_init_queue(uint64_t queue_pa, int queue_len, uint64_t head, uint64_t tail, uint32_t flags)
-{
-}
-
-static inline void trace_megasas_initq_map_failed(int frame)
-{
-}
-
-static inline void trace_megasas_initq_mismatch(int queue_len, int fw_cmds)
-{
-}
-
-static inline void trace_megasas_qf_found(unsigned int index, uint64_t pa)
-{
-}
-
-static inline void trace_megasas_qf_new(unsigned int index, void * cmd)
-{
-}
-
-static inline void trace_megasas_qf_failed(unsigned long pa)
-{
-}
-
-static inline void trace_megasas_qf_enqueue(unsigned int index, unsigned int count, uint64_t context, unsigned int tail, int busy)
-{
-}
-
-static inline void trace_megasas_qf_update(unsigned int head, unsigned int busy)
-{
-}
-
-static inline void trace_megasas_qf_dequeue(unsigned int index)
-{
-}
-
-static inline void trace_megasas_qf_map_failed(int cmd, unsigned long frame)
-{
-}
-
-static inline void trace_megasas_qf_complete_noirq(uint64_t context)
-{
-}
-
-static inline void trace_megasas_qf_complete(uint64_t context, unsigned int tail, unsigned int offset, int busy, unsigned int doorbell)
-{
-}
-
-static inline void trace_megasas_handle_frame(const char * cmd, uint64_t addr, uint64_t context, uint32_t count)
-{
-}
-
-static inline void trace_megasas_frame_busy(uint64_t addr)
-{
-}
-
-static inline void trace_megasas_unhandled_frame_cmd(int cmd, uint8_t frame_cmd)
-{
-}
-
-static inline void trace_megasas_handle_scsi(const char * frame, int bus, int dev, int lun, void * sdev, unsigned long size)
-{
-}
-
-static inline void trace_megasas_scsi_target_not_present(const char * frame, int bus, int dev, int lun)
-{
-}
-
-static inline void trace_megasas_scsi_invalid_cdb_len(const char * frame, int bus, int dev, int lun, int len)
-{
-}
-
-static inline void trace_megasas_iov_read_overflow(int cmd, int bytes, int len)
-{
-}
-
-static inline void trace_megasas_iov_write_overflow(int cmd, int bytes, int len)
-{
-}
-
-static inline void trace_megasas_iov_read_underflow(int cmd, int bytes, int len)
-{
-}
-
-static inline void trace_megasas_iov_write_underflow(int cmd, int bytes, int len)
-{
-}
-
-static inline void trace_megasas_scsi_req_alloc_failed(const char * frame, int dev, int lun)
-{
-}
-
-static inline void trace_megasas_scsi_read_start(int cmd, int len)
-{
-}
-
-static inline void trace_megasas_scsi_write_start(int cmd, int len)
-{
-}
-
-static inline void trace_megasas_scsi_nodata(int cmd)
-{
-}
-
-static inline void trace_megasas_scsi_complete(int cmd, uint32_t status, int len, int xfer)
-{
-}
-
-static inline void trace_megasas_command_complete(int cmd, uint32_t status, uint32_t resid)
-{
-}
-
-static inline void trace_megasas_handle_io(int cmd, const char * frame, int dev, int lun, unsigned long lba, unsigned long count)
-{
-}
-
-static inline void trace_megasas_io_target_not_present(int cmd, const char * frame, int dev, int lun)
-{
-}
-
-static inline void trace_megasas_io_read_start(int cmd, unsigned long lba, unsigned long count, unsigned long len)
-{
-}
-
-static inline void trace_megasas_io_write_start(int cmd, unsigned long lba, unsigned long count, unsigned long len)
-{
-}
-
-static inline void trace_megasas_io_complete(int cmd, uint32_t len)
-{
-}
-
-static inline void trace_megasas_io_read(int cmd, int bytes, int len, unsigned long offset)
-{
-}
-
-static inline void trace_megasas_io_write(int cmd, int bytes, int len, unsigned long offset)
-{
-}
-
-static inline void trace_megasas_io_continue(int cmd, int bytes)
-{
-}
-
-static inline void trace_megasas_iovec_map_failed(int cmd, int index, unsigned long iov_size)
-{
-}
-
-static inline void trace_megasas_iovec_sgl_overflow(int cmd, int index, int limit)
-{
-}
-
-static inline void trace_megasas_iovec_sgl_underflow(int cmd, int index)
-{
-}
-
-static inline void trace_megasas_iovec_sgl_invalid(int cmd, int index, uint64_t pa, uint32_t len)
-{
-}
-
-static inline void trace_megasas_iovec_overflow(int cmd, int len, int limit)
-{
-}
-
-static inline void trace_megasas_iovec_underflow(int cmd, int len, int limit)
-{
-}
-
-static inline void trace_megasas_handle_dcmd(int cmd, int opcode)
-{
-}
-
-static inline void trace_megasas_finish_dcmd(int cmd, int size)
-{
-}
-
-static inline void trace_megasas_dcmd_req_alloc_failed(int cmd, const char * desc)
-{
-}
-
-static inline void trace_megasas_dcmd_internal_submit(int cmd, const char * desc, int dev)
-{
-}
-
-static inline void trace_megasas_dcmd_internal_finish(int cmd, int opcode, int lun)
-{
-}
-
-static inline void trace_megasas_dcmd_internal_invalid(int cmd, int opcode)
-{
-}
-
-static inline void trace_megasas_dcmd_unhandled(int cmd, int opcode, int len)
-{
-}
-
-static inline void trace_megasas_dcmd_zero_sge(int cmd)
-{
-}
-
-static inline void trace_megasas_dcmd_invalid_sge(int cmd, int count)
-{
-}
-
-static inline void trace_megasas_dcmd_map_failed(int cmd)
-{
-}
-
-static inline void trace_megasas_dcmd_invalid_xfer_len(int cmd, unsigned long size, unsigned long max)
-{
-}
-
-static inline void trace_megasas_dcmd_enter(int cmd, const char * dcmd, int len)
-{
-}
-
-static inline void trace_megasas_dcmd_dummy(int cmd, unsigned long size)
-{
-}
-
-static inline void trace_megasas_dcmd_set_fw_time(int cmd, unsigned long time)
-{
-}
-
-static inline void trace_megasas_dcmd_pd_get_list(int cmd, int num, int max, int offset)
-{
-}
-
-static inline void trace_megasas_dcmd_ld_get_list(int cmd, int num, int max)
-{
-}
-
-static inline void trace_megasas_dcmd_ld_get_info(int cmd, int ld_id)
-{
-}
-
-static inline void trace_megasas_dcmd_pd_get_info(int cmd, int pd_id)
-{
-}
-
-static inline void trace_megasas_dcmd_pd_list_query(int cmd, int flags)
-{
-}
-
-static inline void trace_megasas_dcmd_unsupported(int cmd, unsigned long size)
-{
-}
-
-static inline void trace_megasas_abort_frame(int cmd, int abort_cmd)
-{
-}
-
-static inline void trace_megasas_abort_no_cmd(int cmd, uint64_t context)
-{
-}
-
-static inline void trace_megasas_abort_invalid_context(int cmd, uint64_t context, int abort_cmd)
-{
-}
-
-static inline void trace_megasas_reset(void)
-{
-}
-
-static inline void trace_megasas_init(int sges, int cmds, const char * intr, const char * mode)
-{
-}
-
-static inline void trace_megasas_msix_raise(int vector)
-{
-}
-
-static inline void trace_megasas_irq_lower(void)
-{
-}
-
-static inline void trace_megasas_irq_raise(void)
-{
-}
-
-static inline void trace_megasas_intr_enabled(void)
-{
-}
-
-static inline void trace_megasas_intr_disabled(void)
-{
-}
-
-static inline void trace_megasas_mmio_readl(unsigned long addr, uint32_t val)
-{
-}
-
-static inline void trace_megasas_mmio_invalid_readl(unsigned long addr)
-{
-}
-
-static inline void trace_megasas_mmio_writel(uint32_t addr, uint32_t val)
-{
-}
-
-static inline void trace_megasas_mmio_invalid_writel(uint32_t addr, uint32_t val)
-{
-}
-
-static inline void trace_milkymist_ac97_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_ac97_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_ac97_pulse_irq_crrequest(void)
-{
-}
-
-static inline void trace_milkymist_ac97_pulse_irq_crreply(void)
-{
-}
-
-static inline void trace_milkymist_ac97_pulse_irq_dmaw(void)
-{
-}
-
-static inline void trace_milkymist_ac97_pulse_irq_dmar(void)
-{
-}
-
-static inline void trace_milkymist_ac97_in_cb(int avail, uint32_t remaining)
-{
-}
-
-static inline void trace_milkymist_ac97_in_cb_transferred(int transferred)
-{
-}
-
-static inline void trace_milkymist_ac97_out_cb(int free, uint32_t remaining)
-{
-}
-
-static inline void trace_milkymist_ac97_out_cb_transferred(int transferred)
-{
-}
-
-static inline void trace_milkymist_hpdmc_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_hpdmc_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_memcard_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_memcard_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_minimac2_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_minimac2_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_minimac2_mdio_write(uint8_t phy_addr, uint8_t addr, uint16_t value)
-{
-}
-
-static inline void trace_milkymist_minimac2_mdio_read(uint8_t phy_addr, uint8_t addr, uint16_t value)
-{
-}
-
-static inline void trace_milkymist_minimac2_tx_frame(uint32_t length)
-{
-}
-
-static inline void trace_milkymist_minimac2_rx_frame(const void * buf, uint32_t length)
-{
-}
-
-static inline void trace_milkymist_minimac2_drop_rx_frame(const void * buf)
-{
-}
-
-static inline void trace_milkymist_minimac2_rx_transfer(const void * buf, uint32_t length)
-{
-}
-
-static inline void trace_milkymist_minimac2_raise_irq_rx(void)
-{
-}
-
-static inline void trace_milkymist_minimac2_lower_irq_rx(void)
-{
-}
-
-static inline void trace_milkymist_minimac2_pulse_irq_tx(void)
-{
-}
-
-static inline void trace_milkymist_pfpu_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_pfpu_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_pfpu_vectout(uint32_t a, uint32_t b, uint32_t dma_ptr)
-{
-}
-
-static inline void trace_milkymist_pfpu_pulse_irq(void)
-{
-}
-
-static inline void trace_milkymist_softusb_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_softusb_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_softusb_mevt(uint8_t m)
-{
-}
-
-static inline void trace_milkymist_softusb_kevt(uint8_t m)
-{
-}
-
-static inline void trace_milkymist_softusb_mouse_event(int dx, int dy, int dz, int bs)
-{
-}
-
-static inline void trace_milkymist_softusb_pulse_irq(void)
-{
-}
-
-static inline void trace_milkymist_sysctl_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_sysctl_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_sysctl_icap_write(uint32_t value)
-{
-}
-
-static inline void trace_milkymist_sysctl_start_timer0(void)
-{
-}
-
-static inline void trace_milkymist_sysctl_stop_timer0(void)
-{
-}
-
-static inline void trace_milkymist_sysctl_start_timer1(void)
-{
-}
-
-static inline void trace_milkymist_sysctl_stop_timer1(void)
-{
-}
-
-static inline void trace_milkymist_sysctl_pulse_irq_timer0(void)
-{
-}
-
-static inline void trace_milkymist_sysctl_pulse_irq_timer1(void)
-{
-}
-
-static inline void trace_milkymist_tmu2_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_tmu2_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_tmu2_start(void)
-{
-}
-
-static inline void trace_milkymist_tmu2_pulse_irq(void)
-{
-}
-
-static inline void trace_milkymist_uart_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_uart_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_uart_raise_irq(void)
-{
-}
-
-static inline void trace_milkymist_uart_lower_irq(void)
-{
-}
-
-static inline void trace_milkymist_vgafb_memory_read(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_milkymist_vgafb_memory_write(uint32_t addr, uint32_t value)
-{
-}
-
-static inline void trace_mipsnet_send(uint32_t size)
-{
-}
-
-static inline void trace_mipsnet_receive(uint32_t size)
-{
-}
-
-static inline void trace_mipsnet_read(uint64_t addr, uint32_t val)
-{
-}
-
-static inline void trace_mipsnet_write(uint64_t addr, uint64_t val)
-{
-}
-
-static inline void trace_mipsnet_irq(uint32_t isr, uint32_t intctl)
-{
-}
-
-static inline void trace_pc87312_io_read(uint32_t addr, uint32_t val)
-{
-}
-
-static inline void trace_pc87312_io_write(uint32_t addr, uint32_t val)
-{
-}
-
-static inline void trace_pc87312_info_floppy(uint32_t base)
-{
-}
-
-static inline void trace_pc87312_info_ide(uint32_t base)
-{
-}
-
-static inline void trace_pc87312_info_parallel(uint32_t base, uint32_t irq)
-{
-}
-
-static inline void trace_pc87312_info_serial(int n, uint32_t base, uint32_t irq)
-{
-}
-
-static inline void trace_pvscsi_ring_init_data(uint32_t txr_len_log2, uint32_t rxr_len_log2)
-{
-}
-
-static inline void trace_pvscsi_ring_init_msg(uint32_t len_log2)
-{
-}
-
-static inline void trace_pvscsi_ring_flush_cmp(uint64_t filled_cmp_ptr)
-{
-}
-
-static inline void trace_pvscsi_ring_flush_msg(uint64_t filled_cmp_ptr)
-{
-}
-
-static inline void trace_pvscsi_update_irq_level(bool raise, uint64_t mask, uint64_t status)
-{
-}
-
-static inline void trace_pvscsi_update_irq_msi(void)
-{
-}
-
-static inline void trace_pvscsi_cmp_ring_put(unsigned long addr)
-{
-}
-
-static inline void trace_pvscsi_msg_ring_put(unsigned long addr)
-{
-}
-
-static inline void trace_pvscsi_complete_request(uint64_t context, uint64_t len, uint8_t sense_key)
-{
-}
-
-static inline void trace_pvscsi_get_sg_list(int nsg, size_t size)
-{
-}
-
-static inline void trace_pvscsi_get_next_sg_elem(uint32_t flags)
-{
-}
-
-static inline void trace_pvscsi_command_complete_not_found(uint32_t tag)
-{
-}
-
-static inline void trace_pvscsi_command_complete_data_run(void)
-{
-}
-
-static inline void trace_pvscsi_command_complete_sense_len(int len)
-{
-}
-
-static inline void trace_pvscsi_convert_sglist(uint64_t context, unsigned long addr, uint32_t resid)
-{
-}
-
-static inline void trace_pvscsi_process_req_descr(uint8_t cmd, uint64_t ctx)
-{
-}
-
-static inline void trace_pvscsi_process_req_descr_unknown_device(void)
-{
-}
-
-static inline void trace_pvscsi_process_req_descr_invalid_dir(void)
-{
-}
-
-static inline void trace_pvscsi_process_io(unsigned long addr)
-{
-}
-
-static inline void trace_pvscsi_on_cmd_noimpl(const char* cmd)
-{
-}
-
-static inline void trace_pvscsi_on_cmd_reset_dev(uint32_t tgt, int lun, void* dev)
-{
-}
-
-static inline void trace_pvscsi_on_cmd_arrived(const char* cmd)
-{
-}
-
-static inline void trace_pvscsi_on_cmd_abort(uint64_t ctx, uint32_t tgt)
-{
-}
-
-static inline void trace_pvscsi_on_cmd_unknown(uint64_t cmd_id)
-{
-}
-
-static inline void trace_pvscsi_on_cmd_unknown_data(uint32_t data)
-{
-}
-
-static inline void trace_pvscsi_io_write(const char* cmd, uint64_t val)
-{
-}
-
-static inline void trace_pvscsi_io_write_unknown(unsigned long addr, unsigned sz, uint64_t val)
-{
-}
-
-static inline void trace_pvscsi_io_read(const char* cmd, uint64_t status)
-{
-}
-
-static inline void trace_pvscsi_io_read_unknown(unsigned long addr, unsigned sz)
-{
-}
-
-static inline void trace_pvscsi_init_msi_fail(int res)
-{
-}
-
-static inline void trace_pvscsi_state(const char* state)
-{
-}
-
-static inline void trace_pvscsi_tx_rings_ppn(const char* label, uint64_t ppn)
-{
-}
-
-static inline void trace_pvscsi_tx_rings_num_pages(const char* label, uint32_t num)
-{
-}
-
-static inline void trace_xen_ram_alloc(unsigned long ram_addr, unsigned long size)
-{
-}
-
-static inline void trace_xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty)
-{
-}
-
-static inline void trace_xen_map_cache(uint64_t phys_addr)
-{
-}
-
-static inline void trace_xen_remap_bucket(uint64_t index)
-{
-}
-
-static inline void trace_xen_map_cache_return(void* ptr)
-{
-}
-
-static inline void trace_xen_map_block(uint64_t phys_addr, uint64_t size)
-{
-}
-
-static inline void trace_xen_unmap_block(void* addr, unsigned long size)
-{
-}
-
-static inline void trace_xen_platform_log(char * s)
-{
-}
-
-static inline void trace_qemu_coroutine_enter(void * from, void * to, void * opaque)
-{
-}
-
-static inline void trace_qemu_coroutine_yield(void * from, void * to)
-{
-}
-
-static inline void trace_qemu_coroutine_terminate(void * co)
-{
-}
-
-static inline void trace_qemu_co_queue_run_restart(void * co)
-{
-}
-
-static inline void trace_qemu_co_queue_next(void * nxt)
-{
-}
-
-static inline void trace_qemu_co_mutex_lock_entry(void * mutex, void * self)
-{
-}
-
-static inline void trace_qemu_co_mutex_lock_return(void * mutex, void * self)
-{
-}
-
-static inline void trace_qemu_co_mutex_unlock_entry(void * mutex, void * self)
-{
-}
-
-static inline void trace_qemu_co_mutex_unlock_return(void * mutex, void * self)
-{
-}
-
-static inline void trace_escc_put_queue(char channel, int b)
-{
-}
-
-static inline void trace_escc_get_queue(char channel, int val)
-{
-}
-
-static inline void trace_escc_update_irq(int irq)
-{
-}
-
-static inline void trace_escc_update_parameters(char channel, int speed, int parity, int data_bits, int stop_bits)
-{
-}
-
-static inline void trace_escc_mem_writeb_ctrl(char channel, uint32_t reg, uint32_t val)
-{
-}
-
-static inline void trace_escc_mem_writeb_data(char channel, uint32_t val)
-{
-}
-
-static inline void trace_escc_mem_readb_ctrl(char channel, uint32_t reg, uint8_t val)
-{
-}
-
-static inline void trace_escc_mem_readb_data(char channel, uint32_t ret)
-{
-}
-
-static inline void trace_escc_serial_receive_byte(char channel, int ch)
-{
-}
-
-static inline void trace_escc_sunkbd_event_in(int ch)
-{
-}
-
-static inline void trace_escc_sunkbd_event_out(int ch)
-{
-}
-
-static inline void trace_escc_kbd_command(int val)
-{
-}
-
-static inline void trace_escc_sunmouse_event(int dx, int dy, int buttons_state)
-{
-}
-
-static inline void trace_iscsi_aio_write16_cb(void * iscsi, int status, void * acb, int canceled)
-{
-}
-
-static inline void trace_iscsi_aio_writev(void * iscsi, int64_t sector_num, int nb_sectors, void * opaque, void * acb)
-{
-}
-
-static inline void trace_iscsi_aio_read16_cb(void * iscsi, int status, void * acb, int canceled)
-{
-}
-
-static inline void trace_iscsi_aio_readv(void * iscsi, int64_t sector_num, int nb_sectors, void * opaque, void * acb)
-{
-}
-
-static inline void trace_esp_error_fifo_overrun(void)
-{
-}
-
-static inline void trace_esp_error_unhandled_command(uint32_t val)
-{
-}
-
-static inline void trace_esp_error_invalid_write(uint32_t val, uint32_t addr)
-{
-}
-
-static inline void trace_esp_raise_irq(void)
-{
-}
-
-static inline void trace_esp_lower_irq(void)
-{
-}
-
-static inline void trace_esp_dma_enable(void)
-{
-}
-
-static inline void trace_esp_dma_disable(void)
-{
-}
-
-static inline void trace_esp_get_cmd(uint32_t dmalen, int target)
-{
-}
-
-static inline void trace_esp_do_busid_cmd(uint8_t busid)
-{
-}
-
-static inline void trace_esp_handle_satn_stop(uint32_t cmdlen)
-{
-}
-
-static inline void trace_esp_write_response(uint32_t status)
-{
-}
-
-static inline void trace_esp_do_dma(uint32_t cmdlen, uint32_t len)
-{
-}
-
-static inline void trace_esp_command_complete(void)
-{
-}
-
-static inline void trace_esp_command_complete_unexpected(void)
-{
-}
-
-static inline void trace_esp_command_complete_fail(void)
-{
-}
-
-static inline void trace_esp_transfer_data(uint32_t dma_left, int32_t ti_size)
-{
-}
-
-static inline void trace_esp_handle_ti(uint32_t minlen)
-{
-}
-
-static inline void trace_esp_handle_ti_cmd(uint32_t cmdlen)
-{
-}
-
-static inline void trace_esp_mem_readb(uint32_t saddr, uint8_t reg)
-{
-}
-
-static inline void trace_esp_mem_writeb(uint32_t saddr, uint8_t reg, uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_nop(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_flush(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_reset(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_bus_reset(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_iccs(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_msgacc(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_pad(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_satn(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_rstatn(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_sel(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_selatn(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_selatns(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_ensel(uint32_t val)
-{
-}
-
-static inline void trace_esp_mem_writeb_cmd_dissel(uint32_t val)
-{
-}
-
-static inline void trace_esp_pci_error_invalid_dma_direction(void)
-{
-}
-
-static inline void trace_esp_pci_error_invalid_read(uint32_t reg)
-{
-}
-
-static inline void trace_esp_pci_error_invalid_write(uint32_t reg)
-{
-}
-
-static inline void trace_esp_pci_error_invalid_write_dma(uint32_t val, uint32_t addr)
-{
-}
-
-static inline void trace_esp_pci_dma_read(uint32_t saddr, uint32_t reg)
-{
-}
-
-static inline void trace_esp_pci_dma_write(uint32_t saddr, uint32_t reg, uint32_t val)
-{
-}
-
-static inline void trace_esp_pci_dma_idle(uint32_t val)
-{
-}
-
-static inline void trace_esp_pci_dma_blast(uint32_t val)
-{
-}
-
-static inline void trace_esp_pci_dma_abort(uint32_t val)
-{
-}
-
-static inline void trace_esp_pci_dma_start(uint32_t val)
-{
-}
-
-static inline void trace_esp_pci_sbac_read(uint32_t reg)
-{
-}
-
-static inline void trace_esp_pci_sbac_write(uint32_t reg, uint32_t val)
-{
-}
-
-static inline void trace_handle_qmp_command(void * mon, const char * cmd_name)
-{
-}
-
-static inline void trace_monitor_protocol_emitter(void * mon)
-{
-}
-
-static inline void trace_monitor_protocol_event(uint32_t event, const char * evname, void * data)
-{
-}
-
-static inline void trace_monitor_protocol_event_handler(uint32_t event, void * data, uint64_t last, uint64_t now)
-{
-}
-
-static inline void trace_monitor_protocol_event_emit(uint32_t event, void * data)
-{
-}
-
-static inline void trace_monitor_protocol_event_queue(uint32_t event, void * data, uint64_t rate, uint64_t last, uint64_t now)
-{
-}
-
-static inline void trace_monitor_protocol_event_throttle(uint32_t event, uint64_t rate)
-{
-}
-
-static inline void trace_open_eth_mii_write(unsigned idx, uint16_t v)
-{
-}
-
-static inline void trace_open_eth_mii_read(unsigned idx, uint16_t v)
-{
-}
-
-static inline void trace_open_eth_update_irq(uint32_t v)
-{
-}
-
-static inline void trace_open_eth_receive(unsigned len)
-{
-}
-
-static inline void trace_open_eth_receive_mcast(unsigned idx, uint32_t h0, uint32_t h1)
-{
-}
-
-static inline void trace_open_eth_receive_reject(void)
-{
-}
-
-static inline void trace_open_eth_receive_desc(uint32_t addr, uint32_t len_flags)
-{
-}
-
-static inline void trace_open_eth_start_xmit(uint32_t addr, unsigned len, unsigned tx_len)
-{
-}
-
-static inline void trace_open_eth_reg_read(uint32_t addr, uint32_t v)
-{
-}
-
-static inline void trace_open_eth_reg_write(uint32_t addr, uint32_t v)
-{
-}
-
-static inline void trace_open_eth_desc_read(uint32_t addr, uint32_t v)
-{
-}
-
-static inline void trace_open_eth_desc_write(uint32_t addr, uint32_t v)
-{
-}
-
-static inline void trace_v9fs_rerror(uint16_t tag, uint8_t id, int err)
-{
-}
-
-static inline void trace_v9fs_version(uint16_t tag, uint8_t id, int32_t msize, char* version)
-{
-}
-
-static inline void trace_v9fs_version_return(uint16_t tag, uint8_t id, int32_t msize, char* version)
-{
-}
-
-static inline void trace_v9fs_attach(uint16_t tag, uint8_t id, int32_t fid, int32_t afid, char* uname, char* aname)
-{
-}
-
-static inline void trace_v9fs_attach_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path)
-{
-}
-
-static inline void trace_v9fs_stat(uint16_t tag, uint8_t id, int32_t fid)
-{
-}
-
-static inline void trace_v9fs_stat_return(uint16_t tag, uint8_t id, int32_t mode, int32_t atime, int32_t mtime, int64_t length)
-{
-}
-
-static inline void trace_v9fs_getattr(uint16_t tag, uint8_t id, int32_t fid, uint64_t request_mask)
-{
-}
-
-static inline void trace_v9fs_getattr_return(uint16_t tag, uint8_t id, uint64_t result_mask, uint32_t mode, uint32_t uid, uint32_t gid)
-{
-}
-
-static inline void trace_v9fs_walk(uint16_t tag, uint8_t id, int32_t fid, int32_t newfid, uint16_t nwnames)
-{
-}
-
-static inline void trace_v9fs_walk_return(uint16_t tag, uint8_t id, uint16_t nwnames, void* qids)
-{
-}
-
-static inline void trace_v9fs_open(uint16_t tag, uint8_t id, int32_t fid, int32_t mode)
-{
-}
-
-static inline void trace_v9fs_open_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path, int iounit)
-{
-}
-
-static inline void trace_v9fs_lcreate(uint16_t tag, uint8_t id, int32_t dfid, int32_t flags, int32_t mode, uint32_t gid)
-{
-}
-
-static inline void trace_v9fs_lcreate_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path, int32_t iounit)
-{
-}
-
-static inline void trace_v9fs_fsync(uint16_t tag, uint8_t id, int32_t fid, int datasync)
-{
-}
-
-static inline void trace_v9fs_clunk(uint16_t tag, uint8_t id, int32_t fid)
-{
-}
-
-static inline void trace_v9fs_read(uint16_t tag, uint8_t id, int32_t fid, uint64_t off, uint32_t max_count)
-{
-}
-
-static inline void trace_v9fs_read_return(uint16_t tag, uint8_t id, int32_t count, ssize_t err)
-{
-}
-
-static inline void trace_v9fs_readdir(uint16_t tag, uint8_t id, int32_t fid, uint64_t offset, uint32_t max_count)
-{
-}
-
-static inline void trace_v9fs_readdir_return(uint16_t tag, uint8_t id, uint32_t count, ssize_t retval)
-{
-}
-
-static inline void trace_v9fs_write(uint16_t tag, uint8_t id, int32_t fid, uint64_t off, uint32_t count, int cnt)
-{
-}
-
-static inline void trace_v9fs_write_return(uint16_t tag, uint8_t id, int32_t total, ssize_t err)
-{
-}
-
-static inline void trace_v9fs_create(uint16_t tag, uint8_t id, int32_t fid, char* name, int32_t perm, int8_t mode)
-{
-}
-
-static inline void trace_v9fs_create_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path, int iounit)
-{
-}
-
-static inline void trace_v9fs_symlink(uint16_t tag, uint8_t id, int32_t fid, char* name, char* symname, uint32_t gid)
-{
-}
-
-static inline void trace_v9fs_symlink_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path)
-{
-}
-
-static inline void trace_v9fs_flush(uint16_t tag, uint8_t id, int16_t flush_tag)
-{
-}
-
-static inline void trace_v9fs_link(uint16_t tag, uint8_t id, int32_t dfid, int32_t oldfid, char* name)
-{
-}
-
-static inline void trace_v9fs_remove(uint16_t tag, uint8_t id, int32_t fid)
-{
-}
-
-static inline void trace_v9fs_wstat(uint16_t tag, uint8_t id, int32_t fid, int32_t mode, int32_t atime, int32_t mtime)
-{
-}
-
-static inline void trace_v9fs_mknod(uint16_t tag, uint8_t id, int32_t fid, int mode, int major, int minor)
-{
-}
-
-static inline void trace_v9fs_mknod_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path)
-{
-}
-
-static inline void trace_v9fs_lock(uint16_t tag, uint8_t id, int32_t fid, uint8_t type, uint64_t start, uint64_t length)
-{
-}
-
-static inline void trace_v9fs_lock_return(uint16_t tag, uint8_t id, int8_t status)
-{
-}
-
-static inline void trace_v9fs_getlock(uint16_t tag, uint8_t id, int32_t fid, uint8_t type, uint64_t start, uint64_t length)
-{
-}
-
-static inline void trace_v9fs_getlock_return(uint16_t tag, uint8_t id, uint8_t type, uint64_t start, uint64_t length, uint32_t proc_id)
-{
-}
-
-static inline void trace_v9fs_mkdir(uint16_t tag, uint8_t id, int32_t fid, char* name, int mode, uint32_t gid)
-{
-}
-
-static inline void trace_v9fs_mkdir_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path, int err)
-{
-}
-
-static inline void trace_v9fs_xattrwalk(uint16_t tag, uint8_t id, int32_t fid, int32_t newfid, char* name)
-{
-}
-
-static inline void trace_v9fs_xattrwalk_return(uint16_t tag, uint8_t id, int64_t size)
-{
-}
-
-static inline void trace_v9fs_xattrcreate(uint16_t tag, uint8_t id, int32_t fid, char* name, int64_t size, int flags)
-{
-}
-
-static inline void trace_v9fs_readlink(uint16_t tag, uint8_t id, int32_t fid)
-{
-}
-
-static inline void trace_v9fs_readlink_return(uint16_t tag, uint8_t id, char* target)
-{
-}
-
-static inline void trace_mmu_helper_dfault(uint64_t address, uint64_t context, int mmu_idx, uint32_t tl)
-{
-}
-
-static inline void trace_mmu_helper_dprot(uint64_t address, uint64_t context, int mmu_idx, uint32_t tl)
-{
-}
-
-static inline void trace_mmu_helper_dmiss(uint64_t address, uint64_t context)
-{
-}
-
-static inline void trace_mmu_helper_tfault(uint64_t address, uint64_t context)
-{
-}
-
-static inline void trace_mmu_helper_tmiss(uint64_t address, uint64_t context)
-{
-}
-
-static inline void trace_mmu_helper_get_phys_addr_code(uint32_t tl, int mmu_idx, uint64_t prim_context, uint64_t sec_context, uint64_t address)
-{
-}
-
-static inline void trace_mmu_helper_get_phys_addr_data(uint32_t tl, int mmu_idx, uint64_t prim_context, uint64_t sec_context, uint64_t address)
-{
-}
-
-static inline void trace_mmu_helper_mmu_fault(uint64_t address, uint64_t paddr, int mmu_idx, uint32_t tl, uint64_t prim_context, uint64_t sec_context)
-{
-}
-
-static inline void trace_int_helper_set_softint(uint32_t softint)
-{
-}
-
-static inline void trace_int_helper_clear_softint(uint32_t softint)
-{
-}
-
-static inline void trace_int_helper_write_softint(uint32_t softint)
-{
-}
-
-static inline void trace_int_helper_icache_freeze(void)
-{
-}
-
-static inline void trace_int_helper_dcache_freeze(void)
-{
-}
-
-static inline void trace_win_helper_gregset_error(uint32_t pstate)
-{
-}
-
-static inline void trace_win_helper_switch_pstate(uint32_t pstate_regs, uint32_t new_pstate_regs)
-{
-}
-
-static inline void trace_win_helper_no_switch_pstate(uint32_t new_pstate_regs)
-{
-}
-
-static inline void trace_win_helper_wrpil(uint32_t psrpil, uint32_t new_pil)
-{
-}
-
-static inline void trace_win_helper_done(uint32_t tl)
-{
-}
-
-static inline void trace_win_helper_retry(uint32_t tl)
-{
-}
-
-static inline void trace_dma_bdrv_io(void * dbs, void * bs, int64_t sector_num, bool to_dev)
-{
-}
-
-static inline void trace_dma_aio_cancel(void * dbs)
-{
-}
-
-static inline void trace_dma_complete(void * dbs, int ret, void * cb)
-{
-}
-
-static inline void trace_dma_bdrv_cb(void * dbs, int ret)
-{
-}
-
-static inline void trace_dma_map_wait(void * dbs)
-{
-}
-
-static inline void trace_console_gfx_new(void)
-{
-}
-
-static inline void trace_console_txt_new(int w, int h)
-{
-}
-
-static inline void trace_console_select(int nr)
-{
-}
-
-static inline void trace_console_refresh(int interval)
-{
-}
-
-static inline void trace_displaysurface_create(void * display_surface, int w, int h)
-{
-}
-
-static inline void trace_displaysurface_create_from(void * display_surface, int w, int h, int bpp, int swap)
-{
-}
-
-static inline void trace_displaysurface_free(void * display_surface)
-{
-}
-
-static inline void trace_displaychangelistener_register(void * dcl, const char * name)
-{
-}
-
-static inline void trace_displaychangelistener_unregister(void * dcl, const char * name)
-{
-}
-
-static inline void trace_ppm_save(const char * filename, void * display_surface)
-{
-}
-
-static inline void trace_vmware_value_read(uint32_t index, uint32_t value)
-{
-}
-
-static inline void trace_vmware_value_write(uint32_t index, uint32_t value)
-{
-}
-
-static inline void trace_vmware_palette_read(uint32_t index, uint32_t value)
-{
-}
-
-static inline void trace_vmware_palette_write(uint32_t index, uint32_t value)
-{
-}
-
-static inline void trace_vmware_scratch_read(uint32_t index, uint32_t value)
-{
-}
-
-static inline void trace_vmware_scratch_write(uint32_t index, uint32_t value)
-{
-}
-
-static inline void trace_vmware_setmode(uint32_t w, uint32_t h, uint32_t bpp)
-{
-}
-
-static inline void trace_savevm_section_start(void)
-{
-}
-
-static inline void trace_savevm_section_end(unsigned int section_id)
-{
-}
-
-static inline void trace_migration_bitmap_sync_start(void)
-{
-}
-
-static inline void trace_migration_bitmap_sync_end(uint64_t dirty_pages)
-{
-}
-
-static inline void trace_migration_throttle(void)
-{
-}
-
-static inline void trace_qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position)
-{
-}
-
-static inline void trace_qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t flags)
-{
-}
-
-static inline void trace_qxl_destroy_primary(int qid)
-{
-}
-
-static inline void trace_qxl_enter_vga_mode(int qid)
-{
-}
-
-static inline void trace_qxl_exit_vga_mode(int qid)
-{
-}
-
-static inline void trace_qxl_hard_reset(int qid, int64_t loadvm)
-{
-}
-
-static inline void trace_qxl_interface_async_complete_io(int qid, uint32_t current_async, void * cookie)
-{
-}
-
-static inline void trace_qxl_interface_attach_worker(int qid)
-{
-}
-
-static inline void trace_qxl_interface_get_init_info(int qid)
-{
-}
-
-static inline void trace_qxl_interface_set_compression_level(int qid, int64_t level)
-{
-}
-
-static inline void trace_qxl_interface_update_area_complete(int qid, uint32_t surface_id, uint32_t dirty_left, uint32_t dirty_right, uint32_t dirty_top, uint32_t dirty_bottom)
-{
-}
-
-static inline void trace_qxl_interface_update_area_complete_rest(int qid, uint32_t num_updated_rects)
-{
-}
-
-static inline void trace_qxl_interface_update_area_complete_overflow(int qid, int max)
-{
-}
-
-static inline void trace_qxl_interface_update_area_complete_schedule_bh(int qid, uint32_t num_dirty)
-{
-}
-
-static inline void trace_qxl_io_destroy_primary_ignored(int qid, const char * mode)
-{
-}
-
-static inline void trace_qxl_io_log(int qid, const uint8_t * log_buf)
-{
-}
-
-static inline void trace_qxl_io_read_unexpected(int qid)
-{
-}
-
-static inline void trace_qxl_io_unexpected_vga_mode(int qid, uint64_t addr, uint64_t val, const char * desc)
-{
-}
-
-static inline void trace_qxl_io_write(int qid, const char * mode, uint64_t addr, uint64_t val, unsigned size, int async)
-{
-}
-
-static inline void trace_qxl_memslot_add_guest(int qid, uint32_t slot_id, uint64_t guest_start, uint64_t guest_end)
-{
-}
-
-static inline void trace_qxl_post_load(int qid, const char * mode)
-{
-}
-
-static inline void trace_qxl_pre_load(int qid)
-{
-}
-
-static inline void trace_qxl_pre_save(int qid)
-{
-}
-
-static inline void trace_qxl_reset_surfaces(int qid)
-{
-}
-
-static inline void trace_qxl_ring_command_check(int qid, const char * mode)
-{
-}
-
-static inline void trace_qxl_ring_command_get(int qid, const char * mode)
-{
-}
-
-static inline void trace_qxl_ring_command_req_notification(int qid)
-{
-}
-
-static inline void trace_qxl_ring_cursor_check(int qid, const char * mode)
-{
-}
-
-static inline void trace_qxl_ring_cursor_get(int qid, const char * mode)
-{
-}
-
-static inline void trace_qxl_ring_cursor_req_notification(int qid)
-{
-}
-
-static inline void trace_qxl_ring_res_push(int qid, const char * mode, uint32_t surface_count, uint32_t free_res, void * last_release, const char * notify)
-{
-}
-
-static inline void trace_qxl_ring_res_push_rest(int qid, uint32_t ring_has, uint32_t ring_size, uint32_t prod, uint32_t cons)
-{
-}
-
-static inline void trace_qxl_ring_res_put(int qid, uint32_t free_res)
-{
-}
-
-static inline void trace_qxl_set_mode(int qid, int modenr, uint32_t x_res, uint32_t y_res, uint32_t bits, uint64_t devmem)
-{
-}
-
-static inline void trace_qxl_soft_reset(int qid)
-{
-}
-
-static inline void trace_qemu_spice_add_memslot(int qid, uint32_t slot_id, unsigned long virt_start, unsigned long virt_end, int async)
-{
-}
-
-static inline void trace_qemu_spice_del_memslot(int qid, uint32_t gid, uint32_t slot_id)
-{
-}
-
-static inline void trace_qemu_spice_create_primary_surface(int qid, uint32_t sid, void * surface, int async)
-{
-}
-
-static inline void trace_qemu_spice_destroy_primary_surface(int qid, uint32_t sid, int async)
-{
-}
-
-static inline void trace_qemu_spice_wakeup(uint32_t qid)
-{
-}
-
-static inline void trace_qemu_spice_start(uint32_t qid)
-{
-}
-
-static inline void trace_qemu_spice_stop(uint32_t qid)
-{
-}
-
-static inline void trace_qemu_spice_create_update(uint32_t left, uint32_t right, uint32_t top, uint32_t bottom)
-{
-}
-
-static inline void trace_qxl_spice_destroy_surfaces_complete(int qid)
-{
-}
-
-static inline void trace_qxl_spice_destroy_surfaces(int qid, int async)
-{
-}
-
-static inline void trace_qxl_spice_destroy_surface_wait_complete(int qid, uint32_t id)
-{
-}
-
-static inline void trace_qxl_spice_destroy_surface_wait(int qid, uint32_t id, int async)
-{
-}
-
-static inline void trace_qxl_spice_flush_surfaces_async(int qid, uint32_t surface_count, uint32_t num_free_res)
-{
-}
-
-static inline void trace_qxl_spice_monitors_config(int qid)
-{
-}
-
-static inline void trace_qxl_spice_loadvm_commands(int qid, void * ext, uint32_t count)
-{
-}
-
-static inline void trace_qxl_spice_oom(int qid)
-{
-}
-
-static inline void trace_qxl_spice_reset_cursor(int qid)
-{
-}
-
-static inline void trace_qxl_spice_reset_image_cache(int qid)
-{
-}
-
-static inline void trace_qxl_spice_reset_memslots(int qid)
-{
-}
-
-static inline void trace_qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_t right, uint32_t top, uint32_t bottom)
-{
-}
-
-static inline void trace_qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t clear_dirty_region)
-{
-}
-
-static inline void trace_qxl_surfaces_dirty(int qid, int surface, int offset, int size)
-{
-}
-
-static inline void trace_qxl_send_events(int qid, uint32_t events)
-{
-}
-
-static inline void trace_qxl_send_events_vm_stopped(int qid, uint32_t events)
-{
-}
-
-static inline void trace_qxl_set_guest_bug(int qid)
-{
-}
-
-static inline void trace_qxl_interrupt_client_monitors_config(int qid, int num_heads, void * heads)
-{
-}
-
-static inline void trace_qxl_client_monitors_config_unsupported_by_guest(int qid, uint32_t int_mask, void * client_monitors_config)
-{
-}
-
-static inline void trace_qxl_client_monitors_config_unsupported_by_device(int qid, int revision)
-{
-}
-
-static inline void trace_qxl_client_monitors_config_capped(int qid, int requested, int limit)
-{
-}
-
-static inline void trace_qxl_client_monitors_config_crc(int qid, unsigned size, uint32_t crc32)
-{
-}
-
-static inline void trace_qxl_set_client_capabilities_unsupported_by_revision(int qid, int revision)
-{
-}
-
-static inline void trace_qxl_render_blit_guest_primary_initialized(void)
-{
-}
-
-static inline void trace_qxl_render_blit(int32_t stride, int32_t left, int32_t right, int32_t top, int32_t bottom)
-{
-}
-
-static inline void trace_qxl_render_guest_primary_resized(int32_t width, int32_t height, int32_t stride, int32_t bytes_pp, int32_t bits_pp)
-{
-}
-
-static inline void trace_qxl_render_update_area_done(void * cookie)
-{
-}
-
-static inline void trace_spapr_pci_msi(const char * msg, uint32_t n, uint32_t ca)
-{
-}
-
-static inline void trace_spapr_pci_msi_setup(const char * name, unsigned vector, uint64_t addr)
-{
-}
-
-static inline void trace_spapr_pci_rtas_ibm_change_msi(unsigned func, unsigned req)
-{
-}
-
-static inline void trace_spapr_pci_rtas_ibm_query_interrupt_source_number(unsigned ioa, unsigned intr)
-{
-}
-
-static inline void trace_spapr_pci_msi_write(uint64_t addr, uint64_t data, uint32_t dt_irq)
-{
-}
-
-static inline void trace_spapr_pci_lsi_set(const char * busname, int pin, uint32_t irq)
-{
-}
-
-static inline void trace_xics_icp_check_ipi(int server, uint8_t mfrr)
-{
-}
-
-static inline void trace_xics_icp_accept(uint32_t old_xirr, uint32_t new_xirr)
-{
-}
-
-static inline void trace_xics_icp_eoi(int server, uint32_t xirr, uint32_t new_xirr)
-{
-}
-
-static inline void trace_xics_icp_irq(int server, int nr, uint8_t priority)
-{
-}
-
-static inline void trace_xics_icp_raise(uint32_t xirr, uint8_t pending_priority)
-{
-}
-
-static inline void trace_xics_set_irq_msi(int srcno, int nr)
-{
-}
-
-static inline void trace_xics_masked_pending(void)
-{
-}
-
-static inline void trace_xics_set_irq_lsi(int srcno, int nr)
-{
-}
-
-static inline void trace_xics_ics_write_xive(int nr, int srcno, int server, uint8_t priority)
-{
-}
-
-static inline void trace_xics_ics_reject(int nr, int srcno)
-{
-}
-
-static inline void trace_xics_ics_eoi(int nr)
-{
-}
-
-static inline void trace_hbitmap_iter_skip_words(const void * hb, void * hbi, uint64_t pos, unsigned long cur)
-{
-}
-
-static inline void trace_hbitmap_reset(void * hb, uint64_t start, uint64_t count, uint64_t sbit, uint64_t ebit)
-{
-}
-
-static inline void trace_hbitmap_set(void * hb, uint64_t start, uint64_t count, uint64_t sbit, uint64_t ebit)
-{
-}
-
-static inline void trace_ioinst(const char * insn)
-{
-}
-
-static inline void trace_ioinst_sch_id(const char * insn, int cssid, int ssid, int schid)
-{
-}
-
-static inline void trace_ioinst_chp_id(const char * insn, int cssid, int chpid)
-{
-}
-
-static inline void trace_ioinst_chsc_cmd(uint16_t cmd, uint16_t len)
-{
-}
-
-static inline void trace_css_enable_facility(const char * facility)
-{
-}
-
-static inline void trace_css_crw(uint8_t rsc, uint8_t erc, uint16_t rsid, const char * chained)
-{
-}
-
-static inline void trace_css_chpid_add(uint8_t cssid, uint8_t chpid, uint8_t type)
-{
-}
-
-static inline void trace_css_new_image(uint8_t cssid, const char * default_cssid)
-{
-}
-
-static inline void trace_css_assign_subch(const char * do_assign, uint8_t cssid, uint8_t ssid, uint16_t schid, uint16_t devno)
-{
-}
-
-static inline void trace_css_io_interrupt(int cssid, int ssid, int schid, uint32_t intparm, uint8_t isc, const char * conditional)
-{
-}
-
-static inline void trace_virtio_ccw_interpret_ccw(int cssid, int ssid, int schid, int cmd_code)
-{
-}
-
-static inline void trace_virtio_ccw_new_device(int cssid, int ssid, int schid, int devno, const char * devno_mode)
-{
-}
-
-static inline void trace_migrate_set_state(int new_state)
-{
-}
-
-static inline void trace_kvm_ioctl(int type, void * arg)
-{
-}
-
-static inline void trace_kvm_vm_ioctl(int type, void * arg)
-{
-}
-
-static inline void trace_kvm_vcpu_ioctl(int cpu_index, int type, void * arg)
-{
-}
-
-static inline void trace_kvm_run_exit(int cpu_index, uint32_t reason)
-{
-}
-
-static inline void trace_object_dynamic_cast_assert(const char * type, const char * target, const char * file, int line, const char * func)
-{
-}
-
-static inline void trace_object_class_dynamic_cast_assert(const char * type, const char * target, const char * file, int line, const char * func)
-{
-}
-#endif /* TRACE__GENERATED_TRACERS_H */
diff --git a/contrib/qemu/util/aes.c b/contrib/qemu/util/aes.c
deleted file mode 100644
index 91e97fa6e..000000000
--- a/contrib/qemu/util/aes.c
+++ /dev/null
@@ -1,1314 +0,0 @@
-/**
- *
- * aes.c - integrated in QEMU by Fabrice Bellard from the OpenSSL project.
- */
-/*
- * rijndael-alg-fst.c
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "qemu-common.h"
-#include "qemu/aes.h"
-
-#ifndef NDEBUG
-#define NDEBUG
-#endif
-
-typedef uint32_t u32;
-typedef uint16_t u16;
-typedef uint8_t u8;
-
-/* This controls loop-unrolling in aes_core.c */
-#undef FULL_UNROLL
-# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
-# define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
-
-/*
-AES_Te0[x] = S [x].[02, 01, 01, 03];
-AES_Te1[x] = S [x].[03, 02, 01, 01];
-AES_Te2[x] = S [x].[01, 03, 02, 01];
-AES_Te3[x] = S [x].[01, 01, 03, 02];
-AES_Te4[x] = S [x].[01, 01, 01, 01];
-
-AES_Td0[x] = Si[x].[0e, 09, 0d, 0b];
-AES_Td1[x] = Si[x].[0b, 0e, 09, 0d];
-AES_Td2[x] = Si[x].[0d, 0b, 0e, 09];
-AES_Td3[x] = Si[x].[09, 0d, 0b, 0e];
-AES_Td4[x] = Si[x].[01, 01, 01, 01];
-*/
-
-const uint32_t AES_Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-};
-const uint32_t AES_Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
-};
-const uint32_t AES_Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
-};
-const uint32_t AES_Te3[256] = {
-
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
-};
-const uint32_t AES_Te4[256] = {
-    0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
-    0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
-    0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
-    0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
-    0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
-    0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
-    0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
-    0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
-    0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
-    0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
-    0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
-    0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
-    0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
-    0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
-    0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
-    0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
-    0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
-    0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
-    0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
-    0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
-    0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
-    0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
-    0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
-    0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
-    0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
-    0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
-    0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
-    0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
-    0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
-    0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
-    0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
-    0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
-    0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
-    0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
-    0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
-    0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
-    0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
-    0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
-    0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
-    0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
-    0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
-    0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
-    0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
-    0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
-    0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
-    0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
-    0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
-    0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
-    0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
-    0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
-    0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
-    0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
-    0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
-    0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
-    0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
-    0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
-    0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
-    0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
-    0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
-    0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
-    0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
-    0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
-    0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
-    0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
-};
-const uint32_t AES_Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-};
-const uint32_t AES_Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
-};
-const uint32_t AES_Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
-};
-const uint32_t AES_Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
-};
-const uint32_t AES_Td4[256] = {
-    0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
-    0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
-    0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
-    0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
-    0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
-    0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
-    0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
-    0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
-    0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
-    0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
-    0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
-    0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
-    0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
-    0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
-    0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
-    0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
-    0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
-    0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
-    0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
-    0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
-    0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
-    0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
-    0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
-    0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
-    0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
-    0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
-    0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
-    0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
-    0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
-    0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
-    0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
-    0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
-    0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
-    0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
-    0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
-    0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
-    0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
-    0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
-    0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
-    0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
-    0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
-    0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
-    0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
-    0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
-    0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
-    0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
-    0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
-    0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
-    0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
-    0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
-    0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
-    0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
-    0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
-    0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
-    0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
-    0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
-    0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
-    0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
-    0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
-    0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
-    0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
-    0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
-    0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
-    0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
-};
-static const u32 rcon[] = {
-	0x01000000, 0x02000000, 0x04000000, 0x08000000,
-	0x10000000, 0x20000000, 0x40000000, 0x80000000,
-	0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-/**
- * Expand the cipher key into the encryption key schedule.
- */
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-			AES_KEY *key) {
-
-	u32 *rk;
-   	int i = 0;
-	u32 temp;
-
-	if (!userKey || !key)
-		return -1;
-	if (bits != 128 && bits != 192 && bits != 256)
-		return -2;
-
-	rk = key->rd_key;
-
-	if (bits==128)
-		key->rounds = 10;
-	else if (bits==192)
-		key->rounds = 12;
-	else
-		key->rounds = 14;
-
-	rk[0] = GETU32(userKey     );
-	rk[1] = GETU32(userKey +  4);
-	rk[2] = GETU32(userKey +  8);
-	rk[3] = GETU32(userKey + 12);
-	if (bits == 128) {
-		while (1) {
-			temp  = rk[3];
-			rk[4] = rk[0] ^
-                                (AES_Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                                (AES_Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                                (AES_Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                                (AES_Te4[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[5] = rk[1] ^ rk[4];
-			rk[6] = rk[2] ^ rk[5];
-			rk[7] = rk[3] ^ rk[6];
-			if (++i == 10) {
-				return 0;
-			}
-			rk += 4;
-		}
-	}
-	rk[4] = GETU32(userKey + 16);
-	rk[5] = GETU32(userKey + 20);
-	if (bits == 192) {
-		while (1) {
-			temp = rk[ 5];
-			rk[ 6] = rk[ 0] ^
-                                (AES_Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                                (AES_Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                                (AES_Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                                (AES_Te4[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[ 7] = rk[ 1] ^ rk[ 6];
-			rk[ 8] = rk[ 2] ^ rk[ 7];
-			rk[ 9] = rk[ 3] ^ rk[ 8];
-			if (++i == 8) {
-				return 0;
-			}
-			rk[10] = rk[ 4] ^ rk[ 9];
-			rk[11] = rk[ 5] ^ rk[10];
-			rk += 6;
-		}
-	}
-	rk[6] = GETU32(userKey + 24);
-	rk[7] = GETU32(userKey + 28);
-	if (bits == 256) {
-		while (1) {
-			temp = rk[ 7];
-			rk[ 8] = rk[ 0] ^
-                                (AES_Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                                (AES_Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                                (AES_Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                                (AES_Te4[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[ 9] = rk[ 1] ^ rk[ 8];
-			rk[10] = rk[ 2] ^ rk[ 9];
-			rk[11] = rk[ 3] ^ rk[10];
-			if (++i == 7) {
-				return 0;
-			}
-			temp = rk[11];
-			rk[12] = rk[ 4] ^
-                                (AES_Te4[(temp >> 24)       ] & 0xff000000) ^
-                                (AES_Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
-                                (AES_Te4[(temp >>  8) & 0xff] & 0x0000ff00) ^
-                                (AES_Te4[(temp      ) & 0xff] & 0x000000ff);
-			rk[13] = rk[ 5] ^ rk[12];
-			rk[14] = rk[ 6] ^ rk[13];
-			rk[15] = rk[ 7] ^ rk[14];
-
-			rk += 8;
-        	}
-	}
-	return 0;
-}
-
-/**
- * Expand the cipher key into the decryption key schedule.
- */
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-			 AES_KEY *key) {
-
-        u32 *rk;
-	int i, j, status;
-	u32 temp;
-
-	/* first, start with an encryption schedule */
-	status = AES_set_encrypt_key(userKey, bits, key);
-	if (status < 0)
-		return status;
-
-	rk = key->rd_key;
-
-	/* invert the order of the round keys: */
-	for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-		temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-		temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-		temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-		temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-	}
-	/* apply the inverse MixColumn transform to all round keys but the first and the last: */
-	for (i = 1; i < (key->rounds); i++) {
-		rk += 4;
-		rk[0] =
-                        AES_Td0[AES_Te4[(rk[0] >> 24)       ] & 0xff] ^
-                        AES_Td1[AES_Te4[(rk[0] >> 16) & 0xff] & 0xff] ^
-                        AES_Td2[AES_Te4[(rk[0] >>  8) & 0xff] & 0xff] ^
-                        AES_Td3[AES_Te4[(rk[0]      ) & 0xff] & 0xff];
-		rk[1] =
-                        AES_Td0[AES_Te4[(rk[1] >> 24)       ] & 0xff] ^
-                        AES_Td1[AES_Te4[(rk[1] >> 16) & 0xff] & 0xff] ^
-                        AES_Td2[AES_Te4[(rk[1] >>  8) & 0xff] & 0xff] ^
-                        AES_Td3[AES_Te4[(rk[1]      ) & 0xff] & 0xff];
-		rk[2] =
-                        AES_Td0[AES_Te4[(rk[2] >> 24)       ] & 0xff] ^
-                        AES_Td1[AES_Te4[(rk[2] >> 16) & 0xff] & 0xff] ^
-                        AES_Td2[AES_Te4[(rk[2] >>  8) & 0xff] & 0xff] ^
-                        AES_Td3[AES_Te4[(rk[2]      ) & 0xff] & 0xff];
-		rk[3] =
-                        AES_Td0[AES_Te4[(rk[3] >> 24)       ] & 0xff] ^
-                        AES_Td1[AES_Te4[(rk[3] >> 16) & 0xff] & 0xff] ^
-                        AES_Td2[AES_Te4[(rk[3] >>  8) & 0xff] & 0xff] ^
-                        AES_Td3[AES_Te4[(rk[3]      ) & 0xff] & 0xff];
-	}
-	return 0;
-}
-
-#ifndef AES_ASM
-/*
- * Encrypt a single block
- * in and out can overlap
- */
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-		 const AES_KEY *key) {
-
-	const u32 *rk;
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-	int r;
-#endif /* ?FULL_UNROLL */
-
-	assert(in && out && key);
-	rk = key->rd_key;
-
-	/*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-	s0 = GETU32(in     ) ^ rk[0];
-	s1 = GETU32(in +  4) ^ rk[1];
-	s2 = GETU32(in +  8) ^ rk[2];
-	s3 = GETU32(in + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-	/* round 1: */
-        t0 = AES_Te0[s0 >> 24] ^ AES_Te1[(s1 >> 16) & 0xff] ^ AES_Te2[(s2 >>  8) & 0xff] ^ AES_Te3[s3 & 0xff] ^ rk[ 4];
-        t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >>  8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[ 5];
-        t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >>  8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[ 6];
-        t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >>  8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[ 7];
-   	/* round 2: */
-        s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >>  8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[ 8];
-        s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >>  8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[ 9];
-        s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >>  8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[10];
-        s3 = AES_Te0[t3 >> 24] ^ AES_Te1[(t0 >> 16) & 0xff] ^ AES_Te2[(t1 >>  8) & 0xff] ^ AES_Te3[t2 & 0xff] ^ rk[11];
-	/* round 3: */
-        t0 = AES_Te0[s0 >> 24] ^ AES_Te1[(s1 >> 16) & 0xff] ^ AES_Te2[(s2 >>  8) & 0xff] ^ AES_Te3[s3 & 0xff] ^ rk[12];
-        t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >>  8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[13];
-        t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >>  8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[14];
-        t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >>  8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[15];
-   	/* round 4: */
-        s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >>  8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[16];
-        s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >>  8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[17];
-        s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >>  8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[18];
-        s3 = AES_Te0[t3 >> 24] ^ AES_Te1[(t0 >> 16) & 0xff] ^ AES_Te2[(t1 >>  8) & 0xff] ^ AES_Te3[t2 & 0xff] ^ rk[19];
-	/* round 5: */
-        t0 = AES_Te0[s0 >> 24] ^ AES_Te1[(s1 >> 16) & 0xff] ^ AES_Te2[(s2 >>  8) & 0xff] ^ AES_Te3[s3 & 0xff] ^ rk[20];
-        t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >>  8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[21];
-        t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >>  8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[22];
-        t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >>  8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[23];
-   	/* round 6: */
-        s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >>  8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[24];
-        s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >>  8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[25];
-        s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >>  8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[26];
-        s3 = AES_Te0[t3 >> 24] ^ AES_Te1[(t0 >> 16) & 0xff] ^ AES_Te2[(t1 >>  8) & 0xff] ^ AES_Te3[t2 & 0xff] ^ rk[27];
-	/* round 7: */
-        t0 = AES_Te0[s0 >> 24] ^ AES_Te1[(s1 >> 16) & 0xff] ^ AES_Te2[(s2 >>  8) & 0xff] ^ AES_Te3[s3 & 0xff] ^ rk[28];
-        t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >>  8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[29];
-        t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >>  8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[30];
-        t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >>  8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[31];
-   	/* round 8: */
-        s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >>  8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[32];
-        s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >>  8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[33];
-        s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >>  8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[34];
-        s3 = AES_Te0[t3 >> 24] ^ AES_Te1[(t0 >> 16) & 0xff] ^ AES_Te2[(t1 >>  8) & 0xff] ^ AES_Te3[t2 & 0xff] ^ rk[35];
-	/* round 9: */
-        t0 = AES_Te0[s0 >> 24] ^ AES_Te1[(s1 >> 16) & 0xff] ^ AES_Te2[(s2 >>  8) & 0xff] ^ AES_Te3[s3 & 0xff] ^ rk[36];
-        t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >>  8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[37];
-        t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >>  8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[38];
-        t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >>  8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >>  8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[40];
-        s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >>  8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[41];
-        s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >>  8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[42];
-        s3 = AES_Te0[t3 >> 24] ^ AES_Te1[(t0 >> 16) & 0xff] ^ AES_Te2[(t1 >>  8) & 0xff] ^ AES_Te3[t2 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = AES_Te0[s0 >> 24] ^ AES_Te1[(s1 >> 16) & 0xff] ^ AES_Te2[(s2 >>  8) & 0xff] ^ AES_Te3[s3 & 0xff] ^ rk[44];
-        t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >>  8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[45];
-        t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >>  8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[46];
-        t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >>  8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >>  8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[48];
-            s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >>  8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[49];
-            s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >>  8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[50];
-            s3 = AES_Te0[t3 >> 24] ^ AES_Te1[(t0 >> 16) & 0xff] ^ AES_Te2[(t1 >>  8) & 0xff] ^ AES_Te3[t2 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = AES_Te0[s0 >> 24] ^ AES_Te1[(s1 >> 16) & 0xff] ^ AES_Te2[(s2 >>  8) & 0xff] ^ AES_Te3[s3 & 0xff] ^ rk[52];
-            t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >>  8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[53];
-            t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >>  8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[54];
-            t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >>  8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[55];
-        }
-    }
-    rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            AES_Te0[(s0 >> 24)       ] ^
-            AES_Te1[(s1 >> 16) & 0xff] ^
-            AES_Te2[(s2 >>  8) & 0xff] ^
-            AES_Te3[(s3      ) & 0xff] ^
-            rk[4];
-        t1 =
-            AES_Te0[(s1 >> 24)       ] ^
-            AES_Te1[(s2 >> 16) & 0xff] ^
-            AES_Te2[(s3 >>  8) & 0xff] ^
-            AES_Te3[(s0      ) & 0xff] ^
-            rk[5];
-        t2 =
-            AES_Te0[(s2 >> 24)       ] ^
-            AES_Te1[(s3 >> 16) & 0xff] ^
-            AES_Te2[(s0 >>  8) & 0xff] ^
-            AES_Te3[(s1      ) & 0xff] ^
-            rk[6];
-        t3 =
-            AES_Te0[(s3 >> 24)       ] ^
-            AES_Te1[(s0 >> 16) & 0xff] ^
-            AES_Te2[(s1 >>  8) & 0xff] ^
-            AES_Te3[(s2      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            AES_Te0[(t0 >> 24)       ] ^
-            AES_Te1[(t1 >> 16) & 0xff] ^
-            AES_Te2[(t2 >>  8) & 0xff] ^
-            AES_Te3[(t3      ) & 0xff] ^
-            rk[0];
-        s1 =
-            AES_Te0[(t1 >> 24)       ] ^
-            AES_Te1[(t2 >> 16) & 0xff] ^
-            AES_Te2[(t3 >>  8) & 0xff] ^
-            AES_Te3[(t0      ) & 0xff] ^
-            rk[1];
-        s2 =
-            AES_Te0[(t2 >> 24)       ] ^
-            AES_Te1[(t3 >> 16) & 0xff] ^
-            AES_Te2[(t0 >>  8) & 0xff] ^
-            AES_Te3[(t1      ) & 0xff] ^
-            rk[2];
-        s3 =
-            AES_Te0[(t3 >> 24)       ] ^
-            AES_Te1[(t0 >> 16) & 0xff] ^
-            AES_Te2[(t1 >>  8) & 0xff] ^
-            AES_Te3[(t2      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-	s0 =
-                (AES_Te4[(t0 >> 24)       ] & 0xff000000) ^
-                (AES_Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-                (AES_Te4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-                (AES_Te4[(t3      ) & 0xff] & 0x000000ff) ^
-		rk[0];
-	PUTU32(out     , s0);
-	s1 =
-                (AES_Te4[(t1 >> 24)       ] & 0xff000000) ^
-                (AES_Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-                (AES_Te4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-                (AES_Te4[(t0      ) & 0xff] & 0x000000ff) ^
-		rk[1];
-	PUTU32(out +  4, s1);
-	s2 =
-                (AES_Te4[(t2 >> 24)       ] & 0xff000000) ^
-                (AES_Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-                (AES_Te4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-                (AES_Te4[(t1      ) & 0xff] & 0x000000ff) ^
-		rk[2];
-	PUTU32(out +  8, s2);
-	s3 =
-                (AES_Te4[(t3 >> 24)       ] & 0xff000000) ^
-                (AES_Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-                (AES_Te4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-                (AES_Te4[(t2      ) & 0xff] & 0x000000ff) ^
-		rk[3];
-	PUTU32(out + 12, s3);
-}
-
-/*
- * Decrypt a single block
- * in and out can overlap
- */
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-		 const AES_KEY *key) {
-
-	const u32 *rk;
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-	int r;
-#endif /* ?FULL_UNROLL */
-
-	assert(in && out && key);
-	rk = key->rd_key;
-
-	/*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
-    s3 = GETU32(in + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-    /* round 1: */
-    t0 = AES_Td0[s0 >> 24] ^ AES_Td1[(s3 >> 16) & 0xff] ^ AES_Td2[(s2 >>  8) & 0xff] ^ AES_Td3[s1 & 0xff] ^ rk[ 4];
-    t1 = AES_Td0[s1 >> 24] ^ AES_Td1[(s0 >> 16) & 0xff] ^ AES_Td2[(s3 >>  8) & 0xff] ^ AES_Td3[s2 & 0xff] ^ rk[ 5];
-    t2 = AES_Td0[s2 >> 24] ^ AES_Td1[(s1 >> 16) & 0xff] ^ AES_Td2[(s0 >>  8) & 0xff] ^ AES_Td3[s3 & 0xff] ^ rk[ 6];
-    t3 = AES_Td0[s3 >> 24] ^ AES_Td1[(s2 >> 16) & 0xff] ^ AES_Td2[(s1 >>  8) & 0xff] ^ AES_Td3[s0 & 0xff] ^ rk[ 7];
-    /* round 2: */
-    s0 = AES_Td0[t0 >> 24] ^ AES_Td1[(t3 >> 16) & 0xff] ^ AES_Td2[(t2 >>  8) & 0xff] ^ AES_Td3[t1 & 0xff] ^ rk[ 8];
-    s1 = AES_Td0[t1 >> 24] ^ AES_Td1[(t0 >> 16) & 0xff] ^ AES_Td2[(t3 >>  8) & 0xff] ^ AES_Td3[t2 & 0xff] ^ rk[ 9];
-    s2 = AES_Td0[t2 >> 24] ^ AES_Td1[(t1 >> 16) & 0xff] ^ AES_Td2[(t0 >>  8) & 0xff] ^ AES_Td3[t3 & 0xff] ^ rk[10];
-    s3 = AES_Td0[t3 >> 24] ^ AES_Td1[(t2 >> 16) & 0xff] ^ AES_Td2[(t1 >>  8) & 0xff] ^ AES_Td3[t0 & 0xff] ^ rk[11];
-    /* round 3: */
-    t0 = AES_Td0[s0 >> 24] ^ AES_Td1[(s3 >> 16) & 0xff] ^ AES_Td2[(s2 >>  8) & 0xff] ^ AES_Td3[s1 & 0xff] ^ rk[12];
-    t1 = AES_Td0[s1 >> 24] ^ AES_Td1[(s0 >> 16) & 0xff] ^ AES_Td2[(s3 >>  8) & 0xff] ^ AES_Td3[s2 & 0xff] ^ rk[13];
-    t2 = AES_Td0[s2 >> 24] ^ AES_Td1[(s1 >> 16) & 0xff] ^ AES_Td2[(s0 >>  8) & 0xff] ^ AES_Td3[s3 & 0xff] ^ rk[14];
-    t3 = AES_Td0[s3 >> 24] ^ AES_Td1[(s2 >> 16) & 0xff] ^ AES_Td2[(s1 >>  8) & 0xff] ^ AES_Td3[s0 & 0xff] ^ rk[15];
-    /* round 4: */
-    s0 = AES_Td0[t0 >> 24] ^ AES_Td1[(t3 >> 16) & 0xff] ^ AES_Td2[(t2 >>  8) & 0xff] ^ AES_Td3[t1 & 0xff] ^ rk[16];
-    s1 = AES_Td0[t1 >> 24] ^ AES_Td1[(t0 >> 16) & 0xff] ^ AES_Td2[(t3 >>  8) & 0xff] ^ AES_Td3[t2 & 0xff] ^ rk[17];
-    s2 = AES_Td0[t2 >> 24] ^ AES_Td1[(t1 >> 16) & 0xff] ^ AES_Td2[(t0 >>  8) & 0xff] ^ AES_Td3[t3 & 0xff] ^ rk[18];
-    s3 = AES_Td0[t3 >> 24] ^ AES_Td1[(t2 >> 16) & 0xff] ^ AES_Td2[(t1 >>  8) & 0xff] ^ AES_Td3[t0 & 0xff] ^ rk[19];
-    /* round 5: */
-    t0 = AES_Td0[s0 >> 24] ^ AES_Td1[(s3 >> 16) & 0xff] ^ AES_Td2[(s2 >>  8) & 0xff] ^ AES_Td3[s1 & 0xff] ^ rk[20];
-    t1 = AES_Td0[s1 >> 24] ^ AES_Td1[(s0 >> 16) & 0xff] ^ AES_Td2[(s3 >>  8) & 0xff] ^ AES_Td3[s2 & 0xff] ^ rk[21];
-    t2 = AES_Td0[s2 >> 24] ^ AES_Td1[(s1 >> 16) & 0xff] ^ AES_Td2[(s0 >>  8) & 0xff] ^ AES_Td3[s3 & 0xff] ^ rk[22];
-    t3 = AES_Td0[s3 >> 24] ^ AES_Td1[(s2 >> 16) & 0xff] ^ AES_Td2[(s1 >>  8) & 0xff] ^ AES_Td3[s0 & 0xff] ^ rk[23];
-    /* round 6: */
-    s0 = AES_Td0[t0 >> 24] ^ AES_Td1[(t3 >> 16) & 0xff] ^ AES_Td2[(t2 >>  8) & 0xff] ^ AES_Td3[t1 & 0xff] ^ rk[24];
-    s1 = AES_Td0[t1 >> 24] ^ AES_Td1[(t0 >> 16) & 0xff] ^ AES_Td2[(t3 >>  8) & 0xff] ^ AES_Td3[t2 & 0xff] ^ rk[25];
-    s2 = AES_Td0[t2 >> 24] ^ AES_Td1[(t1 >> 16) & 0xff] ^ AES_Td2[(t0 >>  8) & 0xff] ^ AES_Td3[t3 & 0xff] ^ rk[26];
-    s3 = AES_Td0[t3 >> 24] ^ AES_Td1[(t2 >> 16) & 0xff] ^ AES_Td2[(t1 >>  8) & 0xff] ^ AES_Td3[t0 & 0xff] ^ rk[27];
-    /* round 7: */
-    t0 = AES_Td0[s0 >> 24] ^ AES_Td1[(s3 >> 16) & 0xff] ^ AES_Td2[(s2 >>  8) & 0xff] ^ AES_Td3[s1 & 0xff] ^ rk[28];
-    t1 = AES_Td0[s1 >> 24] ^ AES_Td1[(s0 >> 16) & 0xff] ^ AES_Td2[(s3 >>  8) & 0xff] ^ AES_Td3[s2 & 0xff] ^ rk[29];
-    t2 = AES_Td0[s2 >> 24] ^ AES_Td1[(s1 >> 16) & 0xff] ^ AES_Td2[(s0 >>  8) & 0xff] ^ AES_Td3[s3 & 0xff] ^ rk[30];
-    t3 = AES_Td0[s3 >> 24] ^ AES_Td1[(s2 >> 16) & 0xff] ^ AES_Td2[(s1 >>  8) & 0xff] ^ AES_Td3[s0 & 0xff] ^ rk[31];
-    /* round 8: */
-    s0 = AES_Td0[t0 >> 24] ^ AES_Td1[(t3 >> 16) & 0xff] ^ AES_Td2[(t2 >>  8) & 0xff] ^ AES_Td3[t1 & 0xff] ^ rk[32];
-    s1 = AES_Td0[t1 >> 24] ^ AES_Td1[(t0 >> 16) & 0xff] ^ AES_Td2[(t3 >>  8) & 0xff] ^ AES_Td3[t2 & 0xff] ^ rk[33];
-    s2 = AES_Td0[t2 >> 24] ^ AES_Td1[(t1 >> 16) & 0xff] ^ AES_Td2[(t0 >>  8) & 0xff] ^ AES_Td3[t3 & 0xff] ^ rk[34];
-    s3 = AES_Td0[t3 >> 24] ^ AES_Td1[(t2 >> 16) & 0xff] ^ AES_Td2[(t1 >>  8) & 0xff] ^ AES_Td3[t0 & 0xff] ^ rk[35];
-    /* round 9: */
-    t0 = AES_Td0[s0 >> 24] ^ AES_Td1[(s3 >> 16) & 0xff] ^ AES_Td2[(s2 >>  8) & 0xff] ^ AES_Td3[s1 & 0xff] ^ rk[36];
-    t1 = AES_Td0[s1 >> 24] ^ AES_Td1[(s0 >> 16) & 0xff] ^ AES_Td2[(s3 >>  8) & 0xff] ^ AES_Td3[s2 & 0xff] ^ rk[37];
-    t2 = AES_Td0[s2 >> 24] ^ AES_Td1[(s1 >> 16) & 0xff] ^ AES_Td2[(s0 >>  8) & 0xff] ^ AES_Td3[s3 & 0xff] ^ rk[38];
-    t3 = AES_Td0[s3 >> 24] ^ AES_Td1[(s2 >> 16) & 0xff] ^ AES_Td2[(s1 >>  8) & 0xff] ^ AES_Td3[s0 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = AES_Td0[t0 >> 24] ^ AES_Td1[(t3 >> 16) & 0xff] ^ AES_Td2[(t2 >>  8) & 0xff] ^ AES_Td3[t1 & 0xff] ^ rk[40];
-        s1 = AES_Td0[t1 >> 24] ^ AES_Td1[(t0 >> 16) & 0xff] ^ AES_Td2[(t3 >>  8) & 0xff] ^ AES_Td3[t2 & 0xff] ^ rk[41];
-        s2 = AES_Td0[t2 >> 24] ^ AES_Td1[(t1 >> 16) & 0xff] ^ AES_Td2[(t0 >>  8) & 0xff] ^ AES_Td3[t3 & 0xff] ^ rk[42];
-        s3 = AES_Td0[t3 >> 24] ^ AES_Td1[(t2 >> 16) & 0xff] ^ AES_Td2[(t1 >>  8) & 0xff] ^ AES_Td3[t0 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = AES_Td0[s0 >> 24] ^ AES_Td1[(s3 >> 16) & 0xff] ^ AES_Td2[(s2 >>  8) & 0xff] ^ AES_Td3[s1 & 0xff] ^ rk[44];
-        t1 = AES_Td0[s1 >> 24] ^ AES_Td1[(s0 >> 16) & 0xff] ^ AES_Td2[(s3 >>  8) & 0xff] ^ AES_Td3[s2 & 0xff] ^ rk[45];
-        t2 = AES_Td0[s2 >> 24] ^ AES_Td1[(s1 >> 16) & 0xff] ^ AES_Td2[(s0 >>  8) & 0xff] ^ AES_Td3[s3 & 0xff] ^ rk[46];
-        t3 = AES_Td0[s3 >> 24] ^ AES_Td1[(s2 >> 16) & 0xff] ^ AES_Td2[(s1 >>  8) & 0xff] ^ AES_Td3[s0 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = AES_Td0[t0 >> 24] ^ AES_Td1[(t3 >> 16) & 0xff] ^ AES_Td2[(t2 >>  8) & 0xff] ^ AES_Td3[t1 & 0xff] ^ rk[48];
-            s1 = AES_Td0[t1 >> 24] ^ AES_Td1[(t0 >> 16) & 0xff] ^ AES_Td2[(t3 >>  8) & 0xff] ^ AES_Td3[t2 & 0xff] ^ rk[49];
-            s2 = AES_Td0[t2 >> 24] ^ AES_Td1[(t1 >> 16) & 0xff] ^ AES_Td2[(t0 >>  8) & 0xff] ^ AES_Td3[t3 & 0xff] ^ rk[50];
-            s3 = AES_Td0[t3 >> 24] ^ AES_Td1[(t2 >> 16) & 0xff] ^ AES_Td2[(t1 >>  8) & 0xff] ^ AES_Td3[t0 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = AES_Td0[s0 >> 24] ^ AES_Td1[(s3 >> 16) & 0xff] ^ AES_Td2[(s2 >>  8) & 0xff] ^ AES_Td3[s1 & 0xff] ^ rk[52];
-            t1 = AES_Td0[s1 >> 24] ^ AES_Td1[(s0 >> 16) & 0xff] ^ AES_Td2[(s3 >>  8) & 0xff] ^ AES_Td3[s2 & 0xff] ^ rk[53];
-            t2 = AES_Td0[s2 >> 24] ^ AES_Td1[(s1 >> 16) & 0xff] ^ AES_Td2[(s0 >>  8) & 0xff] ^ AES_Td3[s3 & 0xff] ^ rk[54];
-            t3 = AES_Td0[s3 >> 24] ^ AES_Td1[(s2 >> 16) & 0xff] ^ AES_Td2[(s1 >>  8) & 0xff] ^ AES_Td3[s0 & 0xff] ^ rk[55];
-        }
-    }
-	rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            AES_Td0[(s0 >> 24)       ] ^
-            AES_Td1[(s3 >> 16) & 0xff] ^
-            AES_Td2[(s2 >>  8) & 0xff] ^
-            AES_Td3[(s1      ) & 0xff] ^
-            rk[4];
-        t1 =
-            AES_Td0[(s1 >> 24)       ] ^
-            AES_Td1[(s0 >> 16) & 0xff] ^
-            AES_Td2[(s3 >>  8) & 0xff] ^
-            AES_Td3[(s2      ) & 0xff] ^
-            rk[5];
-        t2 =
-            AES_Td0[(s2 >> 24)       ] ^
-            AES_Td1[(s1 >> 16) & 0xff] ^
-            AES_Td2[(s0 >>  8) & 0xff] ^
-            AES_Td3[(s3      ) & 0xff] ^
-            rk[6];
-        t3 =
-            AES_Td0[(s3 >> 24)       ] ^
-            AES_Td1[(s2 >> 16) & 0xff] ^
-            AES_Td2[(s1 >>  8) & 0xff] ^
-            AES_Td3[(s0      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            AES_Td0[(t0 >> 24)       ] ^
-            AES_Td1[(t3 >> 16) & 0xff] ^
-            AES_Td2[(t2 >>  8) & 0xff] ^
-            AES_Td3[(t1      ) & 0xff] ^
-            rk[0];
-        s1 =
-            AES_Td0[(t1 >> 24)       ] ^
-            AES_Td1[(t0 >> 16) & 0xff] ^
-            AES_Td2[(t3 >>  8) & 0xff] ^
-            AES_Td3[(t2      ) & 0xff] ^
-            rk[1];
-        s2 =
-            AES_Td0[(t2 >> 24)       ] ^
-            AES_Td1[(t1 >> 16) & 0xff] ^
-            AES_Td2[(t0 >>  8) & 0xff] ^
-            AES_Td3[(t3      ) & 0xff] ^
-            rk[2];
-        s3 =
-            AES_Td0[(t3 >> 24)       ] ^
-            AES_Td1[(t2 >> 16) & 0xff] ^
-            AES_Td2[(t1 >>  8) & 0xff] ^
-            AES_Td3[(t0      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-   	s0 =
-                (AES_Td4[(t0 >> 24)       ] & 0xff000000) ^
-                (AES_Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-                (AES_Td4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-                (AES_Td4[(t1      ) & 0xff] & 0x000000ff) ^
-   		rk[0];
-	PUTU32(out     , s0);
-   	s1 =
-                (AES_Td4[(t1 >> 24)       ] & 0xff000000) ^
-                (AES_Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-                (AES_Td4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-                (AES_Td4[(t2      ) & 0xff] & 0x000000ff) ^
-   		rk[1];
-	PUTU32(out +  4, s1);
-   	s2 =
-                (AES_Td4[(t2 >> 24)       ] & 0xff000000) ^
-                (AES_Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-                (AES_Td4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-                (AES_Td4[(t3      ) & 0xff] & 0x000000ff) ^
-   		rk[2];
-	PUTU32(out +  8, s2);
-   	s3 =
-                (AES_Td4[(t3 >> 24)       ] & 0xff000000) ^
-                (AES_Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-                (AES_Td4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-                (AES_Td4[(t0      ) & 0xff] & 0x000000ff) ^
-   		rk[3];
-	PUTU32(out + 12, s3);
-}
-
-#endif /* AES_ASM */
-
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-		     const unsigned long length, const AES_KEY *key,
-		     unsigned char *ivec, const int enc)
-{
-
-	unsigned long n;
-	unsigned long len = length;
-	unsigned char tmp[AES_BLOCK_SIZE];
-
-	assert(in && out && key && ivec);
-
-	if (enc) {
-		while (len >= AES_BLOCK_SIZE) {
-			for(n=0; n < AES_BLOCK_SIZE; ++n)
-				tmp[n] = in[n] ^ ivec[n];
-			AES_encrypt(tmp, out, key);
-			memcpy(ivec, out, AES_BLOCK_SIZE);
-			len -= AES_BLOCK_SIZE;
-			in += AES_BLOCK_SIZE;
-			out += AES_BLOCK_SIZE;
-		}
-		if (len) {
-			for(n=0; n < len; ++n)
-				tmp[n] = in[n] ^ ivec[n];
-			for(n=len; n < AES_BLOCK_SIZE; ++n)
-				tmp[n] = ivec[n];
-			AES_encrypt(tmp, tmp, key);
-			memcpy(out, tmp, AES_BLOCK_SIZE);
-			memcpy(ivec, tmp, AES_BLOCK_SIZE);
-		}
-	} else {
-		while (len >= AES_BLOCK_SIZE) {
-			memcpy(tmp, in, AES_BLOCK_SIZE);
-			AES_decrypt(in, out, key);
-			for(n=0; n < AES_BLOCK_SIZE; ++n)
-				out[n] ^= ivec[n];
-			memcpy(ivec, tmp, AES_BLOCK_SIZE);
-			len -= AES_BLOCK_SIZE;
-			in += AES_BLOCK_SIZE;
-			out += AES_BLOCK_SIZE;
-		}
-		if (len) {
-			memcpy(tmp, in, AES_BLOCK_SIZE);
-			AES_decrypt(tmp, tmp, key);
-			for(n=0; n < len; ++n)
-				out[n] = tmp[n] ^ ivec[n];
-			memcpy(ivec, tmp, AES_BLOCK_SIZE);
-		}
-	}
-}
diff --git a/contrib/qemu/util/bitmap.c b/contrib/qemu/util/bitmap.c
deleted file mode 100644
index 687841dce..000000000
--- a/contrib/qemu/util/bitmap.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Bitmap Module
- *
- * Stolen from linux/src/lib/bitmap.c
- *
- * Copyright (C) 2010 Corentin Chary
- *
- * This source code is licensed under the GNU General Public License,
- * Version 2.
- */
-
-#include "qemu/bitops.h"
-#include "qemu/bitmap.h"
-
-/*
- * bitmaps provide an array of bits, implemented using an an
- * array of unsigned longs.  The number of valid bits in a
- * given bitmap does _not_ need to be an exact multiple of
- * BITS_PER_LONG.
- *
- * The possible unused bits in the last, partially used word
- * of a bitmap are 'don't care'.  The implementation makes
- * no particular effort to keep them zero.  It ensures that
- * their value will not affect the results of any operation.
- * The bitmap operations that return Boolean (bitmap_empty,
- * for example) or scalar (bitmap_weight, for example) results
- * carefully filter out these unused bits from impacting their
- * results.
- *
- * These operations actually hold to a slightly stronger rule:
- * if you don't input any bitmaps to these ops that have some
- * unused bits set, then they won't output any set unused bits
- * in output bitmaps.
- *
- * The byte ordering of bitmaps is more natural on little
- * endian architectures.
- */
-
-int slow_bitmap_empty(const unsigned long *bitmap, int bits)
-{
-    int k, lim = bits/BITS_PER_LONG;
-
-    for (k = 0; k < lim; ++k) {
-        if (bitmap[k]) {
-            return 0;
-        }
-    }
-    if (bits % BITS_PER_LONG) {
-        if (bitmap[k] & BITMAP_LAST_WORD_MASK(bits)) {
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-int slow_bitmap_full(const unsigned long *bitmap, int bits)
-{
-    int k, lim = bits/BITS_PER_LONG;
-
-    for (k = 0; k < lim; ++k) {
-        if (~bitmap[k]) {
-            return 0;
-        }
-    }
-
-    if (bits % BITS_PER_LONG) {
-        if (~bitmap[k] & BITMAP_LAST_WORD_MASK(bits)) {
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-int slow_bitmap_equal(const unsigned long *bitmap1,
-                      const unsigned long *bitmap2, int bits)
-{
-    int k, lim = bits/BITS_PER_LONG;
-
-    for (k = 0; k < lim; ++k) {
-        if (bitmap1[k] != bitmap2[k]) {
-            return 0;
-        }
-    }
-
-    if (bits % BITS_PER_LONG) {
-        if ((bitmap1[k] ^ bitmap2[k]) & BITMAP_LAST_WORD_MASK(bits)) {
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-void slow_bitmap_complement(unsigned long *dst, const unsigned long *src,
-                            int bits)
-{
-    int k, lim = bits/BITS_PER_LONG;
-
-    for (k = 0; k < lim; ++k) {
-        dst[k] = ~src[k];
-    }
-
-    if (bits % BITS_PER_LONG) {
-        dst[k] = ~src[k] & BITMAP_LAST_WORD_MASK(bits);
-    }
-}
-
-int slow_bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
-                    const unsigned long *bitmap2, int bits)
-{
-    int k;
-    int nr = BITS_TO_LONGS(bits);
-    unsigned long result = 0;
-
-    for (k = 0; k < nr; k++) {
-        result |= (dst[k] = bitmap1[k] & bitmap2[k]);
-    }
-    return result != 0;
-}
-
-void slow_bitmap_or(unsigned long *dst, const unsigned long *bitmap1,
-                    const unsigned long *bitmap2, int bits)
-{
-    int k;
-    int nr = BITS_TO_LONGS(bits);
-
-    for (k = 0; k < nr; k++) {
-        dst[k] = bitmap1[k] | bitmap2[k];
-    }
-}
-
-void slow_bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,
-                     const unsigned long *bitmap2, int bits)
-{
-    int k;
-    int nr = BITS_TO_LONGS(bits);
-
-    for (k = 0; k < nr; k++) {
-        dst[k] = bitmap1[k] ^ bitmap2[k];
-    }
-}
-
-int slow_bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
-                       const unsigned long *bitmap2, int bits)
-{
-    int k;
-    int nr = BITS_TO_LONGS(bits);
-    unsigned long result = 0;
-
-    for (k = 0; k < nr; k++) {
-        result |= (dst[k] = bitmap1[k] & ~bitmap2[k]);
-    }
-    return result != 0;
-}
-
-#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))
-
-void bitmap_set(unsigned long *map, int start, int nr)
-{
-    unsigned long *p = map + BIT_WORD(start);
-    const int size = start + nr;
-    int bits_to_set = BITS_PER_LONG - (start % BITS_PER_LONG);
-    unsigned long mask_to_set = BITMAP_FIRST_WORD_MASK(start);
-
-    while (nr - bits_to_set >= 0) {
-        *p |= mask_to_set;
-        nr -= bits_to_set;
-        bits_to_set = BITS_PER_LONG;
-        mask_to_set = ~0UL;
-        p++;
-    }
-    if (nr) {
-        mask_to_set &= BITMAP_LAST_WORD_MASK(size);
-        *p |= mask_to_set;
-    }
-}
-
-void bitmap_clear(unsigned long *map, int start, int nr)
-{
-    unsigned long *p = map + BIT_WORD(start);
-    const int size = start + nr;
-    int bits_to_clear = BITS_PER_LONG - (start % BITS_PER_LONG);
-    unsigned long mask_to_clear = BITMAP_FIRST_WORD_MASK(start);
-
-    while (nr - bits_to_clear >= 0) {
-        *p &= ~mask_to_clear;
-        nr -= bits_to_clear;
-        bits_to_clear = BITS_PER_LONG;
-        mask_to_clear = ~0UL;
-        p++;
-    }
-    if (nr) {
-        mask_to_clear &= BITMAP_LAST_WORD_MASK(size);
-        *p &= ~mask_to_clear;
-    }
-}
-
-#define ALIGN_MASK(x,mask)      (((x)+(mask))&~(mask))
-
-/**
- * bitmap_find_next_zero_area - find a contiguous aligned zero area
- * @map: The address to base the search on
- * @size: The bitmap size in bits
- * @start: The bitnumber to start searching at
- * @nr: The number of zeroed bits we're looking for
- * @align_mask: Alignment mask for zero area
- *
- * The @align_mask should be one less than a power of 2; the effect is that
- * the bit offset of all zero areas this function finds is multiples of that
- * power of 2. A @align_mask of 0 means no alignment is required.
- */
-unsigned long bitmap_find_next_zero_area(unsigned long *map,
-					 unsigned long size,
-					 unsigned long start,
-					 unsigned int nr,
-					 unsigned long align_mask)
-{
-    unsigned long index, end, i;
-again:
-    index = find_next_zero_bit(map, size, start);
-
-    /* Align allocation */
-    index = ALIGN_MASK(index, align_mask);
-
-    end = index + nr;
-    if (end > size) {
-        return end;
-    }
-    i = find_next_bit(map, end, index);
-    if (i < end) {
-        start = i + 1;
-        goto again;
-    }
-    return index;
-}
-
-int slow_bitmap_intersects(const unsigned long *bitmap1,
-                           const unsigned long *bitmap2, int bits)
-{
-    int k, lim = bits/BITS_PER_LONG;
-
-    for (k = 0; k < lim; ++k) {
-        if (bitmap1[k] & bitmap2[k]) {
-            return 1;
-        }
-    }
-
-    if (bits % BITS_PER_LONG) {
-        if ((bitmap1[k] & bitmap2[k]) & BITMAP_LAST_WORD_MASK(bits)) {
-            return 1;
-        }
-    }
-    return 0;
-}
diff --git a/contrib/qemu/util/bitops.c b/contrib/qemu/util/bitops.c
deleted file mode 100644
index 227c38b88..000000000
--- a/contrib/qemu/util/bitops.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * Copyright (C) 2008 IBM Corporation
- * Written by Rusty Russell <rusty@rustcorp.com.au>
- * (Inspired by David Howell's find_next_bit implementation)
- *
- * 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.
- */
-
-#include "qemu/bitops.h"
-
-#define BITOP_WORD(nr)		((nr) / BITS_PER_LONG)
-
-/*
- * Find the next set bit in a memory region.
- */
-unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
-			    unsigned long offset)
-{
-    const unsigned long *p = addr + BITOP_WORD(offset);
-    unsigned long result = offset & ~(BITS_PER_LONG-1);
-    unsigned long tmp;
-
-    if (offset >= size) {
-        return size;
-    }
-    size -= result;
-    offset %= BITS_PER_LONG;
-    if (offset) {
-        tmp = *(p++);
-        tmp &= (~0UL << offset);
-        if (size < BITS_PER_LONG) {
-            goto found_first;
-        }
-        if (tmp) {
-            goto found_middle;
-        }
-        size -= BITS_PER_LONG;
-        result += BITS_PER_LONG;
-    }
-    while (size >= 4*BITS_PER_LONG) {
-        unsigned long d1, d2, d3;
-        tmp = *p;
-        d1 = *(p+1);
-        d2 = *(p+2);
-        d3 = *(p+3);
-        if (tmp) {
-            goto found_middle;
-        }
-        if (d1 | d2 | d3) {
-            break;
-        }
-        p += 4;
-        result += 4*BITS_PER_LONG;
-        size -= 4*BITS_PER_LONG;
-    }
-    while (size >= BITS_PER_LONG) {
-        if ((tmp = *(p++))) {
-            goto found_middle;
-        }
-        result += BITS_PER_LONG;
-        size -= BITS_PER_LONG;
-    }
-    if (!size) {
-        return result;
-    }
-    tmp = *p;
-
-found_first:
-    tmp &= (~0UL >> (BITS_PER_LONG - size));
-    if (tmp == 0UL) {		/* Are any bits set? */
-        return result + size;	/* Nope. */
-    }
-found_middle:
-    return result + ctzl(tmp);
-}
-
-/*
- * This implementation of find_{first,next}_zero_bit was stolen from
- * Linus' asm-alpha/bitops.h.
- */
-unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,
-				 unsigned long offset)
-{
-    const unsigned long *p = addr + BITOP_WORD(offset);
-    unsigned long result = offset & ~(BITS_PER_LONG-1);
-    unsigned long tmp;
-
-    if (offset >= size) {
-        return size;
-    }
-    size -= result;
-    offset %= BITS_PER_LONG;
-    if (offset) {
-        tmp = *(p++);
-        tmp |= ~0UL >> (BITS_PER_LONG - offset);
-        if (size < BITS_PER_LONG) {
-            goto found_first;
-        }
-        if (~tmp) {
-            goto found_middle;
-        }
-        size -= BITS_PER_LONG;
-        result += BITS_PER_LONG;
-    }
-    while (size & ~(BITS_PER_LONG-1)) {
-        if (~(tmp = *(p++))) {
-            goto found_middle;
-        }
-        result += BITS_PER_LONG;
-        size -= BITS_PER_LONG;
-    }
-    if (!size) {
-        return result;
-    }
-    tmp = *p;
-
-found_first:
-    tmp |= ~0UL << size;
-    if (tmp == ~0UL) {	/* Are any bits zero? */
-        return result + size;	/* Nope. */
-    }
-found_middle:
-    return result + ctzl(~tmp);
-}
-
-unsigned long find_last_bit(const unsigned long *addr, unsigned long size)
-{
-    unsigned long words;
-    unsigned long tmp;
-
-    /* Start at final word. */
-    words = size / BITS_PER_LONG;
-
-    /* Partial final word? */
-    if (size & (BITS_PER_LONG-1)) {
-        tmp = (addr[words] & (~0UL >> (BITS_PER_LONG
-                                       - (size & (BITS_PER_LONG-1)))));
-        if (tmp) {
-            goto found;
-        }
-    }
-
-    while (words) {
-        tmp = addr[--words];
-        if (tmp) {
-        found:
-            return words * BITS_PER_LONG + BITS_PER_LONG - 1 - clzl(tmp);
-        }
-    }
-
-    /* Not found */
-    return size;
-}
diff --git a/contrib/qemu/util/cutils.c b/contrib/qemu/util/cutils.c
deleted file mode 100644
index 0116fcde7..000000000
--- a/contrib/qemu/util/cutils.c
+++ /dev/null
@@ -1,532 +0,0 @@
-/*
- * Simple C functions to supplement the C library
- *
- * Copyright (c) 2006 Fabrice Bellard
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#include "qemu-common.h"
-#include "qemu/host-utils.h"
-#include <math.h>
-
-#include "qemu/sockets.h"
-#include "qemu/iov.h"
-
-void strpadcpy(char *buf, int buf_size, const char *str, char pad)
-{
-    int len = qemu_strnlen(str, buf_size);
-    memcpy(buf, str, len);
-    memset(buf + len, pad, buf_size - len);
-}
-
-void pstrcpy(char *buf, int buf_size, const char *str)
-{
-    int c;
-    char *q = buf;
-
-    if (buf_size <= 0)
-        return;
-
-    for(;;) {
-        c = *str++;
-        if (c == 0 || q >= buf + buf_size - 1)
-            break;
-        *q++ = c;
-    }
-    *q = '\0';
-}
-
-/* strcat and truncate. */
-char *pstrcat(char *buf, int buf_size, const char *s)
-{
-    int len;
-    len = strlen(buf);
-    if (len < buf_size)
-        pstrcpy(buf + len, buf_size - len, s);
-    return buf;
-}
-
-int strstart(const char *str, const char *val, const char **ptr)
-{
-    const char *p, *q;
-    p = str;
-    q = val;
-    while (*q != '\0') {
-        if (*p != *q)
-            return 0;
-        p++;
-        q++;
-    }
-    if (ptr)
-        *ptr = p;
-    return 1;
-}
-
-int stristart(const char *str, const char *val, const char **ptr)
-{
-    const char *p, *q;
-    p = str;
-    q = val;
-    while (*q != '\0') {
-        if (qemu_toupper(*p) != qemu_toupper(*q))
-            return 0;
-        p++;
-        q++;
-    }
-    if (ptr)
-        *ptr = p;
-    return 1;
-}
-
-/* XXX: use host strnlen if available ? */
-int qemu_strnlen(const char *s, int max_len)
-{
-    int i;
-
-    for(i = 0; i < max_len; i++) {
-        if (s[i] == '\0') {
-            break;
-        }
-    }
-    return i;
-}
-
-char *qemu_strsep(char **input, const char *delim)
-{
-    char *result = *input;
-    if (result != NULL) {
-        char *p;
-
-        for (p = result; *p != '\0'; p++) {
-            if (strchr(delim, *p)) {
-                break;
-            }
-        }
-        if (*p == '\0') {
-            *input = NULL;
-        } else {
-            *p = '\0';
-            *input = p + 1;
-        }
-    }
-    return result;
-}
-
-time_t mktimegm(struct tm *tm)
-{
-    time_t t;
-    int y = tm->tm_year + 1900, m = tm->tm_mon + 1, d = tm->tm_mday;
-    if (m < 3) {
-        m += 12;
-        y--;
-    }
-    t = 86400ULL * (d + (153 * m - 457) / 5 + 365 * y + y / 4 - y / 100 + 
-                 y / 400 - 719469);
-    t += 3600 * tm->tm_hour + 60 * tm->tm_min + tm->tm_sec;
-    return t;
-}
-
-int qemu_fls(int i)
-{
-    return 32 - clz32(i);
-}
-
-/*
- * Make sure data goes on disk, but if possible do not bother to
- * write out the inode just for timestamp updates.
- *
- * Unfortunately even in 2009 many operating systems do not support
- * fdatasync and have to fall back to fsync.
- */
-int qemu_fdatasync(int fd)
-{
-#ifdef CONFIG_FDATASYNC
-    return fdatasync(fd);
-#else
-    return fsync(fd);
-#endif
-}
-
-/*
- * Searches for an area with non-zero content in a buffer
- *
- * Attention! The len must be a multiple of
- * BUFFER_FIND_NONZERO_OFFSET_UNROLL_FACTOR * sizeof(VECTYPE)
- * and addr must be a multiple of sizeof(VECTYPE) due to
- * restriction of optimizations in this function.
- *
- * can_use_buffer_find_nonzero_offset() can be used to check
- * these requirements.
- *
- * The return value is the offset of the non-zero area rounded
- * down to a multiple of sizeof(VECTYPE) for the first
- * BUFFER_FIND_NONZERO_OFFSET_UNROLL_FACTOR chunks and down to
- * BUFFER_FIND_NONZERO_OFFSET_UNROLL_FACTOR * sizeof(VECTYPE)
- * afterwards.
- *
- * If the buffer is all zero the return value is equal to len.
- */
-
-size_t buffer_find_nonzero_offset(const void *buf, size_t len)
-{
-    const VECTYPE *p = buf;
-    const VECTYPE zero = (VECTYPE){0};
-    size_t i;
-
-    assert(can_use_buffer_find_nonzero_offset(buf, len));
-
-    if (!len) {
-        return 0;
-    }
-
-    for (i = 0; i < BUFFER_FIND_NONZERO_OFFSET_UNROLL_FACTOR; i++) {
-        if (!ALL_EQ(p[i], zero)) {
-            return i * sizeof(VECTYPE);
-        }
-    }
-
-    for (i = BUFFER_FIND_NONZERO_OFFSET_UNROLL_FACTOR;
-         i < len / sizeof(VECTYPE);
-         i += BUFFER_FIND_NONZERO_OFFSET_UNROLL_FACTOR) {
-        VECTYPE tmp0 = p[i + 0] | p[i + 1];
-        VECTYPE tmp1 = p[i + 2] | p[i + 3];
-        VECTYPE tmp2 = p[i + 4] | p[i + 5];
-        VECTYPE tmp3 = p[i + 6] | p[i + 7];
-        VECTYPE tmp01 = tmp0 | tmp1;
-        VECTYPE tmp23 = tmp2 | tmp3;
-        if (!ALL_EQ(tmp01 | tmp23, zero)) {
-            break;
-        }
-    }
-
-    return i * sizeof(VECTYPE);
-}
-
-/*
- * Checks if a buffer is all zeroes
- *
- * Attention! The len must be a multiple of 4 * sizeof(long) due to
- * restriction of optimizations in this function.
- */
-bool buffer_is_zero(const void *buf, size_t len)
-{
-    /*
-     * Use long as the biggest available internal data type that fits into the
-     * CPU register and unroll the loop to smooth out the effect of memory
-     * latency.
-     */
-
-    size_t i;
-    long d0, d1, d2, d3;
-    const long * const data = buf;
-
-    /* use vector optimized zero check if possible */
-    if (can_use_buffer_find_nonzero_offset(buf, len)) {
-        return buffer_find_nonzero_offset(buf, len) == len;
-    }
-
-    assert(len % (4 * sizeof(long)) == 0);
-    len /= sizeof(long);
-
-    for (i = 0; i < len; i += 4) {
-        d0 = data[i + 0];
-        d1 = data[i + 1];
-        d2 = data[i + 2];
-        d3 = data[i + 3];
-
-        if (d0 || d1 || d2 || d3) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-#ifndef _WIN32
-/* Sets a specific flag */
-int fcntl_setfl(int fd, int flag)
-{
-    int flags;
-
-    flags = fcntl(fd, F_GETFL);
-    if (flags == -1)
-        return -errno;
-
-    if (fcntl(fd, F_SETFL, flags | flag) == -1)
-        return -errno;
-
-    return 0;
-}
-#endif
-
-static int64_t suffix_mul(char suffix, int64_t unit)
-{
-    switch (qemu_toupper(suffix)) {
-    case STRTOSZ_DEFSUFFIX_B:
-        return 1;
-    case STRTOSZ_DEFSUFFIX_KB:
-        return unit;
-    case STRTOSZ_DEFSUFFIX_MB:
-        return unit * unit;
-    case STRTOSZ_DEFSUFFIX_GB:
-        return unit * unit * unit;
-    case STRTOSZ_DEFSUFFIX_TB:
-        return unit * unit * unit * unit;
-    case STRTOSZ_DEFSUFFIX_PB:
-        return unit * unit * unit * unit * unit;
-    case STRTOSZ_DEFSUFFIX_EB:
-        return unit * unit * unit * unit * unit * unit;
-    }
-    return -1;
-}
-
-/*
- * Convert string to bytes, allowing either B/b for bytes, K/k for KB,
- * M/m for MB, G/g for GB or T/t for TB. End pointer will be returned
- * in *end, if not NULL. Return -ERANGE on overflow, Return -EINVAL on
- * other error.
- */
-int64_t strtosz_suffix_unit(const char *nptr, char **end,
-                            const char default_suffix, int64_t unit)
-{
-    int64_t retval = -EINVAL;
-    char *endptr;
-    unsigned char c;
-    int mul_required = 0;
-    double val, mul, integral, fraction;
-
-    errno = 0;
-    val = strtod(nptr, &endptr);
-    if (isnan(val) || endptr == nptr || errno != 0) {
-        goto fail;
-    }
-    fraction = modf(val, &integral);
-    if (fraction != 0) {
-        mul_required = 1;
-    }
-    c = *endptr;
-    mul = suffix_mul(c, unit);
-    if (mul >= 0) {
-        endptr++;
-    } else {
-        mul = suffix_mul(default_suffix, unit);
-        assert(mul >= 0);
-    }
-    if (mul == 1 && mul_required) {
-        goto fail;
-    }
-    if ((val * mul >= INT64_MAX) || val < 0) {
-        retval = -ERANGE;
-        goto fail;
-    }
-    retval = val * mul;
-
-fail:
-    if (end) {
-        *end = endptr;
-    }
-
-    return retval;
-}
-
-int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix)
-{
-    return strtosz_suffix_unit(nptr, end, default_suffix, 1024);
-}
-
-int64_t strtosz(const char *nptr, char **end)
-{
-    return strtosz_suffix(nptr, end, STRTOSZ_DEFSUFFIX_MB);
-}
-
-/**
- * parse_uint:
- *
- * @s: String to parse
- * @value: Destination for parsed integer value
- * @endptr: Destination for pointer to first character not consumed
- * @base: integer base, between 2 and 36 inclusive, or 0
- *
- * Parse unsigned integer
- *
- * Parsed syntax is like strtoull()'s: arbitrary whitespace, a single optional
- * '+' or '-', an optional "0x" if @base is 0 or 16, one or more digits.
- *
- * If @s is null, or @base is invalid, or @s doesn't start with an
- * integer in the syntax above, set *@value to 0, *@endptr to @s, and
- * return -EINVAL.
- *
- * Set *@endptr to point right beyond the parsed integer (even if the integer
- * overflows or is negative, all digits will be parsed and *@endptr will
- * point right beyond them).
- *
- * If the integer is negative, set *@value to 0, and return -ERANGE.
- *
- * If the integer overflows unsigned long long, set *@value to
- * ULLONG_MAX, and return -ERANGE.
- *
- * Else, set *@value to the parsed integer, and return 0.
- */
-int parse_uint(const char *s, unsigned long long *value, char **endptr,
-               int base)
-{
-    int r = 0;
-    char *endp = (char *)s;
-    unsigned long long val = 0;
-
-    if (!s) {
-        r = -EINVAL;
-        goto out;
-    }
-
-    errno = 0;
-    val = strtoull(s, &endp, base);
-    if (errno) {
-        r = -errno;
-        goto out;
-    }
-
-    if (endp == s) {
-        r = -EINVAL;
-        goto out;
-    }
-
-    /* make sure we reject negative numbers: */
-    while (isspace((unsigned char)*s)) {
-        s++;
-    }
-    if (*s == '-') {
-        val = 0;
-        r = -ERANGE;
-        goto out;
-    }
-
-out:
-    *value = val;
-    *endptr = endp;
-    return r;
-}
-
-/**
- * parse_uint_full:
- *
- * @s: String to parse
- * @value: Destination for parsed integer value
- * @base: integer base, between 2 and 36 inclusive, or 0
- *
- * Parse unsigned integer from entire string
- *
- * Have the same behavior of parse_uint(), but with an additional check
- * for additional data after the parsed number. If extra characters are present
- * after the parsed number, the function will return -EINVAL, and *@v will
- * be set to 0.
- */
-int parse_uint_full(const char *s, unsigned long long *value, int base)
-{
-    char *endp;
-    int r;
-
-    r = parse_uint(s, value, &endp, base);
-    if (r < 0) {
-        return r;
-    }
-    if (*endp) {
-        *value = 0;
-        return -EINVAL;
-    }
-
-    return 0;
-}
-
-int qemu_parse_fd(const char *param)
-{
-    int fd;
-    char *endptr = NULL;
-
-    fd = strtol(param, &endptr, 10);
-    if (*endptr || (fd == 0 && param == endptr)) {
-        return -1;
-    }
-    return fd;
-}
-
-/* round down to the nearest power of 2*/
-int64_t pow2floor(int64_t value)
-{
-    if (!is_power_of_2(value)) {
-        value = 0x8000000000000000ULL >> clz64(value);
-    }
-    return value;
-}
-
-/*
- * Implementation of  ULEB128 (http://en.wikipedia.org/wiki/LEB128)
- * Input is limited to 14-bit numbers
- */
-int uleb128_encode_small(uint8_t *out, uint32_t n)
-{
-    g_assert(n <= 0x3fff);
-    if (n < 0x80) {
-        *out++ = n;
-        return 1;
-    } else {
-        *out++ = (n & 0x7f) | 0x80;
-        *out++ = n >> 7;
-        return 2;
-    }
-}
-
-int uleb128_decode_small(const uint8_t *in, uint32_t *n)
-{
-    if (!(*in & 0x80)) {
-        *n = *in++;
-        return 1;
-    } else {
-        *n = *in++ & 0x7f;
-        /* we exceed 14 bit number */
-        if (*in & 0x80) {
-            return -1;
-        }
-        *n |= *in++ << 7;
-        return 2;
-    }
-}
-
-/*
- * helper to parse debug environment variables
- */
-int parse_debug_env(const char *name, int max, int initial)
-{
-    char *debug_env = getenv(name);
-    char *inv = NULL;
-    int debug;
-
-    if (!debug_env) {
-        return initial;
-    }
-    debug = strtol(debug_env, &inv, 10);
-    if (inv == debug_env) {
-        return initial;
-    }
-    if (debug < 0 || debug > max) {
-        fprintf(stderr, "warning: %s not in [0, %d]", name, max);
-        return initial;
-    }
-    return debug;
-}
diff --git a/contrib/qemu/util/error.c b/contrib/qemu/util/error.c
deleted file mode 100644
index 53b04354a..000000000
--- a/contrib/qemu/util/error.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * QEMU Error Objects
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.  See
- * the COPYING.LIB file in the top-level directory.
- */
-
-#include "qemu-common.h"
-#include "qapi/error.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi-types.h"
-#include "qapi/qmp/qerror.h"
-
-struct Error
-{
-    char *msg;
-    ErrorClass err_class;
-};
-
-void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
-{
-    Error *err;
-    va_list ap;
-
-    if (errp == NULL) {
-        return;
-    }
-    assert(*errp == NULL);
-
-    err = g_malloc0(sizeof(*err));
-
-    va_start(ap, fmt);
-    err->msg = g_strdup_vprintf(fmt, ap);
-    va_end(ap);
-    err->err_class = err_class;
-
-    *errp = err;
-}
-
-void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
-                     const char *fmt, ...)
-{
-    Error *err;
-    char *msg1;
-    va_list ap;
-
-    if (errp == NULL) {
-        return;
-    }
-    assert(*errp == NULL);
-
-    err = g_malloc0(sizeof(*err));
-
-    va_start(ap, fmt);
-    msg1 = g_strdup_vprintf(fmt, ap);
-    if (os_errno != 0) {
-        err->msg = g_strdup_printf("%s: %s", msg1, strerror(os_errno));
-        g_free(msg1);
-    } else {
-        err->msg = msg1;
-    }
-    va_end(ap);
-    err->err_class = err_class;
-
-    *errp = err;
-}
-
-void error_setg_file_open(Error **errp, int os_errno, const char *filename)
-{
-    error_setg_errno(errp, os_errno, "Could not open '%s'", filename);
-}
-
-Error *error_copy(const Error *err)
-{
-    Error *err_new;
-
-    err_new = g_malloc0(sizeof(*err));
-    err_new->msg = g_strdup(err->msg);
-    err_new->err_class = err->err_class;
-
-    return err_new;
-}
-
-bool error_is_set(Error **errp)
-{
-    return (errp && *errp);
-}
-
-ErrorClass error_get_class(const Error *err)
-{
-    return err->err_class;
-}
-
-const char *error_get_pretty(Error *err)
-{
-    return err->msg;
-}
-
-void error_free(Error *err)
-{
-    if (err) {
-        g_free(err->msg);
-        g_free(err);
-    }
-}
-
-void error_propagate(Error **dst_err, Error *local_err)
-{
-    if (dst_err && !*dst_err) {
-        *dst_err = local_err;
-    } else if (local_err) {
-        error_free(local_err);
-    }
-}
diff --git a/contrib/qemu/util/hbitmap.c b/contrib/qemu/util/hbitmap.c
deleted file mode 100644
index d93683128..000000000
--- a/contrib/qemu/util/hbitmap.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * Hierarchical Bitmap Data Type
- *
- * Copyright Red Hat, Inc., 2012
- *
- * Author: Paolo Bonzini <pbonzini@redhat.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or
- * later.  See the COPYING file in the top-level directory.
- */
-
-#include <string.h>
-#include <glib.h>
-#include <assert.h>
-#include "qemu/osdep.h"
-#include "qemu/hbitmap.h"
-#include "qemu/host-utils.h"
-#include "trace.h"
-
-/* HBitmaps provides an array of bits.  The bits are stored as usual in an
- * array of unsigned longs, but HBitmap is also optimized to provide fast
- * iteration over set bits; going from one bit to the next is O(logB n)
- * worst case, with B = sizeof(long) * CHAR_BIT: the result is low enough
- * that the number of levels is in fact fixed.
- *
- * In order to do this, it stacks multiple bitmaps with progressively coarser
- * granularity; in all levels except the last, bit N is set iff the N-th
- * unsigned long is nonzero in the immediately next level.  When iteration
- * completes on the last level it can examine the 2nd-last level to quickly
- * skip entire words, and even do so recursively to skip blocks of 64 words or
- * powers thereof (32 on 32-bit machines).
- *
- * Given an index in the bitmap, it can be split in group of bits like
- * this (for the 64-bit case):
- *
- *   bits 0-57 => word in the last bitmap     | bits 58-63 => bit in the word
- *   bits 0-51 => word in the 2nd-last bitmap | bits 52-57 => bit in the word
- *   bits 0-45 => word in the 3rd-last bitmap | bits 46-51 => bit in the word
- *
- * So it is easy to move up simply by shifting the index right by
- * log2(BITS_PER_LONG) bits.  To move down, you shift the index left
- * similarly, and add the word index within the group.  Iteration uses
- * ffs (find first set bit) to find the next word to examine; this
- * operation can be done in constant time in most current architectures.
- *
- * Setting or clearing a range of m bits on all levels, the work to perform
- * is O(m + m/W + m/W^2 + ...), which is O(m) like on a regular bitmap.
- *
- * When iterating on a bitmap, each bit (on any level) is only visited
- * once.  Hence, The total cost of visiting a bitmap with m bits in it is
- * the number of bits that are set in all bitmaps.  Unless the bitmap is
- * extremely sparse, this is also O(m + m/W + m/W^2 + ...), so the amortized
- * cost of advancing from one bit to the next is usually constant (worst case
- * O(logB n) as in the non-amortized complexity).
- */
-
-struct HBitmap {
-    /* Number of total bits in the bottom level.  */
-    uint64_t size;
-
-    /* Number of set bits in the bottom level.  */
-    uint64_t count;
-
-    /* A scaling factor.  Given a granularity of G, each bit in the bitmap will
-     * will actually represent a group of 2^G elements.  Each operation on a
-     * range of bits first rounds the bits to determine which group they land
-     * in, and then affect the entire page; iteration will only visit the first
-     * bit of each group.  Here is an example of operations in a size-16,
-     * granularity-1 HBitmap:
-     *
-     *    initial state            00000000
-     *    set(start=0, count=9)    11111000 (iter: 0, 2, 4, 6, 8)
-     *    reset(start=1, count=3)  00111000 (iter: 4, 6, 8)
-     *    set(start=9, count=2)    00111100 (iter: 4, 6, 8, 10)
-     *    reset(start=5, count=5)  00000000
-     *
-     * From an implementation point of view, when setting or resetting bits,
-     * the bitmap will scale bit numbers right by this amount of bits.  When
-     * iterating, the bitmap will scale bit numbers left by this amount of
-     * bits.
-     */
-    int granularity;
-
-    /* A number of progressively less coarse bitmaps (i.e. level 0 is the
-     * coarsest).  Each bit in level N represents a word in level N+1 that
-     * has a set bit, except the last level where each bit represents the
-     * actual bitmap.
-     *
-     * Note that all bitmaps have the same number of levels.  Even a 1-bit
-     * bitmap will still allocate HBITMAP_LEVELS arrays.
-     */
-    unsigned long *levels[HBITMAP_LEVELS];
-};
-
-static inline int popcountl(unsigned long l)
-{
-    return BITS_PER_LONG == 32 ? ctpop32(l) : ctpop64(l);
-}
-
-/* Advance hbi to the next nonzero word and return it.  hbi->pos
- * is updated.  Returns zero if we reach the end of the bitmap.
- */
-unsigned long hbitmap_iter_skip_words(HBitmapIter *hbi)
-{
-    size_t pos = hbi->pos;
-    const HBitmap *hb = hbi->hb;
-    unsigned i = HBITMAP_LEVELS - 1;
-
-    unsigned long cur;
-    do {
-        cur = hbi->cur[--i];
-        pos >>= BITS_PER_LEVEL;
-    } while (cur == 0);
-
-    /* Check for end of iteration.  We always use fewer than BITS_PER_LONG
-     * bits in the level 0 bitmap; thus we can repurpose the most significant
-     * bit as a sentinel.  The sentinel is set in hbitmap_alloc and ensures
-     * that the above loop ends even without an explicit check on i.
-     */
-
-    if (i == 0 && cur == (1UL << (BITS_PER_LONG - 1))) {
-        return 0;
-    }
-    for (; i < HBITMAP_LEVELS - 1; i++) {
-        /* Shift back pos to the left, matching the right shifts above.
-         * The index of this word's least significant set bit provides
-         * the low-order bits.
-         */
-        assert(cur);
-        pos = (pos << BITS_PER_LEVEL) + ctzl(cur);
-        hbi->cur[i] = cur & (cur - 1);
-
-        /* Set up next level for iteration.  */
-        cur = hb->levels[i + 1][pos];
-    }
-
-    hbi->pos = pos;
-    trace_hbitmap_iter_skip_words(hbi->hb, hbi, pos, cur);
-
-    assert(cur);
-    return cur;
-}
-
-void hbitmap_iter_init(HBitmapIter *hbi, const HBitmap *hb, uint64_t first)
-{
-    unsigned i, bit;
-    uint64_t pos;
-
-    hbi->hb = hb;
-    pos = first >> hb->granularity;
-    assert(pos < hb->size);
-    hbi->pos = pos >> BITS_PER_LEVEL;
-    hbi->granularity = hb->granularity;
-
-    for (i = HBITMAP_LEVELS; i-- > 0; ) {
-        bit = pos & (BITS_PER_LONG - 1);
-        pos >>= BITS_PER_LEVEL;
-
-        /* Drop bits representing items before first.  */
-        hbi->cur[i] = hb->levels[i][pos] & ~((1UL << bit) - 1);
-
-        /* We have already added level i+1, so the lowest set bit has
-         * been processed.  Clear it.
-         */
-        if (i != HBITMAP_LEVELS - 1) {
-            hbi->cur[i] &= ~(1UL << bit);
-        }
-    }
-}
-
-bool hbitmap_empty(const HBitmap *hb)
-{
-    return hb->count == 0;
-}
-
-int hbitmap_granularity(const HBitmap *hb)
-{
-    return hb->granularity;
-}
-
-uint64_t hbitmap_count(const HBitmap *hb)
-{
-    return hb->count << hb->granularity;
-}
-
-/* Count the number of set bits between start and end, not accounting for
- * the granularity.  Also an example of how to use hbitmap_iter_next_word.
- */
-static uint64_t hb_count_between(HBitmap *hb, uint64_t start, uint64_t last)
-{
-    HBitmapIter hbi;
-    uint64_t count = 0;
-    uint64_t end = last + 1;
-    unsigned long cur;
-    size_t pos;
-
-    hbitmap_iter_init(&hbi, hb, start << hb->granularity);
-    for (;;) {
-        pos = hbitmap_iter_next_word(&hbi, &cur);
-        if (pos >= (end >> BITS_PER_LEVEL)) {
-            break;
-        }
-        count += popcountl(cur);
-    }
-
-    if (pos == (end >> BITS_PER_LEVEL)) {
-        /* Drop bits representing the END-th and subsequent items.  */
-        int bit = end & (BITS_PER_LONG - 1);
-        cur &= (1UL << bit) - 1;
-        count += popcountl(cur);
-    }
-
-    return count;
-}
-
-/* Setting starts at the last layer and propagates up if an element
- * changes from zero to non-zero.
- */
-static inline bool hb_set_elem(unsigned long *elem, uint64_t start, uint64_t last)
-{
-    unsigned long mask;
-    bool changed;
-
-    assert((last >> BITS_PER_LEVEL) == (start >> BITS_PER_LEVEL));
-    assert(start <= last);
-
-    mask = 2UL << (last & (BITS_PER_LONG - 1));
-    mask -= 1UL << (start & (BITS_PER_LONG - 1));
-    changed = (*elem == 0);
-    *elem |= mask;
-    return changed;
-}
-
-/* The recursive workhorse (the depth is limited to HBITMAP_LEVELS)... */
-static void hb_set_between(HBitmap *hb, int level, uint64_t start, uint64_t last)
-{
-    size_t pos = start >> BITS_PER_LEVEL;
-    size_t lastpos = last >> BITS_PER_LEVEL;
-    bool changed = false;
-    size_t i;
-
-    i = pos;
-    if (i < lastpos) {
-        uint64_t next = (start | (BITS_PER_LONG - 1)) + 1;
-        changed |= hb_set_elem(&hb->levels[level][i], start, next - 1);
-        for (;;) {
-            start = next;
-            next += BITS_PER_LONG;
-            if (++i == lastpos) {
-                break;
-            }
-            changed |= (hb->levels[level][i] == 0);
-            hb->levels[level][i] = ~0UL;
-        }
-    }
-    changed |= hb_set_elem(&hb->levels[level][i], start, last);
-
-    /* If there was any change in this layer, we may have to update
-     * the one above.
-     */
-    if (level > 0 && changed) {
-        hb_set_between(hb, level - 1, pos, lastpos);
-    }
-}
-
-void hbitmap_set(HBitmap *hb, uint64_t start, uint64_t count)
-{
-    /* Compute range in the last layer.  */
-    uint64_t last = start + count - 1;
-
-    trace_hbitmap_set(hb, start, count,
-                      start >> hb->granularity, last >> hb->granularity);
-
-    start >>= hb->granularity;
-    last >>= hb->granularity;
-    count = last - start + 1;
-
-    hb->count += count - hb_count_between(hb, start, last);
-    hb_set_between(hb, HBITMAP_LEVELS - 1, start, last);
-}
-
-/* Resetting works the other way round: propagate up if the new
- * value is zero.
- */
-static inline bool hb_reset_elem(unsigned long *elem, uint64_t start, uint64_t last)
-{
-    unsigned long mask;
-    bool blanked;
-
-    assert((last >> BITS_PER_LEVEL) == (start >> BITS_PER_LEVEL));
-    assert(start <= last);
-
-    mask = 2UL << (last & (BITS_PER_LONG - 1));
-    mask -= 1UL << (start & (BITS_PER_LONG - 1));
-    blanked = *elem != 0 && ((*elem & ~mask) == 0);
-    *elem &= ~mask;
-    return blanked;
-}
-
-/* The recursive workhorse (the depth is limited to HBITMAP_LEVELS)... */
-static void hb_reset_between(HBitmap *hb, int level, uint64_t start, uint64_t last)
-{
-    size_t pos = start >> BITS_PER_LEVEL;
-    size_t lastpos = last >> BITS_PER_LEVEL;
-    bool changed = false;
-    size_t i;
-
-    i = pos;
-    if (i < lastpos) {
-        uint64_t next = (start | (BITS_PER_LONG - 1)) + 1;
-
-        /* Here we need a more complex test than when setting bits.  Even if
-         * something was changed, we must not blank bits in the upper level
-         * unless the lower-level word became entirely zero.  So, remove pos
-         * from the upper-level range if bits remain set.
-         */
-        if (hb_reset_elem(&hb->levels[level][i], start, next - 1)) {
-            changed = true;
-        } else {
-            pos++;
-        }
-
-        for (;;) {
-            start = next;
-            next += BITS_PER_LONG;
-            if (++i == lastpos) {
-                break;
-            }
-            changed |= (hb->levels[level][i] != 0);
-            hb->levels[level][i] = 0UL;
-        }
-    }
-
-    /* Same as above, this time for lastpos.  */
-    if (hb_reset_elem(&hb->levels[level][i], start, last)) {
-        changed = true;
-    } else {
-        lastpos--;
-    }
-
-    if (level > 0 && changed) {
-        hb_reset_between(hb, level - 1, pos, lastpos);
-    }
-}
-
-void hbitmap_reset(HBitmap *hb, uint64_t start, uint64_t count)
-{
-    /* Compute range in the last layer.  */
-    uint64_t last = start + count - 1;
-
-    trace_hbitmap_reset(hb, start, count,
-                        start >> hb->granularity, last >> hb->granularity);
-
-    start >>= hb->granularity;
-    last >>= hb->granularity;
-
-    hb->count -= hb_count_between(hb, start, last);
-    hb_reset_between(hb, HBITMAP_LEVELS - 1, start, last);
-}
-
-bool hbitmap_get(const HBitmap *hb, uint64_t item)
-{
-    /* Compute position and bit in the last layer.  */
-    uint64_t pos = item >> hb->granularity;
-    unsigned long bit = 1UL << (pos & (BITS_PER_LONG - 1));
-
-    return (hb->levels[HBITMAP_LEVELS - 1][pos >> BITS_PER_LEVEL] & bit) != 0;
-}
-
-void hbitmap_free(HBitmap *hb)
-{
-    unsigned i;
-    for (i = HBITMAP_LEVELS; i-- > 0; ) {
-        g_free(hb->levels[i]);
-    }
-    g_free(hb);
-}
-
-HBitmap *hbitmap_alloc(uint64_t size, int granularity)
-{
-    HBitmap *hb = g_malloc0(sizeof (struct HBitmap));
-    unsigned i;
-
-    assert(granularity >= 0 && granularity < 64);
-    size = (size + (1ULL << granularity) - 1) >> granularity;
-    assert(size <= ((uint64_t)1 << HBITMAP_LOG_MAX_SIZE));
-
-    hb->size = size;
-    hb->granularity = granularity;
-    for (i = HBITMAP_LEVELS; i-- > 0; ) {
-        size = MAX((size + BITS_PER_LONG - 1) >> BITS_PER_LEVEL, 1);
-        hb->levels[i] = g_malloc0(size * sizeof(unsigned long));
-    }
-
-    /* We necessarily have free bits in level 0 due to the definition
-     * of HBITMAP_LEVELS, so use one for a sentinel.  This speeds up
-     * hbitmap_iter_skip_words.
-     */
-    assert(size == 1);
-    hb->levels[0][0] |= 1UL << (BITS_PER_LONG - 1);
-    return hb;
-}
diff --git a/contrib/qemu/util/hexdump.c b/contrib/qemu/util/hexdump.c
deleted file mode 100644
index 969b3406c..000000000
--- a/contrib/qemu/util/hexdump.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Helper to hexdump a buffer
- *
- * Copyright (c) 2013 Red Hat, Inc.
- * Copyright (c) 2013 Gerd Hoffmann <kraxel@redhat.com>
- * Copyright (c) 2013 Peter Crosthwaite <peter.crosthwaite@xilinx.com>
- * Copyright (c) 2013 Xilinx, Inc
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- * Contributions after 2012-01-13 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- */
-
-#include "qemu-common.h"
-
-void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)
-{
-    unsigned int b;
-
-    for (b = 0; b < size; b++) {
-        if ((b % 16) == 0) {
-            fprintf(fp, "%s: %04x:", prefix, b);
-        }
-        if ((b % 4) == 0) {
-            fprintf(fp, " ");
-        }
-        fprintf(fp, " %02x", (unsigned char)buf[b]);
-        if ((b % 16) == 15) {
-            fprintf(fp, "\n");
-        }
-    }
-    if ((b % 16) != 0) {
-        fprintf(fp, "\n");
-    }
-}
diff --git a/contrib/qemu/util/iov.c b/contrib/qemu/util/iov.c
deleted file mode 100644
index cc6e837c8..000000000
--- a/contrib/qemu/util/iov.c
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * Helpers for getting linearized buffers from iov / filling buffers into iovs
- *
- * Copyright IBM, Corp. 2007, 2008
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * Author(s):
- *  Anthony Liguori <aliguori@us.ibm.com>
- *  Amit Shah <amit.shah@redhat.com>
- *  Michael Tokarev <mjt@tls.msk.ru>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- * Contributions after 2012-01-13 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- */
-
-#include "qemu/iov.h"
-
-#ifdef _WIN32
-# include <windows.h>
-# include <winsock2.h>
-#else
-# include <sys/types.h>
-# include <sys/socket.h>
-#endif
-
-size_t iov_from_buf(const struct iovec *iov, unsigned int iov_cnt,
-                    size_t offset, const void *buf, size_t bytes)
-{
-    size_t done;
-    unsigned int i;
-    for (i = 0, done = 0; (offset || done < bytes) && i < iov_cnt; i++) {
-        if (offset < iov[i].iov_len) {
-            size_t len = MIN(iov[i].iov_len - offset, bytes - done);
-            memcpy(iov[i].iov_base + offset, buf + done, len);
-            done += len;
-            offset = 0;
-        } else {
-            offset -= iov[i].iov_len;
-        }
-    }
-    assert(offset == 0);
-    return done;
-}
-
-size_t iov_to_buf(const struct iovec *iov, const unsigned int iov_cnt,
-                  size_t offset, void *buf, size_t bytes)
-{
-    size_t done;
-    unsigned int i;
-    for (i = 0, done = 0; (offset || done < bytes) && i < iov_cnt; i++) {
-        if (offset < iov[i].iov_len) {
-            size_t len = MIN(iov[i].iov_len - offset, bytes - done);
-            memcpy(buf + done, iov[i].iov_base + offset, len);
-            done += len;
-            offset = 0;
-        } else {
-            offset -= iov[i].iov_len;
-        }
-    }
-    assert(offset == 0);
-    return done;
-}
-
-size_t iov_memset(const struct iovec *iov, const unsigned int iov_cnt,
-                  size_t offset, int fillc, size_t bytes)
-{
-    size_t done;
-    unsigned int i;
-    for (i = 0, done = 0; (offset || done < bytes) && i < iov_cnt; i++) {
-        if (offset < iov[i].iov_len) {
-            size_t len = MIN(iov[i].iov_len - offset, bytes - done);
-            memset(iov[i].iov_base + offset, fillc, len);
-            done += len;
-            offset = 0;
-        } else {
-            offset -= iov[i].iov_len;
-        }
-    }
-    assert(offset == 0);
-    return done;
-}
-
-size_t iov_size(const struct iovec *iov, const unsigned int iov_cnt)
-{
-    size_t len;
-    unsigned int i;
-
-    len = 0;
-    for (i = 0; i < iov_cnt; i++) {
-        len += iov[i].iov_len;
-    }
-    return len;
-}
-
-/* helper function for iov_send_recv() */
-static ssize_t
-do_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, bool do_send)
-{
-#ifdef CONFIG_POSIX
-    ssize_t ret;
-    struct msghdr msg;
-    memset(&msg, 0, sizeof(msg));
-    msg.msg_iov = iov;
-    msg.msg_iovlen = iov_cnt;
-    do {
-        ret = do_send
-            ? sendmsg(sockfd, &msg, 0)
-            : recvmsg(sockfd, &msg, 0);
-    } while (ret < 0 && errno == EINTR);
-    return ret;
-#else
-    /* else send piece-by-piece */
-    /*XXX Note: windows has WSASend() and WSARecv() */
-    unsigned i = 0;
-    ssize_t ret = 0;
-    while (i < iov_cnt) {
-        ssize_t r = do_send
-            ? send(sockfd, iov[i].iov_base, iov[i].iov_len, 0)
-            : recv(sockfd, iov[i].iov_base, iov[i].iov_len, 0);
-        if (r > 0) {
-            ret += r;
-        } else if (!r) {
-            break;
-        } else if (errno == EINTR) {
-            continue;
-        } else {
-            /* else it is some "other" error,
-             * only return if there was no data processed. */
-            if (ret == 0) {
-                ret = -1;
-            }
-            break;
-        }
-        i++;
-    }
-    return ret;
-#endif
-}
-
-ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
-                      size_t offset, size_t bytes,
-                      bool do_send)
-{
-    ssize_t total = 0;
-    ssize_t ret;
-    size_t orig_len, tail;
-    unsigned niov;
-
-    while (bytes > 0) {
-        /* Find the start position, skipping `offset' bytes:
-         * first, skip all full-sized vector elements, */
-        for (niov = 0; niov < iov_cnt && offset >= iov[niov].iov_len; ++niov) {
-            offset -= iov[niov].iov_len;
-        }
-
-        /* niov == iov_cnt would only be valid if bytes == 0, which
-         * we already ruled out in the loop condition.  */
-        assert(niov < iov_cnt);
-        iov += niov;
-        iov_cnt -= niov;
-
-        if (offset) {
-            /* second, skip `offset' bytes from the (now) first element,
-             * undo it on exit */
-            iov[0].iov_base += offset;
-            iov[0].iov_len -= offset;
-        }
-        /* Find the end position skipping `bytes' bytes: */
-        /* first, skip all full-sized elements */
-        tail = bytes;
-        for (niov = 0; niov < iov_cnt && iov[niov].iov_len <= tail; ++niov) {
-            tail -= iov[niov].iov_len;
-        }
-        if (tail) {
-            /* second, fixup the last element, and remember the original
-             * length */
-            assert(niov < iov_cnt);
-            assert(iov[niov].iov_len > tail);
-            orig_len = iov[niov].iov_len;
-            iov[niov++].iov_len = tail;
-        }
-
-        ret = do_send_recv(sockfd, iov, niov, do_send);
-
-        /* Undo the changes above before checking for errors */
-        if (tail) {
-            iov[niov-1].iov_len = orig_len;
-        }
-        if (offset) {
-            iov[0].iov_base -= offset;
-            iov[0].iov_len += offset;
-        }
-
-        if (ret < 0) {
-            assert(errno != EINTR);
-            if (errno == EAGAIN && total > 0) {
-                return total;
-            }
-            return -1;
-        }
-
-        /* Prepare for the next iteration */
-        offset += ret;
-        total += ret;
-        bytes -= ret;
-    }
-
-    return total;
-}
-
-
-void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt,
-                 FILE *fp, const char *prefix, size_t limit)
-{
-    int v;
-    size_t size = 0;
-    char *buf;
-
-    for (v = 0; v < iov_cnt; v++) {
-        size += iov[v].iov_len;
-    }
-    size = size > limit ? limit : size;
-    buf = g_malloc(size);
-    iov_to_buf(iov, iov_cnt, 0, buf, size);
-    qemu_hexdump(buf, fp, prefix, size);
-    g_free(buf);
-}
-
-unsigned iov_copy(struct iovec *dst_iov, unsigned int dst_iov_cnt,
-                 const struct iovec *iov, unsigned int iov_cnt,
-                 size_t offset, size_t bytes)
-{
-    size_t len;
-    unsigned int i, j;
-    for (i = 0, j = 0; i < iov_cnt && j < dst_iov_cnt && bytes; i++) {
-        if (offset >= iov[i].iov_len) {
-            offset -= iov[i].iov_len;
-            continue;
-        }
-        len = MIN(bytes, iov[i].iov_len - offset);
-
-        dst_iov[j].iov_base = iov[i].iov_base + offset;
-        dst_iov[j].iov_len = len;
-        j++;
-        bytes -= len;
-        offset = 0;
-    }
-    assert(offset == 0);
-    return j;
-}
-
-/* io vectors */
-
-void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint)
-{
-    qiov->iov = g_malloc(alloc_hint * sizeof(struct iovec));
-    qiov->niov = 0;
-    qiov->nalloc = alloc_hint;
-    qiov->size = 0;
-}
-
-void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov)
-{
-    int i;
-
-    qiov->iov = iov;
-    qiov->niov = niov;
-    qiov->nalloc = -1;
-    qiov->size = 0;
-    for (i = 0; i < niov; i++)
-        qiov->size += iov[i].iov_len;
-}
-
-void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len)
-{
-    assert(qiov->nalloc != -1);
-
-    if (qiov->niov == qiov->nalloc) {
-        qiov->nalloc = 2 * qiov->nalloc + 1;
-        qiov->iov = g_realloc(qiov->iov, qiov->nalloc * sizeof(struct iovec));
-    }
-    qiov->iov[qiov->niov].iov_base = base;
-    qiov->iov[qiov->niov].iov_len = len;
-    qiov->size += len;
-    ++qiov->niov;
-}
-
-/*
- * Concatenates (partial) iovecs from src_iov to the end of dst.
- * It starts copying after skipping `soffset' bytes at the
- * beginning of src and adds individual vectors from src to
- * dst copies up to `sbytes' bytes total, or up to the end
- * of src_iov if it comes first.  This way, it is okay to specify
- * very large value for `sbytes' to indicate "up to the end
- * of src".
- * Only vector pointers are processed, not the actual data buffers.
- */
-void qemu_iovec_concat_iov(QEMUIOVector *dst,
-                           struct iovec *src_iov, unsigned int src_cnt,
-                           size_t soffset, size_t sbytes)
-{
-    int i;
-    size_t done;
-
-    if (!sbytes) {
-        return;
-    }
-    assert(dst->nalloc != -1);
-    for (i = 0, done = 0; done < sbytes && i < src_cnt; i++) {
-        if (soffset < src_iov[i].iov_len) {
-            size_t len = MIN(src_iov[i].iov_len - soffset, sbytes - done);
-            qemu_iovec_add(dst, src_iov[i].iov_base + soffset, len);
-            done += len;
-            soffset = 0;
-        } else {
-            soffset -= src_iov[i].iov_len;
-        }
-    }
-    assert(soffset == 0); /* offset beyond end of src */
-}
-
-/*
- * Concatenates (partial) iovecs from src to the end of dst.
- * It starts copying after skipping `soffset' bytes at the
- * beginning of src and adds individual vectors from src to
- * dst copies up to `sbytes' bytes total, or up to the end
- * of src if it comes first.  This way, it is okay to specify
- * very large value for `sbytes' to indicate "up to the end
- * of src".
- * Only vector pointers are processed, not the actual data buffers.
- */
-void qemu_iovec_concat(QEMUIOVector *dst,
-                       QEMUIOVector *src, size_t soffset, size_t sbytes)
-{
-    qemu_iovec_concat_iov(dst, src->iov, src->niov, soffset, sbytes);
-}
-
-void qemu_iovec_destroy(QEMUIOVector *qiov)
-{
-    assert(qiov->nalloc != -1);
-
-    qemu_iovec_reset(qiov);
-    g_free(qiov->iov);
-    qiov->nalloc = 0;
-    qiov->iov = NULL;
-}
-
-void qemu_iovec_reset(QEMUIOVector *qiov)
-{
-    assert(qiov->nalloc != -1);
-
-    qiov->niov = 0;
-    qiov->size = 0;
-}
-
-size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset,
-                         void *buf, size_t bytes)
-{
-    return iov_to_buf(qiov->iov, qiov->niov, offset, buf, bytes);
-}
-
-size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
-                           const void *buf, size_t bytes)
-{
-    return iov_from_buf(qiov->iov, qiov->niov, offset, buf, bytes);
-}
-
-size_t qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
-                         int fillc, size_t bytes)
-{
-    return iov_memset(qiov->iov, qiov->niov, offset, fillc, bytes);
-}
-
-size_t iov_discard_front(struct iovec **iov, unsigned int *iov_cnt,
-                         size_t bytes)
-{
-    size_t total = 0;
-    struct iovec *cur;
-
-    for (cur = *iov; *iov_cnt > 0; cur++) {
-        if (cur->iov_len > bytes) {
-            cur->iov_base += bytes;
-            cur->iov_len -= bytes;
-            total += bytes;
-            break;
-        }
-
-        bytes -= cur->iov_len;
-        total += cur->iov_len;
-        *iov_cnt -= 1;
-    }
-
-    *iov = cur;
-    return total;
-}
-
-size_t iov_discard_back(struct iovec *iov, unsigned int *iov_cnt,
-                        size_t bytes)
-{
-    size_t total = 0;
-    struct iovec *cur;
-
-    if (*iov_cnt == 0) {
-        return 0;
-    }
-
-    cur = iov + (*iov_cnt - 1);
-
-    while (*iov_cnt > 0) {
-        if (cur->iov_len > bytes) {
-            cur->iov_len -= bytes;
-            total += bytes;
-            break;
-        }
-
-        bytes -= cur->iov_len;
-        total += cur->iov_len;
-        cur--;
-        *iov_cnt -= 1;
-    }
-
-    return total;
-}
diff --git a/contrib/qemu/util/module.c b/contrib/qemu/util/module.c
deleted file mode 100644
index 7acc33d07..000000000
--- a/contrib/qemu/util/module.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * QEMU Module Infrastructure
- *
- * Copyright IBM, Corp. 2009
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- * Contributions after 2012-01-13 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- */
-
-#include "qemu-common.h"
-#include "qemu/queue.h"
-#include "qemu/module.h"
-
-typedef struct ModuleEntry
-{
-    void (*init)(void);
-    QTAILQ_ENTRY(ModuleEntry) node;
-} ModuleEntry;
-
-typedef QTAILQ_HEAD(, ModuleEntry) ModuleTypeList;
-
-static ModuleTypeList init_type_list[MODULE_INIT_MAX];
-
-static void init_types(void)
-{
-    static int inited;
-    int i;
-
-    if (inited) {
-        return;
-    }
-
-    for (i = 0; i < MODULE_INIT_MAX; i++) {
-        QTAILQ_INIT(&init_type_list[i]);
-    }
-
-    inited = 1;
-}
-
-
-static ModuleTypeList *find_type(module_init_type type)
-{
-    ModuleTypeList *l;
-
-    init_types();
-
-    l = &init_type_list[type];
-
-    return l;
-}
-
-void register_module_init(void (*fn)(void), module_init_type type)
-{
-    ModuleEntry *e;
-    ModuleTypeList *l;
-
-    e = g_malloc0(sizeof(*e));
-    e->init = fn;
-
-    l = find_type(type);
-
-    QTAILQ_INSERT_TAIL(l, e, node);
-}
-
-void module_call_init(module_init_type type)
-{
-    ModuleTypeList *l;
-    ModuleEntry *e;
-
-    l = find_type(type);
-
-    QTAILQ_FOREACH(e, l, node) {
-        e->init();
-    }
-}
diff --git a/contrib/qemu/util/oslib-posix.c b/contrib/qemu/util/oslib-posix.c
deleted file mode 100644
index 3dc8b1b07..000000000
--- a/contrib/qemu/util/oslib-posix.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * os-posix-lib.c
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- * Copyright (c) 2010 Red Hat, Inc.
- *
- * QEMU library functions on POSIX which are shared between QEMU and
- * the QEMU tools.
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/* The following block of code temporarily renames the daemon() function so the
-   compiler does not see the warning associated with it in stdlib.h on OSX */
-#ifdef __APPLE__
-#define daemon qemu_fake_daemon_function
-#include <stdlib.h>
-#undef daemon
-extern int daemon(int, int);
-#endif
-
-#if defined(__linux__) && (defined(__x86_64__) || defined(__arm__))
-   /* Use 2 MiB alignment so transparent hugepages can be used by KVM.
-      Valgrind does not support alignments larger than 1 MiB,
-      therefore we need special code which handles running on Valgrind. */
-#  define QEMU_VMALLOC_ALIGN (512 * 4096)
-#elif defined(__linux__) && defined(__s390x__)
-   /* Use 1 MiB (segment size) alignment so gmap can be used by KVM. */
-#  define QEMU_VMALLOC_ALIGN (256 * 4096)
-#else
-#  define QEMU_VMALLOC_ALIGN getpagesize()
-#endif
-
-#include <glib/gprintf.h>
-
-#include "config-host.h"
-#include "sysemu/sysemu.h"
-#include "trace.h"
-#include "qemu/sockets.h"
-#include <sys/mman.h>
-
-#ifdef CONFIG_LINUX
-#include <sys/syscall.h>
-#endif
-
-int qemu_get_thread_id(void)
-{
-#if defined(__linux__)
-    return syscall(SYS_gettid);
-#else
-    return getpid();
-#endif
-}
-
-int qemu_daemon(int nochdir, int noclose)
-{
-    return daemon(nochdir, noclose);
-}
-
-void *qemu_oom_check(void *ptr)
-{
-    if (ptr == NULL) {
-        fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno));
-        abort();
-    }
-    return ptr;
-}
-
-void *qemu_memalign(size_t alignment, size_t size)
-{
-    void *ptr;
-#if defined(_POSIX_C_SOURCE) && !defined(__sun__)
-    int ret;
-    ret = posix_memalign(&ptr, alignment, size);
-    if (ret != 0) {
-        fprintf(stderr, "Failed to allocate %zu B: %s\n",
-                size, strerror(ret));
-        abort();
-    }
-#elif defined(CONFIG_BSD)
-    ptr = qemu_oom_check(valloc(size));
-#else
-    ptr = qemu_oom_check(memalign(alignment, size));
-#endif
-    trace_qemu_memalign(alignment, size, ptr);
-    return ptr;
-}
-
-/* alloc shared memory pages */
-void *qemu_anon_ram_alloc(size_t size)
-{
-    size_t align = QEMU_VMALLOC_ALIGN;
-    size_t total = size + align - getpagesize();
-    void *ptr = mmap(0, total, PROT_READ | PROT_WRITE,
-                     MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-    size_t offset = QEMU_ALIGN_UP((uintptr_t)ptr, align) - (uintptr_t)ptr;
-
-    if (ptr == MAP_FAILED) {
-        fprintf(stderr, "Failed to allocate %zu B: %s\n",
-                size, strerror(errno));
-        abort();
-    }
-
-    ptr += offset;
-    total -= offset;
-
-    if (offset > 0) {
-        munmap(ptr - offset, offset);
-    }
-    if (total > size) {
-        munmap(ptr + size, total - size);
-    }
-
-    trace_qemu_anon_ram_alloc(size, ptr);
-    return ptr;
-}
-
-void qemu_vfree(void *ptr)
-{
-    trace_qemu_vfree(ptr);
-    free(ptr);
-}
-
-void qemu_anon_ram_free(void *ptr, size_t size)
-{
-    trace_qemu_anon_ram_free(ptr, size);
-    if (ptr) {
-        munmap(ptr, size);
-    }
-}
-
-void qemu_set_block(int fd)
-{
-    int f;
-    f = fcntl(fd, F_GETFL);
-    fcntl(fd, F_SETFL, f & ~O_NONBLOCK);
-}
-
-void qemu_set_nonblock(int fd)
-{
-    int f;
-    f = fcntl(fd, F_GETFL);
-    fcntl(fd, F_SETFL, f | O_NONBLOCK);
-}
-
-void qemu_set_cloexec(int fd)
-{
-    int f;
-    f = fcntl(fd, F_GETFD);
-    fcntl(fd, F_SETFD, f | FD_CLOEXEC);
-}
-
-/*
- * Creates a pipe with FD_CLOEXEC set on both file descriptors
- */
-int qemu_pipe(int pipefd[2])
-{
-    int ret;
-
-#ifdef CONFIG_PIPE2
-    ret = pipe2(pipefd, O_CLOEXEC);
-    if (ret != -1 || errno != ENOSYS) {
-        return ret;
-    }
-#endif
-    ret = pipe(pipefd);
-    if (ret == 0) {
-        qemu_set_cloexec(pipefd[0]);
-        qemu_set_cloexec(pipefd[1]);
-    }
-
-    return ret;
-}
-
-int qemu_utimens(const char *path, const struct timespec *times)
-{
-    struct timeval tv[2], tv_now;
-    struct stat st;
-    int i;
-#ifdef CONFIG_UTIMENSAT
-    int ret;
-
-    ret = utimensat(AT_FDCWD, path, times, AT_SYMLINK_NOFOLLOW);
-    if (ret != -1 || errno != ENOSYS) {
-        return ret;
-    }
-#endif
-    /* Fallback: use utimes() instead of utimensat() */
-
-    /* happy if special cases */
-    if (times[0].tv_nsec == UTIME_OMIT && times[1].tv_nsec == UTIME_OMIT) {
-        return 0;
-    }
-    if (times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) {
-        return utimes(path, NULL);
-    }
-
-    /* prepare for hard cases */
-    if (times[0].tv_nsec == UTIME_NOW || times[1].tv_nsec == UTIME_NOW) {
-        gettimeofday(&tv_now, NULL);
-    }
-    if (times[0].tv_nsec == UTIME_OMIT || times[1].tv_nsec == UTIME_OMIT) {
-        stat(path, &st);
-    }
-
-    for (i = 0; i < 2; i++) {
-        if (times[i].tv_nsec == UTIME_NOW) {
-            tv[i].tv_sec = tv_now.tv_sec;
-            tv[i].tv_usec = tv_now.tv_usec;
-        } else if (times[i].tv_nsec == UTIME_OMIT) {
-            tv[i].tv_sec = (i == 0) ? st.st_atime : st.st_mtime;
-            tv[i].tv_usec = 0;
-        } else {
-            tv[i].tv_sec = times[i].tv_sec;
-            tv[i].tv_usec = times[i].tv_nsec / 1000;
-        }
-    }
-
-    return utimes(path, &tv[0]);
-}
-
-char *
-qemu_get_local_state_pathname(const char *relative_pathname)
-{
-    return g_strdup_printf("%s/%s", CONFIG_QEMU_LOCALSTATEDIR,
-                           relative_pathname);
-}
diff --git a/contrib/qemu/util/qemu-error.c b/contrib/qemu/util/qemu-error.c
deleted file mode 100644
index fec02c607..000000000
--- a/contrib/qemu/util/qemu-error.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Error reporting
- *
- * Copyright (C) 2010 Red Hat Inc.
- *
- * Authors:
- *  Markus Armbruster <armbru@redhat.com>,
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include <stdio.h>
-#include "monitor/monitor.h"
-
-/*
- * Print to current monitor if we have one, else to stderr.
- * TODO should return int, so callers can calculate width, but that
- * requires surgery to monitor_vprintf().  Left for another day.
- */
-void error_vprintf(const char *fmt, va_list ap)
-{
-    if (cur_mon) {
-        monitor_vprintf(cur_mon, fmt, ap);
-    } else {
-        vfprintf(stderr, fmt, ap);
-    }
-}
-
-/*
- * Print to current monitor if we have one, else to stderr.
- * TODO just like error_vprintf()
- */
-void error_printf(const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    error_vprintf(fmt, ap);
-    va_end(ap);
-}
-
-void error_printf_unless_qmp(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (!monitor_cur_is_qmp()) {
-        va_start(ap, fmt);
-        error_vprintf(fmt, ap);
-        va_end(ap);
-    }
-}
-
-static Location std_loc = {
-    .kind = LOC_NONE
-};
-static Location *cur_loc = &std_loc;
-
-/*
- * Push location saved in LOC onto the location stack, return it.
- * The top of that stack is the current location.
- * Needs a matching loc_pop().
- */
-Location *loc_push_restore(Location *loc)
-{
-    assert(!loc->prev);
-    loc->prev = cur_loc;
-    cur_loc = loc;
-    return loc;
-}
-
-/*
- * Initialize *LOC to "nowhere", push it onto the location stack.
- * The top of that stack is the current location.
- * Needs a matching loc_pop().
- * Return LOC.
- */
-Location *loc_push_none(Location *loc)
-{
-    loc->kind = LOC_NONE;
-    loc->prev = NULL;
-    return loc_push_restore(loc);
-}
-
-/*
- * Pop the location stack.
- * LOC must be the current location, i.e. the top of the stack.
- */
-Location *loc_pop(Location *loc)
-{
-    assert(cur_loc == loc && loc->prev);
-    cur_loc = loc->prev;
-    loc->prev = NULL;
-    return loc;
-}
-
-/*
- * Save the current location in LOC, return LOC.
- */
-Location *loc_save(Location *loc)
-{
-    *loc = *cur_loc;
-    loc->prev = NULL;
-    return loc;
-}
-
-/*
- * Change the current location to the one saved in LOC.
- */
-void loc_restore(Location *loc)
-{
-    Location *prev = cur_loc->prev;
-    assert(!loc->prev);
-    *cur_loc = *loc;
-    cur_loc->prev = prev;
-}
-
-/*
- * Change the current location to "nowhere in particular".
- */
-void loc_set_none(void)
-{
-    cur_loc->kind = LOC_NONE;
-}
-
-/*
- * Change the current location to argument ARGV[IDX..IDX+CNT-1].
- */
-void loc_set_cmdline(char **argv, int idx, int cnt)
-{
-    cur_loc->kind = LOC_CMDLINE;
-    cur_loc->num = cnt;
-    cur_loc->ptr = argv + idx;
-}
-
-/*
- * Change the current location to file FNAME, line LNO.
- */
-void loc_set_file(const char *fname, int lno)
-{
-    assert (fname || cur_loc->kind == LOC_FILE);
-    cur_loc->kind = LOC_FILE;
-    cur_loc->num = lno;
-    if (fname) {
-        cur_loc->ptr = fname;
-    }
-}
-
-static const char *progname;
-
-/*
- * Set the program name for error_print_loc().
- */
-void error_set_progname(const char *argv0)
-{
-    const char *p = strrchr(argv0, '/');
-    progname = p ? p + 1 : argv0;
-}
-
-const char *error_get_progname(void)
-{
-    return progname;
-}
-
-/*
- * Print current location to current monitor if we have one, else to stderr.
- */
-void error_print_loc(void)
-{
-    const char *sep = "";
-    int i;
-    const char *const *argp;
-
-    if (!cur_mon && progname) {
-        fprintf(stderr, "%s:", progname);
-        sep = " ";
-    }
-    switch (cur_loc->kind) {
-    case LOC_CMDLINE:
-        argp = cur_loc->ptr;
-        for (i = 0; i < cur_loc->num; i++) {
-            error_printf("%s%s", sep, argp[i]);
-            sep = " ";
-        }
-        error_printf(": ");
-        break;
-    case LOC_FILE:
-        error_printf("%s:", (const char *)cur_loc->ptr);
-        if (cur_loc->num) {
-            error_printf("%d:", cur_loc->num);
-        }
-        error_printf(" ");
-        break;
-    default:
-        error_printf("%s", sep);
-    }
-}
-
-bool enable_timestamp_msg;
-/*
- * Print an error message to current monitor if we have one, else to stderr.
- * Format arguments like sprintf().  The result should not contain
- * newlines.
- * Prepend the current location and append a newline.
- * It's wrong to call this in a QMP monitor.  Use qerror_report() there.
- */
-void error_report(const char *fmt, ...)
-{
-    va_list ap;
-    GTimeVal tv;
-    gchar *timestr;
-
-    if (enable_timestamp_msg) {
-        g_get_current_time(&tv);
-        timestr = g_time_val_to_iso8601(&tv);
-        error_printf("%s ", timestr);
-        g_free(timestr);
-    }
-
-    error_print_loc();
-    va_start(ap, fmt);
-    error_vprintf(fmt, ap);
-    va_end(ap);
-    error_printf("\n");
-}
diff --git a/contrib/qemu/util/qemu-option.c b/contrib/qemu/util/qemu-option.c
deleted file mode 100644
index e0ef426da..000000000
--- a/contrib/qemu/util/qemu-option.c
+++ /dev/null
@@ -1,1126 +0,0 @@
-/*
- * Commandline option parsing functions
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- * Copyright (c) 2009 Kevin Wolf <kwolf@redhat.com>
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "qemu-common.h"
-#include "qemu/error-report.h"
-#include "qapi/qmp/types.h"
-#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
-#include "qemu/option_int.h"
-
-/*
- * Extracts the name of an option from the parameter string (p points at the
- * first byte of the option name)
- *
- * The option name is delimited by delim (usually , or =) or the string end
- * and is copied into buf. If the option name is longer than buf_size, it is
- * truncated. buf is always zero terminated.
- *
- * The return value is the position of the delimiter/zero byte after the option
- * name in p.
- */
-const char *get_opt_name(char *buf, int buf_size, const char *p, char delim)
-{
-    char *q;
-
-    q = buf;
-    while (*p != '\0' && *p != delim) {
-        if (q && (q - buf) < buf_size - 1)
-            *q++ = *p;
-        p++;
-    }
-    if (q)
-        *q = '\0';
-
-    return p;
-}
-
-/*
- * Extracts the value of an option from the parameter string p (p points at the
- * first byte of the option value)
- *
- * This function is comparable to get_opt_name with the difference that the
- * delimiter is fixed to be comma which starts a new option. To specify an
- * option value that contains commas, double each comma.
- */
-const char *get_opt_value(char *buf, int buf_size, const char *p)
-{
-    char *q;
-
-    q = buf;
-    while (*p != '\0') {
-        if (*p == ',') {
-            if (*(p + 1) != ',')
-                break;
-            p++;
-        }
-        if (q && (q - buf) < buf_size - 1)
-            *q++ = *p;
-        p++;
-    }
-    if (q)
-        *q = '\0';
-
-    return p;
-}
-
-int get_next_param_value(char *buf, int buf_size,
-                         const char *tag, const char **pstr)
-{
-    const char *p;
-    char option[128];
-
-    p = *pstr;
-    for(;;) {
-        p = get_opt_name(option, sizeof(option), p, '=');
-        if (*p != '=')
-            break;
-        p++;
-        if (!strcmp(tag, option)) {
-            *pstr = get_opt_value(buf, buf_size, p);
-            if (**pstr == ',') {
-                (*pstr)++;
-            }
-            return strlen(buf);
-        } else {
-            p = get_opt_value(NULL, 0, p);
-        }
-        if (*p != ',')
-            break;
-        p++;
-    }
-    return 0;
-}
-
-int get_param_value(char *buf, int buf_size,
-                    const char *tag, const char *str)
-{
-    return get_next_param_value(buf, buf_size, tag, &str);
-}
-
-/*
- * Searches an option list for an option with the given name
- */
-QEMUOptionParameter *get_option_parameter(QEMUOptionParameter *list,
-    const char *name)
-{
-    while (list && list->name) {
-        if (!strcmp(list->name, name)) {
-            return list;
-        }
-        list++;
-    }
-
-    return NULL;
-}
-
-static void parse_option_bool(const char *name, const char *value, bool *ret,
-                              Error **errp)
-{
-    if (value != NULL) {
-        if (!strcmp(value, "on")) {
-            *ret = 1;
-        } else if (!strcmp(value, "off")) {
-            *ret = 0;
-        } else {
-            error_set(errp,QERR_INVALID_PARAMETER_VALUE, name, "'on' or 'off'");
-        }
-    } else {
-        *ret = 1;
-    }
-}
-
-static void parse_option_number(const char *name, const char *value,
-                                uint64_t *ret, Error **errp)
-{
-    char *postfix;
-    uint64_t number;
-
-    if (value != NULL) {
-        number = strtoull(value, &postfix, 0);
-        if (*postfix != '\0') {
-            error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a number");
-            return;
-        }
-        *ret = number;
-    } else {
-        error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a number");
-    }
-}
-
-static void parse_option_size(const char *name, const char *value,
-                              uint64_t *ret, Error **errp)
-{
-    char *postfix;
-    double sizef;
-
-    if (value != NULL) {
-        sizef = strtod(value, &postfix);
-        switch (*postfix) {
-        case 'T':
-            sizef *= 1024;
-            /* fall through */
-        case 'G':
-            sizef *= 1024;
-            /* fall through */
-        case 'M':
-            sizef *= 1024;
-            /* fall through */
-        case 'K':
-        case 'k':
-            sizef *= 1024;
-            /* fall through */
-        case 'b':
-        case '\0':
-            *ret = (uint64_t) sizef;
-            break;
-        default:
-            error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size");
-#if 0 /* conversion from qerror_report() to error_set() broke this: */
-            error_printf_unless_qmp("You may use k, M, G or T suffixes for "
-                    "kilobytes, megabytes, gigabytes and terabytes.\n");
-#endif
-            return;
-        }
-    } else {
-        error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size");
-    }
-}
-
-/*
- * Sets the value of a parameter in a given option list. The parsing of the
- * value depends on the type of option:
- *
- * OPT_FLAG (uses value.n):
- *      If no value is given, the flag is set to 1.
- *      Otherwise the value must be "on" (set to 1) or "off" (set to 0)
- *
- * OPT_STRING (uses value.s):
- *      value is strdup()ed and assigned as option value
- *
- * OPT_SIZE (uses value.n):
- *      The value is converted to an integer. Suffixes for kilobytes etc. are
- *      allowed (powers of 1024).
- *
- * Returns 0 on succes, -1 in error cases
- */
-int set_option_parameter(QEMUOptionParameter *list, const char *name,
-    const char *value)
-{
-    bool flag;
-    Error *local_err = NULL;
-
-    // Find a matching parameter
-    list = get_option_parameter(list, name);
-    if (list == NULL) {
-        fprintf(stderr, "Unknown option '%s'\n", name);
-        return -1;
-    }
-
-    // Process parameter
-    switch (list->type) {
-    case OPT_FLAG:
-        parse_option_bool(name, value, &flag, &local_err);
-        if (!error_is_set(&local_err)) {
-            list->value.n = flag;
-        }
-        break;
-
-    case OPT_STRING:
-        if (value != NULL) {
-            list->value.s = g_strdup(value);
-        } else {
-            fprintf(stderr, "Option '%s' needs a parameter\n", name);
-            return -1;
-        }
-        break;
-
-    case OPT_SIZE:
-        parse_option_size(name, value, &list->value.n, &local_err);
-        break;
-
-    default:
-        fprintf(stderr, "Bug: Option '%s' has an unknown type\n", name);
-        return -1;
-    }
-
-    if (error_is_set(&local_err)) {
-        qerror_report_err(local_err);
-        error_free(local_err);
-        return -1;
-    }
-
-    return 0;
-}
-
-/*
- * Sets the given parameter to an integer instead of a string.
- * This function cannot be used to set string options.
- *
- * Returns 0 on success, -1 in error cases
- */
-int set_option_parameter_int(QEMUOptionParameter *list, const char *name,
-    uint64_t value)
-{
-    // Find a matching parameter
-    list = get_option_parameter(list, name);
-    if (list == NULL) {
-        fprintf(stderr, "Unknown option '%s'\n", name);
-        return -1;
-    }
-
-    // Process parameter
-    switch (list->type) {
-    case OPT_FLAG:
-    case OPT_NUMBER:
-    case OPT_SIZE:
-        list->value.n = value;
-        break;
-
-    default:
-        return -1;
-    }
-
-    return 0;
-}
-
-/*
- * Frees a option list. If it contains strings, the strings are freed as well.
- */
-void free_option_parameters(QEMUOptionParameter *list)
-{
-    QEMUOptionParameter *cur = list;
-
-    while (cur && cur->name) {
-        if (cur->type == OPT_STRING) {
-            g_free(cur->value.s);
-        }
-        cur++;
-    }
-
-    g_free(list);
-}
-
-/*
- * Count valid options in list
- */
-static size_t count_option_parameters(QEMUOptionParameter *list)
-{
-    size_t num_options = 0;
-
-    while (list && list->name) {
-        num_options++;
-        list++;
-    }
-
-    return num_options;
-}
-
-/*
- * Append an option list (list) to an option list (dest).
- *
- * If dest is NULL, a new copy of list is created.
- *
- * Returns a pointer to the first element of dest (or the newly allocated copy)
- */
-QEMUOptionParameter *append_option_parameters(QEMUOptionParameter *dest,
-    QEMUOptionParameter *list)
-{
-    size_t num_options, num_dest_options;
-
-    num_options = count_option_parameters(dest);
-    num_dest_options = num_options;
-
-    num_options += count_option_parameters(list);
-
-    dest = g_realloc(dest, (num_options + 1) * sizeof(QEMUOptionParameter));
-    dest[num_dest_options].name = NULL;
-
-    while (list && list->name) {
-        if (get_option_parameter(dest, list->name) == NULL) {
-            dest[num_dest_options++] = *list;
-            dest[num_dest_options].name = NULL;
-        }
-        list++;
-    }
-
-    return dest;
-}
-
-/*
- * Parses a parameter string (param) into an option list (dest).
- *
- * list is the template option list. If dest is NULL, a new copy of list is
- * created. If list is NULL, this function fails.
- *
- * A parameter string consists of one or more parameters, separated by commas.
- * Each parameter consists of its name and possibly of a value. In the latter
- * case, the value is delimited by an = character. To specify a value which
- * contains commas, double each comma so it won't be recognized as the end of
- * the parameter.
- *
- * For more details of the parsing see above.
- *
- * Returns a pointer to the first element of dest (or the newly allocated copy)
- * or NULL in error cases
- */
-QEMUOptionParameter *parse_option_parameters(const char *param,
-    QEMUOptionParameter *list, QEMUOptionParameter *dest)
-{
-    QEMUOptionParameter *allocated = NULL;
-    char name[256];
-    char value[256];
-    char *param_delim, *value_delim;
-    char next_delim;
-
-    if (list == NULL) {
-        return NULL;
-    }
-
-    if (dest == NULL) {
-        dest = allocated = append_option_parameters(NULL, list);
-    }
-
-    while (*param) {
-
-        // Find parameter name and value in the string
-        param_delim = strchr(param, ',');
-        value_delim = strchr(param, '=');
-
-        if (value_delim && (value_delim < param_delim || !param_delim)) {
-            next_delim = '=';
-        } else {
-            next_delim = ',';
-            value_delim = NULL;
-        }
-
-        param = get_opt_name(name, sizeof(name), param, next_delim);
-        if (value_delim) {
-            param = get_opt_value(value, sizeof(value), param + 1);
-        }
-        if (*param != '\0') {
-            param++;
-        }
-
-        // Set the parameter
-        if (set_option_parameter(dest, name, value_delim ? value : NULL)) {
-            goto fail;
-        }
-    }
-
-    return dest;
-
-fail:
-    // Only free the list if it was newly allocated
-    free_option_parameters(allocated);
-    return NULL;
-}
-
-/*
- * Prints all options of a list that have a value to stdout
- */
-void print_option_parameters(QEMUOptionParameter *list)
-{
-    while (list && list->name) {
-        switch (list->type) {
-            case OPT_STRING:
-                 if (list->value.s != NULL) {
-                     printf("%s='%s' ", list->name, list->value.s);
-                 }
-                break;
-            case OPT_FLAG:
-                printf("%s=%s ", list->name, list->value.n ? "on" : "off");
-                break;
-            case OPT_SIZE:
-            case OPT_NUMBER:
-                printf("%s=%" PRId64 " ", list->name, list->value.n);
-                break;
-            default:
-                printf("%s=(unknown type) ", list->name);
-                break;
-        }
-        list++;
-    }
-}
-
-/*
- * Prints an overview of all available options
- */
-void print_option_help(QEMUOptionParameter *list)
-{
-    printf("Supported options:\n");
-    while (list && list->name) {
-        printf("%-16s %s\n", list->name,
-            list->help ? list->help : "No description available");
-        list++;
-    }
-}
-
-/* ------------------------------------------------------------------ */
-
-static QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name)
-{
-    QemuOpt *opt;
-
-    QTAILQ_FOREACH_REVERSE(opt, &opts->head, QemuOptHead, next) {
-        if (strcmp(opt->name, name) != 0)
-            continue;
-        return opt;
-    }
-    return NULL;
-}
-
-const char *qemu_opt_get(QemuOpts *opts, const char *name)
-{
-    QemuOpt *opt = qemu_opt_find(opts, name);
-    return opt ? opt->str : NULL;
-}
-
-bool qemu_opt_has_help_opt(QemuOpts *opts)
-{
-    QemuOpt *opt;
-
-    QTAILQ_FOREACH_REVERSE(opt, &opts->head, QemuOptHead, next) {
-        if (is_help_option(opt->name)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval)
-{
-    QemuOpt *opt = qemu_opt_find(opts, name);
-
-    if (opt == NULL)
-        return defval;
-    assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL);
-    return opt->value.boolean;
-}
-
-uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval)
-{
-    QemuOpt *opt = qemu_opt_find(opts, name);
-
-    if (opt == NULL)
-        return defval;
-    assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER);
-    return opt->value.uint;
-}
-
-uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval)
-{
-    QemuOpt *opt = qemu_opt_find(opts, name);
-
-    if (opt == NULL)
-        return defval;
-    assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE);
-    return opt->value.uint;
-}
-
-static void qemu_opt_parse(QemuOpt *opt, Error **errp)
-{
-    if (opt->desc == NULL)
-        return;
-
-    switch (opt->desc->type) {
-    case QEMU_OPT_STRING:
-        /* nothing */
-        return;
-    case QEMU_OPT_BOOL:
-        parse_option_bool(opt->name, opt->str, &opt->value.boolean, errp);
-        break;
-    case QEMU_OPT_NUMBER:
-        parse_option_number(opt->name, opt->str, &opt->value.uint, errp);
-        break;
-    case QEMU_OPT_SIZE:
-        parse_option_size(opt->name, opt->str, &opt->value.uint, errp);
-        break;
-    default:
-        abort();
-    }
-}
-
-static void qemu_opt_del(QemuOpt *opt)
-{
-    QTAILQ_REMOVE(&opt->opts->head, opt, next);
-    g_free((/* !const */ char*)opt->name);
-    g_free((/* !const */ char*)opt->str);
-    g_free(opt);
-}
-
-static bool opts_accepts_any(const QemuOpts *opts)
-{
-    return opts->list->desc[0].name == NULL;
-}
-
-static const QemuOptDesc *find_desc_by_name(const QemuOptDesc *desc,
-                                            const char *name)
-{
-    int i;
-
-    for (i = 0; desc[i].name != NULL; i++) {
-        if (strcmp(desc[i].name, name) == 0) {
-            return &desc[i];
-        }
-    }
-
-    return NULL;
-}
-
-static void opt_set(QemuOpts *opts, const char *name, const char *value,
-                    bool prepend, Error **errp)
-{
-    QemuOpt *opt;
-    const QemuOptDesc *desc;
-    Error *local_err = NULL;
-
-    desc = find_desc_by_name(opts->list->desc, name);
-    if (!desc && !opts_accepts_any(opts)) {
-        error_set(errp, QERR_INVALID_PARAMETER, name);
-        return;
-    }
-
-    opt = g_malloc0(sizeof(*opt));
-    opt->name = g_strdup(name);
-    opt->opts = opts;
-    if (prepend) {
-        QTAILQ_INSERT_HEAD(&opts->head, opt, next);
-    } else {
-        QTAILQ_INSERT_TAIL(&opts->head, opt, next);
-    }
-    opt->desc = desc;
-    opt->str = g_strdup(value);
-    qemu_opt_parse(opt, &local_err);
-    if (error_is_set(&local_err)) {
-        error_propagate(errp, local_err);
-        qemu_opt_del(opt);
-    }
-}
-
-int qemu_opt_set(QemuOpts *opts, const char *name, const char *value)
-{
-    Error *local_err = NULL;
-
-    opt_set(opts, name, value, false, &local_err);
-    if (error_is_set(&local_err)) {
-        qerror_report_err(local_err);
-        error_free(local_err);
-        return -1;
-    }
-
-    return 0;
-}
-
-void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value,
-                      Error **errp)
-{
-    opt_set(opts, name, value, false, errp);
-}
-
-int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val)
-{
-    QemuOpt *opt;
-    const QemuOptDesc *desc = opts->list->desc;
-
-    opt = g_malloc0(sizeof(*opt));
-    opt->desc = find_desc_by_name(desc, name);
-    if (!opt->desc && !opts_accepts_any(opts)) {
-        qerror_report(QERR_INVALID_PARAMETER, name);
-        g_free(opt);
-        return -1;
-    }
-
-    opt->name = g_strdup(name);
-    opt->opts = opts;
-    opt->value.boolean = !!val;
-    opt->str = g_strdup(val ? "on" : "off");
-    QTAILQ_INSERT_TAIL(&opts->head, opt, next);
-
-    return 0;
-}
-
-int qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val)
-{
-    QemuOpt *opt;
-    const QemuOptDesc *desc = opts->list->desc;
-
-    opt = g_malloc0(sizeof(*opt));
-    opt->desc = find_desc_by_name(desc, name);
-    if (!opt->desc && !opts_accepts_any(opts)) {
-        qerror_report(QERR_INVALID_PARAMETER, name);
-        g_free(opt);
-        return -1;
-    }
-
-    opt->name = g_strdup(name);
-    opt->opts = opts;
-    opt->value.uint = val;
-    opt->str = g_strdup_printf("%" PRId64, val);
-    QTAILQ_INSERT_TAIL(&opts->head, opt, next);
-
-    return 0;
-}
-
-int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,
-                     int abort_on_failure)
-{
-    QemuOpt *opt;
-    int rc = 0;
-
-    QTAILQ_FOREACH(opt, &opts->head, next) {
-        rc = func(opt->name, opt->str, opaque);
-        if (abort_on_failure  &&  rc != 0)
-            break;
-    }
-    return rc;
-}
-
-QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id)
-{
-    QemuOpts *opts;
-
-    QTAILQ_FOREACH(opts, &list->head, next) {
-        if (!opts->id && !id) {
-            return opts;
-        }
-        if (opts->id && id && !strcmp(opts->id, id)) {
-            return opts;
-        }
-    }
-    return NULL;
-}
-
-static int id_wellformed(const char *id)
-{
-    int i;
-
-    if (!qemu_isalpha(id[0])) {
-        return 0;
-    }
-    for (i = 1; id[i]; i++) {
-        if (!qemu_isalnum(id[i]) && !strchr("-._", id[i])) {
-            return 0;
-        }
-    }
-    return 1;
-}
-
-QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,
-                           int fail_if_exists, Error **errp)
-{
-    QemuOpts *opts = NULL;
-
-    if (id) {
-        if (!id_wellformed(id)) {
-            error_set(errp,QERR_INVALID_PARAMETER_VALUE, "id", "an identifier");
-#if 0 /* conversion from qerror_report() to error_set() broke this: */
-            error_printf_unless_qmp("Identifiers consist of letters, digits, '-', '.', '_', starting with a letter.\n");
-#endif
-            return NULL;
-        }
-        opts = qemu_opts_find(list, id);
-        if (opts != NULL) {
-            if (fail_if_exists && !list->merge_lists) {
-                error_set(errp, QERR_DUPLICATE_ID, id, list->name);
-                return NULL;
-            } else {
-                return opts;
-            }
-        }
-    } else if (list->merge_lists) {
-        opts = qemu_opts_find(list, NULL);
-        if (opts) {
-            return opts;
-        }
-    }
-    opts = g_malloc0(sizeof(*opts));
-    opts->id = g_strdup(id);
-    opts->list = list;
-    loc_save(&opts->loc);
-    QTAILQ_INIT(&opts->head);
-    QTAILQ_INSERT_TAIL(&list->head, opts, next);
-    return opts;
-}
-
-QemuOpts *qemu_opts_create_nofail(QemuOptsList *list)
-{
-    QemuOpts *opts;
-    Error *errp = NULL;
-    opts = qemu_opts_create(list, NULL, 0, &errp);
-    assert_no_error(errp);
-    return opts;
-}
-
-void qemu_opts_reset(QemuOptsList *list)
-{
-    QemuOpts *opts, *next_opts;
-
-    QTAILQ_FOREACH_SAFE(opts, &list->head, next, next_opts) {
-        qemu_opts_del(opts);
-    }
-}
-
-void qemu_opts_loc_restore(QemuOpts *opts)
-{
-    loc_restore(&opts->loc);
-}
-
-int qemu_opts_set(QemuOptsList *list, const char *id,
-                  const char *name, const char *value)
-{
-    QemuOpts *opts;
-    Error *local_err = NULL;
-
-    opts = qemu_opts_create(list, id, 1, &local_err);
-    if (error_is_set(&local_err)) {
-        qerror_report_err(local_err);
-        error_free(local_err);
-        return -1;
-    }
-    return qemu_opt_set(opts, name, value);
-}
-
-const char *qemu_opts_id(QemuOpts *opts)
-{
-    return opts->id;
-}
-
-void qemu_opts_del(QemuOpts *opts)
-{
-    QemuOpt *opt;
-
-    for (;;) {
-        opt = QTAILQ_FIRST(&opts->head);
-        if (opt == NULL)
-            break;
-        qemu_opt_del(opt);
-    }
-    QTAILQ_REMOVE(&opts->list->head, opts, next);
-    g_free(opts->id);
-    g_free(opts);
-}
-
-int qemu_opts_print(QemuOpts *opts, void *dummy)
-{
-    QemuOpt *opt;
-
-    fprintf(stderr, "%s: %s:", opts->list->name,
-            opts->id ? opts->id : "<noid>");
-    QTAILQ_FOREACH(opt, &opts->head, next) {
-        fprintf(stderr, " %s=\"%s\"", opt->name, opt->str);
-    }
-    fprintf(stderr, "\n");
-    return 0;
-}
-
-static int opts_do_parse(QemuOpts *opts, const char *params,
-                         const char *firstname, bool prepend)
-{
-    char option[128], value[1024];
-    const char *p,*pe,*pc;
-    Error *local_err = NULL;
-
-    for (p = params; *p != '\0'; p++) {
-        pe = strchr(p, '=');
-        pc = strchr(p, ',');
-        if (!pe || (pc && pc < pe)) {
-            /* found "foo,more" */
-            if (p == params && firstname) {
-                /* implicitly named first option */
-                pstrcpy(option, sizeof(option), firstname);
-                p = get_opt_value(value, sizeof(value), p);
-            } else {
-                /* option without value, probably a flag */
-                p = get_opt_name(option, sizeof(option), p, ',');
-                if (strncmp(option, "no", 2) == 0) {
-                    memmove(option, option+2, strlen(option+2)+1);
-                    pstrcpy(value, sizeof(value), "off");
-                } else {
-                    pstrcpy(value, sizeof(value), "on");
-                }
-            }
-        } else {
-            /* found "foo=bar,more" */
-            p = get_opt_name(option, sizeof(option), p, '=');
-            if (*p != '=') {
-                break;
-            }
-            p++;
-            p = get_opt_value(value, sizeof(value), p);
-        }
-        if (strcmp(option, "id") != 0) {
-            /* store and parse */
-            opt_set(opts, option, value, prepend, &local_err);
-            if (error_is_set(&local_err)) {
-                qerror_report_err(local_err);
-                error_free(local_err);
-                return -1;
-            }
-        }
-        if (*p != ',') {
-            break;
-        }
-    }
-    return 0;
-}
-
-int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname)
-{
-    return opts_do_parse(opts, params, firstname, false);
-}
-
-static QemuOpts *opts_parse(QemuOptsList *list, const char *params,
-                            int permit_abbrev, bool defaults)
-{
-    const char *firstname;
-    char value[1024], *id = NULL;
-    const char *p;
-    QemuOpts *opts;
-    Error *local_err = NULL;
-
-    assert(!permit_abbrev || list->implied_opt_name);
-    firstname = permit_abbrev ? list->implied_opt_name : NULL;
-
-    if (strncmp(params, "id=", 3) == 0) {
-        get_opt_value(value, sizeof(value), params+3);
-        id = value;
-    } else if ((p = strstr(params, ",id=")) != NULL) {
-        get_opt_value(value, sizeof(value), p+4);
-        id = value;
-    }
-    opts = qemu_opts_create(list, id, !defaults, &local_err);
-    if (opts == NULL) {
-        if (error_is_set(&local_err)) {
-            qerror_report_err(local_err);
-            error_free(local_err);
-        }
-        return NULL;
-    }
-
-    if (opts_do_parse(opts, params, firstname, defaults) != 0) {
-        qemu_opts_del(opts);
-        return NULL;
-    }
-
-    return opts;
-}
-
-QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params,
-                          int permit_abbrev)
-{
-    return opts_parse(list, params, permit_abbrev, false);
-}
-
-void qemu_opts_set_defaults(QemuOptsList *list, const char *params,
-                            int permit_abbrev)
-{
-    QemuOpts *opts;
-
-    opts = opts_parse(list, params, permit_abbrev, true);
-    assert(opts);
-}
-
-typedef struct OptsFromQDictState {
-    QemuOpts *opts;
-    Error **errp;
-} OptsFromQDictState;
-
-static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque)
-{
-    OptsFromQDictState *state = opaque;
-    char buf[32];
-    const char *value;
-    int n;
-
-    if (!strcmp(key, "id") || error_is_set(state->errp)) {
-        return;
-    }
-
-    switch (qobject_type(obj)) {
-    case QTYPE_QSTRING:
-        value = qstring_get_str(qobject_to_qstring(obj));
-        break;
-    case QTYPE_QINT:
-        n = snprintf(buf, sizeof(buf), "%" PRId64,
-                     qint_get_int(qobject_to_qint(obj)));
-        assert(n < sizeof(buf));
-        value = buf;
-        break;
-    case QTYPE_QFLOAT:
-        n = snprintf(buf, sizeof(buf), "%.17g",
-                     qfloat_get_double(qobject_to_qfloat(obj)));
-        assert(n < sizeof(buf));
-        value = buf;
-        break;
-    case QTYPE_QBOOL:
-        pstrcpy(buf, sizeof(buf),
-                qbool_get_int(qobject_to_qbool(obj)) ? "on" : "off");
-        value = buf;
-        break;
-    default:
-        return;
-    }
-
-    qemu_opt_set_err(state->opts, key, value, state->errp);
-}
-
-/*
- * Create QemuOpts from a QDict.
- * Use value of key "id" as ID if it exists and is a QString.
- * Only QStrings, QInts, QFloats and QBools are copied.  Entries with
- * other types are silently ignored.
- */
-QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict,
-                               Error **errp)
-{
-    OptsFromQDictState state;
-    Error *local_err = NULL;
-    QemuOpts *opts;
-
-    opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1,
-                            &local_err);
-    if (error_is_set(&local_err)) {
-        error_propagate(errp, local_err);
-        return NULL;
-    }
-
-    assert(opts != NULL);
-
-    state.errp = &local_err;
-    state.opts = opts;
-    qdict_iter(qdict, qemu_opts_from_qdict_1, &state);
-    if (error_is_set(&local_err)) {
-        error_propagate(errp, local_err);
-        qemu_opts_del(opts);
-        return NULL;
-    }
-
-    return opts;
-}
-
-/*
- * Adds all QDict entries to the QemuOpts that can be added and removes them
- * from the QDict. When this function returns, the QDict contains only those
- * entries that couldn't be added to the QemuOpts.
- */
-void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp)
-{
-    const QDictEntry *entry, *next;
-
-    entry = qdict_first(qdict);
-
-    while (entry != NULL) {
-        Error *local_err = NULL;
-        OptsFromQDictState state = {
-            .errp = &local_err,
-            .opts = opts,
-        };
-
-        next = qdict_next(qdict, entry);
-
-        if (find_desc_by_name(opts->list->desc, entry->key)) {
-            qemu_opts_from_qdict_1(entry->key, entry->value, &state);
-            if (error_is_set(&local_err)) {
-                error_propagate(errp, local_err);
-                return;
-            } else {
-                qdict_del(qdict, entry->key);
-            }
-        }
-
-        entry = next;
-    }
-}
-
-/*
- * Convert from QemuOpts to QDict.
- * The QDict values are of type QString.
- * TODO We'll want to use types appropriate for opt->desc->type, but
- * this is enough for now.
- */
-QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict)
-{
-    QemuOpt *opt;
-    QObject *val;
-
-    if (!qdict) {
-        qdict = qdict_new();
-    }
-    if (opts->id) {
-        qdict_put(qdict, "id", qstring_from_str(opts->id));
-    }
-    QTAILQ_FOREACH(opt, &opts->head, next) {
-        val = QOBJECT(qstring_from_str(opt->str));
-        qdict_put_obj(qdict, opt->name, val);
-    }
-    return qdict;
-}
-
-/* Validate parsed opts against descriptions where no
- * descriptions were provided in the QemuOptsList.
- */
-void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp)
-{
-    QemuOpt *opt;
-    Error *local_err = NULL;
-
-    assert(opts_accepts_any(opts));
-
-    QTAILQ_FOREACH(opt, &opts->head, next) {
-        opt->desc = find_desc_by_name(desc, opt->name);
-        if (!opt->desc) {
-            error_set(errp, QERR_INVALID_PARAMETER, opt->name);
-            return;
-        }
-
-        qemu_opt_parse(opt, &local_err);
-        if (error_is_set(&local_err)) {
-            error_propagate(errp, local_err);
-            return;
-        }
-    }
-}
-
-int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque,
-                      int abort_on_failure)
-{
-    Location loc;
-    QemuOpts *opts;
-    int rc = 0;
-
-    loc_push_none(&loc);
-    QTAILQ_FOREACH(opts, &list->head, next) {
-        loc_restore(&opts->loc);
-        rc |= func(opts, opaque);
-        if (abort_on_failure  &&  rc != 0)
-            break;
-    }
-    loc_pop(&loc);
-    return rc;
-}
diff --git a/contrib/qemu/util/qemu-thread-posix.c b/contrib/qemu/util/qemu-thread-posix.c
deleted file mode 100644
index 4489abf1d..000000000
--- a/contrib/qemu/util/qemu-thread-posix.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Wrappers around mutex/cond/thread functions
- *
- * Copyright Red Hat, Inc. 2009
- *
- * Author:
- *  Marcelo Tosatti <mtosatti@redhat.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <time.h>
-#include <signal.h>
-#include <stdint.h>
-#include <string.h>
-#include <limits.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include "qemu/thread.h"
-
-static void error_exit(int err, const char *msg)
-{
-    fprintf(stderr, "qemu: %s: %s\n", msg, strerror(err));
-    abort();
-}
-
-void qemu_mutex_init(QemuMutex *mutex)
-{
-    int err;
-    pthread_mutexattr_t mutexattr;
-
-    pthread_mutexattr_init(&mutexattr);
-    pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_ERRORCHECK);
-    err = pthread_mutex_init(&mutex->lock, &mutexattr);
-    pthread_mutexattr_destroy(&mutexattr);
-    if (err)
-        error_exit(err, __func__);
-}
-
-void qemu_mutex_destroy(QemuMutex *mutex)
-{
-    int err;
-
-    err = pthread_mutex_destroy(&mutex->lock);
-    if (err)
-        error_exit(err, __func__);
-}
-
-void qemu_mutex_lock(QemuMutex *mutex)
-{
-    int err;
-
-    err = pthread_mutex_lock(&mutex->lock);
-    if (err)
-        error_exit(err, __func__);
-}
-
-int qemu_mutex_trylock(QemuMutex *mutex)
-{
-    return pthread_mutex_trylock(&mutex->lock);
-}
-
-void qemu_mutex_unlock(QemuMutex *mutex)
-{
-    int err;
-
-    err = pthread_mutex_unlock(&mutex->lock);
-    if (err)
-        error_exit(err, __func__);
-}
-
-void qemu_cond_init(QemuCond *cond)
-{
-    int err;
-
-    err = pthread_cond_init(&cond->cond, NULL);
-    if (err)
-        error_exit(err, __func__);
-}
-
-void qemu_cond_destroy(QemuCond *cond)
-{
-    int err;
-
-    err = pthread_cond_destroy(&cond->cond);
-    if (err)
-        error_exit(err, __func__);
-}
-
-void qemu_cond_signal(QemuCond *cond)
-{
-    int err;
-
-    err = pthread_cond_signal(&cond->cond);
-    if (err)
-        error_exit(err, __func__);
-}
-
-void qemu_cond_broadcast(QemuCond *cond)
-{
-    int err;
-
-    err = pthread_cond_broadcast(&cond->cond);
-    if (err)
-        error_exit(err, __func__);
-}
-
-void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex)
-{
-    int err;
-
-    err = pthread_cond_wait(&cond->cond, &mutex->lock);
-    if (err)
-        error_exit(err, __func__);
-}
-
-void qemu_sem_init(QemuSemaphore *sem, int init)
-{
-    int rc;
-
-#if defined(__APPLE__) || defined(__NetBSD__)
-    rc = pthread_mutex_init(&sem->lock, NULL);
-    if (rc != 0) {
-        error_exit(rc, __func__);
-    }
-    rc = pthread_cond_init(&sem->cond, NULL);
-    if (rc != 0) {
-        error_exit(rc, __func__);
-    }
-    if (init < 0) {
-        error_exit(EINVAL, __func__);
-    }
-    sem->count = init;
-#else
-    rc = sem_init(&sem->sem, 0, init);
-    if (rc < 0) {
-        error_exit(errno, __func__);
-    }
-#endif
-}
-
-void qemu_sem_destroy(QemuSemaphore *sem)
-{
-    int rc;
-
-#if defined(__APPLE__) || defined(__NetBSD__)
-    rc = pthread_cond_destroy(&sem->cond);
-    if (rc < 0) {
-        error_exit(rc, __func__);
-    }
-    rc = pthread_mutex_destroy(&sem->lock);
-    if (rc < 0) {
-        error_exit(rc, __func__);
-    }
-#else
-    rc = sem_destroy(&sem->sem);
-    if (rc < 0) {
-        error_exit(errno, __func__);
-    }
-#endif
-}
-
-void qemu_sem_post(QemuSemaphore *sem)
-{
-    int rc;
-
-#if defined(__APPLE__) || defined(__NetBSD__)
-    pthread_mutex_lock(&sem->lock);
-    if (sem->count == INT_MAX) {
-        rc = EINVAL;
-    } else if (sem->count++ < 0) {
-        rc = pthread_cond_signal(&sem->cond);
-    } else {
-        rc = 0;
-    }
-    pthread_mutex_unlock(&sem->lock);
-    if (rc != 0) {
-        error_exit(rc, __func__);
-    }
-#else
-    rc = sem_post(&sem->sem);
-    if (rc < 0) {
-        error_exit(errno, __func__);
-    }
-#endif
-}
-
-static void compute_abs_deadline(struct timespec *ts, int ms)
-{
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    ts->tv_nsec = tv.tv_usec * 1000 + (ms % 1000) * 1000000;
-    ts->tv_sec = tv.tv_sec + ms / 1000;
-    if (ts->tv_nsec >= 1000000000) {
-        ts->tv_sec++;
-        ts->tv_nsec -= 1000000000;
-    }
-}
-
-int qemu_sem_timedwait(QemuSemaphore *sem, int ms)
-{
-    int rc;
-    struct timespec ts;
-
-#if defined(__APPLE__) || defined(__NetBSD__)
-    compute_abs_deadline(&ts, ms);
-    pthread_mutex_lock(&sem->lock);
-    --sem->count;
-    while (sem->count < 0) {
-        rc = pthread_cond_timedwait(&sem->cond, &sem->lock, &ts);
-        if (rc == ETIMEDOUT) {
-            ++sem->count;
-            break;
-        }
-        if (rc != 0) {
-            error_exit(rc, __func__);
-        }
-    }
-    pthread_mutex_unlock(&sem->lock);
-    return (rc == ETIMEDOUT ? -1 : 0);
-#else
-    if (ms <= 0) {
-        /* This is cheaper than sem_timedwait.  */
-        do {
-            rc = sem_trywait(&sem->sem);
-        } while (rc == -1 && errno == EINTR);
-        if (rc == -1 && errno == EAGAIN) {
-            return -1;
-        }
-    } else {
-        compute_abs_deadline(&ts, ms);
-        do {
-            rc = sem_timedwait(&sem->sem, &ts);
-        } while (rc == -1 && errno == EINTR);
-        if (rc == -1 && errno == ETIMEDOUT) {
-            return -1;
-        }
-    }
-    if (rc < 0) {
-        error_exit(errno, __func__);
-    }
-    return 0;
-#endif
-}
-
-void qemu_sem_wait(QemuSemaphore *sem)
-{
-#if defined(__APPLE__) || defined(__NetBSD__)
-    pthread_mutex_lock(&sem->lock);
-    --sem->count;
-    while (sem->count < 0) {
-        pthread_cond_wait(&sem->cond, &sem->lock);
-    }
-    pthread_mutex_unlock(&sem->lock);
-#else
-    int rc;
-
-    do {
-        rc = sem_wait(&sem->sem);
-    } while (rc == -1 && errno == EINTR);
-    if (rc < 0) {
-        error_exit(errno, __func__);
-    }
-#endif
-}
-
-void qemu_thread_create(QemuThread *thread,
-                       void *(*start_routine)(void*),
-                       void *arg, int mode)
-{
-    sigset_t set, oldset;
-    int err;
-    pthread_attr_t attr;
-
-    err = pthread_attr_init(&attr);
-    if (err) {
-        error_exit(err, __func__);
-    }
-    if (mode == QEMU_THREAD_DETACHED) {
-        err = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-        if (err) {
-            error_exit(err, __func__);
-        }
-    }
-
-    /* Leave signal handling to the iothread.  */
-    sigfillset(&set);
-    pthread_sigmask(SIG_SETMASK, &set, &oldset);
-    err = pthread_create(&thread->thread, &attr, start_routine, arg);
-    if (err)
-        error_exit(err, __func__);
-
-    pthread_sigmask(SIG_SETMASK, &oldset, NULL);
-
-    pthread_attr_destroy(&attr);
-}
-
-void qemu_thread_get_self(QemuThread *thread)
-{
-    thread->thread = pthread_self();
-}
-
-bool qemu_thread_is_self(QemuThread *thread)
-{
-   return pthread_equal(pthread_self(), thread->thread);
-}
-
-void qemu_thread_exit(void *retval)
-{
-    pthread_exit(retval);
-}
-
-void *qemu_thread_join(QemuThread *thread)
-{
-    int err;
-    void *ret;
-
-    err = pthread_join(thread->thread, &ret);
-    if (err) {
-        error_exit(err, __func__);
-    }
-    return ret;
-}
diff --git a/contrib/qemu/util/unicode.c b/contrib/qemu/util/unicode.c
deleted file mode 100644
index d1c865885..000000000
--- a/contrib/qemu/util/unicode.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Dealing with Unicode
- *
- * Copyright (C) 2013 Red Hat, Inc.
- *
- * Authors:
- *  Markus Armbruster <armbru@redhat.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or
- * later.  See the COPYING file in the top-level directory.
- */
-
-#include "qemu-common.h"
-
-/**
- * mod_utf8_codepoint:
- * @s: string encoded in modified UTF-8
- * @n: maximum number of bytes to read from @s, if less than 6
- * @end: set to end of sequence on return
- *
- * Convert the modified UTF-8 sequence at the start of @s.  Modified
- * UTF-8 is exactly like UTF-8, except U+0000 is encoded as
- * "\xC0\x80".
- *
- * If @n is zero or @s points to a zero byte, the sequence is invalid,
- * and @end is set to @s.
- *
- * If @s points to an impossible byte (0xFE or 0xFF) or a continuation
- * byte, the sequence is invalid, and @end is set to @s + 1
- *
- * Else, the first byte determines how many continuation bytes are
- * expected.  If there are fewer, the sequence is invalid, and @end is
- * set to @s + 1 + actual number of continuation bytes.  Else, the
- * sequence is well-formed, and @end is set to @s + 1 + expected
- * number of continuation bytes.
- *
- * A well-formed sequence is valid unless it encodes a codepoint
- * outside the Unicode range U+0000..U+10FFFF, one of Unicode's 66
- * noncharacters, a surrogate codepoint, or is overlong.  Except the
- * overlong sequence "\xC0\x80" is valid.
- *
- * Conversion succeeds if and only if the sequence is valid.
- *
- * Returns: the Unicode codepoint on success, -1 on failure.
- */
-int mod_utf8_codepoint(const char *s, size_t n, char **end)
-{
-    static int min_cp[5] = { 0x80, 0x800, 0x10000, 0x200000, 0x4000000 };
-    const unsigned char *p;
-    unsigned byte, mask, len, i;
-    int cp;
-
-    if (n == 0 || *s == 0) {
-        /* empty sequence */
-        *end = (char *)s;
-        return -1;
-    }
-
-    p = (const unsigned char *)s;
-    byte = *p++;
-    if (byte < 0x80) {
-        cp = byte;              /* one byte sequence */
-    } else if (byte >= 0xFE) {
-        cp = -1;                /* impossible bytes 0xFE, 0xFF */
-    } else if ((byte & 0x40) == 0) {
-        cp = -1;                /* unexpected continuation byte */
-    } else {
-        /* multi-byte sequence */
-        len = 0;
-        for (mask = 0x80; byte & mask; mask >>= 1) {
-            len++;
-        }
-        assert(len > 1 && len < 7);
-        cp = byte & (mask - 1);
-        for (i = 1; i < len; i++) {
-            byte = i < n ? *p : 0;
-            if ((byte & 0xC0) != 0x80) {
-                cp = -1;        /* continuation byte missing */
-                goto out;
-            }
-            p++;
-            cp <<= 6;
-            cp |= byte & 0x3F;
-        }
-        if (cp > 0x10FFFF) {
-            cp = -1;            /* beyond Unicode range */
-        } else if ((cp >= 0xFDD0 && cp <= 0xFDEF)
-                   || (cp & 0xFFFE) == 0xFFFE) {
-            cp = -1;            /* noncharacter */
-        } else if (cp >= 0xD800 && cp <= 0xDFFF) {
-            cp = -1;            /* surrogate code point */
-        } else if (cp < min_cp[len - 2] && !(cp == 0 && len == 2)) {
-            cp = -1;            /* overlong, not \xC0\x80 */
-        }
-    }
-
-out:
-    *end = (char *)p;
-    return cp;
-}
diff --git a/contrib/rbtree/rb.c b/contrib/rbtree/rb.c
index 6184c507e..d1339b97d 100644
--- a/contrib/rbtree/rb.c
+++ b/contrib/rbtree/rb.c
@@ -1,30 +1,26 @@
 /* Produced by texiweb from libavl.w. */
 
 /* libavl - library for manipulation of binary trees.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
-
-   This code is also covered by the following earlier license notice:
+   Copyright (C) 1998-2002, 2004 Free Software Foundation, Inc.
 
    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.
+
+   The author may be contacted at <blp@gnu.org> on the Internet, or
+   write to Ben Pfaff, Stanford University, Computer Science Dept., 353
+   Serra Mall, Stanford CA 94305, USA.
 */
 
 #include <assert.h>
diff --git a/contrib/rbtree/rb.h b/contrib/rbtree/rb.h
index 97b44cfd4..c8858b556 100644
--- a/contrib/rbtree/rb.h
+++ b/contrib/rbtree/rb.h
@@ -1,30 +1,26 @@
 /* Produced by texiweb from libavl.w. */
 
 /* libavl - library for manipulation of binary trees.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
-
-   This code is also covered by the following earlier license notice:
+   Copyright (C) 1998-2002, 2004 Free Software Foundation, Inc.
 
    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.
+
+   The author may be contacted at <blp@gnu.org> on the Internet, or
+   write to Ben Pfaff, Stanford University, Computer Science Dept., 353
+   Serra Mall, Stanford CA 94305, USA.
 */
 
 #ifndef RB_H
@@ -55,7 +51,7 @@ void rb_free (struct libavl_allocator *, void *);
 
 /* Maximum RB height. */
 #ifndef RB_MAX_HEIGHT
-#define RB_MAX_HEIGHT 128
+#define RB_MAX_HEIGHT 48
 #endif
 
 /* Tree data structure. */
diff --git a/contrib/stdlib/gf_mkostemp.c b/contrib/stdlib/gf_mkostemp.c
deleted file mode 100644
index 931249a45..000000000
--- a/contrib/stdlib/gf_mkostemp.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Borrowed from glibc-2.16/sysdeps/posix/tempname.c */
-
-/* Copyright (C) 1991-2001, 2006, 2007, 2009 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <time.h>
-#include <inttypes.h>
-
-static const char letters[] =
-"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
-/* Generate a temporary file name based on TMPL.  TMPL must match the
-   rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix).
-*/
-
-#if !defined(TMP_MAX)
-#define TMP_MAX 238328
-#endif
-
-int
-gf_mkostemp (char *tmpl, int suffixlen, int flags)
-{
-        int len;
-        char *XXXXXX;
-        static uint64_t value;
-        uint64_t random_time_bits;
-        unsigned int count;
-        int fd = -1;
-
-  /* A lower bound on the number of temporary files to attempt to
-     generate.  The maximum total number of temporary file names that
-     can exist for a given template is 62**6.  It should never be
-     necessary to try all these combinations.  Instead if a reasonable
-     number of names is tried (we define reasonable as 62**3) fail to
-     give the system administrator the chance to remove the problems.  */
-
-        unsigned int attempts = TMP_MAX; /* TMP_MAX == 62³ */
-
-        len = strlen (tmpl);
-        if (len < 6 + suffixlen || memcmp (&tmpl[len - 6 - suffixlen],
-                                           "XXXXXX", 6))
-                return -1;
-
-  /* This is where the Xs start.  */
-        XXXXXX = &tmpl[len - 6 - suffixlen];
-
-  /* Get some more or less random data.  */
-# if HAVE_GETTIMEOFDAY
-        struct timeval tv;
-        gettimeofday (&tv, NULL);
-        random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
-# else
-        random_time_bits = time (NULL);
-# endif
-
-        value += random_time_bits ^ getpid ();
-
-        for (count = 0; count < attempts; value += 7777, ++count) {
-                uint64_t v = value;
-
-                /* Fill in the random bits.  */
-                XXXXXX[0] = letters[v % 62];
-                v /= 62;
-                XXXXXX[1] = letters[v % 62];
-                v /= 62;
-                XXXXXX[2] = letters[v % 62];
-                v /= 62;
-                XXXXXX[3] = letters[v % 62];
-                v /= 62;
-                XXXXXX[4] = letters[v % 62];
-                v /= 62;
-                XXXXXX[5] = letters[v % 62];
-
-                fd = open (tmpl, (flags & ~O_ACCMODE)
-                           | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-
-                if (fd >= 0)
-                        return fd;
-                else if (errno != EEXIST)
-                        return -1;
-        }
-
-        /* We got out of the loop because we ran out of combinations to try.  */
-        return -1;
-}
diff --git a/contrib/uuid/uuid_types.h.in b/contrib/uuid/uuid_types.h
index f21ff4ee1..3e2290b46 100644
--- a/contrib/uuid/uuid_types.h.in
+++ b/contrib/uuid/uuid_types.h
@@ -9,13 +9,13 @@
 typedef unsigned char uint8_t;
 typedef signed char int8_t;
 
-#if (@SIZEOF_INT@ == 8)
+#if (4 == 8)
 typedef int		int64_t;
 typedef unsigned int	uint64_t;
-#elif (@SIZEOF_LONG@ == 8)
+#elif (8 == 8)
 typedef long		int64_t;
 typedef unsigned long	uint64_t;
-#elif (@SIZEOF_LONG_LONG@ == 8)
+#elif (8 == 8)
 #if defined(__GNUC__)
 typedef __signed__ long long 	int64_t;
 #else
@@ -24,23 +24,23 @@ typedef signed long long 	int64_t;
 typedef unsigned long long	uint64_t;
 #endif
 
-#if (@SIZEOF_INT@ == 2)
+#if (4 == 2)
 typedef	int		int16_t;
 typedef	unsigned int	uint16_t;
-#elif (@SIZEOF_SHORT@ == 2)
+#elif (2 == 2)
 typedef	short		int16_t;
 typedef	unsigned short	uint16_t;
 #else
   ?==error: undefined 16 bit type
 #endif
 
-#if (@SIZEOF_INT@ == 4)
+#if (4 == 4)
 typedef	int		int32_t;
 typedef	unsigned int	uint32_t;
-#elif (@SIZEOF_LONG@ == 4)
+#elif (8 == 4)
 typedef	long		int32_t;
 typedef	unsigned long	uint32_t;
-#elif (@SIZEOF_SHORT@ == 4)
+#elif (2 == 4)
 typedef	short		int32_t;
 typedef	unsigned short	uint32_t;
 #else
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1103b607d..c5fd2b81a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,13 @@
-EXTRA_DIST = glusterfs.8 mount.glusterfs.8 gluster.8 \
-			glusterd.8 glusterfsd.8
+EXTRA_DIST = glusterfs.vol.sample glusterfsd.vol.sample glusterfs.8 mount.glusterfs.8\
+	porting_guide.txt authentication.txt coding-standard.pdf get_put_api_using_xattr.txt \
+	translator-options.txt mac-related-xattrs.txt replicate.pdf glusterd.vol gluster.8 \
+        glusterd.8 glusterfsd.8
+
+SUBDIRS = examples hacker-guide
+
+voldir = $(sysconfdir)/glusterfs
+vol_DATA = glusterfs.vol.sample glusterfsd.vol.sample glusterd.vol
 
 man8_MANS = glusterfs.8 mount.glusterfs.8 gluster.8 glusterd.8 glusterfsd.8
 
-CLEANFILES =
+CLEANFILES = 
diff --git a/doc/admin-guide/en-US/images/640px-GlusterFS_Architecture.png b/doc/admin-guide/en-US/images/640px-GlusterFS_Architecture.png
deleted file mode 100644
index 95f89ec82..000000000
--- a/doc/admin-guide/en-US/images/640px-GlusterFS_Architecture.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Distributed_Replicated_Volume.png b/doc/admin-guide/en-US/images/Distributed_Replicated_Volume.png
deleted file mode 100644
index dfc0a2c56..000000000
--- a/doc/admin-guide/en-US/images/Distributed_Replicated_Volume.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Distributed_Striped_Replicated_Volume.png b/doc/admin-guide/en-US/images/Distributed_Striped_Replicated_Volume.png
deleted file mode 100644
index d286fa99e..000000000
--- a/doc/admin-guide/en-US/images/Distributed_Striped_Replicated_Volume.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Distributed_Striped_Volume.png b/doc/admin-guide/en-US/images/Distributed_Striped_Volume.png
deleted file mode 100644
index 752fa982f..000000000
--- a/doc/admin-guide/en-US/images/Distributed_Striped_Volume.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Distributed_Volume.png b/doc/admin-guide/en-US/images/Distributed_Volume.png
deleted file mode 100644
index 4386ca935..000000000
--- a/doc/admin-guide/en-US/images/Distributed_Volume.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Geo-Rep03_Internet.png b/doc/admin-guide/en-US/images/Geo-Rep03_Internet.png
deleted file mode 100644
index 3cd0eaded..000000000
--- a/doc/admin-guide/en-US/images/Geo-Rep03_Internet.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Geo-Rep04_Cascading.png b/doc/admin-guide/en-US/images/Geo-Rep04_Cascading.png
deleted file mode 100644
index 54bf9f05c..000000000
--- a/doc/admin-guide/en-US/images/Geo-Rep04_Cascading.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Geo-Rep_LAN.png b/doc/admin-guide/en-US/images/Geo-Rep_LAN.png
deleted file mode 100644
index a74f6dbb5..000000000
--- a/doc/admin-guide/en-US/images/Geo-Rep_LAN.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Geo-Rep_WAN.png b/doc/admin-guide/en-US/images/Geo-Rep_WAN.png
deleted file mode 100644
index d72d72768..000000000
--- a/doc/admin-guide/en-US/images/Geo-Rep_WAN.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/GlusterFS_Architecture.png b/doc/admin-guide/en-US/images/GlusterFS_Architecture.png
deleted file mode 100644
index b506db1f4..000000000
--- a/doc/admin-guide/en-US/images/GlusterFS_Architecture.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Hadoop_Architecture.png b/doc/admin-guide/en-US/images/Hadoop_Architecture.png
deleted file mode 100644
index 8725bd330..000000000
--- a/doc/admin-guide/en-US/images/Hadoop_Architecture.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Replicated_Volume.png b/doc/admin-guide/en-US/images/Replicated_Volume.png
deleted file mode 100644
index 135a63f34..000000000
--- a/doc/admin-guide/en-US/images/Replicated_Volume.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Striped_Replicated_Volume.png b/doc/admin-guide/en-US/images/Striped_Replicated_Volume.png
deleted file mode 100644
index ee88af731..000000000
--- a/doc/admin-guide/en-US/images/Striped_Replicated_Volume.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/Striped_Volume.png b/doc/admin-guide/en-US/images/Striped_Volume.png
deleted file mode 100644
index 63a84b242..000000000
--- a/doc/admin-guide/en-US/images/Striped_Volume.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/UFO_Architecture.png b/doc/admin-guide/en-US/images/UFO_Architecture.png
deleted file mode 100644
index be85d7b28..000000000
--- a/doc/admin-guide/en-US/images/UFO_Architecture.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/VSA_Architecture.png b/doc/admin-guide/en-US/images/VSA_Architecture.png
deleted file mode 100644
index c3ab80cf3..000000000
--- a/doc/admin-guide/en-US/images/VSA_Architecture.png
+++ /dev/null
diff --git a/doc/admin-guide/en-US/images/icon.svg b/doc/admin-guide/en-US/images/icon.svg
deleted file mode 100644
index b2f16d0f6..000000000
--- a/doc/admin-guide/en-US/images/icon.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="32" height="32" id="svg3017">
-  <defs id="defs3019">
-    <linearGradient id="linearGradient2381">
-      <stop id="stop2383" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
-      <stop id="stop2385" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
-    </linearGradient>
-    <linearGradient x1="296.4996" y1="188.81061" x2="317.32471" y2="209.69398" id="linearGradient2371" xlink:href="#linearGradient2381" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)"/>
-  </defs>
-  <g transform="matrix(0.437808,-0.437808,0.437808,0.437808,-220.8237,43.55311)" id="g5089">
-    <path d="m 8.4382985,-6.28125 c -0.6073916,0 -4.3132985,5.94886271 -4.3132985,8.25 l 0,26.71875 c 0,0.846384 0.5818159,1.125 1.15625,1.125 l 25.5625,0 c 0.632342,0 1.125001,-0.492658 1.125,-1.125 l 0,-5.21875 0.28125,0 c 0.49684,0 0.906249,-0.409411 0.90625,-0.90625 l 0,-27.9375 c 0,-0.4968398 -0.40941,-0.90625 -0.90625,-0.90625 l -23.8117015,0 z" transform="translate(282.8327,227.1903)" id="path5091" style="fill:#5c5c4f;stroke:#000000;stroke-width:3.23021388;stroke-miterlimit:4;stroke-dasharray:none"/>
-    <rect width="27.85074" height="29.369793" rx="1.1414107" ry="1.1414107" x="286.96509" y="227.63805" id="rect5093" style="fill:#032c87"/>
-    <path d="m 288.43262,225.43675 25.2418,0 0,29.3698 -26.37615,0.0241 1.13435,-29.39394 z" id="rect5095" style="fill:#ffffff"/>
-    <path d="m 302.44536,251.73726 c 1.38691,7.85917 -0.69311,11.28365 -0.69311,11.28365 2.24384,-1.60762 3.96426,-3.47694 4.90522,-5.736 0.96708,2.19264 1.83294,4.42866 4.27443,5.98941 0,0 -1.59504,-7.2004 -1.71143,-11.53706 l -6.77511,0 z" id="path5097" style="fill:#a70000;fill-opacity:1;stroke-width:2"/>
-    <rect width="25.241802" height="29.736675" rx="0.89682275" ry="0.89682275" x="290.73544" y="220.92249" id="rect5099" style="fill:#809cc9"/>
-    <path d="m 576.47347,725.93939 6.37084,0.41502 0.4069,29.51809 c -1.89202,-1.31785 -6.85427,-3.7608 -8.26232,-1.68101 l 0,-26.76752 c 0,-0.82246 0.66212,-1.48458 1.48458,-1.48458 z" transform="matrix(0.499065,-0.866565,0,1,0,0)" id="rect5101" style="fill:#4573b3;fill-opacity:1"/>
-    <path d="m 293.2599,221.89363 20.73918,0 c 0.45101,0 0.8141,0.3631 0.8141,0.81411 0.21547,6.32836 -19.36824,21.7635 -22.36739,17.59717 l 0,-17.59717 c 0,-0.45101 0.3631,-0.81411 0.81411,-0.81411 z" id="path5103" style="opacity:0.65536726;fill:url(#linearGradient2371);fill-opacity:1"/>
-  </g>
-</svg>
diff --git a/doc/admin-guide/en-US/markdown/Administration_Guide.md b/doc/admin-guide/en-US/markdown/Administration_Guide.md
deleted file mode 100644
index 8b1378917..000000000
--- a/doc/admin-guide/en-US/markdown/Administration_Guide.md
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/doc/admin-guide/en-US/markdown/Author_Group.md b/doc/admin-guide/en-US/markdown/Author_Group.md
deleted file mode 100644
index ef2a5e677..000000000
--- a/doc/admin-guide/en-US/markdown/Author_Group.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Divya
-Muntimadugu
-Red Hat
-Engineering Content Services
-divya@redhat.com
diff --git a/doc/admin-guide/en-US/markdown/Book_Info.md b/doc/admin-guide/en-US/markdown/Book_Info.md
deleted file mode 100644
index 8b1378917..000000000
--- a/doc/admin-guide/en-US/markdown/Book_Info.md
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/doc/admin-guide/en-US/markdown/Chapter.md b/doc/admin-guide/en-US/markdown/Chapter.md
deleted file mode 100644
index 8420259c4..000000000
--- a/doc/admin-guide/en-US/markdown/Chapter.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Test Chapter
-============
-
-This is a test paragraph
-
-Test Section 1
-==============
-
-This is a test paragraph in a section
-
-Test Section 2
-==============
-
-This is a test paragraph in Section 2
-
-1.  listitem text
-
-
diff --git a/doc/admin-guide/en-US/markdown/Preface.md b/doc/admin-guide/en-US/markdown/Preface.md
deleted file mode 100644
index f7e934ae8..000000000
--- a/doc/admin-guide/en-US/markdown/Preface.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Preface
-=======
-
-This guide describes how to configure, operate, and manage Gluster File
-System (GlusterFS).
-
-Audience
-========
-
-This guide is intended for Systems Administrators interested in
-configuring and managing GlusterFS.
-
-This guide assumes that you are familiar with the Linux operating
-system, concepts of File System, GlusterFS concepts, and GlusterFS
-Installation
-
-License
-=======
-
-The License information is available at [][].
-
-  []: http://www.redhat.com/licenses/rhel_rha_eula.html
diff --git a/doc/admin-guide/en-US/markdown/Revision_History.md b/doc/admin-guide/en-US/markdown/Revision_History.md
deleted file mode 100644
index 2084309d1..000000000
--- a/doc/admin-guide/en-US/markdown/Revision_History.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Revision History
-================
-
-1-0 Thu Apr 5 2012 Divya Muntimadugu <divya@redhat.com> Draft
diff --git a/doc/admin-guide/en-US/markdown/admin_ACLs.md b/doc/admin-guide/en-US/markdown/admin_ACLs.md
deleted file mode 100644
index 308e069ca..000000000
--- a/doc/admin-guide/en-US/markdown/admin_ACLs.md
+++ /dev/null
@@ -1,197 +0,0 @@
-POSIX Access Control Lists
-==========================
-
-POSIX Access Control Lists (ACLs) allows you to assign different
-permissions for different users or groups even though they do not
-correspond to the original owner or the owning group.
-
-For example: User john creates a file but does not want to allow anyone
-to do anything with this file, except another user, antony (even though
-there are other users that belong to the group john).
-
-This means, in addition to the file owner, the file group, and others,
-additional users and groups can be granted or denied access by using
-POSIX ACLs.
-
-Activating POSIX ACLs Support
-=============================
-
-To use POSIX ACLs for a file or directory, the partition of the file or
-directory must be mounted with POSIX ACLs support.
-
-Activating POSIX ACLs Support on Sever
---------------------------------------
-
-To mount the backend export directories for POSIX ACLs support, use the
-following command:
-
-`# mount -o acl `
-
-For example:
-
-`# mount -o acl /dev/sda1 /export1 `
-
-Alternatively, if the partition is listed in the /etc/fstab file, add
-the following entry for the partition to include the POSIX ACLs option:
-
-`LABEL=/work /export1 ext3 rw, acl 14 `
-
-Activating POSIX ACLs Support on Client
----------------------------------------
-
-To mount the glusterfs volumes for POSIX ACLs support, use the following
-command:
-
-`# mount –t glusterfs -o acl `
-
-For example:
-
-`# mount -t glusterfs -o acl 198.192.198.234:glustervolume /mnt/gluster`
-
-Setting POSIX ACLs
-==================
-
-You can set two types of POSIX ACLs, that is, access ACLs and default
-ACLs. You can use access ACLs to grant permission for a specific file or
-directory. You can use default ACLs only on a directory but if a file
-inside that directory does not have an ACLs, it inherits the permissions
-of the default ACLs of the directory.
-
-You can set ACLs for per user, per group, for users not in the user
-group for the file, and via the effective right mask.
-
-Setting Access ACLs
--------------------
-
-You can apply access ACLs to grant permission for both files and
-directories.
-
-**To set or modify Access ACLs**
-
-You can set or modify access ACLs use the following command:
-
-`# setfacl –m  file `
-
-The ACL entry types are the POSIX ACLs representations of owner, group,
-and other.
-
-Permissions must be a combination of the characters `r` (read), `w`
-(write), and `x` (execute). You must specify the ACL entry in the
-following format and can specify multiple entry types separated by
-commas.
-
-  ACL Entry              Description
-  ---------------------- --------------------------------------------------------------------------------------------------------------------------------------------------
-  u:uid:\<permission\>   Sets the access ACLs for a user. You can specify user name or UID
-  g:gid:\<permission\>   Sets the access ACLs for a group. You can specify group name or GID.
-  m:\<permission\>       Sets the effective rights mask. The mask is the combination of all access permissions of the owning group and all of the user and group entries.
-  o:\<permission\>       Sets the access ACLs for users other than the ones in the group for the file.
-
-If a file or directory already has an POSIX ACLs, and the setfacl
-command is used, the additional permissions are added to the existing
-POSIX ACLs or the existing rule is modified.
-
-For example, to give read and write permissions to user antony:
-
-`# setfacl -m u:antony:rw /mnt/gluster/data/testfile `
-
-Setting Default ACLs
---------------------
-
-You can apply default ACLs only to directories. They determine the
-permissions of a file system objects that inherits from its parent
-directory when it is created.
-
-To set default ACLs
-
-You can set default ACLs for files and directories using the following
-command:
-
-`# setfacl –m –-set `
-
-For example, to set the default ACLs for the /data directory to read for
-users not in the user group:
-
-`# setfacl –m --set o::r /mnt/gluster/data `
-
-> **Note**
->
-> An access ACLs set for an individual file can override the default
-> ACLs permissions.
-
-**Effects of a Default ACLs**
-
-The following are the ways in which the permissions of a directory's
-default ACLs are passed to the files and subdirectories in it:
-
--   A subdirectory inherits the default ACLs of the parent directory
-    both as its default ACLs and as an access ACLs.
-
--   A file inherits the default ACLs as its access ACLs.
-
-Retrieving POSIX ACLs
-=====================
-
-You can view the existing POSIX ACLs for a file or directory.
-
-**To view existing POSIX ACLs**
-
--   View the existing access ACLs of a file using the following command:
-
-    `# getfacl `
-
-    For example, to view the existing POSIX ACLs for sample.jpg
-
-        # getfacl /mnt/gluster/data/test/sample.jpg
-        # owner: antony
-        # group: antony
-        user::rw-
-        group::rw-
-        other::r--
-
--   View the default ACLs of a directory using the following command:
-
-    `# getfacl `
-
-    For example, to view the existing ACLs for /data/doc
-
-        # getfacl /mnt/gluster/data/doc
-        # owner: antony
-        # group: antony
-        user::rw-
-        user:john:r--
-        group::r--
-        mask::r--
-        other::r--
-        default:user::rwx
-        default:user:antony:rwx
-        default:group::r-x
-        default:mask::rwx
-        default:other::r-x
-
-Removing POSIX ACLs
-===================
-
-To remove all the permissions for a user, groups, or others, use the
-following command:
-
-`# setfacl -x `
-
-For example, to remove all permissions from the user antony:
-
-`# setfacl -x u:antony /mnt/gluster/data/test-file`
-
-Samba and ACLs
-==============
-
-If you are using Samba to access GlusterFS FUSE mount, then POSIX ACLs
-are enabled by default. Samba has been compiled with the
-`--with-acl-support` option, so no special flags are required when
-accessing or mounting a Samba share.
-
-NFS and ACLs
-============
-
-Currently we do not support ACLs configuration through NFS, i.e. setfacl
-and getfacl commands do not work. However, ACLs permissions set using
-Gluster Native Client is applicable on NFS mounts.
diff --git a/doc/admin-guide/en-US/markdown/admin_Hadoop.md b/doc/admin-guide/en-US/markdown/admin_Hadoop.md
deleted file mode 100644
index 2894fa713..000000000
--- a/doc/admin-guide/en-US/markdown/admin_Hadoop.md
+++ /dev/null
@@ -1,170 +0,0 @@
-Managing Hadoop Compatible Storage
-==================================
-
-GlusterFS provides compatibility for Apache Hadoop and it uses the
-standard file system APIs available in Hadoop to provide a new storage
-option for Hadoop deployments. Existing MapReduce based applications can
-use GlusterFS seamlessly. This new functionality opens up data within
-Hadoop deployments to any file-based or object-based application.
-
-Architecture Overview
-=====================
-
-The following diagram illustrates Hadoop integration with GlusterFS:
-
-Advantages
-==========
-
-The following are the advantages of Hadoop Compatible Storage with
-GlusterFS:
-
--   Provides simultaneous file-based and object-based access within
-    Hadoop.
-
--   Eliminates the centralized metadata server.
-
--   Provides compatibility with MapReduce applications and rewrite is
-    not required.
-
--   Provides a fault tolerant file system.
-
-Preparing to Install Hadoop Compatible Storage
-==============================================
-
-This section provides information on pre-requisites and list of
-dependencies that will be installed during installation of Hadoop
-compatible storage.
-
-Pre-requisites
---------------
-
-The following are the pre-requisites to install Hadoop Compatible
-Storage :
-
--   Hadoop 0.20.2 is installed, configured, and is running on all the
-    machines in the cluster.
-
--   Java Runtime Environment
-
--   Maven (mandatory only if you are building the plugin from the
-    source)
-
--   JDK (mandatory only if you are building the plugin from the source)
-
--   getfattr - command line utility
-
-Installing, and Configuring Hadoop Compatible Storage
-=====================================================
-
-This section describes how to install and configure Hadoop Compatible
-Storage in your storage environment and verify that it is functioning
-correctly.
-
-1.  Download `glusterfs-hadoop-0.20.2-0.1.x86_64.rpm` file to each
-    server on your cluster. You can download the file from [][].
-
-2.  To install Hadoop Compatible Storage on all servers in your cluster,
-    run the following command:
-
-    `# rpm –ivh --nodeps glusterfs-hadoop-0.20.2-0.1.x86_64.rpm`
-
-    The following files will be extracted:
-
-    -   /usr/local/lib/glusterfs-Hadoop-version-gluster\_plugin\_version.jar
-
-    -   /usr/local/lib/conf/core-site.xml
-
-3.  (Optional) To install Hadoop Compatible Storage in a different
-    location, run the following command:
-
-    `# rpm –ivh --nodeps –prefix /usr/local/glusterfs/hadoop glusterfs-hadoop- 0.20.2-0.1.x86_64.rpm`
-
-4.  Edit the `conf/core-site.xml` file. The following is the sample
-    `conf/core-site.xml` file:
-
-        <configuration>
-          <property>
-            <name>fs.glusterfs.impl</name>
-            <value>org.apache.hadoop.fs.glusterfs.Gluster FileSystem</value>
-        </property>
-
-        <property>
-           <name>fs.default.name</name>
-           <value>glusterfs://fedora1:9000</value>
-        </property>
-
-        <property>
-           <name>fs.glusterfs.volname</name>
-           <value>hadoopvol</value>
-        </property>  
-         
-        <property>
-           <name>fs.glusterfs.mount</name>
-           <value>/mnt/glusterfs</value>
-        </property>
-
-        <property>
-           <name>fs.glusterfs.server</name>
-           <value>fedora2</value>
-        </property>
-
-        <property>
-           <name>quick.slave.io</name>
-           <value>Off</value>
-        </property>
-        </configuration>
-
-    The following are the configurable fields:
-
-      -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-      Property Name          Default Value              Description
-      ---------------------- -------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-      fs.default.name        glusterfs://fedora1:9000   Any hostname in the cluster as the server and any port number.
-
-      fs.glusterfs.volname   hadoopvol                  GlusterFS volume to mount.
-
-      fs.glusterfs.mount     /mnt/glusterfs             The directory used to fuse mount the volume.
-
-      fs.glusterfs.server    fedora2                    Any hostname or IP address on the cluster except the client/master.
-
-      quick.slave.io         Off                        Performance tunable option. If this option is set to On, the plugin will try to perform I/O directly from the disk file system (like ext3 or ext4) the file resides on. Hence read performance will improve and job would run faster.
-                                                        > **Note**
-                                                        >
-                                                        > This option is not tested widely
-      -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-5.  Create a soft link in Hadoop’s library and configuration directory
-    for the downloaded files (in Step 3) using the following commands:
-
-    `# ln -s >`
-
-    For example,
-
-    `# ln –s /usr/local/lib/glusterfs-0.20.2-0.1.jar /lib/glusterfs-0.20.2-0.1.jar`
-
-    `# ln –s /usr/local/lib/conf/core-site.xml /conf/core-site.xml `
-
-6.  (Optional) You can run the following command on Hadoop master to
-    build the plugin and deploy it along with core-site.xml file,
-    instead of repeating the above steps:
-
-    `# build-deploy-jar.py -d  -c `
-
-Starting and Stopping the Hadoop MapReduce Daemon
-=================================================
-
-To start and stop MapReduce daemon
-
--   To start MapReduce daemon manually, enter the following command:
-
-    `# /bin/start-mapred.sh`
-
--   To stop MapReduce daemon manually, enter the following command:
-
-    `# /bin/stop-mapred.sh `
-
-> **Note**
->
-> You must start Hadoop MapReduce daemon on all servers.
-
-  []: http://download.gluster.com/pub/gluster/glusterfs/qa-releases/3.3-beta-2/glusterfs-hadoop-0.20.2-0.1.x86_64.rpm
diff --git a/doc/admin-guide/en-US/markdown/admin_UFO.md b/doc/admin-guide/en-US/markdown/admin_UFO.md
deleted file mode 100644
index 3311eff01..000000000
--- a/doc/admin-guide/en-US/markdown/admin_UFO.md
+++ /dev/null
@@ -1,1219 +0,0 @@
-Managing Unified File and Object Storage
-========================================
-
-Unified File and Object Storage (UFO) unifies NAS and object storage
-technology. It provides a system for data storage that enables users to
-access the same data, both as an object and as a file, thus simplifying
-management and controlling storage costs.
-
-Unified File and Object Storage is built upon Openstack's Object Storage
-Swift. Open Stack Object Storage allows users to store and retrieve
-files and content through a simple Web Service (REST: Representational
-State Transfer) interface as objects and GlusterFS, allows users to
-store and retrieve files using Native Fuse and NFS mounts. It uses
-GlusterFS as a backend file system for Open Stack Swift. It also
-leverages on Open Stack Swift's web interface for storing and retrieving
-files over the web combined with GlusterFS features like scalability and
-high availability, replication, elastic volume management for data
-management at disk level.
-
-Unified File and Object Storage technology enables enterprises to adopt
-and deploy cloud storage solutions. It allows users to access and modify
-data as objects from a REST interface along with the ability to access
-and modify files from NAS interfaces including NFS and CIFS. In addition
-to decreasing cost and making it faster and easier to access object
-data, it also delivers massive scalability, high availability and
-replication of object storage. Infrastructure as a Service (IaaS)
-providers can utilize GlusterFS Unified File and Object Storage
-technology to enable their own cloud storage service. Enterprises can
-use this technology to accelerate the process of preparing file-based
-applications for the cloud and simplify new application development for
-cloud computing environments.
-
-OpenStack Object Storage is scalable object storage system and it is not
-a traditional file system. You will not be able to mount this system
-like traditional SAN or NAS volumes and perform POSIX compliant
-operations.
-
-Components of Object Storage
-============================
-
-The major components of Object Storage are:
-
-**Proxy Server**
-
-All REST requests to the UFO are routed through the Proxy Server.
-
-**Objects and Containers**
-
-An object is the basic storage entity and any optional metadata that
-represents the data you store. When you upload data, the data is stored
-as-is (with no compression or encryption).
-
-A container is a storage compartment for your data and provides a way
-for you to organize your data. Containers can be visualized as
-directories in a Linux system. Data must be stored in a container and
-hence objects are created within a container.
-
-It implements objects as files and directories under the container. The
-object name is a '/' separated path and UFO maps it to directories until
-the last name in the path, which is marked as a file. With this
-approach, objects can be accessed as files and directories from native
-GlusterFS (FUSE) or NFS mounts by providing the '/' separated path.
-
-**Accounts and Account Servers**
-
-The OpenStack Object Storage system is designed to be used by many
-different storage consumers. Each user is associated with one or more
-accounts and must identify themselves using an authentication system.
-While authenticating, users must provide the name of the account for
-which the authentication is requested.
-
-UFO implements accounts as GlusterFS volumes. So, when a user is granted
-read/write permission on an account, it means that that user has access
-to all the data available on that GlusterFS volume.
-
-**Authentication and Access Permissions**
-
-You must authenticate against an authentication service to receive
-OpenStack Object Storage connection parameters and an authentication
-token. The token must be passed in for all subsequent container or
-object operations. One authentication service that you can use as a
-middleware example is called `tempauth`.
-
-By default, each user has their own storage account and has full access
-to that account. Users must authenticate with their credentials as
-described above, but once authenticated they can manage containers and
-objects within that account. If a user wants to access the content from
-another account, they must have API access key or a session token
-provided by their authentication system.
-
-Advantages of using GlusterFS Unified File and Object Storage
-=============================================================
-
-The following are the advantages of using GlusterFS UFO:
-
--   No limit on upload and download files sizes as compared to Open
-    Stack Swift which limits the object size to 5GB.
-
--   A unified view of data across NAS and Object Storage technologies.
-
--   Using GlusterFS's UFO has other advantages like the following:
-
-    -   High availability
-
-    -   Scalability
-
-    -   Replication
-
-    -   Elastic Volume management
-
-Preparing to Deploy Unified File and Object Storage
-===================================================
-
-This section provides information on pre-requisites and list of
-dependencies that will be installed during the installation of Unified
-File and Object Storage.
-
-Pre-requisites
---------------
-
-GlusterFS's Unified File and Object Storage needs `user_xattr` support
-from the underlying disk file system. Use the following command to
-enable `user_xattr` for GlusterFS bricks backend:
-
-`# mount –o remount,user_xattr `
-
-For example,
-
-`# mount –o remount,user_xattr /dev/hda1 `
-
-Dependencies
-------------
-
-The following packages are installed on GlusterFS when you install
-Unified File and Object Storage:
-
--   curl
-
--   memcached
-
--   openssl
-
--   xfsprogs
-
--   python2.6
-
--   pyxattr
-
--   python-configobj
-
--   python-setuptools
-
--   python-simplejson
-
--   python-webob
-
--   python-eventlet
-
--   python-greenlet
-
--   python-pastedeploy
-
--   python-netifaces
-
-Installing and Configuring Unified File and Object Storage
-==========================================================
-
-This section provides instructions on how to install and configure
-Unified File and Object Storage in your storage environment.
-
-Installing Unified File and Object Storage
-------------------------------------------
-
-To install Unified File and Object Storage:
-
-1.  Download `rhel_install.sh` install script from [][] .
-
-2.  Run `rhel_install.sh` script using the following command:
-
-    `# sh rhel_install.sh`
-
-3.  Download `swift-1.4.5-1.noarch.rpm` and
-    `swift-plugin-1.0.-1.el6.noarch.rpm` files from [][].
-
-4.  Install `swift-1.4.5-1.noarch.rpm` and
-    `swift-plugin-1.0.-1.el6.noarch.rpm` using the following commands:
-
-    `# rpm -ivh swift-1.4.5-1.noarch.rpm`
-
-    `# rpm -ivh swift-plugin-1.0.-1.el6.noarch.rpm`
-
-    > **Note**
-    >
-    > You must repeat the above steps on all the machines on which you
-    > want to install Unified File and Object Storage. If you install
-    > the Unified File and Object Storage on multiple servers, you can
-    > use a load balancer like pound, nginx, and so on to distribute the
-    > request across the machines.
-
-Adding Users
-------------
-
-The authentication system allows the administrator to grant different
-levels of access to different users based on the requirement. The
-following are the types of user permissions:
-
--   admin user
-
--   normal user
-
-Admin user has read and write permissions on the account. By default, a
-normal user has no read or write permissions. A normal user can only
-authenticate itself to get a Auth-Token. Read or write permission are
-provided through ACLs by the admin users.
-
-Add a new user by adding the following entry in
-`/etc/swift/proxy-server.conf` file:
-
-`user_<account-name>_<user-name> = <password> [.admin]`
-
-For example,
-
-`user_test_tester = testing .admin`
-
-> **Note**
->
-> During installation, the installation script adds few sample users to
-> the `proxy-server.conf` file. It is highly recommended that you remove
-> all the default sample user entries from the configuration file.
-
-For more information on setting ACLs, see ?.
-
-Configuring Proxy Server
-------------------------
-
-The Proxy Server is responsible for connecting to the rest of the
-OpenStack Object Storage architecture. For each request, it looks up the
-location of the account, container, or object in the ring and route the
-request accordingly. The public API is also exposed through the proxy
-server. When objects are streamed to or from an object server, they are
-streamed directly through the proxy server to or from the user – the
-proxy server does not spool them.
-
-The configurable options pertaining to proxy server are stored in
-`/etc/swift/proxy-server.conf`. The following is the sample
-`proxy-server.conf` file:
-
-    [app:proxy-server]
-    use = egg:swift#proxy
-    allow_account_management=true
-    account_autocreate=true
-
-    [filter:tempauth]
-    use = egg:swift#tempauth                                   user_admin_admin=admin.admin.reseller_admin
-    user_test_tester=testing.admin
-    user_test2_tester2=testing2.admin
-    user_test_tester3=testing3
-
-    [filter:healthcheck]
-    use = egg:swift#healthcheck 
-
-    [filter:cache]
-    use = egg:swift#memcache
-
-By default, GlusterFS's Unified File and Object Storage is configured to
-support HTTP protocol and uses temporary authentication to authenticate
-the HTTP requests.
-
-Configuring Authentication System
----------------------------------
-
-Proxy server must be configured to authenticate using `
-          
-        `.
-
-Configuring Proxy Server for HTTPS
-----------------------------------
-
-By default, proxy server only handles HTTP request. To configure the
-proxy server to process HTTPS requests, perform the following steps:
-
-1.  Create self-signed cert for SSL using the following commands:
-
-        cd /etc/swift
-        openssl req -new -x509 -nodes -out cert.crt -keyout cert.key
-
-2.  Add the following lines to `/etc/swift/proxy-server.conf `under
-    [DEFAULT]
-
-        bind_port = 443
-         cert_file = /etc/swift/cert.crt
-         key_file = /etc/swift/cert.key
-
-3.  Restart the servers using the following commands:
-
-        swift-init main stop
-        swift-init main start
-
-The following are the configurable options:
-
-  Option       Default      Description
-  ------------ ------------ -------------------------------
-  bind\_ip     0.0.0.0      IP Address for server to bind
-  bind\_port   80           Port for server to bind
-  swift\_dir   /etc/swift   Swift configuration directory
-  workers      1            Number of workers to fork
-  user         swift        swift user
-  cert\_file                Path to the ssl .crt
-  key\_file                 Path to the ssl .key
-
-  : proxy-server.conf Default Options in the [DEFAULT] section
-
-  Option                          Default           Description
-  ------------------------------- ----------------- -----------------------------------------------------------------------------------------------------------
-  use                                               paste.deploy entry point for the container server. For most cases, this should be `egg:swift#container`.
-  log\_name                       proxy-server      Label used when logging
-  log\_facility                   LOG\_LOCAL0       Syslog log facility
-  log\_level                      INFO              Log level
-  log\_headers                    True              If True, log headers in each request
-  recheck\_account\_existence     60                Cache timeout in seconds to send memcached for account existence
-  recheck\_container\_existence   60                Cache timeout in seconds to send memcached for container existence
-  object\_chunk\_size             65536             Chunk size to read from object servers
-  client\_chunk\_size             65536             Chunk size to read from clients
-  memcache\_servers               127.0.0.1:11211   Comma separated list of memcached servers ip:port
-  node\_timeout                   10                Request timeout to external services
-  client\_timeout                 60                Timeout to read one chunk from a client
-  conn\_timeout                   0.5               Connection timeout to external services
-  error\_suppression\_interval    60                Time in seconds that must elapse since the last error for a node to be considered no longer error limited
-  error\_suppression\_limit       10                Error count to consider a node error limited
-  allow\_account\_management      false             Whether account `PUT`s and `DELETE`s are even callable
-
-  : proxy-server.conf Server Options in the [proxy-server] section
-
-Configuring Object Server
--------------------------
-
-The Object Server is a very simple blob storage server that can store,
-retrieve, and delete objects stored on local devices. Objects are stored
-as binary files on the file system with metadata stored in the file’s
-extended attributes (xattrs). This requires that the underlying file
-system choice for object servers support xattrs on files.
-
-The configurable options pertaining Object Server are stored in the file
-`/etc/swift/object-server/1.conf`. The following is the sample
-`object-server/1.conf` file:
-
-    [DEFAULT]
-    devices = /srv/1/node
-    mount_check = false
-    bind_port = 6010
-    user = root
-    log_facility = LOG_LOCAL2
-
-    [pipeline:main]
-    pipeline = gluster object-server
-
-    [app:object-server]
-    use = egg:swift#object 
-
-    [filter:gluster]
-    use = egg:swift#gluster
-
-    [object-replicator]
-    vm_test_mode = yes
-
-    [object-updater]
-    [object-auditor]
-
-The following are the configurable options:
-
-  Option         Default      Description
-  -------------- ------------ ----------------------------------------------------------------------------------------------------
-  swift\_dir     /etc/swift   Swift configuration directory
-  devices        /srv/node    Mount parent directory where devices are mounted
-  mount\_check   true         Whether or not check if the devices are mounted to prevent accidentally writing to the root device
-  bind\_ip       0.0.0.0      IP Address for server to bind
-  bind\_port     6000         Port for server to bind
-  workers        1            Number of workers to fork
-
-  : object-server.conf Default Options in the [DEFAULT] section
-
-  Option                 Default         Description
-  ---------------------- --------------- ----------------------------------------------------------------------------------------------------
-  use                                    paste.deploy entry point for the object server. For most cases, this should be `egg:swift#object`.
-  log\_name              object-server   log name used when logging
-  log\_facility          LOG\_LOCAL0     Syslog log facility
-  log\_level             INFO            Logging level
-  log\_requests          True            Whether or not to log each request
-  user                   swift           swift user
-  node\_timeout          3               Request timeout to external services
-  conn\_timeout          0.5             Connection timeout to external services
-  network\_chunk\_size   65536           Size of chunks to read or write over the network
-  disk\_chunk\_size      65536           Size of chunks to read or write to disk
-  max\_upload\_time      65536           Maximum time allowed to upload an object
-  slow                   0               If \> 0, Minimum time in seconds for a `PUT` or `DELETE` request to complete
-
-  : object-server.conf Server Options in the [object-server] section
-
-Configuring Container Server
-----------------------------
-
-The Container Server’s primary job is to handle listings of objects. The
-listing is done by querying the GlusterFS mount point with path. This
-query returns a list of all files and directories present under that
-container.
-
-The configurable options pertaining to container server are stored in
-`/etc/swift/container-server/1.conf` file. The following is the sample
-`container-server/1.conf` file:
-
-    [DEFAULT]
-    devices = /srv/1/node
-    mount_check = false
-    bind_port = 6011
-    user = root
-    log_facility = LOG_LOCAL2
-
-    [pipeline:main]
-    pipeline = gluster container-server
-
-    [app:container-server]
-    use = egg:swift#container
-
-    [filter:gluster]
-    use = egg:swift#gluster
-
-    [container-replicator]
-    [container-updater]
-    [container-auditor]
-
-The following are the configurable options:
-
-  Option         Default      Description
-  -------------- ------------ ----------------------------------------------------------------------------------------------------
-  swift\_dir     /etc/swift   Swift configuration directory
-  devices        /srv/node    Mount parent directory where devices are mounted
-  mount\_check   true         Whether or not check if the devices are mounted to prevent accidentally writing to the root device
-  bind\_ip       0.0.0.0      IP Address for server to bind
-  bind\_port     6001         Port for server to bind
-  workers        1            Number of workers to fork
-  user           swift        Swift user
-
-  : container-server.conf Default Options in the [DEFAULT] section
-
-  Option          Default            Description
-  --------------- ------------------ ----------------------------------------------------------------------------------------------------------
-  use                                paste.deploy entry point for the container server. For most cases, this should be `egg:swift#container`.
-  log\_name       container-server   Label used when logging
-  log\_facility   LOG\_LOCAL0        Syslog log facility
-  log\_level      INFO               Logging level
-  node\_timeout   3                  Request timeout to external services
-  conn\_timeout   0.5                Connection timeout to external services
-
-  : container-server.conf Server Options in the [container-server]
-  section
-
-Configuring Account Server
---------------------------
-
-The Account Server is very similar to the Container Server, except that
-it is responsible for listing of containers rather than objects. In UFO,
-each gluster volume is an account.
-
-The configurable options pertaining to account server are stored in
-`/etc/swift/account-server/1.conf` file. The following is the sample
-`account-server/1.conf` file:
-
-    [DEFAULT]
-    devices = /srv/1/node
-    mount_check = false
-    bind_port = 6012
-    user = root
-    log_facility = LOG_LOCAL2
-
-    [pipeline:main]
-    pipeline = gluster account-server
-
-    [app:account-server]
-    use = egg:swift#account
-
-    [filter:gluster]
-    use = egg:swift#gluster 
-
-    [account-replicator]
-    vm_test_mode = yes
-
-    [account-auditor]
-    [account-reaper]
-
-The following are the configurable options:
-
-  Option         Default      Description
-  -------------- ------------ ----------------------------------------------------------------------------------------------------
-  swift\_dir     /etc/swift   Swift configuration directory
-  devices        /srv/node    mount parent directory where devices are mounted
-  mount\_check   true         Whether or not check if the devices are mounted to prevent accidentally writing to the root device
-  bind\_ip       0.0.0.0      IP Address for server to bind
-  bind\_port     6002         Port for server to bind
-  workers        1            Number of workers to fork
-  user           swift        Swift user
-
-  : account-server.conf Default Options in the [DEFAULT] section
-
-  Option          Default          Description
-  --------------- ---------------- ----------------------------------------------------------------------------------------------------------
-  use                              paste.deploy entry point for the container server. For most cases, this should be `egg:swift#container`.
-  log\_name       account-server   Label used when logging
-  log\_facility   LOG\_LOCAL0      Syslog log facility
-  log\_level      INFO             Logging level
-
-  : account-server.conf Server Options in the [account-server] section
-
-Starting and Stopping Server
-----------------------------
-
-You must start the server manually when system reboots and whenever you
-update/modify the configuration files.
-
--   To start the server, enter the following command:
-
-    `# swift_init main start`
-
--   To stop the server, enter the following command:
-
-    `# swift_init main stop`
-
-Working with Unified File and Object Storage
-============================================
-
-This section describes the REST API for administering and managing
-Object Storage. All requests will be directed to the host and URL
-described in the `X-Storage-URL HTTP` header obtained during successful
-authentication.
-
-Configuring Authenticated Access
---------------------------------
-
-Authentication is the process of proving identity to the system. To use
-the REST interface, you must obtain an authorization token using GET
-method and supply it with v1.0 as the path.
-
-Each REST request against the Object Storage system requires the
-addition of a specific authorization token HTTP x-header, defined as
-X-Auth-Token. The storage URL and authentication token are returned in
-the headers of the response.
-
--   To authenticate, run the following command:
-
-        GET auth/v1.0 HTTP/1.1
-        Host: <auth URL>
-        X-Auth-User: <account name>:<user name>
-        X-Auth-Key: <user-Password>
-
-    For example,
-
-        GET auth/v1.0 HTTP/1.1
-        Host: auth.example.com
-        X-Auth-User: test:tester
-        X-Auth-Key: testing
-
-        HTTP/1.1 200 OK
-        X-Storage-Url: https:/example.storage.com:443/v1/AUTH_test
-        X-Storage-Token: AUTH_tkde3ad38b087b49bbbac0494f7600a554
-        X-Auth-Token: AUTH_tkde3ad38b087b49bbbac0494f7600a554
-        Content-Length: 0
-        Date: Wed, 10 jul 2011 06:11:51 GMT
-
-    To authenticate access using cURL (for the above example), run the
-    following command:
-
-        curl -v -H 'X-Storage-User: test:tester' -H 'X-Storage-Pass:testing' -k
-        https://auth.example.com:443/auth/v1.0
-
-    The X-Auth-Url has to be parsed and used in the connection and
-    request line of all subsequent requests to the server. In the
-    example output, users connecting to server will send most
-    container/object requests with a host header of example.storage.com
-    and the request line's version and account as v1/AUTH\_test.
-
-> **Note**
->
-> The authentication tokens are valid for a 24 hour period.
-
-Working with Accounts
----------------------
-
-This section describes the list of operations you can perform at the
-account level of the URL.
-
-### Displaying Container Information
-
-You can list the objects of a specific container, or all containers, as
-needed using GET command. You can use the following optional parameters
-with GET request to refine the results:
-
-  Parameter   Description
-  ----------- --------------------------------------------------------------------------
-  limit       Limits the number of results to at most *n* value.
-  marker      Returns object names greater in value than the specified marker.
-  format      Specify either json or xml to return the respective serialized response.
-
-**To display container information**
-
--   List all the containers of an account using the following command:
-
-        GET /<apiversion>/<account> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <authentication-token-key>
-
-    For example,
-
-        GET /v1/AUTH_test HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-
-        HTTP/1.1 200 Ok
-        Date: Wed, 13 Jul 2011 16:32:21 GMT
-        Server: Apache
-        Content-Type: text/plain; charset=UTF-8
-        Content-Length: 39
-
-        songs
-        movies
-        documents
-        reports
-
-To display container information using cURL (for the above example), run
-the following command:
-
-    curl -v -X GET -H 'X-Auth-Token: AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-    https://example.storage.com:443/v1/AUTH_test -k
-
-### Displaying Account Metadata Information
-
-You can issue HEAD command to the storage service to view the number of
-containers and the total bytes stored in the account.
-
--   To display containers and storage used, run the following command:
-
-        HEAD /<apiversion>/<account> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <authentication-token-key>
-
-    For example,
-
-        HEAD /v1/AUTH_test HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-
-        HTTP/1.1 204 No Content
-        Date: Wed, 13 Jul 2011 16:52:21 GMT
-        Server: Apache
-        X-Account-Container-Count: 4
-        X-Account-Total-Bytes-Used: 394792
-
-    To display account metadata information using cURL (for the above
-    example), run the following command:
-
-        curl -v -X HEAD -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test -k
-
-Working with Containers
------------------------
-
-This section describes the list of operations you can perform at the
-container level of the URL.
-
-### Creating Containers
-
-You can use PUT command to create containers. Containers are the storage
-folders for your data. The URL encoded name must be less than 256 bytes
-and cannot contain a forward slash '/' character.
-
--   To create a container, run the following command:
-
-        PUT /<apiversion>/<account>/<container>/ HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <authentication-token-key>
-
-    For example,
-
-        PUT /v1/AUTH_test/pictures/ HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-        HTTP/1.1 201 Created
-
-        Date: Wed, 13 Jul 2011 17:32:21 GMT
-        Server: Apache
-        Content-Type: text/plain; charset=UTF-8
-
-    To create container using cURL (for the above example), run the
-    following command:
-
-        curl -v -X PUT -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test/pictures -k
-
-    The status code of 201 (Created) indicates that you have
-    successfully created the container. If a container with same is
-    already existed, the status code of 202 is displayed.
-
-### Displaying Objects of a Container
-
-You can list the objects of a container using GET command. You can use
-the following optional parameters with GET request to refine the
-results:
-
-  Parameter   Description
-  ----------- --------------------------------------------------------------------------------------------------------------
-  limit       Limits the number of results to at most *n* value.
-  marker      Returns object names greater in value than the specified marker.
-  prefix      Displays the results limited to object names beginning with the substring x. beginning with the substring x.
-  path        Returns the object names nested in the pseudo path.
-  format      Specify either json or xml to return the respective serialized response.
-  delimiter   Returns all the object names nested in the container.
-
-To display objects of a container
-
--   List objects of a specific container using the following command:
-
-<!-- -->
-
-    GET /<apiversion>/<account>/<container>[parm=value] HTTP/1.1
-    Host: <storage URL>
-    X-Auth-Token: <authentication-token-key>
-
-For example,
-
-    GET /v1/AUTH_test/images HTTP/1.1
-    Host: example.storage.com
-    X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-
-    HTTP/1.1 200 Ok
-    Date: Wed, 13 Jul 2011 15:42:21 GMT
-    Server: Apache
-    Content-Type: text/plain; charset=UTF-8
-    Content-Length: 139
-
-    sample file.jpg
-    test-file.pdf
-    You and Me.pdf
-    Puddle of Mudd.mp3
-    Test Reports.doc
-
-To display objects of a container using cURL (for the above example),
-run the following command:
-
-    curl -v -X GET-H 'X-Auth-Token: AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-    https://example.storage.com:443/v1/AUTH_test/images -k
-
-### Displaying Container Metadata Information
-
-You can issue HEAD command to the storage service to view the number of
-objects in a container and the total bytes of all the objects stored in
-the container.
-
--   To display list of objects and storage used, run the following
-    command:
-
-        HEAD /<apiversion>/<account>/<container> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <authentication-token-key>
-
-    For example,
-
-        HEAD /v1/AUTH_test/images HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-
-        HTTP/1.1 204 No Content
-        Date: Wed, 13 Jul 2011 19:52:21 GMT
-        Server: Apache
-        X-Account-Object-Count: 8
-        X-Container-Bytes-Used: 472
-
-    To display list of objects and storage used in a container using
-    cURL (for the above example), run the following command:
-
-        curl -v -X HEAD -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test/images -k
-
-### Deleting Container
-
-You can use DELETE command to permanently delete containers. The
-container must be empty before it can be deleted.
-
-You can issue HEAD command to determine if it contains any objects.
-
--   To delete a container, run the following command:
-
-        DELETE /<apiversion>/<account>/<container>/ HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <authentication-token-key>
-
-    For example,
-
-        DELETE /v1/AUTH_test/pictures HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-
-        HTTP/1.1 204 No Content
-        Date: Wed, 13 Jul 2011 17:52:21 GMT
-        Server: Apache
-        Content-Length: 0
-        Content-Type: text/plain; charset=UTF-8
-
-    To delete a container using cURL (for the above example), run the
-    following command:
-
-        curl -v -X DELETE -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test/pictures -k
-
-    The status code of 204 (No Content) indicates that you have
-    successfully deleted the container. If that container does not
-    exist, the status code 404 (Not Found) is displayed, and if the
-    container is not empty, the status code 409 (Conflict) is displayed.
-
-### Updating Container Metadata
-
-You can update the metadata of container using POST operation, metadata
-keys should be prefixed with 'x-container-meta'.
-
--   To update the metadata of the object, run the following command:
-
-        POST /<apiversion>/<account>/<container> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <Authentication-token-key>
-        X-Container-Meta-<key>: <new value>
-        X-Container-Meta-<key>: <new value>
-
-    For example,
-
-        POST /v1/AUTH_test/images HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-        X-Container-Meta-Zoo: Lion
-        X-Container-Meta-Home: Dog
-
-        HTTP/1.1 204 No Content
-        Date: Wed, 13 Jul 2011 20:52:21 GMT
-        Server: Apache
-        Content-Type: text/plain; charset=UTF-8
-
-    To update the metadata of the object using cURL (for the above
-    example), run the following command:
-
-        curl -v -X POST -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test/images -H ' X-Container-Meta-Zoo: Lion' -H 'X-Container-Meta-Home: Dog' -k
-
-    The status code of 204 (No Content) indicates the container's
-    metadata is updated successfully. If that object does not exist, the
-    status code 404 (Not Found) is displayed.
-
-### Setting ACLs on Container
-
-You can set the container access control list by using POST command on
-container with `x- container-read` and` x-container-write` keys.
-
-The ACL format is `[item[,item...]]`. Each item can be a group name to
-give access to or a referrer designation to grant or deny based on the
-HTTP Referer header.
-
-The referrer designation format is:` .r:[-]value`.
-
-The .r can also be `.ref, .referer, `or .`referrer`; though it will be
-shortened to.r for decreased character count usage. The value can be `*`
-to specify any referrer host is allowed access. The leading minus sign
-(-) indicates referrer hosts that should be denied access.
-
-Examples of valid ACLs:
-
-    .r:*
-    .r:*,bobs_account,sues_account:sue
-    bobs_account,sues_account:sue
-
-Examples of invalid ACLs:
-
-    .r:
-    .r:-
-
-By default, allowing read access via `r `will not allow listing objects
-in the container but allows retrieving objects from the container. To
-turn on listings, use the .`rlistings` directive. Also, `.r`
-designations are not allowed in headers whose names include the word
-write.
-
-For example, to set all the objects access rights to "public" inside the
-container using cURL (for the above example), run the following command:
-
-    curl -v -X POST -H 'X-Auth-Token:
-    AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-    https://example.storage.com:443/v1/AUTH_test/images
-    -H 'X-Container-Read: .r:*' -k
-
-Working with Objects
---------------------
-
-An object represents the data and any metadata for the files stored in
-the system. Through the REST interface, metadata for an object can be
-included by adding custom HTTP headers to the request and the data
-payload as the request body. Objects name should not exceed 1024 bytes
-after URL encoding.
-
-This section describes the list of operations you can perform at the
-object level of the URL.
-
-### Creating or Updating Object
-
-You can use PUT command to write or update an object's content and
-metadata.
-
-You can verify the data integrity by including an MD5checksum for the
-object's data in the ETag header. ETag header is optional and can be
-used to ensure that the object's contents are stored successfully in the
-storage system.
-
-You can assign custom metadata to objects by including additional HTTP
-headers on the PUT request. The objects created with custom metadata via
-HTTP headers are identified with the`X-Object- Meta`- prefix.
-
--   To create or update an object, run the following command:
-
-        PUT /<apiversion>/<account>/<container>/<object> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <authentication-token-key>
-        ETag: da1e100dc9e7becc810986e37875ae38
-        Content-Length: 342909
-        X-Object-Meta-PIN: 2343
-
-    For example,
-
-        PUT /v1/AUTH_test/pictures/dog HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-        ETag: da1e100dc9e7becc810986e37875ae38
-
-        HTTP/1.1 201 Created
-        Date: Wed, 13 Jul 2011 18:32:21 GMT
-        Server: Apache
-        ETag: da1e100dc9e7becc810986e37875ae38
-        Content-Length: 0
-        Content-Type: text/plain; charset=UTF-8
-
-    To create or update an object using cURL (for the above example),
-    run the following command:
-
-        curl -v -X PUT -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test/pictures/dog -H 'Content-
-        Length: 0' -k
-
-    The status code of 201 (Created) indicates that you have
-    successfully created or updated the object. If there is a missing
-    content-Length or Content-Type header in the request, the status
-    code of 412 (Length Required) is displayed. (Optionally) If the MD5
-    checksum of the data written to the storage system does not match
-    the ETag value, the status code of 422 (Unprocessable Entity) is
-    displayed.
-
-#### Chunked Transfer Encoding
-
-You can upload data without knowing the size of the data to be uploaded.
-You can do this by specifying an HTTP header of Transfer-Encoding:
-chunked and without using a Content-Length header.
-
-You can use this feature while doing a DB dump, piping the output
-through gzip, and then piping the data directly into Object Storage
-without having to buffer the data to disk to compute the file size.
-
--   To create or update an object, run the following command:
-
-        PUT /<apiversion>/<account>/<container>/<object> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <authentication-token-key>
-        Transfer-Encoding: chunked
-        X-Object-Meta-PIN: 2343
-
-    For example,
-
-        PUT /v1/AUTH_test/pictures/cat HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-        Transfer-Encoding: chunked
-        X-Object-Meta-PIN: 2343
-        19
-        A bunch of data broken up
-        D
-        into chunks.
-        0
-
-### Copying Object
-
-You can copy object from one container to another or add a new object
-and then add reference to designate the source of the data from another
-container.
-
-**To copy object from one container to another**
-
--   To add a new object and designate the source of the data from
-    another container, run the following command:
-
-        COPY /<apiversion>/<account>/<container>/<sourceobject> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: < authentication-token-key>
-        Destination: /<container>/<destinationobject>
-
-    For example,
-
-        COPY /v1/AUTH_test/images/dogs HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-        Destination: /photos/cats
-
-        HTTP/1.1 201 Created
-        Date: Wed, 13 Jul 2011 18:32:21 GMT
-        Server: Apache
-        Content-Length: 0
-        Content-Type: text/plain; charset=UTF-8
-
-    To copy an object using cURL (for the above example), run the
-    following command:
-
-        curl -v -X COPY -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554' -H 'Destination: /photos/cats' -k https://example.storage.com:443/v1/AUTH_test/images/dogs
-
-    The status code of 201 (Created) indicates that you have
-    successfully copied the object. If there is a missing content-Length
-    or Content-Type header in the request, the status code of 412
-    (Length Required) is displayed.
-
-    You can also use PUT command to copy object by using additional
-    header `X-Copy-From: container/obj`.
-
--   To use PUT command to copy an object, run the following command:
-
-        PUT /v1/AUTH_test/photos/cats HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-        X-Copy-From: /images/dogs
-
-        HTTP/1.1 201 Created
-        Date: Wed, 13 Jul 2011 18:32:21 GMT
-        Server: Apache
-        Content-Type: text/plain; charset=UTF-8
-
-    To copy an object using cURL (for the above example), run the
-    following command:
-
-        curl -v -X PUT -H 'X-Auth-Token: AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        -H 'X-Copy-From: /images/dogs' –k
-        https://example.storage.com:443/v1/AUTH_test/images/cats
-
-    The status code of 201 (Created) indicates that you have
-    successfully copied the object.
-
-### Displaying Object Information
-
-You can issue GET command on an object to view the object data of the
-object.
-
--   To display the content of an object run the following command:
-
-        GET /<apiversion>/<account>/<container>/<object> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <Authentication-token-key>
-
-    For example,
-
-        GET /v1/AUTH_test/images/cat HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-
-        HTTP/1.1 200 Ok
-        Date: Wed, 13 Jul 2011 23:52:21 GMT
-        Server: Apache
-        Last-Modified: Thu, 14 Jul 2011 13:40:18 GMT
-        ETag: 8a964ee2a5e88be344f36c22562a6486
-        Content-Length: 534210
-        [.........]
-
-    To display the content of an object using cURL (for the above
-    example), run the following command:
-
-        curl -v -X GET -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test/images/cat -k
-
-    The status code of 200 (Ok) indicates the object's data is displayed
-    successfully. If that object does not exist, the status code 404
-    (Not Found) is displayed.
-
-### Displaying Object Metadata
-
-You can issue HEAD command on an object to view the object metadata and
-other standard HTTP headers. You must send only authorization token as
-header.
-
--   To display the metadata of the object, run the following command:
-
-<!-- -->
-
-    HEAD /<apiversion>/<account>/<container>/<object> HTTP/1.1
-    Host: <storage URL>
-    X-Auth-Token: <Authentication-token-key>
-
-For example,
-
-    HEAD /v1/AUTH_test/images/cat HTTP/1.1
-    Host: example.storage.com
-    X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-
-    HTTP/1.1 204 No Content
-    Date: Wed, 13 Jul 2011 21:52:21 GMT
-    Server: Apache
-    Last-Modified: Thu, 14 Jul 2011 13:40:18 GMT
-    ETag: 8a964ee2a5e88be344f36c22562a6486
-    Content-Length: 512000
-    Content-Type: text/plain; charset=UTF-8
-    X-Object-Meta-House: Cat
-    X-Object-Meta-Zoo: Cat
-    X-Object-Meta-Home: Cat
-    X-Object-Meta-Park: Cat
-
-To display the metadata of the object using cURL (for the above
-example), run the following command:
-
-    curl -v -X HEAD -H 'X-Auth-Token:
-    AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-    https://example.storage.com:443/v1/AUTH_test/images/cat -k
-
-The status code of 204 (No Content) indicates the object's metadata is
-displayed successfully. If that object does not exist, the status code
-404 (Not Found) is displayed.
-
-### Updating Object Metadata
-
-You can issue POST command on an object name only to set or overwrite
-arbitrary key metadata. You cannot change the object's other headers
-such as Content-Type, ETag and others using POST operation. The POST
-command will delete all the existing metadata and replace it with the
-new arbitrary key metadata.
-
-You must prefix **X-Object-Meta-** to the key names.
-
--   To update the metadata of an object, run the following command:
-
-        POST /<apiversion>/<account>/<container>/<object> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <Authentication-token-key>
-        X-Object-Meta-<key>: <new value>
-        X-Object-Meta-<key>: <new value>
-
-    For example,
-
-        POST /v1/AUTH_test/images/cat HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-        X-Object-Meta-Zoo: Lion
-        X-Object-Meta-Home: Dog
-
-        HTTP/1.1 202 Accepted
-        Date: Wed, 13 Jul 2011 22:52:21 GMT
-        Server: Apache
-        Content-Length: 0
-        Content-Type: text/plain; charset=UTF-8
-
-    To update the metadata of an object using cURL (for the above
-    example), run the following command:
-
-        curl -v -X POST -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test/images/cat -H ' X-Object-
-        Meta-Zoo: Lion' -H 'X-Object-Meta-Home: Dog' -k
-
-    The status code of 202 (Accepted) indicates that you have
-    successfully updated the object's metadata. If that object does not
-    exist, the status code 404 (Not Found) is displayed.
-
-### Deleting Object
-
-You can use DELETE command to permanently delete the object.
-
-The DELETE command on an object will be processed immediately and any
-subsequent operations like GET, HEAD, POST, or DELETE on the object will
-display 404 (Not Found) error.
-
--   To delete an object, run the following command:
-
-        DELETE /<apiversion>/<account>/<container>/<object> HTTP/1.1
-        Host: <storage URL>
-        X-Auth-Token: <Authentication-token-key>
-
-    For example,
-
-        DELETE /v1/AUTH_test/pictures/cat HTTP/1.1
-        Host: example.storage.com
-        X-Auth-Token: AUTH_tkd3ad38b087b49bbbac0494f7600a554
-
-        HTTP/1.1 204 No Content
-        Date: Wed, 13 Jul 2011 20:52:21 GMT
-        Server: Apache
-        Content-Type: text/plain; charset=UTF-8
-
-    To delete an object using cURL (for the above example), run the
-    following command:
-
-        curl -v -X DELETE -H 'X-Auth-Token:
-        AUTH_tkde3ad38b087b49bbbac0494f7600a554'
-        https://example.storage.com:443/v1/AUTH_test/pictures/cat -k
-
-    The status code of 204 (No Content) indicates that you have
-    successfully deleted the object. If that object does not exist, the
-    status code 404 (Not Found) is displayed.
-
-  []: http://download.gluster.com/pub/gluster/glusterfs/3.2/UFO/
diff --git a/doc/admin-guide/en-US/markdown/admin_commandref.md b/doc/admin-guide/en-US/markdown/admin_commandref.md
deleted file mode 100644
index 4ff05f4ef..000000000
--- a/doc/admin-guide/en-US/markdown/admin_commandref.md
+++ /dev/null
@@ -1,180 +0,0 @@
-Command Reference
-=================
-
-This section describes the available commands and includes the following
-section:
-
--   gluster Command
-
-    Gluster Console Manager (command line interpreter)
-
--   glusterd Daemon
-
-    Gluster elastic volume management daemon
-
-gluster Command
-===============
-
-**NAME**
-
-gluster - Gluster Console Manager (command line interpreter)
-
-**SYNOPSIS**
-
-To run the program and display the gluster prompt:
-
-**gluster**
-
-To specify a command directly: gluster [COMMANDS] [OPTIONS]
-
-**DESCRIPTION**
-
-The Gluster Console Manager is a command line utility for elastic volume
-management. You can run the gluster command on any export server. The
-command enables administrators to perform cloud operations such as
-creating, expanding, shrinking, rebalancing, and migrating volumes
-without needing to schedule server downtime.
-
-**COMMANDS**
-
-  ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-  Command                                                                                                    Description
-  ---------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-  **Volume**
-
-  volume info [all | VOLNAME]                                                                                Displays information about all volumes, or the specified volume.
-
-  volume create NEW-VOLNAME [stripe COUNT] [replica COUNT] [transport tcp | rdma | tcp,rdma] NEW-BRICK ...   Creates a new volume of the specified type using the specified bricks and transport type (the default transport type is tcp).
-
-  volume delete VOLNAME                                                                                      Deletes the specified volume.
-
-  volume start VOLNAME                                                                                       Starts the specified volume.
-
-  volume stop VOLNAME [force]                                                                                Stops the specified volume.
-
-  volume rename VOLNAME NEW-VOLNAME                                                                          Renames the specified volume.
-
-  volume help                                                                                                Displays help for the volume command.
-
-  **Brick**
-
-  volume add-brick VOLNAME NEW-BRICK ...                                                                     Adds the specified brick to the specified volume.
-
-  volume replace-brick VOLNAME (BRICK NEW-BRICK) start | pause | abort | status                              Replaces the specified brick.
-
-  volume remove-brick VOLNAME [(replica COUNT)|(stripe COUNT)] BRICK ...                                     Removes the specified brick from the specified volume.
-
-  **Rebalance**
-
-  volume rebalance VOLNAME start                                                                             Starts rebalancing the specified volume.
-
-  volume rebalance VOLNAME stop                                                                              Stops rebalancing the specified volume.
-
-  volume rebalance VOLNAME status                                                                            Displays the rebalance status of the specified volume.
-
-  **Log**
-
-  volume log filename VOLNAME [BRICK] DIRECTORY                                                              Sets the log directory for the corresponding volume/brick.
-
-  volume log rotate VOLNAME [BRICK]                                                                          Rotates the log file for corresponding volume/brick.
-
-  volume log locate VOLNAME [BRICK]                                                                          Locates the log file for corresponding volume/brick.
-
-  **Peer**
-
-  peer probe HOSTNAME                                                                                        Probes the specified peer.
-
-  peer detach HOSTNAME                                                                                       Detaches the specified peer.
-
-  peer status                                                                                                Displays the status of peers.
-
-  peer help                                                                                                  Displays help for the peer command.
-
-  **Geo-replication**
-
-  volume geo-replication MASTER SLAVE start                                                                  Start geo-replication between the hosts specified by MASTER and SLAVE. You can specify a local master volume as :VOLNAME.
-                                                                                                             
-                                                                                                             You can specify a local slave volume as :VOLUME and a local slave directory as /DIRECTORY/SUB-DIRECTORY. You can specify a remote slave volume as DOMAIN::VOLNAME and a remote slave directory as DOMAIN:/DIRECTORY/SUB-DIRECTORY.
-
-  volume geo-replication MASTER SLAVE stop                                                                   Stop geo-replication between the hosts specified by MASTER and SLAVE. You can specify a local master volume as :VOLNAME and a local master directory as /DIRECTORY/SUB-DIRECTORY.
-                                                                                                             
-                                                                                                             You can specify a local slave volume as :VOLNAME and a local slave directory as /DIRECTORY/SUB-DIRECTORY. You can specify a remote slave volume as DOMAIN::VOLNAME and a remote slave directory as DOMAIN:/DIRECTORY/SUB-DIRECTORY.
-
-  volume geo-replication MASTER SLAVE config [options]                                                                                                                                                                                                                                                                                             Configure geo-replication options between the hosts specified by MASTER and SLAVE.
-
-  gluster-command COMMAND                                                                                    The path where the gluster command is installed.
-
-  gluster-log-level LOGFILELEVEL                                                                             The log level for gluster processes.
-
-  log-file LOGFILE                                                                                           The path to the geo-replication log file.
-
-  log-level LOGFILELEVEL                                                                                     The log level for geo-replication.
-
-  remote-gsyncd COMMAND                                                                                      The path where the gsyncd binary is installed on the remote machine.
-
-  ssh-command COMMAND                                                                                        The ssh command to use to connect to the remote machine (the default is ssh).
-
-  rsync-command COMMAND                                                                                      The rsync command to use for synchronizing the files (the default is rsync).
-
-  volume\_id= UID                                                                                            The command to delete the existing master UID for the intermediate/slave node.
-
-  timeout SECONDS                                                                                            The timeout period.
-
-  sync-jobs N                                                                                                The number of simultaneous files/directories that can be synchronized.
-
-                                                                                                             ignore-deletes                                                                                                                                                                                                                        If this option is set to 1, a file deleted on master will not trigger a delete operation on the slave. Hence, the slave will remain as a superset of the master and can be used to recover the master in case of crash and/or accidental delete.
-
-  **Other**
-
-  help                                                                                                                                                                                                                                                                                                                                             Display the command options.
-
-  quit                                                                                                                                                                                                                                                                                                                                             Exit the gluster command line interface.
-  ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-**FILES**
-
-/var/lib/glusterd/\*
-
-**SEE ALSO**
-
-fusermount(1), mount.glusterfs(8), glusterfs-volgen(8), glusterfs(8),
-glusterd(8)
-
-glusterd Daemon
-===============
-
-**NAME**
-
-glusterd - Gluster elastic volume management daemon
-
-**SYNOPSIS**
-
-glusterd [OPTION...]
-
-**DESCRIPTION**
-
-The glusterd daemon is used for elastic volume management. The daemon
-must be run on all export servers.
-
-**OPTIONS**
-
-  Option                              Description
-  ----------------------------------- ----------------------------------------------------------------------------------------------------------------
-  **Basic**
-  -l=LOGFILE, --log-file=LOGFILE      Files to use for logging (the default is /usr/local/var/log/glusterfs/glusterfs.log).
-  -L=LOGLEVEL, --log-level=LOGLEVEL   Logging severity. Valid options are TRACE, DEBUG, INFO, WARNING, ERROR and CRITICAL (the default is INFO).
-  --debug                             Runs the program in debug mode. This option sets --no-daemon, --log-level to DEBUG, and --log-file to console.
-  -N, --no-daemon                     Runs the program in the foreground.
-  **Miscellaneous**
-  -?, --help                          Displays this help.
-  --usage                             Displays a short usage message.
-  -V, --version                       Prints the program version.
-
-**FILES**
-
-/var/lib/glusterd/\*
-
-**SEE ALSO**
-
-fusermount(1), mount.glusterfs(8), glusterfs-volgen(8), glusterfs(8),
-gluster(8)
diff --git a/doc/admin-guide/en-US/markdown/admin_console.md b/doc/admin-guide/en-US/markdown/admin_console.md
deleted file mode 100644
index 9b69de02d..000000000
--- a/doc/admin-guide/en-US/markdown/admin_console.md
+++ /dev/null
@@ -1,51 +0,0 @@
-Using the Gluster Console Manager – Command Line Utility
-========================================================
-
-The Gluster Console Manager is a single command line utility that
-simplifies configuration and management of your storage environment. The
-Gluster Console Manager is similar to the LVM (Logical Volume Manager)
-CLI or ZFS Command Line Interface, but across multiple storage servers.
-You can use the Gluster Console Manager online, while volumes are
-mounted and active. Gluster automatically synchronizes volume
-configuration information across all Gluster servers.
-
-Using the Gluster Console Manager, you can create new volumes, start
-volumes, and stop volumes, as required. You can also add bricks to
-volumes, remove bricks from existing volumes, as well as change
-translator settings, among other operations.
-
-You can also use the commands to create scripts for automation, as well
-as use the commands as an API to allow integration with third-party
-applications.
-
-**Running the Gluster Console Manager**
-
-You can run the Gluster Console Manager on any GlusterFS server either
-by invoking the commands or by running the Gluster CLI in interactive
-mode. You can also use the gluster command remotely using SSH.
-
--   To run commands directly:
-
-    ` # gluster peer `
-
-    For example:
-
-    ` # gluster peer status `
-
--   To run the Gluster Console Manager in interactive mode
-
-    `# gluster`
-
-    You can execute gluster commands from the Console Manager prompt:
-
-    ` gluster> `
-
-    For example, to view the status of the peer server:
-
-    \# `gluster `
-
-    `gluster > peer status `
-
-    Display the status of the peer.
-
-
diff --git a/doc/admin-guide/en-US/markdown/admin_directory_Quota.md b/doc/admin-guide/en-US/markdown/admin_directory_Quota.md
deleted file mode 100644
index 09c757781..000000000
--- a/doc/admin-guide/en-US/markdown/admin_directory_Quota.md
+++ /dev/null
@@ -1,172 +0,0 @@
-Managing Directory Quota
-========================
-
-Directory quotas in GlusterFS allow you to set limits on usage of disk
-space by directories or volumes. The storage administrators can control
-the disk space utilization at the directory and/or volume levels in
-GlusterFS by setting limits to allocatable disk space at any level in
-the volume and directory hierarchy. This is particularly useful in cloud
-deployments to facilitate utility billing model.
-
-> **Note**
->
-> For now, only Hard limit is supported. Here, the limit cannot be
-> exceeded and attempts to use more disk space or inodes beyond the set
-> limit will be denied.
-
-System administrators can also monitor the resource utilization to limit
-the storage for the users depending on their role in the organization.
-
-You can set the quota at the following levels:
-
--   Directory level – limits the usage at the directory level
-
--   Volume level – limits the usage at the volume level
-
-> **Note**
->
-> You can set the disk limit on the directory even if it is not created.
-> The disk limit is enforced immediately after creating that directory.
-> For more information on setting disk limit, see ?.
-
-Enabling Quota
-==============
-
-You must enable Quota to set disk limits.
-
-**To enable quota**
-
--   Enable the quota using the following command:
-
-    `# gluster volume quota  enable `
-
-    For example, to enable quota on test-volume:
-
-        # gluster volume quota test-volume enable
-        Quota is enabled on /test-volume
-
-Disabling Quota
-===============
-
-You can disable Quota, if needed.
-
-**To disable quota:**
-
--   Disable the quota using the following command:
-
-    `# gluster volume quota  disable `
-
-    For example, to disable quota translator on test-volume:
-
-        # gluster volume quota test-volume disable
-        Quota translator is disabled on /test-volume
-
-Setting or Replacing Disk Limit
-===============================
-
-You can create new directories in your storage environment and set the
-disk limit or set disk limit for the existing directories. The directory
-name should be relative to the volume with the export directory/mount
-being treated as "/".
-
-**To set or replace disk limit**
-
--   Set the disk limit using the following command:
-
-    `# gluster volume quota  limit-usage /`
-
-    For example, to set limit on data directory on test-volume where
-    data is a directory under the export directory:
-
-        # gluster volume quota test-volume limit-usage /data 10GB
-        Usage limit has been set on /data
-
-    > **Note**
-    >
-    > In a multi-level directory hierarchy, the strictest disk limit
-    > will be considered for enforcement.
-
-Displaying Disk Limit Information
-=================================
-
-You can display disk limit information on all the directories on which
-the limit is set.
-
-**To display disk limit information**
-
--   Display disk limit information of all the directories on which limit
-    is set, using the following command:
-
-    `# gluster volume quota  list`
-
-    For example, to see the set disks limit on test-volume:
-
-        # gluster volume quota test-volume list
-
-
-        /Test/data    10 GB       6 GB
-        /Test/data1   10 GB       4 GB
-
--   Display disk limit information on a particular directory on which
-    limit is set, using the following command:
-
-    `# gluster volume quota  list `
-
-    For example, to see the set limit on /data directory of test-volume:
-
-        # gluster volume quota test-volume list /data
-
-
-        /Test/data    10 GB       6 GB
-
-Updating Memory Cache Size
-==========================
-
-For performance reasons, quota caches the directory sizes on client. You
-can set timeout indicating the maximum valid duration of directory sizes
-in cache, from the time they are populated.
-
-For example: If there are multiple clients writing to a single
-directory, there are chances that some other client might write till the
-quota limit is exceeded. However, this new file-size may not get
-reflected in the client till size entry in cache has become stale
-because of timeout. If writes happen on this client during this
-duration, they are allowed even though they would lead to exceeding of
-quota-limits, since size in cache is not in sync with the actual size.
-When timeout happens, the size in cache is updated from servers and will
-be in sync and no further writes will be allowed. A timeout of zero will
-force fetching of directory sizes from server for every operation that
-modifies file data and will effectively disables directory size caching
-on client side.
-
-**To update the memory cache size**
-
--   Update the memory cache size using the following command:
-
-    `# gluster volume set  features.quota-timeout`
-
-    For example, to update the memory cache size for every 5 seconds on
-    test-volume:
-
-        # gluster volume set test-volume features.quota-timeout 5
-        Set volume successful
-
-Removing Disk Limit
-===================
-
-You can remove set disk limit, if you do not want quota anymore.
-
-**To remove disk limit**
-
--   Remove disk limit set on a particular directory using the following
-    command:
-
-    `# gluster volume quota  remove `
-
-    For example, to remove the disk limit on /data directory of
-    test-volume:
-
-        # gluster volume quota test-volume remove /data
-        Usage limit set on /data is removed
-
-
diff --git a/doc/admin-guide/en-US/markdown/admin_geo-replication.md b/doc/admin-guide/en-US/markdown/admin_geo-replication.md
deleted file mode 100644
index 849957244..000000000
--- a/doc/admin-guide/en-US/markdown/admin_geo-replication.md
+++ /dev/null
@@ -1,738 +0,0 @@
-Managing Geo-replication
-========================
-
-Geo-replication provides a continuous, asynchronous, and incremental
-replication service from one site to another over Local Area Networks
-(LANs), Wide Area Network (WANs), and across the Internet.
-
-Geo-replication uses a master–slave model, whereby replication and
-mirroring occurs between the following partners:
-
--   Master – a GlusterFS volume
-
--   Slave – a slave which can be of the following types:
-
-    -   A local directory which can be represented as file URL like
-        `file:///path/to/dir`. You can use shortened form, for example,
-        ` /path/to/dir`.
-
-    -   A GlusterFS Volume - Slave volume can be either a local volume
-        like `gluster://localhost:volname` (shortened form - `:volname`)
-        or a volume served by different host like
-        `gluster://host:volname` (shortened form - `host:volname`).
-
-    > **Note**
-    >
-    > Both of the above types can be accessed remotely using SSH tunnel.
-    > To use SSH, add an SSH prefix to either a file URL or gluster type
-    > URL. For example, ` ssh://root@remote-host:/path/to/dir`
-    > (shortened form - `root@remote-host:/path/to/dir`) or
-    > `ssh://root@remote-host:gluster://localhost:volname` (shortened
-    > from - `root@remote-host::volname`).
-
-This section introduces Geo-replication, illustrates the various
-deployment scenarios, and explains how to configure the system to
-provide replication and mirroring in your environment.
-
-Replicated Volumes vs Geo-replication
-=====================================
-
-The following table lists the difference between replicated volumes and
-geo-replication:
-
-  Replicated Volumes                                                                      Geo-replication
-  --------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------
-  Mirrors data across clusters                                                            Mirrors data across geographically distributed clusters
-  Provides high-availability                                                              Ensures backing up of data for disaster recovery
-  Synchronous replication (each and every file operation is sent across all the bricks)   Asynchronous replication (checks for the changes in files periodically and syncs them on detecting differences)
-
-Preparing to Deploy Geo-replication
-===================================
-
-This section provides an overview of the Geo-replication deployment
-scenarios, describes how you can check the minimum system requirements,
-and explores common deployment scenarios.
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
-Exploring Geo-replication Deployment Scenarios
-----------------------------------------------
-
-Geo-replication provides an incremental replication service over Local
-Area Networks (LANs), Wide Area Network (WANs), and across the Internet.
-This section illustrates the most common deployment scenarios for
-Geo-replication, including the following:
-
--   Geo-replication over LAN
-
--   Geo-replication over WAN
-
--   Geo-replication over the Internet
-
--   Multi-site cascading Geo-replication
-
-**Geo-replication over LAN**
-
-You can configure Geo-replication to mirror data over a Local Area
-Network.
-
-![ Geo-replication over LAN ][]
-
-**Geo-replication over WAN**
-
-You can configure Geo-replication to replicate data over a Wide Area
-Network.
-
-![ Geo-replication over WAN ][]
-
-**Geo-replication over Internet**
-
-You can configure Geo-replication to mirror data over the Internet.
-
-![ Geo-replication over Internet ][]
-
-**Multi-site cascading Geo-replication**
-
-You can configure Geo-replication to mirror data in a cascading fashion
-across multiple sites.
-
-![ Multi-site cascading Geo-replication ][]
-
-Geo-replication Deployment Overview
------------------------------------
-
-Deploying Geo-replication involves the following steps:
-
-1.  Verify that your environment matches the minimum system requirement.
-    For more information, see ?.
-
-2.  Determine the appropriate deployment scenario. For more information,
-    see ?.
-
-3.  Start Geo-replication on master and slave systems, as required. For
-    more information, see ?.
-
-Checking Geo-replication Minimum Requirements
----------------------------------------------
-
-Before deploying GlusterFS Geo-replication, verify that your systems
-match the minimum requirements.
-
-The following table outlines the minimum requirements for both master
-and slave nodes within your environment:
-
-  Component                Master                                                                Slave
-  ------------------------ --------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-  Operating System         GNU/Linux                                                             GNU/Linux
-  Filesystem               GlusterFS 3.2 or higher                                               GlusterFS 3.2 or higher (GlusterFS needs to be installed, but does not need to be running), ext3, ext4, or XFS (any other POSIX compliant file system would work, but has not been tested extensively)
-  Python                   Python 2.4 (with ctypes external module), or Python 2.5 (or higher)   Python 2.4 (with ctypes external module), or Python 2.5 (or higher)
-  Secure shell             OpenSSH version 4.0 (or higher)                                       SSH2-compliant daemon
-  Remote synchronization   rsync 3.0.7 or higher                                                 rsync 3.0.7 or higher
-  FUSE                     GlusterFS supported versions                                          GlusterFS supported versions
-
-Setting Up the Environment for Geo-replication
-----------------------------------------------
-
-**Time Synchronization**
-
--   On bricks of a geo-replication master volume, all the servers' time
-    must be uniform. You are recommended to set up NTP (Network Time
-    Protocol) service to keep the bricks sync in time and avoid
-    out-of-time sync effect.
-
-    For example: In a Replicated volume where brick1 of the master is at
-    12.20 hrs and brick 2 of the master is at 12.10 hrs with 10 minutes
-    time lag, all the changes in brick2 between this period may go
-    unnoticed during synchronization of files with Slave.
-
-    For more information on setting up NTP, see [][].
-
-**To setup Geo-replication for SSH**
-
-Password-less login has to be set up between the host machine (where
-geo-replication Start command will be issued) and the remote machine
-(where slave process should be launched through SSH).
-
-1.  On the node where geo-replication sessions are to be set up, run the
-    following command:
-
-    `# ssh-keygen -f /var/lib/glusterd/geo-replication/secret.pem`
-
-    Press Enter twice to avoid passphrase.
-
-2.  Run the following command on master for all the slave hosts:
-
-    `# ssh-copy-id -i /var/lib/glusterd/geo-replication/secret.pem.pub @`
-
-Setting Up the Environment for a Secure Geo-replication Slave
--------------------------------------------------------------
-
-You can configure a secure slave using SSH so that master is granted a
-restricted access. With GlusterFS, you need not specify configuration
-parameters regarding the slave on the master-side configuration. For
-example, the master does not require the location of the rsync program
-on slave but the slave must ensure that rsync is in the PATH of the user
-which the master connects using SSH. The only information that master
-and slave have to negotiate are the slave-side user account, slave's
-resources that master uses as slave resources, and the master's public
-key. Secure access to the slave can be established using the following
-options:
-
--   Restricting Remote Command Execution
-
--   Using `Mountbroker` for Slaves
-
--   Using IP based Access Control
-
-**Backward Compatibility**
-
-Your existing Ge-replication environment will work with GlusterFS,
-except for the following:
-
--   The process of secure reconfiguration affects only the glusterfs
-    instance on slave. The changes are transparent to master with the
-    exception that you may have to change the SSH target to an
-    unprivileged account on slave.
-
--   The following are the some exceptions where this might not work:
-
-    -   Geo-replication URLs which specify the slave resource when
-        configuring master will include the following special
-        characters: space, \*, ?, [;
-
-    -   Slave must have a running instance of glusterd, even if there is
-        no gluster volume among the mounted slave resources (that is,
-        file tree slaves are used exclusively) .
-
-### Restricting Remote Command Execution
-
-If you restrict remote command execution, then the Slave audits commands
-coming from the master and the commands related to the given
-geo-replication session is allowed. The Slave also provides access only
-to the files within the slave resource which can be read or manipulated
-by the Master.
-
-To restrict remote command execution:
-
-1.  Identify the location of the gsyncd helper utility on Slave. This
-    utility is installed in `PREFIX/libexec/glusterfs/gsyncd`, where
-    PREFIX is a compile-time parameter of glusterfs. For example,
-    `--prefix=PREFIX` to the configure script with the following common
-    values` /usr, /usr/local, and /opt/glusterfs/glusterfs_version`.
-
-2.  Ensure that command invoked from master to slave passed through the
-    slave's gsyncd utility.
-
-    You can use either of the following two options:
-
-    -   Set gsyncd with an absolute path as the shell for the account
-        which the master connects through SSH. If you need to use a
-        privileged account, then set it up by creating a new user with
-        UID 0.
-
-    -   Setup key authentication with command enforcement to gsyncd. You
-        must prefix the copy of master's public key in the Slave
-        account's `authorized_keys` file with the following command:
-
-        `command=<path to gsyncd>`.
-
-        For example,
-        `command="PREFIX/glusterfs/gsyncd" ssh-rsa AAAAB3Nza....`
-
-### Using Mountbroker for Slaves
-
-`mountbroker` is a new service of glusterd. This service allows an
-unprivileged process to own a GlusterFS mount by registering a label
-(and DSL (Domain-specific language) options ) with glusterd through a
-glusterd volfile. Using CLI, you can send a mount request to glusterd to
-receive an alias (symlink) of the mounted volume.
-
-A request from the agent , the unprivileged slave agents use the
-mountbroker service of glusterd to set up an auxiliary gluster mount for
-the agent in a special environment which ensures that the agent is only
-allowed to access with special parameters that provide administrative
-level access to the particular volume.
-
-**To setup an auxiliary gluster mount for the agent**:
-
-1.  Create a new group. For example, `geogroup`.
-
-2.  Create a unprivileged account. For example, ` geoaccount`. Make it a
-    member of ` geogroup`.
-
-3.  Create a new directory owned by root and with permissions *0711.*
-    For example, create a create mountbroker-root directory
-    `/var/mountbroker-root`.
-
-4.  Add the following options to the glusterd volfile, assuming the name
-    of the slave gluster volume as `slavevol`:
-
-    `option mountbroker-root /var/mountbroker-root `
-
-    `option mountbroker-geo-replication.geoaccount slavevol`
-
-    `option geo-replication-log-group geogroup`
-
-    If you are unable to locate the glusterd volfile at
-    `/etc/glusterfs/glusterd.vol`, you can create a volfile containing
-    both the default configuration and the above options and place it at
-    `/etc/glusterfs/`.
-
-    A sample glusterd volfile along with default options:
-
-        volume management
-            type mgmt/glusterd
-            option working-directory /var/lib/glusterd
-            option transport-type socket,rdma
-            option transport.socket.keepalive-time 10
-            option transport.socket.keepalive-interval 2
-            option transport.socket.read-fail-log off
-
-            option mountbroker-root /var/mountbroker-root 
-            option mountbroker-geo-replication.geoaccount slavevol
-            option geo-replication-log-group geogroup
-        end-volume
-
-    If you host multiple slave volumes on Slave, you can repeat step 2.
-    for each of them and add the following options to the `volfile`:
-
-        option mountbroker-geo-replication.geoaccount2 slavevol2
-        option mountbroker-geo-replication.geoaccount3 slavevol3
-
-5.  Setup Master to access Slave as `geoaccount@Slave`.
-
-    You can add multiple slave volumes within the same account
-    (geoaccount) by providing comma-separated list (without spaces) as
-    the argument of `mountbroker-geo-replication.geogroup`. You can also
-    have multiple options of the form `mountbroker-geo-replication.*`.
-    It is recommended to use one service account per Master machine. For
-    example, if there are multiple slave volumes on Slave for the master
-    machines Master1, Master2, and Master3, then create a dedicated
-    service user on Slave for them by repeating Step 2. for each (like
-    geogroup1, geogroup2, and geogroup3), and then add the following
-    corresponding options to the volfile:
-
-    `option mountbroker-geo-replication.geoaccount1 slavevol11,slavevol12,slavevol13`
-
-    `option mountbroker-geo-replication.geoaccount2 slavevol21,slavevol22`
-
-    `option mountbroker-geo-replication.geoaccount3 slavevol31`
-
-    Now set up Master1 to ssh to geoaccount1@Slave, etc.
-
-    You must restart glusterd after making changes in the configuration
-    to effect the updates.
-
-### Using IP based Access Control
-
-You can use IP based access control method to provide access control for
-the slave resources using IP address. You can use method for both Slave
-and file tree slaves, but in the section, we are focusing on file tree
-slaves using this method.
-
-To set access control based on IP address for file tree slaves:
-
-1.  Set a general restriction for accessibility of file tree resources:
-
-    `# gluster volume geo-replication '/*' config allow-network ::1,127.0.0.1 `
-
-    This will refuse all requests for spawning slave agents except for
-    requests initiated locally.
-
-2.  If you want the to lease file tree at `/data/slave-tree` to Master,
-    enter the following command:
-
-    `# gluster volume geo-replicationconfig allow-network `
-
-    `MasterIP` is the IP address of Master. The slave agent spawn
-    request from master will be accepted if it is executed at
-    `/data/slave-tree`.
-
-If the Master side network configuration does not enable the Slave to
-recognize the exact IP address of Master, you can use CIDR notation to
-specify a subnet instead of a single IP address as MasterIP or even
-comma-separated lists of CIDR subnets.
-
-If you want to extend IP based access control to gluster slaves, use the
-following command:
-
-`# gluster volume geo-replication '*' config allow-network ::1,127.0.0.1`
-
-Starting Geo-replication
-========================
-
-This section describes how to configure and start Gluster
-Geo-replication in your storage environment, and verify that it is
-functioning correctly.
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
-Starting Geo-replication
-------------------------
-
-To start Gluster Geo-replication
-
--   Start geo-replication between the hosts using the following command:
-
-    `# gluster volume geo-replication  start`
-
-    For example:
-
-        # gluster volume geo-replication Volume1 example.com:/data/remote_dir start
-        Starting geo-replication session between Volume1
-        example.com:/data/remote_dir has been successful
-
-    > **Note**
-    >
-    > You may need to configure the service before starting Gluster
-    > Geo-replication. For more information, see ?.
-
-Verifying Successful Deployment
--------------------------------
-
-You can use the gluster command to verify the status of Gluster
-Geo-replication in your environment.
-
-**To verify the status Gluster Geo-replication**
-
--   Verify the status by issuing the following command on host:
-
-    `# gluster volume geo-replication  status`
-
-    For example:
-
-    `# gluster volume geo-replication Volume1 example.com:/data/remote_dir status`
-
-        # gluster volume geo-replication Volume1 example.com:/data/remote_dir status
-
-        MASTER    SLAVE                            STATUS
-        ______    ______________________________   ____________
-        Volume1 root@example.com:/data/remote_dir  Starting....
-
-Displaying Geo-replication Status Information
----------------------------------------------
-
-You can display status information about a specific geo-replication
-master session, or a particular master-slave session, or all
-geo-replication sessions, as needed.
-
-**To display geo-replication status information**
-
--   Display information of all geo-replication sessions using the
-    following command:
-
-        # gluster volume geo-replication Volume1 example.com:/data/remote_dir status
-
-        MASTER    SLAVE                            STATUS
-        ______    ______________________________   ____________
-        Volume1 root@example.com:/data/remote_dir  Starting....
-
--   Display information of a particular master slave session using the
-    following command:
-
-    `# gluster volume geo-replication  status`
-
-    For example, to display information of Volume1 and
-    example.com:/data/remote\_dir
-
-    `# gluster volume geo-replication Volume1 example.com:/data/remote_dir status`
-
-    The status of the geo-replication between Volume1 and
-    example.com:/data/remote\_dir is displayed.
-
--   Display information of all geo-replication sessions belonging to a
-    master
-
-    `# gluster volume geo-replication MASTER status`
-
-    For example, to display information of Volume1
-
-        # gluster volume geo-replication Volume1 example.com:/data/remote_dir status
-
-        MASTER    SLAVE                            STATUS
-        ______    ______________________________   ____________
-        Volume1 ssh://example.com:gluster://127.0.0.1:remove_volume  OK
-
-        Volume1 ssh://example.com:file:///data/remote_dir  OK
-
-    The status of a session could be one of the following four:
-
--   **Starting**: This is the initial phase of the Geo-replication
-    session; it remains in this state for a minute, to make sure no
-    abnormalities are present.
-
--   **OK**: The geo-replication session is in a stable state.
-
--   **Faulty**: The geo-replication session has witnessed some
-    abnormality and the situation has to be investigated further. For
-    further information, see ? section.
-
--   **Corrupt**: The monitor thread which is monitoring the
-    geo-replication session has died. This situation should not occur
-    normally, if it persists contact Red Hat Support[][1].
-
-Configuring Geo-replication
----------------------------
-
-To configure Gluster Geo-replication
-
--   Use the following command at the Gluster command line:
-
-    `# gluster volume geo-replication  config [options]`
-
-    For more information about the options, see ?.
-
-    For example:
-
-    To view list of all option/value pair, use the following command:
-
-    `# gluster volume geo-replication Volume1 example.com:/data/remote_dir config`
-
-Stopping Geo-replication
-------------------------
-
-You can use the gluster command to stop Gluster Geo-replication (syncing
-of data from Master to Slave) in your environment.
-
-**To stop Gluster Geo-replication**
-
--   Stop geo-replication between the hosts using the following command:
-
-    `# gluster volume geo-replication  stop `
-
-    For example:
-
-        # gluster volume geo-replication Volume1 example.com:/data/remote_dir stop
-        Stopping geo-replication session between Volume1 and
-        example.com:/data/remote_dir has been successful
-
-    See ? for more information about the gluster command.
-
-Restoring Data from the Slave
-=============================
-
-You can restore data from the slave to the master volume, whenever the
-master volume becomes faulty for reasons like hardware failure.
-
-The example in this section assumes that you are using the Master Volume
-(Volume1) with the following configuration:
-
-    machine1# gluster volume info
-    Type: Distribute
-    Status: Started
-    Number of Bricks: 2
-    Transport-type: tcp
-    Bricks:
-    Brick1: machine1:/export/dir16
-    Brick2: machine2:/export/dir16
-    Options Reconfigured:
-    geo-replication.indexing: on
-
-The data is syncing from master volume (Volume1) to slave directory
-(example.com:/data/remote\_dir). To view the status of this
-geo-replication session run the following command on Master:
-
-    # gluster volume geo-replication Volume1 root@example.com:/data/remote_dir status
-
-    MASTER    SLAVE                             STATUS
-    ______    ______________________________    ____________
-    Volume1  root@example.com:/data/remote_dir   OK
-
-**Before Failure**
-
-Assume that the Master volume had 100 files and was mounted at
-/mnt/gluster on one of the client machines (client). Run the following
-command on Client machine to view the list of files:
-
-    client# ls /mnt/gluster | wc –l
-    100
-
-The slave directory (example.com) will have same data as in the master
-volume and same can be viewed by running the following command on slave:
-
-    example.com# ls /data/remote_dir/ | wc –l
-    100
-
-**After Failure**
-
-If one of the bricks (machine2) fails, then the status of
-Geo-replication session is changed from "OK" to "Faulty". To view the
-status of this geo-replication session run the following command on
-Master:
-
-    # gluster volume geo-replication Volume1 root@example.com:/data/remote_dir status
-
-    MASTER    SLAVE                              STATUS
-    ______    ______________________________     ____________
-    Volume1   root@example.com:/data/remote_dir  Faulty
-
-Machine2 is failed and now you can see discrepancy in number of files
-between master and slave. Few files will be missing from the master
-volume but they will be available only on slave as shown below.
-
-Run the following command on Client:
-
-    client # ls /mnt/gluster | wc –l
-    52
-
-Run the following command on slave (example.com):
-
-    Example.com# # ls /data/remote_dir/ | wc –l
-    100
-
-**To restore data from the slave machine**
-
-1.  Stop all Master's geo-replication sessions using the following
-    command:
-
-    `# gluster volume geo-replication  stop`
-
-    For example:
-
-        machine1# gluster volume geo-replication Volume1
-        example.com:/data/remote_dir stop
-
-        Stopping geo-replication session between Volume1 &
-        example.com:/data/remote_dir has been successful
-
-    > **Note**
-    >
-    > Repeat `# gluster volume geo-replication  stop `command on all
-    > active geo-replication sessions of master volume.
-
-2.  Replace the faulty brick in the master by using the following
-    command:
-
-    `# gluster volume replace-brick  start`
-
-    For example:
-
-        machine1# gluster volume replace-brick Volume1 machine2:/export/dir16 machine3:/export/dir16 start
-        Replace-brick started successfully
-
-3.  Commit the migration of data using the following command:
-
-    `# gluster volume replace-brick  commit force `
-
-    For example:
-
-        machine1# gluster volume replace-brick Volume1 machine2:/export/dir16 machine3:/export/dir16 commit force
-        Replace-brick commit successful
-
-4.  Verify the migration of brick by viewing the volume info using the
-    following command:
-
-    `# gluster volume info `
-
-    For example:
-
-        machine1# gluster volume info
-        Volume Name: Volume1
-        Type: Distribute
-        Status: Started
-        Number of Bricks: 2
-        Transport-type: tcp
-        Bricks:
-        Brick1: machine1:/export/dir16
-        Brick2: machine3:/export/dir16
-        Options Reconfigured:
-        geo-replication.indexing: on
-
-5.  Run rsync command manually to sync data from slave to master
-    volume's client (mount point).
-
-    For example:
-
-    `example.com# rsync -PavhS --xattrs --ignore-existing /data/remote_dir/ client:/mnt/gluster`
-
-    Verify that the data is synced by using the following command:
-
-    On master volume, run the following command:
-
-        Client # ls | wc –l
-        100
-
-    On the Slave run the following command:
-
-        example.com# ls /data/remote_dir/ | wc –l
-        100
-
-    Now Master volume and Slave directory is synced.
-
-6.  Restart geo-replication session from master to slave using the
-    following command:
-
-    `# gluster volume geo-replication  start `
-
-    For example:
-
-        machine1# gluster volume geo-replication Volume1
-        example.com:/data/remote_dir start
-        Starting geo-replication session between Volume1 &
-        example.com:/data/remote_dir has been successful
-
-Best Practices
-==============
-
-**Manually Setting Time**
-
-If you have to change the time on your bricks manually, then you must
-set uniform time on all bricks. This avoids the out-of-time sync issue
-described in ?. Setting time backward corrupts the geo-replication
-index, so the recommended way to set the time manually is:
-
-1.  Stop geo-replication between the master and slave using the
-    following command:
-
-    `# gluster volume geo-replication  sto`p
-
-2.  Stop the geo-replication indexing using the following command:
-
-    `# gluster volume set  geo-replication.indexing of`f
-
-3.  Set uniform time on all bricks.s
-
-4.  Restart your geo-replication sessions by using the following
-    command:
-
-    `# gluster volume geo-replication start `
-
-**Running Geo-replication commands in one system**
-
-It is advisable to run the geo-replication commands in one of the bricks
-in the trusted storage pool. This is because, the log files for the
-geo-replication session would be stored in the \*Server\* where the
-Geo-replication start is initiated. Hence it would be easier to locate
-the log-files when required.
-
-**Isolation**
-
-Geo-replication slave operation is not sandboxed as of now and is ran as
-a privileged service. So for the security reason, it is advised to
-create a sandbox environment (dedicated machine / dedicated virtual
-machine / chroot/container type solution) by the administrator to run
-the geo-replication slave in it. Enhancement in this regard will be
-available in follow-up minor release.
-
-  [ Geo-replication over LAN ]: images/Geo-Rep_LAN.png
-  [ Geo-replication over WAN ]: images/Geo-Rep_WAN.png
-  [ Geo-replication over Internet ]: images/Geo-Rep03_Internet.png
-  [ Multi-site cascading Geo-replication ]: images/Geo-Rep04_Cascading.png
-  []: http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Migration_Planning_Guide/ch04s07.html
-  [1]: www.redhat.com/support/
diff --git a/doc/admin-guide/en-US/markdown/admin_managing_volumes.md b/doc/admin-guide/en-US/markdown/admin_managing_volumes.md
deleted file mode 100644
index 6c06e27a0..000000000
--- a/doc/admin-guide/en-US/markdown/admin_managing_volumes.md
+++ /dev/null
@@ -1,710 +0,0 @@
-Managing GlusterFS Volumes
-==========================
-
-This section describes how to perform common GlusterFS management
-operations, including the following:
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
-Tuning Volume Options
-=====================
-
-You can tune volume options, as needed, while the cluster is online and
-available.
-
-> **Note**
->
-> Red Hat recommends you to set server.allow-insecure option to ON if
-> there are too many bricks in each volume or if there are too many
-> services which have already utilized all the privileged ports in the
-> system. Turning this option ON allows ports to accept/reject messages
-> from insecure ports. So, use this option only if your deployment
-> requires it.
-
-To tune volume options
-
--   Tune volume options using the following command:
-
-    `# gluster volume set `
-
-    For example, to specify the performance cache size for test-volume:
-
-        # gluster volume set test-volume performance.cache-size 256MB
-        Set volume successful
-
-    The following table lists the Volume options along with its
-    description and default value:
-
-    > **Note**
-    >
-    > The default options given here are subject to modification at any
-    > given time and may not be the same for all versions.
-
-      -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-      Option                                 Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     Default Value                      Available Options
-      -------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------- ---------------------------------------------------------------------------------------
-      auth.allow                             IP addresses of the clients which should be allowed to access the volume.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       \* (allow all)                     Valid IP address which includes wild card patterns including \*, such as 192.168.1.\*
-
-      auth.reject                            IP addresses of the clients which should be denied to access the volume.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        NONE (reject none)                 Valid IP address which includes wild card patterns including \*, such as 192.168.2.\*
-
-      client.grace-timeout                   Specifies the duration for the lock state to be maintained on the client after a network disconnection.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         10                                 10 - 1800 secs
-
-      cluster.self-heal-window-size          Specifies the maximum number of blocks per file on which self-heal would happen simultaneously.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 16                                 0 - 1025 blocks
-
-      cluster.data-self-heal-algorithm       Specifies the type of self-heal. If you set the option as "full", the entire file is copied from source to destinations. If the option is set to "diff" the file blocks that are not in sync are copied to destinations. Reset uses a heuristic model. If the file does not exist on one of the subvolumes, or a zero-byte file exists (created by entry self-heal) the entire content has to be copied anyway, so there is no benefit from using the "diff" algorithm. If the file size is about the same as page size, the entire file can be read and written with a few operations, which will be faster than "diff" which has to read checksums and then read and write.   reset                              full | diff | reset
-
-      cluster.min-free-disk                  Specifies the percentage of disk space that must be kept free. Might be useful for non-uniform bricks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          10%                                Percentage of required minimum free disk space
-
-      cluster.stripe-block-size              Specifies the size of the stripe unit that will be read from or written to.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     128 KB (for all files)             size in bytes
-
-      cluster.self-heal-daemon               Allows you to turn-off proactive self-heal on replicated volumes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               on                                 On | Off
-
-      cluster.ensure-durability              This option makes sure the data/metadata is durable across abrupt shutdown of the brick.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        on                                 On | Off
-
-      diagnostics.brick-log-level            Changes the log-level of the bricks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            INFO                               DEBUG|WARNING|ERROR|CRITICAL|NONE|TRACE
-
-      diagnostics.client-log-level           Changes the log-level of the clients.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           INFO                               DEBUG|WARNING|ERROR|CRITICAL|NONE|TRACE
-
-      diagnostics.latency-measurement        Statistics related to the latency of each operation would be tracked.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           off                                On | Off
-
-      diagnostics.dump-fd-stats              Statistics related to file-operations would be tracked.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         off                                On | Off
-
-      feature.read-only                      Enables you to mount the entire volume as read-only for all the clients (including NFS clients) accessing it.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   off                                On | Off
-
-      features.lock-heal                     Enables self-healing of locks when the network disconnects.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     on                                 On | Off
-
-      features.quota-timeout                 For performance reasons, quota caches the directory sizes on client. You can set timeout indicating the maximum duration of directory sizes in cache, from the time they are populated, during which they are considered valid.                                                                                                                                                                                                                                                                                                                                                                                                                                                 0                                  0 - 3600 secs
-
-      geo-replication.indexing               Use this option to automatically sync the changes in the filesystem from Master to Slave.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       off                                On | Off
-
-      network.frame-timeout                  The time frame after which the operation has to be declared as dead, if the server does not respond for a particular operation.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 1800 (30 mins)                     1800 secs
-
-      network.ping-timeout                   The time duration for which the client waits to check if the server is responsive. When a ping timeout happens, there is a network disconnect between the client and server. All resources held by server on behalf of the client get cleaned up. When a reconnection happens, all resources will need to be re-acquired before the client can resume its operations on the server. Additionally, the locks will be acquired and the lock tables updated.                                                                                                                                                                                                                       42 Secs                            42 Secs
-                                             This reconnect is a very expensive operation and should be avoided.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-
-      nfs.enable-ino32                       For 32-bit nfs clients or applications that do not support 64-bit inode numbers or large files, use this option from the CLI to make Gluster NFS return 32-bit inode numbers instead of 64-bit inode numbers. Applications that will benefit are those that were either:                                                                                                                                                                                                                                                                                                                                                                                                        off                                On | Off
-                                             \* Built 32-bit and run on 32-bit machines.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                             \* Built 32-bit on 64-bit systems.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                             \* Built 64-bit but use a library built 32-bit, especially relevant for python and perl scripts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                                             Either of the conditions above can lead to application on Linux NFS clients failing with "Invalid argument" or "Value too large for defined data type" errors.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     
-
-      nfs.volume-access                      Set the access type for the specified sub-volume.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               read-write                         read-write|read-only
-
-      nfs.trusted-write                      If there is an UNSTABLE write from the client, STABLE flag will be returned to force the client to not send a COMMIT request.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   off                                On | Off
-                                             In some environments, combined with a replicated GlusterFS setup, this option can improve write performance. This flag allows users to trust Gluster replication logic to sync data to the disks and recover when required. COMMIT requests if received will be handled in a default manner by fsyncing. STABLE writes are still handled in a sync manner.                                                                                                                                                                                                                                                                                                                                                         
-
-      nfs.trusted-sync                       All writes and COMMIT requests are treated as async. This implies that no write requests are guaranteed to be on server disks when the write reply is received at the NFS client. Trusted sync includes trusted-write behavior.                                                                                                                                                                                                                                                                                                                                                                                                                                                 off                                On | Off
-
-      nfs.export-dir                         This option can be used to export specified comma separated subdirectories in the volume. The path must be an absolute path. Along with path allowed list of IPs/hostname can be associated with each subdirectory. If provided connection will allowed only from these IPs. Format: \<dir\>[(hostspec[|hostspec|...])][,...]. Where hostspec can be an IP address, hostname or an IP range in CIDR notation. **Note**: Care must be taken while configuring this option as invalid entries and/or unreachable DNS servers can introduce unwanted delay in all the mount calls.                                                                                                     No sub directory exported.                        Absolute path with allowed list of IP/hostname.
-
-      nfs.export-volumes                     Enable/Disable exporting entire volumes, instead if used in conjunction with nfs3.export-dir, can allow setting up only subdirectories as exports.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              on                                 On | Off
-
-      nfs.rpc-auth-unix                      Enable/Disable the AUTH\_UNIX authentication type. This option is enabled by default for better interoperability. However, you can disable it if required.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      on                                 On | Off
-
-      nfs.rpc-auth-null                      Enable/Disable the AUTH\_NULL authentication type. It is not recommended to change the default value for this option.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           on                                 On | Off
-
-      nfs.rpc-auth-allow\<IP- Addresses\>    Allow a comma separated list of addresses and/or hostnames to connect to the server. By default, all clients are disallowed. This allows you to define a general rule for all exported volumes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 Reject All                         IP address or Host name
-
-      nfs.rpc-auth-reject IP- Addresses      Reject a comma separated list of addresses and/or hostnames from connecting to the server. By default, all connections are disallowed. This allows you to define a general rule for all exported volumes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                       Reject All                         IP address or Host name
-
-      nfs.ports-insecure                     Allow client connections from unprivileged ports. By default only privileged ports are allowed. This is a global setting in case insecure ports are to be enabled for all exports using a single option.                                                                                                                                                                                                                                                                                                                                                                                                                                                                        off                                On | Off
-
-      nfs.addr-namelookup                    Turn-off name lookup for incoming client connections using this option. In some setups, the name server can take too long to reply to DNS queries resulting in timeouts of mount requests. Use this option to turn off name lookups during address authentication. Note, turning this off will prevent you from using hostnames in rpc-auth.addr.\* filters.                                                                                                                                                                                                                                                                                                                    on                                 On | Off
-
-      nfs.register-with- portmap             For systems that need to run multiple NFS servers, you need to prevent more than one from registering with portmap service. Use this option to turn off portmap registration for Gluster NFS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   on                                 On | Off
-
-      nfs.port \<PORT- NUMBER\>              Use this option on systems that need Gluster NFS to be associated with a non-default port number.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               38465- 38467                       
-
-      nfs.disable                            Turn-off volume being exported by NFS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           off                                On | Off
-
-      performance.write-behind-window-size   Size of the per-file write-behind buffer.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       1 MB                               Write-behind cache size
-
-      performance.io-thread-count            The number of threads in IO threads translator.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 16                                 0 - 65
-
-      performance.flush-behind               If this option is set ON, instructs write-behind translator to perform flush in background, by returning success (or any errors, if any of previous writes were failed) to application even before flush is sent to backend filesystem.                                                                                                                                                                                                                                                                                                                                                                                                                                         On                                 On | Off
-
-      performance.cache-max-file-size        Sets the maximum file size cached by the io-cache translator. Can use the normal size descriptors of KB, MB, GB,TB or PB (for example, 6GB). Maximum size uint64.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               2 \^ 64 -1 bytes                   size in bytes
-
-      performance.cache-min-file-size        Sets the minimum file size cached by the io-cache translator. Values same as "max" above.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       0B                                 size in bytes
-
-      performance.cache-refresh-timeout      The cached data for a file will be retained till 'cache-refresh-timeout' seconds, after which data re-validation is performed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  1 sec                              0 - 61
-
-      performance.cache-size                 Size of the read cache.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         32 MB                              size in bytes
-
-      server.allow-insecure                  Allow client connections from unprivileged ports. By default only privileged ports are allowed. This is a global setting in case insecure ports are to be enabled for all exports using a single option.                                                                                                                                                                                                                                                                                                                                                                                                                                                                        on                                 On | Off
-
-      server.grace-timeout                   Specifies the duration for the lock state to be maintained on the server after a network disconnection.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         10                                 10 - 1800 secs
-
-      server.statedump-path                  Location of the state dump file.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                /tmp directory of the brick        New directory path
-
-      storage.health-check-interval          Number of seconds between health-checks done on the filesystem that is used for the brick(s). Defaults to 30 seconds, set to 0 to disable.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      /tmp directory of the brick        New directory path
-      -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-    You can view the changed volume options using
-    the` # gluster volume info ` command. For more information, see ?.
-
-Expanding Volumes
-=================
-
-You can expand volumes, as needed, while the cluster is online and
-available. For example, you might want to add a brick to a distributed
-volume, thereby increasing the distribution and adding to the capacity
-of the GlusterFS volume.
-
-Similarly, you might want to add a group of bricks to a distributed
-replicated volume, increasing the capacity of the GlusterFS volume.
-
-> **Note**
->
-> When expanding distributed replicated and distributed striped volumes,
-> you need to add a number of bricks that is a multiple of the replica
-> or stripe count. For example, to expand a distributed replicated
-> volume with a replica count of 2, you need to add bricks in multiples
-> of 2 (such as 4, 6, 8, etc.).
-
-**To expand a volume**
-
-1.  On the first server in the cluster, probe the server to which you
-    want to add the new brick using the following command:
-
-    `# gluster peer probe `
-
-    For example:
-
-        # gluster peer probe server4
-        Probe successful
-
-2.  Add the brick using the following command:
-
-    `# gluster volume add-brick `
-
-    For example:
-
-        # gluster volume add-brick test-volume server4:/exp4
-        Add Brick successful
-
-3.  Check the volume information using the following command:
-
-    `# gluster volume info `
-
-    The command displays information similar to the following:
-
-        Volume Name: test-volume
-        Type: Distribute
-        Status: Started
-        Number of Bricks: 4
-        Bricks:
-        Brick1: server1:/exp1
-        Brick2: server2:/exp2
-        Brick3: server3:/exp3
-        Brick4: server4:/exp4
-
-4.  Rebalance the volume to ensure that all files are distributed to the
-    new brick.
-
-    You can use the rebalance command as described in ?.
-
-Shrinking Volumes
-=================
-
-You can shrink volumes, as needed, while the cluster is online and
-available. For example, you might need to remove a brick that has become
-inaccessible in a distributed volume due to hardware or network failure.
-
-> **Note**
->
-> Data residing on the brick that you are removing will no longer be
-> accessible at the Gluster mount point. Note however that only the
-> configuration information is removed - you can continue to access the
-> data directly from the brick, as necessary.
-
-When shrinking distributed replicated and distributed striped volumes,
-you need to remove a number of bricks that is a multiple of the replica
-or stripe count. For example, to shrink a distributed striped volume
-with a stripe count of 2, you need to remove bricks in multiples of 2
-(such as 4, 6, 8, etc.). In addition, the bricks you are trying to
-remove must be from the same sub-volume (the same replica or stripe
-set).
-
-**To shrink a volume**
-
-1.  Remove the brick using the following command:
-
-    `# gluster volume remove-brick ` `start`
-
-    For example, to remove server2:/exp2:
-
-        # gluster volume remove-brick test-volume server2:/exp2
-
-        Removing brick(s) can result in data loss. Do you want to Continue? (y/n)
-
-2.  Enter "y" to confirm the operation. The command displays the
-    following message indicating that the remove brick operation is
-    successfully started:
-
-        Remove Brick successful 
-
-3.  (Optional) View the status of the remove brick operation using the
-    following command:
-
-    `# gluster volume remove-brick `` status`
-
-    For example, to view the status of remove brick operation on
-    server2:/exp2 brick:
-
-        # gluster volume remove-brick test-volume server2:/exp2 status
-                                        Node  Rebalanced-files  size  scanned       status
-                                   ---------  ----------------  ----  -------  -----------
-        617c923e-6450-4065-8e33-865e28d9428f               34   340      162   in progress
-
-4.  Check the volume information using the following command:
-
-    `# gluster volume info `
-
-    The command displays information similar to the following:
-
-        # gluster volume info
-        Volume Name: test-volume
-        Type: Distribute
-        Status: Started
-        Number of Bricks: 3
-        Bricks:
-        Brick1: server1:/exp1
-        Brick3: server3:/exp3
-        Brick4: server4:/exp4
-
-5.  Rebalance the volume to ensure that all files are distributed to the
-    new brick.
-
-    You can use the rebalance command as described in ?.
-
-Migrating Volumes
-=================
-
-You can migrate the data from one brick to another, as needed, while the
-cluster is online and available.
-
-**To migrate a volume**
-
-1.  Make sure the new brick, server5 in this example, is successfully
-    added to the cluster.
-
-    For more information, see ?.
-
-2.  Migrate the data from one brick to another using the following
-    command:
-
-    ` # gluster volume replace-brick  start`
-
-    For example, to migrate the data in server3:/exp3 to server5:/exp5
-    in test-volume:
-
-        # gluster volume replace-brick test-volume server3:/exp3  server5:exp5 start
-        Replace brick start operation successful
-
-    > **Note**
-    >
-    > You need to have the FUSE package installed on the server on which
-    > you are running the replace-brick command for the command to work.
-
-3.  To pause the migration operation, if needed, use the following
-    command:
-
-    `# gluster volume replace-brick  pause `
-
-    For example, to pause the data migration from server3:/exp3 to
-    server5:/exp5 in test-volume:
-
-        # gluster volume replace-brick test-volume server3:/exp3 server5:exp5 pause
-        Replace brick pause operation successful
-
-4.  To abort the migration operation, if needed, use the following
-    command:
-
-    ` # gluster volume replace-brick abort `
-
-    For example, to abort the data migration from server3:/exp3 to
-    server5:/exp5 in test-volume:
-
-        # gluster volume replace-brick test-volume server3:/exp3 server5:exp5 abort
-        Replace brick abort operation successful
-
-5.  Check the status of the migration operation using the following
-    command:
-
-    ` # gluster volume replace-brick status `
-
-    For example, to check the data migration status from server3:/exp3
-    to server5:/exp5 in test-volume:
-
-        # gluster volume replace-brick test-volume server3:/exp3 server5:/exp5 status
-        Current File = /usr/src/linux-headers-2.6.31-14/block/Makefile 
-        Number of files migrated = 10567
-        Migration complete
-
-    The status command shows the current file being migrated along with
-    the current total number of files migrated. After completion of
-    migration, it displays Migration complete.
-
-6.  Commit the migration of data from one brick to another using the
-    following command:
-
-    ` # gluster volume replace-brick commit `
-
-    For example, to commit the data migration from server3:/exp3 to
-    server5:/exp5 in test-volume:
-
-        # gluster volume replace-brick test-volume server3:/exp3 server5:/exp5 commit
-        replace-brick commit successful
-
-7.  Verify the migration of brick by viewing the volume info using the
-    following command:
-
-    `# gluster volume info `
-
-    For example, to check the volume information of new brick
-    server5:/exp5 in test-volume:
-
-        # gluster volume info test-volume
-        Volume Name: testvolume
-        Type: Replicate
-        Status: Started
-        Number of Bricks: 4
-        Transport-type: tcp
-        Bricks:
-        Brick1: server1:/exp1
-        Brick2: server2:/exp2
-        Brick3: server4:/exp4
-        Brick4: server5:/exp5
-
-        The new volume details are displayed.
-
-    The new volume details are displayed.
-
-    In the above example, previously, there were bricks; 1,2,3, and 4
-    and now brick 3 is replaced by brick 5.
-
-Rebalancing Volumes
-===================
-
-After expanding or shrinking a volume (using the add-brick and
-remove-brick commands respectively), you need to rebalance the data
-among the servers. New directories created after expanding or shrinking
-of the volume will be evenly distributed automatically. For all the
-existing directories, the distribution can be fixed by rebalancing the
-layout and/or data.
-
-This section describes how to rebalance GlusterFS volumes in your
-storage environment, using the following common scenarios:
-
--   Fix Layout - Fixes the layout changes so that the files can actually
-    go to newly added nodes. For more information, see ?.
-
--   Fix Layout and Migrate Data - Rebalances volume by fixing the layout
-    changes and migrating the existing data. For more information, see
-    ?.
-
-Rebalancing Volume to Fix Layout Changes
-----------------------------------------
-
-Fixing the layout is necessary because the layout structure is static
-for a given directory. In a scenario where new bricks have been added to
-the existing volume, newly created files in existing directories will
-still be distributed only among the old bricks. The
-`# gluster volume rebalance fix-layout start `command will fix the
-layout information so that the files can also go to newly added nodes.
-When this command is issued, all the file stat information which is
-already cached will get revalidated.
-
-A fix-layout rebalance will only fix the layout changes and does not
-migrate data. If you want to migrate the existing data,
-use`# gluster volume rebalance  start ` command to rebalance data among
-the servers.
-
-**To rebalance a volume to fix layout changes**
-
--   Start the rebalance operation on any one of the server using the
-    following command:
-
-    `# gluster volume rebalance fix-layout start`
-
-    For example:
-
-        # gluster volume rebalance test-volume fix-layout start
-        Starting rebalance on volume test-volume has been successful
-
-Rebalancing Volume to Fix Layout and Migrate Data
--------------------------------------------------
-
-After expanding or shrinking a volume (using the add-brick and
-remove-brick commands respectively), you need to rebalance the data
-among the servers.
-
-**To rebalance a volume to fix layout and migrate the existing data**
-
--   Start the rebalance operation on any one of the server using the
-    following command:
-
-    `# gluster volume rebalance start`
-
-    For example:
-
-        # gluster volume rebalance test-volume start
-        Starting rebalancing on volume test-volume has been successful
-
--   Start the migration operation forcefully on any one of the server
-    using the following command:
-
-    `# gluster volume rebalance start force`
-
-    For example:
-
-        # gluster volume rebalance test-volume start force
-        Starting rebalancing on volume test-volume has been successful
-
-Displaying Status of Rebalance Operation
-----------------------------------------
-
-You can display the status information about rebalance volume operation,
-as needed.
-
-**To view status of rebalance volume**
-
--   Check the status of the rebalance operation, using the following
-    command:
-
-    `# gluster volume rebalance  status`
-
-    For example:
-
-        # gluster volume rebalance test-volume status
-                                        Node  Rebalanced-files  size  scanned       status
-                                   ---------  ----------------  ----  -------  -----------
-        617c923e-6450-4065-8e33-865e28d9428f               416  1463      312  in progress
-
-    The time to complete the rebalance operation depends on the number
-    of files on the volume along with the corresponding file sizes.
-    Continue checking the rebalance status, verifying that the number of
-    files rebalanced or total files scanned keeps increasing.
-
-    For example, running the status command again might display a result
-    similar to the following:
-
-        # gluster volume rebalance test-volume status
-                                        Node  Rebalanced-files  size  scanned       status
-                                   ---------  ----------------  ----  -------  -----------
-        617c923e-6450-4065-8e33-865e28d9428f               498  1783      378  in progress
-
-    The rebalance status displays the following when the rebalance is
-    complete:
-
-        # gluster volume rebalance test-volume status
-                                        Node  Rebalanced-files  size  scanned       status
-                                   ---------  ----------------  ----  -------  -----------
-        617c923e-6450-4065-8e33-865e28d9428f               502  1873      334   completed
-
-Stopping Rebalance Operation
-----------------------------
-
-You can stop the rebalance operation, as needed.
-
-**To stop rebalance**
-
--   Stop the rebalance operation using the following command:
-
-    `# gluster volume rebalance  stop`
-
-    For example:
-
-        # gluster volume rebalance test-volume stop
-                                        Node  Rebalanced-files  size  scanned       status
-                                   ---------  ----------------  ----  -------  -----------
-        617c923e-6450-4065-8e33-865e28d9428f               59   590      244       stopped
-        Stopped rebalance process on volume test-volume 
-
-Stopping Volumes
-================
-
-To stop a volume
-
-1.  Stop the volume using the following command:
-
-    `# gluster volume stop `
-
-    For example, to stop test-volume:
-
-        # gluster volume stop test-volume
-        Stopping volume will make its data inaccessible. Do you want to continue? (y/n)
-
-2.  Enter `y` to confirm the operation. The output of the command
-    displays the following:
-
-        Stopping volume test-volume has been successful
-
-Deleting Volumes
-================
-
-To delete a volume
-
-1.  Delete the volume using the following command:
-
-    `# gluster volume delete `
-
-    For example, to delete test-volume:
-
-        # gluster volume delete test-volume
-        Deleting volume will erase all information about the volume. Do you want to continue? (y/n)
-
-2.  Enter `y` to confirm the operation. The command displays the
-    following:
-
-        Deleting volume test-volume has been successful
-
-Triggering Self-Heal on Replicate
-=================================
-
-In replicate module, previously you had to manually trigger a self-heal
-when a brick goes offline and comes back online, to bring all the
-replicas in sync. Now the pro-active self-heal daemon runs in the
-background, diagnoses issues and automatically initiates self-healing
-every 10 minutes on the files which requires*healing*.
-
-You can view the list of files that need *healing*, the list of files
-which are currently/previously *healed*, list of files which are in
-split-brain state, and you can manually trigger self-heal on the entire
-volume or only on the files which need *healing*.
-
--   Trigger self-heal only on the files which requires *healing*:
-
-    `# gluster volume heal `
-
-    For example, to trigger self-heal on files which requires *healing*
-    of test-volume:
-
-        # gluster volume heal test-volume
-        Heal operation on volume test-volume has been successful
-
--   Trigger self-heal on all the files of a volume:
-
-    `# gluster volume heal ` `full`
-
-    For example, to trigger self-heal on all the files of of
-    test-volume:
-
-        # gluster volume heal test-volume full
-        Heal operation on volume test-volume has been successful
-
--   View the list of files that needs *healing*:
-
-    `# gluster volume heal ` `info`
-
-    For example, to view the list of files on test-volume that needs
-    *healing*:
-
-        # gluster volume heal test-volume info
-        Brick :/gfs/test-volume_0
-        Number of entries: 0
-         
-        Brick :/gfs/test-volume_1
-        Number of entries: 101 
-        /95.txt
-        /32.txt
-        /66.txt
-        /35.txt
-        /18.txt
-        /26.txt
-        /47.txt
-        /55.txt
-        /85.txt
-        ...
-
--   View the list of files that are self-healed:
-
-    `# gluster volume heal ` `info healed`
-
-    For example, to view the list of files on test-volume that are
-    self-healed:
-
-        # gluster volume heal test-volume info healed
-        Brick :/gfs/test-volume_0 
-        Number of entries: 0
-
-        Brick :/gfs/test-volume_1 
-        Number of entries: 69
-        /99.txt
-        /93.txt
-        /76.txt
-        /11.txt
-        /27.txt
-        /64.txt
-        /80.txt
-        /19.txt
-        /41.txt
-        /29.txt
-        /37.txt
-        /46.txt
-        ...
-
--   View the list of files of a particular volume on which the self-heal
-    failed:
-
-    `# gluster volume heal ` `info failed`
-
-    For example, to view the list of files of test-volume that are not
-    self-healed:
-
-        # gluster volume heal test-volume info failed
-        Brick :/gfs/test-volume_0
-        Number of entries: 0 
-
-        Brick server2:/gfs/test-volume_3 
-        Number of entries: 72
-        /90.txt
-        /95.txt
-        /77.txt
-        /71.txt
-        /87.txt
-        /24.txt
-        ...
-
--   View the list of files of a particular volume which are in
-    split-brain state:
-
-    `# gluster volume heal ` `info split-brain`
-
-    For example, to view the list of files of test-volume which are in
-    split-brain state:
-
-        # gluster volume heal test-volume info split-brain
-        Brick server1:/gfs/test-volume_2 
-        Number of entries: 12
-        /83.txt
-        /28.txt
-        /69.txt
-        ...
-
-        Brick :/gfs/test-volume_2
-        Number of entries: 12
-        /83.txt
-        /28.txt
-        /69.txt
-        ...
-
-
diff --git a/doc/admin-guide/en-US/markdown/admin_monitoring_workload.md b/doc/admin-guide/en-US/markdown/admin_monitoring_workload.md
deleted file mode 100644
index 0312bd048..000000000
--- a/doc/admin-guide/en-US/markdown/admin_monitoring_workload.md
+++ /dev/null
@@ -1,931 +0,0 @@
-Monitoring your GlusterFS Workload
-==================================
-
-You can monitor the GlusterFS volumes on different parameters.
-Monitoring volumes helps in capacity planning and performance tuning
-tasks of the GlusterFS volume. Using these information, you can identify
-and troubleshoot issues.
-
-You can use Volume Top and Profile commands to view the performance and
-identify bottlenecks/hotspots of each brick of a volume. This helps
-system administrators to get vital performance information whenever
-performance needs to be probed.
-
-You can also perform statedump of the brick processes and nfs server
-process of a volume, and also view volume status and volume information.
-
-Running GlusterFS Volume Profile Command
-========================================
-
-GlusterFS Volume Profile command provides an interface to get the
-per-brick I/O information for each File Operation (FOP) of a volume. The
-per brick information helps in identifying bottlenecks in the storage
-system.
-
-This section describes how to run GlusterFS Volume Profile command by
-performing the following operations:
-
--   ?
-
--   ?
-
--   ?
-
-Start Profiling
----------------
-
-You must start the Profiling to view the File Operation information for
-each brick.
-
-**To start profiling:**
-
--   Start profiling using the following command:
-
-`# gluster volume profile  start `
-
-For example, to start profiling on test-volume:
-
-    # gluster volume profile test-volume start
-    Profiling started on test-volume
-
-When profiling on the volume is started, the following additional
-options are displayed in the Volume Info:
-
-    diagnostics.count-fop-hits: on
-
-    diagnostics.latency-measurement: on
-
-Displaying the I/0 Information
-------------------------------
-
-You can view the I/O information of each brick.
-
-To display I/O information:
-
--   Display the I/O information using the following command:
-
-`# gluster volume profile  info`
-
-For example, to see the I/O information on test-volume:
-
-    # gluster volume profile test-volume info
-    Brick: Test:/export/2
-    Cumulative Stats:
-
-    Block                     1b+           32b+           64b+
-    Size:
-           Read:                0              0              0
-           Write:             908             28              8
-
-    Block                   128b+           256b+         512b+
-    Size:
-           Read:                0               6             4
-           Write:               5              23            16
-
-    Block                  1024b+          2048b+        4096b+
-    Size:
-           Read:                 0              52           17
-           Write:               15             120          846
-
-    Block                   8192b+         16384b+      32768b+
-    Size:
-           Read:                52               8           34
-           Write:              234             134          286
-
-    Block                                  65536b+     131072b+
-    Size:
-           Read:                               118          622
-           Write:                             1341          594
-
-
-    %-latency  Avg-      Min-       Max-       calls     Fop
-              latency   Latency    Latency  
-    ___________________________________________________________
-    4.82      1132.28   21.00      800970.00   4575    WRITE
-    5.70       156.47    9.00      665085.00   39163   READDIRP
-    11.35      315.02    9.00     1433947.00   38698   LOOKUP
-    11.88     1729.34   21.00     2569638.00    7382   FXATTROP
-    47.35   104235.02 2485.00     7789367.00     488   FSYNC
-
-    ------------------
-
-    ------------------
-
-    Duration     : 335
-
-    BytesRead    : 94505058
-
-    BytesWritten : 195571980
-
-Stop Profiling
---------------
-
-You can stop profiling the volume, if you do not need profiling
-information anymore.
-
-**To stop profiling**
-
--   Stop profiling using the following command:
-
-    `# gluster volume profile  stop`
-
-    For example, to stop profiling on test-volume:
-
-    `# gluster volume profile  stop`
-
-    `Profiling stopped on test-volume`
-
-Running GlusterFS Volume TOP Command
-====================================
-
-GlusterFS Volume Top command allows you to view the glusterfs bricks’
-performance metrics like read, write, file open calls, file read calls,
-file write calls, directory open calls, and directory real calls. The
-top command displays up to 100 results.
-
-This section describes how to run and view the results for the following
-GlusterFS Top commands:
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
--   ?
-
-Viewing Open fd Count and Maximum fd Count
-------------------------------------------
-
-You can view both current open fd count (list of files that are
-currently the most opened and the count) on the brick and the maximum
-open fd count (count of files that are the currently open and the count
-of maximum number of files opened at any given point of time, since the
-servers are up and running). If the brick name is not specified, then
-open fd metrics of all the bricks belonging to the volume will be
-displayed.
-
-**To view open fd count and maximum fd count:**
-
--   View open fd count and maximum fd count using the following command:
-
-    `# gluster volume top  open [brick ] [list-cnt ]`
-
-    For example, to view open fd count and maximum fd count on brick
-    server:/export of test-volume and list top 10 open calls:
-
-    `# gluster volume top  open brick  list-cnt `
-
-    `Brick: server:/export/dir1 `
-
-    `Current open fd's: 34 Max open fd's: 209 `
-
-                     ==========Open file stats========
-
-        open            file name
-        call count     
-
-        2               /clients/client0/~dmtmp/PARADOX/
-                        COURSES.DB
-
-        11              /clients/client0/~dmtmp/PARADOX/
-                        ENROLL.DB
-
-        11              /clients/client0/~dmtmp/PARADOX/
-                        STUDENTS.DB
-
-        10              /clients/client0/~dmtmp/PWRPNT/
-                        TIPS.PPT
-
-        10              /clients/client0/~dmtmp/PWRPNT/
-                        PCBENCHM.PPT
-
-        9               /clients/client7/~dmtmp/PARADOX/
-                        STUDENTS.DB
-
-        9               /clients/client1/~dmtmp/PARADOX/
-                        STUDENTS.DB
-
-        9               /clients/client2/~dmtmp/PARADOX/
-                        STUDENTS.DB
-
-        9               /clients/client0/~dmtmp/PARADOX/
-                        STUDENTS.DB
-
-        9               /clients/client8/~dmtmp/PARADOX/
-                        STUDENTS.DB
-
-Viewing Highest File Read Calls
--------------------------------
-
-You can view highest read calls on each brick. If brick name is not
-specified, then by default, list of 100 files will be displayed.
-
-**To view highest file Read calls:**
-
--   View highest file Read calls using the following command:
-
-    `# gluster volume top  read [brick ] [list-cnt ] `
-
-    For example, to view highest Read calls on brick server:/export of
-    test-volume:
-
-    `# gluster volume top  read brick  list-cnt `
-
-    `Brick:` server:/export/dir1
-
-                  ==========Read file stats========
-
-        read              filename
-        call count
-
-        116              /clients/client0/~dmtmp/SEED/LARGE.FIL
-
-        64               /clients/client0/~dmtmp/SEED/MEDIUM.FIL
-
-        54               /clients/client2/~dmtmp/SEED/LARGE.FIL
-
-        54               /clients/client6/~dmtmp/SEED/LARGE.FIL
-
-        54               /clients/client5/~dmtmp/SEED/LARGE.FIL
-
-        54               /clients/client0/~dmtmp/SEED/LARGE.FIL
-
-        54               /clients/client3/~dmtmp/SEED/LARGE.FIL
-
-        54               /clients/client4/~dmtmp/SEED/LARGE.FIL
-
-        54               /clients/client9/~dmtmp/SEED/LARGE.FIL
-
-        54               /clients/client8/~dmtmp/SEED/LARGE.FIL
-
-Viewing Highest File Write Calls
---------------------------------
-
-You can view list of files which has highest file write calls on each
-brick. If brick name is not specified, then by default, list of 100
-files will be displayed.
-
-**To view highest file Write calls:**
-
--   View highest file Write calls using the following command:
-
-    `# gluster volume top  write [brick ] [list-cnt ] `
-
-    For example, to view highest Write calls on brick server:/export of
-    test-volume:
-
-    `# gluster volume top  write brick  list-cnt `
-
-    `Brick: server:/export/dir1 `
-
-                       ==========Write file stats========
-        write call count   filename
-
-        83                /clients/client0/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client7/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client1/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client2/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client0/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client8/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client5/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client4/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client6/~dmtmp/SEED/LARGE.FIL
-
-        59                /clients/client3/~dmtmp/SEED/LARGE.FIL
-
-Viewing Highest Open Calls on Directories
------------------------------------------
-
-You can view list of files which has highest open calls on directories
-of each brick. If brick name is not specified, then the metrics of all
-the bricks belonging to that volume will be displayed.
-
-To view list of open calls on each directory
-
--   View list of open calls on each directory using the following
-    command:
-
-    `# gluster volume top  opendir [brick ] [list-cnt ] `
-
-    For example, to view open calls on brick server:/export/ of
-    test-volume:
-
-    `# gluster volume top  opendir brick  list-cnt `
-
-    `Brick: server:/export/dir1 `
-
-                 ==========Directory open stats========
-
-        Opendir count     directory name
-
-        1001              /clients/client0/~dmtmp
-
-        454               /clients/client8/~dmtmp
-
-        454               /clients/client2/~dmtmp
-         
-        454               /clients/client6/~dmtmp
-
-        454               /clients/client5/~dmtmp
-
-        454               /clients/client9/~dmtmp
-
-        443               /clients/client0/~dmtmp/PARADOX
-
-        408               /clients/client1/~dmtmp
-
-        408               /clients/client7/~dmtmp
-
-        402               /clients/client4/~dmtmp
-
-Viewing Highest Read Calls on Directory
----------------------------------------
-
-You can view list of files which has highest directory read calls on
-each brick. If brick name is not specified, then the metrics of all the
-bricks belonging to that volume will be displayed.
-
-**To view list of highest directory read calls on each brick**
-
--   View list of highest directory read calls on each brick using the
-    following command:
-
-    `# gluster volume top  readdir [brick ] [list-cnt ] `
-
-    For example, to view highest directory read calls on brick
-    server:/export of test-volume:
-
-    `# gluster volume top  readdir brick  list-cnt `
-
-    `Brick: `
-
-        ==========Directory readdirp stats========
-
-        readdirp count           directory name
-
-        1996                    /clients/client0/~dmtmp
-
-        1083                    /clients/client0/~dmtmp/PARADOX
-
-        904                     /clients/client8/~dmtmp
-
-        904                     /clients/client2/~dmtmp
-
-        904                     /clients/client6/~dmtmp
-
-        904                     /clients/client5/~dmtmp
-
-        904                     /clients/client9/~dmtmp
-
-        812                     /clients/client1/~dmtmp
-
-        812                     /clients/client7/~dmtmp
-
-        800                     /clients/client4/~dmtmp
-
-Viewing List of Read Performance on each Brick
-----------------------------------------------
-
-You can view the read throughput of files on each brick. If brick name
-is not specified, then the metrics of all the bricks belonging to that
-volume will be displayed. The output will be the read throughput.
-
-           ==========Read throughput file stats========
-
-    read         filename                         Time
-    through
-    put(MBp
-    s)
-     
-    2570.00    /clients/client0/~dmtmp/PWRPNT/      -2011-01-31
-               TRIDOTS.POT                      15:38:36.894610  
-    2570.00    /clients/client0/~dmtmp/PWRPNT/      -2011-01-31
-               PCBENCHM.PPT                     15:38:39.815310                                                             
-    2383.00    /clients/client2/~dmtmp/SEED/        -2011-01-31
-               MEDIUM.FIL                       15:52:53.631499
-                                                  
-    2340.00    /clients/client0/~dmtmp/SEED/        -2011-01-31
-               MEDIUM.FIL                       15:38:36.926198
-                                                  
-    2299.00   /clients/client0/~dmtmp/SEED/         -2011-01-31
-              LARGE.FIL                         15:38:36.930445
-                                                 
-    2259.00   /clients/client0/~dmtmp/PARADOX/      -2011-01-31
-              COURSES.X04                       15:38:40.549919
-
-    2221.00   /clients/client0/~dmtmp/PARADOX/      -2011-01-31
-              STUDENTS.VAL                      15:52:53.298766
-                                                  
-    2221.00   /clients/client3/~dmtmp/SEED/         -2011-01-31
-              COURSES.DB                        15:39:11.776780
-
-    2184.00   /clients/client3/~dmtmp/SEED/         -2011-01-31
-              MEDIUM.FIL                        15:39:10.251764
-                                                  
-    2184.00   /clients/client5/~dmtmp/WORD/         -2011-01-31
-              BASEMACH.DOC                      15:39:09.336572                                          
-
-This command will initiate a dd for the specified count and block size
-and measures the corresponding throughput.
-
-**To view list of read performance on each brick**
-
--   View list of read performance on each brick using the following
-    command:
-
-    `# gluster volume top  read-perf [bs  count ] [brick ] [list-cnt ]`
-
-    For example, to view read performance on brick server:/export/ of
-    test-volume, 256 block size of count 1, and list count 10:
-
-    `# gluster volume top  read-perf bs 256 count 1 brick list-cnt `
-
-    `Brick: server:/export/dir1 256 bytes (256 B) copied, Throughput: 4.1 MB/s `
-
-               ==========Read throughput file stats========
-
-        read         filename                         Time
-        through
-        put(MBp
-        s)
-
-        2912.00   /clients/client0/~dmtmp/PWRPNT/    -2011-01-31
-                   TRIDOTS.POT                   15:38:36.896486
-                                                   
-        2570.00   /clients/client0/~dmtmp/PWRPNT/    -2011-01-31
-                   PCBENCHM.PPT                  15:38:39.815310
-                                                   
-        2383.00   /clients/client2/~dmtmp/SEED/      -2011-01-31
-                   MEDIUM.FIL                    15:52:53.631499
-                                                   
-        2340.00   /clients/client0/~dmtmp/SEED/      -2011-01-31
-                   MEDIUM.FIL                    15:38:36.926198
-
-        2299.00   /clients/client0/~dmtmp/SEED/      -2011-01-31
-                   LARGE.FIL                     15:38:36.930445
-                                                              
-        2259.00  /clients/client0/~dmtmp/PARADOX/    -2011-01-31
-                  COURSES.X04                    15:38:40.549919
-                                                   
-        2221.00  /clients/client9/~dmtmp/PARADOX/    -2011-01-31
-                  STUDENTS.VAL                   15:52:53.298766
-                                                   
-        2221.00  /clients/client8/~dmtmp/PARADOX/    -2011-01-31
-                 COURSES.DB                      15:39:11.776780
-                                                   
-        2184.00  /clients/client3/~dmtmp/SEED/       -2011-01-31
-                  MEDIUM.FIL                     15:39:10.251764
-                                                   
-        2184.00  /clients/client5/~dmtmp/WORD/       -2011-01-31
-                 BASEMACH.DOC                    15:39:09.336572
-                                                   
-
-Viewing List of Write Performance on each Brick
------------------------------------------------
-
-You can view list of write throughput of files on each brick. If brick
-name is not specified, then the metrics of all the bricks belonging to
-that volume will be displayed. The output will be the write throughput.
-
-This command will initiate a dd for the specified count and block size
-and measures the corresponding throughput. To view list of write
-performance on each brick:
-
--   View list of write performance on each brick using the following
-    command:
-
-    `# gluster volume top  write-perf [bs  count ] [brick ] [list-cnt ] `
-
-    For example, to view write performance on brick server:/export/ of
-    test-volume, 256 block size of count 1, and list count 10:
-
-    `# gluster volume top  write-perf bs 256 count 1 brick list-cnt `
-
-    `Brick`: server:/export/dir1
-
-    `256 bytes (256 B) copied, Throughput: 2.8 MB/s `
-
-               ==========Write throughput file stats========
-
-        write                filename                 Time
-        throughput
-        (MBps)
-         
-        1170.00    /clients/client0/~dmtmp/SEED/     -2011-01-31
-                   SMALL.FIL                     15:39:09.171494
-
-        1008.00    /clients/client6/~dmtmp/SEED/     -2011-01-31
-                   LARGE.FIL                      15:39:09.73189
-
-        949.00    /clients/client0/~dmtmp/SEED/      -2011-01-31
-                  MEDIUM.FIL                     15:38:36.927426
-
-        936.00   /clients/client0/~dmtmp/SEED/       -2011-01-31
-                 LARGE.FIL                        15:38:36.933177    
-        897.00   /clients/client5/~dmtmp/SEED/       -2011-01-31
-                 MEDIUM.FIL                       15:39:09.33628
-
-        897.00   /clients/client6/~dmtmp/SEED/       -2011-01-31
-                 MEDIUM.FIL                       15:39:09.27713
-
-        885.00   /clients/client0/~dmtmp/SEED/       -2011-01-31
-                  SMALL.FIL                      15:38:36.924271
-
-        528.00   /clients/client5/~dmtmp/SEED/       -2011-01-31
-                 LARGE.FIL                        15:39:09.81893
-
-        516.00   /clients/client6/~dmtmp/ACCESS/    -2011-01-31
-                 FASTENER.MDB                    15:39:01.797317
-
-Displaying Volume Information
-=============================
-
-You can display information about a specific volume, or all volumes, as
-needed.
-
-**To display volume information**
-
--   Display information about a specific volume using the following
-    command:
-
-    `# gluster volume info ``VOLNAME`
-
-    For example, to display information about test-volume:
-
-        # gluster volume info test-volume
-        Volume Name: test-volume
-        Type: Distribute
-        Status: Created
-        Number of Bricks: 4
-        Bricks:
-        Brick1: server1:/exp1
-        Brick2: server2:/exp2
-        Brick3: server3:/exp3
-        Brick4: server4:/exp4
-
--   Display information about all volumes using the following command:
-
-    `# gluster volume info all`
-
-        # gluster volume info all
-
-        Volume Name: test-volume
-        Type: Distribute
-        Status: Created
-        Number of Bricks: 4
-        Bricks:
-        Brick1: server1:/exp1
-        Brick2: server2:/exp2
-        Brick3: server3:/exp3
-        Brick4: server4:/exp4
-
-        Volume Name: mirror
-        Type: Distributed-Replicate
-        Status: Started
-        Number of Bricks: 2 X 2 = 4
-        Bricks:
-        Brick1: server1:/brick1
-        Brick2: server2:/brick2
-        Brick3: server3:/brick3
-        Brick4: server4:/brick4
-
-        Volume Name: Vol
-        Type: Distribute
-        Status: Started
-        Number of Bricks: 1
-        Bricks:
-        Brick: server:/brick6
-
-Performing Statedump on a Volume
-================================
-
-Statedump is a mechanism through which you can get details of all
-internal variables and state of the glusterfs process at the time of
-issuing the command.You can perform statedumps of the brick processes
-and nfs server process of a volume using the statedump command. The
-following options can be used to determine what information is to be
-dumped:
-
--   **mem** - Dumps the memory usage and memory pool details of the
-    bricks.
-
--   **iobuf** - Dumps iobuf details of the bricks.
-
--   **priv** - Dumps private information of loaded translators.
-
--   **callpool** - Dumps the pending calls of the volume.
-
--   **fd** - Dumps the open fd tables of the volume.
-
--   **inode** - Dumps the inode tables of the volume.
-
-**To display volume statedump**
-
--   Display statedump of a volume or NFS server using the following
-    command:
-
-    `# gluster volume statedump  [nfs] [all|mem|iobuf|callpool|priv|fd|inode]`
-
-    For example, to display statedump of test-volume:
-
-        # gluster volume statedump test-volume
-        Volume statedump successful
-
-    The statedump files are created on the brick servers in the` /tmp`
-    directory or in the directory set using `server.statedump-path`
-    volume option. The naming convention of the dump file is
-    `<brick-path>.<brick-pid>.dump`.
-
--   By defult, the output of the statedump is stored at
-    ` /tmp/<brickname.PID.dump>` file on that particular server. Change
-    the directory of the statedump file using the following command:
-
-    `# gluster volume set  server.statedump-path `
-
-    For example, to change the location of the statedump file of
-    test-volume:
-
-        # gluster volume set test-volume server.statedump-path /usr/local/var/log/glusterfs/dumps/
-        Set volume successful
-
-    You can view the changed path of the statedump file using the
-    following command:
-
-    `# gluster volume info `
-
-Displaying Volume Status
-========================
-
-You can display the status information about a specific volume, brick or
-all volumes, as needed. Status information can be used to understand the
-current status of the brick, nfs processes, and overall file system.
-Status information can also be used to monitor and debug the volume
-information. You can view status of the volume along with the following
-details:
-
--   **detail** - Displays additional information about the bricks.
-
--   **clients** - Displays the list of clients connected to the volume.
-
--   **mem** - Displays the memory usage and memory pool details of the
-    bricks.
-
--   **inode** - Displays the inode tables of the volume.
-
--   **fd** - Displays the open fd (file descriptors) tables of the
-    volume.
-
--   **callpool** - Displays the pending calls of the volume.
-
-**To display volume status**
-
--   Display information about a specific volume using the following
-    command:
-
-    `# gluster volume status [all| []] [detail|clients|mem|inode|fd|callpool]`
-
-    For example, to display information about test-volume:
-
-        # gluster volume status test-volume
-        STATUS OF VOLUME: test-volume
-        BRICK                           PORT   ONLINE   PID
-        --------------------------------------------------------
-        arch:/export/1                  24009   Y       22445
-        --------------------------------------------------------
-        arch:/export/2                  24010   Y       22450
-
--   Display information about all volumes using the following command:
-
-    `# gluster volume status all`
-
-        # gluster volume status all
-        STATUS OF VOLUME: volume-test
-        BRICK                           PORT   ONLINE   PID
-        --------------------------------------------------------
-        arch:/export/4                  24010   Y       22455
-
-        STATUS OF VOLUME: test-volume
-        BRICK                           PORT   ONLINE   PID
-        --------------------------------------------------------
-        arch:/export/1                  24009   Y       22445
-        --------------------------------------------------------
-        arch:/export/2                  24010   Y       22450
-
--   Display additional information about the bricks using the following
-    command:
-
-    `# gluster volume status  detail`
-
-    For example, to display additional information about the bricks of
-    test-volume:
-
-        # gluster volume status test-volume details
-        STATUS OF VOLUME: test-volume
-        -------------------------------------------
-        Brick                : arch:/export/1      
-        Port                 : 24009              
-        Online               : Y                  
-        Pid                  : 16977              
-        File System          : rootfs              
-        Device               : rootfs              
-        Mount Options        : rw                  
-        Disk Space Free      : 13.8GB              
-        Total Disk Space     : 46.5GB              
-        Inode Size           : N/A                
-        Inode Count          : N/A                
-        Free Inodes          : N/A
-
-        Number of Bricks: 1
-        Bricks:
-        Brick: server:/brick6
-
--   Display the list of clients accessing the volumes using the
-    following command:
-
-    `# gluster volume status  clients`
-
-    For example, to display the list of clients connected to
-    test-volume:
-
-        # gluster volume status test-volume clients
-        Brick : arch:/export/1
-        Clients connected : 2
-        Hostname          Bytes Read   BytesWritten
-        --------          ---------    ------------
-        127.0.0.1:1013    776          676
-        127.0.0.1:1012    50440        51200
-
--   Display the memory usage and memory pool details of the bricks using
-    the following command:
-
-    `# gluster volume status  mem`
-
-    For example, to display the memory usage and memory pool details of
-    the bricks of test-volume:
-
-        Memory status for volume : test-volume
-        ----------------------------------------------
-        Brick : arch:/export/1
-        Mallinfo
-        --------
-        Arena    : 434176
-        Ordblks  : 2
-        Smblks   : 0
-        Hblks    : 12
-        Hblkhd   : 40861696
-        Usmblks  : 0
-        Fsmblks  : 0
-        Uordblks : 332416
-        Fordblks : 101760
-        Keepcost : 100400
-
-        Mempool Stats
-        -------------
-        Name                               HotCount ColdCount PaddedSizeof AllocCount MaxAlloc
-        ----                               -------- --------- ------------ ---------- --------
-        test-volume-server:fd_t                0     16384           92         57        5
-        test-volume-server:dentry_t           59       965           84         59       59
-        test-volume-server:inode_t            60       964          148         60       60
-        test-volume-server:rpcsvc_request_t    0       525         6372        351        2
-        glusterfs:struct saved_frame           0      4096          124          2        2
-        glusterfs:struct rpc_req               0      4096         2236          2        2
-        glusterfs:rpcsvc_request_t             1       524         6372          2        1
-        glusterfs:call_stub_t                  0      1024         1220        288        1
-        glusterfs:call_stack_t                 0      8192         2084        290        2
-        glusterfs:call_frame_t                 0     16384          172       1728        6
-
--   Display the inode tables of the volume using the following command:
-
-    `# gluster volume status  inode`
-
-    For example, to display the inode tables of the test-volume:
-
-        # gluster volume status test-volume inode
-        inode tables for volume test-volume
-        ----------------------------------------------
-        Brick : arch:/export/1
-        Active inodes:
-        GFID                                            Lookups            Ref   IA type
-        ----                                            -------            ---   -------
-        6f3fe173-e07a-4209-abb6-484091d75499                  1              9         2
-        370d35d7-657e-44dc-bac4-d6dd800ec3d3                  1              1         2
-
-        LRU inodes: 
-        GFID                                            Lookups            Ref   IA type
-        ----                                            -------            ---   -------
-        80f98abe-cdcf-4c1d-b917-ae564cf55763                  1              0         1
-        3a58973d-d549-4ea6-9977-9aa218f233de                  1              0         1
-        2ce0197d-87a9-451b-9094-9baa38121155                  1              0         2
-
--   Display the open fd tables of the volume using the following
-    command:
-
-    `# gluster volume status  fd`
-
-    For example, to display the open fd tables of the test-volume:
-
-        # gluster volume status test-volume fd
-
-        FD tables for volume test-volume
-        ----------------------------------------------
-        Brick : arch:/export/1
-        Connection 1:
-        RefCount = 0  MaxFDs = 128  FirstFree = 4
-        FD Entry            PID                 RefCount            Flags              
-        --------            ---                 --------            -----              
-        0                   26311               1                   2                  
-        1                   26310               3                   2                  
-        2                   26310               1                   2                  
-        3                   26311               3                   2                  
-         
-        Connection 2:
-        RefCount = 0  MaxFDs = 128  FirstFree = 0
-        No open fds
-         
-        Connection 3:
-        RefCount = 0  MaxFDs = 128  FirstFree = 0
-        No open fds
-
--   Display the pending calls of the volume using the following command:
-
-    `# gluster volume status  callpool`
-
-    Each call has a call stack containing call frames.
-
-    For example, to display the pending calls of test-volume:
-
-        # gluster volume status test-volume
-
-        Pending calls for volume test-volume
-        ----------------------------------------------
-        Brick : arch:/export/1
-        Pending calls: 2
-        Call Stack1
-         UID    : 0
-         GID    : 0
-         PID    : 26338
-         Unique : 192138
-         Frames : 7
-         Frame 1
-          Ref Count   = 1
-          Translator  = test-volume-server
-          Completed   = No
-         Frame 2
-          Ref Count   = 0
-          Translator  = test-volume-posix
-          Completed   = No
-          Parent      = test-volume-access-control
-          Wind From   = default_fsync
-          Wind To     = FIRST_CHILD(this)->fops->fsync
-         Frame 3
-          Ref Count   = 1
-          Translator  = test-volume-access-control
-          Completed   = No
-          Parent      = repl-locks
-          Wind From   = default_fsync
-          Wind To     = FIRST_CHILD(this)->fops->fsync
-         Frame 4
-          Ref Count   = 1
-          Translator  = test-volume-locks
-          Completed   = No
-          Parent      = test-volume-io-threads
-          Wind From   = iot_fsync_wrapper
-          Wind To     = FIRST_CHILD (this)->fops->fsync
-         Frame 5
-          Ref Count   = 1
-          Translator  = test-volume-io-threads
-          Completed   = No
-          Parent      = test-volume-marker
-          Wind From   = default_fsync
-          Wind To     = FIRST_CHILD(this)->fops->fsync
-         Frame 6
-          Ref Count   = 1
-          Translator  = test-volume-marker
-          Completed   = No
-          Parent      = /export/1
-          Wind From   = io_stats_fsync
-          Wind To     = FIRST_CHILD(this)->fops->fsync
-         Frame 7
-          Ref Count   = 1
-          Translator  = /export/1
-          Completed   = No
-          Parent      = test-volume-server
-          Wind From   = server_fsync_resume
-          Wind To     = bound_xl->fops->fsync
-
-
diff --git a/doc/admin-guide/en-US/markdown/admin_setting_volumes.md b/doc/admin-guide/en-US/markdown/admin_setting_volumes.md
deleted file mode 100644
index 4038523c8..000000000
--- a/doc/admin-guide/en-US/markdown/admin_setting_volumes.md
+++ /dev/null
@@ -1,419 +0,0 @@
-Setting up GlusterFS Server Volumes
-===================================
-
-A volume is a logical collection of bricks where each brick is an export
-directory on a server in the trusted storage pool. Most of the gluster
-management operations are performed on the volume.
-
-To create a new volume in your storage environment, specify the bricks
-that comprise the volume. After you have created a new volume, you must
-start it before attempting to mount it.
-
--   Volumes of the following types can be created in your storage
-    environment:
-
-    -   Distributed - Distributed volumes distributes files throughout
-        the bricks in the volume. You can use distributed volumes where
-        the requirement is to scale storage and the redundancy is either
-        not important or is provided by other hardware/software layers.
-        For more information, see ? .
-
-    -   Replicated – Replicated volumes replicates files across bricks
-        in the volume. You can use replicated volumes in environments
-        where high-availability and high-reliability are critical. For
-        more information, see ?.
-
-    -   Striped – Striped volumes stripes data across bricks in the
-        volume. For best results, you should use striped volumes only in
-        high concurrency environments accessing very large files. For
-        more information, see ?.
-
-    -   Distributed Striped - Distributed striped volumes stripe data
-        across two or more nodes in the cluster. You should use
-        distributed striped volumes where the requirement is to scale
-        storage and in high concurrency environments accessing very
-        large files is critical. For more information, see ?.
-
-    -   Distributed Replicated - Distributed replicated volumes
-        distributes files across replicated bricks in the volume. You
-        can use distributed replicated volumes in environments where the
-        requirement is to scale storage and high-reliability is
-        critical. Distributed replicated volumes also offer improved
-        read performance in most environments. For more information, see
-        ?.
-
-    -   Distributed Striped Replicated – Distributed striped replicated
-        volumes distributes striped data across replicated bricks in the
-        cluster. For best results, you should use distributed striped
-        replicated volumes in highly concurrent environments where
-        parallel access of very large files and performance is critical.
-        In this release, configuration of this volume type is supported
-        only for Map Reduce workloads. For more information, see ?.
-
-    -   Striped Replicated – Striped replicated volumes stripes data
-        across replicated bricks in the cluster. For best results, you
-        should use striped replicated volumes in highly concurrent
-        environments where there is parallel access of very large files
-        and performance is critical. In this release, configuration of
-        this volume type is supported only for Map Reduce workloads. For
-        more information, see ?.
-
-**To create a new volume**
-
--   Create a new volume :
-
-    `# gluster volume create [stripe  | replica ] [transport tcp | rdma | tcp, rdma] `
-
-    For example, to create a volume called test-volume consisting of
-    server3:/exp3 and server4:/exp4:
-
-        # gluster volume create test-volume server3:/exp3 server4:/exp4
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-Creating Distributed Volumes
-============================
-
-In a distributed volumes files are spread randomly across the bricks in
-the volume. Use distributed volumes where you need to scale storage and
-redundancy is either not important or is provided by other
-hardware/software layers.
-
-> **Note**
->
-> Disk/server failure in distributed volumes can result in a serious
-> loss of data because directory contents are spread randomly across the
-> bricks in the volume.
-
-![][]
-
-**To create a distributed volume**
-
-1.  Create a trusted storage pool as described earlier in ?.
-
-2.  Create the distributed volume:
-
-    `# gluster volume create  [transport tcp | rdma | tcp,rdma] `
-
-    For example, to create a distributed volume with four storage
-    servers using tcp:
-
-        # gluster volume create test-volume server1:/exp1 server2:/exp2 server3:/exp3 server4:/exp4
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    (Optional) You can display the volume information:
-
-        # gluster volume info
-        Volume Name: test-volume
-        Type: Distribute
-        Status: Created
-        Number of Bricks: 4
-        Transport-type: tcp
-        Bricks:
-        Brick1: server1:/exp1
-        Brick2: server2:/exp2
-        Brick3: server3:/exp3
-        Brick4: server4:/exp4
-
-    For example, to create a distributed volume with four storage
-    servers over InfiniBand:
-
-        # gluster volume create test-volume transport rdma server1:/exp1 server2:/exp2 server3:/exp3 server4:/exp4
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    If the transport type is not specified, *tcp* is used as the
-    default. You can also set additional options if required, such as
-    auth.allow or auth.reject. For more information, see ?
-
-    > **Note**
-    >
-    > Make sure you start your volumes before you try to mount them or
-    > else client operations after the mount will hang, see ? for
-    > details.
-
-Creating Replicated Volumes
-===========================
-
-Replicated volumes create copies of files across multiple bricks in the
-volume. You can use replicated volumes in environments where
-high-availability and high-reliability are critical.
-
-> **Note**
->
-> The number of bricks should be equal to of the replica count for a
-> replicated volume. To protect against server and disk failures, it is
-> recommended that the bricks of the volume are from different servers.
-
-![][1]
-
-**To create a replicated volume**
-
-1.  Create a trusted storage pool as described earlier in ?.
-
-2.  Create the replicated volume:
-
-    `# gluster volume create  [replica ] [transport tcp | rdma tcp,rdma] `
-
-    For example, to create a replicated volume with two storage servers:
-
-        # gluster volume create test-volume replica 2 transport tcp server1:/exp1 server2:/exp2
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    If the transport type is not specified, *tcp* is used as the
-    default. You can also set additional options if required, such as
-    auth.allow or auth.reject. For more information, see ?
-
-    > **Note**
-    >
-    > Make sure you start your volumes before you try to mount them or
-    > else client operations after the mount will hang, see ? for
-    > details.
-
-Creating Striped Volumes
-========================
-
-Striped volumes stripes data across bricks in the volume. For best
-results, you should use striped volumes only in high concurrency
-environments accessing very large files.
-
-> **Note**
->
-> The number of bricks should be a equal to the stripe count for a
-> striped volume.
-
-![][2]
-
-**To create a striped volume**
-
-1.  Create a trusted storage pool as described earlier in ?.
-
-2.  Create the striped volume:
-
-    `# gluster volume create  [stripe ] [transport tcp | rdma | tcp,rdma] `
-
-    For example, to create a striped volume across two storage servers:
-
-        # gluster volume create test-volume stripe 2 transport tcp server1:/exp1 server2:/exp2
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    If the transport type is not specified, *tcp* is used as the
-    default. You can also set additional options if required, such as
-    auth.allow or auth.reject. For more information, see ?
-
-    > **Note**
-    >
-    > Make sure you start your volumes before you try to mount them or
-    > else client operations after the mount will hang, see ? for
-    > details.
-
-Creating Distributed Striped Volumes
-====================================
-
-Distributed striped volumes stripes files across two or more nodes in
-the cluster. For best results, you should use distributed striped
-volumes where the requirement is to scale storage and in high
-concurrency environments accessing very large files is critical.
-
-> **Note**
->
-> The number of bricks should be a multiple of the stripe count for a
-> distributed striped volume.
-
-![][3]
-
-**To create a distributed striped volume**
-
-1.  Create a trusted storage pool as described earlier in ?.
-
-2.  Create the distributed striped volume:
-
-    `# gluster volume create  [stripe ] [transport tcp | rdma | tcp,rdma] `
-
-    For example, to create a distributed striped volume across eight
-    storage servers:
-
-        # gluster volume create test-volume stripe 4 transport tcp server1:/exp1 server2:/exp2 server3:/exp3 server4:/exp4 server5:/exp5 server6:/exp6 server7:/exp7 server8:/exp8
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    If the transport type is not specified, *tcp* is used as the
-    default. You can also set additional options if required, such as
-    auth.allow or auth.reject. For more information, see ?
-
-    > **Note**
-    >
-    > Make sure you start your volumes before you try to mount them or
-    > else client operations after the mount will hang, see ? for
-    > details.
-
-Creating Distributed Replicated Volumes
-=======================================
-
-Distributes files across replicated bricks in the volume. You can use
-distributed replicated volumes in environments where the requirement is
-to scale storage and high-reliability is critical. Distributed
-replicated volumes also offer improved read performance in most
-environments.
-
-> **Note**
->
-> The number of bricks should be a multiple of the replica count for a
-> distributed replicated volume. Also, the order in which bricks are
-> specified has a great effect on data protection. Each replica\_count
-> consecutive bricks in the list you give will form a replica set, with
-> all replica sets combined into a volume-wide distribute set. To make
-> sure that replica-set members are not placed on the same node, list
-> the first brick on every server, then the second brick on every server
-> in the same order, and so on.
-
-![][4]
-
-**To create a distributed replicated volume**
-
-1.  Create a trusted storage pool as described earlier in ?.
-
-2.  Create the distributed replicated volume:
-
-    `# gluster volume create  [replica ] [transport tcp | rdma | tcp,rdma] `
-
-    For example, four node distributed (replicated) volume with a
-    two-way mirror:
-
-        # gluster volume create test-volume replica 2 transport tcp server1:/exp1 server2:/exp2 server3:/exp3 server4:/exp4
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    For example, to create a six node distributed (replicated) volume
-    with a two-way mirror:
-
-        # gluster volume create test-volume replica 2 transport tcp server1:/exp1 server2:/exp2 server3:/exp3 server4:/exp4 server5:/exp5 server6:/exp6
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    If the transport type is not specified, *tcp* is used as the
-    default. You can also set additional options if required, such as
-    auth.allow or auth.reject. For more information, see ?
-
-    > **Note**
-    >
-    > Make sure you start your volumes before you try to mount them or
-    > else client operations after the mount will hang, see ? for
-    > details.
-
-Creating Distributed Striped Replicated Volumes
-===============================================
-
-Distributed striped replicated volumes distributes striped data across
-replicated bricks in the cluster. For best results, you should use
-distributed striped replicated volumes in highly concurrent environments
-where parallel access of very large files and performance is critical.
-In this release, configuration of this volume type is supported only for
-Map Reduce workloads.
-
-> **Note**
->
-> The number of bricks should be a multiples of number of stripe count
-> and replica count for a distributed striped replicated volume.
-
-**To create a distributed striped replicated volume**
-
-1.  Create a trusted storage pool as described earlier in ?.
-
-2.  Create a distributed striped replicated volume using the following
-    command:
-
-    `# gluster volume create  [stripe ] [replica ] [transport tcp | rdma | tcp,rdma] `
-
-    For example, to create a distributed replicated striped volume
-    across eight storage servers:
-
-        # gluster volume create test-volume stripe 2 replica 2 transport tcp server1:/exp1 server2:/exp2 server3:/exp3 server4:/exp4 server5:/exp5 server6:/exp6 server7:/exp7 server8:/exp8
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    If the transport type is not specified, *tcp* is used as the
-    default. You can also set additional options if required, such as
-    auth.allow or auth.reject. For more information, see ?
-
-    > **Note**
-    >
-    > Make sure you start your volumes before you try to mount them or
-    > else client operations after the mount will hang, see ? for
-    > details.
-
-Creating Striped Replicated Volumes
-===================================
-
-Striped replicated volumes stripes data across replicated bricks in the
-cluster. For best results, you should use striped replicated volumes in
-highly concurrent environments where there is parallel access of very
-large files and performance is critical. In this release, configuration
-of this volume type is supported only for Map Reduce workloads.
-
-> **Note**
->
-> The number of bricks should be a multiple of the replicate count and
-> stripe count for a striped replicated volume.
-
-![][5]
-
-**To create a striped replicated volume**
-
-1.  Create a trusted storage pool consisting of the storage servers that
-    will comprise the volume.
-
-    For more information, see ?.
-
-2.  Create a striped replicated volume :
-
-    `# gluster volume create  [stripe ] [replica ] [transport tcp | rdma | tcp,rdma] `
-
-    For example, to create a striped replicated volume across four
-    storage servers:
-
-        # gluster volume create test-volume stripe 2 replica 2 transport tcp server1:/exp1 server2:/exp2 server3:/exp3 server4:/exp4
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    To create a striped replicated volume across six storage servers:
-
-        # gluster volume create test-volume stripe 3 replica 2 transport tcp server1:/exp1 server2:/exp2 server3:/exp3 server4:/exp4 server5:/exp5 server6:/exp6
-        Creation of test-volume has been successful
-        Please start the volume to access data.
-
-    If the transport type is not specified, *tcp* is used as the
-    default. You can also set additional options if required, such as
-    auth.allow or auth.reject. For more information, see ?
-
-    > **Note**
-    >
-    > Make sure you start your volumes before you try to mount them or
-    > else client operations after the mount will hang, see ? for
-    > details.
-
-Starting Volumes
-================
-
-You must start your volumes before you try to mount them.
-
-**To start a volume**
-
--   Start a volume:
-
-    `# gluster volume start `
-
-    For example, to start test-volume:
-
-        # gluster volume start test-volume
-        Starting test-volume has been successful
-
-  []: images/Distributed_Volume.png
-  [1]: images/Replicated_Volume.png
-  [2]: images/Striped_Volume.png
-  [3]: images/Distributed_Striped_Volume.png
-  [4]: images/Distributed_Replicated_Volume.png
-  [5]: images/Striped_Replicated_Volume.png
diff --git a/doc/admin-guide/en-US/markdown/admin_settingup_clients.md b/doc/admin-guide/en-US/markdown/admin_settingup_clients.md
deleted file mode 100644
index 85b28c952..000000000
--- a/doc/admin-guide/en-US/markdown/admin_settingup_clients.md
+++ /dev/null
@@ -1,641 +0,0 @@
-Accessing Data - Setting Up GlusterFS Client
-============================================
-
-You can access gluster volumes in multiple ways. You can use Gluster
-Native Client method for high concurrency, performance and transparent
-failover in GNU/Linux clients. You can also use NFS v3 to access gluster
-volumes. Extensive testing has be done on GNU/Linux clients and NFS
-implementation in other operating system, such as FreeBSD, and Mac OS X,
-as well as Windows 7 (Professional and Up) and Windows Server 2003.
-Other NFS client implementations may work with gluster NFS server.
-
-You can use CIFS to access volumes when using Microsoft Windows as well
-as SAMBA clients. For this access method, Samba packages need to be
-present on the client side.
-
-Gluster Native Client
-=====================
-
-The Gluster Native Client is a FUSE-based client running in user space.
-Gluster Native Client is the recommended method for accessing volumes
-when high concurrency and high write performance is required.
-
-This section introduces the Gluster Native Client and explains how to
-install the software on client machines. This section also describes how
-to mount volumes on clients (both manually and automatically) and how to
-verify that the volume has mounted successfully.
-
-Installing the Gluster Native Client
-------------------------------------
-
-Before you begin installing the Gluster Native Client, you need to
-verify that the FUSE module is loaded on the client and has access to
-the required modules as follows:
-
-1.  Add the FUSE loadable kernel module (LKM) to the Linux kernel:
-
-    `# modprobe fuse`
-
-2.  Verify that the FUSE module is loaded:
-
-    `# dmesg | grep -i fuse `
-
-    `fuse init (API version 7.13)`
-
-### Installing on Red Hat Package Manager (RPM) Distributions
-
-To install Gluster Native Client on RPM distribution-based systems
-
-1.  Install required prerequisites on the client using the following
-    command:
-
-    `$ sudo yum -y install openssh-server wget fuse fuse-libs openib libibverbs`
-
-2.  Ensure that TCP and UDP ports 24007 and 24008 are open on all
-    Gluster servers. Apart from these ports, you need to open one port
-    for each brick starting from port 24009. For example: if you have
-    five bricks, you need to have ports 24009 to 24013 open.
-
-    You can use the following chains with iptables:
-
-    `$ sudo iptables -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 24007:24008 -j ACCEPT `
-
-    `$ sudo iptables -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 24009:24014 -j ACCEPT`
-
-    > **Note**
-    >
-    > If you already have iptable chains, make sure that the above
-    > ACCEPT rules precede the DROP rules. This can be achieved by
-    > providing a lower rule number than the DROP rule.
-
-3.  Download the latest glusterfs, glusterfs-fuse, and glusterfs-rdma
-    RPM files to each client. The glusterfs package contains the Gluster
-    Native Client. The glusterfs-fuse package contains the FUSE
-    translator required for mounting on client systems and the
-    glusterfs-rdma packages contain OpenFabrics verbs RDMA module for
-    Infiniband.
-
-    You can download the software at [][].
-
-4.  Install Gluster Native Client on the client.
-
-    `$ sudo rpm -i glusterfs-3.3.0qa30-1.x86_64.rpm `
-
-    `$ sudo rpm -i glusterfs-fuse-3.3.0qa30-1.x86_64.rpm `
-
-    `$ sudo rpm -i glusterfs-rdma-3.3.0qa30-1.x86_64.rpm`
-
-    > **Note**
-    >
-    > The RDMA module is only required when using Infiniband.
-
-### Installing on Debian-based Distributions
-
-To install Gluster Native Client on Debian-based distributions
-
-1.  Install OpenSSH Server on each client using the following command:
-
-    `$ sudo apt-get install openssh-server vim wget`
-
-2.  Download the latest GlusterFS .deb file and checksum to each client.
-
-    You can download the software at [][1].
-
-3.  For each .deb file, get the checksum (using the following command)
-    and compare it against the checksum for that file in the md5sum
-    file.
-
-    `$ md5sum GlusterFS_DEB_file.deb `
-
-    The md5sum of the packages is available at: [][2]
-
-4.  Uninstall GlusterFS v3.1 (or an earlier version) from the client
-    using the following command:
-
-    `$ sudo dpkg -r glusterfs `
-
-    (Optional) Run `$ sudo dpkg -purge glusterfs `to purge the
-    configuration files.
-
-5.  Install Gluster Native Client on the client using the following
-    command:
-
-    `$ sudo dpkg -i GlusterFS_DEB_file `
-
-    For example:
-
-    `$ sudo dpkg -i glusterfs-3.3.x.deb `
-
-6.  Ensure that TCP and UDP ports 24007 and 24008 are open on all
-    Gluster servers. Apart from these ports, you need to open one port
-    for each brick starting from port 24009. For example: if you have
-    five bricks, you need to have ports 24009 to 24013 open.
-
-    You can use the following chains with iptables:
-
-    `$ sudo iptables -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 24007:24008 -j ACCEPT `
-
-    `$ sudo iptables -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 24009:24014 -j ACCEPT`
-
-    > **Note**
-    >
-    > If you already have iptable chains, make sure that the above
-    > ACCEPT rules precede the DROP rules. This can be achieved by
-    > providing a lower rule number than the DROP rule.
-
-### Performing a Source Installation
-
-To build and install Gluster Native Client from the source code
-
-1.  Create a new directory using the following commands:
-
-    `# mkdir glusterfs `
-
-    `# cd glusterfs`
-
-2.  Download the source code.
-
-    You can download the source at [][1].
-
-3.  Extract the source code using the following command:
-
-    `# tar -xvzf SOURCE-FILE `
-
-4.  Run the configuration utility using the following command:
-
-    `# ./configure `
-
-    `GlusterFS configure summary `
-
-    `================== `
-
-    `FUSE client : yes `
-
-    `Infiniband verbs : yes `
-
-    `epoll IO multiplex : yes `
-
-    `argp-standalone : no `
-
-    `fusermount : no `
-
-    `readline : yes`
-
-    The configuration summary shows the components that will be built
-    with Gluster Native Client.
-
-5.  Build the Gluster Native Client software using the following
-    commands:
-
-    `# make `
-
-    `# make install`
-
-6.  Verify that the correct version of Gluster Native Client is
-    installed, using the following command:
-
-    `# glusterfs –-version`
-
-Mounting Volumes
-----------------
-
-After installing the Gluster Native Client, you need to mount Gluster
-volumes to access data. There are two methods you can choose:
-
--   ?
-
--   ?
-
-After mounting a volume, you can test the mounted volume using the
-procedure described in ?.
-
-> **Note**
->
-> Server names selected during creation of Volumes should be resolvable
-> in the client machine. You can use appropriate /etc/hosts entries or
-> DNS server to resolve server names to IP addresses.
-
-### Manually Mounting Volumes
-
-To manually mount a Gluster volume
-
--   To mount a volume, use the following command:
-
-    `# mount -t glusterfs HOSTNAME-OR-IPADDRESS:/VOLNAME MOUNTDIR`
-
-    For example:
-
-    `# mount -t glusterfs server1:/test-volume /mnt/glusterfs`
-
-    > **Note**
-    >
-    > The server specified in the mount command is only used to fetch
-    > the gluster configuration volfile describing the volume name.
-    > Subsequently, the client will communicate directly with the
-    > servers mentioned in the volfile (which might not even include the
-    > one used for mount).
-    >
-    > If you see a usage message like "Usage: mount.glusterfs", mount
-    > usually requires you to create a directory to be used as the mount
-    > point. Run "mkdir /mnt/glusterfs" before you attempt to run the
-    > mount command listed above.
-
-**Mounting Options**
-
-You can specify the following options when using the
-`mount -t glusterfs` command. Note that you need to separate all options
-with commas.
-
-backupvolfile-server=server-name
-
-volfile-max-fetch-attempts=number of attempts
-
-log-level=loglevel
-
-log-file=logfile
-
-transport=transport-type
-
-direct-io-mode=[enable|disable]
-
-For example:
-
-`# mount -t glusterfs -o backupvolfile-server=volfile_server2 --volfile-max-fetch-attempts=2 log-level=WARNING,log-file=/var/log/gluster.log server1:/test-volume /mnt/glusterfs`
-
-If `backupvolfile-server` option is added while mounting fuse client,
-when the first volfile server fails, then the server specified in
-`backupvolfile-server` option is used as volfile server to mount the
-client.
-
-In `--volfile-max-fetch-attempts=X` option, specify the number of
-attempts to fetch volume files while mounting a volume. This option is
-useful when you mount a server with multiple IP addresses or when
-round-robin DNS is configured for the server-name..
-
-### Automatically Mounting Volumes
-
-You can configure your system to automatically mount the Gluster volume
-each time your system starts.
-
-The server specified in the mount command is only used to fetch the
-gluster configuration volfile describing the volume name. Subsequently,
-the client will communicate directly with the servers mentioned in the
-volfile (which might not even include the one used for mount).
-
-**To automatically mount a Gluster volume**
-
--   To mount a volume, edit the /etc/fstab file and add the following
-    line:
-
-    `HOSTNAME-OR-IPADDRESS:/VOLNAME MOUNTDIR glusterfs defaults,_netdev 0 0 `
-
-    For example:
-
-    `server1:/test-volume /mnt/glusterfs glusterfs defaults,_netdev 0 0`
-
-**Mounting Options**
-
-You can specify the following options when updating the /etc/fstab file.
-Note that you need to separate all options with commas.
-
-log-level=loglevel
-
-log-file=logfile
-
-transport=transport-type
-
-direct-io-mode=[enable|disable]
-
-For example:
-
-`HOSTNAME-OR-IPADDRESS:/VOLNAME MOUNTDIR glusterfs defaults,_netdev,log-level=WARNING,log-file=/var/log/gluster.log 0 0 `
-
-### Testing Mounted Volumes
-
-To test mounted volumes
-
--   Use the following command:
-
-    `# mount `
-
-    If the gluster volume was successfully mounted, the output of the
-    mount command on the client will be similar to this example:
-
-    `server1:/test-volume on /mnt/glusterfs type fuse.glusterfs (rw,allow_other,default_permissions,max_read=131072`
-
--   Use the following command:
-
-    `# df`
-
-    The output of df command on the client will display the aggregated
-    storage space from all the bricks in a volume similar to this
-    example:
-
-    `# df -h /mnt/glusterfs Filesystem Size Used Avail Use% Mounted on server1:/test-volume 28T 22T 5.4T 82% /mnt/glusterfs`
-
--   Change to the directory and list the contents by entering the
-    following:
-
-    `# cd MOUNTDIR `
-
-    `# ls`
-
--   For example,
-
-    `# cd /mnt/glusterfs `
-
-    `# ls`
-
-NFS
-===
-
-You can use NFS v3 to access to gluster volumes. Extensive testing has
-be done on GNU/Linux clients and NFS implementation in other operating
-system, such as FreeBSD, and Mac OS X, as well as Windows 7
-(Professional and Up), Windows Server 2003, and others, may work with
-gluster NFS server implementation.
-
-GlusterFS now includes network lock manager (NLM) v4. NLM enables
-applications on NFSv3 clients to do record locking on files on NFS
-server. It is started automatically whenever the NFS server is run.
-
-You must install nfs-common package on both servers and clients (only
-for Debian-based) distribution.
-
-This section describes how to use NFS to mount Gluster volumes (both
-manually and automatically) and how to verify that the volume has been
-mounted successfully.
-
-Using NFS to Mount Volumes
---------------------------
-
-You can use either of the following methods to mount Gluster volumes:
-
--   ?
-
--   ?
-
-**Prerequisite**: Install nfs-common package on both servers and clients
-(only for Debian-based distribution), using the following command:
-
-`$ sudo aptitude install nfs-common `
-
-After mounting a volume, you can test the mounted volume using the
-procedure described in ?.
-
-### Manually Mounting Volumes Using NFS
-
-To manually mount a Gluster volume using NFS
-
--   To mount a volume, use the following command:
-
-    `# mount -t nfs -o vers=3 HOSTNAME-OR-IPADDRESS:/VOLNAME MOUNTDIR`
-
-    For example:
-
-    `# mount -t nfs -o vers=3 server1:/test-volume /mnt/glusterfs`
-
-    > **Note**
-    >
-    > Gluster NFS server does not support UDP. If the NFS client you are
-    > using defaults to connecting using UDP, the following message
-    > appears:
-    >
-    > `requested NFS version or transport protocol is not supported`.
-
-    **To connect using TCP**
-
--   Add the following option to the mount command:
-
-    `-o mountproto=tcp `
-
-    For example:
-
-    `# mount -o mountproto=tcp -t nfs server1:/test-volume /mnt/glusterfs`
-
-**To mount Gluster NFS server from a Solaris client**
-
--   Use the following command:
-
-    `# mount -o proto=tcp,vers=3 nfs://HOSTNAME-OR-IPADDRESS:38467/VOLNAME MOUNTDIR`
-
-    For example:
-
-    ` # mount -o proto=tcp,vers=3 nfs://server1:38467/test-volume /mnt/glusterfs`
-
-### Automatically Mounting Volumes Using NFS
-
-You can configure your system to automatically mount Gluster volumes
-using NFS each time the system starts.
-
-**To automatically mount a Gluster volume using NFS**
-
--   To mount a volume, edit the /etc/fstab file and add the following
-    line:
-
-    `HOSTNAME-OR-IPADDRESS:/VOLNAME MOUNTDIR nfs defaults,_netdev,vers=3 0 0`
-
-    For example,
-
-    `server1:/test-volume /mnt/glusterfs nfs defaults,_netdev,vers=3 0 0`
-
-    > **Note**
-    >
-    > Gluster NFS server does not support UDP. If the NFS client you are
-    > using defaults to connecting using UDP, the following message
-    > appears:
-    >
-    > `requested NFS version or transport protocol is not supported.`
-
-    To connect using TCP
-
--   Add the following entry in /etc/fstab file :
-
-    `HOSTNAME-OR-IPADDRESS:/VOLNAME MOUNTDIR nfs defaults,_netdev,mountproto=tcp 0 0`
-
-    For example,
-
-    `server1:/test-volume /mnt/glusterfs nfs defaults,_netdev,mountproto=tcp 0 0`
-
-**To automount NFS mounts**
-
-Gluster supports \*nix standard method of automounting NFS mounts.
-Update the /etc/auto.master and /etc/auto.misc and restart the autofs
-service. After that, whenever a user or process attempts to access the
-directory it will be mounted in the background.
-
-### Testing Volumes Mounted Using NFS
-
-You can confirm that Gluster directories are mounting successfully.
-
-**To test mounted volumes**
-
--   Use the mount command by entering the following:
-
-    `# mount`
-
-    For example, the output of the mount command on the client will
-    display an entry like the following:
-
-    `server1:/test-volume on /mnt/glusterfs type nfs (rw,vers=3,addr=server1)`
-
--   Use the df command by entering the following:
-
-    `# df`
-
-    For example, the output of df command on the client will display the
-    aggregated storage space from all the bricks in a volume.
-
-        # df -h /mnt/glusterfs 
-        Filesystem              Size Used Avail Use% Mounted on 
-        server1:/test-volume    28T  22T  5.4T  82%  /mnt/glusterfs
-
--   Change to the directory and list the contents by entering the
-    following:
-
-    `# cd MOUNTDIR`
-
-    `# ls`
-
-    For example,
-
-    `
-                    
-                  `
-
-    `# ls`
-
-CIFS
-====
-
-You can use CIFS to access to volumes when using Microsoft Windows as
-well as SAMBA clients. For this access method, Samba packages need to be
-present on the client side. You can export glusterfs mount point as the
-samba export, and then mount it using CIFS protocol.
-
-This section describes how to mount CIFS shares on Microsoft
-Windows-based clients (both manually and automatically) and how to
-verify that the volume has mounted successfully.
-
-> **Note**
->
-> CIFS access using the Mac OS X Finder is not supported, however, you
-> can use the Mac OS X command line to access Gluster volumes using
-> CIFS.
-
-Using CIFS to Mount Volumes
----------------------------
-
-You can use either of the following methods to mount Gluster volumes:
-
--   ?
-
--   ?
-
-After mounting a volume, you can test the mounted volume using the
-procedure described in ?.
-
-You can also use Samba for exporting Gluster Volumes through CIFS
-protocol.
-
-### Exporting Gluster Volumes Through Samba
-
-We recommend you to use Samba for exporting Gluster volumes through the
-CIFS protocol.
-
-**To export volumes through CIFS protocol**
-
-1.  Mount a Gluster volume. For more information on mounting volumes,
-    see ?.
-
-2.  Setup Samba configuration to export the mount point of the Gluster
-    volume.
-
-    For example, if a Gluster volume is mounted on /mnt/gluster, you
-    must edit smb.conf file to enable exporting this through CIFS. Open
-    smb.conf file in an editor and add the following lines for a simple
-    configuration:
-
-    [glustertest]
-
-    comment = For testing a Gluster volume exported through CIFS
-
-    path = /mnt/glusterfs
-
-    read only = no
-
-    guest ok = yes
-
-Save the changes and start the smb service using your systems init
-scripts (/etc/init.d/smb [re]start).
-
-> **Note**
->
-> To be able mount from any server in the trusted storage pool, you must
-> repeat these steps on each Gluster node. For more advanced
-> configurations, see Samba documentation.
-
-### Manually Mounting Volumes Using CIFS
-
-You can manually mount Gluster volumes using CIFS on Microsoft
-Windows-based client machines.
-
-**To manually mount a Gluster volume using CIFS**
-
-1.  Using Windows Explorer, choose **Tools \> Map Network Drive…** from
-    the menu. The **Map Network Drive**window appears.
-
-2.  Choose the drive letter using the **Drive** drop-down list.
-
-3.  Click **Browse**, select the volume to map to the network drive, and
-    click **OK**.
-
-4.  Click **Finish.**
-
-The network drive (mapped to the volume) appears in the Computer window.
-
-**Alternatively, to manually mount a Gluster volume using CIFS.**
-
--   Click **Start \> Run** and enter the following:
-
-    `
-                    
-                  `
-
-    For example:
-
-    `
-                    
-                  `
-
-### Automatically Mounting Volumes Using CIFS
-
-You can configure your system to automatically mount Gluster volumes
-using CIFS on Microsoft Windows-based clients each time the system
-starts.
-
-**To automatically mount a Gluster volume using CIFS**
-
-The network drive (mapped to the volume) appears in the Computer window
-and is reconnected each time the system starts.
-
-1.  Using Windows Explorer, choose **Tools \> Map Network Drive…** from
-    the menu. The **Map Network Drive**window appears.
-
-2.  Choose the drive letter using the **Drive** drop-down list.
-
-3.  Click **Browse**, select the volume to map to the network drive, and
-    click **OK**.
-
-4.  Click the **Reconnect** at logon checkbox.
-
-5.  Click **Finish.**
-
-### Testing Volumes Mounted Using CIFS
-
-You can confirm that Gluster directories are mounting successfully by
-navigating to the directory using Windows Explorer.
-
-  []: http://bits.gluster.com/gluster/glusterfs/3.3.0qa30/x86_64/
-  [1]: http://www.gluster.org/download/
-  [2]: http://download.gluster.com/pub/gluster/glusterfs
diff --git a/doc/admin-guide/en-US/markdown/admin_start_stop_daemon.md b/doc/admin-guide/en-US/markdown/admin_start_stop_daemon.md
deleted file mode 100644
index 43251cd01..000000000
--- a/doc/admin-guide/en-US/markdown/admin_start_stop_daemon.md
+++ /dev/null
@@ -1,70 +0,0 @@
-Managing the glusterd Service
-=============================
-
-After installing GlusterFS, you must start glusterd service. The
-glusterd service serves as the Gluster elastic volume manager,
-overseeing glusterfs processes, and co-ordinating dynamic volume
-operations, such as adding and removing volumes across multiple storage
-servers non-disruptively.
-
-This section describes how to start the glusterd service in the
-following ways:
-
--   ?
-
--   ?
-
-> **Note**
->
-> You must start glusterd on all GlusterFS servers.
-
-Starting and Stopping glusterd Manually
-=======================================
-
-This section describes how to start and stop glusterd manually
-
--   To start glusterd manually, enter the following command:
-
-    `# /etc/init.d/glusterd start `
-
--   To stop glusterd manually, enter the following command:
-
-    `# /etc/init.d/glusterd stop`
-
-Starting glusterd Automatically
-===============================
-
-This section describes how to configure the system to automatically
-start the glusterd service every time the system boots.
-
-To automatically start the glusterd service every time the system boots,
-enter the following from the command line:
-
-`# chkconfig glusterd on `
-
-Red Hat-based Systems
----------------------
-
-To configure Red Hat-based systems to automatically start the glusterd
-service every time the system boots, enter the following from the
-command line:
-
-`# chkconfig glusterd on `
-
-Debian-based Systems
---------------------
-
-To configure Debian-based systems to automatically start the glusterd
-service every time the system boots, enter the following from the
-command line:
-
-`# update-rc.d glusterd defaults`
-
-Systems Other than Red Hat and Debain
--------------------------------------
-
-To configure systems other than Red Hat or Debian to automatically start
-the glusterd service every time the system boots, enter the following
-entry to the*/etc/rc.local* file:
-
-`# echo "glusterd" >> /etc/rc.local `
diff --git a/doc/admin-guide/en-US/markdown/admin_storage_pools.md b/doc/admin-guide/en-US/markdown/admin_storage_pools.md
deleted file mode 100644
index 2a35cbea5..000000000
--- a/doc/admin-guide/en-US/markdown/admin_storage_pools.md
+++ /dev/null
@@ -1,73 +0,0 @@
-Setting up Trusted Storage Pools
-================================
-
-Before you can configure a GlusterFS volume, you must create a trusted
-storage pool consisting of the storage servers that provides bricks to a
-volume.
-
-A storage pool is a trusted network of storage servers. When you start
-the first server, the storage pool consists of that server alone. To add
-additional storage servers to the storage pool, you can use the probe
-command from a storage server that is already trusted.
-
-> **Note**
->
-> Do not self-probe the first server/localhost.
-
-The GlusterFS service must be running on all storage servers that you
-want to add to the storage pool. See ? for more information.
-
-Adding Servers to Trusted Storage Pool
-======================================
-
-To create a trusted storage pool, add servers to the trusted storage
-pool
-
-1.  The hostnames used to create the storage pool must be resolvable by
-    DNS.
-
-    To add a server to the storage pool:
-
-    `# gluster peer probe `
-
-    For example, to create a trusted storage pool of four servers, add
-    three servers to the storage pool from server1:
-
-        # gluster peer probe server2
-        Probe successful
-
-        # gluster peer probe server3
-        Probe successful
-
-        # gluster peer probe server4
-        Probe successful
-
-2.  Verify the peer status from the first server using the following
-    commands:
-
-        # gluster peer status
-        Number of Peers: 3
-
-        Hostname: server2
-        Uuid: 5e987bda-16dd-43c2-835b-08b7d55e94e5
-        State: Peer in Cluster (Connected)
-
-        Hostname: server3
-        Uuid: 1e0ca3aa-9ef7-4f66-8f15-cbc348f29ff7
-        State: Peer in Cluster (Connected)
-
-        Hostname: server4
-        Uuid: 3e0caba-9df7-4f66-8e5d-cbc348f29ff7
-        State: Peer in Cluster (Connected)
-
-Removing Servers from the Trusted Storage Pool
-==============================================
-
-To remove a server from the storage pool:
-
-`# gluster peer detach`
-
-For example, to remove server4 from the trusted storage pool:
-
-    # gluster peer detach server4
-    Detach successful
diff --git a/doc/admin-guide/en-US/markdown/admin_troubleshooting.md b/doc/admin-guide/en-US/markdown/admin_troubleshooting.md
deleted file mode 100644
index 88fb85c24..000000000
--- a/doc/admin-guide/en-US/markdown/admin_troubleshooting.md
+++ /dev/null
@@ -1,543 +0,0 @@
-Troubleshooting GlusterFS
-=========================
-
-This section describes how to manage GlusterFS logs and most common
-troubleshooting scenarios related to GlusterFS.
-
-Managing GlusterFS Logs
-=======================
-
-This section describes how to manage GlusterFS logs by performing the
-following operation:
-
--   Rotating Logs
-
-Rotating Logs
--------------
-
-Administrators can rotate the log file in a volume, as needed.
-
-**To rotate a log file**
-
--   Rotate the log file using the following command:
-
-    `# gluster volume log rotate `
-
-    For example, to rotate the log file on test-volume:
-
-        # gluster volume log rotate test-volume
-        log rotate successful
-
-    > **Note**
-    >
-    > When a log file is rotated, the contents of the current log file
-    > are moved to log-file- name.epoch-time-stamp.
-
-Troubleshooting Geo-replication
-===============================
-
-This section describes the most common troubleshooting scenarios related
-to GlusterFS Geo-replication.
-
-Locating Log Files
-------------------
-
-For every Geo-replication session, the following three log files are
-associated to it (four, if the slave is a gluster volume):
-
--   Master-log-file - log file for the process which monitors the Master
-    volume
-
--   Slave-log-file - log file for process which initiates the changes in
-    slave
-
--   Master-gluster-log-file - log file for the maintenance mount point
-    that Geo-replication module uses to monitor the master volume
-
--   Slave-gluster-log-file - is the slave's counterpart of it
-
-**Master Log File**
-
-To get the Master-log-file for geo-replication, use the following
-command:
-
-`gluster volume geo-replication  config log-file`
-
-For example:
-
-`# gluster volume geo-replication Volume1 example.com:/data/remote_dir config log-file `
-
-**Slave Log File**
-
-To get the log file for Geo-replication on slave (glusterd must be
-running on slave machine), use the following commands:
-
-1.  On master, run the following command:
-
-    `# gluster volume geo-replication Volume1 example.com:/data/remote_dir config session-owner 5f6e5200-756f-11e0-a1f0-0800200c9a66 `
-
-    Displays the session owner details.
-
-2.  On slave, run the following command:
-
-    `# gluster volume geo-replication /data/remote_dir config log-file /var/log/gluster/${session-owner}:remote-mirror.log `
-
-3.  Replace the session owner details (output of Step 1) to the output
-    of the Step 2 to get the location of the log file.
-
-    `/var/log/gluster/5f6e5200-756f-11e0-a1f0-0800200c9a66:remote-mirror.log`
-
-Rotating Geo-replication Logs
------------------------------
-
-Administrators can rotate the log file of a particular master-slave
-session, as needed. When you run geo-replication's ` log-rotate`
-command, the log file is backed up with the current timestamp suffixed
-to the file name and signal is sent to gsyncd to start logging to a new
-log file.
-
-**To rotate a geo-replication log file**
-
--   Rotate log file for a particular master-slave session using the
-    following command:
-
-    `# gluster volume geo-replication  log-rotate`
-
-    For example, to rotate the log file of master `Volume1` and slave
-    `example.com:/data/remote_dir` :
-
-        # gluster volume geo-replication Volume1 example.com:/data/remote_dir log rotate
-        log rotate successful
-
--   Rotate log file for all sessions for a master volume using the
-    following command:
-
-    `# gluster volume geo-replication  log-rotate`
-
-    For example, to rotate the log file of master `Volume1`:
-
-        # gluster volume geo-replication Volume1 log rotate
-        log rotate successful
-
--   Rotate log file for all sessions using the following command:
-
-    `# gluster volume geo-replication log-rotate`
-
-    For example, to rotate the log file for all sessions:
-
-        # gluster volume geo-replication log rotate
-        log rotate successful
-
-Synchronization is not complete
--------------------------------
-
-**Description**: GlusterFS Geo-replication did not synchronize the data
-completely but still the geo- replication status displayed is OK.
-
-**Solution**: You can enforce a full sync of the data by erasing the
-index and restarting GlusterFS Geo- replication. After restarting,
-GlusterFS Geo-replication begins synchronizing all the data. All files
-are compared using checksum, which can be a lengthy and high resource
-utilization operation on large data sets. If the error situation
-persists, contact Red Hat Support.
-
-For more information about erasing index, see ?.
-
-Issues in Data Synchronization
-------------------------------
-
-**Description**: Geo-replication display status as OK, but the files do
-not get synced, only directories and symlink gets synced with the
-following error message in the log:
-
-[2011-05-02 13:42:13.467644] E [master:288:regjob] GMaster: failed to
-sync ./some\_file\`
-
-**Solution**: Geo-replication invokes rsync v3.0.0 or higher on the host
-and the remote machine. You must verify if you have installed the
-required version.
-
-Geo-replication status displays Faulty very often
--------------------------------------------------
-
-**Description**: Geo-replication displays status as faulty very often
-with a backtrace similar to the following:
-
-2011-04-28 14:06:18.378859] E [syncdutils:131:log\_raise\_exception]
-\<top\>: FAIL: Traceback (most recent call last): File
-"/usr/local/libexec/glusterfs/python/syncdaemon/syncdutils.py", line
-152, in twraptf(\*aa) File
-"/usr/local/libexec/glusterfs/python/syncdaemon/repce.py", line 118, in
-listen rid, exc, res = recv(self.inf) File
-"/usr/local/libexec/glusterfs/python/syncdaemon/repce.py", line 42, in
-recv return pickle.load(inf) EOFError
-
-**Solution**: This error indicates that the RPC communication between
-the master gsyncd module and slave gsyncd module is broken and this can
-happen for various reasons. Check if it satisfies all the following
-pre-requisites:
-
--   Password-less SSH is set up properly between the host and the remote
-    machine.
-
--   If FUSE is installed in the machine, because geo-replication module
-    mounts the GlusterFS volume using FUSE to sync data.
-
--   If the **Slave** is a volume, check if that volume is started.
-
--   If the Slave is a plain directory, verify if the directory has been
-    created already with the required permissions.
-
--   If GlusterFS 3.2 or higher is not installed in the default location
-    (in Master) and has been prefixed to be installed in a custom
-    location, configure the `gluster-command` for it to point to the
-    exact location.
-
--   If GlusterFS 3.2 or higher is not installed in the default location
-    (in slave) and has been prefixed to be installed in a custom
-    location, configure the `remote-gsyncd-command` for it to point to
-    the exact place where gsyncd is located.
-
-Intermediate Master goes to Faulty State
-----------------------------------------
-
-**Description**: In a cascading set-up, the intermediate master goes to
-faulty state with the following log:
-
-raise RuntimeError ("aborting on uuid change from %s to %s" % \\
-RuntimeError: aborting on uuid change from af07e07c-427f-4586-ab9f-
-4bf7d299be81 to de6b5040-8f4e-4575-8831-c4f55bd41154
-
-**Solution**: In a cascading set-up the Intermediate master is loyal to
-the original primary master. The above log means that the
-geo-replication module has detected change in primary master. If this is
-the desired behavior, delete the config option volume-id in the session
-initiated from the intermediate master.
-
-Troubleshooting POSIX ACLs
-==========================
-
-This section describes the most common troubleshooting issues related to
-POSIX ACLs.
-
-setfacl command fails with “setfacl: \<file or directory name\>: Operation not supported” error
------------------------------------------------------------------------------------------------
-
-You may face this error when the backend file systems in one of the
-servers is not mounted with the "-o acl" option. The same can be
-confirmed by viewing the following error message in the log file of the
-server "Posix access control list is not supported".
-
-**Solution**: Remount the backend file system with "-o acl" option. For
-more information, see ?.
-
-Troubleshooting Hadoop Compatible Storage
-=========================================
-
-This section describes the most common troubleshooting issues related to
-Hadoop Compatible Storage.
-
-Time Sync
----------
-
-Running MapReduce job may throw exceptions if the time is out-of-sync on
-the hosts in the cluster.
-
-**Solution**: Sync the time on all hosts using ntpd program.
-
-Troubleshooting NFS
-===================
-
-This section describes the most common troubleshooting issues related to
-NFS .
-
-mount command on NFS client fails with “RPC Error: Program not registered”
---------------------------------------------------------------------------
-
-Start portmap or rpcbind service on the NFS server.
-
-This error is encountered when the server has not started correctly.
-
-On most Linux distributions this is fixed by starting portmap:
-
-`$ /etc/init.d/portmap start`
-
-On some distributions where portmap has been replaced by rpcbind, the
-following command is required:
-
-`$ /etc/init.d/rpcbind start `
-
-After starting portmap or rpcbind, gluster NFS server needs to be
-restarted.
-
-NFS server start-up fails with “Port is already in use” error in the log file."
--------------------------------------------------------------------------------
-
-Another Gluster NFS server is running on the same machine.
-
-This error can arise in case there is already a Gluster NFS server
-running on the same machine. This situation can be confirmed from the
-log file, if the following error lines exist:
-
-    [2010-05-26 23:40:49] E [rpc-socket.c:126:rpcsvc_socket_listen] rpc-socket: binding socket failed:Address already in use
-    [2010-05-26 23:40:49] E [rpc-socket.c:129:rpcsvc_socket_listen] rpc-socket: Port is already in use 
-    [2010-05-26 23:40:49] E [rpcsvc.c:2636:rpcsvc_stage_program_register] rpc-service: could not create listening connection 
-    [2010-05-26 23:40:49] E [rpcsvc.c:2675:rpcsvc_program_register] rpc-service: stage registration of program failed 
-    [2010-05-26 23:40:49] E [rpcsvc.c:2695:rpcsvc_program_register] rpc-service: Program registration failed: MOUNT3, Num: 100005, Ver: 3, Port: 38465 
-    [2010-05-26 23:40:49] E [nfs.c:125:nfs_init_versions] nfs: Program init failed 
-    [2010-05-26 23:40:49] C [nfs.c:531:notify] nfs: Failed to initialize protocols
-
-To resolve this error one of the Gluster NFS servers will have to be
-shutdown. At this time, Gluster NFS server does not support running
-multiple NFS servers on the same machine.
-
-mount command fails with “rpc.statd” related error message
-----------------------------------------------------------
-
-If the mount command fails with the following error message:
-
-mount.nfs: rpc.statd is not running but is required for remote locking.
-mount.nfs: Either use '-o nolock' to keep locks local, or start statd.
-
-Start rpc.statd
-
-For NFS clients to mount the NFS server, rpc.statd service must be
-running on the clients.
-
-Start rpc.statd service by running the following command:
-
-`$ rpc.statd `
-
-mount command takes too long to finish.
----------------------------------------
-
-Start rpcbind service on the NFS client.
-
-The problem is that the rpcbind or portmap service is not running on the
-NFS client. The resolution for this is to start either of these services
-by running the following command:
-
-`$ /etc/init.d/portmap start`
-
-On some distributions where portmap has been replaced by rpcbind, the
-following command is required:
-
-`$ /etc/init.d/rpcbind start`
-
-NFS server glusterfsd starts but initialization fails with “nfsrpc- service: portmap registration of program failed” error message in the log.
-----------------------------------------------------------------------------------------------------------------------------------------------
-
-NFS start-up can succeed but the initialization of the NFS service can
-still fail preventing clients from accessing the mount points. Such a
-situation can be confirmed from the following error messages in the log
-file:
-
-    [2010-05-26 23:33:47] E [rpcsvc.c:2598:rpcsvc_program_register_portmap] rpc-service: Could notregister with portmap 
-    [2010-05-26 23:33:47] E [rpcsvc.c:2682:rpcsvc_program_register] rpc-service: portmap registration of program failed
-    [2010-05-26 23:33:47] E [rpcsvc.c:2695:rpcsvc_program_register] rpc-service: Program registration failed: MOUNT3, Num: 100005, Ver: 3, Port: 38465
-    [2010-05-26 23:33:47] E [nfs.c:125:nfs_init_versions] nfs: Program init failed
-    [2010-05-26 23:33:47] C [nfs.c:531:notify] nfs: Failed to initialize protocols
-    [2010-05-26 23:33:49] E [rpcsvc.c:2614:rpcsvc_program_unregister_portmap] rpc-service: Could not unregister with portmap
-    [2010-05-26 23:33:49] E [rpcsvc.c:2731:rpcsvc_program_unregister] rpc-service: portmap unregistration of program failed
-    [2010-05-26 23:33:49] E [rpcsvc.c:2744:rpcsvc_program_unregister] rpc-service: Program unregistration failed: MOUNT3, Num: 100005, Ver: 3, Port: 38465
-
-1.  Start portmap or rpcbind service on the NFS server.
-
-    On most Linux distributions, portmap can be started using the
-    following command:
-
-    `$ /etc/init.d/portmap start `
-
-    On some distributions where portmap has been replaced by rpcbind,
-    run the following command:
-
-    `$ /etc/init.d/rpcbind start `
-
-    After starting portmap or rpcbind, gluster NFS server needs to be
-    restarted.
-
-2.  Stop another NFS server running on the same machine.
-
-    Such an error is also seen when there is another NFS server running
-    on the same machine but it is not the Gluster NFS server. On Linux
-    systems, this could be the kernel NFS server. Resolution involves
-    stopping the other NFS server or not running the Gluster NFS server
-    on the machine. Before stopping the kernel NFS server, ensure that
-    no critical service depends on access to that NFS server's exports.
-
-    On Linux, kernel NFS servers can be stopped by using either of the
-    following commands depending on the distribution in use:
-
-    `$ /etc/init.d/nfs-kernel-server stop`
-
-    `$ /etc/init.d/nfs stop`
-
-3.  Restart Gluster NFS server.
-
-mount command fails with NFS server failed error.
--------------------------------------------------
-
-mount command fails with following error
-
-*mount: mount to NFS server '10.1.10.11' failed: timed out (retrying).*
-
-Perform one of the following to resolve this issue:
-
-1.  Disable name lookup requests from NFS server to a DNS server.
-
-    The NFS server attempts to authenticate NFS clients by performing a
-    reverse DNS lookup to match hostnames in the volume file with the
-    client IP addresses. There can be a situation where the NFS server
-    either is not able to connect to the DNS server or the DNS server is
-    taking too long to responsd to DNS request. These delays can result
-    in delayed replies from the NFS server to the NFS client resulting
-    in the timeout error seen above.
-
-    NFS server provides a work-around that disables DNS requests,
-    instead relying only on the client IP addresses for authentication.
-    The following option can be added for successful mounting in such
-    situations:
-
-    `option rpc-auth.addr.namelookup off `
-
-    > **Note**
-    >
-    > Note: Remember that disabling the NFS server forces authentication
-    > of clients to use only IP addresses and if the authentication
-    > rules in the volume file use hostnames, those authentication rules
-    > will fail and disallow mounting for those clients.
-
-    or
-
-2.  NFS version used by the NFS client is other than version 3.
-
-    Gluster NFS server supports version 3 of NFS protocol. In recent
-    Linux kernels, the default NFS version has been changed from 3 to 4.
-    It is possible that the client machine is unable to connect to the
-    Gluster NFS server because it is using version 4 messages which are
-    not understood by Gluster NFS server. The timeout can be resolved by
-    forcing the NFS client to use version 3. The **vers** option to
-    mount command is used for this purpose:
-
-    `$ mount  -o vers=3 `
-
-showmount fails with clnt\_create: RPC: Unable to receive
----------------------------------------------------------
-
-Check your firewall setting to open ports 111 for portmap
-requests/replies and Gluster NFS server requests/replies. Gluster NFS
-server operates over the following port numbers: 38465, 38466, and
-38467.
-
-For more information, see ?.
-
-Application fails with "Invalid argument" or "Value too large for defined data type" error.
--------------------------------------------------------------------------------------------
-
-These two errors generally happen for 32-bit nfs clients or applications
-that do not support 64-bit inode numbers or large files. Use the
-following option from the CLI to make Gluster NFS return 32-bit inode
-numbers instead: nfs.enable-ino32 \<on|off\>
-
-Applications that will benefit are those that were either:
-
--   built 32-bit and run on 32-bit machines such that they do not
-    support large files by default
-
--   built 32-bit on 64-bit systems
-
-This option is disabled by default so NFS returns 64-bit inode numbers
-by default.
-
-Applications which can be rebuilt from source are recommended to rebuild
-using the following flag with gcc:
-
-` -D_FILE_OFFSET_BITS=64`
-
-Troubleshooting File Locks
-==========================
-
-In GlusterFS 3.3 you can use `statedump` command to list the locks held
-on files. The statedump output also provides information on each lock
-with its range, basename, PID of the application holding the lock, and
-so on. You can analyze the output to know about the locks whose
-owner/application is no longer running or interested in that lock. After
-ensuring that the no application is using the file, you can clear the
-lock using the following `clear lock` command:
-
-`# `
-
-For more information on performing `statedump`, see ?
-
-**To identify locked file and clear locks**
-
-1.  Perform statedump on the volume to view the files that are locked
-    using the following command:
-
-    `# gluster volume statedump  inode`
-
-    For example, to display statedump of test-volume:
-
-        # gluster volume statedump test-volume
-        Volume statedump successful
-
-    The statedump files are created on the brick servers in the` /tmp`
-    directory or in the directory set using `server.statedump-path`
-    volume option. The naming convention of the dump file is
-    `<brick-path>.<brick-pid>.dump`.
-
-    The following are the sample contents of the statedump file. It
-    indicates that GlusterFS has entered into a state where there is an
-    entry lock (entrylk) and an inode lock (inodelk). Ensure that those
-    are stale locks and no resources own them.
-
-        [xlator.features.locks.vol-locks.inode]
-        path=/
-        mandatory=0
-        entrylk-count=1
-        lock-dump.domain.domain=vol-replicate-0
-        xlator.feature.locks.lock-dump.domain.entrylk.entrylk[0](ACTIVE)=type=ENTRYLK_WRLCK on basename=file1, pid = 714782904, owner=ffffff2a3c7f0000, transport=0x20e0670, , granted at Mon Feb 27 16:01:01 2012
-
-        conn.2.bound_xl./gfs/brick1.hashsize=14057
-        conn.2.bound_xl./gfs/brick1.name=/gfs/brick1/inode
-        conn.2.bound_xl./gfs/brick1.lru_limit=16384
-        conn.2.bound_xl./gfs/brick1.active_size=2
-        conn.2.bound_xl./gfs/brick1.lru_size=0
-        conn.2.bound_xl./gfs/brick1.purge_size=0
-
-        [conn.2.bound_xl./gfs/brick1.active.1]
-        gfid=538a3d4a-01b0-4d03-9dc9-843cd8704d07
-        nlookup=1
-        ref=2
-        ia_type=1
-        [xlator.features.locks.vol-locks.inode]
-        path=/file1
-        mandatory=0
-        inodelk-count=1
-        lock-dump.domain.domain=vol-replicate-0
-        inodelk.inodelk[0](ACTIVE)=type=WRITE, whence=0, start=0, len=0, pid = 714787072, owner=00ffff2a3c7f0000, transport=0x20e0670, , granted at Mon Feb 27 16:01:01 2012
-
-2.  Clear the lock using the following command:
-
-    `# `
-
-    For example, to clear the entry lock on `file1` of test-volume:
-
-        # gluster volume clear-locks test-volume / kind granted entry file1
-        Volume clear-locks successful
-        vol-locks: entry blocked locks=0 granted locks=1
-
-3.  Clear the inode lock using the following command:
-
-    `# `
-
-    For example, to clear the inode lock on `file1` of test-volume:
-
-        # gluster  volume clear-locks test-volume /file1 kind granted inode 0,0-0
-        Volume clear-locks successful
-        vol-locks: inode blocked locks=0 granted locks=1
-
-    You can perform statedump on test-volume again to verify that the
-    above inode and entry locks are cleared.
-
-
diff --git a/doc/admin-guide/en-US/markdown/gfs_introduction.md b/doc/admin-guide/en-US/markdown/gfs_introduction.md
deleted file mode 100644
index fd2c53dc9..000000000
--- a/doc/admin-guide/en-US/markdown/gfs_introduction.md
+++ /dev/null
@@ -1,50 +0,0 @@
-Introducing Gluster File System
-===============================
-
-GlusterFS is an open source, clustered file system capable of scaling to
-several petabytes and handling thousands of clients. GlusterFS can be
-flexibly combined with commodity physical, virtual, and cloud resources
-to deliver highly available and performant enterprise storage at a
-fraction of the cost of traditional solutions.
-
-GlusterFS clusters together storage building blocks over Infiniband RDMA
-and/or TCP/IP interconnect, aggregating disk and memory resources and
-managing data in a single global namespace. GlusterFS is based on a
-stackable user space design, delivering exceptional performance for
-diverse workloads.
-
-![ Virtualized Cloud Environments ][]
-
-GlusterFS is designed for today's high-performance, virtualized cloud
-environments. Unlike traditional data centers, cloud environments
-require multi-tenancy along with the ability to grow or shrink resources
-on demand. Enterprises can scale capacity, performance, and availability
-on demand, with no vendor lock-in, across on-premise, public cloud, and
-hybrid environments.
-
-GlusterFS is in production at thousands of enterprises spanning media,
-healthcare, government, education, web 2.0, and financial services. The
-following table lists the commercial offerings and its documentation
-location:
-
-  ------------------------------------------------------------------------
-  Product     Documentation Location
-  ----------- ------------------------------------------------------------
-  Red Hat     [][]
-  Storage     
-  Software    
-  Appliance   
-
-  Red Hat     [][1]
-  Virtual     
-  Storage     
-  Appliance   
-
-  Red Hat     [][2]
-  Storage     
-  ------------------------------------------------------------------------
-
-  [ Virtualized Cloud Environments ]: images/640px-GlusterFS_Architecture.png
-  []: http://docs.redhat.com/docs/en-US/Red_Hat_Storage_Software_Appliance/index.html
-  [1]: http://docs.redhat.com/docs/en-US/Red_Hat_Virtual_Storage_Appliance/index.html
-  [2]: http://docs.redhat.com/docs/en-US/Red_Hat_Storage/index.html
diff --git a/doc/admin-guide/en-US/markdown/glossary.md b/doc/admin-guide/en-US/markdown/glossary.md
deleted file mode 100644
index 0febaff8f..000000000
--- a/doc/admin-guide/en-US/markdown/glossary.md
+++ /dev/null
@@ -1,134 +0,0 @@
-Glossary
-========
-
-Brick
-:   A Brick is the GlusterFS basic unit of storage, represented by an
-    export directory on a server in the trusted storage pool. A Brick is
-    expressed by combining a server with an export directory in the
-    following format:
-
-    `SERVER:EXPORT`
-
-    For example:
-
-    `myhostname:/exports/myexportdir/`
-
-Cluster
-:   A cluster is a group of linked computers, working together closely
-    thus in many respects forming a single computer.
-
-Distributed File System
-:   A file system that allows multiple clients to concurrently access
-    data over a computer network.
-
-Filesystem
-:   A method of storing and organizing computer files and their data.
-    Essentially, it organizes these files into a database for the
-    storage, organization, manipulation, and retrieval by the computer's
-    operating system.
-
-    Source: [Wikipedia][]
-
-FUSE
-:   Filesystem in Userspace (FUSE) is a loadable kernel module for
-    Unix-like computer operating systems that lets non-privileged users
-    create their own file systems without editing kernel code. This is
-    achieved by running file system code in user space while the FUSE
-    module provides only a "bridge" to the actual kernel interfaces.
-
-    Source: [Wikipedia][1]
-
-Geo-Replication
-:   Geo-replication provides a continuous, asynchronous, and incremental
-    replication service from site to another over Local Area Networks
-    (LAN), Wide Area Network (WAN), and across the Internet.
-
-glusterd
-:   The Gluster management daemon that needs to run on all servers in
-    the trusted storage pool.
-
-Metadata
-:   Metadata is data providing information about one or more other
-    pieces of data.
-
-Namespace
-:   Namespace is an abstract container or environment created to hold a
-    logical grouping of unique identifiers or symbols. Each Gluster
-    volume exposes a single namespace as a POSIX mount point that
-    contains every file in the cluster.
-
-Open Source
-:   Open source describes practices in production and development that
-    promote access to the end product's source materials. Some consider
-    open source a philosophy, others consider it a pragmatic
-    methodology.
-
-    Before the term open source became widely adopted, developers and
-    producers used a variety of phrases to describe the concept; open
-    source gained hold with the rise of the Internet, and the attendant
-    need for massive retooling of the computing source code.
-
-    Opening the source code enabled a self-enhancing diversity of
-    production models, communication paths, and interactive communities.
-    Subsequently, a new, three-word phrase "open source software" was
-    born to describe the environment that the new copyright, licensing,
-    domain, and consumer issues created.
-
-    Source: [Wikipedia][2]
-
-Petabyte
-:   A petabyte (derived from the SI prefix peta- ) is a unit of
-    information equal to one quadrillion (short scale) bytes, or 1000
-    terabytes. The unit symbol for the petabyte is PB. The prefix peta-
-    (P) indicates a power of 1000:
-
-    1 PB = 1,000,000,000,000,000 B = 10005 B = 1015 B.
-
-    The term "pebibyte" (PiB), using a binary prefix, is used for the
-    corresponding power of 1024.
-
-    Source: [Wikipedia][3]
-
-POSIX
-:   Portable Operating System Interface (for Unix) is the name of a
-    family of related standards specified by the IEEE to define the
-    application programming interface (API), along with shell and
-    utilities interfaces for software compatible with variants of the
-    Unix operating system. Gluster exports a fully POSIX compliant file
-    system.
-
-RAID
-:   Redundant Array of Inexpensive Disks (RAID) is a technology that
-    provides increased storage reliability through redundancy, combining
-    multiple low-cost, less-reliable disk drives components into a
-    logical unit where all drives in the array are interdependent.
-
-RRDNS
-:   Round Robin Domain Name Service (RRDNS) is a method to distribute
-    load across application servers. RRDNS is implemented by creating
-    multiple A records with the same name and different IP addresses in
-    the zone file of a DNS server.
-
-Trusted Storage Pool
-:   A storage pool is a trusted network of storage servers. When you
-    start the first server, the storage pool consists of that server
-    alone.
-
-Userspace
-:   Applications running in user space don’t directly interact with
-    hardware, instead using the kernel to moderate access. Userspace
-    applications are generally more portable than applications in kernel
-    space. Gluster is a user space application.
-
-Volfile
-:   Volfile is a configuration file used by glusterfs process. Volfile
-    will be usually located at `/var/lib/glusterd/vols/VOLNAME`.
-
-Volume
-:   A volume is a logical collection of bricks. Most of the gluster
-    management operations happen on the volume.
-
-  [Wikipedia]: http://en.wikipedia.org/wiki/Filesystem
-  [1]: http://en.wikipedia.org/wiki/Filesystem_in_Userspace
-  [2]: http://en.wikipedia.org/wiki/Open_source
-  [3]: http://en.wikipedia.org/wiki/Petabyte
diff --git a/doc/authentication.txt b/doc/authentication.txt
index 73cb21d73..70aafd933 100644
--- a/doc/authentication.txt
+++ b/doc/authentication.txt
@@ -48,7 +48,7 @@
       protocol/client:
 	option remote-subvolume foo-brick
 	* Client is connecting from a.b.c.d
-
+      
       protocol/server:
 	option auth.addr.foo-brick.allow a.b.c.d,e.f.g.h,i.j.k.l #, other ip addresses from which clients are allowed to connect to foo-brick
 
@@ -79,19 +79,19 @@
   * reject only "user shoo from a.b.c.d"
     protcol/client:
 	option remote-subvolume shoo-brick
-
+    
     protocol/server:
 	# observe that no "option auth.login.shoo-brick.allow shoo" given
 	# Also other users from a.b.c.d have to be explicitly allowed using auth.login.shoo-brick.allow ...
 	option auth.addr.shoo-brick.allow !a.b.c.d
 
-  * reject only "user shoo" from a.b.c.d i.e., user shoo from a.b.c.d has to be rejected.
+  * reject only "user shoo" from a.b.c.d i.e., user shoo from a.b.c.d has to be rejected. 
     * same as reject only "user shoo from a.b.c.d" above, but rules have to be added whether to allow ip addresses (and users from those ips) other than a.b.c.d
 
 ****************************************************************************************************
 
 * ip or username/password based authentication
-
+  
   * allow user foo or clients from a.b.c.d
     protocol/client:
 	option remote-subvolume foo-brick
@@ -104,7 +104,7 @@
   * reject user shoo or clients from a.b.c.d
     protocol/client:
 	option remote-subvolume shoo-brick
-
+   
     protocol/server:
 	option auth.login.shoo-brick.allow <usernames other than shoo>
 	#for each username mentioned in the above <usernames other than shoo> list, specify password as below
diff --git a/doc/legacy/booster.txt b/doc/booster.txt
index 051401a28..684ac8965 100644
--- a/doc/legacy/booster.txt
+++ b/doc/booster.txt
@@ -1,6 +1,6 @@
 Introduction
 ============
-* booster is a LD_PRELOADable library which boosts read/write performance by bypassing fuse for
+* booster is a LD_PRELOADable library which boosts read/write performance by bypassing fuse for 
   read() and write() calls.
 
 Requirements
@@ -14,29 +14,29 @@ Design
   * contents of client volume-file.
   * mount point.
 
-* LD_PRELOADed booster.so maintains an hash table storing mount-points and libglusterfsclient handles
-  so that handles are reused for files from same mount point.
+* LD_PRELOADed booster.so maintains an hash table storing mount-points and libglusterfsclient handles 
+  so that handles are reused for files from same mount point. 
 
 * it also maintains a fdtable. fdtable maps the fd (integer) returned to application to fd (pointer to fd struct)
   used by libglusterfsclient. application is returned the same fd as the one returned from libc apis.
 
 * During fork, these tables are overwritten to enable creation of fresh glusterfs context in child.
-
+ 
 Working
 =======
-* application willing to use booster LD_PRELOADs booster.so which is a wrapper library implementing
+* application willing to use booster LD_PRELOADs booster.so which is a wrapper library implementing 
   open, read and write.
 
-* application should specify the path to logfile through the environment variable GLFS_BOOSTER_LOGFILE. If
+* application should specify the path to logfile through the environment variable GLFS_BOOSTER_LOGFILE. If 
   not specified, logging is done to /dev/stderr.
 
 * open call does,
   * real_open on the file.
   * fgetxattr(fd).
-  * store the volume-file content got in the dictionary to a temporary file.
-  * look in the hashtable for the mount-point, if already present get the libglusterfsclient handle from the
-    hashtable. Otherwise get a new handle from libglusterfsclient (be careful about mount point not present in
-    the hashtable and multiple glusterfs_inits running simultaneously for the same mount-point there by using
+  * store the volume-file content got in the dictionary to a temparory file.
+  * look in the hashtable for the mount-point, if already present get the libglusterfsclient handle from the 
+    hashtable. Otherwise get a new handle from libglusterfsclient (be careful about mount point not present in 
+    the hashtable and multiple glusterfs_inits running simultaneously for the same mount-point there by using 
     multiple handles for the same mount point).
   * real_close (fd).
   * delete temporary volume-volfile.
@@ -51,4 +51,4 @@ Working
 * close call does,
   * remove the fd from the fdtable.
 
-* other calls use real_calls.
+* other calls use real_calls. 
diff --git a/doc/coding-standard.tex b/doc/coding-standard.tex
index 30d412a91..92f799c01 100644
--- a/doc/coding-standard.tex
+++ b/doc/coding-standard.tex
@@ -27,7 +27,7 @@ purpose. The comment should be descriptive without being overly verbose.
 \textsl{Good}:
 
 \begin{verbatim}
-        DBTYPE      access_mode;    /* access mode for accessing
+        DBTYPE      access_mode;    /* access mode for accessing 
                                      * the databases, can be
                                      * DB_HASH, DB_BTREE
                                      * (option access-mode <mode>)
@@ -69,7 +69,7 @@ Never use a non-constant expression as the initialization value for a variable.
 
 \section*{$\bullet$ Validate all arguments to a function}
 All pointer arguments to a function must be checked for \texttt{NULL}.
-A macro named \texttt{VALIDATE} (in \texttt{common-utils.h})
+A macro named \texttt{VALIDATE} (in \texttt{common-utils.h}) 
 takes one argument, and if it is \texttt{NULL}, writes a log message and
 jumps to a label called \texttt{err} after setting op\_ret and op\_errno
 appropriately. It is recommended to use this template.
@@ -142,8 +142,8 @@ for success or failure.
 \begin{verbatim}
         op_ret = close (_fd);
         if (op_ret == -1) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "close on file %s failed (%s)", real_path,
+                gf_log (this->name, GF_LOG_ERROR, 
+                        "close on file %s failed (%s)", real_path, 
                         strerror (errno));
                 op_errno = errno;
                 goto out;
@@ -157,9 +157,9 @@ memory allocation fails, the call should be unwound and an error
 returned to the user.
 
 \section*{$\bullet$ Use result args and reserve the return value to indicate success or failure}
-The return value of every functions must indicate success or failure (unless
-it is impossible for the function to fail --- e.g., boolean functions). If
-the function needs to return additional data, it must be returned using a
+The return value of every functions must indicate success or failure (unless 
+it is impossible for the function to fail --- e.g., boolean functions). If 
+the function needs to return additional data, it must be returned using a 
 result (pointer) argument.
 
 \vspace{2ex}
@@ -192,11 +192,11 @@ Unless impossible, use the length-limited versions of the string functions.
 \end{verbatim}
 
 \section*{$\bullet$ No dead or commented code}
-There must be no dead code (code to which control can never be passed) or
+There must be no dead code (code to which control can never be passed) or 
 commented out code in the codebase.
 
 \section*{$\bullet$ Only one unwind and return per function}
-There must be only one exit out of a function. \texttt{UNWIND} and return
+There must be only one exit out of a function. \texttt{UNWIND} and return 
 should happen at only point in the function.
 
 \section*{$\bullet$ Function length or Keep functions small}
@@ -305,7 +305,7 @@ documentation.
 \end{verbatim}
 
 \subsection*{Indicating critical sections}
-To clearly show regions of code which execute with locks held, use
+To clearly show regions of code which execute with locks held, use 
 the following format:
 
 \begin{verbatim}
@@ -324,7 +324,7 @@ point, \texttt{out}.  At that point, the code should detect the error
 that has occured and do appropriate cleanup.
 
 \begin{verbatim}
-int32_t
+int32_t 
 sample_fop (call_frame_t *frame, xlator_t *this, ...)
 {
         char *            var1     = NULL;
@@ -337,13 +337,13 @@ sample_fop (call_frame_t *frame, xlator_t *this, ...)
         VALIDATE_OR_GOTO (this, out);
 
         /* other validations */
-
+        
         dir = opendir (...);
 
         if (dir == NULL) {
                 op_errno = errno;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "opendir failed on %s (%s)", loc->path,
+                gf_log (this->name, GF_LOG_ERROR, 
+                        "opendir failed on %s (%s)", loc->path, 
                         strerror (op_errno));
                 goto out;
         }
@@ -367,10 +367,11 @@ sample_fop (call_frame_t *frame, xlator_t *this, ...)
                 if (dir) {
                         closedir (dir);
                         dir = NULL;
-                }
-
+                }     
+        
                 if (pfd) {
-                        FREE (pfd->path);
+                        if (pfd->path)
+                                FREE (pfd->path);
                         FREE (pfd);
                         pfd = NULL;
                 }
diff --git a/doc/legacy/errno.list.bsd.txt b/doc/errno.list.bsd.txt
index 350af25e4..350af25e4 100644
--- a/doc/legacy/errno.list.bsd.txt
+++ b/doc/errno.list.bsd.txt
diff --git a/doc/legacy/errno.list.linux.txt b/doc/errno.list.linux.txt
index cc868644b..baa50792d 100644
--- a/doc/legacy/errno.list.linux.txt
+++ b/doc/errno.list.linux.txt
@@ -95,7 +95,7 @@ extern "C" {
 
 /**
  * @defgroup apr_errno Error Codes
- * @ingroup APR
+ * @ingroup APR 
  * @{
  */
 
@@ -110,7 +110,7 @@ typedef int apr_status_t;
  * @param buf A buffer to hold the error string.
  * @param bufsize Size of the buffer to hold the string.
  */
-APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
+APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, 
                                  apr_size_t bufsize);
 
 #if defined(DOXYGEN)
@@ -130,7 +130,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * Fold an apr_status_t code back to the native platform defined error.
  * @param e The apr_status_t folded platform os error code.
  * @warning  macro implementation; the statcode argument may be evaluated
- *      multiple times.  If the statcode was not created by apr_get_os_error
+ *      multiple times.  If the statcode was not created by apr_get_os_error 
  *      or APR_FROM_OS_ERROR, the results are undefined.
  */
 #define APR_TO_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
@@ -166,7 +166,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * @warning This is a macro implementation; the statcode argument may be evaluated
  *      multiple times.  If the statcode was not created by apr_get_os_error
  *      or APR_FROM_OS_ERROR, the results are undefined.  This macro sets
- *      errno, or calls a WSASetLastError() style function, unfolding
+ *      errno, or calls a WSASetLastError() style function, unfolding 
  *      socketcode with APR_TO_OS_ERROR.
  */
 
@@ -206,12 +206,12 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_OS_START_CANONERR  (APR_OS_START_USERERR \
                                  + (APR_OS_ERRSPACE_SIZE * 10))
 /**
- * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into
+ * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into 
  *     apr_status_t values.
  */
 #define APR_OS_START_EAIERR    (APR_OS_START_CANONERR + APR_OS_ERRSPACE_SIZE)
 /**
- * APR_OS_START_SYSERR folds platform-specific system error values into
+ * APR_OS_START_SYSERR folds platform-specific system error values into 
  *     apr_status_t values.
  */
 #define APR_OS_START_SYSERR    (APR_OS_START_EAIERR + APR_OS_ERRSPACE_SIZE)
@@ -219,13 +219,13 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** no error. */
 #define APR_SUCCESS 0
 
-/**
+/** 
  * @defgroup APR_Error APR Error Values
  * <PRE>
  * <b>APR ERROR VALUES</b>
- * APR_ENOSTAT      APR was unable to perform a stat on the file
+ * APR_ENOSTAT      APR was unable to perform a stat on the file 
  * APR_ENOPOOL      APR was not provided a pool with which to allocate memory
- * APR_EBADDATE     APR was given an invalid date
+ * APR_EBADDATE     APR was given an invalid date 
  * APR_EINVALSOCK   APR was given an invalid socket
  * APR_ENOPROC      APR was not given a process structure
  * APR_ENOTIME      APR was not given a time structure
@@ -236,7 +236,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * APR_ENOTHREAD    APR was not given a thread structure
  * APR_ENOTHDKEY    APR was not given a thread key structure
  * APR_ENOSHMAVAIL  There is no more shared memory available
- * APR_EDSOOPEN     APR was unable to open the dso object.  For more
+ * APR_EDSOOPEN     APR was unable to open the dso object.  For more 
  *                  information call apr_dso_error().
  * APR_EGENERAL     General failure (specific information not available)
  * APR_EBADIP       The specified IP address is invalid
@@ -256,17 +256,17 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * APR_INCOMPLETE     The operation was incomplete although some processing
  *                    was performed and the results are partially valid
  * APR_BADCH          Getopt found an option not in the option string
- * APR_BADARG         Getopt found an option that is missing an argument
+ * APR_BADARG         Getopt found an option that is missing an argument 
  *                    and an argument was specified in the option string
  * APR_EOF            APR has encountered the end of the file
  * APR_NOTFOUND       APR was unable to find the socket in the poll structure
  * APR_ANONYMOUS      APR is using anonymous shared memory
  * APR_FILEBASED      APR is using a file name as the key to the shared memory
  * APR_KEYBASED       APR is using a shared key as the key to the shared memory
- * APR_EINIT          Ininitalizer value.  If no option has been found, but
+ * APR_EINIT          Ininitalizer value.  If no option has been found, but 
  *                    the status variable requires a value, this should be used
- * APR_ENOTIMPL       The APR function has not been implemented on this
- *                    platform, either because nobody has gotten to it yet,
+ * APR_ENOTIMPL       The APR function has not been implemented on this 
+ *                    platform, either because nobody has gotten to it yet, 
  *                    or the function is impossible on this platform.
  * APR_EMISMATCH      Two passwords do not match.
  * APR_EABSOLUTE      The given path was absolute.
@@ -334,7 +334,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_ENOTENOUGHENTROPY (APR_OS_START_ERROR + 28)
 /** @} */
 
-/**
+/** 
  * @defgroup APR_STATUS_IS Status Value Tests
  * @warning For any particular error condition, more than one of these tests
  *      may match. This is because platform-specific error codes may not
@@ -345,16 +345,16 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  *      adjust the order of the tests accordingly.
  * @{
  */
-/**
- * APR was unable to perform a stat on the file
+/** 
+ * APR was unable to perform a stat on the file 
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_ENOSTAT(s)        ((s) == APR_ENOSTAT)
-/**
- * APR was not provided a pool with which to allocate memory
+/** 
+ * APR was not provided a pool with which to allocate memory 
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_ENOPOOL(s)        ((s) == APR_ENOPOOL)
 /** APR was given an invalid date  */
@@ -386,8 +386,8 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** The specified netmask is invalid */
 #define APR_STATUS_IS_EBADMASK(s)       ((s) == APR_EBADMASK)
 /* empty slot: +18 */
-/**
- * APR was unable to open the dso object.
+/** 
+ * APR was unable to open the dso object.  
  * For more information call apr_dso_error().
  */
 #if defined(WIN32)
@@ -425,7 +425,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 
 /** @} */
 
-/**
+/** 
  * @addtogroup APR_Error
  * @{
  */
@@ -466,7 +466,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** @see APR_STATUS_IS_KEYBASED */
 #define APR_KEYBASED       (APR_OS_START_STATUS + 21)
 /** @see APR_STATUS_IS_EINIT */
-#define APR_EINIT          (APR_OS_START_STATUS + 22)
+#define APR_EINIT          (APR_OS_START_STATUS + 22)  
 /** @see APR_STATUS_IS_ENOTIMPL */
 #define APR_ENOTIMPL       (APR_OS_START_STATUS + 23)
 /** @see APR_STATUS_IS_EMISMATCH */
@@ -475,156 +475,156 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_EBUSY          (APR_OS_START_STATUS + 25)
 /** @} */
 
-/**
+/** 
  * @addtogroup APR_STATUS_IS
  * @{
  */
-/**
- * Program is currently executing in the child
+/** 
+ * Program is currently executing in the child 
  * @warning
  * always use this test, as platform-specific variances may meet this
  * more than one error code */
 #define APR_STATUS_IS_INCHILD(s)        ((s) == APR_INCHILD)
-/**
- * Program is currently executing in the parent
+/** 
+ * Program is currently executing in the parent 
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_INPARENT(s)       ((s) == APR_INPARENT)
-/**
- * The thread is detached
+/** 
+ * The thread is detached 
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_DETACH(s)         ((s) == APR_DETACH)
-/**
- * The thread is not detached
+/** 
+ * The thread is not detached 
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_NOTDETACH(s)      ((s) == APR_NOTDETACH)
-/**
+/** 
  * The child has finished executing
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_CHILD_DONE(s)     ((s) == APR_CHILD_DONE)
-/**
+/** 
  * The child has not finished executing
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_CHILD_NOTDONE(s)  ((s) == APR_CHILD_NOTDONE)
-/**
+/** 
  * The operation did not finish before the timeout
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP)
-/**
+/** 
  * The operation was incomplete although some processing was performed
  * and the results are partially valid.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_INCOMPLETE(s)     ((s) == APR_INCOMPLETE)
 /* empty slot: +9 */
 /* empty slot: +10 */
 /* empty slot: +11 */
-/**
+/** 
  * Getopt found an option not in the option string
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_BADCH(s)          ((s) == APR_BADCH)
-/**
- * Getopt found an option not in the option string and an argument was
+/** 
+ * Getopt found an option not in the option string and an argument was 
  * specified in the option string
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_BADARG(s)         ((s) == APR_BADARG)
-/**
+/** 
  * APR has encountered the end of the file
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_EOF(s)            ((s) == APR_EOF)
-/**
+/** 
  * APR was unable to find the socket in the poll structure
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_NOTFOUND(s)       ((s) == APR_NOTFOUND)
 /* empty slot: +16 */
 /* empty slot: +17 */
 /* empty slot: +18 */
-/**
+/** 
  * APR is using anonymous shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_ANONYMOUS(s)      ((s) == APR_ANONYMOUS)
-/**
+/** 
  * APR is using a file name as the key to the shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_FILEBASED(s)      ((s) == APR_FILEBASED)
-/**
+/** 
  * APR is using a shared key as the key to the shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_KEYBASED(s)       ((s) == APR_KEYBASED)
-/**
- * Ininitalizer value.  If no option has been found, but
+/** 
+ * Ininitalizer value.  If no option has been found, but 
  * the status variable requires a value, this should be used
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_EINIT(s)          ((s) == APR_EINIT)
-/**
- * The APR function has not been implemented on this
- * platform, either because nobody has gotten to it yet,
+/** 
+ * The APR function has not been implemented on this 
+ * platform, either because nobody has gotten to it yet, 
  * or the function is impossible on this platform.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_ENOTIMPL(s)       ((s) == APR_ENOTIMPL)
-/**
+/** 
  * Two passwords do not match.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_EMISMATCH(s)      ((s) == APR_EMISMATCH)
-/**
+/** 
  * The given lock was busy
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_EBUSY(s)          ((s) == APR_EBUSY)
 
 /** @} */
 
-/**
+/** 
  * @addtogroup APR_Error APR Error Values
  * @{
  */
@@ -713,8 +713,8 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_ESPIPE         (APR_OS_START_CANONERR + 12)
 #endif
 
-/**
- * @see APR_STATUS_IS_EAGAIN
+/** 
+ * @see APR_STATUS_IS_EAGAIN 
  * @warning use APR_STATUS_IS_EAGAIN instead of just testing this value
  */
 #ifdef EAGAIN
@@ -753,7 +753,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_EINPROGRESS    (APR_OS_START_CANONERR + 17)
 #endif
 
-/**
+/** 
  * @see APR_STATUS_IS_ECONNABORTED
  * @warning use APR_STATUS_IS_ECONNABORTED instead of just testing this value
  */
@@ -771,7 +771,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_ECONNRESET     (APR_OS_START_CANONERR + 19)
 #endif
 
-/** @see APR_STATUS_IS_ETIMEDOUT
+/** @see APR_STATUS_IS_ETIMEDOUT 
  *  @deprecated */
 #ifdef ETIMEDOUT
 #define APR_ETIMEDOUT ETIMEDOUT
@@ -849,7 +849,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  */
 #define APR_OS2_STATUS(e) (APR_FROM_OS_ERROR(e))
 
-/* These can't sit in a private header, so in spite of the extra size,
+/* These can't sit in a private header, so in spite of the extra size, 
  * they need to be made available here.
  */
 #define SOCBASEERR              10000
@@ -946,10 +946,10 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
                 || (s) == APR_OS_START_SYSERR + SOCECONNRESET)
 /* XXX deprecated */
 #define APR_STATUS_IS_ETIMEDOUT(s)         ((s) == APR_ETIMEDOUT \
-                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
+                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)    
 #undef APR_STATUS_IS_TIMEUP
 #define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP \
-                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
+                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)    
 #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
                 || (s) == APR_OS_START_SYSERR + SOCEHOSTUNREACH)
 #define APR_STATUS_IS_ENETUNREACH(s)    ((s) == APR_ENETUNREACH \
@@ -1182,7 +1182,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define apr_get_netos_error() (errno)
 #define apr_set_netos_error(e) (errno = (e))
 
-/**
+/** 
  * @addtogroup APR_STATUS_IS
  * @{
  */
@@ -1246,15 +1246,15 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** operation now in progress */
 #define APR_STATUS_IS_EINPROGRESS(s)    ((s) == APR_EINPROGRESS)
 
-/**
- * Software caused connection abort
+/** 
+ * Software caused connection abort 
  * @remark
- * EPROTO on certain older kernels really means ECONNABORTED, so we need to
+ * EPROTO on certain older kernels really means ECONNABORTED, so we need to 
  * ignore it for them.  See discussion in new-httpd archives nh.9701 & nh.9603
  *
- * There is potentially a bug in Solaris 2.x x<6, and other boxes that
+ * There is potentially a bug in Solaris 2.x x<6, and other boxes that 
  * implement tcp sockets in userland (i.e. on top of STREAMS).  On these
- * systems, EPROTO can actually result in a fatal loop.  See PR#981 for
+ * systems, EPROTO can actually result in a fatal loop.  See PR#981 for 
  * example.  It's hard to handle both uses of EPROTO.
  */
 #ifdef EPROTO
diff --git a/doc/legacy/errno.list.macosx.txt b/doc/errno.list.macosx.txt
index 4954e03d8..728753ac7 100644
--- a/doc/legacy/errno.list.macosx.txt
+++ b/doc/errno.list.macosx.txt
@@ -34,7 +34,7 @@ extern "C" {
 
 /**
  * @defgroup apr_errno Error Codes
- * @ingroup APR
+ * @ingroup APR 
  * @{
  */
 
@@ -49,7 +49,7 @@ typedef int apr_status_t;
  * @param buf A buffer to hold the error string.
  * @param bufsize Size of the buffer to hold the string.
  */
-APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
+APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, 
                                  apr_size_t bufsize);
 
 #if defined(DOXYGEN)
@@ -69,7 +69,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * Fold an apr_status_t code back to the native platform defined error.
  * @param e The apr_status_t folded platform os error code.
  * @warning  macro implementation; the statcode argument may be evaluated
- *      multiple times.  If the statcode was not created by apr_get_os_error
+ *      multiple times.  If the statcode was not created by apr_get_os_error 
  *      or APR_FROM_OS_ERROR, the results are undefined.
  */
 #define APR_TO_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
@@ -105,7 +105,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * @warning This is a macro implementation; the statcode argument may be evaluated
  *      multiple times.  If the statcode was not created by apr_get_os_error
  *      or APR_FROM_OS_ERROR, the results are undefined.  This macro sets
- *      errno, or calls a WSASetLastError() style function, unfolding
+ *      errno, or calls a WSASetLastError() style function, unfolding 
  *      socketcode with APR_TO_OS_ERROR.
  */
 
@@ -145,12 +145,12 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_OS_START_CANONERR  (APR_OS_START_USERERR \
                                  + (APR_OS_ERRSPACE_SIZE * 10))
 /**
- * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into
+ * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into 
  *     apr_status_t values.
  */
 #define APR_OS_START_EAIERR    (APR_OS_START_CANONERR + APR_OS_ERRSPACE_SIZE)
 /**
- * APR_OS_START_SYSERR folds platform-specific system error values into
+ * APR_OS_START_SYSERR folds platform-specific system error values into 
  *     apr_status_t values.
  */
 #define APR_OS_START_SYSERR    (APR_OS_START_EAIERR + APR_OS_ERRSPACE_SIZE)
@@ -158,13 +158,13 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** no error. */
 #define APR_SUCCESS 0
 
-/**
+/** 
  * @defgroup APR_Error APR Error Values
  * <PRE>
  * <b>APR ERROR VALUES</b>
- * APR_ENOSTAT      APR was unable to perform a stat on the file
+ * APR_ENOSTAT      APR was unable to perform a stat on the file 
  * APR_ENOPOOL      APR was not provided a pool with which to allocate memory
- * APR_EBADDATE     APR was given an invalid date
+ * APR_EBADDATE     APR was given an invalid date 
  * APR_EINVALSOCK   APR was given an invalid socket
  * APR_ENOPROC      APR was not given a process structure
  * APR_ENOTIME      APR was not given a time structure
@@ -175,7 +175,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * APR_ENOTHREAD    APR was not given a thread structure
  * APR_ENOTHDKEY    APR was not given a thread key structure
  * APR_ENOSHMAVAIL  There is no more shared memory available
- * APR_EDSOOPEN     APR was unable to open the dso object.  For more
+ * APR_EDSOOPEN     APR was unable to open the dso object.  For more 
  *                  information call apr_dso_error().
  * APR_EGENERAL     General failure (specific information not available)
  * APR_EBADIP       The specified IP address is invalid
@@ -195,17 +195,17 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * APR_INCOMPLETE     The operation was incomplete although some processing
  *                    was performed and the results are partially valid
  * APR_BADCH          Getopt found an option not in the option string
- * APR_BADARG         Getopt found an option that is missing an argument
+ * APR_BADARG         Getopt found an option that is missing an argument 
  *                    and an argument was specified in the option string
  * APR_EOF            APR has encountered the end of the file
  * APR_NOTFOUND       APR was unable to find the socket in the poll structure
  * APR_ANONYMOUS      APR is using anonymous shared memory
  * APR_FILEBASED      APR is using a file name as the key to the shared memory
  * APR_KEYBASED       APR is using a shared key as the key to the shared memory
- * APR_EINIT          Ininitalizer value.  If no option has been found, but
+ * APR_EINIT          Ininitalizer value.  If no option has been found, but 
  *                    the status variable requires a value, this should be used
- * APR_ENOTIMPL       The APR function has not been implemented on this
- *                    platform, either because nobody has gotten to it yet,
+ * APR_ENOTIMPL       The APR function has not been implemented on this 
+ *                    platform, either because nobody has gotten to it yet, 
  *                    or the function is impossible on this platform.
  * APR_EMISMATCH      Two passwords do not match.
  * APR_EABSOLUTE      The given path was absolute.
@@ -273,7 +273,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_ENOTENOUGHENTROPY (APR_OS_START_ERROR + 28)
 /** @} */
 
-/**
+/** 
  * @defgroup APR_STATUS_IS Status Value Tests
  * @warning For any particular error condition, more than one of these tests
  *      may match. This is because platform-specific error codes may not
@@ -284,16 +284,16 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  *      adjust the order of the tests accordingly.
  * @{
  */
-/**
- * APR was unable to perform a stat on the file
+/** 
+ * APR was unable to perform a stat on the file 
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_ENOSTAT(s)        ((s) == APR_ENOSTAT)
-/**
- * APR was not provided a pool with which to allocate memory
+/** 
+ * APR was not provided a pool with which to allocate memory 
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_ENOPOOL(s)        ((s) == APR_ENOPOOL)
 /** APR was given an invalid date  */
@@ -325,8 +325,8 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** The specified netmask is invalid */
 #define APR_STATUS_IS_EBADMASK(s)       ((s) == APR_EBADMASK)
 /* empty slot: +18 */
-/**
- * APR was unable to open the dso object.
+/** 
+ * APR was unable to open the dso object.  
  * For more information call apr_dso_error().
  */
 #if defined(WIN32)
@@ -364,7 +364,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 
 /** @} */
 
-/**
+/** 
  * @addtogroup APR_Error
  * @{
  */
@@ -405,7 +405,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** @see APR_STATUS_IS_KEYBASED */
 #define APR_KEYBASED       (APR_OS_START_STATUS + 21)
 /** @see APR_STATUS_IS_EINIT */
-#define APR_EINIT          (APR_OS_START_STATUS + 22)
+#define APR_EINIT          (APR_OS_START_STATUS + 22)  
 /** @see APR_STATUS_IS_ENOTIMPL */
 #define APR_ENOTIMPL       (APR_OS_START_STATUS + 23)
 /** @see APR_STATUS_IS_EMISMATCH */
@@ -414,156 +414,156 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_EBUSY          (APR_OS_START_STATUS + 25)
 /** @} */
 
-/**
+/** 
  * @addtogroup APR_STATUS_IS
  * @{
  */
-/**
- * Program is currently executing in the child
+/** 
+ * Program is currently executing in the child 
  * @warning
  * always use this test, as platform-specific variances may meet this
  * more than one error code */
 #define APR_STATUS_IS_INCHILD(s)        ((s) == APR_INCHILD)
-/**
- * Program is currently executing in the parent
+/** 
+ * Program is currently executing in the parent 
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_INPARENT(s)       ((s) == APR_INPARENT)
-/**
- * The thread is detached
+/** 
+ * The thread is detached 
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_DETACH(s)         ((s) == APR_DETACH)
-/**
- * The thread is not detached
+/** 
+ * The thread is not detached 
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_NOTDETACH(s)      ((s) == APR_NOTDETACH)
-/**
+/** 
  * The child has finished executing
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_CHILD_DONE(s)     ((s) == APR_CHILD_DONE)
-/**
+/** 
  * The child has not finished executing
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_CHILD_NOTDONE(s)  ((s) == APR_CHILD_NOTDONE)
-/**
+/** 
  * The operation did not finish before the timeout
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP)
-/**
+/** 
  * The operation was incomplete although some processing was performed
  * and the results are partially valid.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_INCOMPLETE(s)     ((s) == APR_INCOMPLETE)
 /* empty slot: +9 */
 /* empty slot: +10 */
 /* empty slot: +11 */
-/**
+/** 
  * Getopt found an option not in the option string
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_BADCH(s)          ((s) == APR_BADCH)
-/**
- * Getopt found an option not in the option string and an argument was
+/** 
+ * Getopt found an option not in the option string and an argument was 
  * specified in the option string
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_BADARG(s)         ((s) == APR_BADARG)
-/**
+/** 
  * APR has encountered the end of the file
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_EOF(s)            ((s) == APR_EOF)
-/**
+/** 
  * APR was unable to find the socket in the poll structure
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_NOTFOUND(s)       ((s) == APR_NOTFOUND)
 /* empty slot: +16 */
 /* empty slot: +17 */
 /* empty slot: +18 */
-/**
+/** 
  * APR is using anonymous shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_ANONYMOUS(s)      ((s) == APR_ANONYMOUS)
-/**
+/** 
  * APR is using a file name as the key to the shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_FILEBASED(s)      ((s) == APR_FILEBASED)
-/**
+/** 
  * APR is using a shared key as the key to the shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_KEYBASED(s)       ((s) == APR_KEYBASED)
-/**
- * Ininitalizer value.  If no option has been found, but
+/** 
+ * Ininitalizer value.  If no option has been found, but 
  * the status variable requires a value, this should be used
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_EINIT(s)          ((s) == APR_EINIT)
-/**
- * The APR function has not been implemented on this
- * platform, either because nobody has gotten to it yet,
+/** 
+ * The APR function has not been implemented on this 
+ * platform, either because nobody has gotten to it yet, 
  * or the function is impossible on this platform.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_ENOTIMPL(s)       ((s) == APR_ENOTIMPL)
-/**
+/** 
  * Two passwords do not match.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_EMISMATCH(s)      ((s) == APR_EMISMATCH)
-/**
+/** 
  * The given lock was busy
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code 
  */
 #define APR_STATUS_IS_EBUSY(s)          ((s) == APR_EBUSY)
 
 /** @} */
 
-/**
+/** 
  * @addtogroup APR_Error APR Error Values
  * @{
  */
@@ -652,8 +652,8 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_ESPIPE         (APR_OS_START_CANONERR + 12)
 #endif
 
-/**
- * @see APR_STATUS_IS_EAGAIN
+/** 
+ * @see APR_STATUS_IS_EAGAIN 
  * @warning use APR_STATUS_IS_EAGAIN instead of just testing this value
  */
 #ifdef EAGAIN
@@ -692,7 +692,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_EINPROGRESS    (APR_OS_START_CANONERR + 17)
 #endif
 
-/**
+/** 
  * @see APR_STATUS_IS_ECONNABORTED
  * @warning use APR_STATUS_IS_ECONNABORTED instead of just testing this value
  */
@@ -710,7 +710,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_ECONNRESET     (APR_OS_START_CANONERR + 19)
 #endif
 
-/** @see APR_STATUS_IS_ETIMEDOUT
+/** @see APR_STATUS_IS_ETIMEDOUT 
  *  @deprecated */
 #ifdef ETIMEDOUT
 #define APR_ETIMEDOUT ETIMEDOUT
@@ -788,7 +788,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  */
 #define APR_OS2_STATUS(e) (APR_FROM_OS_ERROR(e))
 
-/* These can't sit in a private header, so in spite of the extra size,
+/* These can't sit in a private header, so in spite of the extra size, 
  * they need to be made available here.
  */
 #define SOCBASEERR              10000
@@ -885,10 +885,10 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
                 || (s) == APR_OS_START_SYSERR + SOCECONNRESET)
 /* XXX deprecated */
 #define APR_STATUS_IS_ETIMEDOUT(s)         ((s) == APR_ETIMEDOUT \
-                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
+                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)    
 #undef APR_STATUS_IS_TIMEUP
 #define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP \
-                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
+                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)    
 #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
                 || (s) == APR_OS_START_SYSERR + SOCEHOSTUNREACH)
 #define APR_STATUS_IS_ENETUNREACH(s)    ((s) == APR_ENETUNREACH \
@@ -1121,7 +1121,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define apr_get_netos_error() (errno)
 #define apr_set_netos_error(e) (errno = (e))
 
-/**
+/** 
  * @addtogroup APR_STATUS_IS
  * @{
  */
@@ -1185,15 +1185,15 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** operation now in progress */
 #define APR_STATUS_IS_EINPROGRESS(s)    ((s) == APR_EINPROGRESS)
 
-/**
- * Software caused connection abort
+/** 
+ * Software caused connection abort 
  * @remark
- * EPROTO on certain older kernels really means ECONNABORTED, so we need to
+ * EPROTO on certain older kernels really means ECONNABORTED, so we need to 
  * ignore it for them.  See discussion in new-httpd archives nh.9701 & nh.9603
  *
- * There is potentially a bug in Solaris 2.x x<6, and other boxes that
+ * There is potentially a bug in Solaris 2.x x<6, and other boxes that 
  * implement tcp sockets in userland (i.e. on top of STREAMS).  On these
- * systems, EPROTO can actually result in a fatal loop.  See PR#981 for
+ * systems, EPROTO can actually result in a fatal loop.  See PR#981 for 
  * example.  It's hard to handle both uses of EPROTO.
  */
 #ifdef EPROTO
@@ -1236,14 +1236,14 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- *
+ * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * compliance with the License. Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this
  * file.
- *
+ * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -1251,7 +1251,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
+ * 
  * @APPLE_LICENSE_HEADER_END@
  */
 #include <sys/errno.h>
@@ -1261,7 +1261,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
+ * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -1270,10 +1270,10 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- *
+ * 
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
+ * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -1281,7 +1281,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
+ * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
@@ -1484,7 +1484,7 @@ __END_DECLS
 #define	ECANCELED	89		/* Operation canceled */
 
 #define EIDRM		90		/* Identifier removed */
-#define ENOMSG		91		/* No message of desired type */
+#define ENOMSG		91		/* No message of desired type */   
 #define EILSEQ		92		/* Illegal byte sequence */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #define ENOATTR		93		/* Attribute not found */
diff --git a/doc/legacy/errno.list.solaris.txt b/doc/errno.list.solaris.txt
index 23601e9d3..23601e9d3 100644
--- a/doc/legacy/errno.list.solaris.txt
+++ b/doc/errno.list.solaris.txt
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
new file mode 100644
index 000000000..b4c93f4c9
--- /dev/null
+++ b/doc/examples/Makefile.am
@@ -0,0 +1,8 @@
+EXTRA = README unify.vol replicate.vol stripe.vol protocol-client.vol protocol-server.vol posix-locks.vol trash.vol write-behind.vol io-threads.vol io-cache.vol read-ahead.vol filter.vol trace.vol
+EXTRA_DIST = $(EXTRA)
+
+docdir = $(datadir)/doc/$(PACKAGE_NAME)
+Examplesdir = $(docdir)/examples
+Examples_DATA = $(EXTRA)
+
+CLEANFILES = 
diff --git a/doc/examples/README b/doc/examples/README
new file mode 100644
index 000000000..4d472ac08
--- /dev/null
+++ b/doc/examples/README
@@ -0,0 +1,13 @@
+GlusterFS's translator feature is very flexible and there are quite a lot of ways one 
+can configure their filesystem to behave like. 
+
+Volume Specification is a way in which GlusterFS understands how it has to work, based 
+on what is written there. 
+
+Going through the following URLs may give you more idea about all these.
+
+* http://www.gluster.org/docs/index.php/GlusterFS
+* http://www.gluster.org/docs/index.php/GlusterFS_Volume_Specification
+* http://www.gluster.org/docs/index.php/GlusterFS_Translators
+
+Mail us any doubts, suggestions on 'gluster-devel(at)nongnu.org'
diff --git a/doc/examples/filter.vol b/doc/examples/filter.vol
new file mode 100644
index 000000000..ca5c59837
--- /dev/null
+++ b/doc/examples/filter.vol
@@ -0,0 +1,23 @@
+volume client
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 192.168.1.10      # IP address of the remote brick
+  option remote-subvolume brick        # name of the remote volume
+end-volume
+
+## In normal clustered storage type, any of the cluster translators can come here.
+#
+# Definition of other clients
+# 
+# Definition of cluster translator (may be unify, afr, or unify over afr)
+# 
+
+### 'Filter' translator is used on client side (or server side according to needs). This traslator makes all the below translators, (or say volumes) as read-only. Hence if one wants a 'read-only' filesystem, using filter as the top most volume will make it really fast as the fops are returned from this level itself.
+
+volume filter-ro
+ type features/filter
+ option root-squashing enable
+# option completely-read-only yes
+# translate-uid 1-99=0
+ subvolumes client
+end-volume
+\ No newline at end of file
diff --git a/doc/examples/io-cache.vol b/doc/examples/io-cache.vol
new file mode 100644
index 000000000..5f3eca4c5
--- /dev/null
+++ b/doc/examples/io-cache.vol
@@ -0,0 +1,25 @@
+volume client
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 192.168.1.10      # IP address of the remote brick
+  option remote-subvolume brick        # name of the remote volume
+end-volume
+
+## In normal clustered storage type, any of the cluster translators can come here.
+#
+# Definition of other clients
+# 
+# Definition of cluster translator (may be unify, replicate, or unify over replicate)
+# 
+
+### 'IO-Cache' translator is best used on client side when a filesystem has file which are not modified frequently but read several times. For example, while compiling a kernel, *.h files are read while compiling every *.c file, in these case, io-cache translator comes very handy, as it keeps the whole file content in the cache, and serves from the cache.
+# One can provide the priority of the cache too.
+
+volume ioc
+  type performance/io-cache
+  subvolumes client         # In this example it is 'client' you may have to change it according to your spec file.
+  option page-size 1MB      # 128KB is default
+  option cache-size 64MB    # 32MB is default
+  option force-revalidate-timeout 5 # 1second is default 
+  option priority *.html:2,*:1 # default is *:0
+end-volume
diff --git a/doc/examples/io-threads.vol b/doc/examples/io-threads.vol
new file mode 100644
index 000000000..9954724e1
--- /dev/null
+++ b/doc/examples/io-threads.vol
@@ -0,0 +1,21 @@
+
+volume brick
+  type storage/posix                   # POSIX FS translator
+  option directory /home/export        # Export this directory
+end-volume
+
+###  'IO-threads' translator gives a threading behaviour to File I/O calls. All other normal fops are having default behaviour. Loading this on server side helps to reduce the contension of network. (Which is assumed as a GlusterFS hang). 
+# One can load it in client side to reduce the latency involved in case of a slow network, when loaded below write-behind.
+volume iot
+  type performance/io-threads
+  subvolumes brick
+  option thread-count 4 # default value is 1
+end-volume
+
+volume server
+  type protocol/server
+  subvolumes iot brick
+  option transport-type tcp     # For TCP/IP transport
+  option auth.addr.brick.allow 192.168.* # Allow access to "brick" volume
+  option auth.addr.iot.allow 192.168.* # Allow access to "p-locks" volume
+end-volume
diff --git a/doc/examples/posix-locks.vol b/doc/examples/posix-locks.vol
new file mode 100644
index 000000000..b9c9e7a64
--- /dev/null
+++ b/doc/examples/posix-locks.vol
@@ -0,0 +1,20 @@
+
+volume brick
+  type storage/posix                   # POSIX FS translator
+  option directory /home/export        # Export this directory
+end-volume
+
+### 'Posix-locks' feature should be added on the server side (as posix volume as subvolume) because it contains the actual file. 
+volume p-locks
+  type features/posix-locks
+  subvolumes brick
+  option mandatory on
+end-volume
+
+volume server
+  type protocol/server
+  subvolumes p-locks brick
+  option transport-type tcp
+  option auth.addr.brick.allow 192.168.* # Allow access to "brick" volume
+  option auth.addr.p-locks.allow 192.168.* # Allow access to "p-locks" volume
+end-volume
diff --git a/doc/examples/protocol-client.vol b/doc/examples/protocol-client.vol
new file mode 100644
index 000000000..43c43e02d
--- /dev/null
+++ b/doc/examples/protocol-client.vol
@@ -0,0 +1,17 @@
+volume client
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+  option remote-host 192.168.1.10      # IP address of the remote brick
+# option transport.socket.remote-port 24016              
+
+# option transport-type ib-verbs # for Infiniband verbs transport
+# option transport.ib-verbs.work-request-send-size  1048576
+# option transport.ib-verbs.work-request-send-count 16
+# option transport.ib-verbs.work-request-recv-size  1048576
+# option transport.ib-verbs.work-request-recv-count 16
+# option transport.ib-verbs.remote-port 24016              
+
+  option remote-subvolume brick        # name of the remote volume
+# option transport-timeout 30          # default value is 120seconds 
+end-volume
diff --git a/doc/examples/protocol-server.vol b/doc/examples/protocol-server.vol
new file mode 100644
index 000000000..e8e4a4643
--- /dev/null
+++ b/doc/examples/protocol-server.vol
@@ -0,0 +1,25 @@
+
+### Export volume "brick" with the contents of "/home/export" directory.
+volume brick
+  type storage/posix                   # POSIX FS translator
+  option directory /home/export        # Export this directory
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp      # For TCP/IP transport
+# option transport.socket.listen-port 24016              
+
+# option transport-type ib-verbs # For Infiniband Verbs transport
+# option transport.ib-verbs.work-request-send-size  131072
+# option transport.ib-verbs.work-request-send-count 64
+# option transport.ib-verbs.work-request-recv-size  131072
+# option transport.ib-verbs.work-request-recv-count 64
+# option transport.ib-verbs.listen-port 24016              
+
+# option bind-address 192.168.1.10     # Default is to listen on all interfaces
+# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
+  subvolumes brick 
+  option auth.addr.brick.allow 192.168.* # Allow access to "brick" volume
+end-volume
diff --git a/doc/examples/read-ahead.vol b/doc/examples/read-ahead.vol
new file mode 100644
index 000000000..3ce0d95ac
--- /dev/null
+++ b/doc/examples/read-ahead.vol
@@ -0,0 +1,22 @@
+volume client
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 192.168.1.10      # IP address of the remote brick
+  option remote-subvolume brick        # name of the remote volume
+end-volume
+
+## In normal clustered storage type, any of the cluster translators can come here.
+#
+# Definition of other clients
+# 
+# Definition of cluster translator (may be unify, replicate, or unify over replicate)
+# 
+
+### 'Read-Ahead' translator is best utilized on client side, as it prefetches the file contents when the first read() call is issued. 
+volume ra
+  type performance/read-ahead
+  subvolumes client            # In this example it is 'client' you may have to change it according to your spec file.
+  option page-size 1MB         # default is 256KB
+  option page-count 4          # default is 2
+  option force-atime-update no # defalut is 'no'
+end-volume
diff --git a/doc/examples/replicate.vol b/doc/examples/replicate.vol
new file mode 100644
index 000000000..333ba7de1
--- /dev/null
+++ b/doc/examples/replicate.vol
@@ -0,0 +1,119 @@
+### 'NOTE'
+# This file has both server spec and client spec to get an understanding of stripe's spec file. Hence can't be used as it is, as a GlusterFS spec file. 
+# One need to seperate out server spec and client spec to get it working.
+
+#=========================================================================
+
+# **** server1 spec file ****
+
+### Export volume "brick" with the contents of "/home/export" directory.
+volume posix1
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export1        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick1
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix1
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp                      # For TCP/IP transport
+  option transport.socket.listen-port 24016       
+# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
+  subvolumes brick1
+  option auth.addr.brick1.allow * 		# access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** server2 spec file ****
+volume posix2
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export2        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick2
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix2
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp                  # For TCP/IP transport
+  option transport.socket.listen-port 24017   
+  subvolumes brick2
+  option auth.addr.brick2.allow * # Allow access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** server3 spec file ****
+
+volume posix3
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export3        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick3
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix3
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp                 # For TCP/IP transport
+  option transport.socket.listen-port 24018  
+  subvolumes brick3
+  option auth.addr.brick3.allow * 		# access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** Clustered Client config file ****
+
+### Add client feature and attach to remote subvolume of server1
+volume client1
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24016              
+  option remote-subvolume brick1        # name of the remote volume
+end-volume
+
+### Add client feature and attach to remote subvolume of server2
+volume client2
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24017              
+  option remote-subvolume brick2        # name of the remote volume
+end-volume
+
+volume client3
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24018              
+  option remote-subvolume brick3        # name of the remote volume
+end-volume
+
+## Add replicate feature.
+volume replicate
+  type cluster/replicate
+  subvolumes client1 client2 client3
+end-volume
+
diff --git a/doc/examples/stripe.vol b/doc/examples/stripe.vol
new file mode 100644
index 000000000..6055b66b9
--- /dev/null
+++ b/doc/examples/stripe.vol
@@ -0,0 +1,121 @@
+
+### 'NOTE'
+# This file has both server spec and client spec to get an understanding of stripe's spec file. Hence can't be used as it is, as a GlusterFS spec file. 
+# One need to seperate out server spec and client spec to get it working.
+
+#=========================================================================
+
+# **** server1 spec file ****
+
+### Export volume "brick" with the contents of "/home/export" directory.
+volume posix1
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export1        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick1
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix1
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp     # For TCP/IP transport
+  option transport.socket.listen-port 24016              
+# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
+  subvolumes brick1
+  option auth.addr.brick1.allow * 		# access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** server2 spec file ****
+volume posix2
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export2        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick2
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix2
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp     # For TCP/IP transport
+  option transport.socket.listen-port 24017              
+  subvolumes brick2
+  option auth.addr.brick2.allow * # Allow access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** server3 spec file ****
+
+volume posix3
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export3        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick3
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix3
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp     # For TCP/IP transport
+  option transport.socket.listen-port 24018              
+  subvolumes brick3
+  option auth.addr.brick3.allow * 		# access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** Clustered Client config file ****
+
+### Add client feature and attach to remote subvolume of server1
+volume client1
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24016              
+  option remote-subvolume brick1        # name of the remote volume
+end-volume
+
+### Add client feature and attach to remote subvolume of server2
+volume client2
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24017              
+  option remote-subvolume brick2        # name of the remote volume
+end-volume
+
+volume client3
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24018              
+  option remote-subvolume brick3        # name of the remote volume
+end-volume
+
+## Add Stripe Feature.
+volume stripe
+  type cluster/stripe
+  subvolumes client1 client2 client3
+  option block-size 1MB
+end-volume
+
diff --git a/doc/examples/trace.vol b/doc/examples/trace.vol
new file mode 100644
index 000000000..3f4864db4
--- /dev/null
+++ b/doc/examples/trace.vol
@@ -0,0 +1,16 @@
+volume client
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 192.168.1.10      # IP address of the remote brick
+  option remote-subvolume brick        # name of the remote volume
+end-volume
+
+### 'Trace' translator is a very handy debug tool for GlusterFS, as it can be loaded between any of the two volumes without changing the behaviour of the filesystem. 
+# On client side it can be the top most volume in spec (like now) to understand what calls are made on FUSE filesystem, when a mounted filesystem is accessed.
+
+volume trace
+  type debug/trace
+  subvolumes client
+end-volume
+
+# 'NOTE:' By loading 'debug/trace' translator, filesystem will be very slow as it logs each and every calls to the log file.
diff --git a/doc/examples/trash.vol b/doc/examples/trash.vol
new file mode 100644
index 000000000..16e71be32
--- /dev/null
+++ b/doc/examples/trash.vol
@@ -0,0 +1,20 @@
+
+volume brick
+  type storage/posix                   # POSIX FS translator
+  option directory /home/export        # Export this directory
+end-volume
+
+### 'Trash' translator is best used on server side as it just renames the deleted file inside 'trash-dir', and it makes 4 seperate fops for one unlink call.  
+volume trashcan
+  type features/trash
+  subvolumes brick
+  option trash-dir /.trashcan
+end-volume
+
+volume server
+  type protocol/server
+  subvolumes trashcan brick
+  option transport-type tcp     # For TCP/IP transport
+  option auth.addr.brick.allow 192.168.* # Allow access to "brick" volume
+  option auth.addr.trashcan.allow 192.168.* # Allow access to "p-locks" volume
+end-volume
diff --git a/doc/examples/unify.vol b/doc/examples/unify.vol
new file mode 100644
index 000000000..3fb7e8320
--- /dev/null
+++ b/doc/examples/unify.vol
@@ -0,0 +1,178 @@
+### 'NOTE'
+# This file has both server spec and client spec to get an understanding of stripe's spec file. Hence can't be used as it is, as a GlusterFS spec file. 
+# One need to seperate out server spec and client spec to get it working.
+
+
+#=========================================================================
+
+# **** server1 spec file ****
+
+### Export volume "brick" with the contents of "/home/export" directory.
+volume posix1
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export1        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick1
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix1
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp     # For TCP/IP transport
+  option transport.socket.listen-port 24016              
+# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
+  subvolumes brick1
+  option auth.addr.brick1.allow * 		# access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** server2 spec file ****
+volume posix2
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export2        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick2
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix2
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp     # For TCP/IP transport
+  option transport.socket.listen-port 24017              
+  subvolumes brick2
+  option auth.addr.brick2.allow * # Allow access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** server3 spec file ****
+
+volume posix3
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export3        # Export this directory
+end-volume
+
+### Add POSIX record locking support to the storage brick
+volume brick3
+  type features/posix-locks
+  option mandatory on          # enables mandatory locking on all files
+  subvolumes posix3
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp     # For TCP/IP transport
+  option transport.socket.listen-port 24018              
+  subvolumes brick3
+  option auth.addr.brick3.allow * 		# access to "brick" volume
+end-volume
+
+#=========================================================================
+
+# *** server for namespace *** 
+### Export volume "brick" with the contents of "/home/export" directory.
+volume brick-ns
+  type storage/posix                    # POSIX FS translator
+  option directory /home/export-ns      # Export this directory
+end-volume
+
+volume server
+  type protocol/server
+  option transport-type tcp     # For TCP/IP transport
+  option transport.socket.listen-port 24019              
+  subvolumes brick-ns
+  option auth.addr.brick-ns.allow * 		# access to "brick" volume
+end-volume
+
+
+#=========================================================================
+
+# **** Clustered Client config file ****
+
+### Add client feature and attach to remote subvolume of server1
+volume client1
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24016              
+  option remote-subvolume brick1        # name of the remote volume
+end-volume
+
+### Add client feature and attach to remote subvolume of server2
+volume client2
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24017              
+  option remote-subvolume brick2        # name of the remote volume
+end-volume
+
+volume client3
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+  option remote-host 127.0.0.1      # IP address of the remote brick
+  option transport.socket.remote-port 24018              
+  option remote-subvolume brick3        # name of the remote volume
+end-volume
+
+
+volume client-ns
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+  option remote-host 127.0.0.1         # IP address of the remote brick
+  option transport.socket.remote-port 24019              
+  option remote-subvolume brick-ns     # name of the remote volume
+end-volume
+
+### Add unify feature to cluster the servers. Associate an
+### appropriate scheduler that matches your I/O demand.
+volume bricks
+  type cluster/unify
+  option namespace client-ns # this will not be storage child of unify.
+  subvolumes client1 client2 client3
+### ** ALU Scheduler Option **
+  option self-heal background # foreground off # default is foreground
+  option scheduler alu
+  option alu.limits.min-free-disk  5% #%
+  option alu.limits.max-open-files 10000
+  option alu.order disk-usage:read-usage:write-usage:open-files-usage:disk-speed-usage
+  option alu.disk-usage.entry-threshold 2GB
+  option alu.disk-usage.exit-threshold  128MB
+  option alu.open-files-usage.entry-threshold 1024
+  option alu.open-files-usage.exit-threshold 32
+  option alu.read-usage.entry-threshold 20 #%
+  option alu.read-usage.exit-threshold 4 #%
+  option alu.write-usage.entry-threshold 20 #%
+  option alu.write-usage.exit-threshold 4 #%
+  option alu.disk-speed-usage.entry-threshold 0 # DO NOT SET IT. SPEED IS CONSTANT!!!.
+  option alu.disk-speed-usage.exit-threshold 0 # DO NOT SET IT. SPEED IS CONSTANT!!!.
+  option alu.stat-refresh.interval 10sec
+  option alu.stat-refresh.num-file-create 10
+### ** Random Scheduler **
+# option scheduler random
+### ** NUFA Scheduler **
+# option scheduler nufa
+# option nufa.local-volume-name posix1
+### ** Round Robin (RR) Scheduler **
+# option scheduler rr
+# option rr.limits.min-free-disk 5% #%
+end-volume
+
diff --git a/doc/examples/write-behind.vol b/doc/examples/write-behind.vol
new file mode 100644
index 000000000..9c6bae11c
--- /dev/null
+++ b/doc/examples/write-behind.vol
@@ -0,0 +1,26 @@
+volume client
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+  option remote-host 192.168.1.10      # IP address of the remote brick
+  option remote-subvolume brick        # name of the remote volume
+end-volume
+
+## In normal clustered storage type, any of the cluster translators can come here.
+#
+# Definition of other clients
+# 
+# Definition of cluster translator (may be unify, replicate, or unify over replicate)
+# 
+
+
+### 'Write-behind' translator is a performance booster for write operation. Best used on client side, as its main intension is to reduce the network latency caused for each write operation.
+
+volume wb
+  type performance/write-behind
+  subvolumes client         # In this example it is 'client' you may have to change it according to your spec file.
+  option flush-behind on    # default value is 'off'
+  option window-size 2MB
+  option aggregate-size 1MB # default value is 0
+  option enable_O_SYNC no  # default is no
+  option disable-for-first-nbytes 128KB #default is 1 
+end-volume
diff --git a/doc/features/rdma-cm-in-3.4.0.txt b/doc/features/rdma-cm-in-3.4.0.txt
deleted file mode 100644
index fd953e56b..000000000
--- a/doc/features/rdma-cm-in-3.4.0.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Following is the impact of http://review.gluster.org/#change,149.
-
-New userspace packages needed:
-librdmacm
-librdmacm-devel
-
-rdmacm needs an IPoIB address for connection establishment. This requirement results in following issues:
-* Because of bug #890502, we've to probe the peer on an IPoIB address. This imposes a restriction that all volumes created in the future have to communicate over IPoIB address (irrespective of whether they use gluster's tcp or rdma transport).
-* Currently client has an independence to choose b/w tcp and rdma transports while communicating with the server (by creating volumes with transport-type tcp,rdma). This independence was a byproduct of our ability use the normal channel used with transport-type tcp for rdma connectiion establishment handshake too. However, with new requirement of IPoIB address for connection establishment, we loose this independence (till we bring in multi-network support - where a brick can be identified by a set of ip-addresses and we can choose different pairs of ip-addresses for communication based on our requirements - in glusterd).
diff --git a/doc/features/rebalance.md b/doc/features/rebalance.md
deleted file mode 100644
index 29b993008..000000000
--- a/doc/features/rebalance.md
+++ /dev/null
@@ -1,74 +0,0 @@
-## Background
-
-
-For a more detailed description, view Jeff Darcy's blog post [here] 
-(http://hekafs.org/index.php/2012/03/glusterfs-algorithms-distribution/) 
-
-GlusterFS uses the distribute translator (DHT) to aggregate space of multiple servers. DHT distributes files among its subvolumes using a consistent hashing method providing 32-bit hashes. Each DHT subvolume is given a range in the 32-bit hash space. A hash value is calculated for every file using a combination of its name. The file is then placed in the subvolume with the hash range that contains the hash value. 
-
-## What is rebalance?
-
-The rebalance process migrates files between the DHT subvolumes when necessary.
-
-## When is rebalance required?
-
-Rebalancing is required for two main cases.
-
-1. Addition/Removal of bricks
-
-2. Renaming of a file 
-
-## Addition/Removal of  bricks
-
-Whenever the number or order of DHT subvolumes change, the hash range given to each subvolume is recalculated. When this happens, already existing files on the volume will need to be moved to the correct subvolume based on their hash. Rebalance does this activity.
-
-Addition of bricks which increase the size of a volume will increase the number of DHT subvolumes and lead to recalculation of hash ranges (This doesn't happen when bricks are added to a volume to increase redundancy, i.e. increase replica count of a volume). This will require an explicit rebalance command to be issued to migrate the files.
-
-Removal of bricks which decrease the size of a volumes also causes the hash ranges of DHT to be recalculated. But we don't need to issue an explicit rebalance command in this case, as rebalance is done automatically by the remove-brick process if needed.
-
-## Renaming of a file
-
-Renaming of file will cause its hash to change. The file now needs to be moved to the correct subvolume based on its new hash. Rebalance does this.
-
-## How does rebalance work?
-
-At a high level, the rebalance process consists of the following 3 steps:
-
-1. Crawl the volume to access all files
-2. Calculate the hash for the file
-3. If needed move the migrate the file to the correct subvolume.
-
-
-The rebalance process has been optimized by making it distributed across the trusted storage pool. With distributed rebalance, a rebalance process is launched on each peer in the cluster. Each rebalance process will crawl files on only those bricks of the volume which are present on it, and migrate the files which need migration to the correct brick. This speeds up the rebalance process considerably.
-
-## What will happen if rebalance is not run?
-
-### Addition of bricks
-
-With the current implementation of add-brick, when the size of a volume is augmented by adding new bricks, the new bricks are not put into use immediately i.e., the hash ranges there not recalculated immediately. This means that the files will still be placed only onto the existing bricks, leaving the newly added storage space unused. Starting a rebalance process on the volume will cause the hash ranges to be recalculated with the new bricks included, which allows the newly added storage space to be used.
-
-### Renaming a file
-
-When a file rename causes the file to be hashed to a new subvolume, DHT writes a link file on the new subvolume leaving the actual file on the original subvolume. A link file is an empty file, which has an extended attribute set that points to the subvolume on which the actual file exists. So, when a client accesses the renamed file, DHT first looks for the file in the hashed subvolume and gets the link file. DHT understands the link file, and gets the actual file from the subvolume pointed to by the link file. This leads to a slight reduction in performance. A rebalance will move the actual file to the hashed subvolume, allowing clients to access the file directly once again.
-
-## Are clients affected during a rebalance process?
-
-The rebalance process is transparent to applications on the clients. Applications which have open files on the volume will not be affected by the rebalance process, even if the open file requires migration. The DHT translator on the client will hide the migration from the applications.
-
-##How are open files migrated?
-
-(A more technical description of the algorithm used can be seen in the commit message of commit a07bb18c8adeb8597f62095c5d1361c5bad01f09.)
-
-To achieve migration of open files, two things need to be assured of,
-a) any writes or changes happening to the file during migration are correctly synced to destination subvolume after the migration is complete.
-b) any further changes should be made to the destination subvolume
-
-Both of these requirements require sending notificatoins to clients. Clients are notified by overloading an attribute used in every callback functions. DHT understands these attributes in the callbacks and can be notified if a file is being migrated or not.
-
-During rebalance, a file will be in two phases
-
-1. Migration in process - In this phase the file is being migrated by the rebalance process from the source subvolume to the destination subvolume. The rebalance process will set a 'in-migration' attribute on the file, which will notify the clients' DHT translator. The clients' DHT translator will then take care to send any further changes to the destination subvolume as well. This way we satisfy the first requirement
-
-2. Migration completed - Once the file has been migrated, the rebalance process will set a 'migration-complete' attribute on the file. The clients will be notified of the completion and all further operations on the file will happen on the destination subvolume.
-
-The DHT translator handles the above and allows the applications on the clients to continue working on a file under migration.
diff --git a/doc/legacy/get_put_api_using_xattr.txt b/doc/get_put_api_using_xattr.txt
index 243f9f1ae..58951f5bf 100644
--- a/doc/legacy/get_put_api_using_xattr.txt
+++ b/doc/get_put_api_using_xattr.txt
@@ -16,7 +16,7 @@ internals:
 * posix handling setxattr/getxattr
   - setxattr
      posix setxattr does a open with O_CREAT|O_TRUNC on the <path>/<name>, writes value of the setxattr as data into the file and closes the file. when data is null, posix setxattr avoids doing write. file is closed after write.
-
+     
   - getxattr
      posix getxattr does open with O_RDONLY on the <path>/<name>, reads the complete content of the file. file is closed after read.
 
diff --git a/doc/gluster.8 b/doc/gluster.8
index 3c78fb8b1..f10a517b3 100644
--- a/doc/gluster.8
+++ b/doc/gluster.8
@@ -1,11 +1,18 @@
-
-.\"  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
+.\"  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
 .\"  This file is part of GlusterFS.
 .\"
-.\"  This file is licensed to you under your choice of the GNU Lesser
-.\"  General Public License, version 3 or any later version (LGPLv3 or
-.\"  later), or the GNU General Public License, version 2 (GPLv2), in all
-.\"  cases as published by the Free Software Foundation.
+.\"  GlusterFS is GF_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 3 of the License,
+.\"  or (at your option) any later version.
+.\"
+.\"  GlusterFS 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, see " <http://www.gnu.org/licenses/>.
 .\"
 .\"
 .TH Gluster 8 "Gluster command line utility" "07 March 2011" "Gluster Inc."
@@ -87,7 +94,7 @@ Replace the specified brick.
 \fB\ volume log filename <VOLNAME> [BRICK] <DIRECTORY> \fB
 Set the log directory for the corresponding volume/brick.
 .TP
-\fB\ volume log locate <VOLNAME> [BRICK] \fB
+\fB\volume log locate <VOLNAME> [BRICK] \fB
 Locate the log file for corresponding volume/brick.
 .TP
 \fB\ volume log rotate <VOLNAME> [BRICK] \fB
@@ -114,7 +121,7 @@ Display the command options.
 Exit the gluster command line interface.
 
 .SH FILES
-/var/lib/glusterd/*
+/etc/glusterd/*
 .SH SEE ALSO
 .nf
 \fBfusermount\fR(1), \fBmount.glusterfs\fR(8), \fBglusterfs\fR(8), \fBglusterd\fR(8)
diff --git a/doc/glusterd.8 b/doc/glusterd.8
index 04a43481e..f979a0fb5 100644
--- a/doc/glusterd.8
+++ b/doc/glusterd.8
@@ -1,11 +1,20 @@
 .\"
-.\"  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
+.\"  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
 .\"  This file is part of GlusterFS.
 .\"
-.\"  This file is licensed to you under your choice of the GNU Lesser
-.\"  General Public License, version 3 or any later version (LGPLv3 or
-.\"  later), or the GNU General Public License, version 2 (GPLv2), in all
-.\"  cases as published by the Free Software Foundation.
+.\"  GlusterFS is GF_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 3 of the License,
+.\"  or (at your option) any later version.
+.\"
+.\"  GlusterFS 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, see
+.\"  <http://www.gnu.org/licenses/>.
 .\"
 .\"
 
@@ -24,10 +33,10 @@ The glusterd daemon is used for elastic volume management. The daemon must be ru
 .PP
 .TP
 
-\fB\-l <LOGFILE>, \fB\-\-log\-file=<LOGFILE>\fR
+\fB\-l=<LOGFILE>, \fB\-\-log\-file=<LOGFILE>\fR
 File to use for logging.
 .TP
-\fB\-L <LOGLEVEL>, \fB\-\-log\-level=<LOGLEVEL>\fR
+\fB\-L=<LOGLEVEL>, \fB\-\-log\-level=<LOGLEVEL>\fR
 Logging severity.  Valid options are TRACE, DEBUG, INFO, WARNING, ERROR and CRITICAL (the default is INFO).
 .TP
 \fB\-\-debug\fR
@@ -50,7 +59,7 @@ Print the program version.
 
 .PP
 .SH FILES
-/var/lib/glusterd/*
+/etc/glusterd/*
 
 .SH SEE ALSO
 .nf
diff --git a/extras/glusterd.vol b/doc/glusterd.vol
index 9bac52ab7..4e43fb0da 100644
--- a/extras/glusterd.vol
+++ b/doc/glusterd.vol
@@ -1,9 +1,8 @@
 volume management
     type mgmt/glusterd
-    option working-directory /var/lib/glusterd
+    option working-directory /etc/glusterd
     option transport-type socket,rdma
     option transport.socket.keepalive-time 10
     option transport.socket.keepalive-interval 2
-    option transport.socket.read-fail-log off
-#   option base-port 49152
 end-volume
+
diff --git a/doc/glusterfs.8 b/doc/glusterfs.8
index 60ad5709b..9a2eaee69 100644
--- a/doc/glusterfs.8
+++ b/doc/glusterfs.8
@@ -1,10 +1,19 @@
-.\"  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+.\"  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
 .\"  This file is part of GlusterFS.
 .\"
-.\"  This file is licensed to you under your choice of the GNU Lesser
-.\"  General Public License, version 3 or any later version (LGPLv3 or
-.\"  later), or the GNU General Public License, version 2 (GPLv2), in all
-.\"  cases as published by the Free Software Foundation.
+.\"  GlusterFS 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 3 of the License,
+.\"  or (at your option) any later version.
+.\"
+.\"  GlusterFS 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
+.\"  long with this program.  If not, see
+.\"  <http://www.gnu.org/licenses/>.
 .\"
 .\"
 .\"
@@ -23,8 +32,7 @@ be made of any commodity hardware, such as x86-64 server with SATA-II RAID and
 Infiniband HBA.
 
 GlusterFS is fully POSIX compliant file system. On client side, it has dependency
-on FUSE package, on server side, it works seemlessly on different operating systems.
-Currently supported on GNU/Linux and Solaris.
+on FUSE package, on server side, it works seemlessly on different operating systems. Currently supported on GNU/Linux and Solaris.
 
 .SH OPTIONS
 
@@ -32,54 +40,32 @@ Currently supported on GNU/Linux and Solaris.
 .PP
 .TP
 \fB\-f, \fB\-\-volfile=VOLUME-FILE\fR
-File to use as VOLUME-FILE.
+File to use as VOLUME-FILE (the default is /etc/glusterfs/glusterfs.vol).
 .TP
 \fB\-l, \fB\-\-log\-file=LOGFILE\fR
-File to use for logging (the default is <INSTALL-DIR>/var/log/glusterfs/<MOUNT-POINT>.log).
+File to use for logging.
 .TP
 \fB\-L, \fB\-\-log\-level=LOGLEVEL\fR
-Logging severity.  Valid options are TRACE, DEBUG, INFO, WARNING, ERROR and CRITICAL (the default is INFO).
+Logging severity.  Valid options are TRACE, DEBUG, INFO, WARNING, ERROR and CRITICAL (the default is WARNING).
 .TP
 \fB\-s, \fB\-\-volfile\-server=SERVER\fR
 Server to get the volume from.  This option overrides \fB\-\-volfile \fR option.
-.TP
-\fB\-\-volfile\-max\-fetch\-attempts=MAX\-ATTEMPTS\fR
-Maximum number of connect attempts to server. This option should be provided with
-\fB\-\-volfile\-server\fR option (the default is 1).
 
 .SS "Advanced options"
 .PP
 .TP
-\fB\-\-acl\fR
-Mount the filesystem with POSIX ACL support.
-.TP
 \fB\-\-debug\fR
 Run in debug mode.  This option sets \fB\-\-no\-daemon\fR, \fB\-\-log\-level\fR to DEBUG,
 and \fB\-\-log\-file\fR to console.
 .TP
-\fB\-\-enable\-ino32=BOOL\fR
-Use 32-bit inodes when mounting to workaround application that doesn't support 64-bit inodes.
-.TP
-\fB\-\-fopen\-keep\-cache\fR
-Do not purge the cache on file open.
-.TP
-\fB\-\-mac\-compat=BOOL\fR
-Provide stubs for attributes needed for seamless operation on Macs (the default is off).
-.TP
 \fB\-N, \fB\-\-no\-daemon\fR
 Run in the foreground.
 .TP
-\fB\-p, \fB\-\-pid\-file=PIDFILE\fR
-File to use as PID file.
-.TP
 \fB\-\-read\-only\fR
-Mount the file system in 'read-only' mode.
+Make the file system read-only.
 .TP
-\fB\-\-selinux\fR
-Enable SELinux label (extended attributes) support on inodes.
-.TP
-\fB\-S, \fB\-\-socket\-file=SOCKFILE\fR
-File to use as unix-socket.
+\fB\-p, \fB\-\-pid\-file=PIDFILE\fR
+File to use as PID file.
 .TP
 \fB\-\-volfile\-id=KEY\fR
 Key of the volume file to be fetched from the server.
@@ -88,14 +74,11 @@ Key of the volume file to be fetched from the server.
 Port number of volfile server.
 .TP
 \fB\-\-volfile\-server\-transport=TRANSPORT\fR
-Transport type to get volume file from server (the default is tcp).
+Transport type to get volume file from server (the deafult is socket).
 .TP
 \fB\-\-volume\-name=VOLUME\-NAME\fR
 Volume name to be used for MOUNT-POINT (the default is top most volume in VOLUME-FILE).
 .TP
-\fB\-\-worm\fR
-Mount the filesystem in 'worm' mode.
-.TP
 \fB\-\-xlator\-option=VOLUME\-NAME.OPTION=VALUE\fR
 Add/Override a translator option for a volume with the specified value.
 
@@ -106,29 +89,11 @@ Add/Override a translator option for a volume with the specified value.
 \fB\-\-attribute\-timeout=SECONDS\fR
 Set attribute timeout to SECONDS for inodes in fuse kernel module (the default is 1).
 .TP
-\fB\-\-background\-qlen=N\fR
-Set fuse module's background queue length to N (the default is 64).
-.TP
-\fB\-\-congestion\-threshold=N\fR
-Set fuse module's congestion threshold to N (the default is 48).
-.TP
-\fB\-\-direct\-io\-mode=BOOL\fR
-Enable/Disable the direct-I/O mode in fuse module (the default is enable).
-.TP
-\fB\-\-dump-fuse=PATH\f\R
-Dump fuse traffic to PATH
-.TP
 \fB\-\-entry\-timeout=SECONDS\fR
 Set entry timeout to SECONDS in fuse kernel module (the default is 1).
 .TP
-\fB\-\-gid\-timeout=SECONDS\fR
-Set auxilary group list timeout to SECONDS for fuse translator (the default is 0).
-.TP
-\fB\-\-negative\-timeout=SECONDS\fR
-Set negative timeout to SECONDS in fuse kernel module (the default is 0).
-.TP
-\fB\-\-volfile-check\fR
-Enable strict volume file checking.
+\fB\-\-direct\-io\-mode=BOOL\fR
+Enable/Disable the direct-I/O mode in fuse module (the default is enable).
 
 .SS "Miscellaneous Options"
 .PP
@@ -137,7 +102,7 @@ Enable strict volume file checking.
 \fB\-?, \fB\-\-help\fR
 Display this help.
 .TP
-\fB\-\-usage\fR
+\fB\-\-usage\fReew
 Display a short usage message.
 .TP
 \fB\-V, \fB\-\-version\fR
@@ -145,12 +110,7 @@ Print the program version.
 
 .PP
 .SH FILES
-/var/lib/glusterd/vols/*/*.vol
-.SH EXAMPLES
-mount a volume named foo on server bar with log level DEBUG on mount point
-/mnt/foo
-
-# glusterfs \-\-log\-level=DEBUG \-\-volfile\-id=foo \-\-volfile\-server=bar /mnt/foo
+/etc/glusterfs/*.vol, /etc/glusterd/vols/*/*.vol
 
 .SH SEE ALSO
 .nf
@@ -159,6 +119,6 @@ mount a volume named foo on server bar with log level DEBUG on mount point
 .fi
 .SH COPYRIGHT
 .nf
-Copyright(c) 2006-2011  Red Hat, Inc.  <http://www.redhat.com>
+Copyright(c) 2006-2011  Gluster, Inc.  <http://www.gluster.com>
 \fR
 .fi
diff --git a/doc/glusterfs.vol.sample b/doc/glusterfs.vol.sample
new file mode 100644
index 000000000..3b1f18517
--- /dev/null
+++ b/doc/glusterfs.vol.sample
@@ -0,0 +1,61 @@
+### file: client-volume.vol.sample
+
+#####################################
+###  GlusterFS Client Volume File  ##
+#####################################
+
+#### CONFIG FILE RULES:
+### "#" is comment character.
+### - Config file is case sensitive
+### - Options within a volume block can be in any order.
+### - Spaces or tabs are used as delimitter within a line. 
+### - Each option should end within a line.
+### - Missing or commented fields will assume default values.
+### - Blank/commented lines are allowed.
+### - Sub-volumes should already be defined above before referring.
+
+### Add client feature and attach to remote subvolume
+volume client
+  type protocol/client
+  option transport-type tcp
+# option transport-type unix
+# option transport-type ib-sdp
+  option remote-host 127.0.0.1         # IP address of the remote brick
+# option transport.socket.remote-port 24016              
+
+# option transport-type ib-verbs
+# option transport.ib-verbs.remote-port 24016              
+# option transport.ib-verbs.work-request-send-size  1048576
+# option transport.ib-verbs.work-request-send-count 16
+# option transport.ib-verbs.work-request-recv-size  1048576
+# option transport.ib-verbs.work-request-recv-count 16
+
+# option transport-timeout 30          # seconds to wait for a reply
+                                       # from server for each request
+  option remote-subvolume brick        # name of the remote volume
+end-volume
+
+### Add readahead feature
+#volume readahead
+#  type performance/read-ahead
+#  option page-size 1MB     # unit in bytes
+#  option page-count 2       # cache per file  = (page-count x page-size)
+#  subvolumes client
+#end-volume
+
+### Add IO-Cache feature
+#volume iocache
+#  type performance/io-cache
+#  option page-size 256KB
+#  option page-count 2
+#  subvolumes readahead
+#end-volume
+
+### Add writeback feature
+#volume writeback
+#  type performance/write-behind
+#  option aggregate-size 1MB
+#  option window-size 2MB
+#  option flush-behind off
+#  subvolumes iocache   
+#end-volume
diff --git a/doc/glusterfsd.8 b/doc/glusterfsd.8
index 176d04236..00b60b225 100644
--- a/doc/glusterfsd.8
+++ b/doc/glusterfsd.8
@@ -1,10 +1,19 @@
-.\"  Copyright (c) 20088888888-2012 Red Hat, Inc. <http://www.redhat.com>
+.\"  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
 .\"  This file is part of GlusterFS.
 .\"
-.\"  This file is licensed to you under your choice of the GNU Lesser
-.\"  General Public License, version 3 or any later version (LGPLv3 or
-.\"  later), or the GNU General Public License, version 2 (GPLv2), in all
-.\"  cases as published by the Free Software Foundation.
+.\"  GlusterFS 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 3 of the License,
+.\"  or (at your option) any later version.
+.\"
+.\"  GlusterFS 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
+.\"  long with this program.  If not, see
+.\"  <http://www.gnu.org/licenses/>.
 .\"
 .\"
 .\"
@@ -64,15 +73,6 @@ Makes the filesystem read-only
 \fB\-p, \fB\-\-pid\-file=PIDFILE\fR
 File to use as pid file
 .TP
-\fB\-S SOCKFILE
-Socket file to used for inter-process communication
-.TP
-\fB\-\-brick\-name DIRECTORY
-Directory to be used as export directory for GlusterFS
-.TP
-\fB\-\-brick\-port PORT
-Brick Port to be registered with Gluster portmapper
-.TP
 \fB\-\-volfile\-id=KEY\fR
 KEY of the volume file to be fetched from server
 .TP
@@ -80,7 +80,7 @@ KEY of the volume file to be fetched from server
 Port number of volfile server
 .TP
 \fB\-\-volfile\-server\-transport=TRANSPORT\fR
-Transport type to get volume file from server [default: tcp]
+Transport type to get volume file from server [default: socket]
 .TP
 \fB\-\-volume\-name=VOLUME\-NAME\fR
 Volume name to be used for MOUNT-POINT [default: top most volume in
@@ -119,11 +119,6 @@ Print program version
 .SH FILES
 /etc/glusterfs/*.vol
 
-.SH EXAMPLES
-Start a GlusterFS server on localhost with volume name foo
-
-glusterfsd \-s localhost \-\-volfile\-id foo.server.media-disk\-1 \-p /var/lib/glusterd/vols/foo/run/server\-media\-disk\-1.pid \-S /tmp/<uniqueid>.socket \-\-brick-name /media/disk\-1 \-l /var/log/glusterfs/bricks/media\-disk\-1.log \-\-brick\-port 24009 \-\-xlator\-option foo\-server.listen-port=24009
-
 .SH SEE ALSO
 .nf
 \fBfusermount\fR(1), \fBmount.glusterfs\fR(8), \fBgluster\fR(8)
diff --git a/doc/glusterfsd.vol.sample b/doc/glusterfsd.vol.sample
new file mode 100644
index 000000000..e91df3290
--- /dev/null
+++ b/doc/glusterfsd.vol.sample
@@ -0,0 +1,47 @@
+### file: server-volume.vol.sample
+
+#####################################
+###  GlusterFS Server Volume File  ##
+#####################################
+
+#### CONFIG FILE RULES:
+### "#" is comment character.
+### - Config file is case sensitive
+### - Options within a volume block can be in any order.
+### - Spaces or tabs are used as delimitter within a line. 
+### - Multiple values to options will be : delimitted.
+### - Each option should end within a line.
+### - Missing or commented fields will assume default values.
+### - Blank/commented lines are allowed.
+### - Sub-volumes should already be defined above before referring.
+
+### Export volume "brick" with the contents of "/home/export" directory.
+volume brick
+  type storage/posix                   # POSIX FS translator
+  option directory /home/export        # Export this directory
+end-volume
+
+### Add network serving capability to above brick.
+volume server
+  type protocol/server
+  option transport-type tcp
+# option transport-type unix
+# option transport-type ib-sdp
+# option transport.socket.bind-address 192.168.1.10     # Default is to listen on all interfaces
+# option transport.socket.listen-port 24016              
+
+# option transport-type ib-verbs
+# option transport.ib-verbs.bind-address 192.168.1.10     # Default is to listen on all interfaces
+# option transport.ib-verbs.listen-port 24016              
+# option transport.ib-verbs.work-request-send-size  131072
+# option transport.ib-verbs.work-request-send-count 64
+# option transport.ib-verbs.work-request-recv-size  131072
+# option transport.ib-verbs.work-request-recv-count 64
+
+# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
+  subvolumes brick
+# NOTE: Access to any volume through protocol/server is denied by
+# default. You need to explicitly grant access through # "auth"
+# option.
+  option auth.addr.brick.allow * # Allow access to "brick" volume
+end-volume
diff --git a/doc/legacy/hacker-guide/Makefile.am b/doc/hacker-guide/Makefile.am
index 65c92ac23..65c92ac23 100644
--- a/doc/legacy/hacker-guide/Makefile.am
+++ b/doc/hacker-guide/Makefile.am
diff --git a/doc/hacker-guide/adding-fops.txt b/doc/hacker-guide/adding-fops.txt
new file mode 100644
index 000000000..e70dbbdc8
--- /dev/null
+++ b/doc/hacker-guide/adding-fops.txt
@@ -0,0 +1,33 @@
+		  HOW TO ADD A NEW FOP TO GlusterFS
+		  =================================
+
+Steps to be followed when adding a new FOP to GlusterFS:
+
+1. Edit glusterfs.h and add a GF_FOP_* constant.
+
+2. Edit xlator.[ch] and:
+   2a. add the new prototype for fop and callback.
+   2b. edit xlator_fops structure.
+
+3. Edit xlator.c and add to fill_defaults.
+
+4. Edit protocol.h and add struct necessary for the new FOP.
+
+5. Edit defaults.[ch] and provide default implementation.
+
+6. Edit call-stub.[ch] and provide stub implementation.
+
+7. Edit common-utils.c and add to gf_global_variable_init().
+
+8. Edit client-protocol and add your FOP.
+
+9. Edit server-protocol and add your FOP.
+
+10. Implement your FOP in any translator for which the default implementation
+    is not sufficient.
+
+==========================================
+Last updated: Mon Oct 27 21:35:49 IST 2008
+
+Author: Vikas Gorur <vikas@gluster.com>
+==========================================
diff --git a/doc/hacker-guide/bdb.txt b/doc/hacker-guide/bdb.txt
new file mode 100644
index 000000000..fd0bd3652
--- /dev/null
+++ b/doc/hacker-guide/bdb.txt
@@ -0,0 +1,70 @@
+
+* How does file translates to key/value pair?
+---------------------------------------------
+
+  in bdb a file is identified by key (obtained by taking basename() of the path of
+the file) and file contents are stored as value corresponding to the key in database
+file (defaults to glusterfs_storage.db under dirname() directory).
+
+* symlinks, directories
+-----------------------
+
+  symlinks and directories are stored as is.
+
+* db (database) files
+---------------------
+
+  every directory, including root directory, contains a database file called
+glusterfs_storage.db. all the regular files contained in the directory are stored
+as key/value pair inside the glusterfs_storage.db.
+
+* internal data cache
+---------------------
+
+  db does not provide a way to find out the size of the value corresponding to a key. 
+so, bdb makes DB->get() call for key and takes the length of the value returned. 
+since DB->get() also returns file contents for key, bdb maintains an internal cache and
+stores the file contents in the cache.
+  every directory maintains a seperate cache.
+  
+* inode number transformation
+-----------------------------
+
+  bdb allocates a inode number to each file and directory on its own. bdb maintains a 
+global counter and increments it after allocating inode number for each file
+(regular, symlink or directory). NOTE: bdb does not guarantee persistent inode numbers.
+
+* checkpoint thread
+-------------------
+
+  bdb creates a checkpoint thread at the time of init(). checkpoint thread does a 
+periodic checkpoint on the DB_ENV. checkpoint is the mechanism, provided by db, to 
+forcefully commit the logged transactions to the storage.
+
+NOTES ABOUT FOPS:
+-----------------
+
+lookup() -
+ 1> do lstat() on the path, if lstat fails, we assume that the file being looked up
+    is either a regular file or doesn't exist.
+ 2> lookup in the DB of parent directory for key corresponding to path. if key exists,
+    return key, with. 
+    NOTE: 'struct stat' stat()ed from DB file is used as a container for 'struct stat'
+           of the regular file. st_ino, st_size, st_blocks are updated with file's values.
+
+readv() -
+ 1> do a lookup in bctx cache. if successful, return the requested data from cache.
+ 2> if cache missed, do a DB->get() the entire file content and insert to cache.
+
+writev():
+ 1> flush any cached content of this file.
+ 2> do a DB->put(), with DB_DBT_PARTIAL flag. 
+    NOTE: DB_DBT_PARTIAL is used to do partial update of a value in DB.
+
+readdir():
+ 1> regular readdir() in a loop, and vomit all DB_ENV log files and DB files that
+    we encounter.
+ 2> if the readdir() buffer still has space, open a DB cursor and do a sequential
+    DBC->get() to fill the reaadir buffer.
+
+
diff --git a/doc/legacy/hacker-guide/call-stub.txt b/doc/hacker-guide/call-stub.txt
index 021037a35..bca1579b2 100644
--- a/doc/legacy/hacker-guide/call-stub.txt
+++ b/doc/hacker-guide/call-stub.txt
@@ -2,8 +2,8 @@ creating a call stub and pausing a call
 ---------------------------------------
 libglusterfs provides seperate API to pause each of the fop. parameters to each API is
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
-       NOTE: @fn should exactly take the same type and number of parameters that
+@fn    - procedure to call during call_resume(). 
+       NOTE: @fn should exactly take the same type and number of parameters that 
              the corresponding regular fop takes.
 rest will be the regular parameters to corresponding fop.
 
@@ -17,7 +17,7 @@ specific parameters.
 here is the list of stub creation APIs for xlator fops.
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @loc       - pointer to location structure.
              NOTE: @loc will be copied to a different location, with inode_ref() to
 	           @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -30,7 +30,7 @@ fop_lookup_stub (call_frame_t *frame,
 		 int32_t need_xattr);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -41,7 +41,7 @@ fop_stat_stub (call_frame_t *frame,
 	       loc_t *loc);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to lk fop.
          NOTE: @fd is stored with a fd_ref().
 call_stub_t *
@@ -50,7 +50,7 @@ fop_fstat_stub (call_frame_t *frame,
 		fd_t *fd);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to @loc->inode and
 	       @loc->parent, if not NULL. also @loc->path will be copied to a different location.
@@ -62,7 +62,7 @@ fop_chmod_stub (call_frame_t *frame,
 		mode_t mode);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to lk fop.
          NOTE: @fd is stored with a fd_ref().
 @mode  - mode parameter for fchmod fop.
@@ -73,7 +73,7 @@ fop_fchmod_stub (call_frame_t *frame,
 		 mode_t mode);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to @loc->inode and
 	       @loc->parent, if not NULL. also @loc->path will be copied to a different location.
@@ -87,7 +87,7 @@ fop_chown_stub (call_frame_t *frame,
 		gid_t gid);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to lk fop.
          NOTE: @fd is stored with a fd_ref().
 @uid   - uid parameter to fchown.
@@ -100,7 +100,7 @@ fop_fchown_stub (call_frame_t *frame,
 		 gid_t gid);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -113,7 +113,7 @@ fop_truncate_stub (call_frame_t *frame,
 		   off_t off);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to lk fop.
          NOTE: @fd is stored with a fd_ref().
 @off   - offset parameter to ftruncate fop.
@@ -124,7 +124,7 @@ fop_ftruncate_stub (call_frame_t *frame,
 		    off_t off);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -137,7 +137,7 @@ fop_utimens_stub (call_frame_t *frame,
 		  struct timespec tv[2]);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -150,7 +150,7 @@ fop_access_stub (call_frame_t *frame,
 		 int32_t mask);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -163,7 +163,7 @@ fop_readlink_stub (call_frame_t *frame,
 		   size_t size);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -178,7 +178,7 @@ fop_mknod_stub (call_frame_t *frame,
 		dev_t rdev);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -191,7 +191,7 @@ fop_mkdir_stub (call_frame_t *frame,
 		mode_t mode);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -202,7 +202,7 @@ fop_unlink_stub (call_frame_t *frame,
 		 loc_t *loc);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -213,7 +213,7 @@ fop_rmdir_stub (call_frame_t *frame,
 		loc_t *loc);
 
 @frame    - call frame which has to be used to resume the call at call_resume().
-@fn       - procedure to call during call_resume().
+@fn       - procedure to call during call_resume(). 
 @linkname - linkname parameter to symlink fop.
 @loc      - pointer to location structure.
             NOTE: @loc will be copied to a different location, with inode_ref() to
@@ -226,10 +226,10 @@ fop_symlink_stub (call_frame_t *frame,
 		  loc_t *loc);
 
 @frame    - call frame which has to be used to resume the call at call_resume().
-@fn       - procedure to call during call_resume().
+@fn       - procedure to call during call_resume(). 
 @oldloc   - pointer to location structure.
-            NOTE: @oldloc will be copied to a different location, with inode_ref() to
-	          @oldloc->inode and @oldloc->parent, if not NULL. also @oldloc->path will
+            NOTE: @oldloc will be copied to a different location, with inode_ref() to 
+	          @oldloc->inode and @oldloc->parent, if not NULL. also @oldloc->path will 
 		  be copied to a different location, if not NULL.
 @newloc   - pointer to location structure.
             NOTE: @newloc will be copied to a different location, with inode_ref() to
@@ -242,7 +242,7 @@ fop_rename_stub (call_frame_t *frame,
 		 loc_t *newloc);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc     - pointer to location structure.
            NOTE: @loc will be copied to a different location, with inode_ref() to
 	         @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -255,7 +255,7 @@ fop_link_stub (call_frame_t *frame,
 	       const char *newpath);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -272,7 +272,7 @@ fop_create_stub (call_frame_t *frame,
 		 mode_t mode, fd_t *fd);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @flags - flags parameter to open fop.
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
@@ -286,7 +286,7 @@ fop_open_stub (call_frame_t *frame,
 	       fd_t *fd);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to lk fop.
          NOTE: @fd is stored with a fd_ref().
 @size  - size parameter to readv fop.
@@ -299,10 +299,10 @@ fop_readv_stub (call_frame_t *frame,
 		off_t off);
 
 @frame  - call frame which has to be used to resume the call at call_resume().
-@fn     - procedure to call during call_resume().
+@fn     - procedure to call during call_resume(). 
 @fd     - file descriptor parameter to lk fop.
           NOTE: @fd is stored with a fd_ref().
-@vector - vector parameter to writev fop.
+@vector - vector parameter to writev fop. 
 	  NOTE: @vector is iov_dup()ed while creating stub. and frame->root->req_refs
                 dictionary is dict_ref()ed.
 @count  - count parameter to writev fop.
@@ -316,7 +316,7 @@ fop_writev_stub (call_frame_t *frame,
 		 off_t off);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to flush fop.
          NOTE: @fd is stored with a fd_ref().
 call_stub_t *
@@ -326,7 +326,7 @@ fop_flush_stub (call_frame_t *frame,
 
 
 @frame    - call frame which has to be used to resume the call at call_resume().
-@fn       - procedure to call during call_resume().
+@fn       - procedure to call during call_resume(). 
 @fd       - file descriptor parameter to lk fop.
             NOTE: @fd is stored with a fd_ref().
 @datasync - datasync parameter to fsync fop.
@@ -337,7 +337,7 @@ fop_fsync_stub (call_frame_t *frame,
 		int32_t datasync);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to @loc->inode and
 	       @loc->parent, if not NULL. also @loc->path will be copied to a different location.
@@ -346,11 +346,11 @@ fop_fsync_stub (call_frame_t *frame,
 call_stub_t *
 fop_opendir_stub (call_frame_t *frame,
 		  fop_opendir_t fn,
-		  loc_t *loc,
+		  loc_t *loc, 
 		  fd_t *fd);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to getdents fop.
          NOTE: @fd is stored with a fd_ref().
 @size  - size parameter to getdents fop.
@@ -365,7 +365,7 @@ fop_getdents_stub (call_frame_t *frame,
 		   int32_t flag);
 
 @frame   - call frame which has to be used to resume the call at call_resume().
-@fn      - procedure to call during call_resume().
+@fn      - procedure to call during call_resume(). 
 @fd      - file descriptor parameter to setdents fop.
            NOTE: @fd is stored with a fd_ref().
 @flags   - flags parameter to setdents fop.
@@ -379,7 +379,7 @@ fop_setdents_stub (call_frame_t *frame,
 		   int32_t count);
 
 @frame    - call frame which has to be used to resume the call at call_resume().
-@fn       - procedure to call during call_resume().
+@fn       - procedure to call during call_resume(). 
 @fd       - file descriptor parameter to setdents fop.
             NOTE: @fd is stored with a fd_ref().
 @datasync - datasync parameter to fsyncdir fop.
@@ -390,7 +390,7 @@ fop_fsyncdir_stub (call_frame_t *frame,
 		   int32_t datasync);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -401,9 +401,9 @@ fop_statfs_stub (call_frame_t *frame,
 		 loc_t *loc);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
-         NOTE: @loc will be copied to a different location, with inode_ref() to
+         NOTE: @loc will be copied to a different location, with inode_ref() to 
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
 	       copied to a different location.
 @dict  - dict parameter to setxattr fop.
@@ -416,7 +416,7 @@ fop_setxattr_stub (call_frame_t *frame,
 		   int32_t flags);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -429,7 +429,7 @@ fop_getxattr_stub (call_frame_t *frame,
 		   const char *name);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -443,7 +443,7 @@ fop_removexattr_stub (call_frame_t *frame,
 		      const char *name);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to lk fop.
          NOTE: @fd is stored with a fd_ref().
 @cmd   - command parameter to lk fop.
@@ -457,13 +457,13 @@ fop_lk_stub (call_frame_t *frame,
 	     struct flock *lock);
 
 @frame    - call frame which has to be used to resume the call at call_resume().
-@fn       - procedure to call during call_resume().
+@fn       - procedure to call during call_resume(). 
 @fd       - fd parameter to gf_lk fop.
 	    NOTE: @fd is fd_ref()ed while creating stub, if not NULL.
 @cmd      - cmd parameter to gf_lk fop.
 @lock     - lock paramater to gf_lk fop.
 	    NOTE: @lock is copied to a different memory location while creating
-	          stub.
+	          stub. 
 call_stub_t *
 fop_gf_lk_stub (call_frame_t *frame,
 		fop_gf_lk_t fn,
@@ -472,7 +472,7 @@ fop_gf_lk_stub (call_frame_t *frame,
 		struct flock *lock);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @fd    - file descriptor parameter to readdir fop.
          NOTE: @fd is stored with a fd_ref().
 @size  - size parameter to readdir fop.
@@ -485,7 +485,7 @@ fop_readdir_stub (call_frame_t *frame,
 		  off_t off);
 
 @frame - call frame which has to be used to resume the call at call_resume().
-@fn    - procedure to call during call_resume().
+@fn    - procedure to call during call_resume(). 
 @loc   - pointer to location structure.
          NOTE: @loc will be copied to a different location, with inode_ref() to
 	       @loc->inode and @loc->parent, if not NULL. also @loc->path will be
@@ -498,7 +498,7 @@ fop_checksum_stub (call_frame_t *frame,
 		   int32_t flags);
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @inode     - inode parameter to @fn.
@@ -516,7 +516,7 @@ fop_lookup_cbk_stub (call_frame_t *frame,
 		     struct stat *buf,
 		     dict_t *dict);
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -529,7 +529,7 @@ fop_stat_cbk_stub (call_frame_t *frame,
 		   struct stat *buf);
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -542,7 +542,7 @@ fop_fstat_cbk_stub (call_frame_t *frame,
 		    struct stat *buf);
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -555,7 +555,7 @@ fop_chmod_cbk_stub (call_frame_t *frame,
 		    struct stat *buf);
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -568,7 +568,7 @@ fop_fchmod_cbk_stub (call_frame_t *frame,
 		     struct stat *buf);
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -582,7 +582,7 @@ fop_chown_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -596,7 +596,7 @@ fop_fchown_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -610,7 +610,7 @@ fop_truncate_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -624,7 +624,7 @@ fop_ftruncate_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -638,7 +638,7 @@ fop_utimens_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -649,7 +649,7 @@ fop_access_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @path      - path parameter to @fn.
@@ -663,7 +663,7 @@ fop_readlink_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @inode     - inode parameter to @fn.
@@ -680,7 +680,7 @@ fop_mknod_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @inode     - inode parameter to @fn.
@@ -697,7 +697,7 @@ fop_mkdir_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -708,7 +708,7 @@ fop_unlink_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -719,7 +719,7 @@ fop_rmdir_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @inode     - inode parameter to @fn.
@@ -736,7 +736,7 @@ fop_symlink_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -750,7 +750,7 @@ fop_rename_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @inode     - inode parameter to @fn.
@@ -766,7 +766,7 @@ fop_link_cbk_stub (call_frame_t *frame,
 		   struct stat *buf);
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @fd        - fd parameter to @fn.
@@ -786,7 +786,7 @@ fop_create_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @fd        - fd parameter to @fn.
@@ -800,10 +800,10 @@ fop_open_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
-@vector    - vector parameter to @fn.
+@vector    - vector parameter to @fn.	
 	     NOTE: @vector is copied to a different memory location, if not NULL. also
 	           frame->root->rsp_refs is dict_ref()ed.
 @stbuf     - stbuf parameter to @fn.
@@ -819,7 +819,7 @@ fop_readv_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @stbuf     - stbuf parameter to @fn.
@@ -833,7 +833,7 @@ fop_writev_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -843,7 +843,7 @@ fop_flush_cbk_stub (call_frame_t *frame,
 		    int32_t op_errno);
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -854,7 +854,7 @@ fop_fsync_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @fd        - fd parameter to @fn.
@@ -868,7 +868,7 @@ fop_opendir_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @entries   - entries parameter to @fn.
@@ -883,7 +883,7 @@ fop_getdents_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -893,7 +893,7 @@ fop_setdents_cbk_stub (call_frame_t *frame,
 		       int32_t op_errno);
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -904,7 +904,7 @@ fop_fsyncdir_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @buf       - buf parameter to @fn.
@@ -918,7 +918,7 @@ fop_statfs_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -929,7 +929,7 @@ fop_setxattr_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 @value     - value dictionary parameter to @fn.
@@ -943,7 +943,7 @@ fop_getxattr_cbk_stub (call_frame_t *frame,
 
 
 @frame     - call frame which has to be used to resume the call at call_resume().
-@fn        - procedure to call during call_resume().
+@fn        - procedure to call during call_resume(). 
 @op_ret    - op_ret parameter to @fn.
 @op_errno  - op_errno parameter to @fn.
 call_stub_t *
@@ -954,12 +954,12 @@ fop_removexattr_cbk_stub (call_frame_t *frame,
 
 
 @frame    - call frame which has to be used to resume the call at call_resume().
-@fn       - procedure to call during call_resume().
+@fn       - procedure to call during call_resume(). 
 @op_ret   - op_ret parameter to @fn.
 @op_errno - op_errno parameter to @fn.
 @lock     - lock parameter to @fn.
 	    NOTE: @lock is copied to a different memory location while creating
-	          stub.
+	          stub. 
 call_stub_t *
 fop_lk_cbk_stub (call_frame_t *frame,
 		 fop_lk_cbk_t fn,
@@ -968,12 +968,12 @@ fop_lk_cbk_stub (call_frame_t *frame,
 		 struct flock *lock);
 
 @frame    - call frame which has to be used to resume the call at call_resume().
-@fn       - procedure to call during call_resume().
+@fn       - procedure to call during call_resume(). 
 @op_ret   - op_ret parameter to @fn.
 @op_errno - op_errno parameter to @fn.
 @lock     - lock parameter to @fn.
 	    NOTE: @lock is copied to a different memory location while creating
-	          stub.
+	          stub. 
 call_stub_t *
 fop_gf_lk_cbk_stub (call_frame_t *frame,
 		    fop_gf_lk_cbk_t fn,
@@ -983,7 +983,7 @@ fop_gf_lk_cbk_stub (call_frame_t *frame,
 
 
 @frame    - call frame which has to be used to resume the call at call_resume().
-@fn       - procedure to call during call_resume().
+@fn       - procedure to call during call_resume(). 
 @op_ret   - op_ret parameter to @fn.
 @op_errno - op_errno parameter to @fn.
 @entries  - entries parameter to @fn.
@@ -996,14 +996,14 @@ fop_readdir_cbk_stub (call_frame_t *frame,
 
 
 @frame         - call frame which has to be used to resume the call at call_resume().
-@fn            - procedure to call during call_resume().
+@fn            - procedure to call during call_resume(). 
 @op_ret        - op_ret parameter to @fn.
 @op_errno      - op_errno parameter to @fn.
 @file_checksum - file_checksum parameter to @fn.
-                 NOTE: file_checksum will be copied to a different memory location
+                 NOTE: file_checksum will be copied to a different memory location 
 		       while creating stub.
 @dir_checksum  - dir_checksum parameter to @fn.
-                 NOTE: file_checksum will be copied to a different memory location
+                 NOTE: file_checksum will be copied to a different memory location 
 		       while creating stub.
 call_stub_t *
 fop_checksum_cbk_stub (call_frame_t *frame,
@@ -1025,9 +1025,9 @@ resuming a call:
         in  stub->args.<operation>.<fd_t-or-inode_t-or-dict_t>. so, if any fd_t, dict_t or
 	inode_t pointers are assigned at stub->args.<operation>.<fd_t-or-inode_t-or-dict_t> after
 	fop_<operation>_stub() call, they must be <fd_t-or-inode_t-or-dict_t>_ref()ed.
-
+	
 	call_resume does not STACK_DESTROY() for any fop.
-
+	
   if stub->fn is NULL, call_resume does STACK_WIND() or STACK_UNWIND() using the stub->frame.
 
   return - call resume fails only if stub is NULL. call resume fails with errno set to EINVAL.
diff --git a/doc/hacker-guide/en-US/markdown/adding-fops.md b/doc/hacker-guide/en-US/markdown/adding-fops.md
deleted file mode 100644
index 3f72ed3e2..000000000
--- a/doc/hacker-guide/en-US/markdown/adding-fops.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Adding a new FOP
-================
-
-Steps to be followed when adding a new FOP to GlusterFS:
-
-1. Edit `glusterfs.h` and add a `GF_FOP_*` constant.
-2. Edit `xlator.[ch]` and:
-    * add the new prototype for fop and callback.
-    * edit `xlator_fops` structure.
-3. Edit `xlator.c` and add to fill_defaults.
-4. Edit `protocol.h` and add struct necessary for the new FOP.
-5. Edit `defaults.[ch]` and provide default implementation.
-6. Edit `call-stub.[ch]` and provide stub implementation.
-7. Edit `common-utils.c` and add to gf_global_variable_init().
-8. Edit client-protocol and add your FOP.
-9. Edit server-protocol and add your FOP.
-10. Implement your FOP in any translator for which the default implementation
-    is not sufficient.
diff --git a/doc/hacker-guide/en-US/markdown/afr.md b/doc/hacker-guide/en-US/markdown/afr.md
deleted file mode 100644
index 1be7e39f2..000000000
--- a/doc/hacker-guide/en-US/markdown/afr.md
+++ /dev/null
@@ -1,191 +0,0 @@
-cluster/afr translator
-======================
-
-Locking
--------
-
-Before understanding replicate, one must understand two internal FOPs:
-
-### `GF_FILE_LK`
-
-This is exactly like `fcntl(2)` locking, except the locks are in a
-separate domain from locks held by applications.
-
-### `GF_DIR_LK (loc_t *loc, char *basename)`
-
-This allows one to lock a name under a directory. For example,
-to lock /mnt/glusterfs/foo, one would use the call:
-
-```
-GF_DIR_LK ({loc_t for "/mnt/glusterfs"}, "foo")
-```
-
-If one wishes to lock *all* the names under a particular directory,
-supply the basename argument as `NULL`.
-
-The locks can either be read locks or write locks; consult the
-function prototype for more details.
-
-Both these operations are implemented by the features/locks (earlier
-known as posix-locks) translator.
-
-Basic design
-------------
-
-All FOPs can be classified into four major groups:
-
-### inode-read
-
-Operations that read an inode's data (file contents) or metadata (perms, etc.).
-
-access, getxattr, fstat, readlink, readv, stat.
-
-### inode-write
-
-Operations that modify an inode's data or metadata.
-
-chmod, chown, truncate, writev, utimens.
-
-### dir-read
-
-Operations that read a directory's contents or metadata.
-
-readdir, getdents, checksum.
-
-### dir-write
-
-Operations that modify a directory's contents or metadata.
-
-create, link, mkdir, mknod, rename, rmdir, symlink, unlink.
-
-Some of these make a subgroup in that they modify *two* different entries:
-link, rename, symlink.
-
-### Others
-
-Other operations.
-
-flush, lookup, open, opendir, statfs.
-
-Algorithms
-----------
-
-Each of the four major groups has its own algorithm:
-
-### inode-read, dir-read
-
-1. Send a request to the first child that is up:
-    * if it fails:
-        * try the next available child
-    * if we have exhausted all children:
-        * return failure
-
-### inode-write
-
- All operations are done in parallel unless specified otherwise.
-
-1. Send a ``GF_FILE_LK`` request on all children for a write lock on the 
-   appropriate region
-   (for metadata operations: entire file (0, 0) for writev:
-   (offset, offset+size of buffer))
-    * If a lock request fails on a child:
-        * unlock all children
-        * try to acquire a blocking lock (`F_SETLKW`) on each child, serially.
-	  If this fails (due to `ENOTCONN` or `EINVAL`):
-          Consider this child as dead for rest of transaction.
-2. Mark all children as "pending" on all (alive) children (see below for 
-meaning of "pending").
-    * If it fails on any child:
-        * mark it as dead (in transaction local state).
-3. Perform operation on all (alive) children.
-    * If it fails on any child:
-        * mark it as dead (in transaction local state).
-4. Unmark all successful children as not "pending" on all nodes.
-5. Unlock region on all (alive) children.
-
-### dir-write
-
- The algorithm for dir-write is same as above except instead of holding
- `GF_FILE_LK` locks we hold a GF_DIR_LK lock on the name being operated upon.
- In case of link-type calls, we hold locks on both the operand names.
-
-"pending"
----------
-
-The "pending" number is like a journal entry. A pending entry is an
-array of 32-bit integers stored in network byte-order as the extended
-attribute of an inode (which can be a directory as well).
-
-There are three keys corresponding to three types of pending operations:
-
-### `AFR_METADATA_PENDING`
-
-There are some metadata operations pending on this inode (perms, ctime/mtime,
-xattr, etc.).
-
-### `AFR_DATA_PENDING`
-
-There is some data pending on this inode (writev).
-
-### `AFR_ENTRY_PENDING`
-
-There are some directory operations pending on this directory
-(create, unlink, etc.).
-
-Self heal
----------
-
-* On lookup, gather extended attribute data:
-    * If entry is a regular file:
-        * If an entry is present on one child and not on others:
-            * create entry on others.
-        * If entries exist but have different metadata (perms, etc.):
-            * consider the entry with the highest `AFR_METADATA_PENDING` number as
-              definitive and replicate its attributes on children.
-    * If entry is a directory:
-        * Consider the entry with the higest `AFR_ENTRY_PENDING` number as
-          definitive and replicate its contents on all children.
-    * If any two entries have non-matching types (i.e., one is file and
-      other is directory):
-        * Announce to the user via log that a split-brain situation has been
-          detected, and do nothing.
-* On open, gather extended attribute data:
-    * Consider the file with the highest `AFR_DATA_PENDING` number as
-      the definitive one and replicate its contents on all other
-      children.
-
-During all self heal operations, appropriate locks must be held on all
-regions/entries being affected.
-
-Inode scaling
--------------
-
-Inode scaling is necessary because if a situation arises where an inode number 
-is returned for a directory (by lookup) which was previously the inode number 
-of a file (as per FUSE's table), then FUSE gets horribly confused (consult a 
-FUSE expert for more details).
-
-To avoid such a situation, we distribute the 64-bit inode space equally
-among all children of replicate.
-
-To illustrate:
-
-If c1, c2, c3 are children of replicate, they each get 1/3 of the available
-inode space:
-
--------------  --  --  --  --  --  --  --  --  --  --  --  ---
-Child:         c1  c2  c3  c1  c2  c3  c1  c2  c3  c1  c2  ...
-Inode number:  1    2   3   4   5   6   7   8   9  10  11  ...
--------------  --  --  --  --  --  --  --  --  --  --  --  ---
-
-Thus, if lookup on c1 returns an inode number "2", it is scaled to "4"
-(which is the second inode number in c1's space).
-
-This way we ensure that there is never a collision of inode numbers from
-two different children.
-
-This reduction of inode space doesn't really reduce the usability of
-replicate since even if we assume replicate has 1024 children (which would be a
-highly unusual scenario), each child still has a 54-bit inode space:
-$2^{54} \sim 1.8 \times 10^{16}$, which is much larger than any real
-world requirement.
diff --git a/doc/hacker-guide/en-US/markdown/coding-standard.md b/doc/hacker-guide/en-US/markdown/coding-standard.md
deleted file mode 100644
index 178dc142a..000000000
--- a/doc/hacker-guide/en-US/markdown/coding-standard.md
+++ /dev/null
@@ -1,402 +0,0 @@
-GlusterFS Coding Standards
-==========================
-
-Structure definitions should have a comment per member
-------------------------------------------------------
-
-Every member in a structure definition must have a comment about its
-purpose. The comment should be descriptive without being overly verbose.
-
-*Bad:*
-
-```
-gf_lock_t   lock;           /* lock */
-```
-
-*Good:*
-
-```
-DBTYPE      access_mode;    /* access mode for accessing
-                             * the databases, can be
-                             * DB_HASH, DB_BTREE
-                             * (option access-mode <mode>)
-                             */
-```
-
-Declare all variables at the beginning of the function
-------------------------------------------------------
-
-All local variables in a function must be declared immediately after the
-opening brace. This makes it easy to keep track of memory that needs to be freed
-during exit. It also helps debugging, since gdb cannot handle variables
-declared inside loops or other such blocks.
-
-Always initialize local variables
----------------------------------
-
-Every local variable should be initialized to a sensible default value
-at the point of its declaration. All pointers should be initialized to NULL,
-and all integers should be zero or (if it makes sense) an error value.
-
-
-*Good:*
-
-```
-int ret       = 0;
-char *databuf = NULL;
-int _fd       = -1;
-```
-
-Initialization should always be done with a constant value
-----------------------------------------------------------
-
-Never use a non-constant expression as the initialization value for a variable.
-
-
-*Bad:*
-
-```
-pid_t pid     = frame->root->pid;
-char *databuf = malloc (1024);
-```
-
-Validate all arguments to a function
-------------------------------------
-
-All pointer arguments to a function must be checked for `NULL`.
-A macro named `VALIDATE` (in `common-utils.h`)
-takes one argument, and if it is `NULL`, writes a log message and
-jumps to a label called `err` after setting op_ret and op_errno
-appropriately. It is recommended to use this template.
-
-
-*Good:*
-
-```
-VALIDATE(frame);
-VALIDATE(this);
-VALIDATE(inode);
-```
-
-Never rely on precedence of operators
--------------------------------------
-
-Never write code that relies on the precedence of operators to execute
-correctly.  Such code can be hard to read and someone else might not
-know the precedence of operators as accurately as you do.
-
-*Bad:*
-
-```
-if (op_ret == -1 && errno != ENOENT)
-```
-
-*Good:*
-
-```
-if ((op_ret == -1) && (errno != ENOENT))
-```
-
-Use exactly matching types
---------------------------
-
-Use a variable of the exact type declared in the manual to hold the
-return value of a function. Do not use an ``equivalent'' type.
-
-
-*Bad:*
-
-```
-int len = strlen (path);
-```
-
-*Good:*
-
-```
-size_t len = strlen (path);
-```
-
-Never write code such as `foo->bar->baz`; check every pointer
--------------------------------------------------------------
-
-Do not write code that blindly follows a chain of pointer
-references. Any pointer in the chain may be `NULL` and thus
-cause a crash. Verify that each pointer is non-null before following
-it.
-
-Check return value of all functions and system calls
-----------------------------------------------------
-
-The return value of all system calls and API functions must be checked
-for success or failure.
-
-*Bad:*
-
-```
-close (fd);
-```
-
-*Good:*
-
-```
-op_ret = close (_fd);
-if (op_ret == -1) {
-        gf_log (this->name, GF_LOG_ERROR,
-                "close on file %s failed (%s)", real_path,
-                strerror (errno));
-        op_errno = errno;
-        goto out;
-}
-```
-
-
-Gracefully handle failure of malloc
------------------------------------
-
-GlusterFS should never crash or exit due to lack of memory. If a
-memory allocation fails, the call should be unwound and an error
-returned to the user.
-
-*Use result args and reserve the return value to indicate success or failure:*
-
-The return value of every functions must indicate success or failure (unless
-it is impossible for the function to fail --- e.g., boolean functions). If
-the function needs to return additional data, it must be returned using a
-result (pointer) argument.
-
-*Bad:*
-
-```
-int32_t dict_get_int32 (dict_t *this, char *key);
-```
-
-*Good:*
-
-```
-int dict_get_int32 (dict_t *this, char *key, int32_t *val);
-```
-
-Always use the `n' versions of string functions
------------------------------------------------
-
-Unless impossible, use the length-limited versions of the string functions.
-
-*Bad:*
-
-```
-strcpy (entry_path, real_path);
-```
-
-*Good:*
-
-```
-strncpy (entry_path, real_path, entry_path_len);
-```
-
-No dead or commented code
--------------------------
-
-There must be no dead code (code to which control can never be passed) or
-commented out code in the codebase.
-
-Only one unwind and return per function
----------------------------------------
-
-There must be only one exit out of a function. `UNWIND` and return
-should happen at only point in the function.
-
-Function length or Keep functions small
----------------------------------------
-
-We live in the UNIX-world where modules do one thing and do it well.
-This rule should apply to our functions also. If a function is very long, try splitting it
-into many little helper functions. The question is, in a coding
-spree, how do we know a function is long and unreadable. One rule of
-thumb given by Linus Torvalds is that, a function should be broken-up
-if you have 4 or more levels of indentation going on for more than 3-4
-lines.
-
-*Example for a helper function:*
-```
-static int
-same_owner (posix_lock_t *l1, posix_lock_t *l2)
-{
-        return ((l1->client_pid == l2->client_pid) &&
-               (l1->transport  == l2->transport));
-}
-```
-
-Defining functions as static
-----------------------------
-
-Define internal functions as static only if you're
-very sure that there will not be a crash(..of any kind..) emanating in
-that function. If there is even a remote possibility, perhaps due to
-pointer derefering, etc, declare the function as non-static. This
-ensures that when a crash does happen, the function name shows up the
-in the back-trace generated by libc. However, doing so has potential
-for polluting the function namespace, so to avoid conflicts with other
-components in other parts, ensure that the function names are
-prepended with a prefix that identify the component to which it
-belongs. For eg. non-static functions in io-threads translator start
-with iot_.
-
-Ensure function calls wrap around after 80-columns
---------------------------------------------------
-
-Place remaining arguments on the next line if needed.
-
-Functions arguments and function definition
--------------------------------------------
-
-Place all the arguments of a function definition on the same line
-until the line goes beyond 80-cols. Arguments that extend beyind
-80-cols should be placed on the next line.
-
-Style issues
-------------
-
-### Brace placement
-
-Use K&R/Linux style of brace placement for blocks.
-
-*Good:*
-
-```
-int some_function (...)
-{
-        if (...) {
-                /* ... */
-        } else if (...) {
-                /* ... */
-        } else {
-                /* ... */
-        }
-
-        do {
-                /* ... */
-        } while (cond);
-}
-```
-
-### Indentation
-
-Use *eight* spaces for indenting blocks. Ensure that your
-file contains only spaces and not tab characters. You can do this
-in Emacs by selecting the entire file (`C-x h`) and
-running `M-x untabify`.
-
-To make Emacs indent lines automatically by eight spaces, add this
-line to your `.emacs`:
-
-```
-(add-hook 'c-mode-hook (lambda () (c-set-style "linux")))
-```
-
-### Comments
-
-Write a comment before every function describing its purpose (one-line),
-its arguments, and its return value. Mention whether it is an internal
-function or an exported function.
-
-Write a comment before every structure describing its purpose, and
-write comments about each of its members.
-
-Follow the style shown below for comments, since such comments
-can then be automatically extracted by doxygen to generate
-documentation.
-
-*Good:*
-
-```
-/**
-* hash_name -hash function for filenames
-* @par:  parent inode number
-* @name: basename of inode
-* @mod:  number of buckets in the hashtable
-*
-* @return: success: bucket number
-*          failure: -1
-*
-* Not for external use.
-*/
-```
-
-### Indicating critical sections
-
-To clearly show regions of code which execute with locks held, use
-the following format:
-
-```
-pthread_mutex_lock (&mutex);
-{
-        /* code */
-}
-pthread_mutex_unlock (&mutex);
-```
-
-*A skeleton fop function:*
-
-This is the recommended template for any fop. In the beginning come
-the initializations. After that, the `success' control flow should be
-linear.  Any error conditions should cause a `goto` to a single
-point, `out`.  At that point, the code should detect the error
-that has occured and do appropriate cleanup.
-
-```
-int32_t
-sample_fop (call_frame_t *frame, xlator_t *this, ...)
-{
-        char *            var1     = NULL;
-        int32_t           op_ret   = -1;
-        int32_t           op_errno = 0;
-        DIR *             dir      = NULL;
-        struct posix_fd * pfd      = NULL;
-
-        VALIDATE_OR_GOTO (frame, out);
-        VALIDATE_OR_GOTO (this, out);
-
-        /* other validations */
-
-        dir = opendir (...);
-
-        if (dir == NULL) {
-                op_errno = errno;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "opendir failed on %s (%s)", loc->path,
-                        strerror (op_errno));
-                goto out;
-        }
-
-        /* another system call */
-        if (...) {
-                op_errno = ENOMEM;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "out of memory :(");
-                goto out;
-        }
-
-        /* ... */
-
- out:
-        if (op_ret == -1) {
-
-          /* check for all the cleanup that needs to be
-             done */
-
-                if (dir) {
-                        closedir (dir);
-                        dir = NULL;
-                }
-
-                if (pfd) {
-                        FREE (pfd->path);
-                        FREE (pfd);
-                        pfd = NULL;
-                }
-        }
-
-        STACK_UNWIND (frame, op_ret, op_errno, fd);
-        return 0;
-}
-```
diff --git a/doc/hacker-guide/en-US/markdown/posix.md b/doc/hacker-guide/en-US/markdown/posix.md
deleted file mode 100644
index 84c813e55..000000000
--- a/doc/hacker-guide/en-US/markdown/posix.md
+++ /dev/null
@@ -1,59 +0,0 @@
-storage/posix translator
-========================
-
-Notes
------
-
-### `SET_FS_ID`
-
-This is so that all filesystem checks are done with the user's
-uid/gid and not GlusterFS's uid/gid.
-
-### `MAKE_REAL_PATH`
-
-This macro concatenates the base directory of the posix volume
-('option directory') with the given path.
-
-### `need_xattr` in lookup
-
-If this flag is passed, lookup returns a xattr dictionary that contains
-the file's create time, the file's contents, and the version number
-of the file.
-
-This is a hack to increase small file performance. If an application
-wants to read a small file, it can finish its job with just a lookup
-call instead of a lookup followed by read.
-
-### `getdents`/`setdents`
-
-These are used by unify to set and get directory entries.
-
-### `ALIGN_BUF`
-
-Macro to align an address to a page boundary (4K).
-
-### `priv->export_statfs`
-
-In some cases, two exported volumes may reside on the same
-partition on the server. Sending statvfs info for both
-the volumes will lead to erroneous df output at the client,
-since free space on the partition will be counted twice.
-
-In such cases, user can disable exporting statvfs info
-on one of the volumes by setting this option.
-
-### `xattrop`
-
-This fop is used by replicate to set version numbers on files.
-
-### `getxattr`/`setxattr` hack to read/write files
-
-A key, `GLUSTERFS_FILE_CONTENT_STRING`, is handled in a special way by
-`getxattr`/`setxattr`. A getxattr with the key will return the entire
-content of the file as the value. A `setxattr` with the key will write
-the value as the entire content of the file.
-
-### `posix_checksum`
-
-This calculates a simple XOR checksum on all entry names in a
-directory that is used by unify to compare directory contents.
diff --git a/doc/hacker-guide/en-US/markdown/translator-development.md b/doc/hacker-guide/en-US/markdown/translator-development.md
deleted file mode 100644
index 77d1b606a..000000000
--- a/doc/hacker-guide/en-US/markdown/translator-development.md
+++ /dev/null
@@ -1,666 +0,0 @@
-Translator development
-======================
-
-Setting the Stage
------------------
-
-This is the first post in a series that will explain some of the details of
-writing a GlusterFS translator, using some actual code to illustrate.
-
-Before we begin, a word about environments. GlusterFS is over 300K lines of
-code spread across a few hundred files. That's no Linux kernel or anything, but
- you're still going to be navigating through a lot of code in every
-code-editing session, so some kind of cross-referencing is *essential*. I use
-cscope with the vim bindings, and if I couldn't do Crtl+G and such to jump
-between definitions all the time my productivity would be cut in half. You may
-prefer different tools, but as I go through these examples you'll need
-something functionally similar to follow on. OK, on with the show.
-
-The first thing you need to know is that translators are not just bags of
-functions and variables. They need to have a very definite internal structure
-so that the translator-loading code can figure out where all the pieces are.
-The way it does this is to use dlsym to look for specific names within your
-shared-object file, as follow (from `xlator.c`):
-
-```
-if (!(xl->fops = dlsym (handle, "fops"))) {
-    gf_log ("xlator", GF_LOG_WARNING, "dlsym(fops) on %s",
-        dlerror ());
-    goto out;
-}
-
-if (!(xl->cbks = dlsym (handle, "cbks"))) {
-    gf_log ("xlator", GF_LOG_WARNING, "dlsym(cbks) on %s",
-        dlerror ());
-    goto out;
-}
-
-if (!(xl->init = dlsym (handle, "init"))) {
-    gf_log ("xlator", GF_LOG_WARNING, "dlsym(init) on %s",
-        dlerror ());
-    goto out;
-}
-
-if (!(xl->fini = dlsym (handle, "fini"))) {
-    gf_log ("xlator", GF_LOG_WARNING, "dlsym(fini) on %s",
-        dlerror ());
-    goto out;
-}
-```
-
-In this example, `xl` is a pointer to the in-memory object for the translator
-we're loading. As you can see, it's looking up various symbols *by name* in the
- shared object it just loaded, and storing pointers to those symbols. Some of
-them (e.g. init are functions, while others e.g. fops are dispatch tables
-containing pointers to many functions. Together, these make up the translator's
- public interface.
-
-Most of this glue or boilerplate can easily be found at the bottom of one of
-the source files that make up each translator. We're going to use the `rot-13`
-translator just for fun, so in this case you'd look in `rot-13.c` to see this:
-
-```
-struct xlator_fops fops = {
-    .readv          = rot13_readv,
-    .writev         = rot13_writev
-};
-
-struct xlator_cbks cbks = {
-};
-
-struct volume_options options[] = {
-{ .key    = {"encrypt-write"},
-  .type = GF_OPTION_TYPE_BOOL
-},
-{ .key    = {"decrypt-read"},
-  .type = GF_OPTION_TYPE_BOOL
-},
-{ .key    = {NULL} },
-};
-```
-
-The `fops` table, defined in `xlator.h`, is one of the most important pieces.
-This table contains a pointer to each of the filesystem functions that your
-translator might implement -- `open`, `read`, `stat`, `chmod`, and so on. There
-are 82 such functions in all, but don't worry; any that you don't specify here
-will be see as null and filled with defaults from `defaults.c` when your
-translator is loaded. In this particular example, since `rot-13` is an
-exceptionally simple translator, we only fill in two entries for `readv` and
-`writev`.
-
-There are actually two other tables, also required to have predefined names,
-that are also used to find translator functions: `cbks` (which is empty in this
- snippet) and `dumpops` (which is missing entirely). The first of these specify
- entry points for when inodes are forgotten or file descriptors are released.
-In other words, they're destructors for objects in which your translator might
- have an interest. Mostly you can ignore them, because the default behavior
-handles even the simpler cases of translator-specific inode/fd context
-automatically. However, if the context you attach is a complex structure
-requiring complex cleanup, you'll need to supply these functions. As for
-dumpops, that's just used if you want to provide functions to pretty-print
-various structures in logs. I've never used it myself, though I probably
-should. What's noteworthy here is that we don't even define dumpops. That's
-because all of the functions that might use these dispatch functions will check
- for `xl->dumpops` being `NULL` before calling through it. This is in sharp
-contrast to the behavior for `fops` and `cbks1`, which *must* be present. If
-they're not, translator loading will fail because these pointers are not
-checked every time and if they're `NULL` then we'll segfault. That's why we
-provide an empty definition for cbks; it's OK for the individual function
-pointers to be NULL, but not for the whole table to be absent.
-
-The last piece I'll cover today is options. As you can see, this is a table of
-translator-specific option names and some information about their types.
-GlusterFS actually provides a pretty rich set of types (`volume_option_type_t`
-in `options.`h) which includes paths, translator names, percentages, and times
-in addition to the obvious integers and strings. Also, the `volume_option_t`
-structure can include information about alternate names, min/max/default
-values, enumerated string values, and descriptions. We don't see any of these
-here, so let's take a quick look at some more complex examples from afr.c and
-then come back to `rot-13`.
-
-```
-{ .key  = {"data-self-heal-algorithm"},
-  .type = GF_OPTION_TYPE_STR,
-  .default_value = "",
-  .description   = "Select between \"full\", \"diff\". The "
-           "\"full\" algorithm copies the entire file from "
-           "source to sink. The \"diff\" algorithm copies to "
-           "sink only those blocks whose checksums don't match "
-           "with those of source.",
-  .value = { "diff", "full", "" }
-},
-{ .key  = {"data-self-heal-window-size"},
-  .type = GF_OPTION_TYPE_INT,
-  .min  = 1,
-  .max  = 1024,
-  .default_value = "1",
-  .description = "Maximum number blocks per file for which "
-         "self-heal process would be applied simultaneously."
-},
-```
-
-When your translator is loaded, all of this information is used to parse the
-options actually provided in the volfile, and then the result is turned into a
-dictionary and stored as `xl->options`. This dictionary is then processed by
-your init function, which you can see being looked up in the first code
-fragment above. We're only going to look at a small part of the `rot-13`'s
-init for now.
-
-```
-priv->decrypt_read = 1;
-priv->encrypt_write = 1;
-
-data = dict_get (this->options, "encrypt-write");
-if (data) {
-    if (gf_string2boolean (data->data, &priv->encrypt_write
-        == -1) {
-        gf_log (this->name, GF_LOG_ERROR,
-            "encrypt-write takes only boolean options");
-        return -1;
-    }
-}
-```
-
-What we can see here is that we're setting some defaults in our priv structure,
-then looking to see if an `encrypt-write` option was actually provided. If so,
-we convert and store it. This is a pretty classic use of dict_get to fetch a
-field from a dictionary, and of using one of many conversion functions in
-`common-utils.c` to convert `data->data` into something we can use.
-
-So far we've covered the basic of how a translator gets loaded, how we find its
-various parts, and how we process its options. In my next Translator 101 post,
-we'll go a little deeper into other things that init and its companion fini
-might do, and how some other fields in our `xlator_t` structure (commonly
-referred to as this) are commonly used.
-
-`init`, `fini`, and private context
------------------------------------
-
-In the previous Translator 101 post, we looked at some of the dispatch tables
-and options processing in a translator. This time we're going to cover the rest
- of the "shell" of a translator -- i.e. the other global parts not specific to
-handling a particular request.
-
-Let's start by looking at the relationship between a translator and its shared
-library. At a first approximation, this is the relationship between an object
-and a class in just about any object-oriented programming language. The class
-defines behaviors, but has to be instantiated as an object to have any kind of
-existence. In our case the object is an `xlator_t`. Several of these might be
-created within the same daemon, sharing all of the same code through init/fini
-and dispatch tables, but sharing *no data*. You could implement shared data (as
- static variables in your shared libraries) but that's strongly discouraged.
-Every function in your shared library will get an `xlator_t` as an argument,
-and should use it. This lack of class-level data is one of the points where
-the analogy to common OOP systems starts to break down. Another place is the
-complete lack of inheritance. Translators inherit behavior (code) from exactly
-one shared library -- looked up and loaded using the `type` field in a volfile
-`volume ... end-volume` block -- and that's it -- not even single inheritance,
-no subclasses or superclasses, no mixins or prototypes, just the relationship
-between an object and its class. With that in mind, let's turn to the init
-function that we just barely touched on last time.
-
-```
-int32_t
-init (xlator_t *this)
-{
-    data_t *data = NULL;
-    rot_13_private_t *priv = NULL;
-
-    if (!this->children || this->children->next) {
-        gf_log ("rot13", GF_LOG_ERROR,
-            "FATAL: rot13 should have exactly one child");
-        return -1;
-    }
-
-    if (!this->parents) {
-        gf_log (this->name, GF_LOG_WARNING,
-            "dangling volume. check volfile ");
-    }
-
-    priv = GF_CALLOC (sizeof (rot_13_private_t), 1, 0);
-    if (!priv)
-        return -1;
-```
-
-At the very top, we see the function signature -- we get a pointer to the
-`xlator_t` object that we're initializing, and we return an `int32_t` status.
-As with most functions in the translator API, this should be zero to indicate
-success. In this case it's safe to return -1 for failure, but watch out: in
-dispatch-table functions, the return value means the status of the *function
-call* rather than the *request*. A request error should be reflected as a
-callback with a non-zero `op_re`t value, but the dispatch function itself
-should still return zero. In fact, the handling of a non-zero return from a
-dispatch function is not all that robust (we recently had a bug report in
-HekaFS related to this) so it's something you should probably avoid
-altogether. This only underscores the difference between dispatch functions
-and `init`/`fini` functions, where non-zero returns *are* expected and handled
-logically by aborting the translator setup. We can see that down at the
-bottom, where we return -1 to indicate that we couldn't allocate our
-private-data area (more about that later).
-
-The first thing this init function does is check that the translator is being
-set up in the right kind of environment. Translators are called by parents and
-in turn call children. Some translators are "initial" translators that inject
-requests into the system from elsewhere -- e.g. mount/fuse injecting requests
-from the kernel, protocol/server injecting requests from the network. Those
-translators don't need parents, but `rot-13` does and so we check for that.
-Similarly, some translators are "final" translators that (from the perspective
-of the current process) terminate requests instead of passing them on -- e.g.
-`protocol/client` passing them to another node, `storage/posix` passing them to
-a local filesystem. Other translators "multiplex" between multiple children --
- passing each parent request on to one (`cluster/dht`), some
-(`cluster/stripe`), or all (`cluster/afr`) of those children. `rot-13` fits
-into none of those categories either, so it checks that it has *exactly one*
-child. It might be more convenient or robust if translator shared libraries
-had standard variables describing these requirements, to be checked in a
-consistent way by the translator-loading infrastructure itself instead of by
-each separate init function, but this is the way translators work today.
-
-The last thing we see in this fragment is allocating our private data area.
-This can literally be anything we want; the infrastructure just provides the
-priv pointer as a convenience but takes no responsibility for how it's used. In
- this case we're using `GF_CALLOC` to allocate our own `rot_13_private_t`
-structure. This gets us all the benefits of GlusterFS's memory-leak detection
-infrastructure, but the way we're calling it is not quite ideal. For one thing,
- the first two arguments -- from `calloc(3)` -- are kind of reversed. For
-another, notice how the last argument is zero. That can actually be an
-enumerated value, to tell the GlusterFS allocator *what* type we're
-allocating. This can be very useful information for memory profiling and leak
-detection, so it's recommended that you follow the example of any
-x`xx-mem-types.h` file elsewhere in the source tree instead of just passing
-zero here (even though that works).
-
-To finish our tour of standard initialization/termination, let's look at the
-end of `init` and the beginning of `fini`:
-
-```
-    this->private = priv;
-    gf_log ("rot13", GF_LOG_DEBUG, "rot13 xlator loaded");
-    return 0;
-}
-
-void
-fini (xlator_t *this)
-{
-    rot_13_private_t *priv = this->private;
-
-    if (!priv)
-        return;
-    this->private = NULL;
-    GF_FREE (priv);
-```
-
-At the end of init we're just storing our private-data pointer in the `priv`
-field of our `xlator_t`, then returning zero to indicate that initialization
-succeeded. As is usually the case, our fini is even simpler. All it really has
-to do is `GF_FREE` our private-data pointer, which we do in a slightly
-roundabout way here. Notice how we don't even have a return value here, since
-there's nothing obvious and useful that the infrastructure could do if `fini`
-failed.
-
-That's practically everything we need to know to get our translator through
-loading, initialization, options processing, and termination. If we had defined
- no dispatch functions, we could actually configure a daemon to use our
-translator and it would work as a basic pass-through from its parent to a
-single child. In the next post I'll cover how to build the translator and
-configure a daemon to use it, so that we can actually step through it in a
-debugger and see how it all fits together before we actually start adding
-functionality.
-
-This Time For Real
-------------------
-
-In the first two parts of this series, we learned how to write a basic
-translator skeleton that can get through loading, initialization, and option
-processing. This time we'll cover how to build that translator, configure a
-volume to use it, and run the glusterfs daemon in debug mode.
-
-Unfortunately, there's not much direct support for writing new translators. You
-can check out a GlusterFS tree and splice in your own translator directory, but
- that's a bit painful because you'll have to update multiple makefiles plus a
-bunch of autoconf garbage. As part of the HekaFS project, I basically reverse
-engineered the truly necessary parts of the translator-building process and
-then pestered one of the Fedora glusterfs package maintainers (thanks
-daMaestro!) to add a `glusterfs-devel` package with the required headers. Since
- then the complexity level in the HekaFS tree has crept back up a bit, but I
-still remember the simple method and still consider it the easiest way to get
-started on a new translator. For the sake of those not using Fedora, I'm going
-to describe a method that doesn't depend on that header package. What it does
-depend on is a GlusterFS source tree, much as you might have cloned from GitHub
- or the Gluster review site. This tree doesn't have to be fully built, but you
-do need to run `autogen.sh` and configure in it. Then you can take the
-following simple makefile and put it in a directory with your actual source.
-
-```
-# Change these to match your source code.
-TARGET  = rot-13.so
-OBJECTS = rot-13.o
-
-# Change these to match your environment.
-GLFS_SRC = /srv/glusterfs
-GLFS_LIB = /usr/lib64
-HOST_OS  = GF_LINUX_HOST_OS
-
-# You shouldn't need to change anything below here.
-
-CFLAGS  = -fPIC -Wall -O0 -g \
-      -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \
-      -D$(HOST_OS) -I$(GLFS_SRC) -I$(GLFS_SRC)/contrib/uuid \
-      -I$(GLFS_SRC)/libglusterfs/src
-LDFLAGS = -shared -nostartfiles -L$(GLFS_LIB) -lglusterfs \
-      -lpthread
-
-$(TARGET): $(OBJECTS)
-    $(CC) $(OBJECTS) $(LDFLAGS) -o $(TARGET)
-```
-
-Yes, it's still Linux-specific. Mea culpa. As you can see, we're sticking with
-the `rot-13` example, so you can just copy the files from
-`xlators/encryption/rot-13/src` in your GlusterFS tree to follow on. Type
-`make` and you should be rewarded with a nice little `.so` file.
-
-```
-xlator_example$ ls -l rot-13.so
--rwxr-xr-x. 1 jeff jeff 40784 Nov 16 16:41 rot-13.so
-```
-
-Notice that we've built with optimization level zero and debugging symbols
-included, which would not typically be the case for a packaged version of
-GlusterFS. Let's put our version of `rot-13.so` into a slightly different file
-on our system, so that it doesn't stomp on the installed version (not that
-you'd ever want to use that anyway).
-
-```
-xlator_example# ls /usr/lib64/glusterfs/3git/xlator/encryption/
-crypt.so crypt.so.0 crypt.so.0.0.0 rot-13.so rot-13.so.0
-rot-13.so.0.0.0
-xlator_example# cp rot-13.so \
-    /usr/lib64/glusterfs/3git/xlator/encryption/my-rot-13.so
-```
-
-These paths represent the current Gluster filesystem layout, which is likely to
-be deprecated in favor of the Fedora layout; your paths may vary. At this point
- we're ready to configure a volume using our new translator. To do that, I'm
-going to suggest something that's strongly discouraged except during
-development (the Gluster guys are going to hate me for this): write our own
-volfile. Here's just about the simplest volfile you'll ever see.
-
-```
-volume my-posix
-    type storage/posix
-    option directory /srv/export
-end-volume
-
-volume my-rot13
-    type encryption/my-rot-13
-    subvolumes my-posix
-end-volume
-```
-
-All we have here is a basic brick using `/srv/export` for its data, and then
-an instance of our translator layered on top -- no client or server is
-necessary for what we're doing, and the system will automatically push a
-mount/fuse translator on top if there's no server translator. To try this out,
-all we need is the following command (assuming the directories involved already
- exist).
-
-```
-xlator_example$ glusterfs --debug -f my.vol /srv/import
-```
-
-You should be rewarded with a whole lot of log output, including the text of
-the volfile (this is very useful for debugging problems in the field). If you
-go to another window on the same machine, you can see that you have a new
-filesystem mounted.
-
-```
-~$ df /srv/import
-Filesystem   1K-blocks     Used    Available Use% Mounted on
-/srv/xlator_example/my.vol
-             114506240     2706176 105983488   3% /srv/import
-```
-
-Just for fun, write something into a file in `/srv/import`, then look at the
-corresponding file in `/srv/export` to see it all `rot-13`'ed for you.
-
-```
-~$ echo hello > /srv/import/a_file
-~$ cat /srv/export/a_file
-uryyb
-```
-
-There you have it -- functionality you control, implemented easily, layered on
-top of local storage. Now you could start adding functionality -- real
-encryption, perhaps -- and inevitably having to debug it. You could do that the
- old-school way, with `gf_log` (preferred) or even plain old `printf`, or you
-could  run daemons under `gdb` instead. Alternatively, you could wait for the
-next  Translator 101 post, where we'll be doing exactly that.
-
-Debugging a Translator
-----------------------
-
-Now that we've learned what a translator looks like and how to build one, it's
-time to run one and actually watch it work. The best way to do this is good
-old-fashioned `gdb`, as follows (using some of the examples from last time).
-
-```
-xlator_example# gdb glusterfs
-GNU gdb (GDB) Red Hat Enterprise Linux (7.2-50.el6)
-...
-(gdb) r --debug -f my.vol /srv/import
-Starting program: /usr/sbin/glusterfs --debug -f my.vol /srv/import
-...
-[2011-11-23 11:23:16.495516] I [fuse-bridge.c:2971:fuse_init]
-    0-glusterfs-fuse: FUSE inited with protocol versions:
-    glusterfs 7.13 kernel 7.13
-```
-
-If you get to this point, your glusterfs client process is already running. You
-can go to another window to see the mountpoint, do file operations, etc.
-
-```
-~# df /srv/import
-Filesystem   1K-blocks     Used    Available Use% Mounted on
-/root/xlator_example/my.vol
-             114506240     2643968 106045568   3% /srv/import
-~# ls /srv/import
-a_file
-~# cat /srv/import/a_file
-hello
-```
-
-Now let's interrupt the process and see where we are.
-
-```
-^C
-Program received signal SIGINT, Interrupt.
-0x0000003a0060b3dc in pthread_cond_wait@@GLIBC_2.3.2 ()
-                   from /lib64/libpthread.so.0
-(gdb) info threads
-  5 Thread 0x7fffeffff700 (LWP 27206)  0x0000003a002dd8c7
-    in readv ()
-    from /lib64/libc.so.6
-  4 Thread 0x7ffff50e3700 (LWP 27205)  0x0000003a0060b75b
-    in pthread_cond_timedwait@@GLIBC_2.3.2 ()
-    from /lib64/libpthread.so.0
-  3 Thread 0x7ffff5f02700 (LWP 27204)  0x0000003a0060b3dc
-    in pthread_cond_wait@@GLIBC_2.3.2 ()
-    from /lib64/libpthread.so.0
-  2 Thread 0x7ffff6903700 (LWP 27203)  0x0000003a0060f245
-    in sigwait ()
-    from /lib64/libpthread.so.0
-* 1 Thread 0x7ffff7957700 (LWP 27196)  0x0000003a0060b3dc
-    in pthread_cond_wait@@GLIBC_2.3.2 ()
-    from /lib64/libpthread.so.0
-```
-
-Like any non-toy server, this one has multiple threads. What are they all
-doing? Honestly, even I don't know. Thread 1 turns out to be in
-`event_dispatch_epoll`, which means it's the one handling all of our network
-I/O. Note that with socket multi-threading patch this will change, with one
-thread in `socket_poller` per connection. Thread 2 is in `glusterfs_sigwaiter`
-which means signals will be isolated to that thread. Thread 3 is in
-`syncenv_task`, so it's a worker process for synchronous requests such as
-those used by the rebalance and repair code. Thread 4 is in
-`janitor_get_next_fd`, so it's waiting for a chance to close no-longer-needed
-file descriptors on the local filesystem. (I admit I had to look that one up,
-BTW.) Lastly, thread 5 is in `fuse_thread_proc`, so it's the one fetching
-requests from our FUSE interface. You'll often see many more threads than
-this, but it's a pretty good basic set. Now, let's set a breakpoint so we can
-actually watch a request.
-
-```
-(gdb) b rot13_writev
-Breakpoint 1 at 0x7ffff50e4f0b: file rot-13.c, line 119.
-(gdb) c
-Continuing.
-```
-
-At this point we go into our other window and do something that will involve a write.
-
-```
-~# echo goodbye > /srv/import/another_file
-(back to the first window)
-[Switching to Thread 0x7fffeffff700 (LWP 27206)]
-
-Breakpoint 1, rot13_writev (frame=0x7ffff6e4402c, this=0x638440,
-    fd=0x7ffff409802c, vector=0x7fffe8000cd8, count=1, offset=0,
-    iobref=0x7fffe8001070) at rot-13.c:119
-119   rot_13_private_t *priv = (rot_13_private_t *)this->private;
-```
-
-Remember how we built with debugging symbols enabled and no optimization? That
-will be pretty important for the next few steps. As you can see, we're in
-`rot13_writev`, with several parameters.
-
-* `frame` is our always-present frame pointer for this request. Also,
-  `frame->local` will point to any local data we created and attached to the
-  request ourselves.
-* `this` is a pointer to our instance of the `rot-13` translator. You can examine
-  it if you like to see the name, type, options, parent/children, inode table,
-  and other stuff associated with it.
-* `fd` is a pointer to a file-descriptor *object* (`fd_t`, not just a
-  file-descriptor index which is what most people use "fd" for). This in turn
-  points to an inode object (`inode_t`) and we can associate our own
-  `rot-13`-specific data with either of these.
-* `vector` and `count` together describe the data buffers for this write, which
-  we'll get to in a moment.
-* `offset` is the offset into the file at which we're writing.
-* `iobref` is a buffer-reference object, which is used to track the life cycle
-  of buffers containing read/write data. If you look closely, you'll notice that
-  `vector[0].iov_base` points to the same address as `iobref->iobrefs[0].ptr`, which
-  should give you some idea of the inter-relationships between vector and iobref.
-
-OK, now what about that `vector`? We can use it to examine the data being
-written, like this.
-
-```
-(gdb) p vector[0]
-$2 = {iov_base = 0x7ffff7936000, iov_len = 8}
-(gdb) x/s 0x7ffff7936000
-0x7ffff7936000:     "goodbye\n"
-```
-
-It's not always safe to view this data as a string, because it might just as
-well be binary data, but since we're generating the write this time it's safe
-and convenient. With that knowledge, let's step through things a bit.
-
-```
-(gdb) s
-120        if (priv->encrypt_write)
-(gdb)
-121            rot13_iovec (vector, count);
-(gdb)
-rot13_iovec (vector=0x7fffe8000cd8, count=1) at rot-13.c:57
-57        for (i = 0; i < count; i++) {
-(gdb)
-58            rot13 (vector[i].iov_base, vector[i].iov_len);
-(gdb)
-rot13 (buf=0x7ffff7936000 "goodbye\n", len=8) at rot-13.c:45
-45        for (i = 0; i < len; i++) {
-(gdb)
-46            if (buf[i] >= 'a' && buf[i] <= 'z')
-(gdb)
-47                buf[i] = 'a' + ((buf[i] - 'a' + 13) % 26);
-```
-
-Here we've stepped into `rot13_iovec`, which iterates through our vector
-calling `rot13`, which in turn iterates through the characters in that chunk
-doing the  `rot-13` operation if/as appropriate. This is pretty straightforward
-stuff, so  let's skip to the next interesting bit.
-
-```
-(gdb) fin
-Run till exit from #0  rot13 (buf=0x7ffff7936000 "goodbye\n",
-    len=8) at rot-13.c:47
-rot13_iovec (vector=0x7fffe8000cd8, count=1) at rot-13.c:57
-57        for (i = 0; i < count; i++) {
-(gdb) fin
-Run till exit from #0  rot13_iovec (vector=0x7fffe8000cd8,
-    count=1) at rot-13.c:57
-rot13_writev (frame=0x7ffff6e4402c, this=0x638440,
-    fd=0x7ffff409802c, vector=0x7fffe8000cd8, count=1,
-    offset=0, iobref=0x7fffe8001070) at rot-13.c:123
-123        STACK_WIND (frame,
-(gdb) b 129
-Breakpoint 2 at 0x7ffff50e4f35: file rot-13.c, line 129.
-(gdb) b rot13_writev_cbk
-Breakpoint 3 at 0x7ffff50e4db3: file rot-13.c, line 106.
-(gdb) c
-```
-
-So we've set breakpoints on both the callback and the statement following the
-`STACK_WIND`. Which one will we hit first?
-
-```
-Breakpoint 3, rot13_writev_cbk (frame=0x7ffff6e4402c,
-    cookie=0x7ffff6e440d8, this=0x638440, op_ret=8, op_errno=0,
-    prebuf=0x7fffefffeca0, postbuf=0x7fffefffec30)
-    at rot-13.c:106
-106  STACK_UNWIND_STRICT (writev, frame, op_ret, op_errno,
-                          prebuf, postbuf);
-(gdb) bt
-#0  rot13_writev_cbk (frame=0x7ffff6e4402c,
-    cookie=0x7ffff6e440d8, this=0x638440, op_ret=8, op_errno=0,
-    prebuf=0x7fffefffeca0, postbuf=0x7fffefffec30)
-    at rot-13.c:106
-#1  0x00007ffff52f1b37 in posix_writev (frame=0x7ffff6e440d8,
-    this=<value optimized out>, fd=<value optimized out>,
-    vector=<value optimized out>, count=1,
-    offset=<value optimized out>, iobref=0x7fffe8001070)
-    at posix.c:2217
-#2  0x00007ffff50e513e in rot13_writev (frame=0x7ffff6e4402c,
-    this=0x638440, fd=0x7ffff409802c, vector=0x7fffe8000cd8,
-    count=1, offset=0, iobref=0x7fffe8001070) at rot-13.c:123
-```
-
-Surprise! We're in `rot13_writev_cbk` now, called (indirectly) while we're
-still in `rot13_writev` before `STACK_WIND` returns (still at rot-13.c:123). If
- you did any request cleanup here, then you need to be careful about what you
-do in the remainder of `rot13_writev` because data may have been freed etc.
-It's tempting to say you should just do the cleanup in `rot13_writev` after
-the `STACK_WIND,` but that's not valid because it's also possible that some
-other translator returned without calling `STACK_UNWIND` -- i.e. before
-`rot13_writev` is called, so then it would be the one getting null-pointer
-errors instead. To put it another way, the callback and the return from
-`STACK_WIND` can occur in either order or even simultaneously on different
-threads. Even if you were to use reference counts, you'd have to make sure to
-use locking or atomic operations to avoid races, and it's not worth it. Unless
-you *really* understand the possible flows of control and know what you're
-doing, it's better to do cleanup in the callback and nothing after
-`STACK_WIND.`
-
-At this point all that's left is a `STACK_UNWIND` and a return. The
-`STACK_UNWIND` invokes our parent's completion callback, and in this case our
-parent is FUSE so at that point the VFS layer is notified of the write being
-complete. Finally, we return through several levels of normal function calls
-until we come back to fuse_thread_proc, which waits for the next request.
-
-So that's it. For extra fun, you might want to repeat this exercise by stepping
-through some other call -- stat or setxattr might be good choices -- but you'll
- have to use a translator that actually implements those calls to see much
-that's interesting. Then you'll pretty much know everything I knew when I
-started writing my first for-real translators, and probably even a bit more. I
-hope you've enjoyed this series, or at least found it useful, and if you have
-any suggestions for other topics I should cover please let me know (via
-comments or email, IRC or Twitter).
diff --git a/doc/hacker-guide/en-US/markdown/write-behind.md b/doc/hacker-guide/en-US/markdown/write-behind.md
deleted file mode 100644
index e20682249..000000000
--- a/doc/hacker-guide/en-US/markdown/write-behind.md
+++ /dev/null
@@ -1,56 +0,0 @@
-performance/write-behind translator
-===================================
-
-Basic working
---------------
-
-Write behind is basically a translator to lie to the application that the 
-write-requests are finished, even before it is actually finished.
-
-On a regular translator tree without write-behind, control flow is like this:
-
-1. application makes a `write()` system call.
-2. VFS ==> FUSE ==> `/dev/fuse`.
-3. fuse-bridge initiates a glusterfs `writev()` call.
-4. `writev()` is `STACK_WIND()`ed upto client-protocol or storage translator.
-5. client-protocol, on receiving reply from server, starts `STACK_UNWIND()` towards the fuse-bridge.
-
-On a translator tree with write-behind, control flow is like this:
-
-1. application makes a `write()` system call.
-2. VFS ==> FUSE ==> `/dev/fuse`.
-3. fuse-bridge initiates a glusterfs `writev()` call.
-4. `writev()` is `STACK_WIND()`ed upto write-behind translator.
-5. write-behind adds the write buffer to its internal queue and does a `STACK_UNWIND()` towards the fuse-bridge.
-
-write call is completed in application's percepective. after 
-`STACK_UNWIND()`ing towards the fuse-bridge, write-behind initiates a fresh 
-writev() call to its child translator, whose replies will be consumed by 
-write-behind itself. Write-behind _doesn't_ cache the write buffer, unless 
-`option flush-behind on` is specified in volume specification file.
-
-Windowing
----------
-
-With respect to write-behind, each write-buffer has three flags: `stack_wound`, `write_behind` and `got_reply`.
-
-* `stack_wound`: if set, indicates that write-behind has initiated `STACK_WIND()` towards child translator.
-* `write_behind`: if set, indicates that write-behind has done `STACK_UNWIND()` towards fuse-bridge.
-* `got_reply`: if set, indicates that write-behind has received reply from child translator for a `writev()` `STACK_WIND()`. a request will be destroyed by write-behind only if this flag is set.
-
-Currently pending write requests = aggregate size of requests with write_behind = 1 and got_reply = 0.
-
-window size limits the aggregate size of currently pending write requests. once 
-the pending requests' size has reached the window size, write-behind blocks  
-writev() calls from fuse-bridge. Blocking is only from application's 
-perspective. Write-behind does `STACK_WIND()` to child translator 
-straight-away, but hold behind the `STACK_UNWIND()` towards fuse-bridge. 
-`STACK_UNWIND()` is done only once write-behind gets enough replies to 
-accomodate for currently blocked request.
-
-Flush behind
-------------
-
-If `option flush-behind on` is specified in volume specification file, then 
-write-behind sends aggregate write requests to child translator, instead of 
-regular per request `STACK_WIND()`s.
diff --git a/doc/legacy/hacker-guide/hacker-guide.tex b/doc/hacker-guide/hacker-guide.tex
index 11101e7a8..c2d7255d7 100644
--- a/doc/legacy/hacker-guide/hacker-guide.tex
+++ b/doc/hacker-guide/hacker-guide.tex
@@ -31,7 +31,7 @@ most part.
 
 \chapter{Major components}
 \section{libglusterfs}
-\texttt{libglusterfs} contains supporting code used by all the other components.
+\texttt{libglusterfs} contains supporting code used by all the other components. 
 The important files here are:
 
 \texttt{dict.c}: This is an implementation of a serializable dictionary type. It is
@@ -165,8 +165,8 @@ First we include the requisite headers.
 #include "logging.h"
 
 /*
- * This is a rot13 ``encryption'' xlator. It rot13's data when
- * writing to disk and rot13's it back when reading it.
+ * This is a rot13 ``encryption'' xlator. It rot13's data when 
+ * writing to disk and rot13's it back when reading it. 
  * This xlator is meant as an example, not for production
  *  use ;) (hence no error-checking)
  */
@@ -178,7 +178,7 @@ letters. Any other byte is passed through as it is.
 
 \begin{verbatim}
 /* We only handle lower case letters for simplicity */
-static void
+static void 
 rot13 (char *buf, int len)
 {
   int i;
@@ -252,12 +252,12 @@ rot13_writev (call_frame_t *frame,
               xlator_t *this,
               dict_t *ctx,
               struct iovec *vector,
-              int32_t count,
+              int32_t count, 
               off_t offset)
 {
   rot13_iovec (vector, count);
 
-  STACK_WIND (frame,
+  STACK_WIND (frame, 
               rot13_writev_cbk,
               FIRST_CHILD (this),
               FIRST_CHILD (this)->fops->writev,
@@ -267,9 +267,9 @@ rot13_writev (call_frame_t *frame,
 
 \end{verbatim}
 
-Every xlator must define two functions and two external symbols. The functions are
+Every xlator must define two functions and two external symbols. The functions are 
 \texttt{init} and \texttt{fini}, and the symbols are \texttt{fops} and \texttt{mops}.
-The \texttt{init} function is called when the xlator is loaded by GlusterFS, and
+The \texttt{init} function is called when the xlator is loaded by GlusterFS, and 
 contains code for the xlator to initialize itself. Note that if an xlator is present
 multiple times in the spec tree, the \texttt{init} function will be called each time
 the xlator is loaded.
@@ -279,7 +279,7 @@ int32_t
 init (xlator_t *this)
 {
   if (!this->children) {
-    gf_log ("rot13", GF_LOG_ERROR,
+    gf_log ("rot13", GF_LOG_ERROR, 
             "FATAL: rot13 should have exactly one child");
     return -1;
   }
@@ -291,7 +291,7 @@ init (xlator_t *this)
 
 \begin{verbatim}
 
-void
+void 
 fini (xlator_t *this)
 {
   return;
diff --git a/doc/hacker-guide/lock-ahead.txt b/doc/hacker-guide/lock-ahead.txt
new file mode 100644
index 000000000..63392b7fa
--- /dev/null
+++ b/doc/hacker-guide/lock-ahead.txt
@@ -0,0 +1,80 @@
+			Lock-ahead translator
+                        ---------------------
+
+The objective of the lock-ahead translator is to speculatively
+hold locks (inodelk and entrylk) on the universal set (0 - infinity
+in case of inodelk and all basenames in case of entrylk) even
+when a lock is requested only on a subset, in anticipation that
+further locks will be requested within the same universal set.
+
+So, for example, when cluster/replicate locks a region before
+writing to it, lock-ahead would instead lock the entire file.
+On further writes, lock-ahead can immediately return success for 
+the lock requests, since the entire file has been previously locked.
+
+To avoid starvation of other clients/mountpoints, we employ a
+notify mechanism, described below.
+
+typedef struct {
+        struct list_head subset_locks;
+} la_universal_lock_t;
+
+Universal lock structure is stored in the inode context.
+
+typedef struct {
+	enum {LOCK_AHEAD_ENTRYLK, LOCK_AHEAD_FENTRYLK,
+              LOCK_AHEAD_INODELK, LOCK_AHEAD_FINODELK};
+
+        union {
+	      fd_t *fd;
+              loc_t loc;
+	};
+
+	off_t l_start;
+        off_t l_len;
+
+	const char *basename;
+
+	struct list_head universal_lock;
+} la_subset_lock_t;
+
+
+fops implemented:
+
+* inodelk/finodelk/entrylk/fentrylk:
+
+lock:
+  if universal lock held:
+    add subset to it (save loc_t or fd) and return success
+  else:
+    send lock-notify fop
+    hold universal lock and return
+      (set inode context, add subset to it, save loc_t or fd)
+    
+    if this fails:
+      forward the lock request
+
+unlock:
+  if subset exists in universal lock:
+    delete subset lock from list
+  else:
+    forward it
+
+* release:
+    hold subset locks (each subset lock using the saved loc_t or fd)
+    and release universal lock
+
+* lock-notify (on unwind) (new fop)
+    hold subset locks and release universal lock
+
+
+lock-notify in locks translator:
+
+if a subset lock in entrylk/inodelk cannot be satisfied
+because of a universal lock held by someone else:
+    unwind the lock-notify fop
+
+==============================================
+$ Last updated: Tue Feb 17 11:31:18 IST 2009 $
+$ Author: Vikas Gorur <vikas@gluster.com>  $
+==============================================
diff --git a/doc/hacker-guide/posix.txt b/doc/hacker-guide/posix.txt
new file mode 100644
index 000000000..d0132abfe
--- /dev/null
+++ b/doc/hacker-guide/posix.txt
@@ -0,0 +1,59 @@
+---------------
+* storage/posix
+---------------
+
+- SET_FS_ID
+
+  This is so that all filesystem checks are done with the user's 
+  uid/gid and not GlusterFS's uid/gid.
+
+- MAKE_REAL_PATH
+ 
+  This macro concatenates the base directory of the posix volume
+  ('option directory') with the given path.
+
+- need_xattr in lookup
+
+  If this flag is passed, lookup returns a xattr dictionary that contains
+  the file's create time, the file's contents, and the version number
+  of the file.
+
+  This is a hack to increase small file performance. If an application 
+  wants to read a small file, it can finish its job with just a lookup 
+  call instead of a lookup followed by read.
+
+- getdents/setdents
+
+  These are used by unify to set and get directory entries.
+
+- ALIGN_BUF
+  
+  Macro to align an address to a page boundary (4K).
+
+- priv->export_statfs
+
+  In some cases, two exported volumes may reside on the same
+  partition on the server. Sending statvfs info for both
+  the volumes will lead to erroneous df output at the client,
+  since free space on the partition will be counted twice.
+
+  In such cases, user can disable exporting statvfs info
+  on one of the volumes by setting this option.
+
+- xattrop
+
+  This fop is used by replicate to set version numbers on files. 
+
+- getxattr/setxattr hack to read/write files
+
+  A key, GLUSTERFS_FILE_CONTENT_STRING, is handled in a special way by
+  getxattr/setxattr. A getxattr with the key will return the entire
+  content of the file as the value. A setxattr with the key will write
+  the value as the entire content of the file.
+
+- posix_checksum
+  
+  This calculates a simple XOR checksum on all entry names in a
+  directory that is used by unify to compare directory contents.
+
+
diff --git a/doc/legacy/hacker-guide/replicate.txt b/doc/hacker-guide/replicate.txt
index 133c72afa..fd1ef2747 100644
--- a/doc/legacy/hacker-guide/replicate.txt
+++ b/doc/hacker-guide/replicate.txt
@@ -5,7 +5,7 @@
 Before understanding replicate, one must understand two internal FOPs:
 
 GF_FILE_LK:
-  This is exactly like fcntl(2) locking, except the locks are in a
+  This is exactly like fcntl(2) locking, except the locks are in a 
   separate domain from locks held by applications.
 
 GF_DIR_LK (loc_t *loc, char *basename):
@@ -17,7 +17,7 @@ GF_DIR_LK (loc_t *loc, char *basename):
   If one wishes to lock *all* the names under a particular directory,
   supply the basename argument as NULL.
 
-  The locks can either be read locks or write locks; consult the
+  The locks can either be read locks or write locks; consult the 
   function prototype for more details.
 
 Both these operations are implemented by the features/locks (earlier
@@ -79,7 +79,7 @@ Each of the four major groups has its own algorithm:
 
  All operations are done in parallel unless specified otherwise.
 
- (1) Send a GF_FILE_LK request on all children for a write lock on
+ (1) Send a GF_FILE_LK request on all children for a write lock on 
      the appropriate region
             (for metadata operations: entire file (0, 0)
              for writev: (offset, offset+size of buffer))
@@ -87,11 +87,11 @@ Each of the four major groups has its own algorithm:
      - If a lock request fails on a child:
          unlock all children
          try to acquire a blocking lock (F_SETLKW) on each child, serially.
-
+	 
 	 If this fails (due to ENOTCONN or EINVAL):
            Consider this child as dead for rest of transaction.
 
- (2) Mark all children as "pending" on all (alive) children
+ (2) Mark all children as "pending" on all (alive) children 
      (see below for meaning of "pending").
 
      - If it fails on any child:
@@ -105,7 +105,7 @@ Each of the four major groups has its own algorithm:
  (4) Unmark all successful children as not "pending" on all nodes.
 
  (5) Unlock region on all (alive) children.
-
+     
  -----------
  - dir-write
  -----------
@@ -121,11 +121,11 @@ Each of the four major groups has its own algorithm:
  The "pending" number is like a journal entry. A pending entry is an
  array of 32-bit integers stored in network byte-order as the extended
  attribute of an inode (which can be a directory as well).
-
+ 
  There are three keys corresponding to three types of pending operations:
 
  - AFR_METADATA_PENDING
-     There are some metadata operations pending on this inode (perms, ctime/mtime,
+     There are some metadata operations pending on this inode (perms, ctime/mtime, 
      xattr, etc.).
 
  - AFR_DATA_PENDING
@@ -134,7 +134,7 @@ Each of the four major groups has its own algorithm:
  - AFR_ENTRY_PENDING
      There are some directory operations pending on this directory
      (create, unlink, etc.).
-
+    
 -----------
 * Self heal
 -----------
@@ -155,7 +155,7 @@ Each of the four major groups has its own algorithm:
      other is directory):
      - Announce to the user via log that a split-brain situation has been
        detected, and do nothing.
-
+ 
  - On open, gather extended attribute data:
    - Consider the file with the highest AFR_DATA_PENDING number as
      the definitive one and replicate its contents on all other
@@ -190,7 +190,7 @@ Thus, if lookup on c1 returns an inode number "2", it is scaled to "4"
 This way we ensure that there is never a collision of inode numbers from
 two different children.
 
-This reduction of inode space doesn't really reduce the usability of
+This reduction of inode space doesn't really reduce the usability of 
 replicate since even if we assume replicate has 1024 children (which would be a
 highly unusual scenario), each child still has a 54-bit inode space.
 
diff --git a/doc/hacker-guide/write-behind.txt b/doc/hacker-guide/write-behind.txt
new file mode 100644
index 000000000..a6e9a8890
--- /dev/null
+++ b/doc/hacker-guide/write-behind.txt
@@ -0,0 +1,45 @@
+basic working
+--------------
+
+  write behind is basically a translator to lie to the application that the write-requests are finished, even before it is actually finished.
+
+  on a regular translator tree without write-behind, control flow is like this:
+  
+  1. application makes a write() system call.
+  2. VFS ==> FUSE ==> /dev/fuse.
+  3. fuse-bridge initiates a glusterfs writev() call.
+  4. writev() is STACK_WIND()ed upto client-protocol or storage translator.
+  5. client-protocol, on receiving reply from server, starts STACK_UNWIND() towards the fuse-bridge.
+
+  on a translator tree with write-behind, control flow is like this:
+  
+  1. application makes a write() system call.
+  2. VFS ==> FUSE ==> /dev/fuse.
+  3. fuse-bridge initiates a glusterfs writev() call.
+  4. writev() is STACK_WIND()ed upto write-behind translator.
+  5. write-behind adds the write buffer to its internal queue and does a STACK_UNWIND() towards the fuse-bridge.
+  
+  write call is completed in application's percepective. after STACK_UNWIND()ing towards the fuse-bridge, write-behind initiates a fresh writev() call to its child translator, whose replies will be consumed by write-behind itself. write-behind _doesn't_ cache the write buffer, unless 'option flush-behind on' is specified in volume specification file.
+
+windowing
+---------
+
+  write respect to write-behind, each write-buffer has three flags: 'stack_wound', 'write_behind' and 'got_reply'.
+
+  stack_wound: if set, indicates that write-behind has initiated STACK_WIND() towards child translator. 
+
+  write_behind: if set, indicates that write-behind has done STACK_UNWIND() towards fuse-bridge.
+
+  got_reply: if set, indicates that write-behind has received reply from child translator for a writev() STACK_WIND(). a request will be destroyed by write-behind only if this flag is set.
+
+  currently pending write requests = aggregate size of requests with write_behind = 1 and got_reply = 0.
+  
+  window size limits the aggregate size of currently pending write requests. once the pending requests' size has reached the window size, write-behind blocks  writev() calls from fuse-bridge. 
+  blocking is only from application's perspective. write-behind does STACK_WIND() to child translator straight-away, but hold behind the STACK_UNWIND() towards fuse-bridge. STACK_UNWIND() is done only once write-behind gets enough replies to accomodate for currently blocked request.
+  
+flush behind
+------------
+
+  if 'option flush-behind on' is specified in volume specification file, then write-behind sends aggregate write requests to child translator, instead of regular per request STACK_WIND()s.
+  
+
diff --git a/doc/legacy/handling-options.txt b/doc/handling-options.txt
index 9a3b2510a..cac1fe939 100644
--- a/doc/legacy/handling-options.txt
+++ b/doc/handling-options.txt
@@ -2,12 +2,12 @@
 How to add a new option to a given volume ?
 ===========================================
 
-* Add a entry in 'struct volume_options options[]' with your key, what is
+* Add a entry in 'struct volume_options options[]' with your key, what is 
   the type of the 'key', etc.
 
-* The 'key' and corresponding 'value' given for the same by user are validated
+* The 'key' and corresponding 'value' given for the same by user are validated 
   before calling init() of the translator/transport/scheduler/auth-module.
 
-* Once the complete init() is successful, user will get a warning if he has
+* Once the complete init() is successful, user will get a warning if he has 
   given a 'key' which is not defined in these modules.
 
diff --git a/doc/logging.txt b/doc/logging.txt
deleted file mode 100644
index b4ee45996..000000000
--- a/doc/logging.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-
-New logging framework in glusterfs is targeted for end users like
-customers, community members, testers etc.  This aims to bring clear,
-understandable logs called user logs whereas the current logging are
-considered as developer logs.  The new framework brings with following
-features
-
-* Each message is logged with proper well defined error code and each
-  error code has well known error message.
-* A logbook has defined error code and error messages.  It helps to
-  keep track of possible causes and remedies
-* Log are sent to syslog.  The syslog application can be configured to
-  pass them to centralized logging system
-* It brings
-  - Remove repeated log messages
-  - Send alerts to users on certain events
-  - Run a program on events
-  - Call home service on events
-
-
-Log book:
-=========
-A log book is a JSON formatted file error-codes.json located in top
-level of glusterfs source repository.  At compile time, gen-headers.py
-generates libglusterfs/src/gf-error-codes.h using the log book and
-gf-error-codes.h.template file.  libglusterfs/src/gf-error-codes.h
-consists of header definitions and helper functions to get message by
-code for given locale. Currently it has _gf_get_message() function
-returns message for locale 'en'.
-
-New entry to log book is added like
-
-{
-    "IO_ERROR": {"code": 2233,
-                 "message": {"en": "I/O error occurred"}},
-    "SETUP_ERROR": {"code": 2240,
-                 "message": {"en": "Setup error"}},
-}
-
-
-Logging:
-========
-The framework provides two functions
-
-void gf_openlog (const char *ident, int option, int facility);
-void gf_syslog (int error_code, int facility_priority, char *format, ...);
-
-Consumers need to call gf_openlog() prior to gf_syslog() like the way
-traditional syslog function calls.  error_code is mandatory when using
-gf_syslog().  For example,
-
-gf_openlog (NULL, -1, -1);
-gf_syslog (GF_ERR_DEV, LOG_ERR, "error reading configuration file");
-
-The logs are sent in CEE format (http://cee.mitre.org/) to syslog.
-Its targeted to rsyslog syslog server.
-
-This log framework is enabled at compile time by default.  This can be
-disabled by passing '--disable-syslog' to ./configure or '--without
-syslog' to rpmbuild
-
-Even though its enabled at compile time, its required to have
-/etc/glusterfs/logger.conf file to make it into effect before starting
-gluster services
-
-Currently all gluster logs are sent with error code GF_ERR_DEV.
diff --git a/doc/legacy/mac-related-xattrs.txt b/doc/mac-related-xattrs.txt
index 92bb2ceef..805658334 100644
--- a/doc/legacy/mac-related-xattrs.txt
+++ b/doc/mac-related-xattrs.txt
@@ -1,21 +1,21 @@
 
-This document is intended to briefly explain how the Extended Attributes on
+This document is intended to briefly explain how the Extended Attributes on 
 Darwin 10.5.x releases works
 ----
 
-On Darwin other than all the normal filesystem operations, 'Finder' (like
-Explorer in Windows but a little more) keeps its information in two extended
-attributes named 'com.apple.FinderInfo' and 'com.apple.ResourceFork'. If these
-xattrs are not implemented the filesystem won't be shown on Finder, and if they
-are not implemented properly there may be issues when some of the file operations
-are done through GUI of Finder. But when a filesystem is used over mountpoint in a
-terminal, everything is fine and these xattrs are not required.
+On Darwin other than all the normal filesystem operations, 'Finder' (like 
+Explorer in Windows but a little more) keeps its information in two extended 
+attributes named 'com.apple.FinderInfo' and 'com.apple.ResourceFork'. If these 
+xattrs are not implemented the filesystem won't be shown on Finder, and if they 
+are not implemented properly there may be issues when some of the file operations 
+are done through GUI of Finder. But when a filesystem is used over mountpoint in a 
+terminal, everything is fine and these xattrs are not required. 
 
-Currently the way these xattrs are implemented is simple. All the xattr calls
+Currently the way these xattrs are implemented is simple. All the xattr calls 
 (getxattr, setxattr, listxattr, removexattr) are passed down to underlaying filesystem,
 most of the cases when exported FS is on MacOS X itself, these keys are supported, hence
-the fops succeed. But in the case of using exports of different OS on Darwin the issue is
-extended attribute prefix like 'com.apple.' may not be supported, hence the problem with
+the fops succeed. But in the case of using exports of different OS on Darwin the issue is 
+extended attribute prefix like 'com.apple.' may not be supported, hence the problem with 
 Finder. To solve this issue, GlusterFS returns virtual default values to these keys, which
 works fine on most of the cases.
 
diff --git a/doc/mount.glusterfs.8 b/doc/mount.glusterfs.8
index 01b7f7554..10e1d59f0 100644
--- a/doc/mount.glusterfs.8
+++ b/doc/mount.glusterfs.8
@@ -1,10 +1,19 @@
-.\"  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+.\"  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
 .\"  This file is part of GlusterFS.
 .\"
-.\"  This file is licensed to you under your choice of the GNU Lesser
-.\"  General Public License, version 3 or any later version (LGPLv3 or
-.\"  later), or the GNU General Public License, version 2 (GPLv2), in all
-.\"  cases as published by the Free Software Foundation.
+.\"  GlusterFS 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 3 of the License,
+.\"  or (at your option) any later version.
+.\"
+.\"  GlusterFS 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
+.\"  long with this program.  If not, see
+.\"  <http://www.gnu.org/licenses/>.
 .\"
 .\"
 .\"
@@ -48,7 +57,7 @@ Mount the filesystem read-only
 Volume key or name of the volume file to be fetched from server
 .TP
 \fBtransport=\fRTRANSPORT-TYPE
-Transport type to get volume file from server [default: tcp]
+Transport type to get volume file from server [default: socket]
 .TP
 \fBvolume\-name=\fRVOLUME-NAME
 Volume name to be used for MOUNT-POINT [default: top most volume in
diff --git a/doc/legacy/porting_guide.txt b/doc/porting_guide.txt
index 5705cd964..905bb4228 100644
--- a/doc/legacy/porting_guide.txt
+++ b/doc/porting_guide.txt
@@ -3,7 +3,7 @@
 
 * General setup
 
-The configure script will detect the target platform for the build.
+The configure script will detect the target platform for the build. 
 All platform-specific CFLAGS, macro definitions should be done
 in configure.ac
 
@@ -15,11 +15,11 @@ Platform-specific code can be written like this:
 
 * Coding guidelines
 
-In general, avoid glibc extensions. For example, nested functions don't work
+In general, avoid glibc extensions. For example, nested functions don't work 
 on Mac OS X. It is best to stick to C99.
 
 When using library calls and system calls, pay attention to the
-portability notes. As far as possible stick to POSIX-specified behavior.
+portability notes. As far as possible stick to POSIX-specified behavior. 
 Do not use anything expressly permitted by the specification. For example,
 some fields in structures may be present only on certain platforms. Avoid
 use of such things.
@@ -27,14 +27,14 @@ use of such things.
 Do not pass values of constants such as F_*, O_*, errno values, etc. across
 platforms.
 
-Please refer compat-errno.h for more details about errno handling inside
-glusterfs for cross platform.
+Please refer compat-errno.h for more details about errno handling inside 
+glusterfs for cross platform. 
 
 * Specific issues
 
 - The argp library is available only on Linux through glibc, but for other
   platforms glusterfs has already included argp-standalone library which will
-  statically linked during the glusterfs build.
+  statically linked during the glusterfs build. 
 
 - Extended attribute calls (setxattr, listxattr, etc.) have differing prototypes
   on different platforms. See compat.h for macro definitions to resolve this, also
diff --git a/doc/qa/qa-client.vol b/doc/qa/qa-client.vol
new file mode 100644
index 000000000..176dda589
--- /dev/null
+++ b/doc/qa/qa-client.vol
@@ -0,0 +1,170 @@
+# This spec file should be used for testing before any release
+# 
+
+# 1st client
+volume client1
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+# option transport-type ib-verbs # for ib-verbs transport 
+# option transport.ib-verbs.work-request-send-size  131072
+# option transport.ib-verbs.work-request-send-count 64
+# option transport.ib-verbs.work-request-recv-size  131072
+# option transport.ib-verbs.work-request-recv-count 64
+  option remote-host 127.0.0.1 
+  option remote-subvolume ra1
+end-volume
+
+# 2nd client
+volume client2
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+# option transport-type ib-verbs # for ib-verbs transport 
+  option remote-host 127.0.0.1 
+  option remote-subvolume ra2
+end-volume
+
+# 3rd client
+volume client3
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+# option transport-type ib-verbs # for ib-verbs transport 
+  option remote-host 127.0.0.1 
+  option remote-subvolume ra3
+end-volume
+
+# 4th client
+volume client4
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+# option transport-type ib-verbs # for ib-verbs transport 
+  option remote-host 127.0.0.1 
+  option remote-subvolume ra4
+end-volume
+
+# 5th client
+volume client5
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+# option transport-type ib-verbs # for ib-verbs transport 
+  option remote-host 127.0.0.1 
+  option remote-subvolume ra5
+end-volume
+
+# 6th client
+volume client6
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+# option transport-type ib-verbs # for ib-verbs transport 
+  option remote-host 127.0.0.1 
+  option remote-subvolume ra6
+end-volume
+
+# 7th client
+volume client7
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+# option transport-type ib-verbs # for ib-verbs transport 
+  option remote-host 127.0.0.1 
+  option remote-subvolume ra7
+end-volume
+
+# 8th client 
+volume client8
+  type protocol/client
+  option transport-type tcp     # for TCP/IP transport
+# option transport-type ib-sdp  # for Infiniband transport
+# option transport-type ib-verbs # for ib-verbs transport 
+  option remote-host 127.0.0.1 
+  option remote-subvolume ra8
+end-volume
+
+# 1st Stripe (client1 client2)
+volume stripe1
+  type cluster/stripe
+  subvolumes client1 client2
+  option block-size 128KB  # all striped in 128kB block
+end-volume
+
+# 2st Stripe (client3 client4)
+volume stripe2
+  type cluster/stripe
+  subvolumes client3 client4
+  option block-size 128KB  # all striped in 128kB block
+end-volume
+
+# 3st Stripe (client5 client6)
+volume stripe3
+  type cluster/stripe
+  subvolumes client5 client6
+  option block-size 128KB  # all striped in 128kB block
+end-volume
+
+# 4st Stripe (client7 client8)
+volume stripe4
+  type cluster/stripe
+  subvolumes client7 client8
+  option block-size 128KB  # all striped in 128kB block
+end-volume
+
+
+# 1st replicate
+volume replicate1
+  type cluster/replicate
+  subvolumes stripe1 stripe2
+end-volume
+
+# 2nd replicate
+volume replicate2
+  type cluster/replicate
+  subvolumes stripe3 stripe4
+end-volume
+
+volume ns
+  type protocol/client
+  option transport-type tcp
+  option remote-host 127.0.0.1
+  option remote-subvolume brick-ns
+end-volume
+
+# Unify
+volume unify0
+  type cluster/unify
+  subvolumes replicate1 replicate2
+#  subvolumes stripe1 stripe3
+  option namespace ns
+  option scheduler rr # random # alu # nufa
+  option rr.limits.min-free-disk 1GB
+# option alu.order x
+# option alu.x.entry-threshold
+# option alu.x.exit-threshold
+end-volume
+
+
+# ==== Performance Translators ====
+# The default options for performance translators should be the best for 90+% of the cases
+volume iot
+  type performance/io-threads
+  subvolumes unify0
+end-volume
+
+volume wb
+  type performance/write-behind
+  subvolumes iot
+end-volume
+
+volume ioc
+ type performance/io-cache
+ subvolumes wb
+end-volume
+
+volume ra
+  type performance/read-ahead
+  subvolumes ioc
+end-volume
diff --git a/doc/qa/qa-high-avail-client.vol b/doc/qa/qa-high-avail-client.vol
new file mode 100644
index 000000000..69cb8dd30
--- /dev/null
+++ b/doc/qa/qa-high-avail-client.vol
@@ -0,0 +1,17 @@
+volume client
+ type protocol/client
+ option transport-type tcp
+ option remote-host localhost
+ option transport.socket.remote-port 7001
+ option remote-subvolume server1-iot
+end-volume
+
+volume ra
+ type performance/read-ahead
+ subvolumes client
+end-volume
+
+volume wb
+ type performance/write-behind
+ subvolumes ra
+end-volume
diff --git a/doc/qa/qa-high-avail-server.vol b/doc/qa/qa-high-avail-server.vol
new file mode 100644
index 000000000..3556b9dae
--- /dev/null
+++ b/doc/qa/qa-high-avail-server.vol
@@ -0,0 +1,344 @@
+
+# -- server 1 --
+volume server1-posix1
+ type storage/posix
+ option directory /tmp/ha-export1/
+end-volume
+
+volume server1-ns1
+ type storage/posix
+ option directory /tmp/ha-export-ns1/
+end-volume
+
+volume server1-client2
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7002
+ option remote-subvolume server2-posix2
+end-volume
+
+volume server1-ns2
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7002
+ option remote-subvolume server2-ns2
+end-volume
+
+volume server1-client3
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7003
+ option remote-subvolume server3-posix3
+end-volume
+
+volume server1-ns3
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7003
+ option remote-subvolume server3-ns3
+end-volume
+
+volume server1-io1
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server1-posix1
+end-volume
+
+
+volume server1-io2
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server1-client2
+end-volume
+
+volume server1-io3
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server1-client3
+end-volume
+
+volume server1-ns-io1
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server1-ns1
+end-volume
+
+volume server1-ns-io2
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server1-ns2
+end-volume
+
+volume server1-ns-io3
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server1-ns3
+end-volume
+
+volume server1-ns-replicate
+ type cluster/replicate
+ subvolumes server1-ns-io1 server1-ns-io2 server1-ns-io3
+end-volume
+
+volume server1-storage-replicate
+ type cluster/replicate
+ subvolumes server1-io1 server1-io2 server1-io3
+end-volume
+
+volume server1-unify
+ type cluster/unify
+ #option self-heal off
+ subvolumes server1-storage-replicate
+ option namespace server1-ns-replicate
+ option scheduler rr
+end-volume
+
+volume server1-iot
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server1-unify
+end-volume
+
+volume server1
+ type protocol/server
+ option transport-type tcp
+ subvolumes server1-iot
+ option transport.socket.listen-port 7001
+ option auth.addr.server1-posix1.allow *
+ option auth.addr.server1-ns1.allow *
+ option auth.addr.server1-iot.allow * 
+end-volume
+
+
+# == Server2 ==
+volume server2-client1
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7001
+ option remote-subvolume server1-posix1
+end-volume
+
+volume server2-ns1
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7001
+ option remote-subvolume server1-ns1
+end-volume
+
+volume server2-posix2
+ type storage/posix
+ option directory /tmp/ha-export2/
+end-volume
+
+volume server2-ns2
+ type storage/posix
+ option directory /tmp/ha-export-ns2/
+end-volume
+
+volume server2-client3
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7003
+ option remote-subvolume server3-posix3
+end-volume
+
+volume server2-ns3
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7003
+ option remote-subvolume server3-ns3
+end-volume
+
+volume server2-io1
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server2-client1
+end-volume
+
+
+volume server2-io2
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server2-posix2
+end-volume
+
+volume server2-io3
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server2-client3
+end-volume
+
+volume server2-ns-io1
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server2-ns1
+end-volume
+
+volume server2-ns-io2
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server2-ns2
+end-volume
+
+volume server2-ns-io3
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server2-ns3
+end-volume
+
+volume server2-ns-replicate
+ type cluster/replicate
+ subvolumes server2-ns-io1 server2-ns-io2 server2-ns-io3
+end-volume
+
+volume server2-storage-replicate
+ type cluster/replicate
+ subvolumes server2-io2 server2-io3 server2-io1
+end-volume
+
+volume server2-unify
+ type cluster/unify
+ option self-heal off
+ subvolumes server2-storage-replicate
+ option namespace server2-ns-replicate
+ option scheduler rr
+end-volume
+
+volume server2-iot
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server2-unify
+end-volume
+
+volume server2
+ type protocol/server
+ option transport-type tcp
+ subvolumes server2-iot
+ option transport.socket.listen-port 7002
+ option auth.addr.server2-posix2.allow *
+ option auth.addr.server2-ns2.allow *
+ option auth.addr.server2-iot.allow * 
+end-volume
+
+# == server 3 ==
+volume server3-client1
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7001
+ option remote-subvolume server1-posix1
+end-volume
+
+volume server3-ns1
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7001
+ option remote-subvolume server1-ns1
+end-volume
+
+volume server3-client2
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7002
+ option remote-subvolume server2-posix2
+end-volume
+
+volume server3-ns2
+ type protocol/client
+ option transport-type tcp
+ option remote-host 127.0.0.1
+ option transport.socket.remote-port 7002
+ option remote-subvolume server2-ns2
+end-volume
+
+volume server3-posix3
+ type storage/posix
+ option directory /tmp/ha-export3/
+end-volume
+
+volume server3-ns3
+ type storage/posix
+ option directory /tmp/ha-export-ns3/
+end-volume
+
+volume server3-io1
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server3-client1
+end-volume
+
+
+volume server3-io2
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server3-client2
+end-volume
+
+volume server3-io3
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server3-posix3
+end-volume
+
+volume server3-ns-io1
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server3-ns1
+end-volume
+
+volume server3-ns-io2
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server3-ns2
+end-volume
+
+volume server3-ns-io3
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server3-ns3
+end-volume
+
+volume server3-ns-replicate
+ type cluster/replicate
+ subvolumes server3-ns-io1 server3-ns-io2 server3-ns-io3
+end-volume
+
+volume server3-storage-replicate
+ type cluster/replicate
+ subvolumes server3-io3 server3-io2 server3-io1
+end-volume
+
+volume server3-unify
+ type cluster/unify
+ option self-heal off
+ subvolumes server3-storage-replicate
+ option namespace server3-ns-replicate
+ option scheduler rr
+end-volume
+
+volume server3-iot
+ type performance/io-threads
+ option thread-count 8
+ subvolumes server3-unify
+end-volume
+
+volume server3
+ type protocol/server
+ option transport-type tcp
+ subvolumes server3-iot
+ option transport.socket.listen-port 7003
+ option auth.addr.server3-posix3.allow *
+ option auth.addr.server3-ns3.allow *
+ option auth.addr.server3-iot.allow * 
+end-volume
+
diff --git a/doc/qa/qa-server.vol b/doc/qa/qa-server.vol
new file mode 100644
index 000000000..1c245c324
--- /dev/null
+++ b/doc/qa/qa-server.vol
@@ -0,0 +1,284 @@
+# This spec file should be used for testing before any release
+# 
+
+# Namespace posix
+volume brick-ns
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export-ns        # Export this directory
+end-volume
+
+# 1st server
+
+volume brick1
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export1        # Export this directory
+end-volume
+
+# == Posix-Locks ==
+ volume plocks1
+   type features/posix-locks
+#  option mandatory on
+   subvolumes brick1
+ end-volume
+
+volume iot1
+  type performance/io-threads
+  subvolumes plocks1 # change properly if above commented volumes needs to be included
+# option <key> <value>
+end-volume
+
+volume wb1
+  type performance/write-behind
+  subvolumes iot1
+# option <key> <value>
+end-volume
+
+volume ra1
+  type performance/read-ahead
+  subvolumes wb1
+# option <key> <value>
+end-volume
+
+volume brick2
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export2        # Export this directory
+end-volume
+
+# == TrashCan Translator ==
+# volume trash2
+#   type features/trash
+#   option trash-dir /.trashcan
+#   subvolumes brick2
+# end-volume
+
+# == Posix-Locks ==
+volume plocks2
+  type features/posix-locks
+#  option <something> <something>
+  subvolumes brick2
+end-volume
+
+volume iot2
+  type performance/io-threads
+  subvolumes plocks2 # change properly if above commented volumes needs to be included
+# option <key> <value>
+end-volume
+
+volume wb2
+  type performance/write-behind
+  subvolumes iot2
+# option <key> <value>
+end-volume
+
+volume ra2
+  type performance/read-ahead
+  subvolumes wb2
+# option <key> <value>
+end-volume
+
+volume brick3
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export3        # Export this directory
+end-volume
+
+# == TrashCan Translator ==
+# volume trash3
+#   type features/trash
+#   option trash-dir /.trashcan
+#   subvolumes brick3
+# end-volume
+
+# == Posix-Locks ==
+volume plocks3
+  type features/posix-locks
+#  option <something> <something>
+  subvolumes brick3
+end-volume
+
+volume iot3
+  type performance/io-threads
+  subvolumes plocks3 # change properly if above commented volumes needs to be included
+# option <key> <value>
+end-volume
+
+volume wb3
+  type performance/write-behind
+  subvolumes iot3
+# option <key> <value>
+end-volume
+
+volume ra3
+  type performance/read-ahead
+  subvolumes wb3
+# option <key> <value>
+end-volume
+
+volume brick4
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export4        # Export this directory
+end-volume
+
+# == Posix-Locks ==
+volume plocks4
+  type features/posix-locks
+# option <something> <something>
+  subvolumes brick4
+end-volume
+
+volume iot4
+  type performance/io-threads
+  subvolumes plocks4 # change properly if above commented volumes needs to be included
+# option <key> <value>
+end-volume
+
+volume wb4
+  type performance/write-behind
+  subvolumes iot4
+# option <key> <value>
+end-volume
+
+volume ra4
+  type performance/read-ahead
+  subvolumes wb4
+# option <key> <value>
+end-volume
+
+volume brick5
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export5        # Export this directory
+end-volume
+
+
+# == Posix-Locks ==
+volume plocks5
+  type features/posix-locks
+# option <something> <something>
+  subvolumes brick5
+end-volume
+
+volume iot5
+  type performance/io-threads
+  subvolumes plocks5 # change properly if above commented volumes needs to be included
+# option <key> <value>
+end-volume
+
+volume wb5
+  type performance/write-behind
+  subvolumes iot5
+# option <key> <value>
+end-volume
+
+volume ra5
+  type performance/read-ahead
+  subvolumes wb5
+# option <key> <value>
+end-volume
+
+volume brick6
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export6        # Export this directory
+end-volume
+
+# == Posix-Locks ==
+volume plocks6
+  type features/posix-locks
+#   option <something> <something>
+  subvolumes brick6
+end-volume
+
+volume iot6
+  type performance/io-threads
+  subvolumes plocks6 # change properly if above commented volumes needs to be included
+# option <key> <value>
+end-volume
+
+volume wb6
+  type performance/write-behind
+  subvolumes iot6
+# option <key> <value>
+end-volume
+
+volume ra6
+  type performance/read-ahead
+  subvolumes wb6
+# option <key> <value>
+end-volume
+
+volume brick7
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export7        # Export this directory
+end-volume
+
+# == Posix-Locks ==
+volume plocks7
+  type features/posix-locks
+#   option <something> <something>
+  subvolumes brick7
+end-volume
+
+volume iot7
+  type performance/io-threads
+  subvolumes plocks7 # change properly if above commented volumes needs to be included
+# option <key> <value>
+end-volume
+
+volume wb7
+  type performance/write-behind
+  subvolumes iot7
+# option <key> <value>
+end-volume
+
+volume ra7
+  type performance/read-ahead
+  subvolumes wb7
+# option <key> <value>
+end-volume
+
+volume brick8
+  type storage/posix                   # POSIX FS translator
+  option directory /tmp/export8        # Export this directory
+end-volume
+
+# == Posix-Locks ==
+volume plocks8
+  type features/posix-locks
+#   option <something> <something>
+  subvolumes brick8
+end-volume
+
+volume iot8
+  type performance/io-threads
+  subvolumes plocks8 # change properly if above commented volumes needs to be included
+# option <key> <value>
+end-volume
+
+volume wb8
+  type performance/write-behind
+  subvolumes iot8
+# option <key> <value>
+end-volume
+
+volume ra8
+  type performance/read-ahead
+  subvolumes wb8
+# option <key> <value>
+end-volume
+
+volume server8
+  type protocol/server
+  subvolumes ra8 ra1 ra2 ra3 ra4 ra5 ra6 ra7 brick-ns
+  option transport-type tcp     # For TCP/IP transport
+# option transport-type ib-sdp  # For Infiniband transport
+# option transport-type ib-verbs # For ib-verbs transport
+  option client-volume-filename /examples/qa-client.vol
+  option auth.addr.ra1.allow * # Allow access to "stat8" volume
+  option auth.addr.ra2.allow * # Allow access to "stat8" volume
+  option auth.addr.ra3.allow * # Allow access to "stat8" volume
+  option auth.addr.ra4.allow * # Allow access to "stat8" volume
+  option auth.addr.ra5.allow * # Allow access to "stat8" volume
+  option auth.addr.ra6.allow * # Allow access to "stat8" volume
+  option auth.addr.ra7.allow * # Allow access to "stat8" volume
+  option auth.addr.ra8.allow * # Allow access to "stat8" volume
+  option auth.addr.brick-ns.allow * # Allow access to "stat8" volume
+end-volume
+
diff --git a/doc/legacy/replicate.lyx b/doc/replicate.lyx
index 58ba6b2e0..d11a92bee 100644
--- a/doc/legacy/replicate.lyx
+++ b/doc/replicate.lyx
@@ -36,7 +36,7 @@ Automatic File Replication (replicate) in GlusterFS
 \end_layout
 
 \begin_layout Author
-Vikas Gorur
+Vikas Gorur 
 \family typewriter
 \size larger
 <vikas@gluster.com>
@@ -77,7 +77,7 @@ The replicate translator of GlusterFS aims to keep identical copies of a file
 \end_layout
 
 \begin_layout Standard
-In the rest of the document the terms
+In the rest of the document the terms 
 \begin_inset Quotes eld
 \end_inset
 
@@ -85,7 +85,7 @@ subvolume
 \begin_inset Quotes erd
 \end_inset
 
- and
+ and 
 \begin_inset Quotes eld
 \end_inset
 
@@ -167,7 +167,7 @@ end{verbatim}
 
 \begin_layout Standard
 This defines an replicate volume with two subvolumes, brick1, and brick2.
- For replicate to work properly, it is essential that its subvolumes support
+ For replicate to work properly, it is essential that its subvolumes support 
 \series bold
 extended attributes
 \series default
@@ -177,7 +177,7 @@ extended attributes
 \end_layout
 
 \begin_layout Standard
-The storage volumes used as backend for replicate
+The storage volumes used as backend for replicate 
 \emph on
 must
 \emph default
@@ -262,7 +262,7 @@ replicate divides all filesystem write operations into three classes:
 \begin_layout Itemize
 
 \series bold
-data:
+data: 
 \series default
 Operations that modify the contents of a file (write, truncate).
 \end_layout
@@ -270,7 +270,7 @@ Operations that modify the contents of a file (write, truncate).
 \begin_layout Itemize
 
 \series bold
-metadata:
+metadata: 
 \series default
 Operations that modify attributes of a file or directory (permissions, ownership
 , etc.).
@@ -279,7 +279,7 @@ Operations that modify attributes of a file or directory (permissions, ownership
 \begin_layout Itemize
 
 \series bold
-entry:
+entry: 
 \series default
 Operations that create or delete directory entries (mkdir, create, rename,
  rmdir, unlink, etc.).
@@ -345,7 +345,7 @@ Self-Heal
 \begin_layout Standard
 replicate automatically tries to fix any inconsistencies it detects among different
  copies of a file.
- It uses information in the change log to determine which copy is the
+ It uses information in the change log to determine which copy is the 
 \begin_inset Quotes eld
 \end_inset
 
@@ -357,7 +357,7 @@ correct
 \end_layout
 
 \begin_layout Standard
-Self-heal is triggered when a file or directory is first
+Self-heal is triggered when a file or directory is first 
 \begin_inset Quotes eld
 \end_inset
 
@@ -374,7 +374,7 @@ If the entry being accessed is a directory:
 \end_layout
 
 \begin_layout Itemize
-The contents of the
+The contents of the 
 \begin_inset Quotes eld
 \end_inset
 
@@ -412,7 +412,7 @@ It may happen that one replicate client can access only some of the servers in
  a cluster and another replicate client can access the remaining servers.
  Or it may happen that in a cluster of two servers, one server goes down
  and comes back up, but the other goes down immediately.
- Both these scenarios result in a
+ Both these scenarios result in a 
 \begin_inset Quotes eld
 \end_inset
 
@@ -425,7 +425,7 @@ split-brain
 
 \begin_layout Standard
 In a split-brain situation, there will be two or more copies of a file,
- all of which are
+ all of which are 
 \begin_inset Quotes eld
 \end_inset
 
@@ -484,12 +484,12 @@ split-brain
 ).
  This means if a discrepancy is noticed in the attributes or content of
  a file, the copy on the `favorite-child' will be considered the definitive
- version and its contents will
+ version and its contents will 
 \emph on
-overwrite
+overwrite 
 \emph default
 the contents of all other copies.
- Use this option with caution! It is possible to
+ Use this option with caution! It is possible to 
 \emph on
 lose data
 \emph default
@@ -502,7 +502,7 @@ Self-heal options
 \end_layout
 
 \begin_layout Standard
-Setting any of these options to
+Setting any of these options to 
 \begin_inset Quotes eld
 \end_inset
 
@@ -549,7 +549,7 @@ If any of these options is turned off, it disables writing of change log
  entries for that class of file operations.
  That is, steps 2 and 4 of the write algorithm (see above) are not done.
  Note that if the change log is not written, the self-heal algorithm cannot
- determine the
+ determine the 
 \begin_inset Quotes eld
 \end_inset
 
@@ -557,7 +557,7 @@ correct
 \begin_inset Quotes erd
 \end_inset
 
- version of a file and hence self-heal will only be able to fix
+ version of a file and hence self-heal will only be able to fix 
 \begin_inset Quotes eld
 \end_inset
 
@@ -602,7 +602,7 @@ These options let you specify the number of lock servers to use for each
  The default values are satisfactory in most cases.
  If you are extra paranoid, you may want to increase the values.
  However, be very cautious if you set the data- or entry- lock server counts
- to zero, since this can result in
+ to zero, since this can result in 
 \emph on
 lost data.
 
@@ -610,11 +610,11 @@ lost data.
  For example, if you set the data-lock-server-count to zero, and two application
 s write to the same region of a file, there is a possibility that none of
  your servers will have all the data.
- In other words, the copies will be
+ In other words, the copies will be 
 \emph on
 inconsistent
 \emph default
-, and
+, and 
 \emph on
 incomplete
 \emph default
diff --git a/doc/legacy/replicate.pdf b/doc/replicate.pdf
index b7212af2b..b7212af2b 100644
--- a/doc/legacy/replicate.pdf
+++ b/doc/replicate.pdf
diff --git a/doc/legacy/solaris-related-xattrs.txt b/doc/solaris-related-xattrs.txt
index 3a4643948..e26efa5d1 100644
--- a/doc/legacy/solaris-related-xattrs.txt
+++ b/doc/solaris-related-xattrs.txt
@@ -1,42 +1,42 @@
                    Solaris Extended Attributes
 
 In solaris extended attributes are logically supported as files
-within the filesystem.  The file system is therefore augmented
+within the filesystem.  The file system is therefore augmented 
 with an orthogonal namespace of file attributes. Attribute values
 are accessed by file descriptors obtained through a special attribute
-interface. This type of logical view of "attributes as files" allows
-the leveraging of existing file system interface functionality to
-support the construction, deletion and manipulation of attributes.
+interface. This type of logical view of "attributes as files" allows 
+the leveraging of existing file system interface functionality to 
+support the construction, deletion and manipulation of attributes. 
 
 But as we have tested through this functionality provided by Solaris
 we have come accross two major issues as written below.
 
-1. Symlink XATTR_NOFOLLOW not present for creating extended attributes
+1. Symlink XATTR_NOFOLLOW not present for creating extended attributes 
    directly on the symlinks like other platforms Linux,MAC-OSX,BSD etc.
-   An implementation is present for O_NOFOLLOW for "openat()" call sets
-   up errno ELOOP whenever encountered with a symlink and also another
+   An implementation is present for O_NOFOLLOW for "openat()" call sets 
+   up errno ELOOP whenever encountered with a symlink and also another 
    implementation AT_SYMLINK_NOFOLLOW which is not present for calls like
    "attropen(), openat()"
 
    a snippet of test code which helped us understand this behaviour
    --------------------------------------
-    attrfd = attropen (path, key,
+    attrfd = attropen (path, key, 
     flags|AT_SYMLINK_NOFOLLOW|O_CREAT|O_WRONLY|O_NOFOLLOW, 0777);
     if (attrfd >= 0) {
       ftruncate (attrfd, 0);
       ret = write (attrfd, value, size);
       close (attrfd);
     } else {
-       fprintf (stderr, "Couldn't set extended attribute for %s (%d)\n",
+       fprintf (stderr, "Couldn't set extended attribute for %s (%d)\n", 
        	        path, errno);
-    }
+    }		
     --------------------------------------
 
 2. Extended attribute support for special files like device files, fifo files
-   is not supported under solaris.
+   is not supported under solaris. 
 
 Apart from these glitches almost everything regarding porting functionality
-for extended attribute calls has been properly implemented in compat.c
+for extended attribute calls has been properly implemented in compat.c 
 with writing wrapper around functions over
 "attropen()", "openat()", "unlinkat()"
 
diff --git a/doc/split-brain.md b/doc/split-brain.md
deleted file mode 100644
index b0d938e26..000000000
--- a/doc/split-brain.md
+++ /dev/null
@@ -1,251 +0,0 @@
-Steps to recover from File split-brain.
-======================================
-
-Quick Start:
-============
-1. Get the path of the file that is in split-brain:  
->  It can be obtained either by  
->       a) The command `gluster volume heal info split-brain`.  
->       b) Identify the files for which file operations performed
-           from the client keep failing with Input/Output error.
-
-2. Close the applications that opened this file from the mount point.
-In case of VMs, they need to be powered-off.
-
-3. Decide on the correct copy:  
-> This is done by observing the afr changelog extended attributes of the file on
-the bricks using the getfattr command; then identifying the type of split-brain 
-(data split-brain, metadata split-brain, entry split-brain or split-brain due to
-gfid-mismatch); and finally determining which of the bricks contains the 'good copy'
-of the file.  
->   `getfattr -d -m . -e hex <file-path-on-brick>`.  
-It is also possible that one brick might contain the correct data while the
-other might contain the correct metadata.
-
-4. Reset the relevant extended attribute on the brick(s) that contains the
-'bad copy' of the file data/metadata using the setfattr command.  
->   `setfattr -n <attribute-name> -v <attribute-value> <file-path-on-brick>`
-
-5. Trigger self-heal on the file by performing lookup from the client:  
->   `ls -l <file-path-on-gluster-mount>`
-
-Detailed Instructions for steps 3 through 5:  
-===========================================
-To understand how to resolve split-brain we need to know how to interpret the
-afr changelog extended attributes.
-
-Execute `getfattr -d -m . -e hex <file-path-on-brick>`
-
-* Example:  
-[root@store3 ~]# getfattr -d -e hex -m. brick-a/file.txt  
-\#file: brick-a/file.txt  
-security.selinux=0x726f6f743a6f626a6563745f723a66696c655f743a733000  
-trusted.afr.vol-client-2=0x000000000000000000000000  
-trusted.afr.vol-client-3=0x000000000200000000000000  
-trusted.gfid=0x307a5c9efddd4e7c96e94fd4bcdcbd1b  
-
-The extended attributes with `trusted.afr.<volname>-client-<subvolume-index>`
-are used by afr to maintain changelog of the file.The values of the
-`trusted.afr.<volname>-client-<subvolume-index>` are calculated by the glusterfs
-client (fuse or nfs-server) processes. When the glusterfs client modifies a file
-or directory, the client contacts each brick and updates the changelog extended 
-attribute according to the response of the brick.
-
-'subvolume-index' is nothing but (brick number - 1) in
-`gluster volume info <volname>` output.
-
-* Example:  
-[root@pranithk-laptop ~]# gluster volume info vol  
- Volume Name: vol  
- Type: Distributed-Replicate  
- Volume ID: 4f2d7849-fbd6-40a2-b346-d13420978a01  
- Status: Created  
- Number of Bricks: 4 x 2 = 8  
- Transport-type: tcp  
- Bricks:  
- brick-a: pranithk-laptop:/gfs/brick-a  
- brick-b: pranithk-laptop:/gfs/brick-b  
- brick-c: pranithk-laptop:/gfs/brick-c  
- brick-d: pranithk-laptop:/gfs/brick-d  
- brick-e: pranithk-laptop:/gfs/brick-e  
- brick-f: pranithk-laptop:/gfs/brick-f  
- brick-g: pranithk-laptop:/gfs/brick-g  
- brick-h: pranithk-laptop:/gfs/brick-h  
-
-In the example above:  
-```
-Brick             |    Replica set        |    Brick subvolume index
-----------------------------------------------------------------------------
--/gfs/brick-a     |       0               |       0
--/gfs/brick-b     |       0               |       1
--/gfs/brick-c     |       1               |       2
--/gfs/brick-d     |       1               |       3
--/gfs/brick-e     |       2               |       4
--/gfs/brick-f     |       2               |       5
--/gfs/brick-g     |       3               |       6
--/gfs/brick-h     |       3               |       7
-```
-
-Each file in a brick maintains the changelog of itself and that of the files
-present in all the other bricks in it's replica set as seen by that brick.
-
-In the example volume given above, all files in brick-a will have 2 entries, 
-one for itself and the other for the file present in it's replica pair, i.e.brick-b:  
-trusted.afr.vol-client-0=0x000000000000000000000000 -->changelog for itself (brick-a)  
-trusted.afr.vol-client-1=0x000000000000000000000000 -->changelog for brick-b as seen by brick-a  
-
-Likewise, all files in brick-b will have:  
-trusted.afr.vol-client-0=0x000000000000000000000000 -->changelog for brick-a as seen by brick-b  
-trusted.afr.vol-client-1=0x000000000000000000000000 -->changelog for itself (brick-b)  
-
-The same can be extended for other replica pairs.  
-
-Interpreting Changelog (roughly pending operation count) Value:  
-Each extended attribute has a value which is 24 hexa decimal digits.  
-First 8 digits represent changelog of data. Second 8 digits represent changelog
-of metadata. Last 8 digits represent Changelog of directory entries.  
-
-Pictorially representing the same, we have:
-```
-0x 000003d7 00000001 00000000
-        |      |       |
-        |      |        \_ changelog of directory entries
-        |       \_ changelog of metadata
-         \ _ changelog of data
-```
-         
-
-For Directories metadata and entry changelogs are valid.
-For regular files data and metadata changelogs are valid.
-For special files like device files etc metadata changelog is valid.
-When a file split-brain happens it could be either data split-brain or
-meta-data split-brain or both. When a split-brain happens the changelog of the
-file would be something like this:  
-
-* Example:(Lets consider both data, metadata split-brain on same file).  
-[root@pranithk-laptop vol]# getfattr -d -m . -e hex /gfs/brick-?/a  
-getfattr: Removing leading '/' from absolute path names  
-\#file: gfs/brick-a/a  
-trusted.afr.vol-client-0=0x000000000000000000000000  
-trusted.afr.vol-client-1=0x000003d70000000100000000  
-trusted.gfid=0x80acdbd886524f6fbefa21fc356fed57   
-\#file: gfs/brick-b/a  
-trusted.afr.vol-client-0=0x000003b00000000100000000  
-trusted.afr.vol-client-1=0x000000000000000000000000  
-trusted.gfid=0x80acdbd886524f6fbefa21fc356fed57  
-
-###Observations:
-
-####According to changelog extended attributes on file /gfs/brick-a/a:  
-The first 8 digits of trusted.afr.vol-client-0 are all
-zeros (0x00000000................), and the first 8 digits of
-trusted.afr.vol-client-1 are not all zeros (0x000003d7................).
-So the changelog on /gfs/brick-a/a implies that some data operations succeeded
-on itself but failed on /gfs/brick-b/a.
-
-The second 8 digits of trusted.afr.vol-client-0 are
-all zeros (0x........00000000........), and the second 8 digits of
-trusted.afr.vol-client-1 are not all zeros (0x........00000001........).
-So the changelog on /gfs/brick-a/a implies that some metadata operations succeeded 
-on itself but failed on /gfs/brick-b/a.
-
-####According to Changelog extended attributes on file /gfs/brick-b/a:  
-The first 8 digits of trusted.afr.vol-client-0 are not all
-zeros (0x000003b0................), and the first 8 digits of
-trusted.afr.vol-client-1 are all zeros (0x00000000................).
-So the changelog on /gfs/brick-b/a implies that some data operations succeeded
-on itself but failed on /gfs/brick-a/a.
-
-The second 8 digits of trusted.afr.vol-client-0 are not
-all zeros (0x........00000001........), and the second 8 digits of
-trusted.afr.vol-client-1 are all zeros (0x........00000000........).
-So the changelog on /gfs/brick-b/a implies that some metadata operations succeeded
-on itself but failed on /gfs/brick-a/a.
-
-Since both the copies have data, metadata changes that are not on the other
-file, it is in both data and metadata split-brain.
-
-Deciding on the correct copy:  
------------------------------
-The user may have to inspect stat,getfattr output of the files to decide which 
-metadata to retain and contents of the file to decide which data to retain.
-Continuing with the example above, lets say we want to retain the data
-of /gfs/brick-a/a and metadata of /gfs/brick-b/a.
-
-Resetting the relevant changelogs to resolve the split-brain:  
--------------------------------------------------------------
-For resolving data-split-brain:  
-We need to change the changelog extended attributes on the files as if some data
-operations succeeded on /gfs/brick-a/a but failed on /gfs/brick-b/a. But
-/gfs/brick-b/a should NOT have any changelog which says some data operations
-succeeded on /gfs/brick-b/a but failed on /gfs/brick-a/a. We need to reset the
-data part of the changelog on trusted.afr.vol-client-0 of /gfs/brick-b/a.
-
-For resolving metadata-split-brain:  
-We need to change the changelog extended attributes on the files as if some
-metadata operations succeeded on /gfs/brick-b/a but failed on /gfs/brick-a/a.
-But /gfs/brick-a/a should NOT have any changelog which says some metadata
-operations succeeded on /gfs/brick-a/a but failed on /gfs/brick-b/a.
-We need to reset metadata part of the changelog on
-trusted.afr.vol-client-1 of /gfs/brick-a/a
-
-So, the intended changes are:  
-On /gfs/brick-b/a:  
-For trusted.afr.vol-client-0  
-0x000003b00000000100000000 to 0x000000000000000100000000  
-(Note that the metadata part is still not all zeros)  
-Hence execute
-`setfattr -n trusted.afr.vol-client-0 -v 0x000000000000000100000000 /gfs/brick-b/a`
-
-On /gfs/brick-a/a:  
-For trusted.afr.vol-client-1  
-0x0000000000000000ffffffff to 0x000003d70000000000000000  
-(Note that the data part is still not all zeros)  
-Hence execute  
-`setfattr -n trusted.afr.vol-client-1 -v 0x000003d70000000000000000 /gfs/brick-a/a`
-
-Thus after the above operations are done, the changelogs look like this:  
-[root@pranithk-laptop vol]# getfattr -d -m . -e hex /gfs/brick-?/a  
-getfattr: Removing leading '/' from absolute path names  
-\#file: gfs/brick-a/a  
-trusted.afr.vol-client-0=0x000000000000000000000000  
-trusted.afr.vol-client-1=0x000003d70000000000000000  
-trusted.gfid=0x80acdbd886524f6fbefa21fc356fed57  
-
-\#file: gfs/brick-b/a  
-trusted.afr.vol-client-0=0x000000000000000100000000  
-trusted.afr.vol-client-1=0x000000000000000000000000  
-trusted.gfid=0x80acdbd886524f6fbefa21fc356fed57  
-
-
-Triggering Self-heal:
----------------------
-Perform `ls -l <file-path-on-gluster-mount>` to trigger healing.
-
-Fixing Directory entry split-brain:
-----------------------------------
-Afr has the ability to conservatively merge different entries in the directories
-when there is a split-brain on directory.
-If on one brick directory 'd' has entries '1', '2' and has entries '3', '4' on
-the other brick then afr will merge all of the entries in the directory to have
-'1', '2', '3', '4' entries in the same directory.
-(Note: this may result in deleted files to re-appear in case the split-brain
-happens because of deletion of files on the directory)
-Split-brain resolution needs human intervention when there is at least one entry
-which has same file name but different gfid in that directory.
-Example:  
-On brick-a the directory has entries '1' (with gfid g1), '2' and on brick-b
-directory has entries '1' (with gfid g2) and '3'.
-These kinds of directory split-brains need human intervention to resolve.
-The user needs to remove either file '1' on brick-a or the file '1' on brick-b
-to resolve the split-brain. In addition, the corresponding gfid-link file also
-needs to be removed.The gfid-link files are present in the .glusterfs folder
-in the top-level directory of the brick. If the gfid of the file is
-0x307a5c9efddd4e7c96e94fd4bcdcbd1b (the trusted.gfid extended attribute got
-from the getfattr command earlier),the gfid-link file can be found at
-> /gfs/brick-a/.glusterfs/30/7a/307a5c9efddd4e7c96e94fd4bcdcbd1b
-
-####Word of caution:
-Before deleting the gfid-link, we have to ensure that there are no hard links
-to the file present on that brick. If hard-links exist,they must be deleted as
-well.
diff --git a/doc/legacy/stat-prefetch-design.txt b/doc/stat-prefetch-design.txt
index 68ed423d3..06d0ad37e 100644
--- a/doc/legacy/stat-prefetch-design.txt
+++ b/doc/stat-prefetch-design.txt
@@ -1,64 +1,64 @@
 what is stat-prefetch?
 ======================
 It is a translator which caches the dentries read in readdir. This dentry
-list is stored in the context of fd. Later when lookup happens on
+list is stored in the context of fd. Later when lookup happens on 
 [parent-inode, basename (path)] combination, this list is searched for the
 basename. The dentry thus searched is used to fill up the stat corresponding
 to path being looked upon, thereby short-cutting lookup calls. This cache is
-preserved till closedir is called on the fd. The purpose of this translator
-is to optimize operations like 'ls -l', where a readdir is followed by
+preserved till closedir is called on the fd. The purpose of this translator 
+is to optimize operations like 'ls -l', where a readdir is followed by 
 lookup (stat) calls on each directory entry.
 
-1. stat-prefetch harnesses the efficiency of short lookup calls
-   (saves network roundtrip time for lookup calls from being accounted to
+1. stat-prefetch harnesses the efficiency of short lookup calls 
+   (saves network roundtrip time for lookup calls from being accounted to 
    the stat call).
-2. To maintain the correctness, it does lookup-behind - lookup is winded to
-   underlying translators after it is unwound to upper translators.
+2. To maintain the correctness, it does lookup-behind - lookup is winded to 
+   underlying translators after it is unwound to upper translators. 
    lookup-behind is necessary as inode gets populated in server inode table
-   only in lookup-cbk and also because various translators store their
+   only in lookup-cbk and also because various translators store their 
    contexts in inode contexts during lookup calls.
 
 fops to be implemented:
 =======================
 * lookup
-  1. check the dentry cache stored in context of fds opened by the same process
+  1. check the dentry cache stored in context of fds opened by the same process 
      on parent inode for basename. If found unwind with cached stat, else wind
-     the lookup call to underlying translators.
-  2. stat is stored in the context of inode if the path being looked upon
+     the lookup call to underlying translators. 
+  2. stat is stored in the context of inode if the path being looked upon 
      happens to be directory. This stat will be used to fill postparent stat
      when lookup happens on any of the directory contents.
 
 * readdir
   1. cache the direntries returned in readdir_cbk in the context of fd.
-  2. if the readdir is happening on non-expected offsets (means a seekdir/rewinddir
+  2. if the readdir is happening on non-expected offsets (means a seekdir/rewinddir 
      has happened), cache has to be flushed.
-  3. delete the entry corresponding to basename of path on which fd is opened
+  3. delete the entry corresponding to basename of path on which fd is opened 
      from cache stored in parent.
 
 * chmod/fchmod
   delete the entry corresponding to basename from cache stored in context of
-  fds opened on parent inode, since these calls change st_mode and st_ctime of
+  fds opened on parent inode, since these calls change st_mode and st_ctime of 
   stat.
-
+ 
 * chown/fchown
-  delete the entry corresponding to basename from cache stored in context of
-  fds opened on parent inode, since these calls change st_uid/st_gid and
+  delete the entry corresponding to basename from cache stored in context of 
+  fds opened on parent inode, since these calls change st_uid/st_gid and 
   st_ctime of stat.
 
 * truncate/ftruncate
-  delete the entry corresponding to basename from cache stored in context of
+  delete the entry corresponding to basename from cache stored in context of 
   fds opened on parent inode, since these calls change st_size/st_mtime of stat.
 
 * utimens
-  delete the entry corresponding to basename from cache stored in context of
+  delete the entry corresponding to basename from cache stored in context of 
   fds opened on parent inode, since this call changes st_atime/st_mtime of stat.
 
 * readlink
   delete the entry corresponding to basename from cache stored in context of fds
   opened on parent inode, since this call changes st_atime of stat.
-
+ 
 * unlink
-  1. delete the entry corresponding to basename from cache stored in context of
+  1. delete the entry corresponding to basename from cache stored in context of 
      fds, opened on parent directory containing the file being unlinked.
   2. delete the entry corresponding to basename of parent directory from cache
      of grand-parent.
@@ -66,14 +66,14 @@ fops to be implemented:
 * rmdir
   1. delete the entry corresponding to basename from cache stored in context of
      fds opened on parent inode.
-  2. remove the entire cache from all fds opened on inode corresponding to
+  2. remove the entire cache from all fds opened on inode corresponding to 
      directory being removed.
   3. delete the entry correspondig to basename of parent from cache stored in
      grand-parent.
 
 * readv
   delete the entry corresponding to basename from cache stored in context of fds
-  opened on parent inode, since readv changes st_atime of file.
+  opened on parent inode, since readv changes st_atime of file. 
 
 * writev
   delete the entry corresponding to basename from cache stored in context of fds
@@ -82,29 +82,29 @@ fops to be implemented:
 
 * fsync
   there is a confusion here as to whether fsync updates mtime/ctimes. Disk based
-  filesystems (atleast ext2) just writes the times stored in inode to disk
-  during fsync and not the time at which fsync is being done. But in glusterfs,
-  a translator like write-behind actually sends writes during fsync which will
-  change mtime/ctime. Hence stat-prefetch implements fsync to delete the entry
+  filesystems (atleast ext2) just writes the times stored in inode to disk 
+  during fsync and not the time at which fsync is being done. But in glusterfs, 
+  a translator like write-behind actually sends writes during fsync which will 
+  change mtime/ctime. Hence stat-prefetch implements fsync to delete the entry 
   corresponding to basename from cache stored in context of fds opened on parent
   inode.
-
+ 
 * rename
-  1. remove entry corresponding to oldname from cache stored in fd contexts of
+  1. remove entry corresponding to oldname from cache stored in fd contexts of 
      oldparent.
   2. remove entry corresponding to newname from cache stored in fd contexts of
-     newparent.
-  3. remove entry corresponding to oldparent from cache stored in
+     newparent. 
+  3. remove entry corresponding to oldparent from cache stored in 
      old-grand-parent, since removing oldname changes st_mtime and st_ctime
      of oldparent stat.
-  4. remove entry corresponding to newparent from cache stored in
+  4. remove entry corresponding to newparent from cache stored in 
      new-grand-parent, since adding newname changes st_mtime and st_ctime
      of newparent stat.
-  5. if oldname happens to be a directory, remove entire cache from all fds
+  5. if oldname happens to be a directory, remove entire cache from all fds 
      opened on it.
 
 * create/mknod/mkdir/symlink/link
-  delete entry corresponding to basename of parent directory in which these
+  delete entry corresponding to basename of parent directory in which these 
   operations are happening, from cache stored in context of fds opened on
   grand-parent, since adding a new entry to a directory changes st_mtime
   and st_ctime of parent directory.
@@ -116,13 +116,13 @@ fops to be implemented:
 * setdents
   1. remove entry corresponding to basename of path on which fd is opened from
      cache stored in context of fds opened on parent.
-  2. for each of the entry in the direntry list, delete from cache stored in
+  2. for each of the entry in the direntry list, delete from cache stored in 
      context of fd, the entry corresponding to basename of path being passed.
 
 * getdents
   1. remove entry corresponding to basename of path on which fd is opened from
-     cache stored in parent, since getdents changes st_atime.
-  2. remove entries corresponding to symbolic links from cache, since readlink
+     cache stored in parent, since getdents changes st_atime. 
+  2. remove entries corresponding to symbolic links from cache, since readlink 
      would've changed st_atime.
 
 * checksum
@@ -144,11 +144,11 @@ callbacks to be implemented:
 limitations:
 ============
 * since a readdir does not return extended attributes of file, if need_xattr is
-  set, short-cutting of lookup does not happen and lookup is passed to
+  set, short-cutting of lookup does not happen and lookup is passed to 
   underlying translators.
 
 * posix_readdir does not check whether the dentries are spanning across multiple
-  mount points. Hence it is not transforming inode numbers in stat buffers if
+  mount points. Hence it is not transforming inode numbers in stat buffers if 
   posix is configured to allow export directory spanning on multiple mountpoints.
-  This is a bug which needs to be fixed. posix_readdir should treat dentries the
+  This is a bug which needs to be fixed. posix_readdir should treat dentries the 
   same way as if lookup is happening on dentries.
diff --git a/doc/legacy/translator-options.txt b/doc/translator-options.txt
index 3422c058a..278ef5b00 100644
--- a/doc/legacy/translator-options.txt
+++ b/doc/translator-options.txt
@@ -1,7 +1,7 @@
 mount/fuse:
 	* direct-io-mode            GF_OPTION_TYPE_BOOL   on|off|yes|no
 	* mount-point (mountpoint)  GF_OPTION_TYPE_PATH   <any-posix-valid-path>
-	* attribute-timeout         GF_OPTION_TYPE_DOUBLE   0.0
+	* attribute-timeout         GF_OPTION_TYPE_DOUBLE   0.0 
 	* entry-timeout             GF_OPTION_TYPE_DOUBLE   0.0
 
 protocol/server:
@@ -13,20 +13,20 @@ protocol/server:
 
 protocol/client:
 	* username                  GF_OPTION_TYPE_ANY
-	* password                  GF_OPTION_TYPE_ANY
+	* password                  GF_OPTION_TYPE_ANY 
 	* transport-type            GF_OPTION_TYPE_STR   tcp|socket|ib-verbs|unix|ib-sdp|
 	  			    			 tcp/client|ib-verbs/client
-	* remote-host               GF_OPTION_TYPE_ANY
-	* remote-subvolume          GF_OPTION_TYPE_ANY
-	* transport-timeout         GF_OPTION_TYPE_TIME  5-1013
+	* remote-host               GF_OPTION_TYPE_ANY 
+	* remote-subvolume          GF_OPTION_TYPE_ANY 
+	* transport-timeout         GF_OPTION_TYPE_TIME  5-1013 
 
 cluster/replicate:
 	* read-subvolume	    GF_OPTION_TYPE_XLATOR
 	* favorite-child 	    GF_OPTION_TYPE_XLATOR
-	* data-self-heal 	    GF_OPTION_TYPE_BOOL
+	* data-self-heal 	    GF_OPTION_TYPE_BOOL 
 	* metadata-self-heal 	    GF_OPTION_TYPE_BOOL
-	* entry-self-heal 	    GF_OPTION_TYPE_BOOL
-	* data-change-log 	    GF_OPTION_TYPE_BOOL
+	* entry-self-heal 	    GF_OPTION_TYPE_BOOL 
+	* data-change-log 	    GF_OPTION_TYPE_BOOL 
 	* metadata-change-log 	    GF_OPTION_TYPE_BOOL
 	* entry-change-log 	    GF_OPTION_TYPE_BOOL
 	* data-lock-server-count    GF_OPTION_TYPE_INT    0
@@ -34,54 +34,54 @@ cluster/replicate:
 	* entry-lock-server-count    GF_OPTION_TYPE_INT   0
 
 cluster/distribute:
-	* lookup-unhashed           GF_OPTION_TYPE_BOOL
+	* lookup-unhashed           GF_OPTION_TYPE_BOOL 
 
 cluster/unify:
-	* namespace		    GF_OPTION_TYPE_XLATOR
-	* scheduler 		    GF_OPTION_TYPE_STR    alu|rr|random|nufa|switch
+	* namespace		    GF_OPTION_TYPE_XLATOR 
+	* scheduler 		    GF_OPTION_TYPE_STR    alu|rr|random|nufa|switch 
 	* self-heal 		    GF_OPTION_TYPE_STR    foreground|background|off
-	* optimist  		    GF_OPTION_TYPE_BOOL
+	* optimist  		    GF_OPTION_TYPE_BOOL 
 
 cluster/nufa:
-	local-volume-name           GF_OPTION_TYPE_XLATOR
+	local-volume-name           GF_OPTION_TYPE_XLATOR 
 
 cluster/stripe:
-	* block-size		    GF_OPTION_TYPE_ANY
+	* block-size		    GF_OPTION_TYPE_ANY 
 	* use-xattr  		    GF_OPTION_TYPE_BOOL
 
 debug/trace:
 	* include-ops (include)     GF_OPTION_TYPE_STR
-	* exclude-ops (exclude)     GF_OPTION_TYPE_STR
+	* exclude-ops (exclude)     GF_OPTION_TYPE_STR 
 
 encryption/rot-13:
 	* encrypt-write             GF_OPTION_TYPE_BOOL
-	* decrypt-read  	    GF_OPTION_TYPE_BOOL
+	* decrypt-read  	    GF_OPTION_TYPE_BOOL 
 
 features/path-convertor:
-	* start-offset              GF_OPTION_TYPE_INT     0-4095
-	* end-offset 		    GF_OPTION_TYPE_INT	   1-4096
+	* start-offset              GF_OPTION_TYPE_INT     0-4095 
+	* end-offset 		    GF_OPTION_TYPE_INT	   1-4096 
 	* replace-with		    GF_OPTION_TYPE_ANY
 
 features/trash:
-	* trash-dir	            GF_OPTION_TYPE_PATH
+	* trash-dir	            GF_OPTION_TYPE_PATH 
 
 features/locks:
-	* mandatory-locks (mandatory) GF_OPTION_TYPE_BOOL
+	* mandatory-locks (mandatory) GF_OPTION_TYPE_BOOL 
 
 features/filter:
-	* root-squashing	    GF_OPTION_TYPE_BOOL
+	* root-squashing	    GF_OPTION_TYPE_BOOL 
 	* read-only                 GF_OPTION_TYPE_BOOL
 	* fixed-uid		    GF_OPTION_TYPE_INT
 	* fixed-gid		    GF_OPTION_TYPE_INT
-	* translate-uid             GF_OPTION_TYPE_ANY
+	* translate-uid             GF_OPTION_TYPE_ANY 
 	* translate-gid		    GF_OPTION_TYPE_ANY
-	* filter-uid		    GF_OPTION_TYPE_ANY
-	* filter-gid		    GF_OPTION_TYPE_ANY
+	* filter-uid		    GF_OPTION_TYPE_ANY 
+	* filter-gid		    GF_OPTION_TYPE_ANY 
 
 features/quota:
 	* min-free-disk-limit	    GF_OPTION_TYPE_PERCENT
 	* refresh-interval	    GF_OPTION_TYPE_TIME
-	* disk-usage-limit	    GF_OPTION_TYPE_SIZET
+	* disk-usage-limit	    GF_OPTION_TYPE_SIZET 
 
 storage/posix:
 	* o-direct		    GF_OPTION_TYPE_BOOL
@@ -104,16 +104,16 @@ storage/bdb:
 	* access-mode		    GF_OPTION_TYPE_STR
 
 performance/read-ahead:
-	* force-atime-update        GF_OPTION_TYPE_BOOL
+	* force-atime-update        GF_OPTION_TYPE_BOOL 
 	* page-size		    GF_OPTION_TYPE_SIZET (64 * GF_UNIT_KB)-(2 * GF_UNIT_MB)
-	* page-count		    GF_OPTION_TYPE_INT   1-16
+	* page-count		    GF_OPTION_TYPE_INT   1-16 
 
 performance/write-behind:
 	* flush-behind		    GF_OPTION_TYPE_BOOL
-	* aggregate-size	    GF_OPTION_TYPE_SIZET  (128 * GF_UNIT_KB)-(4 * GF_UNIT_MB)
-	* window-size		    GF_OPTION_TYPE_SIZET  (512 * GF_UNIT_KB)-(1 * GF_UNIT_GB)
-	* enable-O_SYNC		    GF_OPTION_TYPE_BOOL
-	* disable-for-first-nbytes  GF_OPTION_TYPE_SIZET  1 - (1 * GF_UNIT_MB)
+	* aggregate-size	    GF_OPTION_TYPE_SIZET  (128 * GF_UNIT_KB)-(4 * GF_UNIT_MB) 
+	* window-size		    GF_OPTION_TYPE_SIZET  (512 * GF_UNIT_KB)-(1 * GF_UNIT_GB) 
+	* enable-O_SYNC		    GF_OPTION_TYPE_BOOL  
+	* disable-for-first-nbytes  GF_OPTION_TYPE_SIZET  1 - (1 * GF_UNIT_MB) 
 
 performance/symlink-cache:
 
@@ -121,9 +121,9 @@ performance/io-threads:
 	* thread-count	            GF_OPTION_TYPE_INT    1-32
 
 performance/io-cache:
-	* priority	            GF_OPTION_TYPE_ANY
-	* cache-timeout (force-revalidate-timeout) GF_OPTION_TYPE_INT 0-60
-	* page-size	            GF_OPTION_TYPE_SIZET  (16 * GF_UNIT_KB)-(4 * GF_UNIT_MB)
+	* priority	            GF_OPTION_TYPE_ANY 
+	* cache-timeout (force-revalidate-timeout) GF_OPTION_TYPE_INT 0-60 
+	* page-size	            GF_OPTION_TYPE_SIZET  (16 * GF_UNIT_KB)-(4 * GF_UNIT_MB) 
         * cache-size                GF_OPTION_TYPE_SIZET  (4 * GF_UNIT_MB)-(6 * GF_UNIT_GB)
 
 performance/quick-read:
@@ -132,16 +132,16 @@ performance/quick-read:
 
 auth:
 - addr:
-	* auth.addr.*.allow	    GF_OPTION_TYPE_ANY
-	* auth.addr.*.reject	    GF_OPTION_TYPE_ANY
+	* auth.addr.*.allow	    GF_OPTION_TYPE_ANY 
+	* auth.addr.*.reject	    GF_OPTION_TYPE_ANY 
 
 - login:
-	* auth.login.*.allow	    GF_OPTION_TYPE_ANY
+	* auth.login.*.allow	    GF_OPTION_TYPE_ANY 
 	* auth.login.*.password	    GF_OPTION_TYPE_ANY
 
 scheduler/alu:
-	* scheduler.alu.order (alu.order)
-	                            GF_OPTION_TYPE_ANY
+	* scheduler.alu.order (alu.order) 
+	                            GF_OPTION_TYPE_ANY 
 	* scheduler.alu.disk-usage.entry-threshold (alu.disk-usage.entry-threshold)
 	  			    GF_OPTION_TYPE_SIZET
         * scheduler.alu.disk-usage.exit-threshold (alu.disk-usage.exit-threshold)
@@ -149,17 +149,17 @@ scheduler/alu:
         * scheduler.alu.write-usage.entry-threshold (alu.write-usage.entry-threshold)
                                     GF_OPTION_TYPE_SIZET
         * scheduler.alu.write-usage.exit-threshold (alu.write-usage.exit-threshold)
-                                    GF_OPTION_TYPE_SIZET
+                                    GF_OPTION_TYPE_SIZET 
         * scheduler.alu.read-usage.entry-threshold (alu.read-usage.entry-threshold)
                                     GF_OPTION_TYPE_SIZET
         * scheduler.alu.read-usage.exit-threshold (alu.read-usage.exit-threshold)
-                                    GF_OPTION_TYPE_SIZET
+                                    GF_OPTION_TYPE_SIZET 
         * scheduler.alu.open-files-usage.entry-threshold (alu.open-files-usage.entry-threshold)
                                     GF_OPTION_TYPE_INT
         * scheduler.alu.open-files-usage.exit-threshold (alu.open-files-usage.exit-threshold)
-                                    GF_OPTION_TYPE_INT
+                                    GF_OPTION_TYPE_INT 
         * scheduler.read-only-subvolumes (alu.read-only-subvolumes)
-                                    GF_OPTION_TYPE_ANY
+                                    GF_OPTION_TYPE_ANY 
         * scheduler.refresh-interval (alu.refresh-interval)
                                     GF_OPTION_TYPE_TIME
         * scheduler.limits.min-free-disk (alu.limits.min-free-disk)
@@ -168,11 +168,11 @@ scheduler/alu:
                                     GF_OPTION_TYPE_INT
 
 scheduler/nufa:
-	* scheduler.refresh-interval (nufa.refresh-interval)
+	* scheduler.refresh-interval (nufa.refresh-interval) 
 	                            GF_OPTION_TYPE_TIME
-	* scheduler.limits.min-free-disk (nufa.limits.min-free-disk)
+	* scheduler.limits.min-free-disk (nufa.limits.min-free-disk) 
 	                            GF_OPTION_TYPE_PERCENT
-	* scheduler.local-volume-name (nufa.local-volume-name)
+	* scheduler.local-volume-name (nufa.local-volume-name) 
 	                            GF_OPTION_TYPE_XLATOR
 
 scheduler/random:
@@ -204,20 +204,20 @@ transport/ib-verbs:
         * transport.ib-verbs.work-request-recv-count (ib-verbs-work-request-recv-count)
                                  GF_OPTION_TYPE_INT
         * remote-port (transport.remote-port,transport.ib-verbs.remote-port)
-	                         GF_OPTION_TYPE_INT
-        * transport.ib-verbs.listen-port  GF_OPTION_TYPE_INT
-        * transport.ib-verbs.connect-path (connect-path) GF_OPTION_TYPE_ANY
-        * transport.ib-verbs.bind-path (bind-path) GF_OPTION_TYPE_ANY
-        * transport.ib-verbs.listen-path (listen-path) GF_OPTION_TYPE_ANY
+	                         GF_OPTION_TYPE_INT 
+        * transport.ib-verbs.listen-port  GF_OPTION_TYPE_INT 
+        * transport.ib-verbs.connect-path (connect-path) GF_OPTION_TYPE_ANY 
+        * transport.ib-verbs.bind-path (bind-path) GF_OPTION_TYPE_ANY 
+        * transport.ib-verbs.listen-path (listen-path) GF_OPTION_TYPE_ANY 
         * transport.address-family (address-family) GF_OPTION_TYPE_STR inet|inet6|inet/inet6|
                                                                        inet6/inet|unix|inet-sdp
 
 transport/socket:
-	* transport.remote-port (remote-port,transport.socket.remote-port) GF_OPTION_TYPE_INT
-	* transport.socket.listen-port (listen-port) GF_OPTION_TYPE_INT
-	* transport.socket.bind-address (bind-address) GF_OPTION_TYPE_ANY
-	* transport.socket.connect-path (connect-path) GF_OPTION_TYPE_ANY
-	* transport.socket.bind-path (bind-path)       GF_OPTION_TYPE_ANY
+	* transport.remote-port (remote-port,transport.socket.remote-port) GF_OPTION_TYPE_INT 
+	* transport.socket.listen-port (listen-port) GF_OPTION_TYPE_INT 
+	* transport.socket.bind-address (bind-address) GF_OPTION_TYPE_ANY 
+	* transport.socket.connect-path (connect-path) GF_OPTION_TYPE_ANY 
+	* transport.socket.bind-path (bind-path)       GF_OPTION_TYPE_ANY 
 	* transport.socket.listen-path (listen-path)   GF_OPTION_TYPE_ANY
 	* transport.address-family (address-family)    GF_OPTION_TYPE_STR  inet|inet6|
 	  			   		       			   inet/inet6|inet6/inet|
diff --git a/doc/legacy/Makefile.am b/doc/user-guide/Makefile.am
index b2caabaa2..800e7321d 100644
--- a/doc/legacy/Makefile.am
+++ b/doc/user-guide/Makefile.am
@@ -1,3 +1,3 @@
 info_TEXINFOS = user-guide.texi
-CLEANFILES = *~
+CLEANFILES = *~ 
 DISTCLEANFILES = .deps/*.P *.info *vti
diff --git a/doc/legacy/advanced-stripe.odg b/doc/user-guide/advanced-stripe.odg
index 7686d7091..7686d7091 100644
--- a/doc/legacy/advanced-stripe.odg
+++ b/doc/user-guide/advanced-stripe.odg
diff --git a/doc/legacy/advanced-stripe.pdf b/doc/user-guide/advanced-stripe.pdf
index ec8b03dcf..ec8b03dcf 100644
--- a/doc/legacy/advanced-stripe.pdf
+++ b/doc/user-guide/advanced-stripe.pdf
diff --git a/doc/legacy/colonO-icon.jpg b/doc/user-guide/colonO-icon.jpg
index 3e66f7a27..3e66f7a27 100644
--- a/doc/legacy/colonO-icon.jpg
+++ b/doc/user-guide/colonO-icon.jpg
diff --git a/doc/legacy/fdl.texi b/doc/user-guide/fdl.texi
index e33c687cd..e33c687cd 100644
--- a/doc/legacy/fdl.texi
+++ b/doc/user-guide/fdl.texi
diff --git a/doc/legacy/fuse.odg b/doc/user-guide/fuse.odg
index 61bd103c7..61bd103c7 100644
--- a/doc/legacy/fuse.odg
+++ b/doc/user-guide/fuse.odg
diff --git a/doc/legacy/fuse.pdf b/doc/user-guide/fuse.pdf
index a7d13faff..a7d13faff 100644
--- a/doc/legacy/fuse.pdf
+++ b/doc/user-guide/fuse.pdf
diff --git a/doc/legacy/ha.odg b/doc/user-guide/ha.odg
index e4b8b72d0..e4b8b72d0 100644
--- a/doc/legacy/ha.odg
+++ b/doc/user-guide/ha.odg
diff --git a/doc/legacy/ha.pdf b/doc/user-guide/ha.pdf
index e372c0ab0..e372c0ab0 100644
--- a/doc/legacy/ha.pdf
+++ b/doc/user-guide/ha.pdf
diff --git a/doc/legacy/stripe.odg b/doc/user-guide/stripe.odg
index 79441bf14..79441bf14 100644
--- a/doc/legacy/stripe.odg
+++ b/doc/user-guide/stripe.odg
diff --git a/doc/legacy/stripe.pdf b/doc/user-guide/stripe.pdf
index b94446feb..b94446feb 100644
--- a/doc/legacy/stripe.pdf
+++ b/doc/user-guide/stripe.pdf
diff --git a/doc/legacy/unify.odg b/doc/user-guide/unify.odg
index ccaa9bf16..ccaa9bf16 100644
--- a/doc/legacy/unify.odg
+++ b/doc/user-guide/unify.odg
diff --git a/doc/legacy/unify.pdf b/doc/user-guide/unify.pdf
index c22027f66..c22027f66 100644
--- a/doc/legacy/unify.pdf
+++ b/doc/user-guide/unify.pdf
diff --git a/doc/legacy/user-guide.info b/doc/user-guide/user-guide.info
index 2bbadb351..e46645099 100644
--- a/doc/legacy/user-guide.info
+++ b/doc/user-guide/user-guide.info
@@ -130,7 +130,7 @@ suggestions.  A huge thanks to them all.
 
    Patrick Negri - for TCP non-blocking connect.
         http://gluster.org/core-team.php (<list-hacking@gluster.com>)
-                                                          Gluster
+                                                          Gluster 
 
 
 File: user-guide.info,  Node: Introduction,  Next: Installation and Invocation,  Prev: Acknowledgements,  Up: Top
@@ -160,15 +160,15 @@ makes them all appear to be a part of the same filesystem.
 =================
 
 You can reach us through the mailing list *gluster-devel*
-(<gluster-devel@nongnu.org>).
+(<gluster-devel@nongnu.org>).  
 
    You can also find many of the developers on IRC, on the `#gluster'
-channel on Freenode (<irc.freenode.net>).
+channel on Freenode (<irc.freenode.net>).  
 
    The GlusterFS documentation wiki is also useful:
 <http://gluster.org/docs/index.php/GlusterFS>
 
-   For commercial support, you can contact Gluster at:
+   For commercial support, you can contact Gluster at: 
 
      3194 Winding Vista Common
      Fremont, CA 94539
@@ -397,8 +397,8 @@ command-line options accepted by it.
 `--volfile-server-port=<port-number>'
      Listening port number of volfile server.
 
-`--volfile-server-transport=[tcp|ib-verbs]'
-     Transport type to get volfile from server. [default: `tcp']
+`--volfile-server-transport=[socket|ib-verbs]'
+     Transport type to get volfile from server. [default: `socket']
 
 `--xlator-options=<volume-name.option=value>'
      Add/override a translator option for a volume with specified value.
@@ -467,8 +467,8 @@ filesystem to appear. Example:
 `--volfile-server-port=<port-number>'
      Listening port number of volfile server.
 
-`--volfile-server-transport=[tcp|ib-verbs]'
-     Transport type to get volfile from server. [default: `tcp']
+`--volfile-server-transport=[socket|ib-verbs]'
+     Transport type to get volfile from server. [default: `socket']
 
 `--xlator-options=<volume-name.option=value>'
      Add/override a translator option for a volume with specified value.
@@ -907,7 +907,7 @@ and the client.
      Whether to make the connection attempt asynchronous.
 
 `remote-port <n> (24007)'
-     Server port to connect to.
+     Server port to connect to.  
 
 `remote-host <hostname> *'
      Hostname or IP address of the server. If the host name resolves to
@@ -952,7 +952,7 @@ always best to use `ib-verbs'. Use `ib-sdp' only if you cannot get
      Whether to make the connection attempt asynchronous.
 
 `remote-port <n> (24007)'
-     Server port to connect to.
+     Server port to connect to.  
 
 `remote-host <hostname> *'
      Hostname or IP address of the server. If the host name resolves to
@@ -2057,7 +2057,7 @@ the `--log-file' option (See *note Client::).
 =======================
 
 `modprobe fuse' fails with: "Unknown symbol in module, or unknown
-parameter".
+parameter".  
 
    If you are using fuse-2.6.x on Redhat Enterprise Linux Work Station 4
 and Advanced Server 4 with 2.6.9-42.ELlargesmp, 2.6.9-42.ELsmp,
diff --git a/doc/legacy/user-guide.pdf b/doc/user-guide/user-guide.pdf
index ed7bd2a99..ed7bd2a99 100644
--- a/doc/legacy/user-guide.pdf
+++ b/doc/user-guide/user-guide.pdf
diff --git a/doc/legacy/user-guide.texi b/doc/user-guide/user-guide.texi
index 8e429853f..f864c186a 100644
--- a/doc/legacy/user-guide.texi
+++ b/doc/user-guide/user-guide.texi
@@ -23,7 +23,7 @@ Documentation License''.
 @title GlusterFS 2.0 User Guide [DRAFT]
 @subtitle January 15, 2008
 @author http://gluster.org/core-team.php
-@author @email{@b{Gluster}}
+@author @email{@b{Gluster}} 
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -36,78 +36,78 @@ Documentation License''.
 
 @insertcopying
 @menu
-* Acknowledgements::
-* Introduction::
-* Installation and Invocation::
-* Concepts::
-* Translators::
-* Usage Scenarios::
-* Troubleshooting::
-* GNU Free Documentation Licence::
-* Index::
+* Acknowledgements::            
+* Introduction::                
+* Installation and Invocation::  
+* Concepts::                    
+* Translators::                 
+* Usage Scenarios::             
+* Troubleshooting::             
+* GNU Free Documentation Licence::  
+* Index::                       
 
 @detailmenu
  --- The Detailed Node Listing ---
 
 Installation and Invocation
 
-* Pre requisites::
-* Getting GlusterFS::
-* Building::
-* Running GlusterFS::
-* A Tutorial Introduction::
+* Pre requisites::              
+* Getting GlusterFS::           
+* Building::                    
+* Running GlusterFS::           
+* A Tutorial Introduction::     
 
 Running GlusterFS
 
-* Server::
-* Client::
+* Server::                      
+* Client::                      
 
 Concepts
 
-* Filesystems in Userspace::
-* Translator::
-* Volume specification file::
+* Filesystems in Userspace::                
+* Translator::                  
+* Volume specification file::   
 
 Translators
 
-* Storage Translators::
-* Client and Server Translators::
-* Clustering Translators::
-* Performance Translators::
-* Features Translators::
+* Storage Translators::         
+* Client and Server Translators::  
+* Clustering Translators::      
+* Performance Translators::     
+* Features Translators::        
 
 Storage Translators
 
-* POSIX::
+* POSIX::        
 
 Client and Server Translators
 
-* Transport modules::
-* Client protocol::
-* Server protocol::
+* Transport modules::           
+* Client protocol::             
+* Server protocol::             
 
 Clustering Translators
 
-* Unify::
-* Replicate::
-* Stripe::
+* Unify::                       
+* Replicate::  
+* Stripe::                      
 
 Performance Translators
 
-* Read Ahead::
-* Write Behind::
-* IO Threads::
-* IO Cache::
+* Read Ahead::                  
+* Write Behind::                
+* IO Threads::                  
+* IO Cache::                    
 
-Features Translators
+Features Translators 
 
-* POSIX Locks::
-* Fixed ID::
+* POSIX Locks::                 
+* Fixed ID::                    
 
 Miscellaneous Translators
 
-* ROT-13::
-* Trace::
+* ROT-13::                      
+* Trace::                       
 
 @end detailmenu
 @end menu
@@ -120,7 +120,7 @@ Miscellaneous Translators
 @node Acknowledgements
 @unnumbered Acknowledgements
 GlusterFS continues to be a wonderful and enriching experience for all
-of us involved.
+of us involved. 
 
 GlusterFS development would not have been possible at this pace if
 not for our enthusiastic users. People from around the world have
@@ -142,7 +142,7 @@ Jacques Mattheij - for Europe mirror.
 Patrick Negri - for TCP non-blocking connect.
 @flushright
 http://gluster.org/core-team.php (@email{list-hacking@@gluster.com})
-@email{@b{Gluster}}
+@email{@b{Gluster}} 
 @end flushright
 
 @node Introduction
@@ -166,7 +166,7 @@ Need for distributed filesystems
 @end itemize
 
 @section Contacting us
-You can reach us through the mailing list @strong{gluster-devel}
+You can reach us through the mailing list @strong{gluster-devel} 
 (@email{gluster-devel@@nongnu.org}).
 @cindex GlusterFS mailing list
 
@@ -197,11 +197,11 @@ You can also email us at @email{support@@gluster.com}.
 @chapter Installation and Invocation
 
 @menu
-* Pre requisites::
-* Getting GlusterFS::
-* Building::
-* Running GlusterFS::
-* A Tutorial Introduction::
+* Pre requisites::              
+* Getting GlusterFS::           
+* Building::                    
+* Running GlusterFS::           
+* A Tutorial Introduction::     
 @end menu
 
 @node Pre requisites
@@ -247,7 +247,7 @@ our patched version of the @acronym{FUSE} kernel module. See Patched FUSE for de
 
 @subsection Patched FUSE
 
-The GlusterFS project maintains a patched version of @acronym{FUSE} meant to be used
+The GlusterFS project maintains a patched version of @acronym{FUSE} meant to be used 
 with GlusterFS. The patches increase GlusterFS performance. It is recommended that
 all users use the patched @acronym{FUSE}.
 
@@ -311,7 +311,7 @@ $ cd glusterfs-<version>
 
 If you checked out the source from the Arch repository, you'll need
 to run @command{./autogen.sh} first. Note that you'll need to have
-Autoconf and Automake installed for this.
+Autoconf and Automake installed for this. 
 
 Run @command{configure}.
 
@@ -371,8 +371,8 @@ paths with the prefix.
 @section Running GlusterFS
 
 @menu
-* Server::
-* Client::
+* Server::                      
+* Client::                      
 @end menu
 
 @node Server
@@ -386,7 +386,7 @@ of the GlusterFS server program and all the command-line options accepted by it.
 @cartouche
 @table @code
 Basic Options
-@item -f, --volfile=<path>
+@item -f, --volfile=<path>   
       Use the volume file as the volume specification.
 
 @item -s, --volfile-server=<hostname>
@@ -396,7 +396,7 @@ Basic Options
       Specify the path for the log file.
 
 @item -L, --log-level=<level>
-      Set the log level for the server. Log level should be one of @acronym{DEBUG},
+      Set the log level for the server. Log level should be one of @acronym{DEBUG}, 
 @acronym{WARNING}, @acronym{ERROR}, @acronym{CRITICAL}, or @acronym{NONE}.
 
 Advanced Options
@@ -404,10 +404,10 @@ Advanced Options
       Run in debug mode. This option sets --no-daemon, --log-level to DEBUG and
       --log-file to console.
 
-@item  -N, --no-daemon
+@item  -N, --no-daemon            
       Run glusterfsd as a foreground process.
 
-@item  -p, --pid-file=<path>
+@item  -p, --pid-file=<path>      
       Path for the @acronym{PID} file.
 
 @item --volfile-id=<key>
@@ -416,20 +416,20 @@ Advanced Options
 @item --volfile-server-port=<port-number>
       Listening port number of volfile server.
 
-@item --volfile-server-transport=[tcp|ib-verbs]
-      Transport type to get volfile from server. [default: @command{tcp}]
+@item --volfile-server-transport=[socket|ib-verbs]
+      Transport type to get volfile from server. [default: @command{socket}]
 
 @item --xlator-options=<volume-name.option=value>
       Add/override a translator option for a volume with specified value.
 
 Miscellaneous Options
-@item  -?, --help
+@item  -?, --help                 
        Show this help text.
 
-@item  --usage
+@item  --usage                
        Display a short usage message.
 
-@item  -V, --version
+@item  -V, --version              
        Show version information.
 @end table
 @end cartouche
@@ -464,7 +464,7 @@ The command-line options are detailed below.
 @table @code
 
 Basic Options
-@item -f, --volfile=<path>
+@item -f, --volfile=<path>   
       Use the volume file as the volume specification.
 
 @item -s, --volfile-server=<hostname>
@@ -474,7 +474,7 @@ Basic Options
       Specify the path for the log file.
 
 @item -L, --log-level=<level>
-      Set the log level for the server. Log level should be one of @acronym{DEBUG},
+      Set the log level for the server. Log level should be one of @acronym{DEBUG}, 
 @acronym{WARNING}, @acronym{ERROR}, @acronym{CRITICAL}, or @acronym{NONE}.
 
 Advanced Options
@@ -482,10 +482,10 @@ Advanced Options
       Run in debug mode. This option sets --no-daemon, --log-level to DEBUG and
       --log-file to console.
 
-@item  -N, --no-daemon
+@item  -N, --no-daemon            
       Run @command{glusterfs} as a foreground process.
 
-@item  -p, --pid-file=<path>
+@item  -p, --pid-file=<path>      
       Path for the @acronym{PID} file.
 
 @item --volfile-id=<key>
@@ -494,8 +494,8 @@ Advanced Options
 @item --volfile-server-port=<port-number>
       Listening port number of volfile server.
 
-@item --volfile-server-transport=[tcp|ib-verbs]
-      Transport type to get volfile from server. [default: @command{tcp}]
+@item --volfile-server-transport=[socket|ib-verbs]
+      Transport type to get volfile from server. [default: @command{socket}]
 
 @item --xlator-options=<volume-name.option=value>
       Add/override a translator option for a volume with specified value.
@@ -512,14 +512,14 @@ Advanced Options
        automatically if kernel supports big writes (>= 2.6.26).
 
 @item  -e, --entry-timeout=<n>
-       Entry timeout for directory entries in the kernel, in seconds.
+       Entry timeout for directory entries in the kernel, in seconds. 
        Defaults to 1 second.
 
 Missellaneous Options
-@item  -?, --help
+@item  -?, --help                 
        Show this help information.
 
-@item  -V, --version
+@item  -V, --version              
        Show version information.
 @end table
 @end cartouche
@@ -527,7 +527,7 @@ Missellaneous Options
 @node A Tutorial Introduction
 @section A Tutorial Introduction
 
-This section will show you how to quickly get GlusterFS up and running. We'll
+This section will show you how to quickly get GlusterFS up and running. We'll 
 configure GlusterFS as a simple network filesystem, with one server and one client.
 In this mode of usage, GlusterFS can serve as a replacement for NFS.
 
@@ -545,18 +545,18 @@ be run on the server will be shown with the prompt:
 Our goal is to make a directory on the @emph{server} (say, @command{/export})
 accessible to the @emph{client}.
 
-First of all, get GlusterFS installed on both the machines, as described in the
+First of all, get GlusterFS installed on both the machines, as described in the 
 previous sections. Make sure you have the @acronym{FUSE} kernel module loaded. You
-can ensure this by running:
+can ensure this by running: 
 
 @example
 [root@@server]# modprobe fuse
 @end example
 
 Before we can run the GlusterFS client or server programs, we need to write
-two files called @emph{volume specifications} (equivalently refered to as @emph{volfiles}).
+two files called @emph{volume specifications} (equivalently refered to as @emph{volfiles}). 
 The volfile describes the @emph{translator tree} on a node. The next chapter will
-explain the concepts of `translator' and `volume specification' in detail. For now,
+explain the concepts of `translator' and `volume specification' in detail. For now, 
 just assume that the volfile is like an NFS @command{/etc/export} file.
 
 On the server, create a text file somewhere (we'll assume the path
@@ -572,7 +572,7 @@ end-volume
 volume server
   type protocol/server
   subvolumes colon-o
-  option transport-type tcp
+  option transport-type tcp     
   option auth.addr.colon-o.allow *
 end-volume
 @end example
@@ -625,9 +625,9 @@ working as a network file system.
 @chapter Concepts
 
 @menu
-* Filesystems in Userspace::
-* Translator::
-* Volume specification file::
+* Filesystems in Userspace::                
+* Translator::                  
+* Volume specification file::   
 @end menu
 
 @node Filesystems in Userspace
@@ -639,16 +639,16 @@ is a kernel module/library that allows us to write a filesystem
 completely in userspace.
 
 @acronym{FUSE} consists of a kernel module which interacts with the userspace
-implementation using a device file @code{/dev/fuse}. When a process
+implementation using a device file @code{/dev/fuse}. When a process 
 makes a syscall on a @acronym{FUSE} filesystem, @acronym{VFS} hands the request to the
 @acronym{FUSE} module, which writes the request to @code{/dev/fuse}. The
 userspace implementation polls @code{/dev/fuse}, and when a request arrives,
 processes it and writes the result back to @code{/dev/fuse}. The kernel then
-reads from the device file and returns the result to the user process.
+reads from the device file and returns the result to the user process. 
 
 In case of GlusterFS, the userspace program is the GlusterFS client.
 The control flow is shown in the diagram below. The GlusterFS client
-services the request by sending it to the server, which in turn
+services the request by sending it to the server, which in turn 
 hands it to the local @acronym{POSIX} filesystem.
 
 @center @image{fuse,44pc,,,.pdf}
@@ -752,7 +752,7 @@ or ``forty-two''.
 line is considered the value; it is up to the translator to parse it.
 
 @item @emph{subvolume1}, @emph{subvolume2}, @dots{}
-  Volume names of sub-volumes. The sub-volumes must already have been defined earlier
+  Volume names of sub-volumes. The sub-volumes must already have been defined earlier 
 in the file.
 @end table
 
@@ -797,11 +797,11 @@ end-volume
 @chapter Translators
 
 @menu
-* Storage Translators::
-* Client and Server Translators::
-* Clustering Translators::
-* Performance Translators::
-* Features Translators::
+* Storage Translators::         
+* Client and Server Translators::  
+* Clustering Translators::      
+* Performance Translators::     
+* Features Translators::        
 * Miscellaneous Translators::
 @end menu
 
@@ -823,12 +823,12 @@ Other storage backends are planned for the future. One of the possibilities is a
 Amazon S3 translator. Amazon S3 is an unlimited online storage service accessible
 through a web services @acronym{API}. The S3 translator will allow you to access
 the storage as a normal @acronym{POSIX} filesystem.
-@footnote{Some more discussion about this can be found at:
+@footnote{Some more discussion about this can be found at: 
 
 http://developer.amazonwebservices.com/connect/message.jspa?messageID=52873}
 
 @menu
-* POSIX::
+* POSIX::        
 * BDB::
 @end menu
 
@@ -843,14 +843,14 @@ filesystem as its ``backend'' to actually store files and
 directories. This can be any filesystem that supports extended
 attributes (@acronym{EXT3}, ReiserFS, @acronym{XFS}, ...). Extended
 attributes are used by some translators to store metadata, for
-example, by the replicate and stripe translators. See
+example, by the replicate and stripe translators. See 
 @ref{Replicate} and @ref{Stripe}, respectively for details.
 
 @cartouche
 @table @code
 @item directory <path>
 The directory on the local filesystem which is to be used for storage.
-@end table
+@end table               
 @end cartouche
 
 @node BDB
@@ -862,7 +862,7 @@ type storage/bdb
 The @command{BDB} translator uses a @acronym{Berkeley DB} database as its
 ``backend'' to actually store files as key-value pair in the database and
 directories as regular @acronym{POSIX} directories. Note that @acronym{BDB}
-does not provide extended attribute support for regular files. Do not use
+does not provide extended attribute support for regular files. Do not use 
 @acronym{BDB} as storage translator while using any translator that demands
 extended attributes on ``backend''.
 
@@ -892,9 +892,9 @@ translator tree over the network or access a remote GlusterFS
 server. These two translators implement GlusterFS's network protocol.
 
 @menu
-* Transport modules::
-* Client protocol::
-* Server protocol::
+* Transport modules::           
+* Client protocol::             
+* Server protocol::             
 @end menu
 
 @node Transport modules
@@ -962,7 +962,7 @@ This module accepts the same options as @command{tcp}
 
 @cindex infiniband transport
 
-InfiniBand is a scalable switched fabric interconnect mechanism
+InfiniBand is a scalable switched fabric interconnect mechanism 
 primarily used in high-performance computing. InfiniBand can deliver
 data throughput of the order of 10 Gbit/s, with latencies of 4-5 ms.
 
@@ -970,7 +970,7 @@ The @command{ib-verbs} transport accesses the InfiniBand hardware through
 the ``verbs'' @acronym{API}, which is the lowest level of software access possible
 and which gives the highest performance. On InfiniBand hardware, it is always
 best to use @command{ib-verbs}. Use @command{ib-sdp} only if you cannot get
-@command{ib-verbs} working for some reason.
+@command{ib-verbs} working for some reason. 
 
 The @command{ib-verbs} client module accepts the following options:
 
@@ -1049,7 +1049,7 @@ translator tree.
 
 @item transport-type [tcp,ib-sdp,ib-verbs] (tcp)
 The transport type to use. You should use the client versions of all the
-transport modules (@command{tcp}, @command{ib-sdp},
+transport modules (@command{tcp}, @command{ib-sdp}, 
 @command{ib-verbs}).
 @item remote-subvolume <volume_name> *
 The name of the volume on the remote host to attach to. Note that
@@ -1075,7 +1075,7 @@ remote GlusterFS clients.
 @table @code
 @item client-volume-filename <path> (<CONFDIR>/glusterfs-client.vol)
 The volume specification file to use for the client. This is the file the
-client will receive when it is invoked with the @command{--server} option
+client will receive when it is invoked with the @command{--server} option 
 (@ref{Client}).
 
 @item transport-type [tcp,ib-verbs,ib-sdp] (tcp)
@@ -1106,9 +1106,9 @@ translator allows a file to be spread across many server nodes. The following se
 look at each of these translators in detail.
 
 @menu
-* Unify::
-* Replicate::
-* Stripe::
+* Unify::                       
+* Replicate::  
+* Stripe::                      
 @end menu
 
 @node Unify
@@ -1121,7 +1121,7 @@ type cluster/unify
 
 The unify translator presents a `unified' view of all its sub-volumes. That is,
 it makes the union of all its sub-volumes appear as a single volume. It is the
-unify translator that gives GlusterFS the ability to access an arbitrarily
+unify translator that gives GlusterFS the ability to access an arbitrarily 
 large amount of storage.
 
 For unify to work correctly, certain invariants need to be maintained across
@@ -1144,7 +1144,7 @@ Looking at the second requirement, you might wonder how one can
 accomplish storing redundant copies of a file, if no file can exist
 multiple times.  To answer, we must remember that these invariants are
 from @emph{unify's perspective}.  A translator such as replicate at a lower
-level in the translator tree than unify may subvert this picture.
+level in the translator tree than unify may subvert this picture. 
 
 The first invariant might seem quite tedious to ensure. We shall see
 later that this is not so, since unify's @emph{self-heal} mechanism
@@ -1241,8 +1241,8 @@ are allowed. For example: @command{option alu.limits.min-free-disk 5GB}.
 @item alu.read-usage.exit-threshold <%> (5)
 @item alu.open-files-usage.entry-threshold <n> (1000)
 @item alu.open-files-usage.exit-threshold <n> (100)
-@item alu.limits.min-free-disk <%>
-@item alu.limits.max-open-files <n>
+@item alu.limits.min-free-disk <%> 
+@item alu.limits.max-open-files <n> 
 @end table
 @end cartouche
 
@@ -1259,7 +1259,7 @@ files are mostly similar in size and I/O access pattern, this
 scheduler is a good choice. RR scheduler checks for free disk space
 on the server before scheduling, so you can know when to add
 another server node. The default value of min-free-disk is 5% and is
-checked on file creation calls, with atleast 10 seconds (by default)
+checked on file creation calls, with atleast 10 seconds (by default) 
 elapsing between two checks.
 
 Options:
@@ -1315,7 +1315,7 @@ than a specified amount (5% by default) then @acronym{NUFA} schedules files
 among the other child volumes in a round-robin fashion.
 
 @acronym{NUFA} is named after the similar strategy used for memory access,
-@acronym{NUMA}@footnote{Non-Uniform Memory Access:
+@acronym{NUMA}@footnote{Non-Uniform Memory Access: 
 @indicateurl{http://en.wikipedia.org/wiki/Non-Uniform_Memory_Access}}.
 
 @cartouche
@@ -1325,7 +1325,7 @@ Minimum disk space that must be free (local or remote) for @acronym{NUFA} to sch
 file to it.
 @item nufa.refresh-interval <t> (10 seconds)
 Time between two successive free disk space checks.
-@item nufa.local-volume-name <volume>
+@item nufa.local-volume-name <volume> 
 The name of the volume corresponding to the local system. This volume must be
 one of the children of the unify volume. This option is mandatory.
 @end table
@@ -1397,13 +1397,13 @@ end-volume
 @end example
 
 This sample configuration will replicate all directories and files on
-brick1, brick2 and brick3.
+brick1, brick2 and brick3. 
 
 All the read operations happen from the first alive child. If all the
 three sub-volumes are up, reads will be done from brick1; if brick1 is
 down read will be done from brick2. In case read() was being done on
 brick1 and it goes down, replicate transparently falls back to
-brick2.
+brick2. 
 
 The next release of GlusterFS will add the following features:
 @itemize
@@ -1496,7 +1496,7 @@ type cluster/stripe
 The stripe translator distributes the contents of a file over its
 sub-volumes.  It does this by creating a file equal in size to the
 total size of the file on each of its sub-volumes. It then writes only
-a part of the file to each sub-volume, leaving the rest of it empty.
+a part of the file to each sub-volume, leaving the rest of it empty. 
 These empty regions are called `holes' in Unix terminology. The holes
 do not consume any disk space.
 
@@ -1504,14 +1504,14 @@ The diagram below makes this clear.
 
 @center @image{stripe,44pc,,,.pdf}
 
-You can configure stripe so that only filenames matching a pattern
-are striped. You can also configure the size of the data to be stored
+You can configure stripe so that only filenames matching a pattern 
+are striped. You can also configure the size of the data to be stored 
 on each sub-volume.
 
 @cartouche
 @table @code
 @item block-size <pattern>:<size>  (*:0 no striping)
-Distribute files matching @command{<pattern>} over the sub-volumes,
+Distribute files matching @command{<pattern>} over the sub-volumes, 
 storing at least @command{<size>} on each sub-volume. For example,
 
 @example
@@ -1530,9 +1530,9 @@ different sizes for different file name patterns.
 @section Performance Translators
 
 @menu
-* Read Ahead::
-* Write Behind::
-* IO Threads::
+* Read Ahead::                  
+* Write Behind::                
+* IO Threads::                  
 * IO Cache::
 * Booster::
 @end menu
@@ -1547,9 +1547,9 @@ type performance/read-ahead
 The read-ahead translator pre-fetches data in advance on every read.
 This benefits applications that mostly process files in sequential order,
 since the next block of data will already be available by the time the
-application is done with the current one.
+application is done with the current one. 
 
-Additionally, the read-ahead translator also behaves as a read-aggregator.
+Additionally, the read-ahead translator also behaves as a read-aggregator. 
 Many small read operations are combined and issued as fewer, larger read
 requests to the server.
 
@@ -1557,7 +1557,7 @@ Read-ahead deals in ``pages'' as the unit of data fetched. The page size
 is configurable, as is the ``page count'', which is the number of pages
 that are pre-fetched.
 
-Read-ahead is best used with InfiniBand (using the ib-verbs transport).
+Read-ahead is best used with InfiniBand (using the ib-verbs transport). 
 On FastEthernet and Gigabit Ethernet networks,
 GlusterFS can achieve the link-maximum throughput even without
 read-ahead, making it quite superflous.
@@ -1577,7 +1577,7 @@ The unit of data that is pre-fetched.
 The number of pages that are pre-fetched.
 @item force-atime-update [on|off|yes|no] (off|no)
 Whether to force an access time (atime) update on the file on every read. Without
-this, the atime will be slightly imprecise, as it will reflect the time when
+this, the atime will be slightly imprecise, as it will reflect the time when 
 the read-ahead translator read the data, not when the application actually read it.
 @end table
 @end cartouche
@@ -1596,7 +1596,7 @@ write-behind translator, successive write requests can be pipelined.
 This mode of write-behind operation is best used on the client side, to
 enable decreased write latency for the application.
 
-The write-behind translator can also aggregate write requests. If the
+The write-behind translator can also aggregate write requests. If the 
 @command{aggregate-size} option is specified, then successive writes upto that
 size are accumulated and written in a single operation. This mode of operation
 is best used on the server side, as this will decrease the disk's head movement
@@ -1659,7 +1659,7 @@ It caches data upto @command{cache-size} bytes. The cache is maintained as
 a prioritized least-recently-used (@acronym{LRU}) list, with priorities determined
 by user-specified patterns to match filenames.
 
-When the IO cache translator detects a write operation, the
+When the IO cache translator detects a write operation, the 
 cache for that file is flushed.
 
 The IO cache translator periodically verifies the consistency of
@@ -1715,11 +1715,11 @@ can start your application as:
 The booster translator accepts no options.
 
 @node Features Translators
-@section Features Translators
+@section Features Translators 
 
 @menu
-* POSIX Locks::
-* Fixed ID::
+* POSIX Locks::                 
+* Fixed ID::                    
 @end menu
 
 @node POSIX Locks
@@ -1783,8 +1783,8 @@ The @acronym{GID} to send to the server
 @section Miscellaneous Translators
 
 @menu
-* ROT-13::
-* Trace::
+* ROT-13::                      
+* Trace::                       
 @end menu
 
 @node ROT-13
@@ -1799,7 +1799,7 @@ contents using the @acronym{ROT-13} algorithm. @acronym{ROT-13} is a trivial
 algorithm that rotates each alphabet by thirteen places. Thus, 'A' becomes 'N',
 'B' becomes 'O', and 'Z' becomes 'M'.
 
-It goes without saying that you shouldn't use this translator if you need
+It goes without saying that you shouldn't use this translator if you need 
 @emph{real} encryption (a future release of GlusterFS will have real encryption
 translators).
 
@@ -1816,7 +1816,7 @@ Whether to decrypt on read
 @subsection Trace
 @cindex trace (translator)
 @example
-type debug/trace
+type debug/trace     
 @end example
 
 The trace translator is intended for debugging purposes. When loaded, it
@@ -1827,23 +1827,23 @@ level of DEBUG (See @ref{Running GlusterFS}) for trace to work.
 Sample trace output (lines have been wrapped for readability):
 @cartouche
 @example
-2007-10-30 00:08:58 D [trace.c:1579:trace_opendir] trace: callid: 68
-(*this=0x8059e40, loc=0x8091984 @{path=/iozone3_283, inode=0x8091f00@},
+2007-10-30 00:08:58 D [trace.c:1579:trace_opendir] trace: callid: 68 
+(*this=0x8059e40, loc=0x8091984 @{path=/iozone3_283, inode=0x8091f00@}, 
  fd=0x8091d50)
 
-2007-10-30 00:08:58 D [trace.c:630:trace_opendir_cbk] trace:
+2007-10-30 00:08:58 D [trace.c:630:trace_opendir_cbk] trace: 
 (*this=0x8059e40, op_ret=4, op_errno=1, fd=0x8091d50)
 
-2007-10-30 00:08:58 D [trace.c:1602:trace_readdir] trace: callid: 69
+2007-10-30 00:08:58 D [trace.c:1602:trace_readdir] trace: callid: 69 
 (*this=0x8059e40, size=4096, offset=0 fd=0x8091d50)
 
-2007-10-30 00:08:58 D [trace.c:215:trace_readdir_cbk] trace:
+2007-10-30 00:08:58 D [trace.c:215:trace_readdir_cbk] trace: 
 (*this=0x8059e40, op_ret=0, op_errno=0, count=4)
 
-2007-10-30 00:08:58 D [trace.c:1624:trace_closedir] trace: callid: 71
+2007-10-30 00:08:58 D [trace.c:1624:trace_closedir] trace: callid: 71 
 (*this=0x8059e40, *fd=0x8091d50)
 
-2007-10-30 00:08:58 D [trace.c:809:trace_closedir_cbk] trace:
+2007-10-30 00:08:58 D [trace.c:809:trace_closedir_cbk] trace: 
 (*this=0x8059e40, op_ret=0, op_errno=1)
 @end example
 @end cartouche
@@ -1871,7 +1871,7 @@ scheduling on a single storage volume. Alternatively users can choose
 to have two separate volumes and hence two mount points, but the
 applications may demand a single storage system to host both.
 
-This document explains how to mix file level scheduling with stripe.
+This document explains how to mix file level scheduling with stripe. 
 
 @subsection Configuration Brief
 
@@ -1904,17 +1904,17 @@ addresses / access control fields to match your environment.
            type storage/posix
            option directory /export/for-unify
    end-volume
-
+ 
    volume posix-stripe
            type storage/posix
            option directory /export/for-stripe
    end-volume
-
+ 
    volume posix-namespace
            type storage/posix
            option directory /export/for-namespace
    end-volume
-
+  
    volume server
            type protocol/server
            option transport-type tcp
@@ -1963,7 +1963,7 @@ addresses / access control fields to match your environment.
      option remote-host 192.168.1.4
      option remote-subvolume posix-unify
    end-volume
-
+ 
    volume client-stripe-1
      type protocol/client
      option transport-type tcp
@@ -1991,13 +1991,13 @@ addresses / access control fields to match your environment.
      option remote-host 192.168.1.4
      option remote-subvolume posix-stripe
    end-volume
-
+  
    volume unify
      type cluster/unify
      option scheduler rr
      subvolumes cluster-unify-1 cluster-unify-2 cluster-unify-3 cluster-unify-4
    end-volume
-
+ 
    volume stripe
      type cluster/stripe
      option block-size *.img:2MB # All files ending with .img are striped with 2MB stripe block size.
@@ -2046,13 +2046,13 @@ concludes with the suggested procedure to report bugs in GlusterFS.
 @subsection Server errors
 
 @example
-glusterfsd: FATAL: could not open specfile:
+glusterfsd: FATAL: could not open specfile: 
 '/etc/glusterfs/glusterfsd.vol'
 @end example
 
-The GlusterFS server expects the volume specification file to be
+The GlusterFS server expects the volume specification file to be 
 at @command{/etc/glusterfs/glusterfsd.vol}. The example
-specification file will be installed as
+specification file will be installed as 
 @command{/etc/glusterfs/glusterfsd.vol.sample}. You need to edit
 it and rename it, or provide a different specification file using
 the @command{--spec-file} command line option (See @ref{Server}).
@@ -2060,7 +2060,7 @@ the @command{--spec-file} command line option (See @ref{Server}).
 @vskip 4ex
 
 @example
-gf_log_init: failed to open logfile "/usr/var/log/glusterfs/glusterfsd.log"
+gf_log_init: failed to open logfile "/usr/var/log/glusterfs/glusterfsd.log" 
              (Permission denied)
 @end example
 
@@ -2072,7 +2072,7 @@ file using the @command{--log-file} option (See @ref{Server}).
 @subsection Client errors
 
 @example
-fusermount: failed to access mountpoint /mnt:
+fusermount: failed to access mountpoint /mnt: 
             Transport endpoint is not connected
 @end example
 
@@ -2114,7 +2114,7 @@ port instead.
 @vskip 4ex
 
 @example
-gf_log_init: failed to open logfile "/usr/var/log/glusterfs/glusterfs.log"
+gf_log_init: failed to open logfile "/usr/var/log/glusterfs/glusterfs.log" 
              (Permission denied)
 @end example
 
diff --git a/doc/legacy/xlator.odg b/doc/user-guide/xlator.odg
index 179a65f6e..179a65f6e 100644
--- a/doc/legacy/xlator.odg
+++ b/doc/user-guide/xlator.odg
diff --git a/doc/legacy/xlator.pdf b/doc/user-guide/xlator.pdf
index a07e14d67..a07e14d67 100644
--- a/doc/legacy/xlator.pdf
+++ b/doc/user-guide/xlator.pdf
diff --git a/error-codes.json b/error-codes.json
deleted file mode 100644
index 5121049d3..000000000
--- a/error-codes.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "ERR_DEV": {"code": 9999,
-		"message": {"en": "devel error"}}
-}
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am
deleted file mode 100644
index 1dafa982b..000000000
--- a/extras/LinuxRPM/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-
-GFS_TAR = ../../glusterfs-$(VERSION).tar.gz
-
-.PHONY: all
-
-all:
-	@echo "To build RPMS run 'make glusterrpms'"
-
-.PHONY: glusterrpms prep srcrpm testsrpm clean
-
-glusterrpms: prep srcrpm rpms
-	-rm -rf rpmbuild
-
-prep:
-	if [ ! -e $(GFS_TAR) ]; then \
-		$(MAKE) -C ../.. dist; \
-	fi
-	-mkdir -p rpmbuild/SPECS
-	-mkdir -p rpmbuild/RPMS
-	-mkdir -p rpmbuild/SRPMS
-	-rm -rf rpmbuild/SOURCES
-	@if [ -d /d/cache/glusterfs -a -e /d/cache/glusterfs/sources ]; then \
-		echo "copying glusterfs rpm files from local cache..."  ; \
-		mkdir -p ./rpmbuild/SOURCES; \
-		cp /d/cache/glusterfs/* ./rpmbuild/SOURCES/ ; \
-	elif [ -x /usr/bin/git ]; then \
-		echo "fetching glusterfs rpm files from fedora git repo..."; \
-		cd ./rpmbuild && git clone git://pkgs.fedoraproject.org/glusterfs.git > /dev/null && mv glusterfs SOURCES; \
-	else \
-		echo "glusterfs rpm files not fetched, you don't have git installed!" ; \
-		exit 1 ; \
-	fi
-	cp ../../*.tar.gz ./rpmbuild/SOURCES
-	cp ../../glusterfs.spec ./rpmbuild/SPECS
-
-srcrpm:
-	rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bs rpmbuild/SPECS/glusterfs.spec
-	mv rpmbuild/SRPMS/* .
-
-rpms:
-	rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bb rpmbuild/SPECS/glusterfs.spec
-	mv rpmbuild/RPMS/*/* .
-
-# EPEL-5 does not like new versions of rpmbuild and requires some
-# _source_* defines
-
-testsrpm: prep
-	rpmbuild --define '_topdir $(shell pwd)/rpmbuild' \
-		--define '_source_payload w9.gzdio' \
-		--define '_source_filedigest_algorithm 1' \
-		-bs rpmbuild/SPECS/glusterfs.spec
-	mv rpmbuild/SRPMS/* ../..
-	-rm -rf rpmbuild
-
-clean:
-	-rm -rf rpmbuild
-	-rm -f *.rpm
diff --git a/extras/Makefile.am b/extras/Makefile.am
index cf619329b..5c77ce73d 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -1,20 +1,12 @@
 
-EditorModedir = $(docdir)
+docdir = $(datadir)/doc/glusterfs/
+EditorModedir = $(docdir)/
 EditorMode_DATA = glusterfs-mode.el glusterfs.vim
 
-SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM geo-rep
-
-confdir = $(sysconfdir)/glusterfs
-conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \
-	logger.conf.example glusterfs-georep-logrotate
-
-voldir = $(sysconfdir)/glusterfs
-vol_DATA = glusterd.vol
+SUBDIRS = init.d benchmarking
 
 EXTRA_DIST = specgen.scm MacOSX/Portfile glusterfs-mode.el glusterfs.vim  \
 	migrate-unify-to-distribute.sh backend-xattr-sanitize.sh          \
 	backend-cleanup.sh disk_usage_sync.sh quota-remove-xattr.sh       \
-	quota-metadata-cleanup.sh glusterfs-logrotate clear_xattrs.sh     \
-	group-virt.example glusterd-sysconfig gluster-rsyslog-7.2.conf    \
-	gluster-rsyslog-5.8.conf logger.conf.example glusterd.vol         \
-	glusterfs-georep-logrotate
+	quota-metadata-cleanup.sh glusterfs-logrotate
+
diff --git a/extras/Ubuntu/README.Ubuntu b/extras/Ubuntu/README.Ubuntu
deleted file mode 100644
index 0c5b7828d..000000000
--- a/extras/Ubuntu/README.Ubuntu
+++ /dev/null
@@ -1,24 +0,0 @@
-Bug 765014 - Mounting from localhost in fstab fails at boot on ubuntu
-(https://bugzilla.redhat.com/show_bug.cgi?id=765014)
-(https://bugs.launchpad.net/ubuntu/+source/glusterfs/+bug/876648)
-
-Ubuntu uses upstart instead of init to bootstrap the system and it has a unique
-way of handling fstab, using a program called mountall(8).  As a result of using
-a debian initscript to start glusterd, glusterfs mounts in fstab are tried before
-the glusterd service is running.  In the case where the client is also a server
-and the volume is mounted from localhost, the mount fails at boot time.  To
-correct this we need to launch glusterd using upstart and block the glusterfs
-mounting event until glusterd is started.
-
-The glusterd.conf file contains the necessary configuration for upstart to
-manage the glusterd service.  It should be placed in /etc/init/glusterd.conf
-on Ubuntu systems, and then the old initscript /etc/init.d/glusterd can be
-removed.  An additional upstart job, mounting-glusterfs.conf, is also required
-to block mounting glusterfs volumes until the glusterd service is available.
-Both of these upstart jobs need to be placed in /etc/init to resolve the issue.
-
-Starting with Ubuntu 12.04, Precise Pangolin, these upstart jobs will be
-included with the glusterfs-server package in the Ubuntu repository. 
-
-This affects all versions of glusterfs on the Ubuntu platform since at least
-10.04, Lucid Lynx.
diff --git a/extras/Ubuntu/glusterd.conf b/extras/Ubuntu/glusterd.conf
deleted file mode 100644
index aa99502b0..000000000
--- a/extras/Ubuntu/glusterd.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-author "Louis Zuckerman <me@louiszuckerman.com>"
-description "GlusterFS Management Daemon"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-expect fork
-
-exec /usr/sbin/glusterd -p /var/run/glusterd.pid
-
diff --git a/extras/Ubuntu/mounting-glusterfs.conf b/extras/Ubuntu/mounting-glusterfs.conf
deleted file mode 100644
index 3c59c0f63..000000000
--- a/extras/Ubuntu/mounting-glusterfs.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-author "Louis Zuckerman <me@louiszuckerman.com>"
-description "Block the mounting event for glusterfs filesystems until glusterd is running"
-
-start on mounting TYPE=glusterfs
-task
-exec start wait-for-state WAIT_FOR=glusterd WAITER=mounting-glusterfs
-
diff --git a/extras/benchmarking/Makefile.am b/extras/benchmarking/Makefile.am
index bfcc59277..04cc06182 100644
--- a/extras/benchmarking/Makefile.am
+++ b/extras/benchmarking/Makefile.am
@@ -1,5 +1,7 @@
 
-benchmarkingdir = $(docdir)/benchmarking
+docdir = $(datadir)/doc/$(PACKAGE_NAME)/benchmarking
+
+benchmarkingdir = $(docdir)
 
 benchmarking_DATA = rdd.c glfs-bm.c README launch-script.sh local-script.sh
 
diff --git a/extras/benchmarking/glfs-bm.c b/extras/benchmarking/glfs-bm.c
index dc717f33c..035d055df 100644
--- a/extras/benchmarking/glfs-bm.c
+++ b/extras/benchmarking/glfs-bm.c
@@ -1,12 +1,21 @@
-/*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+/*                                                                  
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com> 
+  This file is part of GlusterFS.                             
+  GlusterFS 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 3 of the License, 
+  or (at your option) any later version.                            
+
+  GlusterFS 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, see 
+  <http://www.gnu.org/licenses/>.  
 */
+
 #define _GNU_SOURCE
 #define __USE_FILE_OFFSET64
 #define _FILE_OFFSET_BITS 64
diff --git a/extras/benchmarking/rdd.c b/extras/benchmarking/rdd.c
index a667c6a1d..527f14cdd 100644
--- a/extras/benchmarking/rdd.c
+++ b/extras/benchmarking/rdd.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -26,278 +36,172 @@
 #define UNIX_PATH_MAX 108
 #endif
 
-#define UNIT_KB 1024ULL
-#define UNIT_MB UNIT_KB*1024ULL
-#define UNIT_GB UNIT_MB*1024ULL
-#define UNIT_TB UNIT_GB*1024ULL
-#define UNIT_PB UNIT_TB*1024ULL
-
-#define UNIT_KB_STRING    "KB"
-#define UNIT_MB_STRING    "MB"
-#define UNIT_GB_STRING    "GB"
-#define UNIT_TB_STRING    "TB"
-#define UNIT_PB_STRING    "PB"
-
 struct rdd_file {
-        char path[UNIX_PATH_MAX];
-        struct stat st;
-        int fd;
+	char path[UNIX_PATH_MAX];
+	struct stat st;
+	int fd;
 };
-
+ 
 struct rdd_config {
-        long iters;
-        long max_ops_per_seq;
-        size_t max_bs;
-        size_t min_bs;
-        int thread_count;
-        pthread_t *threads;
-        pthread_barrier_t barrier;
-        pthread_mutex_t lock;
-        struct rdd_file in_file;
-        struct rdd_file out_file;
-        ssize_t file_size;
+	long iters;
+	long max_ops_per_seq;
+	size_t max_bs;
+	size_t min_bs;
+	int thread_count;
+	pthread_t *threads;
+	pthread_barrier_t barrier;
+	pthread_mutex_t lock;
+	struct rdd_file in_file;
+	struct rdd_file out_file;
 };
 static struct rdd_config rdd_config;
 
 enum rdd_keys {
-        RDD_MIN_BS_KEY = 1,
-        RDD_MAX_BS_KEY,
+	RDD_MIN_BS_KEY = 1,
+	RDD_MAX_BS_KEY,
 };
-
+ 
 static error_t
 rdd_parse_opts (int key, char *arg,
-                struct argp_state *_state)
+		struct argp_state *_state)
 {
-        switch (key) {
-        case 'o':
-        {
-                int len = 0;
-                len = strlen (arg);
-                if (len > UNIX_PATH_MAX) {
-                        fprintf (stderr, "output file name too long (%s)\n",
+	switch (key) {
+	case 'o':
+	{
+		int len = 0;
+		len = strlen (arg);
+		if (len > UNIX_PATH_MAX) {
+			fprintf (stderr, "output file name too long (%s)\n", 
                                  arg);
-                        return -1;
-                }
-
-                strncpy (rdd_config.out_file.path, arg, len);
-        }
-        break;
-
-        case 'i':
-        {
-                int len = 0;
-                len = strlen (arg);
-                if (len > UNIX_PATH_MAX) {
-                        fprintf (stderr, "input file name too long (%s)\n",
+			return -1;
+		}
+
+		strncpy (rdd_config.out_file.path, arg, len);
+	}
+	break;
+
+	case 'i':
+	{
+		int len = 0;
+		len = strlen (arg);
+		if (len > UNIX_PATH_MAX) {
+			fprintf (stderr, "input file name too long (%s)\n", 
                                  arg);
-                        return -1;
-                }
-
-                strncpy (rdd_config.in_file.path, arg, len);
-                rdd_config.in_file.path[len] = '\0';
-        }
-        break;
-
-        case 'f':
-        {
-                char *tmp = NULL;
-                unsigned long long fs = 0;
-                if (string2bytesize (arg, &fs) == -1) {
-                        fprintf (stderr, "invalid argument for file size "
-                                 "(%s)\n", arg);
-                        return -1;
-                }
-
-                rdd_config.file_size = fs;
-        }
-        break;
-
-        case RDD_MIN_BS_KEY:
-        {
-                char *tmp = NULL;
-                long bs = 0;
-                bs = strtol (arg, &tmp, 10);
-                if ((bs == LONG_MAX) || (bs == LONG_MIN) || (tmp && *tmp)) {
-                        fprintf (stderr, "invalid argument for minimum block"
+			return -1;
+		}
+
+		strncpy (rdd_config.in_file.path, arg, len);
+	}
+	break;
+
+	case RDD_MIN_BS_KEY:
+	{
+		char *tmp = NULL;
+		long bs = 0;
+		bs = strtol (arg, &tmp, 10);
+		if ((bs == LONG_MAX) || (bs == LONG_MIN) || (tmp && *tmp)) {
+			fprintf (stderr, "invalid argument for minimum block"
                                  "size (%s)\n", arg);
-                        return -1;
-                }
-
-                rdd_config.min_bs = bs;
-        }
-        break;
-
-        case RDD_MAX_BS_KEY:
-        {
-                char *tmp = NULL;
-                long bs = 0;
-                bs = strtol (arg, &tmp, 10);
-                if ((bs == LONG_MAX) || (bs == LONG_MIN) || (tmp && *tmp)) {
-                        fprintf (stderr, "invalid argument for maximum block"
+			return -1;
+		}
+
+		rdd_config.min_bs = bs;
+	}
+	break;
+
+	case RDD_MAX_BS_KEY:
+	{
+		char *tmp = NULL;
+		long bs = 0;
+		bs = strtol (arg, &tmp, 10);
+		if ((bs == LONG_MAX) || (bs == LONG_MIN) || (tmp && *tmp)) {
+			fprintf (stderr, "invalid argument for maximum block"
                                  "size (%s)\n", arg);
-                        return -1;
-                }
-
-                rdd_config.max_bs = bs;
-        }
-        break;
-
-        case 'r':
-        {
-                char *tmp = NULL;
-                long iters = 0;
-                iters = strtol (arg, &tmp, 10);
-                if ((iters == LONG_MAX) ||
-                    (iters == LONG_MIN) ||
+			return -1;
+		}
+
+		rdd_config.max_bs = bs;
+	}
+	break;
+
+	case 'r':
+	{
+		char *tmp = NULL;
+		long iters = 0;
+		iters = strtol (arg, &tmp, 10);
+		if ((iters == LONG_MAX) || 
+                    (iters == LONG_MIN) || 
                     (tmp && *tmp)) {
-                        fprintf (stderr, "invalid argument for iterations"
+			fprintf (stderr, "invalid argument for iterations"
                                  "(%s)\n", arg);
-                        return -1;
-                }
-
-                rdd_config.iters = iters;
-        }
-        break;
-
-        case 'm':
-        {
-                char *tmp = NULL;
-                long max_ops = 0;
-                max_ops = strtol (arg, &tmp, 10);
-                if ((max_ops == LONG_MAX) ||
-                    (max_ops == LONG_MIN) ||
+			return -1;
+		}
+
+		rdd_config.iters = iters;
+	}
+	break;
+
+	case 'm':
+	{
+		char *tmp = NULL;
+		long max_ops = 0;
+		max_ops = strtol (arg, &tmp, 10);
+		if ((max_ops == LONG_MAX) || 
+                    (max_ops == LONG_MIN) || 
                     (tmp && *tmp)) {
-                        fprintf (stderr, "invalid argument for max-ops"
+			fprintf (stderr, "invalid argument for max-ops"
                                  "(%s)\n", arg);
-                        return -1;
-                }
-
-                rdd_config.max_ops_per_seq = max_ops;
-        }
-        break;
-
-        case 't':
-        {
-                char *tmp = NULL;
-                long threads = 0;
-                threads = strtol (arg, &tmp, 10);
-                if ((threads == LONG_MAX) ||
-                    (threads == LONG_MIN) ||
+			return -1;
+		}
+
+		rdd_config.max_ops_per_seq = max_ops;
+	}
+	break;
+
+	case 't':
+	{
+		char *tmp = NULL;
+		long threads = 0;
+		threads = strtol (arg, &tmp, 10);
+		if ((threads == LONG_MAX) || 
+                    (threads == LONG_MIN) || 
                     (tmp && *tmp)) {
-                        fprintf (stderr, "invalid argument for thread count"
+			fprintf (stderr, "invalid argument for thread count"
                                  "(%s)\n", arg);
-                        return -1;
-                }
+			return -1;
+		}
 
-                rdd_config.thread_count = threads;
-        }
-        break;
+		rdd_config.thread_count = threads;
+	}
+	break;
 
-        case ARGP_KEY_NO_ARGS:
-                break;
-        case ARGP_KEY_ARG:
-                break;
-        case ARGP_KEY_END:
-                if (_state->argc == 1) {
-                        argp_usage (_state);
-                }
+	case ARGP_KEY_NO_ARGS:
+		break;
+	case ARGP_KEY_ARG:
+		break;
+	case ARGP_KEY_END:
+		if (_state->argc == 1) {
+			argp_usage (_state); 
+		}
 
-        }
+	}
 
-        return 0;
-}
-
-int
-string2bytesize (const char *str, unsigned long long *n)
-{
-        unsigned long long value = 0ULL;
-        char *tail = NULL;
-        int old_errno = 0;
-        const char *s = NULL;
-
-        if (str == NULL || n == NULL)
-        {
-                errno = EINVAL;
-                return -1;
-        }
-
-        for (s = str; *s != '\0'; s++)
-        {
-                if (isspace (*s))
-                {
-                        continue;
-                }
-                if (*s == '-')
-                {
-                        return -1;
-                }
-                break;
-        }
-
-        old_errno = errno;
-        errno = 0;
-        value = strtoull (str, &tail, 10);
-
-        if (errno == ERANGE || errno == EINVAL)
-        {
-                return -1;
-        }
-
-        if (errno == 0)
-        {
-                errno = old_errno;
-        }
-
-        if (tail[0] != '\0')
-        {
-                if (strcasecmp (tail, UNIT_KB_STRING) == 0)
-                {
-                        value *= UNIT_KB;
-                }
-                else if (strcasecmp (tail, UNIT_MB_STRING) == 0)
-                {
-                        value *= UNIT_MB;
-                }
-                else if (strcasecmp (tail, UNIT_GB_STRING) == 0)
-                {
-                        value *= UNIT_GB;
-                }
-                else if (strcasecmp (tail, UNIT_TB_STRING) == 0)
-                {
-                        value *= UNIT_TB;
-                }
-                else if (strcasecmp (tail, UNIT_PB_STRING) == 0)
-                {
-                        value *= UNIT_PB;
-                }
-
-                else
-                {
-                        return -1;
-                }
-        }
-
-        *n = value;
-
-        return 0;
+	return 0;
 }
 
 static struct argp_option rdd_options[] = {
-        {"if", 'i', "INPUT_FILE", 0, "input-file"},
-        {"of", 'o', "OUTPUT_FILE", 0, "output-file"},
-        {"threads", 't', "COUNT", 0, "number of threads to spawn (defaults to 2)"},
-        {"min-bs", RDD_MIN_BS_KEY, "MIN_BLOCK_SIZE", 0,
-         "Minimum block size in bytes (defaults to 1024)"},
-        {"max-bs", RDD_MAX_BS_KEY, "MAX_BLOCK_SIZE", 0,
-         "Maximum block size in bytes (defaults to 4096)"},
-        {"iters", 'r', "ITERS", 0,
-         "Number of read-write sequences (defaults to 1000000)"},
-        {"max-ops", 'm', "MAXOPS", 0,
-         "maximum number of read-writes to be performed in a sequence (defaults to 1)"},
-        {"file-size", 'f', "FILESIZE", 0,
-         "the size of the file which will be created and upon it I/O will be done"
-         " (defaults to 100MB"},
-        {0, 0, 0, 0, 0}
+	{"if", 'i', "INPUT_FILE", 0, "input-file"},
+	{"of", 'o', "OUTPUT_FILE", 0, "output-file"},
+	{"threads", 't', "COUNT", 0, "number of threads to spawn (defaults to 2)"},
+	{"min-bs", RDD_MIN_BS_KEY, "MIN_BLOCK_SIZE", 0, 
+	 "Minimum block size in bytes (defaults to 1024)"},
+	{"max-bs", RDD_MAX_BS_KEY, "MAX_BLOCK_SIZE", 0,
+	 "Maximum block size in bytes (defaults to 4096)"},
+	{"iters", 'r', "ITERS", 0,
+	 "Number of read-write sequences (defaults to 1000000)"},
+	{"max-ops", 'm', "MAXOPS", 0,
+	 "maximum number of read-writes to be performed in a sequence (defaults to 1)"},
+	{0, 0, 0, 0, 0}
 };
 
 static struct argp argp = {
@@ -312,341 +216,277 @@ static struct argp argp = {
 static void
 rdd_default_config (void)
 {
-        char *tmp_path = "rdd.in";
-
-        rdd_config.thread_count = 2;
-        rdd_config.iters = 1000000;
-        rdd_config.max_bs = 4096;
-        rdd_config.min_bs = 1024;
-        rdd_config.in_file.fd = rdd_config.out_file.fd = -1;
-        rdd_config.max_ops_per_seq = 1;
-        strncpy (rdd_config.in_file.path, tmp_path, strlen (tmp_path));
-        rdd_config.file_size = 104857600;
-
-        return;
+	rdd_config.thread_count = 2;
+	rdd_config.iters = 1000000;
+	rdd_config.max_bs = 4096;
+	rdd_config.min_bs = 1024;
+	rdd_config.in_file.fd = rdd_config.out_file.fd = -1;
+	rdd_config.max_ops_per_seq = 1;
+
+	return;
 }
 
 
 static char
 rdd_valid_config (void)
 {
-        char ret = 1;
-        int fd = -1;
-
-        fd = open (rdd_config.in_file.path, O_RDONLY);
-        if (fd == -1 && (errno != ENOENT)) {
-                fprintf (stderr, "open: (%s)", strerror (errno));
-                ret = 0;
-                goto out;
-        }
-        close (fd);
-
-        if (rdd_config.min_bs > rdd_config.max_bs) {
-                fprintf (stderr, "minimum blocksize %ld is greater than the "
-                         "maximum blocksize %ld", rdd_config.min_bs,
-                         rdd_config.max_bs);
-                ret = 0;
-                goto out;
-        }
-
-        if (strlen (rdd_config.out_file.path) == 0) {
-                sprintf (rdd_config.out_file.path, "%s.rddout",
+	char ret = 1;
+	int fd = -1;
+
+	fd = open (rdd_config.in_file.path, O_RDONLY);
+	if (fd == -1) {
+		ret = 0;
+		goto out;
+	}
+	close (fd);
+
+	if (rdd_config.min_bs > rdd_config.max_bs) {
+		ret = 0;
+		goto out;
+	}
+
+	if (strlen (rdd_config.out_file.path) == 0) {
+		sprintf (rdd_config.out_file.path, "%s.rddout", 
                          rdd_config.in_file.path);
-        }
+	}
 
 out:
-        return ret;
+	return ret;
 }
 
 
 static void *
 rdd_read_write (void *arg)
 {
-        int i = 0, ret = 0;
-        size_t bs = 0;
-        off_t offset = 0;
-        long rand = 0;
-        long max_ops = 0;
-        char *buf = NULL;
-
-        buf = calloc (1, rdd_config.max_bs);
-        if (!buf) {
-                fprintf (stderr, "calloc failed (%s)\n", strerror (errno));
-                ret = -1;
-                goto out;
-        }
-
-        for (i = 0; i < rdd_config.iters; i++)
-        {
-                pthread_mutex_lock (&rdd_config.lock);
-                {
-                        int bytes = 0;
-                        rand = random ();
-
-                        if (rdd_config.min_bs == rdd_config.max_bs) {
-                                bs = rdd_config.max_bs;
-                        } else {
-                                bs = rdd_config.min_bs +
-                                        (rand %
-                                         (rdd_config.max_bs -
+	int i = 0, ret = 0;
+	size_t bs = 0;
+	off_t offset = 0;
+	long rand = 0;
+	long max_ops = 0;
+	char *buf = NULL;
+
+	buf = calloc (1, rdd_config.max_bs);
+	if (!buf) {
+		fprintf (stderr, "calloc failed (%s)\n", strerror (errno));
+		ret = -1;
+		goto out;
+	}
+
+	for (i = 0; i < rdd_config.iters; i++) 
+	{
+		pthread_mutex_lock (&rdd_config.lock);
+		{
+			int bytes = 0;
+			rand = random ();
+			
+			if (rdd_config.min_bs == rdd_config.max_bs) {
+				bs = rdd_config.max_bs;
+			} else {
+				bs = rdd_config.min_bs + 
+                                        (rand % 
+                                         (rdd_config.max_bs - 
                                           rdd_config.min_bs));
-                        }
-
-                        offset = rand % rdd_config.in_file.st.st_size;
-                        max_ops = rand % rdd_config.max_ops_per_seq;
-                        if (!max_ops) {
-                                max_ops ++;
-                        }
-
-                        ret = lseek (rdd_config.in_file.fd, offset, SEEK_SET);
-                        if (ret != offset) {
-                                fprintf (stderr, "lseek failed (%s)\n",
+			}
+			
+			offset = rand % rdd_config.in_file.st.st_size;
+			max_ops = rand % rdd_config.max_ops_per_seq;
+			if (!max_ops) {
+				max_ops ++;
+			}
+
+			ret = lseek (rdd_config.in_file.fd, offset, SEEK_SET);
+			if (ret != offset) {
+				fprintf (stderr, "lseek failed (%s)\n", 
                                          strerror (errno));
-                                ret = -1;
-                                goto unlock;
-                        }
+				ret = -1;
+				goto unlock;
+			}
 
-                        ret = lseek (rdd_config.out_file.fd, offset, SEEK_SET);
-                        if (ret != offset) {
-                                fprintf (stderr, "lseek failed (%s)\n",
+			ret = lseek (rdd_config.out_file.fd, offset, SEEK_SET);
+			if (ret != offset) {
+				fprintf (stderr, "lseek failed (%s)\n", 
                                          strerror (errno));
-                                ret = -1;
-                                goto unlock;
-                        }
-
-                        while (max_ops--)
-                        {
-                                bytes = read (rdd_config.in_file.fd, buf, bs);
-                                if (!bytes) {
-                                        break;
-                                }
-
-                                if (bytes == -1) {
-                                        fprintf (stderr, "read failed (%s)\n",
+				ret = -1;
+				goto unlock;
+			}
+
+			while (max_ops--) 
+			{ 
+				bytes = read (rdd_config.in_file.fd, buf, bs);
+				if (!bytes) {
+					break;
+				}
+
+				if (bytes == -1) {
+					fprintf (stderr, "read failed (%s)\n", 
                                                  strerror (errno));
-                                        ret = -1;
-                                        goto unlock;
-                                }
+					ret = -1;
+					goto unlock;
+				}
 
-                                if (write (rdd_config.out_file.fd, buf, bytes)
+				if (write (rdd_config.out_file.fd, buf, bytes) 
                                     != bytes) {
-                                        fprintf (stderr, "write failed (%s)\n",
+					fprintf (stderr, "write failed (%s)\n", 
                                                  strerror (errno));
-                                        ret = -1;
-                                        goto unlock;
-                                }
-                        }
-                }
-        unlock:
-                pthread_mutex_unlock (&rdd_config.lock);
-                if (ret == -1) {
-                        goto out;
-                }
-                ret = 0;
-        }
+					ret = -1;
+					goto unlock;
+				}
+			}
+		}
+	unlock:
+		pthread_mutex_unlock (&rdd_config.lock);
+		if (ret == -1) {
+			goto out;
+		}
+		ret = 0;
+	}
 out:
-        free (buf);
-        pthread_barrier_wait (&rdd_config.barrier);
+	free (buf);
+	pthread_barrier_wait (&rdd_config.barrier);
 
-        return NULL;
+	return NULL;
 }
 
-static void
-cleanup (void)
-{
-        close (rdd_config.in_file.fd);
-        close (rdd_config.out_file.fd);
-        rdd_config.in_file.fd = rdd_config.out_file.fd = -1;
-}
-
-static int
-check_and_create (void)
-{
-        int ret = -1;
-        char buf[4096] = {0,};
-        struct stat stbuf = {0,};
-        int  fd[2] = {-1,};
-        size_t  total_size = -1;
-
-        total_size = rdd_config.file_size;
-
-        ret = stat (rdd_config.in_file.path, &stbuf);
-        if (ret == -1 && (errno != ENOENT))
-                goto out;
-
-        fd[1] = open (rdd_config.in_file.path, O_CREAT | O_WRONLY | O_TRUNC);
-        if (fd[1] == -1)
-                goto out;
-
-        fd[0] = open ("/dev/urandom", O_RDONLY);
-        if (fd[0] == -1)
-                goto out;
-
-        while (total_size > 0) {
-                if (total_size >= 4096) {
-                        ret = read (fd[0], buf, 4096);
-                        if (ret == -1)
-                                goto out;
-                        ret = write (fd[1], buf, 4096);
-                        if (ret == -1)
-                                goto out;
-                        total_size = total_size - 4096;
-                } else {
-                        ret = read (fd[0], buf, total_size);
-                        if (ret == -1)
-                                goto out;
-                        ret = write (fd[1], buf, total_size);
-                        if (ret == -1)
-                                goto out;
-                        total_size = total_size - total_size;
-                }
-
-        }
-
-        ret = 0;
-
-out:
-        if (fd[0] > 0)
-                close (fd[0]);
-        if (fd[1] > 0)
-                close (fd[1]);
-        return ret;
-}
 
 static int
 rdd_spawn_threads (void)
 {
-        int i = 0, ret = -1, fd = -1;
-        char buf[4096];
+	int i = 0, ret = -1, fd = -1;
+	char buf[4096]; 
 
-        ret = check_and_create ();
-        if (ret == -1)
-                goto out;
-
-        fd = open (rdd_config.in_file.path, O_RDONLY);
-        if (fd < 0) {
-                fprintf (stderr, "cannot open %s (%s)\n",
+	fd = open (rdd_config.in_file.path, O_RDONLY);
+	if (fd < 0) {
+		fprintf (stderr, "cannot open %s (%s)\n", 
                          rdd_config.in_file.path, strerror (errno));
-                ret = -1;
-                goto out;
-        }
-        ret = fstat (fd, &rdd_config.in_file.st);
-        if (ret != 0) {
-                close (fd);
-                fprintf (stderr, "cannot stat %s (%s)\n",
+		ret = -1;
+		goto out;
+	}
+	ret = fstat (fd, &rdd_config.in_file.st);
+	if (ret != 0) {
+		close (fd);
+		fprintf (stderr, "cannot stat %s (%s)\n", 
                          rdd_config.in_file.path, strerror (errno));
-                ret = -1;
-                goto out;
-        }
-        rdd_config.in_file.fd = fd;
+		ret = -1;
+		goto out;
+	}
+	rdd_config.in_file.fd = fd;
 
-        fd = open (rdd_config.out_file.path, O_WRONLY | O_CREAT | O_TRUNC,
+	fd = open (rdd_config.out_file.path, O_WRONLY | O_CREAT, 
                    S_IRWXU | S_IROTH);
-        if (fd < 0) {
-                close (rdd_config.in_file.fd);
-                rdd_config.in_file.fd = -1;
-                fprintf (stderr, "cannot open %s (%s)\n",
+	if (fd < 0) {
+		close (rdd_config.in_file.fd);
+		rdd_config.in_file.fd = -1;
+		fprintf (stderr, "cannot open %s (%s)\n", 
                          rdd_config.out_file.path, strerror (errno));
-                ret = -1;
-                goto out;
-        }
-        rdd_config.out_file.fd = fd;
-
-        while ((ret = read (rdd_config.in_file.fd, buf, 4096)) > 0) {
-                if (write (rdd_config.out_file.fd, buf, ret) != ret) {
-                        fprintf (stderr, "write failed (%s)\n",
+		ret = -1;
+		goto out;
+	}
+	rdd_config.out_file.fd = fd;
+
+	while ((ret = read (rdd_config.in_file.fd, buf, 4096)) > 0) {
+		if (write (rdd_config.out_file.fd, buf, ret) != ret) {
+			fprintf (stderr, "write failed (%s)\n", 
                                  strerror (errno));
-                        cleanup ();
-                        ret = -1;
-                        goto out;
-                }
-        }
-
-        rdd_config.threads = calloc (rdd_config.thread_count,
+			close (rdd_config.in_file.fd);
+			close (rdd_config.out_file.fd);
+			rdd_config.in_file.fd = rdd_config.out_file.fd = -1;
+			ret = -1;
+			goto out;
+		}
+	}
+
+	rdd_config.threads = calloc (rdd_config.thread_count, 
                                      sizeof (pthread_t));
-        if (rdd_config.threads == NULL) {
-                fprintf (stderr, "calloc() failed (%s)\n", strerror (errno));
+	if (rdd_config.threads == NULL) {
+		fprintf (stderr, "calloc() failed (%s)\n", strerror (errno));
 
-                ret = -1;
-                cleanup ();
-                goto out;
-        }
+		ret = -1;
+		close (rdd_config.in_file.fd);
+		close (rdd_config.out_file.fd);
+		rdd_config.in_file.fd = rdd_config.out_file.fd = -1;
+		goto out;
+	}
 
-        ret = pthread_barrier_init (&rdd_config.barrier, NULL,
+	ret = pthread_barrier_init (&rdd_config.barrier, NULL, 
                                     rdd_config.thread_count + 1);
-        if (ret != 0) {
-                fprintf (stderr, "pthread_barrier_init() failed (%s)\n",
+	if (ret != 0) {
+		fprintf (stderr, "pthread_barrier_init() failed (%s)\n", 
                          strerror (ret));
 
-                free (rdd_config.threads);
-                cleanup ();
-                ret = -1;
-                goto out;
-        }
-
-        ret = pthread_mutex_init (&rdd_config.lock, NULL);
-        if (ret != 0) {
-                fprintf (stderr, "pthread_mutex_init() failed (%s)\n",
+		free (rdd_config.threads);
+		close (rdd_config.in_file.fd);
+		close (rdd_config.out_file.fd);
+		rdd_config.in_file.fd = rdd_config.out_file.fd = -1;
+		ret = -1;
+		goto out;
+	}
+
+	ret = pthread_mutex_init (&rdd_config.lock, NULL);
+	if (ret != 0) {
+		fprintf (stderr, "pthread_mutex_init() failed (%s)\n", 
                          strerror (ret));
 
-                free (rdd_config.threads);
-                pthread_barrier_destroy (&rdd_config.barrier);
-                cleanup ();
-                ret = -1;
-                goto out;
-        }
-
-        for (i = 0; i < rdd_config.thread_count; i++)
-        {
-                ret = pthread_create (&rdd_config.threads[i], NULL,
+		free (rdd_config.threads);
+		pthread_barrier_destroy (&rdd_config.barrier);
+		close (rdd_config.in_file.fd);
+		close (rdd_config.out_file.fd);
+		rdd_config.in_file.fd = rdd_config.out_file.fd = -1;
+		ret = -1;
+		goto out;
+	}
+
+	for (i = 0; i < rdd_config.thread_count; i++)
+	{
+		ret = pthread_create (&rdd_config.threads[i], NULL, 
                                       rdd_read_write, NULL);
-                if (ret != 0) {
-                        fprintf (stderr, "pthread_create failed (%s)\n",
+		if (ret != 0) {
+			fprintf (stderr, "pthread_create failed (%s)\n", 
                                  strerror (errno));
-                        exit (1);
-                }
-        }
+			exit (1);
+		}
+	}
 
 out:
-        return ret;
+	return ret;
 }
 
+
 static void
 rdd_wait_for_completion (void)
 {
-        pthread_barrier_wait (&rdd_config.barrier);
+	pthread_barrier_wait (&rdd_config.barrier);
 }
 
 
-int
+int 
 main (int argc, char *argv[])
 {
-        int ret = -1;
+	int ret = -1;
 
-        rdd_default_config ();
+	rdd_default_config ();
 
-        ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
-        if (ret != 0) {
-                ret = -1;
-                fprintf (stderr, "%s: argp_parse() failed\n", argv[0]);
-                goto err;
-        }
+	ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
+	if (ret != 0) {
+		ret = -1;
+		fprintf (stderr, "%s: argp_parse() failed\n", argv[0]);
+		goto err;
+	}
 
-        if (!rdd_valid_config ()) {
-                ret = -1;
-                fprintf (stderr, "%s: configuration validation failed\n",
+	if (!rdd_valid_config ()) {
+		ret = -1;
+		fprintf (stderr, "%s: configuration validation failed\n", 
                          argv[0]);
-                goto err;
-        }
+		goto err;
+	}
 
-        ret = rdd_spawn_threads ();
-        if (ret != 0) {
-                fprintf (stderr, "%s: spawning threads failed\n", argv[0]);
-                goto err;
-        }
+	ret = rdd_spawn_threads ();
+	if (ret != 0) {
+		fprintf (stderr, "%s: spawning threads failed\n", argv[0]);
+		goto err;
+	}
 
-        rdd_wait_for_completion ();
+	rdd_wait_for_completion ();
 
 err:
-        return ret;
-}
+	return ret;
+} 
diff --git a/extras/clear_xattrs.sh b/extras/clear_xattrs.sh
deleted file mode 100755
index dd04731e8..000000000
--- a/extras/clear_xattrs.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Clear the trusted.gfid xattr in the brick tree
-
-# This script must be run only on a stopped brick/volume
-# Stop the volume to make sure no rebalance/replace-brick
-# operations are on-going
-
-# Not much error checking
-remove_xattrs ()
-{
-    find "$1" -exec setfattr -h -x "trusted.gfid" '{}' \;  > /dev/null 2>&1;
-    find "$1" -exec setfattr -h -x "trusted.glusterfs.volume-id" '{}' \;  > /dev/null 2>&1;
-}
-
-main ()
-{
-    if [ -z "$1" ]; then
-        echo "Usage: $0 <brick_path(s)>";
-        exit 1;
-    fi
-
-    export PATH;
-    which getfattr > /dev/null 2>&1;
-    if [ $? -ne 0 ]; then
-        echo "attr package missing";
-        exit 2;
-    fi
-
-    which setfattr > /dev/null 2>&1;
-    if [ $? -ne 0 ]; then
-        echo "attr package missing";
-        exit 2;
-    fi
-
-    for brick in "$@";
-    do
-        stat "$brick" > /dev/null 2>&1;
-        if [ $? -ne 0 ]; then
-            echo "brick: $brick does not exist";
-            exit 3;
-        fi
-        if [ ! -d "$brick" ]; then
-            echo "$brick: not a directory";
-            exit 4;
-        fi
-        echo "xattr clean-up in progress: $brick";
-        remove_xattrs "$brick";
-        echo "$brick ready to be used as a glusterfs brick";
-    done;
-}
-
-main "$@";
-\ No newline at end of file
diff --git a/extras/contri-add.sh b/extras/contri-add.sh
deleted file mode 100755
index 7db5edd5d..000000000
--- a/extras/contri-add.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# This script adds contributions of files/directories in backend to volume
-# size.
-# It can also be used to debug by passing dir as first argument, in which case
-# it will just add contributions from immediate children of a directory and
-# displays only if added contributions from immediate children is different
-# from size stored in directory.
-# For Eg., find <backend-directory> -type d -exec ./contri-add.sh dir \{} \;
-# will list all the directories which have descrepancies in their
-# size/contributions.
-
-usage ()
-{
-    echo >&2 "usage: $0 <file|dir> <list-of-backend-directories>"
-}
-
-add_contributions ()
-{
-    local var=0
-    local count=0
-
-    SIZE=`getfattr -h -e hex -n trusted.glusterfs.quota.size $2 2>&1 | sed -e '/^#/d' | sed -e '/^getfattr/d' | sed -e '/^$/d' | cut -d'=' -f 2`
-    CONTRI=`getfattr -h -e hex -d -m trusted.glusterfs.quota.*.contri $2 2>&1 | sed -e '/^#/d' | sed -e '/^getfattr/d' | sed -e '/^$/d' | cut -d'=' -f 2`
-
-    if [ $1 == "file" ]; then
-        PATHS=`find  $2 ! -type d | sed -e "\|^$2$|d" | sed -e '/^[ \t]*$/d'`
-    else
-        PATHS=`find  $2 -maxdepth 1 | sed -e "\|^$2$|d" | sed -e '/^[ \t]*$/d'`
-    fi
-
-    if [ -z "$PATHS" ]; then
-        return 0
-    fi
-
-    CONTRIBUTIONS=`echo $PATHS | xargs getfattr -h -e hex -d -m trusted.glusterfs.quota.*.contri 2>&1 | sed -e '/^#/d' | sed -e '/^getfattr/d' | sed -e '/^$/d' | cut -d'=' -f 2 | sed -e 's/^[ \t]*\([^ \t]*\)/\1/g'`
-
-    if [ -n "$CONTRIBUTIONS" ]; then
-        for i in $CONTRIBUTIONS; do
-            count=$(($count + 1))
-            var=$(($var + $i))
-        done
-    fi
-
-    if [ $1 == "file" ] || [ $var -ne $(($SIZE)) ] || [ $(($SIZE)) -ne $(($CONTRI)) ]; then
-        if [ $1 == "dir" ]; then
-            TMP_PATH=`echo $2 | sed -e "s/\/home\/export\/[0-9]*/\/mnt\/raghu/g"`
-            stat $TMP_PATH > /dev/null
-        fi
-
-        echo "file count $count"
-        echo "added contribution of $2=$var"
-        echo "size stored in xattrs on $2=$(($SIZE))"
-        echo "contribution of $2 to its parent directory=$(($CONTRI))"
-        echo "=============================================================="
-    fi
-}
-
-
-main ()
-{
-    [ $# -lt 1 ] && usage
-
-    TYPE=$1
-
-    shift 1
-
-    for i in $@; do
-        add_contributions $TYPE $i
-    done
-}
-
-main $@
-\ No newline at end of file
diff --git a/extras/file_size_contri.sh b/extras/file_size_contri.sh
deleted file mode 100755
index 4f52a9a89..000000000
--- a/extras/file_size_contri.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script checks whether the contribution and disk-usage of a file is same.
-
-CONTRIBUTION_HEX=`getfattr -h -e hex -d -m trusted.glusterfs.quota.*.contri $1 2>&1 | sed -e '/^#/d' | sed -e '/^getfattr/d' | sed -e '/^$/d' | cut -d'=' -f 2`
-
-BLOCKS=`stat -c %b $1`
-SIZE=$(($BLOCKS * 512))
-
-CONTRIBUTION=`printf "%d" $CONTRIBUTION_HEX`
-
-if [ $CONTRIBUTION -ne $SIZE ]; then
-    printf "contribution of %s:%d\n" $1 $CONTRIBUTION
-    echo "size of $1: $SIZE"
-    echo "==================================================="
-fi
- 
diff --git a/extras/generate-xdr-files.sh b/extras/generate-xdr-files.sh
deleted file mode 100755
index bc02f77c9..000000000
--- a/extras/generate-xdr-files.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-_init ()
-{
-    xfile="$1";
-    # TODO: check the validity of .x file
-
-    cfile="${1%.x}.c";
-    hfile="${1%.x}.h";
-
-    tmp_cfile="$1.c";
-
-    tmp1_hfile="$1.h.tmp";
-    tmp1_cfile="$1.c.tmp";
-
-}
-
-append_licence_header ()
-{
-    src_file=$1;
-    dst_file=$2;
-
-    cat >$dst_file <<EOF
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include "xdr-common.h"
-#include "compat.h"
-
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
-
-EOF
-
-    cat $src_file >> $dst_file;
-
-}
-
-main ()
-{
-    if [ $# -ne 1 ]; then
-        echo "wrong number of arguments given"
-        echo " $0 <XDR-definition-file>.x"
-        exit 1;
-    fi
-
-
-    echo -n "writing the XDR routine file ($tmp_cfile) ...  ";
-    rm -f $tmp_cfile;
-    rpcgen -c -o $tmp_cfile $xfile;
-
-    # get rid of warnings in xdr .c file due to "unused variable 'buf'"
-    sed -i -e 's:buf;$:buf;\
-        buf = NULL;:' $tmp_cfile;
-
-    sed -i '/int i;/d' $tmp_cfile;
-
-    echo "OK";
-
-    # no need for a temporary file here as there are no changes from glusterfs
-    echo -n "writing the XDR header file ($hfile) ...  ";
-    rm -f $hfile;
-    rpcgen -h -o $hfile $xfile;
-
-    # the '#ifdef' part of file should be fixed
-    sed -i -e 's/-/_/g' $hfile;
-
-    echo "OK";
-
-    echo -n "writing licence header to the generated files ... ";
-    # Write header to temp file and append generated file
-    append_licence_header $hfile $tmp1_hfile;
-    append_licence_header $tmp_cfile $tmp1_cfile;
-    echo "OK"
-
-    # now move the destination file to actual original file
-    echo -n "updating existing files ... ";
-    mv $tmp1_hfile $hfile;
-    mv $tmp1_cfile $cfile;
-
-    # remove unwanted temporary files (if any)
-    rm -f $tmp_cfile $tmp1_cfile $tmp1_hfile
-
-    echo "OK"
-
-}
-
-_init "$@" && main "$@";
diff --git a/extras/geo-rep/Makefile.am b/extras/geo-rep/Makefile.am
deleted file mode 100644
index fc5f56d54..000000000
--- a/extras/geo-rep/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = gsync-sync-gfid.c gsync-upgrade.sh generate-gfid-file.sh \
-	get-gfid.sh slave-upgrade.sh
diff --git a/extras/geo-rep/generate-gfid-file.sh b/extras/geo-rep/generate-gfid-file.sh
deleted file mode 100644
index c6739fbf1..000000000
--- a/extras/geo-rep/generate-gfid-file.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#Usage: generate-gfid-file.sh <master-volfile-server:master-volume> <path-to-get-gfid.sh> <output-file>
-
-function get_gfids()
-{
-    GET_GFID_CMD=$1
-    OUTPUT_FILE=$2
-    find . -exec $GET_GFID_CMD {} \; > $OUTPUT_FILE
-}
-
-function mount_client()
-{
-    local T; # temporary mount
-    local i; # inode number
-
-    VOLFILE_SERVER=$1;
-    VOLUME=$2;
-    GFID_CMD=$3;
-    OUTPUT=$4;
-
-    T=$(mktemp -d);
-
-    glusterfs -s $VOLFILE_SERVER --volfile-id $VOLUME $T;
-
-    i=$(stat -c '%i' $T);
-
-    [ "x$i" = "x1" ] || fatal "could not mount volume $MASTER on $T";
-
-    cd $T;
-
-    get_gfids $GFID_CMD $OUTPUT
-
-    cd -;
-
-    umount $T || fatal "could not umount $MASTER from $T";
-
-    rmdir $T || warn "rmdir of $T failed";
-}
-
-
-function main()
-{
-    SLAVE=$1
-    GET_GFID_CMD=$2
-    OUTPUT=$3
-
-    VOLFILE_SERVER=`echo $SLAVE | sed -e 's/\(.*\):.*/\1/'`
-    VOLUME_NAME=`echo $SLAVE | sed -e 's/.*:\(.*\)/\1/'`
-
-    mount_client $VOLFILE_SERVER $VOLUME_NAME $GET_GFID_CMD $OUTPUT
-}
-
-main "$@";
diff --git a/extras/geo-rep/get-gfid.sh b/extras/geo-rep/get-gfid.sh
deleted file mode 100755
index a4d609b0b..000000000
--- a/extras/geo-rep/get-gfid.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-ATTR_STR=`getfattr -h $1 -n glusterfs.gfid.string`
-GLFS_PATH=`echo $ATTR_STR | sed -e 's/# file: \(.*\) glusterfs.gfid.string*/\1/g'`
-GFID=`echo $ATTR_STR | sed -e 's/.*glusterfs.gfid.string="\(.*\)"/\1/g'`
-
-echo "$GFID $GLFS_PATH"
diff --git a/extras/geo-rep/gsync-sync-gfid.c b/extras/geo-rep/gsync-sync-gfid.c
deleted file mode 100644
index 601f4720e..000000000
--- a/extras/geo-rep/gsync-sync-gfid.c
+++ /dev/null
@@ -1,106 +0,0 @@
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <attr/xattr.h>
-#include <libgen.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-#ifndef UUID_CANONICAL_FORM_LEN
-#define UUID_CANONICAL_FORM_LEN 36
-#endif
-
-#ifndef GF_FUSE_AUX_GFID_HEAL
-#define GF_FUSE_AUX_GFID_HEAL    "glusterfs.gfid.heal"
-#endif
-
-#define GLFS_LINE_MAX           (PATH_MAX + (2 * UUID_CANONICAL_FORM_LEN))
-
-int
-main (int argc, char *argv[])
-{
-        char *file                = NULL;
-        char *tmp = NULL;
-        char *tmp1 = NULL;
-        char *parent_dir = NULL;
-        char *gfid                = NULL;
-        char *bname = NULL;
-        int   ret                 = -1;
-        int len = 0;
-        FILE *fp                  = NULL;
-        char  line[GLFS_LINE_MAX] = {0,};
-        char *path = NULL;
-        void  *blob               = NULL;
-        void  *tmp_blob               = NULL;
-
-        if (argc != 2) {
-                /* each line in the file has the following format
-                 * uuid-in-canonical-form path-relative-to-gluster-mount.
-                 * Both uuid and relative path are from master mount.
-                 */
-                fprintf (stderr, "usage: %s <file-of-paths-to-be-synced>\n",
-                         argv[0]);
-                goto out;
-        }
-
-        file = argv[1];
-
-        fp = fopen (file, "r");
-        if (fp == NULL) {
-                fprintf (stderr, "cannot open %s for reading (%s)\n",
-                         file, strerror (errno));
-                goto out;
-        }
-
-        while (fgets (line, GLFS_LINE_MAX, fp) != NULL) {
-                tmp = line;
-                path = gfid = line;
-
-                path += UUID_CANONICAL_FORM_LEN + 1;
-
-                while(isspace (*path))
-                        path++;
-
-                if ((strlen (line) < GLFS_LINE_MAX) &&
-                    (line[strlen (line) - 1] == '\n'))
-                        line[strlen (line) - 1] = '\0';
-
-                line[UUID_CANONICAL_FORM_LEN] = '\0';
-
-                tmp = strdup (path);
-                tmp1 = strdup (path);
-                parent_dir = dirname (tmp);
-                bname = basename (tmp1);
-
-                /* gfid + '\0' + bname + '\0' */
-                len = UUID_CANONICAL_FORM_LEN + 1 + strlen (bname) + 1;
-
-                blob = calloc (1, len);
-
-                memcpy (blob, gfid, UUID_CANONICAL_FORM_LEN);
-
-                tmp_blob = blob + UUID_CANONICAL_FORM_LEN + 1;
-
-                memcpy (tmp_blob, bname, strlen (bname));
-
-                ret = setxattr (parent_dir, GF_FUSE_AUX_GFID_HEAL, blob, len,
-                                0);
-                if (ret < 0) {
-                        fprintf (stderr, "setxattr on %s/%s failed (%s)\n",
-                                 parent_dir, bname, strerror (errno));
-                }
-                memset (line, 0, GLFS_LINE_MAX);
-
-                free (blob);
-                free (tmp); free (tmp1);
-                blob = NULL;
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
-
diff --git a/extras/geo-rep/gsync-upgrade.sh b/extras/geo-rep/gsync-upgrade.sh
deleted file mode 100644
index b17948736..000000000
--- a/extras/geo-rep/gsync-upgrade.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash
-#usage: gsync-upgrade.sh <slave-volfile-server:slave-volume> <gfid-file>
-#                        <path-to-gsync-sync-gfid> <ssh-identity-file>
-#<slave-volfile-server>: a machine on which gluster cli can fetch slave volume info.
-#                        slave-volfile-server defaults to localhost.
-#
-#<gfid-file>: a file containing paths and their associated gfids
-#            on master. The paths are relative to master mount point
-#            (not absolute). An example extract of <gfid-file> can be,
-#
-#            <extract>
-#            22114455-57c5-46e9-a783-c40f83a72b09 /dir
-#            25772386-3eb8-4550-a802-c3fdc938ca80 /dir/file
-#            </extract>
-#
-#<ssh-identity-file>: file from which the identity (private key) for public key authentication is read.
-
-SLAVE_MOUNT='/tmp/glfs_slave'
-
-function SSH()
-{
-    HOST=$1
-    SSHKEY=$2
-
-    shift 2
-
-    ssh -qi $SSHKEY \
-        -oPasswordAuthentication=no \
-        -oStrictHostKeyChecking=no \
-        "$HOST" "$@";
-}
-
-function get_bricks()
-{
-    SSHKEY=$3
-
-    SSH $1 $SSHKEY "gluster volume info $2" | grep -E 'Brick[0-9]+' | sed -e 's/[^:]*:\(.*\)/\1/g'
-}
-
-function cleanup_brick()
-{
-    HOST=$1
-    BRICK=$2
-    SSHKEY=$3
-
-    # TODO: write a C program to receive a list of files and does cleanup on
-    # them instead of spawning a new setfattr process for each file if
-    # performance is bad.
-    SSH -i $SSHKEY $HOST  "rm -rf $BRICK/.glusterfs/* && find $BRICK -exec setfattr -x trusted.gfid {} \;"
-}
-
-function cleanup_slave()
-{
-    SSHKEY=$2
-
-    VOLFILE_SERVER=`echo $1 | sed -e 's/\(.*\):.*/\1/'`
-    VOLUME_NAME=`echo $1 | sed -e 's/.*:\(.*\)/\1/'`
-
-    BRICKS=`get_bricks $VOLFILE_SERVER $VOLUME_NAME $SSHKEY`
-
-    for i in $BRICKS; do
-	HOST=`echo $i | sed -e 's/\(.*\):.*/\1/'`
-	BRICK=`echo $i | sed -e 's/.*:\(.*\)/\1/'`
-	cleanup_brick $HOST $BRICK $SSHKEY
-    done
-
-    SSH -i $SSHKEY $VOLFILE_SERVER "gluster --mode=script volume stop $VOLUME_NAME; gluster volume start $VOLUME_NAME";
-
-}
-
-function mount_client()
-{
-    local T; # temporary mount
-    local i; # inode number
-    GFID_FILE=$3
-    SYNC_CMD=$4
-
-    T=$(mktemp -d);
-
-    glusterfs --aux-gfid-mount -s $1 --volfile-id $2 $T;
-
-    i=$(stat -c '%i' $T);
-
-    [ "x$i" = "x1" ] || fatal "could not mount volume $MASTER on $T";
-
-    cd $T;
-
-    $SYNC_CMD $GFID_FILE
-
-    cd -;
-
-    umount -l $T || fatal "could not umount $MASTER from $T";
-
-    rmdir $T || warn "rmdir of $T failed";
-}
-
-function sync_gfids()
-{
-    SLAVE=$1
-    GFID_FILE=$2
-
-    SLAVE_VOLFILE_SERVER=`echo $SLAVE | sed -e 's/\(.*\):.*/\1/'`
-    SLAVE_VOLUME_NAME=`echo $SLAVE | sed -e 's/.*:\(.*\)/\1/'`
-
-    if [ "x$SLAVE_VOLFILE_SERVER" = "x" ]; then
-        SLAVE_VOLFILE_SERVER="localhost"
-    fi
-
-    mount_client $SLAVE_VOLFILE_SERVER $SLAVE_VOLUME_NAME $GFID_FILE $3
-}
-
-function upgrade()
-{
-    SLAVE=$1
-    GFID_FILE=$2
-    SYNC_CMD=$3
-    SSHKEY=$4
-
-    cleanup_slave $SLAVE $SSHKEY
-    sync_gfids $SLAVE $GFID_FILE $SYNC_CMD
-}
-
-upgrade "$@"
diff --git a/extras/geo-rep/slave-upgrade.sh b/extras/geo-rep/slave-upgrade.sh
deleted file mode 100644
index 6198f408a..000000000
--- a/extras/geo-rep/slave-upgrade.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-#usage: slave-upgrade.sh <volfile-server:volname> <gfid-file>
-#                        <path-to-gsync-sync-gfid>
-#<slave-volfile-server>: a machine on which gluster cli can fetch slave volume info.
-#                        slave-volfile-server defaults to localhost.
-#
-#<gfid-file>: a file containing paths and their associated gfids
-#            on master. The paths are relative to master mount point
-#            (not absolute). An example extract of <gfid-file> can be,
-#
-#            <extract>
-#            22114455-57c5-46e9-a783-c40f83a72b09 /dir
-#            25772386-3eb8-4550-a802-c3fdc938ca80 /dir/file
-#            </extract>
-
-function get_bricks()
-{
-    gluster volume info $1 | grep -E 'Brick[0-9]+' | sed -e 's/[^:]*:\(.*\)/\1/g'
-}
-
-function cleanup_brick()
-{
-    HOST=$1
-    BRICK=$2
-
-    # TODO: write a C program to receive a list of files and does cleanup on
-    # them instead of spawning a new setfattr process for each file if
-    # performance is bad.
-    ssh $HOST "rm -rf $BRICK/.glusterfs/* && find $BRICK -exec setfattr -x trusted.gfid {} \; 2>/dev/null"
-}
-
-function cleanup_slave()
-{
-    VOLUME_NAME=`echo $1 | sed -e 's/.*:\(.*\)/\1/'`
-
-    BRICKS=`get_bricks $VOLUME_NAME`
-
-    for i in $BRICKS; do
-	HOST=`echo $i | sed -e 's/\(.*\):.*/\1/'`
-	BRICK=`echo $i | sed -e 's/.*:\(.*\)/\1/'`
-	cleanup_brick $HOST $BRICK
-    done
-
-    # Now restart the volume
-    gluster --mode=script volume stop $VOLUME_NAME;
-    gluster volume start $VOLUME_NAME;
-}
-
-function mount_client()
-{
-    local T; # temporary mount
-    local i; # inode number
-
-    VOLUME_NAME=$2;
-    GFID_FILE=$3
-    SYNC_CMD=$4
-
-    T=$(mktemp -d);
-
-    glusterfs --aux-gfid-mount -s $1 --volfile-id $VOLUME_NAME $T;
-
-    i=$(stat -c '%i' $T);
-
-    cd $T;
-
-    $SYNC_CMD $GFID_FILE
-
-    cd -;
-
-    umount $T || fatal "could not umount $MASTER from $T";
-
-    rmdir $T || warn "rmdir of $T failed";
-}
-
-function sync_gfids()
-{
-    SLAVE=$1
-    GFID_FILE=$2
-    SYNC_CMD=$3
-
-    SLAVE_VOLFILE_SERVER=`echo $SLAVE | sed -e 's/\(.*\):.*/\1/'`
-    SLAVE_VOLUME_NAME=`echo $SLAVE | sed -e 's/.*:\(.*\)/\1/'`
-
-    if [ "x$SLAVE_VOLFILE_SERVER" = "x" ]; then
-        SLAVE_VOLFILE_SERVER="localhost"
-    fi
-
-    mount_client $SLAVE_VOLFILE_SERVER $SLAVE_VOLUME_NAME $GFID_FILE $SYNC_CMD
-}
-
-function upgrade()
-{
-    SLAVE=$1
-    GFID_FILE=$2
-    SYNC_CMD=$3
-
-    cleanup_slave $SLAVE
-
-    sync_gfids $SLAVE $GFID_FILE $SYNC_CMD
-}
-
-upgrade "$@"
diff --git a/extras/gluster-rsyslog-5.8.conf b/extras/gluster-rsyslog-5.8.conf
deleted file mode 100644
index 2519999bc..000000000
--- a/extras/gluster-rsyslog-5.8.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-##### gluster.conf #####
-
-#
-## If you want to log every message to the log file instead of
-## intelligently suppressing repeated messages, set off to
-## RepeatedMsgReduction.  This change requires rsyslog restart
-## (eg. run 'service rsyslog restart')
-#
-#$RepeatedMsgReduction off
-$RepeatedMsgReduction on
-
-#
-## The mmcount module provides the capability to count log messages by 
-## severity or json property of given app-name.  The count value is added
-## into the log message as json property named '$msgid'
-#
-$ModLoad mmcount
-$mmcountKey gf_code # start counting value of gf_code
-
-$template Glusterfsd_dynLogFile,"/var/log/glusterfs/bricks/%app-name%.log"
-$template Gluster_dynLogFile,"/var/log/glusterfs/%app-name%.log"
-
-$template GLFS_Template,"%msgid%/%syslogfacility-text:::uppercase%/%syslogseverity-text:::uppercase% [%TIMESTAMP:::date-rfc3339%] %msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
-
-#
-## Pass logs to mmcount if app-name is 'gluster'
-#
-if $app-name contains 'gluster' then :mmcount:
-
-if $app-name contains 'glusterfsd' then ?Glusterfsd_dynLogFile;GLFS_Template
-if $app-name contains 'gluster' and not ( $app-name contains 'glusterfsd' ) then ?Gluster_dynLogFile;GLFS_Template
-
-#
-## Sample configuration to send a email alert for every 50th mmcount
-#
-#$ModLoad ommail
-#$ActionMailSMTPServer smtp.example.com
-#$ActionMailFrom rsyslog@example.com
-#$ActionMailTo glusteradmin@example.com
-#$template mailSubject,"50th message of gf_code=9999 on %hostname%"
-#$template mailBody,"RSYSLOG Alert\r\nmsg='%msg%'"
-#$ActionMailSubject mailSubject
-#$ActionExecOnlyOnceEveryInterval 30
-#if $app-name == 'glusterfsd' and $msgid != 0 and $msgid % 50 == 0 \
-#then :ommail:;RSYSLOG_SyslogProtocol23Format
-#
-
-#
-## discard logs where app-name is 'gluster' as we processed already
-#
-if $app-name contains 'gluster' then ~
diff --git a/extras/gluster-rsyslog-7.2.conf b/extras/gluster-rsyslog-7.2.conf
deleted file mode 100644
index 8b2841543..000000000
--- a/extras/gluster-rsyslog-7.2.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-##### gluster.conf #####
-#
-## If you want to log every message to the log file instead of
-## intelligently suppressing repeated messages, set off to
-## RepeatedMsgReduction.  This change requires rsyslog restart
-## (eg. run 'service rsyslog restart')
-#
-#$RepeatedMsgReduction off
-$RepeatedMsgReduction on
-
-$ModLoad mmjsonparse
-*.* :mmjsonparse:
-
-#
-## The mmcount module provides the capability to count log messages by 
-## severity or json property of given app-name.  The count value is added
-## into the log message as json property named 'mmcount'
-##
-## More info at http://www.rsyslog.com/doc/mmcount.html
-#
-#module(load="mmcount")
-#action(type="mmcount" appname="glusterd" key="!gf_code") # count each value of gf_code of appname glusterd
-#action(type="mmcount" appname="glusterfsd" key="!gf_code") # count each value of gf_code of appname glusterfsd
-#action(type="mmcount" appname="glusterfs" key="!gf_code") # count each value of gf_code of appname glusterfs
-
-template (name="Glusterfsd_dynLogFile" type="string" string="/var/log/glusterfs/bricks/%app-name%.log")
-template (name="Gluster_dynLogFile" type="string" string="/var/log/glusterfs/%app-name%.log")
-
-template(name="GLFS_template" type="list") {
-   property(name="$!mmcount")
-   constant(value="/")
-   property(name="syslogfacility-text" caseConversion="upper")
-   constant(value="/")
-   property(name="syslogseverity-text" caseConversion="upper")
-   constant(value=" ")
-   constant(value="[")
-   property(name="timereported" dateFormat="rfc3339")
-   constant(value="] ")
-   constant(value="[")
-   property(name="$!gf_code")
-   constant(value="] ")
-   constant(value="[")
-   property(name="$!gf_message")
-   constant(value="] ")
-   property(name="$!msg")
-   constant(value="\n")
-}
-
-if $app-name contains 'glusterfsd' then {
-   action(type="omfile"
-          DynaFile="Glusterfsd_dynLogFile"
-          Template="GLFS_template")
-   stop
-}
-
-if $app-name contains 'gluster' then {
-   action(type="omfile"
-          DynaFile="Gluster_dynLogFile"
-          Template="GLFS_template")
-   stop
-}
-
-#
-## send email for every 50th mmcount
-#$ModLoad ommail
-#if $app-name == 'glusterfsd' and $!mmcount <> 0 and $!mmcount % 50 == 0 then {
-#   $ActionMailSMTPServer smtp.example.com
-#   $ActionMailFrom rsyslog@example.com
-#   $ActionMailTo glusteradmin@example.com
-#   $template mailSubject,"50th message of gf_code=9999 on %hostname%"
-#   $template mailBody,"RSYSLOG Alert\r\nmsg='%msg%'"
-#   $ActionMailSubject mailSubject
-#   $ActionExecOnlyOnceEveryInterval 30
-#   :ommail:;RSYSLOG_SyslogProtocol23Format
-#}
-#
diff --git a/extras/glusterd-sysconfig b/extras/glusterd-sysconfig
deleted file mode 100644
index 8237c5711..000000000
--- a/extras/glusterd-sysconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-## Set custom log file and log level (bellow are defaults)
-# LOG_FILE='/var/log/glusterfs/glusterd.log'
-# LOG_LEVEL='INFO'
-
-## Set custom options for glusterd
-# GLUSTERD_OPTIONS=''
diff --git a/extras/glusterfs-georep-logrotate b/extras/glusterfs-georep-logrotate
deleted file mode 100644
index 6a69ab1e3..000000000
--- a/extras/glusterfs-georep-logrotate
+++ /dev/null
@@ -1,18 +0,0 @@
-
-rotate 52
-missingok
-
-compress
-delaycompress
-notifempty
-
-/var/log/glusterfs/geo-replication/*/*.log {
-}
-
-
-/var/log/glusterfs/geo-replication-slaves/*.log {
-}
-
-
-/var/log/glusterfs/geo-replication-slaves/*/*.log {
-}
diff --git a/extras/glusterfs-mode.el b/extras/glusterfs-mode.el
index d4f6dc568..f5631cf60 100644
--- a/extras/glusterfs-mode.el
+++ b/extras/glusterfs-mode.el
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2007-2011 Gluster Inc. <http://www.gluster.com>
+;;; Copyright (c) 2007-2011 Gluster Inc. <http://www.gluster.com>
 ;;;  
 ;;; 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
diff --git a/extras/glusterfs.vim b/extras/glusterfs.vim
index 899cc6551..31b09be5b 100644
--- a/extras/glusterfs.vim
+++ b/extras/glusterfs.vim
@@ -1,11 +1,20 @@
 " glusterfs.vim: GNU Vim Syntax file for GlusterFS .vol specification
-"  Copyright (c) 2007777777Red Hat, Inc. <http://www.redhat.com>
-"  This file is part of GlusterFS.
+" Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+" This file is part of GlusterFS.
 "
-"  This file is licensed to you under your choice of the GNU Lesser
-"  General Public License, version 3 or any later version (LGPLv3 or
-"  later), or the GNU General Public License, version 2 (GPLv2), in all
-"  cases as published by the Free Software Foundation.
+" GlusterFS 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 3 of the License,
+" or (at your option) any later version.
+"
+" GlusterFS 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, see
+" <http://www.gnu.org/licenses/>.
 "
 " Last Modified: Wed Aug  1 00:47:10 IST 2007
 " Version: 0.8 
diff --git a/extras/gnfs-loganalyse.py b/extras/gnfs-loganalyse.py
index 71e79b6be..d3368d140 100644
--- a/extras/gnfs-loganalyse.py
+++ b/extras/gnfs-loganalyse.py
@@ -1,13 +1,21 @@
 #!/bin/python
 """
-  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 """
 
 import os
@@ -16,13 +24,6 @@ import sys
 
 
 class NFSRequest:
-        def requestIsEntryOp (self):
-                op = self.op
-                if op == "CREATE" or op == "LOOKUP" or op == "REMOVE" or op == "LINK" or op == "RENAME" or op == "MKDIR" or op == "RMDIR" or op == "SYMLINK" or op == "MKNOD":
-                        return 1
-                else:
-                        return 0
-
         def __init__ (self, logline, linecount):
                 self.calllinecount = 0
                 self.xid = ""
@@ -30,13 +31,8 @@ class NFSRequest:
                 self.opdata = ""
                 self.replydata = ""
                 self.replylinecount = 0
-                self.timestamp = ""
-                self.entryname = ""
-                self.gfid = ""
-                self.replygfid = ""
 
                 tokens = logline.strip ().split (" ")
-                self.timestamp = tokens[0] + " " + tokens[1]
                 if "XID:" not in tokens:
                         return None
 
@@ -51,11 +47,6 @@ class NFSRequest:
                 opidx = tokens.index ("args:")
                 self.op = tokens [opidx-1].strip (":")
                 self.opdata = " ".join(tokens [opidx+1:])
-                if self.requestIsEntryOp ():
-                        nameidx = tokens.index ("name:")
-                        self.entryname = tokens[nameidx + 1].strip (",")
-                gfididx = tokens.index ("gfid")
-                self.gfid = tokens[gfididx +1].strip(",")
 
 
         def getXID (self):
@@ -63,56 +54,25 @@ class NFSRequest:
 
         def setReply (self, logline, linecount):
                 tokens = logline.strip ().split (" ")
-                timestamp = tokens[0] + " " + tokens[1]
                 statidx = tokens.index ("NFS:")
-                self.replydata = " TimeStamp: " + timestamp + " " + " ".join (tokens [statidx+1:])
+                self.replydata = " ".join (tokens [statidx+1:])
                 self.replylinecount = linecount
-                if "gfid" in tokens:
-                        gfididx = tokens.index ("gfid")
-                        self.replygfid = tokens [gfididx + 1].strip(",")
 
         def dump (self):
-                print "ReqLine: " + str(self.calllinecount) + " TimeStamp: " + self.timestamp + ", XID: " + self.xid + " " + self.op + " ARGS: " + self.opdata + " RepLine: " + str(self.replylinecount) + " " + self.replydata
+                print "ReqLine: " + str(self.calllinecount) + " XID: " + self.xid + " " + self.op + " ARGS: " + self.opdata + " RepLine: " + str(self.replylinecount) + " " + self.replydata
 
 class NFSLogAnalyzer:
 
-        def __init__ (self, optn, trackfilename, tracknamefh, stats):
-                self.stats = stats
+        def __init__ (self):
                 self.xid_request_map = {}
                 self.orphan_replies = {}
-                self.rqlist = []
                 self.CALL = 1
                 self.REPLY = 2
-                self.optn = optn
-                self.trackfilename = trackfilename
-                self.tracknamefh = tracknamefh
-                self.trackedfilehandles = []
 
         def handle_call_line (self, logline, linecount):
                 newreq = NFSRequest (logline, linecount)
                 xid = newreq.getXID ()
-                if (self.optn == SYNTHESIZE):
-                        self.xid_request_map [xid] = newreq
-                        self.rqlist.append(newreq)
-                elif self.optn == TRACKFILENAME:
-                        if newreq.requestIsEntryOp():
-                                if newreq.entryname == self.trackfilename:
-                                        self.xid_request_map [xid] = newreq
-                                        self.rqlist.append(newreq)
-                                else:
-                                        del newreq
-                        elif self.tracknamefh == ENABLE_TRACKNAME_FH:
-                                if len (self.trackedfilehandles) > 0:
-                                        if newreq.gfid in self.trackedfilehandles:
-                                                self.xid_request_map [xid] = newreq
-                                                self.rqlist.append(newreq)
-                                        else:
-                                                del newreq
-                                else:
-                                        del newreq
-                        else:
-                                del newreq
-
+                self.xid_request_map [xid] = newreq
 
         def handle_reply_line (self, logline, linecount):
                 tokens = logline.strip ().split (" ")
@@ -122,10 +82,7 @@ class NFSLogAnalyzer:
                 if xid not in self.xid_request_map.keys ():
                         self.orphan_replies [xid] = logline
                 else:
-                        rq = self.xid_request_map [xid]
-                        rq.setReply (logline, linecount)
-                        if rq.requestIsEntryOp() and rq.entryname == self.trackfilename:
-                                self.trackedfilehandles.append (rq.replygfid)
+                        self.xid_request_map [xid].setReply (logline, linecount)
 
         def analyzeLine (self, logline, linecount):
                 tokens = logline.strip ().split (" ")
@@ -145,116 +102,43 @@ class NFSLogAnalyzer:
                         self.handle_reply_line (logline, linecount)
 
         def getStats (self):
-                if self.stats == 0:
-                        return
                 rcount = len (self.xid_request_map.keys ())
                 orphancount = len (self.orphan_replies.keys ())
                 print "Requests: " + str(rcount) + ", Orphans: " + str(orphancount)
 
         def dump (self):
                 self.getStats ()
-                for rq in self.rqlist:
+                for rq in self.xid_request_map.values ():
                         rq.dump ()
-                        del rq
-
-                self.rqlist = []
-                self.orphan_replies = {}
-                self.xid_request_map = {}
 
 
-linecount = 0
-
-SYNTHESIZE = 1
-TRACKFILENAME = 2
 
-ENABLESTATS = 1
-DISABLESTATS = 0
 
-ENABLE_TRACKNAME_FH = 1
-DISABLE_TRACKNAME_FH = 0
+linecount = 0
+la = NFSLogAnalyzer ()
 
 progmsgcount = 1000
-dumpinterval = 200000
-operation = SYNTHESIZE
-stats = ENABLESTATS
-tracknamefh = DISABLE_TRACKNAME_FH
-trackfilename = ""
-
-"""
-Print the progress of the analysing operations every X number of lines read from
-the logs, where X is the argument provided to this option.
-
-Use this to print a status message every say 10000 lines processed or 100000
-lines processed to know how much longer the processing will go on for.
+dumpinterval = 2000000
 
-
-USAGE: --progress <NUMLINES>
-"""
 if "--progress" in sys.argv:
         idx = sys.argv.index ("--progress")
         progmsgcount = int(sys.argv[idx+1])
 
-"""
-The replies for a NFS request can be separated by hundreds and even thousands
-of other NFS requests and replies. These can be spread over many hundreds and
-thousands of log lines. This script maintains a memory dict to map each request
-to its reply using the XID. Because this is in-core, there is a limit to the
-number of entries in the dict. At regular intervals, it dumps the mapped
-requests and the replies into the stdout. The requests whose replies were not
-found at the point of dumping are left as orphans, i.e. without info about the
-replies. Use this option to tune the number of lines to maximize the number of
-requests whose replies are found while balancing the dict size with memory
-on the machine. The default works fine for most cases.
-
-USAGE: --dump <NUMLINES>
-"""
+
 if "--dump" in sys.argv:
         idx = sys.argv.index ("--dump")
         dumpinterval = int(sys.argv[idx+1])
 
-"""
-The default operation of the script is to output all the requests mapped to
-their replies in a single line. This operation mode can be changed by this
-argument. It is used to print only those operations that were performed on the
-filename given as the argument to this option. Only those entry operations are
-printed which contain this filename.
-
-USAGE: --trackfilename <filename>
-"""
-if "--trackfilename" in sys.argv:
-        idx = sys.argv.index ("--trackfilename")
-        trackfilename = sys.argv[idx + 1]
-        operation = TRACKFILENAME
-
-"""
-At every dump interval, some stats are printed about the dumped lines.
-Use this option to disable printing that to avoid cluttering the
-output.
-"""
-if "--nostats" in sys.argv:
-        stats = DISABLESTATS
-
-"""
-While tracking a file using --trackfilename, we're only given those
-operations which contain the filename. This excludes a large number
-of operations which operate on that file using its filehandle instead of
-the filename. This option enables outputting those operations also. It
-tracks every single file handle that was ever seen in the log for a given
-filename.
-
-USAGE: --trackfilename
-"""
-if "--tracknamefh" in sys.argv:
-        tracknamefh = ENABLE_TRACKNAME_FH
-
-la = NFSLogAnalyzer (operation, trackfilename, tracknamefh, stats)
-
 for line in sys.stdin:
         linecount = linecount + 1
         if linecount % dumpinterval == 0:
                 sys.stderr.write ("Dumping data..\n")
                 la.dump ()
+                del la
+                la = NFSLogAnalyzer ()
 
         if linecount % progmsgcount == 0:
                 sys.stderr.write ("Integrating line: "+ str(linecount) + "\n")
         la.analyzeLine (line, linecount)
+
+la.dump ()
diff --git a/extras/group-virt.example b/extras/group-virt.example
deleted file mode 100644
index 7dc777f2d..000000000
--- a/extras/group-virt.example
+++ /dev/null
@@ -1,6 +0,0 @@
-quick-read=off
-read-ahead=off
-io-cache=off
-stat-prefetch=off
-eager-lock=enable
-remote-dio=enable
diff --git a/extras/hook-scripts/Makefile.am b/extras/hook-scripts/Makefile.am
deleted file mode 100644
index f6bded20c..000000000
--- a/extras/hook-scripts/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = S29CTDBsetup.sh S30samba-start.sh S30samba-stop.sh S30samba-set.sh S56glusterd-geo-rep-create-post.sh
diff --git a/extras/hook-scripts/S29CTDBsetup.sh b/extras/hook-scripts/S29CTDBsetup.sh
deleted file mode 100644
index e256be1f3..000000000
--- a/extras/hook-scripts/S29CTDBsetup.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/bash
-#non-portable - RHS-2.0 only
-# - The script mounts the 'meta-vol' on start 'event' on a known
-#   directory (eg. /gluster/lock)
-# - Adds the necessary configuration changes for ctdb in smb.conf and
-#   restarts smb service.
-# - P.S: There are other 'tasks' that need to be done outside this script
-#   to get CTDB based failover up and running.
-
-SMB_CONF=/etc/samba/smb.conf
-
-CTDB_MNT=/gluster/lock
-PROGNAME="ctdb"
-OPTSPEC="volname:"
-VOL=
-# $META is the volume that will be used by CTDB as a shared filesystem.
-# It is not desirable to use this volume for storing 'data' as well.
-# META is set to 'all' (viz. a keyword and hence not a legal volume name)
-# to prevent the script from running for volumes it was not intended.
-# User needs to set META to the volume that serves CTDB lockfile.
-META="all"
-
-function sighup_samba () {
-        pid=`cat /var/run/smbd.pid`
-        if [ $pid != " " ]
-        then
-                kill -HUP $pid;
-        else
-                /etc/init.d/smb start
-        fi
-}
-
-function parse_args () {
-        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@)
-        eval set -- "$ARGS"
-
-        while true; do
-            case $1 in
-                --volname)
-                    shift
-                    VOL=$1
-                ;;
-
-                *)
-                     shift
-                     break
-                ;;
-
-            esac
-
-            shift
-        done
-}
-
-function add_glusterfs_ctdb_options () {
-        PAT="Share Definitions"
-        GLUSTER_CTDB_CONFIG="# ctdb config for glusterfs\n\tclustering = yes\n\tidmap backend = tdb2\n\tprivate dir = "$CTDB_MNT"\n"
-
-        sed -i /"$PAT"/i\ "$GLUSTER_CTDB_CONFIG" $SMB_CONF
-}
-
-parse_args $@
-if [ "$META" = "$VOL" ]
-then
-        add_glusterfs_ctdb_options
-        sighup_samba
-        mount -t glusterfs `hostname`:$VOL "$CTDB_MNT" &
-fi
-
diff --git a/extras/hook-scripts/S30samba-set.sh b/extras/hook-scripts/S30samba-set.sh
deleted file mode 100755
index 6b11f5a4f..000000000
--- a/extras/hook-scripts/S30samba-set.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-#Need to be copied to hooks/<HOOKS_VER>/set/post/
-
-#TODO: All gluster and samba paths are assumed for fedora like systems.
-#Some efforts are required to make it work on other distros.
-
-#The preferred way of creating a smb share of a gluster volume has changed.
-#The old method was to create a fuse mount of the volume and share the mount
-#point through samba.
-#
-#New method eliminates the requirement of fuse mount and changes in fstab.
-#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume.
-#
-#This hook script enables user to enable or disable smb share by volume set
-#option. Keys "user.cifs" and "user.smb" both are valid, but user.smb is
-#preferred.
-
-
-PROGNAME="Ssamba-set"
-OPTSPEC="volname:"
-VOL=
-
-enable_smb=""
-
-function parse_args () {
-        ARGS=$(getopt -l $OPTSPEC  -o "o" -name $PROGNAME $@)
-        eval set -- "$ARGS"
-
-        while true; do
-            case $1 in
-            --volname)
-                shift
-                VOL=$1
-                ;;
-            *)
-                shift
-                for pair in $@; do
-                        read key value < <(echo "$pair" | tr "=" " ")
-                        case "$key" in
-                            "user.cifs")
-                                    enable_smb=$value
-                                    ;;
-                            "user.smb")
-                                    enable_smb=$value
-                                    ;;
-                            *)
-                                    ;;
-                        esac
-                done
-
-                shift
-                break
-                ;;
-            esac
-            shift
-        done
-}
-
-function add_samba_share () {
-        volname=$1
-        STRING="\n[gluster-$volname]\n"
-        STRING+="comment = For samba share of volume $volname\n"
-        STRING+="vfs objects = glusterfs\n"
-        STRING+="glusterfs:volume = $volname\n"
-        STRING+="glusterfs:logfile = /var/log/samba/glusterfs-$volname.%%M.log\n"
-        STRING+="glusterfs:loglevel = 7\n"
-        STRING+="path = /\n"
-        STRING+="read only = no\n"
-        STRING+="guest ok = yes\n"
-        printf "$STRING"  >> /etc/samba/smb.conf
-}
-
-function sighup_samba () {
-        pid=`cat /var/run/smbd.pid`
-        if [ "x$pid" != "x" ]
-        then
-                kill -HUP "$pid";
-        else
-                /etc/init.d/smb start
-        fi
-}
-
-function del_samba_share () {
-        volname=$1
-        sed -i "/\[gluster-$volname\]/,/^$/d" /etc/samba/smb.conf
-}
-
-function is_volume_started () {
-        volname=$1
-        echo "$(grep status /var/lib/glusterd/vols/"$volname"/info |\
-                cut -d"=" -f2)"
-}
-
-parse_args $@
-if [ "0" = $(is_volume_started "$VOL") ]; then
-    exit 0
-fi
-
-if [ "$enable_smb" = "enable" ]; then
-    if ! grep --quiet "\[gluster-$VOL\]" /etc/samba/smb.conf ; then
-            add_samba_share $VOL
-            sighup_samba
-    fi
-
-elif [ "$enable_smb" = "disable" ]; then
-    del_samba_share $VOL
-    sighup_samba
-fi
diff --git a/extras/hook-scripts/S30samba-start.sh b/extras/hook-scripts/S30samba-start.sh
deleted file mode 100755
index 34fde0ef8..000000000
--- a/extras/hook-scripts/S30samba-start.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-
-#Need to be copied to hooks/<HOOKS_VER>/start/post
-
-#TODO: All gluster and samba paths are assumed for fedora like systems.
-#Some efforts are required to make it work on other distros.
-
-#The preferred way of creating a smb share of a gluster volume has changed.
-#The old method was to create a fuse mount of the volume and share the mount
-#point through samba.
-#
-#New method eliminates the requirement of fuse mount and changes in fstab.
-#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume.
-#
-#This hook script automagically creates shares for volume on every volume start
-#event by adding the entries in smb.conf file and sending SIGHUP to samba.
-#
-#In smb.conf:
-#glusterfs vfs plugin has to be specified as required vfs object.
-#Path value is relative to the root of gluster volume;"/" signifies complete
-#volume.
-
-PROGNAME="Ssamba-start"
-OPTSPEC="volname:"
-VOL=
-CONFIGFILE=
-LOGFILEBASE=
-PIDDIR=
-
-function parse_args () {
-        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@)
-        eval set -- "$ARGS"
-
-        while true; do
-        case $1 in
-        --volname)
-         shift
-         VOL=$1
-         ;;
-        *)
-         shift
-         break
-         ;;
-        esac
-        shift
-        done
-}
-
-function find_config_info () {
-        cmdout=`smbd -b | grep smb.conf`
-        if [ $? -ne 0 ];then
-                echo "Samba is not installed"
-                exit 1
-        fi
-        CONFIGFILE=`echo $cmdout | awk {'print $2'}`
-        PIDDIR=`smbd -b | grep PIDDIR | awk {'print $2'}`
-        LOGFILEBASE=`smbd -b | grep 'LOGFILEBASE' | awk '{print $2}'`
-}
-
-function add_samba_share () {
-        volname=$1
-        STRING="\n[gluster-$volname]\n"
-        STRING+="comment = For samba share of volume $volname\n"
-        STRING+="vfs objects = glusterfs\n"
-        STRING+="glusterfs:volume = $volname\n"
-        STRING+="glusterfs:logfile = $LOGFILEBASE/glusterfs-$volname.%%M.log\n"
-        STRING+="glusterfs:loglevel = 7\n"
-        STRING+="path = /\n"
-        STRING+="read only = no\n"
-        STRING+="guest ok = yes\n"
-        printf "$STRING"  >> ${CONFIGFILE}
-}
-
-function sighup_samba () {
-        pid=`cat ${PIDDIR}/smbd.pid`
-        if [ "x$pid" != "x" ]
-        then
-                kill -HUP "$pid";
-        else
-                /etc/init.d/smb condrestart
-        fi
-}
-
-function get_smb () {
-        volname=$1
-        uservalue=
-
-        usercifsvalue=$(grep user.cifs /var/lib/glusterd/vols/"$volname"/info |\
-                        cut -d"=" -f2)
-        usersmbvalue=$(grep user.smb /var/lib/glusterd/vols/"$volname"/info |\
-                       cut -d"=" -f2)
-
-        if [[ $usercifsvalue = "disable" || $usersmbvalue = "disable" ]]; then
-                uservalue="disable"
-        fi
-        echo "$uservalue"
-}
-
-parse_args $@
-if [ $(get_smb "$VOL") = "disable" ]; then
-        exit 0
-fi
-
-#Find smb.conf, smbd pid directory and smbd logfile path
-find_config_info
-
-if ! grep --quiet "\[gluster-$VOL\]" ${CONFIGFILE} ; then
-        add_samba_share $VOL
-        sighup_samba
-fi
diff --git a/extras/hook-scripts/S30samba-stop.sh b/extras/hook-scripts/S30samba-stop.sh
deleted file mode 100755
index 8950eea43..000000000
--- a/extras/hook-scripts/S30samba-stop.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/bash
-
-#Need to be copied to hooks/<HOOKS_VER>/stop/pre
-
-#TODO: All gluster and samba paths are assumed for fedora like systems.
-#Some efforts are required to make it work on other distros.
-
-#The preferred way of creating a smb share of a gluster volume has changed.
-#The old method was to create a fuse mount of the volume and share the mount
-#point through samba.
-#
-#New method eliminates the requirement of fuse mount and changes in fstab.
-#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume.
-#
-#This hook script automagically removes shares for volume on every volume stop
-#event by removing the volume related entries(if any) in smb.conf file.
-
-PROGNAME="Ssamba-stop"
-OPTSPEC="volname:"
-VOL=
-CONFIGFILE=
-PIDDIR=
-
-function parse_args () {
-        ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@)
-        eval set -- "$ARGS"
-
-        while true; do
-        case $1 in
-        --volname)
-         shift
-         VOL=$1
-         ;;
-        *)
-         shift
-         break
-         ;;
-        esac
-        shift
-        done
-}
-
-function find_config_info () {
-        cmdout=`smbd -b | grep smb.conf`
-        if [ $? -ne 0 ];then
-                echo "Samba is not installed"
-                exit 1
-        fi
-        CONFIGFILE=`echo $cmdout | awk {'print $2'}`
-        PIDDIR=`smbd -b | grep PIDDIR | awk {'print $2'}`
-}
-
-function del_samba_share () {
-        volname=$1
-        sed -i "/\[gluster-$volname\]/,/^$/d" ${CONFIGFILE}
-}
-
-function sighup_samba () {
-        pid=`cat ${PIDDIR}/smbd.pid`
-        if [ "x$pid" != "x" ]
-        then
-                kill -HUP $pid;
-        else
-                /etc/init.d/smb condrestart
-        fi
-}
-
-parse_args $@
-find_config_info
-del_samba_share $VOL
-sighup_samba
diff --git a/extras/hook-scripts/S40ufo-stop.py b/extras/hook-scripts/S40ufo-stop.py
deleted file mode 100755
index 107f19683..000000000
--- a/extras/hook-scripts/S40ufo-stop.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-
-import os
-from optparse import OptionParser
-
-if __name__ == '__main__':
-    # check if swift is installed
-    try:
-        from gluster.swift.common.Glusterfs import get_mnt_point, unmount
-    except ImportError:
-        import sys
-        sys.exit("Openstack Swift does not appear to be installed properly");
-
-    op = OptionParser(usage="%prog [options...]")
-    op.add_option('--volname', dest='vol', type=str)
-    op.add_option('--last', dest='last', type=str)
-    (opts, args) = op.parse_args()
-
-
-    mnt_point = get_mnt_point(opts.vol)
-    if mnt_point:
-        unmount(mnt_point)
-    else:
-        sys.exit("get_mnt_point returned none for mount point")
diff --git a/extras/hook-scripts/S56glusterd-geo-rep-create-post.sh b/extras/hook-scripts/S56glusterd-geo-rep-create-post.sh
deleted file mode 100755
index 1369c22fc..000000000
--- a/extras/hook-scripts/S56glusterd-geo-rep-create-post.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-key_val_pair1=`echo $2 | cut -d ' ' -f 1`
-key_val_pair2=`echo $2 | cut -d ' ' -f 2`
-key_val_pair3=`echo $2 | cut -d ' ' -f 3`
-
-key=`echo $key_val_pair1 | cut -d '=' -f 1`
-val=`echo $key_val_pair1 | cut -d '=' -f 2`
-if [ "$key" != "is_push_pem" ]; then
-    exit;
-fi
-if [ "$val" != '1' ]; then
-    exit;
-fi
-
-key=`echo $key_val_pair2 | cut -d '=' -f 1`
-val=`echo $key_val_pair2 | cut -d '=' -f 2`
-if [ "$key" != "pub_file" ]; then
-    exit;
-fi
-if [ "$val" == "" ]; then
-    exit;
-fi
-pub_file=`echo $val`
-pub_file_tmp=`echo $val`_tmp
-
-key=`echo $key_val_pair3 | cut -d '=' -f 1`
-val=`echo $key_val_pair3 | cut -d '=' -f 2`
-if [ "$key" != "slave_ip" ]; then
-    exit;
-fi
-if [ "$val" == "" ]; then
-    exit;
-fi
-slave_ip=`echo $val`
-
-if [ -f $pub_file ]; then
-    scp $pub_file $slave_ip:$pub_file_tmp
-    ssh $slave_ip "mv $pub_file_tmp $pub_file"
-    ssh $slave_ip "gluster system:: copy file /geo-replication/common_secret.pem.pub > /dev/null"
-    ssh $slave_ip "gluster system:: execute add_secret_pub > /dev/null"
-fi
diff --git a/extras/init.d/Makefile.am b/extras/init.d/Makefile.am
index 38898fddd..66715f431 100644
--- a/extras/init.d/Makefile.am
+++ b/extras/init.d/Makefile.am
@@ -1,22 +1,19 @@
 
-EXTRA_DIST = glusterd-Debian glusterd-Redhat glusterd-SuSE glusterd.plist rhel5-load-fuse.modules
+EXTRA_DIST = glusterd-Debian glusterd-Redhat glusterd-SuSE glusterd.plist
 
 CLEANFILES = 
 
-INIT_DIR = @initdir@
-SYSTEMD_DIR = @systemddir@
-LAUNCHD_DIR = @launchddir@
+initdir = @initdir@
+launchddir = @launchddir@
 
 $(GF_DISTRIBUTION): 
-	@if [ ! -d $(SYSTEMD_DIR) ]; then \
-		$(mkdir_p) $(DESTDIR)$(INIT_DIR); \
-		$(INSTALL_PROGRAM) glusterd-$(GF_DISTRIBUTION) $(DESTDIR)$(INIT_DIR)/glusterd; \
-	fi
+	$(mkdir_p) $(DESTDIR)$(initdir)	
+	$(INSTALL_PROGRAM) glusterd-$(GF_DISTRIBUTION) $(DESTDIR)$(initdir)/glusterd
 
 install-exec-local: $(GF_DISTRIBUTION)
 
 install-data-local: 
 if GF_DARWIN_HOST_OS
-	$(mkdir_p) $(DESTDIR)$(LAUNCHD_DIR)
-	$(INSTALL_PROGRAM) glusterd.plist $(DESTDIR)$(LAUNCHD_DIR)/com.gluster.glusterd.plist
+	$(mkdir_p) $(DESTDIR)$(launchddir)
+	$(INSTALL_PROGRAM) glusterd.plist $(DESTDIR)$(launchddir)/com.gluster.glusterd.plist
 endif
diff --git a/extras/init.d/glusterd-Redhat.in b/extras/init.d/glusterd-Redhat.in
index e320708ae..6e1260e5c 100755
--- a/extras/init.d/glusterd-Redhat.in
+++ b/extras/init.d/glusterd-Redhat.in
@@ -1,142 +1,71 @@
 #!/bin/bash
 #
-# glusterd   Startup script for the glusterfs server
+# chkconfig: 35 90 12
+# description: Gluster File System service for volume management
 #
-# chkconfig:   - 20 80
-# description: Clustered file-system server
 
-### BEGIN INIT INFO
-# Provides: glusterd
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs $network
-# Should-Start: 
-# Should-Stop: 
-# Default-Start: 
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: glusterfs server
-# Description:       Clustered file-system server
-### END INIT INFO
-#
-
-# Source function library.
+# Get function from functions library
 . /etc/rc.d/init.d/functions
 
 BASE=glusterd
-
-# Fedora File System Layout dictates /run
-[ -e /run ] && RUNDIR="/run"
-PIDFILE="${RUNDIR:-/var/run}/${BASE}.pid"
-
-PID=`test -f $PIDFILE && cat $PIDFILE`
-
-# Overwriteable from sysconfig
-LOG_LEVEL=''
-LOG_FILE=''
-GLUSTERD_OPTIONS=''
-GLUSTERD_NOFILE='65536'
-
-[ -f /etc/sysconfig/${BASE} ] && . /etc/sysconfig/${BASE}
-
-[ ! -z $LOG_LEVEL ] && GLUSTERD_OPTIONS="${GLUSTERD_OPTIONS} --log-level ${LOG_LEVEL}"
-[ ! -z $LOG_FILE ] && GLUSTERD_OPTIONS="${GLUSTERD_OPTIONS} --log-file ${LOG_FILE}"
-
 GLUSTERFSD=glusterfsd
 GLUSTERFS=glusterfs
 GLUSTERD_BIN=@prefix@/sbin/$BASE
-GLUSTERD_OPTS="--pid-file=$PIDFILE ${GLUSTERD_OPTIONS}"
+GLUSTERD_OPTS=""
 GLUSTERD="$GLUSTERD_BIN $GLUSTERD_OPTS"
 RETVAL=0
 
-LOCKFILE=/var/lock/subsys/${BASE}
-
 # Start the service $BASE
 start()
 {
-       if pidofproc -p $PIDFILE $GLUSTERD_BIN &> /dev/null; then
-           echo "glusterd service is already running with pid $PID"
-           return 0
-       else
-           ulimit -n $GLUSTERD_NOFILE
-           echo -n $"Starting $BASE:"
-           daemon $GLUSTERD
-           RETVAL=$?
-           echo
-           [ $RETVAL -eq 0 ] && touch $LOCKFILE
-           return $RETVAL
-       fi
+       echo -n $"Starting $BASE:"
+       daemon $GLUSTERD
+       RETVAL=$?
+       echo
+       [ $RETVAL -ne 0 ] && exit $RETVAL
 }
 
 # Stop the service $BASE
 stop()
 {
-    echo -n $"Stopping $BASE:"
-    if pidofproc -p $PIDFILE $GLUSTERD_BIN &> /dev/null; then
-        killproc -p $PIDFILE $BASE
-    else
-        killproc $BASE
-    fi
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
-    return $RETVAL
-}
-
-restart()
-{
-    stop
-    start
-}
-
-reload()
-{
-    restart
-}
-
-force_reload()
-{
-    restart
-}
-
-rh_status()
-{
-    status $BASE
-}
-
-rh_status_q()
-{
-    rh_status &>/dev/null
+       echo -n $"Stopping $BASE:"
+       killproc $BASE
+       echo
+       pidof -c -o %PPID -x $GLUSTERFSD &> /dev/null
+       [ $? -eq 0 ] &&  killproc $GLUSTERFSD &> /dev/null
+
+       #pidof -c -o %PPID -x $GLUSTERFS &> /dev/null
+       #[ $? -eq 0 ] &&  killproc $GLUSTERFS &> /dev/null
+       
+       if [ -f /etc/glusterd/nfs/run/nfs.pid ] ;then
+       pid=`cat /etc/glusterd/nfs/run/nfs.pid`;
+       cmd=`ps -p $pid -o comm=`
+
+       if [ $cmd == "glusterfs" ]; then
+       kill `cat /etc/glusterd/nfs/run/nfs.pid` 
+       fi
+       fi 
 }
 
 
 ### service arguments ###
 case $1 in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 1
+ start)
+       start
+       ;;
+ stop)
+       stop
+       ;;
+ status)
+       status $BASE
+       ;;
+ restart)
+       $0 stop
+       $0 start
+       ;;
+ *)
+       echo $"Usage: $0 {start|stop|status|restart}."
+       exit 1
 esac
 
-exit $?
+exit 0
diff --git a/extras/init.d/glusterd-SuSE.in b/extras/init.d/glusterd-SuSE.in
index 6259bab00..16cf8de6a 100755
--- a/extras/init.d/glusterd-SuSE.in
+++ b/extras/init.d/glusterd-SuSE.in
@@ -2,8 +2,8 @@
 #
 ### BEGIN INIT INFO
 # Provides:       glusterd
-# Required-Start: $remote_fs $network
-# Required-Stop: $remote_fs $network
+# Required-Start: $local_fs $network
+# Required-Stop:
 # Default-Start:  3 5
 # Default-Stop:
 # Short-Description: Gluster File System service for volume management
@@ -61,17 +61,13 @@ case $1 in
 	fi
 	rc_status -v
        ;;
- reload)
-       rc_failed 3
-       rc_status -v
-       ;;
  restart)
        $0 stop
        $0 start
        rc_status
        ;;
  *)
-       echo $"Usage: $0 {start|stop|status|reload|restart}."
+       echo $"Usage: $0 {start|stop|status|restart}."
        exit 1
 esac
 
diff --git a/extras/init.d/rhel5-load-fuse.modules b/extras/init.d/rhel5-load-fuse.modules
deleted file mode 100755
index ee194db99..000000000
--- a/extras/init.d/rhel5-load-fuse.modules
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# fusermount-glusterfs requires the /dev/fuse character device. The fuse module
-# provides this and is loaded on demand in newer Linux distributions.
-#
-
-[ -c /dev/fuse ] || /sbin/modprobe fuse
diff --git a/extras/logger.conf.example b/extras/logger.conf.example
deleted file mode 100644
index 248be5bda..000000000
--- a/extras/logger.conf.example
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Sample logger.conf file to configure enhanced Logging in GlusterFS
-#
-# To enable enhanced logging capabilities,
-#
-# 1. rename this file to /etc/glusterfs/logger.conf
-#
-# 2. rename /etc/rsyslog.d/gluster.conf.example to
-#    /etc/rsyslog.d/gluster.conf
-#
-# This change requires restart of all gluster services/volumes and
-# rsyslog.
-#
diff --git a/extras/ocf/Makefile.am b/extras/ocf/Makefile.am
deleted file mode 100644
index c49a835fb..000000000
--- a/extras/ocf/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_DIST = glusterd.in volume.in
-
-# The root of the OCF resource agent hierarchy
-# Per the OCF standard, it's always "lib",
-# not "lib64" (even on 64-bit platforms).
-ocfdir = $(prefix)/lib/ocf
-
-# The ceph provider directory
-radir = $(ocfdir)/resource.d/$(PACKAGE_NAME)
-
-ra_SCRIPTS = glusterd volume
diff --git a/extras/ocf/glusterd.in b/extras/ocf/glusterd.in
deleted file mode 100755
index c119a285d..000000000
--- a/extras/ocf/glusterd.in
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/bin/sh
-#
-# glusterd
-#
-# Description:  Manages a glusterd server as a (typically cloned)
-#               HA resource
-#
-# Authors:      Florian Haas (hastexo Professional Services GmbH)
-#
-# License:      GNU General Public License (GPL)
-
-#######################################################################
-# Initialization:
-
-: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
-. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
-
-# Convenience variables
-# When sysconfdir and localstatedir aren't passed in as
-# configure flags, they're defined in terms of prefix
-prefix=@prefix@
-#######################################################################
-
-
-OCF_RESKEY_binary_default="glusterd"
-OCF_RESKEY_pid_default="@localstatedir@/run/glusterd.pid"
-OCF_RESKEY_socket_default=""
-OCF_RESKEY_additional_parameters_default=""
-
-: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
-: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
-
-glusterd_meta_data() {
-    cat <<EOF
-<?xml version="1.0"?>
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="glusterd" version="0.1">
-  <version>0.1</version>
-  <longdesc lang="en">
-  </longdesc>
-  <shortdesc lang="en">Manages a Gluster server</shortdesc>
-  <parameters>
-    <parameter name="binary">
-      <longdesc lang="en">
-      Name of the glusterd executable. Specify a full absolute
-      path if the binary is not in your \$PATH.
-      </longdesc>
-      <shortdesc lang="en">glusterd executable</shortdesc>
-      <content type="string" default="$OCF_RESKEY_binary_default"/>
-    </parameter>
-    <parameter name="pid">
-      <longdesc lang="en">
-      Path to the glusterd PID file.
-      </longdesc>
-      <shortdesc lang="en">PID file</shortdesc>
-      <content type="string" default="$OCF_RESKEY_pid_default"/>
-    </parameter>
-    <parameter name="socket">
-      <longdesc lang="en">
-      Path to the glusterd UNIX socket file. If unspecified,
-      glusterd will not listen on any socket.
-      </longdesc>
-      <shortdesc lang="en">Socket file</shortdesc>
-      <content type="string"/>
-    </parameter>
-  </parameters>
-  <actions>
-    <action name="start"        timeout="20" />
-    <action name="stop"         timeout="20" />
-    <action name="monitor"      timeout="20" interval="10" />
-    <action name="reload"       timeout="20" />
-    <action name="meta-data"    timeout="5" />
-    <action name="validate-all"   timeout="20" />
-  </actions>
-</resource-agent>
-EOF
-
-}
-
-glusterd_start() {
-    local glusterd_options
-    # exit immediately if configuration is not valid
-    glusterd_validate_all || exit $?
-
-    # if resource is already running, bail out early
-    if glusterd_monitor; then
-        ocf_log info "Resource is already running"
-        return $OCF_SUCCESS
-    fi
-
-    # actually start up the resource here (make sure to immediately
-    # exit with an $OCF_ERR_ error code if anything goes seriously
-    # wrong)
-    glusterd_options="-p $OCF_RESKEY_pid"
-    if [ -n "$OCF_RESKEY_socket" ]; then
-	glusterd_options="$glusterd_options -S $OCF_RESKEY_socket"
-    fi
-    if [ -n "$OCF_RESKEY_additional_parameters" ]; then
-	glusterd_options="$glusterd_options $OCF_RESKEY_additional_parameters"
-    fi
-
-    ocf_run $OCF_RESKEY_binary $glusterd_options || exit $OCF_ERR_GENERIC
-
-    # After the resource has been started, check whether it started up
-    # correctly. If the resource starts asynchronously, the agent may
-    # spin on the monitor function here -- if the resource does not
-    # start up within the defined timeout, the cluster manager will
-    # consider the start action failed
-    while ! glusterd_monitor; do
-        ocf_log debug "Resource has not started yet, waiting"
-        sleep 1
-    done
-
-    # only return $OCF_SUCCESS if _everything_ succeeded as expected
-    return $OCF_SUCCESS
-}
-
-glusterd_stop() {
-    local rc
-    local pid
-
-    # exit immediately if configuration is not valid
-    glusterd_validate_all || exit $?
-
-    glusterd_monitor
-    rc=$?
-    case "$rc" in
-        "$OCF_SUCCESS")
-            # Currently running. Normal, expected behavior.
-            ocf_log debug "Resource is currently running"
-            ;;
-        "$OCF_NOT_RUNNING")
-            # Currently not running. Nothing to do.
-            ocf_log info "Resource is already stopped"
-            return $OCF_SUCCESS
-            ;;
-    esac
-
-    # actually shut down the resource here (make sure to immediately
-    # exit with an $OCF_ERR_ error code if anything goes seriously
-    # wrong)
-    pid=`cat $OCF_RESKEY_pid`
-    ocf_run kill -s TERM $pid || exit OCF_ERR_GENERIC
-
-    # After the resource has been stopped, check whether it shut down
-    # correctly. If the resource stops asynchronously, the agent may
-    # spin on the monitor function here -- if the resource does not
-    # shut down within the defined timeout, the cluster manager will
-    # consider the stop action failed
-    while glusterd_monitor; do
-        ocf_log debug "Resource has not stopped yet, waiting"
-        sleep 1
-    done
-
-    # only return $OCF_SUCCESS if _everything_ succeeded as expected
-    return $OCF_SUCCESS
-
-}
-
-glusterd_monitor() {
-    local pid
-
-    [ -e $OCF_RESKEY_pid ] || return $OCF_NOT_RUNNING
-
-    pid=`cat $OCF_RESKEY_pid`
-    ocf_run kill -s 0 $pid || return $OCF_NOT_RUNNING
-
-    ocf_log debug "$OCF_RESKEY_binary running with PID $pid"
-    return $OCF_SUCCESS
-}
-
-glusterd_validate_all() {
-    # Test for required binaries
-    check_binary $OCF_RESKEY_binary
-
-    return $OCF_SUCCESS
-}
-
-
-
-# Make sure meta-data and usage always succeed
-case $__OCF_ACTION in
-meta-data)      glusterd_meta_data
-                exit $OCF_SUCCESS
-                ;;
-usage|help)     glusterd_usage
-                exit $OCF_SUCCESS
-                ;;
-esac
-
-# Anything other than meta-data and usage must pass validation
-glusterd_validate_all || exit $?
-
-# Translate each action into the appropriate function call
-case $__OCF_ACTION in
-start)          glusterd_start;;
-stop)           glusterd_stop;;
-status|monitor) glusterd_monitor;;
-reload)         ocf_log info "Reloading..."
-                glusterd_start
-                ;;
-validate-all)   ;;
-notify)		exit $OCF_SUCCESS;;
-*)              glusterd_usage
-                exit $OCF_ERR_UNIMPLEMENTED
-                ;;
-esac
-rc=$?
-
-# The resource agent may optionally log a debug message
-ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION returned $rc"
-exit $rc
diff --git a/extras/ocf/volume.in b/extras/ocf/volume.in
deleted file mode 100755
index 72fd1213a..000000000
--- a/extras/ocf/volume.in
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/bin/sh
-#
-# glusterd
-#
-# Description:  Manages a glusterd server as a (typically cloned)
-#               HA resource
-#
-# Authors:      Florian Haas (hastexo Professional Services GmbH)
-#
-# License:      GNU General Public License (GPL)
-
-#######################################################################
-# Initialization:
-
-: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
-. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
-
-# Convenience variables
-# When sysconfdir and localstatedir aren't passed in as
-# configure flags, they're defined in terms of prefix
-prefix=@prefix@
-SHORTHOSTNAME=`hostname -s`
-#######################################################################
-
-OCF_RESKEY_binary_default="gluster"
-
-: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
-
-volume_meta_data() {
-    cat <<EOF
-<?xml version="1.0"?>
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="volume" version="0.1">
-  <version>0.1</version>
-  <longdesc lang="en">
-Manages a GlusterFS volume and monitors its bricks. When a resource of
-this type is configured as a clone (as is commonly the case), then it
-must have clone ordering enabled.
-  </longdesc>
-  <shortdesc lang="en">Manages a GlusterFS volume</shortdesc>
-  <parameters>
-    <parameter name="volname" required="1">
-      <longdesc lang="en">
-      The name of the volume to manage.
-      </longdesc>
-      <shortdesc lang="en">volume name</shortdesc>
-      <content type="string"/>
-    </parameter>
-    <parameter name="binary">
-      <longdesc lang="en">
-      Name of the gluster executable. Specify a full absolute
-      path if the binary is not in your \$PATH.
-      </longdesc>
-      <shortdesc lang="en">gluster executable</shortdesc>
-      <content type="string" default="$OCF_RESKEY_binary_default"/>
-    </parameter>
-  </parameters>
-  <actions>
-    <action name="start"        timeout="20" />
-    <action name="stop"         timeout="20" />
-    <action name="monitor"      timeout="20" interval="10" />
-    <action name="reload"       timeout="20" />
-    <action name="meta-data"    timeout="5" />
-    <action name="validate-all"   timeout="20" />
-  </actions>
-</resource-agent>
-EOF
-
-}
-
-volume_getdir() {
-    local voldir
-    voldir="@sysconfdir@/glusterd/vols/${OCF_RESKEY_volname}"
-
-    [ -d ${voldir} ] || return 1
-
-    echo "${voldir}"
-    return 0
-}
-
-volume_getbricks() {
-    local infofile
-    local voldir
-    voldir=`volume_getdir`
-    infofile="${voldir}/info"
-
-    [ -e ${infofile} ] || return 1
-
-    echo "`sed -n -e "s/^brick-.\+=${SHORTHOSTNAME}://p" < ${infofile}`"
-    return 0
-}
-
-volume_getpids() {
-    local bricks
-    local piddir
-    local pidfile
-    local infofile
-    local voldir
-
-    voldir=`volume_getdir`
-    bricks=`volume_getbricks`
-    piddir="${voldir}/run"
-
-    for brick in ${bricks}; do
-	pidfile="${piddir}/${SHORTHOSTNAME}${brick}.pid"
-	[ -e $pidfile ] || return 1
-	cat $pidfile
-    done
-
-    return 0
-}
-
-volume_start() {
-    local volume_options
-
-    # exit immediately if configuration is not valid
-    volume_validate_all || exit $?
-
-    # if resource is already running, bail out early
-    if volume_monitor; then
-        ocf_log info "Resource is already running"
-        return $OCF_SUCCESS
-    fi
-
-    # actually start up the resource here
-    ocf_run "$OCF_RESKEY_binary" \
-	volume start "$OCF_RESKEY_volname" force || exit $OCF_ERR_GENERIC
-
-    # After the resource has been started, check whether it started up
-    # correctly. If the resource starts asynchronously, the agent may
-    # spin on the monitor function here -- if the resource does not
-    # start up within the defined timeout, the cluster manager will
-    # consider the start action failed
-    while ! volume_monitor; do
-        ocf_log debug "Resource has not started yet, waiting"
-        sleep 1
-    done
-
-    # only return $OCF_SUCCESS if _everything_ succeeded as expected
-    return $OCF_SUCCESS
-}
-
-volume_stop() {
-    local rc
-    local pid
-
-    # exit immediately if configuration is not valid
-    volume_validate_all || exit $?
-
-    volume_monitor
-    rc=$?
-    case "$rc" in
-        "$OCF_SUCCESS")
-            # Currently running. Normal, expected behavior.
-            ocf_log debug "Resource is currently running"
-            ;;
-        "$OCF_NOT_RUNNING")
-            # Currently not running. Nothing to do.
-            ocf_log info "Resource is already stopped"
-            return $OCF_SUCCESS
-            ;;
-    esac
-
-    # actually shut down the resource here (make sure to immediately
-    # exit with an $OCF_ERR_ error code if anything goes seriously
-    # wrong)
-    pids=`volume_getpids`
-    for pid in $pids; do
-	ocf_run kill -s TERM $pid
-    done
-
-    # After the resource has been stopped, check whether it shut down
-    # correctly. If the resource stops asynchronously, the agent may
-    # spin on the monitor function here -- if the resource does not
-    # shut down within the defined timeout, the cluster manager will
-    # consider the stop action failed
-    while volume_monitor; do
-        ocf_log debug "Resource has not stopped yet, waiting"
-        sleep 1
-    done
-
-    # only return $OCF_SUCCESS if _everything_ succeeded as expected
-    return $OCF_SUCCESS
-
-}
-
-volume_monitor() {
-    local pid
-
-    pids=`volume_getpids` || return $OCF_NOT_RUNNING
-
-    for pid in $pids; do
-	ocf_run kill -s 0 $pid || return $OCF_NOT_RUNNING
-    done
-
-    ocf_log debug "Local bricks for volume ${OCF_RESKEY_volname} running with PIDs $pids"
-    return $OCF_SUCCESS
-}
-
-volume_validate_all() {
-    # Test for configuration errors first
-    if [ -z "${OCF_RESKEY_volname}" ]; then
-	ocf_log err 'Missing required parameter "volname"'
-	return $OCF_ERR_CONFIGURED
-    fi
-
-    # Test for required binaries
-    check_binary $OCF_RESKEY_binary
-
-    return $OCF_SUCCESS
-}
-
-
-
-# Make sure meta-data and usage always succeed
-case $__OCF_ACTION in
-meta-data)      volume_meta_data
-                exit $OCF_SUCCESS
-                ;;
-usage|help)     volume_usage
-                exit $OCF_SUCCESS
-                ;;
-esac
-
-# Anything other than meta-data and usage must pass validation
-volume_validate_all || exit $?
-
-# Translate each action into the appropriate function call
-case $__OCF_ACTION in
-start)          volume_start;;
-stop)           volume_stop;;
-status|monitor) volume_monitor;;
-reload)         ocf_log info "Reloading..."
-                volume_start
-                ;;
-validate-all)   ;;
-notify)		exit $OCF_SUCCESS;;
-*)              volume_usage
-                exit $OCF_ERR_UNIMPLEMENTED
-                ;;
-esac
-rc=$?
-
-# The resource agent may optionally log a debug message
-ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION returned $rc"
-exit $rc
diff --git a/extras/profiler/glusterfs-profiler b/extras/profiler/glusterfs-profiler
index 65d445864..042eadcf2 100755
--- a/extras/profiler/glusterfs-profiler
+++ b/extras/profiler/glusterfs-profiler
@@ -1,15 +1,22 @@
 #!/usr/bin/env python
 
-#  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
-#  This file is part of GlusterFS.
+# texttable - module for creating simple ASCII tables
+# Copyright (C) 2003-2010 Gerome Fournier <jefke(at)free.fr>
 #
-#  This file is licensed to you under your choice of the GNU Lesser
-#  General Public License, version 3 or any later version (LGPLv3 or
-#  later), or the GNU General Public License, version 2 (GPLv2), in all
-#  cases as published by the Free Software Foundation.
-
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-# texttable - module for creating simple ASCII tables
 # Incorporated from texttable.py downloaded from
 # http://jefke.free.fr/stuff/python/texttable/texttable-0.7.0.tar.gz
 
diff --git a/extras/prot_filter.py b/extras/prot_filter.py
deleted file mode 100755
index 7dccacf15..000000000
--- a/extras/prot_filter.py
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/bin/python
-
-"""
-  Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-"""
-
-"""
-  INSTRUCTIONS
-  Put this in /usr/lib64/glusterfs/$version/filter to have it run automatically,
-  or else you'll have to run it by hand every time you change the volume
-  configuration.  Give it a list of volume names on which to enable the
-  protection functionality; it will deliberately ignore client volfiles for
-  other volumes, and all server volfiles.  It *will* include internal client
-  volfiles such as those used for NFS or rebalance/self-heal; this is a
-  deliberate choice so that it will catch deletions from those sources as well.
-"""
-
-volume_list = [ "jdtest" ]
-
-import copy
-import string
-import sys
-import types
-
-class Translator:
-    def __init__ (self, name):
-        self.name = name
-        self.xl_type = ""
-        self.opts = {}
-        self.subvols = []
-        self.dumped = False
-    def __repr__ (self):
-        return "<Translator %s>" % self.name
-
-def load (path):
-    # If it's a string, open it; otherwise, assume it's already a
-    # file-like object (most notably from urllib*).
-    if type(path) in types.StringTypes:
-        fp = file(path,"r")
-    else:
-        fp = path
-    all_xlators = {}
-    xlator = None
-    last_xlator = None
-    while True:
-        text = fp.readline()
-        if text == "":
-            break
-        text = text.split()
-        if not len(text):
-            continue
-        if text[0] == "volume":
-            if xlator:
-                raise RuntimeError, "nested volume definition"
-            xlator = Translator(text[1])
-            continue
-        if not xlator:
-            raise RuntimeError, "text outside volume definition"
-        if text[0] == "type":
-            xlator.xl_type = text[1]
-            continue
-        if text[0] == "option":
-            xlator.opts[text[1]] = string.join(text[2:])
-            continue
-        if text[0] == "subvolumes":
-            for sv in text[1:]:
-                xlator.subvols.append(all_xlators[sv])
-            continue
-        if text[0] == "end-volume":
-            all_xlators[xlator.name] = xlator
-            last_xlator = xlator
-            xlator = None
-            continue
-        raise RuntimeError, "unrecognized keyword %s" % text[0]
-    if xlator:
-        raise RuntimeError, "unclosed volume definition"
-    return all_xlators, last_xlator
-
-def generate (graph, last, stream=sys.stdout):
-    for sv in last.subvols:
-        if not sv.dumped:
-            generate(graph,sv,stream)
-            print >> stream, ""
-            sv.dumped = True
-    print >> stream, "volume %s" % last.name
-    print >> stream, "    type %s" % last.xl_type
-    for k, v in last.opts.iteritems():
-        print >> stream, "    option %s %s" % (k, v)
-    if last.subvols:
-        print >> stream, "    subvolumes %s" % string.join(
-            [ sv.name for sv in last.subvols ])
-    print >> stream, "end-volume"
-
-def push_filter (graph, old_xl, filt_type, opts={}):
-    new_type = "-" + filt_type.split("/")[1]
-    old_type = "-" + old_xl.xl_type.split("/")[1]
-    pos = old_xl.name.find(old_type)
-    if pos >= 0:
-        new_name = old_xl.name
-        old_name = new_name[:pos] + new_type + new_name[len(old_type)+pos:]
-    else:
-        new_name = old_xl.name + old_type
-        old_name = old_xl.name + new_type
-    new_xl = Translator(new_name)
-    new_xl.xl_type = old_xl.xl_type
-    new_xl.opts = old_xl.opts
-    new_xl.subvols = old_xl.subvols
-    graph[new_xl.name] = new_xl
-    old_xl.name = old_name
-    old_xl.xl_type = filt_type
-    old_xl.opts = opts
-    old_xl.subvols = [new_xl]
-    graph[old_xl.name] = old_xl
-
-if __name__ == "__main__":
-    path = sys.argv[1]
-    # Alow an override for debugging.
-    for extra in sys.argv[2:]:
-        volume_list.append(extra)
-    graph, last = load(path)
-    for v in volume_list:
-        if graph.has_key(v):
-            break
-    else:
-        print "No configured volumes found - aborting."
-        sys.exit(0)
-    for v in graph.values():
-        if v.xl_type == "cluster/distribute":
-            push_filter(graph,v,"features/prot_dht")
-        elif v.xl_type == "protocol/client":
-            push_filter(graph,v,"features/prot_client")
-    # We push debug/trace so that every fop gets a real frame, because DHT
-    # gets confused if STACK_WIND_TAIL causes certain fops to be invoked
-    # from anything other than a direct child.
-    for v in graph.values():
-        if v.xl_type == "features/prot_client":
-            push_filter(graph,v,"debug/trace")
-    generate(graph,last,stream=open(path,"w"))
diff --git a/extras/rebalance.py b/extras/rebalance.py
deleted file mode 100755
index 80c614c5d..000000000
--- a/extras/rebalance.py
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/usr/bin/python
-
-import atexit
-import copy
-import optparse
-import os
-import pipes
-import shutil
-import string
-import subprocess
-import sys
-import tempfile
-import volfilter
-
-# It's just more convenient to have named fields.
-class Brick:
-        def __init__ (self, path, name):
-                self.path = path
-                self.sv_name = name
-                self.size = 0
-                self.curr_size = 0
-                self.good_size = 0
-        def set_size (self, size):
-                self.size = size
-        def set_range (self, rs, re):
-                self.r_start = rs
-                self.r_end = re
-                self.curr_size = self.r_end - self.r_start + 1
-        def __repr__ (self):
-                value = self.path[:]
-                value += "(%d," % self.size
-                if self.curr_size:
-                        value += "0x%x,0x%x)" % (self.r_start, self.r_end)
-                else:
-                        value += "-)"
-                return value
-
-def get_bricks (host, vol):
-        t = pipes.Template()
-        t.prepend("gluster --remote-host=%s system getspec %s"%(host,vol),".-")
-        return t.open(None,"r")
-
-def generate_stanza (vf, all_xlators, cur_subvol):
-        sv_list = []
-        for sv in cur_subvol.subvols:
-                generate_stanza(vf,all_xlators,sv)
-                sv_list.append(sv.name)
-        vf.write("volume %s\n"%cur_subvol.name)
-        vf.write("  type %s\n"%cur_subvol.type)
-        for kvpair in cur_subvol.opts.iteritems():
-                vf.write("  option %s %s\n"%kvpair)
-        if sv_list:
-                vf.write("  subvolumes %s\n"%string.join(sv_list))
-        vf.write("end-volume\n\n")
-
-
-def mount_brick (localpath, all_xlators, dht_subvol):
-
-        # Generate a volfile.
-        vf_name = localpath + ".vol"
-        vf = open(vf_name,"w")
-        generate_stanza(vf,all_xlators,dht_subvol)
-        vf.flush()
-        vf.close()
-
-        # Create a brick directory and mount the brick there.
-        os.mkdir(localpath)
-        subprocess.call(["glusterfs","-f",vf_name,localpath])
-
-# We use the command-line tools because there's no getxattr support in the
-# Python standard library (which is ridiculous IMO).  Adding the xattr package
-# from PyPI would create a new and difficult dependency because the bits to
-# satisfy it don't seem to exist in Fedora.  We already expect the command-line
-# tools to be there, so it's safer just to rely on them.
-#
-# We might have to revisit this if we get as far as actually issuing millions
-# of setxattr requests.  Even then, it might be better to do that part with a C
-# program which has only a build-time dependency.
-def get_range (brick):
-        t = pipes.Template()
-        cmd = "getfattr -e hex -n trusted.glusterfs.dht %s 2> /dev/null"
-        t.prepend(cmd%brick,".-")
-        t.append("grep ^trusted.glusterfs.dht=","--")
-        f = t.open(None,"r")
-        try:
-                value = f.readline().rstrip().split('=')[1][2:]
-        except:
-                print "could not get layout for %s (might be OK)" % brick
-                return None
-        v_start = int("0x"+value[16:24],16)
-        v_end = int("0x"+value[24:32],16)
-        return (v_start, v_end)
-
-def calc_sizes (bricks, total):
-        leftover = 1 << 32
-        for b in bricks:
-               if b.size:
-                        b.good_size = (b.size << 32) / total
-                        leftover -= b.good_size
-               else:
-                        b.good_size = 0
-        if leftover:
-                # Add the leftover to an old brick if we can.
-                for b in bricks:
-                        if b.good_size:
-                                b.good_size += leftover
-                                break
-                else:
-                        # Fine, just add it wherever.
-                        bricks[0].good_size += leftover
-
-# Normalization means sorting the bricks by r_start and (b) ensuring that there
-# are no gaps.
-def normalize (in_bricks):
-        out_bricks = []
-        curr_hash = 0
-        used = 0
-        while curr_hash < (1<<32):
-                curr_best = None
-                for b in in_bricks:
-                        if b.r_start == curr_hash:
-                                used += 1
-                                out_bricks.append(b)
-                                in_bricks.remove(b)
-                                curr_hash = b.r_end + 1
-                                break
-                else:
-                        print "gap found at 0x%08x" % curr_hash
-                        sys.exit(1)
-        return out_bricks + in_bricks, used
-
-def get_score (bricks):
-        score = 0
-        curr_hash = 0
-        for b in bricks:
-                if not b.curr_size:
-                        curr_hash += b.good_size
-                        continue
-                new_start = curr_hash
-                curr_hash += b.good_size
-                new_end = curr_hash - 1
-                if new_start > b.r_start:
-                        max_start = new_start
-                else:
-                        max_start = b.r_start
-                if new_end < b.r_end:
-                        min_end = new_end
-                else:
-                        min_end = b.r_end
-                if max_start <= min_end:
-                        score += (min_end - max_start + 1)
-        return score
-
-if __name__ == "__main__":
-
-	my_usage = "%prog [options] server volume [directory]"
-	parser = optparse.OptionParser(usage=my_usage)
-        parser.add_option("-f", "--free-space", dest="free_space",
-                          default=False, action="store_true",
-                          help="use free space instead of total space")
-        parser.add_option("-l", "--leave-mounted", dest="leave_mounted",
-                          default=False, action="store_true",
-                          help="leave subvolumes mounted")
-        parser.add_option("-v", "--verbose", dest="verbose",
-                          default=False, action="store_true",
-                          help="verbose output")
-	options, args = parser.parse_args()
-
-        if len(args) == 3:
-                fix_dir = args[2]
-        else:
-                if len(args) != 2:
-                        parser.print_help()
-                        sys.exit(1)
-                fix_dir = None
-        hostname, volname = args[:2]
-
-        # Make sure stuff gets cleaned up, even if there are exceptions.
-        orig_dir = os.getcwd()
-        work_dir = tempfile.mkdtemp()
-        bricks = []
-        def cleanup_workdir ():
-                os.chdir(orig_dir)
-                if options.verbose:
-                        print "Cleaning up %s" % work_dir
-                for b in bricks:
-                        subprocess.call(["umount",b.path])
-                shutil.rmtree(work_dir)
-        if not options.leave_mounted:
-                atexit.register(cleanup_workdir)
-        os.chdir(work_dir)
-
-        # Mount each brick individually, so we can issue brick-specific calls.
-        if options.verbose:
-                print "Mounting subvolumes..."
-        index = 0
-        volfile_pipe = get_bricks(hostname,volname)
-        all_xlators, last_xlator = volfilter.load(volfile_pipe)
-        for dht_vol in all_xlators.itervalues():
-                if dht_vol.type == "cluster/distribute":
-                        break
-        else:
-                print "no DHT volume found"
-                sys.exit(1)
-        for sv in dht_vol.subvols:
-                #print "found subvol %s" % sv.name
-                lpath = "%s/brick%s" % (work_dir, index)
-                index += 1
-                mount_brick(lpath,all_xlators,sv)
-                bricks.append(Brick(lpath,sv.name))
-        if index == 0:
-                print "no bricks"
-                sys.exit(1)
-
-        # Collect all of the sizes.
-        if options.verbose:
-                print "Collecting information..."
-        total = 0
-        for b in bricks:
-                info = os.statvfs(b.path)
-                # We want a standard unit even if different bricks use
-                # different block sizes.  The size is chosen to avoid overflows
-                # for very large bricks with very small block sizes, but also
-                # accommodate filesystems which use very large block sizes to
-                # cheat on benchmarks.
-                blocksper100mb = 104857600 / info[0]
-                if options.free_space:
-                        size = info[3] / blocksper100mb
-                else:
-                        size = info[2] / blocksper100mb
-                if size <= 0:
-                        print "brick %s has invalid size %d" % (b.path, size)
-                        sys.exit(1)
-                b.set_size(size)
-                total += size
-
-        # Collect all of the layout information.
-        for b in bricks:
-                hash_range = get_range(b.path)
-                if hash_range is not None:
-                        rs, re = hash_range
-                        if rs > re:
-                                print "%s has backwards hash range" % b.path
-                                sys.exit(1)
-                        b.set_range(hash_range[0],hash_range[1])
-
-        if options.verbose:
-                print "Calculating new layouts..."
-        calc_sizes(bricks,total)
-        bricks, used = normalize(bricks)
-
-        # We can't afford O(n!) here, but O(n^2) should be OK and the result
-        # should be almost as good.
-        while used < len(bricks):
-                best_place = used
-                best_score = get_score(bricks)
-                for i in xrange(used):
-                        new_bricks = bricks[:]
-                        del new_bricks[used]
-                        new_bricks.insert(i,bricks[used])
-                        new_score = get_score(new_bricks)
-                        if new_score > best_score:
-                                best_place = i
-                                best_score = new_score
-                if best_place != used:
-                        nb = bricks[used]
-                        del bricks[used]
-                        bricks.insert(best_place,nb)
-                used += 1
-
-        # Finalize whatever we decided on.
-        curr_hash = 0
-        for b in bricks:
-                b.r_start = curr_hash
-                curr_hash += b.good_size
-                b.r_end = curr_hash - 1
-
-        print "Here are the xattr values for your size-weighted layout:"
-        for b in bricks:
-                print "  %s: 0x0000000200000000%08x%08x" % (
-                        b.sv_name, b.r_start, b.r_end)
-
-        if fix_dir:
-                if options.verbose:
-                        print "Fixing layout for %s" % fix_dir
-                for b in bricks:
-                        value = "0x0000000200000000%08x%08x" % (
-                                b.r_start, b.r_end)
-                        path = "%s/%s" % (b.path, fix_dir)
-                        cmd = "setfattr -n trusted.glusterfs.dht -v %s %s" % (
-                                value, path)
-                        print cmd
-
-        if options.leave_mounted:
-                print "The following subvolumes are still mounted:"
-                for b in bricks:
-                        print "%s on %s" % (b.sv_name, b.path)
-                print "Don't forget to clean up when you're done."
-
diff --git a/extras/rpc-coverage.sh b/extras/rpc-coverage.sh
index 9148a73e2..ebb92a2a1 100755
--- a/extras/rpc-coverage.sh
+++ b/extras/rpc-coverage.sh
@@ -398,7 +398,8 @@ function test_getxattr()
 function test_removexattr()
 {
     setfattr -x trusted.testing $PFX/dir/file || fail "setfattr remove"
-    getfattr -n trusted.testing $PFXf/dir/file 2>&1 | grep -q "No such attribute"
+    getfattr -n trusted.testing $PFX/dir/file 2>&1 | grep -q 'No such attribute' \
+	|| fail "getfattr"
 }
 
 
diff --git a/extras/stripe-merge.c b/extras/stripe-merge.c
index 74bd47e30..3f8e4b124 100644
--- a/extras/stripe-merge.c
+++ b/extras/stripe-merge.c
@@ -1,494 +1,48 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-/*
- * stripe-merge.c
- *
- * This program recovers an original file based on the striped files stored on
- * the individual bricks of a striped volume. The file format and stripe
- * geometry is validated through the extended attributes stored in the file.
- *
- * TODO: Support optional xattr recovery (i.e., user xattrs). Perhaps provide a
- * 	 command-line flag to toggle this behavior.
- */
-
 #include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <errno.h>
-#include <string.h>
-#include <attr/xattr.h>
-#include <fnmatch.h>
-
-#define ATTRNAME_STRIPE_INDEX "trusted.*.stripe-index"
-#define ATTRNAME_STRIPE_COUNT "trusted.*.stripe-count"
-#define ATTRNAME_STRIPE_SIZE "trusted.*.stripe-size"
-#define ATTRNAME_STRIPE_COALESCE "trusted.*.stripe-coalesce"
 
-#define INVALID_FD -1
-#define INVALID_MODE UINT32_MAX
-
-struct file_stripe_info {
-	int stripe_count;
-	int stripe_size;
-	int coalesce;
-	mode_t mode;
-	int fd[0];
-};
-
-static int close_files(struct file_stripe_info *);
-
-static struct
-file_stripe_info *alloc_file_stripe_info(int count)
+int
+main (int argc, char *argv[])
 {
+	int fds[argc-1];
+	char buf[argc-1][4096];
 	int i;
-	struct file_stripe_info *finfo;
+	int max_ret, ret;
 
-	finfo = calloc(1, sizeof(struct file_stripe_info) +
-		(sizeof(int) * count));
-	if (!finfo)
-		return NULL;
-
-	for (i = 0; i < count; i++)
-		finfo->fd[i] = INVALID_FD;
-
-	finfo->mode = INVALID_MODE;
-	finfo->coalesce = INVALID_FD;
-
-	return finfo;
-}
-
-/*
- * Search for an attribute matching the provided pattern. Return a count for
- * the total number of matching entries (including 0). Allocate a buffer for
- * the first matching entry found.
- */
-static int
-get_stripe_attr_name(const char *path, const char *pattern, char **attrname)
-{
-	char attrbuf[4096];
-	char *ptr, *match = NULL;
-	int len, r, match_count = 0;
-
-	if (!path || !pattern || !attrname)
-		return -1;
-
-	len = listxattr(path, attrbuf, sizeof(attrbuf));
-	if (len < 0)
-		return len;
-
-	ptr = attrbuf;
-	while (ptr) {
-		r = fnmatch(pattern, ptr, 0);
-		if (!r) {
-			if (!match)
-				match = ptr;
-			match_count++;
-		} else if (r != FNM_NOMATCH) {
-			return -1;
-		}
-
-		len -= strlen(ptr) + 1;
-		if (len > 0)
-			ptr += strlen(ptr) + 1;
-		else
-			ptr = NULL;
+	if (argc < 2) {
+		printf ("Usage: %s file1 file2 ... >file\n", argv[0]);
+		return 1;
 	}
 
-	if (match)
-		*attrname = strdup(match);
-
-	return match_count;
-}
-
-/*
- * Get the integer representation of a named attribute.
- */
-static int
-get_stripe_attr_val(const char *path, const char *attr, int *val)
-{
-	char attrbuf[4096];
-	int len;
-
-	if (!path || !attr || !val)
-		return -1;
-
-	len = getxattr(path, attr, attrbuf, sizeof(attrbuf));
-	if (len < 0)
-		return len;
-
-	*val = atoi(attrbuf);
-
-	return 0;
-}
-
-/*
- * Get an attribute name/value (assumed to be an integer) pair based on a
- * specified search pattern. A buffer is allocated for the exact attr name
- * returned. Optionally, skip the pattern search if a buffer is provided
- * (which should contain an attribute name).
- *
- * Returns the attribute count or -1 on error. The value parameter is set only
- * when a single attribute is found.
- */
-static int
-get_attr(const char *path, const char *pattern, char **buf, int *val)
-{
-	int count = 1;
-
-	if (!buf)
-		return -1;
-
-	if (!*buf) {
-		count = get_stripe_attr_name(path, pattern, buf);
-		if (count > 1) {
-			/* pattern isn't good enough */
-			fprintf(stderr, "ERROR: duplicate attributes found "
-				"matching pattern: %s\n", pattern);
-			free(*buf);
-			*buf = NULL;
-			return count;
-		} else if (count < 1) {
-			return count;
+	for (i=0; i<argc-1; i++) {
+		fds[i] = open (argv[i+1], O_RDONLY);
+		if (fds[i] == -1) {
+			perror (argv[i+1]);
+			return 1;
 		}
 	}
 
-	if (get_stripe_attr_val(path, *buf, val) < 0)
-		return -1;
-
-	return count;
-}
-
-/*
- * validate_and_open_files()
- *
- * Open the provided source files and validate the extended attributes. Verify
- * that the geometric attributes are consistent across all of the files and
- * print a warning if any files are missing. We proceed without error in the
- * latter case to support partial recovery.
- */
-static struct
-file_stripe_info *validate_and_open_files(char *paths[], int count)
-{
-	int i, val, tmp;
-	struct stat sbuf;
-	char *stripe_count_attr = NULL;
-	char *stripe_size_attr = NULL;
-	char *stripe_index_attr = NULL;
-	char *stripe_coalesce_attr = NULL;
-	struct file_stripe_info *finfo = NULL;
-
-	for (i = 0; i < count; i++) {
-		if (!paths[i])
-			goto err;
-
-		/*
-		 * Check the stripe count first so we can allocate the info
-		 * struct with the appropriate number of fds.
-		 */
-		if (get_attr(paths[i], ATTRNAME_STRIPE_COUNT,
-				&stripe_count_attr, &val) != 1) {
-			fprintf(stderr, "ERROR: %s: attribute: '%s'\n",
-				paths[i], ATTRNAME_STRIPE_COUNT);
-			goto err;
-		}
-		if (!finfo) {
-			finfo = alloc_file_stripe_info(val);
-			if (!finfo)
-				goto err;
-
-			if (val != count)
-				fprintf(stderr, "WARNING: %s: stripe-count "
-					"(%d) != file count (%d). Result may "
-					"be incomplete.\n", paths[i], val,
-					count);
-
-			finfo->stripe_count = val;
-		} else if (val != finfo->stripe_count) {
-			fprintf(stderr, "ERROR %s: invalid stripe count: %d "
-				"(expected %d)\n", paths[i], val,
-				finfo->stripe_count);
-			goto err;
-		}
-
-		/*
-		 * Get and validate the chunk size.
-		 */
-		if (get_attr(paths[i], ATTRNAME_STRIPE_SIZE, &stripe_size_attr,
-				&val) != 1) {
-			fprintf(stderr, "ERROR: %s: attribute: '%s'\n",
-				paths[i], ATTRNAME_STRIPE_SIZE);
-			goto err;
-		}
-
-		if (!finfo->stripe_size) {
-			finfo->stripe_size = val;
-		} else if (val != finfo->stripe_size) {
-			fprintf(stderr, "ERROR: %s: invalid stripe size: %d "
-				"(expected %d)\n", paths[i], val,
-				finfo->stripe_size);
-			goto err;
-		}
-
-		/*
-		 * stripe-coalesce is a backward compatible attribute. If the
-		 * attribute does not exist, assume a value of zero for the
-		 * traditional stripe format.
-		 */
-		tmp = get_attr(paths[i], ATTRNAME_STRIPE_COALESCE,
-				&stripe_coalesce_attr, &val);
-		if (!tmp) {
-			val = 0;
-		} else if (tmp != 1) {
-			fprintf(stderr, "ERROR: %s: attribute: '%s'\n",
-				paths[i], ATTRNAME_STRIPE_COALESCE);
-			goto err;
-		}
-
-		if (finfo->coalesce == INVALID_FD) {
-			finfo->coalesce = val;
-		} else if (val != finfo->coalesce) {
-			fprintf(stderr, "ERROR: %s: invalid coalesce flag\n",
-				paths[i]);
-			goto err;
-		}
-
-		/*
-		 * Get/validate the stripe index and open the file in the
-		 * appropriate fd slot.
-		 */
-		if (get_attr(paths[i], ATTRNAME_STRIPE_INDEX,
-				&stripe_index_attr, &val) != 1) {
-			fprintf(stderr, "ERROR: %s: attribute: '%s'\n",
-				paths[i], ATTRNAME_STRIPE_INDEX);
-			goto err;
-		}
-		if (finfo->fd[val] != INVALID_FD) {
-			fprintf(stderr, "ERROR: %s: duplicate stripe index: "
-				"%d\n", paths[i], val);
-			goto err;
-		}
-
-		finfo->fd[val] = open(paths[i], O_RDONLY);
-		if (finfo->fd[val] < 0)
-			goto err;
-
-		/*
-		 * Get the creation mode for the file.
-		 */
-		if (fstat(finfo->fd[val], &sbuf) < 0)
-			goto err;
-		if (finfo->mode == INVALID_MODE) {
-			finfo->mode = sbuf.st_mode;
-		} else if (sbuf.st_mode != finfo->mode) {
-			fprintf(stderr, "ERROR: %s: invalid mode\n", paths[i]);
-			goto err;
-		}
-	}
-
-	free(stripe_count_attr);
-	free(stripe_size_attr);
-	free(stripe_index_attr);
-	free(stripe_coalesce_attr);
-
-	return finfo;
-err:
-
-	free(stripe_count_attr);
-	free(stripe_size_attr);
-	free(stripe_index_attr);
-	free(stripe_coalesce_attr);
-
-	if (finfo) {
-		close_files(finfo);
-		free(finfo);
-	}
-
-	return NULL;
-}
-
-static int
-close_files(struct file_stripe_info *finfo)
-{
-	int i, ret;
-
-	if (!finfo)
-		return -1;
-
-	for (i = 0; i < finfo->stripe_count; i++) {
-		if (finfo->fd[i] == INVALID_FD)
-			continue;
-
-		ret = close(finfo->fd[i]);
-		if (ret < 0)
-			return ret;
-	}
-
-	return ret;
-}
-
-/*
- * Generate the original file using files striped in the coalesced format.
- * Data in the striped files is stored at a coalesced offset based on the
- * stripe number.
- *
- * Walk through the finfo fds (which are already ordered) and and iteratively
- * copy stripe_size bytes from the source files to the target file. If a source
- * file is missing, seek past the associated stripe_size bytes in the target
- * file.
- */
-static int
-generate_file_coalesce(int target, struct file_stripe_info *finfo)
-{
-	char *buf;
-	int ret = 0;
-	int r, w, i;
-
-	buf = malloc(finfo->stripe_size);
-	if (!buf)
-		return -1;
-
-	i = 0;
-	while (1) {
-		if (finfo->fd[i] == INVALID_FD) {
-			if (lseek(target, finfo->stripe_size, SEEK_CUR) < 0)
-				break;
-
-			i = (i + 1) % finfo->stripe_count;
-			continue;
-		}
-
-		r = read(finfo->fd[i], buf, finfo->stripe_size);
-		if (r < 0) {
-			ret = r;
-			break;
-		}
-		if (!r)
-			break;
-
-		w = write(target, buf, r);
-		if (w < 0) {
-			ret = w;
-			break;
-		}
-
-		i = (i + 1) % finfo->stripe_count;
-	}
-
-	free(buf);
-	return ret;
-}
-
-/*
- * Generate the original file using files striped with the traditional stripe
- * format. Data in the striped files is stored at the equivalent offset from
- * the source file.
- */
-static int
-generate_file_traditional(int target, struct file_stripe_info *finfo)
-{
-	int i, j, max_ret, ret;
-	char buf[finfo->stripe_count][4096];
-
+	max_ret = 0;
 	do {
 		char newbuf[4096] = {0, };
+		int j;
 
 		max_ret = 0;
-		for (i = 0; i < finfo->stripe_count; i++) {
-			memset(buf[i], 0, 4096);
-			ret = read(finfo->fd[i], buf[i], 4096);
+		for (i=0; i<argc-1; i++) {
+			memset (buf[i], 0, 4096);
+			ret = read (fds[i], buf[i], 4096); 
 			if (ret > max_ret)
 				max_ret = ret;
 		}
-		for (i = 0; i < max_ret; i++)
-			for (j = 0; j < finfo->stripe_count; j++)
+		for (i=0; i<max_ret;i++)
+			for (j=0; j<argc-1; j++)
 				newbuf[i] |= buf[j][i];
-			write(target, newbuf, max_ret);
+		write (1, newbuf, max_ret);
 	} while (max_ret);
 
 	return 0;
 }
 
-static int
-generate_file(int target, struct file_stripe_info *finfo)
-{
-	if (finfo->coalesce)
-		return generate_file_coalesce(target, finfo);
-
-	return generate_file_traditional(target, finfo);
-}
-
-static void
-usage(char *name)
-{
-	fprintf(stderr, "Usage: %s [-o <outputfile>] <inputfile1> "
-		"<inputfile2> ...\n", name);
-}
-
-int
-main(int argc, char *argv[])
-{
-	int file_count, opt;
-	char *opath = NULL;
-	int targetfd;
-	struct file_stripe_info *finfo;
-
-	while ((opt = getopt(argc, argv, "o:")) != -1) {
-		switch (opt) {
-		case 'o':
-			opath = optarg;
-			break;
-		default:
-			usage(argv[0]);
-			return -1;
-		}
-	}
-
-	file_count = argc - optind;
-
-	if (!opath || !file_count) {
-		usage(argv[0]);
-		return -1;
-	}
-
-	finfo = validate_and_open_files(&argv[optind], file_count);
-	if (!finfo)
-		goto err;
-
-	targetfd = open(opath, O_RDWR|O_CREAT, finfo->mode);
-	if (targetfd < 0)
-		goto err;
-
-	if (generate_file(targetfd, finfo) < 0)
-		goto err;
-
-	if (fsync(targetfd) < 0)
-		fprintf(stderr, "ERROR: %s\n", strerror(errno));
-	if (close(targetfd) < 0)
-		fprintf(stderr, "ERROR: %s\n", strerror(errno));
-
-	close_files(finfo);
-	free(finfo);
-
-	return 0;
-
-err:
-	if (finfo) {
-		close_files(finfo);
-		free(finfo);
-	}
-
-	return -1;
-}
-
diff --git a/extras/systemd/Makefile.am b/extras/systemd/Makefile.am
deleted file mode 100644
index 3fc656b82..000000000
--- a/extras/systemd/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-CLEANFILES =
-
-SYSTEMD_DIR = @systemddir@
-
-install-exec-local:
-	@if [ -d $(SYSTEMD_DIR) ]; then \
-		$(mkdir_p) $(DESTDIR)$(SYSTEMD_DIR); \
-		$(INSTALL_PROGRAM) glusterd.service $(DESTDIR)$(SYSTEMD_DIR)/; \
-	fi
-
diff --git a/extras/systemd/glusterd.service.in b/extras/systemd/glusterd.service.in
deleted file mode 100644
index fc8d8c9a2..000000000
--- a/extras/systemd/glusterd.service.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=GlusterFS, a clustered file-system server
-After=network.target rpcbind.service
-Before=network-online.target
-
-[Service]
-Type=forking
-PIDFile=/run/glusterd.pid
-LimitNOFILE=65536
-ExecStart=@prefix@/sbin/glusterd -p /run/glusterd.pid
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extras/test/bug-920583.t b/extras/test/bug-920583.t
deleted file mode 100755
index eedbb800a..000000000
--- a/extras/test/bug-920583.t
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-##Copy this file to tests/bugs before running run.sh (cp extras/test/bug-920583.t tests/bugs/)
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-logdir=`gluster --print-logdir`
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-function log-file-name()
-{
-    logfilename=$M0".log"
-    echo ${logfilename:1} | tr / -
-}
-
-log_file=$logdir"/"`log-file-name`
-
-lookup_unhashed_count=`grep "adding option 'lookup-unhashed'" $log_file | wc -l`
-no_child_down_count=`grep "adding option 'assert-no-child-down'" $log_file | wc -l`
-mount -t glusterfs $H0:/$V0 $M0 -o "xlator-option=*dht.assert-no-child-down=yes,xlator-option=*dht.lookup-unhashed=yes"
-touch $M0/file1;
-
-new_lookup_unhashed_count=`grep "adding option 'lookup-unhashed'" $log_file | wc -l`
-new_no_child_down_count=`grep "adding option 'assert-no-child-down'" $log_file | wc -l`
-EXPECT "1" expr $new_lookup_unhashed_count - $lookup_unhashed_count
-EXPECT "1" expr $new_no_child_down_count - $no_child_down_count
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/extras/test/gluster_commands.sh b/extras/test/gluster_commands.sh
index cb2a55fd5..e1e396020 100755
--- a/extras/test/gluster_commands.sh
+++ b/extras/test/gluster_commands.sh
@@ -1,13 +1,21 @@
 #!/bin/bash
 
+#   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+#   This file is part of GlusterFS.
 
-#  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
-#  This file is part of GlusterFS.
-#
-#  This file is licensed to you under your choice of the GNU Lesser
-#  General Public License, version 3 or any later version (LGPLv3 or
-#  later), or the GNU General Public License, version 2 (GPLv2), in all
-#  cases as published by the Free Software Foundation.
+#   GlusterFS 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 3 of the License,
+#   or (at your option) any later version.
+
+#   GlusterFS 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, see
+#   <http://www.gnu.org/licenses/>.
 
 
 # This script tests the basics gluster cli commands.
@@ -46,13 +54,13 @@ gluster volume start vol
 gluster volume info
 sleep 1
 mount -t glusterfs `hostname`:vol /mnt/client
-sleep 1
+sleep 1 
 df -h
 
 echo "adding-brick......."
 gluster volume add-brick vol `hostname`:/exports/exp2
 gluster volume info
-sleep 1
+sleep 1 
 umount /mnt/client
 mount -t glusterfs `hostname`:vol /mnt/client
 df -h
@@ -94,7 +102,7 @@ sleep 1
 echo "removing brick......."
 gluster --mode=script volume remove-brick vol `hostname`:/exports/exp2
 gluster volume info
-sleep 1
+sleep 1 
 df -h
 sleep 1
 
@@ -119,7 +127,7 @@ sleep 1
 echo "starting replicate volume......"
 gluster volume start mirror
 gluster volume info
-sleep 1
+sleep 1 
 mount -t glusterfs `hostname`:mirror /mnt/client
 sleep 1
 df -h
@@ -128,7 +136,7 @@ sleep 1
 echo "adding-brick......."
 gluster volume add-brick mirror `hostname`:/exports/exp3 `hostname`:/exports/exp4
 gluster volume info
-sleep 1
+sleep 1 
 df -h
 sleep 1
 
@@ -170,14 +178,14 @@ sleep 1
 echo "removeing-brick....."
 gluster --mode=script volume remove-brick mirror `hostname`:/exports/exp3 `hostname`:/exports/exp4
 gluster volume info
-sleep 1
+sleep 1 
 df -h
 sleep 1
 
 echo "stopping replicate volume....."
 gluster --mode=script volume stop mirror
 gluster volume info
-sleep 1
+sleep 1 
 umount /mnt/client
 df -h
 
@@ -198,14 +206,14 @@ gluster volume start str
 gluster volume info
 sleep 1
 mount -t glusterfs `hostname`:str /mnt/client
-sleep 1
+sleep 1 
 df -h
 sleep 1
 
 echo "adding brick...."
 gluster volume add-brick str `hostname`:/exports/exp3 `hostname`:/exports/exp4
 gluster volume info
-sleep 1
+sleep 1 
 df -h
 sleep 1
 
diff --git a/extras/test/ld-preload-test/ld-preload-lib.c b/extras/test/ld-preload-test/ld-preload-lib.c
index 88afd14c3..e17305a4a 100644
--- a/extras/test/ld-preload-test/ld-preload-lib.c
+++ b/extras/test/ld-preload-test/ld-preload-lib.c
@@ -1,13 +1,23 @@
 /*
-   Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
+
 /* LD PRELOAD'able library
  * A very simple library that intercepts booster supported system calls
  * and prints a log message to stdout.
diff --git a/extras/test/ld-preload-test/ld-preload-test.c b/extras/test/ld-preload-test/ld-preload-test.c
index 78772f598..55dd98805 100644
--- a/extras/test/ld-preload-test/ld-preload-test.c
+++ b/extras/test/ld-preload-test/ld-preload-test.c
@@ -1,13 +1,23 @@
 /*
-   Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
+
 /*
  * LD PRELOAD Test Tool
  *
diff --git a/extras/test/open-fd-tests.c b/extras/test/open-fd-tests.c
deleted file mode 100644
index 4184079d0..000000000
--- a/extras/test/open-fd-tests.c
+++ /dev/null
@@ -1,64 +0,0 @@
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <attr/xattr.h>
-#include <errno.h>
-#include <string.h>
-
-int
-main (int argc, char *argv[])
-{
-        int          ret      = -1;
-        int          fd       = 0;
-        char        *filename = NULL;
-        int          loop     = 0;
-        struct stat  stbuf    = {0,};
-        char         string[1024] = {0,};
-
-        if (argc > 1)
-                filename = argv[1];
-
-        if (!filename)
-                filename = "temp-fd-test-file";
-
-        fd = open (filename, O_RDWR|O_CREAT|O_TRUNC);
-        if (fd < 0) {
-                fd = 0;
-                fprintf (stderr, "open failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        while (loop < 1000) {
-                /* Use it as a mechanism to test time delays */
-                memset (string, 0, 1024);
-                scanf ("%s", string);
-
-                ret = write (fd, string, strlen (string));
-                if (ret != strlen (string)) {
-                        fprintf (stderr, "write failed : %s (%s %d)\n",
-                                 strerror (errno), string, loop);
-                        goto out;
-                }
-
-                ret = write (fd, "\n", 1);
-                if (ret != 1) {
-                        fprintf (stderr, "write failed : %s (%d)\n",
-                                 strerror (errno), loop);
-                        goto out;
-                }
-
-                loop++;
-        }
-
-        fprintf (stdout, "finishing the test after %d loops\n", loop);
-
-        ret = 0;
-out:
-        if (fd)
-                close (fd);
-
-        return ret;
-}
diff --git a/extras/test/run.sh b/extras/test/run.sh
index 4b3839cf6..2440af237 100755
--- a/extras/test/run.sh
+++ b/extras/test/run.sh
@@ -1,12 +1,21 @@
 #!/bin/sh
 
-#  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
-#  This file is part of GlusterFS.
-#
-#  This file is licensed to you under your choice of the GNU Lesser
-#  General Public License, version 3 or any later version (LGPLv3 or
-#  later), or the GNU General Public License, version 2 (GPLv2), in all
-#  cases as published by the Free Software Foundation.
+#   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+#   This file is part of GlusterFS.
+
+#   GlusterFS 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 3 of the License,
+#   or (at your option) any later version.
+
+#   GlusterFS 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, see
+#   <http://www.gnu.org/licenses/>.
 
 # Running gluster sanity test which starts glusterd and runs gluster commands, and exit at the first failure.
 $PWD/gluster_commands.sh
diff --git a/extras/test/stop_glusterd.sh b/extras/test/stop_glusterd.sh
index a2db13f42..a84689beb 100755
--- a/extras/test/stop_glusterd.sh
+++ b/extras/test/stop_glusterd.sh
@@ -1,12 +1,21 @@
 #!/bin/bash
 
-#  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
-#  This file is part of GlusterFS.
-#
-#  This file is licensed to you under your choice of the GNU Lesser
-#  General Public License, version 3 or any later version (LGPLv3 or
-#  later), or the GNU General Public License, version 2 (GPLv2), in all
-#  cases as published by the Free Software Foundation.
+#   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+#   This file is part of GlusterFS.
+
+#   GlusterFS 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 3 of the License,
+#   or (at your option) any later version.
+
+#   GlusterFS 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, see
+#   <http://www.gnu.org/licenses/>.
 
 #This script stops the glusterd running on the machine. Helpful for gluster sanity script
 
diff --git a/extras/test/test-ffop.c b/extras/test/test-ffop.c
deleted file mode 100644
index 2d174d452..000000000
--- a/extras/test/test-ffop.c
+++ /dev/null
@@ -1,870 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <attr/xattr.h>
-#include <errno.h>
-#include <string.h>
-#include <dirent.h>
-
-int fd_based_fops_1 (char *filename); //for fd based fops after unlink
-int fd_based_fops_2 (char *filename); //for fd based fops before unlink
-int dup_fd_based_fops (char *filename); // fops based on fd after dup
-int path_based_fops (char *filename); //for fops based on path
-int dir_based_fops (char *filename); // for fops which operate on directory
-int link_based_fops (char *filename); //for fops which operate in link files (symlinks)
-int test_open_modes (char *filename); // to test open syscall with open modes available.
-int generic_open_read_write (char *filename, int flag); // generic function which does open write and read.
-
-int
-main (int argc, char *argv[])
-{
-        int   ret           = -1;
-        char  filename[255] = {0,};
-
-        if (argc > 1)
-                strcpy(filename, argv[1]);
-        else
-                strcpy(filename, "temp-xattr-test-file");
-
-        ret = fd_based_fops_1 (strcat(filename, "_1"));
-        if (ret < 0)
-                fprintf (stderr, "fd based file operation 1 failed\n");
-        else
-                fprintf (stdout, "fd based file operation 1 passed\n");
-
-        ret = fd_based_fops_2 (strcat(filename, "_2"));
-        if (ret < 0)
-                fprintf (stderr, "fd based file operation 2 failed\n");
-        else
-                fprintf (stdout, "fd based file operation 2 passed\n");
-
-        ret = dup_fd_based_fops (strcat (filename, "_3"));
-        if (ret < 0)
-                fprintf (stderr, "dup fd based file operation failed\n");
-        else
-                fprintf (stdout, "dup fd based file operation passed\n");
-
-        ret = path_based_fops (strcat (filename, "_4"));
-        if (ret < 0)
-                fprintf (stderr, "path based file operation failed\n");
-        else
-                fprintf (stdout, "path based file operation passed\n");
-
-        ret = dir_based_fops (strcat (filename, "_5"));
-        if (ret < 0)
-                fprintf (stderr, "directory based file operation failed\n");
-        else
-                fprintf (stdout, "directory based file operation passed\n");
-
-        ret = link_based_fops (strcat (filename, "_5"));
-        if (ret < 0)
-                fprintf (stderr, "link based file operation failed\n");
-        else
-                fprintf (stdout, "link based file operation passed\n");
-
-        ret = test_open_modes (strcat (filename, "_5"));
-        if (ret < 0)
-                fprintf (stderr, "testing modes of 'open' call failed\n");
-        else
-                fprintf (stdout, "testing modes of 'open' call passed\n");
-
-out:
-        return ret;
-}
-
-int
-fd_based_fops_1 (char *filename)
-{
-        int         fd        = 0;
-        int         ret       = -1;
-        struct stat stbuf     = {0,};
-        char        wstr[50]  = {0,};
-        char        rstr[50]  = {0,};
-
-        fd = open (filename, O_RDWR|O_CREAT);
-        if (fd < 0) {
-                fd = 0;
-                fprintf (stderr, "open failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = unlink (filename);
-        if (ret < 0) {
-                fprintf (stderr, "unlink failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        strcpy (wstr, "This is my string\n");
-        ret = write (fd, wstr, strlen(wstr));
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "write failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = lseek (fd, 0, SEEK_SET);
-        if (ret < 0) {
-                fprintf (stderr, "lseek failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = read (fd, rstr, strlen(wstr));
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "read failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = memcmp (rstr, wstr, strlen (wstr));
-        if (ret != 0) {
-                ret = -1;
-                fprintf (stderr, "read returning junk\n");
-                goto out;
-        }
-
-        ret = ftruncate (fd, 0);
-        if (ret < 0) {
-                fprintf (stderr, "ftruncate failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fstat (fd, &stbuf);
-        if (ret < 0) {
-                fprintf (stderr, "fstat failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fchmod (fd, 0640);
-        if (ret < 0) {
-                fprintf (stderr, "fchmod failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fchown (fd, 10001, 10001);
-        if (ret < 0) {
-                fprintf (stderr, "fchown failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fsync (fd);
-        if (ret < 0) {
-                fprintf (stderr, "fsync failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fsetxattr (fd, "trusted.xattr-test", "working", 8, 0);
-        if (ret < 0) {
-                fprintf (stderr, "fsetxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fdatasync (fd);
-        if (ret < 0) {
-                fprintf (stderr, "fdatasync failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = flistxattr (fd, NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "flistxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fgetxattr (fd, "trusted.xattr-test", NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "fgetxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fremovexattr (fd, "trusted.xattr-test");
-        if (ret < 0) {
-                fprintf (stderr, "fremovexattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (fd)
-                close (fd);
-
-        return ret;
-}
-
-
-int
-fd_based_fops_2 (char *filename)
-{
-        int         fd    = 0;
-        int         ret   = -1;
-        struct stat stbuf = {0,};
-        char        wstr[50]  = {0,};
-        char        rstr[50]  = {0,};
-
-        fd = open (filename, O_RDWR|O_CREAT);
-        if (fd < 0) {
-                fd = 0;
-                fprintf (stderr, "open failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = ftruncate (fd, 0);
-
-        if (ret < 0) {
-                fprintf (stderr, "ftruncate failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        strcpy (wstr, "This is my second string\n");
-        ret = write (fd, wstr, strlen (wstr));
-        if (ret < 0) {
-                ret = -1;
-                fprintf (stderr, "write failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        lseek (fd, 0, SEEK_SET);
-        if (ret < 0) {
-                fprintf (stderr, "lseek failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = read (fd, rstr, strlen (wstr));
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "read failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = memcmp (rstr, wstr, strlen (wstr));
-        if (ret != 0) {
-                ret = -1;
-                fprintf (stderr, "read returning junk\n");
-                goto out;
-        }
-
-        ret = fstat (fd, &stbuf);
-        if (ret < 0) {
-                fprintf (stderr, "fstat failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fchmod (fd, 0640);
-        if (ret < 0) {
-                fprintf (stderr, "fchmod failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fchown (fd, 10001, 10001);
-        if (ret < 0) {
-                fprintf (stderr, "fchown failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fsync (fd);
-        if (ret < 0) {
-                fprintf (stderr, "fsync failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fsetxattr (fd, "trusted.xattr-test", "working", 8, 0);
-        if (ret < 0) {
-                fprintf (stderr, "fsetxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fdatasync (fd);
-        if (ret < 0) {
-                fprintf (stderr, "fdatasync failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = flistxattr (fd, NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "flistxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fgetxattr (fd, "trusted.xattr-test", NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "fgetxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fremovexattr (fd, "trusted.xattr-test");
-        if (ret < 0) {
-                fprintf (stderr, "fremovexattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-out:
-        if (fd)
-                close (fd);
-        unlink (filename);
-
-        return ret;
-}
-
-int
-path_based_fops (char *filename)
-{
-        int         ret              = -1;
-        int         fd               = 0;
-        struct stat stbuf            = {0,};
-        char        newfilename[255] = {0,};
-
-        fd = creat (filename, 0644);
-        if (fd < 0) {
-                fprintf (stderr, "creat failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = truncate (filename, 0);
-        if (ret < 0) {
-                fprintf (stderr, "truncate failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = stat (filename, &stbuf);
-        if (ret < 0) {
-                fprintf (stderr, "stat failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = chmod (filename, 0640);
-        if (ret < 0) {
-                fprintf (stderr, "chmod failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = chown (filename, 10001, 10001);
-        if (ret < 0) {
-                fprintf (stderr, "chown failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = setxattr (filename, "trusted.xattr-test", "working", 8, 0);
-        if (ret < 0) {
-                fprintf (stderr, "setxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = listxattr (filename, NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "listxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = getxattr (filename, "trusted.xattr-test", NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "getxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = removexattr (filename, "trusted.xattr-test");
-        if (ret < 0) {
-                fprintf (stderr, "removexattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = access (filename, R_OK|W_OK);
-        if (ret < 0) {
-                fprintf (stderr, "access failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        strcpy (newfilename, filename);
-        strcat(newfilename, "_new");
-        ret = rename (filename, newfilename);
-        if (ret < 0) {
-                fprintf (stderr, "rename failed: %s\n", strerror (errno));
-                goto out;
-        }
-        unlink (newfilename);
-
-out:
-        if (fd)
-                close (fd);
-
-        unlink (filename);
-        return ret;
-}
-
-int
-dup_fd_based_fops (char *filename)
-{
-        int         fd        = 0;
-        int         newfd     = 0;
-        int         ret       = -1;
-        struct stat stbuf     = {0,};
-        char        wstr[50]  = {0,};
-        char        rstr[50]  = {0,};
-
-        fd = open (filename, O_RDWR|O_CREAT);
-        if (fd < 0) {
-                fd = 0;
-                fprintf (stderr, "open failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        newfd = dup (fd);
-        if (newfd < 0) {
-                ret = -1;
-                fprintf (stderr, "dup failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        close (fd);
-
-        strcpy (wstr, "This is my string\n");
-        ret = write (newfd, wstr, strlen(wstr));
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "write failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = lseek (newfd, 0, SEEK_SET);
-        if (ret < 0) {
-                fprintf (stderr, "lseek failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = read (newfd, rstr, strlen(wstr));
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "read failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = memcmp (rstr, wstr, strlen (wstr));
-        if (ret != 0) {
-                ret = -1;
-                fprintf (stderr, "read returning junk\n");
-                goto out;
-        }
-
-        ret = ftruncate (newfd, 0);
-        if (ret < 0) {
-                fprintf (stderr, "ftruncate failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fstat (newfd, &stbuf);
-        if (ret < 0) {
-                fprintf (stderr, "fstat failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fchmod (newfd, 0640);
-        if (ret < 0) {
-                fprintf (stderr, "fchmod failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fchown (newfd, 10001, 10001);
-        if (ret < 0) {
-                fprintf (stderr, "fchown failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fsync (newfd);
-        if (ret < 0) {
-                fprintf (stderr, "fsync failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fsetxattr (newfd, "trusted.xattr-test", "working", 8, 0);
-        if (ret < 0) {
-                fprintf (stderr, "fsetxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fdatasync (newfd);
-        if (ret < 0) {
-                fprintf (stderr, "fdatasync failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = flistxattr (newfd, NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "flistxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fgetxattr (newfd, "trusted.xattr-test", NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "fgetxattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = fremovexattr (newfd, "trusted.xattr-test");
-        if (ret < 0) {
-                fprintf (stderr, "fremovexattr failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (newfd)
-                close (newfd);
-        ret = unlink (filename);
-        if (ret < 0) {
-                fprintf (stderr, "unlink failed : %s\n", strerror (errno));
-                goto out;
-        }
-
-        return ret;
-}
-
-int
-dir_based_fops (char *dirname)
-{
-        int            ret           = -1;
-        DIR           *dp            = NULL;
-        char           buff[255]     = {0,};
-        struct dirent *dbuff         = {0,};
-        struct stat    stbuff        = {0,};
-        char           newdname[255] = {0,};
-        char          *cwd           = NULL;
-
-        ret = mkdir (dirname, 0755);
-        if (ret < 0) {
-                fprintf (stderr, "mkdir failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        dp = opendir (dirname);
-        if (dp == NULL) {
-                fprintf (stderr, "opendir failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        dbuff = readdir (dp);
-        if (NULL == dbuff) {
-                fprintf (stderr, "readdir failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = closedir (dp);
-        if (ret < 0) {
-                fprintf (stderr, "closedir failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = stat (dirname, &stbuff);
-        if (ret < 0) {
-                fprintf (stderr, "stat failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = chmod (dirname, 0744);
-        if (ret < 0) {
-                fprintf (stderr, "chmod failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = chown (dirname, 10001, 10001);
-        if (ret < 0) {
-                fprintf (stderr, "chmod failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = setxattr (dirname, "trusted.xattr-test", "working", 8, 0);
-        if (ret < 0) {
-                fprintf (stderr, "setxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = listxattr (dirname, NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "listxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = getxattr (dirname, "trusted.xattr-test", NULL, 0);
-        if (ret <= 0) {
-                ret = -1;
-                fprintf (stderr, "getxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = removexattr (dirname, "trusted.xattr-test");
-        if (ret < 0) {
-                fprintf (stderr, "removexattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        strcpy (newdname, dirname);
-        strcat (newdname, "/../");
-        ret = chdir (newdname);
-        if (ret < 0) {
-                fprintf (stderr, "chdir failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        cwd = getcwd (buff, 255);
-        if (NULL == cwd) {
-                fprintf (stderr, "getcwd failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        strcpy (newdname, dirname);
-        strcat (newdname, "new");
-        ret = rename (dirname, newdname);
-        if (ret < 0) {
-                fprintf (stderr, "rename failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = rmdir (newdname);
-        if (ret < 0) {
-                fprintf (stderr, "rmdir failed: %s\n", strerror (errno));
-                return ret;
-        }
-
-out:
-        rmdir (dirname);
-        return ret;
-}
-
-int
-link_based_fops (char *filename)
-{
-        int         ret           = -1;
-        int         fd            = 0;
-        char        newname[255]  = {0,};
-        char        linkname[255] = {0,};
-        struct stat lstbuf        = {0,};
-
-        fd = creat (filename, 0644);
-        if (fd < 0) {
-                fd = 0;
-                fprintf (stderr, "creat failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        strcpy (newname, filename);
-        strcat (newname, "_hlink");
-        ret = link (filename, newname);
-        if (ret < 0) {
-                fprintf (stderr, "link failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = unlink (filename);
-        if (ret < 0) {
-                fprintf (stderr, "unlink failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        strcpy (linkname, filename);
-        strcat (linkname, "_slink");
-        ret = symlink (newname, linkname);
-        if (ret < 0) {
-                fprintf (stderr, "symlink failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = lstat (linkname, &lstbuf);
-        if (ret < 0) {
-                fprintf (stderr, "lstbuf failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = lchown (linkname, 10001, 10001);
-        if (ret < 0) {
-                fprintf (stderr, "lchown failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = lsetxattr (linkname, "trusted.lxattr-test", "working", 8, 0);
-        if (ret < 0) {
-                fprintf (stderr, "lsetxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = llistxattr (linkname, NULL, 0);
-        if (ret < 0) {
-                ret = -1;
-                fprintf (stderr, "llistxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = lgetxattr (linkname, "trusted.lxattr-test", NULL, 0);
-        if (ret < 0) {
-                ret = -1;
-                fprintf (stderr, "lgetxattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-        ret = lremovexattr (linkname, "trusted.lxattr-test");
-        if (ret < 0) {
-                fprintf (stderr, "lremovexattr failed: %s\n", strerror (errno));
-                goto out;
-        }
-
-
-out:
-        if (fd)
-                close(fd);
-        unlink (linkname);
-        unlink (newname);
-}
-
-int
-test_open_modes (char *filename)
-{
-        int ret = -1;
-
-        ret = generic_open_read_write (filename, O_CREAT|O_WRONLY);
-        if (3 != ret) {
-               fprintf (stderr, "flag O_CREAT|O_WRONLY failed: \n");
-               goto out;
-        }
-
-        ret = generic_open_read_write (filename, O_CREAT|O_RDWR);
-        if (ret != 0) {
-               fprintf (stderr, "flag O_CREAT|O_RDWR failed\n");
-               goto out;
-        }
-
-        ret = generic_open_read_write (filename, O_CREAT|O_RDONLY);
-        if (ret != 0) {
-                fprintf (stderr, "flag O_CREAT|O_RDONLY failed\n");
-                goto out;
-        }
-
-        ret = creat (filename, 0644);
-        close (ret);
-        ret = generic_open_read_write (filename, O_WRONLY);
-        if (3 != ret) {
-               fprintf (stderr, "flag O_WRONLY failed\n");
-               goto out;
-        }
-
-        ret = creat (filename, 0644);
-        close (ret);
-        ret = generic_open_read_write (filename, O_RDWR);
-        if (0 != ret) {
-               fprintf (stderr, "flag O_RDWR failed\n");
-               goto out;
-        }
-
-        ret = creat (filename, 0644);
-        close (ret);
-        ret = generic_open_read_write (filename, O_RDONLY);
-        if (0 != ret) {
-               fprintf (stderr, "flag O_RDONLY failed\n");
-               goto out;
-        }
-
-        ret = creat (filename, 0644);
-        close (ret);
-        ret = generic_open_read_write (filename, O_TRUNC|O_WRONLY);
-        if (3 != ret) {
-               fprintf (stderr, "flag O_TRUNC|O_WRONLY failed\n");
-               goto out;
-        }
-
-#if 0 /* undefined behaviour, unable to reliably test */
-        ret = creat (filename, 0644);
-        close (ret);
-        ret = generic_open_read_write (filename, O_TRUNC|O_RDONLY);
-        if (0 != ret) {
-               fprintf (stderr, "flag O_TRUNC|O_RDONLY failed\n");
-               goto out;
-        }
-#endif
-
-        ret = generic_open_read_write (filename, O_CREAT|O_RDWR|O_SYNC);
-        if (0 != ret) {
-               fprintf (stderr, "flag O_CREAT|O_RDWR|O_SYNC failed\n");
-               goto out;
-        }
-
-        ret = creat (filename, 0644);
-        close (ret);
-        ret = generic_open_read_write (filename, O_CREAT|O_EXCL);
-        if (0 != ret) {
-                fprintf (stderr, "flag O_CREAT|O_EXCL failed\n");
-                goto out;
-        }
-
-out:
-        return ret;
-}
-
-int generic_open_read_write (char *filename, int flag)
-{
-        int  fd          = 0;
-        int  ret         = -1;
-        char wstring[50] = {0,};
-        char rstring[50] = {0,};
-
-        fd = open (filename, flag);
-        if (fd < 0) {
-                if (flag == O_CREAT|O_EXCL && errno == EEXIST) {
-                        unlink (filename);
-                        return 0;
-                }
-                else {
-                        fd = 0;
-                        fprintf (stderr, "open failed: %s\n", strerror (errno));
-                        return 1;
-                }
-        }
-
-        strcpy (wstring, "My string to write\n");
-        ret = write (fd, wstring, strlen(wstring));
-        if (ret <= 0) {
-                if (errno != EBADF) {
-                        fprintf (stderr, "write failed: %s\n", strerror (errno));
-                        close (fd);
-                        unlink(filename);
-                        return 2;
-                }
-        }
-
-        ret = lseek (fd, 0, SEEK_SET);
-        if (ret < 0) {
-                close (fd);
-                unlink(filename);
-                return 4;
-        }
-
-        ret = read (fd, rstring, strlen(wstring));
-        if (ret < 0) {
-                close (fd);
-                unlink (filename);
-                return 3;
-        }
-
-        /* Compare the rstring with wstring. But we do not want to return
-         * error when the flag is either O_RDONLY, O_CREAT|O_RDONLY or
-         * O_TRUNC|O_RDONLY. Because in that case we are not writing
-         * anything to the file.*/
-
-        ret = memcmp (wstring, rstring, strlen (wstring));
-        if (0 != ret  && !(flag == O_CREAT|O_RDONLY || flag == O_RDONLY ||\
-            flag == O_TRUNC|O_RDONLY)) {
-                fprintf (stderr, "read is returning junk\n");
-                close (fd);
-                unlink (filename);
-                return 4;
-        }
-
-        close (fd);
-        unlink (filename);
-        return 0;
-}
diff --git a/extras/volfilter.py b/extras/volfilter.py
deleted file mode 100644
index 0ca456a78..000000000
--- a/extras/volfilter.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright (c) 2010-2011 Red Hat, Inc.
-#
-# This file is part of HekaFS.
-#
-# HekaFS is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License, version 3, as published by the Free
-# Software Foundation.
-#
-# HekaFS 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 HekaFS.  If not, see <http://www.gnu.org/licenses/>.
-
-import copy
-import string
-import sys
-import types
-
-good_xlators = [
-	"cluster/afr",
-	"cluster/dht",
-	"cluster/distribute",
-	"cluster/replicate",
-	"cluster/stripe",
-	"debug/io-stats",
-	"features/access-control",
-	"features/locks",
-	"features/marker",
-	"features/uidmap",
-	"performance/io-threads",
-	"protocol/client",
-	"protocol/server",
-	"storage/posix",
-]
-
-def copy_stack (old_xl,suffix,recursive=False):
-	if recursive:
-		new_name = old_xl.name + "-" + suffix
-	else:
-		new_name = suffix
-	new_xl = Translator(new_name)
-	new_xl.type = old_xl.type
-	# The results with normal assignment here are . . . amusing.
-	new_xl.opts = copy.deepcopy(old_xl.opts)
-	for sv in old_xl.subvols:
-		new_xl.subvols.append(copy_stack(sv,suffix,True))
-	# Patch up the path at the bottom.
-	if new_xl.type == "storage/posix":
-		new_xl.opts["directory"] += ("/" + suffix)
-	return new_xl
-
-def cleanup (parent, graph):
-	if parent.type in good_xlators:
-		# Temporary fix so that HekaFS volumes can use the
-		# SSL-enabled multi-threaded socket transport.
-		if parent.type == "protocol/server":
-			parent.type = "protocol/server2"
-			parent.opts["transport-type"] = "ssl"
-		elif parent.type == "protocol/client":
-			parent.type = "protocol/client2"
-			parent.opts["transport-type"] = "ssl"
-		sv = []
-		for child in parent.subvols:
-			sv.append(cleanup(child,graph))
-		parent.subvols = sv
-	else:
-		parent = cleanup(parent.subvols[0],graph)
-	return parent
-
-class Translator:
-	def __init__ (self, name):
-		self.name = name
-		self.type = ""
-		self.opts = {}
-		self.subvols = []
-		self.dumped = False
-	def __repr__ (self):
-		return "<Translator %s>" % self.name
-
-def load (path):
-	# If it's a string, open it; otherwise, assume it's already a
-	# file-like object (most notably from urllib*).
-	if type(path) in types.StringTypes:
-		fp = file(path,"r")
-	else:
-		fp = path
-	all_xlators = {}
-	xlator = None
-	last_xlator = None
-	while True:
-		text = fp.readline()
-		if text == "":
-			break
-		text = text.split()
-		if not len(text):
-			continue
-		if text[0] == "volume":
-			if xlator:
-				raise RuntimeError, "nested volume definition"
-			xlator = Translator(text[1])
-			continue
-		if not xlator:
-			raise RuntimeError, "text outside volume definition"
-		if text[0] == "type":
-			xlator.type = text[1]
-			continue
-		if text[0] == "option":
-			xlator.opts[text[1]] = string.join(text[2:])
-			continue
-		if text[0] == "subvolumes":
-			for sv in text[1:]:
-				xlator.subvols.append(all_xlators[sv])
-			continue
-		if text[0] == "end-volume":
-			all_xlators[xlator.name] = xlator
-			last_xlator = xlator
-			xlator = None
-			continue
-		raise RuntimeError, "unrecognized keyword %s" % text[0]
-	if xlator:
-		raise RuntimeError, "unclosed volume definition"
-	return all_xlators, last_xlator
-
-def generate (graph, last, stream=sys.stdout):
-	for sv in last.subvols:
-		if not sv.dumped:
-			generate(graph,sv,stream)
-			print >> stream, ""
-			sv.dumped = True
-	print >> stream, "volume %s" % last.name
-	print >> stream, "    type %s" % last.type
-	for k, v in last.opts.iteritems():
-		print >> stream, "    option %s %s" % (k, v)
-	if last.subvols:
-		print >> stream, "    subvolumes %s" % string.join(
-			[ sv.name for sv in last.subvols ])
-	print >> stream, "end-volume"
-
-def push_filter (graph, old_xl, filt_type, opts={}):
-	suffix = "-" + old_xl.type.split("/")[1]
-	if len(old_xl.name) > len(suffix):
-		if old_xl.name[-len(suffix):] == suffix:
-			old_xl.name = old_xl.name[:-len(suffix)]
-	new_xl = Translator(old_xl.name+suffix)
-	new_xl.type = old_xl.type
-	new_xl.opts = old_xl.opts
-	new_xl.subvols = old_xl.subvols
-	graph[new_xl.name] = new_xl
-	old_xl.name += ("-" + filt_type.split("/")[1])
-	old_xl.type = filt_type
-	old_xl.opts = opts
-	old_xl.subvols = [new_xl]
-	graph[old_xl.name] = old_xl
-
-def delete (graph, victim):
-	if len(victim.subvols) != 1:
-		raise RuntimeError, "attempt to delete non-unary translator"
-	for xl in graph.itervalues():
-		while xl.subvols.count(victim):
-			i = xl.subvols.index(victim)
-			xl.subvols[i] = victim.subvols[0]
-
-if __name__ == "__main__":
-	graph, last = load(sys.argv[1])
-	generate(graph,last)
diff --git a/extras/who-wrote-glusterfs/gitdm.aliases b/extras/who-wrote-glusterfs/gitdm.aliases
deleted file mode 100644
index 784a3e3bc..000000000
--- a/extras/who-wrote-glusterfs/gitdm.aliases
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# This is the email aliases file, mapping secondary addresses onto a single,
-# canonical address. This file should probably match the contents of .mailmap
-# in the root of the git repository.
-#
-# Format: <alias> <real>
-
-amar@gluster.com	amarts@redhat.com
-amar@del.gluster.com	amarts@redhat.com
-avati@amp.gluster.com	avati@redhat.com
-avati@blackhole.gluster.com	avati@redhat.com
-avati@dev.gluster.com	avati@redhat.com
-avati@gluster.com	avati@redhat.com
-wheelear@gmail.com      awheeler@redhat.com
-anush@gluster.com	ashetty@redhat.com
-csaba@gluster.com	csaba@redhat.com
-csaba@lowlife.hu	csaba@redhat.com
-csaba@zresearch.com	csaba@redhat.com
-harsha@gluster.com	fharshav@redhat.com
-harsha@zresearch.com	fharshav@redhat.com
-harsha@dev.gluster.com	fharshav@redhat.com
-harsha@harshavardhana.net	fharshav@redhat.com
-kkeithle@f16node1.kkeithle.usersys.redhat.com	kkeithle@redhat.com
-kaushal@gluster.com	kaushal@redhat.com
-kaushikbv@gluster.com	kbudiger@redhat.com
-krishna@gluster.com	ksriniva@redhat.com
-krishna@zresearch.com	ksriniva@redhat.com
-krishna@guest-laptop	ksriniva@redhat.com
-kp@gluster.com	kparthas@redhat.com
-me@louiszuckerman.com	louiszuckerman@gmail.com
-msvbhat@gmail.com	vbhat@redhat.com
-vishwanath@gluster.com	vbhat@redhat.com
-pavan@dev.gluster.com	pavan@gluster.com
-zaitcev@yahoo.com	zaitcev@kotori.zaitcev.us
-pranithk@gluster.com	pkarampu@redhat.com
-raghavendrabhat@gluster.com	raghavendra@redhat.com
-raghavendra@gluster.com	rgowdapp@redhat.com
-raghavendra@zresearch.com	rgowdapp@redhat.com
-rahulcssjce@gmail.com	rahulcs@redhat.com
-rajesh@gluster.com	rajesh@redhat.com
-rajesh.amaravathi@gmail.com	rajesh@redhat.com
-shehjart@zresearch.com	shehjart@gluster.com
-venky@gluster.com	vshankar@redhat.com
-vijay@gluster.com	vbellur@redhat.com
-vijay@dev.gluster.com	vbellur@redhat.com
-vijaykumar.koppad@gmail.com	vkoppad@redhat.com
-vikas@zresearch.com	vikas@gluster.com
-shishirng@gluster.com	sgowda@redhat.com
diff --git a/extras/who-wrote-glusterfs/gitdm.config b/extras/who-wrote-glusterfs/gitdm.config
deleted file mode 100644
index e1ff2bd5b..000000000
--- a/extras/who-wrote-glusterfs/gitdm.config
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is the gitdm configuration file for GlusterFS.
-# See the gitdm.config in the gitdm repositofy for additional options and
-# comments.
-#
-
-EmailAliases gitdm.aliases
-EmailMap gitdm.domain-map
diff --git a/extras/who-wrote-glusterfs/gitdm.domain-map b/extras/who-wrote-glusterfs/gitdm.domain-map
deleted file mode 100644
index f1c305898..000000000
--- a/extras/who-wrote-glusterfs/gitdm.domain-map
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Here is a set of mappings of domain names onto employer names.
-#
-active.by       ActiveCloud
-cern.ch         CERN
-gluster.com     Red Hat
-gooddata.com	GoodData
-hastexo.com     hastexo
-ibm.com		IBM
-linbit.com	LINBIT
-netbsd.org	NetBSD
-netdirect.ca	Net Direct
-redhat.com	Red Hat
-stepping-stone.ch       stepping stone GmbH
-zresearch.com   Red Hat
diff --git a/extras/who-wrote-glusterfs/who-wrote-glusterfs.sh b/extras/who-wrote-glusterfs/who-wrote-glusterfs.sh
deleted file mode 100755
index 487f5874b..000000000
--- a/extras/who-wrote-glusterfs/who-wrote-glusterfs.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# Gather statistics on "Who wrote GlusterFS". The idea comes from the excellent
-# articles on http://lwn.net/ named "Who wrote <linux-version>?".
-#
-# gitdm comes from git://git.lwn.net/gitdm.git by Jonathan Corbet.
-#
-# Confguration files used:
-#  - gitdm.config: main configuration file, pointing to the others
-#  - gitdm.aliases: merge users with different emailaddresses into one
-#  - gitdm.domain-map: map domain names from emailaddresses to companies
-#
-
-DIRNAME=$(dirname $0)
-
-GITDM_REPO=git://git.lwn.net/gitdm.git
-GITDM_DIR=${DIRNAME}/gitdm
-GITDM_CMD="python ${GITDM_DIR}/gitdm"
-
-error()
-{
-        local ret=${?}
-        printf "${@}\n" > /dev/stderr
-        return ${ret}
-}
-
-check_gitdm()
-{
-        if [ ! -e "${GITDM_DIR}/gitdm" ]
-        then
-                git clone --quiet git://git.lwn.net/gitdm.git ${DIRNAME}/gitdm
-        fi
-}
-
-# The first argument is the revision-range (see 'git rev-list --help').
-# REV can be empty, and the statistics will be calculated over the whole
-# current branch.
-REV=${1}
-shift
-# all remaining options are passed to gitdm, see the gitdm script for an
-# explanation of the accepted options.
-GITDM_OPTS=${@}
-
-if ! check_gitdm
-then
-        error "Could not find 'gitdm', exiting..."
-        exit 1
-fi
-
-git log --numstat -M ${REV} | ${GITDM_CMD} -b ${DIRNAME} -n ${GITDM_OPTS}
diff --git a/gen-headers.py b/gen-headers.py
deleted file mode 100755
index ef9fa7711..000000000
--- a/gen-headers.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/python
-
-import sys
-try:
-    import json
-except ImportError:
-    import simplejson as json
-from string import Template
-
-
-def getLogBook(logFile='error-codes.json'):
-    fp = open(logFile)
-    return json.load(fp)
-
-
-def genCHeader(logBook,
-               infile='gf-error-codes.h.template',
-               outfile='gf-error-codes.h'):
-    fp = open('gf-error-codes.h.template')
-    s = fp.read()
-    fp.close()
-    template = Template(s)
-
-    defineLines = []
-    caseLines = []
-    for name, value in logBook.iteritems():
-        nameDef = "GF_%s" % (name.upper(),)
-        code = value['code']
-        msgNameDef = "%s_MSG" % (nameDef,)
-        msg = value['message']['en']
-
-        defineLines.append("#define %-20s %d" % (nameDef, code))
-        defineLines.append("#define %-20s %s" % (msgNameDef,
-                                                 json.dumps(msg)))
-        caseLines.append("        case %s: return _(%s);" % \
-                             (nameDef, msgNameDef))
-
-    d = {'DEFINES': "\n".join(defineLines),
-         'CASES': "\n".join(caseLines)}
-    #print template.substitute(d)
-
-    fp = open(outfile, 'w')
-    fp.write(template.substitute(d))
-    fp.close()
-
-
-if __name__ == "__main__":
-    try:
-        logBook = getLogBook()
-        genCHeader(logBook)
-        sys.exit(0)
-    except IOError, e:
-        print str(e)
-        sys.exit(-1)
diff --git a/geo-replication/Makefile.am b/geo-replication/Makefile.am
deleted file mode 100644
index 556951d9f..000000000
--- a/geo-replication/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = syncdaemon src
-
-CLEANFILES =
diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am
deleted file mode 100644
index 324d8869f..000000000
--- a/geo-replication/src/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-gsyncddir = $(libexecdir)/glusterfs
-
-gsyncd_SCRIPTS = gverify.sh peer_add_secret_pub peer_gsec_create
-
-# peer_gsec_create and peer_add_secret_pub are not added to
-# EXTRA_DIST as it's derived from a .in file
-EXTRA_DIST = gverify.sh
-
-gsyncd_PROGRAMS = gsyncd
-
-gsyncd_SOURCES = gsyncd.c procdiggy.c
-
-gsyncd_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
-	$(GF_GLUSTERFS_LIBS)
-
-gsyncd_LDFLAGS = $(GF_LDFLAGS)
-
-noinst_HEADERS = procdiggy.h
-
-AM_CPPFLAGS = $(GF_CPPFLAGS) \
-	-I$(top_srcdir)/libglusterfs/src\
-	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
-	-DUSE_LIBGLUSTERFS\
-	-DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\"
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
-
-
-CLEANFILES =
-
-$(top_builddir)/libglusterfs/src/libglusterfs.la:
-	$(MAKE) -C $(top_builddir)/libglusterfs/src/ all
diff --git a/geo-replication/src/gsyncd.c b/geo-replication/src/gsyncd.c
deleted file mode 100644
index 0830e7f9b..000000000
--- a/geo-replication/src/gsyncd.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
-   Copyright (c) 2011-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/param.h> /* for PATH_MAX */
-
-/* NOTE (USE_LIBGLUSTERFS):
- * ------------------------
- * When USE_LIBGLUSTERFS debugging sumbol is passed; perform
- * glusterfs translator like initialization so that glusterfs
- * globals, contexts are valid when glustefs api's are invoked.
- * We unconditionally pass then while building gsyncd binary.
- */
-#ifdef USE_LIBGLUSTERFS
-#include "glusterfs.h"
-#include "globals.h"
-#endif
-
-#include "common-utils.h"
-#include "run.h"
-#include "procdiggy.h"
-
-#define _GLUSTERD_CALLED_ "_GLUSTERD_CALLED_"
-#define _GSYNCD_DISPATCHED_ "_GSYNCD_DISPATCHED_"
-#define GSYNCD_CONF_TEMPLATE "geo-replication/gsyncd_template.conf"
-#define GSYNCD_PY "gsyncd.py"
-#define RSYNC "rsync"
-
-int restricted = 0;
-
-static int
-duplexpand (void **buf, size_t tsiz, size_t *len)
-{
-        size_t osiz = tsiz * *len;
-        char *p = realloc (*buf, osiz << 1);
-        if (!p) {
-                free(*buf);
-                return -1;
-        }
-
-        memset (p + osiz, 0, osiz);
-        *buf = p;
-        *len <<= 1;
-
-        return 0;
-}
-
-static int
-str2argv (char *str, char ***argv)
-{
-        char *p         = NULL;
-        char *savetok   = NULL;
-        int argc        = 0;
-        size_t argv_len = 32;
-        int ret         = 0;
-
-        assert (str);
-        str = strdup (str);
-        if (!str)
-                return -1;
-
-        *argv = calloc (argv_len, sizeof (**argv));
-        if (!*argv)
-                goto error;
-
-        while ((p = strtok_r (str, " ", &savetok))) {
-                str = NULL;
-
-                argc++;
-                if (argc == argv_len) {
-                        ret = duplexpand ((void *)argv,
-                                          sizeof (**argv),
-                                          &argv_len);
-                        if (ret == -1)
-                                goto error;
-                }
-                (*argv)[argc - 1] = p;
-        }
-
-        return argc;
-
- error:
-        fprintf (stderr, "out of memory\n");
-        return -1;
-}
-
-static int
-invoke_gsyncd (int argc, char **argv)
-{
-        char config_file[PATH_MAX] = {0,};
-        size_t gluster_workdir_len = 0;
-        runner_t runner            = {0,};
-        int i                      = 0;
-        int j                      = 0;
-        char *nargv[argc + 4];
-        char *python = NULL;
-
-        if (restricted) {
-                size_t len;
-                /* in restricted mode we forcibly use the system-wide config */
-                runinit (&runner);
-                runner_add_args (&runner, SBIN_DIR"/gluster",
-                                 "--log-file=-", "system::", "getwd",
-                                 NULL);
-                runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
-                if (runner_start (&runner) == 0 &&
-                    fgets (config_file, PATH_MAX,
-                           runner_chio (&runner, STDOUT_FILENO)) != NULL &&
-                    (len = strlen (config_file)) &&
-                    config_file[len - 1] == '\n' &&
-                    runner_end (&runner) == 0)
-                        gluster_workdir_len = len - 1;
-
-                if (gluster_workdir_len) {
-                        if (gluster_workdir_len + 1 + strlen (GSYNCD_CONF_TEMPLATE) + 1 >
-                            PATH_MAX)
-                                goto error;
-                        config_file[gluster_workdir_len] = '/';
-                        strcat (config_file, GSYNCD_CONF_TEMPLATE);
-                } else
-                        goto error;
-
-                if (setenv ("_GSYNCD_RESTRICTED_", "1", 1) == -1)
-                        goto error;
-        }
-
-        if (chdir ("/") == -1)
-                goto error;
-
-        j = 0;
-        python = getenv("PYTHON");
-        if(!python)
-                python = PYTHON;
-        nargv[j++] = python;
-        nargv[j++] = GSYNCD_PREFIX"/python/syncdaemon/"GSYNCD_PY;
-        for (i = 1; i < argc; i++)
-                nargv[j++] = argv[i];
-        if (config_file[0]) {
-                nargv[j++] = "-c";
-                nargv[j++] = config_file;
-        }
-        nargv[j++] = NULL;
-
-        execvp (python, nargv);
-
-        fprintf (stderr, "exec of '%s' failed\n", python);
-        return 127;
-
- error:
-        fprintf (stderr, "gsyncd initializaion failed\n");
-        return 1;
-}
-
-
-static int
-find_gsyncd (pid_t pid, pid_t ppid, char *name, void *data)
-{
-        char buf[NAME_MAX * 2] = {0,};
-        char path[PATH_MAX]    = {0,};
-        char *p                = NULL;
-        int zeros              = 0;
-        int ret                = 0;
-        int fd                 = -1;
-        pid_t *pida            = (pid_t *)data;
-
-        if (ppid != pida[0])
-                return 0;
-
-        sprintf (path, PROC"/%d/cmdline", pid);
-        fd = open (path, O_RDONLY);
-        if (fd == -1)
-                return 0;
-        ret = read (fd, buf, sizeof (buf));
-        close (fd);
-        if (ret == -1)
-                return 0;
-        for (zeros = 0, p = buf; zeros < 2 && p < buf + ret; p++)
-                zeros += !*p;
-
-        ret = 0;
-        switch (zeros) {
-        case 2:
-                if ((strcmp (basename (buf), basename (PYTHON)) ||
-                     strcmp (basename (buf + strlen (buf) + 1), GSYNCD_PY)) == 0) {
-                        ret = 1;
-                        break;
-                }
-                /* fallthrough */
-        case 1:
-                if (strcmp (basename (buf), GSYNCD_PY) == 0)
-                        ret = 1;
-        }
-
-        if (ret == 1) {
-                if (pida[1] != -1) {
-                        fprintf (stderr, GSYNCD_PY" sibling is not unique");
-                        return -1;
-                }
-                pida[1] = pid;
-        }
-
-        return 0;
-}
-
-static int
-invoke_rsync (int argc, char **argv)
-{
-        int i                  = 0;
-        char path[PATH_MAX]    = {0,};
-        pid_t pid              = -1;
-        pid_t ppid             = -1;
-        pid_t pida[]           = {-1, -1};
-        char *name             = NULL;
-        char buf[PATH_MAX + 1] = {0,};
-        int ret                = 0;
-
-        assert (argv[argc] == NULL);
-
-        if (argc < 2 || strcmp (argv[1], "--server") != 0)
-                goto error;
-
-        for (i = 2; i < argc && argv[i][0] == '-'; i++);
-
-        if (!(i == argc - 2 && strcmp (argv[i], ".") == 0 && argv[i + 1][0] == '/')) {
-                fprintf (stderr, "need an rsync invocation without protected args\n");
-                goto error;
-        }
-
-        /* look up sshd we are spawned from */
-        for (pid = getpid () ;; pid = ppid) {
-                ppid = pidinfo (pid, &name);
-                if (ppid < 0) {
-                        fprintf (stderr, "sshd ancestor not found\n");
-                        goto error;
-                }
-                if (strcmp (name, "sshd") == 0) {
-                        GF_FREE (name);
-                        break;
-                }
-                GF_FREE (name);
-        }
-        /* look up "ssh-sibling" gsyncd */
-        pida[0] = pid;
-        ret = prociter (find_gsyncd, pida);
-        if (ret == -1 || pida[1] == -1) {
-                fprintf (stderr, "gsyncd sibling not found\n");
-                goto error;
-        }
-        /* check if rsync target matches gsyncd target */
-        sprintf (path, PROC"/%d/cwd", pida[1]);
-        ret = readlink (path, buf, sizeof (buf));
-        if (ret == -1 || ret == sizeof (buf))
-                goto error;
-        if (strcmp (argv[argc - 1], "/") == 0 /* root dir cannot be a target */ ||
-            (strcmp (argv[argc - 1], path) /* match against gluster target */ &&
-             strcmp (argv[argc - 1], buf) /* match against file target */) != 0) {
-                fprintf (stderr, "rsync target does not match "GEOREP" session\n");
-                goto error;
-        }
-
-        argv[0] = RSYNC;
-
-        execvp (RSYNC, argv);
-
-        fprintf (stderr, "exec of "RSYNC" failed\n");
-        return 127;
-
- error:
-        fprintf (stderr, "disallowed "RSYNC" invocation\n");
-        return 1;
-}
-
-static int
-invoke_gluster (int argc, char **argv)
-{
-        int i = 0;
-        int j = 0;
-        int optsover = 0;
-        char *ov = NULL;
-
-        for (i = 1; i < argc; i++) {
-                ov = strtail (argv[i], "--");
-                if (ov && !optsover) {
-                        if (*ov == '\0')
-                                optsover = 1;
-                        continue;
-                }
-                switch (++j) {
-                case 1:
-                        if (strcmp (argv[i], "volume") != 0)
-                                goto error;
-                        break;
-                case 2:
-                        if (strcmp (argv[i], "info") != 0)
-                                goto error;
-                        break;
-                case 3:
-                        break;
-                default:
-                        goto error;
-                }
-        }
-
-        argv[0] = "gluster";
-        execvp (SBIN_DIR"/gluster", argv);
-        fprintf (stderr, "exec of gluster failed\n");
-        return 127;
-
- error:
-        fprintf (stderr, "disallowed gluster invocation\n");
-        return 1;
-}
-
-struct invocable {
-        char *name;
-        int (*invoker) (int argc, char **argv);
-};
-
-struct invocable invocables[] = {
-        { "rsync",   invoke_rsync  },
-        { "gsyncd",  invoke_gsyncd },
-        { "gluster", invoke_gluster },
-        { NULL, NULL}
-};
-
-int
-main (int argc, char **argv)
-{
-        char *evas          = NULL;
-        struct invocable *i = NULL;
-        char *b             = NULL;
-        char *sargv         = NULL;
-
-#ifdef USE_LIBGLUSTERFS
-        glusterfs_ctx_t *ctx = NULL;
-
-        ctx = glusterfs_ctx_new ();
-        if (!ctx)
-                return ENOMEM;
-
-        if (glusterfs_globals_init (ctx))
-                return 1;
-
-        THIS->ctx = ctx;
-#endif
-
-        evas = getenv (_GLUSTERD_CALLED_);
-        if (evas && strcmp (evas, "1") == 0)
-                /* OK, we know glusterd called us, no need to look for further config
-                 * ... altough this conclusion should not inherit to our children
-                 */
-                unsetenv (_GLUSTERD_CALLED_);
-        else {
-                /* we regard all gsyncd invocations unsafe
-                 * that do not come from glusterd and
-                 * therefore restrict it
-                 */
-                restricted = 1;
-
-                if (!getenv (_GSYNCD_DISPATCHED_)) {
-                        evas = getenv ("SSH_ORIGINAL_COMMAND");
-                        if (evas)
-                                sargv = evas;
-                        else {
-                                evas = getenv ("SHELL");
-                                if (evas && strcmp (basename (evas), "gsyncd") == 0 &&
-                                    argc == 3 && strcmp (argv[1], "-c") == 0)
-                                        sargv = argv[2];
-                        }
-                }
-
-        }
-
-        if (!(sargv && restricted))
-                return invoke_gsyncd (argc, argv);
-
-        argc = str2argv (sargv, &argv);
-        if (argc == -1 || setenv (_GSYNCD_DISPATCHED_, "1", 1) == -1) {
-                fprintf (stderr, "internal error\n");
-                return 1;
-        }
-
-        b = basename (argv[0]);
-        for (i = invocables; i->name; i++) {
-                if (strcmp (b, i->name) == 0)
-                        return i->invoker (argc, argv);
-        }
-
-        fprintf (stderr, "invoking %s in restricted SSH session is not allowed\n",
-                 b);
-
-        return 1;
-}
diff --git a/geo-replication/src/gverify.sh b/geo-replication/src/gverify.sh
deleted file mode 100755
index bd1b25f24..000000000
--- a/geo-replication/src/gverify.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/bash
-
-# Script to verify the Master and Slave Gluster compatibility.
-# To use ./gverify <master volume> <slave host> <slave volume>
-# Returns 0 if master and slave compatible.
-
-# Considering buffer_size 100MB
-BUFFER_SIZE=104857600;
-slave_log_file=`gluster --print-logdir`/geo-replication-slaves/slave.log
-
-function SSHM()
-{
-    ssh -q \
-	-oPasswordAuthentication=no \
-	-oStrictHostKeyChecking=no \
-	-oControlMaster=yes \
-	"$@";
-}
-
-function cmd_master()
-{
-    VOL=$1;
-    local cmd_line;
-    cmd_line=$(cat <<EOF
-function do_verify() {
-v=\$1;
-d=\$(mktemp -d 2>/dev/null);
-glusterfs -s localhost --xlator-option="*dht.lookup-unhashed=off" --volfile-id \$v -l $slave_log_file \$d;
-i=\$(stat -c "%i" \$d);
-if [[ "\$i" -ne "1" ]]; then
-echo 0:0;
-exit 1;
-fi;
-cd \$d;
-available_size=\$(df \$d | tail -1 | awk "{print \\\$2}");
-umount -l \$d;
-rmdir \$d;
-ver=\$(gluster --version | head -1 | cut -f2 -d " ");
-echo \$available_size:\$ver;
-};
-cd /tmp;
-[ x$VOL != x ] && do_verify $VOL;
-EOF
-);
-
-echo $cmd_line;
-}
-
-function cmd_slave()
-{
-    VOL=$1;
-    local cmd_line;
-    cmd_line=$(cat <<EOF
-function do_verify() {
-v=\$1;
-d=\$(mktemp -d 2>/dev/null);
-glusterfs -s localhost --xlator-option="*dht.lookup-unhashed=off" --volfile-id \$v -l $slave_log_file \$d;
-i=\$(stat -c "%i" \$d);
-if [[ "\$i" -ne "1" ]]; then
-echo 0:0;
-exit 1;
-fi;
-cd \$d;
-available_size=\$(df \$d | tail -1 | awk "{print \\\$4}");
-no_of_files=\$(find  \$d -maxdepth 0 -empty);
-umount -l \$d;
-rmdir \$d;
-ver=\$(gluster --version | head -1 | cut -f2 -d " ");
-echo \$available_size:\$ver:\$no_of_files:;
-};
-cd /tmp;
-[ x$VOL != x ] && do_verify $VOL;
-EOF
-);
-
-echo $cmd_line;
-}
-
-function master_stats()
-{
-    MASTERVOL=$1;
-    local cmd_line;
-    cmd_line=$(cmd_master $MASTERVOL);
-    bash -c "$cmd_line";
-}
-
-
-function slave_stats()
-{
-    SLAVEHOST=$1;
-    SLAVEVOL=$2;
-    local cmd_line;
-    cmd_line=$(cmd_slave $SLAVEVOL);
-    SSHM $SLAVEHOST bash -c "'$cmd_line'";
-}
-
-
-function main()
-{
-    log_file=$4
-    > $log_file
-
-    # Use FORCE_BLOCKER flag in the error message to differentiate
-    # between the errors which the force command should bypass
-
-    ping -w 5 $2;
-    if [ $? -ne 0 ]; then
-        echo "FORCE_BLOCKER|$2 not reachable." > $log_file
-        exit 1;
-    fi;
-
-    ssh -oNumberOfPasswordPrompts=0 $2 "echo Testing_Passwordless_SSH";
-    if [ $? -ne 0 ]; then
-        echo "FORCE_BLOCKER|Passwordless ssh login has not been setup with $2." > $log_file
-        exit 1;
-    fi;
-
-    ERRORS=0;
-    master_data=$(master_stats $1);
-    slave_data=$(slave_stats $2 $3);
-    master_size=$(echo $master_data | cut -f1 -d':');
-    slave_size=$(echo $slave_data | cut -f1 -d':');
-    master_version=$(echo $master_data | cut -f2 -d':');
-    slave_version=$(echo $slave_data | cut -f2 -d':');
-    slave_no_of_files=$(echo $slave_data | cut -f3 -d':');
-
-    if [[ "x$master_size" = "x" || "x$master_version" = "x" || "$master_size" -eq "0" ]]; then
-	echo "FORCE_BLOCKER|Unable to fetch master volume details. Please check the master cluster and master volume." > $log_file;
-	exit 1;
-    fi;
-
-    if [[ "x$slave_size" = "x" || "x$slave_version" = "x" || "$slave_size" -eq "0" ]]; then
-	echo "FORCE_BLOCKER|Unable to fetch slave volume details. Please check the slave cluster and slave volume." > $log_file;
-	exit 1;
-    fi;
-
-    # The above checks are mandatory and force command should be blocked
-    # if they fail. The checks below can be bypassed if force option is
-    # provided hence no FORCE_BLOCKER flag.
-
-    if [ ! $slave_size -ge $(($master_size - $BUFFER_SIZE )) ]; then
-	echo "Total size of master is greater than available size of slave." >> $log_file;
-	ERRORS=$(($ERRORS + 1));
-    fi;
-
-    if [ -z $slave_no_of_files ]; then
-        echo "$2::$3 is not empty. Please delete existing files in $2::$3 and retry, or use force to continue without deleting the existing files." >> $log_file;
-        ERRORS=$(($ERRORS + 1));
-    fi;
- 
-    if [[ $master_version > $slave_version ]]; then
-	echo "Gluster version mismatch between master and slave." >> $log_file;
-	ERRORS=$(($ERRORS + 1));
-    fi;
-
-    exit $ERRORS;
-}
-
-
-main "$@";
diff --git a/geo-replication/src/peer_add_secret_pub.in b/geo-replication/src/peer_add_secret_pub.in
deleted file mode 100644
index c036cf334..000000000
--- a/geo-replication/src/peer_add_secret_pub.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [ ! -d ~/.ssh ]; then
-        mkdir ~/.ssh;
-        chmod 700 ~/.ssh
-        chown root:root ~/.ssh
-fi
-
-cat "$GLUSTERD_WORKING_DIR"/geo-replication/common_secret.pem.pub >> ~/.ssh/authorized_keys
diff --git a/geo-replication/src/peer_gsec_create.in b/geo-replication/src/peer_gsec_create.in
deleted file mode 100755
index ef630bd44..000000000
--- a/geo-replication/src/peer_gsec_create.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-
-if [ ! -f "$GLUSTERD_WORKING_DIR"/geo-replication/secret.pem.pub ]; then
-    \rm -rf "$GLUSTERD_WORKING_DIR"/geo-replication/secret.pem*
-    ssh-keygen -N '' -f "$GLUSTERD_WORKING_DIR"/geo-replication/secret.pem > /dev/null
-fi
-
-output=`echo command=\"@libexecdir@/glusterfs/gsyncd\" " "``cat "$GLUSTERD_WORKING_DIR"/geo-replication/secret.pem.pub`
-echo $output
diff --git a/geo-replication/src/procdiggy.c b/geo-replication/src/procdiggy.c
deleted file mode 100644
index 1eba414c1..000000000
--- a/geo-replication/src/procdiggy.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-   Copyright (c) 2011-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h> /* for PATH_MAX */
-
-#include "common-utils.h"
-#include "procdiggy.h"
-
-pid_t
-pidinfo (pid_t pid, char **name)
-{
-        char buf[NAME_MAX * 2] = {0,};
-        FILE *f                = NULL;
-        char path[PATH_MAX]    = {0,};
-        char *p                = NULL;
-        int ret                = 0;
-
-        sprintf (path, PROC"/%d/status", pid);
-
-        f = fopen (path, "r");
-        if (!f)
-                return -1;
-
-        if (name)
-                *name = NULL;
-        for (;;) {
-                size_t len;
-                memset (buf, 0, sizeof (buf));
-                if (fgets (buf, sizeof (buf), f) == NULL ||
-                    (len = strlen (buf)) == 0 ||
-                    buf[len - 1] != '\n') {
-                        pid = -1;
-                        goto out;
-                }
-                buf[len - 1] = '\0';
-
-                if (name && !*name) {
-                        p = strtail (buf, "Name:");
-                        if (p) {
-                                while (isspace (*++p));
-                                *name = gf_strdup (p);
-                                if (!*name) {
-                                        pid = -2;
-                                        goto out;
-                                }
-                                continue;
-                        }
-                }
-
-                p = strtail (buf, "PPid:");
-                if (p)
-                        break;
-        }
-
-        while (isspace (*++p));
-        ret = gf_string2int (p, &pid);
-        if (ret == -1)
-                pid = -1;
-
- out:
-        fclose (f);
-        if (pid == -1 && name && *name)
-                GF_FREE (name);
-        if (pid == -2)
-                fprintf (stderr, "out of memory\n");
-        return pid;
-}
-
-int
-prociter (int (*proch) (pid_t pid, pid_t ppid, char *tmpname, void *data),
-          void *data)
-{
-        char *name        = NULL;
-        DIR *d            = NULL;
-        struct dirent *de = NULL;
-        pid_t pid         = -1;
-        pid_t ppid        = -1;
-        int ret           = 0;
-
-        d = opendir (PROC);
-        if (!d)
-                return -1;
-        while (errno = 0, de = readdir (d)) {
-                if (gf_string2int (de->d_name, &pid) != -1 && pid >= 0) {
-                        ppid = pidinfo (pid, &name);
-                        switch (ppid) {
-                        case -1: continue;
-                        case -2: ret = -1; break;
-                        }
-                        ret = proch (pid, ppid, name, data);
-                        GF_FREE (name);
-                        if (ret)
-                                break;
-                }
-        }
-        closedir (d);
-        if (!de && errno) {
-                fprintf (stderr, "failed to traverse "PROC" (%s)\n",
-                         strerror (errno));
-                ret = -1;
-        }
-
-        return ret;
-}
diff --git a/geo-replication/src/procdiggy.h b/geo-replication/src/procdiggy.h
deleted file mode 100644
index 56dfc4eb2..000000000
--- a/geo-replication/src/procdiggy.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (c) 2011-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
-*/
-#ifdef __NetBSD__
-#include <sys/syslimits.h>
-#endif /* __NetBSD__ */
-
-#define PROC "/proc"
-
-pid_t pidinfo (pid_t pid, char **name);
-
-int prociter (int (*proch) (pid_t pid, pid_t ppid, char *name, void *data),
-              void *data);
-
diff --git a/geo-replication/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am
deleted file mode 100644
index 83f969639..000000000
--- a/geo-replication/syncdaemon/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon
-
-syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py \
-	resource.py configinterface.py syncdutils.py monitor.py libcxattr.py \
-	$(top_builddir)/contrib/ipaddr-py/ipaddr.py libgfchangelog.py
-
-CLEANFILES =
diff --git a/geo-replication/syncdaemon/__codecheck.py b/geo-replication/syncdaemon/__codecheck.py
deleted file mode 100644
index e3386afba..000000000
--- a/geo-replication/syncdaemon/__codecheck.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import os
-import os.path
-import sys
-import tempfile
-import shutil
-
-ipd = tempfile.mkdtemp(prefix = 'codecheck-aux')
-
-try:
-    # add a fake ipaddr module, we don't want to
-    # deal with the real one (just test our code)
-    f = open(os.path.join(ipd, 'ipaddr.py'), 'w')
-    f.write("""
-class IPAddress(object):
-    pass
-class IPNetwork(list):
-    pass
-""")
-    f.close()
-    sys.path.append(ipd)
-
-    fl = os.listdir(os.path.dirname(sys.argv[0]) or '.')
-    fl.sort()
-    for f in fl:
-        if f[-3:] != '.py' or f[0] == '_':
-            continue
-        m = f[:-3]
-        sys.stdout.write('importing %s ...' %  m)
-        __import__(m)
-        print(' OK.')
-
-    def sys_argv_set(a):
-        sys.argv = sys.argv[:1] + a
-
-    gsyncd = sys.modules['gsyncd']
-    for a in [['--help'], ['--version'], ['--canonicalize-escape-url', '/foo']]:
-        print('>>> invoking program with args: %s' % ' '.join(a))
-        pid = os.fork()
-        if not pid:
-            sys_argv_set(a)
-            gsyncd.main()
-        _, r = os.waitpid(pid, 0)
-        if r:
-            raise RuntimeError('invocation failed')
-finally:
-    shutil.rmtree(ipd)
diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py
deleted file mode 100644
index 7fcc3165a..000000000
--- a/geo-replication/syncdaemon/gsyncd.py
+++ /dev/null
@@ -1,534 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import os.path
-import glob
-import sys
-import time
-import logging
-import signal
-import shutil
-import optparse
-import fcntl
-import fnmatch
-from optparse import OptionParser, SUPPRESS_HELP
-from logging import Logger, handlers
-from errno import EEXIST, ENOENT
-
-from ipaddr import IPAddress, IPNetwork
-
-from gconf import gconf
-from syncdutils import FreeObject, norm, grabpidfile, finalize, log_raise_exception
-from syncdutils import GsyncdError, select, set_term_handler, privileged, update_file
-from configinterface import GConffile
-import resource
-from monitor import monitor
-
-class GLogger(Logger):
-    """Logger customizations for gsyncd.
-
-    It implements a log format similar to that of glusterfs.
-    """
-
-    def makeRecord(self, name, level, *a):
-        rv = Logger.makeRecord(self, name, level, *a)
-        rv.nsecs = (rv.created - int(rv.created)) * 1000000
-        fr = sys._getframe(4)
-        callee = fr.f_locals.get('self')
-        if callee:
-            ctx = str(type(callee)).split("'")[1].split('.')[-1]
-        else:
-            ctx = '<top>'
-        if not hasattr(rv, 'funcName'):
-            rv.funcName = fr.f_code.co_name
-        rv.lvlnam = logging.getLevelName(level)[0]
-        rv.ctx = ctx
-        return rv
-
-    @classmethod
-    def setup(cls, **kw):
-        lbl = kw.get('label', "")
-        if lbl:
-            lbl = '(' + lbl + ')'
-        lprm = {'datefmt': "%Y-%m-%d %H:%M:%S",
-                'format': "[%(asctime)s.%(nsecs)d] %(lvlnam)s [%(module)s" + lbl + ":%(lineno)s:%(funcName)s] %(ctx)s: %(message)s"}
-        lprm.update(kw)
-        lvl = kw.get('level', logging.INFO)
-        lprm['level'] = lvl
-        logging.root = cls("root", lvl)
-        logging.setLoggerClass(cls)
-        logging.getLogger().handlers = []
-        logging.getLogger().setLevel(lprm['level'])
-
-        if 'filename' in lprm:
-            try:
-                logging_handler = handlers.WatchedFileHandler(lprm['filename'])
-                formatter = logging.Formatter(fmt=lprm['format'],
-                datefmt=lprm['datefmt'])
-                logging_handler.setFormatter(formatter)
-                logging.getLogger().addHandler(logging_handler)
-            except AttributeError:
-                # Python version < 2.6 will not have WatchedFileHandler
-                # so fallback to logging without any handler.
-                # Note: logrotate will not work if Python version is < 2.6
-                logging.basicConfig(**lprm)
-        else:
-            # If filename not passed(not available in lprm) then it may be
-            # streaming.(Ex: {"stream": "/dev/stdout"})
-            logging.basicConfig(**lprm)
-
-    @classmethod
-    def _gsyncd_loginit(cls, **kw):
-        lkw = {}
-        if gconf.log_level:
-            lkw['level'] = gconf.log_level
-        if kw.get('log_file'):
-            if kw['log_file'] in ('-', '/dev/stderr'):
-                lkw['stream'] = sys.stderr
-            elif kw['log_file'] == '/dev/stdout':
-                lkw['stream'] = sys.stdout
-            else:
-                lkw['filename'] = kw['log_file']
-
-        cls.setup(label=kw.get('label'), **lkw)
-
-        lkw.update({'saved_label': kw.get('label')})
-        gconf.log_metadata = lkw
-        gconf.log_exit = True
-
-def startup(**kw):
-    """set up logging, pidfile grabbing, daemonization"""
-    if getattr(gconf, 'pid_file', None) and kw.get('go_daemon') != 'postconn':
-        if not grabpidfile():
-            sys.stderr.write("pidfile is taken, exiting.\n")
-            sys.exit(2)
-        gconf.pid_file_owned = True
-
-    if kw.get('go_daemon') == 'should':
-        x, y = os.pipe()
-        gconf.cpid = os.fork()
-        if gconf.cpid:
-            os.close(x)
-            sys.exit()
-        os.close(y)
-        os.setsid()
-        dn = os.open(os.devnull, os.O_RDWR)
-        for f in (sys.stdin, sys.stdout, sys.stderr):
-            os.dup2(dn, f.fileno())
-        if getattr(gconf, 'pid_file', None):
-            if not grabpidfile(gconf.pid_file + '.tmp'):
-                raise GsyncdError("cannot grab temporary pidfile")
-            os.rename(gconf.pid_file + '.tmp', gconf.pid_file)
-        # wait for parent to terminate
-        # so we can start up with
-        # no messing from the dirty
-        # ol' bustard
-        select((x,), (), ())
-        os.close(x)
-
-    GLogger._gsyncd_loginit(**kw)
-
-
-def _unlink(path):
-    try:
-        os.unlink(path)
-    except (OSError, IOError):
-        if sys.exc_info()[1].errno == ENOENT:
-            pass
-        else:
-            raise GsyncdError('Unlink error: %s' % path)
-
-
-def main():
-    """main routine, signal/exception handling boilerplates"""
-    gconf.starttime = time.time()
-    set_term_handler()
-    GLogger.setup()
-    excont = FreeObject(exval = 0)
-    try:
-        try:
-            main_i()
-        except:
-            log_raise_exception(excont)
-    finally:
-        finalize(exval = excont.exval)
-
-def main_i():
-    """internal main routine
-
-    parse command line, decide what action will be taken;
-    we can either:
-    - query/manipulate configuration
-    - format gsyncd urls using gsyncd's url parsing engine
-    - start service in following modes, in given stages:
-      - monitor: startup(), monitor()
-      - master: startup(), connect_remote(), connect(), service_loop()
-      - slave: startup(), connect(), service_loop()
-    """
-    rconf = {'go_daemon': 'should'}
-
-    def store_abs(opt, optstr, val, parser):
-        if val and val != '-':
-            val = os.path.abspath(val)
-        setattr(parser.values, opt.dest, val)
-    def store_local(opt, optstr, val, parser):
-        rconf[opt.dest] = val
-    def store_local_curry(val):
-        return lambda o, oo, vx, p: store_local(o, oo, val, p)
-    def store_local_obj(op, dmake):
-        return lambda o, oo, vx, p: store_local(o, oo, FreeObject(op=op, **dmake(vx)), p)
-
-    op = OptionParser(usage="%prog [options...] <master> <slave>", version="%prog 0.0.1")
-    op.add_option('--gluster-command-dir', metavar='DIR',   default='')
-    op.add_option('--gluster-log-file',    metavar='LOGF',  default=os.devnull, type=str, action='callback', callback=store_abs)
-    op.add_option('--gluster-log-level',   metavar='LVL')
-    op.add_option('--gluster-params',      metavar='PRMS',  default='')
-    op.add_option('--glusterd-uuid',       metavar='UUID',  type=str, default='', help=SUPPRESS_HELP)
-    op.add_option('--gluster-cli-options', metavar='OPTS',  default='--log-file=-')
-    op.add_option('--mountbroker',         metavar='LABEL')
-    op.add_option('-p', '--pid-file',      metavar='PIDF',  type=str, action='callback', callback=store_abs)
-    op.add_option('-l', '--log-file',      metavar='LOGF',  type=str, action='callback', callback=store_abs)
-    op.add_option('--log-file-mbr',        metavar='LOGF',  type=str, action='callback', callback=store_abs)
-    op.add_option('--state-file',          metavar='STATF', type=str, action='callback', callback=store_abs)
-    op.add_option('--state-detail-file',   metavar='STATF', type=str, action='callback', callback=store_abs)
-    op.add_option('--ignore-deletes',      default=False, action='store_true')
-    op.add_option('--isolated-slave',      default=False, action='store_true')
-    op.add_option('--use-rsync-xattrs',    default=False, action='store_true')
-    op.add_option('-L', '--log-level',     metavar='LVL')
-    op.add_option('-r', '--remote-gsyncd', metavar='CMD',   default=os.path.abspath(sys.argv[0]))
-    op.add_option('--volume-id',           metavar='UUID')
-    op.add_option('--slave-id',            metavar='ID')
-    op.add_option('--session-owner',       metavar='ID')
-    op.add_option('--local-id',            metavar='ID',    help=SUPPRESS_HELP, default='')
-    op.add_option('--local-path',          metavar='PATH',  help=SUPPRESS_HELP, default='')
-    op.add_option('-s', '--ssh-command',   metavar='CMD',   default='ssh')
-    op.add_option('--rsync-command',       metavar='CMD',   default='rsync')
-    op.add_option('--rsync-options',       metavar='OPTS',  default='')
-    op.add_option('--rsync-ssh-options',   metavar='OPTS',  default='--compress')
-    op.add_option('--timeout',             metavar='SEC',   type=int, default=120)
-    op.add_option('--connection-timeout',  metavar='SEC',   type=int, default=60, help=SUPPRESS_HELP)
-    op.add_option('--sync-jobs',           metavar='N',     type=int, default=3)
-    op.add_option('--turns',               metavar='N',     type=int, default=0, help=SUPPRESS_HELP)
-    op.add_option('--allow-network',       metavar='IPS',   default='')
-    op.add_option('--socketdir',           metavar='DIR')
-    op.add_option('--state-socket-unencoded', metavar='SOCKF', type=str, action='callback', callback=store_abs)
-    op.add_option('--checkpoint',          metavar='LABEL', default='')
-    # tunables for failover/failback mechanism:
-    # None   - gsyncd behaves as normal
-    # blind  - gsyncd works with xtime pairs to identify
-    #          candidates for synchronization
-    # wrapup - same as normal mode but does not assign
-    #          xtimes to orphaned files
-    # see crawl() for usage of the above tunables
-    op.add_option('--special-sync-mode', type=str, help=SUPPRESS_HELP)
-
-    # changelog or xtime? (TODO: Change the default)
-    op.add_option('--change-detector', metavar='MODE', type=str, default='xtime')
-    # sleep interval for change detection (xtime crawl uses a hardcoded 1 second sleep time)
-    op.add_option('--change-interval', metavar='SEC', type=int, default=3)
-    # working directory for changelog based mechanism
-    op.add_option('--working-dir', metavar='DIR', type=str, action='callback', callback=store_abs)
-
-    op.add_option('-c', '--config-file',   metavar='CONF',  type=str, action='callback', callback=store_local)
-    # duh. need to specify dest or value will be mapped to None :S
-    op.add_option('--monitor', dest='monitor', action='callback', callback=store_local_curry(True))
-    op.add_option('--resource-local', dest='resource_local', type=str, action='callback', callback=store_local)
-    op.add_option('--resource-remote', dest='resource_remote', type=str, action='callback', callback=store_local)
-    op.add_option('--feedback-fd', dest='feedback_fd', type=int, help=SUPPRESS_HELP, action='callback', callback=store_local)
-    op.add_option('--listen', dest='listen', help=SUPPRESS_HELP,      action='callback', callback=store_local_curry(True))
-    op.add_option('-N', '--no-daemon', dest="go_daemon",    action='callback', callback=store_local_curry('dont'))
-    op.add_option('--verify', type=str, dest="verify", action='callback', callback=store_local)
-    op.add_option('--create', type=str, dest="create", action='callback', callback=store_local)
-    op.add_option('--delete', dest='delete', action='callback', callback=store_local_curry(True))
-    op.add_option('--debug', dest="go_daemon",              action='callback', callback=lambda *a: (store_local_curry('dont')(*a),
-                                                                                                    setattr(a[-1].values, 'log_file', '-'),
-                                                                                                    setattr(a[-1].values, 'log_level', 'DEBUG'))),
-    op.add_option('--path', type=str, action='append')
-
-    for a in ('check', 'get'):
-        op.add_option('--config-' + a,      metavar='OPT',  type=str, dest='config', action='callback',
-                      callback=store_local_obj(a, lambda vx: {'opt': vx}))
-    op.add_option('--config-get-all', dest='config', action='callback', callback=store_local_obj('get', lambda vx: {'opt': None}))
-    for m in ('', '-rx', '-glob'):
-        # call this code 'Pythonic' eh?
-        # have to define a one-shot local function to be able to inject (a value depending on the)
-        # iteration variable into the inner lambda
-        def conf_mod_opt_regex_variant(rx):
-            op.add_option('--config-set' + m,   metavar='OPT VAL', type=str, nargs=2, dest='config', action='callback',
-                          callback=store_local_obj('set', lambda vx: {'opt': vx[0], 'val': vx[1], 'rx': rx}))
-            op.add_option('--config-del' + m,   metavar='OPT',  type=str, dest='config', action='callback',
-                          callback=store_local_obj('del', lambda vx: {'opt': vx, 'rx': rx}))
-        conf_mod_opt_regex_variant(m and m[1:] or False)
-
-    op.add_option('--normalize-url',           dest='url_print', action='callback', callback=store_local_curry('normal'))
-    op.add_option('--canonicalize-url',        dest='url_print', action='callback', callback=store_local_curry('canon'))
-    op.add_option('--canonicalize-escape-url', dest='url_print', action='callback', callback=store_local_curry('canon_esc'))
-
-    tunables = [ norm(o.get_opt_string()[2:]) for o in op.option_list if o.callback in (store_abs, 'store_true', None) and o.get_opt_string() not in ('--version', '--help') ]
-    remote_tunables = [ 'listen', 'go_daemon', 'timeout', 'session_owner', 'config_file', 'use_rsync_xattrs' ]
-    rq_remote_tunables = { 'listen': True }
-
-    # precedence for sources of values: 1) commandline, 2) cfg file, 3) defaults
-    # -- for this to work out we need to tell apart defaults from explicitly set
-    # options... so churn out the defaults here and call the parser with virgin
-    # values container.
-    defaults = op.get_default_values()
-    opts, args = op.parse_args(values=optparse.Values())
-    args_orig = args[:]
-    r = rconf.get('resource_local')
-    if r:
-        if len(args) == 0:
-            args.append(None)
-        args[0] = r
-    r = rconf.get('resource_remote')
-    if r:
-        if len(args) == 0:
-            raise GsyncdError('local resource unspecfied')
-        elif len(args) == 1:
-            args.append(None)
-        args[1] = r
-    confdata = rconf.get('config')
-    if not (len(args) == 2 or \
-            (len(args) == 1 and rconf.get('listen')) or \
-            (len(args) <= 2 and confdata) or \
-            rconf.get('url_print')):
-        sys.stderr.write("error: incorrect number of arguments\n\n")
-        sys.stderr.write(op.get_usage() + "\n")
-        sys.exit(1)
-
-    verify = rconf.get('verify')
-    if verify:
-        logging.info (verify)
-        logging.info ("Able to spawn gsyncd.py")
-        return
-
-    restricted = os.getenv('_GSYNCD_RESTRICTED_')
-
-    if restricted:
-        allopts = {}
-        allopts.update(opts.__dict__)
-        allopts.update(rconf)
-        bannedtuns = set(allopts.keys()) - set(remote_tunables)
-        if bannedtuns:
-            raise GsyncdError('following tunables cannot be set with restricted SSH invocaton: ' + \
-                              ', '.join(bannedtuns))
-        for k, v in rq_remote_tunables.items():
-            if not k in allopts or allopts[k] != v:
-                raise GsyncdError('tunable %s is not set to value %s required for restricted SSH invocaton' % \
-                                  (k, v))
-
-    confrx = getattr(confdata, 'rx', None)
-    def makersc(aa, check=True):
-        if not aa:
-            return ([], None, None)
-        ra = [resource.parse_url(u) for u in aa]
-        local = ra[0]
-        remote = None
-        if len(ra) > 1:
-            remote = ra[1]
-        if check and not local.can_connect_to(remote):
-            raise GsyncdError("%s cannot work with %s" % (local.path, remote and remote.path))
-        return (ra, local, remote)
-    if confrx:
-        # peers are regexen, don't try to parse them
-        if confrx == 'glob':
-            args = [ '\A' + fnmatch.translate(a) for a in args ]
-        canon_peers = args
-        namedict = {}
-    else:
-        dc = rconf.get('url_print')
-        rscs, local, remote = makersc(args_orig, not dc)
-        if dc:
-            for r in rscs:
-                print(r.get_url(**{'normal': {},
-                                   'canon': {'canonical': True},
-                                   'canon_esc': {'canonical': True, 'escaped': True}}[dc]))
-            return
-        pa = ([], [], [])
-        urlprms = ({}, {'canonical': True}, {'canonical': True, 'escaped': True})
-        for x in rscs:
-            for i in range(len(pa)):
-                pa[i].append(x.get_url(**urlprms[i]))
-        _, canon_peers, canon_esc_peers = pa
-        # creating the namedict, a dict representing various ways of referring to / repreenting
-        # peers to be fillable in config templates
-        mods = (lambda x: x, lambda x: x[0].upper() + x[1:], lambda x: 'e' + x[0].upper() + x[1:])
-        if remote:
-            rmap = { local: ('local', 'master'), remote: ('remote', 'slave') }
-        else:
-            rmap = { local: ('local', 'slave') }
-        namedict = {}
-        for i in range(len(rscs)):
-            x = rscs[i]
-            for name in rmap[x]:
-                for j in range(3):
-                    namedict[mods[j](name)] = pa[j][i]
-                namedict[name + 'vol'] = x.volume
-                if name == 'remote':
-                    namedict['remotehost'] = x.remotehost
-    if not 'config_file' in rconf:
-        rconf['config_file'] = os.path.join(os.path.dirname(sys.argv[0]), "conf/gsyncd_template.conf")
-    gcnf = GConffile(rconf['config_file'], canon_peers, defaults.__dict__, opts.__dict__, namedict)
-
-    checkpoint_change = False
-    if confdata:
-        opt_ok = norm(confdata.opt) in tunables + [None]
-        if confdata.op == 'check':
-            if opt_ok:
-                sys.exit(0)
-            else:
-                sys.exit(1)
-        elif not opt_ok:
-            raise GsyncdError("not a valid option: " + confdata.opt)
-        if confdata.op == 'get':
-            gcnf.get(confdata.opt)
-        elif confdata.op == 'set':
-            gcnf.set(confdata.opt, confdata.val, confdata.rx)
-        elif confdata.op == 'del':
-            gcnf.delete(confdata.opt, confdata.rx)
-        # when modifying checkpoint, it's important to make a log
-        # of that, so in that case we go on to set up logging even
-        # if its just config invocation
-        if confdata.opt == 'checkpoint' and confdata.op in ('set', 'del') and \
-           not confdata.rx:
-            checkpoint_change = True
-        if not checkpoint_change:
-            return
-
-    gconf.__dict__.update(defaults.__dict__)
-    gcnf.update_to(gconf.__dict__)
-    gconf.__dict__.update(opts.__dict__)
-    gconf.configinterface = gcnf
-
-    delete = rconf.get('delete')
-    if delete:
-        logging.info ('geo-replication delete')
-        # Delete pid file, status file, socket file
-        cleanup_paths = []
-        if getattr(gconf, 'pid_file', None):
-            cleanup_paths.append(gconf.pid_file)
-
-        if getattr(gconf, 'state_file', None):
-            cleanup_paths.append(gconf.state_file)
-
-        if getattr(gconf, 'state_detail_file', None):
-            cleanup_paths.append(gconf.state_detail_file)
-
-        if getattr(gconf, 'state_socket_unencoded', None):
-            cleanup_paths.append(gconf.state_socket_unencoded)
-
-        cleanup_paths.append(rconf['config_file'][:-11] + "*");
-
-        # Cleanup changelog working dirs
-        if getattr(gconf, 'working_dir', None):
-            try:
-                shutil.rmtree(gconf.working_dir)
-            except (IOError, OSError):
-                if sys.exc_info()[1].errno == ENOENT:
-                    pass
-                else:
-                    raise GsyncdError('Error while removing working dir: %s' % gconf.working_dir)
-
-        for path in cleanup_paths:
-            # To delete temp files
-            for f in glob.glob(path + "*"):
-                _unlink(f)
-        return
-
-    if restricted and gconf.allow_network:
-        ssh_conn = os.getenv('SSH_CONNECTION')
-        if not ssh_conn:
-            #legacy env var
-            ssh_conn = os.getenv('SSH_CLIENT')
-        if ssh_conn:
-            allowed_networks = [ IPNetwork(a) for a in gconf.allow_network.split(',') ]
-            client_ip = IPAddress(ssh_conn.split()[0])
-            allowed = False
-            for nw in allowed_networks:
-                if client_ip in nw:
-                    allowed = True
-                    break
-            if not allowed:
-                raise GsyncdError("client IP address is not allowed")
-
-    ffd = rconf.get('feedback_fd')
-    if ffd:
-        fcntl.fcntl(ffd, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
-
-    #normalize loglevel
-    lvl0 = gconf.log_level
-    if isinstance(lvl0, str):
-        lvl1 = lvl0.upper()
-        lvl2 = logging.getLevelName(lvl1)
-        # I have _never_ _ever_ seen such an utterly braindead
-        # error condition
-        if lvl2 == "Level " + lvl1:
-            raise GsyncdError('cannot recognize log level "%s"' % lvl0)
-        gconf.log_level = lvl2
-
-    if not privileged() and gconf.log_file_mbr:
-        gconf.log_file = gconf.log_file_mbr
-
-    if checkpoint_change:
-        try:
-            GLogger._gsyncd_loginit(log_file=gconf.log_file, label='conf')
-            if confdata.op == 'set':
-                logging.info('checkpoint %s set' % confdata.val)
-            elif confdata.op == 'del':
-                logging.info('checkpoint info was reset')
-        except IOError:
-            if sys.exc_info()[1].errno == ENOENT:
-                # directory of log path is not present,
-                # which happens if we get here from
-                # a peer-multiplexed "config-set checkpoint"
-                # (as that directory is created only on the
-                # original node)
-                pass
-            else:
-                raise
-        return
-
-    create = rconf.get('create')
-    if create:
-        if getattr(gconf, 'state_file', None):
-            update_file(gconf.state_file, lambda f: f.write(create + '\n'))
-        return
-
-    go_daemon = rconf['go_daemon']
-    be_monitor = rconf.get('monitor')
-
-    rscs, local, remote = makersc(args)
-    if not be_monitor and isinstance(remote, resource.SSH) and \
-       go_daemon == 'should':
-        go_daemon = 'postconn'
-        log_file = None
-    else:
-        log_file = gconf.log_file
-    if be_monitor:
-        label = 'monitor'
-    elif remote:
-        #master
-        label = gconf.local_path
-    else:
-        label = 'slave'
-    startup(go_daemon=go_daemon, log_file=log_file, label=label)
-    resource.Popen.init_errhandler()
-
-    if be_monitor:
-        return monitor(*rscs)
-
-    logging.info("syncing: %s" % " -> ".join(r.url for r in rscs))
-    if remote:
-        go_daemon = remote.connect_remote(go_daemon=go_daemon)
-        if go_daemon:
-            startup(go_daemon=go_daemon, log_file=gconf.log_file)
-            # complete remote connection in child
-            remote.connect_remote(go_daemon='done')
-    local.connect()
-    if ffd:
-        os.close(ffd)
-    local.service_loop(*[r for r in [remote] if r])
-
-
-if __name__ == "__main__":
-    main()
diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py
deleted file mode 100644
index 68ec3baf1..000000000
--- a/geo-replication/syncdaemon/libgfchangelog.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import os
-from ctypes import *
-from ctypes.util import find_library
-
-class Changes(object):
-    libgfc = CDLL(find_library("gfchangelog"), use_errno=True)
-
-    @classmethod
-    def geterrno(cls):
-        return get_errno()
-
-    @classmethod
-    def raise_oserr(cls):
-        errn = cls.geterrno()
-        raise OSError(errn, os.strerror(errn))
-
-    @classmethod
-    def _get_api(cls, call):
-        return getattr(cls.libgfc, call)
-
-    @classmethod
-    def cl_register(cls, brick, path, log_file, log_level, retries = 0):
-        ret = cls._get_api('gf_changelog_register')(brick, path,
-                                                    log_file, log_level, retries)
-        if ret == -1:
-            cls.raise_oserr()
-
-    @classmethod
-    def cl_scan(cls):
-        ret = cls._get_api('gf_changelog_scan')()
-        if ret == -1:
-            cls.raise_oserr()
-
-    @classmethod
-    def cl_startfresh(cls):
-        ret = cls._get_api('gf_changelog_start_fresh')()
-        if ret == -1:
-            cls.raise_oserr()
-
-    @classmethod
-    def cl_getchanges(cls):
-        """ remove hardcoding for path name length """
-        def clsort(f):
-            return f.split('.')[-1]
-        changes = []
-        buf = create_string_buffer('\0', 4096)
-        call = cls._get_api('gf_changelog_next_change')
-
-        while True:
-            ret = call(buf, 4096)
-            if ret in (0, -1):
-                break;
-            changes.append(buf.raw[:ret-1])
-        if ret == -1:
-            cls.raise_oserr()
-        # cleanup tracker
-        cls.cl_startfresh()
-        return sorted(changes, key=clsort)
-
-    @classmethod
-    def cl_done(cls, clfile):
-        ret = cls._get_api('gf_changelog_done')(clfile)
-        if ret == -1:
-            cls.raise_oserr()
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
deleted file mode 100644
index 95810a61e..000000000
--- a/geo-replication/syncdaemon/master.py
+++ /dev/null
@@ -1,1022 +0,0 @@
-import os
-import sys
-import time
-import stat
-import random
-import signal
-import json
-import logging
-import socket
-import string
-import errno
-from shutil import copyfileobj
-from errno import ENOENT, ENODATA, EPIPE, EEXIST
-from threading import currentThread, Condition, Lock
-from datetime import datetime
-
-from gconf import gconf
-from tempfile import mkdtemp, NamedTemporaryFile
-from syncdutils import FreeObject, Thread, GsyncdError, boolify, escape, \
-                       unescape, select, gauxpfx, md5hex, selfkill, entry2pb, \
-                       lstat, errno_wrap
-
-URXTIME = (-1, 0)
-
-# Utility functions to help us to get to closer proximity
-# of the DRY principle (no, don't look for elevated or
-# perspectivistic things here)
-
-def _xtime_now():
-    t = time.time()
-    sec = int(t)
-    nsec = int((t - sec) * 1000000)
-    return (sec, nsec)
-
-def _volinfo_hook_relax_foreign(self):
-    volinfo_sys = self.get_sys_volinfo()
-    fgn_vi = volinfo_sys[self.KFGN]
-    if fgn_vi:
-        expiry = fgn_vi['timeout'] - int(time.time()) + 1
-        logging.info('foreign volume info found, waiting %d sec for expiry' % \
-                     expiry)
-        time.sleep(expiry)
-        volinfo_sys = self.get_sys_volinfo()
-    return volinfo_sys
-
-
-# The API!
-
-def gmaster_builder(excrawl=None):
-    """produce the GMaster class variant corresponding
-       to sync mode"""
-    this = sys.modules[__name__]
-    modemixin = gconf.special_sync_mode
-    if not modemixin:
-        modemixin = 'normal'
-    changemixin = isinstance(excrawl, str) and excrawl or gconf.change_detector
-    logging.info('setting up %s change detection mode' % changemixin)
-    modemixin = getattr(this, modemixin.capitalize() + 'Mixin')
-    crawlmixin = getattr(this, 'GMaster' + changemixin.capitalize() + 'Mixin')
-    sendmarkmixin = boolify(gconf.use_rsync_xattrs) and SendmarkRsyncMixin or SendmarkNormalMixin
-    purgemixin = boolify(gconf.ignore_deletes) and PurgeNoopMixin or PurgeNormalMixin
-    class _GMaster(crawlmixin, modemixin, sendmarkmixin, purgemixin):
-        pass
-    return _GMaster
-
-
-# Mixin classes that implement the data format
-# and logic particularities of the certain
-# sync modes
-
-class NormalMixin(object):
-    """normal geo-rep behavior"""
-
-    minus_infinity = URXTIME
-
-    # following staticmethods ideally would be
-    # methods of an xtime object (in particular,
-    # implementing the hooks needed for comparison
-    # operators), but at this point we don't yet
-    # have a dedicated xtime class
-
-    @staticmethod
-    def serialize_xtime(xt):
-        return "%d.%d" % tuple(xt)
-
-    @staticmethod
-    def deserialize_xtime(xt):
-        return tuple(int(x) for x in xt.split("."))
-
-    @staticmethod
-    def native_xtime(xt):
-        return xt
-
-    @staticmethod
-    def xtime_geq(xt0, xt1):
-        return xt0 >= xt1
-
-    def make_xtime_opts(self, is_master, opts):
-        if not 'create' in opts:
-            opts['create'] = is_master
-        if not 'default_xtime' in opts:
-            opts['default_xtime'] = URXTIME
-
-    def xtime_low(self, server, path, **opts):
-        xt = server.xtime(path, self.uuid)
-        if isinstance(xt, int) and xt != ENODATA:
-            return xt
-        if xt == ENODATA or xt < self.volmark:
-            if opts['create']:
-                xt = _xtime_now()
-                server.aggregated.set_xtime(path, self.uuid, xt)
-            else:
-                xt = opts['default_xtime']
-        return xt
-
-    def keepalive_payload_hook(self, timo, gap):
-        # first grab a reference as self.volinfo
-        # can be changed in main thread
-        vi = self.volinfo
-        if vi:
-            # then have a private copy which we can mod
-            vi = vi.copy()
-            vi['timeout'] = int(time.time()) + timo
-        else:
-            # send keep-alives more frequently to
-            # avoid a delay in announcing our volume info
-            # to slave if it becomes established in the
-            # meantime
-            gap = min(10, gap)
-        return (vi, gap)
-
-    def volinfo_hook(self):
-        return self.get_sys_volinfo()
-
-    def xtime_reversion_hook(self, path, xtl, xtr):
-        if xtr > xtl:
-            raise GsyncdError("timestamp corruption for " + path)
-
-    def need_sync(self, e, xte, xtrd):
-        return xte > xtrd
-
-    def set_slave_xtime(self, path, mark):
-        self.slave.server.set_xtime(path, self.uuid, mark)
-        self.slave.server.set_xtime_remote(path, self.uuid, mark)
-
-class PartialMixin(NormalMixin):
-    """a variant tuned towards operation with a master
-       that has partial info of the slave (brick typically)"""
-
-    def xtime_reversion_hook(self, path, xtl, xtr):
-        pass
-
-class RecoverMixin(NormalMixin):
-    """a variant that differs from normal in terms
-       of ignoring non-indexed files"""
-
-    @staticmethod
-    def make_xtime_opts(is_master, opts):
-        if not 'create' in opts:
-            opts['create'] = False
-        if not 'default_xtime' in opts:
-            opts['default_xtime'] = URXTIME
-
-    def keepalive_payload_hook(self, timo, gap):
-        return (None, gap)
-
-    def volinfo_hook(self):
-        return _volinfo_hook_relax_foreign(self)
-
-# Further mixins for certain tunable behaviors
-
-class SendmarkNormalMixin(object):
-
-    def sendmark_regular(self, *a, **kw):
-        return self.sendmark(*a, **kw)
-
-class SendmarkRsyncMixin(object):
-
-    def sendmark_regular(self, *a, **kw):
-        pass
-
-
-class PurgeNormalMixin(object):
-
-    def purge_missing(self, path, names):
-        self.slave.server.purge(path, names)
-
-class PurgeNoopMixin(object):
-
-    def purge_missing(self, path, names):
-        pass
-
-class GMasterCommon(object):
-    """abstract class impementling master role"""
-
-    KFGN = 0
-    KNAT = 1
-
-    def get_sys_volinfo(self):
-        """query volume marks on fs root
-
-        err out on multiple foreign masters
-        """
-        fgn_vis, nat_vi = self.master.server.aggregated.foreign_volume_infos(), \
-                          self.master.server.aggregated.native_volume_info()
-        fgn_vi = None
-        if fgn_vis:
-            if len(fgn_vis) > 1:
-                raise GsyncdError("cannot work with multiple foreign masters")
-            fgn_vi = fgn_vis[0]
-        return fgn_vi, nat_vi
-
-    @property
-    def uuid(self):
-        if self.volinfo:
-            return self.volinfo['uuid']
-
-    @property
-    def volmark(self):
-        if self.volinfo:
-            return self.volinfo['volume_mark']
-
-    def xtime(self, path, *a, **opts):
-        """get amended xtime
-
-        as of amending, we can create missing xtime, or
-        determine a valid value if what we get is expired
-        (as of the volume mark expiry); way of amendig
-        depends on @opts and on subject of query (master
-        or slave).
-        """
-        if a:
-            rsc = a[0]
-        else:
-            rsc = self.master
-        self.make_xtime_opts(rsc == self.master, opts)
-        return self.xtime_low(rsc.server, path, **opts)
-
-    def get_initial_crawl_data(self):
-        # while persisting only 'files_syncd' is non-zero, rest of
-        # the stats are nulls. lets keep it that way in case they
-        # are needed to be used some day...
-        default_data = {'files_syncd': 0,
-                        'files_remaining': 0,
-                        'bytes_remaining': 0,
-                        'purges_remaining': 0}
-        if getattr(gconf, 'state_detail_file', None):
-            try:
-                return json.load(open(gconf.state_detail_file))
-            except (IOError, OSError):
-                ex = sys.exc_info()[1]
-                if ex.errno == ENOENT:
-                    # Create file with initial data
-                    with open(gconf.state_detail_file, 'wb') as f:
-                        json.dump(default_data, f)
-                    return default_data
-                else:
-                    raise
-        return default_data
-
-    def update_crawl_data(self):
-        if getattr(gconf, 'state_detail_file', None):
-            try:
-                same_dir = os.path.dirname(gconf.state_detail_file)
-                with NamedTemporaryFile(dir=same_dir, delete=False) as tmp:
-                    json.dump(self.total_crawl_stats, tmp)
-                    os.rename(tmp.name, gconf.state_detail_file)
-            except (IOError, OSError):
-                raise
-
-    def __init__(self, master, slave):
-        self.master = master
-        self.slave = slave
-        self.jobtab = {}
-        self.syncer = Syncer(slave)
-        # crawls vs. turns:
-        # - self.crawls is simply the number of crawl() invocations on root
-        # - one turn is a maximal consecutive sequence of crawls so that each
-        #   crawl in it detects a change to be synced
-        # - self.turns is the number of turns since start
-        # - self.total_turns is a limit so that if self.turns reaches it, then
-        #   we exit (for diagnostic purposes)
-        # so, eg., if the master fs changes unceasingly, self.turns will remain 0.
-        self.crawls = 0
-        self.turns = 0
-        self.total_turns = int(gconf.turns)
-        self.crawl_start = datetime.now()
-        self.lastreport = {'crawls': 0, 'turns': 0, 'time': 0}
-        self.total_crawl_stats = None
-        self.start = None
-        self.change_seen = None
-        # the actual volinfo we make use of
-        self.volinfo = None
-        self.terminate = False
-        self.sleep_interval = 1
-        self.checkpoint_thread = None
-
-    def init_keep_alive(cls):
-        """start the keep-alive thread """
-        timo = int(gconf.timeout or 0)
-        if timo > 0:
-            def keep_alive():
-                while True:
-                    vi, gap = cls.keepalive_payload_hook(timo, timo * 0.5)
-                    cls.slave.server.keep_alive(vi)
-                    time.sleep(gap)
-            t = Thread(target=keep_alive)
-            t.start()
-
-    def should_crawl(cls):
-        return (gconf.glusterd_uuid in cls.master.server.node_uuid())
-
-    def register(self):
-        self.register()
-
-    def crawlwrap(self, oneshot=False):
-        if oneshot:
-            # it's important to do this during the oneshot crawl as
-            # for a passive gsyncd (ie. in a replicate scenario)
-            # the keepalive thread would keep the connection alive.
-            self.init_keep_alive()
-
-        # no need to maintain volinfo state machine.
-        # in a cascading setup, each geo-replication session is
-        # independent (ie. 'volume-mark' and 'xtime' are not
-        # propogated). This is beacuse the slave's xtime is now
-        # stored on the master itself. 'volume-mark' just identifies
-        # that we are in a cascading setup and need to enable
-        # 'geo-replication.ignore-pid-check' option.
-        volinfo_sys = self.volinfo_hook()
-        self.volinfo = volinfo_sys[self.KNAT]
-        inter_master = volinfo_sys[self.KFGN]
-        logging.info("%s master with volume id %s ..." % \
-                         (inter_master and "intermediate" or "primary",
-                          self.uuid))
-        gconf.configinterface.set('volume_id', self.uuid)
-        if self.volinfo:
-            if self.volinfo['retval']:
-                raise GsyncdError("master is corrupt")
-            self.start_checkpoint_thread()
-        else:
-            raise GsyncdError("master volinfo unavailable")
-	self.total_crawl_stats = self.get_initial_crawl_data()
-        self.lastreport['time'] = time.time()
-        logging.info('crawl interval: %d seconds' % self.sleep_interval)
-
-        t0 = time.time()
-        crawl = self.should_crawl()
-        while not self.terminate:
-            if self.start:
-                logging.debug("... crawl #%d done, took %.6f seconds" % \
-                                  (self.crawls, time.time() - self.start))
-            self.start = time.time()
-            should_display_info = self.start - self.lastreport['time'] >= 60
-            if should_display_info:
-                logging.info("%d crawls, %d turns",
-                             self.crawls - self.lastreport['crawls'],
-                             self.turns - self.lastreport['turns'])
-                self.lastreport.update(crawls = self.crawls,
-                                       turns = self.turns,
-                                       time = self.start)
-            t1 = time.time()
-            if int(t1 - t0) >= 60: #lets hardcode this check to 60 seconds
-                crawl = self.should_crawl()
-                t0 = t1
-            if not crawl:
-                time.sleep(5)
-                continue
-            self.crawl()
-            if oneshot:
-                return
-            time.sleep(self.sleep_interval)
-
-    @classmethod
-    def _checkpt_param(cls, chkpt, prm, xtimish=True):
-        """use config backend to lookup a parameter belonging to
-           checkpoint @chkpt"""
-        cprm = getattr(gconf, 'checkpoint_' + prm, None)
-        if not cprm:
-            return
-        chkpt_mapped, val = cprm.split(':', 1)
-        if unescape(chkpt_mapped) != chkpt:
-            return
-        if xtimish:
-            val = cls.deserialize_xtime(val)
-        return val
-
-    @classmethod
-    def _set_checkpt_param(cls, chkpt, prm, val, xtimish=True):
-        """use config backend to store a parameter associated
-           with checkpoint @chkpt"""
-        if xtimish:
-            val = cls.serialize_xtime(val)
-        gconf.configinterface.set('checkpoint_' + prm, "%s:%s" % (escape(chkpt), val))
-
-    @staticmethod
-    def humantime(*tpair):
-        """format xtime-like (sec, nsec) pair to human readable format"""
-        ts = datetime.fromtimestamp(float('.'.join(str(n) for n in tpair))).\
-               strftime("%Y-%m-%d %H:%M:%S")
-        if len(tpair) > 1:
-            ts += '.' + str(tpair[1])
-        return ts
-
-    def get_extra_info(self):
-        str_info = '\nUptime=%s;FilesSyncd=%d;FilesPending=%d;BytesPending=%d;DeletesPending=%d;' % \
-            (self._crawl_time_format(datetime.now() - self.crawl_start), \
-                 self.total_crawl_stats['files_syncd'], \
-                 self.total_crawl_stats['files_remaining'], \
-                 self.total_crawl_stats['bytes_remaining'], \
-                 self.total_crawl_stats['purges_remaining'])
-        str_info += '\0'
-        logging.debug(str_info)
-        return str_info
-
-    def _crawl_time_format(self, crawl_time):
-        # Ex: 5 years, 4 days, 20:23:10
-        years, days = divmod(crawl_time.days, 365.25)
-        years = int(years)
-        days = int(days)
-
-        date=""
-        m, s = divmod(crawl_time.seconds, 60)
-        h, m = divmod(m, 60)
-
-        if years != 0:
-            date += "%s %s " % (years, "year" if years == 1 else "years")
-        if days != 0:
-            date += "%s %s " % (days, "day" if days == 1 else "days")
-
-        date += "%s:%s:%s" % (string.zfill(h, 2), string.zfill(m, 2), string.zfill(s, 2))
-        return date
-
-    def checkpt_service(self, chan, chkpt, tgt):
-        """checkpoint service loop
-
-        monitor and verify checkpoint status for @chkpt, and listen
-        for incoming requests for whom we serve a pretty-formatted
-        status report"""
-        if not chkpt:
-            # dummy loop for the case when there is no checkpt set
-            while True:
-                select([chan], [], [])
-                conn, _ = chan.accept()
-                conn.send(self.get_extra_info())
-                conn.close()
-        completed = self._checkpt_param(chkpt, 'completed', xtimish=False)
-        if completed:
-            completed = tuple(int(x) for x in completed.split('.'))
-        while True:
-            s,_,_ = select([chan], [], [], (not completed) and 5 or None)
-            # either request made and we re-check to not
-            # give back stale data, or we still hunting for completion
-            if self.native_xtime(tgt) and self.native_xtime(tgt) < self.volmark:
-                # indexing has been reset since setting the checkpoint
-                status = "is invalid"
-            else:
-                xtr = self.xtime('.', self.slave)
-                if isinstance(xtr, int):
-                    raise GsyncdError("slave root directory is unaccessible (%s)",
-                                      os.strerror(xtr))
-                ncompleted = self.xtime_geq(xtr, tgt)
-                if completed and not ncompleted: # stale data
-                    logging.warn("completion time %s for checkpoint %s became stale" % \
-                                 (self.humantime(*completed), chkpt))
-                    completed = None
-                    gconf.confdata.delete('checkpoint-completed')
-                if ncompleted and not completed: # just reaching completion
-                    completed = "%.6f" % time.time()
-                    self._set_checkpt_param(chkpt, 'completed', completed, xtimish=False)
-                    completed = tuple(int(x) for x in completed.split('.'))
-                    logging.info("checkpoint %s completed" % chkpt)
-                status = completed and \
-                  "completed at " + self.humantime(completed[0]) or \
-                  "not reached yet"
-            if s:
-                conn = None
-                try:
-                    conn, _ = chan.accept()
-                    try:
-                        conn.send("  | checkpoint %s %s %s" % (chkpt, status, self.get_extra_info()))
-                    except:
-                        exc = sys.exc_info()[1]
-                        if (isinstance(exc, OSError) or isinstance(exc, IOError)) and \
-                           exc.errno == EPIPE:
-                            logging.debug('checkpoint client disconnected')
-                        else:
-                            raise
-                finally:
-                    if conn:
-                        conn.close()
-
-    def start_checkpoint_thread(self):
-        """prepare and start checkpoint service"""
-        if self.checkpoint_thread or not (
-          getattr(gconf, 'state_socket_unencoded', None) and getattr(gconf, 'socketdir', None)
-        ):
-            return
-        chan = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        state_socket = os.path.join(gconf.socketdir, md5hex(gconf.state_socket_unencoded) + ".socket")
-        try:
-            os.unlink(state_socket)
-        except:
-            if sys.exc_info()[0] == OSError:
-                pass
-        chan.bind(state_socket)
-        chan.listen(1)
-        checkpt_tgt = None
-        if gconf.checkpoint:
-            checkpt_tgt = self._checkpt_param(gconf.checkpoint, 'target')
-            if not checkpt_tgt:
-                checkpt_tgt = self.xtime('.')
-                if isinstance(checkpt_tgt, int):
-                    raise GsyncdError("master root directory is unaccessible (%s)",
-                                      os.strerror(checkpt_tgt))
-                self._set_checkpt_param(gconf.checkpoint, 'target', checkpt_tgt)
-            logging.debug("checkpoint target %s has been determined for checkpoint %s" % \
-                          (repr(checkpt_tgt), gconf.checkpoint))
-        t = Thread(target=self.checkpt_service, args=(chan, gconf.checkpoint, checkpt_tgt))
-        t.start()
-        self.checkpoint_thread = t
-
-    def add_job(self, path, label, job, *a, **kw):
-        """insert @job function to job table at @path with @label"""
-        if self.jobtab.get(path) == None:
-            self.jobtab[path] = []
-        self.jobtab[path].append((label, a, lambda : job(*a, **kw)))
-
-    def add_failjob(self, path, label):
-        """invoke .add_job with a job that does nothing just fails"""
-        logging.debug('salvaged: ' + label)
-        self.add_job(path, label, lambda: False)
-
-    def wait(self, path, *args):
-        """perform jobs registered for @path
-
-        Reset jobtab entry for @path,
-        determine success as the conjuction of
-        success of all the jobs. In case of
-        success, call .sendmark on @path
-        """
-        jobs = self.jobtab.pop(path, [])
-        succeed = True
-        for j in jobs:
-            ret = j[-1]()
-            if not ret:
-                succeed = False
-        if succeed and not args[0] == None:
-            self.sendmark(path, *args)
-        return succeed
-
-    def sendmark(self, path, mark, adct=None):
-        """update slave side xtime for @path to master side xtime
-
-        also can send a setattr payload (see Server.setattr).
-        """
-        if adct:
-            self.slave.server.setattr(path, adct)
-        self.set_slave_xtime(path, mark)
-
-class GMasterChangelogMixin(GMasterCommon):
-    """ changelog based change detection and syncing """
-
-    # index for change type and entry
-    IDX_START = 0
-    IDX_END   = 2
-
-    POS_GFID   = 0
-    POS_TYPE   = 1
-    POS_ENTRY1 = 2
-    POS_ENTRY2 = 3  # renames
-
-    _CL_TYPE_DATA_PFX     = "D "
-    _CL_TYPE_METADATA_PFX = "M "
-    _CL_TYPE_ENTRY_PFX    = "E "
-
-    TYPE_GFID  = [_CL_TYPE_DATA_PFX] # ignoring metadata ops
-    TYPE_ENTRY = [_CL_TYPE_ENTRY_PFX]
-
-    # flat directory heirarchy for gfid based access
-    FLAT_DIR_HIERARCHY = '.'
-
-    # maximum retries per changelog before giving up
-    MAX_RETRIES = 10
-
-    def fallback_xsync(self):
-        logging.info('falling back to xsync mode')
-        gconf.configinterface.set('change-detector', 'xsync')
-        selfkill()
-
-    def setup_working_dir(self):
-        workdir = os.path.join(gconf.working_dir, md5hex(gconf.local_path))
-        logfile = os.path.join(workdir, 'changes.log')
-        logging.debug('changelog working dir %s (log: %s)' % (workdir, logfile))
-        return (workdir, logfile)
-
-    # update stats from *this* crawl
-    def update_cumulative_stats(self, files_pending):
-        self.total_crawl_stats['files_remaining']  = files_pending['count']
-        self.total_crawl_stats['bytes_remaining']  = files_pending['bytes']
-        self.total_crawl_stats['purges_remaining'] = files_pending['purge']
-
-    # sync data
-    def syncdata(self, datas):
-        logging.debug('datas: %s' % (datas))
-        for data in datas:
-            logging.debug('candidate for syncing %s' % data)
-            pb = self.syncer.add(data)
-            def regjob(se, xte, pb):
-                rv = pb.wait()
-                if rv[0]:
-                    logging.debug('synced ' + se)
-                    return True
-                else:
-                    if rv[1] in [23, 24]:
-                        # stat to check if the file exist
-                        st = lstat(se)
-                        if isinstance(st, int):
-                            # file got unlinked in the interim
-                            return True
-                    logging.warn('Rsync: %s [errcode: %d]' % (se, rv[1]))
-            self.add_job(self.FLAT_DIR_HIERARCHY, 'reg', regjob, data, None, pb)
-        if self.wait(self.FLAT_DIR_HIERARCHY, None):
-            return True
-
-    def process_change(self, change, done, retry):
-        pfx = gauxpfx()
-        clist   = []
-        entries = []
-        datas = set()
-
-        # basic crawl stats: files and bytes
-        files_pending  = {'count': 0, 'purge': 0, 'bytes': 0, 'files': []}
-        try:
-            f = open(change, "r")
-            clist = f.readlines()
-            f.close()
-        except IOError:
-            raise
-
-        def edct(op, **ed):
-            dct = {}
-            dct['op'] = op
-            for k in ed:
-                if k == 'stat':
-                    st = ed[k]
-                    dst = dct['stat'] = {}
-                    dst['uid'] = st.st_uid
-                    dst['gid'] = st.st_gid
-                    dst['mode'] = st.st_mode
-                else:
-                    dct[k] = ed[k]
-            return dct
-
-        # regular file update: bytes & count
-        def _update_reg(entry, size):
-            if not entry in files_pending['files']:
-                files_pending['count'] += 1
-                files_pending['bytes'] += size
-                files_pending['files'].append(entry)
-        # updates for directories, symlinks etc..
-        def _update_rest():
-            files_pending['count'] += 1
-
-        # entry count
-        def entry_update(entry, size, mode):
-            if stat.S_ISREG(mode):
-                _update_reg(entry, size)
-            else:
-                _update_rest()
-        # purge count
-        def purge_update():
-            files_pending['purge'] += 1
-
-        for e in clist:
-            e = e.strip()
-            et = e[self.IDX_START:self.IDX_END]
-            ec = e[self.IDX_END:].split(' ')
-            if et in self.TYPE_ENTRY:
-                ty = ec[self.POS_TYPE]
-                en = unescape(os.path.join(pfx, ec[self.POS_ENTRY1]))
-                gfid = ec[self.POS_GFID]
-                # definitely need a better way bucketize entry ops
-                if ty in ['UNLINK', 'RMDIR']:
-                    purge_update()
-                    entries.append(edct(ty, gfid=gfid, entry=en))
-                    continue
-                go = os.path.join(pfx, gfid)
-                st = lstat(go)
-                if isinstance(st, int):
-		    if ty == 'RENAME':
-                        entries.append(edct('UNLINK', gfid=gfid, entry=en))
-		    else:
-                        logging.debug('file %s got purged in the interim' % go)
-                    continue
-                entry_update(go, st.st_size, st.st_mode)
-                if ty in ['CREATE', 'MKDIR', 'MKNOD']:
-                    entries.append(edct(ty, stat=st, entry=en, gfid=gfid))
-                elif ty == 'LINK':
-                    entries.append(edct(ty, stat=st, entry=en, gfid=gfid))
-                elif ty == 'SYMLINK':
-                    rl = errno_wrap(os.readlink, [en], [ENOENT])
-                    if isinstance(rl, int):
-                        continue
-                    entries.append(edct(ty, stat=st, entry=en, gfid=gfid, link=rl))
-                elif ty == 'RENAME':
-                    e2 = unescape(os.path.join(pfx, ec[self.POS_ENTRY2]))
-                    entries.append(edct(ty, gfid=gfid, entry=en, entry1=e2, stat=st))
-                else:
-                    logging.warn('ignoring %s [op %s]' % (gfid, ty))
-            elif et in self.TYPE_GFID:
-                go = os.path.join(pfx, ec[0])
-                st = lstat(go)
-                if isinstance(st, int):
-                    logging.debug('file %s got purged in the interim' % go)
-                    continue
-                entry_update(go, st.st_size, st.st_mode)
-                datas.update([go])
-        logging.debug('entries: %s' % repr(entries))
-        if not retry:
-            self.update_cumulative_stats(files_pending)
-        # sync namespace
-        if (entries):
-            self.slave.server.entry_ops(entries)
-        # sync data
-        if self.syncdata(datas):
-            if done:
-                self.master.server.changelog_done(change)
-            return True
-
-    def sync_done(self):
-        self.total_crawl_stats['files_syncd'] += self.total_crawl_stats['files_remaining']
-        self.total_crawl_stats['files_remaining']  = 0
-        self.total_crawl_stats['bytes_remaining']  = 0
-        self.total_crawl_stats['purges_remaining'] = 0
-        self.update_crawl_data()
-
-    def process(self, changes, done=1):
-        for change in changes:
-            tries = 0
-            retry = False
-            while True:
-                logging.debug('processing change %s' % change)
-                if self.process_change(change, done, retry):
-                    self.sync_done()
-                    break
-                retry = True
-                tries += 1
-                if tries == self.MAX_RETRIES:
-                    logging.warn('changelog %s could not be processed - moving on...' % os.path.basename(change))
-                    self.sync_done()
-                    if done:
-                        self.master.server.changelog_done(change)
-                    break
-                # it's either entry_ops() or Rsync that failed to do it's
-                # job. Mostly it's entry_ops() [which currently has a problem
-                # of failing to create an entry but failing to return an errno]
-                # Therefore we do not know if it's either Rsync or the freaking
-                # entry_ops() that failed... so we retry the _whole_ changelog
-                # again.
-                # TODO: remove entry retries when it's gets fixed.
-                logging.warn('incomplete sync, retrying changelog: %s' % change)
-                time.sleep(0.5)
-            self.turns += 1
-
-    def upd_stime(self, stime):
-        if not stime == URXTIME:
-            self.sendmark(self.FLAT_DIR_HIERARCHY, stime)
-
-    def crawl(self):
-        changes = []
-        try:
-            self.master.server.changelog_scan()
-            self.crawls += 1
-        except OSError:
-            self.fallback_xsync()
-        changes = self.master.server.changelog_getchanges()
-        if changes:
-            xtl = self.xtime(self.FLAT_DIR_HIERARCHY)
-            if isinstance(xtl, int):
-                raise GsyncdError('master is corrupt')
-            logging.debug('processing changes %s' % repr(changes))
-            self.process(changes)
-            self.upd_stime(xtl)
-
-    def register(self):
-        (workdir, logfile) = self.setup_working_dir()
-        self.sleep_interval = int(gconf.change_interval)
-        # register with the changelog library
-        try:
-            # 9 == log level (DEBUG)
-            # 5 == connection retries
-            self.master.server.changelog_register(gconf.local_path,
-                                                  workdir, logfile, 9, 5)
-        except OSError:
-            self.fallback_xsync()
-            # control should not reach here
-            raise
-
-class GMasterXsyncMixin(GMasterChangelogMixin):
-    """
-
-    This crawl needs to be xtime based (as of now
-    it's not. this is beacuse we generate CHANGELOG
-    file during each crawl which is then processed
-    by process_change()).
-    For now it's used as a one-shot initial sync
-    mechanism and only syncs directories, regular
-    files and symlinks.
-    """
-
-    def register(self):
-        self.sleep_interval = 60
-        self.tempdir = self.setup_working_dir()[0]
-        self.tempdir = os.path.join(self.tempdir, 'xsync')
-        logging.info('xsync temp directory: %s' % self.tempdir)
-        try:
-            os.makedirs(self.tempdir)
-        except OSError:
-            ex = sys.exc_info()[1]
-            if ex.errno == EEXIST and os.path.isdir(self.tempdir):
-                pass
-            else:
-                raise
-
-    def write_entry_change(self, prefix, data=[]):
-        self.fh.write("%s %s\n" % (prefix, ' '.join(data)))
-
-    def open(self):
-        try:
-            self.xsync_change = os.path.join(self.tempdir, 'XSYNC-CHANGELOG.' + str(int(time.time())))
-            self.fh = open(self.xsync_change, 'w')
-        except IOError:
-            raise
-
-    def close(self):
-        self.fh.close()
-
-    def fname(self):
-        return self.xsync_change
-
-    def crawl(self, path='.', xtr=None, done=0):
-        """ generate a CHANGELOG file consumable by process_change """
-        if path == '.':
-            self.open()
-            self.crawls += 1
-        if not xtr:
-            # get the root stime and use it for all comparisons
-            xtr = self.xtime('.', self.slave)
-            if isinstance(xtr, int):
-                if xtr != ENOENT:
-                    raise GsyncdError('slave is corrupt')
-                xtr = self.minus_infinity
-        xtl = self.xtime(path)
-        if isinstance(xtl, int):
-            raise GsyncdError('master is corrupt')
-        if xtr == xtl:
-            if path == '.':
-                self.close()
-            return
-        self.xtime_reversion_hook(path, xtl, xtr)
-        logging.debug("entering " + path)
-        dem = self.master.server.entries(path)
-        pargfid = self.master.server.gfid(path)
-        if isinstance(pargfid, int):
-            logging.warn('skipping directory %s' % (path))
-        for e in dem:
-            bname = e
-            e = os.path.join(path, e)
-            st = lstat(e)
-            if isinstance(st, int):
-                logging.warn('%s got purged in the interim..' % e)
-                continue
-            gfid = self.master.server.gfid(e)
-            if isinstance(gfid, int):
-                logging.warn('skipping entry %s..' % (e))
-                continue
-            xte = self.xtime(e)
-            if isinstance(xte, int):
-                raise GsyncdError('master is corrupt')
-            if not self.need_sync(e, xte, xtr):
-                continue
-            mo = st.st_mode
-            if stat.S_ISDIR(mo):
-                self.write_entry_change("E", [gfid, 'MKDIR', escape(os.path.join(pargfid, bname))])
-                self.crawl(e, xtr)
-            elif stat.S_ISLNK(mo):
-                rl = errno_wrap(os.readlink, [en], [ENOENT])
-                if isinstance(rl, int):
-                    continue
-                self.write_entry_change("E", [gfid, 'SYMLINK', escape(os.path.join(pargfid, bname)), rl])
-            else:
-                # if a file has a hardlink, create a Changelog entry as 'LINK' so the slave
-                # side will decide if to create the new entry, or to create link.
-                if st.st_nlink == 1:
-                    self.write_entry_change("E", [gfid, 'MKNOD', escape(os.path.join(pargfid, bname))])
-                else:
-                    self.write_entry_change("E", [gfid, 'LINK', escape(os.path.join(pargfid, bname))])
-                if stat.S_ISREG(mo):
-                    self.write_entry_change("D", [gfid])
-
-        if path == '.':
-            logging.info('processing xsync changelog %s' % self.fname())
-            self.close()
-            self.process([self.fname()], done)
-            self.upd_stime(xtl)
-
-class BoxClosedErr(Exception):
-    pass
-
-class PostBox(list):
-    """synchronized collection for storing things thought of as "requests" """
-
-    def __init__(self, *a):
-        list.__init__(self, *a)
-        # too bad Python stdlib does not have read/write locks...
-        # it would suffivce to grab the lock in .append as reader, in .close as writer
-        self.lever = Condition()
-        self.open = True
-        self.done = False
-
-    def wait(self):
-        """wait on requests to be processed"""
-        self.lever.acquire()
-        if not self.done:
-            self.lever.wait()
-        self.lever.release()
-        return self.result
-
-    def wakeup(self, data):
-        """wake up requestors with the result"""
-        self.result = data
-        self.lever.acquire()
-        self.done = True
-        self.lever.notifyAll()
-        self.lever.release()
-
-    def append(self, e):
-        """post a request"""
-        self.lever.acquire()
-        if not self.open:
-            raise BoxClosedErr
-        list.append(self, e)
-        self.lever.release()
-
-    def close(self):
-        """prohibit the posting of further requests"""
-        self.lever.acquire()
-        self.open = False
-        self.lever.release()
-
-class Syncer(object):
-    """a staged queue to relay rsync requests to rsync workers
-
-    By "staged queue" its meant that when a consumer comes to the
-    queue, it takes _all_ entries, leaving the queue empty.
-    (I don't know if there is an official term for this pattern.)
-
-    The queue uses a PostBox to accumulate incoming items.
-    When a consumer (rsync worker) comes, a new PostBox is
-    set up and the old one is passed on to the consumer.
-
-    Instead of the simplistic scheme of having one big lock
-    which synchronizes both the addition of new items and
-    PostBox exchanges, use a separate lock to arbitrate consumers,
-    and rely on PostBox's synchronization mechanisms take
-    care about additions.
-
-    There is a corner case racy situation, producers vs. consumers,
-    which is not handled by this scheme: namely, when the PostBox
-    exchange occurs in between being passed to the producer for posting
-    and the post placement. But that's what Postbox.close is for:
-    such a posting will find the PostBox closed, in which case
-    the producer can re-try posting against the actual PostBox of
-    the queue.
-
-    To aid accumlation of items in the PostBoxen before grabbed
-    by an rsync worker, the worker goes to sleep a bit after
-    each completed syncjob.
-    """
-
-    def __init__(self, slave):
-        """spawn worker threads"""
-        self.slave = slave
-        self.lock = Lock()
-        self.pb = PostBox()
-        self.bytes_synced = 0
-        for i in range(int(gconf.sync_jobs)):
-            t = Thread(target=self.syncjob)
-            t.start()
-
-    def syncjob(self):
-        """the life of a worker"""
-        while True:
-            pb = None
-            while True:
-                self.lock.acquire()
-                if self.pb:
-                    pb, self.pb = self.pb, PostBox()
-                self.lock.release()
-                if pb:
-                    break
-                time.sleep(0.5)
-            pb.close()
-            po = self.slave.rsync(pb)
-            if po.returncode == 0:
-                ret = (True, 0)
-            elif po.returncode in (23, 24):
-                # partial transfer (cf. rsync(1)), that's normal
-                ret = (False, po.returncode)
-            else:
-                po.errfail()
-            pb.wakeup(ret)
-
-    def add(self, e):
-        while True:
-            pb = self.pb
-            try:
-                pb.append(e)
-                return pb
-            except BoxClosedErr:
-                pass
diff --git a/geo-replication/syncdaemon/monitor.py b/geo-replication/syncdaemon/monitor.py
deleted file mode 100644
index 0c3a42fa6..000000000
--- a/geo-replication/syncdaemon/monitor.py
+++ /dev/null
@@ -1,244 +0,0 @@
-import os
-import sys
-import time
-import signal
-import logging
-import uuid
-import xml.etree.ElementTree as XET
-from subprocess import PIPE
-from resource import Popen, FILE, GLUSTER, SSH
-from threading import Lock
-from gconf import gconf
-from syncdutils import update_file, select, waitpid, set_term_handler, is_host_local, GsyncdError
-from syncdutils import escape, Thread, finalize, memoize
-
-class Volinfo(object):
-    def __init__(self, vol, host='localhost', prelude=[]):
-        po = Popen(prelude + ['gluster', '--xml', '--remote-host=' + host, 'volume', 'info', vol],
-                   stdout=PIPE, stderr=PIPE)
-        vix = po.stdout.read()
-        po.wait()
-        po.terminate_geterr()
-        vi = XET.fromstring(vix)
-        if vi.find('opRet').text != '0':
-            if prelude:
-                via = '(via %s) ' % prelude.join(' ')
-            else:
-                via = ' '
-            raise GsyncdError('getting volume info of %s%s failed with errorcode %s',
-                              (vol, via, vi.find('opErrno').text))
-        self.tree = vi
-        self.volume = vol
-        self.host = host
-
-    def get(self, elem):
-        return self.tree.findall('.//' + elem)
-
-    @property
-    @memoize
-    def bricks(self):
-        def bparse(b):
-            host, dirp = b.text.split(':', 2)
-            return {'host': host, 'dir': dirp}
-        return [ bparse(b) for b in self.get('brick') ]
-
-    @property
-    @memoize
-    def uuid(self):
-        ids = self.get('id')
-        if len(ids) != 1:
-            raise GsyncdError("volume info of %s obtained from %s: ambiguous uuid",
-                              self.volume, self.host)
-        return ids[0].text
-
-
-class Monitor(object):
-    """class which spawns and manages gsyncd workers"""
-
-    ST_INIT     = 'Initializing...'
-    ST_STABLE   = 'Stable'
-    ST_FAULTY   = 'faulty'
-    ST_INCON    = 'inconsistent'
-    _ST_ORD = [ST_STABLE, ST_INIT, ST_FAULTY, ST_INCON]
-
-    def __init__(self):
-        self.lock = Lock()
-        self.state = {}
-
-    def set_state(self, state, w=None):
-        """set the state that can be used by external agents
-           like glusterd for status reporting"""
-        computestate = lambda: self.state and self._ST_ORD[max(self._ST_ORD.index(s) for s in self.state.values())]
-        if w:
-            self.lock.acquire()
-            old_state = computestate()
-            self.state[w] = state
-            state = computestate()
-            self.lock.release()
-            if state != old_state:
-                self.set_state(state)
-        else:
-            logging.info('new state: %s' % state)
-            if getattr(gconf, 'state_file', None):
-                update_file(gconf.state_file, lambda f: f.write(state + '\n'))
-
-    @staticmethod
-    def terminate():
-        # relax one SIGTERM by setting a handler that sets back
-        # standard handler
-        set_term_handler(lambda *a: set_term_handler())
-        # give a chance to graceful exit
-        os.kill(-os.getpid(), signal.SIGTERM)
-
-    def monitor(self, w, argv, cpids):
-        """the monitor loop
-
-        Basic logic is a blantantly simple blunt heuristics:
-        if spawned client survives 60 secs, it's considered OK.
-        This servers us pretty well as it's not vulneralbe to
-        any kind of irregular behavior of the child...
-
-        ... well, except for one: if children is hung up on
-        waiting for some event, it can survive aeons, still
-        will be defunct. So we tweak the above logic to
-        expect the worker to send us a signal within 60 secs
-        (in the form of closing its end of a pipe). The worker
-        does this when it's done with the setup stage
-        ready to enter the service loop (note it's the setup
-        stage which is vulnerable to hangs -- the full
-        blown worker blows up on EPIPE if the net goes down,
-        due to the keep-alive thread)
-        """
-
-        self.set_state(self.ST_INIT, w)
-        ret = 0
-        def nwait(p, o=0):
-            p2, r = waitpid(p, o)
-            if not p2:
-                return
-            return r
-        def exit_signalled(s):
-            """ child teminated due to receipt of SIGUSR1 """
-            return (os.WIFSIGNALED(s) and (os.WTERMSIG(s) == signal.SIGUSR1))
-        def exit_status(s):
-            if os.WIFEXITED(s):
-                return os.WEXITSTATUS(s)
-            return 1
-        conn_timeout = int(gconf.connection_timeout)
-        while ret in (0, 1):
-            logging.info('-' * conn_timeout)
-            logging.info('starting gsyncd worker')
-            pr, pw = os.pipe()
-            cpid = os.fork()
-            if cpid == 0:
-                os.close(pr)
-                os.execv(sys.executable, argv + ['--feedback-fd', str(pw),
-                                                 '--local-path', w[0],
-                                                 '--local-id', '.' + escape(w[0]),
-                                                 '--resource-remote', w[1]])
-            self.lock.acquire()
-            cpids.add(cpid)
-            self.lock.release()
-            os.close(pw)
-            t0 = time.time()
-            so = select((pr,), (), (), conn_timeout)[0]
-            os.close(pr)
-            if so:
-                ret = nwait(cpid, os.WNOHANG)
-                if ret != None:
-                    logging.debug("worker died before establishing connection")
-                else:
-                    logging.debug("worker seems to be connected (?? racy check)")
-                    while time.time() < t0 + conn_timeout:
-                        ret = nwait(cpid, os.WNOHANG)
-                        if ret != None:
-                            logging.debug("worker died in startup phase")
-                            break
-                        time.sleep(1)
-            else:
-                logging.debug("worker not confirmed in %d sec, aborting it" % \
-                              conn_timeout)
-                self.terminate()
-                time.sleep(1)
-                os.kill(cpid, signal.SIGKILL)
-                ret = nwait(cpid)
-            if ret == None:
-                self.set_state(self.ST_STABLE, w)
-                ret = nwait(cpid)
-            if exit_signalled(ret):
-                ret = 0
-            else:
-                ret = exit_status(ret)
-                if ret in (0,1):
-                    self.set_state(self.ST_FAULTY, w)
-            time.sleep(10)
-        self.set_state(self.ST_INCON, w)
-        return ret
-
-    def multiplex(self, wspx, suuid):
-        argv = sys.argv[:]
-        for o in ('-N', '--no-daemon', '--monitor'):
-            while o in argv:
-                argv.remove(o)
-        argv.extend(('-N', '-p', '', '--slave-id', suuid))
-        argv.insert(0, os.path.basename(sys.executable))
-
-        cpids = set()
-        ta = []
-        for wx in wspx:
-            def wmon(w):
-                cpid, _ = self.monitor(w, argv, cpids)
-                terminate()
-                time.sleep(1)
-                self.lock.acquire()
-                for cpid in cpids:
-                    os.kill(cpid, signal.SIGKILL)
-                self.lock.release()
-                finalize(exval=1)
-            t = Thread(target = wmon, args=[wx])
-            t.start()
-            ta.append(t)
-        for t in ta:
-            t.join()
-
-def distribute(*resources):
-    master, slave = resources
-    mvol = Volinfo(master.volume, master.host)
-    logging.debug('master bricks: ' + repr(mvol.bricks))
-    prelude  = []
-    si = slave
-    if isinstance(slave, SSH):
-        prelude = gconf.ssh_command.split() + [slave.remote_addr]
-        si = slave.inner_rsc
-        logging.debug('slave SSH gateway: ' + slave.remote_addr)
-    if isinstance(si, FILE):
-        sbricks = {'host': 'localhost', 'dir': si.path}
-        suuid = uuid.uuid5(uuid.NAMESPACE_URL, slave.get_url(canonical=True))
-    elif isinstance(si, GLUSTER):
-        svol = Volinfo(si.volume, si.host, prelude)
-        sbricks = svol.bricks
-        suuid = svol.uuid
-    else:
-        raise GsyncdError("unkown slave type " + slave.url)
-    logging.info('slave bricks: ' + repr(sbricks))
-    if isinstance(si, FILE):
-        slaves = [ slave.url ]
-    else:
-        slavenodes = set(b['host'] for b in sbricks)
-        if isinstance(slave, SSH) and not gconf.isolated_slave:
-            rap = SSH.parse_ssh_address(slave)
-            slaves = [ 'ssh://' + rap['user'] + '@' + h + ':' + si.url for h in slavenodes ]
-        else:
-            slavevols = [ h + ':' + si.volume for h in slavenodes ]
-            if isinstance(slave, SSH):
-                slaves = [ 'ssh://' + rap.remote_addr + ':' + v for v in slavevols ]
-            else:
-                slaves = slavevols
-
-    workerspex = [ (brick['dir'], slaves[idx % len(slaves)]) for idx, brick in enumerate(mvol.bricks) if is_host_local(brick['host']) ]
-    logging.info('worker specs: ' + repr(workerspex))
-    return workerspex, suuid
-
-def monitor(*resources):
-    """oh yeah, actually Monitor is used as singleton, too"""
-    return Monitor().multiplex(*distribute(*resources))
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
deleted file mode 100644
index faf62f868..000000000
--- a/geo-replication/syncdaemon/resource.py
+++ /dev/null
@@ -1,1172 +0,0 @@
-import re
-import os
-import sys
-import stat
-import time
-import fcntl
-import errno
-import types
-import struct
-import socket
-import logging
-import tempfile
-import threading
-import subprocess
-from errno import EEXIST, ENOENT, ENODATA, ENOTDIR, ELOOP, EISDIR, ENOTEMPTY, ESTALE, EINVAL
-from select import error as SelectError
-
-from gconf import gconf
-import repce
-from repce import RepceServer, RepceClient
-from  master import gmaster_builder
-import syncdutils
-from syncdutils import GsyncdError, select, privileged, boolify, funcode
-from syncdutils import umask, entry2pb, gauxpfx, errno_wrap, lstat
-
-UrlRX  = re.compile('\A(\w+)://([^ *?[]*)\Z')
-HostRX = re.compile('[a-z\d](?:[a-z\d.-]*[a-z\d])?', re.I)
-UserRX = re.compile("[\w!\#$%&'*+-\/=?^_`{|}~]+")
-
-def sup(x, *a, **kw):
-    """a rubyesque "super" for python ;)
-
-    invoke caller method in parent class with given args.
-    """
-    return getattr(super(type(x), x), sys._getframe(1).f_code.co_name)(*a, **kw)
-
-def desugar(ustr):
-    """transform sugared url strings to standard <scheme>://<urlbody> form
-
-    parsing logic enforces the constraint that sugared forms should contatin
-    a ':' or a '/', which ensures that sugared urls do not conflict with
-    gluster volume names.
-    """
-    m = re.match('([^:]*):(.*)', ustr)
-    if m:
-        if not m.groups()[0]:
-            return "gluster://localhost" + ustr
-        elif '@' in m.groups()[0] or re.search('[:/]', m.groups()[1]):
-            return "ssh://" + ustr
-        else:
-            return "gluster://" + ustr
-    else:
-        if ustr[0] != '/':
-            raise GsyncdError("cannot resolve sugared url '%s'" % ustr)
-        ap = os.path.normpath(ustr)
-        if ap.startswith('//'):
-            ap = ap[1:]
-        return "file://" + ap
-
-def gethostbyname(hnam):
-    """gethostbyname wrapper"""
-    try:
-        return socket.gethostbyname(hnam)
-    except socket.gaierror:
-        ex = sys.exc_info()[1]
-        raise GsyncdError("failed to resolve %s: %s" % \
-                          (hnam, ex.strerror))
-
-def parse_url(ustr):
-    """instantiate an url object by scheme-to-class dispatch
-
-    The url classes taken into consideration are the ones in
-    this module whose names are full-caps.
-    """
-    m = UrlRX.match(ustr)
-    if not m:
-        ustr = desugar(ustr)
-    m = UrlRX.match(ustr)
-    if not m:
-        raise GsyncdError("malformed url")
-    sch, path = m.groups()
-    this = sys.modules[__name__]
-    if not hasattr(this, sch.upper()):
-        raise GsyncdError("unknown url scheme " + sch)
-    return getattr(this, sch.upper())(path)
-
-
-class _MetaXattr(object):
-    """singleton class, a lazy wrapper around the
-    libcxattr module
-
-    libcxattr (a heavy import due to ctypes) is
-    loaded only when when the single
-    instance is tried to be used.
-
-    This reduces runtime for those invocations
-    which do not need filesystem manipulation
-    (eg. for config, url parsing)
-    """
-
-    def __getattr__(self, meth):
-        from libcxattr import Xattr as LXattr
-        xmeth = [ m for m in dir(LXattr) if m[0] != '_' ]
-        if not meth in xmeth:
-            return
-        for m in xmeth:
-            setattr(self, m, getattr(LXattr, m))
-        return getattr(self, meth)
-
-class _MetaChangelog(object):
-    def __getattr__(self, meth):
-        from libgfchangelog import Changes as LChanges
-        xmeth = [ m for m in dir(LChanges) if m[0] != '_' ]
-        if not meth in xmeth:
-            return
-        for m in xmeth:
-            setattr(self, m, getattr(LChanges, m))
-        return getattr(self, meth)
-
-Xattr = _MetaXattr()
-Changes = _MetaChangelog()
-
-
-class Popen(subprocess.Popen):
-    """customized subclass of subprocess.Popen with a ring
-    buffer for children error output"""
-
-    @classmethod
-    def init_errhandler(cls):
-        """start the thread which handles children's error output"""
-        cls.errstore = {}
-        def tailer():
-            while True:
-                errstore = cls.errstore.copy()
-                try:
-                    poe, _ ,_ = select([po.stderr for po in errstore], [], [], 1)
-                except (ValueError, SelectError):
-                    continue
-                for po in errstore:
-                    if po.stderr not in poe:
-                        continue
-                    po.lock.acquire()
-                    try:
-                        if po.on_death_row:
-                            continue
-                        la = errstore[po]
-                        try:
-                            fd = po.stderr.fileno()
-                        except ValueError:  # file is already closed
-                            continue
-                        l = os.read(fd, 1024)
-                        if not l:
-                            continue
-                        tots = len(l)
-                        for lx in la:
-                            tots += len(lx)
-                        while tots > 1<<20 and la:
-                            tots -= len(la.pop(0))
-                        la.append(l)
-                    finally:
-                        po.lock.release()
-        t = syncdutils.Thread(target = tailer)
-        t.start()
-        cls.errhandler = t
-
-    @classmethod
-    def fork(cls):
-        """fork wrapper that restarts errhandler thread in child"""
-        pid = os.fork()
-        if not pid:
-            cls.init_errhandler()
-        return pid
-
-    def __init__(self, args, *a, **kw):
-        """customizations for subprocess.Popen instantiation
-
-        - 'close_fds' is taken to be the default
-        - if child's stderr is chosen to be managed,
-          register it with the error handler thread
-        """
-        self.args = args
-        if 'close_fds' not in kw:
-            kw['close_fds'] = True
-        self.lock = threading.Lock()
-        self.on_death_row = False
-        try:
-            sup(self, args, *a, **kw)
-        except:
-            ex = sys.exc_info()[1]
-            if not isinstance(ex, OSError):
-                raise
-            raise GsyncdError("""execution of "%s" failed with %s (%s)""" % \
-                              (args[0], errno.errorcode[ex.errno], os.strerror(ex.errno)))
-        if kw.get('stderr') == subprocess.PIPE:
-            assert(getattr(self, 'errhandler', None))
-            self.errstore[self] = []
-
-    def errlog(self):
-        """make a log about child's failure event"""
-        filling = ""
-        if self.elines:
-            filling = ", saying:"
-        logging.error("""command "%s" returned with %s%s""" % \
-                      (" ".join(self.args), repr(self.returncode), filling))
-        lp = ''
-        def logerr(l):
-            logging.error(self.args[0] + "> " + l)
-        for l in self.elines:
-            ls = l.split('\n')
-            ls[0] = lp + ls[0]
-            lp = ls.pop()
-            for ll in ls:
-                logerr(ll)
-        if lp:
-            logerr(lp)
-
-    def errfail(self):
-        """fail nicely if child did not terminate with success"""
-        self.errlog()
-        syncdutils.finalize(exval = 1)
-
-    def terminate_geterr(self, fail_on_err = True):
-        """kill child, finalize stderr harvesting (unregister
-        from errhandler, set up .elines), fail on error if
-        asked for
-        """
-        self.lock.acquire()
-        try:
-            self.on_death_row = True
-        finally:
-            self.lock.release()
-        elines = self.errstore.pop(self)
-        if self.poll() == None:
-            self.terminate()
-            if self.poll() == None:
-                time.sleep(0.1)
-                self.kill()
-                self.wait()
-        while True:
-            if not select([self.stderr],[],[],0.1)[0]:
-                break
-            b = os.read(self.stderr.fileno(), 1024)
-            if b:
-                elines.append(b)
-            else:
-                break
-        self.stderr.close()
-        self.elines = elines
-        if fail_on_err and self.returncode != 0:
-            self.errfail()
-
-
-class Server(object):
-    """singleton implemening those filesystem access primitives
-       which are needed for geo-replication functionality
-
-    (Singleton in the sense it's a class which has only static
-    and classmethods and is used directly, without instantiation.)
-    """
-
-    GX_NSPACE_PFX = (privileged() and "trusted" or "system")
-    GX_NSPACE = GX_NSPACE_PFX + ".glusterfs"
-    NTV_FMTSTR = "!" + "B"*19 + "II"
-    FRGN_XTRA_FMT = "I"
-    FRGN_FMTSTR = NTV_FMTSTR + FRGN_XTRA_FMT
-    GX_GFID_CANONICAL_LEN = 37 # canonical gfid len + '\0'
-
-    local_path = ''
-
-    @classmethod
-    def _fmt_mknod(cls, l):
-        return "!II%dsI%dsIII" % (cls.GX_GFID_CANONICAL_LEN, l+1)
-    @classmethod
-    def _fmt_mkdir(cls, l):
-        return "!II%dsI%dsII" % (cls.GX_GFID_CANONICAL_LEN, l+1)
-    @classmethod
-    def _fmt_symlink(cls, l1, l2):
-        return "!II%dsI%ds%ds" % (cls.GX_GFID_CANONICAL_LEN, l1+1, l2+1)
-
-    def _pathguard(f):
-        """decorator method that checks
-        the path argument of the decorated
-        functions to make sure it does not
-        point out of the managed tree
-        """
-
-        fc = funcode(f)
-        pi = list(fc.co_varnames).index('path')
-        def ff(*a):
-            path = a[pi]
-            ps = path.split('/')
-            if path[0] == '/' or '..' in ps:
-                raise ValueError('unsafe path')
-            a = list(a)
-            a[pi] = os.path.join(a[0].local_path, path)
-            return f(*a)
-        return ff
-
-    @classmethod
-    @_pathguard
-    def entries(cls, path):
-        """directory entries in an array"""
-        # prevent symlinks being followed
-        if not stat.S_ISDIR(os.lstat(path).st_mode):
-            raise OSError(ENOTDIR, os.strerror(ENOTDIR))
-        return os.listdir(path)
-
-    @classmethod
-    @_pathguard
-    def purge(cls, path, entries=None):
-        """force-delete subtrees
-
-        If @entries is not specified, delete
-        the whole subtree under @path (including
-        @path).
-
-        Otherwise, @entries should be a
-        a sequence of children of @path, and
-        the effect is identical with a joint
-        @entries-less purge on them, ie.
-
-        for e in entries:
-            cls.purge(os.path.join(path, e))
-        """
-        me_also = entries == None
-        if not entries:
-            try:
-                # if it's a symlink, prevent
-                # following it
-                try:
-                    os.unlink(path)
-                    return
-                except OSError:
-                    ex = sys.exc_info()[1]
-                    if ex.errno == EISDIR:
-                        entries = os.listdir(path)
-                    else:
-                        raise
-            except OSError:
-                ex = sys.exc_info()[1]
-                if ex.errno in (ENOTDIR, ENOENT, ELOOP):
-                    try:
-                        os.unlink(path)
-                        return
-                    except OSError:
-                        ex = sys.exc_info()[1]
-                        if ex.errno == ENOENT:
-                            return
-                        raise
-                else:
-                    raise
-        for e in entries:
-            cls.purge(os.path.join(path, e))
-        if me_also:
-            os.rmdir(path)
-
-    @classmethod
-    @_pathguard
-    def _create(cls, path, ctor):
-        """path creation backend routine"""
-        try:
-            ctor(path)
-        except OSError:
-            ex = sys.exc_info()[1]
-            if ex.errno == EEXIST:
-                cls.purge(path)
-                return ctor(path)
-            raise
-
-    @classmethod
-    @_pathguard
-    def mkdir(cls, path):
-        cls._create(path, os.mkdir)
-
-    @classmethod
-    @_pathguard
-    def symlink(cls, lnk, path):
-        cls._create(path, lambda p: os.symlink(lnk, p))
-
-    @classmethod
-    @_pathguard
-    def xtime(cls, path, uuid):
-        """query xtime extended attribute
-
-        Return xtime of @path for @uuid as a pair of integers.
-        "Normal" errors due to non-existent @path or extended attribute
-        are tolerated and errno is returned in such a case.
-        """
-
-        try:
-            return struct.unpack('!II', Xattr.lgetxattr(path, '.'.join([cls.GX_NSPACE, uuid, 'xtime']), 8))
-        except OSError:
-            ex = sys.exc_info()[1]
-            if ex.errno in (ENOENT, ENODATA, ENOTDIR):
-                return ex.errno
-            else:
-                raise
-
-    @classmethod
-    def gfid(cls, gfidpath):
-        return errno_wrap(Xattr.lgetxattr, [gfidpath, 'glusterfs.gfid.string', cls.GX_GFID_CANONICAL_LEN], [ENOENT])
-
-    @classmethod
-    def node_uuid(cls, path='.'):
-        try:
-            uuid_l = Xattr.lgetxattr_buf(path, '.'.join([cls.GX_NSPACE, 'node-uuid']))
-            return uuid_l[:-1].split(' ')
-        except OSError:
-            raise
-
-    @classmethod
-    def xtime_vec(cls, path, *uuids):
-        """vectored version of @xtime
-
-        accepts a list of uuids and returns a dictionary
-        with uuid as key(s) and xtime as value(s)
-        """
-        xt = {}
-        for uuid in uuids:
-            xtu = cls.xtime(path, uuid)
-            if xtu == ENODATA:
-                xtu = None
-            if isinstance(xtu, int):
-                return xtu
-            xt[uuid] = xtu
-        return xt
-
-    @classmethod
-    @_pathguard
-    def set_xtime(cls, path, uuid, mark):
-        """set @mark as xtime for @uuid on @path"""
-        Xattr.lsetxattr(path, '.'.join([cls.GX_NSPACE, uuid, 'xtime']), struct.pack('!II', *mark))
-
-    @classmethod
-    @_pathguard
-    def set_xtime_remote(cls, path, uuid, mark):
-        """
-        set @mark as xtime for @uuid on @path
-        the difference b/w this and set_xtime() being
-        set_xtime() being overloaded to set the xtime
-        on the brick (this method sets xtime on the
-        remote slave)
-        """
-        Xattr.lsetxattr(path, '.'.join([cls.GX_NSPACE, uuid, 'xtime']), struct.pack('!II', *mark))
-
-    @classmethod
-    def set_xtime_vec(cls, path, mark_dct):
-        """vectored (or dictered) version of set_xtime
-
-        ignore values that match @ignore
-        """
-        for u,t in mark_dct.items():
-            cls.set_xtime(path, u, t)
-
-    @classmethod
-    def entry_ops(cls, entries):
-        pfx = gauxpfx()
-        logging.debug('entries: %s' % repr(entries))
-        # regular file
-        def entry_pack_reg(gf, bn, st):
-            blen = len(bn)
-            mo = st['mode']
-            return struct.pack(cls._fmt_mknod(blen),
-                               st['uid'], st['gid'],
-                               gf, mo, bn,
-                               stat.S_IMODE(mo), 0, umask())
-        # mkdir
-        def entry_pack_mkdir(gf, bn, st):
-            blen = len(bn)
-            mo = st['mode']
-            return struct.pack(cls._fmt_mkdir(blen),
-                               st['uid'], st['gid'],
-                               gf, mo, bn,
-                               stat.S_IMODE(mo), umask())
-        #symlink
-        def entry_pack_symlink(gf, bn, lnk, st):
-            blen = len(bn)
-            llen = len(lnk)
-            return struct.pack(cls._fmt_symlink(blen, llen),
-                               st['uid'], st['gid'],
-                               gf, st['mode'], bn, lnk)
-        def entry_purge(entry, gfid):
-            # This is an extremely racy code and needs to be fixed ASAP.
-            # The GFID check here is to be sure that the pargfid/bname
-            # to be purged is the GFID gotten from the changelog.
-            # (a stat(changelog_gfid) would also be valid here)
-            # The race here is between the GFID check and the purge.
-            disk_gfid = cls.gfid(entry)
-            if isinstance(disk_gfid, int):
-                return
-            if not gfid == disk_gfid:
-                return
-            er = errno_wrap(os.unlink, [entry], [ENOENT, EISDIR])
-            if isinstance(er, int):
-                if er == EISDIR:
-                    er = errno_wrap(os.rmdir, [entry], [ENOENT, ENOTEMPTY])
-                    if er == ENOTEMPTY:
-                        return er
-        for e in entries:
-            blob = None
-            op = e['op']
-            gfid = e['gfid']
-            entry = e['entry']
-            (pg, bname) = entry2pb(entry)
-            if op in ['RMDIR', 'UNLINK']:
-                while True:
-                    er = entry_purge(entry, gfid)
-                    if isinstance(er, int):
-                        time.sleep(1)
-                    else:
-                        break
-            elif op in ['CREATE', 'MKNOD']:
-                blob = entry_pack_reg(gfid, bname, e['stat'])
-            elif op == 'MKDIR':
-                blob = entry_pack_mkdir(gfid, bname, e['stat'])
-            elif op == 'LINK':
-                slink = os.path.join(pfx, gfid)
-                st = lstat(slink)
-                if isinstance(st, int):
-                    (pg, bname) = entry2pb(entry)
-                    blob = entry_pack_reg(gfid, bname, e['stat'])
-                else:
-                    errno_wrap(os.link, [slink, entry], [ENOENT, EEXIST])
-            elif op == 'SYMLINK':
-                blob = entry_pack_symlink(gfid, bname, e['link'], e['stat'])
-            elif op == 'RENAME':
-                en = e['entry1']
-                st = lstat(entry)
-                if isinstance(st, int):
-                    (pg, bname) = entry2pb(en)
-                    blob = entry_pack_reg(gfid, bname, e['stat'])
-                else:
-                    errno_wrap(os.rename, [entry, en], [ENOENT, EEXIST])
-            if blob:
-                errno_wrap(Xattr.lsetxattr_l, [pg, 'glusterfs.gfid.newfile', blob], [EEXIST], [ENOENT, ESTALE, EINVAL])
-
-    @classmethod
-    def changelog_register(cls, cl_brick, cl_dir, cl_log, cl_level, retries = 0):
-        Changes.cl_register(cl_brick, cl_dir, cl_log, cl_level, retries)
-
-    @classmethod
-    def changelog_scan(cls):
-        Changes.cl_scan()
-
-    @classmethod
-    def changelog_getchanges(cls):
-        return Changes.cl_getchanges()
-
-    @classmethod
-    def changelog_done(cls, clfile):
-        Changes.cl_done(clfile)
-
-    @classmethod
-    @_pathguard
-    def setattr(cls, path, adct):
-        """set file attributes
-
-        @adct is a dict, where 'own', 'mode' and 'times'
-        keys are looked for and values used to perform
-        chown, chmod or utimes on @path.
-        """
-        own = adct.get('own')
-        if own:
-            os.lchown(path, *own)
-        mode = adct.get('mode')
-        if mode:
-            os.chmod(path, stat.S_IMODE(mode))
-        times = adct.get('times')
-        if times:
-            os.utime(path, times)
-
-    @staticmethod
-    def pid():
-        return os.getpid()
-
-    last_keep_alive = 0
-    @classmethod
-    def keep_alive(cls, dct):
-        """process keepalive messages.
-
-        Return keep-alive counter (number of received keep-alive
-        messages).
-
-        Now the "keep-alive" message can also have a payload which is
-        used to set a foreign volume-mark on the underlying file system.
-        """
-        if dct:
-            key = '.'.join([cls.GX_NSPACE, 'volume-mark', dct['uuid']])
-            val = struct.pack(cls.FRGN_FMTSTR,
-                              *(dct['version']  +
-                                tuple(int(x,16) for x in re.findall('(?:[\da-f]){2}', dct['uuid'])) +
-                                (dct['retval'],) + dct['volume_mark'][0:2] + (dct['timeout'],)))
-            Xattr.lsetxattr('.', key, val)
-        cls.last_keep_alive += 1
-        return cls.last_keep_alive
-
-    @staticmethod
-    def version():
-        """version used in handshake"""
-        return 1.0
-
-
-class SlaveLocal(object):
-    """mix-in class to implement some factes of a slave server
-
-    ("mix-in" is sort of like "abstract class", ie. it's not
-    instantiated just included in the ancesty DAG. I use "mix-in"
-    to indicate that it's not used as an abstract base class,
-    rather just taken in to implement additional functionality
-    on the basis of the assumed availability of certain interfaces.)
-    """
-
-    def can_connect_to(self, remote):
-        """determine our position in the connectibility matrix"""
-        return not remote
-
-    def service_loop(self):
-        """start a RePCe server serving self's server
-
-        stop servicing if a timeout is configured and got no
-        keep-alime in that inteval
-        """
-
-        if boolify(gconf.use_rsync_xattrs) and not privileged():
-            raise GsyncdError("using rsync for extended attributes is not supported")
-
-        repce = RepceServer(self.server, sys.stdin, sys.stdout, int(gconf.sync_jobs))
-        t = syncdutils.Thread(target=lambda: (repce.service_loop(),
-                                              syncdutils.finalize()))
-        t.start()
-        logging.info("slave listening")
-        if gconf.timeout and int(gconf.timeout) > 0:
-            while True:
-                lp = self.server.last_keep_alive
-                time.sleep(int(gconf.timeout))
-                if lp == self.server.last_keep_alive:
-                    logging.info("connection inactive for %d seconds, stopping" % int(gconf.timeout))
-                    break
-        else:
-            select((), (), ())
-
-class SlaveRemote(object):
-    """mix-in class to implement an interface to a remote slave"""
-
-    def connect_remote(self, rargs=[], **opts):
-        """connects to a remote slave
-
-        Invoke an auxiliary utility (slave gsyncd, possibly wrapped)
-        which sets up the connection and set up a RePCe client to
-        communicate throuh its stdio.
-        """
-        slave = opts.get('slave', self.url)
-        extra_opts = []
-        so = getattr(gconf, 'session_owner', None)
-        if so:
-            extra_opts += ['--session-owner', so]
-        if boolify(gconf.use_rsync_xattrs):
-            extra_opts.append('--use-rsync-xattrs')
-        po = Popen(rargs + gconf.remote_gsyncd.split() + extra_opts + \
-                   ['-N', '--listen', '--timeout', str(gconf.timeout), slave],
-                   stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        gconf.transport = po
-        return self.start_fd_client(po.stdout, po.stdin, **opts)
-
-    def start_fd_client(self, i, o, **opts):
-        """set up RePCe client, handshake with server
-
-        It's cut out as a separate method to let
-        subclasses hook into client startup
-        """
-        self.server = RepceClient(i, o)
-        rv = self.server.__version__()
-        exrv = {'proto': repce.repce_version, 'object': Server.version()}
-        da0 = (rv, exrv)
-        da1 = ({}, {})
-        for i in range(2):
-            for k, v in da0[i].iteritems():
-                da1[i][k] = int(v)
-        if da1[0] != da1[1]:
-            raise GsyncdError("RePCe major version mismatch: local %s, remote %s" % (exrv, rv))
-
-    def rsync(self, files, *args):
-        """invoke rsync"""
-        if not files:
-            raise GsyncdError("no files to sync")
-        logging.debug("files: " + ", ".join(files))
-        argv = gconf.rsync_command.split() + \
-               ['-avR0', '--inplace', '--files-from=-', '--super','--stats', '--numeric-ids', '--no-implied-dirs'] + \
-               gconf.rsync_options.split() + (boolify(gconf.use_rsync_xattrs) and ['--xattrs'] or []) + \
-               ['.'] + list(args)
-        po = Popen(argv, stdin=subprocess.PIPE,stderr=subprocess.PIPE)
-        for f in files:
-            po.stdin.write(f)
-            po.stdin.write('\0')
-
-        po.stdin.close()
-        po.wait()
-        po.terminate_geterr(fail_on_err = False)
-
-        return po
-
-
-class AbstractUrl(object):
-    """abstract base class for url scheme classes"""
-
-    def __init__(self, path, pattern):
-        m = re.search(pattern, path)
-        if not m:
-            raise GsyncdError("malformed path")
-        self.path = path
-        return m.groups()
-
-    @property
-    def scheme(self):
-        return type(self).__name__.lower()
-
-    def canonical_path(self):
-        return self.path
-
-    def get_url(self, canonical=False, escaped=False):
-        """format self's url in various styles"""
-        if canonical:
-            pa = self.canonical_path()
-        else:
-            pa = self.path
-        u = "://".join((self.scheme, pa))
-        if escaped:
-            u = syncdutils.escape(u)
-        return u
-
-    @property
-    def url(self):
-        return self.get_url()
-
-
-  ### Concrete resource classes ###
-
-
-class FILE(AbstractUrl, SlaveLocal, SlaveRemote):
-    """scheme class for file:// urls
-
-    can be used to represent a file slave server
-    on slave side, or interface to a remote file
-    file server on master side
-    """
-
-    class FILEServer(Server):
-        """included server flavor"""
-        pass
-
-    server = FILEServer
-
-    def __init__(self, path):
-        sup(self, path, '^/')
-
-    def connect(self):
-        """inhibit the resource beyond"""
-        os.chdir(self.path)
-
-    def rsync(self, files):
-        return sup(self, files, self.path)
-
-
-class GLUSTER(AbstractUrl, SlaveLocal, SlaveRemote):
-    """scheme class for gluster:// urls
-
-    can be used to represent a gluster slave server
-    on slave side, or interface to a remote gluster
-    slave on master side, or to represent master
-    (slave-ish features come from the mixins, master
-    functionality is outsourced to GMaster from master)
-    """
-
-    class GLUSTERServer(Server):
-        "server enhancements for a glusterfs backend"""
-
-        @classmethod
-        def _attr_unpack_dict(cls, xattr, extra_fields = ''):
-            """generic volume mark fetching/parsing backed"""
-            fmt_string = cls.NTV_FMTSTR + extra_fields
-            buf = Xattr.lgetxattr('.', xattr, struct.calcsize(fmt_string))
-            vm = struct.unpack(fmt_string, buf)
-            m = re.match('(.{8})(.{4})(.{4})(.{4})(.{12})', "".join(['%02x' % x for x in vm[2:18]]))
-            uuid = '-'.join(m.groups())
-            volinfo = {  'version': vm[0:2],
-                         'uuid'   : uuid,
-                         'retval' : vm[18],
-                         'volume_mark': vm[19:21],
-                      }
-            if extra_fields:
-                return volinfo, vm[-len(extra_fields):]
-            else:
-                return volinfo
-
-        @classmethod
-        def foreign_volume_infos(cls):
-            """return list of valid (not expired) foreign volume marks"""
-            dict_list = []
-            xattr_list = Xattr.llistxattr_buf('.')
-            for ele in xattr_list:
-                if ele.find('.'.join([cls.GX_NSPACE, 'volume-mark', ''])) == 0:
-                    d, x = cls._attr_unpack_dict(ele, cls.FRGN_XTRA_FMT)
-                    now = int(time.time())
-                    if x[0] > now:
-                        logging.debug("volinfo[%s] expires: %d (%d sec later)" % \
-                                      (d['uuid'], x[0], x[0] - now))
-                        d['timeout'] = x[0]
-                        dict_list.append(d)
-                    else:
-                        try:
-                            Xattr.lremovexattr('.', ele)
-                        except OSError:
-                            pass
-            return dict_list
-
-        @classmethod
-        def native_volume_info(cls):
-            """get the native volume mark of the underlying gluster volume"""
-            try:
-                return cls._attr_unpack_dict('.'.join([cls.GX_NSPACE, 'volume-mark']))
-            except OSError:
-                ex = sys.exc_info()[1]
-                if ex.errno != ENODATA:
-                    raise
-
-    server = GLUSTERServer
-
-    def __init__(self, path):
-        self.host, self.volume = sup(self, path, '^(%s):(.+)' % HostRX.pattern)
-
-    def canonical_path(self):
-        return ':'.join([gethostbyname(self.host), self.volume])
-
-    def can_connect_to(self, remote):
-        """determine our position in the connectibility matrix"""
-        return not remote or \
-               (isinstance(remote, SSH) and isinstance(remote.inner_rsc, GLUSTER))
-
-    class Mounter(object):
-        """Abstract base class for mounter backends"""
-
-        def __init__(self, params):
-            self.params = params
-            self.mntpt = None
-
-        @classmethod
-        def get_glusterprog(cls):
-            return os.path.join(gconf.gluster_command_dir, cls.glusterprog)
-
-        def umount_l(self, d):
-            """perform lazy umount"""
-            po = Popen(self.make_umount_argv(d), stderr=subprocess.PIPE)
-            po.wait()
-            return po
-
-        @classmethod
-        def make_umount_argv(cls, d):
-            raise NotImplementedError
-
-        def make_mount_argv(self, *a):
-            raise NotImplementedError
-
-        def cleanup_mntpt(self, *a):
-            pass
-
-        def handle_mounter(self, po):
-            po.wait()
-
-        def inhibit(self, *a):
-            """inhibit a gluster filesystem
-
-            Mount glusterfs over a temporary mountpoint,
-            change into the mount, and lazy unmount the
-            filesystem.
-            """
-
-            mpi, mpo = os.pipe()
-            mh = Popen.fork()
-            if mh:
-                os.close(mpi)
-                fcntl.fcntl(mpo, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
-                d = None
-                margv = self.make_mount_argv(*a)
-                if self.mntpt:
-                    # mntpt is determined pre-mount
-                    d = self.mntpt
-                    os.write(mpo, d + '\0')
-                po = Popen(margv, **self.mountkw)
-                self.handle_mounter(po)
-                po.terminate_geterr()
-                logging.debug('auxiliary glusterfs mount in place')
-                if not d:
-                    # mntpt is determined during mount
-                    d = self.mntpt
-                    os.write(mpo, d + '\0')
-                os.write(mpo, 'M')
-                t = syncdutils.Thread(target=lambda: os.chdir(d))
-                t.start()
-                tlim = gconf.starttime + int(gconf.connection_timeout)
-                while True:
-                    if not t.isAlive():
-                        break
-                    if time.time() >= tlim:
-                        syncdutils.finalize(exval = 1)
-                    time.sleep(1)
-                os.close(mpo)
-                _, rv = syncdutils.waitpid(mh, 0)
-                if rv:
-                    rv = (os.WIFEXITED(rv) and os.WEXITSTATUS(rv) or 0) - \
-                         (os.WIFSIGNALED(rv) and os.WTERMSIG(rv) or 0)
-                    logging.warn('stale mount possibly left behind on ' + d)
-                    raise GsyncdError("cleaning up temp mountpoint %s failed with status %d" % \
-                                      (d, rv))
-            else:
-                rv = 0
-                try:
-                    os.setsid()
-                    os.close(mpo)
-                    mntdata = ''
-                    while True:
-                        c = os.read(mpi, 1)
-                        if not c:
-                            break
-                        mntdata += c
-                    if mntdata:
-                        mounted = False
-                        if mntdata[-1] == 'M':
-                            mntdata = mntdata[:-1]
-                            assert(mntdata)
-                            mounted = True
-                        assert(mntdata[-1] == '\0')
-                        mntpt = mntdata[:-1]
-                        assert(mntpt)
-                        if mounted:
-                            po = self.umount_l(mntpt)
-                            po.terminate_geterr(fail_on_err = False)
-                            if po.returncode != 0:
-                                po.errlog()
-                                rv = po.returncode
-                        self.cleanup_mntpt(mntpt)
-                except:
-                    logging.exception('mount cleanup failure:')
-                    rv = 200
-                os._exit(rv)
-            logging.debug('auxiliary glusterfs mount prepared')
-
-    class DirectMounter(Mounter):
-        """mounter backend which calls mount(8), umount(8) directly"""
-
-        mountkw = {'stderr': subprocess.PIPE}
-        glusterprog = 'glusterfs'
-
-        @staticmethod
-        def make_umount_argv(d):
-            return ['umount', '-l', d]
-
-        def make_mount_argv(self):
-            self.mntpt = tempfile.mkdtemp(prefix = 'gsyncd-aux-mount-')
-            return [self.get_glusterprog()] + ['--' + p for p in self.params] + [self.mntpt]
-
-        def cleanup_mntpt(self, mntpt = None):
-            if not mntpt:
-                mntpt = self.mntpt
-            os.rmdir(mntpt)
-
-    class MountbrokerMounter(Mounter):
-        """mounter backend using the mountbroker gluster service"""
-
-        mountkw = {'stderr': subprocess.PIPE, 'stdout': subprocess.PIPE}
-        glusterprog = 'gluster'
-
-        @classmethod
-        def make_cli_argv(cls):
-            return [cls.get_glusterprog()] + gconf.gluster_cli_options.split() + ['system::']
-
-        @classmethod
-        def make_umount_argv(cls, d):
-            return cls.make_cli_argv() + ['umount', d, 'lazy']
-
-        def make_mount_argv(self, label):
-            return self.make_cli_argv() + \
-                   ['mount', label, 'user-map-root=' + syncdutils.getusername()] + self.params
-
-        def handle_mounter(self, po):
-            self.mntpt = po.stdout.readline()[:-1]
-            po.stdout.close()
-            sup(self, po)
-            if po.returncode != 0:
-                # if cli terminated with error due to being
-                # refused by glusterd, what it put
-                # out on stdout is a diagnostic message
-                logging.error('glusterd answered: %s' % self.mntpt)
-
-    def connect(self):
-        """inhibit the resource beyond
-
-        Choose mounting backend (direct or mountbroker),
-        set up glusterfs parameters and perform the mount
-        with given backend
-        """
-
-        label = getattr(gconf, 'mountbroker', None)
-        if not label and not privileged():
-            label = syncdutils.getusername()
-        mounter = label and self.MountbrokerMounter or self.DirectMounter
-        params = gconf.gluster_params.split() + \
-                   (gconf.gluster_log_level and ['log-level=' + gconf.gluster_log_level] or []) + \
-                   ['log-file=' + gconf.gluster_log_file, 'volfile-server=' + self.host,
-                    'volfile-id=' + self.volume, 'client-pid=-1']
-        mounter(params).inhibit(*[l for l in [label] if l])
-
-    def connect_remote(self, *a, **kw):
-        sup(self, *a, **kw)
-        self.slavedir = "/proc/%d/cwd" % self.server.pid()
-
-    def gmaster_instantiate_tuple(self, slave):
-        """return a tuple of the 'one shot' and the 'main crawl' class instance"""
-        return (gmaster_builder('xsync')(self, slave), gmaster_builder()(self, slave))
-
-    def service_loop(self, *args):
-        """enter service loop
-
-        - if slave given, instantiate GMaster and
-          pass control to that instance, which implements
-          master behavior
-        - else do that's what's inherited
-        """
-        if args:
-            slave = args[0]
-            if gconf.local_path:
-                class brickserver(FILE.FILEServer):
-                    local_path = gconf.local_path
-                    aggregated = self.server
-                    @classmethod
-                    def entries(cls, path):
-                        e = super(brickserver, cls).entries(path)
-                        # on the brick don't mess with /.glusterfs
-                        if path == '.':
-                            try:
-                                e.remove('.glusterfs')
-                            except ValueError:
-                                pass
-                        return e
-                if gconf.slave_id:
-                    # define {,set_}xtime in slave, thus preempting
-                    # the call to remote, so that it takes data from
-                    # the local brick
-                    slave.server.xtime = types.MethodType(lambda _self, path, uuid: brickserver.xtime(path, uuid + '.' + gconf.slave_id), slave.server)
-                    slave.server.set_xtime = types.MethodType(lambda _self, path, uuid, mark: brickserver.set_xtime(path, uuid + '.' + gconf.slave_id, mark), slave.server)
-                (g1, g2) = self.gmaster_instantiate_tuple(slave)
-                g1.master.server = brickserver
-                g2.master.server = brickserver
-            else:
-                (g1, g2) = self.gmaster_instantiate_tuple(slave)
-                g1.master.server.aggregated = gmaster.master.server
-                g2.master.server.aggregated = gmaster.master.server
-            # bad bad bad: bad way to do things like this
-            # need to make this elegant
-            # register the crawlers and start crawling
-            g1.register()
-            g2.register()
-            g1.crawlwrap(oneshot=True)
-            g2.crawlwrap()
-        else:
-            sup(self, *args)
-
-    def rsync(self, files):
-        return sup(self, files, self.slavedir)
-
-
-class SSH(AbstractUrl, SlaveRemote):
-    """scheme class for ssh:// urls
-
-    interface to remote slave on master side
-    implementing an ssh based proxy
-    """
-
-    def __init__(self, path):
-        self.remote_addr, inner_url = sup(self, path,
-                                          '^((?:%s@)?%s):(.+)' % tuple([ r.pattern for r in (UserRX, HostRX) ]))
-        self.inner_rsc = parse_url(inner_url)
-        self.volume = inner_url[1:]
-
-    @staticmethod
-    def parse_ssh_address(self):
-        m = re.match('([^@]+)@(.+)', self.remote_addr)
-        if m:
-            u, h = m.groups()
-        else:
-            u, h = syncdutils.getusername(), self.remote_addr
-        self.remotehost = h
-        return {'user': u, 'host': h}
-
-    def canonical_path(self):
-        rap = self.parse_ssh_address(self)
-        remote_addr = '@'.join([rap['user'], gethostbyname(rap['host'])])
-        return ':'.join([remote_addr, self.inner_rsc.get_url(canonical=True)])
-
-    def can_connect_to(self, remote):
-        """determine our position in the connectibility matrix"""
-        return False
-
-    def start_fd_client(self, *a, **opts):
-        """customizations for client startup
-
-        - be a no-op if we are to daemonize (client startup is deferred
-          to post-daemon stage)
-        - determine target url for rsync after consulting server
-        """
-        if opts.get('deferred'):
-            return a
-        sup(self, *a)
-        ityp = type(self.inner_rsc)
-        if ityp == FILE:
-            slavepath = self.inner_rsc.path
-        elif ityp == GLUSTER:
-            slavepath = "/proc/%d/cwd" % self.server.pid()
-        else:
-            raise NotImplementedError
-        self.slaveurl = ':'.join([self.remote_addr, slavepath])
-
-    def connect_remote(self, go_daemon=None):
-        """connect to inner slave url through outer ssh url
-
-        Wrap the connecting utility in ssh.
-
-        Much care is put into daemonizing: in that case
-        ssh is started before daemonization, but
-        RePCe client is to be created after that (as ssh
-        interactive password auth would be defeated by
-        a daemonized ssh, while client should be present
-        only in the final process). In that case the action
-        is taken apart to two parts, this method is ivoked
-        once pre-daemon, once post-daemon. Use @go_daemon
-        to deiced what part to perform.
-
-        [NB. ATM gluster product does not makes use of interactive
-        authentication.]
-        """
-        if go_daemon == 'done':
-            return self.start_fd_client(*self.fd_pair)
-
-        syncdutils.setup_ssh_ctl(tempfile.mkdtemp(prefix='gsyncd-aux-ssh-'),
-                                 self.remote_addr,
-                                 self.inner_rsc.url)
-
-        deferred = go_daemon == 'postconn'
-        ret = sup(self, gconf.ssh_command.split() + gconf.ssh_ctl_args + [self.remote_addr],
-                  slave=self.inner_rsc.url, deferred=deferred)
-
-        if deferred:
-            # send a message to peer so that we can wait for
-            # the answer from which we know connection is
-            # established and we can proceed with daemonization
-            # (doing that too early robs the ssh passwd prompt...)
-            # However, we'd better not start the RepceClient
-            # before daemonization (that's not preserved properly
-            # in daemon), we just do a an ad-hoc linear put/get.
-            i, o = ret
-            inf = os.fdopen(i)
-            repce.send(o, None, '__repce_version__')
-            select((inf,), (), ())
-            repce.recv(inf)
-            # hack hack hack: store a global reference to the file
-            # to save it from getting GC'd which implies closing it
-            gconf.permanent_handles.append(inf)
-            self.fd_pair = (i, o)
-            return 'should'
-
-    def rsync(self, files):
-        return sup(self, files, '-e', " ".join(gconf.ssh_command.split() + gconf.ssh_ctl_args),
-                   *(gconf.rsync_ssh_options.split() + [self.slaveurl]))
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
deleted file mode 100644
index 348eb38c1..000000000
--- a/geo-replication/syncdaemon/syncdutils.py
+++ /dev/null
@@ -1,438 +0,0 @@
-import os
-import sys
-import pwd
-import time
-import fcntl
-import shutil
-import logging
-import socket
-from threading import Lock, Thread as baseThread
-from errno import EACCES, EAGAIN, EPIPE, ENOTCONN, ECONNABORTED, EINTR, ENOENT, EPERM, ESTALE, errorcode
-from signal import signal, SIGTERM, SIGKILL
-from time import sleep
-import select as oselect
-from os import waitpid as owaitpid
-
-try:
-    from cPickle import PickleError
-except ImportError:
-    # py 3
-    from pickle import PickleError
-
-from gconf import gconf
-
-try:
-    # py 3
-    from urllib import parse as urllib
-except ImportError:
-    import urllib
-
-try:
-    from hashlib import md5 as md5
-except ImportError:
-    # py 2.4
-    from md5 import new as md5
-
-# auxillary gfid based access prefix
-_CL_AUX_GFID_PFX = ".gfid/"
-GF_OP_RETRIES = 20
-
-def escape(s):
-    """the chosen flavor of string escaping, used all over
-       to turn whatever data to creatable representation"""
-    return urllib.quote_plus(s)
-
-def unescape(s):
-    """inverse of .escape"""
-    return urllib.unquote_plus(s)
-
-def norm(s):
-    if s:
-        return s.replace('-', '_')
-
-def update_file(path, updater, merger = lambda f: True):
-    """update a file in a transaction-like manner"""
-
-    fr = fw = None
-    try:
-        fd = os.open(path, os.O_CREAT|os.O_RDWR)
-        try:
-            fr = os.fdopen(fd, 'r+b')
-        except:
-            os.close(fd)
-            raise
-        fcntl.lockf(fr, fcntl.LOCK_EX)
-        if not merger(fr):
-            return
-
-        tmpp = path + '.tmp.' + str(os.getpid())
-        fd = os.open(tmpp, os.O_CREAT|os.O_EXCL|os.O_WRONLY)
-        try:
-            fw = os.fdopen(fd, 'wb', 0)
-        except:
-            os.close(fd)
-            raise
-        updater(fw)
-        os.fsync(fd)
-        os.rename(tmpp, path)
-    finally:
-        for fx in (fr, fw):
-            if fx:
-                fx.close()
-
-def create_manifest(fname, content):
-    """
-    Create manifest file for SSH Control Path
-    """
-    fd = None
-    try:
-        fd = os.open(fname, os.O_CREAT|os.O_RDWR)
-        try:
-            os.write(fd, content)
-        except:
-            os.close(fd)
-            raise
-    finally:
-        if fd != None:
-            os.close(fd)
-
-def setup_ssh_ctl(ctld, remote_addr, resource_url):
-    """
-    Setup GConf ssh control path parameters
-    """
-    gconf.ssh_ctl_dir = ctld
-    content = "SLAVE_HOST=%s\nSLAVE_RESOURCE_URL=%s" % (remote_addr,
-                                                            resource_url)
-    content_md5 = md5hex(content)
-    fname = os.path.join(gconf.ssh_ctl_dir,
-                         "%s.mft" % content_md5)
-
-    create_manifest(fname, content)
-    ssh_ctl_path = os.path.join(gconf.ssh_ctl_dir,
-                                "%s.sock" % content_md5)
-    gconf.ssh_ctl_args = ["-oControlMaster=auto", "-S", ssh_ctl_path]
-
-def grabfile(fname, content=None):
-    """open @fname + contest for its fcntl lock
-
-    @content: if given, set the file content to it
-    """
-    # damn those messy open() mode codes
-    fd = os.open(fname, os.O_CREAT|os.O_RDWR)
-    f = os.fdopen(fd, 'r+b', 0)
-    try:
-        fcntl.lockf(f, fcntl.LOCK_EX|fcntl.LOCK_NB)
-    except:
-        ex = sys.exc_info()[1]
-        f.close()
-        if isinstance(ex, IOError) and ex.errno in (EACCES, EAGAIN):
-            # cannot grab, it's taken
-            return
-        raise
-    if content:
-        try:
-            f.truncate()
-            f.write(content)
-        except:
-            f.close()
-            raise
-    gconf.permanent_handles.append(f)
-    return f
-
-def grabpidfile(fname=None, setpid=True):
-    """.grabfile customization for pid files"""
-    if not fname:
-        fname = gconf.pid_file
-    content = None
-    if setpid:
-        content = str(os.getpid()) + '\n'
-    return grabfile(fname, content=content)
-
-final_lock = Lock()
-
-def finalize(*a, **kw):
-    """all those messy final steps we go trough upon termination
-
-    Do away with pidfile, ssh control dir and logging.
-    """
-    final_lock.acquire()
-    if getattr(gconf, 'pid_file', None):
-        rm_pidf = gconf.pid_file_owned
-        if gconf.cpid:
-            # exit path from parent branch of daemonization
-            rm_pidf = False
-            while True:
-                f = grabpidfile(setpid=False)
-                if not f:
-                    # child has already taken over pidfile
-                    break
-                if os.waitpid(gconf.cpid, os.WNOHANG)[0] == gconf.cpid:
-                    # child has terminated
-                    rm_pidf = True
-                    break;
-                time.sleep(0.1)
-        if rm_pidf:
-            try:
-                os.unlink(gconf.pid_file)
-            except:
-                ex = sys.exc_info()[1]
-                if ex.errno == ENOENT:
-                    pass
-                else:
-                    raise
-    if gconf.ssh_ctl_dir and not gconf.cpid:
-        shutil.rmtree(gconf.ssh_ctl_dir)
-    if getattr(gconf, 'state_socket', None):
-        try:
-            os.unlink(gconf.state_socket)
-        except:
-            if sys.exc_info()[0] == OSError:
-                pass
-    if gconf.log_exit:
-        logging.info("exiting.")
-    sys.stdout.flush()
-    sys.stderr.flush()
-    os._exit(kw.get('exval', 0))
-
-def log_raise_exception(excont):
-    """top-level exception handler
-
-    Try to some fancy things to cover up we face with an error.
-    Translate some weird sounding but well understood exceptions
-    into human-friendly lingo
-    """
-    is_filelog = False
-    for h in logging.getLogger().handlers:
-        fno = getattr(getattr(h, 'stream', None), 'fileno', None)
-        if fno and not os.isatty(fno()):
-            is_filelog = True
-
-    exc = sys.exc_info()[1]
-    if isinstance(exc, SystemExit):
-        excont.exval = exc.code or 0
-        raise
-    else:
-        logtag = None
-        if isinstance(exc, GsyncdError):
-            if is_filelog:
-                logging.error(exc.args[0])
-            sys.stderr.write('failure: ' + exc.args[0] + '\n')
-        elif isinstance(exc, PickleError) or isinstance(exc, EOFError) or \
-             ((isinstance(exc, OSError) or isinstance(exc, IOError)) and \
-              exc.errno == EPIPE):
-            logging.error('connection to peer is broken')
-            if hasattr(gconf, 'transport'):
-                gconf.transport.wait()
-                if gconf.transport.returncode == 127:
-                    logging.warn("!!!!!!!!!!!!!")
-                    logging.warn('!!! getting "No such file or directory" errors '
-                                 "is most likely due to MISCONFIGURATION, please consult "
-                                 "http://access.redhat.com/knowledge/docs/en-US/Red_Hat_Storage/2.0/html/Administration_Guide/chap-User_Guide-Geo_Rep-Preparation-Settingup_Environment.html")
-                    logging.warn("!!!!!!!!!!!!!")
-                gconf.transport.terminate_geterr()
-        elif isinstance(exc, OSError) and exc.errno in (ENOTCONN, ECONNABORTED):
-            logging.error('glusterfs session went down [%s]', errorcode[exc.errno])
-        else:
-            logtag = "FAIL"
-        if not logtag and logging.getLogger().isEnabledFor(logging.DEBUG):
-            logtag = "FULL EXCEPTION TRACE"
-        if logtag:
-            logging.exception(logtag + ": ")
-            sys.stderr.write("failed with %s.\n" % type(exc).__name__)
-        excont.exval = 1
-        sys.exit(excont.exval)
-
-
-class FreeObject(object):
-    """wildcard class for which any attribute can be set"""
-
-    def __init__(self, **kw):
-        for k,v in kw.items():
-            setattr(self, k, v)
-
-class Thread(baseThread):
-    """thread class flavor for gsyncd
-
-    - always a daemon thread
-    - force exit for whole program if thread
-      function coughs up an exception
-    """
-    def __init__(self, *a, **kw):
-        tf = kw.get('target')
-        if tf:
-            def twrap(*aa):
-                excont = FreeObject(exval = 0)
-                try:
-                    tf(*aa)
-                except:
-                    try:
-                        log_raise_exception(excont)
-                    finally:
-                        finalize(exval = excont.exval)
-            kw['target'] = twrap
-        baseThread.__init__(self, *a, **kw)
-        self.setDaemon(True)
-
-class GsyncdError(Exception):
-    pass
-
-def getusername(uid = None):
-    if uid == None:
-        uid = os.geteuid()
-    return pwd.getpwuid(uid).pw_name
-
-def privileged():
-    return os.geteuid() == 0
-
-def boolify(s):
-    """
-    Generic string to boolean converter
-
-    return
-    - Quick return if string 's' is of type bool
-    - True if it's in true_list
-    - False if it's in false_list
-    - Warn if it's not present in either and return False
-    """
-    true_list  = ['true', 'yes', '1', 'on']
-    false_list = ['false', 'no', '0', 'off']
-
-    if isinstance(s, bool):
-        return s
-
-    rv = False
-    lstr = s.lower()
-    if lstr in true_list:
-        rv = True
-    elif not lstr in false_list:
-        logging.warn("Unknown string (%s) in string to boolean conversion defaulting to False\n" % (s))
-
-    return rv
-
-def eintr_wrap(func, exc, *a):
-    """
-    wrapper around syscalls resilient to interrupt caused
-    by signals
-    """
-    while True:
-        try:
-            return func(*a)
-        except exc:
-            ex = sys.exc_info()[1]
-            if not ex.args[0] == EINTR:
-                raise
-
-def select(*a):
-    return eintr_wrap(oselect.select, oselect.error, *a)
-
-def waitpid (*a):
-    return eintr_wrap(owaitpid, OSError, *a)
-
-def set_term_handler(hook=lambda *a: finalize(*a, **{'exval': 1})):
-    signal(SIGTERM, hook)
-
-def is_host_local(host):
-    locaddr = False
-    for ai in socket.getaddrinfo(host, None):
-        # cf. http://github.com/gluster/glusterfs/blob/ce111f47/xlators/mgmt/glusterd/src/glusterd-utils.c#L125
-        if ai[0] == socket.AF_INET:
-            if ai[-1][0].split(".")[0] == "127":
-                locaddr = True
-                break
-        elif ai[0] == socket.AF_INET6:
-            if ai[-1][0] == "::1":
-                locaddr = True
-                break
-        else:
-            continue
-        try:
-            # use ICMP socket to avoid net.ipv4.ip_nonlocal_bind issue,
-            # cf. https://bugzilla.redhat.com/show_bug.cgi?id=890587
-            s = socket.socket(ai[0], socket.SOCK_RAW, socket.IPPROTO_ICMP)
-        except socket.error:
-            ex = sys.exc_info()[1]
-            if ex.errno != EPERM:
-                raise
-            f = None
-            try:
-                f = open("/proc/sys/net/ipv4/ip_nonlocal_bind")
-                if int(f.read()) != 0:
-                    raise GsyncdError(
-                            "non-local bind is set and not allowed to create raw sockets, "
-                            "cannot determine if %s is local" % host)
-                s = socket.socket(ai[0], socket.SOCK_DGRAM)
-            finally:
-                if f:
-                    f.close()
-        try:
-            s.bind(ai[-1])
-            locaddr = True
-            break
-        except:
-            pass
-        s.close()
-    return locaddr
-
-def funcode(f):
-    fc = getattr(f, 'func_code', None)
-    if not fc:
-        # python 3
-        fc = f.__code__
-    return fc
-
-def memoize(f):
-    fc = funcode(f)
-    fn = fc.co_name
-    def ff(self, *a, **kw):
-        rv = getattr(self, '_' + fn, None)
-        if rv == None:
-            rv = f(self, *a, **kw)
-            setattr(self, '_' + fn, rv)
-        return rv
-    return ff
-
-def umask():
-    return os.umask(0)
-
-def entry2pb(e):
-    return e.rsplit('/', 1)
-
-def gauxpfx():
-    return _CL_AUX_GFID_PFX
-
-def md5hex(s):
-    return md5(s).hexdigest()
-
-def selfkill(sig=SIGTERM):
-    os.kill(os.getpid(), sig)
-
-def errno_wrap(call, arg=[], errnos=[], retry_errnos=[ESTALE]):
-    """ wrapper around calls resilient to errnos.
-    retry in case of ESTALE by default.
-    """
-    nr_tries = 0
-    while True:
-        try:
-            return call(*arg)
-        except OSError:
-            ex = sys.exc_info()[1]
-            if ex.errno in errnos:
-                return ex.errno
-            if not ex.errno in retry_errnos:
-                raise
-            nr_tries += 1
-            if nr_tries == GF_OP_RETRIES:
-                # probably a screwed state, cannot do much...
-                logging.warn('reached maximum retries (%s)...' % repr(arg))
-                return
-            time.sleep(0.250)  # retry the call
-
-def lstat(e):
-    try:
-        return os.lstat(e)
-    except (IOError, OSError):
-        ex = sys.exc_info()[1]
-        if ex.errno == ENOENT:
-            return ex.errno
-        else:
-            raise
diff --git a/gf-error-codes.h.template b/gf-error-codes.h.template
deleted file mode 100644
index ab6020d64..000000000
--- a/gf-error-codes.h.template
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************/
-/**                                                           **/
-/**                   DO NOT EDIT THIS FILE                   **/
-/**           THIS IS AUTO-GENERATED FROM LOG BOOK            **/
-/**         YOUR CHANGES WILL BE LOST IN NEXT BUILD           **/
-/**                                                           **/
-/***************************************************************/
-
-#ifndef _GF_ERROR_CODES_H
-#define _GF_ERROR_CODES_H
-
-#include <libintl.h>
-
-#define _(STRING)    gettext(STRING)
-
-
-/** START: ERROR CODE DEFINITIONS **/
-$DEFINES
-/** END: ERROR CODE DEFINITIONS **/
-
-
-/** START: FUNCTION RETURNS MESSAGE OF GIVEN ERROR CODE **/
-const char *
-_gf_get_message (int code) {
-        switch (code) {
-$CASES
-        default: return NULL;
-        }
-}
-/** END: FUNCTION RETURNS MESSAGE OF GIVEN ERROR CODE **/
-
-
-#endif
diff --git a/glusterfs-api.pc.in b/glusterfs-api.pc.in
deleted file mode 100644
index fab4a57d5..000000000
--- a/glusterfs-api.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-
-Name: glusterfs-api
-Description: GlusterFS API
-/* This is the API version, NOT package version */
-Version: 6
-Libs: -L${libdir} -lgfapi -lglusterfs -lgfrpc -lgfxdr
-Cflags: -I${includedir}/glusterfs -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64
diff --git a/glusterfs-hadoop/0.20.2/conf/core-site.xml b/glusterfs-hadoop/0.20.2/conf/core-site.xml
deleted file mode 100644
index d7f75fca7..000000000
--- a/glusterfs-hadoop/0.20.2/conf/core-site.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration>
-
-  <property>
-    <name>fs.glusterfs.impl</name>
-    <value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value>
-  </property>
-
-  <property>
-    <name>fs.default.name</name>
-    <value>glusterfs://192.168.1.36:9000</value>
-  </property>
-
-  <property>
-    <name>fs.glusterfs.volname</name>
-    <value>volume-dist-rep</value>
-  </property>
-
-  <property>
-    <name>fs.glusterfs.mount</name>
-    <value>/mnt/glusterfs</value>
-  </property>
-
-  <property>
-    <name>fs.glusterfs.server</name>
-    <value>192.168.1.36</value>
-  </property>
-
-  <property>
-    <name>quick.slave.io</name>
-    <value>Off</value>
-  </property>
-
-</configuration>
diff --git a/glusterfs-hadoop/0.20.2/pom.xml b/glusterfs-hadoop/0.20.2/pom.xml
deleted file mode 100644
index fe661d40f..000000000
--- a/glusterfs-hadoop/0.20.2/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.hadoop.fs.glusterfs</groupId>
-  <artifactId>glusterfs</artifactId>
-  <packaging>jar</packaging>
-  <version>0.20.2-0.1</version>
-  <name>glusterfs</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
-      <version>0.20.2</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSBrickClass.java b/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSBrickClass.java
deleted file mode 100644
index e633b8aae..000000000
--- a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSBrickClass.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of GlusterFS.
- *
- * Licensed under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- *
- */
-
-package org.apache.hadoop.fs.glusterfs;
-
-import java.io.*;
-
-public class GlusterFSBrickClass {
-        String  host;
-        String  exportedFile;
-        long    start;
-        long    end;
-        boolean isChunked;
-        int     stripeSize;     // Stripe size in bytes
-        int     nrStripes;      // number of stripes
-        int     switchCount;    // for SR, DSR - number of replicas of each stripe
-                                // -1 for others
-
-        public GlusterFSBrickClass (String brick, long start, long len, boolean flag,
-                                    int stripeSize, int nrStripes, int switchCount)
-                throws IOException {
-                this.host = brick2host(brick);
-                this.exportedFile = brick2file(brick);
-                this.start = start;
-                this.end = start + len;
-                this.isChunked = flag;
-                this.stripeSize = stripeSize;
-                this.nrStripes = nrStripes;
-                this.switchCount = switchCount;
-        }
-
-        public boolean isChunked () {
-                return isChunked;
-        }
-
-        public String brickIsLocal(String hostname) {
-                String path = null;
-                File f = null;
-                if (host.equals(hostname))
-                        path = exportedFile;
-
-                return path;
-        }
-
-        public int[] getBrickNumberInTree(long start, int len) {
-                long end = len;
-                int startNodeInTree = ((int) (start / stripeSize)) % nrStripes;
-                int endNodeInTree = ((int) ((start + len) / stripeSize)) % nrStripes;
-
-                if (startNodeInTree != endNodeInTree) {
-                        end = (start - (start % stripeSize)) + stripeSize;
-                        end -= start;
-                }
-
-                return new int[] {startNodeInTree, endNodeInTree, (int) end};
-        }
-
-        public boolean brickHasFilePart(int nodeInTree, int nodeLoc) {
-                if (switchCount == -1)
-                        return (nodeInTree == nodeLoc);
-
-                nodeInTree *= switchCount;
-                for (int i = nodeInTree; i < (nodeInTree + switchCount); i++) {
-                        if (i == nodeLoc)
-                                return true;
-                }
-
-                return false;
-        }
-
-        public String brick2host (String brick)
-                throws IOException {
-                String[] hf = null;
-
-                hf = brick.split(":");
-                if (hf.length != 2)
-                        throw new IOException("Error getting hostname from brick");
-
-                return hf[0];
-        }
-
-        public String brick2file (String brick)
-                throws IOException {
-                String[] hf = null;
-
-                hf = brick.split(":");
-                if (hf.length != 2)
-                        throw new IOException("Error getting hostname from brick");
-
-                return hf[1];
-        }
-
-}
diff --git a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSBrickRepl.java b/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSBrickRepl.java
deleted file mode 100644
index 11454e636..000000000
--- a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSBrickRepl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of GlusterFS.
- *
- * Licensed under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- *
- */
-
-package org.apache.hadoop.fs.glusterfs;
-
-import java.io.*;
-
-public class GlusterFSBrickRepl {
-        private String[] replHost;
-        private long start;
-        private long len;
-        private int cnt;
-
-        GlusterFSBrickRepl(int replCount, long start, long len) {
-                this.replHost = new String[replCount];
-                this.start = start;
-                this.len = len;
-                this.cnt = 0;
-        }
-
-        public void addHost (String host) {
-                this.replHost[cnt++] = host;
-        }
-
-        public String[] getReplHosts () {
-                return this.replHost;
-        }
-
-        public long getStartLen () {
-                return this.start;
-        }
-
-        public long getOffLen () {
-                return this.len;
-        }
-}
diff --git a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSXattr.java b/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSXattr.java
deleted file mode 100644
index 455dda97e..000000000
--- a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSXattr.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/**
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of GlusterFS.
- *
- * Licensed under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- *
- */
-
-package org.apache.hadoop.fs.glusterfs;
-
-import java.net.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.io.*;
-import java.util.HashMap;
-import java.util.TreeMap;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.apache.hadoop.fs.BlockLocation;
-
-public class GlusterFSXattr {
-
-	public enum LAYOUT { D, S, R, DS, DR, SR, DSR }
-        public enum CMD { GET_HINTS, GET_REPLICATION, GET_BLOCK_SIZE, CHECK_FOR_QUICK_IO }
-
-        private static String hostname;
-
-        public GlusterFSXattr() { }
-
-        public static String brick2host (String brick)
-        throws IOException {
-                String[] hf = null;
-
-                hf = brick.split(":");
-                if (hf.length != 2) {
-                        System.out.println("brick not of format hostname:path");
-                        throw new IOException("Error getting hostname from brick");
-                }
-
-                return hf[0];
-        }
-
-        public static String brick2file (String brick)
-        throws IOException {
-                String[] hf = null;
-
-                hf = brick.split(":");
-                if (hf.length != 2) {
-                        System.out.println("brick not of format hostname:path");
-                        throw new IOException("Error getting hostname from brick");
-                }
-
-                return hf[1];
-        }
-
-        public static BlockLocation[] getPathInfo (String filename, long start, long len)
-                throws IOException {
-                HashMap<String, ArrayList<String>> vol = null;
-                HashMap<String, Integer> meta          = new HashMap<String, Integer>();
-
-                vol = execGetFattr(filename, meta, CMD.GET_HINTS);
-
-                return getHints(vol, meta, start, len, null);
-        }
-
-        public static long getBlockSize (String filename)
-                throws IOException {
-                HashMap<String, ArrayList<String>> vol = null;
-                HashMap<String, Integer> meta          = new HashMap<String, Integer>();
-
-                vol = execGetFattr(filename, meta, CMD.GET_BLOCK_SIZE);
-
-                if (!meta.containsKey("block-size"))
-                        return 0;
-
-                return (long) meta.get("block-size");
-
-        }
-
-        public static short getReplication (String filename)
-                throws IOException {
-                HashMap<String, ArrayList<String>> vol = null;
-                HashMap<String, Integer> meta          = new HashMap<String, Integer>();
-
-                vol = execGetFattr(filename, meta, CMD.GET_REPLICATION);
-
-                return (short) getReplicationFromLayout(vol, meta);
-
-        }
-
-        public static TreeMap<Integer, GlusterFSBrickClass> quickIOPossible (String filename, long start,
-                                                                             long len)
-                throws IOException {
-                String                   realpath      = null;
-                HashMap<String, ArrayList<String>> vol = null;
-                HashMap<String, Integer> meta          = new HashMap<String, Integer>();
-                TreeMap<Integer, GlusterFSBrickClass> hnts = new TreeMap<Integer, GlusterFSBrickClass>();
-
-                vol = execGetFattr(filename, meta, CMD.GET_HINTS);
-                getHints(vol, meta, start, len, hnts);
-
-                if (hnts.size() == 0)
-                        return null; // BOOM !!
-
-                // DEBUG - dump hnts here
-                return hnts;
-        }
-
-        public static HashMap<String, ArrayList<String>> execGetFattr (String filename,
-                                                                       HashMap<String, Integer> meta,
-                                                                       CMD cmd)
-                throws IOException {
-                Process        p              = null;
-                BufferedReader brInput        = null;
-                String         s              = null;
-                String         cmdOut         = null;
-                String         getfattrCmd    = null;
-                String         xlator         = null;
-                String         enclosingXl    = null;
-                String         enclosingXlVol = null;
-                String         key            = null;
-                String         layout         = "";
-                int            rcount         = 0;
-                int            scount         = 0;
-                int            dcount         = 0;
-                int            count          = 0;
-
-                HashMap<String, ArrayList<String>> vol = new HashMap<String, ArrayList<String>>();
-
-                getfattrCmd = "getfattr -m . -n trusted.glusterfs.pathinfo " + filename;
-
-                p = Runtime.getRuntime().exec(getfattrCmd);
-                brInput = new BufferedReader(new InputStreamReader(p.getInputStream()));
-
-                cmdOut = "";
-                while ( (s = brInput.readLine()) != null )
-                        cmdOut += s;
-
-                /**
-                 * TODO: Use a single regex for extracting posix paths as well
-                 * as xlator counts for layout matching.
-                 */
-
-                Pattern pattern = Pattern.compile("<(.*?)[:\\(](.*?)>");
-                Matcher matcher = pattern.matcher(cmdOut);
-
-                Pattern p_px = Pattern.compile(".*?:(.*)");
-                Matcher m_px;
-                String gibberish_path;
-
-                s = null;
-                while (matcher.find()) {
-                        xlator = matcher.group(1);
-                        if (xlator.equalsIgnoreCase("posix")) {
-                                if (enclosingXl.equalsIgnoreCase("replicate"))
-                                        count = rcount;
-                                else if (enclosingXl.equalsIgnoreCase("stripe"))
-                                        count = scount;
-                                else if (enclosingXl.equalsIgnoreCase("distribute"))
-                                        count = dcount;
-                                else
-                                        throw new IOException("Unknown Translator: " + enclosingXl);
-
-                                key = enclosingXl + "-" + count;
-
-                                if (vol.get(key) == null)
-                                        vol.put(key, new ArrayList<String>());
-
-                                gibberish_path = matcher.group(2);
-
-                                /* extract posix path from the gibberish string */
-                                m_px = p_px.matcher(gibberish_path);
-                                if (!m_px.find())
-                                        throw new IOException("Cannot extract posix path");
-
-                                vol.get(key).add(m_px.group(1));
-                                continue;
-                        }
-
-                        enclosingXl = xlator;
-                        enclosingXlVol = matcher.group(2);
-
-                        if (xlator.equalsIgnoreCase("replicate"))
-                                if (rcount++ != 0)
-                                        continue;
-
-                        if (xlator.equalsIgnoreCase("stripe")) {
-                                if (scount++ != 0)
-                                        continue;
-
-
-                                Pattern ps = Pattern.compile("\\[(\\d+)\\]");
-                                Matcher ms = ps.matcher(enclosingXlVol);
-
-                                if (ms.find()) {
-                                        if (((cmd == CMD.GET_BLOCK_SIZE) || (cmd == CMD.GET_HINTS))
-                                            && (meta != null))
-                                            meta.put("block-size", Integer.parseInt(ms.group(1)));
-                                } else
-                                        throw new IOException("Cannot get stripe size");
-                        }
-
-                        if (xlator.equalsIgnoreCase("distribute"))
-                                if (dcount++ != 0)
-                                        continue;
-
-                        layout += xlator.substring(0, 1);
-                }
-
-                if ((dcount == 0) && (scount == 0) && (rcount == 0))
-                        throw new IOException("Cannot get layout");
-
-                if (meta != null) {
-                        meta.put("dcount", dcount);
-                        meta.put("scount", scount);
-                        meta.put("rcount", rcount);
-                }
-
-                vol.put("layout", new ArrayList<String>(1));
-                vol.get("layout").add(layout);
-
-                return vol;
-        }
-
-        static BlockLocation[] getHints (HashMap<String, ArrayList<String>> vol,
-                                         HashMap<String, Integer> meta,
-                                         long start, long len,
-                                         TreeMap<Integer, GlusterFSBrickClass> hnts)
-                throws IOException {
-                String            brick         = null;
-                String            key           = null;
-                boolean           done          = false;
-                int               i             = 0;
-                int               counter       = 0;
-                int               stripeSize    = 0;
-                long              stripeStart   = 0;
-                long              stripeEnd     = 0;
-                int               nrAllocs      = 0;
-                int               allocCtr      = 0;
-                BlockLocation[] result          = null;
-                ArrayList<String> brickList     = null;
-                ArrayList<String> stripedBricks = null;
-                Iterator<String>  it            = null;
-
-                String[] blks = null;
-                GlusterFSBrickRepl[] repl = null;
-                int dcount, scount, rcount;
-
-                LAYOUT l = LAYOUT.valueOf(vol.get("layout").get(0));
-                dcount = meta.get("dcount");
-                scount = meta.get("scount");
-                rcount = meta.get("rcount");
-
-                switch (l) {
-                case D:
-                        key = "DISTRIBUTE-" + dcount;
-                        brick = vol.get(key).get(0);
-
-                        if (hnts == null) {
-                                result = new BlockLocation[1];
-                                result[0] = new BlockLocation(null, new String[] {brick2host(brick)}, start, len);
-                        } else
-                                hnts.put(0, new GlusterFSBrickClass(brick, start, len, false, -1, -1, -1));
-                        break;
-
-                case R:
-                case DR:
-                        /* just the name says it's striped - the volume isn't */
-                        stripedBricks = new ArrayList<String>();
-
-                        for (i = 1; i <= rcount; i++) {
-                                key = "REPLICATE-" + i;
-                                brickList = vol.get(key);
-                                it = brickList.iterator();
-                                while (it.hasNext()) {
-                                        stripedBricks.add(it.next());
-                                }
-                        }
-
-                        nrAllocs = stripedBricks.size();
-                        if (hnts == null) {
-                                result = new BlockLocation[1];
-                                blks = new String[nrAllocs];
-                        }
-
-                        for (i = 0; i < nrAllocs; i++) {
-                                if (hnts == null)
-                                        blks[i] = brick2host(stripedBricks.get(i));
-                                else
-                                        hnts.put(i, new GlusterFSBrickClass(stripedBricks.get(i), start, len, false, -1, -1, -1));
-                        }
-
-                        if (hnts == null)
-                                result[0] = new BlockLocation(null, blks, start, len);
-
-                        break;
-
-                case SR:
-                case DSR:
-                        int rsize = 0;
-                        ArrayList<ArrayList<String>> replicas = new ArrayList<ArrayList<String>>();
-
-                        stripedBricks = new ArrayList<String>();
-
-                        if (rcount == 0)
-                                throw new IOException("got replicated volume with replication count 0");
-
-                        for (i = 1; i <= rcount; i++) {
-                                key = "REPLICATE-" + i;
-                                brickList = vol.get(key);
-                                it = brickList.iterator();
-                                replicas.add(i - 1, new ArrayList<String>());
-                                while (it.hasNext()) {
-                                        replicas.get(i - 1).add(it.next());
-                                }
-                        }
-
-                        stripeSize = meta.get("block-size");
-
-                        nrAllocs = (int) (((len - start) / stripeSize) + 1);
-                        if (hnts == null) {
-                                result = new BlockLocation[nrAllocs];
-                                repl = new GlusterFSBrickRepl[nrAllocs];
-                        }
-
-                        // starting stripe position
-                        counter = (int) ((start / stripeSize) % rcount);
-                        stripeStart = start;
-
-                        key = null;
-                        int currAlloc = 0;
-                        boolean hntsDone = false;
-                        while ((stripeStart < len) && !done) {
-                                stripeEnd = (stripeStart - (stripeStart % stripeSize)) + stripeSize - 1;
-                                if (stripeEnd > start + len) {
-                                        stripeEnd = start + len - 1;
-                                        done = true;
-                                }
-
-                                rsize = replicas.get(counter).size();
-
-                                if (hnts == null)
-                                        repl[allocCtr] = new GlusterFSBrickRepl(rsize, stripeStart, (stripeEnd - stripeStart));
-
-                                for (i = 0; i < rsize; i++) {
-                                        brick = replicas.get(counter).get(i);
-                                        currAlloc = (allocCtr * rsize) + i;
-
-                                        if (hnts == null)
-                                                repl[allocCtr].addHost(brick2host(brick));
-                                        else
-                                                if (currAlloc <= (rsize * rcount) - 1) {
-                                                        hnts.put(currAlloc, new GlusterFSBrickClass(brick, stripeStart,
-                                                                                                    (stripeEnd - stripeStart),
-                                                                                                    true, stripeSize, rcount, rsize));
-                                                } else
-                                                        hntsDone = true;
-                                }
-
-                                if (hntsDone)
-                                        break;
-
-                                stripeStart = stripeEnd + 1;
-
-                                allocCtr++;
-                                counter++;
-
-                                if (counter >= replicas.size())
-                                        counter = 0;
-                        }
-
-                        if (hnts == null)
-                                for (int k = 0; k < nrAllocs; k++)
-                                        result[k] = new BlockLocation(null, repl[k].getReplHosts(), repl[k].getStartLen(), repl[k].getOffLen());
-
-                        break;
-
-                case S:
-                case DS:
-                        if (scount == 0)
-                                throw new IOException("got striped volume with stripe count 0");
-
-                        stripedBricks = new ArrayList<String>();
-                        stripeSize = meta.get("block-size");
-
-                        key = "STRIPE-" + scount;
-                        brickList = vol.get(key);
-                        it = brickList.iterator();
-                        while (it.hasNext()) {
-                                stripedBricks.add(it.next());
-                        }
-
-                        nrAllocs = (int) ((len - start) / stripeSize) + 1;
-                        if (hnts == null)
-                                result = new BlockLocation[nrAllocs];
-
-                        // starting stripe position
-                        counter = (int) ((start / stripeSize) % stripedBricks.size());
-                        stripeStart = start;
-
-                        key = null;
-                        while ((stripeStart < len) && !done) {
-                                brick = stripedBricks.get(counter);
-
-                                stripeEnd = (stripeStart - (stripeStart % stripeSize)) + stripeSize - 1;
-                                if (stripeEnd > start + len) {
-                                        stripeEnd = start + len - 1;
-                                        done = true;
-                                }
-
-                                if (hnts == null)
-                                        result[allocCtr] = new BlockLocation(null, new String[] {brick2host(brick)},
-                                                                             stripeStart, (stripeEnd - stripeStart));
-                                else
-                                        if (allocCtr <= stripedBricks.size()) {
-                                                hnts.put(allocCtr, new GlusterFSBrickClass(brick, stripeStart, (stripeEnd - stripeStart),
-                                                                                           true, stripeSize, stripedBricks.size(), -1));
-                                        } else
-                                                break;
-
-                                stripeStart = stripeEnd + 1;
-
-                                counter++;
-                                allocCtr++;
-
-                                if (counter >= stripedBricks.size())
-                                        counter = 0;
-                        }
-
-                        break;
-                }
-
-                return result;
-        }
-
-        /* TODO: use meta{dcount,scount,rcount} for checking */
-        public static int getReplicationFromLayout (HashMap<String, ArrayList<String>> vol,
-                                                    HashMap<String, Integer> meta)
-                throws IOException {
-                int replication = 0;
-                LAYOUT l = LAYOUT.valueOf(vol.get("layout").get(0));
-
-                switch (l) {
-                case D:
-                case S:
-                case DS:
-                        replication = 1;
-                        break;
-
-                case R:
-                case DR:
-                case SR:
-                case DSR:
-                        final String key = "REPLICATION-1";
-                        replication = vol.get(key).size();
-                }
-
-                return replication;
-        }
-}
diff --git a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEInputStream.java b/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEInputStream.java
deleted file mode 100644
index e92237aee..000000000
--- a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEInputStream.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of GlusterFS.
- *
- * Licensed under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- *
- */
-
-package org.apache.hadoop.fs.glusterfs;
-
-import java.io.*;
-import java.util.TreeMap;
-
-import org.apache.hadoop.fs.FSInputStream;
-import org.apache.hadoop.fs.FileSystem;
-
-
-public class GlusterFUSEInputStream extends FSInputStream {
-        File                                  f;
-        boolean                               lastActive;
-        long                                  pos;
-        boolean                               closed;
-        String                                thisHost;
-        RandomAccessFile                      fuseInputStream;
-        RandomAccessFile                      fsInputStream;
-        GlusterFSBrickClass                   thisBrick;
-        int                                   nodeLocation;
-        TreeMap<Integer, GlusterFSBrickClass> hnts;
-
-        public GlusterFUSEInputStream (File f, TreeMap<Integer, GlusterFSBrickClass> hnts,
-                                       String hostname) throws IOException {
-                this.f = f;
-                this.pos = 0;
-                this.closed = false;
-                this.hnts = hnts;
-                this.thisHost = hostname;
-                this.fsInputStream = null;
-                this.fuseInputStream = new RandomAccessFile(f.getPath(), "r");
-
-                this.lastActive = true; // true == FUSE, false == backed file
-
-                String directFilePath = null;
-                if (this.hnts != null) {
-                        directFilePath = findLocalFile(f.getPath(), this.hnts);
-                        if (directFilePath != null) {
-                                this.fsInputStream = new RandomAccessFile(directFilePath, "r");
-                                this.lastActive = !this.lastActive;
-                        }
-                }
-        }
-
-        public String findLocalFile (String path, TreeMap<Integer, GlusterFSBrickClass> hnts) {
-                int i = 0;
-                String actFilePath = null;
-                GlusterFSBrickClass gfsBrick = null;
-
-                gfsBrick = hnts.get(0);
-
-                /* do a linear search for the matching host not worrying
-                   about file stripes */
-                for (i = 0; i < hnts.size(); i++) {
-                        gfsBrick = hnts.get(i);
-                        actFilePath = gfsBrick.brickIsLocal(this.thisHost);
-                        if (actFilePath != null) {
-                                this.thisBrick = gfsBrick;
-                                this.nodeLocation = i;
-                                break;
-                        }
-                }
-
-                return actFilePath;
-        }
-
-        public long getPos () throws IOException {
-                return pos;
-        }
-
-        public synchronized int available () throws IOException {
-                return (int) ((f.length()) - getPos());
-        }
-
-        public void seek (long pos) throws IOException {
-                fuseInputStream.seek(pos);
-                if (fsInputStream != null)
-                        fsInputStream.seek(pos);
-        }
-
-        public boolean seekToNewSource (long pos) throws IOException {
-                return false;
-        }
-
-        public RandomAccessFile chooseStream (long start, int[] nlen)
-                throws IOException {
-                GlusterFSBrickClass gfsBrick = null;
-                RandomAccessFile in = fuseInputStream;
-                boolean oldActiveStream = lastActive;
-                lastActive = true;
-
-                if ((hnts != null) && (fsInputStream != null)) {
-                        gfsBrick = hnts.get(0);
-                        if (!gfsBrick.isChunked()) {
-                                in = fsInputStream;
-                                lastActive = false;
-                        } else {
-                                // find the current location in the tree and the amount of data it can serve
-                                int[] nodeInTree = thisBrick.getBrickNumberInTree(start, nlen[0]);
-
-                                // does this node hold the byte ranges we have been requested for ?
-                                if ((nodeInTree[2] != 0) && thisBrick.brickHasFilePart(nodeInTree[0], nodeLocation)) {
-                                        in = fsInputStream;
-                                        nlen[0] = nodeInTree[2]; // the amount of data that can be read from the stripe
-                                        lastActive = false;
-                                }
-                        }
-                }
-
-                return in;
-        }
-
-        public synchronized int read () throws IOException {
-                int byteRead = 0;
-                RandomAccessFile in = null;
-
-                if (closed)
-                        throw new IOException("Stream Closed.");
-
-                int[] nlen = { 1 };
-
-                in = chooseStream(getPos(), nlen);
-
-                byteRead = in.read();
-                if (byteRead >= 0) {
-                        pos++;
-                        syncStreams(1);
-                }
-
-                return byteRead;
-        }
-
-        public synchronized int read (byte buff[], int off, int len) throws
-                IOException {
-                int result = 0;
-                RandomAccessFile in = null;
-
-                if (closed)
-                        throw new IOException("Stream Closed.");
-
-                int[] nlen = {len}; // hack to make len mutable
-                in = chooseStream(pos, nlen);
-
-                result = in.read(buff, off, nlen[0]);
-                if (result > 0) {
-                        pos += result;
-                        syncStreams(result);
-                }
-
-                return result;
-        }
-
-        /**
-         * TODO: use seek() insted of skipBytes(); skipBytes does I/O
-         */
-        public void syncStreams (int bytes) throws IOException {
-                if ((hnts != null) && (hnts.get(0).isChunked()) && (fsInputStream != null))
-                        if (!this.lastActive)
-                                fuseInputStream.skipBytes(bytes);
-                        else
-                                fsInputStream.skipBytes(bytes);
-        }
-
-        public synchronized void close () throws IOException {
-                if (closed)
-                        throw new IOException("Stream closed.");
-
-                super.close();
-                if (fsInputStream != null)
-                        fsInputStream.close();
-                fuseInputStream.close();
-
-                closed = true;
-        }
-
-        // Not supported - mark () and reset ()
-
-        public boolean markSupported () {
-                return false;
-        }
-
-        public void mark (int readLimit) {}
-
-        public void reset () throws IOException {
-                throw new IOException("Mark/Reset not supported.");
-        }
-}
diff --git a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEOutputStream.java b/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEOutputStream.java
deleted file mode 100644
index 5192a0a56..000000000
--- a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEOutputStream.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of GlusterFS.
- *
- * Licensed under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- *
- */
-
-package org.apache.hadoop.fs.glusterfs;
-
-import java.io.*;
-
-import org.apache.hadoop.fs.FSOutputSummer;
-import org.apache.hadoop.fs.FileSystem;
-
-public class GlusterFUSEOutputStream extends OutputStream {
-        File         f;
-        long         pos;
-        boolean      closed;
-        OutputStream fuseOutputStream;
-
-        public GlusterFUSEOutputStream (String file, boolean append) throws
-                IOException {
-                this.f = new File(file); /* not needed ? */
-                this.pos = 0;
-                this.fuseOutputStream = new FileOutputStream(file, append);
-                this.closed = false;
-        }
-
-        public long getPos () throws IOException {
-                return pos;
-        }
-
-        public void write (int v) throws IOException {
-                if (closed)
-                        throw new IOException("Stream closed.");
-
-                byte[] b = new byte[1];
-                b[0] = (byte) v;
-
-                write(b, 0, 1);
-        }
-
-        public void write (byte b[]) throws IOException {
-                if (closed)
-                        throw new IOException("Stream closed.");
-
-                fuseOutputStream.write(b, 0, b.length);
-                pos += (long) b.length;
-        }
-
-        public void write (byte b[], int off, int len) throws IOException {
-                if (closed)
-                        throw new IOException("Stream closed.");
-
-                fuseOutputStream.write(b, off, len);
-                pos += (long) len;
-        }
-
-        public void flush () throws IOException {
-                if (closed)
-                        throw new IOException("Stream closed.");
-
-                fuseOutputStream.flush();
-        }
-
-        public void close () throws IOException {
-                if (closed)
-                        throw new IOException("Stream closed.");
-
-                flush();
-                fuseOutputStream.close();
-                closed = true;
-        }
-}
diff --git a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java b/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java
deleted file mode 100644
index b0501cced..000000000
--- a/glusterfs-hadoop/0.20.2/src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java
+++ /dev/null
@@ -1,492 +0,0 @@
-/**
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of GlusterFS.
- *
- * Licensed under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- *
- */
-
-/**
- * Implements the Hadoop FileSystem Interface to allow applications to store
- * files on GlusterFS and run Map/Reduce jobs on the data.
- */
-
-package org.apache.hadoop.fs.glusterfs;
-
-import java.io.*;
-import java.net.*;
-
-import java.util.regex.*;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileUtil;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.BlockLocation;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.util.Progressable;
-
-import java.util.TreeMap;
-
-/*
- * This package provides interface for hadoop jobs (incl. Map/Reduce)
- * to access files in GlusterFS backed file system via FUSE mount
- */
-public class GlusterFileSystem extends FileSystem {
-
-        private FileSystem glusterFs    = null;
-        private URI        uri          = null;
-        private Path       workingDir   = null;
-        private String     glusterMount = null;
-        private boolean    mounted      = false;
-
-        /* for quick IO */
-        private boolean quickSlaveIO = false;
-
-        /* extended attribute class */
-        private GlusterFSXattr xattr = null;
-
-        /* hostname of this machine */
-        private static String hostname;
-
-        public GlusterFileSystem () {
-
-        }
-
-        public URI getUri () {
-                return uri;
-        }
-
-        public boolean FUSEMount (String volname, String server, String mount)
-                throws IOException, InterruptedException  {
-                boolean        ret      = true;
-                int            retVal   = 0;
-                Process        p        = null;
-                String         s        = null;
-                String         mountCmd = null;
-
-                mountCmd = "mount -t glusterfs " + server + ":" + "/" + volname + " " + mount;
-
-                try {
-                        p = Runtime.getRuntime().exec(mountCmd);
-
-                        retVal = p.waitFor();
-                        if (retVal != 0)
-                                ret = false;
-
-                } catch (IOException e) {
-                        System.out.println ("Problem mounting FUSE mount on: " + mount);
-                        e.printStackTrace();
-                        System.exit(-1);
-                }
-
-                return ret;
-        }
-
-        public void initialize (URI uri, Configuration conf) throws IOException {
-                boolean ret             = false;
-                String  volName         = null;
-                String  remoteGFSServer = null;
-                String  needQuickRead   = null;
-
-                if (this.mounted)
-                        return;
-
-                System.out.println("Initializing GlusterFS");
-
-                try {
-                        volName = conf.get("fs.glusterfs.volname", "");
-                        glusterMount = conf.get("fs.glusterfs.mount", "");
-                        remoteGFSServer = conf.get("fs.glusterfs.server", "");
-                        needQuickRead = conf.get("quick.slave.io", "");
-
-                        /*
-                         * bail out if we do not have enough information to do a FUSE
-                         * mount
-                         */
-                        if ( (volName.length() == 0) || (remoteGFSServer.length() == 0) ||
-                             (glusterMount.length() == 0) )
-                                System.exit (-1);
-
-                        ret = FUSEMount(volName, remoteGFSServer, glusterMount);
-                        if (!ret) {
-                                System.out.println("Failed to initialize GlusterFS");
-                                System.exit(-1);
-                        }
-
-                        if ((needQuickRead.length() != 0)
-                            && (needQuickRead.equalsIgnoreCase("yes")
-                                || needQuickRead.equalsIgnoreCase("on")
-                                || needQuickRead.equals("1")))
-                                this.quickSlaveIO = true;
-
-                        this.mounted = true;
-                        this.glusterFs = FileSystem.getLocal(conf);
-                        this.workingDir = new Path(glusterMount);
-                        this.uri = URI.create(uri.getScheme() + "://" + uri.getAuthority());
-
-                        this.xattr = new GlusterFSXattr();
-
-                        InetAddress addr = InetAddress.getLocalHost();
-                        this.hostname = addr.getHostName();
-
-                        setConf(conf);
-
-                } catch (Exception e) {
-                        e.printStackTrace();
-                        System.out.println("Unable to initialize GlusterFS");
-                        System.exit(-1);
-                }
-        }
-
-        @Deprecated
-        public String getName () {
-                return getUri().toString();
-        }
-
-        public Path getWorkingDirectory () {
-                return this.workingDir;
-        }
-
-        public Path getHomeDirectory () {
-                return this.workingDir;
-        }
-
-        public Path makeAbsolute (Path path) {
-                String pth = path.toUri().getPath();
-                if (pth.startsWith(workingDir.toUri().getPath())) {
-                        return path;
-                }
-
-                return new Path(workingDir + "/" + pth);
-        }
-
-        public void setWorkingDirectory (Path dir) {
-                this.workingDir = makeAbsolute(dir);
-        }
-
-        public boolean exists (Path path) throws IOException {
-                Path absolute = makeAbsolute(path);
-                File f = new File(absolute.toUri().getPath());
-
-                return f.exists();
-        }
-
-        public boolean mkdirs (Path path, FsPermission permission
-                               ) throws IOException {
-                boolean created  = false;
-                Path    absolute = makeAbsolute(path);
-                File    f        = new File(absolute.toUri().getPath());
-
-                if (f.exists()) {
-                        System.out.println("Directory " + f.getPath() + " already exist");
-                        return true;
-                }
-
-                return f.mkdirs();
-        }
-
-        @Deprecated
-        public boolean isDirectory (Path path) throws IOException {
-                Path absolute = makeAbsolute(path);
-                File f = new File(absolute.toUri().getPath());
-
-                return f.isDirectory();
-        }
-
-        public boolean isFile (Path path) throws IOException {
-                return !isDirectory(path);
-        }
-
-        public Path[] listPaths (Path path) throws IOException {
-                Path   absolute   = makeAbsolute(path);
-                File   f          = new File (absolute.toUri().getPath());
-                String relPath    = path.toUri().getPath();
-                String[] fileList = null;
-                Path[] filePath   = null;
-                int    fileCnt    = 0;
-
-                fileList = f.list();
-
-                filePath = new Path[fileList.length];
-
-                for (; fileCnt < fileList.length; fileCnt++) {
-                        filePath[fileCnt] = new Path(relPath + "/" + fileList[fileCnt]);
-                }
-
-                return filePath;
-        }
-
-        public FileStatus[] listStatus (Path path) throws IOException {
-                int    fileCnt          = 0;
-                Path   absolute         = makeAbsolute(path);
-                String relpath          = path.toUri().getPath();
-                String[] strFileList    = null;
-                FileStatus[] fileStatus = null;
-                File   f                = new File(absolute.toUri().getPath());
-
-                if (!f.exists()) {
-                        return null;
-                }
-
-                if (f.isFile())
-                        return new FileStatus[] {
-                                getFileStatus(path)
-                        };
-
-                if (relpath.charAt(relpath.length() - 1) != '/')
-                        relpath += "/";
-
-                strFileList = f.list();
-
-                fileStatus = new FileStatus[strFileList.length];
-
-                for (; fileCnt < strFileList.length; fileCnt++) {
-                        fileStatus[fileCnt] = getFileStatusFromFileString(relpath + strFileList[fileCnt]);
-                }
-
-                return fileStatus;
-        }
-
-        public FileStatus getFileStatusFromFileString (String path)
-                throws IOException {
-                Path nPath = new Path(path);
-                return getFileStatus(nPath);
-        }
-
-        public FileStatus getFileStatus (Path path) throws IOException {
-                Path absolute = makeAbsolute(path);
-                File f = new File(absolute.toUri().getPath());
-
-                if (!f.exists ())
-                        throw new FileNotFoundException("File " + f.getPath() + " does not exist.");
-
-                if (f.isDirectory ())
-                        return new FileStatus(0, true, 1, 0, f.lastModified(), path.makeQualified(this));
-                else
-                        return new FileStatus(f.length(), false, 0, getDefaultBlockSize(),
-                                              f.lastModified(), path.makeQualified(this));
-
-        }
-
-        /*
-         * creates a new file in glusterfs namespace. internally the file
-         * descriptor is an instance of OutputStream class.
-         */
-        public FSDataOutputStream create (Path path, FsPermission permission,
-                                          boolean overwrite, int bufferSize,
-                                          short replication, long blockSize,
-                                          Progressable progress)
-        throws IOException {
-                Path               absolute          = makeAbsolute(path);
-                Path               parent            = null;
-                File               f                 = null;
-                File               fParent           = null;
-                FSDataOutputStream glusterFileStream = null;
-
-                f = new File(absolute.toUri().getPath());
-
-                if (f.exists ()) {
-                        if (overwrite)
-                                f.delete ();
-                        else
-                                throw new IOException(f.getPath() + " already exist");
-                }
-
-                parent = path.getParent();
-                fParent = new File ((makeAbsolute(parent)).toUri().getPath());
-                if ((parent != null) && (fParent != null) && (!fParent.exists()))
-                        if (!fParent.mkdirs())
-                                throw new IOException("cannot create parent directory: " + fParent.getPath());
-
-                glusterFileStream = new FSDataOutputStream(new GlusterFUSEOutputStream
-                                                           (f.getPath(), false));
-
-                return glusterFileStream;
-        }
-
-        /*
-         * open the file in read mode (internally the file descriptor is an
-         * instance of InputStream class).
-         *
-         * if quick read mode is set then read the file by by-passing FUSE
-         * if we are on same slave where the file exist
-         */
-        public FSDataInputStream open (Path path) throws IOException {
-                Path              absolute          = makeAbsolute(path);
-                File              f                 = new File(absolute.toUri().getPath());
-                FSDataInputStream glusterFileStream = null;
-                TreeMap<Integer, GlusterFSBrickClass> hnts = null;
-
-                if (!f.exists())
-                        throw new IOException("File " + f.getPath() + " does not exist.");
-
-                if (quickSlaveIO)
-                        hnts = xattr.quickIOPossible(f.getPath(), 0, f.length());
-
-                glusterFileStream = new FSDataInputStream(new GlusterFUSEInputStream(f, hnts, hostname));
-                return glusterFileStream;
-        }
-
-        public FSDataInputStream open (Path path, int bufferSize) throws IOException {
-                return open(path);
-        }
-
-        public FSDataOutputStream append (Path f, int bufferSize, Progressable progress)
-                throws IOException {
-                throw new IOException ("append not supported (as yet).");
-        }
-
-        public boolean rename (Path src, Path dst) throws IOException {
-                Path absoluteSrc = makeAbsolute(src);
-                Path absoluteDst = makeAbsolute(dst);
-
-                File fSrc = new File(absoluteSrc.toUri().getPath());
-                File fDst = new File(absoluteDst.toUri().getPath());
-
-                if (fDst.isDirectory()) {
-                        fDst = null;
-                        String newPath = absoluteDst.toUri().getPath() + "/" + fSrc.getName();
-                        fDst = new File(newPath);
-                }
-                return fSrc.renameTo(fDst);
-        }
-
-        @Deprecated
-        public boolean delete (Path path) throws IOException {
-                return delete(path, true);
-        }
-
-        public boolean delete (Path path, boolean recursive) throws IOException {
-                Path absolute = makeAbsolute(path);
-                File f = new File(absolute.toUri().getPath());
-
-                if (f.isFile())
-                        return f.delete();
-
-                FileStatus[] dirEntries = listStatus(absolute);
-                if ((!recursive) && (dirEntries != null) && (dirEntries.length != 0))
-                        throw new IOException ("Directory " + path.toString() + " is not empty");
-
-                if (dirEntries != null)
-                        for (int i = 0; i < dirEntries.length; i++)
-                                delete(new Path(absolute, dirEntries[i].getPath()), recursive);
-
-                return f.delete();
-        }
-
-        @Deprecated
-        public long getLength (Path path) throws IOException {
-                Path absolute = makeAbsolute(path);
-                File f = new File(absolute.toUri().getPath());
-
-                if (!f.exists())
-                        throw new IOException(f.getPath() + " does not exist.");
-
-                return f.length();
-        }
-
-        @Deprecated
-        public short getReplication (Path path) throws IOException {
-                Path absolute = makeAbsolute(path);
-                File f = new File(absolute.toUri().getPath());
-
-                if (!f.exists())
-                        throw new IOException(f.getPath() + " does not exist.");
-
-                return xattr.getReplication(f.getPath());
-        }
-
-        public short getDefaultReplication (Path path) throws IOException {
-                return getReplication(path);
-        }
-
-        public boolean setReplication (Path path, short replication)
-                throws IOException {
-                return true;
-        }
-
-        public long getBlockSize (Path path) throws IOException {
-                long blkSz;
-                Path absolute = makeAbsolute(path);
-                File f = new File(absolute.toUri().getPath());
-
-                blkSz = xattr.getBlockSize(f.getPath());
-                if (blkSz == 0)
-                        blkSz = getLength(path);
-
-                return blkSz;
-        }
-
-        public long getDefaultBlockSize () {
-                return 1 << 26; /* default's from hdfs, kfs */
-        }
-
-        @Deprecated
-        public void lock (Path path, boolean shared) throws IOException {
-        }
-
-        @Deprecated
-        public void release (Path path) throws IOException {
-        }
-
-        public BlockLocation[] getFileBlockLocations (FileStatus file, long start, long len)
-                throws IOException {
-
-                Path absolute          = makeAbsolute(file.getPath());
-                File f                 = new File(absolute.toUri().getPath());
-                BlockLocation[] result = null;
-
-                if (file == null)
-                        return null;
-
-                result = xattr.getPathInfo(f.getPath(), start, len);
-                if (result == null) {
-                        System.out.println("Problem getting destination host for file "
-                                           + f.getPath());
-                        return null;
-                }
-
-                return result;
-        }
-
-        // getFileBlockLocations (FileStatus, long, long) is called by hadoop
-        public BlockLocation[] getFileBlockLocations (Path p, long start, long len)
-                throws IOException {
-                return null;
-        }
-
-        public void copyFromLocalFile (boolean delSrc, Path src, Path dst)
-                throws IOException {
-                FileUtil.copy(glusterFs, src, this, dst, delSrc, getConf());
-        }
-
-        public void copyToLocalFile (boolean delSrc, Path src, Path dst)
-                throws IOException {
-                FileUtil.copy(this, src, glusterFs, dst, delSrc, getConf());
-        }
-
-        public Path startLocalOutput (Path fsOutputFile, Path tmpLocalFile)
-                throws IOException {
-                return tmpLocalFile;
-        }
-
-        public void completeLocalOutput (Path fsOutputFile, Path tmpLocalFile)
-                throws IOException {
-                moveFromLocalFile(tmpLocalFile, fsOutputFile);
-        }
-}
diff --git a/glusterfs-hadoop/0.20.2/src/test/java/org/apache/hadoop/fs/glusterfs/AppTest.java b/glusterfs-hadoop/0.20.2/src/test/java/org/apache/hadoop/fs/glusterfs/AppTest.java
deleted file mode 100644
index 21e188c52..000000000
--- a/glusterfs-hadoop/0.20.2/src/test/java/org/apache/hadoop/fs/glusterfs/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.hadoop.fs.glusterfs;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/glusterfs-hadoop/0.20.2/tools/build-deploy-jar.py b/glusterfs-hadoop/0.20.2/tools/build-deploy-jar.py
deleted file mode 100755
index c20e53b39..000000000
--- a/glusterfs-hadoop/0.20.2/tools/build-deploy-jar.py
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/usr/bin/python
-
-##
- #
- # Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- # This file is part of GlusterFS.
- #
- # Licensed under the Apache License, Version 2.0
- # (the "License"); you may not use this file except in compliance with
- # the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- # implied. See the License for the specific language governing
- # permissions and limitations under the License.
- #
- ##
-
-import getopt
-import glob
-import sys, os
-import shutil
-import subprocess, shlex
-
-def usage():
-    print "usage: python build-deploy-jar.py [-b/--build] -d/--dir <hadoop-home> [-c/--core] [-m/--mapred] [-h/--henv]"
-
-def addSlash(s):
-    if not (s[-1] == '/'):
-        s = s + '/'
-
-    return s
-
-def whereis(program):
-    abspath = None
-    for path in (os.environ.get('PATH', '')).split(':'):
-        abspath = os.path.join(path, program)
-        if os.path.exists(abspath) and not os.path.isdir(abspath):
-            return abspath
-
-    return None
-
-def getLatestJar(targetdir):
-    glusterfsJar = glob.glob(targetdir + "*.jar")
-    if len(glusterfsJar) == 0:
-        print "No GlusterFS jar file found in %s ... exiting" % (targetdir)
-        return None
-
-    # pick up the latest jar file - just in case ...
-    stat = latestJar = None
-    ctime = 0
-
-    for jar in glusterfsJar:
-        stat = os.stat(jar)
-        if stat.st_ctime > ctime:
-           latestJar = jar
-           ctime = stat.st_ctime
-
-    return latestJar
-
-# build the glusterfs hadoop plugin using maven
-def build_jar(targetdir):
-    location = whereis('mvn')
-
-    if location == None:
-        print "Cannot find maven to build glusterfs hadoop jar"
-        print "please install maven or if it's already installed then fix your PATH environ"
-        return None
-
-    # do a clean packaging
-    if os.path.exists(targetdir) and os.path.isdir(targetdir):
-        print "Cleaning up directories ... [ " + targetdir + " ]"
-        shutil.rmtree(targetdir)
-
-    print "Building glusterfs jar ..."
-    process = subprocess.Popen(['package'], shell=True,
-                               executable=location, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-    process.wait()
-    if not process.returncode == 0:
-        print "Building glusterfs jar failed ... exiting"
-        return None
-
-    latestJar = getLatestJar(targetdir)
-    return latestJar
-
-def rcopy(f, host, libdir):
-    print "   * doing remote copy to host %s" % (host)
-    scpCmd = "scp %s %s:%s" % (f, host, libdir)
-
-    os.system(scpCmd);
-
-def deployInSlave(f, confdir, libdir, cc, cm, he):
-    slavefile = confdir + "slaves"
-
-    ccFile = confdir + "core-site.xml"
-    cmFile = confdir + "mapred-site.xml"
-    heFile = confdir + "hadoop-env.sh"
-
-    sf = open(slavefile, 'r')
-    for host in sf:
-        host = host.rstrip('\n')
-        print "  >>> Deploying %s on %s ..." % (os.path.basename(f), host)
-        rcopy(f, host, libdir)
-
-        if cc:
-            print "  >>> Deploying [%s] on %s ..." % (os.path.basename(ccFile), host)
-            rcopy(ccFile, host, confdir)
-
-        if cm:
-            print "  >>> Deploying [%s] on %s ..." % (os.path.basename(cmFile), host)
-            rcopy(cmFile, host, confdir)
-
-        if he:
-            print "  >>> Deploying [%s] on %s ..." % (os.path.basename(heFile), host)
-            rcopy(heFile, host, confdir);
-
-        print "<<< Done\n"
-
-    sf.close()
-
-def deployInMaster(f, confdir, libdir):
-    import socket
-    masterfile = confdir + "masters"
-
-    mf = open(masterfile, 'r')
-    for host in mf:
-        host = host.rstrip('\n')
-        print "  >>> Deploying %s on %s ..." % (os.path.basename(f), host)
-        h = host
-        try:
-            socket.inet_aton(host)
-            h = socket.getfqdn(host)
-        except socket.error:
-            pass
-
-        if h == socket.gethostname() or h == 'localhost':
-            # local cp
-            print "   * doing local copy"
-            shutil.copy(f, libdir)
-        else:
-            # scp the file
-            rcopy(f, h, libdir)
-
-        print "<<< Done\n"
-
-    mf.close()
-
-if __name__ == '__main__':
-    opt = args = []
-    try:
-        opt, args = getopt.getopt(sys.argv[1:], "bd:cmh", ["build", "dir=", "core", "mapred", "henv"]);
-    except getopt.GetoptError, err:
-        print str(err)
-        usage()
-        sys.exit(1)
-
-    needbuild = hadoop_dir = copyCore = copyMapred = copyHadoopEnv = None
-
-    for k, v in opt:
-        if k in ("-b", "--build"):
-            needbuild = True
-        elif k in ("-d", "--dir"):
-            hadoop_dir = v
-        elif k in ("-c", "--core"):
-            copyCore = True
-        elif k in ("-m", "--mapred"):
-            copyMapred = True
-        elif k in ("-h", "--henv"):
-            copyHadoopEnv = True
-        else:
-            pass
-
-    if hadoop_dir == None:
-        print 'hadoop directory missing'
-        usage()
-        sys.exit(1)
-
-    os.chdir(os.path.dirname(sys.argv[0]) + '/..')
-    targetdir = './target/'
-
-    if needbuild:
-        jar = build_jar(targetdir)
-        if jar == None:
-            sys.exit(1)
-    else:
-        jar = getLatestJar(targetdir)
-        if jar == None:
-            print "Maybe you want to build it ? with -b option"
-            sys.exit(1)
-
-    print ""
-    print "*** Deploying %s *** " % (jar)
-
-    # copy jar to local hadoop distribution (master)
-    hadoop_home = addSlash(hadoop_dir)
-    if not (os.path.exists(hadoop_home) and os.path.isdir(hadoop_home)):
-        print "path " + hadoop_home + " does not exist or is not adiretory";
-        sys.exit(1);
-
-    hadoop_conf = hadoop_home + "conf/"
-    hadoop_lib = hadoop_home + "lib/"
-
-    print " >>> Scanning hadoop master file for host(s) to deploy"
-    deployInMaster(jar, hadoop_conf, hadoop_lib)
-
-    print ""
-    print " >>> Scanning hadoop slave file for host(s) to deploy"
-    deployInSlave(jar, hadoop_conf, hadoop_lib, copyCore, copyMapred, copyHadoopEnv)
diff --git a/glusterfs-hadoop/COPYING b/glusterfs-hadoop/COPYING
deleted file mode 100644
index d64569567..000000000
--- a/glusterfs-hadoop/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/glusterfs-hadoop/README b/glusterfs-hadoop/README
deleted file mode 100644
index 3026f11c0..000000000
--- a/glusterfs-hadoop/README
+++ /dev/null
@@ -1,182 +0,0 @@
-GlusterFS Hadoop Plugin
-=======================
-
-INTRODUCTION
-------------
-
-This document describes how to use GlusterFS (http://www.gluster.org/) as a backing store with Hadoop.
-
-
-REQUIREMENTS
-------------
-
-* Supported OS is GNU/Linux
-* GlusterFS and Hadoop installed on all machines in the cluster
-* Java Runtime Environment (JRE)
-* Maven (needed if you are building the plugin from source)
-* JDK (needed if you are building the plugin from source)
-
-NOTE: Plugin relies on two *nix command line utilities to function properly. They are:
-
-* mount: Used to mount GlusterFS volumes.
-* getfattr: Used to fetch Extended Attributes of a file
-
-Make sure they are installed on all hosts in the cluster and their locations are in $PATH
-environment variable.
-
-
-INSTALLATION
-------------
-
-** NOTE: Example below is for Hadoop version 0.20.2 ($GLUSTER_HOME/hdfs/0.20.2) **
-
-* Building the plugin from source [Maven (http://maven.apache.org/) and JDK is required to build the plugin]
-
-  Change to glusterfs-hadoop directory in the GlusterFS source tree and build the plugin.
-
-  # cd $GLUSTER_HOME/hdfs/0.20.2
-  # mvn package
-
-  On a successful build the plugin will be present in the `target` directory.
-  (NOTE: version number will be a part of the plugin)
-
-  # ls target/
-  classes  glusterfs-0.20.2-0.1.jar  maven-archiver  surefire-reports  test-classes
-               ^^^^^^^^^^^^^^^^^^
-
-  Copy the plugin to lib/ directory in your $HADOOP_HOME dir.
-
-  # cp target/glusterfs-0.20.2-0.1.jar $HADOOP_HOME/lib
-
-  Copy the sample configuration file that ships with this source (conf/core-site.xml) to conf
-  directory in your $HADOOP_HOME dir.
-
-  # cp conf/core-site.xml $HADOOP_HOME/conf
-
-* Installing the plugin from RPM
-
-  See the plugin documentation for installing from RPM.
-
-
-CLUSTER INSTALLATION
---------------------
-
-  In case it is tedious to do the above steps(s) on all hosts in the cluster; use the build-and-deploy.py script to
-  build the plugin in one place and deploy it (along with the configuration file on all other hosts).
-
-  This should be run on the host which is that hadoop master [Job Tracker].
-
-* STEPS (You would have done Step 1 and 2 anyway while deploying Hadoop)
-
-  1. Edit conf/slaves file in your hadoop distribution; one line for each slave.
-  2. Setup password-less ssh b/w hadoop master and slave(s).
-  3. Edit conf/core-site.xml with all glusterfs related configurations (see CONFIGURATION)
-  4. Run the following
-     # cd $GLUSTER_HOME/hdfs/0.20.2/tools
-     # python ./build-and-deploy.py -b -d /path/to/hadoop/home -c
-
-     This will build the plugin and copy it (and the config file) to all slaves (mentioned in $HADOOP_HOME/conf/slaves).
-
-   Script options:
-     -b : build the plugin
-     -d : location of hadoop directory
-     -c : deploy core-site.xml
-     -m : deploy mapred-site.xml
-     -h : deploy hadoop-env.sh
-
-
-CONFIGURATION
--------------
-
-  All plugin configuration is done in a single XML file (core-site.xml) with <name><value> tags in each <property>
-  block.
-
-  Brief explanation of the tunables and the values they accept (change them where-ever needed) are mentioned below
-
-  name:  fs.glusterfs.impl
-  value: org.apache.hadoop.fs.glusterfs.GlusterFileSystem
-
-         The default FileSystem API to use (there is little reason to modify this).
-
-  name:  fs.default.name
-  value: glusterfs://server:port
-
-         The default name that hadoop uses to represent file as a URI (typically a server:port tuple). Use any host
-         in the cluster as the server and any port number. This option has to be in server:port format for hadoop
-         to create file URI; but is not used by plugin.
-
-  name:  fs.glusterfs.volname
-  value: volume-dist-rep
-
-         The volume to mount.
-
-
-  name:  fs.glusterfs.mount
-  value: /mnt/glusterfs
-
-         This is the directory that the plugin will use to mount (FUSE mount) the volume.
-
-  name:  fs.glusterfs.server
-  value: 192.168.1.36, hackme.zugzug.org
-
-         To mount a volume the plugin needs to know the hostname or the IP of a GlusterFS server in the cluster.
-         Mention it here.
-
-  name:  quick.slave.io
-  value: [On/Off], [Yes/No], [1/0]
-
-         NOTE: This option is not tested as of now.
-
-         This is a performance tunable option. Hadoop schedules jobs to hosts that contain the file data part. The job
-         then does I/O on the file (via FUSE in case of GlusterFS). When this option is set, the plugin will try to
-         do I/O directly from the backed filesystem (ext3, ext4 etc..) the file resides on. Hence read performance
-         will improve and job would run faster.
-
-
-USAGE
------
-
-  Once configured, start Hadoop Map/Reduce daemons
-
-  # cd $HADOOP_HOME
-  # ./bin/start-mapred.sh
-
-  If the map/reduce job/task trackers are up, all I/O will be done to GlusterFS.
-
-
-FOR HACKERS
------------
-
-* Source Layout
-
-** version specific: hdfs/<version> **
-./src
-./src/main
-./src/main/java
-./src/main/java/org
-./src/main/java/org/apache
-./src/main/java/org/apache/hadoop
-./src/main/java/org/apache/hadoop/fs
-./src/main/java/org/apache/hadoop/fs/glusterfs
-./src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSBrickClass.java
-./src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSXattr.java            <--- Fetch/Parse Extended Attributes of a file
-./src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEInputStream.java    <--- Input Stream (instantiated during open() calls; quick read from backed FS)
-./src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFSBrickRepl.java
-./src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEOutputStream.java   <--- Output Stream (instantiated during creat() calls)
-./src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java         <--- Entry Point for the plugin (extends Hadoop FileSystem class)
-./src/test
-./src/test/java
-./src/test/java/org
-./src/test/java/org/apache
-./src/test/java/org/apache/hadoop
-./src/test/java/org/apache/hadoop/fs
-./src/test/java/org/apache/hadoop/fs/glusterfs
-./src/test/java/org/apache/hadoop/fs/glusterfs/AppTest.java                  <--- Your test cases go here (if any :-))
-./tools/build-deploy-jar.py                                                  <--- Build and Deployment Script
-./conf
-./conf/core-site.xml                                                         <--- Sample configuration file
-./pom.xml                                                                    <--- build XML file (used by maven)
-
-** toplevel: hdfs/ **
-./COPYING                                                                    <--- License
-./README                                                                     <--- This file
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 040500c5f..8fe91ea28 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -1,269 +1,96 @@
-%global _hardened_build 1
-
-%global _for_fedora_koji_builds 0
-
-# uncomment and add '%' to use the prereltag for pre-releases
-# global prereltag beta4
+# if you make changes, the it is advised to increment this number, and provide
+# a descriptive suffix to identify who owns or what the change represents
+# e.g. release_version 2.MSW
+%define release 1%{?dist}
+%define _libexecdir %{_prefix}/local/libexec/
 
 # if you wish to compile an rpm without rdma support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
-%{?_without_rdma:%global _without_rdma --disable-ibverbs}
-
-# No RDMA Support on s390(x)
-%ifarch s390 s390x
-%global _without_rdma --disable-ibverbs
-%endif
+%{?_without_rdma:%define _without_rdma --disable-ibverbs}
 
 # if you wish to compile an rpm without epoll...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without epoll
-%{?_without_epoll:%global _without_epoll --disable-epoll}
+%{?_without_epoll:%define _without_epoll --disable-epoll}
 
-# if you wish to compile an rpm without fusermount...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without fusermount
-%{?_without_fusermount:%global _without_fusermount --disable-fusermount}
+# if you wish to compile an rpm with fusermount...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with fusermount
+%{?_with_fusermount:%define _with_fusermount --enable-fusermount}
 
 # if you wish to compile an rpm without geo-replication support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication
-%{?_without_georeplication:%global _without_georeplication --disable-geo-replication}
-
-# if you wish to compile an rpm without the OCF resource agents...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf
-%{?_without_ocf:%global _without_ocf --without-ocf}
-
-# if you wish to build rpms without syslog logging, compile like this
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@tar.gz --without syslog
-%{?_without_syslog:%global _without_syslog --disable-syslog}
-
-# disable syslog forcefully as rhel <= 6 doesn't have rsyslog or rsyslog-mmcount
-%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
-%global _without_syslog --disable-syslog
-%endif
-
-# there is no systemtap support! Perhaps some day there will be
-%global _without_systemtap --enable-systemtap=no
-
-# if you wish to compile an rpm without the BD map support...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd
-%{?_without_bd:%global _without_bd --disable-bd-xlator}
-
-%if ( 0%{?rhel} && 0%{?rhel} < 6 )
-%define _without_bd --disable-bd-xlator
-%endif
-
-# if you wish to compile an rpm without the qemu-block support...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without qemu-block
-%{?_without_qemu_block:%global _without_qemu_block --disable-qemu-block}
-
-%if ( 0%{?rhel} && 0%{?rhel} < 6 )
-# xlators/features/qemu-block fails to build on RHEL5, disable it
-%define _without_qemu_block --disable-qemu-block
-%endif
-
-%if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
-%global           _with_systemd true
-%endif
-
-# From https://fedoraproject.org/wiki/Packaging:Python#Macros
-%if ( 0%{?rhel} && 0%{?rhel} <= 5 )
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-
-Summary:          Cluster File System
-%if ( 0%{_for_fedora_koji_builds} )
-Name:             glusterfs
-Version:          3.4.1
-Release:          3%{?prereltag:.%{prereltag}}%{?dist}
-Vendor:           Fedora Project
-%else
-Name:             @PACKAGE_NAME@
-Version:          @PACKAGE_VERSION@
-Release:          1%{?dist}
-Vendor:           glusterfs.org
-%endif
-License:          GPLv2 or LGPLv3+
-Group:            System Environment/Base
-URL:              http://www.gluster.org/docs/index.php/GlusterFS
-%if ( 0%{_for_fedora_koji_builds} )
-Source0:          http://download.gluster.org/pub/gluster/glusterfs/3.4/%{version}%{?prereltag}/glusterfs-%{version}%{?prereltag}.tar.gz
-Source1:          glusterd.sysconfig
-Source2:          glusterfsd.sysconfig
-Source3:          glusterfs-fuse.logrotate
-Source4:          glusterd.logrotate
-Source5:          glusterfsd.logrotate
-Source6:          rhel5-load-fuse-modules
-Source11:         glusterfsd.service
-Source13:         glusterfsd.init
-Patch0:           %{name}-3.2.5.configure.ac.patch
-Patch1:           %{name}-3.3.0.libglusterfs.Makefile.patch
-Patch2:           %{name}-3.3.1.rpc.rpcxprt.rdma.name.c.patch
-%else
-Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
-%endif
-
-BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-%if ( 0%{?rhel} && 0%{?rhel} <= 5 )
-BuildRequires:    python-simplejson
-%endif
-%if ( 0%{?_with_systemd:1} )
-%if ( 0%{_for_fedora_koji_builds} )
-%global glusterfsd_service %{S:%{SOURCE11}}
-%endif
-BuildRequires:    systemd-units
-Requires(post):   systemd-units
-Requires(preun):  systemd-units
-Requires(postun): systemd-units
-%define _init_enable()  /bin/systemctl enable %1.service ;
-%define _init_disable() /bin/systemctl disable %1.service ;
-%define _init_restart() /bin/systemctl try-restart %1.service ;
-%define _init_stop()    /bin/systemctl stop %1.service ;
-%define _init_install() %{__install} -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service ;
-# can't seem to make a generic macro that works
-%define _init_glusterd   %{_unitdir}/glusterd.service
-%define _init_glusterfsd %{_unitdir}/glusterfsd.service
-%else
-%if ( 0%{_for_fedora_koji_builds} )
-%global glusterfsd_service %{S:%{SOURCE13}}
-%endif
-Requires(post):   /sbin/chkconfig
-Requires(preun):  /sbin/service
-Requires(preun):  /sbin/chkconfig
+%{?_without_georeplication:%define _without_georeplication --disable-geo-replication}
+
+Summary: Cluster File System
+Name: @PACKAGE_NAME@
+Version: @PACKAGE_VERSION@
+Release: %{release}
+License: GPLv3+
+Group: System Environment/Base
+Vendor: Gluster Inc
+Packager: @PACKAGE_BUGREPORT@
+URL: http://www.gluster.org/docs/index.php/GlusterFS
+Source0: ftp://ftp.gluster.com/pub/gluster/glusterfs/@PACKAGE_VERSION@/@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
-%define _init_enable()  /sbin/chkconfig --add %1 ;
-%define _init_disable() /sbin/chkconfig --del %1 ;
-%define _init_restart() /sbin/service %1 condrestart &>/dev/null ;
-%define _init_stop()    /sbin/service %1 stop &>/dev/null ;
-%define _init_install() %{__install} -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 ;
-# can't seem to make a generic macro that works
-%define _init_glusterd   %{_sysconfdir}/init.d/glusterd
-%define _init_glusterfsd %{_sysconfdir}/init.d/glusterfsd
-%endif
-
-Requires:         %{name}-libs = %{version}-%{release}
-BuildRequires:    bison flex
-BuildRequires:    gcc make automake libtool
-BuildRequires:    ncurses-devel readline-devel
-BuildRequires:    libxml2-devel openssl-devel
-BuildRequires:    libaio-devel
-BuildRequires:    python-devel
-BuildRequires:    python-ctypes
-%if ( 0%{!?_without_systemtap:1} )
-BuildRequires:    systemtap-sdt-devel
-%endif
-%if ( 0%{!?_without_bd:1} )
-BuildRequires:    lvm2-devel
-%endif
-%if ( 0%{!?_without_qemu_block:1} )
-BuildRequires:    glib2-devel
-%endif
-
-Obsoletes:        hekafs <= 0.7
-Obsoletes:        %{name}-libs <= 2.0.0
-Obsoletes:        %{name}-common < %{version}-%{release}
-Obsoletes:        %{name}-core < %{version}-%{release}
-Provides:         %{name}-libs = %{version}-%{release}
-Provides:         %{name}-common = %{version}-%{release}
-Provides:         %{name}-core = %{version}-%{release}
 
-# We do not want to generate useless provides and requires for xlator .so files
-# Filter all generated:
-#
-# TODO: RHEL5 does not have a convenient solution
-%if ( 0%{?rhel} == 6 )
-    # filter_setup exists in RHEL6 only
-    %filter_provides_in %{_libdir}/glusterfs/%{version}/
-    %global __filter_from_req %{?__filter_from_req} | %{__grep} -v -P '^(?!lib).*\.so.*$'
-    %filter_setup
-%else
-    # modern rpm and current Fedora do not generate requires if the provides
-    # are filtered
-    %global __provides_exclude_from ^%{_libdir}/glusterfs/%{version}/.*$
-%endif
-
-%if ( 0%{?rhel} && 0%{?rhel} < 6 )
-   # _sharedstatedir is not provided by RHEL5
-   %define _sharedstatedir /var/lib
-%endif
+BuildRequires: bison flex
+BuildRequires: gcc make
+%define _prefix /opt/%{name}/%{version}
 
 %description
 GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
-or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
-terms of features and extensibility.  It borrows a powerful concept
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package includes the glusterfs binary, the glusterfsd daemon and the
-gluster command line, libglusterfs and glusterfs translator modules common to
-both GlusterFS server and client framework.
-
-%package libs
-Summary:          GlusterFS common libraries
-Group:            Applications/File
-%if ( 0%{!?_without_syslog:1} )
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
-Requires:         rsyslog-mmjsonparse
-%endif
-%if ( 0%{?rhel} && 0%{?rhel} == 6 )
-Requires:         rsyslog-mmcount
-%endif
-%endif
-
-%description libs
-GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
+peta-bytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
+system. GlusterFS is one of the most sophisticated file system in
 terms of features and extensibility.  It borrows a powerful concept
 called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package provides the base GlusterFS libraries
+is in userspace and easily manageable.
 
-%package cli
-Summary:          GlusterFS CLI
-Group:            Applications/File
-Requires:         %{name}-libs = %{version}-%{release}
+%package core
+Summary: GlusterFS common files for both the client and the server
+Group: System Environment/Libraries
+Obsoletes: glusterfs-libs <= 2.0.0 glusterfs-common < 3.1.0 glusterfs-server < 3.1.0
+Provides: glusterfs-libs = %{version}-%{release}
 
-%description cli
+%description core
 GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
+peta-bytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
+system. GlusterFS is one of the most sophisticated file system in
 terms of features and extensibility.  It borrows a powerful concept
 called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
+is in userspace and easily manageable.
 
-This package provides the GlusterFS CLI application and its man page
+This package includes the glusterfs binary, the glusterd daemon and the gluster
+command line, libglusterfs and glusterfs translator modules common to both
+GlusterFS server and client framework.
 
-%if ( 0%{!?_without_rdma:1} )
+%if 0%{!?_without_rdma:1}
 %package rdma
-Summary:          GlusterFS rdma support for ib-verbs
-Group:            Applications/File
-BuildRequires:    libibverbs-devel
-BuildRequires:    librdmacm-devel
-Requires:         %{name} = %{version}-%{release}
+Summary: GlusterFS rdma
+Group: Applications/File
+Requires: glusterfs-core >= %{version}-%{release}
+BuildRequires: libibverbs-devel
 
 %description rdma
 GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
+peta-bytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
+system. GlusterFS is one of the most sophisticated file system in
 terms of features and extensibility.  It borrows a powerful concept
 called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
+is in userspace and easily manageable.
 
 This package provides support to ib-verbs library.
 %endif
 
-%if ( 0%{!?_without_georeplication:1} )
+%if 0%{!?_without_georeplication:1}
 %package geo-replication
-Summary:          GlusterFS Geo-replication
-Group:            Applications/File
-Requires:         %{name} = %{version}-%{release}
-Requires:         %{name}-server = %{version}-%{release}
+Summary: GlusterFS Geo-replication
+Group: Applications/File
+Requires: glusterfs-core >= %{version}-%{release} , python-ctypes , rsync >= 3.0.0
 
 %description geo-replication
 GlusterFS is a clustered file-system capable of scaling to several
@@ -278,896 +105,168 @@ This package provides support to geo-replication.
 %endif
 
 %package fuse
-Summary:          Fuse client
-Group:            Applications/File
-BuildRequires:    fuse-devel
-
-Requires:         %{name} = %{version}-%{release}
-
-Obsoletes:        %{name}-client < %{version}-%{release}
-Provides:         %{name}-client = %{version}-%{release}
+Summary: GlusterFS Fuse
+Group: Applications/File
+Requires: glusterfs-core >= %{version}-%{release}
+Obsoletes: glusterfs-client < 3.1.0
 
 %description fuse
 GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
+peta-bytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
+system. GlusterFS is one of the most sophisticated file system in
 terms of features and extensibility.  It borrows a powerful concept
 called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
+is in userspace and easily manageable.
 
 This package provides support to FUSE based clients.
 
-%package server
-Summary:          Clustered file-system server
-Group:            System Environment/Daemons
-Requires:         %{name} = %{version}-%{release}
-Requires:         %{name}-cli = %{version}-%{release}
-Requires:         %{name}-libs = %{version}-%{release}
-Requires:         %{name}-fuse = %{version}-%{release}
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
-Requires:         rpcbind
-%else
-Requires:         portmap
-%endif
-
-%description server
-GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
-or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
-terms of features and extensibility.  It borrows a powerful concept
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package provides the glusterfs server daemon.
-
-%package api
-Summary:          Clustered file-system api library
-Group:            System Environment/Daemons
-Requires:         %{name} = %{version}-%{release}
-Requires:         %{name}-devel = %{version}-%{release}
-# we provide the Python package/namespace 'gluster'
-Provides:         python-gluster = %{version}-%{release}
-
-%description api
-GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
-or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
-terms of features and extensibility.  It borrows a powerful concept
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package provides the glusterfs libgfapi library.
-
-%if ( 0%{!?_without_ocf:1} )
-%package resource-agents
-Summary:          OCF Resource Agents for GlusterFS
-License:          GPLv3+
-%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) )
-# EL5 does not support noarch sub-packages
-BuildArch:        noarch
-%endif
-# this Group handling comes from the Fedora resource-agents package
-%if ( 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} )
-Group:            System Environment/Base
-%else
-Group:            Productivity/Clustering/HA
-%endif
-# for glusterd
-Requires:         glusterfs-server
-# depending on the distribution, we need pacemaker or resource-agents
-Requires:         %{_prefix}/lib/ocf/resource.d
-
-%description resource-agents
-GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
-or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
-terms of features and extensibility.  It borrows a powerful concept
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package provides the resource agents which plug glusterd into
-Open Cluster Framework (OCF) compliant cluster resource managers,
-like Pacemaker.
-%endif
-
-%package devel
-Summary:          Development Libraries
-Group:            Development/Libraries
-Requires:         %{name} = %{version}-%{release}
-
-%description devel
-GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
-or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
-terms of features and extensibility.  It borrows a powerful concept
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package provides the development libraries and include files.
-
-%package api-devel
-Summary:          Development Libraries
-Group:            Development/Libraries
-Requires:         %{name} = %{version}-%{release}
-Requires:         %{name}-devel = %{version}-%{release}
-
-%description api-devel
-GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
-or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
-terms of features and extensibility.  It borrows a powerful concept
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package provides the api include files.
-
-%package regression-tests
-Summary:          Development Tools
-Group:            Development/Tools
-Requires:         %{name} = %{version}-%{release}
-Requires:         %{name}-fuse = %{version}-%{release}
-Requires:         %{name}-server = %{version}-%{release}
-Requires:         perl(App::Prove) perl(Test::Harness) gcc util-linux-ng lvm2
-Requires:         python attr dbench git nfs-utils xfsprogs
-
-%description regression-tests
-The Gluster Test Framework, is a suite of scripts used for
-regression testing of Gluster.
-
 %prep
-%setup -q -n %{name}-%{version}%{?prereltag}
-%if ( 0%{_for_fedora_koji_builds} )
-#%patch0 -p0
-%patch1 -p0 -F4
-%if ( "%{version}" == "3.3.1" )
-%patch2 -p1
-%endif
-%endif
+%setup -q -n %{name}-%{version}
 
 %build
-./autogen.sh
-%configure \
-        %{?_without_rdma} \
-        %{?_without_epoll} \
-        %{?_without_fusermount} \
-        %{?_without_georeplication} \
-        %{?_without_ocf} \
-        %{?_without_syslog} \
-        %{?_without_bd} \
-        %{?_without_qemu_block} \
-        %{?_without_systemtap}
 
-# fix hardening and remove rpath in shlibs
-%if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
-%{__sed} -i 's| \\\$compiler_flags |&\\\$LDFLAGS |' libtool
-%endif
-%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|' libtool
-%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|' libtool
+%configure %{?_without_rdma} %{?_without_epoll} %{?_with_fusermount} %{?_without_georeplication}
 
+# Remove rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 
-pushd api/examples
-FLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-popd
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-# install the gfapi Python library in /usr/lib/python*/site-packages
-pushd api/examples
-%{__python} setup.py install --skip-build --verbose --root %{buildroot}
-popd
-# Install include directory
+%{__mkdir_p} %{buildroot}/usr/sbin
+%{__mkdir_p} %{buildroot}/usr/local/libexec/glusterfs
+%{__ln_s} ../..%{_sbindir}/glusterd %{buildroot}/usr/sbin/glusterd
+%{__ln_s} ../..%{_sbindir}/glusterfsd %{buildroot}/usr/sbin/glusterfsd
+%{__ln_s} ../..%{_sbindir}/gluster %{buildroot}/usr/sbin/gluster
+%{__ln_s} ../..%{_sbindir}/glusterfs %{buildroot}/usr/sbin/glusterfs
+%{__ln_s} %{_libexecdir}/glusterfs/gsyncd %{buildroot}/usr/local/libexec/glusterfs/gsyncd
 %{__mkdir_p} %{buildroot}%{_includedir}/glusterfs
+%{__mkdir_p} %{buildroot}/var/log/glusterfs
 %{__install} -p -m 0644 libglusterfs/src/*.h \
     %{buildroot}%{_includedir}/glusterfs/
-%{__install} -p -m 0644 contrib/uuid/*.h \
-    %{buildroot}%{_includedir}/glusterfs/
-# Following needed by hekafs multi-tenant translator
-%{__mkdir_p} %{buildroot}%{_includedir}/glusterfs/rpc
-%{__install} -p -m 0644 rpc/rpc-lib/src/*.h \
-    %{buildroot}%{_includedir}/glusterfs/rpc/
-%{__install} -p -m 0644 rpc/xdr/src/*.h \
-    %{buildroot}%{_includedir}/glusterfs/rpc/
-%{__mkdir_p} %{buildroot}%{_includedir}/glusterfs/server
-%{__install} -p -m 0644 xlators/protocol/server/src/*.h \
-    %{buildroot}%{_includedir}/glusterfs/server/
-%if ( 0%{_for_fedora_koji_builds} )
-%{__install} -D -p -m 0644 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/sysconfig/glusterd
-%{__install} -D -p -m 0644 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
-%else
-%{__install} -D -p -m 0644 extras/glusterd-sysconfig \
-    %{buildroot}%{_sysconfdir}/sysconfig/glusterd
-%endif
-
-%if ( 0%{_for_fedora_koji_builds} )
-%if ( 0%{?rhel} && 0%{?rhel} <= 5 )
-%{__install} -D -p -m 0755 %{SOURCE6} \
-    %{buildroot}%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules
-%endif
-%endif
-
-%{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterd
-%{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterfs
-%{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterfsd
-%{__mkdir_p} %{buildroot}%{_localstatedir}/run/gluster
 
 # Remove unwanted files from all the shared libraries
-find %{buildroot}%{_libdir} -name '*.a' -delete
-find %{buildroot}%{_libdir} -name '*.la' -delete
-
-# Remove installed docs, they're included by %%doc
-%{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/
-head -50 ChangeLog > ChangeLog.head && mv ChangeLog.head ChangeLog
-cat << EOM >> ChangeLog
-
-More commit messages for this ChangeLog can be found at
-https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?prereltag}
-EOM
-
-# Remove benchmarking and other unpackaged files
-%{__rm} -rf %{buildroot}/benchmarking
-%{__rm} -f %{buildroot}/glusterfs-mode.el
-%{__rm} -f %{buildroot}/glusterfs.vim
-
-# Create working directory
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd
-
-# Update configuration file to /var/lib working directory
-sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sharedstatedir}/glusterd|g' \
-    %{buildroot}%{_sysconfdir}/glusterfs/glusterd.vol
-
-# Install glusterfsd .service or init.d file
-%if ( 0%{_for_fedora_koji_builds} )
-%_init_install %{glusterfsd_service} glusterfsd
-%endif
-
-%if ( 0%{_for_fedora_koji_builds} )
-# Client logrotate entry
-%{__install} -D -p -m 0644 %{SOURCE3} \
-    %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-fuse
+find %{buildroot}%{_libdir} -name '*.la' | xargs rm -f
+find %{buildroot}%{_libdir} -name '*.a' | xargs rm -f
 
-# Server logrotate entry
-%{__install} -D -p -m 0644 %{SOURCE4} \
-    %{buildroot}%{_sysconfdir}/logrotate.d/glusterd
-# Legacy server logrotate entry
-%{__install} -D -p -m 0644 %{SOURCE5} \
-    %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
+#update  /etc/ld.so.conf.d
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/ld.so.conf.d
+%ifarch x86_64
+echo "%{_prefix}/lib64" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/glusterfs.conf
 %else
-%{__install} -D -p -m 0644 extras/glusterfs-logrotate \
-    %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
+echo "%{_prefix}/lib" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/glusterfs.conf
 %endif
 
-%if ( 0%{!?_without_georeplication:1} )
-# geo-rep ghosts
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
-touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
-%{__install} -D -p -m 0644 extras/glusterfs-georep-logrotate \
-    %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep
-%endif
+%clean
+%{__rm} -rf %{buildroot}
 
-%if ( 0%{!?_without_syslog:1} )
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
-%{__install} -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \
-    %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
-%endif
+%post core
+/sbin/ldconfig
+/sbin/chkconfig --add glusterd
 
-%if ( 0%{?rhel} && 0%{?rhel} == 6 )
-%{__install} -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \
-    %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
-%endif
 
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
-%{__install} -D -p -m 0644 extras/logger.conf.example \
-    %{buildroot}%{_sysconfdir}/glusterfs/logger.conf.example
-%endif
-%endif
+/sbin/ldconfig
 
-# the rest of the ghosts
-touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
-touch %{buildroot}%{_sharedstatedir}/glusterd/options
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/glustershd
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/peers
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/vols
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/groups
-%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/nfs/run
-touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol
-touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid
+if [ -d /etc/glusterd/vols ]; then
+#for each dir under vols, backup non-fuse .vol files  as .Vol.old
+for file in `find /etc/glusterd/vols -type f ! -name *-fuse.vol `;
+do
+grep ".vol" $file &> /dev/null && fname=`basename $file .vol` && dname=`dirname $file` && cp $file $dname/$fname.Vol.old
+done
+fi
 
-find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs
+pidof -c -o %PPID -x glusterd &> /dev/null
+if [ $? -eq 0 ];
+then
+kill -9 `pgrep -f gsyncd.py` &> /dev/null
 
-%clean
-%{__rm} -rf %{buildroot}
+killall glusterd glusterfsd &> /dev/null
+# add marker translator
+glusterd --xlator-option *.upgrade=on
+else
+glusterd --xlator-option *.upgrade=on
+sleep 10
+killall glusterd &> /dev/null
+fi
 
-%post
-/sbin/ldconfig
-%if ( 0%{!?_without_syslog:1} )
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
-%_init_restart rsyslog
-%endif
-%endif
+%postun core
+/sbin/ldconfig -n %{_libdir}
 
-%postun
-/sbin/ldconfig
-%if ( 0%{!?_without_syslog:1} )
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
-%_init_restart rsyslog
-%endif
-%endif
+%preun core
+if [ $1 -eq 0 ]; then
+    /sbin/chkconfig --del glusterd
+fi
 
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS
-%config(noreplace) %{_sysconfdir}/logrotate.d/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
-%if ( 0%{!?_without_syslog:1} )
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
-%{_sysconfdir}/rsyslog.d/gluster.conf.example
-%endif
+%files core
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS
+%doc %{_datadir}/doc/glusterfs
+%if 0%{?_with_fusermount:1}
+%{_bindir}/fusermount-glusterfs
 %endif
 %{_libdir}/glusterfs
-%{_sbindir}/glusterfs*
-%{_mandir}/man8/*gluster*.8*
-%exclude %{_mandir}/man8/gluster.8*
-%dir %{_localstatedir}/log/glusterfs
-%dir %{_localstatedir}/run/gluster
-%dir %{_sharedstatedir}/glusterd
-%if ( 0%{!?_without_rdma:1} )
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
-%endif
-# server-side, etc., xlators in other RPMs
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api*
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse*
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage*
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt*
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
-# sample xlators not generally used or usable
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13*
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/mac-compat*
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache*
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-%files libs
 %{_libdir}/*.so.*
-%exclude %{_libdir}/libgfapi.*
-
-%files cli
+%{_sbindir}/glusterfs*
 %{_sbindir}/gluster
-%{_mandir}/man8/gluster.8*
+%{_sbindir}/glusterd
+/usr/sbin
+%{_mandir}/man8/*glusterfs.8*
+%{_mandir}/man8/*glusterfsd.8*
+%{_mandir}/man8/*gluster.8*
+%{_mandir}/man8/*glusterd.8*
+%dir /var/log/glusterfs
+%if 0%{!?_without_rdma:1}
+%exclude %{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
+%endif
+%exclude %{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
+%config %{_sysconfdir}/glusterfs
+%{_sysconfdir}/init.d/glusterd
+%{_includedir}/glusterfs
+%exclude %{_includedir}/glusterfs/y.tab.h
+%{_sysconfdir}/ld.so.conf.d/glusterfs.conf
+%{_libdir}/*.so
+%exclude %{_libexecdir}/glusterfs/gsyncd
+%exclude %{_libexecdir}/glusterfs/python/syncdaemon/*
+%exclude /usr/local/libexec/glusterfs/gsyncd
 
-%if ( 0%{!?_without_rdma:1} )
+%if 0%{!?_without_rdma:1}
 %files rdma
-%defattr(-,root,root,-)
-%{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
+%defattr(-,root,root)
+%{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
 %endif
 
-%if ( 0%{!?_without_georeplication:1} )
+%if 0%{!?_without_georeplication:1}
 %post geo-replication
 #restart glusterd.
-if [ $1 -ge 1 ]; then
-    %_init_restart glusterd
-fi
+/etc/init.d/glusterd restart &> /dev/null
+%endif
 
+%if 0%{!?_without_georeplication:1}
 %files geo-replication
 %defattr(-,root,root)
 %{_libexecdir}/glusterfs/gsyncd
 %{_libexecdir}/glusterfs/python/syncdaemon/*
-%{_libexecdir}/glusterfs/gverify.sh
-%{_libexecdir}/glusterfs/peer_add_secret_pub
-%{_libexecdir}/glusterfs/peer_gsec_create
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication
-%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
-%endif
-
-%files fuse
-%defattr(-,root,root,-)
-%if ( 0%{_for_fedora_koji_builds} )
-%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-fuse
-%endif
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse*
-/sbin/mount.glusterfs
-%if ( 0%{!?_without_fusermount:1} )
-%{_bindir}/fusermount-glusterfs
-%endif
-%if ( 0%{_for_fedora_koji_builds} )
-%if ( 0%{?rhel} && 0%{?rhel} <= 5 )
-%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules
-%endif
-%endif
-
-%files server
-%defattr(-,root,root,-)
-%doc extras/clear_xattrs.sh
-%if ( 0%{_for_fedora_koji_builds} )
-%config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
-%endif
-%config(noreplace) %{_sysconfdir}/sysconfig/glusterd
-%config(noreplace) %{_sysconfdir}/glusterfs
-# Legacy configs
-%if ( 0%{_for_fedora_koji_builds} )
-%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd
-%config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
+/usr/local/libexec/glusterfs/gsyncd
 %endif
-# init files
-%_init_glusterd
-%if ( 0%{_for_fedora_koji_builds} )
-%_init_glusterfsd
-%endif
-# binaries
-%{_sbindir}/glusterd
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
-%ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
-%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
-# This is really ugly, but I have no idea how to mark these directories in an
-# other way. They should belong to the glusterfs-server package, but don't
-# exist after installation. They are generated on the first start...
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/post
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/pre
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/pre
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/groups
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs
-%ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
-%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
-%ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
 
-%post api
-/sbin/ldconfig
-
-%postun api
-/sbin/ldconfig
 
-%files api
-%exclude %{_libdir}/*.so
-%{_libdir}/libgfapi.*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api*
-%{python_sitelib}/*
-
-%if ( 0%{!?_without_ocf:1} )
-%files resource-agents
+%files fuse
 %defattr(-,root,root)
-# /usr/lib is the standard for OCF, also on x86_64
-%{_prefix}/lib/ocf/resource.d/glusterfs
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/glusterfs
-%exclude %{_includedir}/glusterfs/y.tab.h
-%exclude %{_includedir}/glusterfs/api
-%exclude %{_libdir}/libgfapi.so
-%{_libdir}/*.so
-
-%files api-devel
-%{_libdir}/pkgconfig/glusterfs-api.pc
-%{_libdir}/pkgconfig/libgfchangelog.pc
-%{_libdir}/libgfapi.so
-%{_includedir}/glusterfs/api/*
-
-%files regression-tests
-%defattr(-,root,root,-)
-%{_prefix}/share/glusterfs/*
-%exclude %{_prefix}/share/glusterfs/tests/basic/rpm.t
-
-%post server
-# Legacy server
-%_init_enable glusterd
-%_init_enable glusterfsd
-
-# Genuine Fedora (and EPEL) builds never put gluster files in /etc; if
-# there are any files in /etc from a prior gluster.org install, move them
-# to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib
-# in gluster.org RPMs.) Be careful to copy them on the off chance that
-# /etc and /var/lib are on separate file systems
-if [ -d /etc/glusterd -a ! -h %{_sharedstatedir}/glusterd ]; then
-    %{__mkdir_p} %{_sharedstatedir}/glusterd
-    cp -a /etc/glusterd %{_sharedstatedir}/glusterd
-    rm -rf /etc/glusterd
-    ln -sf %{_sharedstatedir}/glusterd /etc/glusterd
-fi
-
-# Rename old volfiles in an RPM-standard way.  These aren't actually
-# considered package config files, so %config doesn't work for them.
-if [ -d %{_sharedstatedir}/glusterd/vols ]; then
-    for file in $(find %{_sharedstatedir}/glusterd/vols -name '*.vol'); do
-        newfile=${file}.rpmsave
-        echo "warning: ${file} saved as ${newfile}"
-        cp ${file} ${newfile}
-    done
-fi
-
-# add marker translator
-# but first make certain that there are no old libs around to bite us
-# BZ 834847
-if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then
-    rm -f /etc/ld.so.conf.d/glusterfs.conf
-    /sbin/ldconfig
-fi
-pidof -c -o %PPID -x glusterd &> /dev/null
-if [ $? -eq 0 ]; then
-    kill -9 `pgrep -f gsyncd.py` &> /dev/null
-
-    killall glusterd &> /dev/null
-    glusterd --xlator-option *.upgrade=on -N
-else
-    glusterd --xlator-option *.upgrade=on -N
-fi
-
-%preun server
-if [ $1 -eq 0 ]; then
-    if [ -f %_init_glusterfsd ]; then
-        %_init_stop glusterfsd
-    fi
-    %_init_stop glusterd
-    if [ -f %_init_glusterfsd ]; then
-        %_init_disable glusterfsd
-    fi
-    %_init_disable glusterd
-fi
-if [ $1 -ge 1 ]; then
-    if [ -f %_init_glusterfsd ]; then
-        %_init_restart glusterfsd
-    fi
-    %_init_restart glusterd
-fi
+%{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
+/sbin/mount.glusterfs
 
 %changelog
-* Wed Oct 11 2013 Harshavardhana <fharshav@redhat.com>
-- Add '_sharedstatedir' macro to `/var/lib` on <= RHEL5 (#1003184)
-
-* Wed Oct 9 2013 Kaleb S. KEITHLEY <kkeithle@redhat.com>
-- Sync with Fedora glusterfs.spec 3.4.1-2+
-
-* Wed Oct 9 2013 Niels de Vos <ndevos@redhat.com>
-- glusterfs-api-devel requires glusterfs-devel (#1016938, #1017094)
-
-* Mon Sep 30 2013 Niels de Vos <ndevos@redhat.com>
-- Package gfapi.py into the Python site-packages path (#1005146)
-
-* Tue Sep 17 2013 Harshavardhana <fharshav@redhat.com>
-- Provide a new package called "glusterfs-regression-tests" for standalone
-  regression testing.
-
-* Thu Aug 22 2013 Niels de Vos <ndevos@redhat.com>
-- Correct the day/date for some entries in this changelog (#1000019)
-
-* Wed Aug 7 2013 Kaleb S. KEITHLEY <kkeithle@redhat.com>
-- Sync with Fedora glusterfs.spec
--  add Requires
--  add -cli subpackage,
--  fix other minor differences with Fedora glusterfs.spec
-
-* Tue Jul 30 2013 Kaleb S. KEITHLEY <kkeithle@redhat.com>
-- Sync with Fedora glusterfs.spec, add glusterfs-libs RPM for oVirt/qemu-kvm
-
-* Thu Jul 25 2013 Csaba Henk <csaba@redhat.com>
-- Added peer_add_secret_pub and peer_gsec_create to %{_libexecdir}/glusterfs
-
-* Thu Jul 25 2013 Aravinda VK <avishwan@redhat.com>
-- Added gverify.sh to %{_libexecdir}/glusterfs directory.
-
-* Thu Jul 25 2013 Harshavardhana <fharshav@redhat.com>
-- Allow to build with '--without bd' to disable 'bd' xlator
-
-* Thu Jun 27 2013 Kaleb S. KEITHLEY <kkeithle@redhat.com>
-- fix the hardening fix for shlibs, use %%{__sed} macro, shorter ChangeLog
-
-* Wed Jun 26 2013 Niels de Vos <ndevos@redhat.com>
-- move the mount/api xlator to glusterfs-api
-
-* Fri Jun 7 2013 Kaleb S. KEITHLEY <kkeithle@redhat.com>
-- Sync with Fedora glusterfs.spec, remove G4S/UFO and Swift
-
-* Mon Mar 4 2013 Niels de Vos <ndevos@redhat.com>
-- Package /var/run/gluster so that statedumps can be created
-
-* Wed Feb 6 2013 Kaleb S. KEITHLEY <kkeithle@redhat.com>
-- Sync with Fedora glusterfs.spec
-
-* Tue Dec 11 2012 Filip Pytloun <filip.pytloun@gooddata.com>
-- add sysconfig file
-
-* Thu Oct 25 2012 Niels de Vos <ndevos@redhat.com>
-- Add a sub-package for the OCF resource agents
-
-* Wed Sep 05 2012 Niels de Vos <ndevos@redhat.com>
-- Don't use python-ctypes on SLES (from Jörg Petersen)
-
-* Tue Jul 10 2012 Niels de Vos <ndevos@redhat.com>
-- Include extras/clear_xattrs.sh in the glusterfs-server sub-package
-
-* Thu Jun 07 2012 Niels de Vos <ndevos@redhat.com>
-- Mark /var/lib/glusterd as owned by glusterfs, subdirs belong to -server
-
-* Wed May 9 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
-- Add BuildRequires: libxml2-devel so that configure will DTRT on for
-- Fedora's Koji build system
-
-* Wed Nov 9 2011 Joe Julian <me@joejulian.name> - git master
-- Merge fedora specfile into gluster's spec.in.
-- Add conditionals to allow the same spec file to be used for both 3.1 and 3.2
-- http://bugs.gluster.com/show_bug.cgi?id=2970
-
-* Wed Oct  5 2011 Joe Julian <me@joejulian.name> - 3.2.4-1
-- Update to 3.2.4
-- Removed the $local_fs requirement from the init scripts as in RHEL/CentOS that's provided
-- by netfs, which needs to be started after glusterd.
-
-* Sun Sep 25 2011 Joe Julian <me@joejulian.name> - 3.2.3-2
-- Merged in upstream changes
-- Fixed version reporting 3.2git
-- Added nfs init script (disabled by default)
-
-* Thu Sep  1 2011 Joe Julian <me@joejulian.name> - 3.2.3-1
-- Update to 3.2.3
-
-* Tue Jul 19 2011 Joe Julian <me@joejulian.name> - 3.2.2-3
-- Add readline and libtermcap dependencies
-
-* Tue Jul 19 2011 Joe Julian <me@joejulian.name> - 3.2.2-2
-- Critical patch to prevent glusterd from walking outside of its own volume during rebalance
-
-* Thu Jul 14 2011 Joe Julian <me@joejulian.name> - 3.2.2-1
-- Update to 3.2.2
-
-* Wed Jul 13 2011 Joe Julian <me@joejulian.name> - 3.2.1-2
-- fix hardcoded path to gsyncd in source to match the actual file location
-
-* Tue Jun 21 2011 Joe Julian <me@joejulian.name> - 3.2.1
-- Update to 3.2.1
-
-* Mon Jun 20 2011 Joe Julian <me@joejulian.name> - 3.1.5
-- Update to 3.1.5
-
-* Tue May 31 2011 Joe Julian <me@joejulian.name> - 3.1.5-qa1.4
-- Current git
-
-* Sun May 29 2011 Joe Julian <me@joejulian.name> - 3.1.5-qa1.2
-- set _sharedstatedir to /var/lib for FHS compliance in RHEL5/CentOS5
-- mv /etc/glusterd, if it exists, to the new state dir for upgrading from gluster packaging
-
-* Sat May 28 2011 Joe Julian <me@joejulian.name> - 3.1.5-qa1.1
-- Update to 3.1.5-qa1
-- Add patch to remove optimization disabling
-- Add patch to remove forced 64 bit compile
-- Obsolete glusterfs-core to allow for upgrading from gluster packaging
-
-* Sat Mar 19 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.3-1
-- Update to 3.1.3
-- Merge in more upstream SPEC changes
-- Remove patches from GlusterFS bugzilla #2309 and #2311
-- Remove inode-gen.patch
-
-* Sun Feb 06 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.2-3
-- Add back in legacy SPEC elements to support older branches
-
-* Thu Feb 03 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.2-2
-- Add patches from CloudFS project
-
-* Tue Jan 25 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.2-1
-- Update to 3.1.2
-
-* Wed Jan 5 2011 Dan Horák <dan[at]danny.cz> - 3.1.1-3
-- no InfiniBand on s390(x)
-
-* Sat Jan 1 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.1-2
-- Update to support readline
-- Update to not parallel build
-
-* Mon Dec 27 2010 Silas Sewell <silas@sewell.ch> - 3.1.1-1
-- Update to 3.1.1
-- Change package names to mirror upstream
-
-* Mon Dec 20 2010 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.0.7-1
-- Update to 3.0.7
-
-* Wed Jul 28 2010 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.0.5-1
-- Update to 3.0.x
-
-* Sat Apr 10 2010 Jonathan Steffan <jsteffan@fedoraproject.org> - 2.0.9-2
-- Move python version requires into a proper BuildRequires otherwise
-  the spec always turned off python bindings as python is not part
-  of buildsys-build and the chroot will never have python unless we
-  require it
-- Temporarily set -D_FORTIFY_SOURCE=1 until upstream fixes code
-  GlusterFS Bugzilla #197 (#555728)
-- Move glusterfs-volgen to devel subpackage (#555724)
-- Update description (#554947)
-
-* Sat Jan 2 2010 Jonathan Steffan <jsteffan@fedoraproject.org> - 2.0.9-1
-- Update to 2.0.9
-
-* Sun Nov 8 2009 Jonathan Steffan <jsteffan@fedoraproject.org> - 2.0.8-1
-- Update to 2.0.8
-- Remove install of glusterfs-volgen, it's properly added to
-  automake upstream now
-
-* Sat Oct 31 2009 Jonathan Steffan <jsteffan@fedoraproject.org> - 2.0.7-1
-- Update to 2.0.7
-- Install glusterfs-volgen, until it's properly added to automake
-  by upstream
-- Add macro to be able to ship more docs
-
-* Thu Sep 17 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.6-2
-- Rebuilt with new fuse
-
-* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.6-1
-- Update to 2.0.6.
-- No longer default to disable the client on RHEL5 (#522192).
-- Update spec file URLs.
-
-* Mon Jul 27 2009 Matthias Saou <http://freshrpms.net/> 2.0.4-1
-- Update to 2.0.4.
-
-* Thu Jun 11 2009 Matthias Saou <http://freshrpms.net/> 2.0.1-2
-- Remove libglusterfs/src/y.tab.c to fix koji F11/devel builds.
-
-* Sat May 16 2009 Matthias Saou <http://freshrpms.net/> 2.0.1-1
-- Update to 2.0.1.
-
-* Thu May  7 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-1
-- Update to 2.0.0 final.
-
-* Wed Apr 29 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.3.rc8
-- Move glusterfsd to common, since the client has a symlink to it.
-
-* Fri Apr 24 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.2.rc8
-- Update to 2.0.0rc8.
-
-* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.2.rc7
-- Update glusterfsd init script to the new style init.
-- Update files to match the new default vol file names.
-- Include logrotate for glusterfsd, use a pid file by default.
-- Include logrotate for glusterfs, using killall for lack of anything better.
-
-* Sat Apr 11 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.1.rc7
-- Update to 2.0.0rc7.
-- Rename "libs" to "common" and move the binary, man page and log dir there.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 2.0.0-0.1.rc1
-- Update to 2.0.0rc1.
-- Include new libglusterfsclient.h.
-
-* Mon Feb 16 2009 Matthias Saou <http://freshrpms.net/> 1.3.12-1
-- Update to 1.3.12.
-- Remove no longer needed ocreat patch.
-
-* Thu Jul 17 2008 Matthias Saou <http://freshrpms.net/> 1.3.10-1
-- Update to 1.3.10.
-- Remove mount patch, it's been included upstream now.
-
-* Fri May 16 2008 Matthias Saou <http://freshrpms.net/> 1.3.9-1
-- Update to 1.3.9.
-
-* Fri May  9 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-1
-- Update to 1.3.8 final.
-
-* Wed Apr 23 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-0.10
-- Include short patch to include fixes from latest TLA 751.
-
-* Tue Apr 22 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-0.9
-- Update to 1.3.8pre6.
-- Include glusterfs binary in both the client and server packages, now that
-  glusterfsd is a symlink to it instead of a separate binary.
-* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-0.8
-- Add python version check and disable bindings for version < 2.4.
-
-* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-0.7
-- Add --without client rpmbuild option, make it the default for RHEL (no fuse).
-  (I hope "rhel" is the proper default macro name, couldn't find it...)
-
-* Wed Jan 30 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-0.6
-- Add --without ibverbs rpmbuild option to the package.
-
-* Mon Jan 14 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-0.5
-- Update to current TLA again, patch-636 which fixes the known segfaults.
-
-* Thu Jan 10 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-0.4
-- Downgrade to glusterfs--mainline--2.5--patch-628 which is more stable.
-
-* Tue Jan  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.8-0.3
-- Update to current TLA snapshot.
-- Include umount.glusterfs wrapper script (really needed? dunno).
-- Include patch to mount wrapper to avoid multiple identical mounts.
-
-* Sun Dec 30 2007 Matthias Saou <http://freshrpms.net/> 1.3.8-0.1
-- Update to current TLA snapshot, which includes "volume-name=" fstab option.
-
-* Mon Dec  3 2007 Matthias Saou <http://freshrpms.net/> 1.3.7-6
-- Re-add the /var/log/glusterfs directory in the client sub-package (required).
-- Include custom patch to support vol= in fstab for -n glusterfs client option.
-
-* Mon Nov 26 2007 Matthias Saou <http://freshrpms.net/> 1.3.7-4
-- Re-enable libibverbs.
-- Check and update License field to GPLv3+.
-- Add glusterfs-common obsoletes, to provide upgrade path from old packages.
-- Include patch to add mode to O_CREATE opens.
-
-* Thu Nov 22 2007 Matthias Saou <http://freshrpms.net/> 1.3.7-3
-- Remove Makefile* files from examples.
-- Include RHEL/Fedora type init script, since the included ones don't do.
-
-* Wed Nov 21 2007 Matthias Saou <http://freshrpms.net/> 1.3.7-1
-- Major spec file cleanup.
-- Add missing %%clean section.
-- Fix ldconfig calls (weren't set for the proper sub-package).
-
-* Sat Aug 4 2007 Matt Paine <matt@mattsoftware.com> - 1.3.pre7
-- Added support to build rpm without ibverbs support (use --without ibverbs
-  switch)
-
-* Sun Jul 15 2007 Matt Paine <matt@mattsoftware.com> - 1.3.pre6
-- Initial spec file
+* Wed Jul 01 2009 Harshavardhana <harsha@gluster.com> - 2.1
+- Removed mod_glusterfs.so and added new --without epoll build
+  option.
+
+* Thu Apr 16 2009 Harshavardhana <harsha@gluster.com> - 2.0
+- Galore of updates including new packages added common,
+  client,server splitting the original package. rpmbuild
+  fully restructured to adhere to Fedora rpm standards.
+  Older changelog removed as there were warnings when
+  tried with 'rpmlint'.
diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am
index 05a10dee3..17d7a4a81 100644
--- a/glusterfsd/src/Makefile.am
+++ b/glusterfsd/src/Makefile.am
@@ -4,17 +4,15 @@ glusterfsd_SOURCES = glusterfsd.c glusterfsd-mgmt.c
 glusterfsd_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
 	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
-	$(GF_LDADD) $(GF_GLUSTERFS_LIBS)
-glusterfsd_LDFLAGS = $(GF_LDFLAGS)
+	$(GF_LDADD)
+glusterfsd_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS)
 noinst_HEADERS = glusterfsd.h glusterfsd-mem-types.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) \
+AM_CFLAGS = -fPIC -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
 	-I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" \
-	-DCONFDIR=\"$(sysconfdir)/glusterfs\" \
+	-DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS) \
 	-I$(top_srcdir)/rpc/rpc-lib/src -I$(top_srcdir)/rpc/xdr/src
 
-AM_CFLAGS = -Wall $(GF_GLUSTERFS_CFLAGS)
-
 CLEANFILES = 
 
 $(top_builddir)/libglusterfs/src/libglusterfs.la:
@@ -26,9 +24,7 @@ uninstall-local:
 
 install-data-local:
 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run
-	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run/gluster
 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs
-	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
 	rm -f $(DESTDIR)$(sbindir)/glusterfs
 	rm -f $(DESTDIR)$(sbindir)/glusterd
 	ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
diff --git a/glusterfsd/src/glusterfsd-mem-types.h b/glusterfsd/src/glusterfsd-mem-types.h
index 7135c0ada..7f953d1ff 100644
--- a/glusterfsd/src/glusterfsd-mem-types.h
+++ b/glusterfsd/src/glusterfsd-mem-types.h
@@ -1,12 +1,22 @@
 /*
-  Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #ifndef __GLUSTERFSD_MEM_TYPES_H__
 #define __GLUSTERFSD_MEM_TYPES_H__
 
@@ -17,7 +27,6 @@
 enum gfd_mem_types_ {
         gfd_mt_xlator_list_t = GF_MEM_TYPE_START,
         gfd_mt_xlator_t,
-        gfd_mt_server_cmdline_t,
         gfd_mt_xlator_cmdline_option_t,
         gfd_mt_char,
         gfd_mt_call_pool_t,
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index f4445acf6..938920637 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -1,17 +1,26 @@
 /*
-   Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <stdlib.h>
-#include <signal.h>
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -27,60 +36,48 @@
 #include "rpc-clnt.h"
 #include "protocol-common.h"
 #include "glusterfs3.h"
-#include "portmap-xdr.h"
-#include "xdr-generic.h"
+#include "portmap.h"
+#include "glusterd1.h"
 
 #include "glusterfsd.h"
 #include "rpcsvc.h"
-#include "cli1-xdr.h"
-#include "statedump.h"
-#include "syncop.h"
-#include "xlator.h"
 
-static gf_boolean_t is_mgmt_rpc_reconnect = _gf_false;
+static char is_mgmt_rpc_reconnect;
+
+typedef ssize_t (*mgmt_serialize_t) (struct iovec outmsg, void *args);
+typedef ssize_t (*gf_serialize_t) (struct iovec outmsg, void *args);
+
+
 
 int glusterfs_mgmt_pmap_signin (glusterfs_ctx_t *ctx);
 int glusterfs_volfile_fetch (glusterfs_ctx_t *ctx);
 int glusterfs_process_volfp (glusterfs_ctx_t *ctx, FILE *fp);
-int glusterfs_graph_unknown_options (glusterfs_graph_t *graph);
-int emancipate(glusterfs_ctx_t *ctx, int ret);
 
 int
-mgmt_cbk_spec (struct rpc_clnt *rpc, void *mydata, void *data)
+mgmt_cbk_spec (void *data)
 {
         glusterfs_ctx_t *ctx = NULL;
-        xlator_t *this = NULL;
 
-        this = mydata;
-        ctx = glusterfsd_ctx;
+        ctx = glusterfs_ctx_get ();
         gf_log ("mgmt", GF_LOG_INFO, "Volume file changed");
 
         glusterfs_volfile_fetch (ctx);
         return 0;
 }
 
-
-int
-mgmt_cbk_event (struct rpc_clnt *rpc, void *mydata, void *data)
-{
-        return 0;
-}
-
 struct iobuf *
 glusterfs_serialize_reply (rpcsvc_request_t *req, void *arg,
-                           struct iovec *outmsg, xdrproc_t xdrproc)
+                           gf_serialize_t sfunc, struct iovec *outmsg)
 {
         struct iobuf            *iob = NULL;
         ssize_t                  retlen = -1;
-        ssize_t                  xdr_size = 0;
 
         /* First, get the io buffer into which the reply in arg will
          * be serialized.
          */
-        xdr_size = xdr_sizeof (xdrproc, arg);
-        iob = iobuf_get2 (req->svc->ctx->iobuf_pool, xdr_size);
+        iob = iobuf_get (req->svc->ctx->iobuf_pool);
         if (!iob) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to get iobuf");
+                gf_log ("", GF_LOG_ERROR, "Failed to get iobuf");
                 goto ret;
         }
 
@@ -91,15 +88,16 @@ glusterfs_serialize_reply (rpcsvc_request_t *req, void *arg,
         /* retlen is used to received the error since size_t is unsigned and we
          * need -1 for error notification during encoding.
          */
-        retlen = xdr_serialize_generic (*outmsg, arg, xdrproc);
+        retlen = sfunc (*outmsg, arg);
         if (retlen == -1) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to encode message");
+                gf_log ("", GF_LOG_ERROR, "Failed to encode message");
                 goto ret;
         }
 
         outmsg->iov_len = retlen;
 ret:
         if (retlen == -1) {
+                iobuf_unref (iob);
                 iob = NULL;
         }
 
@@ -109,7 +107,7 @@ ret:
 int
 glusterfs_submit_reply (rpcsvc_request_t *req, void *arg,
                         struct iovec *payload, int payloadcount,
-                        struct iobref *iobref, xdrproc_t xdrproc)
+                        struct iobref *iobref, gf_serialize_t sfunc)
 {
         struct iobuf           *iob        = NULL;
         int                     ret        = -1;
@@ -121,23 +119,25 @@ glusterfs_submit_reply (rpcsvc_request_t *req, void *arg,
                 goto out;
         }
 
+
         if (!iobref) {
                 iobref = iobref_new ();
                 if (!iobref) {
-                        gf_log (THIS->name, GF_LOG_ERROR, "out of memory");
+                        gf_log ("", GF_LOG_ERROR, "out of memory");
                         goto out;
                 }
 
                 new_iobref = 1;
         }
 
-        iob = glusterfs_serialize_reply (req, arg, &rsp, xdrproc);
+        iob = glusterfs_serialize_reply (req, arg, sfunc, &rsp);
         if (!iob) {
-                gf_log_callingfn (THIS->name, GF_LOG_ERROR, "Failed to serialize reply");
-        } else {
-                iobref_add (iobref, iob);
+                gf_log ("", GF_LOG_ERROR, "Failed to serialize reply");
+                goto out;
         }
 
+        iobref_add (iobref, iob);
+
         ret = rpcsvc_submit_generic (req, &rsp, 1, payload, payloadcount,
                                      iobref);
 
@@ -145,18 +145,18 @@ glusterfs_submit_reply (rpcsvc_request_t *req, void *arg,
          * we can safely unref the iob in the hope that RPC layer must have
          * ref'ed the iob on receiving into the txlist.
          */
+        iobuf_unref (iob);
         if (ret == -1) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Reply submission failed");
+                gf_log ("", GF_LOG_ERROR, "Reply submission failed");
                 goto out;
         }
 
         ret = 0;
 out:
-        if (iob)
-                iobuf_unref (iob);
 
-        if (new_iobref && iobref)
+        if (new_iobref) {
                 iobref_unref (iobref);
+        }
 
         return ret;
 }
@@ -175,23 +175,52 @@ glusterfs_terminate_response_send (rpcsvc_request_t *req, int op_ret)
 
         if (dict)
                 ret = dict_allocate_and_serialize (dict, &rsp.output.output_val,
-                                                   &rsp.output.output_len);
+                                                (size_t *)&rsp.output.output_len);
 
 
         if (ret == 0)
                 ret = glusterfs_submit_reply (req, &rsp, NULL, 0, NULL,
-                                              (xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
+                                              gd_xdr_serialize_mgmt_brick_op_rsp);
 
-        GF_FREE (rsp.output.output_val);
+        if (rsp.output.output_val)
+                GF_FREE (rsp.output.output_val);
         if (dict)
                 dict_unref (dict);
         return ret;
 }
 
 int
+glusterfs_listener_stop (void)
+{
+        glusterfs_ctx_t  *ctx = NULL;
+        cmd_args_t       *cmd_args = NULL;
+        int              ret = 0;
+        xlator_t         *this = NULL;
+
+        ctx = glusterfs_ctx_get ();
+        GF_ASSERT (ctx);
+        cmd_args = &ctx->cmd_args;
+        if (cmd_args->sock_file) {
+                ret = unlink (cmd_args->sock_file);
+                if (ret && (ENOENT == errno)) {
+                        ret = 0;
+                }
+        }
+
+        if (ret) {
+                this = THIS;
+                gf_log (this->name, GF_LOG_ERROR, "Failed to unlink linstener "
+                        "socket %s, error: %s", cmd_args->sock_file,
+                        strerror (errno));
+        }
+        return ret;
+}
+
+int
 glusterfs_handle_terminate (rpcsvc_request_t *req)
 {
 
+        (void) glusterfs_listener_stop ();
         glusterfs_terminate_response_send (req, 0);
         cleanup_and_exit (SIGTERM);
         return 0;
@@ -202,452 +231,30 @@ glusterfs_translator_info_response_send (rpcsvc_request_t *req, int ret,
                                          char *msg, dict_t *output)
 {
         gd1_mgmt_brick_op_rsp    rsp = {0,};
-        gf_boolean_t             free_ptr = _gf_false;
+        GF_ASSERT (msg);
         GF_ASSERT (req);
+        GF_ASSERT (output);
 
         rsp.op_ret = ret;
         rsp.op_errno = 0;
-        if (ret && msg && msg[0])
-                rsp.op_errstr = msg;
-        else
-                rsp.op_errstr = "";
-
-        ret = -1;
-        if (output) {
-                ret = dict_allocate_and_serialize (output,
-                                                   &rsp.output.output_val,
-                                                   &rsp.output.output_len);
-        }
-        if (!ret)
-                free_ptr = _gf_true;
-
-        glusterfs_submit_reply (req, &rsp, NULL, 0, NULL,
-                                (xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
-        ret = 0;
-        if (free_ptr)
-                GF_FREE (rsp.output.output_val);
-        return ret;
-}
-
-int
-glusterfs_xlator_op_response_send (rpcsvc_request_t *req, int op_ret,
-                                   char *msg, dict_t *output)
-{
-        gd1_mgmt_brick_op_rsp    rsp = {0,};
-        int                      ret = -1;
-        gf_boolean_t             free_ptr = _gf_false;
-        GF_ASSERT (req);
-
-        rsp.op_ret = op_ret;
-        rsp.op_errno = 0;
-        if (op_ret && msg && msg[0])
+        if (ret && msg[0])
                 rsp.op_errstr = msg;
         else
                 rsp.op_errstr = "";
 
-        if (output) {
-                ret = dict_allocate_and_serialize (output,
-                                                   &rsp.output.output_val,
-                                                   &rsp.output.output_len);
-        }
-        if (!ret)
-                free_ptr = _gf_true;
+        ret = dict_allocate_and_serialize (output, &rsp.output.output_val,
+                                        (size_t *)&rsp.output.output_len);
 
         ret = glusterfs_submit_reply (req, &rsp, NULL, 0, NULL,
-                                     (xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
-
-        if (free_ptr)
+                                     gd_xdr_serialize_mgmt_brick_op_rsp);
+        if (rsp.output.output_val)
                 GF_FREE (rsp.output.output_val);
-
         return ret;
 }
 
 int
 glusterfs_handle_translator_info_get (rpcsvc_request_t *req)
 {
-        int32_t                 ret     = -1;
-        gd1_mgmt_brick_op_req   xlator_req = {0,};
-        dict_t                  *dict    = NULL;
-        xlator_t                *this = NULL;
-        gf1_cli_top_op          top_op = 0;
-        uint32_t                blk_size = 0;
-        uint32_t                blk_count = 0;
-        double                  time = 0;
-        double                  throughput = 0;
-        xlator_t                *any = NULL;
-        xlator_t                *xlator = NULL;
-        glusterfs_graph_t       *active = NULL;
-        glusterfs_ctx_t         *ctx = NULL;
-        char                    msg[2048] = {0,};
-        dict_t                  *output = NULL;
-
-        GF_ASSERT (req);
-        this = THIS;
-        GF_ASSERT (this);
-
-        ret = xdr_to_generic (req->msg[0], &xlator_req,
-                              (xdrproc_t)xdr_gd1_mgmt_brick_op_req);
-        if (ret < 0) {
-                //failed to decode msg;
-                req->rpc_err = GARBAGE_ARGS;
-                goto out;
-        }
-
-        dict = dict_new ();
-        ret = dict_unserialize (xlator_req.input.input_val,
-                                xlator_req.input.input_len,
-                                &dict);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to "
-                        "unserialize req-buffer to dictionary");
-                goto out;
-        }
-
-        ret = dict_get_int32 (dict, "top-op", (int32_t *)&top_op);
-        if ((!ret) && (GF_CLI_TOP_READ_PERF == top_op ||
-            GF_CLI_TOP_WRITE_PERF == top_op)) {
-                ret = dict_get_uint32 (dict, "blk-size", &blk_size);
-                if (ret)
-                        goto cont;
-                ret = dict_get_uint32 (dict, "blk-cnt", &blk_count);
-                if (ret)
-                        goto cont;
-
-                if (GF_CLI_TOP_READ_PERF == top_op) {
-                        ret = glusterfs_volume_top_read_perf
-                                (blk_size, blk_count, xlator_req.name,
-                                 &throughput, &time);
-                } else if ( GF_CLI_TOP_WRITE_PERF == top_op) {
-                        ret = glusterfs_volume_top_write_perf
-                                (blk_size, blk_count, xlator_req.name,
-                                 &throughput, &time);
-                }
-                ret = dict_set_double (dict, "time", time);
-                if (ret)
-                        goto cont;
-                ret = dict_set_double (dict, "throughput", throughput);
-                if (ret)
-                        goto cont;
-        }
-cont:
-        ctx = glusterfsd_ctx;
-        GF_ASSERT (ctx);
-        active = ctx->active;
-        any = active->first;
-
-        xlator = xlator_search_by_name (any, xlator_req.name);
-        if (!xlator) {
-                snprintf (msg, sizeof (msg), "xlator %s is not loaded",
-                          xlator_req.name);
-                goto out;
-        }
-
-        output = dict_new ();
-        ret = xlator->notify (xlator, GF_EVENT_TRANSLATOR_INFO, dict, output);
-
-out:
-        ret = glusterfs_translator_info_response_send (req, ret, msg, output);
-
-        free (xlator_req.name);
-        free (xlator_req.input.input_val);
-        if (output)
-                dict_unref (output);
-        if (dict)
-                dict_unref (dict);
-        return ret;
-}
-
-int
-glusterfs_volume_top_write_perf (uint32_t blk_size, uint32_t blk_count,
-                                 char *brick_path, double *throughput,
-                                 double *time)
-{
-        int32_t                 fd = -1;
-        int32_t                 input_fd = -1;
-        char                    export_path[PATH_MAX];
-        char                    *buf = NULL;
-        int32_t                 iter = 0;
-        int32_t                 ret = -1;
-        uint64_t                total_blks = 0;
-        struct timeval          begin, end = {0,};
-
-        GF_ASSERT (brick_path);
-        GF_ASSERT (throughput);
-        GF_ASSERT (time);
-        if (!(blk_size > 0) || ! (blk_count > 0))
-                goto out;
-
-        snprintf (export_path, sizeof (export_path), "%s/%s",
-                  brick_path, ".gf-tmp-stats-perf");
-
-        fd = open (export_path, O_CREAT|O_RDWR, S_IRWXU);
-        if (-1 == fd) {
-                ret = -1;
-                gf_log ("glusterd", GF_LOG_ERROR, "Could not open tmp file");
-                goto out;
-        }
-
-        buf = GF_MALLOC (blk_size * sizeof(*buf), gf_common_mt_char);
-        if (!buf) {
-                ret = -1;
-                goto out;
-        }
-
-        input_fd = open ("/dev/zero", O_RDONLY);
-        if (-1 == input_fd) {
-                ret = -1;
-                gf_log ("glusterd",GF_LOG_ERROR, "Unable to open input file");
-                goto out;
-        }
-
-        gettimeofday (&begin, NULL);
-        for (iter = 0; iter < blk_count; iter++) {
-                ret = read (input_fd, buf, blk_size);
-                if (ret != blk_size) {
-                        ret = -1;
-                        goto out;
-                }
-                ret = write (fd, buf, blk_size);
-                if (ret != blk_size) {
-                        ret = -1;
-                        goto out;
-                }
-                total_blks += ret;
-        }
-        ret = 0;
-        if (total_blks != ((uint64_t)blk_size * blk_count)) {
-                gf_log ("glusterd", GF_LOG_WARNING, "Error in write");
-                ret = -1;
-                goto out;
-        }
-
-        gettimeofday (&end, NULL);
-        *time = (end.tv_sec - begin.tv_sec) * 1e6
-                     + (end.tv_usec - begin.tv_usec);
-        *throughput = total_blks / *time;
-        gf_log ("glusterd", GF_LOG_INFO, "Throughput %.2f Mbps time %.2f secs "
-                "bytes written %"PRId64, *throughput, *time, total_blks);
-
-out:
-        if (fd >= 0)
-                close (fd);
-        if (input_fd >= 0)
-                close (input_fd);
-        GF_FREE (buf);
-        unlink (export_path);
-
-        return ret;
-}
-
-int
-glusterfs_volume_top_read_perf (uint32_t blk_size, uint32_t blk_count,
-                                char *brick_path, double *throughput,
-                                double *time)
-{
-        int32_t                 fd = -1;
-        int32_t                 input_fd = -1;
-        int32_t                 output_fd = -1;
-        char                    export_path[PATH_MAX];
-        char                    *buf = NULL;
-        int32_t                 iter = 0;
-        int32_t                 ret = -1;
-        uint64_t                total_blks = 0;
-        struct timeval          begin, end = {0,};
-
-        GF_ASSERT (brick_path);
-        GF_ASSERT (throughput);
-        GF_ASSERT (time);
-        if (!(blk_size > 0) || ! (blk_count > 0))
-                goto out;
-
-        snprintf (export_path, sizeof (export_path), "%s/%s",
-                  brick_path, ".gf-tmp-stats-perf");
-        fd = open (export_path, O_CREAT|O_RDWR, S_IRWXU);
-        if (-1 == fd) {
-                ret = -1;
-                gf_log ("glusterd", GF_LOG_ERROR, "Could not open tmp file");
-                goto out;
-        }
-
-        buf = GF_MALLOC (blk_size * sizeof(*buf), gf_common_mt_char);
-        if (!buf) {
-                ret = -1;
-                gf_log ("glusterd", GF_LOG_ERROR, "Could not allocate memory");
-                goto out;
-        }
-
-        input_fd = open ("/dev/zero", O_RDONLY);
-        if (-1 == input_fd) {
-                ret = -1;
-                gf_log ("glusterd", GF_LOG_ERROR, "Could not open input file");
-                goto out;
-        }
-
-        output_fd = open ("/dev/null", O_RDWR);
-        if (-1 == output_fd) {
-                ret = -1;
-                gf_log ("glusterd", GF_LOG_ERROR, "Could not open output file");
-                goto out;
-        }
-
-        for (iter = 0; iter < blk_count; iter++) {
-                ret = read (input_fd, buf, blk_size);
-                if (ret != blk_size) {
-                        ret = -1;
-                        goto out;
-                }
-                ret = write (fd, buf, blk_size);
-                if (ret != blk_size) {
-                        ret = -1;
-                        goto out;
-                }
-        }
-
-        ret = fsync (fd);
-        if (ret) {
-                gf_log ("glusterd", GF_LOG_ERROR, "could not flush cache");
-                goto out;
-        }
-        ret = lseek (fd, 0L, 0);
-        if (ret != 0) {
-                gf_log ("glusterd", GF_LOG_ERROR,
-                        "could not seek back to start");
-                ret = -1;
-                goto out;
-        }
-        gettimeofday (&begin, NULL);
-        for (iter = 0; iter < blk_count; iter++) {
-                ret = read (fd, buf, blk_size);
-                if (ret != blk_size) {
-                        ret = -1;
-                        goto out;
-                }
-                ret = write (output_fd, buf, blk_size);
-                if (ret != blk_size) {
-                        ret = -1;
-                        goto out;
-                }
-                total_blks += ret;
-        }
-        ret = 0;
-        if (total_blks != ((uint64_t)blk_size * blk_count)) {
-                ret = -1;
-                gf_log ("glusterd", GF_LOG_WARNING, "Error in read");
-                goto out;
-        }
-
-        gettimeofday (&end, NULL);
-        *time = (end.tv_sec - begin.tv_sec) * 1e6
-                + (end.tv_usec - begin.tv_usec);
-        *throughput = total_blks / *time;
-        gf_log ("glusterd", GF_LOG_INFO, "Throughput %.2f Mbps time %.2f secs "
-                "bytes read %"PRId64, *throughput, *time, total_blks);
-
-out:
-        if (fd >= 0)
-                close (fd);
-        if (input_fd >= 0)
-                close (input_fd);
-        if (output_fd >= 0)
-                close (output_fd);
-        GF_FREE (buf);
-        unlink (export_path);
-
-        return ret;
-}
-
-int
-glusterfs_handle_translator_op (rpcsvc_request_t *req)
-{
-        int32_t                  ret     = -1;
-        gd1_mgmt_brick_op_req    xlator_req = {0,};
-        dict_t                   *input    = NULL;
-        xlator_t                 *xlator = NULL;
-        xlator_t                 *any = NULL;
-        dict_t                   *output = NULL;
-        char                     key[2048] = {0};
-        char                    *xname = NULL;
-        glusterfs_ctx_t          *ctx = NULL;
-        glusterfs_graph_t        *active = NULL;
-        xlator_t                 *this = NULL;
-        int                      i = 0;
-        int                      count = 0;
-
-        GF_ASSERT (req);
-        this = THIS;
-        GF_ASSERT (this);
-
-        ret = xdr_to_generic (req->msg[0], &xlator_req,
-                              (xdrproc_t)xdr_gd1_mgmt_brick_op_req);
-        if (ret < 0) {
-                //failed to decode msg;
-                req->rpc_err = GARBAGE_ARGS;
-                goto out;
-        }
-
-        ctx = glusterfsd_ctx;
-        active = ctx->active;
-        any = active->first;
-        input = dict_new ();
-        ret = dict_unserialize (xlator_req.input.input_val,
-                                xlator_req.input.input_len,
-                                &input);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to "
-                        "unserialize req-buffer to dictionary");
-                goto out;
-        } else {
-                input->extra_stdfree = xlator_req.input.input_val;
-        }
-
-        ret = dict_get_int32 (input, "count", &count);
-
-        output = dict_new ();
-        if (!output) {
-                ret = -1;
-                goto out;
-        }
-
-        for (i = 0; i < count; i++)  {
-                snprintf (key, sizeof (key), "xl-%d", i);
-                ret = dict_get_str (input, key, &xname);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "Couldn't get "
-                                "xlator %s ", key);
-                        goto out;
-                }
-                xlator = xlator_search_by_name (any, xname);
-                if (!xlator) {
-                        gf_log (this->name, GF_LOG_ERROR, "xlator %s is not "
-                                "loaded", xname);
-                        goto out;
-                }
-        }
-        for (i = 0; i < count; i++)  {
-                snprintf (key, sizeof (key), "xl-%d", i);
-                ret = dict_get_str (input, key, &xname);
-                xlator = xlator_search_by_name (any, xname);
-                XLATOR_NOTIFY (xlator, GF_EVENT_TRANSLATOR_OP, input, output);
-                if (ret)
-                        break;
-        }
-out:
-        glusterfs_xlator_op_response_send (req, ret, "", output);
-        if (input)
-                dict_unref (input);
-        if (output)
-                dict_unref (output);
-        free (xlator_req.name); //malloced by xdr
-
-        return 0;
-}
-
-
-int
-glusterfs_handle_defrag (rpcsvc_request_t *req)
-{
         int32_t                  ret     = -1;
         gd1_mgmt_brick_op_req    xlator_req = {0,};
         dict_t                   *dict    = NULL;
@@ -663,26 +270,17 @@ glusterfs_handle_defrag (rpcsvc_request_t *req)
         this = THIS;
         GF_ASSERT (this);
 
-        ctx = glusterfsd_ctx;
+        ctx = glusterfs_ctx_get ();
         GF_ASSERT (ctx);
 
         active = ctx->active;
-        if (!active) {
-                req->rpc_err = GARBAGE_ARGS;
-                goto out;
-        }
-
         any = active->first;
-        ret = xdr_to_generic (req->msg[0], &xlator_req,
-                              (xdrproc_t)xdr_gd1_mgmt_brick_op_req);
-        if (ret < 0) {
+        if (!gd_xdr_to_mgmt_brick_op_req (req->msg[0], &xlator_req)) {
                 //failed to decode msg;
                 req->rpc_err = GARBAGE_ARGS;
                 goto out;
         }
         dict = dict_new ();
-        if (!dict)
-                goto out;
 
         ret = dict_unserialize (xlator_req.input.input_val,
                                 xlator_req.input.input_len,
@@ -693,448 +291,52 @@ glusterfs_handle_defrag (rpcsvc_request_t *req)
                         "unserialize req-buffer to dictionary");
                 goto out;
         }
+
         xlator = xlator_search_by_name (any, xlator_req.name);
         if (!xlator) {
                 snprintf (msg, sizeof (msg), "xlator %s is not loaded",
                           xlator_req.name);
-                goto out;
-        }
-
-        output = dict_new ();
-        if (!output) {
                 ret = -1;
                 goto out;
         }
 
-        ret = xlator->notify (xlator, GF_EVENT_VOLUME_DEFRAG, dict, output);
-
-        ret = glusterfs_translator_info_response_send (req, ret,
-                                                       msg, output);
-out:
-        if (dict)
-                dict_unref (dict);
-        free (xlator_req.input.input_val); // malloced by xdr
-        if (output)
-                dict_unref (output);
-        free (xlator_req.name); //malloced by xdr
-
-        return ret;
-
-}
-int
-glusterfs_handle_brick_status (rpcsvc_request_t *req)
-{
-        int                     ret = -1;
-        gd1_mgmt_brick_op_req   brick_req = {0,};
-        gd1_mgmt_brick_op_rsp   rsp = {0,};
-        glusterfs_ctx_t         *ctx = NULL;
-        glusterfs_graph_t       *active = NULL;
-        xlator_t                *this = NULL;
-        xlator_t                *any = NULL;
-        xlator_t                *xlator = NULL;
-        dict_t                  *dict = NULL;
-        dict_t                  *output = NULL;
-        char                    *volname = NULL;
-        char                    *xname = NULL;
-        uint32_t                cmd = 0;
-        char                    *msg = NULL;
-
-        GF_ASSERT (req);
-        this = THIS;
-        GF_ASSERT (this);
-
-        ret = xdr_to_generic (req->msg[0], &brick_req,
-                              (xdrproc_t)xdr_gd1_mgmt_brick_op_req);
-        if (ret < 0) {
-                req->rpc_err = GARBAGE_ARGS;
-                goto out;
-        }
-
-        dict = dict_new ();
-        ret = dict_unserialize (brick_req.input.input_val,
-                                brick_req.input.input_len, &dict);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to unserialize "
-                        "req-buffer to dictionary");
-                goto out;
-        }
-
-        ret = dict_get_uint32 (dict, "cmd", &cmd);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Couldn't get status op");
-                goto out;
-        }
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Couldn't get volname");
-                goto out;
-        }
-
-        ctx = glusterfsd_ctx;
-        GF_ASSERT (ctx);
-        active = ctx->active;
-        any = active->first;
-
-        ret = gf_asprintf (&xname, "%s-server", volname);
-        if (-1 == ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Out of memory");
-                goto out;
-        }
-
-        xlator = xlator_search_by_name (any, xname);
-        if (!xlator) {
-                gf_log (this->name, GF_LOG_ERROR, "xlator %s is not loaded",
-                        xname);
-                ret = -1;
-                goto out;
-        }
-
-
         output = dict_new ();
-        switch (cmd & GF_CLI_STATUS_MASK) {
-                case GF_CLI_STATUS_MEM:
-                        ret = 0;
-                        gf_proc_dump_mem_info_to_dict (output);
-                        gf_proc_dump_mempool_info_to_dict (ctx, output);
-                        break;
-
-                case GF_CLI_STATUS_CLIENTS:
-                        ret = xlator->dumpops->priv_to_dict (xlator, output);
-                        break;
-
-                case GF_CLI_STATUS_INODE:
-                        ret = xlator->dumpops->inode_to_dict (xlator, output);
-                        break;
-
-                case GF_CLI_STATUS_FD:
-                        ret = xlator->dumpops->fd_to_dict (xlator, output);
-                        break;
-
-                case GF_CLI_STATUS_CALLPOOL:
-                        ret = 0;
-                        gf_proc_dump_pending_frames_to_dict (ctx->pool, output);
-                        break;
-
-                default:
-                        ret = -1;
-                        msg = gf_strdup ("Unknown status op");
-                        break;
-        }
-        rsp.op_ret = ret;
-        rsp.op_errno = 0;
-        if (ret && msg)
-                rsp.op_errstr = msg;
-        else
-                rsp.op_errstr = "";
-
-        ret = dict_allocate_and_serialize (output, &rsp.output.output_val,
-                                           &rsp.output.output_len);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "Failed to serialize output dict to rsp");
-                goto out;
-        }
-
-        glusterfs_submit_reply (req, &rsp, NULL, 0, NULL,
-                                (xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
-        ret = 0;
-
+        ret = xlator->notify (xlator, GF_EVENT_TRANSLATOR_INFO, dict, output);
 out:
+        ret = glusterfs_translator_info_response_send (req, ret, msg, output);
         if (dict)
                 dict_unref (dict);
+        if (xlator_req.input.input_val)
+                free (xlator_req.input.input_val); // malloced by xdr
         if (output)
                 dict_unref (output);
-        free (brick_req.input.input_val);
-        GF_FREE (xname);
-        GF_FREE (msg);
-        GF_FREE (rsp.output.output_val);
-
+        if (xlator_req.name)
+                free (xlator_req.name); //malloced by xdr
         return ret;
 }
 
-
 int
-glusterfs_handle_node_status (rpcsvc_request_t *req)
-{
-        int                     ret = -1;
-        gd1_mgmt_brick_op_req   node_req = {0,};
-        gd1_mgmt_brick_op_rsp   rsp = {0,};
-        glusterfs_ctx_t         *ctx = NULL;
-        glusterfs_graph_t       *active = NULL;
-        xlator_t                *any = NULL;
-        xlator_t                *node = NULL;
-        xlator_t                *subvol = NULL;
-        dict_t                  *dict = NULL;
-        dict_t                  *output = NULL;
-        char                    *volname = NULL;
-        char                    *node_name = NULL;
-        char                    *subvol_name = NULL;
-        uint32_t                cmd = 0;
-        char                    *msg = NULL;
-
-        GF_ASSERT (req);
-
-        ret = xdr_to_generic (req->msg[0], &node_req,
-                              (xdrproc_t)xdr_gd1_mgmt_brick_op_req);
-        if (ret < 0) {
-                req->rpc_err = GARBAGE_ARGS;
-                goto out;
-        }
-
-        dict = dict_new ();
-        ret = dict_unserialize (node_req.input.input_val,
-                                node_req.input.input_len, &dict);
-        if (ret < 0) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to unserialize "
-                        "req buffer to dictionary");
-                goto out;
-        }
-
-        ret = dict_get_uint32 (dict, "cmd", &cmd);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Couldn't get status op");
-                goto out;
-        }
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Couldn't get volname");
-                goto out;
-        }
-
-        ctx = glusterfsd_ctx;
-        GF_ASSERT (ctx);
-        active = ctx->active;
-        any = active->first;
-
-        if ((cmd & GF_CLI_STATUS_NFS) != 0)
-                ret = gf_asprintf (&node_name, "%s", "nfs-server");
-        else if ((cmd & GF_CLI_STATUS_SHD) != 0)
-                ret = gf_asprintf (&node_name, "%s", "glustershd");
-        else {
-                ret = -1;
-                goto out;
-        }
-        if (ret == -1) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "Failed to set node xlator name");
-                goto out;
-        }
-
-        node = xlator_search_by_name (any, node_name);
-        if (!node) {
-                ret = -1;
-                gf_log (THIS->name, GF_LOG_ERROR, "%s xlator is not loaded",
-                        node_name);
-                goto out;
-        }
-
-        if ((cmd & GF_CLI_STATUS_NFS) != 0)
-                ret = gf_asprintf (&subvol_name, "%s", volname);
-        else if ((cmd & GF_CLI_STATUS_SHD) != 0)
-                ret = gf_asprintf (&subvol_name, "%s-replicate-0", volname);
-        else {
-                ret = -1;
-                goto out;
-        }
-        if (ret == -1) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "Failed to set node xlator name");
-                goto out;
-        }
-
-        subvol = xlator_search_by_name (node, subvol_name);
-        if (!subvol) {
-                ret = -1;
-                gf_log (THIS->name, GF_LOG_ERROR, "%s xlator is not loaded",
-                        subvol_name);
-                goto out;
-        }
-
-        output = dict_new ();
-        switch (cmd & GF_CLI_STATUS_MASK) {
-                case GF_CLI_STATUS_MEM:
-                        ret = 0;
-                        gf_proc_dump_mem_info_to_dict (output);
-                        gf_proc_dump_mempool_info_to_dict (ctx, output);
-                        break;
-
-                case GF_CLI_STATUS_CLIENTS:
-                        // clients not availbale for SHD
-                        if ((cmd & GF_CLI_STATUS_SHD) != 0)
-                                break;
-
-                        ret = dict_set_str (output, "volname", volname);
-                        if (ret) {
-                                gf_log (THIS->name, GF_LOG_ERROR,
-                                        "Error setting volname to dict");
-                                goto out;
-                        }
-                        ret = node->dumpops->priv_to_dict (node, output);
-                        break;
-
-                case GF_CLI_STATUS_INODE:
-                        ret = 0;
-                        inode_table_dump_to_dict (subvol->itable, "conn0",
-                                                  output);
-                        ret = dict_set_int32 (output, "conncount", 1);
-                        break;
-
-                case GF_CLI_STATUS_FD:
-                        // cannot find fd-tables in nfs-server graph
-                        // TODO: finish once found
-                        break;
-
-                case GF_CLI_STATUS_CALLPOOL:
-                        ret = 0;
-                        gf_proc_dump_pending_frames_to_dict (ctx->pool, output);
-                        break;
-
-                default:
-                        ret = -1;
-                        msg = gf_strdup ("Unknown status op");
-                        gf_log (THIS->name, GF_LOG_ERROR, "%s", msg);
-                        break;
-        }
-        rsp.op_ret = ret;
-        rsp.op_errno = 0;
-        if (ret && msg)
-                rsp.op_errstr = msg;
-        else
-                rsp.op_errstr = "";
-
-        ret = dict_allocate_and_serialize (output, &rsp.output.output_val,
-                                           &rsp.output.output_len);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "Failed to serialize output dict to rsp");
-                goto out;
-        }
-
-        glusterfs_submit_reply (req, &rsp, NULL, 0, NULL,
-                                (xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
-        ret = 0;
-
-out:
-        if (dict)
-                dict_unref (dict);
-        free (node_req.input.input_val);
-        GF_FREE (msg);
-        GF_FREE (rsp.output.output_val);
-        GF_FREE (node_name);
-        GF_FREE (subvol_name);
-
-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-glusterfs_handle_nfs_profile (rpcsvc_request_t *req)
+glusterfs_handle_rpc_msg (rpcsvc_request_t *req)
 {
-        int                     ret = -1;
-        gd1_mgmt_brick_op_req   nfs_req = {0,};
-        gd1_mgmt_brick_op_rsp   rsp = {0,};
-        dict_t                  *dict = NULL;
-        glusterfs_ctx_t         *ctx = NULL;
-        glusterfs_graph_t       *active = NULL;
-        xlator_t                *any = NULL;
-        xlator_t                *nfs = NULL;
-        xlator_t                *subvol = NULL;
-        char                    *volname = NULL;
-        dict_t                  *output = NULL;
-
-        GF_ASSERT (req);
-
-        ret = xdr_to_generic (req->msg[0], &nfs_req,
-                              (xdrproc_t)xdr_gd1_mgmt_brick_op_req);
-        if (ret < 0) {
-                req->rpc_err = GARBAGE_ARGS;
-                goto out;
-        }
-
-        dict = dict_new ();
-        ret = dict_unserialize (nfs_req.input.input_val,
-                                nfs_req.input.input_len, &dict);
-        if (ret < 0) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to "
-                        "unserialize req-buffer to dict");
-                goto out;
-        }
-
-        ret = dict_get_str (dict, "volname", &volname);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Couldn't get volname");
-                goto out;
-        }
-
-        ctx = glusterfsd_ctx;
-        GF_ASSERT (ctx);
-
-        active = ctx->active;
-        any = active->first;
-
-        // is this needed?
-        // are problems possible by searching for subvol directly from "any"?
-        nfs = xlator_search_by_name (any, "nfs-server");
-        if (!nfs) {
-                ret = -1;
-                gf_log (THIS->name, GF_LOG_ERROR, "xlator nfs-server is "
-                        "not loaded");
-                goto out;
-        }
-
-        subvol = xlator_search_by_name (nfs, volname);
-        if (!subvol) {
-                ret = -1;
-                gf_log (THIS->name, GF_LOG_ERROR, "xlator %s is no loaded",
-                        volname);
-                goto out;
-        }
-
-        output = dict_new ();
-        ret = subvol->notify (subvol, GF_EVENT_TRANSLATOR_INFO, dict, output);
-
-        rsp.op_ret = ret;
-        rsp.op_errno = 0;
-        rsp.op_errstr = "";
-
-        ret = dict_allocate_and_serialize (output, &rsp.output.output_val,
-                                           &rsp.output.output_len);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "Failed to serialize output dict to rsp");
-                goto out;
+        int     ret = -1;
+        xlator_t *this = THIS;
+        GF_ASSERT (this);
+        switch (req->procnum) {
+        case GF_BRICK_TERMINATE:
+                ret = glusterfs_handle_terminate (req);
+                break;
+        case GF_BRICK_XLATOR_INFO:
+                ret = glusterfs_handle_translator_info_get (req);
+                break;
+        default:
+                break;
         }
 
-        glusterfs_submit_reply (req, &rsp, NULL, 0, NULL,
-                                (xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
-        ret = 0;
-
-out:
-        free (nfs_req.input.input_val);
-        if (dict)
-                dict_unref (dict);
-        if (output)
-                dict_unref (output);
-        GF_FREE (rsp.output.output_val);
-
-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-glusterfs_handle_rpc_msg (rpcsvc_request_t *req)
-{
-        int ret = -1;
-        /* for now, nothing */
         return ret;
 }
 
-rpcclnt_cb_actor_t mgmt_cbk_actors[] = {
+rpcclnt_cb_actor_t gluster_cbk_actors[] = {
         [GF_CBK_FETCHSPEC] = {"FETCHSPEC", GF_CBK_FETCHSPEC, mgmt_cbk_spec },
-        [GF_CBK_EVENT_NOTIFY] = {"EVENTNOTIFY", GF_CBK_EVENT_NOTIFY,
-                                 mgmt_cbk_event},
 };
 
 
@@ -1142,7 +344,7 @@ struct rpcclnt_cb_program mgmt_cbk_prog = {
         .progname  = "GlusterFS Callback",
         .prognum   = GLUSTER_CBK_PROGRAM,
         .progver   = GLUSTER_CBK_VERSION,
-        .actors    = mgmt_cbk_actors,
+        .actors    = gluster_cbk_actors,
         .numactors = GF_CBK_MAXVALUE,
 };
 
@@ -1168,7 +370,6 @@ char *clnt_handshake_procs[GF_HNDSK_MAXVALUE] = {
         [GF_HNDSK_SETVOLUME]    = "SETVOLUME",
         [GF_HNDSK_GETSPEC]      = "GETSPEC",
         [GF_HNDSK_PING]         = "PING",
-        [GF_HNDSK_EVENT_NOTIFY] = "EVENTNOTIFY",
 };
 
 rpc_clnt_prog_t clnt_handshake_prog = {
@@ -1179,60 +380,52 @@ rpc_clnt_prog_t clnt_handshake_prog = {
 };
 
 rpcsvc_actor_t glusterfs_actors[] = {
-        [GLUSTERD_BRICK_NULL]          = {"NULL",              GLUSTERD_BRICK_NULL,          glusterfs_handle_rpc_msg,             NULL, 0, DRC_NA},
-        [GLUSTERD_BRICK_TERMINATE]     = {"TERMINATE",         GLUSTERD_BRICK_TERMINATE,     glusterfs_handle_terminate,           NULL, 0, DRC_NA},
-        [GLUSTERD_BRICK_XLATOR_INFO]   = {"TRANSLATOR INFO",   GLUSTERD_BRICK_XLATOR_INFO,   glusterfs_handle_translator_info_get, NULL, 0, DRC_NA},
-        [GLUSTERD_BRICK_XLATOR_OP]     = {"TRANSLATOR OP",     GLUSTERD_BRICK_XLATOR_OP,     glusterfs_handle_translator_op,       NULL, 0, DRC_NA},
-        [GLUSTERD_BRICK_STATUS]        = {"STATUS",            GLUSTERD_BRICK_STATUS,        glusterfs_handle_brick_status,        NULL, 0, DRC_NA},
-        [GLUSTERD_BRICK_XLATOR_DEFRAG] = {"TRANSLATOR DEFRAG", GLUSTERD_BRICK_XLATOR_DEFRAG, glusterfs_handle_defrag,              NULL, 0, DRC_NA},
-        [GLUSTERD_NODE_PROFILE]        = {"NFS PROFILE",       GLUSTERD_NODE_PROFILE,        glusterfs_handle_nfs_profile,         NULL, 0, DRC_NA},
-        [GLUSTERD_NODE_STATUS]         = {"NFS STATUS",        GLUSTERD_NODE_STATUS,         glusterfs_handle_node_status,         NULL, 0, DRC_NA},
+        [GF_BRICK_NULL]        = { "NULL",    GF_BRICK_NULL, glusterfs_handle_rpc_msg, NULL, NULL},
+        [GF_BRICK_TERMINATE] = { "TERMINATE", GF_BRICK_TERMINATE, glusterfs_handle_rpc_msg, NULL, NULL},
+        [GF_BRICK_XLATOR_INFO] = { "TRANSLATOR INFO", GF_BRICK_XLATOR_INFO, glusterfs_handle_rpc_msg, NULL, NULL}
 };
 
 struct rpcsvc_program glusterfs_mop_prog = {
-        .progname  = "Gluster Brick operations",
-        .prognum   = GD_BRICK_PROGRAM,
-        .progver   = GD_BRICK_VERSION,
+        .progname  = "GlusterFS Mops",
+        .prognum   = GLUSTERFS_PROGRAM,
+        .progver   = GLUSTERFS_VERSION,
+        .numactors = GLUSTERFS_PROCCNT,
         .actors    = glusterfs_actors,
-        .numactors = GLUSTERD_BRICK_MAXVALUE,
-	.synctask  = _gf_true,
 };
 
 int
 mgmt_submit_request (void *req, call_frame_t *frame,
                      glusterfs_ctx_t *ctx,
                      rpc_clnt_prog_t *prog, int procnum,
-                     fop_cbk_fn_t cbkfn, xdrproc_t xdrproc)
+                     mgmt_serialize_t sfunc, fop_cbk_fn_t cbkfn)
 {
         int                     ret         = -1;
         int                     count      = 0;
         struct iovec            iov         = {0, };
         struct iobuf            *iobuf = NULL;
         struct iobref           *iobref = NULL;
-        ssize_t                 xdr_size = 0;
 
         iobref = iobref_new ();
         if (!iobref) {
                 goto out;
         }
 
-        if (req) {
-                xdr_size = xdr_sizeof (xdrproc, req);
+        iobuf = iobuf_get (ctx->iobuf_pool);
+        if (!iobuf) {
+                goto out;
+        };
 
-                iobuf = iobuf_get2 (ctx->iobuf_pool, xdr_size);
-                if (!iobuf) {
-                        goto out;
-                };
+        iobref_add (iobref, iobuf);
 
-                iobref_add (iobref, iobuf);
+        iov.iov_base = iobuf->ptr;
+        iov.iov_len  = 128 * GF_UNIT_KB;
 
-                iov.iov_base = iobuf->ptr;
-                iov.iov_len  = iobuf_pagesize (iobuf);
 
-                /* Create the xdr payload */
-                ret = xdr_serialize_generic (iov, req, xdrproc);
+        /* Create the xdr payload */
+        if (req && sfunc) {
+                ret = sfunc (iov, req);
                 if (ret == -1) {
-                        gf_log (THIS->name, GF_LOG_WARNING, "failed to create XDR payload");
+                        gf_log ("", GF_LOG_WARNING, "failed to create XDR payload");
                         goto out;
                 }
                 iov.iov_len = ret;
@@ -1248,17 +441,161 @@ out:
         if (iobref)
                 iobref_unref (iobref);
 
-        if (iobuf)
-                iobuf_unref (iobuf);
         return ret;
 }
 
 
 /* XXX: move these into @ctx */
-static char *oldvolfile = NULL;
+static char oldvolfile[131072];
 static int oldvollen = 0;
 
+static int
+xlator_equal_rec (xlator_t *xl1, xlator_t *xl2)
+{
+        xlator_list_t *trav1 = NULL;
+        xlator_list_t *trav2 = NULL;
+        int            ret   = 0;
+
+        if (xl1 == NULL || xl2 == NULL) {
+                gf_log ("xlator", GF_LOG_DEBUG, "invalid argument");
+                return -1;
+        }
+
+        trav1 = xl1->children;
+        trav2 = xl2->children;
 
+        while (trav1 && trav2) {
+                ret = xlator_equal_rec (trav1->xlator, trav2->xlator);
+                if (ret) {
+                        gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
+                                "xlators children not equal");
+                        goto out;
+                }
+
+                trav1 = trav1->next;
+                trav2 = trav2->next;
+        }
+
+        if (trav1 || trav2) {
+                ret = -1;
+                goto out;
+        }
+
+        if (strcmp (xl1->name, xl2->name)) {
+                ret = -1;
+                goto out;
+        }
+out :
+        return ret;
+}
+
+static gf_boolean_t
+is_graph_topology_equal (glusterfs_graph_t *graph1,
+                                glusterfs_graph_t *graph2)
+{
+        xlator_t    *trav1    = NULL;
+        xlator_t    *trav2    = NULL;
+        gf_boolean_t ret      = _gf_true;
+
+        trav1 = graph1->first;
+        trav2 = graph2->first;
+
+        ret = xlator_equal_rec (trav1, trav2);
+
+        if (ret) {
+                gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
+                        "graphs are not equal");
+                ret = _gf_false;
+                goto out;
+        }
+
+        ret = _gf_true;
+        gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
+                "graphs are equal");
+
+out:
+        return ret;
+}
+
+/* Function has 3types of return value 0, -ve , 1
+ *   return 0          =======> reconfiguration of options has succeded
+ *   return 1          =======> the graph has to be reconstructed and all the xlators should be inited
+ *   return -1(or -ve) =======> Some Internal Error occured during the operation
+ */
+static int
+glusterfs_volfile_reconfigure (FILE *newvolfile_fp)
+{
+        glusterfs_graph_t *oldvolfile_graph = NULL;
+        glusterfs_graph_t *newvolfile_graph = NULL;
+        FILE              *oldvolfile_fp    = NULL;
+        glusterfs_ctx_t   *ctx              = NULL;
+
+        int ret = -1;
+
+        oldvolfile_fp = tmpfile ();
+        if (!oldvolfile_fp)
+                goto out;
+
+        if (!oldvollen) {
+                ret = 1; // Has to call INIT for the whole graph
+                goto out;
+        }
+        fwrite (oldvolfile, oldvollen, 1, oldvolfile_fp);
+        fflush (oldvolfile_fp);
+
+
+        oldvolfile_graph = glusterfs_graph_construct (oldvolfile_fp);
+        if (!oldvolfile_graph) {
+                goto out;
+        }
+
+        newvolfile_graph = glusterfs_graph_construct (newvolfile_fp);
+        if (!newvolfile_graph) {
+                goto out;
+        }
+
+        if (!is_graph_topology_equal (oldvolfile_graph,
+                                      newvolfile_graph)) {
+
+                ret = 1;
+                gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
+                        "Graph topology not equal(should call INIT)");
+                goto out;
+        }
+
+        gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
+                "Only options have changed in the new "
+                "graph");
+
+        ctx = glusterfs_ctx_get ();
+
+        if (!ctx) {
+                gf_log ("glusterfsd-mgmt", GF_LOG_ERROR,
+                        "glusterfs_ctx_get() returned NULL");
+                goto out;
+        }
+
+        oldvolfile_graph = ctx->active;
+
+        if (!oldvolfile_graph) {
+                gf_log ("glusterfsd-mgmt", GF_LOG_ERROR,
+                        "glsuterfs_ctx->active is NULL");
+                goto out;
+        }
+
+        /* */
+        ret = glusterfs_graph_reconfigure (oldvolfile_graph,
+                                           newvolfile_graph);
+        if (ret) {
+                gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
+                        "Could not reconfigure new options in old graph");
+                goto out;
+        }
+
+        ret = 0;
+out:
+        return ret;
+}
 
 int
 mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
@@ -1270,7 +607,6 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
         int                      ret   = 0;
         ssize_t                  size = 0;
         FILE                    *tmpfp = NULL;
-        char                    *volfilebuf = NULL;
 
         frame = myframe;
         ctx = frame->this->ctx;
@@ -1280,7 +616,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_getspec_rsp);
+        ret = xdr_to_getspec_rsp (*iov, &rsp);
         if (ret < 0) {
                 gf_log (frame->this->name, GF_LOG_ERROR, "XDR decoding error");
                 ret   = -1;
@@ -1290,7 +626,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
         if (-1 == rsp.op_ret) {
                 gf_log (frame->this->name, GF_LOG_ERROR,
                         "failed to get the 'volume file' from server");
-                ret = rsp.op_errno;
+                ret = -1;
                 goto out;
         }
 
@@ -1298,8 +634,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
         size = rsp.op_ret;
 
         if (size == oldvollen && (memcmp (oldvolfile, rsp.spec, size) == 0)) {
-                gf_log (frame->this->name, GF_LOG_INFO,
-                        "No change in volfile, continuing");
+                gf_log ("", GF_LOG_INFO, "No change in volfile, continuing");
                 goto out;
         }
 
@@ -1311,32 +646,19 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
 
         fwrite (rsp.spec, size, 1, tmpfp);
         fflush (tmpfp);
-        if (ferror (tmpfp)) {
-                ret = -1;
-                goto out;
-        }
 
         /*  Check if only options have changed. No need to reload the
         *  volfile if topology hasn't changed.
         *  glusterfs_volfile_reconfigure returns 3 possible return states
-        *  return 0          =======> reconfiguration of options has succeeded
+        *  return 0          =======> reconfiguration of options has succeded
         *  return 1          =======> the graph has to be reconstructed and all the xlators should be inited
-        *  return -1(or -ve) =======> Some Internal Error occurred during the operation
+        *  return -1(or -ve) =======> Some Internal Error occured during the operation
         */
 
-        ret = glusterfs_volfile_reconfigure (oldvollen, tmpfp, ctx, oldvolfile);
+        ret = glusterfs_volfile_reconfigure (tmpfp);
         if (ret == 0) {
                 gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
                         "No need to re-load volfile, reconfigure done");
-                if (oldvolfile)
-                        volfilebuf = GF_REALLOC (oldvolfile, size);
-                else
-                        volfilebuf = GF_CALLOC (1, size, gf_common_mt_char);
-                if (!volfilebuf) {
-                        ret = -1;
-                        goto out;
-                }
-                oldvolfile = volfilebuf;
                 oldvollen = size;
                 memcpy (oldvolfile, rsp.spec, size);
                 goto out;
@@ -1348,41 +670,21 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
         }
 
         ret = glusterfs_process_volfp (ctx, tmpfp);
-        /* tmpfp closed */
-        tmpfp = NULL;
         if (ret)
                 goto out;
 
-        if (oldvolfile)
-                volfilebuf = GF_REALLOC (oldvolfile, size);
-        else
-                volfilebuf = GF_CALLOC (1, size, gf_common_mt_char);
-
-        if (!volfilebuf) {
-                ret = -1;
-                goto out;
-        }
-        oldvolfile = volfilebuf;
         oldvollen = size;
         memcpy (oldvolfile, rsp.spec, size);
         if (!is_mgmt_rpc_reconnect) {
                 glusterfs_mgmt_pmap_signin (ctx);
-                is_mgmt_rpc_reconnect =  _gf_true;
+                is_mgmt_rpc_reconnect = 1;
         }
 
 out:
         STACK_DESTROY (frame->root);
 
-        free (rsp.spec);
-
-        emancipate (ctx, ret);
-
-        // Stop if server is running at an unsupported op-version
-        if (ENOTSUP == ret) {
-                gf_log ("mgmt", GF_LOG_ERROR, "Server is operating at an "
-                        "op-version which is not supported");
-                cleanup_and_exit (0);
-        }
+        if (rsp.spec)
+                free (rsp.spec);
 
         if (ret && ctx && !ctx->active) {
                 /* Do it only for the first time */
@@ -1393,11 +695,6 @@ out:
                         ctx->cmd_args.volfile_id);
                 cleanup_and_exit (0);
         }
-
-
-        if (tmpfp)
-                fclose (tmpfp);
-
         return 0;
 }
 
@@ -1409,7 +706,6 @@ glusterfs_volfile_fetch (glusterfs_ctx_t *ctx)
         gf_getspec_req    req = {0, };
         int               ret = 0;
         call_frame_t     *frame = NULL;
-        dict_t           *dict = NULL;
 
         cmd_args = &ctx->cmd_args;
 
@@ -1418,235 +714,53 @@ glusterfs_volfile_fetch (glusterfs_ctx_t *ctx)
         req.key = cmd_args->volfile_id;
         req.flags = 0;
 
-        dict = dict_new ();
-        if (!dict) {
-                ret = -1;
-                goto out;
-        }
-
-        // Set the supported min and max op-versions, so glusterd can make a
-        // decision
-        ret = dict_set_int32 (dict, "min-op-version", GD_OP_VERSION_MIN);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to set min-op-version"
-                        " in request dict");
-                goto out;
-        }
-
-        ret = dict_set_int32 (dict, "max-op-version", GD_OP_VERSION_MAX);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to set max-op-version"
-                        " in request dict");
-                goto out;
-        }
-
-        ret = dict_allocate_and_serialize (dict, &req.xdata.xdata_val,
-                                           &req.xdata.xdata_len);
-        if (ret < 0) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "Failed to serialize dictionary");
-                goto out;
-        }
-
         ret = mgmt_submit_request (&req, frame, ctx, &clnt_handshake_prog,
-                                   GF_HNDSK_GETSPEC, mgmt_getspec_cbk,
-                                   (xdrproc_t)xdr_gf_getspec_req);
-out:
-        return ret;
-}
-
-int32_t
-mgmt_event_notify_cbk (struct rpc_req *req, struct iovec *iov, int count,
-                  void *myframe)
-{
-        gf_event_notify_rsp      rsp   = {0,};
-        call_frame_t            *frame = NULL;
-        glusterfs_ctx_t         *ctx = NULL;
-        int                      ret   = 0;
-
-        frame = myframe;
-        ctx = frame->this->ctx;
-
-        if (-1 == req->rpc_status) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_event_notify_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR, "XDR decoding error");
-                ret   = -1;
-                goto out;
-        }
-
-        if (-1 == rsp.op_ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "failed to get the rsp from server");
-                ret = -1;
-                goto out;
-        }
-out:
-        free (rsp.dict.dict_val); //malloced by xdr
-        return ret;
-
-}
-
-int32_t
-glusterfs_rebalance_event_notify_cbk (struct rpc_req *req, struct iovec *iov,
-                                      int count, void *myframe)
-{
-        gf_event_notify_rsp      rsp   = {0,};
-        call_frame_t            *frame = NULL;
-        glusterfs_ctx_t         *ctx = NULL;
-        int                      ret   = 0;
-
-        frame = myframe;
-        ctx = frame->this->ctx;
-
-        if (-1 == req->rpc_status) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "failed to get the rsp from server");
-                ret = -1;
-                goto out;
-        }
-
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gf_event_notify_rsp);
-        if (ret < 0) {
-                gf_log (frame->this->name, GF_LOG_ERROR, "XDR decoding error");
-                ret   = -1;
-                goto out;
-        }
-
-        if (-1 == rsp.op_ret) {
-                gf_log (frame->this->name, GF_LOG_ERROR,
-                        "Received error (%s) from server",
-                        strerror (rsp.op_errno));
-                ret = -1;
-                goto out;
-        }
-out:
-        free (rsp.dict.dict_val); //malloced by xdr
+                                   GF_HNDSK_GETSPEC, xdr_from_getspec_req,
+                                   mgmt_getspec_cbk);
         return ret;
-
 }
 
-int32_t
-glusterfs_rebalance_event_notify (dict_t *dict)
-{
-        glusterfs_ctx_t         *ctx = NULL;
-        gf_event_notify_req      req = {0,};
-        int32_t                  ret = -1;
-        cmd_args_t              *cmd_args = NULL;
-        call_frame_t            *frame = NULL;
-
-        ctx = glusterfsd_ctx;
-        cmd_args = &ctx->cmd_args;
-
-        frame = create_frame (THIS, ctx->pool);
-
-        req.op = GF_EN_DEFRAG_STATUS;
-
-        if (dict) {
-                ret = dict_set_str (dict, "volname", cmd_args->volfile_id);
-                if (ret)
-                        gf_log ("", GF_LOG_ERROR, "failed to set volname");
-
-                ret = dict_allocate_and_serialize (dict, &req.dict.dict_val,
-                                                   &req.dict.dict_len);
-        }
-
-        ret = mgmt_submit_request (&req, frame, ctx, &clnt_handshake_prog,
-                                   GF_HNDSK_EVENT_NOTIFY,
-                                   glusterfs_rebalance_event_notify_cbk,
-                                   (xdrproc_t)xdr_gf_event_notify_req);
-
-        GF_FREE (req.dict.dict_val);
-
-        STACK_DESTROY (frame->root);
-        return ret;
-}
 
 static int
 mgmt_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
                  void *data)
 {
-        xlator_t         *this = NULL;
-        glusterfs_ctx_t  *ctx = NULL;
+        xlator_t        *this = NULL;
+        glusterfs_ctx_t *ctx = NULL;
         int              ret = 0;
-        server_cmdline_t *server = NULL;
-        rpc_transport_t  *rpc_trans = NULL;
-        int              need_term = 0;
-        int              emval = 0;
 
         this = mydata;
-        rpc_trans = rpc->conn.trans;
         ctx = this->ctx;
 
         switch (event) {
         case RPC_CLNT_DISCONNECT:
                 if (!ctx->active) {
                         gf_log ("glusterfsd-mgmt", GF_LOG_ERROR,
-                                "failed to connect with remote-host: %s (%s)",
-                                ctx->cmd_args.volfile_server,
+                                "failed to connect with remote-host: %s",
                                 strerror (errno));
-                        server = ctx->cmd_args.curr_server;
-                        if (server->list.next == &ctx->cmd_args.volfile_servers) {
-                                need_term = 1;
-                                emval = ENOTCONN;
-                                gf_log("glusterfsd-mgmt", GF_LOG_INFO,
-                                       "Exhausted all volfile servers");
-                                break;
-                        }
-                        server = list_entry (server->list.next, typeof(*server),
-                                             list);
-                        ctx->cmd_args.curr_server = server;
-                        ctx->cmd_args.volfile_server = server->volfile_server;
-
-                        ret = dict_set_str (rpc_trans->options,
-                                            "remote-host",
-                                            server->volfile_server);
-                        if (ret != 0) {
-                                gf_log ("glusterfsd-mgmt", GF_LOG_ERROR,
-                                        "failed to set remote-host: %s",
-                                        server->volfile_server);
-                                need_term = 1;
-                                emval = ENOTCONN;
-                                break;
-                        }
-                        gf_log ("glusterfsd-mgmt", GF_LOG_INFO,
-                                "connecting to next volfile server %s",
-                                server->volfile_server);
+                        cleanup_and_exit (1);
                 }
                 break;
         case RPC_CLNT_CONNECT:
                 rpc_clnt_set_connected (&((struct rpc_clnt*)ctx->mgmt)->conn);
 
                 ret = glusterfs_volfile_fetch (ctx);
-                if (ret) {
-                        emval = ret;
-                        if (!ctx->active) {
-                                need_term = 1;
-                                gf_log ("glusterfsd-mgmt", GF_LOG_ERROR,
-                                        "failed to fetch volume file (key:%s)",
-                                        ctx->cmd_args.volfile_id);
-                                break;
-
-                        }
+                if (ret && ctx && (ctx->active == NULL)) {
+                        /* Do it only for the first time */
+                        /* Exit the process.. there is some wrong options */
+                        gf_log ("mgmt", GF_LOG_ERROR,
+                                "failed to fetch volume file (key:%s)",
+                                ctx->cmd_args.volfile_id);
+                        cleanup_and_exit (0);
                 }
 
                 if (is_mgmt_rpc_reconnect)
                         glusterfs_mgmt_pmap_signin (ctx);
-
                 break;
         default:
                 break;
         }
 
-        if (need_term) {
-                emancipate (ctx, emval);
-                cleanup_and_exit (1);
-        }
-
         return 0;
 }
 
@@ -1654,10 +768,16 @@ int
 glusterfs_rpcsvc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event,
                      void *data)
 {
+        xlator_t            *this = NULL;
+        rpc_transport_t     *xprt = NULL;
+
         if (!xl || !data) {
                 goto out;
         }
 
+        this = xl;
+        xprt = data;
+
         switch (event) {
         case RPCSVC_EVENT_ACCEPT:
         {
@@ -1697,7 +817,7 @@ glusterfs_listener_init (glusterfs_ctx_t *ctx)
         if (ret)
                 goto out;
 
-        rpc = rpcsvc_init (THIS, ctx, options, 8);
+        rpc = rpcsvc_init (ctx, options);
         if (rpc == NULL) {
                 goto out;
         }
@@ -1725,66 +845,6 @@ out:
 }
 
 int
-glusterfs_listener_stop (glusterfs_ctx_t *ctx)
-{
-        cmd_args_t              *cmd_args = NULL;
-        rpcsvc_t                *rpc = NULL;
-        rpcsvc_listener_t       *listener = NULL;
-        rpcsvc_listener_t       *next = NULL;
-        int                     ret = 0;
-        xlator_t                *this = NULL;
-
-        GF_ASSERT (ctx);
-
-        rpc = ctx->listener;
-        ctx->listener = NULL;
-
-        (void) rpcsvc_program_unregister(rpc, &glusterfs_mop_prog);
-
-        list_for_each_entry_safe (listener, next, &rpc->listeners, list) {
-                rpcsvc_listener_destroy (listener);
-        }
-
-        (void) rpcsvc_unregister_notify (rpc, glusterfs_rpcsvc_notify, THIS);
-
-        GF_FREE (rpc);
-
-        cmd_args = &ctx->cmd_args;
-        if (cmd_args->sock_file) {
-                ret = unlink (cmd_args->sock_file);
-                if (ret && (ENOENT == errno)) {
-                        ret = 0;
-                }
-        }
-
-        if (ret) {
-                this = THIS;
-                gf_log (this->name, GF_LOG_ERROR, "Failed to unlink listener "
-                        "socket %s, error: %s", cmd_args->sock_file,
-                        strerror (errno));
-        }
-        return ret;
-}
-
-int
-glusterfs_mgmt_notify (int32_t op, void *data, ...)
-{
-        int ret = 0;
-        switch (op)
-        {
-                case GF_EN_DEFRAG_STATUS:
-                        ret = glusterfs_rebalance_event_notify ((dict_t*) data);
-                        break;
-
-                default:
-                        gf_log ("", GF_LOG_ERROR, "Invalid op");
-                        break;
-        }
-
-        return ret;
-}
-
-int
 glusterfs_mgmt_init (glusterfs_ctx_t *ctx)
 {
         cmd_args_t              *cmd_args = NULL;
@@ -1810,34 +870,30 @@ glusterfs_mgmt_init (glusterfs_ctx_t *ctx)
         if (ret)
                 goto out;
 
-        rpc = rpc_clnt_new (options, THIS->ctx, THIS->name, 8);
+        rpc = rpc_clnt_new (options, THIS->ctx, THIS->name);
         if (!rpc) {
                 ret = -1;
-                gf_log (THIS->name, GF_LOG_WARNING, "failed to create rpc clnt");
+                gf_log ("", GF_LOG_WARNING, "failed to create rpc clnt");
                 goto out;
         }
 
         ret = rpc_clnt_register_notify (rpc, mgmt_rpc_notify, THIS);
         if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to register notify function");
+                gf_log ("", GF_LOG_WARNING, "failed to register notify function");
                 goto out;
         }
 
-        ret = rpcclnt_cbk_program_register (rpc, &mgmt_cbk_prog, THIS);
+        ret = rpcclnt_cbk_program_register (rpc, &mgmt_cbk_prog);
         if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to register callback function");
+                gf_log ("", GF_LOG_WARNING, "failed to register callback function");
                 goto out;
         }
 
-        ctx->notify = glusterfs_mgmt_notify;
+        ret = rpc_clnt_start (rpc);
+        if (ret)
+                goto out;
 
-        /* This value should be set before doing the 'rpc_clnt_start()' as
-           the notify function uses this variable */
         ctx->mgmt = rpc;
-
-        ret = rpc_clnt_start (rpc);
 out:
         return ret;
 }
@@ -1858,7 +914,7 @@ mgmt_pmap_signin2_cbk (struct rpc_req *req, struct iovec *iov, int count,
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_pmap_signin_rsp);
+        ret = xdr_to_pmap_signin_rsp (*iov, &rsp);
         if (ret < 0) {
                 gf_log (frame->this->name, GF_LOG_ERROR, "XDR decode error");
                 rsp.op_ret   = -1;
@@ -1897,7 +953,7 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
                 goto out;
         }
 
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_pmap_signin_rsp);
+        ret = xdr_to_pmap_signin_rsp (*iov, &rsp);
         if (ret < 0) {
                 gf_log (frame->this->name, GF_LOG_ERROR, "XDR decode error");
                 rsp.op_ret   = -1;
@@ -1911,7 +967,7 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
                 goto out;
         }
 
-        ctx = glusterfsd_ctx;
+        ctx = glusterfs_ctx_get ();
         cmd_args = &ctx->cmd_args;
 
         if (!cmd_args->brick_port2) {
@@ -1924,8 +980,8 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
         pmap_req.brick = brick_name;
 
         ret = mgmt_submit_request (&pmap_req, frame, ctx, &clnt_pmap_prog,
-                                   GF_PMAP_SIGNIN, mgmt_pmap_signin2_cbk,
-                                   (xdrproc_t)xdr_pmap_signin_req);
+                                   GF_PMAP_SIGNIN, xdr_from_pmap_signin_req,
+                                   mgmt_pmap_signin2_cbk);
         if (ret)
                 goto out;
 
@@ -1958,8 +1014,8 @@ glusterfs_mgmt_pmap_signin (glusterfs_ctx_t *ctx)
         req.brick = cmd_args->brick_name;
 
         ret = mgmt_submit_request (&req, frame, ctx, &clnt_pmap_prog,
-                                   GF_PMAP_SIGNIN, mgmt_pmap_signin_cbk,
-                                   (xdrproc_t)xdr_pmap_signin_req);
+                                   GF_PMAP_SIGNIN, xdr_from_pmap_signin_req,
+                                   mgmt_pmap_signin_cbk);
 
 out:
         return ret;
@@ -1971,30 +1027,35 @@ mgmt_pmap_signout_cbk (struct rpc_req *req, struct iovec *iov, int count,
                        void *myframe)
 {
         pmap_signout_rsp  rsp   = {0,};
+        call_frame_t    *frame = NULL;
         int              ret   = 0;
         glusterfs_ctx_t  *ctx = NULL;
 
+        frame = myframe;
+
         if (-1 == req->rpc_status) {
                 rsp.op_ret   = -1;
                 rsp.op_errno = EINVAL;
                 goto out;
         }
 
-        ctx = glusterfsd_ctx;
-        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_pmap_signout_rsp);
+        ctx = glusterfs_ctx_get ();
+        ret = xdr_to_pmap_signout_rsp (*iov, &rsp);
         if (ret < 0) {
-                gf_log (THIS->name, GF_LOG_ERROR, "XDR decoding failed");
+                gf_log ("", GF_LOG_ERROR, "XDR decoding failed");
                 rsp.op_ret   = -1;
                 rsp.op_errno = EINVAL;
                 goto out;
         }
 
         if (-1 == rsp.op_ret) {
-                gf_log (THIS->name, GF_LOG_ERROR,
+                gf_log ("", GF_LOG_ERROR,
                         "failed to register the port with glusterd");
                 goto out;
         }
 out:
+//        if (frame)
+//                STACK_DESTROY (frame->root);
         return 0;
 }
 
@@ -2020,8 +1081,8 @@ glusterfs_mgmt_pmap_signout (glusterfs_ctx_t *ctx)
         req.brick = cmd_args->brick_name;
 
         ret = mgmt_submit_request (&req, frame, ctx, &clnt_pmap_prog,
-                                   GF_PMAP_SIGNOUT, mgmt_pmap_signout_cbk,
-                                   (xdrproc_t)xdr_pmap_signout_req);
+                                   GF_PMAP_SIGNOUT, xdr_from_pmap_signout_req,
+                                   mgmt_pmap_signout_cbk);
 out:
         return ret;
 }
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 3cb8f0f51..104688343 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2006-2013 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -15,7 +25,6 @@
 #include <sys/types.h>
 #include <sys/resource.h>
 #include <sys/file.h>
-#include <sys/wait.h>
 #include <netdb.h>
 #include <signal.h>
 #include <libgen.h>
@@ -29,7 +38,6 @@
 #include <time.h>
 #include <semaphore.h>
 #include <errno.h>
-#include <pwd.h>
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -66,29 +74,26 @@
 #include "call-stub.h"
 #include <fnmatch.h>
 #include "rpc-clnt.h"
-#include "syncop.h"
-#include "client_t.h"
 
+#ifdef GF_DARWIN_HOST_OS
 #include "daemon.h"
+#else
+#define os_daemon(u, v) daemon (u, v)
+#endif
 
-/* process mode definitions */
-#define GF_SERVER_PROCESS   0
-#define GF_CLIENT_PROCESS   1
-#define GF_GLUSTERD_PROCESS 2
 
 /* using argp for command line parsing */
 static char gf_doc[] = "";
 static char argp_doc[] = "--volfile-server=SERVER [MOUNT-POINT]\n"       \
         "--volfile=VOLFILE [MOUNT-POINT]";
-const char *argp_program_version = ""
-        PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__
-        "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"
-        "Copyright (c) 2006-2013 Red Hat, Inc. <http://www.redhat.com/>\n"
-        "GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"
-        "It is licensed to you under your choice of the GNU Lesser\n"
-        "General Public License, version 3 or any later version (LGPLv3\n"
-        "or later), or the GNU General Public License, version 2 (GPLv2),\n"
-        "in all cases as published by the Free Software Foundation.";
+const char *argp_program_version = "" \
+        PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \
+        "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"  \
+        "Copyright (c) 2006-2011 Gluster Inc. "             \
+        "<http://www.gluster.com>\n"                                \
+        "GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"              \
+        "You may redistribute copies of GlusterFS under the terms of "\
+        "the GNU General Public License.";
 const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
 
 static error_t parse_opts (int32_t key, char *arg, struct argp_state *_state);
@@ -98,6 +103,10 @@ static struct argp_option gf_options[] = {
         {"volfile-server", ARGP_VOLFILE_SERVER_KEY, "SERVER", 0,
          "Server to get the volume file from.  This option overrides "
          "--volfile option"},
+        {"volfile-max-fetch-attempts", ARGP_VOLFILE_MAX_FETCH_ATTEMPTS,
+         "MAX-ATTEMPTS", 0, "Maximum number of connect attempts to server. "
+         "This option should be provided with --volfile-server option"
+         "[default: 1]"},
         {"volfile", ARGP_VOLUME_FILE_KEY, "VOLFILE", 0,
          "File to use as VOLUME_FILE"},
         {"spec-file", ARGP_VOLUME_FILE_KEY, "VOLFILE", OPTION_HIDDEN,
@@ -105,7 +114,7 @@ static struct argp_option gf_options[] = {
 
         {"log-level", ARGP_LOG_LEVEL_KEY, "LOGLEVEL", 0,
          "Logging severity.  Valid options are DEBUG, INFO, WARNING, ERROR, "
-         "CRITICAL, TRACE and NONE [default: INFO]"},
+         "CRITICAL and NONE [default: INFO]"},
         {"log-file", ARGP_LOG_FILE_KEY, "LOGFILE", 0,
          "File to use for logging [default: "
          DEFAULT_LOG_FILE_DIRECTORY "/" PACKAGE_NAME ".log" "]"},
@@ -130,27 +139,15 @@ static struct argp_option gf_options[] = {
         {"debug", ARGP_DEBUG_KEY, 0, 0,
          "Run in debug mode.  This option sets --no-daemon, --log-level "
          "to DEBUG and --log-file to console"},
-        {"volume-name", ARGP_VOLUME_NAME_KEY, "XLATOR-NAME", 0,
-         "Translator name to be used for MOUNT-POINT [default: top most volume "
-         "definition in VOLFILE]"},
-        {"xlator-option", ARGP_XLATOR_OPTION_KEY,"XLATOR-NAME.OPTION=VALUE", 0,
-         "Add/override an option for a translator in volume file with specified"
-         " value"},
+        {"volume-name", ARGP_VOLUME_NAME_KEY, "VOLUME-NAME", 0,
+         "Volume name to be used for MOUNT-POINT [default: top most volume "
+         "in VOLFILE]"},
+        {"xlator-option", ARGP_XLATOR_OPTION_KEY,"VOLUME-NAME.OPTION=VALUE", 0,
+         "Add/override a translator option for a volume with specified value"},
         {"read-only", ARGP_READ_ONLY_KEY, 0, 0,
          "Mount the filesystem in 'read-only' mode"},
         {"acl", ARGP_ACL_KEY, 0, 0,
          "Mount the filesystem with POSIX ACL support"},
-        {"selinux", ARGP_SELINUX_KEY, 0, 0,
-         "Enable SELinux label (extened attributes) support on inodes"},
-#ifdef GF_LINUX_HOST_OS
-        {"aux-gfid-mount", ARGP_AUX_GFID_MOUNT_KEY, 0, 0,
-         "Enable access to filesystem through gfid directly"},
-#endif
-        {"enable-ino32", ARGP_INODE32_KEY, "BOOL", OPTION_ARG_OPTIONAL,
-         "Use 32-bit inodes when mounting to workaround broken applications"
-         "that don't support 64-bit inodes"},
-        {"worm", ARGP_WORM_KEY, 0, 0,
-         "Mount the filesystem in 'worm' mode"},
         {"mac-compat", ARGP_MAC_COMPAT_KEY, "BOOL", OPTION_ARG_OPTIONAL,
          "Provide stubs for attributes needed for seamless operation on Macs "
 #ifdef GF_DARWIN_HOST_OS
@@ -163,8 +160,6 @@ static struct argp_option gf_options[] = {
          "Brick name to be registered with Gluster portmapper" },
         {"brick-port", ARGP_BRICK_PORT_KEY, "BRICK-PORT", OPTION_HIDDEN,
          "Brick Port to be registered with Gluster portmapper" },
-	{"fopen-keep-cache", ARGP_FOPEN_KEEP_CACHE_KEY, "BOOL", OPTION_ARG_OPTIONAL,
-	 "Do not purge the cache on file open"},
 
         {0, 0, 0, 0, "Fuse options:"},
         {"direct-io-mode", ARGP_DIRECT_IO_MODE_KEY, "BOOL", OPTION_ARG_OPTIONAL,
@@ -173,35 +168,15 @@ static struct argp_option gf_options[] = {
          "\"on\" for fds not opened with O_RDONLY]"},
         {"entry-timeout", ARGP_ENTRY_TIMEOUT_KEY, "SECONDS", 0,
          "Set entry timeout to SECONDS in fuse kernel module [default: 1]"},
-        {"negative-timeout", ARGP_NEGATIVE_TIMEOUT_KEY, "SECONDS", 0,
-         "Set negative timeout to SECONDS in fuse kernel module [default: 0]"},
         {"attribute-timeout", ARGP_ATTRIBUTE_TIMEOUT_KEY, "SECONDS", 0,
          "Set attribute timeout to SECONDS for inodes in fuse kernel module "
          "[default: 1]"},
-	{"gid-timeout", ARGP_GID_TIMEOUT_KEY, "SECONDS", 0,
-	 "Set auxilary group list timeout to SECONDS for fuse translator "
-	 "[default: 0]"},
-	{"background-qlen", ARGP_FUSE_BACKGROUND_QLEN_KEY, "N", 0,
-	 "Set fuse module's background queue length to N "
-	 "[default: 64]"},
-	{"congestion-threshold", ARGP_FUSE_CONGESTION_THRESHOLD_KEY, "N", 0,
-	 "Set fuse module's congestion threshold to N "
-	 "[default: 48]"},
         {"client-pid", ARGP_CLIENT_PID_KEY, "PID", OPTION_HIDDEN,
          "client will authenticate itself with process id PID to server"},
-        {"user-map-root", ARGP_USER_MAP_ROOT_KEY, "USER", OPTION_HIDDEN,
-         "replace USER with root in messages"},
         {"dump-fuse", ARGP_DUMP_FUSE_KEY, "PATH", 0,
          "Dump fuse traffic to PATH"},
         {"volfile-check", ARGP_VOLFILE_CHECK_KEY, 0, 0,
          "Enable strict volume file checking"},
-        {"mem-accounting", ARGP_MEM_ACCOUNTING_KEY, 0, OPTION_HIDDEN,
-         "Enable internal memory accounting"},
-        {"fuse-mountopts", ARGP_FUSE_MOUNTOPTS_KEY, "OPTIONS", OPTION_HIDDEN,
-         "Extra mount options to pass to FUSE"},
-        {"use-readdirp", ARGP_FUSE_USE_READDIRP_KEY, "BOOL", OPTION_ARG_OPTIONAL,
-         "Use readdirp mode in fuse kernel module"
-         " [default: \"off\"]"},
         {0, 0, 0, 0, "Miscellaneous Options:"},
         {0, }
 };
@@ -213,41 +188,45 @@ int glusterfs_pidfile_cleanup (glusterfs_ctx_t *ctx);
 int glusterfs_volumes_init (glusterfs_ctx_t *ctx);
 int glusterfs_mgmt_init (glusterfs_ctx_t *ctx);
 int glusterfs_listener_init (glusterfs_ctx_t *ctx);
-int glusterfs_listener_stop (glusterfs_ctx_t *ctx);
 
-
-static int
-set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
+int
+create_fuse_mount (glusterfs_ctx_t *ctx)
 {
         int              ret = 0;
         cmd_args_t      *cmd_args = NULL;
-        char            *mount_point = NULL;
-        char            cwd[PATH_MAX] = {0,};
+        xlator_t        *master = NULL;
 
         cmd_args = &ctx->cmd_args;
 
-        /* Check if mount-point is absolute path,
-         * if not convert to absolute path by concating with CWD
-         */
-        if (cmd_args->mount_point[0] != '/') {
-                if (getcwd (cwd, PATH_MAX) != NULL) {
-                        ret = gf_asprintf (&mount_point, "%s/%s", cwd,
-                                           cmd_args->mount_point);
-                        if (ret == -1) {
-                                gf_log ("glusterfsd", GF_LOG_ERROR,
-                                        "Could not create absolute mountpoint "
-                                        "path");
-                                goto err;
-                        }
-                } else {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "Could not get current working directory");
-                        goto err;
-                }
-        } else
-                mount_point = gf_strdup (cmd_args->mount_point);
+        if (!cmd_args->mount_point) {
+                gf_log ("", GF_LOG_TRACE,
+                        "mount point not found, not a client process");
+                return 0;
+        }
 
-        ret = dict_set_dynstr (options, ZR_MOUNTPOINT_OPT, mount_point);
+        master = GF_CALLOC (1, sizeof (*master),
+                            gfd_mt_xlator_t);
+        if (!master)
+                goto err;
+
+        master->name = gf_strdup ("fuse");
+        if (!master->name)
+                goto err;
+
+        if (xlator_set_type (master, "mount/fuse") == -1) {
+                gf_log ("glusterfsd", GF_LOG_ERROR,
+                        "MOUNT-POINT %s initialization failed",
+                        cmd_args->mount_point);
+                goto err;
+        }
+
+        master->ctx      = ctx;
+        master->options  = get_new_dict ();
+        if (!master->options)
+                goto err;
+
+        ret = dict_set_static_ptr (master->options, ZR_MOUNTPOINT_OPT,
+                                   cmd_args->mount_point);
         if (ret < 0) {
                 gf_log ("glusterfsd", GF_LOG_ERROR,
                         "failed to set mount-point to options dictionary");
@@ -255,7 +234,7 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
         }
 
         if (cmd_args->fuse_attribute_timeout >= 0) {
-                ret = dict_set_double (options, ZR_ATTR_TIMEOUT_OPT,
+                ret = dict_set_double (master->options, ZR_ATTR_TIMEOUT_OPT,
                                        cmd_args->fuse_attribute_timeout);
 
                 if (ret < 0) {
@@ -267,7 +246,7 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
         }
 
         if (cmd_args->fuse_entry_timeout >= 0) {
-                ret = dict_set_double (options, ZR_ENTRY_TIMEOUT_OPT,
+                ret = dict_set_double (master->options, ZR_ENTRY_TIMEOUT_OPT,
                                        cmd_args->fuse_entry_timeout);
                 if (ret < 0) {
                         gf_log ("glusterfsd", GF_LOG_ERROR,
@@ -277,19 +256,8 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
                 }
         }
 
-        if (cmd_args->fuse_negative_timeout >= 0) {
-                ret = dict_set_double (options, ZR_NEGATIVE_TIMEOUT_OPT,
-                                       cmd_args->fuse_negative_timeout);
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "failed to set dict value for key %s",
-                                ZR_NEGATIVE_TIMEOUT_OPT);
-                        goto err;
-                }
-        }
-
         if (cmd_args->client_pid_set) {
-                ret = dict_set_int32 (options, "client-pid",
+                ret = dict_set_int32 (master->options, "client-pid",
                                       cmd_args->client_pid);
                 if (ret < 0) {
                         gf_log ("glusterfsd", GF_LOG_ERROR,
@@ -299,19 +267,8 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
                 }
         }
 
-        if (cmd_args->uid_map_root) {
-                ret = dict_set_int32 (options, "uid-map-root",
-                                      cmd_args->uid_map_root);
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "failed to set dict value for key %s",
-                                "uid-map-root");
-                        goto err;
-                }
-        }
-
         if (cmd_args->volfile_check) {
-                ret = dict_set_int32 (options, ZR_STRICT_VOLFILE_CHECK,
+                ret = dict_set_int32 (master->options, ZR_STRICT_VOLFILE_CHECK,
                                       cmd_args->volfile_check);
                 if (ret < 0) {
                         gf_log ("glusterfsd", GF_LOG_ERROR,
@@ -322,7 +279,7 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
         }
 
         if (cmd_args->dump_fuse) {
-                ret = dict_set_static_ptr (options, ZR_DUMP_FUSE,
+                ret = dict_set_static_ptr (master->options, ZR_DUMP_FUSE,
                                            cmd_args->dump_fuse);
                 if (ret < 0) {
                         gf_log ("glusterfsd", GF_LOG_ERROR,
@@ -333,7 +290,7 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
         }
 
         if (cmd_args->acl) {
-                ret = dict_set_static_ptr (options, "acl", "on");
+                ret = dict_set_static_ptr (master->options, "acl", "on");
                 if (ret < 0) {
                         gf_log ("glusterfsd", GF_LOG_ERROR,
                                 "failed to set dict value for key acl");
@@ -341,104 +298,9 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
                 }
         }
 
-        if (cmd_args->selinux) {
-                ret = dict_set_static_ptr (options, "selinux", "on");
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "failed to set dict value for key selinux");
-                        goto err;
-                }
-        }
-
-        if (cmd_args->aux_gfid_mount) {
-                ret = dict_set_static_ptr (options, "virtual-gfid-access",
-                                           "on");
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "failed to set dict value for key "
-                                "aux-gfid-mount");
-                        goto err;
-                }
-        }
-
-        if (cmd_args->enable_ino32) {
-                ret = dict_set_static_ptr (options, "enable-ino32", "on");
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "failed to set dict value for key enable-ino32");
-                        goto err;
-                }
-        }
-
-        if (cmd_args->read_only) {
-                ret = dict_set_static_ptr (options, "read-only", "on");
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "failed to set dict value for key read-only");
-                        goto err;
-                }
-        }
-
-	switch (cmd_args->fopen_keep_cache) {
-	case GF_OPTION_ENABLE:
-		ret = dict_set_static_ptr(options, "fopen-keep-cache",
-			"on");
-		if (ret < 0) {
-			gf_log("glusterfsd", GF_LOG_ERROR,
-				"failed to set dict value for key "
-				"fopen-keep-cache");
-			goto err;
-		}
-		break;
-	case GF_OPTION_DISABLE:
-		ret = dict_set_static_ptr(options, "fopen-keep-cache",
-			"off");
-		if (ret < 0) {
-			gf_log("glusterfsd", GF_LOG_ERROR,
-				"failed to set dict value for key "
-				"fopen-keep-cache");
-			goto err;
-		}
-		break;
-        case GF_OPTION_DEFERRED: /* default */
-        default:
-                gf_log ("glusterfsd", GF_LOG_DEBUG,
-			"fopen-keep-cache mode %d",
-                        cmd_args->fopen_keep_cache);
-                break;
-	}
-
-	if (cmd_args->gid_timeout) {
-		ret = dict_set_int32(options, "gid-timeout",
-			cmd_args->gid_timeout);
-		if (ret < 0) {
-			gf_log("glusterfsd", GF_LOG_ERROR, "failed to set dict "
-				"value for key gid-timeout");
-			goto err;
-		}
-	}
-	if (cmd_args->background_qlen) {
-		ret = dict_set_int32 (options, "background-qlen",
-                                      cmd_args->background_qlen);
-		if (ret < 0) {
-			gf_log("glusterfsd", GF_LOG_ERROR, "failed to set dict "
-                               "value for key background-qlen");
-			goto err;
-		}
-	}
-	if (cmd_args->congestion_threshold) {
-		ret = dict_set_int32 (options, "congestion-threshold",
-                                      cmd_args->congestion_threshold);
-		if (ret < 0) {
-			gf_log("glusterfsd", GF_LOG_ERROR, "failed to set dict "
-                               "value for key congestion-threshold");
-			goto err;
-		}
-	}
-
         switch (cmd_args->fuse_direct_io_mode) {
         case GF_OPTION_DISABLE: /* disable */
-                ret = dict_set_static_ptr (options, ZR_DIRECT_IO_OPT,
+                ret = dict_set_static_ptr (master->options, ZR_DIRECT_IO_OPT,
                                            "disable");
                 if (ret < 0) {
                         gf_log ("glusterfsd", GF_LOG_ERROR,
@@ -448,7 +310,7 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
                 }
                 break;
         case GF_OPTION_ENABLE: /* enable */
-                ret = dict_set_static_ptr (options, ZR_DIRECT_IO_OPT,
+                ret = dict_set_static_ptr (master->options, ZR_DIRECT_IO_OPT,
                                            "enable");
                 if (ret < 0) {
                         gf_log ("glusterfsd", GF_LOG_ERROR,
@@ -464,87 +326,6 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
                 break;
         }
 
-        if (!cmd_args->no_daemon_mode) {
-                ret = dict_set_static_ptr (options, "sync-to-mount",
-                                           "enable");
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "failed to set dict value for key sync-mtab");
-                        goto err;
-                }
-        }
-
-        if (cmd_args->use_readdirp) {
-                ret = dict_set_str (options, "use-readdirp",
-                                    cmd_args->use_readdirp);
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR, "failed to set dict"
-                                " value for key use-readdirp");
-                        goto err;
-                }
-        }
-        ret = 0;
-err:
-        return ret;
-}
-
-int
-create_fuse_mount (glusterfs_ctx_t *ctx)
-{
-        int              ret = 0;
-        cmd_args_t      *cmd_args = NULL;
-        xlator_t        *master = NULL;
-
-        cmd_args = &ctx->cmd_args;
-
-        if (!cmd_args->mount_point) {
-                gf_log ("", GF_LOG_TRACE,
-                        "mount point not found, not a client process");
-                return 0;
-        }
-
-        if (ctx->process_mode != GF_CLIENT_PROCESS) {
-                gf_log("glusterfsd", GF_LOG_ERROR,
-                       "Not a client process, not performing mount operation");
-                return -1;
-        }
-
-        master = GF_CALLOC (1, sizeof (*master),
-                            gfd_mt_xlator_t);
-        if (!master)
-                goto err;
-
-        master->name = gf_strdup ("fuse");
-        if (!master->name)
-                goto err;
-
-        if (xlator_set_type (master, "mount/fuse") == -1) {
-                gf_log ("glusterfsd", GF_LOG_ERROR,
-                        "MOUNT-POINT %s initialization failed",
-                        cmd_args->mount_point);
-                goto err;
-        }
-
-        master->ctx      = ctx;
-        master->options  = get_new_dict ();
-        if (!master->options)
-                goto err;
-
-        ret = set_fuse_mount_options (ctx, master->options);
-        if (ret)
-                goto err;
-
-        if (cmd_args->fuse_mountopts) {
-                ret = dict_set_static_ptr (master->options, ZR_FUSE_MOUNTOPTS,
-                                           cmd_args->fuse_mountopts);
-                if (ret < 0) {
-                        gf_log ("glusterfsd", GF_LOG_ERROR,
-                                "failed to set dict value for key %s",
-                                ZR_FUSE_MOUNTOPTS);
-                        goto err;
-                }
-        }
-
         ret = xlator_init (master);
         if (ret) {
                 gf_log ("", GF_LOG_DEBUG, "failed to initialize fuse translator");
@@ -560,7 +341,7 @@ err:
                 xlator_destroy (master);
         }
 
-        return 1;
+        return -1;
 }
 
 
@@ -595,59 +376,9 @@ get_volfp (glusterfs_ctx_t *ctx)
         return specfp;
 }
 
-static int
-gf_remember_backup_volfile_server (char *arg)
-{
-        glusterfs_ctx_t         *ctx = NULL;
-        cmd_args_t              *cmd_args = NULL;
-        int                      ret = -1;
-        server_cmdline_t        *server = NULL;
-
-        ctx = glusterfsd_ctx;
-        if (!ctx)
-                goto out;
-        cmd_args = &ctx->cmd_args;
-
-        if(!cmd_args)
-                goto out;
-
-        server = GF_CALLOC (1, sizeof (server_cmdline_t),
-                            gfd_mt_server_cmdline_t);
-        if (!server)
-                goto out;
-
-        INIT_LIST_HEAD(&server->list);
-
-        server->volfile_server = gf_strdup(arg);
-
-        if (!cmd_args->volfile_server) {
-                cmd_args->volfile_server = server->volfile_server;
-                cmd_args->curr_server = server;
-        }
-
-        if (!server->volfile_server) {
-                gf_log ("", GF_LOG_WARNING,
-                        "xlator option %s is invalid", arg);
-                goto out;
-        }
-
-        list_add_tail (&server->list, &cmd_args->volfile_servers);
-
-        ret = 0;
-out:
-        if (ret == -1) {
-                if (server) {
-                        GF_FREE (server->volfile_server);
-                        GF_FREE (server);
-                }
-        }
-
-        return ret;
-
-}
 
 static int
-gf_remember_xlator_option (char *arg)
+gf_remember_xlator_option (struct list_head *options, char *arg)
 {
         glusterfs_ctx_t         *ctx = NULL;
         cmd_args_t              *cmd_args  = NULL;
@@ -656,7 +387,7 @@ gf_remember_xlator_option (char *arg)
         char                    *dot = NULL;
         char                    *equals = NULL;
 
-        ctx = glusterfsd_ctx;
+        ctx = glusterfs_ctx_get ();
         cmd_args = &ctx->cmd_args;
 
         option = GF_CALLOC (1, sizeof (xlator_cmdline_option_t),
@@ -708,9 +439,12 @@ gf_remember_xlator_option (char *arg)
 out:
         if (ret == -1) {
                 if (option) {
-                        GF_FREE (option->volume);
-                        GF_FREE (option->key);
-                        GF_FREE (option->value);
+                        if (option->volume)
+                                GF_FREE (option->volume);
+                        if (option->key)
+                                GF_FREE (option->key);
+                        if (option->value)
+                                GF_FREE (option->value);
 
                         GF_FREE (option);
                 }
@@ -732,14 +466,24 @@ parse_opts (int key, char *arg, struct argp_state *state)
         char          tmp_buf[2048] = {0,};
         char         *tmp_str       = NULL;
         char         *port_str      = NULL;
-        struct passwd *pw           = NULL;
 
         cmd_args = state->input;
 
         switch (key) {
         case ARGP_VOLFILE_SERVER_KEY:
-                gf_remember_backup_volfile_server (arg);
+                cmd_args->volfile_server = gf_strdup (arg);
+                break;
 
+        case ARGP_VOLFILE_MAX_FETCH_ATTEMPTS:
+                n = 0;
+
+                if (gf_string2uint_base10 (arg, &n) == 0) {
+                        cmd_args->max_connect_attempts = n;
+                        break;
+                }
+
+                argp_failure (state, -1, 0,
+                              "Invalid limit on connect attempts %s", arg);
                 break;
 
         case ARGP_READ_ONLY_KEY:
@@ -748,24 +492,6 @@ parse_opts (int key, char *arg, struct argp_state *state)
 
         case ARGP_ACL_KEY:
                 cmd_args->acl = 1;
-                gf_remember_xlator_option ("*-md-cache.cache-posix-acl=true");
-                break;
-
-        case ARGP_SELINUX_KEY:
-                cmd_args->selinux = 1;
-                gf_remember_xlator_option ("*-md-cache.cache-selinux=true");
-                break;
-
-        case ARGP_AUX_GFID_MOUNT_KEY:
-                cmd_args->aux_gfid_mount = 1;
-                break;
-
-        case ARGP_INODE32_KEY:
-                cmd_args->enable_ino32 = 1;
-                break;
-
-        case ARGP_WORM_KEY:
-                cmd_args->worm = 1;
                 break;
 
         case ARGP_MAC_COMPAT_KEY:
@@ -783,7 +509,8 @@ parse_opts (int key, char *arg, struct argp_state *state)
                 break;
 
         case ARGP_VOLUME_FILE_KEY:
-                GF_FREE (cmd_args->volfile);
+                if (cmd_args->volfile)
+                        GF_FREE (cmd_args->volfile);
 
                 if (arg[0] != '/') {
                         pwd = getcwd (NULL, PATH_MAX);
@@ -905,18 +632,6 @@ parse_opts (int key, char *arg, struct argp_state *state)
                 argp_failure (state, -1, 0, "unknown entry timeout %s", arg);
                 break;
 
-        case ARGP_NEGATIVE_TIMEOUT_KEY:
-                d = 0.0;
-
-                gf_string2double (arg, &d);
-                if (!(d < 0.0)) {
-                        cmd_args->fuse_negative_timeout = d;
-                        break;
-                }
-
-                argp_failure (state, -1, 0, "unknown negative timeout %s", arg);
-                break;
-
         case ARGP_ATTRIBUTE_TIMEOUT_KEY:
                 d = 0.0;
 
@@ -940,15 +655,6 @@ parse_opts (int key, char *arg, struct argp_state *state)
                               "unknown client pid %s", arg);
                 break;
 
-        case ARGP_USER_MAP_ROOT_KEY:
-                pw = getpwnam (arg);
-                if (pw)
-                        cmd_args->uid_map_root = pw->pw_uid;
-                else
-                        argp_failure (state, -1, 0,
-                                      "user %s does not exist", arg);
-                break;
-
         case ARGP_VOLFILE_CHECK_KEY:
                 cmd_args->volfile_check = 1;
                 break;
@@ -958,9 +664,8 @@ parse_opts (int key, char *arg, struct argp_state *state)
                 break;
 
         case ARGP_XLATOR_OPTION_KEY:
-                if (gf_remember_xlator_option (arg))
-                        argp_failure (state, -1, 0, "invalid xlator option  %s",
-                                      arg);
+                if (gf_remember_xlator_option (&cmd_args->xlator_options, arg))
+                        argp_failure (state, -1, 0, "invalid xlator option  %s", arg);
 
                 break;
 
@@ -1001,71 +706,7 @@ parse_opts (int key, char *arg, struct argp_state *state)
                 argp_failure (state, -1, 0,
                               "unknown brick (listen) port %s", arg);
                 break;
-
-        case ARGP_MEM_ACCOUNTING_KEY:
-                /* TODO: it should have got handled much earlier */
-		//gf_mem_acct_enable_set (THIS->ctx);
-                break;
-
-	case ARGP_FOPEN_KEEP_CACHE_KEY:
-                if (!arg)
-                        arg = "on";
-
-                if (gf_string2boolean (arg, &b) == 0) {
-                        cmd_args->fopen_keep_cache = b;
-
-                        break;
-                }
-
-                argp_failure (state, -1, 0,
-                              "unknown cache setting \"%s\"", arg);
-
-		break;
-
-	case ARGP_GID_TIMEOUT_KEY:
-		if (!gf_string2int(arg, &cmd_args->gid_timeout))
-			break;
-
-		argp_failure(state, -1, 0, "unknown group list timeout %s", arg);
-		break;
-        case ARGP_FUSE_BACKGROUND_QLEN_KEY:
-                if (!gf_string2int (arg, &cmd_args->background_qlen))
-                        break;
-
-                argp_failure (state, -1, 0,
-                              "unknown background qlen option %s", arg);
-                break;
-        case ARGP_FUSE_CONGESTION_THRESHOLD_KEY:
-                if (!gf_string2int (arg, &cmd_args->congestion_threshold))
-                        break;
-
-                argp_failure (state, -1, 0,
-                              "unknown congestion threshold option %s", arg);
-                break;
-
-        case ARGP_FUSE_MOUNTOPTS_KEY:
-                cmd_args->fuse_mountopts = gf_strdup (arg);
-                break;
-
-        case ARGP_FUSE_USE_READDIRP_KEY:
-                if (!arg)
-                        arg = "yes";
-
-                if (gf_string2boolean (arg, &b) == 0) {
-                        if (b) {
-                                cmd_args->use_readdirp = "yes";
-                        } else {
-                                cmd_args->use_readdirp = "no";
-                        }
-
-                        break;
-                }
-
-                argp_failure (state, -1, 0,
-                              "unknown use-readdirp setting \"%s\"", arg);
-                break;
-
-	}
+        }
 
         return 0;
 }
@@ -1077,7 +718,7 @@ cleanup_and_exit (int signum)
         glusterfs_ctx_t *ctx      = NULL;
         xlator_t        *trav     = NULL;
 
-        ctx = glusterfsd_ctx;
+        ctx = glusterfs_ctx_get ();
 
         if (!ctx)
                 return;
@@ -1090,17 +731,9 @@ cleanup_and_exit (int signum)
 
         ctx->cleanup_started = 1;
         glusterfs_mgmt_pmap_signout (ctx);
-
-        /* below part is a racy code where the rpcsvc object is freed.
-         * But in another thread (epoll thread), upon poll error in the
-         * socket the transports are cleaned up where again rpcsvc object
-         * is accessed (which is already freed by the below function).
-         * Since the process is about to be killed dont execute the function
-         * below.
-         */
-        /* if (ctx->listener) { */
-        /*         (void) glusterfs_listener_stop (ctx); */
-        /* } */
+        if (ctx->listener) {
+                ctx->listener = NULL;
+        }
 
         /* Call fini() of FUSE xlator first:
          * so there are no more requests coming and
@@ -1115,12 +748,9 @@ cleanup_and_exit (int signum)
 
         exit (0);
 #if 0
-        /* TODO: Properly do cleanup_and_exit(), with synchronization */
-        if (ctx->mgmt) {
-                /* cleanup the saved-frames before last unref */
-                rpc_clnt_connection_cleanup (&ctx->mgmt->conn);
+        /* TODO: Properly do cleanup_and_exit(), with synchronisations */
+        if (ctx->mgmt)
                 rpc_clnt_unref (ctx->mgmt);
-        }
 
         /* call fini() of each xlator */
         trav = NULL;
@@ -1144,7 +774,7 @@ reincarnate (int signum)
         glusterfs_ctx_t    *ctx = NULL;
         cmd_args_t         *cmd_args = NULL;
 
-        ctx = glusterfsd_ctx;
+        ctx = glusterfs_ctx_get ();
         cmd_args = &ctx->cmd_args;
 
         if (cmd_args->volfile_server) {
@@ -1152,11 +782,12 @@ reincarnate (int signum)
                         "Fetching the volume file from server...");
                 ret = glusterfs_volfile_fetch (ctx);
         } else {
-                gf_log ("glusterfsd", GF_LOG_DEBUG,
-                        "Not reloading volume specification file on SIGHUP");
+                gf_log ("glusterfsd", GF_LOG_INFO,
+                        "Reloading volfile ...");
+                ret = glusterfs_volumes_init (ctx);
         }
 
-        /* Also, SIGHUP should do logrotate */
+        /* Also, SIGHUP should do logroate */
         gf_log_logrotate (1);
 
         if (ret < 0)
@@ -1166,17 +797,40 @@ reincarnate (int signum)
         return;
 }
 
-void
-emancipate (glusterfs_ctx_t *ctx, int ret)
+
+static char *
+generate_uuid ()
 {
-        /* break free from the parent */
-        if (ctx->daemon_pipe[1] != -1) {
-                write (ctx->daemon_pipe[1], (void *) &ret, sizeof (ret));
-                close (ctx->daemon_pipe[1]);
-                ctx->daemon_pipe[1] = -1;
+        char           tmp_str[1024] = {0,};
+        char           hostname[256] = {0,};
+        struct timeval tv = {0,};
+        struct tm      now = {0, };
+        char           now_str[32];
+
+        if (gettimeofday (&tv, NULL) == -1) {
+                gf_log ("glusterfsd", GF_LOG_ERROR,
+                        "gettimeofday: failed %s",
+                        strerror (errno));
         }
+
+        if (gethostname (hostname, 256) == -1) {
+                gf_log ("glusterfsd", GF_LOG_ERROR,
+                        "gethostname: failed %s",
+                        strerror (errno));
+        }
+
+        localtime_r (&tv.tv_sec, &now);
+        strftime (now_str, 32, "%Y/%m/%d-%H:%M:%S", &now);
+        snprintf (tmp_str, 1024, "%s-%d-%s:%" GF_PRI_SUSECONDS,
+                  hostname, getpid(), now_str, tv.tv_usec);
+
+        return gf_strdup (tmp_str);
 }
 
+#define GF_SERVER_PROCESS   0
+#define GF_CLIENT_PROCESS   1
+#define GF_GLUSTERD_PROCESS 2
+
 static uint8_t
 gf_get_process_mode (char *exec_name)
 {
@@ -1200,167 +854,182 @@ gf_get_process_mode (char *exec_name)
 }
 
 
+
+static int
+set_log_file_path (cmd_args_t *cmd_args)
+{
+        int   i = 0;
+        int   j = 0;
+        int   ret = 0;
+        int   port = 0;
+        char *tmp_ptr = NULL;
+        char  tmp_str[1024] = {0,};
+
+        if (cmd_args->mount_point) {
+                j = 0;
+                i = 0;
+                if (cmd_args->mount_point[0] == '/')
+                        i = 1;
+                for (; i < strlen (cmd_args->mount_point); i++,j++) {
+                        tmp_str[j] = cmd_args->mount_point[i];
+                        if (cmd_args->mount_point[i] == '/')
+                                tmp_str[j] = '-';
+                }
+
+                ret = gf_asprintf (&cmd_args->log_file,
+                                   DEFAULT_LOG_FILE_DIRECTORY "/%s.log",
+                                   tmp_str);
+                goto done;
+        }
+
+        if (cmd_args->volfile) {
+                j = 0;
+                i = 0;
+                if (cmd_args->volfile[0] == '/')
+                        i = 1;
+                for (; i < strlen (cmd_args->volfile); i++,j++) {
+                        tmp_str[j] = cmd_args->volfile[i];
+                        if (cmd_args->volfile[i] == '/')
+                                tmp_str[j] = '-';
+                }
+                ret = gf_asprintf (&cmd_args->log_file,
+                                   DEFAULT_LOG_FILE_DIRECTORY "/%s.log",
+                                   tmp_str);
+                goto done;
+        }
+
+        if (cmd_args->volfile_server) {
+                port = 1;
+                tmp_ptr = "default";
+
+                if (cmd_args->volfile_server_port)
+                        port = cmd_args->volfile_server_port;
+                if (cmd_args->volfile_id)
+                        tmp_ptr = cmd_args->volfile_id;
+
+                ret = gf_asprintf (&cmd_args->log_file,
+                                   DEFAULT_LOG_FILE_DIRECTORY "/%s-%s-%d.log",
+                                   cmd_args->volfile_server, tmp_ptr, port);
+        }
+done:
+        return ret;
+}
+
+
 static int
 glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
 {
-        cmd_args_t          *cmd_args = NULL;
-        struct rlimit        lim      = {0, };
-        int                  ret      = -1;
+        cmd_args_t    *cmd_args = NULL;
+        struct rlimit  lim = {0, };
+        call_pool_t   *pool = NULL;
 
         xlator_mem_acct_init (THIS, gfd_mt_end);
 
-        ctx->process_uuid = generate_glusterfs_ctx_id ();
+        ctx->process_uuid = generate_uuid ();
         if (!ctx->process_uuid) {
                 gf_log ("", GF_LOG_CRITICAL,
                         "ERROR: glusterfs uuid generation failed");
-                goto out;
+                return -1;
         }
 
         ctx->page_size  = 128 * GF_UNIT_KB;
 
-        ctx->iobuf_pool = iobuf_pool_new ();
+        ctx->iobuf_pool = iobuf_pool_new (8 * GF_UNIT_MB, ctx->page_size);
         if (!ctx->iobuf_pool) {
                 gf_log ("", GF_LOG_CRITICAL,
                         "ERROR: glusterfs iobuf pool creation failed");
-                goto out;
+                return -1;
         }
 
         ctx->event_pool = event_pool_new (DEFAULT_EVENT_POOL_SIZE);
         if (!ctx->event_pool) {
                 gf_log ("", GF_LOG_CRITICAL,
                         "ERROR: glusterfs event pool creation failed");
-                goto out;
+                return -1;
         }
 
-        ctx->pool = GF_CALLOC (1, sizeof (call_pool_t), gfd_mt_call_pool_t);
-        if (!ctx->pool) {
+        pool = GF_CALLOC (1, sizeof (call_pool_t),
+                          gfd_mt_call_pool_t);
+        if (!pool) {
                 gf_log ("", GF_LOG_CRITICAL,
                         "ERROR: glusterfs call pool creation failed");
-                goto out;
+                return -1;
         }
 
-        INIT_LIST_HEAD (&ctx->pool->all_frames);
-        LOCK_INIT (&ctx->pool->lock);
+        /* frame_mem_pool size 112 * 16k */
+        pool->frame_mem_pool = mem_pool_new (call_frame_t, 16384);
 
-        /* frame_mem_pool size 112 * 4k */
-        ctx->pool->frame_mem_pool = mem_pool_new (call_frame_t, 4096);
-        if (!ctx->pool->frame_mem_pool) {
+        if (!pool->frame_mem_pool) {
                 gf_log ("", GF_LOG_CRITICAL,
                         "ERROR: glusterfs frame pool creation failed");
-                goto out;
+                return -1;
         }
-        /* stack_mem_pool size 256 * 1024 */
-        ctx->pool->stack_mem_pool = mem_pool_new (call_stack_t, 1024);
-        if (!ctx->pool->stack_mem_pool) {
+        /* stack_mem_pool size 256 * 8k */
+        pool->stack_mem_pool = mem_pool_new (call_stack_t, 8192);
+
+        if (!pool->stack_mem_pool) {
                 gf_log ("", GF_LOG_CRITICAL,
                         "ERROR: glusterfs stack pool creation failed");
-                goto out;
+                return -1;
         }
 
         ctx->stub_mem_pool = mem_pool_new (call_stub_t, 1024);
         if (!ctx->stub_mem_pool) {
                 gf_log ("", GF_LOG_CRITICAL,
                         "ERROR: glusterfs stub pool creation failed");
-                goto out;
+                return -1;
         }
 
-        ctx->dict_pool = mem_pool_new (dict_t, GF_MEMPOOL_COUNT_OF_DICT_T);
-        if (!ctx->dict_pool)
-                goto out;
-
-        ctx->dict_pair_pool = mem_pool_new (data_pair_t,
-                                            GF_MEMPOOL_COUNT_OF_DATA_PAIR_T);
-        if (!ctx->dict_pair_pool)
-                goto out;
-
-        ctx->dict_data_pool = mem_pool_new (data_t, GF_MEMPOOL_COUNT_OF_DATA_T);
-        if (!ctx->dict_data_pool)
-                goto out;
+        INIT_LIST_HEAD (&pool->all_frames);
+        LOCK_INIT (&pool->lock);
+        ctx->pool = pool;
 
         pthread_mutex_init (&(ctx->lock), NULL);
 
-        ctx->clienttable = gf_clienttable_alloc();
-        if (!ctx->clienttable)
-                goto out;
-
         cmd_args = &ctx->cmd_args;
 
         /* parsing command line arguments */
         cmd_args->log_level = DEFAULT_LOG_LEVEL;
-
-        cmd_args->mac_compat = GF_OPTION_DISABLE;
 #ifdef GF_DARWIN_HOST_OS
+        cmd_args->mac_compat = GF_OPTION_DEFERRED;
         /* On Darwin machines, O_APPEND is not handled,
          * which may corrupt the data
          */
         cmd_args->fuse_direct_io_mode = GF_OPTION_DISABLE;
 #else
+        cmd_args->mac_compat = GF_OPTION_DISABLE;
         cmd_args->fuse_direct_io_mode = GF_OPTION_DEFERRED;
 #endif
         cmd_args->fuse_attribute_timeout = -1;
         cmd_args->fuse_entry_timeout = -1;
-	cmd_args->fopen_keep_cache = GF_OPTION_DEFERRED;
 
         INIT_LIST_HEAD (&cmd_args->xlator_options);
-        INIT_LIST_HEAD (&cmd_args->volfile_servers);
 
         lim.rlim_cur = RLIM_INFINITY;
         lim.rlim_max = RLIM_INFINITY;
         setrlimit (RLIMIT_CORE, &lim);
 
-        ret = 0;
-out:
-
-        if (ret && ctx) {
-                if (ctx->pool) {
-                        mem_pool_destroy (ctx->pool->frame_mem_pool);
-                        mem_pool_destroy (ctx->pool->stack_mem_pool);
-                }
-                GF_FREE (ctx->pool);
-                mem_pool_destroy (ctx->stub_mem_pool);
-                mem_pool_destroy (ctx->dict_pool);
-                mem_pool_destroy (ctx->dict_data_pool);
-                mem_pool_destroy (ctx->dict_pair_pool);
-        }
-
-        return ret;
+        return 0;
 }
 
+
 static int
-logging_init (glusterfs_ctx_t *ctx, const char *progpath)
+logging_init (glusterfs_ctx_t *ctx)
 {
         cmd_args_t *cmd_args = NULL;
         int         ret = 0;
-        char        ident[1024] = {0,};
-        char       *progname = NULL;
-        char       *ptr = NULL;
 
         cmd_args = &ctx->cmd_args;
 
         if (cmd_args->log_file == NULL) {
-                ret = gf_set_log_file_path (cmd_args);
+                ret = set_log_file_path (cmd_args);
                 if (ret == -1) {
                         fprintf (stderr, "ERROR: failed to set the log file path\n");
                         return -1;
                 }
         }
 
-#ifdef GF_USE_SYSLOG
-        progname  = gf_strdup (progpath);
-        snprintf (ident, 1024, "%s_%s", basename(progname),
-                  basename(cmd_args->log_file));
-        GF_FREE (progname);
-        /* remove .log suffix */
-        if (NULL != (ptr = strrchr(ident, '.'))) {
-                if (strcmp(ptr, ".log") == 0) {
-                        /* note: ptr points to location in ident only */
-                        ptr[0] = '\0';
-                }
-        }
-        ptr = ident;
-#endif
-
-        if (gf_log_init (ctx, cmd_args->log_file, ptr) == -1) {
+        if (gf_log_init (cmd_args->log_file) == -1) {
                 fprintf (stderr, "ERROR: failed to open logfile %s\n",
                          cmd_args->log_file);
                 return -1;
@@ -1371,29 +1040,20 @@ logging_init (glusterfs_ctx_t *ctx, const char *progpath)
         return 0;
 }
 
-void
-gf_check_and_set_mem_acct (glusterfs_ctx_t *ctx, int argc, char *argv[])
-{
-        int i = 0;
-        for (i = 0; i < argc; i++) {
-                if (strcmp (argv[i], "--mem-accounting") == 0) {
-			gf_mem_acct_enable_set (ctx);
-                        break;
-                }
-        }
-}
 
 int
 parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx)
 {
-        int          process_mode = 0;
-        int          ret = 0;
-        struct stat  stbuf = {0, };
-        char         timestr[32];
-        char         tmp_logfile[1024] = { 0 };
-        char        *tmp_logfile_dyn = NULL;
-        char        *tmp_logfilebase = NULL;
-        cmd_args_t  *cmd_args = NULL;
+        int               process_mode = 0;
+        int               ret = 0;
+        struct stat       stbuf = {0, };
+        struct tm        *tm = NULL;
+        time_t            utime;
+        char              timestr[256];
+        char              tmp_logfile[1024] = { 0 };
+        char              *tmp_logfile_dyn = NULL;
+        char              *tmp_logfilebase = NULL;
+        cmd_args_t        *cmd_args = NULL;
 
         cmd_args = &ctx->cmd_args;
 
@@ -1406,17 +1066,6 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx)
         }
 
         process_mode = gf_get_process_mode (argv[0]);
-        ctx->process_mode = process_mode;
-
-        /* Make sure after the parsing cli, if '--volfile-server' option is
-           given, then '--volfile-id' is mandatory */
-        if (cmd_args->volfile_server && !cmd_args->volfile_id) {
-                gf_log ("glusterfs", GF_LOG_CRITICAL,
-                        "ERROR: '--volfile-id' is mandatory if '-s' OR "
-                        "'--volfile-server' option is given");
-                ret = -1;
-                goto out;
-        }
 
         if ((cmd_args->volfile_server == NULL)
             && (cmd_args->volfile == NULL)) {
@@ -1426,19 +1075,6 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx)
                         cmd_args->volfile = gf_strdup (DEFAULT_GLUSTERD_VOLFILE);
                 else
                         cmd_args->volfile = gf_strdup (DEFAULT_CLIENT_VOLFILE);
-
-                /* Check if the volfile exists, if not give usage output
-                   and exit */
-                ret = stat (cmd_args->volfile, &stbuf);
-                if (ret) {
-                        gf_log ("glusterfs", GF_LOG_CRITICAL,
-                                "ERROR: parsing the volfile failed (%s)\n",
-                                strerror (errno));
-                        /* argp_usage (argp.) */
-                        fprintf (stderr, "USAGE: %s [options] [mountpoint]\n",
-                                 argv[0]);
-                        goto out;
-                }
         }
 
         if (cmd_args->run_id) {
@@ -1449,9 +1085,9 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx)
                 if (((ret == 0) &&
                      (S_ISREG (stbuf.st_mode) || S_ISLNK (stbuf.st_mode))) ||
                     (ret == -1)) {
-                        /* Have separate logfile per run */
-                        gf_time_fmt (timestr, sizeof timestr, time (NULL),
-                                     gf_timefmt_FT);
+                        /* Have seperate logfile per run */
+                        tm = localtime (&utime);
+                        strftime (timestr, 256, "%Y%m%d.%H%M%S", tm);
                         sprintf (tmp_logfile, "%s.%s.%d",
                                  cmd_args->log_file, timestr, getpid ());
 
@@ -1464,23 +1100,15 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx)
                                            cmd_args->log_file);
                         if (ret == -1) {
                                 fprintf (stderr, "ERROR: symlink of logfile failed\n");
-                                goto out;
+                        } else {
+                                GF_FREE (cmd_args->log_file);
+                                cmd_args->log_file = gf_strdup (tmp_logfile);
                         }
 
-                        GF_FREE (cmd_args->log_file);
-                        cmd_args->log_file = gf_strdup (tmp_logfile);
-
                         GF_FREE (tmp_logfile_dyn);
                 }
         }
 
-#ifdef GF_DARWIN_HOST_OS
-        if (cmd_args->mount_point)
-                cmd_args->mac_compat = GF_OPTION_DEFERRED;
-#endif
-
-        ret = 0;
-out:
         return ret;
 }
 
@@ -1489,7 +1117,7 @@ int
 glusterfs_pidfile_setup (glusterfs_ctx_t *ctx)
 {
         cmd_args_t  *cmd_args = NULL;
-        int          ret = -1;
+        int          ret = 0;
         FILE        *pidfp = NULL;
 
         cmd_args = &ctx->cmd_args;
@@ -1502,7 +1130,7 @@ glusterfs_pidfile_setup (glusterfs_ctx_t *ctx)
                 gf_log ("glusterfsd", GF_LOG_ERROR,
                         "pidfile %s error (%s)",
                         cmd_args->pid_file, strerror (errno));
-                goto out;
+                return -1;
         }
 
         ret = lockf (fileno (pidfp), F_TLOCK, 0);
@@ -1510,7 +1138,7 @@ glusterfs_pidfile_setup (glusterfs_ctx_t *ctx)
                 gf_log ("glusterfsd", GF_LOG_ERROR,
                         "pidfile %s lock error (%s)",
                         cmd_args->pid_file, strerror (errno));
-                goto out;
+                return ret;
         }
 
         gf_log ("glusterfsd", GF_LOG_TRACE,
@@ -1522,17 +1150,12 @@ glusterfs_pidfile_setup (glusterfs_ctx_t *ctx)
                 gf_log ("glusterfsd", GF_LOG_ERROR,
                         "pidfile %s unlock error (%s)",
                         cmd_args->pid_file, strerror (errno));
-                goto out;
+                return ret;
         }
 
         ctx->pidfp = pidfp;
 
-        ret = 0;
-out:
-        if (ret && pidfp)
-                fclose (pidfp);
-
-        return ret;
+        return 0;
 }
 
 
@@ -1645,10 +1268,10 @@ glusterfs_sigwaiter (void *arg)
                         reincarnate (sig);
                         break;
                 case SIGUSR1:
-                        gf_proc_dump_info (sig, glusterfsd_ctx);
+                        gf_proc_dump_info (sig);
                         break;
                 case SIGUSR2:
-                        gf_latency_toggle (sig, glusterfsd_ctx);
+                        gf_latency_toggle (sig);
                         break;
                 default:
 
@@ -1660,13 +1283,6 @@ glusterfs_sigwaiter (void *arg)
 }
 
 
-void
-glusterfsd_print_trace (int signum)
-{
-	gf_print_trace (signum, glusterfsd_ctx);
-}
-
-
 int
 glusterfs_signals_setup (glusterfs_ctx_t *ctx)
 {
@@ -1676,12 +1292,12 @@ glusterfs_signals_setup (glusterfs_ctx_t *ctx)
         sigemptyset (&set);
 
         /* common setting for all threads */
-        signal (SIGSEGV, glusterfsd_print_trace);
-        signal (SIGABRT, glusterfsd_print_trace);
-        signal (SIGILL, glusterfsd_print_trace);
-        signal (SIGTRAP, glusterfsd_print_trace);
-        signal (SIGFPE, glusterfsd_print_trace);
-        signal (SIGBUS, glusterfsd_print_trace);
+        signal (SIGSEGV, gf_print_trace);
+        signal (SIGABRT, gf_print_trace);
+        signal (SIGILL, gf_print_trace);
+        signal (SIGTRAP, gf_print_trace);
+        signal (SIGFPE, gf_print_trace);
+        signal (SIGBUS, gf_print_trace);
         signal (SIGINT, cleanup_and_exit);
         signal (SIGPIPE, SIG_IGN);
 
@@ -1693,7 +1309,7 @@ glusterfs_signals_setup (glusterfs_ctx_t *ctx)
 
         ret = pthread_sigmask (SIG_BLOCK, &set, NULL);
         if (ret) {
-                gf_log ("glusterfsd", GF_LOG_WARNING,
+                gf_log ("", GF_LOG_WARNING,
                         "failed to execute pthread_signmask  %s",
                         strerror (errno));
                 return ret;
@@ -1707,7 +1323,7 @@ glusterfs_signals_setup (glusterfs_ctx_t *ctx)
                   fallback to signals getting handled by other threads.
                   setup the signal handlers
                 */
-                gf_log ("glusterfsd", GF_LOG_WARNING,
+                gf_log ("", GF_LOG_WARNING,
                         "failed to create pthread  %s",
                         strerror (errno));
                 return ret;
@@ -1722,8 +1338,6 @@ daemonize (glusterfs_ctx_t *ctx)
 {
         int            ret = -1;
         cmd_args_t    *cmd_args = NULL;
-        int            cstatus = 0;
-        int            err = 0;
 
         cmd_args = &ctx->cmd_args;
 
@@ -1737,48 +1351,11 @@ daemonize (glusterfs_ctx_t *ctx)
         if (cmd_args->debug_mode)
                 goto postfork;
 
-        ret = pipe (ctx->daemon_pipe);
-        if (ret) {
-                /* If pipe() fails, retain daemon_pipe[] = {-1, -1}
-                   and parent will just not wait for child status
-                */
-                ctx->daemon_pipe[0] = -1;
-                ctx->daemon_pipe[1] = -1;
-        }
-
-        ret = os_daemon_return (0, 0);
-        switch (ret) {
-        case -1:
-                if (ctx->daemon_pipe[0] != -1) {
-                        close (ctx->daemon_pipe[0]);
-                        close (ctx->daemon_pipe[1]);
-                }
-
+        ret = os_daemon (0, 0);
+        if (ret == -1) {
                 gf_log ("daemonize", GF_LOG_ERROR,
                         "Daemonization failed: %s", strerror(errno));
                 goto out;
-        case 0:
-                /* child */
-                /* close read */
-                close (ctx->daemon_pipe[0]);
-                break;
-        default:
-                /* parent */
-                /* close write */
-                close (ctx->daemon_pipe[1]);
-
-                if (ctx->mnt_pid > 0) {
-                        ret = waitpid (ctx->mnt_pid, &cstatus, 0);
-                        if (!(ret == ctx->mnt_pid && cstatus == 0)) {
-                                gf_log ("daemonize", GF_LOG_ERROR,
-                                        "mount failed");
-                                exit (1);
-                        }
-                }
-
-                err = 1;
-                read (ctx->daemon_pipe[0], (void *)&err, sizeof (err));
-                _exit (err);
         }
 
 postfork:
@@ -1827,7 +1404,7 @@ glusterfs_process_volfp (glusterfs_ctx_t *ctx, FILE *fp)
                 goto out;
         }
 
-        gf_log_dump_graph (fp, graph);
+        gf_log_volume_file (fp);
 
         ret = 0;
 out:
@@ -1860,8 +1437,7 @@ glusterfs_volumes_init (glusterfs_ctx_t *ctx)
 
         if (cmd_args->volfile_server) {
                 ret = glusterfs_mgmt_init (ctx);
-                /* return, do not emancipate() yet */
-                return ret;
+                goto out;
         }
 
         fp = get_volfp (ctx);
@@ -1878,41 +1454,26 @@ glusterfs_volumes_init (glusterfs_ctx_t *ctx)
                 goto out;
 
 out:
-        emancipate (ctx, ret);
         return ret;
 }
 
 
-/* This is the only legal global pointer  */
-glusterfs_ctx_t *glusterfsd_ctx;
-
 int
 main (int argc, char *argv[])
 {
         glusterfs_ctx_t  *ctx = NULL;
         int               ret = -1;
-        char              cmdlinestr[PATH_MAX] = {0,};
 
-	ctx = glusterfs_ctx_new ();
+        ret = glusterfs_globals_init ();
+        if (ret)
+                return ret;
+
+        ctx = glusterfs_ctx_get ();
         if (!ctx) {
                 gf_log ("glusterfs", GF_LOG_CRITICAL,
                         "ERROR: glusterfs context not initialized");
                 return ENOMEM;
         }
-	glusterfsd_ctx = ctx;
-
-#ifdef DEBUG
-        gf_mem_acct_enable_set (ctx);
-#else
-        /* Enable memory accounting on the fly based on argument */
-        gf_check_and_set_mem_acct (ctx, argc, argv);
-#endif
-
-        ret = glusterfs_globals_init (ctx);
-        if (ret)
-                return ret;
-
-	THIS->ctx = ctx;
 
         ret = glusterfs_ctx_defaults_init (ctx);
         if (ret)
@@ -1922,23 +1483,14 @@ main (int argc, char *argv[])
         if (ret)
                 goto out;
 
-        ret = logging_init (ctx, argv[0]);
+        ret = logging_init (ctx);
         if (ret)
                 goto out;
 
-        /* log the version of glusterfs running here along with the actual
-           command line options. */
-        {
-                int i = 0;
-                strcpy (cmdlinestr, argv[0]);
-                for (i = 1; i < argc; i++) {
-                        strcat (cmdlinestr, " ");
-                        strcat (cmdlinestr, argv[i]);
-                }
-                gf_log (argv[0], GF_LOG_INFO,
-                        "Started running %s version %s (%s)",
-                        argv[0], PACKAGE_VERSION, cmdlinestr);
-        }
+        /* log the version of glusterfs running here */
+        gf_log (argv[0], GF_LOG_INFO,
+                "Started running %s version %s",
+                argv[0], PACKAGE_VERSION);
 
         gf_proc_dump_init();
 
@@ -1950,13 +1502,6 @@ main (int argc, char *argv[])
         if (ret)
                 goto out;
 
-	ctx->env = syncenv_new (0, 0, 0);
-        if (!ctx->env) {
-                gf_log ("", GF_LOG_ERROR,
-                        "Could not create new sync-environment");
-                goto out;
-        }
-
         ret = glusterfs_volumes_init (ctx);
         if (ret)
                 goto out;
diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h
index 9e2a0e56e..f5013dfe6 100644
--- a/glusterfsd/src/glusterfsd.h
+++ b/glusterfsd/src/glusterfsd.h
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #ifndef __GLUSTERFSD_H__
 #define __GLUSTERFSD_H__
 
@@ -14,12 +24,13 @@
 #define _CONFIG_H
 #include "config.h"
 #endif
-#include "rpcsvc.h"
-#include "glusterd1-xdr.h"
+
 
 #define DEFAULT_GLUSTERD_VOLFILE              CONFDIR "/glusterd.vol"
 #define DEFAULT_CLIENT_VOLFILE                CONFDIR "/glusterfs.vol"
 #define DEFAULT_SERVER_VOLFILE                CONFDIR "/glusterfsd.vol"
+#define DEFAULT_LOG_FILE_DIRECTORY            DATADIR "/log/glusterfs"
+#define DEFAULT_LOG_LEVEL                     GF_LOG_INFO
 
 #define DEFAULT_EVENT_POOL_SIZE            16384
 
@@ -28,17 +39,12 @@
 #define ARGP_LOG_LEVEL_CRITICAL_OPTION    "CRITICAL"
 #define ARGP_LOG_LEVEL_ERROR_OPTION       "ERROR"
 #define ARGP_LOG_LEVEL_WARNING_OPTION     "WARNING"
-#define ARGP_LOG_LEVEL_INFO_OPTION        "INFO"
+#define ARGP_LOG_LEVEL_INFO_OPTION      "INFO"
 #define ARGP_LOG_LEVEL_DEBUG_OPTION       "DEBUG"
 
 #define ENABLE_NO_DAEMON_MODE     1
 #define ENABLE_DEBUG_MODE         1
 
-#define GF_MEMPOOL_COUNT_OF_DICT_T        4096
-/* Considering 4 key/value pairs in a dictionary on an average */
-#define GF_MEMPOOL_COUNT_OF_DATA_T        (GF_MEMPOOL_COUNT_OF_DICT_T * 4)
-#define GF_MEMPOOL_COUNT_OF_DATA_PAIR_T   (GF_MEMPOOL_COUNT_OF_DICT_T * 4)
-
 enum argp_option_keys {
         ARGP_VOLFILE_SERVER_KEY           = 's',
         ARGP_VOLUME_FILE_KEY              = 'f',
@@ -51,7 +57,6 @@ enum argp_option_keys {
         ARGP_NO_DAEMON_KEY                = 'N',
         ARGP_RUN_ID_KEY                   = 'r',
         ARGP_DEBUG_KEY                    = 133,
-        ARGP_NEGATIVE_TIMEOUT_KEY         = 134,
         ARGP_ENTRY_TIMEOUT_KEY            = 135,
         ARGP_ATTRIBUTE_TIMEOUT_KEY        = 136,
         ARGP_VOLUME_NAME_KEY              = 137,
@@ -72,42 +77,11 @@ enum argp_option_keys {
         ARGP_BRICK_PORT_KEY               = 152,
         ARGP_CLIENT_PID_KEY               = 153,
         ARGP_ACL_KEY                      = 154,
-        ARGP_WORM_KEY                     = 155,
-        ARGP_USER_MAP_ROOT_KEY            = 156,
-        ARGP_MEM_ACCOUNTING_KEY           = 157,
-        ARGP_SELINUX_KEY                  = 158,
-	ARGP_FOPEN_KEEP_CACHE_KEY	  = 159,
-	ARGP_GID_TIMEOUT_KEY		  = 160,
-	ARGP_FUSE_BACKGROUND_QLEN_KEY     = 161,
-	ARGP_FUSE_CONGESTION_THRESHOLD_KEY = 162,
-        ARGP_INODE32_KEY                  = 163,
-	ARGP_FUSE_MOUNTOPTS_KEY		  = 164,
-        ARGP_FUSE_USE_READDIRP_KEY        = 165,
-	ARGP_AUX_GFID_MOUNT_KEY		  = 166,
-};
-
-struct _gfd_vol_top_priv_t {
-        rpcsvc_request_t        *req;
-        gd1_mgmt_brick_op_req   xlator_req;
-        uint32_t                blk_count;
-        uint32_t                blk_size;
-        double                  throughput;
-        double                  time;
-        int32_t                 ret;
 };
-typedef struct _gfd_vol_top_priv_t gfd_vol_top_priv_t;
 
 int glusterfs_mgmt_pmap_signout (glusterfs_ctx_t *ctx);
 int glusterfs_mgmt_pmap_signin (glusterfs_ctx_t *ctx);
 int glusterfs_volfile_fetch (glusterfs_ctx_t *ctx);
 void cleanup_and_exit (int signum);
 
-int glusterfs_volume_top_write_perf (uint32_t blk_size, uint32_t blk_count,
-                                     char *brick_path, double *throughput,
-                                     double *time);
-int glusterfs_volume_top_read_perf (uint32_t blk_size, uint32_t blk_count,
-                                    char *brick_path, double *throughput,
-                                    double *time);
-
-extern glusterfs_ctx_t *glusterfsd_ctx;
 #endif /* __GLUSTERFSD_H__ */
diff --git a/libgfchangelog.pc.in b/libgfchangelog.pc.in
deleted file mode 100644
index d654280d0..000000000
--- a/libgfchangelog.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-
-Name: libgfchangelog
-Description: GlusterFS Changelog Consumer Library
-Version: @VERSION@
-Libs: -L${libdir} -lgfchangelog -lglusterfs
-Cflags: -I${includedir}/glusterfs/gfchangelog -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
index 907399ae6..b3df8518d 100644
--- a/libglusterfs/src/Makefile.am
+++ b/libglusterfs/src/Makefile.am
@@ -1,56 +1,21 @@
-libglusterfs_la_CFLAGS = -Wall $(GF_CFLAGS) \
-	$(GF_DARWIN_LIBGLUSTERFS_CFLAGS)    \
-        -DDATADIR=\"$(localstatedir)\"
+libglusterfs_la_CFLAGS = -fPIC  -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
 
-libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \
-	-DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" \
-	-I$(top_srcdir)/rpc/rpc-lib/src/ -I$(CONTRIBDIR)/rbtree
+libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -D$(GF_HOST_OS) -I$(CONTRIBDIR)/rbtree  -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\" -I$(CONTRIBDIR)/md5
 
 libglusterfs_la_LIBADD = @LEXLIB@
 
 lib_LTLIBRARIES = libglusterfs.la
 
-CONTRIB_BUILDDIR = $(top_builddir)/contrib
-
-libglusterfs_la_SOURCES = dict.c xlator.c logging.c \
-	hashfn.c defaults.c common-utils.c timer.c inode.c call-stub.c \
-	compat.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c \
-	iobuf.c globals.c statedump.c stack.c checksum.c daemon.c timespec.c \
-	$(CONTRIBDIR)/rbtree/rb.c rbthash.c store.c latency.c \
-	graph.c $(CONTRIBDIR)/uuid/clear.c $(CONTRIBDIR)/uuid/copy.c \
-	$(CONTRIBDIR)/uuid/gen_uuid.c $(CONTRIBDIR)/uuid/pack.c \
-	$(CONTRIBDIR)/uuid/parse.c $(CONTRIBDIR)/uuid/unparse.c \
-	$(CONTRIBDIR)/uuid/uuid_time.c $(CONTRIBDIR)/uuid/compare.c \
-	$(CONTRIBDIR)/uuid/isnull.c $(CONTRIBDIR)/uuid/unpack.c syncop.c \
-	graph-print.c trie.c run.c options.c fd-lk.c circ-buff.c \
-	event-history.c gidcache.c ctx.c client_t.c event-poll.c event-epoll.c \
-	$(CONTRIBDIR)/libgen/basename_r.c $(CONTRIBDIR)/libgen/dirname_r.c \
-	$(CONTRIBDIR)/stdlib/gf_mkostemp.c
-
-
-nodist_libglusterfs_la_SOURCES = y.tab.c graph.lex.c gf-error-codes.h
-
-BUILT_SOURCES = graph.lex.c
-
-noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h timespec.h \
-	logging.h xlator.h stack.h timer.h list.h inode.h call-stub.h compat.h \
-	fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h \
-	gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h \
-	checksum.h daemon.h $(CONTRIBDIR)/rbtree/rb.h store.h\
-	rbthash.h iatt.h latency.h mem-types.h $(CONTRIBDIR)/uuid/uuidd.h \
-	$(CONTRIBDIR)/uuid/uuid.h $(CONTRIBDIR)/uuid/uuidP.h \
-	$(CONTRIB_BUILDDIR)/uuid/uuid_types.h syncop.h graph-utils.h trie.h \
-	run.h options.h lkowner.h fd-lk.h circ-buff.h event-history.h \
-	gidcache.h client_t.h glusterfs-acl.h
+libglusterfs_la_SOURCES = dict.c graph.lex.c y.tab.c xlator.c logging.c  hashfn.c defaults.c common-utils.c timer.c inode.c call-stub.c compat.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c $(CONTRIBDIR)/md5/md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c graph.c $(CONTRIBDIR)/uuid/clear.c $(CONTRIBDIR)/uuid/copy.c $(CONTRIBDIR)/uuid/gen_uuid.c $(CONTRIBDIR)/uuid/pack.c $(CONTRIBDIR)/uuid/parse.c $(CONTRIBDIR)/uuid/unparse.c $(CONTRIBDIR)/uuid/uuid_time.c $(CONTRIBDIR)/uuid/compare.c $(CONTRIBDIR)/uuid/isnull.c $(CONTRIBDIR)/uuid/unpack.c syncop.c graph-print.c trie.c daemon.c
+
+noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h logging.h  xlator.h  stack.h timer.h list.h inode.h call-stub.h compat.h fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h checksum.h $(CONTRIBDIR)/md5/md5.h $(CONTRIBDIR)/rbtree/rb.h rbthash.h iatt.h latency.h mem-types.h $(CONTRIBDIR)/uuid/uuidd.h $(CONTRIBDIR)/uuid/uuid.h $(CONTRIBDIR)/uuid/uuidP.h $(CONTRIBDIR)/uuid/uuid_types.h syncop.h graph-utils.h graph-mem-types.h trie.h trie-mem-types.h daemon.h
 
 EXTRA_DIST = graph.l graph.y
 
 graph.lex.c: graph.l y.tab.h
-	$(LEX) -Pgraphyy -t $(srcdir)/graph.l > $@
+	$(LEX) -t $(srcdir)/graph.l > $@
 
-y.tab.c: y.tab.h
-y.tab.h: graph.y
-	$(YACC) -p graphyy -d $(srcdir)/graph.y
+y.tab.c y.tab.h: graph.y
+	$(YACC) -d $(srcdir)/graph.y
 
 CLEANFILES = graph.lex.c y.tab.c y.tab.h
-CONFIG_CLEAN_FILES = $(CONTRIB_BUILDDIR)/uuid/uuid_types.h
diff --git a/libglusterfs/src/byte-order.h b/libglusterfs/src/byte-order.h
index 4101db2c7..e325e522d 100644
--- a/libglusterfs/src/byte-order.h
+++ b/libglusterfs/src/byte-order.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _BYTE_ORDER_H
diff --git a/libglusterfs/src/call-stub.c b/libglusterfs/src/call-stub.c
index ac79cf071..fab368a6d 100644
--- a/libglusterfs/src/call-stub.c
+++ b/libglusterfs/src/call-stub.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -13,9 +22,9 @@
 #include "config.h"
 #endif
 
-#include <openssl/md5.h>
 #include <inttypes.h>
 
+#include "md5.h"
 #include "call-stub.h"
 #include "mem-types.h"
 
@@ -37,16 +46,16 @@ stub_new (call_frame_t *frame,
         new->fop = fop;
         new->stub_mem_pool = frame->this->ctx->stub_mem_pool;
         INIT_LIST_HEAD (&new->list);
-
-        INIT_LIST_HEAD (&new->args_cbk.entries);
 out:
         return new;
 }
 
 
 call_stub_t *
-fop_lookup_stub (call_frame_t *frame, fop_lookup_t fn, loc_t *loc,
-                 dict_t *xdata)
+fop_lookup_stub (call_frame_t *frame,
+                 fop_lookup_t fn,
+                 loc_t *loc,
+                 dict_t *xattr_req)
 {
         call_stub_t *stub = NULL;
 
@@ -56,22 +65,26 @@ fop_lookup_stub (call_frame_t *frame, fop_lookup_t fn, loc_t *loc,
         stub = stub_new (frame, 1, GF_FOP_LOOKUP);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.lookup = fn;
+        stub->args.lookup.fn = fn;
 
-        loc_copy (&stub->args.loc, loc);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        if (xattr_req)
+                stub->args.lookup.xattr_req = dict_ref (xattr_req);
 
+        loc_copy (&stub->args.lookup.loc, loc);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_lookup_cbk_stub (call_frame_t *frame, fop_lookup_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     inode_t *inode, struct iatt *buf,
-                     dict_t *xdata, struct iatt *postparent)
+fop_lookup_cbk_stub (call_frame_t *frame,
+                     fop_lookup_cbk_t fn,
+                     int32_t op_ret,
+                     int32_t op_errno,
+                     inode_t *inode,
+                     struct iatt *buf,
+                     dict_t *dict,
+                     struct iatt *postparent)
 {
         call_stub_t *stub = NULL;
 
@@ -80,25 +93,27 @@ fop_lookup_cbk_stub (call_frame_t *frame, fop_lookup_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_LOOKUP);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.lookup = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.lookup_cbk.fn = fn;
+        stub->args.lookup_cbk.op_ret = op_ret;
+        stub->args.lookup_cbk.op_errno = op_errno;
         if (inode)
-                stub->args_cbk.inode = inode_ref (inode);
+                stub->args.lookup_cbk.inode = inode_ref (inode);
         if (buf)
-                stub->args_cbk.stat = *buf;
+                stub->args.lookup_cbk.buf = *buf;
+        if (dict)
+                stub->args.lookup_cbk.dict = dict_ref (dict);
         if (postparent)
-                stub->args_cbk.postparent = *postparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.lookup_cbk.postparent = *postparent;
 out:
         return stub;
 }
 
 
+
 call_stub_t *
-fop_stat_stub (call_frame_t *frame, fop_stat_t fn,
-               loc_t *loc, dict_t *xdata)
+fop_stat_stub (call_frame_t *frame,
+               fop_stat_t fn,
+               loc_t *loc)
 {
         call_stub_t *stub = NULL;
 
@@ -108,19 +123,19 @@ fop_stat_stub (call_frame_t *frame, fop_stat_t fn,
         stub = stub_new (frame, 1, GF_FOP_STAT);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.stat = fn;
-        loc_copy (&stub->args.loc, loc);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.stat.fn = fn;
+        loc_copy (&stub->args.stat.loc, loc);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_stat_cbk_stub (call_frame_t *frame, fop_stat_cbk_t fn,
-                   int32_t op_ret, int32_t op_errno,
-                   struct iatt *buf, dict_t *xdata)
+fop_stat_cbk_stub (call_frame_t *frame,
+                   fop_stat_cbk_t fn,
+                   int32_t op_ret,
+                   int32_t op_errno,
+                   struct iatt *buf)
 {
         call_stub_t *stub = NULL;
 
@@ -129,21 +144,20 @@ fop_stat_cbk_stub (call_frame_t *frame, fop_stat_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_STAT);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.stat = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.stat_cbk.fn = fn;
+        stub->args.stat_cbk.op_ret = op_ret;
+        stub->args.stat_cbk.op_errno = op_errno;
         if (op_ret == 0)
-                stub->args_cbk.stat = *buf;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.stat_cbk.buf = *buf;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fstat_stub (call_frame_t *frame, fop_fstat_t fn,
-                fd_t *fd, dict_t *xdata)
+fop_fstat_stub (call_frame_t *frame,
+                fop_fstat_t fn,
+                fd_t *fd)
 {
         call_stub_t *stub = NULL;
 
@@ -152,21 +166,21 @@ fop_fstat_stub (call_frame_t *frame, fop_fstat_t fn,
         stub = stub_new (frame, 1, GF_FOP_FSTAT);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.fstat = fn;
+        stub->args.fstat.fn = fn;
 
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.fstat.fd = fd_ref (fd);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fstat_cbk_stub (call_frame_t *frame, fop_fstat_cbk_t fn,
-                    int32_t op_ret, int32_t op_errno,
-                    struct iatt *buf, dict_t *xdata)
+fop_fstat_cbk_stub (call_frame_t *frame,
+                    fop_fstat_cbk_t fn,
+                    int32_t op_ret,
+                    int32_t op_errno,
+                    struct iatt *buf)
 {
         call_stub_t *stub = NULL;
 
@@ -175,21 +189,23 @@ fop_fstat_cbk_stub (call_frame_t *frame, fop_fstat_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FSTAT);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fstat = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.fstat_cbk.fn = fn;
+        stub->args.fstat_cbk.op_ret = op_ret;
+        stub->args.fstat_cbk.op_errno = op_errno;
         if (buf)
-                stub->args_cbk.stat = *buf;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.fstat_cbk.buf = *buf;
 out:
         return stub;
 }
 
 
+/* truncate */
+
 call_stub_t *
-fop_truncate_stub (call_frame_t *frame, fop_truncate_t fn,
-                   loc_t *loc, off_t off, dict_t *xdata)
+fop_truncate_stub (call_frame_t *frame,
+                   fop_truncate_t fn,
+                   loc_t *loc,
+                   off_t off)
 {
         call_stub_t *stub = NULL;
 
@@ -199,20 +215,21 @@ fop_truncate_stub (call_frame_t *frame, fop_truncate_t fn,
         stub = stub_new (frame, 1, GF_FOP_TRUNCATE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.truncate = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.offset = off;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.truncate.fn = fn;
+        loc_copy (&stub->args.truncate.loc, loc);
+        stub->args.truncate.off = off;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_truncate_cbk_stub (call_frame_t *frame, fop_truncate_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-		       struct iatt *postbuf, dict_t *xdata)
+fop_truncate_cbk_stub (call_frame_t *frame,
+                       fop_truncate_cbk_t fn,
+                       int32_t op_ret,
+                       int32_t op_errno,
+                       struct iatt *prebuf,
+                       struct iatt *postbuf)
 {
         call_stub_t *stub = NULL;
 
@@ -221,23 +238,23 @@ fop_truncate_cbk_stub (call_frame_t *frame, fop_truncate_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_TRUNCATE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.truncate = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.truncate_cbk.fn = fn;
+        stub->args.truncate_cbk.op_ret = op_ret;
+        stub->args.truncate_cbk.op_errno = op_errno;
         if (prebuf)
-                stub->args_cbk.prestat = *prebuf;
+                stub->args.truncate_cbk.prebuf = *prebuf;
         if (postbuf)
-                stub->args_cbk.poststat = *postbuf;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.truncate_cbk.postbuf = *postbuf;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_ftruncate_stub (call_frame_t *frame, fop_ftruncate_t fn,
-                    fd_t *fd, off_t off, dict_t *xdata)
+fop_ftruncate_stub (call_frame_t *frame,
+                    fop_ftruncate_t fn,
+                    fd_t *fd,
+                    off_t off)
 {
         call_stub_t *stub = NULL;
 
@@ -246,22 +263,23 @@ fop_ftruncate_stub (call_frame_t *frame, fop_ftruncate_t fn,
         stub = stub_new (frame, 1, GF_FOP_FTRUNCATE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.ftruncate = fn;
+        stub->args.ftruncate.fn = fn;
         if (fd)
-                stub->args.fd = fd_ref (fd);
+                stub->args.ftruncate.fd = fd_ref (fd);
 
-        stub->args.offset = off;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.ftruncate.off = off;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_ftruncate_cbk_stub (call_frame_t *frame, fop_ftruncate_cbk_t fn,
-                        int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-			struct iatt *postbuf, dict_t *xdata)
+fop_ftruncate_cbk_stub (call_frame_t *frame,
+                        fop_ftruncate_cbk_t fn,
+                        int32_t op_ret,
+                        int32_t op_errno,
+                        struct iatt *prebuf,
+                        struct iatt *postbuf)
 {
         call_stub_t *stub = NULL;
 
@@ -270,24 +288,23 @@ fop_ftruncate_cbk_stub (call_frame_t *frame, fop_ftruncate_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FTRUNCATE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.ftruncate = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.ftruncate_cbk.fn = fn;
+        stub->args.ftruncate_cbk.op_ret = op_ret;
+        stub->args.ftruncate_cbk.op_errno = op_errno;
         if (prebuf)
-                stub->args_cbk.prestat = *prebuf;
+                stub->args.ftruncate_cbk.prebuf = *prebuf;
         if (postbuf)
-                stub->args_cbk.poststat = *postbuf;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
-
+                stub->args.ftruncate_cbk.postbuf = *postbuf;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_access_stub (call_frame_t *frame, fop_access_t fn,
-                 loc_t *loc, int32_t mask, dict_t *xdata)
+fop_access_stub (call_frame_t *frame,
+                 fop_access_t fn,
+                 loc_t *loc,
+                 int32_t mask)
 {
         call_stub_t *stub = NULL;
 
@@ -297,19 +314,19 @@ fop_access_stub (call_frame_t *frame, fop_access_t fn,
         stub = stub_new (frame, 1, GF_FOP_ACCESS);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.access = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.mask = mask;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.access.fn = fn;
+        loc_copy (&stub->args.access.loc, loc);
+        stub->args.access.mask = mask;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_access_cbk_stub (call_frame_t *frame, fop_access_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno, dict_t *xdata)
+fop_access_cbk_stub (call_frame_t *frame,
+                     fop_access_cbk_t fn,
+                     int32_t op_ret,
+                     int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -318,19 +335,19 @@ fop_access_cbk_stub (call_frame_t *frame, fop_access_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_ACCESS);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.access = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+        stub->args.access_cbk.fn = fn;
+        stub->args.access_cbk.op_ret = op_ret;
+        stub->args.access_cbk.op_errno = op_errno;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_readlink_stub (call_frame_t *frame, fop_readlink_t fn,
-                   loc_t *loc, size_t size, dict_t *xdata)
+fop_readlink_stub (call_frame_t *frame,
+                   fop_readlink_t fn,
+                   loc_t *loc,
+                   size_t size)
 {
         call_stub_t *stub = NULL;
 
@@ -340,20 +357,21 @@ fop_readlink_stub (call_frame_t *frame, fop_readlink_t fn,
         stub = stub_new (frame, 1, GF_FOP_READLINK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.readlink = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.size = size;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.readlink.fn = fn;
+        loc_copy (&stub->args.readlink.loc, loc);
+        stub->args.readlink.size = size;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_readlink_cbk_stub (call_frame_t *frame, fop_readlink_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno,
-                       const char *path, struct iatt *stbuf, dict_t *xdata)
+fop_readlink_cbk_stub (call_frame_t *frame,
+                       fop_readlink_cbk_t fn,
+                       int32_t op_ret,
+                       int32_t op_errno,
+                       const char *path,
+                       struct iatt *sbuf)
 {
         call_stub_t *stub = NULL;
 
@@ -362,23 +380,21 @@ fop_readlink_cbk_stub (call_frame_t *frame, fop_readlink_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_READLINK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.readlink = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.readlink_cbk.fn = fn;
+        stub->args.readlink_cbk.op_ret = op_ret;
+        stub->args.readlink_cbk.op_errno = op_errno;
         if (path)
-                stub->args_cbk.buf = gf_strdup (path);
-        if (stbuf)
-                stub->args_cbk.stat = *stbuf;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.readlink_cbk.buf = gf_strdup (path);
+        if (sbuf)
+                stub->args.readlink_cbk.sbuf = *sbuf;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_mknod_stub (call_frame_t *frame, fop_mknod_t fn, loc_t *loc, mode_t mode,
-                dev_t rdev, mode_t umask, dict_t *xdata)
+fop_mknod_stub (call_frame_t *frame, fop_mknod_t fn,
+                loc_t *loc, mode_t mode, dev_t rdev, dict_t *params)
 {
         call_stub_t *stub = NULL;
 
@@ -388,23 +404,26 @@ fop_mknod_stub (call_frame_t *frame, fop_mknod_t fn, loc_t *loc, mode_t mode,
         stub = stub_new (frame, 1, GF_FOP_MKNOD);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.mknod = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.mode = mode;
-        stub->args.rdev = rdev;
-        stub->args.umask = umask;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.mknod.fn = fn;
+        loc_copy (&stub->args.mknod.loc, loc);
+        stub->args.mknod.mode = mode;
+        stub->args.mknod.rdev = rdev;
+        if (params)
+                stub->args.mknod.params = dict_ref (params);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_mknod_cbk_stub (call_frame_t *frame, fop_mknod_cbk_t fn, int32_t op_ret,
-                    int32_t op_errno, inode_t *inode, struct iatt *buf,
-                    struct iatt *preparent, struct iatt *postparent,
-		    dict_t *xdata)
+fop_mknod_cbk_stub (call_frame_t *frame,
+                    fop_mknod_cbk_t fn,
+                    int32_t op_ret,
+                    int32_t op_errno,
+                    inode_t *inode,
+                    struct iatt *buf,
+                    struct iatt *preparent,
+                    struct iatt *postparent)
 {
         call_stub_t *stub = NULL;
 
@@ -413,20 +432,17 @@ fop_mknod_cbk_stub (call_frame_t *frame, fop_mknod_cbk_t fn, int32_t op_ret,
         stub = stub_new (frame, 0, GF_FOP_MKNOD);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.mknod = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.mknod_cbk.fn = fn;
+        stub->args.mknod_cbk.op_ret = op_ret;
+        stub->args.mknod_cbk.op_errno = op_errno;
         if (inode)
-                stub->args_cbk.inode = inode_ref (inode);
+                stub->args.mknod_cbk.inode = inode_ref (inode);
         if (buf)
-                stub->args_cbk.stat = *buf;
+                stub->args.mknod_cbk.buf = *buf;
         if (preparent)
-                stub->args_cbk.preparent = *preparent;
+                stub->args.mknod_cbk.preparent = *preparent;
         if (postparent)
-                stub->args_cbk.postparent = *postparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
-
+                stub->args.mknod_cbk.postparent = *postparent;
 out:
         return stub;
 }
@@ -434,7 +450,7 @@ out:
 
 call_stub_t *
 fop_mkdir_stub (call_frame_t *frame, fop_mkdir_t fn,
-                loc_t *loc, mode_t mode, mode_t umask, dict_t *xdata)
+                loc_t *loc, mode_t mode, dict_t *params)
 {
         call_stub_t *stub = NULL;
 
@@ -444,23 +460,25 @@ fop_mkdir_stub (call_frame_t *frame, fop_mkdir_t fn,
         stub = stub_new (frame, 1, GF_FOP_MKDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.mkdir = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.mode  = mode;
-        stub->args.umask = umask;
-
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.mkdir.fn = fn;
+        loc_copy (&stub->args.mkdir.loc, loc);
+        stub->args.mkdir.mode = mode;
+        if (params)
+                stub->args.mkdir.params = dict_ref (params);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_mkdir_cbk_stub (call_frame_t *frame, fop_mkdir_cbk_t fn,
-                    int32_t op_ret, int32_t op_errno, inode_t *inode,
-                    struct iatt *buf, struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata)
+fop_mkdir_cbk_stub (call_frame_t *frame,
+                    fop_mkdir_cbk_t fn,
+                    int32_t op_ret,
+                    int32_t op_errno,
+                    inode_t *inode,
+                    struct iatt *buf,
+                    struct iatt *preparent,
+                    struct iatt *postparent)
 {
         call_stub_t *stub = NULL;
 
@@ -469,27 +487,26 @@ fop_mkdir_cbk_stub (call_frame_t *frame, fop_mkdir_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_MKDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.mkdir = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.mkdir_cbk.fn = fn;
+        stub->args.mkdir_cbk.op_ret = op_ret;
+        stub->args.mkdir_cbk.op_errno = op_errno;
         if (inode)
-                stub->args_cbk.inode = inode_ref (inode);
+                stub->args.mkdir_cbk.inode = inode_ref (inode);
         if (buf)
-                stub->args_cbk.stat = *buf;
+                stub->args.mkdir_cbk.buf = *buf;
         if (preparent)
-                stub->args_cbk.preparent = *preparent;
+                stub->args.mkdir_cbk.preparent = *preparent;
         if (postparent)
-                stub->args_cbk.postparent = *postparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.mkdir_cbk.postparent = *postparent;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_unlink_stub (call_frame_t *frame, fop_unlink_t fn,
-                 loc_t *loc, int xflag, dict_t *xdata)
+fop_unlink_stub (call_frame_t *frame,
+                 fop_unlink_t fn,
+                 loc_t *loc)
 {
         call_stub_t *stub = NULL;
 
@@ -499,21 +516,20 @@ fop_unlink_stub (call_frame_t *frame, fop_unlink_t fn,
         stub = stub_new (frame, 1, GF_FOP_UNLINK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.unlink = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.xflag = xflag;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.unlink.fn = fn;
+        loc_copy (&stub->args.unlink.loc, loc);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_unlink_cbk_stub (call_frame_t *frame, fop_unlink_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     struct iatt *preparent, struct iatt *postparent,
-		     dict_t *xdata)
+fop_unlink_cbk_stub (call_frame_t *frame,
+                     fop_unlink_cbk_t fn,
+                     int32_t op_ret,
+                     int32_t op_errno,
+                     struct iatt *preparent,
+                     struct iatt *postparent)
 {
         call_stub_t *stub = NULL;
 
@@ -522,15 +538,13 @@ fop_unlink_cbk_stub (call_frame_t *frame, fop_unlink_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_UNLINK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.unlink = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.unlink_cbk.fn = fn;
+        stub->args.unlink_cbk.op_ret = op_ret;
+        stub->args.unlink_cbk.op_errno = op_errno;
         if (preparent)
-                stub->args_cbk.preparent = *preparent;
+                stub->args.unlink_cbk.preparent = *preparent;
         if (postparent)
-                stub->args_cbk.postparent = *postparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.unlink_cbk.postparent = *postparent;
 out:
         return stub;
 }
@@ -539,7 +553,7 @@ out:
 
 call_stub_t *
 fop_rmdir_stub (call_frame_t *frame, fop_rmdir_t fn,
-                loc_t *loc, int flags, dict_t *xdata)
+                loc_t *loc, int flags)
 {
         call_stub_t *stub = NULL;
 
@@ -549,21 +563,21 @@ fop_rmdir_stub (call_frame_t *frame, fop_rmdir_t fn,
         stub = stub_new (frame, 1, GF_FOP_RMDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.rmdir = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.flags = flags;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.rmdir.fn = fn;
+        loc_copy (&stub->args.rmdir.loc, loc);
+        stub->args.rmdir.flags = flags;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_rmdir_cbk_stub (call_frame_t *frame, fop_rmdir_cbk_t fn,
-                    int32_t op_ret, int32_t op_errno,
-                    struct iatt *preparent, struct iatt *postparent,
-		    dict_t *xdata)
+fop_rmdir_cbk_stub (call_frame_t *frame,
+                    fop_rmdir_cbk_t fn,
+                    int32_t op_ret,
+                    int32_t op_errno,
+                    struct iatt *preparent,
+                    struct iatt *postparent)
 {
         call_stub_t *stub = NULL;
 
@@ -572,15 +586,13 @@ fop_rmdir_cbk_stub (call_frame_t *frame, fop_rmdir_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_RMDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.rmdir = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.rmdir_cbk.fn = fn;
+        stub->args.rmdir_cbk.op_ret = op_ret;
+        stub->args.rmdir_cbk.op_errno = op_errno;
         if (preparent)
-                stub->args_cbk.preparent = *preparent;
+                stub->args.rmdir_cbk.preparent = *preparent;
         if (postparent)
-                stub->args_cbk.postparent = *postparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.rmdir_cbk.postparent = *postparent;
 out:
         return stub;
 }
@@ -588,7 +600,7 @@ out:
 
 call_stub_t *
 fop_symlink_stub (call_frame_t *frame, fop_symlink_t fn,
-                  const char *linkname, loc_t *loc, mode_t umask, dict_t *xdata)
+                  const char *linkname, loc_t *loc, dict_t *params)
 {
         call_stub_t *stub = NULL;
 
@@ -599,23 +611,25 @@ fop_symlink_stub (call_frame_t *frame, fop_symlink_t fn,
         stub = stub_new (frame, 1, GF_FOP_SYMLINK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.symlink = fn;
-        stub->args.linkname = gf_strdup (linkname);
-        stub->args.umask = umask;
-        loc_copy (&stub->args.loc, loc);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.symlink.fn = fn;
+        stub->args.symlink.linkname = gf_strdup (linkname);
+        loc_copy (&stub->args.symlink.loc, loc);
+        if (params)
+                stub->args.symlink.params = dict_ref (params);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_symlink_cbk_stub (call_frame_t *frame, fop_symlink_cbk_t fn,
-                      int32_t op_ret, int32_t op_errno,
-                      inode_t *inode, struct iatt *buf,
-                      struct iatt *preparent, struct iatt *postparent,
-		      dict_t *xdata)
+fop_symlink_cbk_stub (call_frame_t *frame,
+                      fop_symlink_cbk_t fn,
+                      int32_t op_ret,
+                      int32_t op_errno,
+                      inode_t *inode,
+                      struct iatt *buf,
+                      struct iatt *preparent,
+                      struct iatt *postparent)
 {
         call_stub_t *stub = NULL;
 
@@ -624,27 +638,27 @@ fop_symlink_cbk_stub (call_frame_t *frame, fop_symlink_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_SYMLINK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.symlink = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.symlink_cbk.fn = fn;
+        stub->args.symlink_cbk.op_ret = op_ret;
+        stub->args.symlink_cbk.op_errno = op_errno;
         if (inode)
-                stub->args_cbk.inode = inode_ref (inode);
+                stub->args.symlink_cbk.inode = inode_ref (inode);
         if (buf)
-                stub->args_cbk.stat = *buf;
+                stub->args.symlink_cbk.buf = *buf;
         if (preparent)
-                stub->args_cbk.preparent = *preparent;
+                stub->args.symlink_cbk.preparent = *preparent;
         if (postparent)
-                stub->args_cbk.postparent = *postparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.symlink_cbk.postparent = *postparent;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_rename_stub (call_frame_t *frame, fop_rename_t fn,
-                 loc_t *oldloc, loc_t *newloc, dict_t *xdata)
+fop_rename_stub (call_frame_t *frame,
+                 fop_rename_t fn,
+                 loc_t *oldloc,
+                 loc_t *newloc)
 {
         call_stub_t *stub = NULL;
 
@@ -655,22 +669,24 @@ fop_rename_stub (call_frame_t *frame, fop_rename_t fn,
         stub = stub_new (frame, 1, GF_FOP_RENAME);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.rename = fn;
-        loc_copy (&stub->args.loc, oldloc);
-        loc_copy (&stub->args.loc2, newloc);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.rename.fn = fn;
+        loc_copy (&stub->args.rename.old, oldloc);
+        loc_copy (&stub->args.rename.new, newloc);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_rename_cbk_stub (call_frame_t *frame, fop_rename_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno, struct iatt *buf,
-                     struct iatt *preoldparent, struct iatt *postoldparent,
-                     struct iatt *prenewparent, struct iatt *postnewparent,
-		     dict_t *xdata)
+fop_rename_cbk_stub (call_frame_t *frame,
+                     fop_rename_cbk_t fn,
+                     int32_t op_ret,
+                     int32_t op_errno,
+                     struct iatt *buf,
+                     struct iatt *preoldparent,
+                     struct iatt *postoldparent,
+                     struct iatt *prenewparent,
+                     struct iatt *postnewparent)
 {
         call_stub_t *stub = NULL;
 
@@ -679,29 +695,29 @@ fop_rename_cbk_stub (call_frame_t *frame, fop_rename_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_RENAME);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.rename = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.rename_cbk.fn = fn;
+        stub->args.rename_cbk.op_ret = op_ret;
+        stub->args.rename_cbk.op_errno = op_errno;
         if (buf)
-                stub->args_cbk.stat = *buf;
+                stub->args.rename_cbk.buf = *buf;
         if (preoldparent)
-                stub->args_cbk.preparent = *preoldparent;
+                stub->args.rename_cbk.preoldparent = *preoldparent;
         if (postoldparent)
-                stub->args_cbk.postparent = *postoldparent;
+                stub->args.rename_cbk.postoldparent = *postoldparent;
         if (prenewparent)
-                stub->args_cbk.preparent2 = *prenewparent;
+                stub->args.rename_cbk.prenewparent = *prenewparent;
         if (postnewparent)
-                stub->args_cbk.postparent2 = *postnewparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.rename_cbk.postnewparent = *postnewparent;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_link_stub (call_frame_t *frame, fop_link_t fn,
-               loc_t *oldloc, loc_t *newloc, dict_t *xdata)
+fop_link_stub (call_frame_t *frame,
+               fop_link_t fn,
+               loc_t *oldloc,
+               loc_t *newloc)
 {
         call_stub_t *stub = NULL;
 
@@ -712,23 +728,24 @@ fop_link_stub (call_frame_t *frame, fop_link_t fn,
         stub = stub_new (frame, 1, GF_FOP_LINK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.link = fn;
-        loc_copy (&stub->args.loc, oldloc);
-        loc_copy (&stub->args.loc2, newloc);
+        stub->args.link.fn = fn;
+        loc_copy (&stub->args.link.oldloc, oldloc);
+        loc_copy (&stub->args.link.newloc, newloc);
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_link_cbk_stub (call_frame_t *frame, fop_link_cbk_t fn,
-                   int32_t op_ret, int32_t op_errno,
-                   inode_t *inode, struct iatt *buf,
-                   struct iatt *preparent, struct iatt *postparent,
-		   dict_t *xdata)
+fop_link_cbk_stub (call_frame_t *frame,
+                   fop_link_cbk_t fn,
+                   int32_t op_ret,
+                   int32_t op_errno,
+                   inode_t *inode,
+                   struct iatt *buf,
+                   struct iatt *preparent,
+                   struct iatt *postparent)
 {
         call_stub_t *stub = NULL;
 
@@ -737,19 +754,17 @@ fop_link_cbk_stub (call_frame_t *frame, fop_link_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_LINK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.link = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.link_cbk.fn = fn;
+        stub->args.link_cbk.op_ret = op_ret;
+        stub->args.link_cbk.op_errno = op_errno;
         if (inode)
-                stub->args_cbk.inode = inode_ref (inode);
+                stub->args.link_cbk.inode = inode_ref (inode);
         if (buf)
-                stub->args_cbk.stat = *buf;
+                stub->args.link_cbk.buf = *buf;
         if (preparent)
-                stub->args_cbk.preparent = *preparent;
+                stub->args.link_cbk.preparent = *preparent;
         if (postparent)
-                stub->args_cbk.postparent = *postparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.link_cbk.postparent = *postparent;
 out:
         return stub;
 }
@@ -758,7 +773,7 @@ out:
 call_stub_t *
 fop_create_stub (call_frame_t *frame, fop_create_t fn,
                  loc_t *loc, int32_t flags, mode_t mode,
-                 mode_t umask, fd_t *fd, dict_t *xdata)
+                 fd_t *fd, dict_t *params)
 {
         call_stub_t *stub = NULL;
 
@@ -768,26 +783,29 @@ fop_create_stub (call_frame_t *frame, fop_create_t fn,
         stub = stub_new (frame, 1, GF_FOP_CREATE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.create = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.flags = flags;
-        stub->args.mode = mode;
-        stub->args.umask = umask;
+        stub->args.create.fn = fn;
+        loc_copy (&stub->args.create.loc, loc);
+        stub->args.create.flags = flags;
+        stub->args.create.mode = mode;
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.create.fd = fd_ref (fd);
+        if (params)
+                stub->args.create.params = dict_ref (params);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_create_cbk_stub (call_frame_t *frame, fop_create_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     fd_t *fd, inode_t *inode, struct iatt *buf,
-                     struct iatt *preparent, struct iatt *postparent,
-		     dict_t *xdata)
+fop_create_cbk_stub (call_frame_t *frame,
+                     fop_create_cbk_t fn,
+                     int32_t op_ret,
+                     int32_t op_errno,
+                     fd_t *fd,
+                     inode_t *inode,
+                     struct iatt *buf,
+                     struct iatt *preparent,
+                     struct iatt *postparent)
 {
         call_stub_t *stub = NULL;
 
@@ -796,29 +814,30 @@ fop_create_cbk_stub (call_frame_t *frame, fop_create_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_CREATE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.create = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.create_cbk.fn = fn;
+        stub->args.create_cbk.op_ret = op_ret;
+        stub->args.create_cbk.op_errno = op_errno;
         if (fd)
-                stub->args_cbk.fd = fd_ref (fd);
+                stub->args.create_cbk.fd = fd_ref (fd);
         if (inode)
-                stub->args_cbk.inode = inode_ref (inode);
+                stub->args.create_cbk.inode = inode_ref (inode);
         if (buf)
-                stub->args_cbk.stat = *buf;
+                stub->args.create_cbk.buf = *buf;
         if (preparent)
-                stub->args_cbk.preparent = *preparent;
+                stub->args.create_cbk.preparent = *preparent;
         if (postparent)
-                stub->args_cbk.postparent = *postparent;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.create_cbk.postparent = *postparent;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_open_stub (call_frame_t *frame, fop_open_t fn,
-               loc_t *loc, int32_t flags, fd_t *fd, dict_t *xdata)
+fop_open_stub (call_frame_t *frame,
+               fop_open_t fn,
+               loc_t *loc,
+               int32_t flags, fd_t *fd,
+               int32_t wbflags)
 {
         call_stub_t *stub = NULL;
 
@@ -828,22 +847,24 @@ fop_open_stub (call_frame_t *frame, fop_open_t fn,
         stub = stub_new (frame, 1, GF_FOP_OPEN);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.open = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.flags = flags;
+        stub->args.open.fn = fn;
+        loc_copy (&stub->args.open.loc, loc);
+        stub->args.open.flags = flags;
+        stub->args.open.wbflags = wbflags;
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.open.fd = fd_ref (fd);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_open_cbk_stub (call_frame_t *frame, fop_open_cbk_t fn,
-                   int32_t op_ret, int32_t op_errno,
-                   fd_t *fd, dict_t *xdata)
+fop_open_cbk_stub (call_frame_t *frame,
+                   fop_open_cbk_t fn,
+                   int32_t op_ret,
+                   int32_t op_errno,
+                   fd_t *fd)
+
 {
         call_stub_t *stub = NULL;
 
@@ -852,22 +873,22 @@ fop_open_cbk_stub (call_frame_t *frame, fop_open_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_OPEN);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.open = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.open_cbk.fn = fn;
+        stub->args.open_cbk.op_ret = op_ret;
+        stub->args.open_cbk.op_errno = op_errno;
         if (fd)
-                stub->args_cbk.fd = fd_ref (fd);
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.open_cbk.fd = fd_ref (fd);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_readv_stub (call_frame_t *frame, fop_readv_t fn,
-                fd_t *fd, size_t size, off_t off, uint32_t flags,
-		dict_t *xdata)
+fop_readv_stub (call_frame_t *frame,
+                fop_readv_t fn,
+                fd_t *fd,
+                size_t size,
+                off_t off)
 {
         call_stub_t *stub = NULL;
 
@@ -876,25 +897,26 @@ fop_readv_stub (call_frame_t *frame, fop_readv_t fn,
         stub = stub_new (frame, 1, GF_FOP_READ);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.readv = fn;
+        stub->args.readv.fn = fn;
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        stub->args.size  = size;
-        stub->args.offset  = off;
-        stub->args.flags = flags;
-
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.readv.fd = fd_ref (fd);
+        stub->args.readv.size = size;
+        stub->args.readv.off = off;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_readv_cbk_stub (call_frame_t *frame, fop_readv_cbk_t fn,
-                    int32_t op_ret, int32_t op_errno, struct iovec *vector,
-		    int32_t count, struct iatt *stbuf,
-                    struct iobref *iobref, dict_t *xdata)
+fop_readv_cbk_stub (call_frame_t *frame,
+                    fop_readv_cbk_t fn,
+                    int32_t op_ret,
+                    int32_t op_errno,
+                    struct iovec *vector,
+                    int32_t count,
+                    struct iatt *stbuf,
+                    struct iobref *iobref)
+
 {
         call_stub_t *stub = NULL;
 
@@ -903,26 +925,28 @@ fop_readv_cbk_stub (call_frame_t *frame, fop_readv_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_READ);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.readv = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.readv_cbk.fn = fn;
+        stub->args.readv_cbk.op_ret = op_ret;
+        stub->args.readv_cbk.op_errno = op_errno;
         if (op_ret >= 0) {
-                stub->args_cbk.vector = iov_dup (vector, count);
-                stub->args_cbk.count = count;
-                stub->args_cbk.stat = *stbuf;
-                stub->args_cbk.iobref = iobref_ref (iobref);
+                stub->args.readv_cbk.vector = iov_dup (vector, count);
+                stub->args.readv_cbk.count = count;
+                stub->args.readv_cbk.stbuf = *stbuf;
+                stub->args.readv_cbk.iobref = iobref_ref (iobref);
         }
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_writev_stub (call_frame_t *frame, fop_writev_t fn,
-                 fd_t *fd, struct iovec *vector, int32_t count, off_t off,
-		 uint32_t flags, struct iobref *iobref, dict_t *xdata)
+fop_writev_stub (call_frame_t *frame,
+                 fop_writev_t fn,
+                 fd_t *fd,
+                 struct iovec *vector,
+                 int32_t count,
+                 off_t off,
+                 struct iobref *iobref)
 {
         call_stub_t *stub = NULL;
 
@@ -932,25 +956,26 @@ fop_writev_stub (call_frame_t *frame, fop_writev_t fn,
         stub = stub_new (frame, 1, GF_FOP_WRITE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.writev = fn;
+        stub->args.writev.fn = fn;
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        stub->args.vector = iov_dup (vector, count);
-        stub->args.count  = count;
-        stub->args.offset = off;
-        stub->args.flags  = flags;
-        stub->args.iobref = iobref_ref (iobref);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.writev.fd = fd_ref (fd);
+        stub->args.writev.vector = iov_dup (vector, count);
+        stub->args.writev.count = count;
+        stub->args.writev.off = off;
+        stub->args.writev.iobref = iobref_ref (iobref);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_writev_cbk_stub (call_frame_t *frame, fop_writev_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     struct iatt *prebuf, struct iatt *postbuf, dict_t *xdata)
+fop_writev_cbk_stub (call_frame_t *frame,
+                     fop_writev_cbk_t fn,
+                     int32_t op_ret,
+                     int32_t op_errno,
+                     struct iatt *prebuf,
+                     struct iatt *postbuf)
+
 {
         call_stub_t *stub = NULL;
 
@@ -959,23 +984,23 @@ fop_writev_cbk_stub (call_frame_t *frame, fop_writev_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_WRITE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.writev = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.writev_cbk.fn = fn;
+        stub->args.writev_cbk.op_ret = op_ret;
+        stub->args.writev_cbk.op_errno = op_errno;
         if (op_ret >= 0)
-                stub->args_cbk.poststat = *postbuf;
+                stub->args.writev_cbk.postbuf = *postbuf;
         if (prebuf)
-                stub->args_cbk.prestat = *prebuf;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.writev_cbk.prebuf = *prebuf;
 out:
         return stub;
 }
 
 
+
 call_stub_t *
-fop_flush_stub (call_frame_t *frame, fop_flush_t fn,
-                fd_t *fd, dict_t *xdata)
+fop_flush_stub (call_frame_t *frame,
+                fop_flush_t fn,
+                fd_t *fd)
 {
         call_stub_t *stub = NULL;
 
@@ -984,19 +1009,20 @@ fop_flush_stub (call_frame_t *frame, fop_flush_t fn,
         stub = stub_new (frame, 1, GF_FOP_FLUSH);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.flush = fn;
+        stub->args.flush.fn = fn;
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.flush.fd = fd_ref (fd);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_flush_cbk_stub (call_frame_t *frame, fop_flush_cbk_t fn,
-                    int32_t op_ret, int32_t op_errno, dict_t *xdata)
+fop_flush_cbk_stub (call_frame_t *frame,
+                    fop_flush_cbk_t fn,
+                    int32_t op_ret,
+                    int32_t op_errno)
+
 {
         call_stub_t *stub = NULL;
 
@@ -1005,19 +1031,21 @@ fop_flush_cbk_stub (call_frame_t *frame, fop_flush_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FLUSH);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.flush = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+        stub->args.flush_cbk.fn = fn;
+        stub->args.flush_cbk.op_ret = op_ret;
+        stub->args.flush_cbk.op_errno = op_errno;
 out:
         return stub;
 }
 
 
+
+
 call_stub_t *
-fop_fsync_stub (call_frame_t *frame, fop_fsync_t fn,
-                fd_t *fd, int32_t datasync, dict_t *xdata)
+fop_fsync_stub (call_frame_t *frame,
+                fop_fsync_t fn,
+                fd_t *fd,
+                int32_t datasync)
 {
         call_stub_t *stub = NULL;
 
@@ -1026,21 +1054,22 @@ fop_fsync_stub (call_frame_t *frame, fop_fsync_t fn,
         stub = stub_new (frame, 1, GF_FOP_FSYNC);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.fsync = fn;
+        stub->args.fsync.fn = fn;
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        stub->args.datasync = datasync;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.fsync.fd = fd_ref (fd);
+        stub->args.fsync.datasync = datasync;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fsync_cbk_stub (call_frame_t *frame, fop_fsync_cbk_t fn,
-                    int32_t op_ret, int32_t op_errno,
-                    struct iatt *prebuf, struct iatt *postbuf, dict_t *xdata)
+fop_fsync_cbk_stub (call_frame_t *frame,
+                    fop_fsync_cbk_t fn,
+                    int32_t op_ret,
+                    int32_t op_errno,
+                    struct iatt *prebuf,
+                    struct iatt *postbuf)
 {
         call_stub_t *stub = NULL;
 
@@ -1049,23 +1078,22 @@ fop_fsync_cbk_stub (call_frame_t *frame, fop_fsync_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FSYNC);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fsync = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.fsync_cbk.fn = fn;
+        stub->args.fsync_cbk.op_ret = op_ret;
+        stub->args.fsync_cbk.op_errno = op_errno;
         if (prebuf)
-                stub->args_cbk.prestat = *prebuf;
+                stub->args.fsync_cbk.prebuf = *prebuf;
         if (postbuf)
-                stub->args_cbk.poststat = *postbuf;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.fsync_cbk.postbuf = *postbuf;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_opendir_stub (call_frame_t *frame, fop_opendir_t fn,
-                  loc_t *loc, fd_t *fd, dict_t *xdata)
+fop_opendir_stub (call_frame_t *frame,
+                  fop_opendir_t fn,
+                  loc_t *loc, fd_t *fd)
 {
         call_stub_t *stub = NULL;
 
@@ -1075,21 +1103,22 @@ fop_opendir_stub (call_frame_t *frame, fop_opendir_t fn,
         stub = stub_new (frame, 1, GF_FOP_OPENDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.opendir = fn;
-        loc_copy (&stub->args.loc, loc);
+        stub->args.opendir.fn = fn;
+        loc_copy (&stub->args.opendir.loc, loc);
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.opendir.fd = fd_ref (fd);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_opendir_cbk_stub (call_frame_t *frame, fop_opendir_cbk_t fn,
-                      int32_t op_ret, int32_t op_errno,
-                      fd_t *fd, dict_t *xdata)
+fop_opendir_cbk_stub (call_frame_t *frame,
+                      fop_opendir_cbk_t fn,
+                      int32_t op_ret,
+                      int32_t op_errno,
+                      fd_t *fd)
+
 {
         call_stub_t *stub = NULL;
 
@@ -1098,22 +1127,22 @@ fop_opendir_cbk_stub (call_frame_t *frame, fop_opendir_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_OPENDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.opendir = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.opendir_cbk.fn = fn;
+        stub->args.opendir_cbk.op_ret = op_ret;
+        stub->args.opendir_cbk.op_errno = op_errno;
 
         if (fd)
-                stub->args_cbk.fd = fd_ref (fd);
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.opendir_cbk.fd = fd_ref (fd);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fsyncdir_stub (call_frame_t *frame, fop_fsyncdir_t fn,
-                   fd_t *fd, int32_t datasync, dict_t *xdata)
+fop_fsyncdir_stub (call_frame_t *frame,
+                   fop_fsyncdir_t fn,
+                   fd_t *fd,
+                   int32_t datasync)
 {
         call_stub_t *stub = NULL;
 
@@ -1122,20 +1151,21 @@ fop_fsyncdir_stub (call_frame_t *frame, fop_fsyncdir_t fn,
         stub = stub_new (frame, 1, GF_FOP_FSYNCDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.fsyncdir = fn;
+        stub->args.fsyncdir.fn = fn;
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        stub->args.datasync = datasync;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.fsyncdir.fd = fd_ref (fd);
+        stub->args.fsyncdir.datasync = datasync;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fsyncdir_cbk_stub (call_frame_t *frame, fop_fsyncdir_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno, dict_t *xdata)
+fop_fsyncdir_cbk_stub (call_frame_t *frame,
+                       fop_fsyncdir_cbk_t fn,
+                       int32_t op_ret,
+                       int32_t op_errno)
+
 {
         call_stub_t *stub = NULL;
 
@@ -1144,19 +1174,18 @@ fop_fsyncdir_cbk_stub (call_frame_t *frame, fop_fsyncdir_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FSYNCDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fsyncdir = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+        stub->args.fsyncdir_cbk.fn = fn;
+        stub->args.fsyncdir_cbk.op_ret = op_ret;
+        stub->args.fsyncdir_cbk.op_errno = op_errno;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_statfs_stub (call_frame_t *frame, fop_statfs_t fn,
-                 loc_t *loc, dict_t *xdata)
+fop_statfs_stub (call_frame_t *frame,
+                 fop_statfs_t fn,
+                 loc_t *loc)
 {
         call_stub_t *stub = NULL;
 
@@ -1166,19 +1195,20 @@ fop_statfs_stub (call_frame_t *frame, fop_statfs_t fn,
         stub = stub_new (frame, 1, GF_FOP_STATFS);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.statfs = fn;
-        loc_copy (&stub->args.loc, loc);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.statfs.fn = fn;
+        loc_copy (&stub->args.statfs.loc, loc);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_statfs_cbk_stub (call_frame_t *frame, fop_statfs_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     struct statvfs *buf, dict_t *xdata)
+fop_statfs_cbk_stub (call_frame_t *frame,
+                     fop_statfs_cbk_t fn,
+                     int32_t op_ret,
+                     int32_t op_errno,
+                     struct statvfs *buf)
+
 {
         call_stub_t *stub = NULL;
 
@@ -1187,22 +1217,22 @@ fop_statfs_cbk_stub (call_frame_t *frame, fop_statfs_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_STATFS);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.statfs = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.statfs_cbk.fn = fn;
+        stub->args.statfs_cbk.op_ret = op_ret;
+        stub->args.statfs_cbk.op_errno = op_errno;
         if (op_ret == 0)
-                stub->args_cbk.statvfs = *buf;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.statfs_cbk.buf = *buf;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_setxattr_stub (call_frame_t *frame, fop_setxattr_t fn,
-                   loc_t *loc, dict_t *dict,
-                   int32_t flags, dict_t *xdata)
+fop_setxattr_stub (call_frame_t *frame,
+                   fop_setxattr_t fn,
+                   loc_t *loc,
+                   dict_t *dict,
+                   int32_t flags)
 {
         call_stub_t *stub = NULL;
 
@@ -1212,14 +1242,12 @@ fop_setxattr_stub (call_frame_t *frame, fop_setxattr_t fn,
         stub = stub_new (frame, 1, GF_FOP_SETXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.setxattr = fn;
-        loc_copy (&stub->args.loc, loc);
+        stub->args.setxattr.fn = fn;
+        loc_copy (&stub->args.setxattr.loc, loc);
         /* TODO */
         if (dict)
-                stub->args.xattr = dict_ref (dict);
-        stub->args.flags = flags;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.setxattr.dict = dict_ref (dict);
+        stub->args.setxattr.flags = flags;
 out:
         return stub;
 }
@@ -1229,7 +1257,7 @@ call_stub_t *
 fop_setxattr_cbk_stub (call_frame_t *frame,
                        fop_setxattr_cbk_t fn,
                        int32_t op_ret,
-                       int32_t op_errno, dict_t *xdata)
+                       int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -1238,19 +1266,18 @@ fop_setxattr_cbk_stub (call_frame_t *frame,
         stub = stub_new (frame, 0, GF_FOP_SETXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.setxattr = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+        stub->args.setxattr_cbk.fn = fn;
+        stub->args.setxattr_cbk.op_ret = op_ret;
+        stub->args.setxattr_cbk.op_errno = op_errno;
 out:
         return stub;
 }
 
-
 call_stub_t *
-fop_getxattr_stub (call_frame_t *frame, fop_getxattr_t fn,
-                   loc_t *loc, const char *name, dict_t *xdata)
+fop_getxattr_stub (call_frame_t *frame,
+                   fop_getxattr_t fn,
+                   loc_t *loc,
+                   const char *name)
 {
         call_stub_t *stub = NULL;
 
@@ -1260,22 +1287,22 @@ fop_getxattr_stub (call_frame_t *frame, fop_getxattr_t fn,
         stub = stub_new (frame, 1, GF_FOP_GETXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.getxattr = fn;
-        loc_copy (&stub->args.loc, loc);
+        stub->args.getxattr.fn = fn;
+        loc_copy (&stub->args.getxattr.loc, loc);
 
         if (name)
-                stub->args.name = gf_strdup (name);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.getxattr.name = gf_strdup (name);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_getxattr_cbk_stub (call_frame_t *frame, fop_getxattr_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno,
-                       dict_t *dict, dict_t *xdata)
+fop_getxattr_cbk_stub (call_frame_t *frame,
+                       fop_getxattr_cbk_t fn,
+                       int32_t op_ret,
+                       int32_t op_errno,
+                       dict_t *dict)
 {
         call_stub_t *stub = NULL;
 
@@ -1284,22 +1311,23 @@ fop_getxattr_cbk_stub (call_frame_t *frame, fop_getxattr_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_GETXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.getxattr = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.getxattr_cbk.fn = fn;
+        stub->args.getxattr_cbk.op_ret = op_ret;
+        stub->args.getxattr_cbk.op_errno = op_errno;
         /* TODO */
         if (dict)
-                stub->args_cbk.xattr = dict_ref (dict);
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.getxattr_cbk.dict = dict_ref (dict);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fsetxattr_stub (call_frame_t *frame, fop_fsetxattr_t fn,
-                    fd_t *fd, dict_t *dict, int32_t flags, dict_t *xdata)
+fop_fsetxattr_stub (call_frame_t *frame,
+                    fop_fsetxattr_t fn,
+                    fd_t *fd,
+                    dict_t *dict,
+                    int32_t flags)
 {
         call_stub_t *stub = NULL;
 
@@ -1309,22 +1337,23 @@ fop_fsetxattr_stub (call_frame_t *frame, fop_fsetxattr_t fn,
         stub = stub_new (frame, 1, GF_FOP_FSETXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.fsetxattr = fn;
-        stub->args.fd = fd_ref (fd);
+        stub->args.fsetxattr.fn = fn;
+        stub->args.fsetxattr.fd = fd_ref (fd);
 
+        /* TODO */
         if (dict)
-                stub->args.xattr = dict_ref (dict);
-        stub->args.flags = flags;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.fsetxattr.dict = dict_ref (dict);
+        stub->args.fsetxattr.flags = flags;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fsetxattr_cbk_stub (call_frame_t *frame, fop_fsetxattr_cbk_t fn,
-                        int32_t op_ret, int32_t op_errno, dict_t *xdata)
+fop_fsetxattr_cbk_stub (call_frame_t *frame,
+                        fop_fsetxattr_cbk_t fn,
+                        int32_t op_ret,
+                        int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -1333,19 +1362,19 @@ fop_fsetxattr_cbk_stub (call_frame_t *frame, fop_fsetxattr_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FSETXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fsetxattr = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+        stub->args.fsetxattr_cbk.fn = fn;
+        stub->args.fsetxattr_cbk.op_ret = op_ret;
+        stub->args.fsetxattr_cbk.op_errno = op_errno;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fgetxattr_stub (call_frame_t *frame, fop_fgetxattr_t fn,
-                    fd_t *fd, const char *name, dict_t *xdata)
+fop_fgetxattr_stub (call_frame_t *frame,
+                    fop_fgetxattr_t fn,
+                    fd_t *fd,
+                    const char *name)
 {
         call_stub_t *stub = NULL;
 
@@ -1355,22 +1384,22 @@ fop_fgetxattr_stub (call_frame_t *frame, fop_fgetxattr_t fn,
         stub = stub_new (frame, 1, GF_FOP_FGETXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.fgetxattr = fn;
-        stub->args.fd = fd_ref (fd);
+        stub->args.fgetxattr.fn = fn;
+        stub->args.fgetxattr.fd = fd_ref (fd);
 
         if (name)
-                stub->args.name = gf_strdup (name);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.fgetxattr.name = gf_strdup (name);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fgetxattr_cbk_stub (call_frame_t *frame, fop_fgetxattr_cbk_t fn,
-                        int32_t op_ret, int32_t op_errno,
-                        dict_t *dict, dict_t *xdata)
+fop_fgetxattr_cbk_stub (call_frame_t *frame,
+                        fop_fgetxattr_cbk_t fn,
+                        int32_t op_ret,
+                        int32_t op_errno,
+                        dict_t *dict)
 {
         call_stub_t *stub = NULL;
 
@@ -1379,22 +1408,23 @@ fop_fgetxattr_cbk_stub (call_frame_t *frame, fop_fgetxattr_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_GETXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fgetxattr = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.fgetxattr_cbk.fn = fn;
+        stub->args.fgetxattr_cbk.op_ret = op_ret;
+        stub->args.fgetxattr_cbk.op_errno = op_errno;
 
+        /* TODO */
         if (dict)
-                stub->args_cbk.xattr = dict_ref (dict);
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.fgetxattr_cbk.dict = dict_ref (dict);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_removexattr_stub (call_frame_t *frame, fop_removexattr_t fn,
-                      loc_t *loc, const char *name, dict_t *xdata)
+fop_removexattr_stub (call_frame_t *frame,
+                      fop_removexattr_t fn,
+                      loc_t *loc,
+                      const char *name)
 {
         call_stub_t *stub = NULL;
 
@@ -1405,19 +1435,19 @@ fop_removexattr_stub (call_frame_t *frame, fop_removexattr_t fn,
         stub = stub_new (frame, 1, GF_FOP_REMOVEXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.removexattr = fn;
-        loc_copy (&stub->args.loc, loc);
-        stub->args.name = gf_strdup (name);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.removexattr.fn = fn;
+        loc_copy (&stub->args.removexattr.loc, loc);
+        stub->args.removexattr.name = gf_strdup (name);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_removexattr_cbk_stub (call_frame_t *frame, fop_removexattr_cbk_t fn,
-                          int32_t op_ret, int32_t op_errno, dict_t *xdata)
+fop_removexattr_cbk_stub (call_frame_t *frame,
+                          fop_removexattr_cbk_t fn,
+                          int32_t op_ret,
+                          int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -1426,64 +1456,20 @@ fop_removexattr_cbk_stub (call_frame_t *frame, fop_removexattr_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_REMOVEXATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.removexattr = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
-out:
-        return stub;
-}
-
-
-call_stub_t *
-fop_fremovexattr_stub (call_frame_t *frame, fop_fremovexattr_t fn,
-                       fd_t *fd, const char *name, dict_t *xdata)
-{
-        call_stub_t *stub = NULL;
-
-        GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
-        GF_VALIDATE_OR_GOTO ("call-stub", fd, out);
-        GF_VALIDATE_OR_GOTO ("call-stub", name, out);
-
-        stub = stub_new (frame, 1, GF_FOP_FREMOVEXATTR);
-        GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
-
-        stub->fn.fremovexattr = fn;
-        stub->args.fd = fd_ref (fd);
-        stub->args.name = gf_strdup (name);
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
-out:
-        return stub;
-}
-
-
-call_stub_t *
-fop_fremovexattr_cbk_stub (call_frame_t *frame, fop_fremovexattr_cbk_t fn,
-                           int32_t op_ret, int32_t op_errno, dict_t *xdata)
-{
-        call_stub_t *stub = NULL;
-
-        GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
-
-        stub = stub_new (frame, 0, GF_FOP_FREMOVEXATTR);
-        GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
-
-        stub->fn_cbk.fremovexattr = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+        stub->args.removexattr_cbk.fn = fn;
+        stub->args.removexattr_cbk.op_ret = op_ret;
+        stub->args.removexattr_cbk.op_errno = op_errno;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_lk_stub (call_frame_t *frame, fop_lk_t fn,
-             fd_t *fd, int32_t cmd,
-             struct gf_flock *lock, dict_t *xdata)
+fop_lk_stub (call_frame_t *frame,
+             fop_lk_t fn,
+             fd_t *fd,
+             int32_t cmd,
+             struct gf_flock *lock)
 {
         call_stub_t *stub = NULL;
 
@@ -1493,22 +1479,23 @@ fop_lk_stub (call_frame_t *frame, fop_lk_t fn,
         stub = stub_new (frame, 1, GF_FOP_LK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.lk = fn;
+        stub->args.lk.fn = fn;
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        stub->args.cmd = cmd;
-        stub->args.lock = *lock;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+                stub->args.lk.fd = fd_ref (fd);
+        stub->args.lk.cmd = cmd;
+        stub->args.lk.lock = *lock;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_lk_cbk_stub (call_frame_t *frame, fop_lk_cbk_t fn,
-                 int32_t op_ret, int32_t op_errno,
-                 struct gf_flock *lock, dict_t *xdata)
+fop_lk_cbk_stub (call_frame_t *frame,
+                 fop_lk_cbk_t fn,
+                 int32_t op_ret,
+                 int32_t op_errno,
+                 struct gf_flock *lock)
+
 {
         call_stub_t *stub = NULL;
 
@@ -1517,22 +1504,18 @@ fop_lk_cbk_stub (call_frame_t *frame, fop_lk_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_LK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.lk = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.lk_cbk.fn = fn;
+        stub->args.lk_cbk.op_ret = op_ret;
+        stub->args.lk_cbk.op_errno = op_errno;
         if (op_ret == 0)
-                stub->args_cbk.lock = *lock;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.lk_cbk.lock = *lock;
 out:
         return stub;
 }
 
-
 call_stub_t *
 fop_inodelk_stub (call_frame_t *frame, fop_inodelk_t fn,
-                  const char *volume, loc_t *loc, int32_t cmd,
-                  struct gf_flock *lock, dict_t *xdata)
+                  const char *volume, loc_t *loc, int32_t cmd, struct gf_flock *lock)
 {
         call_stub_t *stub = NULL;
 
@@ -1542,24 +1525,21 @@ fop_inodelk_stub (call_frame_t *frame, fop_inodelk_t fn,
         stub = stub_new (frame, 1, GF_FOP_INODELK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.inodelk = fn;
+        stub->args.inodelk.fn = fn;
 
         if (volume)
-                stub->args.volume = gf_strdup (volume);
+                stub->args.inodelk.volume = gf_strdup (volume);
 
-        loc_copy (&stub->args.loc, loc);
-        stub->args.cmd  = cmd;
-        stub->args.lock = *lock;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        loc_copy (&stub->args.inodelk.loc, loc);
+        stub->args.inodelk.cmd  = cmd;
+        stub->args.inodelk.lock = *lock;
 out:
         return stub;
 }
 
-
 call_stub_t *
 fop_inodelk_cbk_stub (call_frame_t *frame, fop_inodelk_cbk_t fn,
-                      int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -1568,12 +1548,10 @@ fop_inodelk_cbk_stub (call_frame_t *frame, fop_inodelk_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_INODELK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.inodelk       = fn;
-        stub->args_cbk.op_ret   = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.inodelk_cbk.fn       = fn;
+        stub->args.inodelk_cbk.op_ret   = op_ret;
+        stub->args.inodelk_cbk.op_errno = op_errno;
 
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
@@ -1581,8 +1559,7 @@ out:
 
 call_stub_t *
 fop_finodelk_stub (call_frame_t *frame, fop_finodelk_t fn,
-                   const char *volume, fd_t *fd, int32_t cmd,
-                   struct gf_flock *lock, dict_t *xdata)
+                   const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *lock)
 {
         call_stub_t *stub = NULL;
 
@@ -1592,19 +1569,17 @@ fop_finodelk_stub (call_frame_t *frame, fop_finodelk_t fn,
         stub = stub_new (frame, 1, GF_FOP_FINODELK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.finodelk = fn;
+        stub->args.finodelk.fn = fn;
 
         if (fd)
-                stub->args.fd   = fd_ref (fd);
+                stub->args.finodelk.fd   = fd_ref (fd);
 
         if (volume)
-                stub->args.volume = gf_strdup (volume);
+                stub->args.finodelk.volume = gf_strdup (volume);
 
-        stub->args.cmd  = cmd;
-        stub->args.lock = *lock;
+        stub->args.finodelk.cmd  = cmd;
+        stub->args.finodelk.lock = *lock;
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
@@ -1612,7 +1587,7 @@ out:
 
 call_stub_t *
 fop_finodelk_cbk_stub (call_frame_t *frame, fop_inodelk_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                       int32_t op_ret, int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -1621,12 +1596,10 @@ fop_finodelk_cbk_stub (call_frame_t *frame, fop_inodelk_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FINODELK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.finodelk       = fn;
-        stub->args_cbk.op_ret   = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.finodelk_cbk.fn       = fn;
+        stub->args.finodelk_cbk.op_ret   = op_ret;
+        stub->args.finodelk_cbk.op_errno = op_errno;
 
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
@@ -1635,7 +1608,7 @@ out:
 call_stub_t *
 fop_entrylk_stub (call_frame_t *frame, fop_entrylk_t fn,
                   const char *volume, loc_t *loc, const char *name,
-                  entrylk_cmd cmd, entrylk_type type, dict_t *xdata)
+                  entrylk_cmd cmd, entrylk_type type)
 {
         call_stub_t *stub = NULL;
 
@@ -1644,29 +1617,25 @@ fop_entrylk_stub (call_frame_t *frame, fop_entrylk_t fn,
         stub = stub_new (frame, 1, GF_FOP_ENTRYLK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.entrylk = fn;
+        stub->args.entrylk.fn = fn;
 
         if (volume)
-                stub->args.volume = gf_strdup (volume);
-
-        loc_copy (&stub->args.loc, loc);
+                stub->args.entrylk.volume = gf_strdup (volume);
 
-        stub->args.entrylkcmd = cmd;
-        stub->args.entrylktype = type;
+        loc_copy (&stub->args.entrylk.loc, loc);
 
+        stub->args.entrylk.cmd = cmd;
+        stub->args.entrylk.type = type;
         if (name)
-                stub->args.name = gf_strdup (name);
+                stub->args.entrylk.name = gf_strdup (name);
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
-
 call_stub_t *
 fop_entrylk_cbk_stub (call_frame_t *frame, fop_entrylk_cbk_t fn,
-                      int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -1675,12 +1644,10 @@ fop_entrylk_cbk_stub (call_frame_t *frame, fop_entrylk_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_ENTRYLK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.entrylk       = fn;
-        stub->args_cbk.op_ret   = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.entrylk_cbk.fn       = fn;
+        stub->args.entrylk_cbk.op_ret   = op_ret;
+        stub->args.entrylk_cbk.op_errno = op_errno;
 
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
@@ -1689,7 +1656,7 @@ out:
 call_stub_t *
 fop_fentrylk_stub (call_frame_t *frame, fop_fentrylk_t fn,
                    const char *volume, fd_t *fd, const char *name,
-                   entrylk_cmd cmd, entrylk_type type, dict_t *xdata)
+                   entrylk_cmd cmd, entrylk_type type)
 {
         call_stub_t *stub = NULL;
 
@@ -1698,28 +1665,25 @@ fop_fentrylk_stub (call_frame_t *frame, fop_fentrylk_t fn,
         stub = stub_new (frame, 1, GF_FOP_FENTRYLK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.fentrylk = fn;
+        stub->args.fentrylk.fn = fn;
 
         if (volume)
-                stub->args.volume = gf_strdup (volume);
+                stub->args.fentrylk.volume = gf_strdup (volume);
 
         if (fd)
-                stub->args.fd = fd_ref (fd);
-        stub->args.entrylkcmd = cmd;
-        stub->args.entrylktype = type;
+                stub->args.fentrylk.fd = fd_ref (fd);
+        stub->args.fentrylk.cmd = cmd;
+        stub->args.fentrylk.type = type;
         if (name)
-                stub->args.name = gf_strdup (name);
+                stub->args.fentrylk.name = gf_strdup (name);
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
-
 call_stub_t *
 fop_fentrylk_cbk_stub (call_frame_t *frame, fop_fentrylk_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                       int32_t op_ret, int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -1728,21 +1692,21 @@ fop_fentrylk_cbk_stub (call_frame_t *frame, fop_fentrylk_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FENTRYLK);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fentrylk       = fn;
-        stub->args_cbk.op_ret   = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.fentrylk_cbk.fn       = fn;
+        stub->args.fentrylk_cbk.op_ret   = op_ret;
+        stub->args.fentrylk_cbk.op_errno = op_errno;
 
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_readdirp_cbk_stub (call_frame_t *frame, fop_readdirp_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno,
-                       gf_dirent_t *entries, dict_t *xdata)
+fop_readdirp_cbk_stub (call_frame_t *frame,
+                       fop_readdirp_cbk_t fn,
+                       int32_t op_ret,
+                       int32_t op_errno,
+                       gf_dirent_t *entries)
 {
         call_stub_t *stub = NULL;
         gf_dirent_t *stub_entry = NULL, *entry = NULL;
@@ -1752,10 +1716,14 @@ fop_readdirp_cbk_stub (call_frame_t *frame, fop_readdirp_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_READDIRP);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.readdirp = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.readdirp_cbk.fn = fn;
+        stub->args.readdirp_cbk.op_ret = op_ret;
+        stub->args.readdirp_cbk.op_errno = op_errno;
+        INIT_LIST_HEAD (&stub->args.readdirp_cbk.entries.list);
 
+        /* This check must come after the init of head above
+         * so we're sure the list is empty for list_empty.
+         */
         GF_VALIDATE_OR_GOTO ("call-stub", entries, out);
 
         if (op_ret > 0) {
@@ -1766,23 +1734,21 @@ fop_readdirp_cbk_stub (call_frame_t *frame, fop_readdirp_cbk_t fn,
                         stub_entry->d_off = entry->d_off;
                         stub_entry->d_ino = entry->d_ino;
                         stub_entry->d_stat = entry->d_stat;
-			if (entry->inode)
-				stub_entry->inode = inode_ref (entry->inode);
                         list_add_tail (&stub_entry->list,
-                                       &stub->args_cbk.entries.list);
+                                       &stub->args.readdirp_cbk.entries.list);
                 }
         }
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_readdir_cbk_stub (call_frame_t *frame, fop_readdir_cbk_t fn,
-                      int32_t op_ret, int32_t op_errno,
-                      gf_dirent_t *entries, dict_t *xdata)
+fop_readdir_cbk_stub (call_frame_t *frame,
+                      fop_readdir_cbk_t fn,
+                      int32_t op_ret,
+                      int32_t op_errno,
+                      gf_dirent_t *entries)
 {
         call_stub_t *stub = NULL;
         gf_dirent_t *stub_entry = NULL, *entry = NULL;
@@ -1792,10 +1758,14 @@ fop_readdir_cbk_stub (call_frame_t *frame, fop_readdir_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_READDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.readdir = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.readdir_cbk.fn = fn;
+        stub->args.readdir_cbk.op_ret = op_ret;
+        stub->args.readdir_cbk.op_errno = op_errno;
+        INIT_LIST_HEAD (&stub->args.readdir_cbk.entries.list);
 
+        /* This check must come after the init of head above
+         * so we're sure the list is empty for list_empty.
+         */
         GF_VALIDATE_OR_GOTO ("call-stub", entries, out);
 
         if (op_ret > 0) {
@@ -1807,61 +1777,60 @@ fop_readdir_cbk_stub (call_frame_t *frame, fop_readdir_cbk_t fn,
                         stub_entry->d_ino = entry->d_ino;
 
                         list_add_tail (&stub_entry->list,
-                                       &stub->args_cbk.entries.list);
+                                       &stub->args.readdir_cbk.entries.list);
                 }
         }
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
-
 call_stub_t *
-fop_readdir_stub (call_frame_t *frame, fop_readdir_t fn,
-                  fd_t *fd, size_t size,
-                  off_t off, dict_t *xdata)
+fop_readdir_stub (call_frame_t *frame,
+                  fop_readdir_t fn,
+                  fd_t *fd,
+                  size_t size,
+                  off_t off)
 {
         call_stub_t *stub = NULL;
 
         stub = stub_new (frame, 1, GF_FOP_READDIR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.readdir = fn;
-        stub->args.fd = fd_ref (fd);
-        stub->args.size = size;
-        stub->args.offset = off;
+        stub->args.readdir.fn = fn;
+        stub->args.readdir.fd = fd_ref (fd);
+        stub->args.readdir.size = size;
+        stub->args.readdir.off = off;
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
-
 call_stub_t *
-fop_readdirp_stub (call_frame_t *frame, fop_readdirp_t fn,
-                   fd_t *fd, size_t size, off_t off, dict_t *xdata)
+fop_readdirp_stub (call_frame_t *frame,
+                   fop_readdirp_t fn,
+                   fd_t *fd,
+                   size_t size,
+                   off_t off)
 {
         call_stub_t *stub = NULL;
 
         stub = stub_new (frame, 1, GF_FOP_READDIRP);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.readdirp = fn;
-        stub->args.fd = fd_ref (fd);
-        stub->args.size = size;
-        stub->args.offset = off;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.readdirp.fn = fn;
+        stub->args.readdirp.fd = fd_ref (fd);
+        stub->args.readdirp.size = size;
+        stub->args.readdirp.off = off;
+
 out:
         return stub;
 }
 
-
 call_stub_t *
-fop_rchecksum_stub (call_frame_t *frame, fop_rchecksum_t fn,
-                    fd_t *fd, off_t offset, int32_t len, dict_t *xdata)
+fop_rchecksum_stub (call_frame_t *frame,
+                    fop_rchecksum_t fn,
+                    fd_t *fd, off_t offset,
+                    int32_t len)
 {
         call_stub_t *stub = NULL;
 
@@ -1871,22 +1840,22 @@ fop_rchecksum_stub (call_frame_t *frame, fop_rchecksum_t fn,
         stub = stub_new (frame, 1, GF_FOP_RCHECKSUM);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.rchecksum = fn;
-        stub->args.fd = fd_ref (fd);
-        stub->args.offset = offset;
-        stub->args.size    = len;
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        stub->args.rchecksum.fn = fn;
+        stub->args.rchecksum.fd = fd_ref (fd);
+        stub->args.rchecksum.offset = offset;
+        stub->args.rchecksum.len    = len;
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_rchecksum_cbk_stub (call_frame_t *frame, fop_rchecksum_cbk_t fn,
-                        int32_t op_ret, int32_t op_errno,
-                        uint32_t weak_checksum, uint8_t *strong_checksum,
-			dict_t *xdata)
+fop_rchecksum_cbk_stub (call_frame_t *frame,
+                        fop_rchecksum_cbk_t fn,
+                        int32_t op_ret,
+                        int32_t op_errno,
+                        uint32_t weak_checksum,
+                        uint8_t *strong_checksum)
 {
         call_stub_t *stub = NULL;
 
@@ -1895,27 +1864,28 @@ fop_rchecksum_cbk_stub (call_frame_t *frame, fop_rchecksum_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_RCHECKSUM);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.rchecksum = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.rchecksum_cbk.fn = fn;
+        stub->args.rchecksum_cbk.op_ret = op_ret;
+        stub->args.rchecksum_cbk.op_errno = op_errno;
 
-        if (op_ret >= 0) {
-                stub->args_cbk.weak_checksum =
+        if (op_ret >= 0)
+        {
+                stub->args.rchecksum_cbk.weak_checksum =
                         weak_checksum;
-                stub->args_cbk.strong_checksum =
-                        memdup (strong_checksum, MD5_DIGEST_LENGTH);
-        }
 
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.rchecksum_cbk.strong_checksum =
+                        memdup (strong_checksum, MD5_DIGEST_LEN);
+        }
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_xattrop_cbk_stub (call_frame_t *frame, fop_xattrop_cbk_t fn,
-                      int32_t op_ret, int32_t op_errno, dict_t *xdata)
+fop_xattrop_cbk_stub (call_frame_t *frame,
+                      fop_xattrop_cbk_t fn,
+                      int32_t op_ret,
+                      int32_t op_errno)
 {
         call_stub_t *stub = NULL;
 
@@ -1924,21 +1894,21 @@ fop_xattrop_cbk_stub (call_frame_t *frame, fop_xattrop_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_XATTROP);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.xattrop       = fn;
-        stub->args_cbk.op_ret   = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.xattrop_cbk.fn       = fn;
+        stub->args.xattrop_cbk.op_ret   = op_ret;
+        stub->args.xattrop_cbk.op_errno = op_errno;
 
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_fxattrop_cbk_stub (call_frame_t *frame, fop_fxattrop_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno,
-                       dict_t *xattr, dict_t *xdata)
+fop_fxattrop_cbk_stub (call_frame_t *frame,
+                       fop_fxattrop_cbk_t fn,
+                       int32_t op_ret,
+                       int32_t op_errno,
+                       dict_t *xattr)
 {
         call_stub_t *stub = NULL;
         GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
@@ -1946,23 +1916,23 @@ fop_fxattrop_cbk_stub (call_frame_t *frame, fop_fxattrop_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FXATTROP);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fxattrop = fn;
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.fxattrop_cbk.fn = fn;
+        stub->args.fxattrop_cbk.op_ret = op_ret;
+        stub->args.fxattrop_cbk.op_errno = op_errno;
         if (xattr)
-                stub->args_cbk.xattr = dict_ref (xattr);
+                stub->args.fxattrop_cbk.xattr = dict_ref (xattr);
 
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_xattrop_stub (call_frame_t *frame, fop_xattrop_t fn,
-                  loc_t *loc, gf_xattrop_flags_t optype,
-                  dict_t *xattr, dict_t *xdata)
+fop_xattrop_stub (call_frame_t *frame,
+                  fop_xattrop_t fn,
+                  loc_t *loc,
+                  gf_xattrop_flags_t optype,
+                  dict_t *xattr)
 {
         call_stub_t *stub = NULL;
 
@@ -1972,24 +1942,23 @@ fop_xattrop_stub (call_frame_t *frame, fop_xattrop_t fn,
         stub = stub_new (frame, 1, GF_FOP_XATTROP);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.xattrop = fn;
+        stub->args.xattrop.fn = fn;
 
-        loc_copy (&stub->args.loc, loc);
+        loc_copy (&stub->args.xattrop.loc, loc);
 
-        stub->args.optype = optype;
-        stub->args.xattr = dict_ref (xattr);
+        stub->args.xattrop.optype = optype;
+        stub->args.xattrop.xattr = dict_ref (xattr);
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
-
 call_stub_t *
-fop_fxattrop_stub (call_frame_t *frame, fop_fxattrop_t fn,
-                   fd_t *fd, gf_xattrop_flags_t optype,
-                   dict_t *xattr, dict_t *xdata)
+fop_fxattrop_stub (call_frame_t *frame,
+                   fop_fxattrop_t fn,
+                   fd_t *fd,
+                   gf_xattrop_flags_t optype,
+                   dict_t *xattr)
 {
         call_stub_t *stub = NULL;
 
@@ -1999,25 +1968,25 @@ fop_fxattrop_stub (call_frame_t *frame, fop_fxattrop_t fn,
         stub = stub_new (frame, 1, GF_FOP_FXATTROP);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.fxattrop = fn;
+        stub->args.fxattrop.fn = fn;
 
-        stub->args.fd = fd_ref (fd);
+        stub->args.fxattrop.fd = fd_ref (fd);
 
-        stub->args.optype = optype;
-        stub->args.xattr = dict_ref (xattr);
+        stub->args.fxattrop.optype = optype;
+        stub->args.fxattrop.xattr = dict_ref (xattr);
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
 
 call_stub_t *
-fop_setattr_cbk_stub (call_frame_t *frame, fop_setattr_cbk_t fn,
-                      int32_t op_ret, int32_t op_errno,
-                      struct iatt *statpre, struct iatt *statpost,
-		      dict_t *xdata)
+fop_setattr_cbk_stub (call_frame_t *frame,
+                      fop_setattr_cbk_t fn,
+                      int32_t op_ret,
+                      int32_t op_errno,
+                      struct iatt *statpre,
+                      struct iatt *statpost)
 {
         call_stub_t *stub = NULL;
 
@@ -2026,28 +1995,27 @@ fop_setattr_cbk_stub (call_frame_t *frame, fop_setattr_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_SETATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.setattr = fn;
+        stub->args.setattr_cbk.fn = fn;
 
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.setattr_cbk.op_ret = op_ret;
+        stub->args.setattr_cbk.op_errno = op_errno;
 
         if (statpre)
-                stub->args_cbk.prestat = *statpre;
+                stub->args.setattr_cbk.statpre = *statpre;
         if (statpost)
-                stub->args_cbk.poststat = *statpost;
+                stub->args.setattr_cbk.statpost = *statpost;
 
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
-
 call_stub_t *
-fop_fsetattr_cbk_stub (call_frame_t *frame, fop_setattr_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno,
-                       struct iatt *statpre, struct iatt *statpost,
-		       dict_t *xdata)
+fop_fsetattr_cbk_stub (call_frame_t *frame,
+                       fop_setattr_cbk_t fn,
+                       int32_t op_ret,
+                       int32_t op_errno,
+                       struct iatt *statpre,
+                       struct iatt *statpost)
 {
         call_stub_t *stub = NULL;
 
@@ -2056,26 +2024,25 @@ fop_fsetattr_cbk_stub (call_frame_t *frame, fop_setattr_cbk_t fn,
         stub = stub_new (frame, 0, GF_FOP_FSETATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fsetattr = fn;
+        stub->args.fsetattr_cbk.fn = fn;
 
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        stub->args.fsetattr_cbk.op_ret = op_ret;
+        stub->args.fsetattr_cbk.op_errno = op_errno;
 
         if (statpre)
-                stub->args_cbk.prestat = *statpre;
+                stub->args.setattr_cbk.statpre = *statpre;
         if (statpost)
-                stub->args_cbk.poststat = *statpost;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
+                stub->args.fsetattr_cbk.statpost = *statpost;
 out:
         return stub;
 }
 
-
 call_stub_t *
-fop_setattr_stub (call_frame_t *frame, fop_setattr_t fn,
-                  loc_t *loc, struct iatt *stbuf,
-                  int32_t valid, dict_t *xdata)
+fop_setattr_stub (call_frame_t *frame,
+                  fop_setattr_t fn,
+                  loc_t *loc,
+                  struct iatt *stbuf,
+                  int32_t valid)
 {
         call_stub_t *stub = NULL;
 
@@ -2085,26 +2052,25 @@ fop_setattr_stub (call_frame_t *frame, fop_setattr_t fn,
         stub = stub_new (frame, 1, GF_FOP_SETATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.setattr = fn;
+        stub->args.setattr.fn = fn;
 
-        loc_copy (&stub->args.loc, loc);
+        loc_copy (&stub->args.setattr.loc, loc);
 
         if (stbuf)
-                stub->args.stat = *stbuf;
+                stub->args.setattr.stbuf = *stbuf;
 
-        stub->args.valid = valid;
+        stub->args.setattr.valid = valid;
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
-
 call_stub_t *
-fop_fsetattr_stub (call_frame_t *frame, fop_fsetattr_t fn,
-                   fd_t *fd, struct iatt *stbuf,
-                   int32_t valid, dict_t *xdata)
+fop_fsetattr_stub (call_frame_t *frame,
+                   fop_fsetattr_t fn,
+                   fd_t *fd,
+                   struct iatt *stbuf,
+                   int32_t valid)
 {
         call_stub_t *stub = NULL;
 
@@ -2114,716 +2080,1768 @@ fop_fsetattr_stub (call_frame_t *frame, fop_fsetattr_t fn,
         stub = stub_new (frame, 1, GF_FOP_FSETATTR);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn.fsetattr = fn;
+        stub->args.fsetattr.fn = fn;
 
         if (fd)
-                stub->args.fd = fd_ref (fd);
+                stub->args.fsetattr.fd = fd_ref (fd);
 
         if (stbuf)
-                stub->args.stat = *stbuf;
+                stub->args.fsetattr.stbuf = *stbuf;
 
-        stub->args.valid = valid;
+        stub->args.fsetattr.valid = valid;
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
 out:
         return stub;
 }
 
-call_stub_t *
-fop_fallocate_cbk_stub(call_frame_t *frame, fop_fallocate_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno,
-                       struct iatt *statpre, struct iatt *statpost,
-		       dict_t *xdata)
+static void
+call_resume_wind (call_stub_t *stub)
 {
-        call_stub_t *stub = NULL;
-
-        GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
-
-        stub = stub_new (frame, 0, GF_FOP_FALLOCATE);
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        stub->fn_cbk.fallocate = fn;
-
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        switch (stub->fop) {
+        case GF_FOP_OPEN:
+        {
+                stub->args.open.fn (stub->frame,
+                                    stub->frame->this,
+                                    &stub->args.open.loc,
+                                    stub->args.open.flags, stub->args.open.fd,
+                                    stub->args.open.wbflags);
+                break;
+        }
+        case GF_FOP_CREATE:
+        {
+                stub->args.create.fn (stub->frame,
+                                      stub->frame->this,
+                                      &stub->args.create.loc,
+                                      stub->args.create.flags,
+                                      stub->args.create.mode,
+                                      stub->args.create.fd,
+                                      stub->args.create.params);
+                break;
+        }
+        case GF_FOP_STAT:
+        {
+                stub->args.stat.fn (stub->frame,
+                                    stub->frame->this,
+                                    &stub->args.stat.loc);
+                break;
+        }
+        case GF_FOP_READLINK:
+        {
+                stub->args.readlink.fn (stub->frame,
+                                        stub->frame->this,
+                                        &stub->args.readlink.loc,
+                                        stub->args.readlink.size);
+                break;
+        }
 
-        if (statpre)
-                stub->args_cbk.prestat = *statpre;
-        if (statpost)
-                stub->args_cbk.poststat = *statpost;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
-out:
-        return stub;
-}
+        case GF_FOP_MKNOD:
+        {
+                stub->args.mknod.fn (stub->frame, stub->frame->this,
+                                     &stub->args.mknod.loc,
+                                     stub->args.mknod.mode,
+                                     stub->args.mknod.rdev,
+                                     stub->args.mknod.params);
+        }
+        break;
 
-call_stub_t *
-fop_fallocate_stub(call_frame_t *frame, fop_fallocate_t fn, fd_t *fd,
-		   int32_t mode, off_t offset, size_t len, dict_t *xdata)
-{
-        call_stub_t *stub = NULL;
+        case GF_FOP_MKDIR:
+        {
+                stub->args.mkdir.fn (stub->frame, stub->frame->this,
+                                     &stub->args.mkdir.loc,
+                                     stub->args.mkdir.mode,
+                                     stub->args.mkdir.params);
+        }
+        break;
 
-        GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
-        GF_VALIDATE_OR_GOTO ("call-stub", fn, out);
+        case GF_FOP_UNLINK:
+        {
+                stub->args.unlink.fn (stub->frame,
+                                      stub->frame->this,
+                                      &stub->args.unlink.loc);
+        }
+        break;
 
-        stub = stub_new (frame, 1, GF_FOP_FALLOCATE);
-        GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
+        case GF_FOP_RMDIR:
+        {
+                stub->args.rmdir.fn (stub->frame, stub->frame->this,
+                                     &stub->args.rmdir.loc,
+                                     stub->args.rmdir.flags);
+        }
+        break;
 
-        stub->fn.fallocate = fn;
+        case GF_FOP_SYMLINK:
+        {
+                stub->args.symlink.fn (stub->frame,
+                                       stub->frame->this,
+                                       stub->args.symlink.linkname,
+                                       &stub->args.symlink.loc,
+                                       stub->args.symlink.params);
+        }
+        break;
 
-        if (fd)
-                stub->args.fd = fd_ref (fd);
+        case GF_FOP_RENAME:
+        {
+                stub->args.rename.fn (stub->frame,
+                                      stub->frame->this,
+                                      &stub->args.rename.old,
+                                      &stub->args.rename.new);
+        }
+        break;
 
-	stub->args.flags = mode;
-	stub->args.offset = offset;
-	stub->args.size = len;
+        case GF_FOP_LINK:
+        {
+                stub->args.link.fn (stub->frame,
+                                    stub->frame->this,
+                                    &stub->args.link.oldloc,
+                                    &stub->args.link.newloc);
+        }
+        break;
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
-out:
-        return stub;
+        case GF_FOP_TRUNCATE:
+        {
+                stub->args.truncate.fn (stub->frame,
+                                        stub->frame->this,
+                                        &stub->args.truncate.loc,
+                                        stub->args.truncate.off);
+                break;
+        }
 
-}
+        case GF_FOP_READ:
+        {
+                stub->args.readv.fn (stub->frame,
+                                     stub->frame->this,
+                                     stub->args.readv.fd,
+                                     stub->args.readv.size,
+                                     stub->args.readv.off);
+                break;
+        }
 
-call_stub_t *
-fop_discard_cbk_stub(call_frame_t *frame, fop_discard_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     struct iatt *statpre, struct iatt *statpost,
-		     dict_t *xdata)
-{
-        call_stub_t *stub = NULL;
+        case GF_FOP_WRITE:
+        {
+                stub->args.writev.fn (stub->frame,
+                                      stub->frame->this,
+                                      stub->args.writev.fd,
+                                      stub->args.writev.vector,
+                                      stub->args.writev.count,
+                                      stub->args.writev.off,
+                                      stub->args.writev.iobref);
+                break;
+        }
 
-        GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
+        case GF_FOP_STATFS:
+        {
+                stub->args.statfs.fn (stub->frame,
+                                      stub->frame->this,
+                                      &stub->args.statfs.loc);
+                break;
+        }
+        case GF_FOP_FLUSH:
+        {
+                stub->args.flush.fn (stub->frame,
+                                     stub->frame->this,
+                                     stub->args.flush.fd);
+                break;
+        }
 
-        stub = stub_new (frame, 0, GF_FOP_DISCARD);
-        GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
+        case GF_FOP_FSYNC:
+        {
+                stub->args.fsync.fn (stub->frame,
+                                     stub->frame->this,
+                                     stub->args.fsync.fd,
+                                     stub->args.fsync.datasync);
+                break;
+        }
 
-        stub->fn_cbk.discard = fn;
+        case GF_FOP_SETXATTR:
+        {
+                stub->args.setxattr.fn (stub->frame,
+                                        stub->frame->this,
+                                        &stub->args.setxattr.loc,
+                                        stub->args.setxattr.dict,
+                                        stub->args.setxattr.flags);
+                break;
+        }
 
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        case GF_FOP_GETXATTR:
+        {
+                stub->args.getxattr.fn (stub->frame,
+                                        stub->frame->this,
+                                        &stub->args.getxattr.loc,
+                                        stub->args.getxattr.name);
+                break;
+        }
 
-        if (statpre)
-                stub->args_cbk.prestat = *statpre;
-        if (statpost)
-                stub->args_cbk.poststat = *statpost;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
-out:
-        return stub;
-}
+        case GF_FOP_FSETXATTR:
+        {
+                stub->args.fsetxattr.fn (stub->frame,
+                                         stub->frame->this,
+                                         stub->args.fsetxattr.fd,
+                                         stub->args.fsetxattr.dict,
+                                         stub->args.fsetxattr.flags);
+                break;
+        }
 
-call_stub_t *
-fop_discard_stub(call_frame_t *frame, fop_discard_t fn, fd_t *fd,
-		 off_t offset, size_t len, dict_t *xdata)
-{
-        call_stub_t *stub = NULL;
+        case GF_FOP_FGETXATTR:
+        {
+                stub->args.fgetxattr.fn (stub->frame,
+                                         stub->frame->this,
+                                         stub->args.fgetxattr.fd,
+                                         stub->args.fgetxattr.name);
+                break;
+        }
 
-        GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
-        GF_VALIDATE_OR_GOTO ("call-stub", fn, out);
+        case GF_FOP_REMOVEXATTR:
+        {
+                stub->args.removexattr.fn (stub->frame,
+                                           stub->frame->this,
+                                           &stub->args.removexattr.loc,
+                                           stub->args.removexattr.name);
+                break;
+        }
 
-        stub = stub_new (frame, 1, GF_FOP_DISCARD);
-        GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
+        case GF_FOP_OPENDIR:
+        {
+                stub->args.opendir.fn (stub->frame,
+                                       stub->frame->this,
+                                       &stub->args.opendir.loc,
+                                       stub->args.opendir.fd);
+                break;
+        }
 
-        stub->fn.discard = fn;
+        case GF_FOP_FSYNCDIR:
+        {
+                stub->args.fsyncdir.fn (stub->frame,
+                                        stub->frame->this,
+                                        stub->args.fsyncdir.fd,
+                                        stub->args.fsyncdir.datasync);
+                break;
+        }
 
-        if (fd)
-                stub->args.fd = fd_ref (fd);
+        case GF_FOP_ACCESS:
+        {
+                stub->args.access.fn (stub->frame,
+                                      stub->frame->this,
+                                      &stub->args.access.loc,
+                                      stub->args.access.mask);
+                break;
+        }
 
-	stub->args.offset = offset;
-	stub->args.size = len;
+        case GF_FOP_FTRUNCATE:
+        {
+                stub->args.ftruncate.fn (stub->frame,
+                                         stub->frame->this,
+                                         stub->args.ftruncate.fd,
+                                         stub->args.ftruncate.off);
+                break;
+        }
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
-out:
-        return stub;
+        case GF_FOP_FSTAT:
+        {
+                stub->args.fstat.fn (stub->frame,
+                                     stub->frame->this,
+                                     stub->args.fstat.fd);
+                break;
+        }
 
-}
+        case GF_FOP_LK:
+        {
+                stub->args.lk.fn (stub->frame,
+                                  stub->frame->this,
+                                  stub->args.lk.fd,
+                                  stub->args.lk.cmd,
+                                  &stub->args.lk.lock);
+                break;
+        }
 
-call_stub_t *
-fop_zerofill_cbk_stub(call_frame_t *frame, fop_zerofill_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     struct iatt *statpre, struct iatt *statpost,
-                     dict_t *xdata)
-{
-        call_stub_t *stub = NULL;
+        case GF_FOP_INODELK:
+        {
+                stub->args.inodelk.fn (stub->frame,
+                                       stub->frame->this,
+                                       stub->args.inodelk.volume,
+                                       &stub->args.inodelk.loc,
+                                       stub->args.inodelk.cmd,
+                                       &stub->args.inodelk.lock);
+                break;
+        }
 
-        GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
+        case GF_FOP_FINODELK:
+        {
+                stub->args.finodelk.fn (stub->frame,
+                                        stub->frame->this,
+                                        stub->args.finodelk.volume,
+                                        stub->args.finodelk.fd,
+                                        stub->args.finodelk.cmd,
+                                        &stub->args.finodelk.lock);
+                break;
+        }
 
-        stub = stub_new (frame, 0, GF_FOP_ZEROFILL);
-        GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
+        case GF_FOP_ENTRYLK:
+        {
+                stub->args.entrylk.fn (stub->frame,
+                                       stub->frame->this,
+                                       stub->args.entrylk.volume,
+                                       &stub->args.entrylk.loc,
+                                       stub->args.entrylk.name,
+                                       stub->args.entrylk.cmd,
+                                       stub->args.entrylk.type);
+                break;
+        }
 
-        stub->fn_cbk.zerofill = fn;
+        case GF_FOP_FENTRYLK:
+        {
+                stub->args.fentrylk.fn (stub->frame,
+                                        stub->frame->this,
+                                        stub->args.fentrylk.volume,
+                                        stub->args.fentrylk.fd,
+                                        stub->args.fentrylk.name,
+                                        stub->args.fentrylk.cmd,
+                                        stub->args.fentrylk.type);
+                break;
+        }
 
-        stub->args_cbk.op_ret = op_ret;
-        stub->args_cbk.op_errno = op_errno;
+        break;
 
-        if (statpre)
-                stub->args_cbk.prestat = *statpre;
-        if (statpost)
-                stub->args_cbk.poststat = *statpost;
-        if (xdata)
-                stub->args_cbk.xdata = dict_ref (xdata);
-out:
-        return stub;
-}
+        case GF_FOP_LOOKUP:
+        {
+                stub->args.lookup.fn (stub->frame,
+                                      stub->frame->this,
+                                      &stub->args.lookup.loc,
+                                      stub->args.lookup.xattr_req);
+                break;
+        }
 
-call_stub_t *
-fop_zerofill_stub(call_frame_t *frame, fop_zerofill_t fn, fd_t *fd,
-                 off_t offset, size_t len, dict_t *xdata)
-{
-        call_stub_t *stub = NULL;
+        case GF_FOP_RCHECKSUM:
+        {
+                stub->args.rchecksum.fn (stub->frame,
+                                         stub->frame->this,
+                                         stub->args.rchecksum.fd,
+                                         stub->args.rchecksum.offset,
+                                         stub->args.rchecksum.len);
+                break;
+        }
 
-        GF_VALIDATE_OR_GOTO ("call-stub", frame, out);
-        GF_VALIDATE_OR_GOTO ("call-stub", fn, out);
+        case GF_FOP_READDIR:
+        {
+                stub->args.readdir.fn (stub->frame,
+                                       stub->frame->this,
+                                       stub->args.readdir.fd,
+                                       stub->args.readdir.size,
+                                       stub->args.readdir.off);
+                break;
+        }
 
-        stub = stub_new (frame, 1, GF_FOP_ZEROFILL);
-        GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
+        case GF_FOP_READDIRP:
+        {
+                stub->args.readdirp.fn (stub->frame,
+                                        stub->frame->this,
+                                        stub->args.readdirp.fd,
+                                        stub->args.readdirp.size,
+                                        stub->args.readdirp.off);
+                break;
+        }
 
-        stub->fn.zerofill = fn;
+        case GF_FOP_XATTROP:
+        {
+                stub->args.xattrop.fn (stub->frame,
+                                       stub->frame->this,
+                                       &stub->args.xattrop.loc,
+                                       stub->args.xattrop.optype,
+                                       stub->args.xattrop.xattr);
 
-        if (fd)
-                stub->args.fd = fd_ref (fd);
+                break;
+        }
+        case GF_FOP_FXATTROP:
+        {
+                stub->args.fxattrop.fn (stub->frame,
+                                        stub->frame->this,
+                                        stub->args.fxattrop.fd,
+                                        stub->args.fxattrop.optype,
+                                        stub->args.fxattrop.xattr);
 
-        stub->args.offset = offset;
-        stub->args.size = len;
+                break;
+        }
+        case GF_FOP_SETATTR:
+        {
+                stub->args.setattr.fn (stub->frame,
+                                       stub->frame->this,
+                                       &stub->args.setattr.loc,
+                                       &stub->args.setattr.stbuf,
+                                       stub->args.setattr.valid);
+                break;
+        }
+        case GF_FOP_FSETATTR:
+        {
+                stub->args.fsetattr.fn (stub->frame,
+                                        stub->frame->this,
+                                        stub->args.fsetattr.fd,
+                                        &stub->args.fsetattr.stbuf,
+                                        stub->args.fsetattr.valid);
+                break;
+        }
+        default:
+        {
+                gf_log_callingfn ("call-stub", GF_LOG_ERROR,
+                                  "Invalid value of FOP (%d)",
+                                  stub->fop);
+                break;
+        }
 
-        if (xdata)
-                stub->args.xdata = dict_ref (xdata);
+        }
 out:
-        return stub;
-
+        return;
 }
 
 
+
 static void
-call_resume_wind (call_stub_t *stub)
+call_resume_unwind (call_stub_t *stub)
 {
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
         switch (stub->fop) {
         case GF_FOP_OPEN:
-                stub->fn.open (stub->frame, stub->frame->this,
-			       &stub->args.loc, stub->args.flags,
-			       stub->args.fd, stub->args.xdata);
+        {
+                if (!stub->args.open_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.open_cbk.op_ret,
+                                      stub->args.open_cbk.op_errno,
+                                      stub->args.open_cbk.fd);
+                else
+                        stub->args.open_cbk.fn (stub->frame,
+                                                stub->frame->cookie,
+                                                stub->frame->this,
+                                                stub->args.open_cbk.op_ret,
+                                                stub->args.open_cbk.op_errno,
+                                                stub->args.open_cbk.fd);
                 break;
+        }
+
         case GF_FOP_CREATE:
-                stub->fn.create (stub->frame, stub->frame->this,
-				 &stub->args.loc, stub->args.flags,
-				 stub->args.mode, stub->args.umask,
-				 stub->args.fd, stub->args.xdata);
+        {
+                if (!stub->args.create_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.create_cbk.op_ret,
+                                      stub->args.create_cbk.op_errno,
+                                      stub->args.create_cbk.fd,
+                                      stub->args.create_cbk.inode,
+                                      &stub->args.create_cbk.buf,
+                                      &stub->args.create_cbk.preparent,
+                                      &stub->args.create_cbk.postparent);
+                else
+                        stub->args.create_cbk.fn (stub->frame,
+                                                  stub->frame->cookie,
+                                                  stub->frame->this,
+                                                  stub->args.create_cbk.op_ret,
+                                                  stub->args.create_cbk.op_errno,
+                                                  stub->args.create_cbk.fd,
+                                                  stub->args.create_cbk.inode,
+                                                  &stub->args.create_cbk.buf,
+                                                  &stub->args.create_cbk.preparent,
+                                                  &stub->args.create_cbk.postparent);
+
                 break;
+        }
+
         case GF_FOP_STAT:
-                stub->fn.stat (stub->frame, stub->frame->this,
-			       &stub->args.loc, stub->args.xdata);
+        {
+                if (!stub->args.stat_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.stat_cbk.op_ret,
+                                      stub->args.stat_cbk.op_errno,
+                                      &stub->args.stat_cbk.buf);
+                else
+                        stub->args.stat_cbk.fn (stub->frame,
+                                                stub->frame->cookie,
+                                                stub->frame->this,
+                                                stub->args.stat_cbk.op_ret,
+                                                stub->args.stat_cbk.op_errno,
+                                                &stub->args.stat_cbk.buf);
+
                 break;
+        }
+
         case GF_FOP_READLINK:
-                stub->fn.readlink (stub->frame, stub->frame->this,
-				   &stub->args.loc, stub->args.size,
-				   stub->args.xdata);
+        {
+                if (!stub->args.readlink_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.readlink_cbk.op_ret,
+                                      stub->args.readlink_cbk.op_errno,
+                                      stub->args.readlink_cbk.buf,
+                                      &stub->args.readlink_cbk.sbuf);
+                else
+                        stub->args.readlink_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.readlink_cbk.op_ret,
+                                                    stub->args.readlink_cbk.op_errno,
+                                                    stub->args.readlink_cbk.buf,
+                                                    &stub->args.readlink_cbk.sbuf);
+
                 break;
+        }
+
         case GF_FOP_MKNOD:
-                stub->fn.mknod (stub->frame, stub->frame->this,
-				&stub->args.loc, stub->args.mode,
-				stub->args.rdev, stub->args.umask,
-				stub->args.xdata);
-		break;
+        {
+                if (!stub->args.mknod_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.mknod_cbk.op_ret,
+                                      stub->args.mknod_cbk.op_errno,
+                                      stub->args.mknod_cbk.inode,
+                                      &stub->args.mknod_cbk.buf,
+                                      &stub->args.mknod_cbk.preparent,
+                                      &stub->args.mknod_cbk.postparent);
+                else
+                        stub->args.mknod_cbk.fn (stub->frame,
+                                                 stub->frame->cookie,
+                                                 stub->frame->this,
+                                                 stub->args.mknod_cbk.op_ret,
+                                                 stub->args.mknod_cbk.op_errno,
+                                                 stub->args.mknod_cbk.inode,
+                                                 &stub->args.mknod_cbk.buf,
+                                                 &stub->args.mknod_cbk.preparent,
+                                                 &stub->args.mknod_cbk.postparent);
+                break;
+        }
+
         case GF_FOP_MKDIR:
-                stub->fn.mkdir (stub->frame, stub->frame->this,
-				&stub->args.loc, stub->args.mode,
-				stub->args.umask, stub->args.xdata);
-		break;
+        {
+                if (!stub->args.mkdir_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.mkdir_cbk.op_ret,
+                                      stub->args.mkdir_cbk.op_errno,
+                                      stub->args.mkdir_cbk.inode,
+                                      &stub->args.mkdir_cbk.buf,
+                                      &stub->args.mkdir_cbk.preparent,
+                                      &stub->args.mkdir_cbk.postparent);
+                else
+                        stub->args.mkdir_cbk.fn (stub->frame,
+                                                 stub->frame->cookie,
+                                                 stub->frame->this,
+                                                 stub->args.mkdir_cbk.op_ret,
+                                                 stub->args.mkdir_cbk.op_errno,
+                                                 stub->args.mkdir_cbk.inode,
+                                                 &stub->args.mkdir_cbk.buf,
+                                                 &stub->args.mkdir_cbk.preparent,
+                                                 &stub->args.mkdir_cbk.postparent);
+
+                if (stub->args.mkdir_cbk.inode)
+                        inode_unref (stub->args.mkdir_cbk.inode);
+
+                break;
+        }
+
         case GF_FOP_UNLINK:
-                stub->fn.unlink (stub->frame, stub->frame->this,
-				 &stub->args.loc, stub->args.xflag,
-				 stub->args.xdata);
-		break;
+        {
+                if (!stub->args.unlink_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.unlink_cbk.op_ret,
+                                      stub->args.unlink_cbk.op_errno,
+                                      &stub->args.unlink_cbk.preparent,
+                                      &stub->args.unlink_cbk.postparent);
+                else
+                        stub->args.unlink_cbk.fn (stub->frame,
+                                                  stub->frame->cookie,
+                                                  stub->frame->this,
+                                                  stub->args.unlink_cbk.op_ret,
+                                                  stub->args.unlink_cbk.op_errno,
+                                                  &stub->args.unlink_cbk.preparent,
+                                                  &stub->args.unlink_cbk.postparent);
+                break;
+        }
+
         case GF_FOP_RMDIR:
-                stub->fn.rmdir (stub->frame, stub->frame->this,
-				&stub->args.loc, stub->args.flags,
-				stub->args.xdata);
-		break;
+        {
+                if (!stub->args.rmdir_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.rmdir_cbk.op_ret,
+                                      stub->args.rmdir_cbk.op_errno,
+                                      &stub->args.rmdir_cbk.preparent,
+                                      &stub->args.rmdir_cbk.postparent);
+                else
+                        stub->args.rmdir_cbk.fn (stub->frame,
+                                                 stub->frame->cookie,
+                                                 stub->frame->this,
+                                                 stub->args.rmdir_cbk.op_ret,
+                                                 stub->args.rmdir_cbk.op_errno,
+                                                 &stub->args.rmdir_cbk.preparent,
+                                                 &stub->args.rmdir_cbk.postparent);
+                break;
+        }
+
         case GF_FOP_SYMLINK:
-                stub->fn.symlink (stub->frame, stub->frame->this,
-				  stub->args.linkname, &stub->args.loc,
-				  stub->args.umask, stub->args.xdata);
-		break;
+        {
+                if (!stub->args.symlink_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.symlink_cbk.op_ret,
+                                      stub->args.symlink_cbk.op_errno,
+                                      stub->args.symlink_cbk.inode,
+                                      &stub->args.symlink_cbk.buf,
+                                      &stub->args.symlink_cbk.preparent,
+                                      &stub->args.symlink_cbk.postparent);
+                else
+                        stub->args.symlink_cbk.fn (stub->frame,
+                                                   stub->frame->cookie,
+                                                   stub->frame->this,
+                                                   stub->args.symlink_cbk.op_ret,
+                                                   stub->args.symlink_cbk.op_errno,
+                                                   stub->args.symlink_cbk.inode,
+                                                   &stub->args.symlink_cbk.buf,
+                                                   &stub->args.symlink_cbk.preparent,
+                                                   &stub->args.symlink_cbk.postparent);
+        }
+        break;
+
         case GF_FOP_RENAME:
-                stub->fn.rename (stub->frame, stub->frame->this,
-				 &stub->args.loc, &stub->args.loc2,
-				 stub->args.xdata);
-		break;
+        {
+                if (!stub->args.rename_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.rename_cbk.op_ret,
+                                      stub->args.rename_cbk.op_errno,
+                                      &stub->args.rename_cbk.buf,
+                                      &stub->args.rename_cbk.preoldparent,
+                                      &stub->args.rename_cbk.postoldparent,
+                                      &stub->args.rename_cbk.prenewparent,
+                                      &stub->args.rename_cbk.postnewparent);
+                else
+                        stub->args.rename_cbk.fn (stub->frame,
+                                                  stub->frame->cookie,
+                                                  stub->frame->this,
+                                                  stub->args.rename_cbk.op_ret,
+                                                  stub->args.rename_cbk.op_errno,
+                                                  &stub->args.rename_cbk.buf,
+                                                  &stub->args.rename_cbk.preoldparent,
+                                                  &stub->args.rename_cbk.postoldparent,
+                                                  &stub->args.rename_cbk.prenewparent,
+                                                  &stub->args.rename_cbk.postnewparent);
+                break;
+        }
+
         case GF_FOP_LINK:
-                stub->fn.link (stub->frame, stub->frame->this,
-			       &stub->args.loc, &stub->args.loc2,
-			       stub->args.xdata);
-		break;
+        {
+                if (!stub->args.link_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.link_cbk.op_ret,
+                                      stub->args.link_cbk.op_errno,
+                                      stub->args.link_cbk.inode,
+                                      &stub->args.link_cbk.buf);
+                else
+                        stub->args.link_cbk.fn (stub->frame,
+                                                stub->frame->cookie,
+                                                stub->frame->this,
+                                                stub->args.link_cbk.op_ret,
+                                                stub->args.link_cbk.op_errno,
+                                                stub->args.link_cbk.inode,
+                                                &stub->args.link_cbk.buf,
+                                                &stub->args.link_cbk.preparent,
+                                                &stub->args.link_cbk.postparent);
+                break;
+        }
+
         case GF_FOP_TRUNCATE:
-                stub->fn.truncate (stub->frame, stub->frame->this,
-				   &stub->args.loc, stub->args.offset,
-				   stub->args.xdata);
+        {
+                if (!stub->args.truncate_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.truncate_cbk.op_ret,
+                                      stub->args.truncate_cbk.op_errno,
+                                      &stub->args.truncate_cbk.prebuf,
+                                      &stub->args.truncate_cbk.postbuf);
+                else
+                        stub->args.truncate_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.truncate_cbk.op_ret,
+                                                    stub->args.truncate_cbk.op_errno,
+                                                    &stub->args.truncate_cbk.prebuf,
+                                                    &stub->args.truncate_cbk.postbuf);
                 break;
+        }
+
         case GF_FOP_READ:
-                stub->fn.readv (stub->frame, stub->frame->this,
-				stub->args.fd, stub->args.size,
-				stub->args.offset, stub->args.flags,
-				stub->args.xdata);
-                break;
+        {
+                if (!stub->args.readv_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.readv_cbk.op_ret,
+                                      stub->args.readv_cbk.op_errno,
+                                      stub->args.readv_cbk.vector,
+                                      stub->args.readv_cbk.count,
+                                      &stub->args.readv_cbk.stbuf,
+                                      stub->args.readv_cbk.iobref);
+                else
+                        stub->args.readv_cbk.fn (stub->frame,
+                                                 stub->frame->cookie,
+                                                 stub->frame->this,
+                                                 stub->args.readv_cbk.op_ret,
+                                                 stub->args.readv_cbk.op_errno,
+                                                 stub->args.readv_cbk.vector,
+                                                 stub->args.readv_cbk.count,
+                                                 &stub->args.readv_cbk.stbuf,
+                                                 stub->args.readv_cbk.iobref);
+        }
+        break;
+
         case GF_FOP_WRITE:
-                stub->fn.writev (stub->frame, stub->frame->this,
-				 stub->args.fd, stub->args.vector,
-				 stub->args.count, stub->args.offset,
-				 stub->args.flags, stub->args.iobref,
-				 stub->args.xdata);
+        {
+                if (!stub->args.writev_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.writev_cbk.op_ret,
+                                      stub->args.writev_cbk.op_errno,
+                                      &stub->args.writev_cbk.prebuf,
+                                      &stub->args.writev_cbk.postbuf);
+                else
+                        stub->args.writev_cbk.fn (stub->frame,
+                                                  stub->frame->cookie,
+                                                  stub->frame->this,
+                                                  stub->args.writev_cbk.op_ret,
+                                                  stub->args.writev_cbk.op_errno,
+                                                  &stub->args.writev_cbk.prebuf,
+                                                  &stub->args.writev_cbk.postbuf);
                 break;
+        }
+
         case GF_FOP_STATFS:
-                stub->fn.statfs (stub->frame, stub->frame->this,
-				 &stub->args.loc, stub->args.xdata);
-                break;
+        {
+                if (!stub->args.statfs_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.statfs_cbk.op_ret,
+                                      stub->args.statfs_cbk.op_errno,
+                                      &(stub->args.statfs_cbk.buf));
+                else
+                        stub->args.statfs_cbk.fn (stub->frame,
+                                                  stub->frame->cookie,
+                                                  stub->frame->this,
+                                                  stub->args.statfs_cbk.op_ret,
+                                                  stub->args.statfs_cbk.op_errno,
+                                                  &(stub->args.statfs_cbk.buf));
+        }
+        break;
+
         case GF_FOP_FLUSH:
-                stub->fn.flush (stub->frame, stub->frame->this,
-				stub->args.fd, stub->args.xdata);
+        {
+                if (!stub->args.flush_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.flush_cbk.op_ret,
+                                      stub->args.flush_cbk.op_errno);
+                else
+                        stub->args.flush_cbk.fn (stub->frame,
+                                                 stub->frame->cookie,
+                                                 stub->frame->this,
+                                                 stub->args.flush_cbk.op_ret,
+                                                 stub->args.flush_cbk.op_errno);
+
                 break;
+        }
+
         case GF_FOP_FSYNC:
-                stub->fn.fsync (stub->frame, stub->frame->this,
-				stub->args.fd, stub->args.datasync,
-				stub->args.xdata);
+        {
+                if (!stub->args.fsync_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.fsync_cbk.op_ret,
+                                      stub->args.fsync_cbk.op_errno,
+                                      &stub->args.fsync_cbk.prebuf,
+                                      &stub->args.fsync_cbk.postbuf);
+                else
+                        stub->args.fsync_cbk.fn (stub->frame,
+                                                 stub->frame->cookie,
+                                                 stub->frame->this,
+                                                 stub->args.fsync_cbk.op_ret,
+                                                 stub->args.fsync_cbk.op_errno,
+                                                 &stub->args.fsync_cbk.prebuf,
+                                                 &stub->args.fsync_cbk.postbuf);
                 break;
+        }
+
         case GF_FOP_SETXATTR:
-                stub->fn.setxattr (stub->frame, stub->frame->this,
-				   &stub->args.loc, stub->args.xattr,
-				   stub->args.flags, stub->args.xdata);
+        {
+                if (!stub->args.setxattr_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.setxattr_cbk.op_ret,
+                                      stub->args.setxattr_cbk.op_errno);
+
+                else
+                        stub->args.setxattr_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.setxattr_cbk.op_ret,
+                                                    stub->args.setxattr_cbk.op_errno);
+
                 break;
+        }
+
         case GF_FOP_GETXATTR:
-                stub->fn.getxattr (stub->frame, stub->frame->this,
-				   &stub->args.loc, stub->args.name,
-				   stub->args.xdata);
+        {
+                if (!stub->args.getxattr_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.getxattr_cbk.op_ret,
+                                      stub->args.getxattr_cbk.op_errno,
+                                      stub->args.getxattr_cbk.dict);
+                else
+                        stub->args.getxattr_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.getxattr_cbk.op_ret,
+                                                    stub->args.getxattr_cbk.op_errno,
+                                                    stub->args.getxattr_cbk.dict);
                 break;
+        }
+
         case GF_FOP_FSETXATTR:
-                stub->fn.fsetxattr (stub->frame, stub->frame->this,
-				    stub->args.fd, stub->args.xattr,
-				    stub->args.flags, stub->args.xdata);
+        {
+                if (!stub->args.fsetxattr_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.fsetxattr_cbk.op_ret,
+                                      stub->args.fsetxattr_cbk.op_errno);
+
+                else
+                        stub->args.fsetxattr_cbk.fn (stub->frame,
+                                                     stub->frame->cookie,
+                                                     stub->frame->this,
+                                                     stub->args.fsetxattr_cbk.op_ret,
+                                                     stub->args.fsetxattr_cbk.op_errno);
+
                 break;
+        }
+
         case GF_FOP_FGETXATTR:
-                stub->fn.fgetxattr (stub->frame, stub->frame->this,
-				    stub->args.fd, stub->args.name,
-				    stub->args.xdata);
+        {
+                if (!stub->args.fgetxattr_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.fgetxattr_cbk.op_ret,
+                                      stub->args.fgetxattr_cbk.op_errno,
+                                      stub->args.fgetxattr_cbk.dict);
+                else
+                        stub->args.fgetxattr_cbk.fn (stub->frame,
+                                                     stub->frame->cookie,
+                                                     stub->frame->this,
+                                                     stub->args.fgetxattr_cbk.op_ret,
+                                                     stub->args.fgetxattr_cbk.op_errno,
+                                                     stub->args.fgetxattr_cbk.dict);
                 break;
+        }
+
         case GF_FOP_REMOVEXATTR:
-                stub->fn.removexattr (stub->frame, stub->frame->this,
-				      &stub->args.loc, stub->args.name,
-				      stub->args.xdata);
-                break;
-        case GF_FOP_FREMOVEXATTR:
-                stub->fn.fremovexattr (stub->frame, stub->frame->this,
-				       stub->args.fd, stub->args.name,
-				       stub->args.xdata);
+        {
+                if (!stub->args.removexattr_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.removexattr_cbk.op_ret,
+                                      stub->args.removexattr_cbk.op_errno);
+                else
+                        stub->args.removexattr_cbk.fn (stub->frame,
+                                                       stub->frame->cookie,
+                                                       stub->frame->this,
+                                                       stub->args.removexattr_cbk.op_ret,
+                                                       stub->args.removexattr_cbk.op_errno);
+
                 break;
+        }
+
         case GF_FOP_OPENDIR:
-                stub->fn.opendir (stub->frame, stub->frame->this,
-				  &stub->args.loc, stub->args.fd,
-				  stub->args.xdata);
+        {
+                if (!stub->args.opendir_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.opendir_cbk.op_ret,
+                                      stub->args.opendir_cbk.op_errno,
+                                      stub->args.opendir_cbk.fd);
+                else
+                        stub->args.opendir_cbk.fn (stub->frame,
+                                                   stub->frame->cookie,
+                                                   stub->frame->this,
+                                                   stub->args.opendir_cbk.op_ret,
+                                                   stub->args.opendir_cbk.op_errno,
+                                                   stub->args.opendir_cbk.fd);
                 break;
+        }
+
         case GF_FOP_FSYNCDIR:
-                stub->fn.fsyncdir (stub->frame, stub->frame->this,
-				   stub->args.fd, stub->args.datasync,
-				   stub->args.xdata);
+        {
+                if (!stub->args.fsyncdir_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.fsyncdir_cbk.op_ret,
+                                      stub->args.fsyncdir_cbk.op_errno);
+                else
+                        stub->args.fsyncdir_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.fsyncdir_cbk.op_ret,
+                                                    stub->args.fsyncdir_cbk.op_errno);
                 break;
+        }
+
         case GF_FOP_ACCESS:
-                stub->fn.access (stub->frame, stub->frame->this,
-				 &stub->args.loc, stub->args.mask,
-				 stub->args.xdata);
+        {
+                if (!stub->args.access_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.access_cbk.op_ret,
+                                      stub->args.access_cbk.op_errno);
+                else
+                        stub->args.access_cbk.fn (stub->frame,
+                                                  stub->frame->cookie,
+                                                  stub->frame->this,
+                                                  stub->args.access_cbk.op_ret,
+                                                  stub->args.access_cbk.op_errno);
+
                 break;
+        }
 
         case GF_FOP_FTRUNCATE:
-                stub->fn.ftruncate (stub->frame, stub->frame->this,
-				    stub->args.fd, stub->args.offset,
-				    stub->args.xdata);
+        {
+                if (!stub->args.ftruncate_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.ftruncate_cbk.op_ret,
+                                      stub->args.ftruncate_cbk.op_errno,
+                                      &stub->args.ftruncate_cbk.prebuf,
+                                      &stub->args.ftruncate_cbk.postbuf);
+                else
+                        stub->args.ftruncate_cbk.fn (stub->frame,
+                                                     stub->frame->cookie,
+                                                     stub->frame->this,
+                                                     stub->args.ftruncate_cbk.op_ret,
+                                                     stub->args.ftruncate_cbk.op_errno,
+                                                     &stub->args.ftruncate_cbk.prebuf,
+                                                     &stub->args.ftruncate_cbk.postbuf);
                 break;
+        }
+
         case GF_FOP_FSTAT:
-                stub->fn.fstat (stub->frame, stub->frame->this,
-				stub->args.fd, stub->args.xdata);
+        {
+                if (!stub->args.fstat_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.fstat_cbk.op_ret,
+                                      stub->args.fstat_cbk.op_errno,
+                                      &stub->args.fstat_cbk.buf);
+                else
+                        stub->args.fstat_cbk.fn (stub->frame,
+                                                 stub->frame->cookie,
+                                                 stub->frame->this,
+                                                 stub->args.fstat_cbk.op_ret,
+                                                 stub->args.fstat_cbk.op_errno,
+                                                 &stub->args.fstat_cbk.buf);
+
                 break;
+        }
+
         case GF_FOP_LK:
-                stub->fn.lk (stub->frame, stub->frame->this,
-			     stub->args.fd, stub->args.cmd,
-			     &stub->args.lock, stub->args.xdata);
+        {
+                if (!stub->args.lk_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.lk_cbk.op_ret,
+                                      stub->args.lk_cbk.op_errno,
+                                      &stub->args.lk_cbk.lock);
+                else
+                        stub->args.lk_cbk.fn (stub->frame,
+                                              stub->frame->cookie,
+                                              stub->frame->this,
+                                              stub->args.lk_cbk.op_ret,
+                                              stub->args.lk_cbk.op_errno,
+                                              &stub->args.lk_cbk.lock);
                 break;
+        }
+
         case GF_FOP_INODELK:
-                stub->fn.inodelk (stub->frame, stub->frame->this,
-				  stub->args.volume, &stub->args.loc,
-				  stub->args.cmd, &stub->args.lock,
-				  stub->args.xdata);
+        {
+                if (!stub->args.inodelk_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.inodelk_cbk.op_ret,
+                                      stub->args.inodelk_cbk.op_errno);
+
+                else
+                        stub->args.inodelk_cbk.fn (stub->frame,
+                                                   stub->frame->cookie,
+                                                   stub->frame->this,
+                                                   stub->args.inodelk_cbk.op_ret,
+                                                   stub->args.inodelk_cbk.op_errno);
                 break;
+        }
+
         case GF_FOP_FINODELK:
-                stub->fn.finodelk (stub->frame, stub->frame->this,
-				   stub->args.volume, stub->args.fd,
-				   stub->args.cmd, &stub->args.lock,
-				   stub->args.xdata);
+        {
+                if (!stub->args.finodelk_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.finodelk_cbk.op_ret,
+                                      stub->args.finodelk_cbk.op_errno);
+
+                else
+                        stub->args.finodelk_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.finodelk_cbk.op_ret,
+                                                    stub->args.finodelk_cbk.op_errno);
                 break;
+        }
+
         case GF_FOP_ENTRYLK:
-                stub->fn.entrylk (stub->frame, stub->frame->this,
-				  stub->args.volume, &stub->args.loc,
-				  stub->args.name, stub->args.entrylkcmd,
-				  stub->args.entrylktype, stub->args.xdata);
+        {
+                if (!stub->args.entrylk_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.entrylk_cbk.op_ret,
+                                      stub->args.entrylk_cbk.op_errno);
+
+                else
+                        stub->args.entrylk_cbk.fn (stub->frame,
+                                                   stub->frame->cookie,
+                                                   stub->frame->this,
+                                                   stub->args.entrylk_cbk.op_ret,
+                                                   stub->args.entrylk_cbk.op_errno);
                 break;
+        }
+
         case GF_FOP_FENTRYLK:
-                stub->fn.fentrylk (stub->frame, stub->frame->this,
-				   stub->args.volume, stub->args.fd,
-				   stub->args.name, stub->args.entrylkcmd,
-				   stub->args.entrylktype, stub->args.xdata);
-		break;
+        {
+                if (!stub->args.fentrylk_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.fentrylk_cbk.op_ret,
+                                      stub->args.fentrylk_cbk.op_errno);
+
+                else
+                        stub->args.fentrylk_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.fentrylk_cbk.op_ret,
+                                                    stub->args.fentrylk_cbk.op_errno);
+                break;
+        }
+
         case GF_FOP_LOOKUP:
-                stub->fn.lookup (stub->frame, stub->frame->this,
-				 &stub->args.loc, stub->args.xdata);
+        {
+                if (!stub->args.lookup_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.lookup_cbk.op_ret,
+                                      stub->args.lookup_cbk.op_errno,
+                                      stub->args.lookup_cbk.inode,
+                                      &stub->args.lookup_cbk.buf,
+                                      stub->args.lookup_cbk.dict,
+                                      &stub->args.lookup_cbk.postparent);
+                else
+                        stub->args.lookup_cbk.fn (stub->frame,
+                                                  stub->frame->cookie,
+                                                  stub->frame->this,
+                                                  stub->args.lookup_cbk.op_ret,
+                                                  stub->args.lookup_cbk.op_errno,
+                                                  stub->args.lookup_cbk.inode,
+                                                  &stub->args.lookup_cbk.buf,
+                                                  stub->args.lookup_cbk.dict,
+                                                  &stub->args.lookup_cbk.postparent);
+                /* FIXME NULL should not be passed */
+
+                if (stub->args.lookup_cbk.dict)
+                        dict_unref (stub->args.lookup_cbk.dict);
+                if (stub->args.lookup_cbk.inode)
+                        inode_unref (stub->args.lookup_cbk.inode);
+
                 break;
+        }
+
         case GF_FOP_RCHECKSUM:
-                stub->fn.rchecksum (stub->frame, stub->frame->this,
-				    stub->args.fd, stub->args.offset,
-				    stub->args.size, stub->args.xdata);
+        {
+                if (!stub->args.rchecksum_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.rchecksum_cbk.op_ret,
+                                      stub->args.rchecksum_cbk.op_errno,
+                                      stub->args.rchecksum_cbk.weak_checksum,
+                                      stub->args.rchecksum_cbk.strong_checksum);
+                else
+                        stub->args.rchecksum_cbk.fn (stub->frame,
+                                                     stub->frame->cookie,
+                                                     stub->frame->this,
+                                                     stub->args.rchecksum_cbk.op_ret,
+                                                     stub->args.rchecksum_cbk.op_errno,
+                                                     stub->args.rchecksum_cbk.weak_checksum,
+                                                     stub->args.rchecksum_cbk.strong_checksum);
+                if (stub->args.rchecksum_cbk.op_ret >= 0)
+                {
+                        GF_FREE (stub->args.rchecksum_cbk.strong_checksum);
+                }
+
                 break;
+        }
+
         case GF_FOP_READDIR:
-                stub->fn.readdir (stub->frame, stub->frame->this,
-				  stub->args.fd, stub->args.size,
-				  stub->args.offset, stub->args.xdata);
+        {
+                if (!stub->args.readdir_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.readdir_cbk.op_ret,
+                                      stub->args.readdir_cbk.op_errno,
+                                      &stub->args.readdir_cbk.entries);
+                else
+                        stub->args.readdir_cbk.fn (stub->frame,
+                                                   stub->frame->cookie,
+                                                   stub->frame->this,
+                                                   stub->args.readdir_cbk.op_ret,
+                                                   stub->args.readdir_cbk.op_errno,
+                                                   &stub->args.readdir_cbk.entries);
+
+                if (stub->args.readdir_cbk.op_ret > 0)
+                        gf_dirent_free (&stub->args.readdir_cbk.entries);
+
                 break;
+        }
+
         case GF_FOP_READDIRP:
-                stub->fn.readdirp (stub->frame, stub->frame->this,
-				   stub->args.fd, stub->args.size,
-				   stub->args.offset, stub->args.xdata);
+        {
+                if (!stub->args.readdirp_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.readdirp_cbk.op_ret,
+                                      stub->args.readdirp_cbk.op_errno,
+                                      &stub->args.readdirp_cbk.entries);
+                else
+                        stub->args.readdirp_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.readdirp_cbk.op_ret,
+                                                    stub->args.readdirp_cbk.op_errno,
+                                                    &stub->args.readdirp_cbk.entries);
+
+                if (stub->args.readdirp_cbk.op_ret > 0)
+                        gf_dirent_free (&stub->args.readdirp_cbk.entries);
+
                 break;
+        }
+
         case GF_FOP_XATTROP:
-                stub->fn.xattrop (stub->frame, stub->frame->this,
-				  &stub->args.loc, stub->args.optype,
-				  stub->args.xattr, stub->args.xdata);
+        {
+                if (!stub->args.xattrop_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.xattrop_cbk.op_ret,
+                                      stub->args.xattrop_cbk.op_errno);
+                else
+                        stub->args.xattrop_cbk.fn (stub->frame,
+                                                   stub->frame->cookie,
+                                                   stub->frame->this,
+                                                   stub->args.xattrop_cbk.op_ret,
+                                                   stub->args.xattrop_cbk.op_errno,
+                                                   stub->args.xattrop_cbk.xattr);
+
+                if (stub->args.xattrop_cbk.xattr)
+                        dict_unref (stub->args.xattrop_cbk.xattr);
+
                 break;
+        }
         case GF_FOP_FXATTROP:
-                stub->fn.fxattrop (stub->frame, stub->frame->this,
-				   stub->args.fd, stub->args.optype,
-				   stub->args.xattr, stub->args.xdata);
+        {
+                if (!stub->args.fxattrop_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.fxattrop_cbk.op_ret,
+                                      stub->args.fxattrop_cbk.op_errno);
+                else
+                        stub->args.fxattrop_cbk.fn (stub->frame,
+                                                    stub->frame->cookie,
+                                                    stub->frame->this,
+                                                    stub->args.fxattrop_cbk.op_ret,
+                                                    stub->args.fxattrop_cbk.op_errno,
+                                                    stub->args.fxattrop_cbk.xattr);
+
+                if (stub->args.fxattrop_cbk.xattr)
+                        dict_unref (stub->args.fxattrop_cbk.xattr);
+
                 break;
+        }
         case GF_FOP_SETATTR:
-                stub->fn.setattr (stub->frame, stub->frame->this,
-				  &stub->args.loc, &stub->args.stat,
-				  stub->args.valid, stub->args.xdata);
+        {
+                if (!stub->args.setattr_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.setattr_cbk.op_ret,
+                                      stub->args.setattr_cbk.op_errno,
+                                      &stub->args.setattr_cbk.statpre,
+                                      &stub->args.setattr_cbk.statpost);
+                else
+                        stub->args.setattr_cbk.fn (
+                                stub->frame,
+                                stub->frame->cookie,
+                                stub->frame->this,
+                                stub->args.setattr_cbk.op_ret,
+                                stub->args.setattr_cbk.op_errno,
+                                &stub->args.setattr_cbk.statpre,
+                                &stub->args.setattr_cbk.statpost);
                 break;
+        }
         case GF_FOP_FSETATTR:
-                stub->fn.fsetattr (stub->frame, stub->frame->this,
-				   stub->args.fd, &stub->args.stat,
-				   stub->args.valid, stub->args.xdata);
-                break;
-	case GF_FOP_FALLOCATE:
-		stub->fn.fallocate(stub->frame, stub->frame->this,
-				   stub->args.fd, stub->args.flags,
-				   stub->args.offset, stub->args.size,
-				   stub->args.xdata);
-		break;
-	case GF_FOP_DISCARD:
-		stub->fn.discard(stub->frame, stub->frame->this,
-				 stub->args.fd, stub->args.offset,
-				 stub->args.size, stub->args.xdata);
-		break;
-        case GF_FOP_ZEROFILL:
-                stub->fn.zerofill(stub->frame, stub->frame->this,
-                                 stub->args.fd, stub->args.offset,
-                                 stub->args.size, stub->args.xdata);
+        {
+                if (!stub->args.fsetattr_cbk.fn)
+                        STACK_UNWIND (stub->frame,
+                                      stub->args.fsetattr_cbk.op_ret,
+                                      stub->args.fsetattr_cbk.op_errno,
+                                      &stub->args.fsetattr_cbk.statpre,
+                                      &stub->args.fsetattr_cbk.statpost);
+                else
+                        stub->args.fsetattr_cbk.fn (
+                                stub->frame,
+                                stub->frame->cookie,
+                                stub->frame->this,
+                                stub->args.fsetattr_cbk.op_ret,
+                                stub->args.fsetattr_cbk.op_errno,
+                                &stub->args.fsetattr_cbk.statpre,
+                                &stub->args.fsetattr_cbk.statpost);
                 break;
-
+        }
         default:
+        {
                 gf_log_callingfn ("call-stub", GF_LOG_ERROR,
                                   "Invalid value of FOP (%d)",
                                   stub->fop);
                 break;
         }
+        }
 out:
         return;
 }
 
 
-#define STUB_UNWIND(stb, fop, args ...) do {				\
-	if (stb->fn_cbk.fop)						\
-		stb->fn_cbk.fop (stb->frame, stb->frame->cookie,	\
-				 stb->frame->this, stb->args_cbk.op_ret, \
-				 stb->args_cbk.op_errno, args);		\
-	else								\
-		STACK_UNWIND_STRICT (fop, stb->frame, stb->args_cbk.op_ret, \
-				     stb->args_cbk.op_errno, args);	\
-	} while (0)
-
-
 static void
-call_resume_unwind (call_stub_t *stub)
+call_stub_destroy_wind (call_stub_t *stub)
 {
-        GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
-
         switch (stub->fop) {
         case GF_FOP_OPEN:
-		STUB_UNWIND (stub, open, stub->args_cbk.fd,
-			     stub->args_cbk.xdata);
+        {
+                loc_wipe (&stub->args.open.loc);
+                if (stub->args.open.fd)
+                        fd_unref (stub->args.open.fd);
                 break;
+        }
         case GF_FOP_CREATE:
-		STUB_UNWIND (stub, create, stub->args_cbk.fd,
-			     stub->args_cbk.inode, &stub->args_cbk.stat,
-			     &stub->args_cbk.preparent,
-			     &stub->args_cbk.postparent,
-			     stub->args_cbk.xdata);
+        {
+                loc_wipe (&stub->args.create.loc);
+                if (stub->args.create.fd)
+                        fd_unref (stub->args.create.fd);
+                if (stub->args.create.params)
+                        dict_unref (stub->args.create.params);
                 break;
+        }
         case GF_FOP_STAT:
-		STUB_UNWIND (stub, stat, &stub->args_cbk.stat,
-			     stub->args_cbk.xdata);
+        {
+                loc_wipe (&stub->args.stat.loc);
                 break;
+        }
         case GF_FOP_READLINK:
-		STUB_UNWIND (stub, readlink, stub->args_cbk.buf,
-			     &stub->args_cbk.stat, stub->args.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.readlink.loc);
+                break;
+        }
+
         case GF_FOP_MKNOD:
-		STUB_UNWIND (stub, mknod, stub->args_cbk.inode,
-			     &stub->args_cbk.stat, &stub->args_cbk.preparent,
-			     &stub->args_cbk.postparent, stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.mknod.loc);
+                if (stub->args.mknod.params)
+                        dict_unref (stub->args.mknod.params);
+        }
+        break;
+
         case GF_FOP_MKDIR:
-		STUB_UNWIND (stub, mkdir, stub->args_cbk.inode,
-			     &stub->args_cbk.stat, &stub->args_cbk.preparent,
-			     &stub->args_cbk.postparent, stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.mkdir.loc);
+                if (stub->args.mkdir.params)
+                        dict_unref (stub->args.mkdir.params);
+        }
+        break;
+
         case GF_FOP_UNLINK:
-		STUB_UNWIND (stub, unlink, &stub->args_cbk.preparent,
-			     &stub->args_cbk.postparent, stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.unlink.loc);
+        }
+        break;
+
         case GF_FOP_RMDIR:
-		STUB_UNWIND (stub, rmdir, &stub->args_cbk.preparent,
-			     &stub->args_cbk.postparent, stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.rmdir.loc);
+        }
+        break;
+
         case GF_FOP_SYMLINK:
-		STUB_UNWIND (stub, symlink, stub->args_cbk.inode,
-			     &stub->args_cbk.stat, &stub->args_cbk.preparent,
-			     &stub->args_cbk.postparent, stub->args_cbk.xdata);
-		break;
+        {
+                GF_FREE ((char *)stub->args.symlink.linkname);
+                loc_wipe (&stub->args.symlink.loc);
+                if (stub->args.symlink.params)
+                        dict_unref (stub->args.symlink.params);
+        }
+        break;
+
         case GF_FOP_RENAME:
-		STUB_UNWIND (stub, rename, &stub->args_cbk.stat,
-			     &stub->args_cbk.preparent,
-			     &stub->args_cbk.postparent,
-			     &stub->args_cbk.preparent2,
-			     &stub->args_cbk.postparent2,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.rename.old);
+                loc_wipe (&stub->args.rename.new);
+        }
+        break;
+
         case GF_FOP_LINK:
-		STUB_UNWIND (stub, link, stub->args_cbk.inode,
-			     &stub->args_cbk.stat, &stub->args_cbk.preparent,
-			     &stub->args_cbk.postparent, stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.link.oldloc);
+                loc_wipe (&stub->args.link.newloc);
+        }
+        break;
+
         case GF_FOP_TRUNCATE:
-		STUB_UNWIND (stub, truncate, &stub->args_cbk.prestat,
-			     &stub->args_cbk.poststat, stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.truncate.loc);
+                break;
+        }
+
         case GF_FOP_READ:
-		STUB_UNWIND (stub, readv, stub->args_cbk.vector,
-			     stub->args_cbk.count, &stub->args_cbk.stat,
-			     stub->args_cbk.iobref, stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.readv.fd)
+                        fd_unref (stub->args.readv.fd);
+                break;
+        }
+
         case GF_FOP_WRITE:
-		STUB_UNWIND (stub, writev, &stub->args_cbk.prestat,
-			     &stub->args_cbk.poststat, stub->args_cbk.xdata);
-		break;
+        {
+                struct iobref *iobref = stub->args.writev.iobref;
+                if (stub->args.writev.fd)
+                        fd_unref (stub->args.writev.fd);
+                GF_FREE (stub->args.writev.vector);
+                if (iobref)
+                        iobref_unref (iobref);
+                break;
+        }
+
         case GF_FOP_STATFS:
-		STUB_UNWIND (stub, statfs, &stub->args_cbk.statvfs,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.statfs.loc);
+                break;
+        }
         case GF_FOP_FLUSH:
-		STUB_UNWIND (stub, flush, stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.flush.fd)
+                        fd_unref (stub->args.flush.fd);
+                break;
+        }
+
         case GF_FOP_FSYNC:
-		STUB_UNWIND (stub, fsync, &stub->args_cbk.prestat,
-			     &stub->args_cbk.poststat, stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.fsync.fd)
+                        fd_unref (stub->args.fsync.fd);
+                break;
+        }
+
         case GF_FOP_SETXATTR:
-		STUB_UNWIND (stub, setxattr, stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.setxattr.loc);
+                if (stub->args.setxattr.dict)
+                        dict_unref (stub->args.setxattr.dict);
+                break;
+        }
+
         case GF_FOP_GETXATTR:
-		STUB_UNWIND (stub, getxattr, stub->args_cbk.xattr,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.getxattr.name)
+                        GF_FREE ((char *)stub->args.getxattr.name);
+                loc_wipe (&stub->args.getxattr.loc);
+                break;
+        }
+
         case GF_FOP_FSETXATTR:
-		STUB_UNWIND (stub, fsetxattr, stub->args_cbk.xdata);
-		break;
+        {
+                fd_unref (stub->args.fsetxattr.fd);
+                if (stub->args.fsetxattr.dict)
+                        dict_unref (stub->args.fsetxattr.dict);
+                break;
+        }
+
         case GF_FOP_FGETXATTR:
-		STUB_UNWIND (stub, fgetxattr, stub->args_cbk.xattr,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.fgetxattr.name)
+                        GF_FREE ((char *)stub->args.fgetxattr.name);
+                fd_unref (stub->args.fgetxattr.fd);
+                break;
+        }
+
         case GF_FOP_REMOVEXATTR:
-		STUB_UNWIND (stub, removexattr, stub->args_cbk.xdata);
-		break;
-        case GF_FOP_FREMOVEXATTR:
-		STUB_UNWIND (stub, fremovexattr, stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.removexattr.loc);
+                GF_FREE ((char *)stub->args.removexattr.name);
+                break;
+        }
+
         case GF_FOP_OPENDIR:
-		STUB_UNWIND (stub, opendir, stub->args_cbk.fd,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.opendir.loc);
+                if (stub->args.opendir.fd)
+                        fd_unref (stub->args.opendir.fd);
+                break;
+        }
+
         case GF_FOP_FSYNCDIR:
-		STUB_UNWIND (stub, fsyncdir, stub->args_cbk.xdata);
+        {
+                if (stub->args.fsyncdir.fd)
+                        fd_unref (stub->args.fsyncdir.fd);
                 break;
+        }
+
         case GF_FOP_ACCESS:
-		STUB_UNWIND (stub, access, stub->args_cbk.xdata);
+        {
+                loc_wipe (&stub->args.access.loc);
                 break;
+        }
+
         case GF_FOP_FTRUNCATE:
-		STUB_UNWIND (stub, ftruncate, &stub->args_cbk.prestat,
-			     &stub->args_cbk.poststat, stub->args_cbk.xdata);
+        {
+                if (stub->args.ftruncate.fd)
+                        fd_unref (stub->args.ftruncate.fd);
                 break;
+        }
+
         case GF_FOP_FSTAT:
-		STUB_UNWIND (stub, fstat, &stub->args_cbk.stat,
-			     stub->args_cbk.xdata);
+        {
+                if (stub->args.fstat.fd)
+                        fd_unref (stub->args.fstat.fd);
                 break;
+        }
+
         case GF_FOP_LK:
-		STUB_UNWIND (stub, lk, &stub->args_cbk.lock,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.lk.fd)
+                        fd_unref (stub->args.lk.fd);
+                break;
+        }
+
         case GF_FOP_INODELK:
-		STUB_UNWIND (stub, inodelk, stub->args_cbk.xdata);
+        {
+                if (stub->args.inodelk.volume)
+                        GF_FREE ((char *)stub->args.inodelk.volume);
+
+                loc_wipe (&stub->args.inodelk.loc);
                 break;
+        }
         case GF_FOP_FINODELK:
-		STUB_UNWIND (stub, finodelk, stub->args_cbk.xdata);
+        {
+                if (stub->args.finodelk.volume)
+                        GF_FREE ((char *)stub->args.finodelk.volume);
+
+                if (stub->args.finodelk.fd)
+                        fd_unref (stub->args.finodelk.fd);
                 break;
+        }
         case GF_FOP_ENTRYLK:
-		STUB_UNWIND (stub, entrylk, stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.entrylk.volume)
+                        GF_FREE ((char *)stub->args.entrylk.volume);
+
+                if (stub->args.entrylk.name)
+                        GF_FREE ((char *)stub->args.entrylk.name);
+                loc_wipe (&stub->args.entrylk.loc);
+                break;
+        }
         case GF_FOP_FENTRYLK:
-		STUB_UNWIND (stub, fentrylk, stub->args_cbk.xdata);
+        {
+                if (stub->args.fentrylk.volume)
+                        GF_FREE ((char *)stub->args.fentrylk.volume);
+
+                if (stub->args.fentrylk.name)
+                        GF_FREE ((char *)stub->args.fentrylk.name);
+
+                if (stub->args.fentrylk.fd)
+                        fd_unref (stub->args.fentrylk.fd);
                 break;
+        }
+
         case GF_FOP_LOOKUP:
-		STUB_UNWIND (stub, lookup, stub->args_cbk.inode,
-			     &stub->args_cbk.stat, stub->args_cbk.xdata,
-			     &stub->args_cbk.postparent);
+        {
+                loc_wipe (&stub->args.lookup.loc);
+                if (stub->args.lookup.xattr_req)
+                        dict_unref (stub->args.lookup.xattr_req);
                 break;
+        }
+
         case GF_FOP_RCHECKSUM:
-		STUB_UNWIND (stub, rchecksum, stub->args_cbk.weak_checksum,
-			     stub->args_cbk.strong_checksum, stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.rchecksum.fd)
+                        fd_unref (stub->args.rchecksum.fd);
+                break;
+        }
+
         case GF_FOP_READDIR:
-		STUB_UNWIND (stub, readdir, &stub->args_cbk.entries,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.readdir.fd)
+                        fd_unref (stub->args.readdir.fd);
+                break;
+        }
+
         case GF_FOP_READDIRP:
-		STUB_UNWIND (stub, readdir, &stub->args_cbk.entries,
-			     stub->args_cbk.xdata);
+        {
+                if (stub->args.readdirp.fd)
+                        fd_unref (stub->args.readdirp.fd);
                 break;
+        }
+
         case GF_FOP_XATTROP:
-		STUB_UNWIND (stub, xattrop, stub->args_cbk.xattr,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                loc_wipe (&stub->args.xattrop.loc);
+                dict_unref (stub->args.xattrop.xattr);
+                break;
+        }
         case GF_FOP_FXATTROP:
-		STUB_UNWIND (stub, fxattrop, stub->args_cbk.xattr,
-			     stub->args_cbk.xdata);
-		break;
+        {
+                if (stub->args.fxattrop.fd)
+                        fd_unref (stub->args.fxattrop.fd);
+                dict_unref (stub->args.fxattrop.xattr);
+                break;
+        }
         case GF_FOP_SETATTR:
-		STUB_UNWIND (stub, setattr, &stub->args_cbk.prestat,
-			     &stub->args_cbk.poststat, stub->args_cbk.xdata);
+        {
+                loc_wipe (&stub->args.setattr.loc);
                 break;
+        }
         case GF_FOP_FSETATTR:
-		STUB_UNWIND (stub, fsetattr, &stub->args_cbk.prestat,
-			     &stub->args_cbk.poststat, stub->args_cbk.xdata);
-                break;
-	case GF_FOP_FALLOCATE:
-		STUB_UNWIND(stub, fallocate, &stub->args_cbk.prestat,
-			    &stub->args_cbk.poststat, stub->args_cbk.xdata);
-		break;
-	case GF_FOP_DISCARD:
-		STUB_UNWIND(stub, discard, &stub->args_cbk.prestat,
-			    &stub->args_cbk.poststat, stub->args_cbk.xdata);
-		break;
-        case GF_FOP_ZEROFILL:
-                STUB_UNWIND(stub, zerofill, &stub->args_cbk.prestat,
-                            &stub->args_cbk.poststat, stub->args_cbk.xdata);
+        {
+                if (stub->args.fsetattr.fd)
+                        fd_unref (stub->args.fsetattr.fd);
                 break;
-
+        }
         default:
+        {
                 gf_log_callingfn ("call-stub", GF_LOG_ERROR,
                                   "Invalid value of FOP (%d)",
                                   stub->fop);
                 break;
         }
-out:
-        return;
+        }
 }
 
 
 static void
-call_stub_wipe_args (call_stub_t *stub)
+call_stub_destroy_unwind (call_stub_t *stub)
 {
-	loc_wipe (&stub->args.loc);
+        switch (stub->fop) {
+        case GF_FOP_OPEN:
+        {
+                if (stub->args.open_cbk.fd)
+                        fd_unref (stub->args.open_cbk.fd);
+        }
+        break;
 
-	loc_wipe (&stub->args.loc2);
+        case GF_FOP_CREATE:
+        {
+                if (stub->args.create_cbk.fd)
+                        fd_unref (stub->args.create_cbk.fd);
 
-	if (stub->args.fd)
-		fd_unref (stub->args.fd);
+                if (stub->args.create_cbk.inode)
+                        inode_unref (stub->args.create_cbk.inode);
+        }
+        break;
 
-	GF_FREE ((char *)stub->args.linkname);
+        case GF_FOP_STAT:
+                break;
 
-	GF_FREE (stub->args.vector);
+        case GF_FOP_READLINK:
+        {
+                if (stub->args.readlink_cbk.buf)
+                        GF_FREE ((char *)stub->args.readlink_cbk.buf);
+        }
+        break;
 
-	if (stub->args.iobref)
-		iobref_unref (stub->args.iobref);
+        case GF_FOP_MKNOD:
+        {
+                if (stub->args.mknod_cbk.inode)
+                        inode_unref (stub->args.mknod_cbk.inode);
+        }
+        break;
 
-	if (stub->args.xattr)
-		dict_unref (stub->args.xattr);
+        case GF_FOP_MKDIR:
+        {
+                if (stub->args.mkdir_cbk.inode)
+                        inode_unref (stub->args.mkdir_cbk.inode);
+        }
+        break;
 
-	GF_FREE ((char *)stub->args.name);
+        case GF_FOP_UNLINK:
+                break;
 
-	GF_FREE ((char *)stub->args.volume);
+        case GF_FOP_RMDIR:
+                break;
 
-	if (stub->args.xdata)
-		dict_unref (stub->args.xdata);
-}
+        case GF_FOP_SYMLINK:
+        {
+                if (stub->args.symlink_cbk.inode)
+                        inode_unref (stub->args.symlink_cbk.inode);
+        }
+        break;
 
+        case GF_FOP_RENAME:
+                break;
 
-static void
-call_stub_wipe_args_cbk (call_stub_t *stub)
-{
-	if (stub->args_cbk.inode)
-		inode_unref (stub->args_cbk.inode);
+        case GF_FOP_LINK:
+        {
+                if (stub->args.link_cbk.inode)
+                        inode_unref (stub->args.link_cbk.inode);
+        }
+        break;
+
+        case GF_FOP_TRUNCATE:
+                break;
+
+        case GF_FOP_READ:
+        {
+                if (stub->args.readv_cbk.op_ret >= 0) {
+                        struct iobref *iobref = stub->args.readv_cbk.iobref;
+                        GF_FREE (stub->args.readv_cbk.vector);
+
+                        if (iobref) {
+                                iobref_unref (iobref);
+                        }
+                }
+        }
+        break;
+
+        case GF_FOP_WRITE:
+                break;
+
+        case GF_FOP_STATFS:
+                break;
+
+        case GF_FOP_FLUSH:
+                break;
+
+        case GF_FOP_FSYNC:
+                break;
+
+        case GF_FOP_SETXATTR:
+                break;
+
+        case GF_FOP_GETXATTR:
+        {
+                if (stub->args.getxattr_cbk.dict)
+                        dict_unref (stub->args.getxattr_cbk.dict);
+        }
+        break;
+
+        case GF_FOP_FSETXATTR:
+                break;
+
+        case GF_FOP_FGETXATTR:
+        {
+                if (stub->args.fgetxattr_cbk.dict)
+                        dict_unref (stub->args.fgetxattr_cbk.dict);
+        }
+        break;
 
-	GF_FREE ((char *)stub->args_cbk.buf);
+        case GF_FOP_REMOVEXATTR:
+                break;
 
-	GF_FREE (stub->args_cbk.vector);
+        case GF_FOP_OPENDIR:
+        {
+                if (stub->args.opendir_cbk.fd)
+                        fd_unref (stub->args.opendir_cbk.fd);
+        }
+        break;
+
+        case GF_FOP_FSYNCDIR:
+                break;
+
+        case GF_FOP_ACCESS:
+                break;
 
-	if (stub->args_cbk.iobref)
-		iobref_unref (stub->args_cbk.iobref);
+        case GF_FOP_FTRUNCATE:
+                break;
 
-	if (stub->args_cbk.fd)
-		fd_unref (stub->args_cbk.fd);
+        case GF_FOP_FSTAT:
+                break;
 
-	if (stub->args_cbk.xattr)
-		dict_unref (stub->args_cbk.xattr);
+        case GF_FOP_LK:
+                break;
 
-	GF_FREE (stub->args_cbk.strong_checksum);
+        case GF_FOP_INODELK:
+                break;
 
-	if (stub->args_cbk.xdata)
-		dict_unref (stub->args_cbk.xdata);
+        case GF_FOP_FINODELK:
+                break;
 
-	if (!list_empty (&stub->args_cbk.entries.list))
-		gf_dirent_free (&stub->args_cbk.entries);
+        case GF_FOP_ENTRYLK:
+                break;
+
+        case GF_FOP_FENTRYLK:
+                break;
+
+        case GF_FOP_LOOKUP:
+        {
+                if (stub->args.lookup_cbk.inode)
+                        inode_unref (stub->args.lookup_cbk.inode);
+
+                if (stub->args.lookup_cbk.dict)
+                        dict_unref (stub->args.lookup_cbk.dict);
+        }
+        break;
+
+        case GF_FOP_RCHECKSUM:
+        {
+                if (stub->args.rchecksum_cbk.op_ret >= 0) {
+                        GF_FREE (stub->args.rchecksum_cbk.strong_checksum);
+                }
+        }
+        break;
+
+        case GF_FOP_READDIR:
+        {
+                if (stub->args.readdir_cbk.op_ret > 0) {
+                        gf_dirent_free (&stub->args.readdir_cbk.entries);
+                }
+        }
+        break;
+
+        case GF_FOP_READDIRP:
+        {
+                if (stub->args.readdirp_cbk.op_ret > 0) {
+                        gf_dirent_free (&stub->args.readdirp_cbk.entries);
+                }
+        }
+        break;
+
+        case GF_FOP_XATTROP:
+        {
+                if (stub->args.xattrop_cbk.xattr)
+                        dict_unref (stub->args.xattrop_cbk.xattr);
+        }
+        break;
+
+        case GF_FOP_FXATTROP:
+        {
+                if (stub->args.fxattrop_cbk.xattr)
+                        dict_unref (stub->args.fxattrop_cbk.xattr);
+        }
+        break;
+
+        case GF_FOP_SETATTR:
+        {
+                break;
+        }
+
+        case GF_FOP_FSETATTR:
+        {
+                break;
+        }
+
+        default:
+        {
+                gf_log_callingfn ("call-stub", GF_LOG_ERROR,
+                                  "Invalid value of FOP (%d)",
+                                  stub->fop);
+                break;
+        }
+        }
 }
 
 
 void
 call_stub_destroy (call_stub_t *stub)
 {
+        struct mem_pool *tmp_pool = NULL;
+
         GF_VALIDATE_OR_GOTO ("call-stub", stub, out);
 
-        if (stub->wind)
-                call_stub_wipe_args (stub);
-        else
-                call_stub_wipe_args_cbk (stub);
+        tmp_pool = stub->stub_mem_pool;
 
-        stub->stub_mem_pool = NULL;
+        if (stub->wind) {
+                call_stub_destroy_wind (stub);
+        } else {
+                call_stub_destroy_unwind (stub);
+        }
 
-        mem_put (stub);
+        stub->stub_mem_pool = NULL;
+        mem_put (tmp_pool, stub);
 out:
+        tmp_pool = NULL;
+
         return;
 }
 
-
 void
 call_resume (call_stub_t *stub)
 {
@@ -2848,26 +3866,3 @@ call_resume (call_stub_t *stub)
 out:
         return;
 }
-
-
-void
-call_unwind_error (call_stub_t *stub, int op_ret, int op_errno)
-{
-        xlator_t *old_THIS = NULL;
-
-        list_del_init (&stub->list);
-
-        old_THIS = THIS;
-        THIS = stub->frame->this;
-        {
-		stub->args_cbk.op_ret = op_ret;
-		stub->args_cbk.op_errno = op_errno;
-		call_resume_unwind (stub);
-        }
-        THIS = old_THIS;
-
-        call_stub_destroy (stub);
-
-        return;
-
-}
diff --git a/libglusterfs/src/call-stub.h b/libglusterfs/src/call-stub.h
index 45bef8044..01b6cdd1b 100644
--- a/libglusterfs/src/call-stub.h
+++ b/libglusterfs/src/call-stub.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CALL_STUB_H_
@@ -25,164 +34,561 @@ typedef struct {
 	char wind;
 	call_frame_t *frame;
 	glusterfs_fop_t fop;
-        struct mem_pool *stub_mem_pool; /* pointer to stub mempool in ctx_t */
+       struct mem_pool *stub_mem_pool;    /* pointer to stub mempool in glusterfs ctx */
 
 	union {
-		fop_lookup_t lookup;
-		fop_stat_t stat;
-		fop_fstat_t fstat;
-		fop_truncate_t truncate;
-		fop_ftruncate_t ftruncate;
-		fop_access_t access;
-		fop_readlink_t readlink;
-		fop_mknod_t mknod;
-		fop_mkdir_t mkdir;
-		fop_unlink_t unlink;
-		fop_rmdir_t rmdir;
-		fop_symlink_t symlink;
-		fop_rename_t rename;
-		fop_link_t link;
-		fop_create_t create;
-		fop_open_t open;
-		fop_readv_t readv;
-		fop_writev_t writev;
-		fop_flush_t flush;
-		fop_fsync_t fsync;
-		fop_opendir_t opendir;
-		fop_fsyncdir_t fsyncdir;
-		fop_statfs_t statfs;
-		fop_setxattr_t setxattr;
-		fop_getxattr_t getxattr;
-		fop_fgetxattr_t fgetxattr;
-		fop_fsetxattr_t fsetxattr;
-		fop_removexattr_t removexattr;
-		fop_fremovexattr_t fremovexattr;
-		fop_lk_t lk;
-		fop_inodelk_t inodelk;
-		fop_finodelk_t finodelk;
-		fop_entrylk_t entrylk;
-		fop_fentrylk_t fentrylk;
-		fop_readdir_t readdir;
-		fop_readdirp_t readdirp;
-		fop_rchecksum_t rchecksum;
-		fop_xattrop_t xattrop;
-		fop_fxattrop_t fxattrop;
-		fop_setattr_t setattr;
-		fop_fsetattr_t fsetattr;
-		fop_fallocate_t fallocate;
-		fop_discard_t discard;
-                fop_zerofill_t zerofill;
-	} fn;
+		/* lookup */
+		struct {
+			fop_lookup_t fn;
+			loc_t loc;
+			dict_t *xattr_req;
+		} lookup;
+		struct {
+			fop_lookup_cbk_t fn;
+			int32_t op_ret, op_errno;
+			inode_t *inode;
+			struct iatt buf;
+			dict_t *dict;
+                        struct iatt postparent;
+		} lookup_cbk;
+
+		/* stat */
+		struct {
+			fop_stat_t fn;
+			loc_t loc;
+		} stat;
+		struct {
+			fop_stat_cbk_t fn;
+			int32_t op_ret, op_errno;
+			struct iatt buf;
+		} stat_cbk;
+
+		/* fstat */
+		struct {
+			fop_fstat_t fn;
+			fd_t *fd;
+		} fstat;
+		struct {
+			fop_fstat_cbk_t fn;
+			int32_t op_ret, op_errno;
+			struct iatt buf;
+		} fstat_cbk;
+
+		/* truncate */
+		struct {
+			fop_truncate_t fn;
+			loc_t loc;
+			off_t off;
+		} truncate;
+		struct {
+			fop_truncate_cbk_t fn;
+			int32_t op_ret, op_errno;
+			struct iatt prebuf;
+                        struct iatt postbuf;
+		} truncate_cbk;
+
+		/* ftruncate */
+		struct {
+			fop_ftruncate_t fn;
+			fd_t *fd;
+			off_t off;
+		} ftruncate;
+		struct {
+			fop_ftruncate_cbk_t fn;
+			int32_t op_ret, op_errno;
+			struct iatt prebuf;
+                        struct iatt postbuf;
+		} ftruncate_cbk;
+
+		/* access */
+		struct {
+			fop_access_t fn;
+			loc_t loc;
+			int32_t mask;
+		} access;
+		struct {
+			fop_access_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} access_cbk;
+
+		/* readlink */
+		struct {
+			fop_readlink_t fn;
+			loc_t loc;
+			size_t size;
+		} readlink;
+		struct {
+			fop_readlink_cbk_t fn;
+			int32_t op_ret, op_errno;
+			const char *buf;
+                        struct iatt sbuf;
+		} readlink_cbk;
+
+		/* mknod */
+		struct {
+			fop_mknod_t fn;
+			loc_t loc;
+			mode_t mode;
+			dev_t rdev;
+                        dict_t *params;
+		} mknod;
+		struct {
+			fop_mknod_cbk_t fn;
+			int32_t op_ret, op_errno;
+			inode_t *inode;
+			struct iatt buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
+		} mknod_cbk;
+
+		/* mkdir */
+		struct {
+			fop_mkdir_t fn;
+			loc_t loc;
+			mode_t mode;
+                        dict_t *params;
+		} mkdir;
+		struct {
+			fop_mkdir_cbk_t fn;
+			int32_t op_ret, op_errno;
+			inode_t *inode;
+			struct iatt buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
+		} mkdir_cbk;
+
+		/* unlink */
+		struct {
+			fop_unlink_t fn;
+			loc_t loc;
+		} unlink;
+		struct {
+			fop_unlink_cbk_t fn;
+			int32_t op_ret, op_errno;
+                        struct iatt preparent;
+                        struct iatt postparent;
+		} unlink_cbk;
+
+		/* rmdir */
+		struct {
+			fop_rmdir_t fn;
+			loc_t loc;
+                        int   flags;
+		} rmdir;
+		struct {
+			fop_rmdir_cbk_t fn;
+			int32_t op_ret, op_errno;
+                        struct iatt preparent;
+                        struct iatt postparent;
+		} rmdir_cbk;
+
+		/* symlink */
+		struct {
+			fop_symlink_t fn;
+			const char *linkname;
+			loc_t loc;
+                        dict_t *params;
+		} symlink;
+		struct {
+			fop_symlink_cbk_t fn;
+			int32_t op_ret, op_errno;
+			inode_t *inode;
+			struct iatt buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
+		} symlink_cbk;
+
+		/* rename */
+		struct {
+			fop_rename_t fn;
+			loc_t old;
+			loc_t new;
+		} rename;
+		struct {
+			fop_rename_cbk_t fn;
+			int32_t op_ret, op_errno;
+			struct iatt buf;
+                        struct iatt preoldparent;
+                        struct iatt postoldparent;
+                        struct iatt prenewparent;
+                        struct iatt postnewparent;
+		} rename_cbk;
+
+		/* link */
+		struct {
+			fop_link_t fn;
+			loc_t oldloc;
+			loc_t newloc;
+		} link;
+		struct {
+			fop_link_cbk_t fn;
+			int32_t op_ret, op_errno;
+			inode_t *inode;
+			struct iatt buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
+		} link_cbk;
+
+		/* create */
+		struct {
+			fop_create_t fn;
+			loc_t loc;
+			int32_t flags;
+			mode_t mode;
+			fd_t *fd;
+                        dict_t *params;
+		} create;
+		struct {
+			fop_create_cbk_t fn;
+			int32_t op_ret, op_errno;
+			fd_t *fd;
+			inode_t *inode;
+			struct iatt buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
+		} create_cbk;
+
+		/* open */
+		struct {
+			fop_open_t fn;
+			loc_t loc;
+			int32_t flags;
+			fd_t *fd;
+                        int32_t wbflags;
+		} open;
+		struct {
+			fop_open_cbk_t fn;
+			int32_t op_ret, op_errno;
+			fd_t *fd;
+		} open_cbk;
+
+		/* readv */
+		struct {
+			fop_readv_t fn;
+			fd_t *fd;
+			size_t size;
+			off_t off;
+		} readv;
+		struct {
+			fop_readv_cbk_t fn;
+			int32_t op_ret;
+			int32_t op_errno;
+			struct iovec *vector;
+			int32_t count;
+			struct iatt stbuf;
+			struct iobref *iobref;
+		} readv_cbk;
+
+		/* writev */
+		struct {
+			fop_writev_t fn;
+			fd_t *fd;
+			struct iovec *vector;
+			int32_t count;
+			off_t off;
+			struct iobref *iobref;
+		} writev;
+		struct {
+			fop_writev_cbk_t fn;
+			int32_t op_ret, op_errno;
+                        struct iatt prebuf;
+			struct iatt postbuf;
+		} writev_cbk;
+
+		/* flush */
+		struct {
+			fop_flush_t fn;
+			fd_t *fd;
+		} flush;
+		struct {
+			fop_flush_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} flush_cbk;
+
+		/* fsync */
+		struct {
+			fop_fsync_t fn;
+			fd_t *fd;
+			int32_t datasync;
+		} fsync;
+		struct {
+			fop_fsync_cbk_t fn;
+			int32_t op_ret, op_errno;
+                        struct iatt prebuf;
+                        struct iatt postbuf;
+		} fsync_cbk;
+
+		/* opendir */
+		struct {
+			fop_opendir_t fn;
+			loc_t loc;
+			fd_t *fd;
+		} opendir;
+		struct {
+			fop_opendir_cbk_t fn;
+			int32_t op_ret, op_errno;
+			fd_t *fd;
+		} opendir_cbk;
+
+
+		/* fsyncdir */
+		struct {
+			fop_fsyncdir_t fn;
+			fd_t *fd;
+			int32_t datasync;
+		} fsyncdir;
+		struct {
+			fop_fsyncdir_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} fsyncdir_cbk;
+
+		/* statfs */
+		struct {
+			fop_statfs_t fn;
+			loc_t loc;
+		} statfs;
+		struct {
+			fop_statfs_cbk_t fn;
+			int32_t op_ret, op_errno;
+			struct statvfs buf;
+		} statfs_cbk;
+
+		/* setxattr */
+		struct {
+			fop_setxattr_t fn;
+			loc_t loc;
+			dict_t *dict;
+			int32_t flags;
+		} setxattr;
+		struct {
+			fop_setxattr_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} setxattr_cbk;
+
+		/* getxattr */
+		struct {
+			fop_getxattr_t fn;
+			loc_t loc;
+			const char *name;
+		} getxattr;
+		struct {
+			fop_getxattr_cbk_t fn;
+			int32_t op_ret, op_errno;
+			dict_t *dict;
+		} getxattr_cbk;
+
+		/* fsetxattr */
+		struct {
+			fop_fsetxattr_t fn;
+			fd_t *fd;
+			dict_t *dict;
+			int32_t flags;
+		} fsetxattr;
+		struct {
+			fop_fsetxattr_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} fsetxattr_cbk;
+
+		/* fgetxattr */
+		struct {
+			fop_fgetxattr_t fn;
+			fd_t *fd;
+			const char *name;
+		} fgetxattr;
+		struct {
+			fop_fgetxattr_cbk_t fn;
+			int32_t op_ret, op_errno;
+			dict_t *dict;
+		} fgetxattr_cbk;
+
+		/* removexattr */
+		struct {
+			fop_removexattr_t fn;
+			loc_t loc;
+			const char *name;
+		} removexattr;
+		struct {
+			fop_removexattr_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} removexattr_cbk;
+
+		/* lk */
+		struct {
+			fop_lk_t fn;
+			fd_t *fd;
+			int32_t cmd;
+			struct gf_flock lock;
+		} lk;
+		struct {
+			fop_lk_cbk_t fn;
+			int32_t op_ret, op_errno;
+			struct gf_flock lock;
+		} lk_cbk;
+
+		/* inodelk */
+		struct {
+			fop_inodelk_t fn;
+                        const char *volume;
+			loc_t loc;
+			int32_t cmd;
+			struct gf_flock lock;
+		} inodelk;
+
+		struct {
+			fop_inodelk_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} inodelk_cbk;
+
+		/* finodelk */
+		struct {
+			fop_finodelk_t fn;
+                        const char *volume;
+			fd_t *fd;
+			int32_t cmd;
+			struct gf_flock lock;
+		} finodelk;
+
+		struct {
+			fop_finodelk_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} finodelk_cbk;
+
+		/* entrylk */
+		struct {
+			fop_entrylk_t fn;
+			loc_t loc;
+                        const char *volume;
+			const char *name;
+			entrylk_cmd cmd;
+			entrylk_type type;
+		} entrylk;
+
+		struct {
+			fop_entrylk_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} entrylk_cbk;
+
+		/* fentrylk */
+		struct {
+			fop_fentrylk_t fn;
+			fd_t *fd;
+                        const char *volume;
+			const char *name;
+			entrylk_cmd cmd;
+			entrylk_type type;
+		} fentrylk;
+
+		struct {
+			fop_fentrylk_cbk_t fn;
+			int32_t op_ret, op_errno;
+		} fentrylk_cbk;
+
+		/* readdir */
+		struct {
+			fop_readdir_t fn;
+			fd_t *fd;
+			size_t size;
+			off_t off;
+		} readdir;
+		struct {
+			fop_readdir_cbk_t fn;
+			int32_t op_ret, op_errno;
+			gf_dirent_t entries;
+		} readdir_cbk;
+
+                /* readdirp */
+		struct {
+			fop_readdirp_t fn;
+			fd_t *fd;
+			size_t size;
+			off_t off;
+		} readdirp;
+		struct {
+			fop_readdirp_cbk_t fn;
+			int32_t op_ret, op_errno;
+			gf_dirent_t entries;
+		} readdirp_cbk;
+
+		/* rchecksum */
+		struct {
+			fop_rchecksum_t fn;
+			fd_t *fd;
+                        off_t offset;
+			int32_t len;
+		} rchecksum;
+		struct {
+			fop_rchecksum_cbk_t fn;
+			int32_t op_ret, op_errno;
+			uint32_t weak_checksum;
+			uint8_t *strong_checksum;
+		} rchecksum_cbk;
+
+		/* xattrop */
+		struct {
+			fop_xattrop_t fn;
+			loc_t loc;
+			gf_xattrop_flags_t optype;
+			dict_t *xattr;
+		} xattrop;
+		struct {
+			fop_xattrop_cbk_t fn;
+			int32_t op_ret;
+			int32_t op_errno;
+			dict_t *xattr;
+		} xattrop_cbk;
+
+		/* fxattrop */
+		struct {
+			fop_fxattrop_t fn;
+			fd_t *fd;
+			gf_xattrop_flags_t optype;
+			dict_t *xattr;
+		} fxattrop;
+		struct {
+			fop_fxattrop_cbk_t fn;
+			int32_t op_ret;
+			int32_t op_errno;
+			dict_t *xattr;
+		} fxattrop_cbk;
+
+                /* setattr */
+                struct {
+                        fop_setattr_t fn;
+                        loc_t loc;
+                        struct iatt stbuf;
+                        int32_t valid;
+                } setattr;
+                struct {
+                        fop_setattr_cbk_t fn;
+                        int32_t op_ret;
+                        int32_t op_errno;
+                        struct iatt statpre;
+                        struct iatt statpost;
+                } setattr_cbk;
+
+                /* fsetattr */
+                struct {
+                        fop_fsetattr_t fn;
+                        fd_t *fd;
+                        struct iatt stbuf;
+                        int32_t valid;
+                } fsetattr;
+                struct {
+                        fop_fsetattr_cbk_t fn;
+                        int32_t op_ret;
+                        int32_t op_errno;
+                        struct iatt statpre;
+                        struct iatt statpost;
+                } fsetattr_cbk;
 
-	union {
-		fop_lookup_cbk_t lookup;
-		fop_stat_cbk_t stat;
-		fop_fstat_cbk_t fstat;
-		fop_truncate_cbk_t truncate;
-		fop_ftruncate_cbk_t ftruncate;
-		fop_access_cbk_t access;
-		fop_readlink_cbk_t readlink;
-		fop_mknod_cbk_t mknod;
-		fop_mkdir_cbk_t mkdir;
-		fop_unlink_cbk_t unlink;
-		fop_rmdir_cbk_t rmdir;
-		fop_symlink_cbk_t symlink;
-		fop_rename_cbk_t rename;
-		fop_link_cbk_t link;
-		fop_create_cbk_t create;
-		fop_open_cbk_t open;
-		fop_readv_cbk_t readv;
-		fop_writev_cbk_t writev;
-		fop_flush_cbk_t flush;
-		fop_fsync_cbk_t fsync;
-		fop_opendir_cbk_t opendir;
-		fop_fsyncdir_cbk_t fsyncdir;
-		fop_statfs_cbk_t statfs;
-		fop_setxattr_cbk_t setxattr;
-		fop_getxattr_cbk_t getxattr;
-		fop_fgetxattr_cbk_t fgetxattr;
-		fop_fsetxattr_cbk_t fsetxattr;
-		fop_removexattr_cbk_t removexattr;
-		fop_fremovexattr_cbk_t fremovexattr;
-		fop_lk_cbk_t lk;
-		fop_inodelk_cbk_t inodelk;
-		fop_finodelk_cbk_t finodelk;
-		fop_entrylk_cbk_t entrylk;
-		fop_fentrylk_cbk_t fentrylk;
-		fop_readdir_cbk_t readdir;
-		fop_readdirp_cbk_t readdirp;
-		fop_rchecksum_cbk_t rchecksum;
-		fop_xattrop_cbk_t xattrop;
-		fop_fxattrop_cbk_t fxattrop;
-		fop_setattr_cbk_t setattr;
-		fop_fsetattr_cbk_t fsetattr;
-		fop_fallocate_cbk_t fallocate;
-		fop_discard_cbk_t discard;
-                fop_zerofill_cbk_t zerofill;
-	} fn_cbk;
-
-	struct {
-		loc_t loc; // @old in rename(), link()
-		loc_t loc2; // @new in rename(), link()
-		fd_t *fd;
-		off_t offset;
-		int mask;
-		size_t size;
-		mode_t mode;
-		dev_t rdev;
-		mode_t umask;
-		int xflag;
-		int flags;
-		const char *linkname;
-		struct iovec *vector;
-		int count;
-		struct iobref *iobref;
-		int datasync;
-		dict_t *xattr;
-		const char *name;
-		int cmd;
-		struct gf_flock lock;
-		const char *volume;
-		entrylk_cmd entrylkcmd;
-		entrylk_type entrylktype;
-		gf_xattrop_flags_t optype;
-		int valid;
-		struct iatt stat;
-		dict_t *xdata;
 	} args;
-
-	struct {
-		int op_ret;
-		int op_errno;
-		inode_t *inode;
-		struct iatt stat;
-		struct iatt prestat;
-		struct iatt poststat;
-		struct iatt preparent;   // @preoldparent in rename_cbk
-		struct iatt postparent;  // @postoldparent in rename_cbk
-		struct iatt preparent2;  // @prenewparent in rename_cbk
-		struct iatt postparent2; // @postnewparent in rename_cbk
-		const char *buf;
-		struct iovec *vector;
-		int count;
-		struct iobref *iobref;
-		fd_t *fd;
-		struct statvfs statvfs;
-		dict_t *xattr;
-		struct gf_flock lock;
-		gf_dirent_t entries;
-		uint32_t weak_checksum;
-		uint8_t *strong_checksum;
-		dict_t *xdata;
-	} args_cbk;
 } call_stub_t;
 
-
 call_stub_t *
 fop_lookup_stub (call_frame_t *frame,
 		 fop_lookup_t fn,
 		 loc_t *loc,
-		 dict_t *xdata);
+		 dict_t *xattr_req);
 
 call_stub_t *
 fop_lookup_cbk_stub (call_frame_t *frame,
@@ -191,34 +597,34 @@ fop_lookup_cbk_stub (call_frame_t *frame,
 		     int32_t op_errno,
 		     inode_t *inode,
 		     struct iatt *buf,
-                     dict_t *xdata,
+                     dict_t *dict,
                      struct iatt *postparent);
 call_stub_t *
 fop_stat_stub (call_frame_t *frame,
 	       fop_stat_t fn,
-	       loc_t *loc, dict_t *xdata);
+	       loc_t *loc);
 call_stub_t *
 fop_stat_cbk_stub (call_frame_t *frame,
 		   fop_stat_cbk_t fn,
 		   int32_t op_ret,
 		   int32_t op_errno,
-		   struct iatt *buf, dict_t *xdata);
+		   struct iatt *buf);
 call_stub_t *
 fop_fstat_stub (call_frame_t *frame,
 		fop_fstat_t fn,
-		fd_t *fd, dict_t *xdata);
+		fd_t *fd);
 call_stub_t *
 fop_fstat_cbk_stub (call_frame_t *frame,
 		    fop_fstat_cbk_t fn,
 		    int32_t op_ret,
 		    int32_t op_errno,
-		    struct iatt *buf, dict_t *xdata);
+		    struct iatt *buf);
 
 call_stub_t *
 fop_truncate_stub (call_frame_t *frame,
 		   fop_truncate_t fn,
 		   loc_t *loc,
-		   off_t off, dict_t *xdata);
+		   off_t off);
 
 call_stub_t *
 fop_truncate_cbk_stub (call_frame_t *frame,
@@ -226,13 +632,13 @@ fop_truncate_cbk_stub (call_frame_t *frame,
 		       int32_t op_ret,
 		       int32_t op_errno,
 		       struct iatt *prebuf,
-                       struct iatt *postbuf, dict_t *xdata);
+                       struct iatt *postbuf);
 
 call_stub_t *
 fop_ftruncate_stub (call_frame_t *frame,
 		    fop_ftruncate_t fn,
 		    fd_t *fd,
-		    off_t off, dict_t *xdata);
+		    off_t off);
 
 call_stub_t *
 fop_ftruncate_cbk_stub (call_frame_t *frame,
@@ -240,25 +646,25 @@ fop_ftruncate_cbk_stub (call_frame_t *frame,
 			int32_t op_ret,
 			int32_t op_errno,
 			struct iatt *prebuf,
-                        struct iatt *postbuf, dict_t *xdata);
+                        struct iatt *postbuf);
 
 call_stub_t *
 fop_access_stub (call_frame_t *frame,
 		 fop_access_t fn,
 		 loc_t *loc,
-		 int32_t mask, dict_t *xdata);
+		 int32_t mask);
 
 call_stub_t *
 fop_access_cbk_stub (call_frame_t *frame,
 		     fop_access_cbk_t fn,
 		     int32_t op_ret,
-		     int32_t op_errno, dict_t *xdata);
+		     int32_t op_errno);
 
 call_stub_t *
 fop_readlink_stub (call_frame_t *frame,
 		   fop_readlink_t fn,
 		   loc_t *loc,
-		   size_t size, dict_t *xdata);
+		   size_t size);
 
 call_stub_t *
 fop_readlink_cbk_stub (call_frame_t *frame,
@@ -266,11 +672,11 @@ fop_readlink_cbk_stub (call_frame_t *frame,
 		       int32_t op_ret,
 		       int32_t op_errno,
 		       const char *path,
-                       struct iatt *buf, dict_t *xdata);
+                       struct iatt *buf);
 
 call_stub_t *
-fop_mknod_stub (call_frame_t *frame, fop_mknod_t fn, loc_t *loc, mode_t mode,
-                dev_t rdev, mode_t umask, dict_t *xdata);
+fop_mknod_stub (call_frame_t *frame, fop_mknod_t fn,
+		loc_t *loc, mode_t mode, dev_t rdev, dict_t *params);
 
 call_stub_t *
 fop_mknod_cbk_stub (call_frame_t *frame,
@@ -280,11 +686,11 @@ fop_mknod_cbk_stub (call_frame_t *frame,
 		    inode_t *inode,
                     struct iatt *buf,
                     struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata);
+                    struct iatt *postparent);
 
 call_stub_t *
-fop_mkdir_stub (call_frame_t *frame, fop_mkdir_t fn, loc_t *loc, mode_t mode,
-                mode_t umask, dict_t *xdata);
+fop_mkdir_stub (call_frame_t *frame, fop_mkdir_t fn,
+		loc_t *loc, mode_t mode, dict_t *params);
 
 call_stub_t *
 fop_mkdir_cbk_stub (call_frame_t *frame,
@@ -294,11 +700,12 @@ fop_mkdir_cbk_stub (call_frame_t *frame,
 		    inode_t *inode,
                     struct iatt *buf,
                     struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata);
+                    struct iatt *postparent);
 
 call_stub_t *
-fop_unlink_stub (call_frame_t *frame, fop_unlink_t fn,
-		 loc_t *loc, int xflag, dict_t *xdata);
+fop_unlink_stub (call_frame_t *frame,
+		 fop_unlink_t fn,
+		 loc_t *loc);
 
 call_stub_t *
 fop_unlink_cbk_stub (call_frame_t *frame,
@@ -306,11 +713,11 @@ fop_unlink_cbk_stub (call_frame_t *frame,
 		     int32_t op_ret,
 		     int32_t op_errno,
                      struct iatt *preparent,
-                     struct iatt *postparent, dict_t *xdata);
+                     struct iatt *postparent);
 
 call_stub_t *
 fop_rmdir_stub (call_frame_t *frame, fop_rmdir_t fn,
-		loc_t *loc, int flags, dict_t *xdata);
+		loc_t *loc, int flags);
 
 call_stub_t *
 fop_rmdir_cbk_stub (call_frame_t *frame,
@@ -318,11 +725,11 @@ fop_rmdir_cbk_stub (call_frame_t *frame,
 		    int32_t op_ret,
 		    int32_t op_errno,
                     struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata);
+                    struct iatt *postparent);
 
 call_stub_t *
 fop_symlink_stub (call_frame_t *frame, fop_symlink_t fn,
-		  const char *linkname, loc_t *loc, mode_t umask, dict_t *xdata);
+		  const char *linkname, loc_t *loc, dict_t *params);
 
 call_stub_t *
 fop_symlink_cbk_stub (call_frame_t *frame,
@@ -332,13 +739,13 @@ fop_symlink_cbk_stub (call_frame_t *frame,
 		      inode_t *inode,
                       struct iatt *buf,
                       struct iatt *preparent,
-                      struct iatt *postparent, dict_t *xdata);
+                      struct iatt *postparent);
 
 call_stub_t *
 fop_rename_stub (call_frame_t *frame,
 		 fop_rename_t fn,
 		 loc_t *oldloc,
-		 loc_t *newloc, dict_t *xdata);
+		 loc_t *newloc);
 
 call_stub_t *
 fop_rename_cbk_stub (call_frame_t *frame,
@@ -349,13 +756,13 @@ fop_rename_cbk_stub (call_frame_t *frame,
                      struct iatt *preoldparent,
                      struct iatt *postoldparent,
                      struct iatt *prenewparent,
-                     struct iatt *postnewparent, dict_t *xdata);
+                     struct iatt *postnewparent);
 
 call_stub_t *
 fop_link_stub (call_frame_t *frame,
 	       fop_link_t fn,
 	       loc_t *oldloc,
-	       loc_t *newloc, dict_t *xdata);
+	       loc_t *newloc);
 
 call_stub_t *
 fop_link_cbk_stub (call_frame_t *frame,
@@ -365,12 +772,12 @@ fop_link_cbk_stub (call_frame_t *frame,
 		   inode_t *inode,
                    struct iatt *buf,
                    struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata);
+                   struct iatt *postparent);
 
 call_stub_t *
 fop_create_stub (call_frame_t *frame, fop_create_t fn,
 		 loc_t *loc, int32_t flags, mode_t mode,
-                 mode_t umask, fd_t *fd, dict_t *xdata);
+                 fd_t *fd, dict_t *params);
 
 call_stub_t *
 fop_create_cbk_stub (call_frame_t *frame,
@@ -381,7 +788,7 @@ fop_create_cbk_stub (call_frame_t *frame,
 		     inode_t *inode,
 		     struct iatt *buf,
                      struct iatt *preparent,
-                     struct iatt *postparent, dict_t *xdata);
+                     struct iatt *postparent);
 
 call_stub_t *
 fop_open_stub (call_frame_t *frame,
@@ -389,21 +796,21 @@ fop_open_stub (call_frame_t *frame,
 	       loc_t *loc,
 	       int32_t flags,
 	       fd_t *fd,
-               dict_t *xdata);
+               int32_t wbflags);
 
 call_stub_t *
 fop_open_cbk_stub (call_frame_t *frame,
 		   fop_open_cbk_t fn,
 		   int32_t op_ret,
 		   int32_t op_errno,
-		   fd_t *fd, dict_t *xdata);
+		   fd_t *fd);
 
 call_stub_t *
 fop_readv_stub (call_frame_t *frame,
 		fop_readv_t fn,
 		fd_t *fd,
 		size_t size,
-		off_t off, uint32_t flags, dict_t *xdata);
+		off_t off);
 
 call_stub_t *
 fop_readv_cbk_stub (call_frame_t *frame,
@@ -413,7 +820,7 @@ fop_readv_cbk_stub (call_frame_t *frame,
 		    struct iovec *vector,
 		    int32_t count,
 		    struct iatt *stbuf,
-                    struct iobref *iobref, dict_t *xdata);
+                    struct iobref *iobref);
 
 call_stub_t *
 fop_writev_stub (call_frame_t *frame,
@@ -421,8 +828,8 @@ fop_writev_stub (call_frame_t *frame,
 		 fd_t *fd,
 		 struct iovec *vector,
 		 int32_t count,
-		 off_t off, uint32_t flags,
-                 struct iobref *iobref, dict_t *xdata);
+		 off_t off,
+                 struct iobref *iobref);
 
 call_stub_t *
 fop_writev_cbk_stub (call_frame_t *frame,
@@ -430,24 +837,24 @@ fop_writev_cbk_stub (call_frame_t *frame,
 		     int32_t op_ret,
 		     int32_t op_errno,
                      struct iatt *prebuf,
-                     struct iatt *postbuf, dict_t *xdata);
+                     struct iatt *postbuf);
 
 call_stub_t *
 fop_flush_stub (call_frame_t *frame,
 		fop_flush_t fn,
-		fd_t *fd, dict_t *xdata);
+		fd_t *fd);
 
 call_stub_t *
 fop_flush_cbk_stub (call_frame_t *frame,
 		    fop_flush_cbk_t fn,
 		    int32_t op_ret,
-		    int32_t op_errno, dict_t *xdata);
+		    int32_t op_errno);
 
 call_stub_t *
 fop_fsync_stub (call_frame_t *frame,
 		fop_fsync_t fn,
 		fd_t *fd,
-		int32_t datasync, dict_t *xdata);
+		int32_t datasync);
 
 call_stub_t *
 fop_fsync_cbk_stub (call_frame_t *frame,
@@ -455,205 +862,190 @@ fop_fsync_cbk_stub (call_frame_t *frame,
 		    int32_t op_ret,
 		    int32_t op_errno,
                     struct iatt *prebuf,
-                    struct iatt *postbuf, dict_t *xdata);
+                    struct iatt *postbuf);
 
 call_stub_t *
 fop_opendir_stub (call_frame_t *frame,
 		  fop_opendir_t fn,
-		  loc_t *loc, fd_t *fd, dict_t *xdata);
+		  loc_t *loc, fd_t *fd);
 
 call_stub_t *
 fop_opendir_cbk_stub (call_frame_t *frame,
 		      fop_opendir_cbk_t fn,
 		      int32_t op_ret,
 		      int32_t op_errno,
-		      fd_t *fd, dict_t *xdata);
+		      fd_t *fd);
 
 call_stub_t *
 fop_fsyncdir_stub (call_frame_t *frame,
 		   fop_fsyncdir_t fn,
 		   fd_t *fd,
-		   int32_t datasync, dict_t *xdata);
+		   int32_t datasync);
 
 call_stub_t *
 fop_fsyncdir_cbk_stub (call_frame_t *frame,
 		       fop_fsyncdir_cbk_t fn,
 		       int32_t op_ret,
-		       int32_t op_errno, dict_t *xdata);
+		       int32_t op_errno);
 
 call_stub_t *
 fop_statfs_stub (call_frame_t *frame,
 		 fop_statfs_t fn,
-		 loc_t *loc, dict_t *xdata);
+		 loc_t *loc);
 
 call_stub_t *
 fop_statfs_cbk_stub (call_frame_t *frame,
 		     fop_statfs_cbk_t fn,
 		     int32_t op_ret,
 		     int32_t op_errno,
-		     struct statvfs *buf, dict_t *xdata);
+		     struct statvfs *buf);
 
 call_stub_t *
 fop_setxattr_stub (call_frame_t *frame,
 		   fop_setxattr_t fn,
 		   loc_t *loc,
 		   dict_t *dict,
-		   int32_t flags, dict_t *xdata);
+		   int32_t flags);
 
 call_stub_t *
 fop_setxattr_cbk_stub (call_frame_t *frame,
 		       fop_setxattr_cbk_t fn,
 		       int32_t op_ret,
-		       int32_t op_errno, dict_t *xdata);
+		       int32_t op_errno);
 
 call_stub_t *
 fop_getxattr_stub (call_frame_t *frame,
 		   fop_getxattr_t fn,
 		   loc_t *loc,
-		   const char *name, dict_t *xdata);
+		   const char *name);
 
 call_stub_t *
 fop_getxattr_cbk_stub (call_frame_t *frame,
 		       fop_getxattr_cbk_t fn,
 		       int32_t op_ret,
 		       int32_t op_errno,
-		       dict_t *value, dict_t *xdata);
+		       dict_t *value);
 
 call_stub_t *
 fop_fsetxattr_stub (call_frame_t *frame,
                     fop_fsetxattr_t fn,
                     fd_t *fd,
                     dict_t *dict,
-                    int32_t flags, dict_t *xdata);
+                    int32_t flags);
 
 call_stub_t *
 fop_fsetxattr_cbk_stub (call_frame_t *frame,
                         fop_fsetxattr_cbk_t fn,
                         int32_t op_ret,
-                        int32_t op_errno, dict_t *xdata);
+                        int32_t op_errno);
 
 call_stub_t *
 fop_fgetxattr_stub (call_frame_t *frame,
                     fop_fgetxattr_t fn,
                     fd_t *fd,
-                    const char *name, dict_t *xdata);
+                    const char *name);
 
 call_stub_t *
 fop_fgetxattr_cbk_stub (call_frame_t *frame,
                         fop_fgetxattr_cbk_t fn,
                         int32_t op_ret,
                         int32_t op_errno,
-                        dict_t *value, dict_t *xdata);
+                        dict_t *value);
 
 call_stub_t *
 fop_removexattr_stub (call_frame_t *frame,
 		      fop_removexattr_t fn,
 		      loc_t *loc,
-		      const char *name, dict_t *xdata);
+		      const char *name);
 
 call_stub_t *
 fop_removexattr_cbk_stub (call_frame_t *frame,
 			  fop_removexattr_cbk_t fn,
 			  int32_t op_ret,
-			  int32_t op_errno, dict_t *xdata);
-
-
-call_stub_t *
-fop_fremovexattr_stub (call_frame_t *frame,
-                       fop_fremovexattr_t fn,
-                       fd_t *fd,
-                       const char *name, dict_t *xdata);
-
-call_stub_t *
-fop_fremovexattr_cbk_stub (call_frame_t *frame,
-                           fop_fremovexattr_cbk_t fn,
-                           int32_t op_ret,
-                           int32_t op_errno, dict_t *xdata);
-
+			  int32_t op_errno);
 call_stub_t *
 fop_lk_stub (call_frame_t *frame,
 	     fop_lk_t fn,
 	     fd_t *fd,
 	     int32_t cmd,
-	     struct gf_flock *lock, dict_t *xdata);
+	     struct gf_flock *lock);
 
 call_stub_t *
 fop_lk_cbk_stub (call_frame_t *frame,
 		 fop_lk_cbk_t fn,
 		 int32_t op_ret,
 		 int32_t op_errno,
-		 struct gf_flock *lock, dict_t *xdata);
+		 struct gf_flock *lock);
 
 call_stub_t *
 fop_inodelk_stub (call_frame_t *frame, fop_inodelk_t fn,
 		  const char *volume, loc_t *loc, int32_t cmd,
-                  struct gf_flock *lock, dict_t *xdata);
+                  struct gf_flock *lock);
 
 call_stub_t *
 fop_finodelk_stub (call_frame_t *frame, fop_finodelk_t fn,
 		   const char *volume, fd_t *fd, int32_t cmd,
-                   struct gf_flock *lock, dict_t *xdata);
+                   struct gf_flock *lock);
 
 call_stub_t *
 fop_entrylk_stub (call_frame_t *frame, fop_entrylk_t fn,
 		  const char *volume, loc_t *loc, const char *basename,
-		  entrylk_cmd cmd, entrylk_type type, dict_t *xdata);
+		  entrylk_cmd cmd, entrylk_type type);
 
 call_stub_t *
 fop_fentrylk_stub (call_frame_t *frame, fop_fentrylk_t fn,
 		   const char *volume, fd_t *fd, const char *basename,
-		   entrylk_cmd cmd, entrylk_type type, dict_t *xdata);
+		   entrylk_cmd cmd, entrylk_type type);
 
 call_stub_t *
 fop_inodelk_cbk_stub (call_frame_t *frame, fop_inodelk_cbk_t fn,
-		      int32_t op_ret, int32_t op_errno, dict_t *xdata);
+		      int32_t op_ret, int32_t op_errno);
 
 call_stub_t *
 fop_finodelk_cbk_stub (call_frame_t *frame, fop_inodelk_cbk_t fn,
-		       int32_t op_ret, int32_t op_errno, dict_t *xdata);
+		       int32_t op_ret, int32_t op_errno);
 
 call_stub_t *
 fop_entrylk_cbk_stub (call_frame_t *frame, fop_entrylk_cbk_t fn,
-		      int32_t op_ret, int32_t op_errno, dict_t *xdata);
+		      int32_t op_ret, int32_t op_errno);
 
 call_stub_t *
 fop_fentrylk_cbk_stub (call_frame_t *frame, fop_entrylk_cbk_t fn,
-		       int32_t op_ret, int32_t op_errno, dict_t *xdata);
+		       int32_t op_ret, int32_t op_errno);
 
 call_stub_t *
 fop_readdir_stub (call_frame_t *frame,
 		  fop_readdir_t fn,
 		  fd_t *fd,
 		  size_t size,
-		  off_t off, dict_t *xdata);
+		  off_t off);
 
 call_stub_t *
 fop_readdirp_stub (call_frame_t *frame,
-		   fop_readdirp_t fn,
+		   fop_readdir_t fn,
 		   fd_t *fd,
 		   size_t size,
-		   off_t off,
-                   dict_t *xdata);
+		   off_t off);
 
 call_stub_t *
 fop_readdirp_cbk_stub (call_frame_t *frame,
 		       fop_readdir_cbk_t fn,
 		       int32_t op_ret,
 		       int32_t op_errno,
-		       gf_dirent_t *entries, dict_t *xdata);
+		       gf_dirent_t *entries);
 
 call_stub_t *
 fop_readdir_cbk_stub (call_frame_t *frame,
 		      fop_readdir_cbk_t fn,
 		      int32_t op_ret,
 		      int32_t op_errno,
-		      gf_dirent_t *entries, dict_t *xdata);
+		      gf_dirent_t *entries);
 
 call_stub_t *
 fop_rchecksum_stub (call_frame_t *frame,
                     fop_rchecksum_t fn,
                     fd_t *fd, off_t offset,
-                    int32_t len, dict_t *xdata);
+                    int32_t len);
 
 call_stub_t *
 fop_rchecksum_cbk_stub (call_frame_t *frame,
@@ -661,40 +1053,40 @@ fop_rchecksum_cbk_stub (call_frame_t *frame,
                         int32_t op_ret,
                         int32_t op_errno,
                         uint32_t weak_checksum,
-                        uint8_t *strong_checksum, dict_t *xdata);
+                        uint8_t *strong_checksum);
 
 call_stub_t *
 fop_xattrop_stub (call_frame_t *frame,
 		  fop_xattrop_t fn,
 		  loc_t *loc,
 		  gf_xattrop_flags_t optype,
-		  dict_t *xattr, dict_t *xdata);
+		  dict_t *xattr);
 
 call_stub_t *
 fop_xattrop_stub_cbk_stub (call_frame_t *frame,
 			   fop_xattrop_cbk_t fn,
 			   int32_t op_ret,
-			   int32_t op_errno, dict_t *xdata);
+			   int32_t op_errno);
 
 call_stub_t *
 fop_fxattrop_stub (call_frame_t *frame,
 		   fop_fxattrop_t fn,
 		   fd_t *fd,
 		   gf_xattrop_flags_t optype,
-		   dict_t *xattr, dict_t *xdata);
+		   dict_t *xattr);
 
 call_stub_t *
 fop_fxattrop_stub_cbk_stub (call_frame_t *frame,
 			    fop_xattrop_cbk_t fn,
 			    int32_t op_ret,
-			    int32_t op_errno, dict_t *xdata);
+			    int32_t op_errno);
 
 call_stub_t *
 fop_setattr_stub (call_frame_t *frame,
                   fop_setattr_t fn,
                   loc_t *loc,
                   struct iatt *stbuf,
-                  int32_t valid, dict_t *xdata);
+                  int32_t valid);
 
 call_stub_t *
 fop_setattr_cbk_stub (call_frame_t *frame,
@@ -702,14 +1094,14 @@ fop_setattr_cbk_stub (call_frame_t *frame,
                       int32_t op_ret,
                       int32_t op_errno,
                       struct iatt *statpre,
-                      struct iatt *statpost, dict_t *xdata);
+                      struct iatt *statpost);
 
 call_stub_t *
 fop_fsetattr_stub (call_frame_t *frame,
                    fop_fsetattr_t fn,
                    fd_t *fd,
                    struct iatt *stbuf,
-                   int32_t valid, dict_t *xdata);
+                   int32_t valid);
 
 call_stub_t *
 fop_fsetattr_cbk_stub (call_frame_t *frame,
@@ -717,51 +1109,8 @@ fop_fsetattr_cbk_stub (call_frame_t *frame,
                        int32_t op_ret,
                        int32_t op_errno,
                        struct iatt *statpre,
-                       struct iatt *statpost, dict_t *xdata);
-
-call_stub_t *
-fop_fallocate_stub(call_frame_t *frame,
-		   fop_fallocate_t fn,
-		   fd_t *fd,
-		   int32_t mode, off_t offset,
-		   size_t len, dict_t *xdata);
-
-call_stub_t *
-fop_fallocate_cbk_stub(call_frame_t *frame,
-		       fop_fallocate_cbk_t fn,
-                       int32_t op_ret, int32_t op_errno,
-                       struct iatt *statpre, struct iatt *statpost,
-                       dict_t *xdata);
-
-call_stub_t *
-fop_discard_stub(call_frame_t *frame,
-		 fop_discard_t fn,
-		 fd_t *fd,
-		 off_t offset,
-		 size_t len, dict_t *xdata);
-
-call_stub_t *
-fop_discard_cbk_stub(call_frame_t *frame,
-		     fop_discard_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     struct iatt *statpre, struct iatt *statpost,
-                     dict_t *xdata);
-
-call_stub_t *
-fop_zerofill_stub(call_frame_t *frame,
-                 fop_zerofill_t fn,
-                 fd_t *fd,
-                 off_t offset,
-                 size_t len, dict_t *xdata);
-
-call_stub_t *
-fop_zerofill_cbk_stub(call_frame_t *frame,
-                     fop_zerofill_cbk_t fn,
-                     int32_t op_ret, int32_t op_errno,
-                     struct iatt *statpre, struct iatt *statpost,
-                     dict_t *xdata);
+                       struct iatt *statpost);
 
 void call_resume (call_stub_t *stub);
 void call_stub_destroy (call_stub_t *stub);
-void call_unwind_error (call_stub_t *stub, int op_ret, int op_errno);
 #endif
diff --git a/libglusterfs/src/checksum.c b/libglusterfs/src/checksum.c
index e14a3044c..cea782293 100644
--- a/libglusterfs/src/checksum.c
+++ b/libglusterfs/src/checksum.c
@@ -1,17 +1,28 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
-#include <openssl/md5.h>
-#include <stdint.h>
+#include <inttypes.h>
 
 #include "glusterfs.h"
+#include "md5.h"
+#include "checksum.h"
+
 
 /*
  * The "weak" checksum required for the rsync algorithm,
@@ -20,26 +31,22 @@
  *
  * "a simple 32 bit checksum that can be upadted from either end
  *  (inspired by Mark Adler's Adler-32 checksum)"
- *
- * Note: these functions are only called to compute checksums on
- * pathnames; they don't need to handle arbitrarily long strings of
- * data. Thus int32_t and uint32_t are sufficient
  */
 
 uint32_t
-gf_rsync_weak_checksum (unsigned char *buf, size_t len)
+gf_rsync_weak_checksum (char *buf1, int32_t len)
 {
-        int32_t i = 0;
+        int32_t i;
         uint32_t s1, s2;
 
+        signed char *buf = (signed char *) buf1;
         uint32_t csum;
 
         s1 = s2 = 0;
-        if (len >= 4) {
-                for (; i < (len-4); i+=4) {
-                        s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3];
-                        s1 += buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3];
-                }
+        for (i = 0; i < (len-4); i+=4) {
+                s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3];
+
+                s1 += buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3];
         }
 
         for (; i < len; i++) {
@@ -59,7 +66,13 @@ gf_rsync_weak_checksum (unsigned char *buf, size_t len)
  */
 
 void
-gf_rsync_strong_checksum (unsigned char *data, size_t len, unsigned char *md5)
+gf_rsync_strong_checksum (char *buf, int32_t len, uint8_t *sum)
 {
-        MD5(data, len, md5);
+        md_context m;
+
+        md5_begin (&m);
+        md5_update (&m, (unsigned char *) buf, len);
+        md5_result (&m, (unsigned char *) sum);
+
+        return;
 }
diff --git a/libglusterfs/src/checksum.h b/libglusterfs/src/checksum.h
index bf7eeede8..3542036bf 100644
--- a/libglusterfs/src/checksum.h
+++ b/libglusterfs/src/checksum.h
@@ -1,20 +1,27 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
+   Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __CHECKSUM_H__
 #define __CHECKSUM_H__
 
-uint32_t
-gf_rsync_weak_checksum (unsigned char *buf, size_t len);
+uint32_t gf_rsync_weak_checksum (char *buf, int32_t len);
 
-void
-gf_rsync_strong_checksum (unsigned char *buf, size_t len, unsigned char *sum);
+void gf_rsync_strong_checksum (char *buf, int32_t len, uint8_t *sum);
 
 #endif /* __CHECKSUM_H__ */
diff --git a/libglusterfs/src/circ-buff.c b/libglusterfs/src/circ-buff.c
deleted file mode 100644
index 484ce7dc9..000000000
--- a/libglusterfs/src/circ-buff.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include "circ-buff.h"
-
-void
-cb_destroy_data (circular_buffer_t *cb,
-                 void (*destroy_buffer_data) (void *data))
-{
-        if (destroy_buffer_data)
-                destroy_buffer_data (cb->data);
-        GF_FREE (cb->data);
-        return;
-}
-
-
-/* hold lock while calling this function */
-int
-__cb_add_entry_buffer (buffer_t *buffer, void *item)
-{
-        circular_buffer_t   *ptr  = NULL;
-        int    ret   = -1;
-        //DO we really need the assert here?
-        GF_ASSERT (buffer->used_len <= buffer->size_buffer);
-
-        if (buffer->use_once == _gf_true &&
-            buffer->used_len == buffer->size_buffer) {
-                gf_log  ("", GF_LOG_WARNING, "buffer %p is use once buffer",
-                         buffer);
-                return -1;
-        } else {
-                if (buffer->used_len == buffer->size_buffer) {
-                        if (buffer->cb[buffer->w_index]) {
-                                ptr = buffer->cb[buffer->w_index];
-                                if (ptr->data) {
-                                        cb_destroy_data (ptr,
-                                                   buffer->destroy_buffer_data);
-                                        ptr->data = NULL;
-                                        GF_FREE (ptr);
-                                }
-                                buffer->cb[buffer->w_index] = NULL;
-                                ptr = NULL;
-                        }
-                }
-
-                buffer->cb[buffer->w_index] =
-                        GF_CALLOC (1, sizeof (circular_buffer_t),
-                                   gf_common_mt_circular_buffer_t);
-                if (!buffer->cb[buffer->w_index])
-                        return -1;
-
-                buffer->cb[buffer->w_index]->data = item;
-                ret = gettimeofday (&buffer->cb[buffer->w_index]->tv, NULL);
-                if (ret == -1)
-                        gf_log_callingfn ("", GF_LOG_WARNING, "getting time of"
-                                          "the day failed");
-                buffer->w_index++;
-                buffer->w_index %= buffer->size_buffer;
-                //used_buffer size cannot be greater than the total buffer size
-
-                if (buffer->used_len < buffer->size_buffer)
-                        buffer->used_len++;
-                return buffer->w_index;
-        }
-}
-
-int
-cb_add_entry_buffer (buffer_t *buffer, void *item)
-{
-        int write_index = -1;
-
-        pthread_mutex_lock (&buffer->lock);
-        {
-                write_index = __cb_add_entry_buffer (buffer, item);
-        }
-        pthread_mutex_unlock (&buffer->lock);
-
-        return write_index;
-}
-
-void
-cb_buffer_show (buffer_t *buffer)
-{
-        pthread_mutex_lock (&buffer->lock);
-        {
-                gf_log ("", GF_LOG_DEBUG, "w_index: %d, size: %"GF_PRI_SIZET
-                        " used_buffer: %d", buffer->w_index,
-                        buffer->size_buffer,
-                        buffer->used_len);
-        }
-        pthread_mutex_unlock (&buffer->lock);
-}
-
-void
-cb_buffer_dump (buffer_t *buffer, void *data,
-                int (fn) (circular_buffer_t *buffer, void *data))
-{
-        int index = 0;
-        circular_buffer_t *entry = NULL;
-        int  entries = 0;
-        int ul = 0;
-        int w_ind = 0;
-        int size_buff = 0;
-        int i = 0;
-
-        ul = buffer->used_len;
-        w_ind = buffer->w_index;
-        size_buff = buffer->size_buffer;
-
-        pthread_mutex_lock (&buffer->lock);
-        {
-                if (buffer->use_once == _gf_false) {
-                        index = (size_buff + (w_ind - ul))%size_buff;
-                        for (entries = 0; entries < buffer->used_len;
-                             entries++) {
-                                entry = buffer->cb[index];
-                                if (entry)
-                                        fn (entry, data);
-                                else
-                                        gf_log_callingfn ("", GF_LOG_WARNING,
-                                                          "Null entry in "
-                                                          "circular buffer at "
-                                                          "index %d.", index);
-
-                                index++;
-                                index %= buffer->size_buffer;
-                        }
-                } else {
-                        for (i = 0; i < buffer->used_len ; i++) {
-                                entry = buffer->cb[i];
-                                fn (entry, data);
-                        }
-                }
-        }
-        pthread_mutex_unlock (&buffer->lock);
-}
-
-buffer_t *
-cb_buffer_new (size_t buffer_size, gf_boolean_t use_once,
-               void (*destroy_buffer_data) (void *data))
-{
-        buffer_t    *buffer = NULL;
-
-        buffer = GF_CALLOC (1, sizeof (*buffer), gf_common_mt_buffer_t);
-        if (!buffer) {
-                gf_log ("", GF_LOG_ERROR, "could not allocate the "
-                        "buffer");
-                goto out;
-        }
-
-        buffer->cb = GF_CALLOC (buffer_size,
-                                sizeof (circular_buffer_t *),
-                                gf_common_mt_circular_buffer_t);
-        if (!buffer->cb) {
-                gf_log ("", GF_LOG_ERROR, "could not allocate the "
-                        "memory for the circular buffer");
-                GF_FREE (buffer);
-                buffer = NULL;
-                goto out;
-        }
-
-        buffer->w_index = 0;
-        buffer->size_buffer = buffer_size;
-        buffer->use_once = use_once;
-        buffer->used_len = 0;
-        buffer->destroy_buffer_data = destroy_buffer_data;
-        pthread_mutex_init (&buffer->lock, NULL);
-
-out:
-        return buffer;
-}
-
-void
-cb_buffer_destroy (buffer_t *buffer)
-{
-        int                     i = 0;
-        circular_buffer_t       *ptr = NULL;
-        if (buffer) {
-                if (buffer->cb) {
-                        for (i = 0; i < buffer->used_len ; i++) {
-                                ptr = buffer->cb[i];
-                                if (ptr->data) {
-                                        cb_destroy_data (ptr,
-                                                   buffer->destroy_buffer_data);
-                                        ptr->data = NULL;
-                                        GF_FREE (ptr);
-                                }
-                        }
-                        GF_FREE (buffer->cb);
-                }
-                pthread_mutex_destroy (&buffer->lock);
-                GF_FREE (buffer);
-        }
-}
-
diff --git a/libglusterfs/src/circ-buff.h b/libglusterfs/src/circ-buff.h
deleted file mode 100644
index e3459f5e3..000000000
--- a/libglusterfs/src/circ-buff.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CB_H
-#define _CB_H
-
-#include "common-utils.h"
-#include "logging.h"
-#include "mem-types.h"
-
-#define BUFFER_SIZE 10
-#define TOTAL_SIZE BUFFER_SIZE + 1
-
-
-struct _circular_buffer {
-        struct timeval tv;
-        void *data;
-};
-
-typedef struct _circular_buffer circular_buffer_t;
-
-struct _buffer {
-        unsigned int w_index;
-        size_t  size_buffer;
-        gf_boolean_t use_once;
-        /* This variable is assigned the proper value at the time of initing */
-        /* the buffer. It indicates, whether the buffer should be used once */
-        /*  it becomes full. */
-
-        int  used_len;
-        /* indicates the amount of circular buffer used. */
-
-        circular_buffer_t **cb;
-        void (*destroy_buffer_data) (void *data);
-        pthread_mutex_t   lock;
-};
-
-typedef struct _buffer buffer_t;
-
-int
-cb_add_entry_buffer (buffer_t *buffer, void *item);
-
-void
-cb_buffer_show (buffer_t *buffer);
-
-buffer_t *
-cb_buffer_new (size_t buffer_size,gf_boolean_t use_buffer_once,
-               void (*destroy_data) (void *data));
-
-void
-cb_buffer_destroy (buffer_t *buffer);
-
-void
-cb_buffer_dump (buffer_t *buffer, void *data,
-                int (fn) (circular_buffer_t *buffer, void *data));
-
-#endif /* _CB_H */
diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c
deleted file mode 100644
index 06447dc5d..000000000
--- a/libglusterfs/src/client_t.c
+++ /dev/null
@@ -1,890 +0,0 @@
-/*
-  Copyright (c) 2008-2013 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include "glusterfs.h"
-#include "dict.h"
-#include "statedump.h"
-#include "client_t.h"
-#include "list.h"
-#include "rpcsvc.h"
-
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-
-static int
-gf_client_chain_client_entries (cliententry_t *entries, uint32_t startidx,
-                        uint32_t endcount)
-{
-        uint32_t        i = 0;
-
-        if (!entries) {
-                gf_log_callingfn ("client_t", GF_LOG_WARNING, "!entries");
-                return -1;
-        }
-
-        /* Chain only till the second to last entry because we want to
-         * ensure that the last entry has GF_CLIENTTABLE_END.
-         */
-        for (i = startidx; i < (endcount - 1); i++)
-                entries[i].next_free = i + 1;
-
-        /* i has already been incremented upto the last entry. */
-        entries[i].next_free = GF_CLIENTTABLE_END;
-
-        return 0;
-}
-
-
-static int
-gf_client_clienttable_expand (clienttable_t *clienttable, uint32_t nr)
-{
-        cliententry_t   *oldclients     = NULL;
-        uint32_t         oldmax_clients = -1;
-        int              ret            = -1;
-
-        if (clienttable == NULL || nr < 0) {
-                gf_log_callingfn ("client_t", GF_LOG_ERROR, "invalid argument");
-                ret = EINVAL;
-                goto out;
-        }
-
-        /* expand size by power-of-two...
-           this originally came from .../xlators/protocol/server/src/server.c
-           where it was not commented */
-        nr /= (1024 / sizeof (cliententry_t));
-        nr = gf_roundup_next_power_of_two (nr + 1);
-        nr *= (1024 / sizeof (cliententry_t));
-
-        oldclients = clienttable->cliententries;
-        oldmax_clients = clienttable->max_clients;
-
-        clienttable->cliententries = GF_CALLOC (nr, sizeof (cliententry_t),
-                                                gf_common_mt_cliententry_t);
-        if (!clienttable->cliententries) {
-                ret = ENOMEM;
-                goto out;
-        }
-        clienttable->max_clients = nr;
-
-        if (oldclients) {
-                uint32_t cpy = oldmax_clients * sizeof (cliententry_t);
-                memcpy (clienttable->cliententries, oldclients, cpy);
-        }
-
-        gf_client_chain_client_entries (clienttable->cliententries, oldmax_clients,
-                                clienttable->max_clients);
-
-        /* Now that expansion is done, we must update the client list
-         * head pointer so that the client allocation functions can continue
-         * using the expanded table.
-         */
-        clienttable->first_free = oldmax_clients;
-        GF_FREE (oldclients);
-        ret = 0;
-out:
-        return ret;
-}
-
-
-clienttable_t *
-gf_clienttable_alloc (void)
-{
-        clienttable_t *clienttable = NULL;
-
-        clienttable =
-                GF_CALLOC (1, sizeof (clienttable_t), gf_common_mt_clienttable_t);
-        if (!clienttable)
-                return NULL;
-
-        LOCK_INIT (&clienttable->lock);
-        gf_client_clienttable_expand (clienttable, GF_CLIENTTABLE_INITIAL_SIZE);
-        return clienttable;
-}
-
-
-void
-gf_client_clienttable_destroy (clienttable_t *clienttable)
-{
-        client_t         *client        = NULL;
-        cliententry_t    *cliententries = NULL;
-        uint32_t          client_count  = 0;
-        int32_t           i             = 0;
-
-        if (!clienttable) {
-                gf_log_callingfn ("client_t", GF_LOG_WARNING, "!clienttable");
-                return;
-        }
-
-        LOCK (&clienttable->lock);
-        {
-                client_count = clienttable->max_clients;
-                clienttable->max_clients = 0;
-                cliententries = clienttable->cliententries;
-                clienttable->cliententries = NULL;
-        }
-        UNLOCK (&clienttable->lock);
-
-        if (cliententries != NULL) {
-                for (i = 0; i < client_count; i++) {
-                        client = cliententries[i].client;
-                        if (client != NULL) {
-                                gf_client_unref (client);
-                        }
-                }
-
-                GF_FREE (cliententries);
-                LOCK_DESTROY (&clienttable->lock);
-                GF_FREE (clienttable);
-        }
-}
-
-client_t *
-gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid)
-{
-        client_t      *client      = NULL;
-        cliententry_t *cliententry = NULL;
-        clienttable_t *clienttable = NULL;
-        unsigned int   i           = 0;
-
-        if (this == NULL || client_uid == NULL) {
-                gf_log_callingfn ("client_t", GF_LOG_ERROR, "invalid argument");
-                errno = EINVAL;
-                return NULL;
-        }
-
-        gf_log (this->name, GF_LOG_INFO, "client_uid=%s", client_uid);
-
-        clienttable = this->ctx->clienttable;
-
-        LOCK (&clienttable->lock);
-        {
-                for (; i < clienttable->max_clients; i++) {
-                        client = clienttable->cliententries[i].client;
-                        if (client == NULL)
-                                continue;
-                        /*
-                         * look for matching client_uid, _and_
-                         * if auth was used, matching auth flavour and data
-                         */
-                        if (strcmp (client_uid, client->client_uid) == 0 &&
-                                (cred->flavour != AUTH_NONE &&
-                                        (cred->flavour == client->auth.flavour &&
-                                        (size_t) cred->datalen == client->auth.len &&
-                                        memcmp (cred->authdata,
-                                                client->auth.data,
-                                                client->auth.len) == 0))) {
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-                                __sync_add_and_fetch(&client->ref.bind, 1);
-#else
-                                LOCK (&client->ref.lock);
-                                {
-                                        ++client->ref.bind;
-                                }
-                                UNLOCK (&client->ref.lock);
-#endif
-                                break;
-                        }
-                }
-                if (client) {
-                        gf_client_ref (client);
-                        goto unlock;
-                }
-                client = GF_CALLOC (1, sizeof(client_t), gf_common_mt_client_t);
-                if (client == NULL) {
-                        errno = ENOMEM;
-                        goto unlock;
-                }
-
-                client->this = this;
-
-                LOCK_INIT (&client->scratch_ctx.lock);
-                LOCK_INIT (&client->ref.lock);
-
-                client->client_uid = gf_strdup (client_uid);
-                if (client->client_uid == NULL) {
-                        GF_FREE (client);
-                        client = NULL;
-                        errno = ENOMEM;
-                        goto unlock;
-                }
-                client->scratch_ctx.count = GF_CLIENTCTX_INITIAL_SIZE;
-                client->scratch_ctx.ctx =
-                        GF_CALLOC (GF_CLIENTCTX_INITIAL_SIZE,
-                                   sizeof (struct client_ctx),
-                                   gf_common_mt_client_ctx);
-                if (client->scratch_ctx.ctx == NULL) {
-                        GF_FREE (client->client_uid);
-                        GF_FREE (client);
-                        client = NULL;
-                        errno = ENOMEM;
-                        goto unlock;
-                }
-
-                /* no need to do these atomically here */
-                client->ref.bind = client->ref.count = 1;
-
-                client->auth.flavour = cred->flavour;
-                if (cred->flavour != AUTH_NONE) {
-                        client->auth.data =
-                                GF_CALLOC (1, cred->datalen,
-                                           gf_common_mt_client_t);
-                        if (client->auth.data == NULL) {
-                                GF_FREE (client->scratch_ctx.ctx);
-                                GF_FREE (client->client_uid);
-                                GF_FREE (client);
-                                client = NULL;
-                                errno = ENOMEM;
-                                goto unlock;
-                        }
-                        memcpy (client->auth.data, cred->authdata,
-                                cred->datalen);
-                        client->auth.len = cred->datalen;
-                }
-
-                client->tbl_index = clienttable->first_free;
-                cliententry = &clienttable->cliententries[client->tbl_index];
-                cliententry->client = client;
-                clienttable->first_free = cliententry->next_free;
-                cliententry->next_free = GF_CLIENTENTRY_ALLOCATED;
-                gf_client_ref (client);
-        }
-unlock:
-        UNLOCK (&clienttable->lock);
-
-        return client;
-}
-
-void
-gf_client_put (client_t *client, gf_boolean_t *detached)
-{
-        gf_boolean_t unref = _gf_false;
-        int bind_ref;
-
-        if (detached)
-                *detached = _gf_false;
-
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-        bind_ref = __sync_sub_and_fetch(&client->ref.bind, 1);
-#else
-        LOCK (&client->ref.lock);
-        {
-                bind_ref = --client->ref.bind;
-        }
-        UNLOCK (&client->ref.lock);
-#endif
-        if (bind_ref == 0)
-                unref = _gf_true;
-
-        if (unref) {
-                gf_log (THIS->name, GF_LOG_INFO, "Shutting down connection %s",
-                        client->client_uid);
-                if (detached)
-                        *detached = _gf_true;
-                gf_client_unref (client);
-        }
-}
-
-
-client_t *
-gf_client_ref (client_t *client)
-{
-        if (!client) {
-                gf_log_callingfn ("client_t", GF_LOG_ERROR, "null client");
-                return NULL;
-        }
-
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-        __sync_add_and_fetch(&client->ref.count, 1);
-#else
-        LOCK (&client->ref.lock);
-        {
-                ++client->ref.count;
-        }
-        UNLOCK (&client->ref.lock);
-#endif
-        return client;
-}
-
-
-static void
-client_destroy (client_t *client)
-{
-        clienttable_t     *clienttable = NULL;
-        glusterfs_graph_t *gtrav       = NULL;
-        xlator_t          *xtrav       = NULL;
-
-        if (client == NULL){
-                gf_log_callingfn ("xlator", GF_LOG_ERROR, "invalid argument");
-                goto out;
-        }
-
-        clienttable = client->this->ctx->clienttable;
-
-        LOCK_DESTROY (&client->scratch_ctx.lock);
-        LOCK_DESTROY (&client->ref.lock);
-
-        LOCK (&clienttable->lock);
-        {
-                clienttable->cliententries[client->tbl_index].client = NULL;
-                clienttable->cliententries[client->tbl_index].next_free =
-                        clienttable->first_free;
-                clienttable->first_free = client->tbl_index;
-        }
-        UNLOCK (&clienttable->lock);
-
-        list_for_each_entry (gtrav, &client->this->ctx->graphs, list) {
-                xtrav = gtrav->top;
-                while (xtrav != NULL) {
-                        if (xtrav->cbks->client_destroy != NULL)
-                                xtrav->cbks->client_destroy (xtrav, client);
-                        xtrav = xtrav->next;
-                }
-        }
-        GF_FREE (client->auth.data);
-        GF_FREE (client->scratch_ctx.ctx);
-        GF_FREE (client->client_uid);
-        GF_FREE (client);
-out:
-        return;
-}
-
-
-int
-gf_client_disconnect (client_t *client)
-{
-        int                ret   = 0;
-        glusterfs_graph_t *gtrav = NULL;
-        xlator_t          *xtrav = NULL;
-
-        list_for_each_entry (gtrav, &client->this->ctx->graphs, list) {
-                xtrav = gtrav->top;
-                while (xtrav != NULL) {
-                        if (xtrav->cbks->client_disconnect != NULL)
-                                if (xtrav->cbks->client_disconnect (xtrav, client) != 0)
-                                        ret = -1;
-                        xtrav = xtrav->next;
-                }
-        }
-
-        return ret;
-}
-
-
-void
-gf_client_unref (client_t *client)
-{
-        int refcount;
-
-        if (!client) {
-                gf_log_callingfn ("client_t", GF_LOG_ERROR, "client is NULL");
-                return;
-        }
-
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-        refcount = __sync_sub_and_fetch(&client->ref.count, 1);
-#else
-        LOCK (&client->ref.lock);
-        {
-                refcount = --client->ref.count;
-        }
-        UNLOCK (&client->ref.lock);
-#endif
-        if (refcount == 0) {
-                client_destroy (client);
-        }
-}
-
-
-static int
-client_ctx_set_int (client_t *client, void *key, void *value)
-{
-        int index   = 0;
-        int ret     = 0;
-        int set_idx = -1;
-
-        for (index = 0; index < client->scratch_ctx.count; index++) {
-                if (!client->scratch_ctx.ctx[index].ctx_key) {
-                        if (set_idx == -1)
-                                set_idx = index;
-                        /* dont break, to check if key already exists
-                           further on */
-                }
-                if (client->scratch_ctx.ctx[index].ctx_key == key) {
-                        set_idx = index;
-                        break;
-                }
-        }
-
-        if (set_idx == -1) {
-                ret = -1;
-                goto out;
-        }
-
-        client->scratch_ctx.ctx[set_idx].ctx_key = key;
-        client->scratch_ctx.ctx[set_idx].ctx_value  = value;
-
-out:
-        return ret;
-}
-
-
-int
-client_ctx_set (client_t *client, void *key, void *value)
-{
-        int ret = 0;
-
-        if (!client || !key)
-                return -1;
-
-        LOCK (&client->scratch_ctx.lock);
-        {
-                ret = client_ctx_set_int (client, key, value);
-        }
-        UNLOCK (&client->scratch_ctx.lock);
-
-        return ret;
-}
-
-
-static int
-client_ctx_get_int (client_t *client, void *key, void **value)
-{
-        int index = 0;
-        int ret   = 0;
-
-        for (index = 0; index < client->scratch_ctx.count; index++) {
-                if (client->scratch_ctx.ctx[index].ctx_key == key)
-                        break;
-        }
-
-        if (index == client->scratch_ctx.count) {
-                ret = -1;
-                goto out;
-        }
-
-        if (value)
-                *value = client->scratch_ctx.ctx[index].ctx_value;
-
-out:
-        return ret;
-}
-
-
-int
-client_ctx_get (client_t *client, void *key, void **value)
-{
-        int ret = 0;
-
-        if (!client || !key)
-                return -1;
-
-        LOCK (&client->scratch_ctx.lock);
-        {
-                ret = client_ctx_get_int (client, key, value);
-        }
-        UNLOCK (&client->scratch_ctx.lock);
-
-        return ret;
-}
-
-
-static int
-client_ctx_del_int (client_t *client, void *key, void **value)
-{
-        int index = 0;
-        int ret   = 0;
-
-        for (index = 0; index < client->scratch_ctx.count; index++) {
-                if (client->scratch_ctx.ctx[index].ctx_key == key)
-                        break;
-        }
-
-        if (index == client->scratch_ctx.count) {
-                ret = -1;
-                goto out;
-        }
-
-        if (value)
-                *value = client->scratch_ctx.ctx[index].ctx_value;
-
-        client->scratch_ctx.ctx[index].ctx_key   = 0;
-        client->scratch_ctx.ctx[index].ctx_value = 0;
-
-out:
-        return ret;
-}
-
-
-int
-client_ctx_del (client_t *client, void *key, void **value)
-{
-        int ret = 0;
-
-        if (!client || !key)
-                return -1;
-
-        LOCK (&client->scratch_ctx.lock);
-        {
-                ret = client_ctx_del_int (client, key, value);
-        }
-        UNLOCK (&client->scratch_ctx.lock);
-
-        return ret;
-}
-
-
-void
-client_dump (client_t *client, char *prefix)
-{
-        char key[GF_DUMP_MAX_BUF_LEN];
-
-        if (!client)
-                return;
-
-        memset(key, 0, sizeof key);
-        gf_proc_dump_write("refcount", "%d", client->ref.count);
-}
-
-
-void
-cliententry_dump (cliententry_t *cliententry, char *prefix)
-{
-        if (!cliententry)
-                return;
-
-        if (GF_CLIENTENTRY_ALLOCATED != cliententry->next_free)
-                return;
-
-        if (cliententry->client)
-                client_dump(cliententry->client, prefix);
-}
-
-
-void
-clienttable_dump (clienttable_t *clienttable, char *prefix)
-{
-        int     i   = 0;
-        int     ret = -1;
-        char    key[GF_DUMP_MAX_BUF_LEN] = {0};
-
-        if (!clienttable)
-                return;
-
-        ret = TRY_LOCK (&clienttable->lock);
-        {
-                if (ret) {
-                        gf_log ("client_t", GF_LOG_WARNING,
-                                "Unable to acquire lock");
-                        return;
-                }
-                memset(key, 0, sizeof key);
-                gf_proc_dump_build_key(key, prefix, "maxclients");
-                gf_proc_dump_write(key, "%d", clienttable->max_clients);
-                gf_proc_dump_build_key(key, prefix, "first_free");
-                gf_proc_dump_write(key, "%d", clienttable->first_free);
-                for ( i = 0 ; i < clienttable->max_clients; i++) {
-                        if (GF_CLIENTENTRY_ALLOCATED ==
-                            clienttable->cliententries[i].next_free) {
-                                gf_proc_dump_build_key(key, prefix,
-                                                       "cliententry[%d]", i);
-                                gf_proc_dump_add_section(key);
-                                cliententry_dump(&clienttable->cliententries[i],
-                                                 key);
-                        }
-                }
-        }
-        UNLOCK(&clienttable->lock);
-}
-
-
-void
-client_ctx_dump (client_t *client, char *prefix)
-{
-#if 0 /* TBD, FIXME */
-        struct client_ctx   *client_ctx = NULL;
-        xlator_t            *xl = NULL;
-        int                  i = 0;
-
-        if ((client == NULL) || (client->ctx == NULL)) {
-                goto out;
-        }
-
-        LOCK (&client->ctx_lock);
-        if (client->ctx != NULL) {
-                client_ctx = GF_CALLOC (client->inode->table->xl->graph->ctx_count,
-                                        sizeof (*client_ctx),
-                                        gf_common_mt_client_ctx);
-                if (client_ctx == NULL) {
-                        goto unlock;
-                }
-
-                for (i = 0; i < client->inode->table->xl->graph->ctx_count; i++) {
-                        client_ctx[i] = client->ctx[i];
-                }
-        }
-unlock:
-        UNLOCK (&client->ctx_lock);
-
-        if (client_ctx == NULL) {
-                goto out;
-        }
-
-        for (i = 0; i < client->inode->table->xl->graph->ctx_count; i++) {
-                if (client_ctx[i].xl_key) {
-                        xl = (xlator_t *)(long)client_ctx[i].xl_key;
-                        if (xl->dumpops && xl->dumpops->clientctx)
-                                xl->dumpops->clientctx (xl, client);
-                }
-        }
-out:
-        GF_FREE (client_ctx);
-#endif
-}
-
-
-/*
- * the following functions are here to preserve legacy behavior of the
- * protocol/server xlator dump, but perhaps they should just be folded
- * into the client dump instead?
- */
-int
-gf_client_dump_fdtables_to_dict (xlator_t *this, dict_t *dict)
-{
-        clienttable_t  *clienttable = NULL;
-        int             count       = 0;
-        int             ret         = -1;
-#ifdef NOTYET
-        client_t       *client      = NULL;
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-#endif
-
-        GF_VALIDATE_OR_GOTO (THIS->name, this, out);
-        GF_VALIDATE_OR_GOTO (this->name, dict, out);
-
-        clienttable = this->ctx->clienttable;
-
-        if (!clienttable)
-                return -1;
-
-#ifdef NOTYET
-        ret = TRY_LOCK (&clienttable->lock);
-        {
-                if (ret) {
-                        gf_log ("client_t", GF_LOG_WARNING,
-                                "Unable to acquire lock");
-                        return -1;
-                }
-                for ( ; count < clienttable->max_clients; count++) {
-                        if (GF_CLIENTENTRY_ALLOCATED !=
-                            clienttable->cliententries[count].next_free)
-                                continue;
-                        client = clienttable->cliententries[count].client;
-                        memset(key, 0, sizeof key);
-                        snprintf (key, sizeof key, "conn%d", count++);
-                        fdtable_dump_to_dict (client->server_ctx.fdtable,
-                                              key, dict);
-                }
-        }
-        UNLOCK(&clienttable->lock);
-#endif
-
-        ret = dict_set_int32 (dict, "conncount", count);
-out:
-        return ret;
-}
-
-int
-gf_client_dump_fdtables (xlator_t *this)
-{
-        client_t       *client = NULL;
-        clienttable_t  *clienttable = NULL;
-        int             count = 1;
-        int             ret = -1;
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-
-        GF_VALIDATE_OR_GOTO (THIS->name, this, out);
-
-        clienttable = this->ctx->clienttable;
-
-        if (!clienttable)
-                return -1;
-
-        ret = TRY_LOCK (&clienttable->lock);
-        {
-                if (ret) {
-                        gf_log ("client_t", GF_LOG_WARNING,
-                                "Unable to acquire lock");
-                        return -1;
-                }
-
-
-                for ( ; count < clienttable->max_clients; count++) {
-                        if (GF_CLIENTENTRY_ALLOCATED !=
-                            clienttable->cliententries[count].next_free)
-                                continue;
-                        client = clienttable->cliententries[count].client;
-                        memset(key, 0, sizeof key);
-                        if (client->client_uid) {
-                                gf_proc_dump_build_key (key, "conn",
-                                                        "%d.id", count);
-                                gf_proc_dump_write (key, "%s",
-                                                    client->client_uid);
-                        }
-
-                        gf_proc_dump_build_key (key, "conn", "%d.ref",
-                                                        count);
-                        gf_proc_dump_write (key, "%d", client->ref.count);
-                        if (client->bound_xl) {
-                                gf_proc_dump_build_key (key, "conn",
-                                                        "%d.bound_xl", count);
-                                gf_proc_dump_write (key, "%s",
-                                                    client->bound_xl->name);
-                        }
-
-#ifdef NOTYET
-                        gf_proc_dump_build_key (key, "conn","%d.id", count);
-                        fdtable_dump (client->server_ctx.fdtable, key);
-#endif
-                }
-        }
-
-        UNLOCK(&clienttable->lock);
-
-        ret = 0;
-out:
-        return ret;
-}
-
-
-int
-gf_client_dump_inodes_to_dict (xlator_t *this, dict_t *dict)
-{
-        client_t       *client        = NULL;
-        clienttable_t  *clienttable   = NULL;
-        xlator_t       *prev_bound_xl = NULL;
-        char            key[32]       = {0,};
-        int             count         = 0;
-        int             ret           = -1;
-
-        GF_VALIDATE_OR_GOTO (THIS->name, this, out);
-        GF_VALIDATE_OR_GOTO (this->name, dict, out);
-
-        clienttable = this->ctx->clienttable;
-
-        if (!clienttable)
-                return -1;
-
-        ret = TRY_LOCK (&clienttable->lock);
-        {
-                if (ret) {
-                        gf_log ("client_t", GF_LOG_WARNING,
-                                "Unable to acquire lock");
-                        return -1;
-                }
-                for ( ; count < clienttable->max_clients; count++) {
-                        if (GF_CLIENTENTRY_ALLOCATED !=
-                            clienttable->cliententries[count].next_free)
-                                continue;
-                        client = clienttable->cliententries[count].client;
-                        memset(key, 0, sizeof key);
-                        if (client->bound_xl && client->bound_xl->itable) {
-                                /* Presently every brick contains only
-                                 * one bound_xl for all connections.
-                                 * This will lead to duplicating of
-                                 *  the inode lists, if listing is
-                                 * done for every connection. This
-                                 * simple check prevents duplication
-                                 * in the present case. If need arises
-                                 * the check can be improved.
-                                 */
-                                if (client->bound_xl == prev_bound_xl)
-                                        continue;
-                                prev_bound_xl = client->bound_xl;
-
-                                memset (key, 0, sizeof (key));
-                                snprintf (key, sizeof (key), "conn%d", count);
-                                inode_table_dump_to_dict (client->bound_xl->itable,
-                                                          key, dict);
-                        }
-                }
-        }
-        UNLOCK(&clienttable->lock);
-
-        ret = dict_set_int32 (dict, "conncount", count);
-
-out:
-        if (prev_bound_xl)
-                prev_bound_xl = NULL;
-        return ret;
-}
-
-int
-gf_client_dump_inodes (xlator_t *this)
-{
-        client_t       *client        = NULL;
-        clienttable_t  *clienttable   = NULL;
-        xlator_t       *prev_bound_xl = NULL;
-        int             count         = 1;
-        int             ret           = -1;
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-
-        GF_VALIDATE_OR_GOTO (THIS->name, this, out);
-
-        clienttable = this->ctx->clienttable;
-
-        if (!clienttable)
-                goto out;
-
-        ret = TRY_LOCK (&clienttable->lock);
-        {
-                if (ret) {
-                        gf_log ("client_t", GF_LOG_WARNING,
-                                "Unable to acquire lock");
-                        goto out;
-                }
-
-                for ( ; count < clienttable->max_clients; count++) {
-                        if (GF_CLIENTENTRY_ALLOCATED !=
-                            clienttable->cliententries[count].next_free)
-                                continue;
-                        client = clienttable->cliententries[count].client;
-                        memset(key, 0, sizeof key);
-                        if (client->bound_xl && client->bound_xl->itable) {
-                                /* Presently every brick contains only
-                                 * one bound_xl for all connections.
-                                 * This will lead to duplicating of
-                                 * the inode lists, if listing is
-                                 * done for every connection. This
-                                 * simple check prevents duplication
-                                 * in the present case. If need arises
-                                 * the check can be improved.
-                                 */
-                                if (client->bound_xl == prev_bound_xl)
-                                        continue;
-                                prev_bound_xl = client->bound_xl;
-
-                                gf_proc_dump_build_key(key, "conn",
-                                                       "%d.bound_xl.%s", count,
-                                                       client->bound_xl->name);
-                                inode_table_dump(client->bound_xl->itable,key);
-                        }
-                }
-        }
-        UNLOCK(&clienttable->lock);
-
-        ret = 0;
-out:
-        return ret;
-}
-
diff --git a/libglusterfs/src/client_t.h b/libglusterfs/src/client_t.h
deleted file mode 100644
index f7812f8f0..000000000
--- a/libglusterfs/src/client_t.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CLIENT_T_H
-#define _CLIENT_T_H
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "glusterfs.h"
-#include "locking.h"  /* for gf_lock_t, not included by glusterfs.h */
-
-struct client_ctx {
-        void     *ctx_key;
-        void     *ctx_value;
-};
-
-typedef struct _client_t {
-        struct {
-                /* e.g. protocol/server stashes its ctx here */
-                gf_lock_t            lock;
-                unsigned short       count;
-                struct client_ctx   *ctx;
-        }            scratch_ctx;
-        struct {
-                gf_lock_t            lock;
-                volatile int         bind;
-                volatile int         count;
-        }            ref;
-        xlator_t    *bound_xl;
-        xlator_t    *this;
-        int          tbl_index;
-        char        *client_uid;
-        struct {
-                int                  flavour;
-                size_t               len;
-                char                *data;
-        }            auth;
-} client_t;
-
-#define GF_CLIENTCTX_INITIAL_SIZE 8
-
-struct client_table_entry {
-        client_t            *client;
-        int                  next_free;
-};
-typedef struct client_table_entry cliententry_t;
-
-struct clienttable {
-        unsigned int         max_clients;
-        gf_lock_t            lock;
-        cliententry_t       *cliententries;
-        int                  first_free;
-};
-typedef struct clienttable clienttable_t;
-
-#define GF_CLIENTTABLE_INITIAL_SIZE 32
-
-/* Signifies no more entries in the client table. */
-#define GF_CLIENTTABLE_END  -1
-
-/* This is used to invalidate
- * the next_free value in an cliententry that has been allocated
- */
-#define GF_CLIENTENTRY_ALLOCATED    -2
-
-struct rpcsvc_auth_data;
-
-client_t *
-gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid);
-
-void
-gf_client_put (client_t *client, gf_boolean_t *detached);
-
-clienttable_t *
-gf_clienttable_alloc (void);
-
-void
-gf_client_clienttable_destroy (clienttable_t *clienttable);
-
-client_t *
-gf_client_ref (client_t *client);
-
-void
-gf_client_unref (client_t *client);
-
-int
-gf_client_dump_fdtable_to_dict (xlator_t *this, dict_t *dict);
-
-int
-gf_client_dump_fdtable (xlator_t *this);
-
-int
-gf_client_dump_inodes_to_dict (xlator_t *this, dict_t *dict);
-
-int
-gf_client_dump_inodes (xlator_t *this);
-
-int
-client_ctx_set (client_t *client, void *key, void *value);
-
-int
-client_ctx_get (client_t *client, void *key, void **value);
-
-int
-client_ctx_del (client_t *client, void *key, void **value);
-
-void
-client_ctx_dump (client_t *client, char *prefix);
-
-int
-gf_client_dump_fdtables_to_dict (xlator_t *this, dict_t *dict);
-
-int
-gf_client_dump_fdtables (xlator_t *this);
-
-int
-gf_client_dump_inodes_to_dict (xlator_t *this, dict_t *dict);
-
-int
-gf_client_dump_inodes (xlator_t *this);
-
-int
-gf_client_disconnect (client_t *client);
-
-#endif /* _CLIENT_T_H */
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index 827475282..dee6b3592 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -31,11 +40,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <signal.h>
-#include <stdlib.h>
-
-#if defined GF_BSD_HOST_OS || defined GF_DARWIN_HOST_OS
-#include <sys/sysctl.h>
-#endif
 
 #include "logging.h"
 #include "common-utils.h"
@@ -43,13 +47,7 @@
 #include "glusterfs.h"
 #include "stack.h"
 #include "globals.h"
-#include "lkowner.h"
-#include "syscall.h"
-#include <ifaddrs.h>
-
-#ifndef AI_ADDRCONFIG
-#define AI_ADDRCONFIG 0
-#endif /* AI_ADDRCONFIG */
+#include "md5.h"
 
 typedef int32_t (*rw_op_t)(int32_t fd, char *buf, int32_t size);
 typedef int32_t (*rwv_op_t)(int32_t fd, const struct iovec *buf, int32_t size);
@@ -59,99 +57,6 @@ struct dnscache6 {
         struct addrinfo *next;
 };
 
-void
-md5_wrapper(const unsigned char *data, size_t len, char *md5)
-{
-        unsigned short i = 0;
-        unsigned short lim = MD5_DIGEST_LENGTH*2+1;
-        unsigned char scratch[MD5_DIGEST_LENGTH] = {0,};
-        MD5(data, len, scratch);
-        for (; i < MD5_DIGEST_LENGTH; i++)
-                snprintf(md5 + i * 2, lim-i*2, "%02x", scratch[i]);
-}
-
-/* works similar to mkdir(1) -p.
- */
-int
-mkdir_p (char *path, mode_t mode, gf_boolean_t allow_symlinks)
-{
-        int             i               = 0;
-        int             ret             = -1;
-        char            dir[PATH_MAX]   = {0,};
-        struct stat     stbuf           = {0,};
-
-        strcpy (dir, path);
-        i = (dir[0] == '/')? 1: 0;
-        do {
-                if (path[i] != '/' && path[i] != '\0')
-                        continue;
-
-                dir[i] = '\0';
-                ret = mkdir (dir, mode);
-                if (ret && errno != EEXIST) {
-                        gf_log ("", GF_LOG_ERROR, "Failed due to reason %s",
-                                strerror (errno));
-                        goto out;
-                }
-
-                if (ret && errno == EEXIST && !allow_symlinks) {
-                        ret = lstat (dir, &stbuf);
-                        if (ret)
-                                goto out;
-
-                        if (S_ISLNK (stbuf.st_mode)) {
-                                ret = -1;
-                                gf_log ("", GF_LOG_ERROR, "%s is a symlink",
-                                        dir);
-                                goto out;
-                        }
-                }
-                dir[i] = '/';
-
-        } while (path[i++] != '\0');
-
-        ret = stat (dir, &stbuf);
-        if (ret || !S_ISDIR (stbuf.st_mode)) {
-                ret = -1;
-                gf_log ("", GF_LOG_ERROR, "Failed to create directory, "
-                        "possibly some of the components were not directories");
-                goto out;
-        }
-
-        ret = 0;
-out:
-
-        return ret;
-}
-
-int
-gf_lstat_dir (const char *path, struct stat *stbuf_in)
-{
-        int ret           = -1;
-        struct stat stbuf = {0,};
-
-        if (path == NULL) {
-                errno = EINVAL;
-                goto out;
-        }
-
-        ret = sys_lstat (path, &stbuf);
-        if (ret)
-                goto out;
-
-        if (!S_ISDIR (stbuf.st_mode)) {
-                errno = ENOTDIR;
-                ret = -1;
-                goto out;
-        }
-        ret = 0;
-
-out:
-        if (!ret && stbuf_in)
-                *stbuf_in = stbuf;
-
-        return ret;
-}
 
 int
 log_base2 (unsigned long x)
@@ -208,9 +113,7 @@ gf_resolve_ip6 (const char *hostname,
                 memset(&hints, 0, sizeof(hints));
                 hints.ai_family   = family;
                 hints.ai_socktype = SOCK_STREAM;
-#ifndef __NetBSD__
                 hints.ai_flags    = AI_ADDRCONFIG;
-#endif
 
                 ret = gf_asprintf (&port_str, "%d", port);
                 if (-1 == ret) {
@@ -279,101 +182,28 @@ err:
 }
 
 
-struct xldump {
-	int lineno;
-	FILE *logfp;
-};
-
-
-static int
-nprintf (struct xldump *dump, const char *fmt, ...)
-{
-	va_list ap;
-	int ret = 0;
-
-
-	ret += fprintf (dump->logfp, "%3d: ", ++dump->lineno);
-
-	va_start (ap, fmt);
-	ret += vfprintf (dump->logfp, fmt, ap);
-	va_end (ap);
-
-	ret += fprintf (dump->logfp, "\n");
-
-	return ret;
-}
-
-
-static int
-xldump_options (dict_t *this, char *key, data_t *value,	void *d)
-{
-	nprintf (d, "    option %s %s", key, value->data);
-	return 0;
-}
-
-
-static void
-xldump_subvolumes (xlator_t *this, void *d)
-{
-	xlator_list_t *subv = NULL;
-	int len = 0;
-	char *subvstr = NULL;
-
-	subv = this->children;
-	if (!this->children)
-		return;
-
-	for (subv = this->children; subv; subv = subv->next)
-		len += (strlen (subv->xlator->name) + 1);
-
-	subvstr = GF_CALLOC (1, len, gf_common_mt_strdup);
-
-	len = 0;
-	for (subv = this->children; subv; subv= subv->next)
-		len += sprintf (subvstr + len, "%s%s", subv->xlator->name,
-				subv->next ? " " : "");
-
-	nprintf (d, "    subvolumes %s", subvstr);
-
-	GF_FREE (subvstr);
-}
-
-
-static void
-xldump (xlator_t *each, void *d)
-{
-	nprintf (d, "volume %s", each->name);
-	nprintf (d, "    type %s", each->type);
-	dict_foreach (each->options, xldump_options, d);
-
-	xldump_subvolumes (each, d);
-
-	nprintf (d, "end-volume");
-	nprintf (d, "");
-}
-
-
 void
-gf_log_dump_graph (FILE *specfp, glusterfs_graph_t *graph)
+gf_log_volume_file (FILE *specfp)
 {
-        glusterfs_ctx_t *ctx;
-	struct xldump xld = {0, };
-
+        extern FILE *gf_log_logfile;
+        int          lcount = 0;
+        char         data[GF_UNIT_KB];
 
-        ctx = THIS->ctx;
-	xld.logfp = ctx->log.gf_log_logfile;
+        fseek (specfp, 0L, SEEK_SET);
 
-        fprintf (ctx->log.gf_log_logfile, "Final graph:\n");
-        fprintf (ctx->log.gf_log_logfile,
+        fprintf (gf_log_logfile, "Given volfile:\n");
+        fprintf (gf_log_logfile,
                  "+---------------------------------------"
                  "---------------------------------------+\n");
-
-	xlator_foreach_depth_first (graph->top, xldump, &xld);
-
-        fprintf (ctx->log.gf_log_logfile,
-                 "+---------------------------------------"
+        while (fgets (data, GF_UNIT_KB, specfp) != NULL){
+                lcount++;
+                fprintf (gf_log_logfile, "%3d: %s", lcount, data);
+        }
+        fprintf (gf_log_logfile,
+                 "\n+---------------------------------------"
                  "---------------------------------------+\n");
-        fflush (ctx->log.gf_log_logfile);
+        fflush (gf_log_logfile);
+        fseek (specfp, 0L, SEEK_SET);
 }
 
 static void
@@ -508,31 +338,23 @@ out:
 /* Obtain a backtrace and print it to stdout. */
 /* TODO: It looks like backtrace_symbols allocates memory,
    it may be problem because mostly memory allocation/free causes 'sigsegv' */
-
 void
-gf_print_trace (int32_t signum, glusterfs_ctx_t *ctx)
+gf_print_trace (int32_t signum)
 {
+        extern FILE *gf_log_logfile;
+        struct tm   *tm = NULL;
         char         msg[1024] = {0,};
-        char         timestr[64] = {0,};
+        char         timestr[256] = {0,};
+        time_t       utime = 0;
         int          ret = 0;
         int          fd = 0;
 
-        fd = fileno (ctx->log.gf_log_logfile);
+        fd = fileno (gf_log_logfile);
 
-        /* Now every gf_log call will just write to a buffer and when the
-         * buffer becomes full, its written to the log-file. Suppose the process
-         * crashes and prints the backtrace in the log-file, then the previous
-         * log information will still be in the buffer itself. So flush the
-         * contents of the buffer to the log file before printing the backtrace
-         * which helps in debugging.
-         */
-        fflush (ctx->log.gf_log_logfile);
         /* Pending frames, (if any), list them in order */
         ret = write (fd, "pending frames:\n", 16);
-        if (ret < 0)
-                goto out;
-
         {
+                glusterfs_ctx_t *ctx = glusterfs_ctx_get ();
                 struct list_head *trav = ((call_pool_t *)ctx->pool)->all_frames.next;
                 while (trav != (&((call_pool_t *)ctx->pool)->all_frames)) {
                         call_frame_t *tmp = (call_frame_t *)(&((call_stack_t *)trav)->frames);
@@ -540,42 +362,31 @@ gf_print_trace (int32_t signum, glusterfs_ctx_t *ctx)
                                 sprintf (msg,"frame : type(%d) op(%s)\n",
                                          tmp->root->type,
                                          gf_fop_list[tmp->root->op]);
-                        else
-                                sprintf (msg,"frame : type(%d) op(%d)\n",
+                        if (tmp->root->type == GF_OP_TYPE_MGMT)
+                                sprintf (msg,"frame : type(%d) op(%s)\n",
                                          tmp->root->type,
-                                         tmp->root->op);
+                                         gf_mgmt_list[tmp->root->op]);
 
                         ret = write (fd, msg, strlen (msg));
-                        if (ret < 0)
-                                goto out;
-
                         trav = trav->next;
                 }
                 ret = write (fd, "\n", 1);
-                if (ret < 0)
-                        goto out;
         }
 
         sprintf (msg, "patchset: %s\n", GLUSTERFS_REPOSITORY_REVISION);
         ret = write (fd, msg, strlen (msg));
-        if (ret < 0)
-                goto out;
 
         sprintf (msg, "signal received: %d\n", signum);
         ret = write (fd, msg, strlen (msg));
-        if (ret < 0)
-                goto out;
 
         {
                 /* Dump the timestamp of the crash too, so the previous logs
                    can be related */
-                gf_time_fmt (timestr, sizeof timestr, time (NULL), gf_timefmt_FT);
+                utime = time (NULL);
+                tm    = localtime (&utime);
+                strftime (timestr, 256, "%Y-%m-%d %H:%M:%S\n", tm);
                 ret = write (fd, "time of crash: ", 15);
-                if (ret < 0)
-                        goto out;
                 ret = write (fd, timestr, strlen (timestr));
-                if (ret < 0)
-                        goto out;
         }
 
         gf_dump_config_flags (fd);
@@ -589,12 +400,9 @@ gf_print_trace (int32_t signum, glusterfs_ctx_t *ctx)
                 backtrace_symbols_fd (&array[1], size-1, fd);
                 sprintf (msg, "---------\n");
                 ret = write (fd, msg, strlen (msg));
-                if (ret < 0)
-                        goto out;
         }
 #endif /* HAVE_BACKTRACE */
 
-out:
         /* Send a signal to terminate the process */
         signal (signum, SIG_DFL);
         raise (signum);
@@ -611,7 +419,8 @@ gf_trim (char *string)
 {
         register char *s, *t;
 
-        if (string == NULL) {
+        if (string == NULL)
+        {
                 return NULL;
         }
 
@@ -642,17 +451,19 @@ gf_strsplit (const char *str, const char *delim,
         int j = 0;
 
         if (str == NULL || delim == NULL || tokens == NULL || token_count == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 return -1;
         }
 
         _running = gf_strdup (str);
         if (_running == NULL)
+        {
                 return -1;
-
+        }
         running = _running;
 
-        while ((token = strsep (&running, delim)) != NULL) {
+        while ((token = strsep (&running, delim)) != NULL)
+        {
                 if (token[0] != '\0')
                         count++;
         }
@@ -660,17 +471,20 @@ gf_strsplit (const char *str, const char *delim,
 
         _running = gf_strdup (str);
         if (_running == NULL)
+        {
                 return -1;
-
+        }
         running = _running;
 
         if ((token_list = GF_CALLOC (count, sizeof (char *),
-                                     gf_common_mt_char)) == NULL) {
+                                     gf_common_mt_char)) == NULL)
+        {
                 GF_FREE (_running);
                 return -1;
         }
 
-        while ((token = strsep (&running, delim)) != NULL) {
+        while ((token = strsep (&running, delim)) != NULL)
+        {
                 if (token[0] == '\0')
                         continue;
 
@@ -689,8 +503,9 @@ gf_strsplit (const char *str, const char *delim,
 free_exit:
         GF_FREE (_running);
         for (j = 0; j < i; j++)
+        {
                 GF_FREE (token_list[j]);
-
+        }
         GF_FREE (token_list);
         return -1;
 }
@@ -707,7 +522,7 @@ gf_strstr (const char *str, const char *delim, const char *match)
         tmp_str = strdup (str);
 
         if (str == NULL || delim == NULL || match == NULL || tmp_str == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 ret = -1;
                 goto out;
         }
@@ -725,7 +540,8 @@ gf_strstr (const char *str, const char *delim, const char *match)
         }
 
 out:
-        free (tmp_str);
+        if (tmp_str)
+                free (tmp_str);
 
         return ret;
 
@@ -737,14 +553,17 @@ gf_volume_name_validate (const char *volume_name)
         const char *vname = NULL;
 
         if (volume_name == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 return -1;
         }
 
         if (!isalpha (volume_name[0]))
+        {
                 return 1;
+        }
 
-        for (vname = &volume_name[1]; *vname != '\0'; vname++) {
+        for (vname = &volume_name[1]; *vname != '\0'; vname++)
+        {
                 if (!(isalnum (*vname) || *vname == '_'))
                         return 1;
         }
@@ -761,80 +580,100 @@ gf_string2time (const char *str, uint32_t *n)
         int old_errno = 0;
         const char *s = NULL;
 
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+        if (str == NULL || n == NULL)
+        {
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
 
-        for (s = str; *s != '\0'; s++) {
+        for (s = str; *s != '\0'; s++)
+        {
                 if (isspace (*s))
+                {
                         continue;
+                }
                 if (*s == '-')
+                {
                         return -1;
+                }
                 break;
         }
 
         old_errno = errno;
         errno = 0;
         value = strtol (str, &tail, 0);
-        if (str == tail)
-                errno = EINVAL;
 
         if (errno == ERANGE || errno == EINVAL)
+        {
                 return -1;
+        }
 
         if (errno == 0)
+        {
                 errno = old_errno;
+        }
 
         if (!((tail[0] == '\0') ||
               ((tail[0] == 's') && (tail[1] == '\0')) ||
-              ((tail[0] == 's') && (tail[1] == 'e') &&
-	       (tail[2] == 'c') && (tail[3] == '\0'))))
+              ((tail[0] == 's') && (tail[1] == 'e') && (tail[2] == 'c') && (tail[3] == '\0'))))
+        {
                 return -1;
+        }
 
         *n = value;
 
         return 0;
 }
 
+
 int
-gf_string2percent (const char *str, double *n)
+gf_string2percent (const char *str, uint32_t *n)
 {
-        double value = 0;
+        unsigned long value = 0;
         char *tail = NULL;
         int old_errno = 0;
         const char *s = NULL;
 
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+        if (str == NULL || n == NULL)
+        {
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
 
-        for (s = str; *s != '\0'; s++) {
+        for (s = str; *s != '\0'; s++)
+        {
                 if (isspace (*s))
+                {
                         continue;
+                }
                 if (*s == '-')
+                {
                         return -1;
+                }
                 break;
         }
 
         old_errno = errno;
         errno = 0;
-        value = strtod (str, &tail);
-        if (str == tail)
-                errno = EINVAL;
+        value = strtol (str, &tail, 0);
 
         if (errno == ERANGE || errno == EINVAL)
+        {
                 return -1;
+        }
 
         if (errno == 0)
+        {
                 errno = old_errno;
+        }
 
         if (!((tail[0] == '\0') ||
               ((tail[0] == '%') && (tail[1] == '\0'))))
+        {
                 return -1;
+        }
 
         *n = value;
 
@@ -849,8 +688,9 @@ _gf_string2long (const char *str, long *n, int base)
         char *tail = NULL;
         int old_errno = 0;
 
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+        if (str == NULL || n == NULL)
+        {
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
@@ -858,17 +698,22 @@ _gf_string2long (const char *str, long *n, int base)
         old_errno = errno;
         errno = 0;
         value = strtol (str, &tail, base);
-        if (str == tail)
-                errno = EINVAL;
 
         if (errno == ERANGE || errno == EINVAL)
+        {
                 return -1;
+        }
 
         if (errno == 0)
+        {
                 errno = old_errno;
+        }
 
         if (tail[0] != '\0')
+        {
+                /* bala: invalid integer format */
                 return -1;
+        }
 
         *n = value;
 
@@ -883,34 +728,47 @@ _gf_string2ulong (const char *str, unsigned long *n, int base)
         int old_errno = 0;
         const char *s = NULL;
 
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+        if (str == NULL || n == NULL)
+        {
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
 
-        for (s = str; *s != '\0'; s++) {
+        for (s = str; *s != '\0'; s++)
+        {
                 if (isspace (*s))
+                {
                         continue;
+                }
                 if (*s == '-')
+                {
+                        /* bala: we do not support suffixed (-) sign and
+                           invalid integer format */
                         return -1;
+                }
                 break;
         }
 
         old_errno = errno;
         errno = 0;
         value = strtoul (str, &tail, base);
-        if (str == tail)
-                errno = EINVAL;
 
         if (errno == ERANGE || errno == EINVAL)
+        {
                 return -1;
+        }
 
         if (errno == 0)
+        {
                 errno = old_errno;
+        }
 
         if (tail[0] != '\0')
+        {
+                /* bala: invalid integer format */
                 return -1;
+        }
 
         *n = value;
 
@@ -925,34 +783,47 @@ _gf_string2uint (const char *str, unsigned int *n, int base)
         int old_errno = 0;
         const char *s = NULL;
 
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+        if (str == NULL || n == NULL)
+        {
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
 
-        for (s = str; *s != '\0'; s++) {
+        for (s = str; *s != '\0'; s++)
+        {
                 if (isspace (*s))
+                {
                         continue;
+                }
                 if (*s == '-')
+                {
+                        /* bala: we do not support suffixed (-) sign and
+                           invalid integer format */
                         return -1;
+                }
                 break;
         }
 
         old_errno = errno;
         errno = 0;
         value = strtoul (str, &tail, base);
-        if (str == tail)
-                errno = EINVAL;
 
         if (errno == ERANGE || errno == EINVAL)
+        {
                 return -1;
+        }
 
         if (errno == 0)
+        {
                 errno = old_errno;
+        }
 
         if (tail[0] != '\0')
+        {
+                /* bala: invalid integer format */
                 return -1;
+        }
 
         *n = (unsigned int)value;
 
@@ -967,7 +838,7 @@ _gf_string2double (const char *str, double *n)
         int    old_errno = 0;
 
         if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
@@ -975,17 +846,18 @@ _gf_string2double (const char *str, double *n)
         old_errno = errno;
         errno = 0;
         value = strtod (str, &tail);
-        if (str == tail)
-                errno = EINVAL;
 
-        if (errno == ERANGE || errno == EINVAL)
+        if (errno == ERANGE || errno == EINVAL) {
                 return -1;
+        }
 
-        if (errno == 0)
+        if (errno == 0) {
                 errno = old_errno;
+        }
 
-        if (tail[0] != '\0')
+        if (tail[0] != '\0') {
                 return -1;
+        }
 
         *n = value;
 
@@ -999,8 +871,9 @@ _gf_string2longlong (const char *str, long long *n, int base)
         char *tail = NULL;
         int old_errno = 0;
 
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+        if (str == NULL || n == NULL)
+        {
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
@@ -1008,17 +881,22 @@ _gf_string2longlong (const char *str, long long *n, int base)
         old_errno = errno;
         errno = 0;
         value = strtoll (str, &tail, base);
-        if (str == tail)
-                errno = EINVAL;
 
         if (errno == ERANGE || errno == EINVAL)
+        {
                 return -1;
+        }
 
         if (errno == 0)
+        {
                 errno = old_errno;
+        }
 
         if (tail[0] != '\0')
+        {
+                /* bala: invalid integer format */
                 return -1;
+        }
 
         *n = value;
 
@@ -1033,34 +911,47 @@ _gf_string2ulonglong (const char *str, unsigned long long *n, int base)
         int old_errno = 0;
         const char *s = NULL;
 
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+        if (str == NULL || n == NULL)
+        {
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
 
-        for (s = str; *s != '\0'; s++) {
+        for (s = str; *s != '\0'; s++)
+        {
                 if (isspace (*s))
+                {
                         continue;
+                }
                 if (*s == '-')
+                {
+                        /* bala: we do not support suffixed (-) sign and
+                           invalid integer format */
                         return -1;
+                }
                 break;
         }
 
         old_errno = errno;
         errno = 0;
         value = strtoull (str, &tail, base);
-        if (str == tail)
-                errno = EINVAL;
 
         if (errno == ERANGE || errno == EINVAL)
+        {
                 return -1;
+        }
 
         if (errno == 0)
+        {
                 errno = old_errno;
+        }
 
         if (tail[0] != '\0')
+        {
+                /* bala: invalid integer format */
                 return -1;
+        }
 
         *n = value;
 
@@ -1125,7 +1016,8 @@ gf_string2int8 (const char *str, int8_t *n)
         if (rv != 0)
                 return rv;
 
-        if ((l >= INT8_MIN) && (l <= INT8_MAX)) {
+        if (l >= INT8_MIN && l <= INT8_MAX)
+        {
                 *n = (int8_t) l;
                 return 0;
         }
@@ -1144,7 +1036,8 @@ gf_string2int16 (const char *str, int16_t *n)
         if (rv != 0)
                 return rv;
 
-        if ((l >= INT16_MIN) && (l <= INT16_MAX)) {
+        if (l >= INT16_MIN && l <= INT16_MAX)
+        {
                 *n = (int16_t) l;
                 return 0;
         }
@@ -1163,7 +1056,8 @@ gf_string2int32 (const char *str, int32_t *n)
         if (rv != 0)
                 return rv;
 
-        if ((l >= INT32_MIN) && (l <= INT32_MAX)) {
+        if (l >= INT32_MIN && l <= INT32_MAX)
+        {
                 *n = (int32_t) l;
                 return 0;
         }
@@ -1182,7 +1076,8 @@ gf_string2int64 (const char *str, int64_t *n)
         if (rv != 0)
                 return rv;
 
-        if ((l >= INT64_MIN) && (l <= INT64_MAX)) {
+        if (l >= INT64_MIN && l <= INT64_MAX)
+        {
                 *n = (int64_t) l;
                 return 0;
         }
@@ -1201,7 +1096,8 @@ gf_string2uint8 (const char *str, uint8_t *n)
         if (rv != 0)
                 return rv;
 
-        if (l >= 0 && l <= UINT8_MAX) {
+        if (l >= 0 && l <= UINT8_MAX)
+        {
                 *n = (uint8_t) l;
                 return 0;
         }
@@ -1220,7 +1116,8 @@ gf_string2uint16 (const char *str, uint16_t *n)
         if (rv != 0)
                 return rv;
 
-        if (l >= 0 && l <= UINT16_MAX) {
+        if (l >= 0 && l <= UINT16_MAX)
+        {
                 *n = (uint16_t) l;
                 return 0;
         }
@@ -1239,7 +1136,8 @@ gf_string2uint32 (const char *str, uint32_t *n)
         if (rv != 0)
                 return rv;
 
-        if (l >= 0 && l <= UINT32_MAX) {
+        if (l >= 0 && l <= UINT32_MAX)
+        {
                 *n = (uint32_t) l;
                 return 0;
         }
@@ -1258,7 +1156,8 @@ gf_string2uint64 (const char *str, uint64_t *n)
         if (rv != 0)
                 return rv;
 
-        if (l >= 0 && l <= UINT64_MAX) {
+        if (l >= 0 && l <= UINT64_MAX)
+        {
                 *n = (uint64_t) l;
                 return 0;
         }
@@ -1289,7 +1188,8 @@ gf_string2uint8_base10 (const char *str, uint8_t *n)
         if (rv != 0)
                 return rv;
 
-        if (l >= 0 && l <= UINT8_MAX) {
+        if (l >= 0 && l <= UINT8_MAX)
+        {
                 *n = (uint8_t) l;
                 return 0;
         }
@@ -1308,7 +1208,8 @@ gf_string2uint16_base10 (const char *str, uint16_t *n)
         if (rv != 0)
                 return rv;
 
-        if (l >= 0 && l <= UINT16_MAX) {
+        if (l >= 0 && l <= UINT16_MAX)
+        {
                 *n = (uint16_t) l;
                 return 0;
         }
@@ -1327,7 +1228,8 @@ gf_string2uint32_base10 (const char *str, uint32_t *n)
         if (rv != 0)
                 return rv;
 
-        if (l >= 0 && l <= UINT32_MAX) {
+        if (l >= 0 && l <= UINT32_MAX)
+        {
                 *n = (uint32_t) l;
                 return 0;
         }
@@ -1346,7 +1248,8 @@ gf_string2uint64_base10 (const char *str, uint64_t *n)
         if (rv != 0)
                 return rv;
 
-        if (l >= 0 && l <= UINT64_MAX) {
+        if (l >= 0 && l <= UINT64_MAX)
+        {
                 *n = (uint64_t) l;
                 return 0;
         }
@@ -1394,124 +1297,77 @@ err:
 int
 gf_string2bytesize (const char *str, uint64_t *n)
 {
-        double value = 0.0;
+        uint64_t value = 0ULL;
         char *tail = NULL;
         int old_errno = 0;
         const char *s = NULL;
 
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+        if (str == NULL || n == NULL)
+        {
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 errno = EINVAL;
                 return -1;
         }
 
-        for (s = str; *s != '\0'; s++) {
+        for (s = str; *s != '\0'; s++)
+        {
                 if (isspace (*s))
+                {
                         continue;
+                }
                 if (*s == '-')
+                {
+                        /* bala: we do not support suffixed (-) sign and
+                           invalid integer format */
                         return -1;
+                }
                 break;
         }
 
         old_errno = errno;
         errno = 0;
-        value = strtod (str, &tail);
-        if (str == tail)
-                errno = EINVAL;
+        value = strtoull (str, &tail, 10);
 
         if (errno == ERANGE || errno == EINVAL)
-                return -1;
-
-        if (errno == 0)
-                errno = old_errno;
-
-        if (tail[0] != '\0')
         {
-                if (strcasecmp (tail, GF_UNIT_KB_STRING) == 0)
-                        value *= GF_UNIT_KB;
-                else if (strcasecmp (tail, GF_UNIT_MB_STRING) == 0)
-                        value *= GF_UNIT_MB;
-                else if (strcasecmp (tail, GF_UNIT_GB_STRING) == 0)
-                        value *= GF_UNIT_GB;
-                else if (strcasecmp (tail, GF_UNIT_TB_STRING) == 0)
-                        value *= GF_UNIT_TB;
-                else if (strcasecmp (tail, GF_UNIT_PB_STRING) == 0)
-                        value *= GF_UNIT_PB;
-                else
-                        return -1;
-        }
-
-        if ((UINT64_MAX - value) < 0) {
-                errno = ERANGE;
-                return -1;
-        }
-
-        *n = (uint64_t) value;
-
-        return 0;
-}
-
-int
-gf_string2percent_or_bytesize (const char *str,
-			       uint64_t *n,
-			       gf_boolean_t *is_percent)
-{
-        double value = 0ULL;
-        char *tail = NULL;
-        int old_errno = 0;
-        const char *s = NULL;
-
-        if (str == NULL || n == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING,
-				  "argument invalid");
-                errno = EINVAL;
                 return -1;
         }
 
-        for (s = str; *s != '\0'; s++) {
-                if (isspace (*s))
-                        continue;
-                if (*s == '-')
-                        return -1;
-                break;
-        }
-
-        old_errno = errno;
-        errno = 0;
-        value = strtod (str, &tail);
-        if (str == tail)
-                errno = EINVAL;
-
-        if (errno == ERANGE || errno == EINVAL)
-                return -1;
-
         if (errno == 0)
+        {
                 errno = old_errno;
+        }
 
-        if (tail[0] != '\0') {
+        if (tail[0] != '\0')
+        {
                 if (strcasecmp (tail, GF_UNIT_KB_STRING) == 0)
+                {
                         value *= GF_UNIT_KB;
+                }
                 else if (strcasecmp (tail, GF_UNIT_MB_STRING) == 0)
+                {
                         value *= GF_UNIT_MB;
+                }
                 else if (strcasecmp (tail, GF_UNIT_GB_STRING) == 0)
+                {
                         value *= GF_UNIT_GB;
+                }
                 else if (strcasecmp (tail, GF_UNIT_TB_STRING) == 0)
+                {
                         value *= GF_UNIT_TB;
+                }
                 else if (strcasecmp (tail, GF_UNIT_PB_STRING) == 0)
+                {
                         value *= GF_UNIT_PB;
-		else if (strcasecmp (tail, GF_UNIT_PERCENT_STRING) == 0)
-			*is_percent = _gf_true;
+                }
                 else
+                {
+                        /* bala: invalid integer format */
                         return -1;
+                }
         }
 
-        /* Error out if we cannot store the value in uint64 */
-        if ((UINT64_MAX - value) < 0) {
-                errno = ERANGE;
-                return -1;
-        }
-
-        *n = (uint64_t) value;
+        *n = value;
 
         return 0;
 }
@@ -1559,7 +1415,7 @@ int
 gf_string2boolean (const char *str, gf_boolean_t *b)
 {
         if (str == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 return -1;
         }
 
@@ -1665,6 +1521,79 @@ get_checksum_for_file (int fd, uint32_t *checksum)
 }
 
 
+/* One should pass the command here with command with full path,
+   otherwise, execv will fail */
+int
+gf_system (const char *command)
+{
+        int    ret    = -1;
+        pid_t  pid    = 0;
+        int    status = 0;
+        int    idx    = 0;
+        char  *dupcmd = NULL;
+        char  *arg    = NULL;
+        char  *tmp    = NULL;
+        char  *argv[100] = { NULL, };
+        sigset_t set;
+
+        dupcmd = gf_strdup (command);
+        if (!dupcmd)
+                goto out;
+
+        pid = fork ();
+        if (pid < 0) {
+                /* failure */
+                goto out;
+        }
+        if (pid == 0) {
+                /* Child process */
+                /* Step 0: Prepare the argv */
+                arg = strtok_r (dupcmd, " ", &tmp);
+                while (arg) {
+                        argv[idx] = arg;
+                        arg = strtok_r (NULL, " ", &tmp);
+                        idx++;
+                }
+                /* Step 1: Close all 'fd' */
+                for (idx = 3; idx < 65536; idx++) {
+                        close (idx);
+                }
+
+                /* Step 2: Start with an empty signal mask */
+                ret = sigemptyset (&set);
+                if (ret) {
+                        gf_log ("", GF_LOG_ERROR, "Failed to empty signal set");
+                        goto step3;
+                }
+
+                ret = sigprocmask (SIG_SETMASK, &set, NULL);
+                if (ret)
+                        gf_log ("", GF_LOG_ERROR, "Failed to set signal mask");
+
+        step3:
+                /* Step 3: execv (); */
+                ret = execvp (argv[0], argv);
+
+                /* Code will not come here at all */
+                gf_log ("", GF_LOG_ERROR, "execv of (%s) failed", command);
+
+                kill (getpid(), SIGKILL);
+        }
+        if (pid > 0) {
+                /* Current, ie, parent process */
+                pid = waitpid (pid, &status, 0);
+                if (WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS)
+                        ret = 0;
+                else
+                        ret = -1;
+        }
+out:
+        if (dupcmd)
+                GF_FREE (dupcmd);
+
+        return ret;
+}
+
 int
 get_checksum_for_path (char *path, uint32_t *checksum)
 {
@@ -1677,7 +1606,7 @@ get_checksum_for_path (char *path, uint32_t *checksum)
         fd = open (path, O_RDWR);
 
         if (fd == -1) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Unable to open %s, errno: %d",
+                gf_log ("", GF_LOG_ERROR, "Unable to open %s, errno: %d",
                         path, errno);
                 goto out;
         }
@@ -1704,183 +1633,60 @@ strtail (char *str, const char *pattern)
         return NULL;
 }
 
-void
-skipwhite (char **s)
-{
-        while (isspace (**s))
-                (*s)++;
-}
-
-char *
-nwstrtail (char *str, char *pattern)
-{
-        for (;;) {
-                skipwhite (&str);
-                skipwhite (&pattern);
-
-                if (*str != *pattern || !*str)
-                        break;
-
-                str++;
-                pattern++;
-        }
-
-        return *pattern ? NULL : str;
-}
-
-void
-skipword (char **s)
-{
-        if (!*s)
-                return;
-
-        skipwhite (s);
-
-        while (!isspace(**s))
-                (*s)++;
-}
-
-char *
-get_nth_word (const char *str, int n)
-{
-        char           buf[4096] = {0};
-        char          *start     = NULL;
-        char          *word      = NULL;
-        int            i         = 0;
-        int            word_len  = 0;
-        const char    *end       = NULL;
-
-        if (!str)
-                goto out;
-
-        snprintf (buf, sizeof (buf), "%s", str);
-        start = buf;
-
-        for (i = 0; i < n-1; i++)
-                skipword (&start);
-
-        skipwhite (&start);
-        end = strpbrk ((const char *)start, " \t\n\0");
-
-        if (!end)
-                goto out;
-
-        word_len = abs (end - start);
-
-        word = GF_CALLOC (1, word_len + 1, gf_common_mt_strdup);
-        if (!word)
-                goto out;
-
-        strncpy (word, start, word_len);
-        *(word + word_len) = '\0';
- out:
-        return word;
-}
-
-/* Syntax formed according to RFC 1912 (RFC 1123 & 952 are more restrictive)  *
-   <hname> ::= <gen-name>*["."<gen-name>]                                     *
-   <gen-name> ::= <let-or-digit> <[*[<let-or-digit-or-hyphen>]<let-or-digit>] */
+/* RFC 1123 & 952 */
 char
 valid_host_name (char *address, int length)
 {
-        int             i = 0;
-        int             str_len = 0;
-        char            ret = 1;
-        char            *dup_addr = NULL;
-        char            *temp_str = NULL;
-        char            *save_ptr = NULL;
-
-        if ((length > _POSIX_HOST_NAME_MAX) || (length < 1)) {
-                ret = 0;
-                goto out;
-        }
-
-        dup_addr = gf_strdup (address);
-        if (!dup_addr) {
-                ret = 0;
-                goto out;
-        }
+        int i = 0;
+        char ret = 1;
 
-        if (!isalnum (dup_addr[length - 1]) && (dup_addr[length - 1] != '*')) {
+        if ((length > 75) || (length == 1)) {
                 ret = 0;
                 goto out;
         }
 
-        /* Check for consecutive dots, which is invalid in a hostname and is
-         * ignored by strtok()
-         */
-        if (strstr (dup_addr, "..")) {
+        if (!isalnum (address[length - 1])) {
                 ret = 0;
                 goto out;
         }
 
-        /* gen-name */
-        temp_str = strtok_r (dup_addr, ".", &save_ptr);
-        do {
-                str_len = strlen (temp_str);
-
-                if (!isalnum (temp_str[0]) ||
-                    !isalnum (temp_str[str_len-1])) {
+        for (i = 0; i < length; i++) {
+                if (!isalnum (address[i]) && (address[i] != '.')
+                    && (address[i] != '-')) {
                         ret = 0;
                         goto out;
                 }
-                for (i = 1; i < str_len; i++) {
-                        if (!isalnum (temp_str[i]) && (temp_str[i] != '-')) {
-                                ret = 0;
-                                goto out;
-                        }
-                }
-        } while ((temp_str = strtok_r (NULL, ".", &save_ptr)));
+        }
 
 out:
-        GF_FREE (dup_addr);
         return ret;
 }
 
-/*  Matches all ipv4 address, if wildcard_acc is true  '*' wildcard pattern for*
-  subnets is considerd as valid strings as well                               */
 char
-valid_ipv4_address (char *address, int length, gf_boolean_t wildcard_acc)
+valid_ipv4_address (char *address, int length)
 {
         int octets = 0;
         int value = 0;
         char *tmp = NULL, *ptr = NULL, *prev = NULL, *endptr = NULL;
         char ret = 1;
-        int is_wildcard = 0;
 
         tmp = gf_strdup (address);
-
-        /*
-         * To prevent cases where last character is '.' and which have
-         * consecutive dots like ".." as strtok ignore consecutive
-         * delimeters.
-         */
-        if (length <= 0 ||
-            (strstr (address, "..")) ||
-            (!isdigit (tmp[length - 1]) && (tmp[length - 1] != '*'))) {
-                ret = 0;
-                goto out;
-        }
-
         prev = tmp;
         prev = strtok_r (tmp, ".", &ptr);
 
-        while (prev != NULL) {
+        while (prev != NULL)
+        {
                 octets++;
-                if (wildcard_acc && !strcmp (prev, "*")) {
-                        is_wildcard = 1;
-                } else {
-                        value = strtol (prev, &endptr, 10);
-                        if ((value > 255) || (value < 0) ||
-                            (endptr != NULL && *endptr != '\0')) {
-                                ret = 0;
-                                goto out;
-                        }
+                value = strtol (prev, &endptr, 10);
+                if ((value > 255) || (value < 0) || (endptr != NULL)) {
+                        ret = 0;
+                        goto out;
                 }
+
                 prev = strtok_r (NULL, ".", &ptr);
         }
 
-        if ((octets > 4) || (octets < 4 && !is_wildcard)) {
+        if (octets != 4) {
                 ret = 0;
         }
 
@@ -1890,53 +1696,30 @@ out:
 }
 
 char
-valid_ipv6_address (char *address, int length, gf_boolean_t wildcard_acc)
+valid_ipv6_address (char *address, int length)
 {
         int hex_numbers = 0;
         int value = 0;
-        int i = 0;
         char *tmp = NULL, *ptr = NULL, *prev = NULL, *endptr = NULL;
         char ret = 1;
-        int is_wildcard = 0;
-        int is_compressed = 0;
 
         tmp = gf_strdup (address);
-
-        /* Check for compressed form */
-        if (length <= 0 || tmp[length - 1] == ':') {
-                ret = 0;
-                goto out;
-        }
-        for (i = 0; i < (length - 1) ; i++) {
-                if (tmp[i] == ':' && tmp[i + 1] == ':') {
-                        if (is_compressed == 0)
-                                is_compressed = 1;
-                        else {
-                                ret = 0;
-                                goto out;
-                        }
-                }
-        }
-
         prev = strtok_r (tmp, ":", &ptr);
 
-        while (prev != NULL) {
+        while (prev != NULL)
+        {
                 hex_numbers++;
-                if (wildcard_acc && !strcmp (prev, "*")) {
-                        is_wildcard = 1;
-                } else {
-                        value = strtol (prev, &endptr, 16);
-                        if ((value > 0xffff) || (value < 0)
-                        || (endptr != NULL && *endptr != '\0')) {
-                                ret = 0;
-                                goto out;
-                        }
+                value = strtol (prev, &endptr, 16);
+                if ((value > 0xffff) || (value < 0)
+                    || (endptr != NULL && *endptr != '\0')) {
+                        ret = 0;
+                        goto out;
                 }
+
                 prev = strtok_r (NULL, ":", &ptr);
         }
 
-        if ((hex_numbers > 8) || (hex_numbers < 8 && !is_wildcard
-            && !is_compressed)) {
+        if (hex_numbers > 8) {
                 ret = 0;
         }
 
@@ -1946,78 +1729,36 @@ out:
 }
 
 char
-valid_internet_address (char *address, gf_boolean_t wildcard_acc)
+valid_internet_address (char *address)
 {
         char ret = 0;
         int length = 0;
 
         if (address == NULL) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
+                gf_log_callingfn ("", GF_LOG_WARNING, "arguement invalid");
                 goto out;
         }
 
         length = strlen (address);
-        if (length == 0)
+        if (length == 0) {
                 goto out;
+        }
 
-        if (valid_ipv4_address (address, length, wildcard_acc)
-            || valid_ipv6_address (address, length, wildcard_acc)
-            || valid_host_name (address, length))
+        if (valid_ipv4_address (address, length)
+            || valid_ipv6_address (address, length)
+            || valid_host_name (address, length)) {
                 ret = 1;
+        }
 
 out:
         return ret;
 }
 
-/**
- * gf_sock_union_equal_addr - check if two given gf_sock_unions have same addr
- *
- * @param a - first sock union
- * @param b - second sock union
- * @return _gf_true if a and b have same ipv{4,6} addr, _gf_false otherwise
- */
-gf_boolean_t
-gf_sock_union_equal_addr (union gf_sock_union *a,
-                          union gf_sock_union *b)
-{
-        if (!a || !b) {
-                gf_log ("common-utils", GF_LOG_ERROR, "Invalid arguments"
-                        " to gf_sock_union_equal_addr");
-                return _gf_false;
-        }
-
-        if (a->storage.ss_family != b->storage.ss_family)
-                return _gf_false;
-
-        switch (a->storage.ss_family) {
-        case AF_INET:
-                if (a->sin.sin_addr.s_addr == b->sin.sin_addr.s_addr)
-                        return _gf_true;
-                else
-                        return _gf_false;
-
-        case AF_INET6:
-                if (memcmp ((void *)(&a->sin6.sin6_addr),
-                            (void *)(&b->sin6.sin6_addr),
-                            sizeof (a->sin6.sin6_addr)))
-                        return _gf_false;
-                else
-                        return _gf_true;
-
-        default:
-                gf_log ("common-utils", GF_LOG_DEBUG,
-                        "Unsupported/invalid address family");
-                break;
-        }
-
-        return _gf_false;
-}
-
 /*Thread safe conversion function*/
 char *
 uuid_utoa (uuid_t uuid)
 {
-        char *uuid_buffer = glusterfs_uuid_buf_get(THIS->ctx);
+        char *uuid_buffer = glusterfs_uuid_buf_get();
         uuid_unparse (uuid, uuid_buffer);
         return uuid_buffer;
 }
@@ -2032,23 +1773,17 @@ uuid_utoa_r (uuid_t uuid, char *dst)
         return dst;
 }
 
-/*Thread safe conversion function*/
-char *
-lkowner_utoa (gf_lkowner_t *lkowner)
+void _get_md5_str (char *out_str, size_t outlen,
+                   const uint8_t *input, int n)
 {
-        char *lkowner_buffer = glusterfs_lkowner_buf_get(THIS->ctx);
-        lkowner_unparse (lkowner, lkowner_buffer, GF_LKOWNER_BUF_SIZE);
-        return lkowner_buffer;
-}
+        uint8_t out[MD5_DIGEST_LEN] = {0};
+        int     j = 0;
+
+        GF_ASSERT (outlen >= (2*MD5_DIGEST_LEN + 1));
+        get_md5 (out, input, n);
+        for (j = 0; j < MD5_DIGEST_LEN; j++)
+                snprintf(out_str + j * 2, outlen-j*2, "%02x", out[j]);
 
-/*Re-entrant conversion function*/
-char *
-lkowner_utoa_r (gf_lkowner_t *lkowner, char *dst, int len)
-{
-        if(!dst)
-                return NULL;
-        lkowner_unparse (lkowner, dst, len);
-        return dst;
 }
 
 void* gf_array_elem (void *a, int index, size_t elem_size)
@@ -2079,8 +1814,8 @@ gf_array_insertionsort (void *A, int l, int r, size_t elem_size,
         for(i = l; i < N; i++) {
                 Temp = gf_array_elem (A, i, elem_size);
                 j = i - 1;
-                while((cmp (Temp, gf_array_elem (A, j, elem_size))
-		       < 0) && j>=0) {
+                while((cmp (Temp, gf_array_elem (A, j, elem_size)) < 0) && j>=0)
+                {
                         gf_elem_swap (Temp, gf_array_elem (A, j, elem_size),
                                       elem_size);
                         Temp = gf_array_elem (A, j, elem_size);
@@ -2096,7 +1831,7 @@ gf_is_str_int (const char *value)
         char   *str  = NULL;
         char   *fptr = NULL;
 
-        GF_VALIDATE_OR_GOTO (THIS->name, value, out);
+        GF_VALIDATE_OR_GOTO ("", value, out);
 
         str = gf_strdup (value);
         if (!str)
@@ -2113,796 +1848,9 @@ gf_is_str_int (const char *value)
         }
 
 out:
-        GF_FREE (fptr);
+        if (fptr)
+                GF_FREE (fptr);
 
         return flag;
 }
-/*
- * rounds up nr to power of two. If nr is already a power of two, just returns
- * nr
- */
-
-inline int32_t
-gf_roundup_power_of_two (int32_t nr)
-{
-        int32_t result = 1;
-
-        if (nr < 0) {
-                gf_log ("common-utils", GF_LOG_WARNING,
-                        "negative number passed");
-                result = -1;
-                goto out;
-        }
-
-        while (result < nr)
-                result *= 2;
-
-out:
-        return result;
-}
-
-/*
- * rounds up nr to next power of two. If nr is already a power of two, next
- * power of two is returned.
- */
-
-inline int32_t
-gf_roundup_next_power_of_two (int32_t nr)
-{
-        int32_t result = 1;
-
-        if (nr < 0) {
-                gf_log ("common-utils", GF_LOG_WARNING,
-                        "negative number passed");
-                result = -1;
-                goto out;
-        }
-
-        while (result <= nr)
-                result *= 2;
-
-out:
-        return result;
-}
 
-int
-validate_brick_name (char *brick)
-{
-        char *delimiter = NULL;
-        int  ret = 0;
-        delimiter = strrchr (brick, ':');
-        if (!delimiter || delimiter == brick
-            || *(delimiter+1) != '/')
-                ret = -1;
-
-        return ret;
-}
-
-char *
-get_host_name (char *word, char **host)
-{
-        char *delimiter = NULL;
-        delimiter = strrchr (word, ':');
-        if (delimiter)
-                *delimiter = '\0';
-        else
-                return NULL;
-        *host = word;
-        return *host;
-}
-
-
-char *
-get_path_name (char *word, char **path)
-{
-        char *delimiter = NULL;
-        delimiter = strchr (word, '/');
-        if (!delimiter)
-                return NULL;
-        *path = delimiter;
-        return *path;
-}
-
-void
-gf_path_strip_trailing_slashes (char *path)
-{
-        int i = 0;
-        int len = 0;
-
-        if (!path)
-                return;
-
-        len = strlen (path);
-        for (i = len - 1; i > 0; i--) {
-                if (path[i] != '/')
-                        break;
-	}
-
-        if (i < (len -1))
-                path [i+1] = '\0';
-
-        return;
-}
-
-uint64_t
-get_mem_size ()
-{
-        uint64_t memsize = -1;
-
-#if defined GF_LINUX_HOST_OS || defined GF_SOLARIS_HOST_OS
-
-	uint64_t page_size = 0;
-	uint64_t num_pages = 0;
-
-	page_size = sysconf (_SC_PAGESIZE);
-	num_pages = sysconf (_SC_PHYS_PAGES);
-
-	memsize = page_size * num_pages;
-#endif
-
-#if defined GF_BSD_HOST_OS || defined GF_DARWIN_HOST_OS
-
-	size_t len = sizeof(memsize);
-	int name [] = { CTL_HW, HW_PHYSMEM };
-
-	sysctl (name, 2, &memsize, &len, NULL, 0);
-#endif
-	return memsize;
-}
-
-/* Strips all whitespace characters in a string and returns length of new string
- * on success
- */
-int
-gf_strip_whitespace (char *str, int len)
-{
-        int     i = 0;
-        int     new_len = 0;
-        char    *new_str = NULL;
-
-        GF_ASSERT (str);
-
-        new_str = GF_CALLOC (1, len + 1, gf_common_mt_char);
-        if (new_str == NULL)
-                return -1;
-
-        for (i = 0; i < len; i++) {
-                if (!isspace (str[i]))
-                        new_str[new_len++] = str[i];
-        }
-        new_str[new_len] = '\0';
-
-        if (new_len != len) {
-                memset (str, 0, len);
-                strncpy (str, new_str, new_len);
-        }
-
-        GF_FREE (new_str);
-        return new_len;
-}
-
-int
-gf_canonicalize_path (char *path)
-{
-        int             ret                  = -1;
-        int             path_len             = 0;
-        int             dir_path_len         = 0;
-        char           *tmppath              = NULL;
-        char           *dir                  = NULL;
-        char           *tmpstr               = NULL;
-
-        if (!path || *path != '/')
-                goto out;
-
-        tmppath = gf_strdup (path);
-        if (!tmppath)
-                goto out;
-
-        /* Strip the extra slashes and return */
-        bzero (path, strlen(path));
-        path[0] = '/';
-        dir = strtok_r(tmppath, "/", &tmpstr);
-
-        while (dir) {
-                dir_path_len = strlen(dir);
-                strncpy ((path + path_len + 1), dir, dir_path_len);
-                path_len += dir_path_len + 1;
-                dir = strtok_r (NULL, "/", &tmpstr);
-                if (dir)
-                        strncpy ((path + path_len), "/", 1);
-        }
-        path[path_len] = '\0';
-        ret = 0;
-
- out:
-        if (ret)
-                gf_log ("common-utils", GF_LOG_ERROR,
-                        "Path manipulation failed");
-
-        GF_FREE(tmppath);
-
-        return ret;
-}
-
-static const char *__gf_timefmts[] = {
-        "%F %T",
-        "%Y/%m/%d-%T",
-        "%b %d %T",
-        "%F %H%M%S"
-};
-
-static const char *__gf_zerotimes[] = {
-        "0000-00-00 00:00:00",
-        "0000/00/00-00:00:00",
-        "xxx 00 00:00:00",
-        "0000-00-00 000000"
-};
-
-void
-_gf_timestuff (gf_timefmts *fmt, const char ***fmts, const char ***zeros)
-{
-        *fmt = gf_timefmt_last;
-        *fmts = __gf_timefmts;
-        *zeros = __gf_zerotimes;
-}
-
-
-char *
-generate_glusterfs_ctx_id (void)
-{
-        char           tmp_str[1024] = {0,};
-        char           hostname[256] = {0,};
-        struct timeval tv = {0,};
-        char           now_str[32];
-
-        if (gettimeofday (&tv, NULL) == -1) {
-                gf_log ("glusterfsd", GF_LOG_ERROR,
-                        "gettimeofday: failed %s",
-                        strerror (errno));
-        }
-
-        if (gethostname (hostname, 256) == -1) {
-                gf_log ("glusterfsd", GF_LOG_ERROR,
-                        "gethostname: failed %s",
-                        strerror (errno));
-        }
-
-        gf_time_fmt (now_str, sizeof now_str, tv.tv_sec, gf_timefmt_Ymd_T);
-        snprintf (tmp_str, sizeof tmp_str, "%s-%d-%s:%"
-#ifdef GF_DARWIN_HOST_OS
-                  PRId32,
-#else
-                  "ld",
-#endif
-                  hostname, getpid(), now_str, tv.tv_usec);
-
-        return gf_strdup (tmp_str);
-}
-
-char *
-gf_get_reserved_ports ()
-{
-        char    *ports_info  = NULL;
-#if defined GF_LINUX_HOST_OS
-        int     proc_fd      = -1;
-        char    *proc_file   = "/proc/sys/net/ipv4/ip_local_reserved_ports";
-        char    buffer[4096] = {0,};
-        int32_t ret          = -1;
-
-        proc_fd = open (proc_file, O_RDONLY);
-        if (proc_fd == -1) {
-                /* What should be done in this case? error out from here
-                 * and thus stop the glusterfs process from starting or
-                 * continue with older method of using any of the available
-                 * port? For now 2nd option is considered.
-                 */
-                gf_log ("glusterfs", GF_LOG_WARNING, "could not open "
-                        "the file /proc/sys/net/ipv4/ip_local_reserved_ports "
-                        "for getting reserved ports info (%s)",
-                        strerror (errno));
-                goto out;
-        }
-
-        ret = read (proc_fd, buffer, sizeof (buffer));
-        if (ret < 0) {
-                gf_log ("glusterfs", GF_LOG_WARNING, "could not "
-                        "read the file %s for getting reserved ports "
-                        "info (%s)", proc_file, strerror (errno));
-                goto out;
-        }
-        ports_info = gf_strdup (buffer);
-
-out:
-        if (proc_fd != -1)
-                close (proc_fd);
-#endif /* GF_LINUX_HOST_OS */
-        return ports_info;
-}
-
-int
-gf_process_reserved_ports (gf_boolean_t *ports)
-{
-        int      ret         = -1;
-#if defined GF_LINUX_HOST_OS
-        char    *ports_info  = NULL;
-        char    *tmp         = NULL;
-        char    *blocked_port = NULL;
-
-        ports_info = gf_get_reserved_ports ();
-        if (!ports_info) {
-                gf_log ("glusterfs", GF_LOG_WARNING, "Not able to get reserved "
-                        "ports, hence there is a possibility that glusterfs "
-                        "may consume reserved port");
-                goto out;
-        }
-
-        blocked_port = strtok_r (ports_info, ",\n",&tmp);
-
-        while (blocked_port) {
-                gf_ports_reserved (blocked_port, ports);
-                blocked_port = strtok_r (NULL, ",\n", &tmp);
-        }
-
-        ret = 0;
-
-out:
-        GF_FREE (ports_info);
-#endif /* GF_LINUX_HOST_OS */
-        return ret;
-}
-
-gf_boolean_t
-gf_ports_reserved (char *blocked_port, gf_boolean_t *ports)
-{
-        gf_boolean_t    result   = _gf_false;
-        char            *range_port = NULL;
-        int16_t         tmp_port1, tmp_port2 = -1;
-
-        if (strstr (blocked_port, "-") == NULL) {
-                /* get rid of the new line character*/
-                if (blocked_port[strlen(blocked_port) -1] == '\n')
-                        blocked_port[strlen(blocked_port) -1] = '\0';
-                if (gf_string2int16 (blocked_port, &tmp_port1) == 0) {
-                        if (tmp_port1 > (GF_CLIENT_PORT_CEILING - 1)
-                            || tmp_port1 < 0) {
-                                gf_log ("glusterfs-socket", GF_LOG_WARNING,
-                                        "invalid port %d", tmp_port1);
-                                result = _gf_true;
-                                goto out;
-                        } else {
-                                gf_log ("glusterfs", GF_LOG_DEBUG,
-                                        "blocking port %d", tmp_port1);
-                                ports[tmp_port1] = _gf_true;
-                        }
-                } else {
-                        gf_log ("glusterfs-socket", GF_LOG_WARNING, "%s is "
-                                "not a valid port identifier", blocked_port);
-                        result = _gf_true;
-                        goto out;
-                }
-        } else {
-                range_port = strtok (blocked_port, "-");
-                if (!range_port){
-                        result = _gf_true;
-                        goto out;
-                }
-                if (gf_string2int16 (range_port, &tmp_port1) == 0) {
-                        if (tmp_port1 > (GF_CLIENT_PORT_CEILING - 1))
-                                tmp_port1 = GF_CLIENT_PORT_CEILING - 1;
-                        if (tmp_port1 < 0)
-                                tmp_port1 = 0;
-                }
-                range_port = strtok (NULL, "-");
-                if (!range_port) {
-                        result = _gf_true;
-                        goto out;
-                }
-                /* get rid of the new line character*/
-                if (range_port[strlen(range_port) -1] == '\n')
-                        range_port[strlen(range_port) - 1] = '\0';
-                if (gf_string2int16 (range_port, &tmp_port2) == 0) {
-                        if (tmp_port2 >
-                            (GF_CLIENT_PORT_CEILING - 1))
-                                tmp_port2 = GF_CLIENT_PORT_CEILING - 1;
-                        if (tmp_port2 < 0)
-                                tmp_port2 = 0;
-                }
-                gf_log ("glusterfs", GF_LOG_DEBUG, "lower: %d, higher: %d",
-                        tmp_port1, tmp_port2);
-                for (; tmp_port1 <= tmp_port2; tmp_port1++)
-                        ports[tmp_port1] = _gf_true;
-        }
-
-out:
-        return result;
-}
-
-/* Takes in client ip{v4,v6} and returns associated hostname, if any
- * Also, allocates memory for the hostname.
- * Returns: 0 for success, -1 for failure
- */
-int
-gf_get_hostname_from_ip (char *client_ip, char **hostname)
-{
-        int                      ret                          = -1;
-        struct sockaddr         *client_sockaddr              = NULL;
-        struct sockaddr_in       client_sock_in               = {0};
-        struct sockaddr_in6      client_sock_in6              = {0};
-        char                     client_hostname[NI_MAXHOST]  = {0};
-        char                    *client_ip_copy               = NULL;
-        char                    *tmp                          = NULL;
-        char                    *ip                           = NULL;
-
-        /* if ipv4, reverse lookup the hostname to
-         * allow FQDN based rpc authentication
-         */
-        if (valid_ipv4_address (client_ip, strlen (client_ip), 0) == _gf_false) {
-                /* most times, we get a.b.c.d:port form, so check that */
-                client_ip_copy = gf_strdup (client_ip);
-                if (!client_ip_copy)
-                        goto out;
-
-                ip = strtok_r (client_ip_copy, ":", &tmp);
-        } else {
-                ip = client_ip;
-        }
-
-        if (valid_ipv4_address (ip, strlen (ip), 0) == _gf_true) {
-                client_sockaddr = (struct sockaddr *)&client_sock_in;
-                client_sock_in.sin_family = AF_INET;
-                ret = inet_pton (AF_INET, ip,
-                                 (void *)&client_sock_in.sin_addr.s_addr);
-
-        } else if (valid_ipv6_address (ip, strlen (ip), 0) == _gf_true) {
-                client_sockaddr = (struct sockaddr *) &client_sock_in6;
-
-                client_sock_in6.sin6_family = AF_INET6;
-                ret = inet_pton (AF_INET6, ip,
-                                 (void *)&client_sock_in6.sin6_addr);
-        } else {
-                goto out;
-        }
-
-        if (ret != 1) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = getnameinfo (client_sockaddr,
-                           sizeof (*client_sockaddr),
-                           client_hostname, sizeof (client_hostname),
-                           NULL, 0, 0);
-        if (ret) {
-                gf_log ("common-utils", GF_LOG_ERROR,
-                        "Could not lookup hostname of %s : %s",
-                        client_ip, gai_strerror (ret));
-                ret = -1;
-                goto out;
-        }
-
-        *hostname = gf_strdup ((char *)client_hostname);
- out:
-        if (client_ip_copy)
-                GF_FREE (client_ip_copy);
-
-        return ret;
-}
-
-gf_boolean_t
-gf_interface_search (char *ip)
-{
-        int32_t         ret = -1;
-        gf_boolean_t    found = _gf_false;
-        struct          ifaddrs *ifaddr, *ifa;
-        int             family;
-        char            host[NI_MAXHOST];
-        xlator_t        *this = NULL;
-        char            *pct = NULL;
-
-        this = THIS;
-
-        ret = getifaddrs (&ifaddr);
-
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_ERROR, "getifaddrs() failed: %s\n",
-                        gai_strerror(ret));
-                goto out;
-        }
-
-        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-                if (!ifa->ifa_addr) {
-                        /*
-                         * This seemingly happens if an interface hasn't
-                         * been bound to a particular protocol (seen with
-                         * TUN devices).
-                         */
-                        continue;
-                }
-                family = ifa->ifa_addr->sa_family;
-
-                if (family != AF_INET && family != AF_INET6)
-                        continue;
-
-                ret = getnameinfo (ifa->ifa_addr,
-                        (family == AF_INET) ? sizeof(struct sockaddr_in) :
-                                              sizeof(struct sockaddr_in6),
-                        host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-
-                if (ret != 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "getnameinfo() failed: %s\n",
-                                gai_strerror(ret));
-                        goto out;
-                }
-
-                /*
-                 * Sometimes the address comes back as addr%eth0 or
-                 * similar.  Since % is an invalid character, we can
-                 * strip it out with confidence that doing so won't
-                 * harm anything.
-                 */
-                pct = index(host,'%');
-                if (pct) {
-                        *pct = '\0';
-                }
-
-                if (strncmp (ip, host, NI_MAXHOST) == 0) {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "%s is local address at interface %s",
-                                ip, ifa->ifa_name);
-                        found = _gf_true;
-                        goto out;
-                }
-        }
-out:
-        if(ifaddr)
-                freeifaddrs (ifaddr);
-        return found;
-}
-
-char *
-get_ip_from_addrinfo (struct addrinfo *addr, char **ip)
-{
-        char buf[64];
-        void *in_addr = NULL;
-        struct sockaddr_in *s4 = NULL;
-        struct sockaddr_in6 *s6 = NULL;
-
-        switch (addr->ai_family)
-        {
-                case AF_INET:
-                        s4 = (struct sockaddr_in *)addr->ai_addr;
-                        in_addr = &s4->sin_addr;
-                        break;
-
-                case AF_INET6:
-                        s6 = (struct sockaddr_in6 *)addr->ai_addr;
-                        in_addr = &s6->sin6_addr;
-                        break;
-
-                default:
-                        gf_log ("glusterd", GF_LOG_ERROR, "Invalid family");
-                        return NULL;
-        }
-
-        if (!inet_ntop(addr->ai_family, in_addr, buf, sizeof(buf))) {
-                gf_log ("glusterd", GF_LOG_ERROR, "String conversion failed");
-                return NULL;
-        }
-
-        *ip = strdup (buf);
-        return *ip;
-}
-
-gf_boolean_t
-gf_is_loopback_localhost (const struct sockaddr *sa, char *hostname)
-{
-        GF_ASSERT (sa);
-
-        gf_boolean_t is_local = _gf_false;
-        const struct in_addr *addr4 = NULL;
-        const struct in6_addr *addr6 = NULL;
-        uint8_t      *ap   = NULL;
-        struct in6_addr loopbackaddr6 = IN6ADDR_LOOPBACK_INIT;
-
-        switch (sa->sa_family) {
-                case AF_INET:
-                        addr4 = &(((struct sockaddr_in *)sa)->sin_addr);
-                        ap = (uint8_t*)&addr4->s_addr;
-                        if (ap[0] == 127)
-                                is_local = _gf_true;
-                        break;
-
-                case AF_INET6:
-                        addr6 = &(((struct sockaddr_in6 *)sa)->sin6_addr);
-                        if (memcmp (addr6, &loopbackaddr6,
-                                    sizeof (loopbackaddr6)) == 0)
-                                is_local = _gf_true;
-                        break;
-
-                default:
-                        if (hostname)
-                                gf_log ("glusterd", GF_LOG_ERROR,
-                                        "unknown address family %d for %s",
-                                        sa->sa_family, hostname);
-                        break;
-        }
-
-        return is_local;
-}
-
-gf_boolean_t
-gf_is_local_addr (char *hostname)
-{
-        int32_t         ret = -1;
-        struct          addrinfo *result = NULL;
-        struct          addrinfo *res = NULL;
-        gf_boolean_t    found = _gf_false;
-        char            *ip = NULL;
-        xlator_t        *this = NULL;
-
-        this = THIS;
-        ret = getaddrinfo (hostname, NULL, NULL, &result);
-
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_ERROR, "error in getaddrinfo: %s\n",
-                        gai_strerror(ret));
-                goto out;
-        }
-
-        for (res = result; res != NULL; res = res->ai_next) {
-                gf_log (this->name, GF_LOG_DEBUG, "%s ",
-                        get_ip_from_addrinfo (res, &ip));
-
-                found = gf_is_loopback_localhost (res->ai_addr, hostname)
-                        || gf_interface_search (ip);
-                if (found)
-                        goto out;
-        }
-
-out:
-        if (result)
-                freeaddrinfo (result);
-
-        if (!found)
-                gf_log (this->name, GF_LOG_DEBUG, "%s is not local", hostname);
-
-        return found;
-}
-
-gf_boolean_t
-gf_is_same_address (char *name1, char *name2)
-{
-        struct addrinfo         *addr1 = NULL;
-        struct addrinfo         *addr2 = NULL;
-        struct addrinfo         *p = NULL;
-        struct addrinfo         *q = NULL;
-        gf_boolean_t            ret = _gf_false;
-        int                     gai_err = 0;
-
-        gai_err = getaddrinfo(name1,NULL,NULL,&addr1);
-        if (gai_err != 0) {
-                gf_log (name1, GF_LOG_WARNING,
-                        "error in getaddrinfo: %s\n", gai_strerror(gai_err));
-                goto out;
-        }
-
-        gai_err = getaddrinfo(name2,NULL,NULL,&addr2);
-        if (gai_err != 0) {
-                gf_log (name2, GF_LOG_WARNING,
-                        "error in getaddrinfo: %s\n", gai_strerror(gai_err));
-                goto out;
-        }
-
-        for (p = addr1; p; p = p->ai_next) {
-                for (q = addr2; q; q = q->ai_next) {
-                        if (p->ai_addrlen != q->ai_addrlen) {
-                                continue;
-                        }
-                        if (memcmp(p->ai_addr,q->ai_addr,p->ai_addrlen)) {
-                                continue;
-                        }
-                        ret = _gf_true;
-                        goto out;
-                }
-        }
-
-out:
-        if (addr1) {
-                freeaddrinfo(addr1);
-        }
-        if (addr2) {
-                freeaddrinfo(addr2);
-        }
-        return ret;
-
-}
-
-
-/* Sets log file path from user provided arguments */
-int
-gf_set_log_file_path (cmd_args_t *cmd_args)
-{
-        int   i = 0;
-        int   j = 0;
-        int   ret = 0;
-        char  tmp_str[1024] = {0,};
-
-        if (!cmd_args)
-                goto done;
-
-        if (cmd_args->mount_point) {
-                j = 0;
-                i = 0;
-                if (cmd_args->mount_point[0] == '/')
-                        i = 1;
-                for (; i < strlen (cmd_args->mount_point); i++,j++) {
-                        tmp_str[j] = cmd_args->mount_point[i];
-                        if (cmd_args->mount_point[i] == '/')
-                                tmp_str[j] = '-';
-                }
-
-                ret = gf_asprintf (&cmd_args->log_file,
-                                   DEFAULT_LOG_FILE_DIRECTORY "/%s.log",
-                                   tmp_str);
-                if (ret > 0)
-                        ret = 0;
-                goto done;
-        }
-
-        if (cmd_args->volfile) {
-                j = 0;
-                i = 0;
-                if (cmd_args->volfile[0] == '/')
-                        i = 1;
-                for (; i < strlen (cmd_args->volfile); i++,j++) {
-                        tmp_str[j] = cmd_args->volfile[i];
-                        if (cmd_args->volfile[i] == '/')
-                                tmp_str[j] = '-';
-                }
-                ret = gf_asprintf (&cmd_args->log_file,
-                                   DEFAULT_LOG_FILE_DIRECTORY "/%s.log",
-                                   tmp_str);
-                if (ret > 0)
-                        ret = 0;
-                goto done;
-        }
-
-        if (cmd_args->volfile_server) {
-
-                ret = gf_asprintf (&cmd_args->log_file,
-                                   DEFAULT_LOG_FILE_DIRECTORY "/%s-%s-%d.log",
-                                   cmd_args->volfile_server,
-                                   cmd_args->volfile_id, getpid());
-                if (ret > 0)
-                        ret = 0;
-        }
-done:
-        return ret;
-}
-
-int
-gf_thread_create (pthread_t *thread, const pthread_attr_t *attr,
-		  void *(*start_routine)(void *), void *arg)
-{
-	sigset_t set, old;
-	int ret;
-
-	sigemptyset (&set);
-
-	sigfillset (&set);
-	sigdelset (&set, SIGSEGV);
-	sigdelset (&set, SIGBUS);
-	sigdelset (&set, SIGILL);
-	sigdelset (&set, SIGSYS);
-	sigdelset (&set, SIGFPE);
-	sigdelset (&set, SIGABRT);
-
-	pthread_sigmask (SIG_BLOCK, &set, &old);
-
-	ret = pthread_create (thread, attr, start_routine, arg);
-
-	pthread_sigmask (SIG_SETMASK, &old, NULL);
-
-	return ret;
-}
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h
index 3c99a4212..272beee2d 100644
--- a/libglusterfs/src/common-utils.h
+++ b/libglusterfs/src/common-utils.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _COMMON_UTILS_H
@@ -23,7 +32,6 @@
 #include <string.h>
 #include <assert.h>
 #include <pthread.h>
-#include <openssl/md5.h>
 #ifndef GF_BSD_HOST_OS
 #include <alloca.h>
 #endif
@@ -42,7 +50,6 @@ void trap (void);
 #include "uuid.h"
 
 
-
 #define min(a,b) ((a)<(b)?(a):(b))
 #define max(a,b) ((a)>(b)?(a):(b))
 #define roof(a,b) ((((a)+(b)-1)/((b)?(b):1))*(b))
@@ -61,63 +68,32 @@ void trap (void);
 #define GF_UNIT_TB_STRING    "TB"
 #define GF_UNIT_PB_STRING    "PB"
 
-#define GF_UNIT_PERCENT_STRING      "%"
-
 #define GEOREP "geo-replication"
-#define GHADOOP "glusterfs-hadoop"
-
-#define GF_SELINUX_XATTR_KEY "security.selinux"
 
 #define WIPE(statp) do { typeof(*statp) z = {0,}; if (statp) *statp = z; } while (0)
 
-#define IS_EXT_FS(fs_name)          \
-        (!strcmp (fs_name, "ext2") || \
-         !strcmp (fs_name, "ext3") || \
-         !strcmp (fs_name, "ext4"))
-
-/* Defining this here as it is needed by glusterd for setting
- * nfs port in volume status.
- */
-#define GF_NFS3_PORT    2049
-#define GF_CLIENT_PORT_CEILING 1024
-
 enum _gf_boolean
 {
 	_gf_false = 0,
 	_gf_true = 1
 };
 
-/*
- * we could have initialized these as +ve values and treated
- * them as negative while comparing etc.. (which would have
- * saved us with the pain of assigning values), but since we
- * only have a couple of clients that use this feature, it's
- * okay.
- */
-enum _gf_client_pid
-{
-        GF_CLIENT_PID_MAX    =  0,
-        GF_CLIENT_PID_GSYNCD = -1,
-        GF_CLIENT_PID_HADOOP = -2,
-        GF_CLIENT_PID_DEFRAG = -3,
-};
-
 typedef enum _gf_boolean gf_boolean_t;
-typedef enum _gf_client_pid gf_client_pid_t;
 typedef int (*gf_cmp) (void *, void *);
 
 void gf_global_variable_init(void);
 
 in_addr_t gf_resolve_ip (const char *hostname, void **dnscache);
 
-void gf_log_dump_graph (FILE *specfp, glusterfs_graph_t *graph);
-void gf_print_trace (int32_t signal, glusterfs_ctx_t *ctx);
-int  gf_set_log_file_path (cmd_args_t *cmd_args);
+void gf_log_volume_file (FILE *specfp);
+void gf_print_trace (int32_t signal);
+
+extern char *gf_fop_list[GF_FOP_MAXVALUE];
+extern char *gf_mgmt_list[GF_MGMT_MAXVALUE];
 
 #define VECTORSIZE(count) (count * (sizeof (struct iovec)))
 
 #define STRLEN_0(str) (strlen(str) + 1)
-
 #define VALIDATE_OR_GOTO(arg,label)   do {				\
 		if (!arg) {						\
 			errno = EINVAL;					\
@@ -127,7 +103,7 @@ int  gf_set_log_file_path (cmd_args_t *cmd_args);
                                           "invalid argument: " #arg);   \
 			goto label;					\
 		}							\
-	} while (0)
+	} while (0);
 
 #define GF_VALIDATE_OR_GOTO(name,arg,label)   do {                      \
 		if (!arg) {                                             \
@@ -136,7 +112,7 @@ int  gf_set_log_file_path (cmd_args_t *cmd_args);
                                           "invalid argument: " #arg);	\
 			goto label;                                     \
 		}                                                       \
-	} while (0)
+	} while (0);
 
 #define GF_VALIDATE_OR_GOTO_WITH_ERROR(name, arg, label, errno, error) do { \
                 if (!arg) {                                                 \
@@ -145,15 +121,7 @@ int  gf_set_log_file_path (cmd_args_t *cmd_args);
                                           "invalid argument: " #arg);   \
                         goto label;                                     \
                 }                                                       \
-        }while (0)
-
-#define GF_ASSERT_AND_GOTO_WITH_ERROR(name, arg, label, errno, error) do { \
-                if (!arg) {                                             \
-                        GF_ASSERT (0);                                  \
-                        errno = error;                                  \
-                        goto label;                                     \
-                }                                                       \
-        }while (0)
+        }while (0);
 
 #define GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO(name,arg,label)               \
         do {                                                            \
@@ -164,54 +132,7 @@ int  gf_set_log_file_path (cmd_args_t *cmd_args);
                                           "invalid argument: " #arg);	\
                         goto label;                                     \
                 }                                                       \
-	} while (0)
-
-#define GF_REMOVE_SLASH_FROM_PATH(path, string)                         \
-        do {                                                            \
-                int i = 0;                                              \
-                for (i = 1; i < strlen (path); i++) {                   \
-                        string[i-1] = path[i];                          \
-                        if (string[i-1] == '/')                         \
-                                string[i-1] = '-';                      \
-                }                                                       \
-        } while (0)
-
-#define GF_IF_INTERNAL_XATTR_GOTO(pattern, dict, op_errno, label)       \
-        do {                                                            \
-                if (!dict) {                                            \
-                        gf_log (this->name, GF_LOG_ERROR,               \
-                                "setxattr dict is null");               \
-                        goto label;                                     \
-                }                                                       \
-                if (dict_foreach_fnmatch (dict, pattern,                \
-                                          dict_null_foreach_fn,         \
-                                          NULL) > 0) {                  \
-                        op_errno = EPERM;                               \
-                        gf_log (this->name, GF_LOG_ERROR,               \
-                                "attempt to set internal"               \
-                                " xattr: %s: %s", pattern,              \
-                                strerror (op_errno));                   \
-                        goto label;                                     \
-                }                                                       \
-        } while (0)
-
-#define GF_IF_NATIVE_XATTR_GOTO(pattern, key, op_errno, label)          \
-        do {                                                            \
-                if (!key) {                                             \
-                        gf_log (this->name, GF_LOG_ERROR,               \
-                                "no key for removexattr");              \
-                        goto label;                                     \
-                }                                                       \
-                if (!fnmatch (pattern, key, 0)) {                       \
-                        op_errno = EPERM;                               \
-                        gf_log (this->name, GF_LOG_ERROR,               \
-                                "attempt to remove internal "           \
-                                "xattr: %s: %s", key,                   \
-                                strerror (op_errno));                   \
-                        goto label;                                     \
-                }                                                       \
-        } while (0)
-
+	} while (0);
 
 #define GF_FILE_CONTENT_REQUESTED(_xattr_req,_content_limit) \
 	(dict_get_uint64 (_xattr_req, "glusterfs.content", _content_limit) == 0)
@@ -225,20 +146,9 @@ int  gf_set_log_file_path (cmd_args_t *cmd_args);
                         gf_log_callingfn ("", GF_LOG_ERROR,             \
                                           "Assertion failed: " #x);     \
                 }                                                       \
-        } while (0)
+        } while (0);
 #endif
 
-#define GF_UUID_ASSERT(u) \
-        if (uuid_is_null (u))\
-                GF_ASSERT (!"uuid null");
-
-union gf_sock_union {
-        struct sockaddr_storage storage;
-        struct sockaddr_in6 sin6;
-        struct sockaddr_in sin;
-        struct sockaddr sa;
-};
-
 #define GF_HIDDEN_PATH ".glusterfs"
 
 static inline void
@@ -267,7 +177,7 @@ iov_length (const struct iovec *vector, int count)
 
 
 static inline struct iovec *
-iov_dup (const struct iovec *vector, int count)
+iov_dup (struct iovec *vector, int count)
 {
 	int           bytecount = 0;
 	int           i;
@@ -347,65 +257,6 @@ iov_unload (char *buf, const struct iovec *vector, int count)
 }
 
 
-static inline size_t
-iov_load (const struct iovec *vector, int count, char *buf, int size)
-{
-	size_t left = size;
-	size_t cp = 0;
-	int    ret = 0;
-	int    i = 0;
-
-	while (left && i < count) {
-		cp = min (vector[i].iov_len, left);
-		if (vector[i].iov_base != buf + (size - left))
-			memcpy (vector[i].iov_base, buf + (size - left), cp);
-		ret += cp;
-		left -= cp;
-		if (left)
-			i++;
-	}
-
-	return ret;
-}
-
-
-static inline size_t
-iov_copy (const struct iovec *dst, int dcnt,
-	  const struct iovec *src, int scnt)
-{
-	size_t  ret = 0;
-	size_t  left = 0;
-	size_t  min_i = 0;
-	int     s_i = 0, s_ii = 0;
-	int     d_i = 0, d_ii = 0;
-
-	ret = min (iov_length (dst, dcnt), iov_length (src, scnt));
-	left = ret;
-
-	while (left) {
-		min_i = min (dst[d_i].iov_len - d_ii, src[s_i].iov_len - s_ii);
-		memcpy (dst[d_i].iov_base + d_ii, src[s_i].iov_base + s_ii,
-			min_i);
-
-		d_ii += min_i;
-		if (d_ii == dst[d_i].iov_len) {
-			d_ii = 0;
-			d_i++;
-		}
-
-		s_ii += min_i;
-		if (s_ii == src[s_i].iov_len) {
-			s_ii = 0;
-			s_i++;
-		}
-
-		left -= min_i;
-	}
-
-	return ret;
-}
-
-
 static inline int
 mem_0filled (const char *buf, size_t size)
 {
@@ -451,52 +302,6 @@ memdup (const void *ptr, size_t size)
 	return newptr;
 }
 
-typedef enum {
-        gf_timefmt_default = 0,
-        gf_timefmt_FT = 0,  /* YYYY-MM-DD hh:mm:ss */
-        gf_timefmt_Ymd_T,   /* YYYY/MM-DD-hh:mm:ss */
-        gf_timefmt_bdT,     /* ddd DD hh:mm:ss */
-        gf_timefmt_F_HMS,   /* YYYY-MM-DD hhmmss */
-        gf_timefmt_last
-} gf_timefmts;
-
-static inline void
-gf_time_fmt (char *dst, size_t sz_dst, time_t utime, unsigned int fmt)
-{
-        extern void _gf_timestuff (gf_timefmts *, const char ***, const char ***);
-        static gf_timefmts timefmt_last = (gf_timefmts) -1;
-        static const char **fmts;
-        static const char **zeros;
-        struct tm tm;
-
-        if (timefmt_last == -1)
-                _gf_timestuff (&timefmt_last, &fmts, &zeros);
-        if (timefmt_last < fmt) fmt = gf_timefmt_default;
-        if (utime && gmtime_r (&utime, &tm) != NULL) {
-                strftime (dst, sz_dst, fmts[fmt], &tm);
-        } else {
-                strncpy (dst, "N/A", sz_dst);
-        }
-}
-
-int
-mkdir_p (char *path, mode_t mode, gf_boolean_t allow_symlinks);
-/*
- * rounds up nr to power of two. If nr is already a power of two, just returns
- * nr
- */
-
-int
-gf_lstat_dir (const char *path, struct stat *stbuf_in);
-
-int32_t gf_roundup_power_of_two (int32_t nr);
-
-/*
- * rounds up nr to next power of two. If nr is already a power of two, next
- * power of two is returned.
- */
-
-int32_t gf_roundup_next_power_of_two (int32_t nr);
 
 char *gf_trim (char *string);
 int gf_strsplit (const char *str, const char *delim,
@@ -530,11 +335,9 @@ int gf_string2uint32_base10 (const char *str, uint32_t *n);
 int gf_string2uint64_base10 (const char *str, uint64_t *n);
 
 int gf_string2bytesize (const char *str, uint64_t *n);
-int gf_string2percent_or_bytesize (const char *str, uint64_t *n,
-				   gf_boolean_t *is_percent);
 
 int gf_string2boolean (const char *str, gf_boolean_t *b);
-int gf_string2percent (const char *str, double *n);
+int gf_string2percent (const char *str, uint32_t *n);
 int gf_string2time (const char *str, uint32_t *n);
 
 int gf_lockfd (int fd);
@@ -543,52 +346,23 @@ int gf_unlockfd (int fd);
 int get_checksum_for_file (int fd, uint32_t *checksum);
 int log_base2 (unsigned long x);
 
+int gf_system (const char *command);
 int get_checksum_for_path (char *path, uint32_t *checksum);
 
 char *strtail (char *str, const char *pattern);
-void skipwhite (char **s);
-char *nwstrtail (char *str, char *pattern);
-void skip_word (char **str);
-/* returns a new string with nth word of given string. n>=1 */
-char *get_nth_word (const char *str, int n);
 
 char valid_host_name (char *address, int length);
-char valid_ipv4_address (char *address, int length, gf_boolean_t wildcard_acc);
-char valid_ipv6_address (char *address, int length, gf_boolean_t wildcard_acc);
-char valid_internet_address (char *address, gf_boolean_t wildcard_acc);
-char valid_ipv4_wildcard_check (char *address);
-char valid_ipv6_wildcard_check (char *address);
-char valid_wildcard_internet_address (char *address);
-gf_boolean_t gf_sock_union_equal_addr (union gf_sock_union *a,
-                                       union gf_sock_union *b);
+char valid_ipv4_address (char *address, int length);
+char valid_ipv6_address (char *address, int length);
+char valid_internet_address (char *address);
 
 char *uuid_utoa (uuid_t uuid);
 char *uuid_utoa_r (uuid_t uuid, char *dst);
-char *lkowner_utoa (gf_lkowner_t *lkowner);
-char *lkowner_utoa_r (gf_lkowner_t *lkowner, char *dst, int len);
-
+void _get_md5_str (char *out_str, size_t outlen,
+                   const uint8_t *input, int n);
 void gf_array_insertionsort (void *a, int l, int r, size_t elem_size,
                              gf_cmp cmp);
 int gf_is_str_int (const char *value);
 
 char *gf_uint64_2human_readable (uint64_t);
-int validate_brick_name (char *brick);
-char *get_host_name (char *word, char **host);
-char *get_path_name (char *word, char **path);
-void gf_path_strip_trailing_slashes (char *path);
-uint64_t get_mem_size ();
-int gf_strip_whitespace (char *str, int len);
-int gf_canonicalize_path (char *path);
-char *generate_glusterfs_ctx_id (void);
-char *gf_get_reserved_ports();
-int gf_process_reserved_ports (gf_boolean_t ports[]);
-gf_boolean_t gf_ports_reserved (char *blocked_port, gf_boolean_t *ports);
-int gf_get_hostname_from_ip (char *client_ip, char **hostname);
-gf_boolean_t gf_is_local_addr (char *hostname);
-gf_boolean_t gf_is_same_address (char *host1, char *host2);
-void md5_wrapper(const unsigned char *data, size_t len, char *md5);
-
-int gf_thread_create (pthread_t *thread, const pthread_attr_t *attr,
-		      void *(*start_routine)(void *), void *arg);
-
 #endif /* _COMMON_UTILS_H */
diff --git a/libglusterfs/src/compat-errno.c b/libglusterfs/src/compat-errno.c
index fd5cc49ce..f0362fc00 100644
--- a/libglusterfs/src/compat-errno.c
+++ b/libglusterfs/src/compat-errno.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -558,7 +567,7 @@ init_compat_errno_arrays ()
         gf_error_to_errno_array[GF_ERROR_CODE_BADMACHO] = EBADMACHO;
         gf_errno_to_error_array[EBADMACHO] = GF_ERROR_CODE_BADMACHO;
 
-#ifdef EDOOFUS
+#if 0
         /*    EDOOFUS           88              / * Programming error */
         gf_error_to_errno_array[GF_ERROR_CODE_DOOFUS] = EDOOFUS;
         gf_errno_to_error_array[EDOOFUS] = GF_ERROR_CODE_DOOFUS;
@@ -849,11 +858,9 @@ init_compat_errno_arrays ()
         gf_error_to_errno_array[GF_ERROR_CODE_NOATTR] = ENOATTR;
         gf_errno_to_error_array[ENOATTR] = GF_ERROR_CODE_NOATTR;
 
-#ifdef EDOOFUS
         /*    EDOOFUS           88              / * Programming error */
         gf_error_to_errno_array[GF_ERROR_CODE_DOOFUS] = EDOOFUS;
         gf_errno_to_error_array[EDOOFUS] = GF_ERROR_CODE_DOOFUS;
-#endif
 
         /*      EBADMSG         89              / * Bad message */
         gf_error_to_errno_array[GF_ERROR_CODE_BADMSG] = EBADMSG;
diff --git a/libglusterfs/src/compat-errno.h b/libglusterfs/src/compat-errno.h
index 65e52081d..a61457960 100644
--- a/libglusterfs/src/compat-errno.h
+++ b/libglusterfs/src/compat-errno.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __COMPAT_ERRNO_H__
diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c
index eb6d8d4b7..a5a49d4e6 100644
--- a/libglusterfs/src/compat.c
+++ b/libglusterfs/src/compat.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -112,7 +121,7 @@ make_export_path (const char *real_path, char **path)
         ret = solaris_getxattr ("/", GFID_XATTR_KEY, gfid, 16);
         /* Return value of getxattr */
         if (ret == 16) {
-                if (__is_root_gfid (gfid)){
+                if (!__is_root_gfid (gfid)){
                         strcat (export_path, "/");
                         ret = 0;
                         goto done;
@@ -126,7 +135,7 @@ make_export_path (const char *real_path, char **path)
                 strcat (export_path, dup);
                 ret = solaris_getxattr (export_path, GFID_XATTR_KEY, gfid, 16);
                 if (ret == 16) {
-                        if (__is_root_gfid (gfid)) {
+                        if (!__is_root_gfid (gfid)) {
                                 ret = 0;
                                 goto done;
                         }
@@ -142,7 +151,8 @@ done:
                 *path = export_path;
         }
 out:
-        GF_FREE (freeptr);
+        if (freeptr)
+                GF_FREE (freeptr);
         if (ret && export_path)
                 GF_FREE (export_path);
 
@@ -171,7 +181,7 @@ solaris_xattr_resolve_path (const char *real_path, char **path)
                 if (lstat (export_path, &statbuf)) {
                         ret = mkdir (export_path, 0777);
                         if (ret && (errno != EEXIST)) {
-                                gf_log (THIS->name, GF_LOG_DEBUG, "mkdir failed,"
+                                gf_log ("", GF_LOG_DEBUG, "mkdir failed,"
                                         " errno: %d", errno);
                                 goto out;
                         }
@@ -185,7 +195,7 @@ solaris_xattr_resolve_path (const char *real_path, char **path)
                 if (ret) {
                         ret = mknod (xattr_path, S_IFREG|O_WRONLY, 0);
                         if (ret && (errno != EEXIST)) {
-                                gf_log (THIS->name, GF_LOG_WARNING,"Failed to create "
+                                gf_log ("", GF_LOG_WARNING,"Failed to create "
                                         "mapped file %s, error %d", xattr_path,
                                         errno);
                                 goto out;
@@ -194,7 +204,8 @@ solaris_xattr_resolve_path (const char *real_path, char **path)
                 *path = gf_strdup (xattr_path);
         }
 out:
-        GF_FREE (export_path);
+        if (export_path)
+                GF_FREE (export_path);
         if (*path)
                 return 0;
         else
@@ -228,7 +239,8 @@ solaris_setxattr(const char *path, const char* key, const char *value,
                                 path, errno);
                 ret = -1;
         }
-        GF_FREE (mapped_path);
+        if (mapped_path)
+                GF_FREE (mapped_path);
         return ret;
 }
 
@@ -294,7 +306,8 @@ solaris_listxattr(const char *path, char *list, size_t size)
                 close (attrdirfd);
         }
 out:
-        GF_FREE (mapped_path);
+        if (mapped_path)
+                GF_FREE (mapped_path);
         return len;
 }
 
@@ -376,7 +389,8 @@ solaris_removexattr(const char *path, const char* key)
                 ret = -1;
         }
 
-        GF_FREE (mapped_path);
+        if (mapped_path)
+                GF_FREE (mapped_path);
 
         return ret;
 }
@@ -416,7 +430,8 @@ solaris_getxattr(const char *path,
                         errno = ENODATA;
                 ret = -1;
         }
-        GF_FREE (mapped_path);
+        if (mapped_path)
+                GF_FREE (mapped_path);
         return ret;
 }
 
@@ -475,20 +490,21 @@ int solaris_unlink (const char *path)
 
         if (!ret && mapped_path) {
                 if (lstat(path, &stbuf)) {
-                        gf_log (THIS->name, GF_LOG_WARNING, "Stat failed on mapped"
+                        gf_log ("",GF_LOG_WARNING, "Stat failed on mapped"
                                 " file %s with error %d", mapped_path, errno);
                         goto out;
                 }
                 if (stbuf.st_nlink == 1) {
                         if(remove (mapped_path))
-                                gf_log (THIS->name, GF_LOG_WARNING, "Failed to remove mapped "
+                                gf_log ("", GF_LOG_WARNING, "Failed to remove mapped "
                                         "file %s. Errno %d", mapped_path, errno);
                 }
 
         }
 
 out:
-        GF_FREE (mapped_path);
+        if (mapped_path)
+                GF_FREE (mapped_path);
 
         return  unlink (path);
 }
@@ -504,7 +520,7 @@ solaris_rename (const char *old_path, const char *new_path)
 
         if (!ret && mapped_path) {
                 if (!remove (mapped_path))
-                        gf_log (THIS->name, GF_LOG_WARNING, "Failed to remove mapped "
+                        gf_log ("", GF_LOG_WARNING, "Failed to remove mapped "
                                 "file %s. Errno %d", mapped_path, errno);
                 GF_FREE (mapped_path);
         }
@@ -513,13 +529,14 @@ solaris_rename (const char *old_path, const char *new_path)
 
 }
 
+
 char *
 mkdtemp (char *tempstring)
 {
         char *new_string = NULL;
         int   ret        = 0;
 
-        new_string = mkstemp (tempstring);
+        new_string = mktemp (tempstring);
         if (!new_string)
                 goto out;
 
@@ -531,6 +548,7 @@ out:
         return new_string;
 }
 
+
 #endif /* GF_SOLARIS_HOST_OS */
 
 #ifndef HAVE_STRNLEN
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
index 2bd982541..b04a71df4 100644
--- a/libglusterfs/src/compat.h
+++ b/libglusterfs/src/compat.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __COMPAT_H__
@@ -32,12 +41,6 @@
 #include <linux/limits.h>
 #include <sys/xattr.h>
 #include <endian.h>
-#ifdef HAVE_FALLOC_H
-#include <linux/falloc.h>
-#else
-#define FALLOC_FL_KEEP_SIZE     0x01 /* default is extend size */
-#define FALLOC_FL_PUNCH_HOLE    0x02 /* de-allocates range */
-#endif
 
 
 #ifndef HAVE_LLISTXATTR
@@ -55,7 +58,7 @@
 #endif /* GF_LINUX_HOST_OS */
 
 #ifdef GF_BSD_HOST_OS
-/* In case of FreeBSD and NetBSD */
+/* In case of FreeBSD */
 
 #define UNIX_PATH_MAX 104
 #include <sys/types.h>
@@ -63,21 +66,16 @@
 #include <sys/un.h>
 #include <sys/endian.h>
 #include <sys/extattr.h>
-#ifdef HAVE_SYS_XATTR_H
-#include <sys/xattr.h>
-#endif /* HAVE_SYS_XATTR_H */
 #include <limits.h>
 
 #include <libgen.h>
 
-#ifndef XATTR_CREATE
 enum {
         ATTR_CREATE = 1,
 #define XATTR_CREATE ATTR_CREATE
         ATTR_REPLACE = 2
 #define XATTR_REPLACE ATTR_REPLACE
 };
-#endif /* XATTR_CREATE */
 
 
 #ifndef sighandler_t
@@ -286,12 +284,10 @@ int solaris_rename (const char *oldpath, const char *newpath);
 
 int solaris_unlink (const char *pathname);
 
-char *mkdtemp (char *temp);
-
 #define GF_SOLARIS_XATTR_DIR ".glusterfs_xattr_inode"
 
 int solaris_xattr_resolve_path (const char *real_path, char **path);
-
+char *mkdtemp (char *__template);
 #endif /* GF_SOLARIS_HOST_OS */
 
 #ifndef HAVE_ARGP
@@ -340,18 +336,6 @@ dirent_size (struct dirent *entry)
         return size;
 }
 
-#ifdef THREAD_UNSAFE_BASENAME
-char *basename_r(const char *);
-#define basename(path) basename_r(path)
-#endif /* THREAD_UNSAFE_BASENAME */
-
-#ifdef THREAD_UNSAFE_DIRNAME
-char *dirname_r(char *path);
-#define dirname(path) dirname_r(path)
-#endif /* THREAD_UNSAFE_DIRNAME */
-
-int gf_mkostemp (char *tmpl, int suffixlen, int flags);
-#define mkostemp(tmpl, flags) gf_mkostemp(tmpl, 0, flags);
 
 #ifdef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 /* Linux, Solaris, Cygwin */
@@ -394,9 +378,4 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
 #define IXDR_PUT_U_LONG(buf, v)       IXDR_PUT_LONG(buf, (long)(v))
 #endif
 
-#if defined(__GNUC__) && !defined(RELAX_POISONING)
-/* Use run API, see run.h */
-#pragma GCC poison system popen
-#endif
-
 #endif /* __COMPAT_H__ */
diff --git a/libglusterfs/src/ctx.c b/libglusterfs/src/ctx.c
deleted file mode 100644
index 0082601d4..000000000
--- a/libglusterfs/src/ctx.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif /* !_CONFIG_H */
-
-#include <pthread.h>
-
-#include "glusterfs.h"
-
-glusterfs_ctx_t *
-glusterfs_ctx_new ()
-{
-        int               ret = 0;
-	glusterfs_ctx_t  *ctx = NULL;
-
-	/* no GF_CALLOC here, gf_acct_mem_set_enable is not
-	   yet decided at this point */
-        ctx = calloc (1, sizeof (*ctx));
-        if (!ctx) {
-                ret = -1;
-                goto out;
-        }
-
-        INIT_LIST_HEAD (&ctx->graphs);
-	INIT_LIST_HEAD (&ctx->mempool_list);
-
-	ctx->daemon_pipe[0] = -1;
-	ctx->daemon_pipe[1] = -1;
-
-	ret = pthread_mutex_init (&ctx->lock, NULL);
-	if (ret) {
-		free (ctx);
-		ctx = NULL;
-	}
-out:
-	return ctx;
-}
-
diff --git a/libglusterfs/src/daemon.c b/libglusterfs/src/daemon.c
index 348e3ad40..3d4383f8c 100644
--- a/libglusterfs/src/daemon.c
+++ b/libglusterfs/src/daemon.c
@@ -1,28 +1,43 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
-#include "daemon.h"
 
 int
-os_daemon_return (int nochdir, int noclose)
+os_daemon (int nochdir, int noclose)
 {
-	pid_t   pid  = -1;
-	int     ret  = -1;
+	pid_t   pid = -1;
+	int     ret = -1;
         FILE    *ptr = NULL;
 
 	ret = fork();
-	if (ret)
-		return ret;
+
+        switch (ret) {
+        case -1:
+                return (-1);
+        case 0:
+                break;
+        default:
+                _exit(0);
+        }
 
 	pid = setsid();
 
@@ -34,16 +49,17 @@ os_daemon_return (int nochdir, int noclose)
 	if (!nochdir)
 		ret = chdir("/");
 
+        ret = -1;
         if (!noclose) {
-                ptr = freopen (DEVNULLPATH, "r", stdin);
+                ptr = freopen ("/dev/null", "r", stdin);
                 if (!ptr)
                         goto out;
 
-                ptr = freopen (DEVNULLPATH, "w", stdout);
+                ptr = freopen ("/dev/null", "w", stdout);
                 if (!ptr)
                         goto out;
 
-                ptr = freopen (DEVNULLPATH, "w", stderr);
+                ptr = freopen ("/dev/null", "w", stderr);
                 if (!ptr)
                         goto out;
 	}
@@ -52,15 +68,3 @@ os_daemon_return (int nochdir, int noclose)
 out:
 	return ret;
 }
-
-int
-os_daemon (int nochdir, int noclose)
-{
-	int ret = -1;
-
-	ret = os_daemon_return (nochdir, noclose);
-	if (ret <= 0)
-		return ret;
-
-	_exit (0);
-}
diff --git a/libglusterfs/src/daemon.h b/libglusterfs/src/daemon.h
index 80836a326..6edc4566b 100644
--- a/libglusterfs/src/daemon.h
+++ b/libglusterfs/src/daemon.h
@@ -1,23 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
+   Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _DAEMON_H
-#define _DAEMON_H
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
+   GlusterFS 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.
 
-#define DEVNULLPATH "/dev/null"
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see
+   <http://www.gnu.org/licenses/>.
+*/
 
-int os_daemon_return(int nochdir, int noclose);
 int os_daemon(int nochdir, int noclose);
-#endif /*_DAEMON_H */
diff --git a/libglusterfs/src/defaults.c b/libglusterfs/src/defaults.c
index 2ebb25150..392819ca9 100644
--- a/libglusterfs/src/defaults.c
+++ b/libglusterfs/src/defaults.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 /* libglusterfs/src/defaults.c:
@@ -32,19 +41,18 @@
 int32_t
 default_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, inode_t *inode,
-                    struct iatt *buf, dict_t *xdata, struct iatt *postparent)
+                    struct iatt *buf, dict_t *dict, struct iatt *postparent)
 {
         STACK_UNWIND_STRICT (lookup, frame, op_ret, op_errno, inode, buf,
-                             xdata, postparent);
+                             dict, postparent);
         return 0;
 }
 
 int32_t
 default_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, struct iatt *buf,
-                  dict_t *xdata)
+                  int32_t op_ret, int32_t op_errno, struct iatt *buf)
 {
-        STACK_UNWIND_STRICT (stat, frame, op_ret, op_errno, buf, xdata);
+        STACK_UNWIND_STRICT (stat, frame, op_ret, op_errno, buf);
         return 0;
 }
 
@@ -52,41 +60,37 @@ default_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int32_t
 default_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                      struct iatt *postbuf,
-                      dict_t *xdata)
+                      struct iatt *postbuf)
 {
         STACK_UNWIND_STRICT (truncate, frame, op_ret, op_errno, prebuf,
-                             postbuf, xdata);
+                             postbuf);
         return 0;
 }
 
 int32_t
 default_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                       struct iatt *postbuf,
-                       dict_t *xdata)
+                       struct iatt *postbuf)
 {
         STACK_UNWIND_STRICT (ftruncate, frame, op_ret, op_errno, prebuf,
-                             postbuf, xdata);
+                             postbuf);
         return 0;
 }
 
 int32_t
 default_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno,
-                    dict_t *xdata)
+                    int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (access, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (access, frame, op_ret, op_errno);
         return 0;
 }
 
 int32_t
 default_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno, const char *path,
-                      struct iatt *buf, dict_t *xdata)
+                      struct iatt *buf)
 {
-        STACK_UNWIND_STRICT (readlink, frame, op_ret, op_errno, path, buf,
-                             xdata);
+        STACK_UNWIND_STRICT (readlink, frame, op_ret, op_errno, path, buf);
         return 0;
 }
 
@@ -95,10 +99,10 @@ int32_t
 default_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, inode_t *inode,
                    struct iatt *buf, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata)
+                   struct iatt *postparent)
 {
         STACK_UNWIND_STRICT (mknod, frame, op_ret, op_errno, inode,
-                             buf, preparent, postparent, xdata);
+                             buf, preparent, postparent);
         return 0;
 }
 
@@ -106,31 +110,30 @@ int32_t
 default_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, inode_t *inode,
                    struct iatt *buf, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata)
+                   struct iatt *postparent)
 {
         STACK_UNWIND_STRICT (mkdir, frame, op_ret, op_errno, inode,
-                             buf, preparent, postparent, xdata);
+                             buf, preparent, postparent);
         return 0;
 }
 
 int32_t
 default_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata)
+                    struct iatt *postparent)
 {
         STACK_UNWIND_STRICT (unlink, frame, op_ret, op_errno, preparent,
-                             postparent, xdata);
+                             postparent);
         return 0;
 }
 
 int32_t
 default_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, struct iatt *preparent,
-                   struct iatt *postparent,
-                   dict_t *xdata)
+                   struct iatt *postparent)
 {
         STACK_UNWIND_STRICT (rmdir, frame, op_ret, op_errno, preparent,
-                             postparent, xdata);
+                             postparent);
         return 0;
 }
 
@@ -139,10 +142,10 @@ int32_t
 default_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, inode_t *inode,
                      struct iatt *buf, struct iatt *preparent,
-                     struct iatt *postparent, dict_t *xdata)
+                     struct iatt *postparent)
 {
         STACK_UNWIND_STRICT (symlink, frame, op_ret, op_errno, inode, buf,
-                             preparent, postparent, xdata);
+                             preparent, postparent);
         return 0;
 }
 
@@ -151,11 +154,10 @@ int32_t
 default_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, struct iatt *buf,
                     struct iatt *preoldparent, struct iatt *postoldparent,
-                    struct iatt *prenewparent, struct iatt *postnewparent,
-                    dict_t *xdata)
+                    struct iatt *prenewparent, struct iatt *postnewparent)
 {
         STACK_UNWIND_STRICT (rename, frame, op_ret, op_errno, buf, preoldparent,
-                             postoldparent, prenewparent, postnewparent, xdata);
+                             postoldparent, prenewparent, postnewparent);
         return 0;
 }
 
@@ -164,11 +166,10 @@ int32_t
 default_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                   int32_t op_ret, int32_t op_errno, inode_t *inode,
                   struct iatt *buf, struct iatt *preparent,
-                  struct iatt *postparent,
-                  dict_t *xdata)
+                  struct iatt *postparent)
 {
         STACK_UNWIND_STRICT (link, frame, op_ret, op_errno, inode, buf,
-                             preparent, postparent, xdata);
+                             preparent, postparent);
         return 0;
 }
 
@@ -177,31 +178,28 @@ int32_t
 default_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, fd_t *fd, inode_t *inode,
                     struct iatt *buf, struct iatt *preparent,
-                    struct iatt *postparent,
-                    dict_t *xdata)
+                    struct iatt *postparent)
 {
         STACK_UNWIND_STRICT (create, frame, op_ret, op_errno, fd, inode, buf,
-                             preparent, postparent, xdata);
+                             preparent, postparent);
         return 0;
 }
 
 int32_t
 default_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, fd_t *fd,
-                  dict_t *xdata)
+                  int32_t op_ret, int32_t op_errno, fd_t *fd)
 {
-        STACK_UNWIND_STRICT (open, frame, op_ret, op_errno, fd, xdata);
+        STACK_UNWIND_STRICT (open, frame, op_ret, op_errno, fd);
         return 0;
 }
 
 int32_t
 default_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, struct iovec *vector,
-                   int32_t count, struct iatt *stbuf, struct iobref *iobref,
-                   dict_t *xdata)
+                   int32_t count, struct iatt *stbuf, struct iobref *iobref)
 {
         STACK_UNWIND_STRICT (readv, frame, op_ret, op_errno, vector, count,
-                             stbuf, iobref, xdata);
+                             stbuf, iobref);
         return 0;
 }
 
@@ -209,20 +207,18 @@ default_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int32_t
 default_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                    struct iatt *postbuf,
-                    dict_t *xdata)
+                    struct iatt *postbuf)
 {
-        STACK_UNWIND_STRICT (writev, frame, op_ret, op_errno, prebuf, postbuf, xdata);
+        STACK_UNWIND_STRICT (writev, frame, op_ret, op_errno, prebuf, postbuf);
         return 0;
 }
 
 
 int32_t
 default_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno,
-                   dict_t *xdata)
+                   int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (flush, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (flush, frame, op_ret, op_errno);
         return 0;
 }
 
@@ -231,67 +227,59 @@ default_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int32_t
 default_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                   struct iatt *postbuf,
-                   dict_t *xdata)
+                   struct iatt *postbuf)
 {
-        STACK_UNWIND_STRICT (fsync, frame, op_ret, op_errno, prebuf, postbuf,
-                             xdata);
+        STACK_UNWIND_STRICT (fsync, frame, op_ret, op_errno, prebuf, postbuf);
         return 0;
 }
 
 int32_t
 default_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, struct iatt *buf,
-                   dict_t *xdata)
+                   int32_t op_ret, int32_t op_errno, struct iatt *buf)
 {
-        STACK_UNWIND_STRICT (fstat, frame, op_ret, op_errno, buf, xdata);
+        STACK_UNWIND_STRICT (fstat, frame, op_ret, op_errno, buf);
         return 0;
 }
 
 int32_t
 default_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, fd_t *fd,
-                     dict_t *xdata)
+                     int32_t op_ret, int32_t op_errno, fd_t *fd)
 {
-        STACK_UNWIND_STRICT (opendir, frame, op_ret, op_errno, fd, xdata);
+        STACK_UNWIND_STRICT (opendir, frame, op_ret, op_errno, fd);
         return 0;
 }
 
 int32_t
 default_fsyncdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (fsyncdir, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (fsyncdir, frame, op_ret, op_errno);
         return 0;
 }
 
 int32_t
 default_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno, struct statvfs *buf,
-                    dict_t *xdata)
+                    int32_t op_ret, int32_t op_errno, struct statvfs *buf)
 {
-        STACK_UNWIND_STRICT (statfs, frame, op_ret, op_errno, buf, xdata);
+        STACK_UNWIND_STRICT (statfs, frame, op_ret, op_errno, buf);
         return 0;
 }
 
 
 int32_t
 default_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (setxattr, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (setxattr, frame, op_ret, op_errno);
         return 0;
 }
 
 
 int32_t
 default_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int32_t op_ret, int32_t op_errno,
-                       dict_t *xdata)
+                       int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (fsetxattr, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (fsetxattr, frame, op_ret, op_errno);
         return 0;
 }
 
@@ -299,104 +287,84 @@ default_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int32_t
 default_fgetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int32_t op_ret, int32_t op_errno, dict_t *dict,
-                       dict_t *xdata)
+                       int32_t op_ret, int32_t op_errno, dict_t *dict)
 {
-        STACK_UNWIND_STRICT (fgetxattr, frame, op_ret, op_errno, dict, xdata);
+        STACK_UNWIND_STRICT (fgetxattr, frame, op_ret, op_errno, dict);
         return 0;
 }
 
 
 int32_t
 default_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, dict_t *dict,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno, dict_t *dict)
 {
-        STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, dict, xdata);
+        STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, dict);
         return 0;
 }
 
 int32_t
 default_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, dict_t *dict,
-                     dict_t *xdata)
+                     int32_t op_ret, int32_t op_errno, dict_t *dict)
 {
-        STACK_UNWIND_STRICT (xattrop, frame, op_ret, op_errno, dict, xdata);
+        STACK_UNWIND_STRICT (xattrop, frame, op_ret, op_errno, dict);
         return 0;
 }
 
 int32_t
 default_fxattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, dict_t *dict,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno, dict_t *dict)
 {
-        STACK_UNWIND_STRICT (fxattrop, frame, op_ret, op_errno, dict, xdata);
+        STACK_UNWIND_STRICT (fxattrop, frame, op_ret, op_errno, dict);
         return 0;
 }
 
 
 int32_t
 default_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                         int32_t op_ret, int32_t op_errno,
-                         dict_t *xdata)
-{
-        STACK_UNWIND_STRICT (removexattr, frame, op_ret, op_errno, xdata);
-        return 0;
-}
-
-
-int32_t
-default_fremovexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno,
-                          dict_t *xdata)
+                         int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (fremovexattr, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (removexattr, frame, op_ret, op_errno);
         return 0;
 }
 
 int32_t
 default_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                int32_t op_ret, int32_t op_errno, struct gf_flock *lock,
-                dict_t *xdata)
+                int32_t op_ret, int32_t op_errno, struct gf_flock *lock)
 {
-        STACK_UNWIND_STRICT (lk, frame, op_ret, op_errno, lock, xdata);
+        STACK_UNWIND_STRICT (lk, frame, op_ret, op_errno, lock);
         return 0;
 }
 
 int32_t
 default_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno,
-                     dict_t *xdata)
+                     int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (inodelk, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (inodelk, frame, op_ret, op_errno);
         return 0;
 }
 
 
 int32_t
 default_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (finodelk, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (finodelk, frame, op_ret, op_errno);
         return 0;
 }
 
 int32_t
 default_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno,
-                     dict_t *xdata)
+                     int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (entrylk, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (entrylk, frame, op_ret, op_errno);
         return 0;
 }
 
 int32_t
 default_fentrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno)
 {
-        STACK_UNWIND_STRICT (fentrylk, frame, op_ret, op_errno, xdata);
+        STACK_UNWIND_STRICT (fentrylk, frame, op_ret, op_errno);
         return 0;
 }
 
@@ -404,86 +372,52 @@ default_fentrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int32_t
 default_rchecksum_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int32_t op_ret, int32_t op_errno, uint32_t weak_checksum,
-                       uint8_t *strong_checksum,
-                       dict_t *xdata)
+                       uint8_t *strong_checksum)
 {
         STACK_UNWIND_STRICT (rchecksum, frame, op_ret, op_errno, weak_checksum,
-                             strong_checksum, xdata);
+                             strong_checksum);
         return 0;
 }
 
 
 int32_t
 default_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, gf_dirent_t *entries,
-                     dict_t *xdata)
+                     int32_t op_ret, int32_t op_errno, gf_dirent_t *entries)
 {
-        STACK_UNWIND_STRICT (readdir, frame, op_ret, op_errno, entries, xdata);
+        STACK_UNWIND_STRICT (readdir, frame, op_ret, op_errno, entries);
         return 0;
 }
 
 
 int32_t
 default_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, gf_dirent_t *entries,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno, gf_dirent_t *entries)
 {
-        STACK_UNWIND_STRICT (readdirp, frame, op_ret, op_errno, entries, xdata);
+        STACK_UNWIND_STRICT (readdirp, frame, op_ret, op_errno, entries);
         return 0;
 }
 
 int32_t
 default_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, struct iatt *statpre,
-                     struct iatt *statpost,
-                     dict_t *xdata)
+                     struct iatt *statpost)
 {
         STACK_UNWIND_STRICT (setattr, frame, op_ret, op_errno, statpre,
-                             statpost, xdata);
+                             statpost);
         return 0;
 }
 
 int32_t
 default_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno, struct iatt *statpre,
-                      struct iatt *statpost,
-                      dict_t *xdata)
+                      struct iatt *statpost)
 {
         STACK_UNWIND_STRICT (fsetattr, frame, op_ret, op_errno, statpre,
-                             statpost, xdata);
+                             statpost);
         return 0;
 }
 
 int32_t
-default_fallocate_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, struct iatt *pre,
-                      struct iatt *post, dict_t *xdata)
-{
-	STACK_UNWIND_STRICT(fallocate, frame, op_ret, op_errno, pre, post, xdata);
-	return 0;
-}
-
-int32_t
-default_discard_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno, struct iatt *pre,
-                    struct iatt *post, dict_t *xdata)
-{
-	STACK_UNWIND_STRICT(discard, frame, op_ret, op_errno, pre, post, xdata);
-	return 0;
-}
-
-int32_t
-default_zerofill_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno, struct iatt *pre,
-                    struct iatt *post, dict_t *xdata)
-{
-        STACK_UNWIND_STRICT(zerofill, frame, op_ret, op_errno, pre,
-                           post, xdata);
-        return 0;
-}
-
-
-int32_t
 default_getspec_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, char *spec_data)
 {
@@ -495,271 +429,257 @@ default_getspec_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int32_t
 default_fgetxattr_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                          const char *name, dict_t *xdata)
+                          const char *name)
 {
         STACK_WIND (frame, default_fgetxattr_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->fgetxattr, fd, name, xdata);
+                    FIRST_CHILD(this)->fops->fgetxattr, fd, name);
         return 0;
 }
 
 int32_t
 default_fsetxattr_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                          dict_t *dict, int32_t flags, dict_t *xdata)
+                          dict_t *dict, int32_t flags)
 {
         STACK_WIND (frame, default_fsetxattr_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->fsetxattr, fd, dict, flags, xdata);
+                    FIRST_CHILD(this)->fops->fsetxattr, fd, dict, flags);
         return 0;
 }
 
 int32_t
 default_setxattr_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                         dict_t *dict, int32_t flags, dict_t *xdata)
+                         dict_t *dict, int32_t flags)
 {
         STACK_WIND (frame, default_setxattr_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->setxattr, loc, dict, flags, xdata);
+                    FIRST_CHILD(this)->fops->setxattr, loc, dict, flags);
         return 0;
 }
 
 int32_t
-default_statfs_resume (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
+default_statfs_resume (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
         STACK_WIND (frame, default_statfs_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->statfs, loc, xdata);
+                    FIRST_CHILD(this)->fops->statfs, loc);
         return 0;
 }
 
 int32_t
 default_fsyncdir_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                         int32_t flags, dict_t *xdata)
+                         int32_t flags)
 {
         STACK_WIND (frame, default_fsyncdir_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->fsyncdir, fd, flags, xdata);
+                    FIRST_CHILD(this)->fops->fsyncdir, fd, flags);
         return 0;
 }
 
 int32_t
 default_opendir_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                        fd_t *fd, dict_t *xdata)
+                        fd_t *fd)
 {
         STACK_WIND (frame, default_opendir_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->opendir, loc, fd, xdata);
+                    FIRST_CHILD(this)->fops->opendir, loc, fd);
         return 0;
 }
 
 int32_t
-default_fstat_resume (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
+default_fstat_resume (call_frame_t *frame, xlator_t *this, fd_t *fd)
 {
         STACK_WIND (frame, default_fstat_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->fstat, fd, xdata);
+                    FIRST_CHILD(this)->fops->fstat, fd);
         return 0;
 }
 
 int32_t
 default_fsync_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                      int32_t flags, dict_t *xdata)
+                      int32_t flags)
 {
         STACK_WIND (frame, default_fsync_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->fsync, fd, flags, xdata);
+                    FIRST_CHILD(this)->fops->fsync, fd, flags);
         return 0;
 }
 
 int32_t
-default_flush_resume (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
+default_flush_resume (call_frame_t *frame, xlator_t *this, fd_t *fd)
 {
         STACK_WIND (frame, default_flush_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->flush, fd, xdata);
+                    FIRST_CHILD(this)->fops->flush, fd);
         return 0;
 }
 
 int32_t
 default_writev_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
                        struct iovec *vector, int32_t count, off_t off,
-                       uint32_t flags, struct iobref *iobref, dict_t *xdata)
+                       struct iobref *iobref)
 {
         STACK_WIND (frame, default_writev_cbk, FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->writev, fd, vector, count, off,
-                    flags, iobref, xdata);
+                    iobref);
         return 0;
 }
 
 int32_t
 default_readv_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                      size_t size, off_t offset, uint32_t flags, dict_t *xdata)
+                      size_t size, off_t offset)
 {
         STACK_WIND (frame, default_readv_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->readv, fd, size, offset, flags, xdata);
+                    FIRST_CHILD(this)->fops->readv, fd, size, offset);
         return 0;
 }
 
 
 int32_t
 default_open_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                     int32_t flags, fd_t *fd, dict_t *xdata)
+                     int32_t flags, fd_t *fd, int32_t wbflags)
 {
         STACK_WIND (frame, default_open_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->open, loc, flags, fd, xdata);
+                    FIRST_CHILD(this)->fops->open, loc, flags, fd, wbflags);
         return 0;
 }
 
 int32_t
 default_create_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                       int32_t flags, mode_t mode, mode_t umask, fd_t *fd,
-                       dict_t *xdata)
+                       int32_t flags, mode_t mode, fd_t *fd, dict_t *params)
 {
         STACK_WIND (frame, default_create_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->create, loc, flags, mode, umask,
-                    fd, xdata);
+                    FIRST_CHILD(this)->fops->create, loc, flags, mode, fd,
+                    params);
         return 0;
 }
 
 int32_t
 default_link_resume (call_frame_t *frame, xlator_t *this, loc_t *oldloc,
-                     loc_t *newloc, dict_t *xdata)
+                     loc_t *newloc)
 {
         STACK_WIND (frame, default_link_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->link, oldloc, newloc, xdata);
+                    FIRST_CHILD(this)->fops->link, oldloc, newloc);
         return 0;
 }
 
 int32_t
 default_rename_resume (call_frame_t *frame, xlator_t *this, loc_t *oldloc,
-                       loc_t *newloc, dict_t *xdata)
+                       loc_t *newloc)
 {
         STACK_WIND (frame, default_rename_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->rename, oldloc, newloc, xdata);
+                    FIRST_CHILD(this)->fops->rename, oldloc, newloc);
         return 0;
 }
 
 
 int
 default_symlink_resume (call_frame_t *frame, xlator_t *this,
-                        const char *linkpath, loc_t *loc, mode_t umask,
-                        dict_t *xdata)
+                        const char *linkpath, loc_t *loc, dict_t *params)
 {
         STACK_WIND (frame, default_symlink_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->symlink, linkpath, loc, umask,
-                    xdata);
+                    FIRST_CHILD(this)->fops->symlink, linkpath, loc, params);
         return 0;
 }
 
 int32_t
 default_rmdir_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                      int flags, dict_t *xdata)
+                      int flags)
 {
         STACK_WIND (frame, default_rmdir_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->rmdir, loc, flags, xdata);
+                    FIRST_CHILD(this)->fops->rmdir, loc, flags);
         return 0;
 }
 
 int32_t
-default_unlink_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                       int xflag, dict_t *xdata)
+default_unlink_resume (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
         STACK_WIND (frame, default_unlink_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->unlink, loc, xflag, xdata);
+                    FIRST_CHILD(this)->fops->unlink, loc);
         return 0;
 }
 
 int
 default_mkdir_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                      mode_t mode, mode_t umask, dict_t *xdata)
+                      mode_t mode, dict_t *params)
 {
         STACK_WIND (frame, default_mkdir_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->mkdir, loc, mode, umask, xdata);
+                    FIRST_CHILD(this)->fops->mkdir, loc, mode, params);
         return 0;
 }
 
 
 int
 default_mknod_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                      mode_t mode, dev_t rdev, mode_t umask, dict_t *xdata)
+                      mode_t mode, dev_t rdev, dict_t *parms)
 {
         STACK_WIND (frame, default_mknod_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->mknod, loc, mode, rdev, umask,
-                    xdata);
+                    FIRST_CHILD(this)->fops->mknod, loc, mode, rdev, parms);
         return 0;
 }
 
 int32_t
 default_readlink_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                         size_t size, dict_t *xdata)
+                         size_t size)
 {
         STACK_WIND (frame, default_readlink_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->readlink, loc, size, xdata);
+                    FIRST_CHILD(this)->fops->readlink, loc, size);
         return 0;
 }
 
 
 int32_t
 default_access_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                       int32_t mask, dict_t *xdata)
+                       int32_t mask)
 {
         STACK_WIND (frame, default_access_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->access, loc, mask, xdata);
+                    FIRST_CHILD(this)->fops->access, loc, mask);
         return 0;
 }
 
 int32_t
 default_ftruncate_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                          off_t offset, dict_t *xdata)
+                          off_t offset)
 {
         STACK_WIND (frame, default_ftruncate_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->ftruncate, fd, offset, xdata);
+                    FIRST_CHILD(this)->fops->ftruncate, fd, offset);
         return 0;
 }
 
 int32_t
 default_getxattr_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                         const char *name, dict_t *xdata)
+                         const char *name)
 {
         STACK_WIND (frame, default_getxattr_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->getxattr, loc, name, xdata);
+                    FIRST_CHILD(this)->fops->getxattr, loc, name);
         return 0;
 }
 
 
 int32_t
 default_xattrop_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                        gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata)
+                        gf_xattrop_flags_t flags, dict_t *dict)
 {
         STACK_WIND (frame, default_xattrop_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->xattrop, loc, flags, dict, xdata);
+                    FIRST_CHILD(this)->fops->xattrop, loc, flags, dict);
         return 0;
 }
 
 int32_t
 default_fxattrop_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                         gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata)
+                         gf_xattrop_flags_t flags, dict_t *dict)
 {
         STACK_WIND (frame, default_fxattrop_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->fxattrop, fd, flags, dict, xdata);
+                    FIRST_CHILD(this)->fops->fxattrop, fd, flags, dict);
         return 0;
 }
 
 int32_t
 default_removexattr_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                            const char *name, dict_t *xdata)
+                            const char *name)
 {
         STACK_WIND (frame, default_removexattr_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->removexattr, loc, name, xdata);
-        return 0;
-}
-
-int32_t
-default_fremovexattr_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                             const char *name, dict_t *xdata)
-{
-        STACK_WIND (frame, default_fremovexattr_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->fremovexattr, fd, name, xdata);
+                    FIRST_CHILD(this)->fops->removexattr, loc, name);
         return 0;
 }
 
 int32_t
 default_lk_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                   int32_t cmd, struct gf_flock *lock, dict_t *xdata)
+                   int32_t cmd, struct gf_flock *lock)
 {
         STACK_WIND (frame, default_lk_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->lk, fd, cmd, lock, xdata);
+                    FIRST_CHILD(this)->fops->lk, fd, cmd, lock);
         return 0;
 }
 
@@ -767,431 +687,367 @@ default_lk_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
 int32_t
 default_inodelk_resume (call_frame_t *frame, xlator_t *this,
                         const char *volume, loc_t *loc, int32_t cmd,
-                        struct gf_flock *lock,
-                        dict_t *xdata)
+                        struct gf_flock *lock)
 {
         STACK_WIND (frame, default_inodelk_cbk, FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->inodelk,
-                    volume, loc, cmd, lock, xdata);
+                    volume, loc, cmd, lock);
         return 0;
 }
 
 int32_t
 default_finodelk_resume (call_frame_t *frame, xlator_t *this,
                          const char *volume, fd_t *fd, int32_t cmd,
-                         struct gf_flock *lock,
-                         dict_t *xdata)
+                         struct gf_flock *lock)
 {
         STACK_WIND (frame, default_finodelk_cbk, FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->finodelk,
-                    volume, fd, cmd, lock, xdata);
+                    volume, fd, cmd, lock);
         return 0;
 }
 
 int32_t
 default_entrylk_resume (call_frame_t *frame, xlator_t *this,
                         const char *volume, loc_t *loc, const char *basename,
-                        entrylk_cmd cmd, entrylk_type type,
-                        dict_t *xdata)
+                        entrylk_cmd cmd, entrylk_type type)
 {
         STACK_WIND (frame, default_entrylk_cbk, FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->entrylk,
-                    volume, loc, basename, cmd, type, xdata);
+                    volume, loc, basename, cmd, type);
         return 0;
 }
 
 int32_t
 default_fentrylk_resume (call_frame_t *frame, xlator_t *this,
                          const char *volume, fd_t *fd, const char *basename,
-                         entrylk_cmd cmd, entrylk_type type,
-                         dict_t *xdata)
+                         entrylk_cmd cmd, entrylk_type type)
 {
         STACK_WIND (frame, default_fentrylk_cbk, FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->fentrylk,
-                    volume, fd, basename, cmd, type, xdata);
+                    volume, fd, basename, cmd, type);
         return 0;
 }
 
 int32_t
 default_rchecksum_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                          off_t offset, int32_t len,
-                          dict_t *xdata)
+                          off_t offset, int32_t len)
 {
         STACK_WIND (frame, default_rchecksum_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->rchecksum, fd, offset, len, xdata);
+                    FIRST_CHILD(this)->fops->rchecksum, fd, offset, len);
         return 0;
 }
 
 
 int32_t
 default_readdir_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                        size_t size, off_t off,
-                        dict_t *xdata)
+                        size_t size, off_t off)
 {
         STACK_WIND (frame, default_readdir_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->readdir, fd, size, off, xdata);
+                    FIRST_CHILD(this)->fops->readdir, fd, size, off);
         return 0;
 }
 
 
 int32_t
 default_readdirp_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                         size_t size, off_t off, dict_t *xdata)
+                         size_t size, off_t off)
 {
         STACK_WIND (frame, default_readdirp_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->readdirp, fd, size, off, xdata);
+                    FIRST_CHILD(this)->fops->readdirp, fd, size, off);
         return 0;
 }
 
 int32_t
 default_setattr_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                        struct iatt *stbuf, int32_t valid,
-                        dict_t *xdata)
+                        struct iatt *stbuf, int32_t valid)
 {
         STACK_WIND (frame, default_setattr_cbk, FIRST_CHILD (this),
-                    FIRST_CHILD (this)->fops->setattr, loc, stbuf, valid, xdata);
+                    FIRST_CHILD (this)->fops->setattr, loc, stbuf, valid);
         return 0;
 }
 
 int32_t
 default_truncate_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                         off_t offset,
-                         dict_t *xdata)
+                         off_t offset)
 {
         STACK_WIND (frame, default_truncate_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->truncate, loc, offset, xdata);
+                    FIRST_CHILD(this)->fops->truncate, loc, offset);
         return 0;
 }
 
 int32_t
-default_stat_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                     dict_t *xdata)
+default_stat_resume (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
         STACK_WIND (frame, default_stat_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->stat, loc, xdata);
+                    FIRST_CHILD(this)->fops->stat, loc);
         return 0;
 }
 
 int32_t
 default_lookup_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                       dict_t *xdata)
+                       dict_t *xattr_req)
 {
         STACK_WIND (frame, default_lookup_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->lookup, loc, xdata);
+                    FIRST_CHILD(this)->fops->lookup, loc, xattr_req);
         return 0;
 }
 
 int32_t
 default_fsetattr_resume (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                         struct iatt *stbuf, int32_t valid,
-                         dict_t *xdata)
+                         struct iatt *stbuf, int32_t valid)
 {
         STACK_WIND (frame, default_fsetattr_cbk, FIRST_CHILD (this),
-                    FIRST_CHILD (this)->fops->fsetattr, fd, stbuf, valid, xdata);
+                    FIRST_CHILD (this)->fops->fsetattr, fd, stbuf, valid);
         return 0;
 }
 
-int32_t
-default_fallocate_resume(call_frame_t *frame, xlator_t *this, fd_t *fd,
-			 int32_t keep_size, off_t offset, size_t len, dict_t *xdata)
-{
-	STACK_WIND(frame, default_fallocate_cbk, FIRST_CHILD(this),
-		   FIRST_CHILD(this)->fops->fallocate, fd, keep_size, offset, len,
-		   xdata);
-        return 0;
-}
-
-int32_t
-default_discard_resume(call_frame_t *frame, xlator_t *this, fd_t *fd,
-		       off_t offset, size_t len, dict_t *xdata)
-{
-	STACK_WIND(frame, default_discard_cbk, FIRST_CHILD(this),
-		   FIRST_CHILD(this)->fops->discard, fd, offset, len,
-		   xdata);
-        return 0;
-}
-
-int32_t
-default_zerofill_resume(call_frame_t *frame, xlator_t *this, fd_t *fd,
-                       off_t offset, size_t len, dict_t *xdata)
-{
-        STACK_WIND(frame, default_zerofill_cbk, FIRST_CHILD(this),
-                   FIRST_CHILD(this)->fops->zerofill, fd, offset, len,
-                   xdata);
-        return 0;
-}
-
-
 /* FOPS */
 
 int32_t
 default_fgetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                   const char *name, dict_t *xdata)
+                   const char *name)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->fgetxattr, fd, name, xdata);
+        STACK_WIND (frame, default_fgetxattr_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fgetxattr, fd, name);
         return 0;
 }
 
 int32_t
 default_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict,
-                   int32_t flags, dict_t *xdata)
+                   int32_t flags)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->fsetxattr, fd, dict, flags,
-                         xdata);
+        STACK_WIND (frame, default_fsetxattr_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fsetxattr, fd, dict, flags);
         return 0;
 }
 
 int32_t
 default_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
-                  int32_t flags, dict_t *xdata)
+                  int32_t flags)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->setxattr, loc, dict, flags,
-                         xdata);
+        STACK_WIND (frame, default_setxattr_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->setxattr, loc, dict, flags);
         return 0;
 }
 
 int32_t
-default_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
+default_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->statfs, loc, xdata);
+        STACK_WIND (frame, default_statfs_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->statfs, loc);
         return 0;
 }
 
 int32_t
-default_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, dict_t *xdata)
+default_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->fsyncdir, fd, flags, xdata);
+        STACK_WIND (frame, default_fsyncdir_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fsyncdir, fd, flags);
         return 0;
 }
 
 int32_t
-default_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, dict_t *xdata)
+default_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->opendir, loc, fd, xdata);
+        STACK_WIND (frame, default_opendir_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->opendir, loc, fd);
         return 0;
 }
 
 int32_t
-default_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
+default_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->fstat, fd, xdata);
+        STACK_WIND (frame, default_fstat_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fstat, fd);
         return 0;
 }
 
 int32_t
-default_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, dict_t *xdata)
+default_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->fsync, fd, flags, xdata);
+        STACK_WIND (frame, default_fsync_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fsync, fd, flags);
         return 0;
 }
 
 int32_t
-default_flush (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
+default_flush (call_frame_t *frame, xlator_t *this, fd_t *fd)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->flush, fd, xdata);
+        STACK_WIND (frame, default_flush_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->flush, fd);
         return 0;
 }
 
 int32_t
 default_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                struct iovec *vector, int32_t count, off_t off, uint32_t flags,
-                struct iobref *iobref, dict_t *xdata)
+                struct iovec *vector, int32_t count, off_t off,
+                struct iobref *iobref)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->writev, fd, vector, count,
-                         off, flags, iobref, xdata);
+        STACK_WIND (frame, default_writev_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->writev, fd, vector, count, off,
+                    iobref);
         return 0;
 }
 
 int32_t
 default_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
-               off_t offset, uint32_t flags, dict_t *xdata)
+               off_t offset)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->readv, fd, size, offset,
-                         flags, xdata);
+        STACK_WIND (frame, default_readv_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->readv, fd, size, offset);
         return 0;
 }
 
 
 int32_t
 default_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
-              fd_t *fd, dict_t *xdata)
+              fd_t *fd, int32_t wbflags)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->open, loc, flags, fd, xdata);
+        STACK_WIND (frame, default_open_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->open, loc, flags, fd, wbflags);
         return 0;
 }
 
 int32_t
 default_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
-                mode_t mode, mode_t umask, fd_t *fd, dict_t *xdata)
+                mode_t mode, fd_t *fd, dict_t *params)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->create, loc, flags, mode,
-                         umask, fd, xdata);
+        STACK_WIND (frame, default_create_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->create, loc, flags, mode, fd,
+                    params);
         return 0;
 }
 
 int32_t
-default_link (call_frame_t *frame, xlator_t *this, loc_t *oldloc, loc_t *newloc,
-              dict_t *xdata)
+default_link (call_frame_t *frame, xlator_t *this, loc_t *oldloc, loc_t *newloc)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->link, oldloc, newloc, xdata);
+        STACK_WIND (frame, default_link_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->link, oldloc, newloc);
         return 0;
 }
 
 int32_t
 default_rename (call_frame_t *frame, xlator_t *this, loc_t *oldloc,
-                loc_t *newloc, dict_t *xdata)
+                loc_t *newloc)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->rename, oldloc, newloc,
-                         xdata);
+        STACK_WIND (frame, default_rename_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->rename, oldloc, newloc);
         return 0;
 }
 
 
 int
 default_symlink (call_frame_t *frame, xlator_t *this, const char *linkpath,
-                 loc_t *loc, mode_t umask, dict_t *xdata)
+                 loc_t *loc, dict_t *params)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->symlink, linkpath, loc,
-                         umask, xdata);
+        STACK_WIND (frame, default_symlink_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->symlink, linkpath, loc, params);
         return 0;
 }
 
 int32_t
-default_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags,
-               dict_t *xdata)
+default_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->rmdir, loc, flags, xdata);
+        STACK_WIND (frame, default_rmdir_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->rmdir, loc, flags);
         return 0;
 }
 
 int32_t
-default_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag,
-                dict_t *xdata)
+default_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->unlink, loc, xflag, xdata);
+        STACK_WIND (frame, default_unlink_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->unlink, loc);
         return 0;
 }
 
 int
 default_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
-               mode_t umask, dict_t *xdata)
+               dict_t *params)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->mkdir, loc, mode, umask,
-                         xdata);
+        STACK_WIND (frame, default_mkdir_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->mkdir, loc, mode, params);
         return 0;
 }
 
 
 int
 default_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
-               dev_t rdev, mode_t umask, dict_t *xdata)
+               dev_t rdev, dict_t *parms)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->mknod, loc, mode, rdev,
-                         umask, xdata);
+        STACK_WIND (frame, default_mknod_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->mknod, loc, mode, rdev, parms);
         return 0;
 }
 
 int32_t
-default_readlink (call_frame_t *frame, xlator_t *this, loc_t *loc, size_t size, dict_t *xdata)
+default_readlink (call_frame_t *frame, xlator_t *this, loc_t *loc, size_t size)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->readlink, loc, size, xdata);
+        STACK_WIND (frame, default_readlink_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->readlink, loc, size);
         return 0;
 }
 
 
 int32_t
-default_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask, dict_t *xdata)
+default_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->access, loc, mask, xdata);
+        STACK_WIND (frame, default_access_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->access, loc, mask);
         return 0;
 }
 
 int32_t
-default_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, dict_t *xdata)
+default_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->ftruncate, fd, offset, xdata);
+        STACK_WIND (frame, default_ftruncate_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->ftruncate, fd, offset);
         return 0;
 }
 
 int32_t
 default_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                  const char *name, dict_t *xdata)
+                  const char *name)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->getxattr, loc, name, xdata);
+        STACK_WIND (frame, default_getxattr_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->getxattr, loc, name);
         return 0;
 }
 
 
 int32_t
 default_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                 gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata)
+                 gf_xattrop_flags_t flags, dict_t *dict)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->xattrop, loc, flags, dict,
-                         xdata);
+        STACK_WIND (frame, default_xattrop_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->xattrop, loc, flags, dict);
         return 0;
 }
 
 int32_t
 default_fxattrop (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                  gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata)
+                  gf_xattrop_flags_t flags, dict_t *dict)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->fxattrop, fd, flags, dict,
-                         xdata);
+        STACK_WIND (frame, default_fxattrop_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fxattrop, fd, flags, dict);
         return 0;
 }
 
 int32_t
 default_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                     const char *name, dict_t *xdata)
+                     const char *name)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->removexattr, loc, name,
-                         xdata);
-        return 0;
-}
-
-int32_t
-default_fremovexattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                      const char *name, dict_t *xdata)
-{
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->fremovexattr, fd, name,
-                         xdata);
+        STACK_WIND (frame, default_removexattr_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->removexattr, loc, name);
         return 0;
 }
 
 int32_t
 default_lk (call_frame_t *frame, xlator_t *this, fd_t *fd,
-            int32_t cmd, struct gf_flock *lock, dict_t *xdata)
+            int32_t cmd, struct gf_flock *lock)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->lk, fd, cmd, lock, xdata);
+        STACK_WIND (frame, default_lk_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->lk, fd, cmd, lock);
         return 0;
 }
 
@@ -1199,160 +1055,115 @@ default_lk (call_frame_t *frame, xlator_t *this, fd_t *fd,
 int32_t
 default_inodelk (call_frame_t *frame, xlator_t *this,
                  const char *volume, loc_t *loc, int32_t cmd,
-                 struct gf_flock *lock,
-                 dict_t *xdata)
+                 struct gf_flock *lock)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->inodelk, volume, loc, cmd,
-                         lock, xdata);
+        STACK_WIND (frame, default_inodelk_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->inodelk,
+                    volume, loc, cmd, lock);
         return 0;
 }
 
 int32_t
 default_finodelk (call_frame_t *frame, xlator_t *this,
-                  const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *lock,
-                  dict_t *xdata)
+                  const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *lock)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->finodelk, volume, fd, cmd,
-                         lock, xdata);
+        STACK_WIND (frame, default_finodelk_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->finodelk,
+                    volume, fd, cmd, lock);
         return 0;
 }
 
 int32_t
 default_entrylk (call_frame_t *frame, xlator_t *this,
                  const char *volume, loc_t *loc, const char *basename,
-                 entrylk_cmd cmd, entrylk_type type,
-                 dict_t *xdata)
+                 entrylk_cmd cmd, entrylk_type type)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->entrylk, volume, loc,
-                         basename, cmd, type, xdata);
+        STACK_WIND (frame, default_entrylk_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->entrylk,
+                    volume, loc, basename, cmd, type);
         return 0;
 }
 
 int32_t
 default_fentrylk (call_frame_t *frame, xlator_t *this,
                   const char *volume, fd_t *fd, const char *basename,
-                  entrylk_cmd cmd, entrylk_type type,
-                  dict_t *xdata)
+                  entrylk_cmd cmd, entrylk_type type)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->fentrylk, volume, fd,
-                         basename, cmd, type, xdata);
+        STACK_WIND (frame, default_fentrylk_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->fentrylk,
+                    volume, fd, basename, cmd, type);
         return 0;
 }
 
 int32_t
 default_rchecksum (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
-                   int32_t len,
-                   dict_t *xdata)
+                   int32_t len)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->rchecksum, fd, offset, len,
-                         xdata);
+        STACK_WIND (frame, default_rchecksum_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->rchecksum, fd, offset, len);
         return 0;
 }
 
 
 int32_t
 default_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                 size_t size, off_t off,
-                 dict_t *xdata)
+                 size_t size, off_t off)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->readdir, fd, size, off,
-                         xdata);
+        STACK_WIND (frame, default_readdir_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->readdir, fd, size, off);
         return 0;
 }
 
 
 int32_t
 default_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                  size_t size, off_t off, dict_t *xdata)
+                  size_t size, off_t off)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->readdirp, fd, size, off,
-                         xdata);
+        STACK_WIND (frame, default_readdirp_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->readdirp, fd, size, off);
         return 0;
 }
 
 int32_t
 default_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                 struct iatt *stbuf, int32_t valid,
-                 dict_t *xdata)
+                 struct iatt *stbuf, int32_t valid)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD (this),
-                         FIRST_CHILD (this)->fops->setattr, loc, stbuf, valid,
-                         xdata);
+        STACK_WIND (frame, default_setattr_cbk, FIRST_CHILD (this),
+                    FIRST_CHILD (this)->fops->setattr, loc, stbuf, valid);
         return 0;
 }
 
 int32_t
-default_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset,
-                  dict_t *xdata)
+default_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->truncate, loc, offset, xdata);
+        STACK_WIND (frame, default_truncate_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->truncate, loc, offset);
         return 0;
 }
 
 int32_t
-default_stat (call_frame_t *frame, xlator_t *this, loc_t *loc,
-              dict_t *xdata)
+default_stat (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->stat, loc, xdata);
+        STACK_WIND (frame, default_stat_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->stat, loc);
         return 0;
 }
 
 int32_t
 default_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                dict_t *xdata)
+                dict_t *xattr_req)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->lookup, loc, xdata);
+        STACK_WIND (frame, default_lookup_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->lookup, loc, xattr_req);
         return 0;
 }
 
 int32_t
 default_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                  struct iatt *stbuf, int32_t valid,
-                  dict_t *xdata)
-{
-        STACK_WIND_TAIL (frame, FIRST_CHILD (this),
-                         FIRST_CHILD (this)->fops->fsetattr, fd, stbuf, valid,
-                         xdata);
-        return 0;
-}
-
-int32_t
-default_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd,
-		  int32_t keep_size, off_t offset, size_t len, dict_t *xdata)
+                  struct iatt *stbuf, int32_t valid)
 {
-	STACK_WIND_TAIL(frame, FIRST_CHILD(this),
-			FIRST_CHILD(this)->fops->fallocate, fd, keep_size, offset,
-			len, xdata);
-	return 0;
-}
-
-int32_t
-default_discard(call_frame_t *frame, xlator_t *this, fd_t *fd,
-		off_t offset, size_t len, dict_t *xdata)
-{
-	STACK_WIND_TAIL(frame, FIRST_CHILD(this),
-			FIRST_CHILD(this)->fops->discard, fd, offset, len,
-			xdata);
-	return 0;
-}
-
-int32_t
-default_zerofill(call_frame_t *frame, xlator_t *this, fd_t *fd,
-                off_t offset, size_t len, dict_t *xdata)
-{
-        STACK_WIND_TAIL(frame, FIRST_CHILD(this),
-                        FIRST_CHILD(this)->fops->zerofill, fd, offset, len,
-                        xdata);
+        STACK_WIND (frame, default_fsetattr_cbk, FIRST_CHILD (this),
+                    FIRST_CHILD (this)->fops->fsetattr, fd, stbuf, valid);
         return 0;
 }
 
@@ -1360,8 +1171,6 @@ default_zerofill(call_frame_t *frame, xlator_t *this, fd_t *fd,
 int32_t
 default_forget (xlator_t *this, inode_t *inode)
 {
-        gf_log_callingfn (this->name, GF_LOG_WARNING, "xlator does not "
-                          "implement forget_cbk");
         return 0;
 }
 
@@ -1369,16 +1178,12 @@ default_forget (xlator_t *this, inode_t *inode)
 int32_t
 default_releasedir (xlator_t *this, fd_t *fd)
 {
-        gf_log_callingfn (this->name, GF_LOG_WARNING, "xlator does not "
-                          "implement releasedir_cbk");
         return 0;
 }
 
 int32_t
 default_release (xlator_t *this, fd_t *fd)
 {
-        gf_log_callingfn (this->name, GF_LOG_WARNING, "xlator does not "
-                          "implement release_cbk");
         return 0;
 }
 
@@ -1391,8 +1196,8 @@ int32_t
 default_getspec (call_frame_t *frame, xlator_t *this, const char *key,
                  int32_t flags)
 {
-        STACK_WIND_TAIL (frame, FIRST_CHILD(this),
-                         FIRST_CHILD(this)->fops->getspec, key, flags);
+        STACK_WIND (frame, default_getspec_cbk, FIRST_CHILD(this),
+                    FIRST_CHILD(this)->fops->getspec, key, flags);
         return 0;
 }
 
@@ -1403,7 +1208,6 @@ default_notify (xlator_t *this, int32_t event, void *data, ...)
         switch (event)
         {
         case GF_EVENT_PARENT_UP:
-        case GF_EVENT_PARENT_DOWN:
         {
                 xlator_list_t *list = this->children;
 
@@ -1417,10 +1221,9 @@ default_notify (xlator_t *this, int32_t event, void *data, ...)
         case GF_EVENT_CHILD_MODIFIED:
         case GF_EVENT_CHILD_DOWN:
         case GF_EVENT_CHILD_UP:
-        case GF_EVENT_AUTH_FAILED:
         {
                 xlator_list_t *parent = this->parents;
-                /* Handle case of CHILD_* & AUTH_FAILED event specially, send it to fuse */
+                /* Handle case of CHILD_* event specially, send it to fuse */
                 if (!parent && this->ctx && this->ctx->master)
                         xlator_notify (this->ctx->master, event, this->graph, NULL);
 
diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/defaults.h
index 0747027bc..a312901a7 100644
--- a/libglusterfs/src/defaults.h
+++ b/libglusterfs/src/defaults.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 /* libglusterfs/src/defaults.h:
@@ -22,18 +31,6 @@
 
 #include "xlator.h"
 
-int32_t default_notify (xlator_t *this,
-                        int32_t event,
-                        void *data,
-                        ...);
-
-int32_t default_forget (xlator_t *this, inode_t *inode);
-
-int32_t default_release (xlator_t *this, fd_t *fd);
-
-int32_t default_releasedir (xlator_t *this, fd_t *fd);
-
-
 /* Management Operations */
 
 int32_t default_getspec (call_frame_t *frame,
@@ -44,85 +41,83 @@ int32_t default_getspec (call_frame_t *frame,
 int32_t default_rchecksum (call_frame_t *frame,
                            xlator_t *this,
                            fd_t *fd, off_t offset,
-                           int32_t len, dict_t *xdata);
+                           int32_t len);
 
 /* FileSystem operations */
 int32_t default_lookup (call_frame_t *frame,
                         xlator_t *this,
                         loc_t *loc,
-                        dict_t *xdata);
+                        dict_t *xattr_req);
 
 int32_t default_stat (call_frame_t *frame,
                       xlator_t *this,
-                      loc_t *loc, dict_t *xdata);
+                      loc_t *loc);
 
 int32_t default_fstat (call_frame_t *frame,
                        xlator_t *this,
-                       fd_t *fd, dict_t *xdata);
+                       fd_t *fd);
 
 int32_t default_truncate (call_frame_t *frame,
                           xlator_t *this,
                           loc_t *loc,
-                          off_t offset, dict_t *xdata);
+                          off_t offset);
 
 int32_t default_ftruncate (call_frame_t *frame,
                            xlator_t *this,
                            fd_t *fd,
-                           off_t offset, dict_t *xdata);
+                           off_t offset);
 
 int32_t default_access (call_frame_t *frame,
                         xlator_t *this,
                         loc_t *loc,
-                        int32_t mask, dict_t *xdata);
+                        int32_t mask);
 
 int32_t default_readlink (call_frame_t *frame,
                           xlator_t *this,
                           loc_t *loc,
-                          size_t size, dict_t *xdata);
+                          size_t size);
 
-int32_t default_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                       mode_t mode, dev_t rdev, mode_t umask, dict_t *xdata);
+int32_t default_mknod (call_frame_t *frame, xlator_t *this,
+                       loc_t *loc, mode_t mode, dev_t rdev, dict_t *params);
 
 int32_t default_mkdir (call_frame_t *frame, xlator_t *this,
-                       loc_t *loc, mode_t mode, mode_t umask, dict_t *xdata);
+                       loc_t *loc, mode_t mode, dict_t *params);
 
 int32_t default_unlink (call_frame_t *frame,
                         xlator_t *this,
-                        loc_t *loc, int xflag, dict_t *xdata);
+                        loc_t *loc);
 
 int32_t default_rmdir (call_frame_t *frame, xlator_t *this,
-                       loc_t *loc, int xflag, dict_t *xdata);
+                       loc_t *loc, int flags);
 
 int32_t default_symlink (call_frame_t *frame, xlator_t *this,
-                         const char *linkpath, loc_t *loc, mode_t umask,
-                         dict_t *xdata);
+                         const char *linkpath, loc_t *loc, dict_t *params);
 
 int32_t default_rename (call_frame_t *frame,
                         xlator_t *this,
                         loc_t *oldloc,
-                        loc_t *newloc, dict_t *xdata);
+                        loc_t *newloc);
 
 int32_t default_link (call_frame_t *frame,
                       xlator_t *this,
                       loc_t *oldloc,
-                      loc_t *newloc, dict_t *xdata);
+                      loc_t *newloc);
 
 int32_t default_create (call_frame_t *frame, xlator_t *this,
                         loc_t *loc, int32_t flags, mode_t mode,
-                        mode_t umask, fd_t *fd, dict_t *xdata);
+                        fd_t *fd, dict_t *params);
 
 int32_t default_open (call_frame_t *frame,
                       xlator_t *this,
                       loc_t *loc,
                       int32_t flags, fd_t *fd,
-                      dict_t *xdata);
+                      int32_t wbflags);
 
 int32_t default_readv (call_frame_t *frame,
                        xlator_t *this,
                        fd_t *fd,
                        size_t size,
-                       off_t offset,
-                       uint32_t flags, dict_t *xdata);
+                       off_t offset);
 
 int32_t default_writev (call_frame_t *frame,
                         xlator_t *this,
@@ -130,588 +125,550 @@ int32_t default_writev (call_frame_t *frame,
                         struct iovec *vector,
                         int32_t count,
                         off_t offset,
-                        uint32_t flags,
-                        struct iobref *iobref, dict_t *xdata);
+                        struct iobref *iobref);
 
 int32_t default_flush (call_frame_t *frame,
                        xlator_t *this,
-                       fd_t *fd, dict_t *xdata);
+                       fd_t *fd);
 
 int32_t default_fsync (call_frame_t *frame,
                        xlator_t *this,
                        fd_t *fd,
-                       int32_t datasync, dict_t *xdata);
+                       int32_t datasync);
 
 int32_t default_opendir (call_frame_t *frame,
                          xlator_t *this,
-                         loc_t *loc, fd_t *fd, dict_t *xdata);
+                         loc_t *loc, fd_t *fd);
 
 int32_t default_fsyncdir (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
-                          int32_t datasync, dict_t *xdata);
+                          int32_t datasync);
 
 int32_t default_statfs (call_frame_t *frame,
                         xlator_t *this,
-                        loc_t *loc, dict_t *xdata);
+                        loc_t *loc);
 
 int32_t default_setxattr (call_frame_t *frame,
                           xlator_t *this,
                           loc_t *loc,
                           dict_t *dict,
-                          int32_t flags, dict_t *xdata);
+                          int32_t flags);
 
 int32_t default_getxattr (call_frame_t *frame,
                           xlator_t *this,
                           loc_t *loc,
-                          const char *name, dict_t *xdata);
+                          const char *name);
 
 int32_t default_fsetxattr (call_frame_t *frame,
                            xlator_t *this,
                            fd_t *fd,
                            dict_t *dict,
-                           int32_t flags, dict_t *xdata);
+                           int32_t flags);
 
 int32_t default_fgetxattr (call_frame_t *frame,
                            xlator_t *this,
                            fd_t *fd,
-                           const char *name, dict_t *xdata);
+                           const char *name);
 
 int32_t default_removexattr (call_frame_t *frame,
                              xlator_t *this,
                              loc_t *loc,
-                             const char *name, dict_t *xdata);
-
-int32_t default_fremovexattr (call_frame_t *frame,
-                              xlator_t *this,
-                              fd_t *fd,
-                              const char *name, dict_t *xdata);
+                             const char *name);
 
 int32_t default_lk (call_frame_t *frame,
                     xlator_t *this,
                     fd_t *fd,
                     int32_t cmd,
-                    struct gf_flock *flock, dict_t *xdata);
+                    struct gf_flock *flock);
 
 int32_t default_inodelk (call_frame_t *frame, xlator_t *this,
                          const char *volume, loc_t *loc, int32_t cmd,
-                         struct gf_flock *flock, dict_t *xdata);
+                         struct gf_flock *flock);
 
 int32_t default_finodelk (call_frame_t *frame, xlator_t *this,
                           const char *volume, fd_t *fd, int32_t cmd,
-                          struct gf_flock *flock, dict_t *xdata);
+                          struct gf_flock *flock);
 
 int32_t default_entrylk (call_frame_t *frame, xlator_t *this,
                          const char *volume, loc_t *loc, const char *basename,
-                         entrylk_cmd cmd, entrylk_type type, dict_t *xdata);
+                         entrylk_cmd cmd, entrylk_type type);
 
 int32_t default_fentrylk (call_frame_t *frame, xlator_t *this,
                           const char *volume, fd_t *fd, const char *basename,
-                          entrylk_cmd cmd, entrylk_type type, dict_t *xdata);
+                          entrylk_cmd cmd, entrylk_type type);
 
 int32_t default_readdir (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
-                          size_t size, off_t off, dict_t *xdata);
+                          size_t size, off_t off);
 
 int32_t default_readdirp (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
-                          size_t size, off_t off, dict_t *xdata);
+                          size_t size, off_t off);
 
 int32_t default_xattrop (call_frame_t *frame,
                          xlator_t *this,
                          loc_t *loc,
                          gf_xattrop_flags_t flags,
-                         dict_t *dict, dict_t *xdata);
+                         dict_t *dict);
 
 int32_t default_fxattrop (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
                           gf_xattrop_flags_t flags,
-                          dict_t *dict, dict_t *xdata);
+                          dict_t *dict);
+
+int32_t default_notify (xlator_t *this,
+                        int32_t event,
+                        void *data,
+                        ...);
+
+int32_t default_forget (xlator_t *this,
+                        inode_t *inode);
+
+int32_t default_release (xlator_t *this,
+                         fd_t *fd);
+
+int32_t default_releasedir (xlator_t *this,
+                            fd_t *fd);
 
 int32_t default_setattr (call_frame_t *frame,
                          xlator_t *this,
                          loc_t *loc,
                          struct iatt *stbuf,
-                         int32_t valid, dict_t *xdata);
+                         int32_t valid);
 
 int32_t default_fsetattr (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
                           struct iatt *stbuf,
-                          int32_t valid, dict_t *xdata);
-
-int32_t default_fallocate(call_frame_t *frame,
-			  xlator_t *this,
-			  fd_t *fd,
-			  int32_t keep_size, off_t offset,
-			  size_t len, dict_t *xdata);
-
-int32_t default_discard(call_frame_t *frame,
-			xlator_t *this,
-			fd_t *fd,
-			off_t offset,
-			size_t len, dict_t *xdata);
-
-int32_t default_zerofill(call_frame_t *frame,
-                        xlator_t *this,
-                        fd_t *fd,
-                        off_t offset,
-                        size_t len, dict_t *xdata);
-
+                          int32_t valid);
 
 /* Resume */
-int32_t default_getspec_resume (call_frame_t *frame,
-                                xlator_t *this,
-                                const char *key,
-                                int32_t flag);
+int32_t default_getspec (call_frame_t *frame,
+                         xlator_t *this,
+                         const char *key,
+                         int32_t flag);
 
-int32_t default_rchecksum_resume (call_frame_t *frame,
+int32_t default_rchecksum (call_frame_t *frame,
                            xlator_t *this,
                            fd_t *fd, off_t offset,
-                           int32_t len, dict_t *xdata);
+                           int32_t len);
 
 /* FileSystem operations */
 int32_t default_lookup_resume (call_frame_t *frame,
-                               xlator_t *this,
-                               loc_t *loc,
-                               dict_t *xdata);
+                        xlator_t *this,
+                        loc_t *loc,
+                        dict_t *xattr_req);
 
 int32_t default_stat_resume (call_frame_t *frame,
                       xlator_t *this,
-                      loc_t *loc, dict_t *xdata);
+                      loc_t *loc);
 
 int32_t default_fstat_resume (call_frame_t *frame,
                        xlator_t *this,
-                       fd_t *fd, dict_t *xdata);
+                       fd_t *fd);
 
 int32_t default_truncate_resume (call_frame_t *frame,
                           xlator_t *this,
                           loc_t *loc,
-                          off_t offset, dict_t *xdata);
+                          off_t offset);
 
 int32_t default_ftruncate_resume (call_frame_t *frame,
                            xlator_t *this,
                            fd_t *fd,
-                           off_t offset, dict_t *xdata);
+                           off_t offset);
 
 int32_t default_access_resume (call_frame_t *frame,
                         xlator_t *this,
                         loc_t *loc,
-                        int32_t mask, dict_t *xdata);
+                        int32_t mask);
 
 int32_t default_readlink_resume (call_frame_t *frame,
                           xlator_t *this,
                           loc_t *loc,
-                          size_t size, dict_t *xdata);
+                          size_t size);
 
-int32_t default_mknod_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                              mode_t mode, dev_t rdev, mode_t umask,
-                              dict_t *xdata);
+int32_t default_mknod_resume (call_frame_t *frame, xlator_t *this,
+                       loc_t *loc, mode_t mode, dev_t rdev, dict_t *params);
 
-int32_t default_mkdir_resume (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                              mode_t mode, mode_t umask, dict_t *xdata);
+int32_t default_mkdir_resume (call_frame_t *frame, xlator_t *this,
+                       loc_t *loc, mode_t mode, dict_t *params);
 
 int32_t default_unlink_resume (call_frame_t *frame,
-                               xlator_t *this,
-                               loc_t *loc, int xflag, dict_t *xdata);
+                        xlator_t *this,
+                        loc_t *loc);
 
 int32_t default_rmdir_resume (call_frame_t *frame, xlator_t *this,
-                              loc_t *loc, int xflag, dict_t *xdata);
+                              loc_t *loc, int flags);
 
 int32_t default_symlink_resume (call_frame_t *frame, xlator_t *this,
-                                const char *linkpath, loc_t *loc, mode_t umask,
-                                dict_t *xdata);
+                         const char *linkpath, loc_t *loc, dict_t *params);
 
 int32_t default_rename_resume (call_frame_t *frame,
                         xlator_t *this,
                         loc_t *oldloc,
-                        loc_t *newloc, dict_t *xdata);
+                        loc_t *newloc);
 
 int32_t default_link_resume (call_frame_t *frame,
                       xlator_t *this,
                       loc_t *oldloc,
-                      loc_t *newloc, dict_t *xdata);
+                      loc_t *newloc);
 
 int32_t default_create_resume (call_frame_t *frame, xlator_t *this,
-                               loc_t *loc, int32_t flags, mode_t mode,
-                               mode_t umask, fd_t *fd, dict_t *xdata);
+                        loc_t *loc, int32_t flags, mode_t mode,
+                        fd_t *fd, dict_t *params);
 
 int32_t default_open_resume (call_frame_t *frame,
-                             xlator_t *this,
-                             loc_t *loc,
-                             int32_t flags, fd_t *fd, dict_t *xdata);
+                      xlator_t *this,
+                      loc_t *loc,
+                      int32_t flags, fd_t *fd,
+                      int32_t wbflags);
 
 int32_t default_readv_resume (call_frame_t *frame,
-                              xlator_t *this,
-                              fd_t *fd,
-                              size_t size,
-                              off_t offset, uint32_t flags, dict_t *xdata);
+                       xlator_t *this,
+                       fd_t *fd,
+                       size_t size,
+                       off_t offset);
 
 int32_t default_writev_resume (call_frame_t *frame,
-                               xlator_t *this,
-                               fd_t *fd,
-                               struct iovec *vector,
-                               int32_t count,
-                               off_t offset, uint32_t flags,
-                               struct iobref *iobref, dict_t *xdata);
+                        xlator_t *this,
+                        fd_t *fd,
+                        struct iovec *vector,
+                        int32_t count,
+                        off_t offset,
+                        struct iobref *iobref);
 
 int32_t default_flush_resume (call_frame_t *frame,
                        xlator_t *this,
-                       fd_t *fd, dict_t *xdata);
+                       fd_t *fd);
 
 int32_t default_fsync_resume (call_frame_t *frame,
                        xlator_t *this,
                        fd_t *fd,
-                       int32_t datasync, dict_t *xdata);
+                       int32_t datasync);
 
 int32_t default_opendir_resume (call_frame_t *frame,
                          xlator_t *this,
-                         loc_t *loc, fd_t *fd, dict_t *xdata);
+                         loc_t *loc, fd_t *fd);
 
 int32_t default_fsyncdir_resume (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
-                          int32_t datasync, dict_t *xdata);
+                          int32_t datasync);
 
 int32_t default_statfs_resume (call_frame_t *frame,
                         xlator_t *this,
-                        loc_t *loc, dict_t *xdata);
+                        loc_t *loc);
 
 int32_t default_setxattr_resume (call_frame_t *frame,
                           xlator_t *this,
                           loc_t *loc,
                           dict_t *dict,
-                          int32_t flags, dict_t *xdata);
+                          int32_t flags);
 
 int32_t default_getxattr_resume (call_frame_t *frame,
                           xlator_t *this,
                           loc_t *loc,
-                          const char *name, dict_t *xdata);
+                          const char *name);
 
 int32_t default_fsetxattr_resume (call_frame_t *frame,
                            xlator_t *this,
                            fd_t *fd,
                            dict_t *dict,
-                           int32_t flags, dict_t *xdata);
+                           int32_t flags);
 
 int32_t default_fgetxattr_resume (call_frame_t *frame,
                            xlator_t *this,
                            fd_t *fd,
-                           const char *name, dict_t *xdata);
+                           const char *name);
 
 int32_t default_removexattr_resume (call_frame_t *frame,
                              xlator_t *this,
                              loc_t *loc,
-                             const char *name, dict_t *xdata);
-
-int32_t default_fremovexattr_resume (call_frame_t *frame,
-                                     xlator_t *this,
-                                     fd_t *fd,
-                                     const char *name, dict_t *xdata);
+                             const char *name);
 
 int32_t default_lk_resume (call_frame_t *frame,
                     xlator_t *this,
                     fd_t *fd,
                     int32_t cmd,
-                    struct gf_flock *flock, dict_t *xdata);
+                    struct gf_flock *flock);
 
 int32_t default_inodelk_resume (call_frame_t *frame, xlator_t *this,
                          const char *volume, loc_t *loc, int32_t cmd,
-                         struct gf_flock *flock, dict_t *xdata);
+                         struct gf_flock *flock);
 
 int32_t default_finodelk_resume (call_frame_t *frame, xlator_t *this,
                           const char *volume, fd_t *fd, int32_t cmd,
-                          struct gf_flock *flock, dict_t *xdata);
+                          struct gf_flock *flock);
 
 int32_t default_entrylk_resume (call_frame_t *frame, xlator_t *this,
                          const char *volume, loc_t *loc, const char *basename,
-                         entrylk_cmd cmd, entrylk_type type, dict_t *xdata);
+                         entrylk_cmd cmd, entrylk_type type);
 
 int32_t default_fentrylk_resume (call_frame_t *frame, xlator_t *this,
                           const char *volume, fd_t *fd, const char *basename,
-                          entrylk_cmd cmd, entrylk_type type, dict_t *xdata);
+                          entrylk_cmd cmd, entrylk_type type);
 
 int32_t default_readdir_resume (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
-                          size_t size, off_t off, dict_t *xdata);
+                          size_t size, off_t off);
 
 int32_t default_readdirp_resume (call_frame_t *frame,
-                                 xlator_t *this,
-                                 fd_t *fd,
-                                 size_t size, off_t off, dict_t *xdata);
+                          xlator_t *this,
+                          fd_t *fd,
+                          size_t size, off_t off);
 
 int32_t default_xattrop_resume (call_frame_t *frame,
                          xlator_t *this,
                          loc_t *loc,
                          gf_xattrop_flags_t flags,
-                         dict_t *dict, dict_t *xdata);
+                         dict_t *dict);
 
 int32_t default_fxattrop_resume (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
                           gf_xattrop_flags_t flags,
-                          dict_t *dict, dict_t *xdata);
+                          dict_t *dict);
 int32_t default_rchecksum_resume (call_frame_t *frame,
                                   xlator_t *this,
                                   fd_t *fd, off_t offset,
-                                  int32_t len, dict_t *xdata);
+                                  int32_t len);
+
+int32_t default_notify (xlator_t *this,
+                        int32_t event,
+                        void *data,
+                        ...);
+
+int32_t default_forget (xlator_t *this,
+                        inode_t *inode);
+
+int32_t default_release (xlator_t *this,
+                         fd_t *fd);
+
+int32_t default_releasedir (xlator_t *this,
+                            fd_t *fd);
 
 int32_t default_setattr_resume (call_frame_t *frame,
                          xlator_t *this,
                          loc_t *loc,
                          struct iatt *stbuf,
-                         int32_t valid, dict_t *xdata);
+                         int32_t valid);
 
 int32_t default_fsetattr_resume (call_frame_t *frame,
                           xlator_t *this,
                           fd_t *fd,
                           struct iatt *stbuf,
-                          int32_t valid, dict_t *xdata);
-
-int32_t default_fallocate_resume(call_frame_t *frame,
-				 xlator_t *this,
-				 fd_t *fd,
-				 int32_t keep_size, off_t offset,
-				 size_t len, dict_t *xdata);
-
-int32_t default_discard_resume(call_frame_t *frame,
-			       xlator_t *this,
-			       fd_t *fd,
-			       off_t offset,
-			       size_t len, dict_t *xdata);
-
-int32_t default_zerofill_resume(call_frame_t *frame,
-                               xlator_t *this,
-                               fd_t *fd,
-                               off_t offset,
-                               size_t len, dict_t *xdata);
-
+                          int32_t valid);
 
 /* _cbk */
 
 int32_t
 default_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, inode_t *inode,
-                    struct iatt *buf, dict_t *xdata, struct iatt *postparent);
+                    struct iatt *buf, dict_t *dict, struct iatt *postparent);
 
 int32_t
 default_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, struct iatt *buf, dict_t *xdata);
+                  int32_t op_ret, int32_t op_errno, struct iatt *buf);
 
 
 int32_t
 default_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                      struct iatt *postbuf, dict_t *xdata);
+                      struct iatt *postbuf);
 
 int32_t
 default_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                       struct iatt *postbuf, dict_t *xdata);
+                       struct iatt *postbuf);
 
 int32_t
 default_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                    int32_t op_ret, int32_t op_errno);
 
 int32_t
 default_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno, const char *path,
-                      struct iatt *buf, dict_t *xdata);
+                      struct iatt *buf);
 
 
 int32_t
 default_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, inode_t *inode,
                    struct iatt *buf, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata);
+                   struct iatt *postparent);
 
 int32_t
 default_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, inode_t *inode,
                    struct iatt *buf, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata);
+                   struct iatt *postparent);
 
 int32_t
 default_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata);
+                    struct iatt *postparent);
 
 int32_t
 default_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata);
+                   struct iatt *postparent);
 
 
 int32_t
 default_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, inode_t *inode,
                      struct iatt *buf, struct iatt *preparent,
-                     struct iatt *postparent, dict_t *xdata);
+                     struct iatt *postparent);
 
 
 int32_t
 default_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, struct iatt *buf,
                     struct iatt *preoldparent, struct iatt *postoldparent,
-                    struct iatt *prenewparent, struct iatt *postnewparent, dict_t *xdata);
+                    struct iatt *prenewparent, struct iatt *postnewparent);
 
 
 int32_t
 default_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                   int32_t op_ret, int32_t op_errno, inode_t *inode,
                   struct iatt *buf, struct iatt *preparent,
-                  struct iatt *postparent, dict_t *xdata);
+                  struct iatt *postparent);
 
 
 int32_t
 default_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, fd_t *fd, inode_t *inode,
                     struct iatt *buf, struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata);
+                    struct iatt *postparent);
 
 int32_t
 default_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, fd_t *fd, dict_t *xdata);
+                  int32_t op_ret, int32_t op_errno, fd_t *fd);
 
 int32_t
 default_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, struct iovec *vector,
-                   int32_t count, struct iatt *stbuf, struct iobref *iobref, dict_t *xdata);
+                   int32_t count, struct iatt *stbuf, struct iobref *iobref);
 
 
 int32_t
 default_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                    struct iatt *postbuf, dict_t *xdata);
+                    struct iatt *postbuf);
 
 
 int32_t
 default_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                   int32_t op_ret, int32_t op_errno);
 
 
 
 int32_t
 default_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                   struct iatt *postbuf, dict_t *xdata);
+                   struct iatt *postbuf);
 
 int32_t
 default_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, struct iatt *buf, dict_t *xdata);
+                   int32_t op_ret, int32_t op_errno, struct iatt *buf);
 
 int32_t
 default_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, fd_t *fd, dict_t *xdata);
+                     int32_t op_ret, int32_t op_errno, fd_t *fd);
 
 int32_t
 default_fsyncdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                      int32_t op_ret, int32_t op_errno);
 
 int32_t
 default_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno, struct statvfs *buf, dict_t *xdata);
+                    int32_t op_ret, int32_t op_errno, struct statvfs *buf);
 
 
 int32_t
 default_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                      int32_t op_ret, int32_t op_errno);
 
 
 int32_t
 default_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                       int32_t op_ret, int32_t op_errno);
 
 
 
 int32_t
 default_fgetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int32_t op_ret, int32_t op_errno, dict_t *dict, dict_t *xdata);
+                       int32_t op_ret, int32_t op_errno, dict_t *dict);
 
 
 int32_t
 default_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, dict_t *dict, dict_t *xdata);
+                      int32_t op_ret, int32_t op_errno, dict_t *dict);
 
 int32_t
 default_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, dict_t *dict, dict_t *xdata);
+                     int32_t op_ret, int32_t op_errno, dict_t *dict);
 
 int32_t
 default_fxattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, dict_t *dict, dict_t *xdata);
+                      int32_t op_ret, int32_t op_errno, dict_t *dict);
 
 
 int32_t
 default_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                         int32_t op_ret, int32_t op_errno, dict_t *xdata);
-
-int32_t
-default_fremovexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                         int32_t op_ret, int32_t op_errno);
 
 int32_t
 default_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                int32_t op_ret, int32_t op_errno, struct gf_flock *lock, dict_t *xdata);
+                int32_t op_ret, int32_t op_errno, struct gf_flock *lock);
 
 int32_t
 default_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                     int32_t op_ret, int32_t op_errno);
 
 
 int32_t
 default_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                      int32_t op_ret, int32_t op_errno);
 
 int32_t
 default_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                     int32_t op_ret, int32_t op_errno);
 
 int32_t
 default_fentrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, dict_t *xdata);
+                      int32_t op_ret, int32_t op_errno);
 
 
 int32_t
 default_rchecksum_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int32_t op_ret, int32_t op_errno, uint32_t weak_checksum,
-                       uint8_t *strong_checksum, dict_t *xdata);
+                       uint8_t *strong_checksum);
 
 
 int32_t
 default_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, gf_dirent_t *entries, dict_t *xdata);
+                     int32_t op_ret, int32_t op_errno, gf_dirent_t *entries);
 
 
 int32_t
 default_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, gf_dirent_t *entries, dict_t *xdata);
+                      int32_t op_ret, int32_t op_errno, gf_dirent_t *entries);
 
 int32_t
 default_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, struct iatt *statpre,
-                     struct iatt *statpost, dict_t *xdata);
+                     struct iatt *statpost);
 
 int32_t
 default_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno, struct iatt *statpre,
-                      struct iatt *statpost, dict_t *xdata);
-
-int32_t default_fallocate_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-			      int32_t op_ret, int32_t op_errno, struct iatt *pre,
-			      struct iatt *post, dict_t *xdata);
-
-int32_t default_discard_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-			    int32_t op_ret, int32_t op_errno, struct iatt *pre,
-			    struct iatt *post, dict_t *xdata);
-
-int32_t default_zerofill_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-                            int32_t op_ret, int32_t op_errno, struct iatt *pre,
-                            struct iatt *post, dict_t *xdata);
+                      struct iatt *statpost);
 
 int32_t
 default_getspec_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c
index 3b7ddce5e..cfa1b8317 100644
--- a/libglusterfs/src/dict.c
+++ b/libglusterfs/src/dict.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <unistd.h>
@@ -13,8 +22,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include <limits.h>
-#include <fnmatch.h>
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -28,14 +35,23 @@
 #include "logging.h"
 #include "compat.h"
 #include "byte-order.h"
-#include "globals.h"
+
+data_pair_t *
+get_new_data_pair ()
+{
+        data_pair_t *data_pair_ptr = NULL;
+
+        data_pair_ptr = (data_pair_t *) GF_CALLOC (1, sizeof (data_pair_t),
+                                                   gf_common_mt_data_pair_t);
+        return data_pair_ptr;
+}
 
 data_t *
 get_new_data ()
 {
         data_t *data = NULL;
 
-        data = mem_get0 (THIS->ctx->dict_data_pool);
+        data = (data_t *) GF_CALLOC (1, sizeof (data_t), gf_common_mt_data_t);
         if (!data) {
                 return NULL;
         }
@@ -47,39 +63,19 @@ get_new_data ()
 dict_t *
 get_new_dict_full (int size_hint)
 {
-        dict_t *dict = mem_get0 (THIS->ctx->dict_pool);
+        dict_t *dict = GF_CALLOC (1, sizeof (dict_t), gf_common_mt_dict_t);
 
         if (!dict) {
                 return NULL;
         }
 
         dict->hash_size = size_hint;
-        if (size_hint == 1) {
-                /*
-                 * This is the only case we ever see currently.  If we ever
-                 * need to support resizing the hash table, the resize function
-                 * will have to take into account the possibility that
-                 * "members" is not separately allocated (i.e. don't just call
-                 * realloc() blindly.
-                 */
-                dict->members = &dict->members_internal;
-        }
-        else {
-                /*
-                 * We actually need to allocate space for size_hint *pointers*
-                 * but we actually allocate space for one *structure*.  Since
-                 * a data_pair_t consists of five pointers, we're wasting four
-                 * pointers' worth for N=1, and will overrun what we allocated
-                 * for N>5.  If anybody ever starts using size_hint, we'll need
-                 * to fix this.
-                 */
-                GF_ASSERT (size_hint <=
-                           (sizeof(data_pair_t) / sizeof(data_pair_t *)));
-                dict->members = mem_get0 (THIS->ctx->dict_pair_pool);
-                if (!dict->members) {
-                        mem_put (dict);
-                        return NULL;
-                }
+        dict->members = GF_CALLOC (size_hint, sizeof (data_pair_t *),
+                                   gf_common_mt_data_pair_t);
+
+        if (!dict->members) {
+                GF_FREE (dict);
+                return NULL;
         }
 
         LOCK_INIT (&dict->lock);
@@ -111,12 +107,9 @@ int32_t
 is_data_equal (data_t *one,
                data_t *two)
 {
-        if (!one || !two || !one->data || !two->data) {
-		gf_log_callingfn ("dict", GF_LOG_ERROR,
-				  "input arguments are provided "
-				  "with value data_t as NULL");
-                return -1;
-	}
+        /* LOG-TODO */
+        if (!one || !two || !one->data || !two->data)
+                return 1;
 
         if (one == two)
                 return 1;
@@ -146,11 +139,13 @@ data_destroy (data_t *data)
                                 else
                                         GF_FREE (data->data);
                         }
+                        if (data->vec)
+                                GF_FREE (data->vec);
                 }
 
                 data->len = 0xbabababa;
                 if (!data->is_const)
-                        mem_put (data);
+                        GF_FREE (data);
         }
 }
 
@@ -163,7 +158,9 @@ data_copy (data_t *old)
                 return NULL;
         }
 
-        data_t *newdata = mem_get0 (THIS->ctx->dict_data_pool);
+        data_t *newdata = (data_t *) GF_CALLOC (1, sizeof (*newdata),
+                                                gf_common_mt_data_t);
+
         if (!newdata) {
                 return NULL;
         }
@@ -175,6 +172,12 @@ data_copy (data_t *old)
                         if (!newdata->data)
                                 goto err_out;
                 }
+                if (old->vec) {
+                        newdata->vec = memdup (old->vec, old->len * (sizeof (void *) +
+                                                                     sizeof (size_t)));
+                        if (!newdata->vec)
+                                goto err_out;
+                }
         }
 
         LOCK_INIT (&newdata->lock);
@@ -182,8 +185,11 @@ data_copy (data_t *old)
 
 err_out:
 
-        FREE (newdata->data);
-        mem_put (newdata);
+        if (newdata->data)
+                FREE (newdata->data);
+        if (newdata->vec)
+                FREE (newdata->vec);
+        GF_FREE (newdata);
 
         return NULL;
 }
@@ -208,31 +214,11 @@ _dict_lookup (dict_t *this, char *key)
         return NULL;
 }
 
-int32_t
-dict_lookup (dict_t *this, char *key, data_t **data)
-{
-        if (!this || !key || !data) {
-                gf_log_callingfn ("dict", GF_LOG_WARNING,
-                                  "!this || !key || !data");
-                return -1;
-        }
-
-        data_pair_t *tmp = NULL;
-        LOCK (&this->lock);
-        {
-                tmp = _dict_lookup (this, key);
-        }
-        UNLOCK (&this->lock);
-
-        if (!tmp)
-                return -1;
-
-        *data = tmp->value;
-        return 0;
-}
 
 static int32_t
-_dict_set (dict_t *this, char *key, data_t *value, gf_boolean_t replace)
+_dict_set (dict_t *this,
+           char *key,
+           data_t *value)
 {
         int hashval;
         data_pair_t *pair;
@@ -251,54 +237,34 @@ _dict_set (dict_t *this, char *key, data_t *value, gf_boolean_t replace)
 
         tmp = SuperFastHash (key, strlen (key));
         hashval = (tmp % this->hash_size);
+        pair = _dict_lookup (this, key);
 
-        /* Search for a existing key if 'replace' is asked for */
-        if (replace) {
-                pair = _dict_lookup (this, key);
-
-                if (pair) {
-                        data_t *unref_data = pair->value;
-                        pair->value = data_ref (value);
-                        data_unref (unref_data);
-                        if (key_free)
-                                GF_FREE (key);
-                        /* Indicates duplicate key */
-                        return 0;
-                }
-        }
-
-        if (this->free_pair_in_use) {
-                pair = mem_get0 (THIS->ctx->dict_pair_pool);
-                if (!pair) {
-                        if (key_free)
-                                GF_FREE (key);
-                        return -1;
-                }
+        if (pair) {
+                data_t *unref_data = pair->value;
+                pair->value = data_ref (value);
+                data_unref (unref_data);
+                if (key_free)
+                        GF_FREE (key);
+                /* Indicates duplicate key */
+                return 0;
         }
-        else {
-                pair = &this->free_pair;
-                this->free_pair_in_use = _gf_true;
+        pair = (data_pair_t *) GF_CALLOC (1, sizeof (*pair),
+                                          gf_common_mt_data_pair_t);
+        if (!pair) {
+                return -1;
         }
 
-        if (key_free) {
-                /* It's ours.  Use it. */
-                pair->key = key;
-                key_free = 0;
-        }
-        else {
-                pair->key = (char *) GF_CALLOC (1, strlen (key) + 1,
-                                                gf_common_mt_char);
-                if (!pair->key) {
-                        if (pair == &this->free_pair) {
-                                this->free_pair_in_use = _gf_false;
-                        }
-                        else {
-                                mem_put (pair);
-                        }
-                        return -1;
-                }
-                strcpy (pair->key, key);
+        pair->key = (char *) GF_CALLOC (1, strlen (key) + 1,
+                                        gf_common_mt_char);
+        if (!pair->key) {
+                GF_FREE (pair);
+
+                if (key_free)
+                        GF_FREE (key);
+                return -1;
         }
+
+        strcpy (pair->key, key);
         pair->value = data_ref (value);
 
         pair->hash_next = this->members[hashval];
@@ -331,28 +297,7 @@ dict_set (dict_t *this,
 
         LOCK (&this->lock);
 
-        ret = _dict_set (this, key, value, 1);
-
-        UNLOCK (&this->lock);
-
-        return ret;
-}
-
-
-int32_t
-dict_add (dict_t *this, char *key, data_t *value)
-{
-        int32_t ret;
-
-        if (!this || !value) {
-                gf_log_callingfn ("dict", GF_LOG_WARNING,
-                                  "!this || !value for key=%s", key);
-                return -1;
-        }
-
-        LOCK (&this->lock);
-
-        ret = _dict_set (this, key, value, 0);
+        ret = _dict_set (this, key, value);
 
         UNLOCK (&this->lock);
 
@@ -416,12 +361,7 @@ dict_del (dict_t *this, char *key)
                                 pair->next->prev = pair->prev;
 
                         GF_FREE (pair->key);
-                        if (pair == &this->free_pair) {
-                                this->free_pair_in_use = _gf_false;
-                        }
-                        else {
-                                mem_put (pair);
-                        }
+                        GF_FREE (pair);
                         this->count--;
                         break;
                 }
@@ -452,21 +392,19 @@ dict_destroy (dict_t *this)
                 pair = pair->next;
                 data_unref (prev->value);
                 GF_FREE (prev->key);
-                if (prev != &this->free_pair) {
-                        mem_put (prev);
-                }
+                GF_FREE (prev);
                 prev = pair;
         }
 
-        if (this->members != &this->members_internal) {
-                mem_put (this->members);
-        }
+        GF_FREE (this->members);
 
-        GF_FREE (this->extra_free);
-        free (this->extra_stdfree);
+        if (this->extra_free)
+                GF_FREE (this->extra_free);
+        if (this->extra_stdfree)
+                free (this->extra_stdfree);
 
         if (!this->is_static)
-                mem_put (this);
+                GF_FREE (this);
 
         return;
 }
@@ -547,6 +485,236 @@ data_ref (data_t *this)
         return this;
 }
 
+/*
+  Serialization format:
+  ----
+  Count:8
+  Key_len:8:Value_len:8
+  Key
+  Value
+  .
+  .
+  .
+*/
+
+int32_t
+dict_serialized_length_old (dict_t *this)
+{
+
+        if (!this) {
+                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");
+                return -1;
+        }
+
+        int32_t len = 9; /* count + \n */
+        int32_t count = this->count;
+        data_pair_t *pair = this->members_list;
+
+        while (count) {
+                len += 18;
+                len += strlen (pair->key) + 1;
+                if (pair->value->vec) {
+                        int i;
+                        for (i=0; i<pair->value->len; i++) {
+                                len += pair->value->vec[i].iov_len;
+                        }
+                } else {
+                        len += pair->value->len;
+                }
+                pair = pair->next;
+                count--;
+        }
+
+        return len;
+}
+
+int32_t
+dict_serialize_old (dict_t *this, char *buf)
+{
+        if (!this || !buf) {
+                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");
+                return -1;
+        }
+
+        data_pair_t *pair = this->members_list;
+        int32_t count = this->count;
+        uint64_t dcount = this->count;
+
+        // FIXME: magic numbers
+
+        sprintf (buf, "%08"PRIx64"\n", dcount);
+        buf += 9;
+        while (count) {
+                uint64_t keylen = strlen (pair->key) + 1;
+                uint64_t vallen = pair->value->len;
+
+                sprintf (buf, "%08"PRIx64":%08"PRIx64"\n", keylen, vallen);
+                buf += 18;
+                memcpy (buf, pair->key, keylen);
+                buf += keylen;
+                memcpy (buf, pair->value->data, pair->value->len);
+                buf += pair->value->len;
+                pair = pair->next;
+                count--;
+        }
+        return (0);
+}
+
+
+dict_t *
+dict_unserialize_old (char *buf, int32_t size, dict_t **fill)
+{
+        int32_t ret = 0;
+        int32_t cnt = 0;
+
+        if (!buf || !fill || !(*fill)) {
+                gf_log_callingfn ("dict", GF_LOG_WARNING, "buf is NULL");
+                return NULL;
+        }
+
+        uint64_t count;
+        ret = sscanf (buf, "%"SCNx64"\n", &count);
+        (*fill)->count = 0;
+
+        if (!ret){
+                gf_log ("dict", GF_LOG_ERROR, "sscanf on buf failed");
+                goto err;
+        }
+        buf += 9;
+
+        if (count == 0) {
+                gf_log ("dict", GF_LOG_ERROR, "count == 0");
+                goto err;
+        }
+
+        for (cnt = 0; cnt < count; cnt++) {
+                data_t *value = NULL;
+                char *key = NULL;
+                uint64_t key_len, value_len;
+
+                ret = sscanf (buf, "%"SCNx64":%"SCNx64"\n", &key_len, &value_len);
+                if (ret != 2) {
+                        gf_log ("dict", GF_LOG_ERROR,
+                                "sscanf for key_len and value_len failed");
+                        goto err;
+                }
+                buf += 18;
+
+                key = buf;
+                buf += key_len;
+
+                value = get_new_data ();
+                value->len = value_len;
+                value->data = buf;
+                value->is_static = 1;
+                buf += value_len;
+
+                dict_set (*fill, key, value);
+        }
+
+        goto ret;
+
+err:
+        GF_FREE (*fill);
+        *fill = NULL;
+
+ret:
+        return *fill;
+}
+
+
+int32_t
+dict_iovec_len (dict_t *this)
+{
+        if (!this) {
+                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");
+                return -1;
+        }
+
+        int32_t len = 0;
+        data_pair_t *pair = this->members_list;
+
+        len++; /* initial header */
+        while (pair) {
+                len++; /* pair header */
+                len++; /* key */
+
+                if (pair->value->vec)
+                        len += pair->value->len;
+                else
+                        len++;
+                pair = pair->next;
+        }
+
+        return len;
+}
+
+int32_t
+dict_to_iovec (dict_t *this,
+               struct iovec *vec,
+               int32_t count)
+{
+        if (!this || !vec) {
+                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");
+                return -1;
+        }
+
+        int32_t i = 0;
+        data_pair_t *pair = this->members_list;
+
+        vec[0].iov_len = 9;
+        if (vec[0].iov_base)
+                sprintf (vec[0].iov_base,
+                         "%08"PRIx64"\n",
+                         (int64_t)this->count);
+        i++;
+
+        while (pair) {
+                int64_t keylen = strlen (pair->key) + 1;
+                int64_t vallen = 0;
+
+                if (pair->value->vec) {
+                        int i;
+
+                        for (i=0; i<pair->value->len; i++) {
+                                vallen += pair->value->vec[i].iov_len;
+                        }
+                } else {
+                        vallen = pair->value->len;
+                }
+
+                vec[i].iov_len = 18;
+                if (vec[i].iov_base)
+                        sprintf (vec[i].iov_base,
+                                 "%08"PRIx64":%08"PRIx64"\n",
+                                 keylen,
+                                 vallen);
+                i++;
+
+                vec[i].iov_len = keylen;
+                vec[i].iov_base = pair->key;
+                i++;
+
+                if (pair->value->vec) {
+                        int k;
+
+                        for (k=0; k<pair->value->len; k++) {
+                                vec[i].iov_len = pair->value->vec[k].iov_len;
+                                vec[i].iov_base = pair->value->vec[k].iov_base;
+                                i++;
+                        }
+                } else {
+                        vec[i].iov_len = pair->value->len;
+                        vec[i].iov_base = pair->value->data;
+                        i++;
+                }
+
+                pair = pair->next;
+        }
+
+        return 0;
+}
+
 data_t *
 int_to_data (int64_t value)
 {
@@ -896,8 +1064,6 @@ data_to_int32 (data_t *data)
 int16_t
 data_to_int16 (data_t *data)
 {
-        int16_t value = 0;
-
         if (!data) {
                 gf_log_callingfn ("dict", GF_LOG_WARNING, "data is NULL");
                 return -1;
@@ -910,26 +1076,13 @@ data_to_int16 (data_t *data)
         memcpy (str, data->data, data->len);
         str[data->len] = '\0';
 
-        errno = 0;
-        value = strtol (str, NULL, 0);
-
-        if ((value > SHRT_MAX) || (value < SHRT_MIN)) {
-                errno = ERANGE;
-                gf_log_callingfn ("dict", GF_LOG_WARNING,
-                                  "Error in data conversion: "
-                                  "detected overflow");
-                return -1;
-        }
-
-        return (int16_t)value;
+        return strtol (str, NULL, 0);
 }
 
 
 int8_t
 data_to_int8 (data_t *data)
 {
-        int8_t value = 0;
-
         if (!data) {
                 gf_log_callingfn ("dict", GF_LOG_WARNING, "data is NULL");
                 return -1;
@@ -942,18 +1095,7 @@ data_to_int8 (data_t *data)
         memcpy (str, data->data, data->len);
         str[data->len] = '\0';
 
-        errno = 0;
-        value = strtol (str, NULL, 0);
-
-        if ((value > SCHAR_MAX) || (value < SCHAR_MIN)) {
-                errno = ERANGE;
-                gf_log_callingfn ("dict", GF_LOG_WARNING,
-                                  "Error in data conversion: "
-                                  "detected overflow");
-                return -1;
-        }
-
-        return (int8_t)value;
+        return (int8_t)strtol (str, NULL, 0);
 }
 
 
@@ -991,8 +1133,6 @@ data_to_uint32 (data_t *data)
 uint16_t
 data_to_uint16 (data_t *data)
 {
-	uint16_t value = 0;
-
         if (!data)
                 return -1;
 
@@ -1003,49 +1143,7 @@ data_to_uint16 (data_t *data)
         memcpy (str, data->data, data->len);
         str[data->len] = '\0';
 
-	errno = 0;
-	value = strtol (str, NULL, 0);
-
-	if ((USHRT_MAX - value) < 0) {
-		errno = ERANGE;
-		gf_log_callingfn ("dict", GF_LOG_WARNING,
-				  "Error in data conversion: "
-				  "overflow detected");
-		return -1;
-	}
-
-        return (uint16_t)value;
-}
-
-uint8_t
-data_to_uint8 (data_t *data)
-{
-	uint32_t value = 0;
-
-        if (!data) {
-		gf_log_callingfn ("dict", GF_LOG_WARNING, "data is NULL");
-                return -1;
-	}
-
-        char *str = alloca (data->len + 1);
-        if (!str)
-                return -1;
-
-        memcpy (str, data->data, data->len);
-        str[data->len] = '\0';
-
-	errno = 0;
-	value = strtol (str, NULL, 0);
-
-	if ((UCHAR_MAX - value) < 0) {
-		errno = ERANGE;
-		gf_log_callingfn ("dict", GF_LOG_WARNING,
-				  "data conversion overflow detected (%s)",
-				  strerror(errno));
-		return -1;
-	}
-
-        return (uint8_t) value;
+        return strtol (str, NULL, 0);
 }
 
 char *
@@ -1078,141 +1176,38 @@ data_to_bin (data_t *data)
         return data->data;
 }
 
-int
-dict_null_foreach_fn (dict_t *d, char *k,
-                      data_t *v, void *tmp)
-{
-        return 0;
-}
-
-int
+void
 dict_foreach (dict_t *dict,
-              int (*fn)(dict_t *this,
-                        char *key,
-                        data_t *value,
-                        void *data),
+              void (*fn)(dict_t *this,
+                         char *key,
+                         data_t *value,
+                         void *data),
               void *data)
 {
         if (!dict) {
                 gf_log_callingfn ("dict", GF_LOG_WARNING,
                                   "dict is NULL");
-                return -1;
-        }
-
-        int          ret   = -1;
-        data_pair_t *pairs = NULL;
-        data_pair_t *next  = NULL;
-
-        pairs = dict->members_list;
-        while (pairs) {
-                next = pairs->next;
-                ret = fn (dict, pairs->key, pairs->value, data);
-                if (ret == -1)
-                        return -1;
-                pairs = next;
-        }
-
-        return 0;
-}
-
-/* return values:
-   -1 = failure,
-    0 = no matches found,
-   +n = n number of matches
-*/
-int
-dict_foreach_fnmatch (dict_t *dict, char *pattern,
-                      int (*fn)(dict_t *this,
-                                char *key,
-                                data_t *value,
-                                void *data),
-                      void *data)
-{
-        if (!dict) {
-                gf_log_callingfn ("dict", GF_LOG_WARNING,
-                                  "dict is NULL");
-                return 0;
+                return;
         }
 
-        int          ret = -1;
-        int          count = 0;
-        data_pair_t *pairs = NULL;
-        data_pair_t *next  = NULL;
+        data_pair_t *pairs = dict->members_list;
+        data_pair_t *next = NULL;
 
-        pairs = dict->members_list;
         while (pairs) {
                 next = pairs->next;
-                if (!fnmatch (pattern, pairs->key, 0)) {
-                        ret = fn (dict, pairs->key, pairs->value, data);
-                        if (ret == -1)
-                                return -1;
-                        count++;
-                }
+                fn (dict, pairs->key, pairs->value, data);
                 pairs = next;
         }
-
-        return count;
 }
 
 
-/**
- * dict_keys_join - pack the keys of the dictionary in a buffer.
- *
- * @value     : buffer in which the keys will be packed (can be NULL)
- * @size      : size of the buffer which is sent (can be 0, in which case buffer
- *              is not packed but only length is returned)
- * @dict      : dictionary of which all the keys will be packed
- * @filter_fn : keys matched in filter_fn() is counted.
- *
- * @return : @length of string after joining keys.
- *
- */
-
-int
-dict_keys_join (void *value, int size, dict_t *dict,
-                int (*filter_fn)(char *k))
-{
-	int          len = 0;
-        data_pair_t *pairs = NULL;
-        data_pair_t *next  = NULL;
-
-        pairs = dict->members_list;
-        while (pairs) {
-                next = pairs->next;
-
-                if (filter_fn && filter_fn (pairs->key)){
-		    pairs = next;
-		    continue;
-		}
-
-		if (value && (size > len))
-			strncpy (value + len, pairs->key, size - len);
-
-                len += (strlen (pairs->key) + 1);
-
-                pairs = next;
-        }
-
-	return len;
-}
-
-static int
+static void
 _copy (dict_t *unused,
        char *key,
        data_t *value,
        void *newdict)
 {
-        return dict_set ((dict_t *)newdict, key, (value));
-}
-
-static int
-_remove (dict_t *dict,
-         char *key,
-         data_t *value,
-         void *unused)
-{
-        dict_del ((dict_t *)dict, key);
-        return 0;
+        dict_set ((dict_t *)newdict, key, (value));
 }
 
 
@@ -1233,20 +1228,6 @@ dict_copy (dict_t *dict,
         return new;
 }
 
-int
-dict_reset (dict_t *dict)
-{
-        int32_t         ret = -1;
-        if (!dict) {
-                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");
-                goto out;
-        }
-        dict_foreach (dict, _remove, NULL);
-        ret = 0;
-out:
-        return ret;
-}
-
 dict_t *
 dict_copy_with_ref (dict_t *dict,
                     dict_t *new)
@@ -1266,6 +1247,28 @@ fail:
         return new;
 }
 
+static void
+_remove (dict_t *dict,
+         char *key,
+         data_t *value,
+         void *unused)
+{
+        dict_del ((dict_t *)dict, key);
+}
+
+int
+dict_reset (dict_t *dict)
+{
+        int32_t         ret = -1;
+        if (!dict) {
+                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");
+                goto out;
+        }
+        dict_foreach (dict, _remove, NULL);
+        ret = 0;
+out:
+        return ret;
+}
 /*
  * !!!!!!! CLEANED UP CODE !!!!!!!
  */
@@ -1955,36 +1958,6 @@ err:
 }
 
 int
-dict_get_ptr_and_len (dict_t *this, char *key, void **ptr, int *len)
-{
-        data_t * data = NULL;
-        int      ret  = 0;
-
-        if (!this || !key || !ptr) {
-                ret = -EINVAL;
-                goto err;
-        }
-
-        ret = dict_get_with_ref (this, key, &data);
-        if (ret != 0) {
-                goto err;
-        }
-
-	*len = data->len;
-
-        ret = _data_to_ptr (data, ptr);
-        if (ret != 0) {
-                goto err;
-        }
-
-err:
-        if (data)
-                data_unref (data);
-
-        return ret;
-}
-
-int
 dict_set_ptr (dict_t *this, char *key, void *ptr)
 {
         data_t * data = NULL;
@@ -2259,6 +2232,7 @@ _dict_serialized_length (dict_t *this)
         int ret            = -EINVAL;
         int count          = 0;
         int len            = 0;
+        int i              = 0;
         data_pair_t * pair = NULL;
 
         len = DICT_HDR_LEN;
@@ -2293,14 +2267,27 @@ _dict_serialized_length (dict_t *this)
                         goto out;
                 }
 
-                if (pair->value->len < 0) {
-                        gf_log ("dict", GF_LOG_ERROR,
-                                "value->len (%d) < 0",
-                                pair->value->len);
-                        goto out;
-                }
+                if (pair->value->vec) {
+                        for (i = 0; i < pair->value->len; i++) {
+                                if (pair->value->vec[i].iov_len < 0) {
+                                        gf_log ("dict", GF_LOG_ERROR,
+                                                "iov_len (%"GF_PRI_SIZET") < 0!",
+                                                pair->value->vec[i].iov_len);
+                                        goto out;
+                                }
 
-                len += pair->value->len;
+                                len += pair->value->vec[i].iov_len;
+                        }
+                } else {
+                        if (pair->value->len < 0) {
+                                gf_log ("dict", GF_LOG_ERROR,
+                                        "value->len (%d) < 0",
+                                        pair->value->len);
+                                goto out;
+                        }
+
+                        len += pair->value->len;
+                }
 
                 pair = pair->next;
                 count--;
@@ -2576,7 +2563,6 @@ dict_unserialize (char *orig_buf, int32_t size, dict_t **fill)
                                           "available (%lu) < required (%lu)",
                                           (long)(orig_buf + size),
                                           (long)(buf + vallen));
-                        goto out;
                 }
                 value = get_new_data ();
                 value->len  = vallen;
@@ -2584,7 +2570,7 @@ dict_unserialize (char *orig_buf, int32_t size, dict_t **fill)
                 value->is_static = 0;
                 buf += vallen;
 
-                dict_add (*fill, key, value);
+                dict_set (*fill, key, value);
         }
 
         ret = 0;
@@ -2605,7 +2591,7 @@ out:
  */
 
 int32_t
-dict_allocate_and_serialize (dict_t *this, char **buf, u_int *length)
+dict_allocate_and_serialize (dict_t *this, char **buf, size_t *length)
 {
         int           ret    = -EINVAL;
         ssize_t       len = 0;
@@ -2742,40 +2728,3 @@ dict_serialize_value_with_delim (dict_t *this, char *buf, int32_t *serz_len,
 out:
         return ret;
 }
-
-void
-dict_dump (dict_t *this)
-{
-        int          ret     = 0;
-        int          dumplen = 0;
-        data_pair_t *trav    = NULL;
-        char         dump[64*1024]; /* This is debug only, hence
-                                       performance should not matter */
-
-        if (!this) {
-                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict NULL");
-                goto out;
-        }
-
-        dump[0] = '\0'; /* the array is not initialized to '\0' */
-
-        /* There is a possibility of issues if data is binary, ignore it
-           for now as debugging is more important */
-        for (trav = this->members_list; trav; trav = trav->next) {
-                ret = snprintf (&dump[dumplen], ((64*1024) - dumplen - 1),
-                                "(%s:%s)", trav->key, trav->value->data);
-                if ((ret == -1) || !ret)
-                        break;
-
-                dumplen += ret;
-                /* snprintf doesn't append a trailing '\0', add it here */
-                dump[dumplen] = '\0';
-        }
-
-        if (dumplen)
-                gf_log_callingfn ("dict", GF_LOG_INFO,
-                                  "dict=%p (%s)", this, dump);
-
-out:
-        return;
-}
diff --git a/libglusterfs/src/dict.h b/libglusterfs/src/dict.h
index 9b41b5a7d..76a085ee7 100644
--- a/libglusterfs/src/dict.h
+++ b/libglusterfs/src/dict.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _DICT_H
@@ -26,47 +35,12 @@ typedef struct _data data_t;
 typedef struct _dict dict_t;
 typedef struct _data_pair data_pair_t;
 
-
-#define GF_PROTOCOL_DICT_SERIALIZE(this,from_dict,to,len,ope,labl) do { \
-                int    ret     = 0;                                     \
-                                                                        \
-                if (!from_dict)                                         \
-                        break;                                          \
-                                                                        \
-                ret = dict_allocate_and_serialize (from_dict, to, &len);\
-                if (ret < 0) {                                          \
-                        gf_log (this->name, GF_LOG_WARNING,             \
-                                "failed to get serialized dict (%s)",   \
-                                (#from_dict));                          \
-                        ope = EINVAL;                                   \
-                        goto labl;                                      \
-                }                                                       \
-        } while (0)
-
-
-#define GF_PROTOCOL_DICT_UNSERIALIZE(xl,to,buff,len,ret,ope,labl) do {  \
-                if (!len)                                               \
-                        break;                                          \
-                to = dict_new();                                        \
-                GF_VALIDATE_OR_GOTO (xl->name, to, labl);               \
-                                                                        \
-                ret = dict_unserialize (buff, len, &to);                 \
-                if (ret < 0) {                                          \
-                        gf_log (xl->name, GF_LOG_WARNING,               \
-                                "failed to unserialize dictionary (%s)", \
-                                (#to));                                 \
-                                                                        \
-                        ope = EINVAL;                                   \
-                        goto labl;                                      \
-                }                                                       \
-                                                                        \
-        } while (0)
-
 struct _data {
         unsigned char  is_static:1;
         unsigned char  is_const:1;
         unsigned char  is_stdalloc:1;
         int32_t        len;
+        struct iovec  *vec;
         char          *data;
         int32_t        refcount;
         gf_lock_t      lock;
@@ -90,20 +64,13 @@ struct _dict {
         char           *extra_free;
         char           *extra_stdfree;
         gf_lock_t       lock;
-        data_pair_t    *members_internal;
-        data_pair_t     free_pair;
-        gf_boolean_t    free_pair_in_use;
 };
 
 
 int32_t is_data_equal (data_t *one, data_t *two);
 void data_destroy (data_t *data);
 
-/* function to set a key/value pair (overwrite existing if matches the key */
 int32_t dict_set (dict_t *this, char *key, data_t *value);
-/* function to set a new key/value pair (without checking for duplicate) */
-int32_t dict_add (dict_t *this, char *key, data_t *value);
-
 data_t *dict_get (dict_t *this, char *key);
 void dict_del (dict_t *this, char *key);
 int dict_reset (dict_t *dict);
@@ -112,7 +79,10 @@ int32_t dict_serialized_length (dict_t *dict);
 int32_t dict_serialize (dict_t *dict, char *buf);
 int32_t dict_unserialize (char *buf, int32_t size, dict_t **fill);
 
-int32_t dict_allocate_and_serialize (dict_t *this, char **buf, u_int *length);
+int32_t dict_allocate_and_serialize (dict_t *this, char **buf, size_t *length);
+
+int32_t dict_iovec_len (dict_t *dict);
+int32_t dict_to_iovec (dict_t *dict, struct iovec *vec, int32_t count);
 
 void dict_destroy (dict_t *dict);
 void dict_unref (dict_t *dict);
@@ -120,7 +90,6 @@ dict_t *dict_ref (dict_t *dict);
 data_t *data_ref (data_t *data);
 void data_unref (data_t *data);
 
-int32_t dict_lookup  (dict_t *this, char *key, data_t **data);
 /*
    TODO: provide converts for differnt byte sizes, signedness, and void *
  */
@@ -140,7 +109,6 @@ int8_t data_to_int8 (data_t *data);
 uint64_t data_to_uint64 (data_t *data);
 uint32_t data_to_uint32 (data_t *data);
 uint16_t data_to_uint16 (data_t *data);
-uint8_t data_to_uint8 (data_t *data);
 
 data_t *data_from_ptr (void *value);
 data_t *data_from_static_ptr (void *value);
@@ -163,33 +131,21 @@ data_t * data_copy (data_t *old);
 dict_t *get_new_dict_full (int size_hint);
 dict_t *get_new_dict ();
 
-int dict_foreach (dict_t *this,
-                  int (*fn)(dict_t *this,
-                            char *key,
-                            data_t *value,
-                            void *data),
-                  void *data);
-
-int dict_foreach_fnmatch (dict_t *dict, char *pattern,
-                          int (*fn)(dict_t *this,
-                                    char *key,
-                                    data_t *value,
-                                    void *data),
-                          void *data);
+data_pair_t *get_new_data_pair ();
 
-int dict_null_foreach_fn (dict_t *d, char *k,
-                          data_t *v, void *tmp);
+void dict_foreach (dict_t *this,
+		   void (*fn)(dict_t *this,
+			      char *key,
+			      data_t *value,
+			      void *data),
+		   void *data);
 
 dict_t *dict_copy (dict_t *this, dict_t *new);
-int dict_keys_join (void *value, int size, dict_t *dict,
-                    int (*filter_fn)(char *key));
 
 /* CLEANED UP FUNCTIONS DECLARATIONS */
 GF_MUST_CHECK dict_t *dict_new (void);
 dict_t *dict_copy_with_ref (dict_t *this, dict_t *new);
 
-GF_MUST_CHECK int dict_reset (dict_t *dict);
-
 GF_MUST_CHECK int dict_get_int8 (dict_t *this, char *key, int8_t *val);
 GF_MUST_CHECK int dict_set_int8 (dict_t *this, char *key, int8_t val);
 
@@ -216,7 +172,6 @@ GF_MUST_CHECK int dict_set_double (dict_t *this, char *key, double val);
 
 GF_MUST_CHECK int dict_set_static_ptr (dict_t *this, char *key, void *ptr);
 GF_MUST_CHECK int dict_get_ptr (dict_t *this, char *key, void **ptr);
-GF_MUST_CHECK int dict_get_ptr_and_len (dict_t *this, char *key, void **ptr, int *len);
 GF_MUST_CHECK int dict_set_ptr (dict_t *this, char *key, void *ptr);
 GF_MUST_CHECK int dict_set_dynptr (dict_t *this, char *key, void *ptr, size_t size);
 
@@ -232,6 +187,4 @@ GF_MUST_CHECK int dict_get_str (dict_t *this, char *key, char **str);
 GF_MUST_CHECK int dict_get_str_boolean (dict_t *this, char *key, int default_val);
 GF_MUST_CHECK int dict_serialize_value_with_delim (dict_t *this, char *buf, int32_t *serz_len,
                                                     char delimiter);
-
-void dict_dump (dict_t *dict);
 #endif
diff --git a/libglusterfs/src/event-epoll.c b/libglusterfs/src/event-epoll.c
deleted file mode 100644
index 06b323624..000000000
--- a/libglusterfs/src/event-epoll.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include <sys/poll.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include "logging.h"
-#include "event.h"
-#include "mem-pool.h"
-#include "common-utils.h"
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-
-#ifdef HAVE_SYS_EPOLL_H
-#include <sys/epoll.h>
-
-
-static int
-__event_getindex (struct event_pool *event_pool, int fd, int idx)
-{
-        int  ret = -1;
-        int  i = 0;
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        if (idx > -1 && idx < event_pool->used) {
-                if (event_pool->reg[idx].fd == fd)
-                        ret = idx;
-        }
-
-        for (i=0; ret == -1 && i<event_pool->used; i++) {
-                if (event_pool->reg[i].fd == fd) {
-                        ret = i;
-                        break;
-                }
-        }
-
-out:
-        return ret;
-}
-
-
-static struct event_pool *
-event_pool_new_epoll (int count)
-{
-        struct event_pool *event_pool = NULL;
-        int                epfd = -1;
-
-        event_pool = GF_CALLOC (1, sizeof (*event_pool),
-                                gf_common_mt_event_pool);
-
-        if (!event_pool)
-                goto out;
-
-        event_pool->count = count;
-        event_pool->reg = GF_CALLOC (event_pool->count,
-                                     sizeof (*event_pool->reg),
-                                     gf_common_mt_reg);
-
-        if (!event_pool->reg) {
-                GF_FREE (event_pool);
-                event_pool = NULL;
-                goto out;
-        }
-
-        epfd = epoll_create (count);
-
-        if (epfd == -1) {
-                gf_log ("epoll", GF_LOG_ERROR, "epoll fd creation failed (%s)",
-                        strerror (errno));
-                GF_FREE (event_pool->reg);
-                GF_FREE (event_pool);
-                event_pool = NULL;
-                goto out;
-        }
-
-        event_pool->fd = epfd;
-
-        event_pool->count = count;
-
-        pthread_mutex_init (&event_pool->mutex, NULL);
-        pthread_cond_init (&event_pool->cond, NULL);
-
-out:
-        return event_pool;
-}
-
-
-int
-event_register_epoll (struct event_pool *event_pool, int fd,
-                      event_handler_t handler,
-                      void *data, int poll_in, int poll_out)
-{
-        int                 idx = -1;
-        int                 ret = -1;
-        struct epoll_event  epoll_event = {0, };
-        struct event_data  *ev_data = (void *)&epoll_event.data;
-
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                if (event_pool->count == event_pool->used) {
-                        event_pool->count *= 2;
-
-                        event_pool->reg = GF_REALLOC (event_pool->reg,
-                                                      event_pool->count *
-                                                      sizeof (*event_pool->reg));
-
-                        if (!event_pool->reg) {
-                                gf_log ("epoll", GF_LOG_ERROR,
-                                        "event registry re-allocation failed");
-                                goto unlock;
-                        }
-                }
-
-                idx = event_pool->used;
-                event_pool->used++;
-
-                event_pool->reg[idx].fd = fd;
-                event_pool->reg[idx].events = EPOLLPRI;
-                event_pool->reg[idx].handler = handler;
-                event_pool->reg[idx].data = data;
-
-                switch (poll_in) {
-                case 1:
-                        event_pool->reg[idx].events |= EPOLLIN;
-                        break;
-                case 0:
-                        event_pool->reg[idx].events &= ~EPOLLIN;
-                        break;
-                case -1:
-                        /* do nothing */
-                        break;
-                default:
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "invalid poll_in value %d", poll_in);
-                        break;
-                }
-
-                switch (poll_out) {
-                case 1:
-                        event_pool->reg[idx].events |= EPOLLOUT;
-                        break;
-                case 0:
-                        event_pool->reg[idx].events &= ~EPOLLOUT;
-                        break;
-                case -1:
-                        /* do nothing */
-                        break;
-                default:
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "invalid poll_out value %d", poll_out);
-                        break;
-                }
-
-                event_pool->changed = 1;
-
-                epoll_event.events = event_pool->reg[idx].events;
-                ev_data->fd = fd;
-                ev_data->idx = idx;
-
-                ret = epoll_ctl (event_pool->fd, EPOLL_CTL_ADD, fd,
-                                 &epoll_event);
-
-                if (ret == -1) {
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "failed to add fd(=%d) to epoll fd(=%d) (%s)",
-                                fd, event_pool->fd, strerror (errno));
-                        goto unlock;
-                }
-
-                pthread_cond_broadcast (&event_pool->cond);
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-out:
-        return ret;
-}
-
-
-static int
-event_unregister_epoll (struct event_pool *event_pool, int fd, int idx_hint)
-{
-        int  idx = -1;
-        int  ret = -1;
-
-        struct epoll_event epoll_event = {0, };
-        struct event_data *ev_data = (void *)&epoll_event.data;
-        int                lastidx = -1;
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                idx = __event_getindex (event_pool, fd, idx_hint);
-
-                if (idx == -1) {
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "index not found for fd=%d (idx_hint=%d)",
-                                fd, idx_hint);
-                        errno = ENOENT;
-                        goto unlock;
-                }
-
-                ret = epoll_ctl (event_pool->fd, EPOLL_CTL_DEL, fd, NULL);
-
-                /* if ret is -1, this array member should never be accessed */
-                /* if it is 0, the array member might be used by idx_cache
-                 * in which case the member should not be accessed till
-                 * it is reallocated
-                 */
-
-                event_pool->reg[idx].fd = -1;
-
-                if (ret == -1) {
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "fail to del fd(=%d) from epoll fd(=%d) (%s)",
-                                fd, event_pool->fd, strerror (errno));
-                        goto unlock;
-                }
-
-                lastidx = event_pool->used - 1;
-                if (lastidx == idx) {
-                        event_pool->used--;
-                        goto unlock;
-                }
-
-                epoll_event.events = event_pool->reg[lastidx].events;
-                ev_data->fd = event_pool->reg[lastidx].fd;
-                ev_data->idx = idx;
-
-                ret = epoll_ctl (event_pool->fd, EPOLL_CTL_MOD, ev_data->fd,
-                                 &epoll_event);
-                if (ret == -1) {
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "fail to modify fd(=%d) index %d to %d (%s)",
-                                ev_data->fd, event_pool->used, idx,
-                                strerror (errno));
-                        goto unlock;
-                }
-
-                /* just replace the unregistered idx by last one */
-                event_pool->reg[idx] = event_pool->reg[lastidx];
-                event_pool->used--;
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-out:
-        return ret;
-}
-
-
-static int
-event_select_on_epoll (struct event_pool *event_pool, int fd, int idx_hint,
-                       int poll_in, int poll_out)
-{
-        int idx = -1;
-        int ret = -1;
-
-        struct epoll_event epoll_event = {0, };
-        struct event_data *ev_data = (void *)&epoll_event.data;
-
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                idx = __event_getindex (event_pool, fd, idx_hint);
-
-                if (idx == -1) {
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "index not found for fd=%d (idx_hint=%d)",
-                                fd, idx_hint);
-                        errno = ENOENT;
-                        goto unlock;
-                }
-
-                switch (poll_in) {
-                case 1:
-                        event_pool->reg[idx].events |= EPOLLIN;
-                        break;
-                case 0:
-                        event_pool->reg[idx].events &= ~EPOLLIN;
-                        break;
-                case -1:
-                        /* do nothing */
-                        break;
-                default:
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "invalid poll_in value %d", poll_in);
-                        break;
-                }
-
-                switch (poll_out) {
-                case 1:
-                        event_pool->reg[idx].events |= EPOLLOUT;
-                        break;
-                case 0:
-                        event_pool->reg[idx].events &= ~EPOLLOUT;
-                        break;
-                case -1:
-                        /* do nothing */
-                        break;
-                default:
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "invalid poll_out value %d", poll_out);
-                        break;
-                }
-
-                epoll_event.events = event_pool->reg[idx].events;
-                ev_data->fd = fd;
-                ev_data->idx = idx;
-
-                ret = epoll_ctl (event_pool->fd, EPOLL_CTL_MOD, fd,
-                                 &epoll_event);
-                if (ret == -1) {
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "failed to modify fd(=%d) events to %d",
-                                fd, epoll_event.events);
-                }
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-out:
-        return ret;
-}
-
-
-static int
-event_dispatch_epoll_handler (struct event_pool *event_pool,
-                              struct epoll_event *events, int i)
-{
-        struct event_data  *event_data = NULL;
-        event_handler_t     handler = NULL;
-        void               *data = NULL;
-        int                 idx = -1;
-        int                 ret = -1;
-
-
-        event_data = (void *)&events[i].data;
-        handler = NULL;
-        data = NULL;
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                idx = __event_getindex (event_pool, event_data->fd,
-                                        event_data->idx);
-
-                if (idx == -1) {
-                        gf_log ("epoll", GF_LOG_ERROR,
-                                "index not found for fd(=%d) (idx_hint=%d)",
-                                event_data->fd, event_data->idx);
-                        goto unlock;
-                }
-
-                handler = event_pool->reg[idx].handler;
-                data = event_pool->reg[idx].data;
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-        if (handler)
-                ret = handler (event_data->fd, event_data->idx, data,
-                               (events[i].events & (EPOLLIN|EPOLLPRI)),
-                               (events[i].events & (EPOLLOUT)),
-                               (events[i].events & (EPOLLERR|EPOLLHUP)));
-        return ret;
-}
-
-
-static int
-event_dispatch_epoll (struct event_pool *event_pool)
-{
-        struct epoll_event *events = NULL;
-        int                 size = 0;
-        int                 i = 0;
-        int                 ret = -1;
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        while (1) {
-                pthread_mutex_lock (&event_pool->mutex);
-                {
-                        while (event_pool->used == 0)
-                                pthread_cond_wait (&event_pool->cond,
-                                                   &event_pool->mutex);
-
-                        if (event_pool->used > event_pool->evcache_size) {
-                                GF_FREE (event_pool->evcache);
-
-                                event_pool->evcache = events = NULL;
-
-                                event_pool->evcache_size =
-                                        event_pool->used + 256;
-
-                                events = GF_CALLOC (event_pool->evcache_size,
-                                                    sizeof (struct epoll_event),
-                                                    gf_common_mt_epoll_event);
-                                if (!events)
-                                        break;
-
-                                event_pool->evcache = events;
-                        }
-                }
-                pthread_mutex_unlock (&event_pool->mutex);
-
-                ret = epoll_wait (event_pool->fd, event_pool->evcache,
-                                  event_pool->evcache_size, -1);
-
-                if (ret == 0)
-                        /* timeout */
-                        continue;
-
-                if (ret == -1 && errno == EINTR)
-                        /* sys call */
-                        continue;
-
-                size = ret;
-
-                for (i = 0; i < size; i++) {
-                        if (!events || !events[i].events)
-                                continue;
-
-                        ret = event_dispatch_epoll_handler (event_pool,
-                                                            events, i);
-                }
-        }
-
-out:
-        return ret;
-}
-
-
-struct event_ops event_ops_epoll = {
-        .new              = event_pool_new_epoll,
-        .event_register   = event_register_epoll,
-        .event_select_on  = event_select_on_epoll,
-        .event_unregister = event_unregister_epoll,
-        .event_dispatch   = event_dispatch_epoll
-};
-
-#endif
diff --git a/libglusterfs/src/event-history.c b/libglusterfs/src/event-history.c
deleted file mode 100644
index 82baa521a..000000000
--- a/libglusterfs/src/event-history.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include "event-history.h"
-
-eh_t *
-eh_new (size_t buffer_size, gf_boolean_t use_buffer_once,
-        void (*destroy_buffer_data) (void *data))
-{
-        eh_t *history = NULL;
-        buffer_t *buffer = NULL;
-
-        history = GF_CALLOC (1, sizeof (eh_t), gf_common_mt_eh_t);
-        if (!history) {
-                gf_log ("", GF_LOG_ERROR, "allocating history failed.");
-                goto out;
-        }
-
-        buffer = cb_buffer_new (buffer_size, use_buffer_once,
-                                destroy_buffer_data);
-        if (!buffer) {
-                gf_log ("", GF_LOG_ERROR, "allocating circular buffer failed");
-                GF_FREE (history);
-                history = NULL;
-        }
-
-        history->buffer = buffer;
-
-        pthread_mutex_init (&history->lock, NULL);
-out:
-        return history;
-}
-
-void
-eh_dump (eh_t *history, void *data,
-         int (dump_fn) (circular_buffer_t *buffer, void *data))
-{
-        if (!history) {
-                gf_log ("", GF_LOG_DEBUG, "history is NULL");
-                goto out;
-        }
-
-        cb_buffer_dump (history->buffer, data, dump_fn);
-
-out:
-        return;
-}
-
-int
-eh_save_history (eh_t *history, void *data)
-{
-        int   ret = -1;
-
-        ret = cb_add_entry_buffer (history->buffer, data);
-
-        return ret;
-}
-
-int
-eh_destroy (eh_t *history)
-{
-        if (!history) {
-                gf_log ("", GF_LOG_INFO, "history for the xlator is "
-                        "NULL");
-                return -1;
-        }
-
-        cb_buffer_destroy (history->buffer);
-        history->buffer = NULL;
-
-        pthread_mutex_destroy (&history->lock);
-
-        GF_FREE (history);
-
-        return 0;
-}
diff --git a/libglusterfs/src/event-history.h b/libglusterfs/src/event-history.h
deleted file mode 100644
index b64f63b5e..000000000
--- a/libglusterfs/src/event-history.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _EH_H
-#define _EH_H
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "mem-types.h"
-#include "circ-buff.h"
-
-struct event_hist
-{
-        buffer_t *buffer;
-        pthread_mutex_t lock;
-};
-
-typedef struct event_hist eh_t;
-
-void
-eh_dump (eh_t *event , void *data,
-         int (fn) (circular_buffer_t *buffer, void *data));
-
-eh_t *
-eh_new (size_t buffer_size, gf_boolean_t use_buffer_once,
-        void (*destroy_data) (void *data));
-
-int
-eh_save_history (eh_t *history, void *string);
-
-int
-eh_destroy (eh_t *history);
-
-#endif /* _EH_H */
diff --git a/libglusterfs/src/event-poll.c b/libglusterfs/src/event-poll.c
deleted file mode 100644
index 7f7f560d0..000000000
--- a/libglusterfs/src/event-poll.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
-  Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include <sys/poll.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include "logging.h"
-#include "event.h"
-#include "mem-pool.h"
-#include "common-utils.h"
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-static int
-event_register_poll (struct event_pool *event_pool, int fd,
-                     event_handler_t handler,
-                     void *data, int poll_in, int poll_out);
-
-
-static int
-__flush_fd (int fd, int idx, void *data,
-            int poll_in, int poll_out, int poll_err)
-{
-        char buf[64];
-        int ret = -1;
-
-        if (!poll_in)
-                return ret;
-
-        do {
-                ret = read (fd, buf, 64);
-                if (ret == -1 && errno != EAGAIN) {
-                        gf_log ("poll", GF_LOG_ERROR,
-                                "read on %d returned error (%s)",
-                                fd, strerror (errno));
-                }
-        } while (ret == 64);
-
-        return ret;
-}
-
-
-static int
-__event_getindex (struct event_pool *event_pool, int fd, int idx)
-{
-        int  ret = -1;
-        int  i = 0;
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        if (idx > -1 && idx < event_pool->used) {
-                if (event_pool->reg[idx].fd == fd)
-                        ret = idx;
-        }
-
-        for (i=0; ret == -1 && i<event_pool->used; i++) {
-                if (event_pool->reg[i].fd == fd) {
-                        ret = i;
-                        break;
-                }
-        }
-
-out:
-        return ret;
-}
-
-
-static struct event_pool *
-event_pool_new_poll (int count)
-{
-        struct event_pool *event_pool = NULL;
-        int                ret = -1;
-
-        event_pool = GF_CALLOC (1, sizeof (*event_pool),
-                                gf_common_mt_event_pool);
-
-        if (!event_pool)
-                return NULL;
-
-        event_pool->count = count;
-        event_pool->reg = GF_CALLOC (event_pool->count,
-                                     sizeof (*event_pool->reg),
-                                     gf_common_mt_reg);
-
-        if (!event_pool->reg) {
-                GF_FREE (event_pool);
-                return NULL;
-        }
-
-        pthread_mutex_init (&event_pool->mutex, NULL);
-
-        ret = pipe (event_pool->breaker);
-
-        if (ret == -1) {
-                gf_log ("poll", GF_LOG_ERROR,
-                        "pipe creation failed (%s)", strerror (errno));
-                GF_FREE (event_pool->reg);
-                GF_FREE (event_pool);
-                return NULL;
-        }
-
-        ret = fcntl (event_pool->breaker[0], F_SETFL, O_NONBLOCK);
-        if (ret == -1) {
-                gf_log ("poll", GF_LOG_ERROR,
-                        "could not set pipe to non blocking mode (%s)",
-                        strerror (errno));
-                close (event_pool->breaker[0]);
-                close (event_pool->breaker[1]);
-                event_pool->breaker[0] = event_pool->breaker[1] = -1;
-
-                GF_FREE (event_pool->reg);
-                GF_FREE (event_pool);
-                return NULL;
-        }
-
-        ret = fcntl (event_pool->breaker[1], F_SETFL, O_NONBLOCK);
-        if (ret == -1) {
-                gf_log ("poll", GF_LOG_ERROR,
-                        "could not set pipe to non blocking mode (%s)",
-                        strerror (errno));
-
-                close (event_pool->breaker[0]);
-                close (event_pool->breaker[1]);
-                event_pool->breaker[0] = event_pool->breaker[1] = -1;
-
-                GF_FREE (event_pool->reg);
-                GF_FREE (event_pool);
-                return NULL;
-        }
-
-        ret = event_register_poll (event_pool, event_pool->breaker[0],
-                                   __flush_fd, NULL, 1, 0);
-        if (ret == -1) {
-                gf_log ("poll", GF_LOG_ERROR,
-                        "could not register pipe fd with poll event loop");
-                close (event_pool->breaker[0]);
-                close (event_pool->breaker[1]);
-                event_pool->breaker[0] = event_pool->breaker[1] = -1;
-
-                GF_FREE (event_pool->reg);
-                GF_FREE (event_pool);
-                return NULL;
-        }
-
-        return event_pool;
-}
-
-
-static int
-event_register_poll (struct event_pool *event_pool, int fd,
-                     event_handler_t handler,
-                     void *data, int poll_in, int poll_out)
-{
-        int idx = -1;
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                if (event_pool->count == event_pool->used)
-                {
-                        event_pool->count += 256;
-
-                        event_pool->reg = GF_REALLOC (event_pool->reg,
-                                                      event_pool->count *
-                                                      sizeof (*event_pool->reg));
-                        if (!event_pool->reg)
-                                goto unlock;
-                }
-
-                idx = event_pool->used++;
-
-                event_pool->reg[idx].fd = fd;
-                event_pool->reg[idx].events = POLLPRI;
-                event_pool->reg[idx].handler = handler;
-                event_pool->reg[idx].data = data;
-
-                switch (poll_in) {
-                case 1:
-                        event_pool->reg[idx].events |= POLLIN;
-                        break;
-                case 0:
-                        event_pool->reg[idx].events &= ~POLLIN;
-                        break;
-                case -1:
-                        /* do nothing */
-                        break;
-                default:
-                        gf_log ("poll", GF_LOG_ERROR,
-                                "invalid poll_in value %d", poll_in);
-                        break;
-                }
-
-                switch (poll_out) {
-                case 1:
-                        event_pool->reg[idx].events |= POLLOUT;
-                        break;
-                case 0:
-                        event_pool->reg[idx].events &= ~POLLOUT;
-                        break;
-                case -1:
-                        /* do nothing */
-                        break;
-                default:
-                        gf_log ("poll", GF_LOG_ERROR,
-                                "invalid poll_out value %d", poll_out);
-                        break;
-                }
-
-                event_pool->changed = 1;
-
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-out:
-        return idx;
-}
-
-
-static int
-event_unregister_poll (struct event_pool *event_pool, int fd, int idx_hint)
-{
-        int idx = -1;
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                idx = __event_getindex (event_pool, fd, idx_hint);
-
-                if (idx == -1) {
-                        gf_log ("poll", GF_LOG_ERROR,
-                                "index not found for fd=%d (idx_hint=%d)",
-                                fd, idx_hint);
-                        errno = ENOENT;
-                        goto unlock;
-                }
-
-                event_pool->reg[idx] =  event_pool->reg[--event_pool->used];
-                event_pool->changed = 1;
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-out:
-        return idx;
-}
-
-
-static int
-event_select_on_poll (struct event_pool *event_pool, int fd, int idx_hint,
-                      int poll_in, int poll_out)
-{
-        int idx = -1;
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                idx = __event_getindex (event_pool, fd, idx_hint);
-
-                if (idx == -1) {
-                        gf_log ("poll", GF_LOG_ERROR,
-                                "index not found for fd=%d (idx_hint=%d)",
-                                fd, idx_hint);
-                        errno = ENOENT;
-                        goto unlock;
-                }
-
-                switch (poll_in) {
-                case 1:
-                        event_pool->reg[idx].events |= POLLIN;
-                        break;
-                case 0:
-                        event_pool->reg[idx].events &= ~POLLIN;
-                        break;
-                case -1:
-                        /* do nothing */
-                        break;
-                default:
-                        /* TODO: log error */
-                        break;
-                }
-
-                switch (poll_out) {
-                case 1:
-                        event_pool->reg[idx].events |= POLLOUT;
-                        break;
-                case 0:
-                        event_pool->reg[idx].events &= ~POLLOUT;
-                        break;
-                case -1:
-                        /* do nothing */
-                        break;
-                default:
-                        /* TODO: log error */
-                        break;
-                }
-
-                if (poll_in + poll_out > -2)
-                        event_pool->changed = 1;
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-out:
-        return idx;
-}
-
-
-static int
-event_dispatch_poll_handler (struct event_pool *event_pool,
-                             struct pollfd *ufds, int i)
-{
-        event_handler_t  handler = NULL;
-        void            *data = NULL;
-        int              idx = -1;
-        int              ret = 0;
-
-        handler = NULL;
-        data    = NULL;
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                idx = __event_getindex (event_pool, ufds[i].fd, i);
-
-                if (idx == -1) {
-                        gf_log ("poll", GF_LOG_ERROR,
-                                "index not found for fd=%d (idx_hint=%d)",
-                                ufds[i].fd, i);
-                        goto unlock;
-                }
-
-                handler = event_pool->reg[idx].handler;
-                data = event_pool->reg[idx].data;
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-        if (handler)
-                ret = handler (ufds[i].fd, idx, data,
-                               (ufds[i].revents & (POLLIN|POLLPRI)),
-                               (ufds[i].revents & (POLLOUT)),
-                               (ufds[i].revents & (POLLERR|POLLHUP|POLLNVAL)));
-
-        return ret;
-}
-
-
-static int
-event_dispatch_poll_resize (struct event_pool *event_pool,
-                            struct pollfd *ufds, int size)
-{
-        int              i = 0;
-
-        pthread_mutex_lock (&event_pool->mutex);
-        {
-                if (event_pool->changed == 0) {
-                        goto unlock;
-                }
-
-                if (event_pool->used > event_pool->evcache_size) {
-                        GF_FREE (event_pool->evcache);
-
-                        event_pool->evcache = ufds = NULL;
-
-                        event_pool->evcache_size = event_pool->used;
-
-                        ufds = GF_CALLOC (sizeof (struct pollfd),
-                                          event_pool->evcache_size,
-                                          gf_common_mt_pollfd);
-                        if (!ufds)
-                                goto unlock;
-                        event_pool->evcache = ufds;
-                }
-
-                for (i = 0; i < event_pool->used; i++) {
-                        ufds[i].fd = event_pool->reg[i].fd;
-                        ufds[i].events = event_pool->reg[i].events;
-                        ufds[i].revents = 0;
-                }
-
-                size = i;
-        }
-unlock:
-        pthread_mutex_unlock (&event_pool->mutex);
-
-        return size;
-}
-
-
-static int
-event_dispatch_poll (struct event_pool *event_pool)
-{
-        struct pollfd   *ufds = NULL;
-        int              size = 0;
-        int              i = 0;
-        int              ret = -1;
-
-        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
-
-        while (1) {
-                size = event_dispatch_poll_resize (event_pool, ufds, size);
-                ufds = event_pool->evcache;
-
-                ret = poll (ufds, size, 1);
-
-                if (ret == 0)
-                        /* timeout */
-                        continue;
-
-                if (ret == -1 && errno == EINTR)
-                        /* sys call */
-                        continue;
-
-                for (i = 0; i < size; i++) {
-                        if (!ufds[i].revents)
-                                continue;
-
-                        event_dispatch_poll_handler (event_pool, ufds, i);
-                }
-        }
-
-out:
-        return -1;
-}
-
-
-struct event_ops event_ops_poll = {
-        .new              = event_pool_new_poll,
-        .event_register   = event_register_poll,
-        .event_select_on  = event_select_on_poll,
-        .event_unregister = event_unregister_poll,
-        .event_dispatch   = event_dispatch_poll
-};
diff --git a/libglusterfs/src/event.c b/libglusterfs/src/event.c
index 0197e7948..c117a4ae2 100644
--- a/libglusterfs/src/event.c
+++ b/libglusterfs/src/event.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <sys/poll.h>
@@ -26,17 +35,851 @@
 #include "config.h"
 #endif
 
+static int
+event_register_poll (struct event_pool *event_pool, int fd,
+                     event_handler_t handler,
+                     void *data, int poll_in, int poll_out);
+
+
+static int
+__flush_fd (int fd, int idx, void *data,
+            int poll_in, int poll_out, int poll_err)
+{
+        char buf[64];
+        int ret = -1;
+
+        if (!poll_in)
+                return ret;
+
+        do {
+                ret = read (fd, buf, 64);
+                if (ret == -1 && errno != EAGAIN) {
+                        gf_log ("poll", GF_LOG_ERROR,
+                                "read on %d returned error (%s)",
+                                fd, strerror (errno));
+                }
+        } while (ret == 64);
+
+        return ret;
+}
+
+
+static int
+__event_getindex (struct event_pool *event_pool, int fd, int idx)
+{
+        int  ret = -1;
+        int  i = 0;
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        if (idx > -1 && idx < event_pool->used) {
+                if (event_pool->reg[idx].fd == fd)
+                        ret = idx;
+        }
+
+        for (i=0; ret == -1 && i<event_pool->used; i++) {
+                if (event_pool->reg[i].fd == fd) {
+                        ret = i;
+                        break;
+                }
+        }
+
+out:
+        return ret;
+}
+
+
+static struct event_pool *
+event_pool_new_poll (int count)
+{
+        struct event_pool *event_pool = NULL;
+        int                ret = -1;
+
+        event_pool = GF_CALLOC (1, sizeof (*event_pool),
+                                gf_common_mt_event_pool);
+
+        if (!event_pool)
+                return NULL;
+
+        event_pool->count = count;
+        event_pool->reg = GF_CALLOC (event_pool->count,
+                                     sizeof (*event_pool->reg),
+                                     gf_common_mt_reg);
+
+        if (!event_pool->reg) {
+                GF_FREE (event_pool);
+                return NULL;
+        }
+
+        pthread_mutex_init (&event_pool->mutex, NULL);
+
+        ret = pipe (event_pool->breaker);
+
+        if (ret == -1) {
+                gf_log ("poll", GF_LOG_ERROR,
+                        "pipe creation failed (%s)", strerror (errno));
+                GF_FREE (event_pool->reg);
+                GF_FREE (event_pool);
+                return NULL;
+        }
+
+        ret = fcntl (event_pool->breaker[0], F_SETFL, O_NONBLOCK);
+        if (ret == -1) {
+                gf_log ("poll", GF_LOG_ERROR,
+                        "could not set pipe to non blocking mode (%s)",
+                        strerror (errno));
+                close (event_pool->breaker[0]);
+                close (event_pool->breaker[1]);
+                event_pool->breaker[0] = event_pool->breaker[1] = -1;
+
+                GF_FREE (event_pool->reg);
+                GF_FREE (event_pool);
+                return NULL;
+        }
+
+        ret = fcntl (event_pool->breaker[1], F_SETFL, O_NONBLOCK);
+        if (ret == -1) {
+                gf_log ("poll", GF_LOG_ERROR,
+                        "could not set pipe to non blocking mode (%s)",
+                        strerror (errno));
+
+                close (event_pool->breaker[0]);
+                close (event_pool->breaker[1]);
+                event_pool->breaker[0] = event_pool->breaker[1] = -1;
+
+                GF_FREE (event_pool->reg);
+                GF_FREE (event_pool);
+                return NULL;
+        }
+
+        ret = event_register_poll (event_pool, event_pool->breaker[0],
+                                   __flush_fd, NULL, 1, 0);
+        if (ret == -1) {
+                gf_log ("poll", GF_LOG_ERROR,
+                        "could not register pipe fd with poll event loop");
+                close (event_pool->breaker[0]);
+                close (event_pool->breaker[1]);
+                event_pool->breaker[0] = event_pool->breaker[1] = -1;
+
+                GF_FREE (event_pool->reg);
+                GF_FREE (event_pool);
+                return NULL;
+        }
+
+        return event_pool;
+}
+
+
+static int
+event_register_poll (struct event_pool *event_pool, int fd,
+                     event_handler_t handler,
+                     void *data, int poll_in, int poll_out)
+{
+        int idx = -1;
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                if (event_pool->count == event_pool->used)
+                {
+                        event_pool->count += 256;
+
+                        event_pool->reg = GF_REALLOC (event_pool->reg,
+                                                      event_pool->count *
+                                                      sizeof (*event_pool->reg));
+                        if (!event_pool->reg)
+                                goto unlock;
+                }
+
+                idx = event_pool->used++;
+
+                event_pool->reg[idx].fd = fd;
+                event_pool->reg[idx].events = POLLPRI;
+                event_pool->reg[idx].handler = handler;
+                event_pool->reg[idx].data = data;
+
+                switch (poll_in) {
+                case 1:
+                        event_pool->reg[idx].events |= POLLIN;
+                        break;
+                case 0:
+                        event_pool->reg[idx].events &= ~POLLIN;
+                        break;
+                case -1:
+                        /* do nothing */
+                        break;
+                default:
+                        gf_log ("poll", GF_LOG_ERROR,
+                                "invalid poll_in value %d", poll_in);
+                        break;
+                }
+
+                switch (poll_out) {
+                case 1:
+                        event_pool->reg[idx].events |= POLLOUT;
+                        break;
+                case 0:
+                        event_pool->reg[idx].events &= ~POLLOUT;
+                        break;
+                case -1:
+                        /* do nothing */
+                        break;
+                default:
+                        gf_log ("poll", GF_LOG_ERROR,
+                                "invalid poll_out value %d", poll_out);
+                        break;
+                }
+
+                event_pool->changed = 1;
+
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+out:
+        return idx;
+}
+
+
+static int
+event_unregister_poll (struct event_pool *event_pool, int fd, int idx_hint)
+{
+        int idx = -1;
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                idx = __event_getindex (event_pool, fd, idx_hint);
+
+                if (idx == -1) {
+                        gf_log ("poll", GF_LOG_ERROR,
+                                "index not found for fd=%d (idx_hint=%d)",
+                                fd, idx_hint);
+                        errno = ENOENT;
+                        goto unlock;
+                }
+
+                event_pool->reg[idx] =  event_pool->reg[--event_pool->used];
+                event_pool->changed = 1;
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+out:
+        return idx;
+}
+
+
+static int
+event_select_on_poll (struct event_pool *event_pool, int fd, int idx_hint,
+                      int poll_in, int poll_out)
+{
+        int idx = -1;
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                idx = __event_getindex (event_pool, fd, idx_hint);
+
+                if (idx == -1) {
+                        gf_log ("poll", GF_LOG_ERROR,
+                                "index not found for fd=%d (idx_hint=%d)",
+                                fd, idx_hint);
+                        errno = ENOENT;
+                        goto unlock;
+                }
+
+                switch (poll_in) {
+                case 1:
+                        event_pool->reg[idx].events |= POLLIN;
+                        break;
+                case 0:
+                        event_pool->reg[idx].events &= ~POLLIN;
+                        break;
+                case -1:
+                        /* do nothing */
+                        break;
+                default:
+                        /* TODO: log error */
+                        break;
+                }
+
+                switch (poll_out) {
+                case 1:
+                        event_pool->reg[idx].events |= POLLOUT;
+                        break;
+                case 0:
+                        event_pool->reg[idx].events &= ~POLLOUT;
+                        break;
+                case -1:
+                        /* do nothing */
+                        break;
+                default:
+                        /* TODO: log error */
+                        break;
+                }
+
+                if (poll_in + poll_out > -2)
+                        event_pool->changed = 1;
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+out:
+        return idx;
+}
+
+
+static int
+event_dispatch_poll_handler (struct event_pool *event_pool,
+                             struct pollfd *ufds, int i)
+{
+        event_handler_t  handler = NULL;
+        void            *data = NULL;
+        int              idx = -1;
+        int              ret = 0;
+
+        handler = NULL;
+        data    = NULL;
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                idx = __event_getindex (event_pool, ufds[i].fd, i);
+
+                if (idx == -1) {
+                        gf_log ("poll", GF_LOG_ERROR,
+                                "index not found for fd=%d (idx_hint=%d)",
+                                ufds[i].fd, i);
+                        goto unlock;
+                }
+
+                handler = event_pool->reg[idx].handler;
+                data = event_pool->reg[idx].data;
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+        if (handler)
+                ret = handler (ufds[i].fd, idx, data,
+                               (ufds[i].revents & (POLLIN|POLLPRI)),
+                               (ufds[i].revents & (POLLOUT)),
+                               (ufds[i].revents & (POLLERR|POLLHUP|POLLNVAL)));
+
+        return ret;
+}
+
+
+static int
+event_dispatch_poll_resize (struct event_pool *event_pool,
+                            struct pollfd *ufds, int size)
+{
+        int              i = 0;
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                if (event_pool->changed == 0) {
+                        goto unlock;
+                }
+
+                if (event_pool->used > event_pool->evcache_size) {
+                        if (event_pool->evcache)
+                                GF_FREE (event_pool->evcache);
+
+                        event_pool->evcache = ufds = NULL;
+
+                        event_pool->evcache_size = event_pool->used;
+
+                        ufds = GF_CALLOC (sizeof (struct pollfd),
+                                          event_pool->evcache_size,
+                                          gf_common_mt_pollfd);
+                        if (!ufds)
+                                goto unlock;
+                        event_pool->evcache = ufds;
+                }
+
+                for (i = 0; i < event_pool->used; i++) {
+                        ufds[i].fd = event_pool->reg[i].fd;
+                        ufds[i].events = event_pool->reg[i].events;
+                        ufds[i].revents = 0;
+                }
+
+                size = i;
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+        return size;
+}
+
+
+static int
+event_dispatch_poll (struct event_pool *event_pool)
+{
+        struct pollfd   *ufds = NULL;
+        int              size = 0;
+        int              i = 0;
+        int              ret = -1;
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        while (1) {
+                size = event_dispatch_poll_resize (event_pool, ufds, size);
+                ufds = event_pool->evcache;
+
+                ret = poll (ufds, size, 1);
+
+                if (ret == 0)
+                        /* timeout */
+                        continue;
+
+                if (ret == -1 && errno == EINTR)
+                        /* sys call */
+                        continue;
+
+                for (i = 0; i < size; i++) {
+                        if (!ufds[i].revents)
+                                continue;
+
+                        event_dispatch_poll_handler (event_pool, ufds, i);
+                }
+        }
+
+out:
+        return -1;
+}
+
+
+static struct event_ops event_ops_poll = {
+        .new              = event_pool_new_poll,
+        .event_register   = event_register_poll,
+        .event_select_on  = event_select_on_poll,
+        .event_unregister = event_unregister_poll,
+        .event_dispatch   = event_dispatch_poll
+};
+
+
+
+#ifdef HAVE_SYS_EPOLL_H
+#include <sys/epoll.h>
+
+
+static struct event_pool *
+event_pool_new_epoll (int count)
+{
+        struct event_pool *event_pool = NULL;
+        int                epfd = -1;
+
+        event_pool = GF_CALLOC (1, sizeof (*event_pool),
+                                gf_common_mt_event_pool);
+
+        if (!event_pool)
+                goto out;
+
+        event_pool->count = count;
+        event_pool->reg = GF_CALLOC (event_pool->count,
+                                     sizeof (*event_pool->reg),
+                                     gf_common_mt_reg);
+
+        if (!event_pool->reg) {
+                GF_FREE (event_pool);
+                event_pool = NULL;
+                goto out;
+        }
+
+        epfd = epoll_create (count);
+
+        if (epfd == -1) {
+                gf_log ("epoll", GF_LOG_ERROR, "epoll fd creation failed (%s)",
+                        strerror (errno));
+                GF_FREE (event_pool->reg);
+                GF_FREE (event_pool);
+                event_pool = NULL;
+                goto out;
+        }
+
+        event_pool->fd = epfd;
+
+        event_pool->count = count;
+
+        pthread_mutex_init (&event_pool->mutex, NULL);
+        pthread_cond_init (&event_pool->cond, NULL);
+
+out:
+        return event_pool;
+}
+
+
+int
+event_register_epoll (struct event_pool *event_pool, int fd,
+                      event_handler_t handler,
+                      void *data, int poll_in, int poll_out)
+{
+        int                 idx = -1;
+        int                 ret = -1;
+        struct epoll_event  epoll_event = {0, };
+        struct event_data  *ev_data = (void *)&epoll_event.data;
+
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                if (event_pool->count == event_pool->used) {
+                        event_pool->count *= 2;
+
+                        event_pool->reg = GF_REALLOC (event_pool->reg,
+                                                      event_pool->count *
+                                                      sizeof (*event_pool->reg));
+
+                        if (!event_pool->reg) {
+                                gf_log ("epoll", GF_LOG_ERROR,
+                                        "event registry re-allocation failed");
+                                goto unlock;
+                        }
+                }
+
+                idx = event_pool->used;
+                event_pool->used++;
+
+                event_pool->reg[idx].fd = fd;
+                event_pool->reg[idx].events = EPOLLPRI;
+                event_pool->reg[idx].handler = handler;
+                event_pool->reg[idx].data = data;
+
+                switch (poll_in) {
+                case 1:
+                        event_pool->reg[idx].events |= EPOLLIN;
+                        break;
+                case 0:
+                        event_pool->reg[idx].events &= ~EPOLLIN;
+                        break;
+                case -1:
+                        /* do nothing */
+                        break;
+                default:
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "invalid poll_in value %d", poll_in);
+                        break;
+                }
+
+                switch (poll_out) {
+                case 1:
+                        event_pool->reg[idx].events |= EPOLLOUT;
+                        break;
+                case 0:
+                        event_pool->reg[idx].events &= ~EPOLLOUT;
+                        break;
+                case -1:
+                        /* do nothing */
+                        break;
+                default:
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "invalid poll_out value %d", poll_out);
+                        break;
+                }
+
+                event_pool->changed = 1;
+
+                epoll_event.events = event_pool->reg[idx].events;
+                ev_data->fd = fd;
+                ev_data->idx = idx;
+
+                ret = epoll_ctl (event_pool->fd, EPOLL_CTL_ADD, fd,
+                                 &epoll_event);
+
+                if (ret == -1) {
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "failed to add fd(=%d) to epoll fd(=%d) (%s)",
+                                fd, event_pool->fd, strerror (errno));
+                        goto unlock;
+                }
+
+                pthread_cond_broadcast (&event_pool->cond);
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+out:
+        return ret;
+}
+
+
+static int
+event_unregister_epoll (struct event_pool *event_pool, int fd, int idx_hint)
+{
+        int  idx = -1;
+        int  ret = -1;
+
+        struct epoll_event epoll_event = {0, };
+        struct event_data *ev_data = (void *)&epoll_event.data;
+        int                lastidx = -1;
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                idx = __event_getindex (event_pool, fd, idx_hint);
+
+                if (idx == -1) {
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "index not found for fd=%d (idx_hint=%d)",
+                                fd, idx_hint);
+                        errno = ENOENT;
+                        goto unlock;
+                }
+
+                ret = epoll_ctl (event_pool->fd, EPOLL_CTL_DEL, fd, NULL);
+
+                /* if ret is -1, this array member should never be accessed */
+                /* if it is 0, the array member might be used by idx_cache
+                 * in which case the member should not be accessed till
+                 * it is reallocated
+                 */
+
+                event_pool->reg[idx].fd = -1;
+
+                if (ret == -1) {
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "fail to del fd(=%d) from epoll fd(=%d) (%s)",
+                                fd, event_pool->fd, strerror (errno));
+                        goto unlock;
+                }
+
+                lastidx = event_pool->used - 1;
+                if (lastidx == idx) {
+                        event_pool->used--;
+                        goto unlock;
+                }
+
+                epoll_event.events = event_pool->reg[lastidx].events;
+                ev_data->fd = event_pool->reg[lastidx].fd;
+                ev_data->idx = idx;
+
+                ret = epoll_ctl (event_pool->fd, EPOLL_CTL_MOD, ev_data->fd,
+                                 &epoll_event);
+                if (ret == -1) {
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "fail to modify fd(=%d) index %d to %d (%s)",
+                                ev_data->fd, event_pool->used, idx,
+                                strerror (errno));
+                        goto unlock;
+                }
+
+                /* just replace the unregistered idx by last one */
+                event_pool->reg[idx] = event_pool->reg[lastidx];
+                event_pool->used--;
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+out:
+        return ret;
+}
+
+
+static int
+event_select_on_epoll (struct event_pool *event_pool, int fd, int idx_hint,
+                       int poll_in, int poll_out)
+{
+        int idx = -1;
+        int ret = -1;
+
+        struct epoll_event epoll_event = {0, };
+        struct event_data *ev_data = (void *)&epoll_event.data;
+
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                idx = __event_getindex (event_pool, fd, idx_hint);
+
+                if (idx == -1) {
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "index not found for fd=%d (idx_hint=%d)",
+                                fd, idx_hint);
+                        errno = ENOENT;
+                        goto unlock;
+                }
+
+                switch (poll_in) {
+                case 1:
+                        event_pool->reg[idx].events |= EPOLLIN;
+                        break;
+                case 0:
+                        event_pool->reg[idx].events &= ~EPOLLIN;
+                        break;
+                case -1:
+                        /* do nothing */
+                        break;
+                default:
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "invalid poll_in value %d", poll_in);
+                        break;
+                }
+
+                switch (poll_out) {
+                case 1:
+                        event_pool->reg[idx].events |= EPOLLOUT;
+                        break;
+                case 0:
+                        event_pool->reg[idx].events &= ~EPOLLOUT;
+                        break;
+                case -1:
+                        /* do nothing */
+                        break;
+                default:
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "invalid poll_out value %d", poll_out);
+                        break;
+                }
+
+                epoll_event.events = event_pool->reg[idx].events;
+                ev_data->fd = fd;
+                ev_data->idx = idx;
+
+                ret = epoll_ctl (event_pool->fd, EPOLL_CTL_MOD, fd,
+                                 &epoll_event);
+                if (ret == -1) {
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "failed to modify fd(=%d) events to %d",
+                                fd, epoll_event.events);
+                }
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+out:
+        return ret;
+}
+
+
+static int
+event_dispatch_epoll_handler (struct event_pool *event_pool,
+                              struct epoll_event *events, int i)
+{
+        struct event_data  *event_data = NULL;
+        event_handler_t     handler = NULL;
+        void               *data = NULL;
+        int                 idx = -1;
+        int                 ret = -1;
+
+
+        event_data = (void *)&events[i].data;
+        handler = NULL;
+        data = NULL;
+
+        pthread_mutex_lock (&event_pool->mutex);
+        {
+                idx = __event_getindex (event_pool, event_data->fd,
+                                        event_data->idx);
+
+                if (idx == -1) {
+                        gf_log ("epoll", GF_LOG_ERROR,
+                                "index not found for fd(=%d) (idx_hint=%d)",
+                                event_data->fd, event_data->idx);
+                        goto unlock;
+                }
+
+                handler = event_pool->reg[idx].handler;
+                data = event_pool->reg[idx].data;
+        }
+unlock:
+        pthread_mutex_unlock (&event_pool->mutex);
+
+        if (handler)
+                ret = handler (event_data->fd, event_data->idx, data,
+                               (events[i].events & (EPOLLIN|EPOLLPRI)),
+                               (events[i].events & (EPOLLOUT)),
+                               (events[i].events & (EPOLLERR|EPOLLHUP)));
+        return ret;
+}
+
+
+static int
+event_dispatch_epoll (struct event_pool *event_pool)
+{
+        struct epoll_event *events = NULL;
+        int                 size = 0;
+        int                 i = 0;
+        int                 ret = -1;
+
+        GF_VALIDATE_OR_GOTO ("event", event_pool, out);
+
+        while (1) {
+                pthread_mutex_lock (&event_pool->mutex);
+                {
+                        while (event_pool->used == 0)
+                                pthread_cond_wait (&event_pool->cond,
+                                                   &event_pool->mutex);
+
+                        if (event_pool->used > event_pool->evcache_size) {
+                                if (event_pool->evcache)
+                                        GF_FREE (event_pool->evcache);
+
+                                event_pool->evcache = events = NULL;
+
+                                event_pool->evcache_size =
+                                        event_pool->used + 256;
+
+                                events = GF_CALLOC (event_pool->evcache_size,
+                                                    sizeof (struct epoll_event),
+                                                    gf_common_mt_epoll_event);
+                                if (!events)
+                                        break;
+
+                                event_pool->evcache = events;
+                        }
+                }
+                pthread_mutex_unlock (&event_pool->mutex);
+
+                ret = epoll_wait (event_pool->fd, event_pool->evcache,
+                                  event_pool->evcache_size, -1);
+
+                if (ret == 0)
+                        /* timeout */
+                        continue;
+
+                if (ret == -1 && errno == EINTR)
+                        /* sys call */
+                        continue;
+
+                size = ret;
+
+                for (i = 0; i < size; i++) {
+                        if (!events || !events[i].events)
+                                continue;
+
+                        ret = event_dispatch_epoll_handler (event_pool,
+                                                            events, i);
+                }
+        }
+
+out:
+        return ret;
+}
+
+
+static struct event_ops event_ops_epoll = {
+        .new              = event_pool_new_epoll,
+        .event_register   = event_register_epoll,
+        .event_select_on  = event_select_on_epoll,
+        .event_unregister = event_unregister_epoll,
+        .event_dispatch   = event_dispatch_epoll
+};
+
+#endif
 
 
 struct event_pool *
 event_pool_new (int count)
 {
         struct event_pool *event_pool = NULL;
-        extern struct event_ops event_ops_poll;
 
 #ifdef HAVE_SYS_EPOLL_H
-        extern struct event_ops event_ops_epoll;
-
         event_pool = event_ops_epoll.new (count);
 
         if (event_pool) {
diff --git a/libglusterfs/src/event.h b/libglusterfs/src/event.h
index 7ed182492..0e87f0cd7 100644
--- a/libglusterfs/src/event.h
+++ b/libglusterfs/src/event.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _EVENT_H_
@@ -21,8 +30,8 @@
 struct event_pool;
 struct event_ops;
 struct event_data {
-	int fd;
-	int idx;
+  int fd;
+  int idx;
 } __attribute__ ((__packed__, __may_alias__));
 
 
@@ -30,27 +39,28 @@ typedef int (*event_handler_t) (int fd, int idx, void *data,
 				int poll_in, int poll_out, int poll_err);
 
 struct event_pool {
-	struct event_ops *ops;
+  struct event_ops *ops;
 
-	int fd;
-	int breaker[2];
+  int fd;
+  int breaker[2];
 
-	int count;
-	struct {
-		int fd;
-		int events;
-		void *data;
-		event_handler_t handler;
-	} *reg;
+  int count;
+  struct {
+    int fd;
+    int events;
+    void *data;
+    event_handler_t handler;
+  } *reg;
 
-	int used;
-	int changed;
+  int used;
+  int idx_cache;
+  int changed;
 
-	pthread_mutex_t mutex;
-	pthread_cond_t cond;
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
 
-	void *evcache;
-	int evcache_size;
+  void *evcache;
+  int evcache_size;
 };
 
 struct event_ops {
diff --git a/libglusterfs/src/fd-lk.c b/libglusterfs/src/fd-lk.c
deleted file mode 100644
index caf2bb38e..000000000
--- a/libglusterfs/src/fd-lk.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include "fd-lk.h"
-#include "common-utils.h"
-
-
-int32_t
-_fd_lk_delete_lock (fd_lk_ctx_node_t *lock)
-{
-        int32_t    ret = -1;
-
-        GF_VALIDATE_OR_GOTO ("fd-lk", lock, out);
-
-        list_del_init (&lock->next);
-
-        ret = 0;
-out:
-        return ret;
-}
-
-int32_t
-_fd_lk_destroy_lock (fd_lk_ctx_node_t *lock)
-{
-        int32_t    ret = -1;
-
-        GF_VALIDATE_OR_GOTO ("fd-lk", lock, out);
-
-        GF_FREE (lock);
-
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-_fd_lk_destroy_lock_list (fd_lk_ctx_t *lk_ctx)
-{
-        int               ret     = -1;
-        fd_lk_ctx_node_t *lk      = NULL;
-        fd_lk_ctx_node_t *tmp     = NULL;
-
-        GF_VALIDATE_OR_GOTO ("fd-lk", lk_ctx, out);
-
-        list_for_each_entry_safe (lk, tmp, &lk_ctx->lk_list, next) {
-                _fd_lk_delete_lock (lk);
-                _fd_lk_destroy_lock (lk);
-        }
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-fd_lk_ctx_unref (fd_lk_ctx_t *lk_ctx)
-{
-        int ref = -1;
-
-        GF_VALIDATE_OR_GOTO ("fd-lk", lk_ctx, err);
-
-        LOCK (&lk_ctx->lock);
-        {
-                ref = --lk_ctx->ref;
-                if (ref < 0)
-                        GF_ASSERT (!ref);
-                if (ref == 0)
-                        _fd_lk_destroy_lock_list (lk_ctx);
-        }
-        UNLOCK (&lk_ctx->lock);
-
-        if (ref == 0) {
-                LOCK_DESTROY (&lk_ctx->lock);
-                GF_FREE (lk_ctx);
-        }
-
-        return 0;
-err:
-        return -1;
-}
-
-fd_lk_ctx_t *
-_fd_lk_ctx_ref (fd_lk_ctx_t *lk_ctx)
-{
-        if (!lk_ctx) {
-                gf_log_callingfn ("fd", GF_LOG_WARNING,
-                                  "invalid argument");
-                return NULL;
-        }
-
-        ++lk_ctx->ref;
-
-        return lk_ctx;
-}
-
-fd_lk_ctx_t *
-fd_lk_ctx_ref (fd_lk_ctx_t *lk_ctx)
-{
-        fd_lk_ctx_t *new_lk_ctx = NULL;
-
-        if (!lk_ctx) {
-                gf_log_callingfn ("fd", GF_LOG_WARNING,
-                                  "invalid argument");
-                return NULL;
-        }
-
-        LOCK (&lk_ctx->lock);
-        {
-                new_lk_ctx = _fd_lk_ctx_ref (lk_ctx);
-        }
-        UNLOCK (&lk_ctx->lock);
-
-        return new_lk_ctx;
-}
-
-fd_lk_ctx_t *
-fd_lk_ctx_try_ref (fd_lk_ctx_t *lk_ctx)
-{
-        int         ret         = -1;
-        fd_lk_ctx_t *new_lk_ctx = NULL;
-
-        if (!lk_ctx) {
-                goto out;
-        }
-
-        ret = TRY_LOCK (&lk_ctx->lock);
-        if (ret)
-                goto out;
-
-        new_lk_ctx = _fd_lk_ctx_ref (lk_ctx);
-        UNLOCK (&lk_ctx->lock);
-
-out:
-        return new_lk_ctx;
-}
-
-fd_lk_ctx_t *
-fd_lk_ctx_create ()
-{
-        fd_lk_ctx_t *fd_lk_ctx = NULL;
-
-        fd_lk_ctx = GF_CALLOC (1, sizeof (fd_lk_ctx_t),
-                               gf_common_mt_fd_lk_ctx_t);
-        if (!fd_lk_ctx)
-                goto out;
-
-        INIT_LIST_HEAD (&fd_lk_ctx->lk_list);
-
-        LOCK_INIT (&fd_lk_ctx->lock);
-
-        fd_lk_ctx = fd_lk_ctx_ref (fd_lk_ctx);
-out:
-        return fd_lk_ctx;
-}
-
-int
-_fd_lk_insert_lock (fd_lk_ctx_t *lk_ctx,
-                    fd_lk_ctx_node_t *lock)
-{
-        list_add_tail (&lock->next, &lk_ctx->lk_list);
-        return 0;
-}
-
-static off_t
-_fd_lk_get_lock_len (off_t start, off_t end)
-{
-        if (end == LLONG_MAX)
-                return 0;
-        else
-                return (end - start + 1);
-}
-
-fd_lk_ctx_node_t *
-fd_lk_ctx_node_new (int32_t cmd, struct gf_flock *flock)
-{
-        fd_lk_ctx_node_t  *new_lock  = NULL;
-
-        /* TODO: get from mem-pool */
-        new_lock = GF_CALLOC (1, sizeof (fd_lk_ctx_node_t),
-                              gf_common_mt_fd_lk_ctx_node_t);
-        if (!new_lock)
-                goto out;
-
-        new_lock->cmd = cmd;
-
-        if (flock) {
-                new_lock->fl_type  = flock->l_type;
-                new_lock->fl_start = flock->l_start;
-
-                if (flock->l_len == 0)
-                        new_lock->fl_end = LLONG_MAX;
-                else
-                        new_lock->fl_end = flock->l_start + flock->l_len - 1;
-
-                memcpy (&new_lock->user_flock, flock,
-                        sizeof (struct gf_flock));
-        }
-
-        INIT_LIST_HEAD (&new_lock->next);
-out:
-        return new_lock;
-}
-
-int32_t
-_fd_lk_delete_unlck_locks (fd_lk_ctx_t *lk_ctx)
-{
-        int32_t            ret   = -1;
-        fd_lk_ctx_node_t  *tmp   = NULL;
-        fd_lk_ctx_node_t  *lk    = NULL;
-
-        GF_VALIDATE_OR_GOTO ("fd-lk", lk_ctx, out);
-
-        list_for_each_entry_safe (lk, tmp, &lk_ctx->lk_list, next) {
-                if (lk->fl_type == F_UNLCK) {
-                        _fd_lk_delete_lock (lk);
-                        _fd_lk_destroy_lock (lk);
-                }
-        }
-out:
-        return ret;
-}
-
-int
-fd_lk_overlap (fd_lk_ctx_node_t *l1,
-               fd_lk_ctx_node_t *l2)
-{
-        if (l1->fl_end >= l2->fl_start &&
-            l2->fl_end >= l1->fl_start)
-                return 1;
-
-        return 0;
-}
-
-fd_lk_ctx_node_t *
-_fd_lk_add_locks (fd_lk_ctx_node_t *l1,
-                  fd_lk_ctx_node_t *l2)
-{
-        fd_lk_ctx_node_t  *sum = NULL;
-
-        sum = fd_lk_ctx_node_new (0, NULL);
-        if (!sum)
-                goto out;
-
-        sum->fl_start = min (l1->fl_start, l2->fl_start);
-        sum->fl_end   = max (l1->fl_end, l2->fl_end);
-
-        sum->user_flock.l_start = sum->fl_start;
-        sum->user_flock.l_len   = _fd_lk_get_lock_len (sum->fl_start,
-                                                       sum->fl_end);
-out:
-        return sum;
-}
-
-/* Subtract two locks */
-struct _values {
-        fd_lk_ctx_node_t *locks[3];
-};
-
-int32_t
-_fd_lk_sub_locks (struct _values *v,
-                  fd_lk_ctx_node_t *big,
-                  fd_lk_ctx_node_t *small)
-{
-        int32_t  ret  = -1;
-
-        if ((big->fl_start == small->fl_start) &&
-            (big->fl_end   == small->fl_end)) {
-                /* both edges coincide with big */
-                v->locks[0] = fd_lk_ctx_node_new (small->cmd, NULL);
-                if (!v->locks[0])
-                        goto out;
-
-                memcpy (v->locks[0], big, sizeof (fd_lk_ctx_node_t));
-
-                v->locks[0]->fl_type            = small->fl_type;
-                v->locks[0]->user_flock.l_type = small->fl_type;
-        } else if ((small->fl_start > big->fl_start) &&
-                   (small->fl_end   < big->fl_end)) {
-                /* small lock is completely inside big lock,
-                   break it down into 3 different locks. */
-                v->locks[0] = fd_lk_ctx_node_new (big->cmd, NULL);
-                if (!v->locks[0])
-                        goto out;
-
-                v->locks[1] = fd_lk_ctx_node_new (small->cmd, NULL);
-                if (!v->locks[1])
-                        goto out;
-
-                v->locks[2] = fd_lk_ctx_node_new (big->cmd, NULL);
-                if (!v->locks[2])
-                        goto out;
-
-                memcpy (v->locks[0], big, sizeof (fd_lk_ctx_node_t));
-                v->locks[0]->fl_end = small->fl_start - 1;
-                v->locks[0]->user_flock.l_len =
-                        _fd_lk_get_lock_len (v->locks[0]->fl_start,
-                                             v->locks[0]->fl_end);
-
-                memcpy (v->locks[1], small, sizeof (fd_lk_ctx_node_t));
-
-                memcpy (v->locks[2], big, sizeof (fd_lk_ctx_node_t));
-                v->locks[2]->fl_start = small->fl_end + 1;
-                v->locks[2]->user_flock.l_len =
-                        _fd_lk_get_lock_len (v->locks[2]->fl_start,
-                                             v->locks[2]->fl_end);
-        } else if (small->fl_start == big->fl_start) {
-                /* One of the ends co-incide, break the
-                   locks into two seperate parts */
-                v->locks[0] = fd_lk_ctx_node_new (small->cmd, NULL);
-                if (!v->locks[0])
-                        goto out;
-
-                v->locks[1] = fd_lk_ctx_node_new (big->cmd, NULL);
-                if (!v->locks[1])
-                        goto out;
-
-                memcpy (v->locks[0], small, sizeof (fd_lk_ctx_node_t));
-
-                memcpy (v->locks[1], big, sizeof (fd_lk_ctx_node_t));
-                v->locks[1]->fl_start = small->fl_end + 1;
-                v->locks[1]->user_flock.l_start = small->fl_end + 1;
-        } else if (small->fl_end == big->fl_end) {
-                /* One of the ends co-incide, break the
-                   locks into two seperate parts */
-                v->locks[0] = fd_lk_ctx_node_new (small->cmd, NULL);
-                if (!v->locks[0])
-                        goto out;
-
-                v->locks[1] = fd_lk_ctx_node_new (big->cmd, NULL);
-                if (!v->locks[1])
-                        goto out;
-
-                memcpy (v->locks[0], big, sizeof (fd_lk_ctx_node_t));
-                v->locks[0]->fl_end = small->fl_start - 1;
-                v->locks[0]->user_flock.l_len =
-                        _fd_lk_get_lock_len (v->locks[0]->fl_start,
-                                             v->locks[0]->fl_end);
-
-                memcpy (v->locks[1], small, sizeof (fd_lk_ctx_node_t));
-        } else {
-                /* We should never come to this case */
-                GF_ASSERT (!"Invalid case");
-        }
-        ret = 0;
-out:
-        return ret;
-}
-
-static void
-_fd_lk_insert_and_merge (fd_lk_ctx_t *lk_ctx,
-                         fd_lk_ctx_node_t *lock)
-{
-        int32_t               ret     = -1;
-        int32_t               i       = 0;
-        fd_lk_ctx_node_t     *entry   = NULL;
-        fd_lk_ctx_node_t     *t       = NULL;
-        fd_lk_ctx_node_t     *sum     = NULL;
-        struct _values        v       = {.locks = {0, 0, 0 }};
-
-        list_for_each_entry_safe (entry, t, &lk_ctx->lk_list, next) {
-                if (!fd_lk_overlap (entry, lock))
-                        continue;
-
-                if (entry->fl_type == lock->fl_type) {
-                        sum = _fd_lk_add_locks (entry, lock);
-                        if (!sum)
-                                return;
-                        sum->fl_type = entry->fl_type;
-                        sum->user_flock.l_type = entry->fl_type;
-                        _fd_lk_delete_lock (entry);
-                        _fd_lk_destroy_lock (entry);
-                        _fd_lk_destroy_lock (lock);
-                        _fd_lk_insert_and_merge (lk_ctx, sum);
-                        return;
-                } else {
-                        sum = _fd_lk_add_locks (entry, lock);
-                        sum->fl_type = lock->fl_type;
-                        sum->user_flock.l_type = lock->fl_type;
-                        ret = _fd_lk_sub_locks (&v, sum, lock);
-                        if (ret)
-                                return;
-                        _fd_lk_delete_lock (entry);
-                        _fd_lk_destroy_lock (entry);
-
-                        _fd_lk_delete_lock (lock);
-                        _fd_lk_destroy_lock (lock);
-
-                        _fd_lk_destroy_lock (sum);
-
-                        for (i = 0; i < 3; i++) {
-                                if (!v.locks[i])
-                                        continue;
-
-                                INIT_LIST_HEAD (&v.locks[i]->next);
-                                _fd_lk_insert_and_merge (lk_ctx, v.locks[i]);
-                        }
-                        _fd_lk_delete_unlck_locks (lk_ctx);
-                        return;
-                }
-        }
-
-        /* no conflicts, so just insert */
-        if (lock->fl_type != F_UNLCK) {
-                _fd_lk_insert_lock (lk_ctx, lock);
-        } else {
-                _fd_lk_destroy_lock (lock);
-        }
-}
-
-static void
-print_lock_list (fd_lk_ctx_t *lk_ctx)
-{
-        fd_lk_ctx_node_t    *lk     = NULL;
-
-        gf_log ("fd-lk", GF_LOG_DEBUG, "lock list:");
-
-        list_for_each_entry (lk, &lk_ctx->lk_list, next)
-                gf_log ("fd-lk", GF_LOG_DEBUG, "owner = %s, "
-                        "cmd = %s fl_type = %s, fs_start = %"PRId64", "
-                        "fs_end = %"PRId64", user_flock: l_type = %s, "
-                        "l_start = %"PRId64", l_len = %"PRId64", ",
-                        lkowner_utoa (&lk->user_flock.l_owner),
-                        get_lk_cmd (lk->cmd), get_lk_type (lk->fl_type),
-                        lk->fl_start, lk->fl_end,
-                        get_lk_type (lk->user_flock.l_type),
-                        lk->user_flock.l_start,
-                        lk->user_flock.l_len);
-}
-
-int
-fd_lk_insert_and_merge (fd_t *fd, int32_t cmd,
-                        struct gf_flock *flock)
-{
-        int32_t              ret      = -1;
-        fd_lk_ctx_t         *lk_ctx   = NULL;
-        fd_lk_ctx_node_t    *lk     = NULL;
-
-        GF_VALIDATE_OR_GOTO ("fd-lk", fd, out);
-        GF_VALIDATE_OR_GOTO ("fd-lk", flock, out);
-
-        lk_ctx = fd_lk_ctx_ref (fd->lk_ctx);
-        lk     = fd_lk_ctx_node_new (cmd, flock);
-
-        gf_log ("fd-lk", GF_LOG_DEBUG,
-                "new lock requrest: owner = %s, fl_type = %s, "
-                "fs_start = %"PRId64", fs_end = %"PRId64", "
-                "user_flock: l_type = %s, l_start = %"PRId64", "
-                "l_len = %"PRId64, lkowner_utoa (&flock->l_owner),
-                get_lk_type (lk->fl_type), lk->fl_start,
-                lk->fl_end, get_lk_type (lk->user_flock.l_type),
-                lk->user_flock.l_start,
-                lk->user_flock.l_len);
-
-        LOCK (&lk_ctx->lock);
-        {
-                _fd_lk_insert_and_merge (lk_ctx, lk);
-                print_lock_list (lk_ctx);
-        }
-        UNLOCK (&lk_ctx->lock);
-
-        fd_lk_ctx_unref (lk_ctx);
-
-        ret = 0;
-out:
-        return ret;
-}
-
-
-gf_boolean_t
-fd_lk_ctx_empty (fd_lk_ctx_t *lk_ctx)
-{
-	gf_boolean_t verdict = _gf_true;
-
-	if (!lk_ctx)
-		return _gf_true;
-
-	LOCK (&lk_ctx->lock);
-	{
-		verdict = list_empty (&lk_ctx->lk_list);
-	}
-	UNLOCK (&lk_ctx->lock);
-
-	return verdict;
-}
diff --git a/libglusterfs/src/fd-lk.h b/libglusterfs/src/fd-lk.h
deleted file mode 100644
index 1d2ff794c..000000000
--- a/libglusterfs/src/fd-lk.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _FD_LK_H
-#define _FD_LK_H
-
-#include "fd.h"
-#include "locking.h"
-#include "list.h"
-#include "logging.h"
-#include "mem-pool.h"
-#include "mem-types.h"
-#include "glusterfs.h"
-#include "common-utils.h"
-
-#define get_lk_type(type)                                               \
-        type == F_UNLCK ? "F_UNLCK" : (type == F_RDLCK ? "F_RDLCK" : "F_WRLCK")
-
-#define get_lk_cmd(cmd)                                                 \
-        cmd == F_SETLKW ? "F_SETLKW" : (cmd == F_SETLK ? "F_SETLK" : "F_GETLK")
-
-struct _fd;
-
-struct fd_lk_ctx {
-        struct list_head lk_list;
-        int   ref;
-        gf_lock_t lock;
-};
-typedef struct fd_lk_ctx fd_lk_ctx_t;
-
-struct fd_lk_ctx_node {
-        int32_t            cmd;
-        struct gf_flock    user_flock;
-        off_t              fl_start;
-        off_t              fl_end;
-        short              fl_type;
-        struct list_head   next;
-};
-typedef struct fd_lk_ctx_node fd_lk_ctx_node_t;
-
-fd_lk_ctx_t *
-_fd_lk_ctx_ref (fd_lk_ctx_t *lk_ctx);
-
-fd_lk_ctx_t *
-fd_lk_ctx_ref (fd_lk_ctx_t *lk_ctx);
-
-fd_lk_ctx_t *
-fd_lk_ctx_try_ref (fd_lk_ctx_t *lk_ctx);
-
-fd_lk_ctx_t *
-fd_lk_ctx_create ();
-
-int
-fd_lk_insert_and_merge (struct _fd *lk_ctx, int32_t cmd,
-                        struct gf_flock *flock);
-
-int
-fd_lk_ctx_unref (fd_lk_ctx_t *lk_ctx);
-
-gf_boolean_t
-fd_lk_ctx_empty (fd_lk_ctx_t *lk_ctx);
-
-#endif /* _FD_LK_H */
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c
index 36cc4d056..ee98ef2eb 100644
--- a/libglusterfs/src/fd.c
+++ b/libglusterfs/src/fd.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include "fd.h"
@@ -26,7 +35,28 @@ gf_fd_fdtable_expand (fdtable_t *fdtable, uint32_t nr);
 
 
 fd_t *
-__fd_ref (fd_t *fd);
+_fd_ref (fd_t *fd);
+
+/*
+  Allocate in memory chunks of power of 2 starting from 1024B
+  Assumes fdtable->lock is held
+*/
+static inline int
+gf_roundup_power_of_two (uint32_t nr)
+{
+        uint32_t result = 1;
+
+        if (nr < 0) {
+                gf_log ("fd", GF_LOG_ERROR, "negative number passed");
+                return -1;
+        }
+
+        while (result <= nr)
+                result *= 2;
+
+        return result;
+}
+
 
 static int
 gf_fd_chain_fd_entries (fdentry_t *entries, uint32_t startidx,
@@ -66,7 +96,7 @@ gf_fd_fdtable_expand (fdtable_t *fdtable, uint32_t nr)
         }
 
         nr /= (1024 / sizeof (fdentry_t));
-        nr = gf_roundup_next_power_of_two (nr + 1);
+        nr = gf_roundup_power_of_two (nr + 1);
         nr *= (1024 / sizeof (fdentry_t));
 
         oldfds = fdtable->fdentries;
@@ -121,7 +151,7 @@ gf_fd_fdtable_alloc (void)
 }
 
 
-static fdentry_t *
+fdentry_t *
 __gf_fd_fdtable_get_all_fds (fdtable_t *fdtable, uint32_t *count)
 {
         fdentry_t       *fdentries = NULL;
@@ -159,53 +189,6 @@ gf_fd_fdtable_get_all_fds (fdtable_t *fdtable, uint32_t *count)
 }
 
 
-static fdentry_t *
-__gf_fd_fdtable_copy_all_fds (fdtable_t *fdtable, uint32_t *count)
-{
-        fdentry_t *fdentries = NULL;
-        int        i         = 0;
-
-        if (count == NULL) {
-                gf_log_callingfn ("fd", GF_LOG_WARNING, "!count");
-                goto out;
-        }
-
-        fdentries = GF_CALLOC (fdtable->max_fds, sizeof (fdentry_t),
-                               gf_common_mt_fdentry_t);
-        if (fdentries == NULL) {
-                goto out;
-        }
-
-        *count = fdtable->max_fds;
-
-        for (i = 0; i < fdtable->max_fds; i++) {
-                if (fdtable->fdentries[i].fd != NULL) {
-                        fdentries[i].fd = fd_ref (fdtable->fdentries[i].fd);
-                }
-        }
-
-out:
-        return fdentries;
-}
-
-
-fdentry_t *
-gf_fd_fdtable_copy_all_fds (fdtable_t *fdtable, uint32_t *count)
-{
-        fdentry_t *entries = NULL;
-
-        if (fdtable) {
-                pthread_mutex_lock (&fdtable->lock);
-                {
-                        entries = __gf_fd_fdtable_copy_all_fds (fdtable, count);
-                }
-                pthread_mutex_unlock (&fdtable->lock);
-        }
-
-        return entries;
-}
-
-
 void
 gf_fd_fdtable_destroy (fdtable_t *fdtable)
 {
@@ -307,10 +290,6 @@ gf_fd_put (fdtable_t *fdtable, int32_t fd)
         fd_t *fdptr = NULL;
         fdentry_t *fde = NULL;
 
-        if (fd == -2)
-                /* anonymous fd */
-                return;
-
         if (fdtable == NULL || fd < 0) {
                 gf_log_callingfn ("fd", GF_LOG_ERROR, "invalid argument");
                 return;
@@ -328,7 +307,7 @@ gf_fd_put (fdtable_t *fdtable, int32_t fd)
                  * without doing anything.
                  * This has the potential of masking out any bugs in a user of
                  * fd that ends up calling gf_fd_put twice for the same fd or
-                 * for an unallocated fd, but it is a price we have to pay for
+                 * for an unallocated fd, but thats a price we have to pay for
                  * ensuring sanity of our fd-table.
                  */
                 if (fde->next_free != GF_FDENTRY_ALLOCATED)
@@ -347,54 +326,6 @@ unlock_out:
 }
 
 
-inline void
-gf_fdptr_put (fdtable_t *fdtable, fd_t *fd)
-{
-        fdentry_t *fde   = NULL;
-        int32_t    i     = 0;
-
-        if ((fdtable == NULL) || (fd == NULL)) {
-                gf_log_callingfn ("fd", GF_LOG_ERROR, "invalid argument");
-                return;
-        }
-
-        pthread_mutex_lock (&fdtable->lock);
-        {
-                for (i = 0; i < fdtable->max_fds; i++) {
-                        if (fdtable->fdentries[i].fd == fd) {
-                                fde = &fdtable->fdentries[i];
-                                break;
-                        }
-                }
-
-                if (fde == NULL) {
-                        gf_log_callingfn ("fd", GF_LOG_WARNING,
-                                "fd (%p) is not present in fdtable", fd);
-                        goto unlock_out;
-                }
-
-                /* If the entry is not allocated, put operation must return
-                 * without doing anything.
-                 * This has the potential of masking out any bugs in a user of
-                 * fd that ends up calling gf_fd_put twice for the same fd or
-                 * for an unallocated fd, but it is a price we have to pay for
-                 * ensuring sanity of our fd-table.
-                 */
-                if (fde->next_free != GF_FDENTRY_ALLOCATED)
-                        goto unlock_out;
-                fde->fd = NULL;
-                fde->next_free = fdtable->first_free;
-                fdtable->first_free = i;
-        }
-unlock_out:
-        pthread_mutex_unlock (&fdtable->lock);
-
-        if ((fd != NULL) && (fde != NULL)) {
-                fd_unref (fd);
-        }
-}
-
-
 fd_t *
 gf_fd_fdptr_get (fdtable_t *fdtable, int64_t fd)
 {
@@ -426,7 +357,7 @@ gf_fd_fdptr_get (fdtable_t *fdtable, int64_t fd)
 
 
 fd_t *
-__fd_ref (fd_t *fd)
+_fd_ref (fd_t *fd)
 {
         ++fd->refcount;
 
@@ -445,7 +376,7 @@ fd_ref (fd_t *fd)
         }
 
         LOCK (&fd->inode->lock);
-        refed_fd = __fd_ref (fd);
+        refed_fd = _fd_ref (fd);
         UNLOCK (&fd->inode->lock);
 
         return refed_fd;
@@ -453,7 +384,7 @@ fd_ref (fd_t *fd)
 
 
 fd_t *
-__fd_unref (fd_t *fd)
+_fd_unref (fd_t *fd)
 {
         GF_ASSERT (fd->refcount);
 
@@ -473,9 +404,10 @@ fd_destroy (fd_t *fd)
         xlator_t    *xl = NULL;
         int          i = 0;
         xlator_t    *old_THIS = NULL;
+        struct mem_pool *tmp_pool = NULL;
 
         if (fd == NULL){
-                gf_log_callingfn ("xlator", GF_LOG_ERROR, "invalid argument");
+                gf_log_callingfn ("xlator", GF_LOG_ERROR, "invalid arugument");
                 goto out;
         }
 
@@ -486,8 +418,10 @@ fd_destroy (fd_t *fd)
         if (!fd->_ctx)
                 goto out;
 
+        tmp_pool = fd->inode->table->fd_mem_pool;
+
         if (IA_ISDIR (fd->inode->ia_type)) {
-                for (i = 0; i <  fd->xl_count; i++) {
+                for (i = 0; i < fd->xl_count; i++) {
                         if (fd->_ctx[i].key) {
                                 xl = fd->_ctx[i].xl_key;
                                 old_THIS = THIS;
@@ -513,15 +447,10 @@ fd_destroy (fd_t *fd)
         LOCK_DESTROY (&fd->lock);
 
         GF_FREE (fd->_ctx);
-        LOCK (&fd->inode->lock);
-        {
-                fd->inode->fd_count--;
-        }
-        UNLOCK (&fd->inode->lock);
         inode_unref (fd->inode);
         fd->inode = (inode_t *)0xaaaaaaaa;
-        fd_lk_ctx_unref (fd->lk_ctx);
-        mem_put (fd);
+        mem_put (tmp_pool,fd);
+        tmp_pool = NULL;
 out:
         return;
 }
@@ -539,7 +468,7 @@ fd_unref (fd_t *fd)
 
         LOCK (&fd->inode->lock);
         {
-                __fd_unref (fd);
+                _fd_unref (fd);
                 refcount = fd->refcount;
         }
         UNLOCK (&fd->inode->lock);
@@ -553,36 +482,28 @@ fd_unref (fd_t *fd)
 
 
 fd_t *
-__fd_bind (fd_t *fd)
-{
-        list_del_init (&fd->inode_list);
-        list_add (&fd->inode_list, &fd->inode->fd_list);
-        fd->inode->fd_count++;
-
-        return fd;
-}
-
-
-fd_t *
 fd_bind (fd_t *fd)
 {
+        inode_t *inode = NULL;
+
         if (!fd || !fd->inode) {
                 gf_log_callingfn ("fd", GF_LOG_ERROR, "!fd || !fd->inode");
                 return NULL;
         }
+        inode = fd->inode;
 
-        LOCK (&fd->inode->lock);
+        LOCK (&inode->lock);
         {
-                fd = __fd_bind (fd);
+                list_add (&fd->inode_list, &inode->fd_list);
         }
-        UNLOCK (&fd->inode->lock);
+        UNLOCK (&inode->lock);
 
         return fd;
 }
 
 
-static fd_t *
-__fd_create (inode_t *inode, uint64_t pid)
+fd_t *
+fd_create (inode_t *inode, pid_t pid)
 {
         fd_t *fd = NULL;
 
@@ -599,111 +520,33 @@ __fd_create (inode_t *inode, uint64_t pid)
 
         fd->_ctx = GF_CALLOC (1, (sizeof (struct _fd_ctx) * fd->xl_count),
                               gf_common_mt_fd_ctx);
-        if (!fd->_ctx)
-                goto free_fd;
-
-        fd->lk_ctx = fd_lk_ctx_create ();
-        if (!fd->lk_ctx)
-                goto free_fd_ctx;
+        if (!fd->_ctx) {
+                GF_FREE (fd);
+                fd = NULL;
+                goto out;
+        }
 
         fd->inode = inode_ref (inode);
         fd->pid = pid;
         INIT_LIST_HEAD (&fd->inode_list);
 
         LOCK_INIT (&fd->lock);
-out:
-        return fd;
-
-free_fd_ctx:
-        GF_FREE (fd->_ctx);
-free_fd:
-        mem_put (fd);
-
-        return NULL;
-}
-
-
-fd_t *
-fd_create (inode_t *inode, pid_t pid)
-{
-        fd_t *fd = NULL;
-
-        fd = __fd_create (inode, (uint64_t)pid);
-        if (!fd)
-                goto out;
-
-        fd = fd_ref (fd);
-
-out:
-        return fd;
-}
-
-fd_t *
-fd_create_uint64 (inode_t *inode, uint64_t pid)
-{
-        fd_t *fd = NULL;
-
-        fd = __fd_create (inode, pid);
-        if (!fd)
-                goto out;
-
-        fd = fd_ref (fd);
-
-out:
-        return fd;
-}
-
-
-static fd_t *
-__fd_lookup (inode_t *inode, uint64_t pid)
-{
-        fd_t *iter_fd = NULL;
-        fd_t *fd = NULL;
-
-        if (list_empty (&inode->fd_list))
-                return NULL;
-
-
-        list_for_each_entry (iter_fd, &inode->fd_list, inode_list) {
-                if (iter_fd->anonymous)
-                        /* If someone was interested in getting an
-                           anonymous fd (or was OK getting an anonymous fd),
-                           they can as well call fd_anonymous() directly */
-                        continue;
-
-                if (!pid || iter_fd->pid == pid) {
-                        fd = __fd_ref (iter_fd);
-                        break;
-                }
-        }
-
-        return fd;
-}
-
-
-fd_t *
-fd_lookup (inode_t *inode, pid_t pid)
-{
-        fd_t *fd = NULL;
-
-        if (!inode) {
-                gf_log_callingfn ("fd", GF_LOG_WARNING, "!inode");
-                return NULL;
-        }
 
         LOCK (&inode->lock);
         {
-                fd = __fd_lookup (inode, (uint64_t)pid);
+                fd = _fd_ref (fd);
         }
         UNLOCK (&inode->lock);
-
+out:
         return fd;
 }
 
+
 fd_t *
-fd_lookup_uint64 (inode_t *inode, uint64_t pid)
+fd_lookup (inode_t *inode, pid_t pid)
 {
         fd_t *fd = NULL;
+        fd_t *iter_fd = NULL;
 
         if (!inode) {
                 gf_log_callingfn ("fd", GF_LOG_WARNING, "!inode");
@@ -712,98 +555,27 @@ fd_lookup_uint64 (inode_t *inode, uint64_t pid)
 
         LOCK (&inode->lock);
         {
-                fd = __fd_lookup (inode, pid);
-        }
-        UNLOCK (&inode->lock);
-
-        return fd;
-}
-
-static fd_t *
-__fd_lookup_anonymous (inode_t *inode)
-{
-        fd_t *iter_fd = NULL;
-        fd_t *fd = NULL;
-
-        if (list_empty (&inode->fd_list))
-                return NULL;
-
-        list_for_each_entry (iter_fd, &inode->fd_list, inode_list) {
-                if (iter_fd->anonymous) {
-                        fd = __fd_ref (iter_fd);
-                        break;
+                if (list_empty (&inode->fd_list)) {
+                        fd = NULL;
+                } else {
+                        list_for_each_entry (iter_fd, &inode->fd_list, inode_list) {
+                                if (pid) {
+                                        if (iter_fd->pid == pid) {
+                                                fd = _fd_ref (iter_fd);
+                                                break;
+                                        }
+                                } else {
+                                        fd = _fd_ref (iter_fd);
+                                        break;
+                                }
+                        }
                 }
         }
-
-        return fd;
-}
-
-static fd_t *
-__fd_anonymous (inode_t *inode)
-{
-        fd_t *fd = NULL;
-
-        fd = __fd_lookup_anonymous (inode);
-
-        /* if (fd); then we already have increased the refcount in
-           __fd_lookup_anonymous(), so no need of one more fd_ref().
-           if (!fd); then both create and bind wont bump up the ref
-           count, so we have to call fd_ref() after bind. */
-        if (!fd) {
-                fd = __fd_create (inode, 0);
-
-                if (!fd)
-                        return NULL;
-
-                fd->anonymous = _gf_true;
-
-                __fd_bind (fd);
-
-                __fd_ref (fd);
-        }
-
-        return fd;
-}
-
-
-fd_t *
-fd_anonymous (inode_t *inode)
-{
-        fd_t *fd = NULL;
-
-        LOCK (&inode->lock);
-        {
-                fd = __fd_anonymous (inode);
-        }
         UNLOCK (&inode->lock);
 
         return fd;
 }
 
-fd_t*
-fd_lookup_anonymous (inode_t *inode)
-{
-        fd_t *fd = NULL;
-
-        if (!inode) {
-                gf_log_callingfn ("fd", GF_LOG_WARNING, "!inode");
-                return NULL;
-        }
-
-        LOCK (&inode->lock);
-        {
-                fd = __fd_lookup_anonymous (inode);
-        }
-        UNLOCK (&inode->lock);
-        return fd;
-}
-
-gf_boolean_t
-fd_is_anonymous (fd_t *fd)
-{
-        return (fd && fd->anonymous);
-}
-
 
 uint8_t
 fd_list_empty (inode_t *inode)
@@ -823,12 +595,9 @@ fd_list_empty (inode_t *inode)
 int
 __fd_ctx_set (fd_t *fd, xlator_t *xlator, uint64_t value)
 {
-        int             index   = 0, new_xl_count = 0;
-        int             ret     = 0;
-        int             set_idx = -1;
-        void           *begin   = NULL;
-        size_t          diff    = 0;
-        struct _fd_ctx *tmp     = NULL;
+        int index = 0;
+        int ret = 0;
+        int set_idx = -1;
 
 	if (!fd || !xlator)
 		return -1;
@@ -847,33 +616,9 @@ __fd_ctx_set (fd_t *fd, xlator_t *xlator, uint64_t value)
         }
 
         if (set_idx == -1) {
-                set_idx = fd->xl_count;
-
-                new_xl_count = fd->xl_count + xlator->graph->xl_count;
-
-                tmp = GF_REALLOC (fd->_ctx,
-                                  (sizeof (struct _fd_ctx)
-                                   * new_xl_count));
-                if (tmp == NULL) {
-                        gf_log_callingfn (THIS->name, GF_LOG_WARNING,
-                                          "realloc of fd->_ctx for fd "
-                                          "(ptr: %p) failed, cannot set the key"
-                                          , fd);
-                        ret = -1;
-                        goto out;
-                }
-
-                fd->_ctx = tmp;
-
-                begin = fd->_ctx;
-                begin += (fd->xl_count * sizeof (struct _fd_ctx));
-
-                diff = (new_xl_count - fd->xl_count )
-                        * sizeof (struct _fd_ctx);
-
-                memset (begin, 0, diff);
-
-                fd->xl_count = new_xl_count;
+                gf_log_callingfn ("", GF_LOG_WARNING, "%p %s", fd, xlator->name);
+                ret = -1;
+                goto out;
         }
 
         fd->_ctx[set_idx].xl_key = xlator;
@@ -1006,16 +751,16 @@ fd_dump (fd_t *fd, char *prefix)
                 return;
 
         memset(key, 0, sizeof(key));
-        gf_proc_dump_write("pid", "%llu", fd->pid);
-        gf_proc_dump_write("refcount", "%d", fd->refcount);
-        gf_proc_dump_write("flags", "%d", fd->flags);
-
+        gf_proc_dump_build_key(key, prefix, "pid");
+        gf_proc_dump_write(key, "%d", fd->pid);
+        gf_proc_dump_build_key(key, prefix, "refcount");
+        gf_proc_dump_write(key, "%d", fd->refcount);
+        gf_proc_dump_build_key(key, prefix, "flags");
+        gf_proc_dump_write(key, "%d", fd->flags);
         if (fd->inode) {
-                gf_proc_dump_build_key (key, "inode", NULL);
-                gf_proc_dump_add_section(key);
-                inode_dump (fd->inode, key);
+                gf_proc_dump_build_key(key, prefix, "inode");
+                gf_proc_dump_write(key, "%ld", fd->inode->ino);
         }
-
 }
 
 
@@ -1045,8 +790,10 @@ fdtable_dump (fdtable_t *fdtable, char *prefix)
 
         ret = pthread_mutex_trylock (&fdtable->lock);
 
-        if (ret)
-                goto out;
+        if (ret) {
+                gf_log ("fd", GF_LOG_WARNING, "Unable to acquire lock");
+                return;
+        }
 
         memset(key, 0, sizeof(key));
         gf_proc_dump_build_key(key, prefix, "refcount");
@@ -1066,12 +813,6 @@ fdtable_dump (fdtable_t *fdtable, char *prefix)
         }
 
         pthread_mutex_unlock(&fdtable->lock);
-
-out:
-        if (ret != 0)
-                gf_proc_dump_write ("Unable to dump the fdtable",
-                                    "(Lock acquistion failed) %p", fdtable);
-        return;
 }
 
 
@@ -1090,13 +831,15 @@ fd_ctx_dump (fd_t *fd, char *prefix)
         LOCK (&fd->lock);
         {
                 if (fd->_ctx != NULL) {
-                        fd_ctx = GF_CALLOC (fd->xl_count, sizeof (*fd_ctx),
+                        fd_ctx = GF_CALLOC (fd->inode->table->xl->graph->xl_count,
+                                            sizeof (*fd_ctx),
                                             gf_common_mt_fd_ctx);
                         if (fd_ctx == NULL) {
                                 goto unlock;
                         }
 
-                        for (i = 0; i < fd->xl_count; i++) {
+                        for (i = 0; i < fd->inode->table->xl->graph->xl_count;
+                             i++) {
                                 fd_ctx[i] = fd->_ctx[i];
                         }
                 }
@@ -1108,7 +851,7 @@ unlock:
                 goto out;
         }
 
-        for (i = 0; i < fd->xl_count; i++) {
+        for (i = 0; i < fd->inode->table->xl->graph->xl_count; i++) {
                 if (fd_ctx[i].xl_key) {
                         xl = (xlator_t *)(long)fd_ctx[i].xl_key;
                         if (xl->dumpops && xl->dumpops->fdctx)
@@ -1117,99 +860,9 @@ unlock:
         }
 
 out:
-        GF_FREE (fd_ctx);
-
-        return;
-}
-
-void
-fdentry_dump_to_dict (fdentry_t *fdentry, char *prefix, dict_t *dict,
-                      int *openfds)
-{
-        char    key[GF_DUMP_MAX_BUF_LEN] = {0,};
-        int     ret = -1;
-
-        if (!fdentry)
-                return;
-        if (!dict)
-                return;
-
-        if (GF_FDENTRY_ALLOCATED != fdentry->next_free)
-                return;
-
-        if (fdentry->fd) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.pid", prefix);
-                ret = dict_set_int32 (dict, key, fdentry->fd->pid);
-                if (ret)
-                        return;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.refcount", prefix);
-                ret = dict_set_int32 (dict, key, fdentry->fd->refcount);
-                if (ret)
-                        return;
-
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.flags", prefix);
-                ret = dict_set_int32 (dict, key, fdentry->fd->flags);
-
-                (*openfds)++;
-        }
-        return;
-}
-
-void
-fdtable_dump_to_dict (fdtable_t *fdtable, char *prefix, dict_t *dict)
-{
-        char    key[GF_DUMP_MAX_BUF_LEN] = {0,};
-        int     i = 0;
-        int     openfds = 0;
-        int     ret = -1;
-
-        if (!fdtable)
-                return;
-        if (!dict)
-                return;
-
-        ret = pthread_mutex_trylock (&fdtable->lock);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.fdtable.refcount", prefix);
-        ret = dict_set_int32 (dict, key, fdtable->refcount);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.fdtable.maxfds", prefix);
-        ret = dict_set_uint32 (dict, key, fdtable->max_fds);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.fdtable.firstfree", prefix);
-        ret = dict_set_int32 (dict, key, fdtable->first_free);
-        if (ret)
-                goto out;
-
-        for (i = 0; i < fdtable->max_fds; i++) {
-                if (GF_FDENTRY_ALLOCATED ==
-                    fdtable->fdentries[i].next_free) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%s.fdtable.fdentry%d",
-                                  prefix, i);
-                        fdentry_dump_to_dict (&fdtable->fdentries[i], key,
-                                              dict, &openfds);
-                }
+        if (fd_ctx != NULL) {
+                GF_FREE (fd_ctx);
         }
 
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.fdtable.openfds", prefix);
-        ret = dict_set_int32 (dict, key, openfds);
-
-out:
-        pthread_mutex_unlock (&fdtable->lock);
         return;
 }
diff --git a/libglusterfs/src/fd.h b/libglusterfs/src/fd.h
index c1b9157d8..3c2be972a 100644
--- a/libglusterfs/src/fd.h
+++ b/libglusterfs/src/fd.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _FD_H
@@ -21,14 +30,9 @@
 #include <unistd.h>
 #include "glusterfs.h"
 #include "locking.h"
-#include "fd-lk.h"
-#include "common-utils.h"
-
-#define GF_ANON_FD_NO -2
 
 struct _inode;
 struct _dict;
-struct fd_lk_ctx;
 
 struct _fd_ctx {
         union {
@@ -41,8 +45,12 @@ struct _fd_ctx {
         };
 };
 
+/* If this structure changes, please have mercy on the booster maintainer
+ * and update the fd_t struct in booster/src/booster-fd.h.
+ * See the comment there to know why.
+ */
 struct _fd {
-        uint64_t          pid;
+        pid_t             pid;
 	int32_t           flags;
         int32_t           refcount;
         struct list_head  inode_list;
@@ -51,8 +59,6 @@ struct _fd {
                                    'struct _fd_ctx' array (_ctx).*/
 	struct _fd_ctx   *_ctx;
         int               xl_count; /* Number of xl referred in this fd */
-        struct fd_lk_ctx *lk_ctx;
-        gf_boolean_t      anonymous; /* geo-rep anonymous fd */
 };
 typedef struct _fd fd_t;
 
@@ -86,7 +92,7 @@ typedef struct _fdtable fdtable_t;
 #include "xlator.h"
 
 
-void
+inline void
 gf_fd_put (fdtable_t *fdtable, int32_t fd);
 
 
@@ -111,10 +117,6 @@ gf_fd_fdtable_destroy (fdtable_t *fdtable);
 
 
 fd_t *
-__fd_ref (fd_t *fd);
-
-
-fd_t *
 fd_ref (fd_t *fd);
 
 
@@ -125,25 +127,10 @@ fd_unref (fd_t *fd);
 fd_t *
 fd_create (struct _inode *inode, pid_t pid);
 
-fd_t *
-fd_create_uint64 (struct _inode *inode, uint64_t pid);
 
 fd_t *
 fd_lookup (struct _inode *inode, pid_t pid);
 
-fd_t *
-fd_lookup_uint64 (struct _inode *inode, uint64_t pid);
-
-fd_t*
-fd_lookup_anonymous (inode_t *inode);
-
-fd_t *
-fd_anonymous (inode_t *inode);
-
-
-gf_boolean_t
-fd_is_anonymous (fd_t *fd);
-
 
 uint8_t
 fd_list_empty (struct _inode *inode);
@@ -164,9 +151,6 @@ fd_ctx_get (fd_t *fd, xlator_t *xlator, uint64_t *value);
 int
 fd_ctx_del (fd_t *fd, xlator_t *xlator, uint64_t *value);
 
-int
-__fd_ctx_del (fd_t *fd, xlator_t *xlator, uint64_t *value);
-
 
 int
 __fd_ctx_set (fd_t *fd, xlator_t *xlator, uint64_t value);
@@ -176,14 +160,13 @@ int
 __fd_ctx_get (fd_t *fd, xlator_t *xlator, uint64_t *value);
 
 
-void
-fd_ctx_dump (fd_t *fd, char *prefix);
-
-fdentry_t *
-gf_fd_fdtable_copy_all_fds (fdtable_t *fdtable, uint32_t *count);
+int
+__fd_ctx_del (fd_t *fd, xlator_t *xlator, uint64_t *value);
 
+fd_t *
+_fd_ref (fd_t *fd);
 
 void
-gf_fdptr_put (fdtable_t *fdtable, fd_t *fd);
+fd_ctx_dump (fd_t *fd, char *prefix);
 
 #endif /* _FD_H */
diff --git a/libglusterfs/src/gf-dirent.c b/libglusterfs/src/gf-dirent.c
index bb028c967..4c85db3f3 100644
--- a/libglusterfs/src/gf-dirent.c
+++ b/libglusterfs/src/gf-dirent.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -22,6 +31,26 @@
 #include "xlator.h"
 
 gf_dirent_t *
+gf_dirent_for_namelen (int len)
+{
+        gf_dirent_t *gf_dirent = NULL;
+
+        /* TODO: use mem-pool */
+        gf_dirent = CALLOC (len, sizeof(char));
+        if (!gf_dirent)
+                return NULL;
+
+        INIT_LIST_HEAD (&gf_dirent->list);
+
+        gf_dirent->d_off = 0;
+        gf_dirent->d_ino = -1;
+        gf_dirent->d_type = 0;
+
+        return gf_dirent;
+}
+
+
+gf_dirent_t *
 gf_dirent_for_name (const char *name)
 {
         gf_dirent_t *gf_dirent = NULL;
@@ -57,36 +86,7 @@ gf_dirent_free (gf_dirent_t *entries)
                 return;
 
         list_for_each_entry_safe (entry, tmp, &entries->list, list) {
-                if (entry->dict)
-                        dict_unref (entry->dict);
-                if (entry->inode)
-                        inode_unref (entry->inode);
-
                 list_del (&entry->list);
                 GF_FREE (entry);
         }
 }
-
-/* TODO: Currently, with this function, we will be breaking the
-   policy of 1-1 mapping of kernel nlookup refs with our inode_t's
-   nlookup count.
-   Need more thoughts before finalizing this function
-*/
-int
-gf_link_inodes_from_dirent (xlator_t *this, inode_t *parent,
-                            gf_dirent_t *entries)
-{
-        gf_dirent_t *entry      = NULL;
-        inode_t     *link_inode = NULL;
-
-        list_for_each_entry (entry, &entries->list, list) {
-                if (entry->inode) {
-                        link_inode = inode_link (entry->inode, parent,
-                                                 entry->d_name, &entry->d_stat);
-                        inode_lookup (link_inode);
-                        inode_unref (link_inode);
-                }
-        }
-
-        return 0;
-}
diff --git a/libglusterfs/src/gf-dirent.h b/libglusterfs/src/gf-dirent.h
index 588d522db..db1dac835 100644
--- a/libglusterfs/src/gf-dirent.h
+++ b/libglusterfs/src/gf-dirent.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -18,7 +27,6 @@
 #endif
 
 #include "iatt.h"
-#include "inode.h"
 
 #define gf_dirent_size(name) (sizeof (gf_dirent_t) + strlen (name) + 1)
 
@@ -43,16 +51,12 @@ struct _gf_dirent_t {
 	uint32_t                             d_len;
 	uint32_t                             d_type;
         struct iatt                          d_stat;
-        dict_t                              *dict;
-        inode_t                             *inode;
-	char                                 d_name[];
+	char                                 d_name[0];
 };
 
-#define DT_ISDIR(mode) (mode == DT_DIR)
 
 gf_dirent_t *gf_dirent_for_name (const char *name);
 void gf_dirent_free (gf_dirent_t *entries);
-int gf_link_inodes_from_dirent (xlator_t *this, inode_t *parent,
-                                gf_dirent_t *entries);
+gf_dirent_t * gf_dirent_for_namelen (int len);
 
 #endif /* _GF_DIRENT_H */
diff --git a/libglusterfs/src/gidcache.c b/libglusterfs/src/gidcache.c
deleted file mode 100644
index c5bdda925..000000000
--- a/libglusterfs/src/gidcache.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include "gidcache.h"
-#include "mem-pool.h"
-
-/*
- * We treat this as a very simple set-associative LRU cache, with entries aged
- * out after a configurable interval.  Hardly rocket science, but lots of
- * details to worry about.
- */
-#define BUCKET_START(p,n)       ((p) + ((n) * AUX_GID_CACHE_ASSOC))
-
-/*
- * Initialize the cache.
- */
-int gid_cache_init(gid_cache_t *cache, uint32_t timeout)
-{
-	if (!cache)
-		return -1;
-
-	LOCK_INIT(&cache->gc_lock);
-	cache->gc_max_age = timeout;
-	cache->gc_nbuckets = AUX_GID_CACHE_BUCKETS;
-	memset(cache->gc_cache, 0, sizeof(gid_list_t) * AUX_GID_CACHE_SIZE);
-
-	return 0;
-}
-
-/*
- * Reconfigure the cache timeout.
- */
-int gid_cache_reconf(gid_cache_t *cache, uint32_t timeout)
-{
-        if (!cache)
-                return -1;
-
-        LOCK(&cache->gc_lock);
-        cache->gc_max_age = timeout;
-        UNLOCK(&cache->gc_lock);
-
-        return 0;
-}
-
-/*
- * Look up an ID in the cache. If found, return the actual cache entry to avoid
- * an additional allocation and memory copy. The caller should copy the data and
- * release (unlock) the cache as soon as possible.
- */
-const gid_list_t *gid_cache_lookup(gid_cache_t *cache, uint64_t id)
-{
-	int bucket;
-	int i;
-	time_t now;
-	const gid_list_t *agl;
-
-	LOCK(&cache->gc_lock);
-	now = time(NULL);
-	bucket = id % cache->gc_nbuckets;
-	agl = BUCKET_START(cache->gc_cache, bucket);
-	for (i = 0; i < AUX_GID_CACHE_ASSOC; i++, agl++) {
-		if (!agl->gl_list)
-			continue;
-		if (agl->gl_id != id)
-			continue;
-
-		/*
-		 * We don't put new entries in the cache when expiration=0, but
-		 * there might be entries still in there if expiration was
-		 * changed very recently.  Writing the check this way ensures
-		 * that they're not used.
-		 */
-		if (now < agl->gl_deadline) {
-			return agl;
-		}
-
-		/*
-		 * We're not going to find any more UID matches, and reaping
-		 * is handled further down to maintain LRU order.
-		 */
-		break;
-	}
-	UNLOCK(&cache->gc_lock);
-	return NULL;
-}
-
-/*
- * Release an entry found via lookup.
- */
-void gid_cache_release(gid_cache_t *cache, const gid_list_t *agl)
-{
-	UNLOCK(&cache->gc_lock);
-}
-
-/*
- * Add a new list entry to the cache. If an entry for this ID already exists,
- * update it.
- */
-int gid_cache_add(gid_cache_t *cache, gid_list_t *gl)
-{
-	gid_list_t *agl;
-	int bucket;
-	int i;
-	time_t now;
-
-	if (!gl || !gl->gl_list)
-		return -1;
-
-	if (!cache->gc_max_age)
-		return 0;
-
-	LOCK(&cache->gc_lock);
-	now = time(NULL);
-
-	/*
-	 * Scan for the first free entry or one that matches this id. The id
-	 * check is added to address a bug where the cache might contain an
-	 * expired entry for this id. Since lookup occurs in LRU order and
-	 * does not reclaim entries, it will always return failure on discovery
-	 * of an expired entry. This leads to duplicate entries being added,
-	 * which still do not satisfy lookups until the expired entry (and
-	 * everything before it) is reclaimed.
-	 *
-	 * We address this through reuse of an entry already allocated to this
-	 * id, whether expired or not, since we have obviously already received
-	 * more recent data. The entry is repopulated with the new data and a new
-	 * deadline and is pushed forward to reside as the last populated entry in
-	 * the bucket.
-	 */
-	bucket = gl->gl_id % cache->gc_nbuckets;
-	agl = BUCKET_START(cache->gc_cache, bucket);
-	for (i = 0; i < AUX_GID_CACHE_ASSOC; ++i, ++agl) {
-		if (agl->gl_id == gl->gl_id)
-			break;
-		if (!agl->gl_list)
-			break;
-	}
-
-	/*
-	 * The way we allocate free entries naturally places the newest
-	 * ones at the highest indices, so evicting the lowest makes
-	 * sense, but that also means we can't just replace it with the
-	 * one that caused the eviction.  That would cause us to thrash
-	 * the first entry while others remain idle.  Therefore, we
-	 * need to slide the other entries down and add the new one at
-	 * the end just as if the *last* slot had been free.
-	 *
-	 * Deadline expiration is also handled here, since the oldest
-	 * expired entry will be in the first position.  This does mean
-	 * the bucket can stay full of expired entries if we're idle
-	 * but, if the small amount of extra memory or scan time before
-	 * we decide to evict someone ever become issues, we could
-	 * easily add a reaper thread.
-	 */
-
-	if (i >= AUX_GID_CACHE_ASSOC) {
-		/* cache full, evict the first (LRU) entry */
-		i = 0;
-		agl = BUCKET_START(cache->gc_cache, bucket);
-		GF_FREE(agl->gl_list);
-	} else if (agl->gl_list) {
-		/* evict the old entry we plan to reuse */
-		GF_FREE(agl->gl_list);
-	}
-
-	/*
-	 * If we have evicted an entry, slide the subsequent populated entries
-	 * back and populate the last entry.
-	 */
-	for (; i < AUX_GID_CACHE_ASSOC - 1; i++) {
-		if (!agl[1].gl_list)
-			break;
-		agl[0] = agl[1];
-		agl++;
-	}
-
-	agl->gl_id = gl->gl_id;
-	agl->gl_count = gl->gl_count;
-	agl->gl_list = gl->gl_list;
-	agl->gl_deadline = now + cache->gc_max_age;
-
-	UNLOCK(&cache->gc_lock);
-
-	return 1;
-}
diff --git a/libglusterfs/src/gidcache.h b/libglusterfs/src/gidcache.h
deleted file mode 100644
index 9379f8e8b..000000000
--- a/libglusterfs/src/gidcache.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef __GIDCACHE_H__
-#define __GIDCACHE_H__
-
-#include "glusterfs.h"
-#include "locking.h"
-
-/*
- * TBD: make the cache size tunable
- *
- * The current size represents a pretty trivial amount of memory, and should
- * provide good hit rates even for quite busy systems.  If we ever want to
- * support really large cache sizes, we'll need to do dynamic allocation
- * instead of just defining an array within a private structure. It doesn't make
- * a whole lot of sense to change the associativity, because it won't improve
- * hit rates all that much and will increase the maintenance cost as we have
- * to scan more entries with every lookup/update.
- */
-
-#define AUX_GID_CACHE_ASSOC     4
-#define AUX_GID_CACHE_BUCKETS   256
-#define AUX_GID_CACHE_SIZE      (AUX_GID_CACHE_ASSOC * AUX_GID_CACHE_BUCKETS)
-
-typedef struct {
-	uint64_t	gl_id;
-	int		gl_count;
-	gid_t		*gl_list;
-	time_t		gl_deadline;
-} gid_list_t;
-
-typedef struct {
-	gf_lock_t	gc_lock;
-	uint32_t	gc_max_age;
-	unsigned int	gc_nbuckets;
-	gid_list_t	gc_cache[AUX_GID_CACHE_SIZE];
-} gid_cache_t;
-
-int gid_cache_init(gid_cache_t *, uint32_t);
-int gid_cache_reconf(gid_cache_t *, uint32_t);
-const gid_list_t *gid_cache_lookup(gid_cache_t *, uint64_t);
-void gid_cache_release(gid_cache_t *, const gid_list_t *);
-int gid_cache_add(gid_cache_t *, gid_list_t *);
-
-#endif /* __GIDCACHE_H__ */
diff --git a/libglusterfs/src/globals.c b/libglusterfs/src/globals.c
index 259c5c885..d1985b7ed 100644
--- a/libglusterfs/src/globals.c
+++ b/libglusterfs/src/globals.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -19,74 +28,114 @@
 #include "globals.h"
 #include "xlator.h"
 #include "mem-pool.h"
-#include "syncop.h"
-
-const char *gf_fop_list[GF_FOP_MAXVALUE] = {
-        [GF_FOP_NULL]        = "NULL",
-        [GF_FOP_STAT]        = "STAT",
-        [GF_FOP_READLINK]    = "READLINK",
-        [GF_FOP_MKNOD]       = "MKNOD",
-        [GF_FOP_MKDIR]       = "MKDIR",
-        [GF_FOP_UNLINK]      = "UNLINK",
-        [GF_FOP_RMDIR]       = "RMDIR",
-        [GF_FOP_SYMLINK]     = "SYMLINK",
-        [GF_FOP_RENAME]      = "RENAME",
-        [GF_FOP_LINK]        = "LINK",
-        [GF_FOP_TRUNCATE]    = "TRUNCATE",
-        [GF_FOP_OPEN]        = "OPEN",
-        [GF_FOP_READ]        = "READ",
-        [GF_FOP_WRITE]       = "WRITE",
-        [GF_FOP_STATFS]      = "STATFS",
-        [GF_FOP_FLUSH]       = "FLUSH",
-        [GF_FOP_FSYNC]       = "FSYNC",
-        [GF_FOP_SETXATTR]    = "SETXATTR",
-        [GF_FOP_GETXATTR]    = "GETXATTR",
-        [GF_FOP_REMOVEXATTR] = "REMOVEXATTR",
-        [GF_FOP_OPENDIR]     = "OPENDIR",
-        [GF_FOP_FSYNCDIR]    = "FSYNCDIR",
-        [GF_FOP_ACCESS]      = "ACCESS",
-        [GF_FOP_CREATE]      = "CREATE",
-        [GF_FOP_FTRUNCATE]   = "FTRUNCATE",
-        [GF_FOP_FSTAT]       = "FSTAT",
-        [GF_FOP_LK]          = "LK",
-        [GF_FOP_LOOKUP]      = "LOOKUP",
-        [GF_FOP_READDIR]     = "READDIR",
-        [GF_FOP_INODELK]     = "INODELK",
-        [GF_FOP_FINODELK]    = "FINODELK",
-        [GF_FOP_ENTRYLK]     = "ENTRYLK",
-        [GF_FOP_FENTRYLK]    = "FENTRYLK",
-        [GF_FOP_XATTROP]     = "XATTROP",
-        [GF_FOP_FXATTROP]    = "FXATTROP",
-        [GF_FOP_FSETXATTR]   = "FSETXATTR",
-        [GF_FOP_FGETXATTR]   = "FGETXATTR",
-        [GF_FOP_RCHECKSUM]   = "RCHECKSUM",
-        [GF_FOP_SETATTR]     = "SETATTR",
-        [GF_FOP_FSETATTR]    = "FSETATTR",
-        [GF_FOP_READDIRP]    = "READDIRP",
-        [GF_FOP_GETSPEC]     = "GETSPEC",
-        [GF_FOP_FORGET]      = "FORGET",
-        [GF_FOP_RELEASE]     = "RELEASE",
-        [GF_FOP_RELEASEDIR]  = "RELEASEDIR",
-        [GF_FOP_FREMOVEXATTR]= "FREMOVEXATTR",
-	[GF_FOP_FALLOCATE]   = "FALLOCATE",
-	[GF_FOP_DISCARD]     = "DISCARD",
-        [GF_FOP_ZEROFILL]     = "ZEROFILL",
-};
+
+
+/* gf_*_list[] */
+
+char *gf_fop_list[GF_FOP_MAXVALUE];
+char *gf_mgmt_list[GF_MGMT_MAXVALUE];
+
+
+void
+gf_op_list_init()
+{
+        gf_fop_list[GF_FOP_NULL]        = "NULL";
+        gf_fop_list[GF_FOP_STAT]        = "STAT";
+        gf_fop_list[GF_FOP_READLINK]    = "READLINK";
+        gf_fop_list[GF_FOP_MKNOD]       = "MKNOD";
+        gf_fop_list[GF_FOP_MKDIR]       = "MKDIR";
+        gf_fop_list[GF_FOP_UNLINK]      = "UNLINK";
+        gf_fop_list[GF_FOP_RMDIR]       = "RMDIR";
+        gf_fop_list[GF_FOP_SYMLINK]     = "SYMLINK";
+        gf_fop_list[GF_FOP_RENAME]      = "RENAME";
+        gf_fop_list[GF_FOP_LINK]        = "LINK";
+        gf_fop_list[GF_FOP_TRUNCATE]    = "TRUNCATE";
+        gf_fop_list[GF_FOP_OPEN]        = "OPEN";
+        gf_fop_list[GF_FOP_READ]        = "READ";
+        gf_fop_list[GF_FOP_WRITE]       = "WRITE";
+        gf_fop_list[GF_FOP_STATFS]      = "STATFS";
+        gf_fop_list[GF_FOP_FLUSH]       = "FLUSH";
+        gf_fop_list[GF_FOP_FSYNC]       = "FSYNC";
+        gf_fop_list[GF_FOP_SETXATTR]    = "SETXATTR";
+        gf_fop_list[GF_FOP_GETXATTR]    = "GETXATTR";
+        gf_fop_list[GF_FOP_REMOVEXATTR] = "REMOVEXATTR";
+        gf_fop_list[GF_FOP_OPENDIR]     = "OPENDIR";
+        gf_fop_list[GF_FOP_FSYNCDIR]    = "FSYNCDIR";
+        gf_fop_list[GF_FOP_ACCESS]      = "ACCESS";
+        gf_fop_list[GF_FOP_CREATE]      = "CREATE";
+        gf_fop_list[GF_FOP_FTRUNCATE]   = "FTRUNCATE";
+        gf_fop_list[GF_FOP_FSTAT]       = "FSTAT";
+        gf_fop_list[GF_FOP_LK]          = "LK";
+        gf_fop_list[GF_FOP_LOOKUP]      = "LOOKUP";
+        gf_fop_list[GF_FOP_READDIR]     = "READDIR";
+        gf_fop_list[GF_FOP_INODELK]     = "INODELK";
+        gf_fop_list[GF_FOP_FINODELK]    = "FINODELK";
+        gf_fop_list[GF_FOP_ENTRYLK]     = "ENTRYLK";
+        gf_fop_list[GF_FOP_FENTRYLK]    = "FENTRYLK";
+        gf_fop_list[GF_FOP_XATTROP]     = "XATTROP";
+        gf_fop_list[GF_FOP_FXATTROP]    = "FXATTROP";
+        gf_fop_list[GF_FOP_FSETXATTR]   = "FSETXATTR";
+        gf_fop_list[GF_FOP_FGETXATTR]   = "FGETXATTR";
+        gf_fop_list[GF_FOP_RCHECKSUM]   = "RCHECKSUM";
+        gf_fop_list[GF_FOP_SETATTR]     = "SETATTR";
+        gf_fop_list[GF_FOP_FSETATTR]    = "FSETATTR";
+        gf_fop_list[GF_FOP_READDIRP]    = "READDIRP";
+        gf_fop_list[GF_FOP_GETSPEC]     = "GETSPEC";
+        gf_fop_list[GF_FOP_FORGET]      = "FORGET";
+        gf_fop_list[GF_FOP_RELEASE]     = "RELEASE";
+        gf_fop_list[GF_FOP_RELEASEDIR]  = "RELEASEDIR";
+
+        gf_fop_list[GF_MGMT_NULL]  = "NULL";
+        return;
+}
+
+
+/* CTX */
+static glusterfs_ctx_t *glusterfs_ctx;
+
+
+int
+glusterfs_ctx_init ()
+{
+        int  ret = 0;
+
+        if (glusterfs_ctx) {
+                gf_log_callingfn ("", GF_LOG_WARNING, "init called again");
+                goto out;
+        }
+
+        glusterfs_ctx = CALLOC (1, sizeof (*glusterfs_ctx));
+        if (!glusterfs_ctx) {
+                ret = -1;
+                goto out;
+        }
+
+        INIT_LIST_HEAD (&glusterfs_ctx->graphs);
+        ret = pthread_mutex_init (&glusterfs_ctx->lock, NULL);
+
+out:
+        return ret;
+}
+
+
+glusterfs_ctx_t *
+glusterfs_ctx_get ()
+{
+        return glusterfs_ctx;
+
+}
+
+
 /* THIS */
 
 xlator_t global_xlator;
 static pthread_key_t this_xlator_key;
-static pthread_key_t synctask_key;
-static pthread_key_t uuid_buf_key;
-static char          global_uuid_buf[GF_UUID_BUF_SIZE];
-static pthread_key_t lkowner_buf_key;
-static char          global_lkowner_buf[GF_LKOWNER_BUF_SIZE];
-
 
 void
 glusterfs_this_destroy (void *ptr)
 {
-        FREE (ptr);
+        if (ptr)
+                FREE (ptr);
 }
 
 
@@ -103,8 +152,7 @@ glusterfs_this_init ()
 
         global_xlator.name = "glusterfs";
         global_xlator.type = "global";
-
-        INIT_LIST_HEAD (&global_xlator.volume_options);
+        global_xlator.ctx  = glusterfs_ctx;
 
         return ret;
 }
@@ -125,6 +173,8 @@ __glusterfs_this_location ()
 
                 ret = pthread_setspecific (this_xlator_key, this_location);
                 if (ret != 0) {
+                        gf_log ("", GF_LOG_WARNING, "pthread setspecific failed");
+
                         FREE (this_location);
                         this_location = NULL;
                         goto out;
@@ -166,55 +216,10 @@ glusterfs_this_set (xlator_t *this)
         return 0;
 }
 
-/* SYNCOPCTX */
-static pthread_key_t syncopctx_key;
-
-static void
-syncopctx_key_destroy (void *ptr)
-{
-	struct syncopctx *opctx = ptr;
-
-	if (opctx) {
-		if (opctx->groups)
-			GF_FREE (opctx->groups);
-
-		GF_FREE (opctx);
-	}
-
-	return;
-}
-
-void *
-syncopctx_getctx ()
-{
-	void *opctx = NULL;
-
-	opctx = pthread_getspecific (syncopctx_key);
-
-	return opctx;
-}
-
-int
-syncopctx_setctx (void *ctx)
-{
-	int ret = 0;
-
-	ret = pthread_setspecific (syncopctx_key, ctx);
-
-	return ret;
-}
-
-static int
-syncopctx_init (void)
-{
-	int ret;
-
-	ret = pthread_key_create (&syncopctx_key, syncopctx_key_destroy);
+/* SYNCTASK */
 
-	return ret;
-}
+static pthread_key_t synctask_key;
 
-/* SYNCTASK */
 
 int
 synctask_init ()
@@ -226,6 +231,7 @@ synctask_init ()
         return ret;
 }
 
+
 void *
 synctask_get ()
 {
@@ -249,10 +255,13 @@ synctask_set (void *synctask)
 
 //UUID_BUFFER
 
+static pthread_key_t uuid_buf_key;
+static char global_uuid_buf[GF_UUID_BUF_SIZE];
 void
 glusterfs_uuid_buf_destroy (void *ptr)
 {
-        FREE (ptr);
+        if (ptr)
+                FREE (ptr);
 }
 
 int
@@ -275,52 +284,27 @@ glusterfs_uuid_buf_get ()
         if(!buf) {
                 buf = MALLOC (GF_UUID_BUF_SIZE);
                 ret = pthread_setspecific (uuid_buf_key, (void *) buf);
-                if (ret)
+                if(ret)
                         buf = global_uuid_buf;
         }
         return buf;
 }
 
-/* LKOWNER_BUFFER */
-
-void
-glusterfs_lkowner_buf_destroy (void *ptr)
-{
-        FREE (ptr);
-}
-
 int
-glusterfs_lkowner_buf_init ()
+glusterfs_globals_init ()
 {
         int ret = 0;
 
-        ret = pthread_key_create (&lkowner_buf_key,
-                                  glusterfs_lkowner_buf_destroy);
-        return ret;
-}
+        gf_op_list_init ();
 
-char *
-glusterfs_lkowner_buf_get ()
-{
-        char *buf;
-        int ret = 0;
+        gf_log_globals_init ();
 
-        buf = pthread_getspecific (lkowner_buf_key);
-        if(!buf) {
-                buf = MALLOC (GF_LKOWNER_BUF_SIZE);
-                ret = pthread_setspecific (lkowner_buf_key, (void *) buf);
-                if (ret)
-                        buf = global_lkowner_buf;
+        ret = glusterfs_ctx_init ();
+        if (ret) {
+                gf_log ("", GF_LOG_CRITICAL,
+                        "ERROR: glusterfs context init failed");
+                goto out;
         }
-        return buf;
-}
-
-int
-glusterfs_globals_init (glusterfs_ctx_t *ctx)
-{
-        int ret = 0;
-
-        gf_log_globals_init (ctx);
 
         ret = glusterfs_this_init ();
         if (ret) {
@@ -336,12 +320,7 @@ glusterfs_globals_init (glusterfs_ctx_t *ctx)
                 goto out;
         }
 
-        ret = glusterfs_lkowner_buf_init ();
-        if(ret) {
-                gf_log ("", GF_LOG_CRITICAL,
-                        "ERROR: glusterfs lkowner buffer init failed");
-                goto out;
-        }
+        gf_mem_acct_enable_set ();
 
         ret = synctask_init ();
         if (ret) {
@@ -349,13 +328,28 @@ glusterfs_globals_init (glusterfs_ctx_t *ctx)
                         "ERROR: glusterfs synctask init failed");
                 goto out;
         }
-
-        ret = syncopctx_init ();
-        if (ret) {
-                gf_log ("", GF_LOG_CRITICAL,
-                        "ERROR: glusterfs syncopctx init failed");
-                goto out;
-        }
 out:
         return ret;
 }
+
+
+char eventstring[GF_EVENT_MAXVAL][64] = {
+        "Invalid event",
+        "Parent Up",
+        "Poll In",
+        "Poll Out",
+        "Poll Err",
+        "Child Up",
+        "Child Down",
+        "Child Connecting",
+        "Transport Cleanup",
+        "Transport Connected",
+        "Volfile Modified",
+};
+
+/* Copy the string ptr contents if needed for yourself */
+char *
+glusterfs_strevent (glusterfs_event_t ev)
+{
+        return eventstring[ev];
+}
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
index 3085db21c..5f4af8613 100644
--- a/libglusterfs/src/globals.h
+++ b/libglusterfs/src/globals.h
@@ -1,62 +1,66 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
+   Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _GLOBALS_H
 #define _GLOBALS_H
 
+/* TODO: remove this 'pragma' by fixing the root cause of warnings */
+#if defined(__GNUC__)
+#if __GNUC__ >= 4
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#endif
+
 #define GF_DEFAULT_BASE_PORT 24007
 
-#define GD_OP_VERSION_KEY     "operating-version"
-#define GD_MIN_OP_VERSION_KEY "minimum-operating-version"
-#define GD_MAX_OP_VERSION_KEY "maximum-operating-version"
-
-/* Gluster versions - OP-VERSION mapping
- *
- * 3.3.0                - 1
- * 3.4.0                - 2
- * 3.next (3.5?)        - 3
- *
- * TODO: Change above comment once gluster version is finalised
- * TODO: Finalize the op-version ranges
+/* This corresponds to the max 16 number of group IDs that are sent through an
+ * RPC request. Since NFS is the only one going to set this, we can be safe
+ * in keeping this size hardcoded.
  */
-#define GD_OP_VERSION_MIN  1 /* MIN is the fresh start op-version, mostly
-                                should not change */
-#define GD_OP_VERSION_MAX  3 /* MAX VERSION is the maximum count in VME table,
-                                should keep changing with introduction of newer
-                                versions */
+#define GF_REQUEST_MAXGROUPS    16
+
+#include "glusterfs.h"
+
+/* CTX */
+#define CTX (glusterfs_ctx_get())
+
+glusterfs_ctx_t *glusterfs_ctx_get ();
 
 #include "xlator.h"
 
 /* THIS */
 #define THIS (*__glusterfs_this_location())
 
+#define GF_UUID_BUF_SIZE 50
+
 xlator_t **__glusterfs_this_location ();
 xlator_t *glusterfs_this_get ();
 int glusterfs_this_set (xlator_t *);
 
-/* syncopctx */
-void *syncopctx_getctx ();
-int syncopctx_setctx (void *ctx);
-
 /* task */
 void *synctask_get ();
 int synctask_set (void *);
 
 /* uuid_buf */
 char *glusterfs_uuid_buf_get();
-/* lkowner_buf */
-char *glusterfs_lkowner_buf_get();
 
 /* init */
-int glusterfs_globals_init (glusterfs_ctx_t *ctx);
-
-extern const char *gf_fop_list[];
+int glusterfs_globals_init (void);
 
 #endif /* !_GLOBALS_H */
diff --git a/libglusterfs/src/glusterfs-acl.h b/libglusterfs/src/glusterfs-acl.h
deleted file mode 100644
index b7de1cdb4..000000000
--- a/libglusterfs/src/glusterfs-acl.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-  Copyright (c) 2008-2013 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _GLUSTERFS_ACL_H
-#define _GLUSTERFS_ACL_H
-
-#include <stdint.h>
-#include <sys/types.h> /* For uid_t */
-
-#include "locking.h" /* For gf_lock_t in struct posix_acl_conf */
-
-#define ACL_PROGRAM    100227
-#define ACLV3_VERSION  3
-
-#define POSIX_ACL_MINIMAL_ACE_COUNT   3
-
-#define POSIX_ACL_READ                (0x04)
-#define POSIX_ACL_WRITE               (0x02)
-#define POSIX_ACL_EXECUTE             (0x01)
-
-#define POSIX_ACL_UNDEFINED_TAG       (0x00)
-#define POSIX_ACL_USER_OBJ            (0x01)
-#define POSIX_ACL_USER                (0x02)
-#define POSIX_ACL_GROUP_OBJ           (0x04)
-#define POSIX_ACL_GROUP               (0x08)
-#define POSIX_ACL_MASK                (0x10)
-#define POSIX_ACL_OTHER               (0x20)
-
-#define POSIX_ACL_UNDEFINED_ID        (-1)
-
-#define POSIX_ACL_VERSION             (0x02)
-
-#define POSIX_ACL_ACCESS_XATTR        "system.posix_acl_access"
-#define POSIX_ACL_DEFAULT_XATTR       "system.posix_acl_default"
-
-struct posix_acl_xattr_entry {
-        uint16_t            tag;
-        uint16_t            perm;
-        uint32_t            id;
-};
-
-struct posix_acl_xattr_header {
-        uint32_t                        version;
-        struct posix_acl_xattr_entry    entries[];
-};
-
-struct posix_ace {
-        uint16_t     tag;
-        uint16_t     perm;
-        uint32_t     id;
-};
-
-
-struct posix_acl {
-        int               refcnt;
-        int               count;
-        struct posix_ace  entries[];
-};
-
-struct posix_acl_ctx {
-        uid_t             uid;
-        gid_t             gid;
-        mode_t            perm;
-        struct posix_acl *acl_access;
-        struct posix_acl *acl_default;
-};
-
-struct posix_acl_conf {
-        gf_lock_t         acl_lock;
-        uid_t             super_uid;
-        struct posix_acl *minimal_acl;
-};
-
-#endif /* _GLUSTERFS_ACL_H */
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h
index a2fd48db5..14a0dbc75 100644
--- a/libglusterfs/src/glusterfs.h
+++ b/libglusterfs/src/glusterfs.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _GLUSTERFS_H
@@ -32,23 +41,17 @@
 #include <arpa/inet.h>
 #include <sys/poll.h>
 #include <pthread.h>
-#include <limits.h> /* For PATH_MAX */
 
 #include "list.h"
 #include "logging.h"
-#include "lkowner.h"
+
 
 #define GF_YES 1
 #define GF_NO  0
 
 #ifndef O_LARGEFILE
 /* savannah bug #20053, patch for compiling on darwin */
-#define O_LARGEFILE 0100000 /* from bits/fcntl.h */
-#endif
-
-#ifndef O_FMODE_EXEC
-/* redhat bug 843080, added from linux/fs.h */
-#define O_FMODE_EXEC 040 //0x20
+#define O_LARGEFILE 0
 #endif
 
 #ifndef O_DIRECT
@@ -73,65 +76,22 @@
 #define ZR_MOUNTPOINT_OPT       "mountpoint"
 #define ZR_ATTR_TIMEOUT_OPT     "attribute-timeout"
 #define ZR_ENTRY_TIMEOUT_OPT    "entry-timeout"
-#define ZR_NEGATIVE_TIMEOUT_OPT "negative-timeout"
 #define ZR_DIRECT_IO_OPT        "direct-io-mode"
 #define ZR_STRICT_VOLFILE_CHECK "strict-volfile-check"
 #define ZR_DUMP_FUSE            "dump-fuse"
-#define ZR_FUSE_MOUNTOPTS       "fuse-mountopts"
 
-#define GF_XATTR_CLRLK_CMD      "glusterfs.clrlk"
 #define GF_XATTR_PATHINFO_KEY   "trusted.glusterfs.pathinfo"
-#define GF_XATTR_NODE_UUID_KEY  "trusted.glusterfs.node-uuid"
-#define GF_XATTR_VOL_ID_KEY   "trusted.glusterfs.volume-id"
-#define GF_XATTR_LOCKINFO_KEY   "trusted.glusterfs.lockinfo"
-#define GF_XATTR_GET_REAL_FILENAME_KEY "user.glusterfs.get_real_filename:"
-
-#define GF_READDIR_SKIP_DIRS       "readdir-filter-directories"
-
-#define BD_XATTR_KEY             "user.glusterfs"
-
-#define XATTR_IS_PATHINFO(x)  (strncmp (x, GF_XATTR_PATHINFO_KEY,       \
-                                        strlen (GF_XATTR_PATHINFO_KEY)) == 0)
-#define XATTR_IS_NODE_UUID(x) (strncmp (x, GF_XATTR_NODE_UUID_KEY,      \
-                                        strlen (GF_XATTR_NODE_UUID_KEY)) == 0)
-#define XATTR_IS_LOCKINFO(x) (strncmp (x, GF_XATTR_LOCKINFO_KEY,        \
-                                       strlen (GF_XATTR_LOCKINFO_KEY)) == 0)
-
-#define XATTR_IS_BD(x) (strncmp (x, BD_XATTR_KEY, strlen (BD_XATTR_KEY)) == 0)
-
 #define GF_XATTR_LINKINFO_KEY   "trusted.distribute.linkinfo"
-#define GFID_XATTR_KEY          "trusted.gfid"
-#define VIRTUAL_GFID_XATTR_KEY_STR  "glusterfs.gfid.string"
-#define VIRTUAL_GFID_XATTR_KEY      "glusterfs.gfid"
-#define UUID_CANONICAL_FORM_LEN 36
-
-#define GLUSTERFS_INTERNAL_FOP_KEY  "glusterfs-internal-fop"
+#define GFID_XATTR_KEY "trusted.gfid"
 
 #define ZR_FILE_CONTENT_STR     "glusterfs.file."
 #define ZR_FILE_CONTENT_STRLEN 15
 
-#define GLUSTERFS_WRITE_IS_APPEND "glusterfs.write-is-append"
 #define GLUSTERFS_OPEN_FD_COUNT "glusterfs.open-fd-count"
 #define GLUSTERFS_INODELK_COUNT "glusterfs.inodelk-count"
 #define GLUSTERFS_ENTRYLK_COUNT "glusterfs.entrylk-count"
 #define GLUSTERFS_POSIXLK_COUNT "glusterfs.posixlk-count"
-#define GLUSTERFS_PARENT_ENTRYLK "glusterfs.parent-entrylk"
-#define GLUSTERFS_INODELK_DOM_COUNT "glusterfs.inodelk-dom-count"
 #define QUOTA_SIZE_KEY "trusted.glusterfs.quota.size"
-#define GFID_TO_PATH_KEY "glusterfs.gfid2path"
-#define GF_XATTR_STIME_PATTERN "trusted.glusterfs.*.stime"
-
-/* Index xlator related */
-#define GF_XATTROP_INDEX_GFID "glusterfs.xattrop_index_gfid"
-#define GF_BASE_INDICES_HOLDER_GFID "glusterfs.base_indicies_holder_gfid"
-
-#define GF_GFIDLESS_LOOKUP "gfidless-lookup"
-/* replace-brick and pump related internal xattrs */
-#define RB_PUMP_CMD_START       "glusterfs.pump.start"
-#define RB_PUMP_CMD_PAUSE       "glusterfs.pump.pause"
-#define RB_PUMP_CMD_COMMIT      "glusterfs.pump.commit"
-#define RB_PUMP_CMD_ABORT       "glusterfs.pump.abort"
-#define RB_PUMP_CMD_STATUS      "glusterfs.pump.status"
 
 #define GLUSTERFS_RDMA_INLINE_THRESHOLD       (2048)
 #define GLUSTERFS_RDMA_MAX_HEADER_SIZE        (228) /* (sizeof (rdma_header_t)                 \
@@ -142,29 +102,10 @@
 #define GLUSTERFS_RPC_REPLY_SIZE               24
 
 #define ZR_FILE_CONTENT_REQUEST(key) (!strncmp(key, ZR_FILE_CONTENT_STR, \
-                                               ZR_FILE_CONTENT_STRLEN))
-
-#define DEFAULT_VAR_RUN_DIRECTORY    DATADIR "/run/gluster"
-#define GF_REPLICATE_TRASH_DIR          ".landfill"
-
-/* GlusterFS's maximum supported Auxilary GIDs */
-/* TODO: Keeping it to 200, so that we can fit in 2KB buffer for auth data
- * in RPC server code, if there is ever need for having more aux-gids, then
- * we have to add aux-gid in payload of actors */
-#define GF_MAX_AUX_GROUPS   65536
+					       ZR_FILE_CONTENT_STRLEN))
 
-#define GF_UUID_BUF_SIZE 50
-
-#define GF_REBALANCE_TID_KEY     "rebalance-id"
-#define GF_REMOVE_BRICK_TID_KEY  "remove-brick-id"
-#define GF_REPLACE_BRICK_TID_KEY "replace-brick-id"
-
-#define UUID_CANONICAL_FORM_LEN  36
-
-/* Adding this here instead of any glusterd*.h files as it is also required by
- * cli
- */
-#define DEFAULT_GLUSTERD_SOCKFILE             DATADIR "/run/glusterd.socket"
+/* TODO: Should we use PATH-MAX? On some systems it may save space */
+#define ZR_PATH_MAX 4096
 
 /* NOTE: add members ONLY at the end (just before _MAXVALUE) */
 typedef enum {
@@ -199,8 +140,8 @@ typedef enum {
         GF_FOP_READDIR,
         GF_FOP_INODELK,
         GF_FOP_FINODELK,
-        GF_FOP_ENTRYLK,
-        GF_FOP_FENTRYLK,
+	GF_FOP_ENTRYLK,
+	GF_FOP_FENTRYLK,
         GF_FOP_XATTROP,
         GF_FOP_FXATTROP,
         GF_FOP_FGETXATTR,
@@ -213,10 +154,6 @@ typedef enum {
         GF_FOP_RELEASE,
         GF_FOP_RELEASEDIR,
         GF_FOP_GETSPEC,
-        GF_FOP_FREMOVEXATTR,
-	GF_FOP_FALLOCATE,
-	GF_FOP_DISCARD,
-        GF_FOP_ZEROFILL,
         GF_FOP_MAXVALUE,
 } glusterfs_fop_t;
 
@@ -233,6 +170,15 @@ typedef enum {
         GF_OP_TYPE_MAX,
 } gf_op_type_t;
 
+struct gf_flock {
+        short    l_type;
+        short    l_whence;
+        off_t    l_start;
+        off_t    l_len;
+        pid_t    l_pid;
+        uint64_t l_owner;
+};
+
 /* NOTE: all the miscellaneous flags used by GlusterFS should be listed here */
 typedef enum {
         GF_LK_GETLK = 0,
@@ -266,23 +212,21 @@ typedef enum {
 
 
 typedef enum {
-        ENTRYLK_LOCK,
-        ENTRYLK_UNLOCK,
-        ENTRYLK_LOCK_NB
+	ENTRYLK_LOCK,
+	ENTRYLK_UNLOCK,
+	ENTRYLK_LOCK_NB
 } entrylk_cmd;
 
 
 typedef enum {
-        ENTRYLK_RDLCK,
-        ENTRYLK_WRLCK
+	ENTRYLK_RDLCK,
+	ENTRYLK_WRLCK
 } entrylk_type;
 
 
 typedef enum {
-        GF_XATTROP_ADD_ARRAY,
-        GF_XATTROP_ADD_ARRAY64,
-        GF_XATTROP_OR_ARRAY,
-        GF_XATTROP_AND_ARRAY
+	GF_XATTROP_ADD_ARRAY,
+        GF_XATTROP_ADD_ARRAY64
 } gf_xattrop_flags_t;
 
 
@@ -291,79 +235,65 @@ typedef enum {
 #define GF_SET_DIR_ONLY       0x4
 #define GF_SET_EPOCH_TIME     0x8 /* used by afr dir lookup selfheal */
 
+/* Directory into which replicate self-heal will move deleted files and
+   directories into. The storage/posix janitor thread will periodically
+   clean up this directory */
+
+#define GF_REPLICATE_TRASH_DIR          ".landfill"
+
 /* key value which quick read uses to get small files in lookup cbk */
 #define GF_CONTENT_KEY "glusterfs.content"
 
 struct _xlator_cmdline_option {
-        struct list_head    cmd_args;
-        char               *volume;
-        char               *key;
-        char               *value;
+	struct list_head    cmd_args;
+	char               *volume;
+	char               *key;
+	char               *value;
 };
 typedef struct _xlator_cmdline_option xlator_cmdline_option_t;
 
-struct _server_cmdline {
-        struct list_head  list;
-        char              *volfile_server;
-};
-typedef struct _server_cmdline server_cmdline_t;
 
 #define GF_OPTION_ENABLE   _gf_true
 #define GF_OPTION_DISABLE  _gf_false
 #define GF_OPTION_DEFERRED 2
 
 struct _cmd_args {
-        /* basic options */
-        char             *volfile_server;
-        server_cmdline_t *curr_server;
-        /* List of backup volfile servers, including original */
-        struct list_head volfile_servers;
-        char             *volfile;
-        char             *log_server;
-        gf_loglevel_t    log_level;
-        char            *log_file;
+	/* basic options */
+	char            *volfile_server;
+	char            *volfile;
+        char            *log_server;
+	gf_loglevel_t    log_level;
+	char            *log_file;
         int32_t          max_connect_attempts;
-        /* advanced options */
-        uint32_t         volfile_server_port;
-        char            *volfile_server_transport;
+	/* advanced options */
+	uint32_t         volfile_server_port;
+	char            *volfile_server_transport;
         uint32_t         log_server_port;
-        char            *pid_file;
+	char            *pid_file;
         char            *sock_file;
-        int              no_daemon_mode;
-        char            *run_id;
-        int              debug_mode;
+	int              no_daemon_mode;
+	char            *run_id;
+	int              debug_mode;
         int              read_only;
         int              acl;
-        int              selinux;
-        int              enable_ino32;
-        int              worm;
         int              mac_compat;
-        int              fopen_keep_cache;
-        int              gid_timeout;
-        int              aux_gfid_mount;
-        struct list_head xlator_options;  /* list of xlator_option_t */
-
-        /* fuse options */
-        int              fuse_direct_io_mode;
-        char             *use_readdirp;
+	struct list_head xlator_options;  /* list of xlator_option_t */
+
+	/* fuse options */
+	int              fuse_direct_io_mode;
         int              volfile_check;
-        double           fuse_entry_timeout;
-        double           fuse_negative_timeout;
-        double           fuse_attribute_timeout;
-        char            *volume_name;
-        int              fuse_nodev;
-        int              fuse_nosuid;
-        char            *dump_fuse;
+	double           fuse_entry_timeout;
+	double           fuse_attribute_timeout;
+	char            *volume_name;
+	int              fuse_nodev;
+	int              fuse_nosuid;
+	char            *dump_fuse;
         pid_t            client_pid;
         int              client_pid_set;
-        unsigned         uid_map_root;
-        int              background_qlen;
-        int              congestion_threshold;
-        char             *fuse_mountopts;
 
-        /* key args */
-        char            *mount_point;
-        char            *volfile_id;
+	/* key args */
+	char            *mount_point;
+	char            *volfile_id;
 
         /* required for portmap */
         int             brick_port;
@@ -388,19 +318,17 @@ struct _glusterfs_graph {
 typedef struct _glusterfs_graph glusterfs_graph_t;
 
 
-typedef int32_t (*glusterfsd_mgmt_event_notify_fn_t) (int32_t event, void *data,
-                                                      ...);
 struct _glusterfs_ctx {
-        cmd_args_t          cmd_args;
-        char               *process_uuid;
-        FILE               *pidfp;
-        char                fin;
-        void               *timer;
-        void               *ib;
-        struct call_pool   *pool;
-        void               *event_pool;
+	cmd_args_t          cmd_args;
+	char               *process_uuid;
+	FILE               *pidfp;
+	char                fin;
+	void               *timer;
+	void               *ib;
+	void               *pool;
+	void               *event_pool;
         void               *iobuf_pool;
-        pthread_mutex_t     lock;
+	pthread_mutex_t     lock;
         size_t              page_size;
         struct list_head    graphs; /* double linked list of graphs - one per volfile parse */
         glusterfs_graph_t  *active; /* the latest graph in use */
@@ -414,34 +342,13 @@ struct _glusterfs_ctx {
         int                 graph_id; /* Incremented per graph, value should
                                          indicate how many times the graph has
                                          got changed */
-        pid_t               mnt_pid; /* pid of the mount agent */
-        int                 process_mode; /*mode in which process is runninng*/
-        struct syncenv     *env;          /* The env pointer to the synctasks */
-
-        struct list_head    mempool_list; /* used to keep a global list of
-                                             mempools, used to log details of
-                                             mempool in statedump */
-        char               *statedump_path;
-
-        struct mem_pool    *dict_pool;
-        struct mem_pool    *dict_pair_pool;
-        struct mem_pool    *dict_data_pool;
-
-        glusterfsd_mgmt_event_notify_fn_t notify; /* Used for xlators to make
-                                                     call to fsd-mgmt */
-        gf_log_handle_t     log; /* all logging related variables */
-
-        int                 mem_acct_enable;
-
-        int                 daemon_pipe[2];
-
-        struct client_disconnect *client_disconnect;
-        struct clienttable *clienttable;
 };
 typedef struct _glusterfs_ctx glusterfs_ctx_t;
 
-glusterfs_ctx_t *glusterfs_ctx_new (void);
 
+/* If you edit this structure then, make a corresponding change in
+ * globals.c in the eventstring.
+ */
 typedef enum {
         GF_EVENT_PARENT_UP = 1,
         GF_EVENT_POLLIN,
@@ -456,30 +363,12 @@ typedef enum {
         GF_EVENT_VOLFILE_MODIFIED,
         GF_EVENT_GRAPH_NEW,
         GF_EVENT_TRANSLATOR_INFO,
-        GF_EVENT_TRANSLATOR_OP,
-        GF_EVENT_AUTH_FAILED,
-        GF_EVENT_VOLUME_DEFRAG,
-        GF_EVENT_PARENT_DOWN,
         GF_EVENT_MAXVAL,
 } glusterfs_event_t;
 
-struct gf_flock {
-        short        l_type;
-        short        l_whence;
-        off_t        l_start;
-        off_t        l_len;
-        pid_t        l_pid;
-        gf_lkowner_t l_owner;
-};
+extern char *glusterfs_strevent (glusterfs_event_t ev);
 
 #define GF_MUST_CHECK __attribute__((warn_unused_result))
-/*
- * Some macros (e.g. ALLOC_OR_GOTO) set variables in function scope, but the
- * calling function might not only declare the variable to keep the macro happy
- * and not use it otherwise.  In such cases, the following can be used to
- * suppress the "set but not used" warning that would otherwise occur.
- */
-#define GF_UNUSED __attribute__((unused))
 
 int glusterfs_graph_prepare (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx);
 int glusterfs_graph_destroy (glusterfs_graph_t *graph);
diff --git a/libglusterfs/src/graph-mem-types.h b/libglusterfs/src/graph-mem-types.h
new file mode 100644
index 000000000..c409adbbc
--- /dev/null
+++ b/libglusterfs/src/graph-mem-types.h
@@ -0,0 +1,31 @@
+/*
+   Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __GRAPH_MEM_TYPES_H__
+#define __GRAPH_MEM_TYPES_H__
+
+#include "mem-types.h"
+
+#define GF_MEM_TYPE_START (gf_common_mt_end + 1)
+
+enum gf_graph_mem_types {
+        gf_graph_mt_buf = GF_MEM_TYPE_START,
+        gf_graph_mt_end
+};
+#endif
diff --git a/libglusterfs/src/graph-print.c b/libglusterfs/src/graph-print.c
index d860d63b3..062f2ffa1 100644
--- a/libglusterfs/src/graph-print.c
+++ b/libglusterfs/src/graph-print.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -17,6 +26,7 @@
 
 #include "common-utils.h"
 #include "xlator.h"
+#include "graph-mem-types.h"
 #include "graph-utils.h"
 
 
@@ -24,7 +34,6 @@
 struct gf_printer {
         ssize_t (*write) (struct gf_printer *gp, char *buf, size_t len);
         void *priv;
-        int  len;
 };
 
 static ssize_t
@@ -81,31 +90,19 @@ gpprintf (struct gf_printer *gp, const char *format, ...)
         return ret;
 }
 
+static int
+glusterfs_graph_print (struct gf_printer *gp, glusterfs_graph_t *graph)
+{
 #define GPPRINTF(gp, fmt, ...) do {                             \
                 ret = gpprintf (gp, fmt, ## __VA_ARGS__);       \
                 if (ret == -1)                                  \
                         goto out;                               \
                 else                                            \
-                        gp->len += ret;                             \
+                        len += ret;                             \
         } while (0)
 
-static int
-_print_volume_options (dict_t *d, char *k, data_t *v,
-                           void *tmp)
-{
-        struct gf_printer *gp  = tmp;
-        int                ret = 0;
-        GPPRINTF (gp, "    option %s %s\n", k, v->data);
-        return 0;
-out:
-        /* means, it is a failure */
-        return -1;
-}
-
-static int
-glusterfs_graph_print (struct gf_printer *gp, glusterfs_graph_t *graph)
-{
         xlator_t      *trav = NULL;
+        data_pair_t   *pair = NULL;
         xlator_list_t *xch = NULL;
         int            ret = 0;
         ssize_t        len = 0;
@@ -118,9 +115,11 @@ glusterfs_graph_print (struct gf_printer *gp, glusterfs_graph_t *graph)
                 GPPRINTF (gp, "volume %s\n    type %s\n", trav->name,
                           trav->type);
 
-                ret = dict_foreach (trav->options, _print_volume_options, gp);
-                if (ret)
-                        goto out;
+                for (pair =  trav->options->members_list; pair && pair->next;
+                     pair = pair->next);
+                for (; pair; pair = pair->prev)
+                        GPPRINTF (gp, "    option %s %s\n", pair->key,
+                                  pair->value->data);
 
                 if (trav->children) {
                         GPPRINTF (gp, "    subvolumes");
@@ -137,7 +136,6 @@ glusterfs_graph_print (struct gf_printer *gp, glusterfs_graph_t *graph)
         }
 
 out:
-        len = gp->len;
         if (ret == -1) {
                 gf_log ("graph-print", GF_LOG_ERROR, "printing failed");
 
@@ -182,7 +180,7 @@ glusterfs_graph_print_buf (glusterfs_graph_t *graph)
         if (len == -1)
                 return NULL;
 
-        buf = GF_CALLOC (1, len + 1, gf_common_mt_graph_buf);
+        buf = GF_CALLOC (1, len + 1, gf_graph_mt_buf);
         if (!buf) {
                 return NULL;
         }
diff --git a/libglusterfs/src/graph-utils.h b/libglusterfs/src/graph-utils.h
index 207664fdb..d125fbe0d 100644
--- a/libglusterfs/src/graph-utils.h
+++ b/libglusterfs/src/graph-utils.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
+   Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _GRAPH_H_
diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c
index e76df1ca5..725425d39 100644
--- a/libglusterfs/src/graph.c
+++ b/libglusterfs/src/graph.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -20,23 +29,28 @@
 #include "defaults.h"
 
 
+
+
 #if 0
 static void
 _gf_dump_details (int argc, char **argv)
 {
         extern FILE *gf_log_logfile;
         int          i = 0;
-        char         timestr[64];
+        char         timestr[256];
         time_t       utime = 0;
+        struct tm   *tm = NULL;
         pid_t        mypid = 0;
         struct utsname uname_buf = {{0, }, };
         int            uname_ret = -1;
 
+        utime = time (NULL);
+        tm    = localtime (&utime);
         mypid = getpid ();
         uname_ret   = uname (&uname_buf);
 
-        utime = time (NULL);
-        gf_time_fmt (timestr, sizeof timestr, utime, gf_timefmt_FT);
+        /* Which git? What time? */
+        strftime (timestr, 256, "%Y-%m-%d %H:%M:%S", tm);
         fprintf (gf_log_logfile,
                  "========================================"
                  "========================================\n");
@@ -70,6 +84,44 @@ _gf_dump_details (int argc, char **argv)
 #endif
 
 
+static int
+_log_if_option_is_invalid (xlator_t *xl, data_pair_t *pair)
+{
+        volume_opt_list_t *vol_opt = NULL;
+        volume_option_t   *opt     = NULL;
+        int                i     = 0;
+        int                index = 0;
+        int                found = 0;
+
+        /* Get the first volume_option */
+        list_for_each_entry (vol_opt, &xl->volume_options, list) {
+                /* Warn for extra option */
+                if (!vol_opt->given_opt)
+                        break;
+
+                opt = vol_opt->given_opt;
+                for (index = 0;
+                     ((index < ZR_OPTION_MAX_ARRAY_SIZE) &&
+                      (opt[index].key && opt[index].key[0]));  index++)
+                        for (i = 0; (i < ZR_VOLUME_MAX_NUM_KEY) &&
+                                     opt[index].key[i]; i++) {
+                                if (fnmatch (opt[index].key[i],
+                                             pair->key,
+                                             FNM_NOESCAPE) == 0) {
+                                        found = 1;
+                                        break;
+                                }
+                        }
+        }
+
+        if (!found) {
+                gf_log (xl->name, GF_LOG_WARNING,
+                        "option '%s' is not recognized",
+                        pair->key);
+        }
+        return 0;
+}
+
 
 int
 glusterfs_xlator_link (xlator_t *pxl, xlator_t *cxl)
@@ -117,8 +169,7 @@ glusterfs_graph_set_first (glusterfs_graph_t *graph, xlator_t *xl)
 
 int
 glusterfs_graph_insert (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx,
-                        const char *type, const char *name,
-                        gf_boolean_t autoload)
+                        const char *type, const char *name)
 {
         xlator_t        *ixl = NULL;
 
@@ -144,8 +195,6 @@ glusterfs_graph_insert (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx,
         if (!ixl->name)
                 goto err;
 
-        ixl->is_autoloaded = autoload;
-
         if (xlator_set_type (ixl, type) == -1) {
                 gf_log ("glusterfs", GF_LOG_ERROR,
                         "%s (%s) initialization failed",
@@ -164,38 +213,41 @@ err:
         return -1;
 }
 
+
 int
-glusterfs_graph_acl (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
+glusterfs_graph_readonly (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
 {
         int ret = 0;
         cmd_args_t      *cmd_args = NULL;
 
         cmd_args = &ctx->cmd_args;
 
-        if (!cmd_args->acl)
+        if (!cmd_args->read_only)
                 return 0;
 
-        ret = glusterfs_graph_insert (graph, ctx, "system/posix-acl",
-                                      "posix-acl-autoload", 1);
+        ret = glusterfs_graph_insert (graph, ctx, "features/read-only",
+                                      "readonly-autoload");
         return ret;
 }
 
+
 int
-glusterfs_graph_worm (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
+glusterfs_graph_acl (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
 {
         int ret = 0;
         cmd_args_t      *cmd_args = NULL;
 
         cmd_args = &ctx->cmd_args;
 
-        if (!cmd_args->worm)
+        if (!cmd_args->acl)
                 return 0;
 
-        ret = glusterfs_graph_insert (graph, ctx, "features/worm",
-                                      "worm-autoload", 1);
+        ret = glusterfs_graph_insert (graph, ctx, "system/posix-acl",
+                                      "posix-acl-autoload");
         return ret;
 }
 
+
 int
 glusterfs_graph_mac_compat (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
 {
@@ -208,26 +260,11 @@ glusterfs_graph_mac_compat (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
                 return 0;
 
         ret = glusterfs_graph_insert (graph, ctx, "features/mac-compat",
-                                      "mac-compat-autoload", 1);
+                                      "mac-compat-autoload");
 
         return ret;
 }
 
-int
-glusterfs_graph_gfid_access (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
-{
-        int ret = 0;
-        cmd_args_t      *cmd_args = NULL;
-
-        cmd_args = &ctx->cmd_args;
-
-        if (!cmd_args->aux_gfid_mount)
-                return 0;
-
-        ret = glusterfs_graph_insert (graph, ctx, "features/gfid-access",
-                                      "gfid-access-autoload", 1);
-        return ret;
-}
 
 static void
 gf_add_cmdline_options (glusterfs_graph_t *graph, cmd_args_t *cmd_args)
@@ -247,7 +284,7 @@ gf_add_cmdline_options (glusterfs_graph_t *graph, cmd_args_t *cmd_args)
                                                     cmd_option->key,
                                                     cmd_option->value);
                                 if (ret == 0) {
-                                        gf_log (trav->name, GF_LOG_INFO,
+                                        gf_log (trav->name, GF_LOG_WARNING,
                                                 "adding option '%s' for "
                                                 "volume '%s' with value '%s'",
                                                 cmd_option->key, trav->name,
@@ -269,9 +306,9 @@ gf_add_cmdline_options (glusterfs_graph_t *graph, cmd_args_t *cmd_args)
 int
 glusterfs_graph_validate_options (glusterfs_graph_t *graph)
 {
+        volume_opt_list_t  *vol_opt = NULL;
         xlator_t           *trav = NULL;
         int                 ret = -1;
-        char               *errstr = NULL;
 
         trav = graph->first;
 
@@ -279,10 +316,14 @@ glusterfs_graph_validate_options (glusterfs_graph_t *graph)
                 if (list_empty (&trav->volume_options))
                         continue;
 
-                ret = xlator_options_validate (trav, trav->options, &errstr);
+                vol_opt = list_entry (trav->volume_options.next,
+                                      volume_opt_list_t, list);
+
+                ret = validate_xlator_volume_options (trav,
+                                                      vol_opt->given_opt);
                 if (ret) {
                         gf_log (trav->name, GF_LOG_ERROR,
-                                "validation failed: %s", errstr);
+                                "validating translator failed");
                         return ret;
                 }
                 trav = trav->next;
@@ -314,46 +355,35 @@ glusterfs_graph_init (glusterfs_graph_t *graph)
 }
 
 
-static int
-_log_if_unknown_option (dict_t *dict, char *key, data_t *value, void *data)
+int
+glusterfs_graph_unknown_options (glusterfs_graph_t *graph)
 {
-        volume_option_t   *found = NULL;
-        xlator_t          *xl = NULL;
-
-        xl = data;
+        data_pair_t        *pair = NULL;
+        xlator_t           *trav = NULL;
 
-        found = xlator_volume_option_get (xl, key);
+        trav = graph->first;
 
-        if (!found) {
-                gf_log (xl->name, GF_LOG_WARNING,
-                        "option '%s' is not recognized", key);
+        /* Validate again phase */
+        while (trav) {
+                pair = trav->options->members_list;
+                while (pair) {
+                        _log_if_option_is_invalid (trav, pair);
+                        pair = pair->next;
+                }
+                trav = trav->next;
         }
 
         return 0;
 }
 
 
-static void
-_xlator_check_unknown_options (xlator_t *xl, void *data)
-{
-        dict_foreach (xl->options, _log_if_unknown_option, xl);
-}
-
-
-int
-glusterfs_graph_unknown_options (glusterfs_graph_t *graph)
-{
-        xlator_foreach (graph->first, _xlator_check_unknown_options, NULL);
-        return 0;
-}
-
-
 void
 fill_uuid (char *uuid, int size)
 {
         char           hostname[256] = {0,};
         struct timeval tv = {0,};
-        char           now_str[64];
+        struct tm      now = {0, };
+        char           now_str[32];
 
         if (gettimeofday (&tv, NULL) == -1) {
                 gf_log ("graph", GF_LOG_ERROR,
@@ -367,7 +397,8 @@ fill_uuid (char *uuid, int size)
                         strerror (errno));
         }
 
-        gf_time_fmt (now_str, sizeof now_str, tv.tv_sec, gf_timefmt_Ymd_T);
+        localtime_r (&tv.tv_sec, &now);
+        strftime (now_str, 32, "%Y/%m/%d-%H:%M:%S", &now);
         snprintf (uuid, size, "%s-%d-%s:%"GF_PRI_SUSECONDS,
                   hostname, getpid(), now_str, tv.tv_usec);
 
@@ -437,12 +468,13 @@ glusterfs_graph_prepare (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
                 return -1;
         }
 
-        /* XXX: WORM VOLUME */
-        ret = glusterfs_graph_worm (graph, ctx);
+        /* XXX: RO VOLUME */
+        ret = glusterfs_graph_readonly (graph, ctx);
         if (ret) {
-                gf_log ("graph", GF_LOG_ERROR, "glusterfs graph worm failed");
+                gf_log ("graph", GF_LOG_ERROR, "glusterfs graph readonly failed");
                 return -1;
         }
+
         ret = glusterfs_graph_acl (graph, ctx);
         if (ret) {
                 gf_log ("graph", GF_LOG_ERROR, "glusterfs graph ACL failed");
@@ -456,14 +488,6 @@ glusterfs_graph_prepare (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
                 return -1;
         }
 
-        /* XXX: gfid-access */
-        ret = glusterfs_graph_gfid_access (graph, ctx);
-        if (ret) {
-                gf_log ("graph", GF_LOG_ERROR,
-                        "glusterfs graph 'gfid-access' failed");
-                return -1;
-        }
-
         /* XXX: this->ctx setting */
         for (trav = graph->first; trav; trav = trav->next) {
                 trav->ctx = ctx;
@@ -515,14 +539,11 @@ glusterfs_graph_activate (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
         ctx->active = graph;
 
         /* XXX: attach to master and set active pointer */
-        if (ctx->master) {
+        if (ctx->master)
                 ret = xlator_notify (ctx->master, GF_EVENT_GRAPH_NEW, graph);
-                if (ret) {
-                        gf_log ("graph", GF_LOG_ERROR,
-                                "graph new notification failed");
-                        return ret;
-                }
-                ((xlator_t *)ctx->master)->next = graph->top;
+        if (ret) {
+                gf_log ("graph", GF_LOG_ERROR, "graph new notification failed");
+                return ret;
         }
 
         /* XXX: perform parent up */
@@ -535,204 +556,18 @@ glusterfs_graph_activate (glusterfs_graph_t *graph, glusterfs_ctx_t *ctx)
         return 0;
 }
 
-
-int
-xlator_equal_rec (xlator_t *xl1, xlator_t *xl2)
-{
-        xlator_list_t *trav1 = NULL;
-        xlator_list_t *trav2 = NULL;
-        int            ret   = 0;
-
-        if (xl1 == NULL || xl2 == NULL) {
-                gf_log ("xlator", GF_LOG_DEBUG, "invalid argument");
-                return -1;
-        }
-
-        trav1 = xl1->children;
-        trav2 = xl2->children;
-
-        while (trav1 && trav2) {
-                ret = xlator_equal_rec (trav1->xlator, trav2->xlator);
-                if (ret) {
-                        gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-                                "xlators children not equal");
-                        goto out;
-                }
-
-                trav1 = trav1->next;
-                trav2 = trav2->next;
-        }
-
-        if (trav1 || trav2) {
-                ret = -1;
-                goto out;
-        }
-
-        if (strcmp (xl1->name, xl2->name)) {
-                ret = -1;
-                goto out;
-        }
-
-	/* type could have changed even if xlator names match,
-	   e.g cluster/distrubte and cluster/nufa share the same
-	   xlator name
-	*/
-        if (strcmp (xl1->type, xl2->type)) {
-                ret = -1;
-                goto out;
-        }
-out :
-        return ret;
-}
-
-
-gf_boolean_t
-is_graph_topology_equal (glusterfs_graph_t *graph1, glusterfs_graph_t *graph2)
-{
-        xlator_t    *trav1    = NULL;
-        xlator_t    *trav2    = NULL;
-        gf_boolean_t ret      = _gf_true;
-
-        trav1 = graph1->first;
-        trav2 = graph2->first;
-
-        ret = xlator_equal_rec (trav1, trav2);
-
-        if (ret) {
-                gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-                        "graphs are not equal");
-                ret = _gf_false;
-                goto out;
-        }
-
-        ret = _gf_true;
-        gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-                "graphs are equal");
-
-out:
-        return ret;
-}
-
-
-/* Function has 3types of return value 0, -ve , 1
- *   return 0          =======> reconfiguration of options has succeeded
- *   return 1          =======> the graph has to be reconstructed and all the xlators should be inited
- *   return -1(or -ve) =======> Some Internal Error occurred during the operation
- */
-int
-glusterfs_volfile_reconfigure (int oldvollen, FILE *newvolfile_fp,
-                               glusterfs_ctx_t *ctx, const char *oldvolfile)
-{
-        glusterfs_graph_t *oldvolfile_graph = NULL;
-        glusterfs_graph_t *newvolfile_graph = NULL;
-        FILE              *oldvolfile_fp    = NULL;
-        gf_boolean_t      active_graph_found = _gf_true;
-
-        int ret = -1;
-
-        if (!oldvollen) {
-                ret = 1; // Has to call INIT for the whole graph
-                goto out;
-        }
-
-        if (!ctx) {
-                gf_log ("glusterfsd-mgmt", GF_LOG_ERROR,
-			"ctx is NULL");
-		goto out;
-	}
-
-        oldvolfile_graph = ctx->active;
-        if (!oldvolfile_graph) {
-                active_graph_found = _gf_false;
-                gf_log ("glusterfsd-mgmt", GF_LOG_ERROR,
-                        "glusterfs_ctx->active is NULL");
-
-                oldvolfile_fp = tmpfile ();
-                if (!oldvolfile_fp) {
-                        gf_log ("glusterfsd-mgmt", GF_LOG_ERROR, "Unable to "
-                                "create temporary volfile: (%s)",
-                                strerror (errno));
-                        goto out;
-                }
-
-                fwrite (oldvolfile, oldvollen, 1, oldvolfile_fp);
-                fflush (oldvolfile_fp);
-                if (ferror (oldvolfile_fp)) {
-                        goto out;
-                }
-
-                oldvolfile_graph = glusterfs_graph_construct (oldvolfile_fp);
-                if (!oldvolfile_graph)
-                        goto out;
-        }
-
-        newvolfile_graph = glusterfs_graph_construct (newvolfile_fp);
-        if (!newvolfile_graph) {
-                goto out;
-        }
-
-        if (!is_graph_topology_equal (oldvolfile_graph,
-                                      newvolfile_graph)) {
-
-                ret = 1;
-                gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-                        "Graph topology not equal(should call INIT)");
-                goto out;
-        }
-
-        gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-                "Only options have changed in the new "
-                "graph");
-
-        /* */
-        ret = glusterfs_graph_reconfigure (oldvolfile_graph,
-                                           newvolfile_graph);
-        if (ret) {
-                gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-                        "Could not reconfigure new options in old graph");
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (oldvolfile_fp)
-                fclose (oldvolfile_fp);
-
-        /*  Do not simply destroy the old graph here. If the oldgraph
-            is constructed here in this function itself instead of getting
-            it from ctx->active (which happens only of ctx->active is NULL),
-            then destroy the old graph. If some i/o is still happening in
-            the old graph and the old graph is obtained from ctx->active,
-            then destroying the graph will cause problems.
-        */
-        if (!active_graph_found && oldvolfile_graph)
-                glusterfs_graph_destroy (oldvolfile_graph);
-        if (newvolfile_graph)
-                glusterfs_graph_destroy (newvolfile_graph);
-
-        return ret;
-}
-
-
 int
 glusterfs_graph_reconfigure (glusterfs_graph_t *oldgraph,
                              glusterfs_graph_t *newgraph)
 {
-        xlator_t   *old_xl   = NULL;
-        xlator_t   *new_xl   = NULL;
+        xlator_t *old_xl = NULL;
+        xlator_t *new_xl = NULL;
 
         GF_ASSERT (oldgraph);
         GF_ASSERT (newgraph);
 
         old_xl   = oldgraph->first;
-        while (old_xl->is_autoloaded) {
-                old_xl = old_xl->children->xlator;
-        }
-
         new_xl   = newgraph->first;
-        while (new_xl->is_autoloaded) {
-                new_xl = new_xl->children->xlator;
-        }
 
         return xlator_tree_reconfigure (old_xl, new_xl);
 }
@@ -740,12 +575,5 @@ glusterfs_graph_reconfigure (glusterfs_graph_t *oldgraph,
 int
 glusterfs_graph_destroy (glusterfs_graph_t *graph)
 {
-        xlator_tree_free (graph->first);
-
-        if (graph) {
-                list_del_init (&graph->list);
-                GF_FREE (graph);
-        }
-
         return 0;
 }
diff --git a/libglusterfs/src/graph.l b/libglusterfs/src/graph.l
index e4eba9cbe..04fff2582 100644
--- a/libglusterfs/src/graph.l
+++ b/libglusterfs/src/graph.l
@@ -1,13 +1,23 @@
 /*
-   Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
+
 %x STRING
 %option yylineno
 %option noinput
@@ -70,10 +80,10 @@ TYPE   [t][y][p][e]
                               yyunput (0, NULL);
                        }
                        BEGIN (INITIAL);
-                       graphyylval = text;
+                       yylval = text;
                        return STRING_TOK;
        }
 }
-[^ \t\r\n\"\\]+ {    graphyylval = gf_strdup (yytext) ; return ID; }
+[^ \t\r\n\"\\]+ {    yylval = gf_strdup (yytext) ; return ID; }
 [ \t\r\n]+             ;
 %%
diff --git a/libglusterfs/src/graph.y b/libglusterfs/src/graph.y
index a220abeb9..25322378e 100644
--- a/libglusterfs/src/graph.y
+++ b/libglusterfs/src/graph.y
@@ -1,13 +1,23 @@
 /*
-   Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
+
 %token VOLUME_BEGIN VOLUME_END OPTION NEWLINE SUBVOLUME ID WHITESPACE COMMENT TYPE STRING_TOK
 
 %{
@@ -18,9 +28,6 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <pthread.h>
-
-#define RELAX_POISONING
 
 #include "xlator.h"
 #include "graph-utils.h"
@@ -38,8 +45,8 @@ static void option_error (void);
 #define YYSTYPE char *
 #define GF_CMD_BUFFER_LEN (8 * GF_UNIT_KB)
 
-int graphyyerror (const char *);
-int graphyylex ();
+int yyerror (const char *);
+int yylex ();
 %}
 
 
@@ -79,11 +86,11 @@ glusterfs_graph_t *construct;
 static void
 type_error (void)
 {
-        extern int graphyylineno;
+        extern int yylineno;
 
         gf_log ("parser", GF_LOG_ERROR,
                 "Volume %s, before line %d: Please specify volume type",
-                curr->name, graphyylineno);
+                curr->name, yylineno);
         return;
 }
 
@@ -91,11 +98,11 @@ type_error (void)
 static void
 sub_error (void)
 {
-        extern int graphyylineno;
+        extern int yylineno;
 
         gf_log ("parser", GF_LOG_ERROR,
                 "Volume %s, before line %d: Please specify subvolumes",
-                curr->name, graphyylineno);
+                curr->name, yylineno);
         return;
 }
 
@@ -103,12 +110,12 @@ sub_error (void)
 static void
 option_error (void)
 {
-        extern int graphyylineno;
+        extern int yylineno;
 
         gf_log ("parser", GF_LOG_ERROR,
                 "Volume %s, before line %d: Please specify "
                 "option <key> <value>",
-                curr->name, graphyylineno);
+                curr->name, yylineno);
         return;
 }
 
@@ -116,7 +123,7 @@ option_error (void)
 static int
 new_volume (char *name)
 {
-        extern int   graphyylineno;
+        extern int   yylineno;
         xlator_t    *trav = NULL;
         int          ret = 0;
 
@@ -130,7 +137,7 @@ new_volume (char *name)
         if (curr) {
                 gf_log ("parser", GF_LOG_ERROR,
                         "new volume (%s) defintion in line %d unexpected",
-                        name, graphyylineno);
+                        name, yylineno);
                 ret = -1;
                 goto out;
         }
@@ -150,7 +157,7 @@ new_volume (char *name)
                 if (!strcmp (name, trav->name)) {
                         gf_log ("parser", GF_LOG_ERROR,
 				"Line %d: volume '%s' defined again",
-                                graphyylineno, name);
+                                yylineno, name);
                         ret = -1;
                         goto out;
                 }
@@ -195,7 +202,7 @@ out:
 static int
 volume_type (char *type)
 {
-        extern int   graphyylineno;
+        extern int   yylineno;
         int32_t      ret = 0;
 
         if (!type) {
@@ -209,7 +216,7 @@ volume_type (char *type)
                 gf_log ("parser", GF_LOG_ERROR,
                         "Volume '%s', line %d: type '%s' is not valid or "
 			"not found on this machine",
-                        curr->name, graphyylineno, type);
+                        curr->name, yylineno, type);
                 ret = -1;
                 goto out;
         }
@@ -226,7 +233,7 @@ out:
 static int
 volume_option (char *key, char *value)
 {
-        extern int  graphyylineno;
+        extern int  yylineno;
         int         ret = 0;
         char       *set_value = NULL;
 
@@ -243,7 +250,7 @@ volume_option (char *key, char *value)
                 gf_log ("parser", GF_LOG_ERROR,
                         "Volume '%s', line %d: duplicate entry "
 			"('option %s') present",
-                        curr->name, graphyylineno, key);
+                        curr->name, yylineno, key);
                 ret = -1;
                 goto out;
         }
@@ -262,7 +269,7 @@ out:
 static int
 volume_sub (char *sub)
 {
-        extern int       graphyylineno;
+        extern int       yylineno;
         xlator_t        *trav = NULL;
         int              ret = 0;
 
@@ -284,7 +291,7 @@ volume_sub (char *sub)
                 gf_log ("parser", GF_LOG_ERROR,
                         "Volume '%s', line %d: subvolume '%s' is not defined "
 			"prior to usage",
-                        curr->name, graphyylineno, sub);
+                        curr->name, yylineno, sub);
                 ret = -1;
                 goto out;
         }
@@ -292,7 +299,7 @@ volume_sub (char *sub)
         if (trav == curr) {
                 gf_log ("parser", GF_LOG_ERROR,
                         "Volume '%s', line %d: has '%s' itself as subvolume",
-                        curr->name, graphyylineno, sub);
+                        curr->name, yylineno, sub);
                 ret = -1;
                 goto out;
         }
@@ -329,46 +336,46 @@ volume_end (void)
 
 
 int
-graphyywrap ()
+yywrap ()
 {
         return 1;
 }
 
 
 int
-graphyyerror (const char *str)
+yyerror (const char *str)
 {
-        extern char  *graphyytext;
-        extern int    graphyylineno;
+        extern char  *yytext;
+        extern int    yylineno;
 
-        if (curr && curr->name && graphyytext) {
-                if (!strcmp (graphyytext, "volume")) {
+        if (curr && curr->name && yytext) {
+                if (!strcmp (yytext, "volume")) {
                         gf_log ("parser", GF_LOG_ERROR,
                                 "'end-volume' not defined for volume '%s'",
 				curr->name);
-                } else if (!strcmp (graphyytext, "type")) {
+                } else if (!strcmp (yytext, "type")) {
                         gf_log ("parser", GF_LOG_ERROR,
                                 "line %d: duplicate 'type' defined for "
 				"volume '%s'",
-                                graphyylineno, curr->name);
-                } else if (!strcmp (graphyytext, "subvolumes")) {
+                                yylineno, curr->name);
+                } else if (!strcmp (yytext, "subvolumes")) {
                         gf_log ("parser", GF_LOG_ERROR,
                                 "line %d: duplicate 'subvolumes' defined for "
 				"volume '%s'",
-                                graphyylineno, curr->name);
+                                yylineno, curr->name);
                 } else if (curr) {
                         gf_log ("parser", GF_LOG_ERROR,
                                 "syntax error: line %d (volume '%s'): \"%s\""
 				"\nallowed tokens are 'volume', 'type', "
 				"'subvolumes', 'option', 'end-volume'()",
-                                graphyylineno, curr->name,
-				graphyytext);
+                                yylineno, curr->name,
+				yytext);
                 } else {
                         gf_log ("parser", GF_LOG_ERROR,
                                 "syntax error: line %d (just after volume "
 				"'%s'): \"%s\"\n(%s)",
-                                graphyylineno, curr->name,
-				graphyytext,
+                                yylineno, curr->name,
+				yytext,
                                 "allowed tokens are 'volume', 'type', "
 				"'subvolumes', 'option', 'end-volume'");
                 }
@@ -377,7 +384,7 @@ graphyyerror (const char *str)
                         "syntax error in line %d: \"%s\" \n"
                         "(allowed tokens are 'volume', 'type', "
 			"'subvolumes', 'option', 'end-volume')\n",
-                        graphyylineno, graphyytext);
+                        yylineno, yytext);
         }
 
         return -1;
@@ -436,6 +443,8 @@ preprocess (FILE *srcfp, FILE *dstfp)
         char    in_backtick = 0;
 	int     line = 1;
         int     column = 0;
+        int     backtick_line = 0;
+        int     backtick_column = 0;
         int     character = 0;
 
 
@@ -473,6 +482,9 @@ preprocess (FILE *srcfp, FILE *dstfp)
 			} else {
 				i = 0;
 				cmd[i] = '\0';
+
+				backtick_column = column;
+				backtick_line = line;
 			}
 
 			in_backtick = !in_backtick;
@@ -482,7 +494,6 @@ preprocess (FILE *srcfp, FILE *dstfp)
 					cmd_buf_size *= 2;
 					cmd = GF_REALLOC (cmd, cmd_buf_size);
                                         if (cmd == NULL) {
-                                                GF_FREE (result);
                                                 return -1;
                                         }
 
@@ -524,7 +535,6 @@ preprocess (FILE *srcfp, FILE *dstfp)
 out:
 	fseek (srcfp, 0L, SEEK_SET);
 	fseek (dstfp, 0L, SEEK_SET);
-
 	GF_FREE (cmd);
 	GF_FREE (result);
 
@@ -532,7 +542,7 @@ out:
 }
 
 
-extern FILE *graphyyin;
+extern FILE *yyin;
 
 glusterfs_graph_t *
 glusterfs_graph_new ()
@@ -556,65 +566,52 @@ glusterfs_graph_t *
 glusterfs_graph_construct (FILE *fp)
 {
         int                ret = 0;
-        int                tmp_fd = -1;
         glusterfs_graph_t *graph = NULL;
-        FILE              *tmp_file = NULL;
-        char               template[PATH_MAX] = {0};
-	static pthread_mutex_t graph_mutex = PTHREAD_MUTEX_INITIALIZER;
+	FILE              *tmp_file = NULL;
 
         graph = glusterfs_graph_new ();
         if (!graph)
-                goto err;
+                return NULL;
 
-        strcpy (template, "/tmp/tmp.XXXXXX");
-        tmp_fd = mkstemp (template);
-        if (-1 == tmp_fd)
-                goto err;
+	tmp_file = tmpfile ();
 
-        ret = unlink (template);
-        if (ret < 0) {
-                gf_log ("parser", GF_LOG_WARNING, "Unable to delete file: %s",
-                        template);
-        }
+	if (tmp_file == NULL) {
+		gf_log ("parser", GF_LOG_ERROR,
+			"cannot create temparory file");
 
-        tmp_file = fdopen (tmp_fd, "w+b");
-        if (!tmp_file)
-                goto err;
+                glusterfs_graph_destroy (graph);
+		return NULL;
+	}
 
-        ret = preprocess (fp, tmp_file);
-        if (ret < 0) {
-                gf_log ("parser", GF_LOG_ERROR, "parsing of backticks failed");
-                goto err;
-        }
+	ret = preprocess (fp, tmp_file);
+	if (ret < 0) {
+		gf_log ("parser", GF_LOG_ERROR,
+			"parsing of backticks failed");
 
-	pthread_mutex_lock (&graph_mutex);
-	{
-		graphyyin = tmp_file;
-		construct = graph;
-		ret = yyparse ();
-		construct = NULL;
+                glusterfs_graph_destroy (graph);
+		fclose (tmp_file);
+		return NULL;
 	}
-	pthread_mutex_unlock (&graph_mutex);
+
+        yyin = tmp_file;
+
+        construct = graph;
+
+        ret = yyparse ();
+
+        construct = NULL;
+
+	fclose (tmp_file);
 
         if (ret == 1) {
                 gf_log ("parser", GF_LOG_DEBUG,
-                        "parsing of volfile failed, please review it "
-                        "once more");
-                goto err;
-        }
+			"parsing of volfile failed, please review it "
+			"once more");
 
-        fclose (tmp_file);
-        return graph;
-err:
-        if (tmp_file) {
-                fclose (tmp_file);
-        } else {
-                gf_log ("parser", GF_LOG_ERROR, "cannot create temporary file");
-                if (-1 != tmp_fd)
-                        close (tmp_fd);
+                glusterfs_graph_destroy (graph);
+                return NULL;
         }
 
-        glusterfs_graph_destroy (graph);
-        return NULL;
+        return graph;
 }
 
diff --git a/libglusterfs/src/hashfn.c b/libglusterfs/src/hashfn.c
index f79165b22..b5752956c 100644
--- a/libglusterfs/src/hashfn.c
+++ b/libglusterfs/src/hashfn.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <stdint.h>
diff --git a/libglusterfs/src/hashfn.h b/libglusterfs/src/hashfn.h
index 06ae37e79..af306745b 100644
--- a/libglusterfs/src/hashfn.h
+++ b/libglusterfs/src/hashfn.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __HASHFN_H__
diff --git a/libglusterfs/src/iatt.h b/libglusterfs/src/iatt.h
index 60ae59047..b84eaa379 100644
--- a/libglusterfs/src/iatt.h
+++ b/libglusterfs/src/iatt.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -94,8 +103,6 @@ struct iatt {
 #define IA_PROT_SGID(prot)      ((prot).sgid == 1)
 #define IA_PROT_STCKY(prot)     ((prot).sticky == 1)
 
-#define IA_FILE_OR_DIR(t)       (IA_ISREG(t) || IA_ISDIR(t))
-
 static inline uint32_t
 ia_major (uint64_t ia_dev)
 {
@@ -265,24 +272,6 @@ iatt_from_stat (struct iatt *iatt, struct stat *stat)
         iatt->ia_blksize    = stat->st_blksize;
         iatt->ia_blocks     = stat->st_blocks;
 
-        /* There is a possibility that the backend FS (like XFS) can
-           allocate blocks beyond EOF for better performance reasons, which
-           results in 'st_blocks' with higher values than what is consumed by
-           the file descriptor. This would break few logic inside GlusterFS,
-           like quota behavior etc, thus we need the exact number of blocks
-           which are consumed by the file to the higher layers inside GlusterFS.
-           Currently, this logic won't work for sparse files (ie, file with
-           holes)
-        */
-        {
-                uint64_t maxblocks;
-
-                maxblocks = (iatt->ia_size + 511) / 512;
-
-                if (iatt->ia_blocks > maxblocks)
-                        iatt->ia_blocks = maxblocks;
-        }
-
         iatt->ia_atime      = stat->st_atime;
         iatt->ia_atime_nsec = ST_ATIM_NSEC (stat);
 
diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c
index 15e0ccf78..0b923dcb2 100644
--- a/libglusterfs/src/inode.c
+++ b/libglusterfs/src/inode.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -85,7 +94,7 @@ __dentry_hash (dentry_t *dentry)
         int              hash = 0;
 
         if (!dentry) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "dentry not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "dentry not found");
                 return;
         }
 
@@ -102,7 +111,7 @@ static int
 __is_dentry_hashed (dentry_t *dentry)
 {
         if (!dentry) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "dentry not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "dentry not found");
                 return 0;
         }
 
@@ -114,7 +123,7 @@ static void
 __dentry_unhash (dentry_t *dentry)
 {
         if (!dentry) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "dentry not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "dentry not found");
                 return;
         }
 
@@ -125,23 +134,29 @@ __dentry_unhash (dentry_t *dentry)
 static void
 __dentry_unset (dentry_t *dentry)
 {
+        struct mem_pool *tmp_pool = NULL;
+
         if (!dentry) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "dentry not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "dentry not found");
                 return;
         }
 
+        tmp_pool = dentry->inode->table->dentry_pool;
         __dentry_unhash (dentry);
 
         list_del_init (&dentry->inode_list);
 
-        GF_FREE (dentry->name);
+        if (dentry->name)
+                GF_FREE (dentry->name);
 
         if (dentry->parent) {
                 __inode_unref (dentry->parent);
                 dentry->parent = NULL;
         }
 
-        mem_put (dentry);
+        mem_put (tmp_pool, dentry);
+        tmp_pool = NULL;
+
 }
 
 
@@ -156,19 +171,19 @@ __foreach_ancestor_dentry (dentry_t *dentry,
         int       ret = 0;
 
         if (!dentry) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "dentry not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "dentry not found");
                 return 0;
         }
 
         ret = per_dentry_fn (dentry, data);
         if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING, "per dentry fn returned %d", ret);
+                gf_log ("", GF_LOG_WARNING, "per dentry fn returned %d", ret);
                 goto out;
         }
 
         parent = dentry->parent;
         if (!parent) {
-                gf_log (THIS->name, GF_LOG_WARNING, "parent not found");
+                gf_log ("", GF_LOG_WARNING, "parent not found");
                 goto out;
         }
 
@@ -213,8 +228,8 @@ __is_dentry_cyclic (dentry_t *dentry)
 
                 gf_log (dentry->inode->table->name, GF_LOG_CRITICAL,
                         "detected cyclic loop formation during inode linkage."
-                        " inode (%s) linking under itself as %s",
-                        uuid_utoa (inode->gfid), name);
+                        " inode (%"PRId64"/%s) linking under itself as %s",
+                        inode->ino, uuid_utoa (inode->gfid), name);
         }
 
         return ret;
@@ -225,7 +240,7 @@ static void
 __inode_unhash (inode_t *inode)
 {
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return;
         }
 
@@ -237,7 +252,7 @@ static int
 __is_inode_hashed (inode_t *inode)
 {
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return 0;
         }
 
@@ -252,7 +267,7 @@ __inode_hash (inode_t *inode)
         int            hash = 0;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return;
         }
 
@@ -265,25 +280,18 @@ __inode_hash (inode_t *inode)
 
 
 static dentry_t *
-__dentry_search_for_inode (inode_t *inode, uuid_t pargfid, const char *name)
+__dentry_search_for_inode (inode_t *inode, ino_t par, const char *name)
 {
         dentry_t *dentry = NULL;
         dentry_t *tmp = NULL;
 
         if (!inode || !name) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode || name not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode || name not found");
                 return NULL;
         }
 
-        /* earlier, just the ino was sent, which could have been 0, now
-           we deal with gfid, and if sent gfid is null or 0, no need to
-           continue with the check */
-        if (!pargfid || uuid_is_null (pargfid))
-                return NULL;
-
         list_for_each_entry (tmp, &inode->dentry_list, inode_list) {
-                if ((uuid_compare (tmp->parent->gfid, pargfid) == 0) &&
-                    !strcmp (tmp->name, name)) {
+                if (tmp->parent->ino == par && !strcmp (tmp->name, name)) {
                         dentry = tmp;
                         break;
                 }
@@ -299,18 +307,21 @@ __inode_destroy (inode_t *inode)
         int          index = 0;
         xlator_t    *xl = NULL;
         xlator_t    *old_THIS = NULL;
+        struct mem_pool *tmp_pool = NULL;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return;
         }
 
         if (!inode->_ctx) {
-                gf_log (THIS->name, GF_LOG_WARNING, "_ctx not found");
+                gf_log ("", GF_LOG_WARNING, "_ctx not found");
                 goto noctx;
         }
 
-        for (index = 0; index < inode->table->ctxcount; index++) {
+        tmp_pool = inode->table->inode_pool;
+
+        for (index = 0; index < inode->table->xl->graph->xl_count; index++) {
                 if (inode->_ctx[index].xl_key) {
                         xl = (xlator_t *)(long)inode->_ctx[index].xl_key;
                         old_THIS = THIS;
@@ -325,7 +336,9 @@ __inode_destroy (inode_t *inode)
 noctx:
         LOCK_DESTROY (&inode->lock);
         //  memset (inode, 0xb, sizeof (*inode));
-        mem_put (inode);
+        mem_put (tmp_pool, inode);
+        tmp_pool = NULL;
+
 }
 
 
@@ -347,7 +360,7 @@ __inode_passivate (inode_t *inode)
         dentry_t      *t = NULL;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return;
         }
 
@@ -368,7 +381,7 @@ __inode_retire (inode_t *inode)
         dentry_t      *t = NULL;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return;
         }
 
@@ -389,7 +402,7 @@ __inode_unref (inode_t *inode)
         if (!inode)
                 return NULL;
 
-        if (__is_root_gfid(inode->gfid))
+        if (inode->ino == 1)
                 return inode;
 
         GF_ASSERT (inode->ref);
@@ -473,7 +486,7 @@ __dentry_create (inode_t *inode, inode_t *parent, const char *name)
         dentry_t      *newd = NULL;
 
         if (!inode || !parent || !name) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING,
+                gf_log_callingfn ("", GF_LOG_WARNING,
                                   "inode || parent || name not found");
                 return NULL;
         }
@@ -488,7 +501,7 @@ __dentry_create (inode_t *inode, inode_t *parent, const char *name)
 
         newd->name = gf_strdup (name);
         if (newd->name == NULL) {
-                mem_put (newd);
+                mem_put (parent->table->dentry_pool, newd);
                 newd = NULL;
                 goto out;
         }
@@ -510,7 +523,7 @@ __inode_create (inode_table_t *table)
         inode_t  *newi = NULL;
 
         if (!table) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "table not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "table not found");
                 return NULL;
         }
 
@@ -528,12 +541,13 @@ __inode_create (inode_table_t *table)
         INIT_LIST_HEAD (&newi->hash);
         INIT_LIST_HEAD (&newi->dentry_list);
 
-        newi->_ctx = GF_CALLOC (1,
-                                (sizeof (struct _inode_ctx) * table->ctxcount),
+        newi->_ctx = GF_CALLOC (1, (sizeof (struct _inode_ctx) *
+                                    table->xl->graph->xl_count),
                                 gf_common_mt_inode_ctx);
+
         if (newi->_ctx == NULL) {
                 LOCK_DESTROY (&newi->lock);
-                mem_put (newi);
+                mem_put (table->inode_pool, newi);
                 newi = NULL;
                 goto out;
         }
@@ -553,7 +567,7 @@ inode_new (inode_table_t *table)
         inode_t *inode = NULL;
 
         if (!table) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return NULL;
         }
 
@@ -629,7 +643,7 @@ inode_grep (inode_table_t *table, inode_t *parent, const char *name)
         dentry_t  *dentry = NULL;
 
         if (!table || !parent || !name) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING,
+                gf_log_callingfn ("", GF_LOG_WARNING,
                                   "table || parent || name not found");
                 return NULL;
         }
@@ -651,94 +665,24 @@ inode_grep (inode_table_t *table, inode_t *parent, const char *name)
 
 
 inode_t *
-inode_resolve (inode_table_t *table, char *path)
+inode_get (inode_table_t *table, ino_t ino, uint64_t gen)
 {
-        char    *tmp   = NULL, *bname = NULL, *str = NULL, *saveptr = NULL;
-        inode_t *inode = NULL, *parent = NULL;
-
-        if ((path == NULL) || (table == NULL)) {
-                goto out;
-        }
-
-        parent = inode_ref (table->root);
-        str = tmp = gf_strdup (path);
-
-        while (1) {
-                bname = strtok_r (str, "/", &saveptr);
-                if (bname == NULL) {
-                        break;
-                }
-
-                if (inode != NULL) {
-                        inode_unref (inode);
-                }
-
-                inode = inode_grep (table, parent, bname);
-                if (inode == NULL) {
-                        break;
-                }
-
-                if (parent != NULL) {
-                        inode_unref (parent);
-                }
-
-                parent = inode_ref (inode);
-                str = NULL;
-        }
-
-        inode_unref (parent);
-        GF_FREE (tmp);
-out:
-        return inode;
+        return NULL;
 }
 
 
 int
-inode_grep_for_gfid (inode_table_t *table, inode_t *parent, const char *name,
-                     uuid_t gfid, ia_type_t *type)
-{
-        inode_t   *inode = NULL;
-        dentry_t  *dentry = NULL;
-        int        ret = -1;
-
-        if (!table || !parent || !name) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING,
-                                  "table || parent || name not found");
-                return ret;
-        }
-
-        pthread_mutex_lock (&table->lock);
-        {
-                dentry = __dentry_grep (table, parent, name);
-
-                if (dentry)
-                        inode = dentry->inode;
-
-                if (inode) {
-                        uuid_copy (gfid, inode->gfid);
-                        *type = inode->ia_type;
-                        ret = 0;
-                }
-        }
-        pthread_mutex_unlock (&table->lock);
-
-        return ret;
-}
-
-
-/* return 1 if gfid is of root, 0 if not */
-gf_boolean_t
 __is_root_gfid (uuid_t gfid)
 {
         uuid_t  root;
+        int     ret;
 
         memset (root, 0, 16);
         root[15] = 1;
 
-        if (uuid_compare (gfid, root) == 0)
-                return _gf_true;
+        ret = uuid_compare (gfid, root);
 
-        return _gf_false;
+        return ret;
 }
 
 
@@ -750,11 +694,11 @@ __inode_find (inode_table_t *table, uuid_t gfid)
         int        hash = 0;
 
         if (!table) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "table not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "table not found");
                 goto out;
         }
 
-        if (__is_root_gfid (gfid))
+        if (__is_root_gfid (gfid) == 0)
                 return table->root;
 
         hash = hash_gfid (gfid, 65536);
@@ -777,7 +721,7 @@ inode_find (inode_table_t *table, uuid_t gfid)
         inode_t   *inode = NULL;
 
         if (!table) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "table not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "table not found");
                 return NULL;
         }
 
@@ -828,36 +772,25 @@ __inode_link (inode_t *inode, inode_t *parent, const char *name,
                 if (uuid_is_null (iatt->ia_gfid))
                         return NULL;
 
-                old_inode = __inode_find (table, iatt->ia_gfid);
+                uuid_copy (inode->gfid, iatt->ia_gfid);
+                inode->ino        = iatt->ia_ino;
+                inode->ia_type    = iatt->ia_type;
+
+                old_inode = __inode_find (table, inode->gfid);
 
                 if (old_inode) {
                         link_inode = old_inode;
                 } else {
-                        uuid_copy (inode->gfid, iatt->ia_gfid);
-                        inode->ia_type    = iatt->ia_type;
                         __inode_hash (inode);
                 }
         }
 
-        if (name) {
-                if (!strcmp(name, ".") || !strcmp(name, ".."))
-                        return link_inode;
-        }
-
         /* use only link_inode beyond this point */
         if (parent) {
                 old_dentry = __dentry_grep (table, parent, name);
 
                 if (!old_dentry || old_dentry->inode != link_inode) {
                         dentry = __dentry_create (link_inode, parent, name);
-                        if (!dentry) {
-                                gf_log_callingfn (THIS->name, GF_LOG_ERROR,
-                                                  "dentry create failed on "
-                                                  "inode %s with parent %s",
-                                                  uuid_utoa (link_inode->gfid),
-                                                  uuid_utoa (parent->gfid));
-                                return NULL;
-                        }
                         if (old_inode && __is_dentry_cyclic (dentry)) {
                                 __dentry_unset (dentry);
                                 return NULL;
@@ -881,7 +814,7 @@ inode_link (inode_t *inode, inode_t *parent, const char *name,
         inode_t       *linked_inode = NULL;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return NULL;
         }
 
@@ -908,7 +841,7 @@ inode_lookup (inode_t *inode)
         inode_table_t *table = NULL;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return -1;
         }
 
@@ -930,7 +863,7 @@ inode_forget (inode_t *inode, uint64_t nlookup)
         inode_table_t *table = NULL;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return -1;
         }
 
@@ -947,54 +880,6 @@ inode_forget (inode_t *inode, uint64_t nlookup)
         return 0;
 }
 
-/*
- * Invalidate an inode. This is invoked when a translator decides that an inode's
- * cache is no longer valid. Any translator interested in taking action in this
- * situation can define the invalidate callback.
- */
-int
-inode_invalidate(inode_t *inode)
-{
-	int ret = 0;
-	xlator_t *xl = NULL;
-	xlator_t *old_THIS = NULL;
-
-	if (!inode) {
-		gf_log_callingfn(THIS->name, GF_LOG_WARNING, "inode not found");
-		return -1;
-	}
-
-	/*
-	 * The master xlator is not in the graph but it can define an invalidate
-	 * handler.
-	 */
-	xl = inode->table->xl->ctx->master;
-	if (xl && xl->cbks->invalidate) {
-		old_THIS = THIS;
-		THIS = xl;
-		ret = xl->cbks->invalidate(xl, inode);
-		THIS = old_THIS;
-		if (ret)
-			return ret;
-	}
-
-	xl = inode->table->xl->graph->first;
-	while (xl) {
-		old_THIS = THIS;
-		THIS = xl;
-		if (xl->cbks->invalidate)
-			ret = xl->cbks->invalidate(xl, inode);
-		THIS = old_THIS;
-
-		if (ret)
-			break;
-
-		xl = xl->next;
-	}
-
-	return ret;
-}
-
 
 static void
 __inode_unlink (inode_t *inode, inode_t *parent, const char *name)
@@ -1004,7 +889,7 @@ __inode_unlink (inode_t *inode, inode_t *parent, const char *name)
         if (!inode || !parent || !name)
                 return;
 
-        dentry = __dentry_search_for_inode (inode, parent->gfid, name);
+        dentry = __dentry_search_for_inode (inode, parent->ino, name);
 
         /* dentry NULL for corrupted backend */
         if (dentry)
@@ -1018,7 +903,7 @@ inode_unlink (inode_t *inode, inode_t *parent, const char *name)
         inode_table_t *table = NULL;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return;
         }
 
@@ -1040,7 +925,7 @@ inode_rename (inode_table_t *table, inode_t *srcdir, const char *srcname,
               struct iatt *iatt)
 {
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return -1;
         }
 
@@ -1087,14 +972,14 @@ __dentry_search_arbit (inode_t *inode)
 
 
 inode_t *
-inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
+inode_parent (inode_t *inode, ino_t par, const char *name)
 {
         inode_t       *parent = NULL;
         inode_table_t *table = NULL;
         dentry_t      *dentry = NULL;
 
         if (!inode) {
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found");
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return NULL;
         }
 
@@ -1102,8 +987,8 @@ inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
 
         pthread_mutex_lock (&table->lock);
         {
-                if (pargfid && !uuid_is_null (pargfid) && name) {
-                        dentry = __dentry_search_for_inode (inode, pargfid, name);
+                if (par && name) {
+                        dentry = __dentry_search_for_inode (inode, par, name);
                 } else {
                         dentry = __dentry_search_arbit (inode);
                 }
@@ -1121,88 +1006,85 @@ inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
 
 
 int
-__inode_path (inode_t *inode, const char *name, char **bufp)
+inode_path (inode_t *inode, const char *name, char **bufp)
 {
         inode_table_t *table = NULL;
-        inode_t       *itrav = NULL;
-        dentry_t      *trav  = NULL;
-        size_t         i     = 0, size = 0;
-        int64_t        ret   = 0;
-        int            len   = 0;
-        char          *buf   = NULL;
-
-        if (!inode || uuid_is_null (inode->gfid)) {
-                GF_ASSERT (0);
-                gf_log_callingfn (THIS->name, GF_LOG_WARNING, "invalid inode");
+        dentry_t      *trav = NULL;
+        size_t         i = 0, size = 0;
+        int64_t        ret = 0;
+        int            len = 0;
+        char          *buf = NULL;
+
+        if (!inode) {
+                gf_log_callingfn ("", GF_LOG_WARNING, "inode not found");
                 return -1;
         }
 
         table = inode->table;
 
-        itrav = inode;
-        for (trav = __dentry_search_arbit (itrav); trav;
-             trav = __dentry_search_arbit (itrav)) {
-                itrav = trav->parent;
-                i ++; /* "/" */
-                i += strlen (trav->name);
-                if (i > PATH_MAX) {
-                        gf_log (table->name, GF_LOG_CRITICAL,
-                                "possible infinite loop detected, "
-                                "forcing break. name=(%s)", name);
-                        ret = -ENOENT;
-                        goto out;
+        pthread_mutex_lock (&table->lock);
+        {
+                for (trav = __dentry_search_arbit (inode); trav;
+                     trav = __dentry_search_arbit (trav->parent)) {
+                        i ++; /* "/" */
+                        i += strlen (trav->name);
+                        if (i > PATH_MAX) {
+                                gf_log (table->name, GF_LOG_CRITICAL,
+                                        "possible infinite loop detected, "
+                                        "forcing break. name=(%s)", name);
+                                ret = -ENOENT;
+                                goto unlock;
+                        }
                 }
-        }
 
-        if (!__is_root_gfid (itrav->gfid)) {
-                /* "<gfid:00000000-0000-0000-0000-000000000000>"/path */
-                i += GFID_STR_PFX_LEN;
-        }
-
-        if (name) {
-                i++;
-                i += strlen (name);
-        }
-
-        ret = i;
-        size = i + 1;
-        buf = GF_CALLOC (size, sizeof (char), gf_common_mt_char);
-        if (buf) {
-
-                buf[size - 1] = 0;
+                if ((inode->ino != 1) &&
+                    (i == 0)) {
+                        gf_log_callingfn (table->name, GF_LOG_WARNING,
+                                "no dentry for non-root inode %"PRId64": %s",
+                                inode->ino, uuid_utoa (inode->gfid));
+                        ret = -ENOENT;
+                        goto unlock;
+                }
 
                 if (name) {
-                        len = strlen (name);
-                        strncpy (buf + (i - len), name, len);
-                        buf[i-len-1] = '/';
-                        i -= (len + 1);
+                        i++;
+                        i += strlen (name);
                 }
 
-                itrav = inode;
-                for (trav = __dentry_search_arbit (itrav); trav;
-                     trav = __dentry_search_arbit (itrav)) {
-                        itrav = trav->parent;
-                        len = strlen (trav->name);
-                        strncpy (buf + (i - len), trav->name, len);
-                        buf[i-len-1] = '/';
-                        i -= (len + 1);
-                }
+                ret = i;
+                size = i + 1;
+                buf = GF_CALLOC (size, sizeof (char), gf_common_mt_char);
+                if (buf) {
 
-                if (!__is_root_gfid (itrav->gfid)) {
-                        snprintf (&buf[i-GFID_STR_PFX_LEN], GFID_STR_PFX_LEN,
-                                  INODE_PATH_FMT, uuid_utoa (itrav->gfid));
-                        buf[i-1] = '>';
-                }
+                        buf[size - 1] = 0;
+
+                        if (name) {
+                                len = strlen (name);
+                                strncpy (buf + (i - len), name, len);
+                                buf[i-len-1] = '/';
+                                i -= (len + 1);
+                        }
 
-                *bufp = buf;
-        } else {
-                ret = -ENOMEM;
+                        for (trav = __dentry_search_arbit (inode); trav;
+                             trav = __dentry_search_arbit (trav->parent)) {
+                                len = strlen (trav->name);
+                                strncpy (buf + (i - len), trav->name, len);
+                                buf[i-len-1] = '/';
+                                i -= (len + 1);
+                        }
+                        *bufp = buf;
+                } else {
+                        ret = -ENOMEM;
+                }
         }
+unlock:
+        pthread_mutex_unlock (&table->lock);
 
-out:
-        if (__is_root_gfid (inode->gfid) && !name) {
+        if (inode->ino == 1 && !name) {
                 ret = 1;
-                GF_FREE (buf);
+                if (buf) {
+                        GF_FREE (buf);
+                }
                 buf = GF_CALLOC (ret + 1, sizeof (char), gf_common_mt_char);
                 if (buf) {
                         strcpy (buf, "/");
@@ -1212,33 +1094,9 @@ out:
                 }
         }
 
-        if (ret < 0)
-                *bufp = NULL;
-        return ret;
-}
-
-
-int
-inode_path (inode_t *inode, const char *name, char **bufp)
-{
-        inode_table_t *table = NULL;
-        int            ret   = -1;
-
-        if (!inode)
-                return -1;
-
-        table = inode->table;
-
-        pthread_mutex_lock (&table->lock);
-        {
-                ret = __inode_path (inode, name, bufp);
-        }
-        pthread_mutex_unlock (&table->lock);
-
         return ret;
 }
 
-
 static int
 inode_table_prune (inode_table_t *table)
 {
@@ -1298,8 +1156,8 @@ __inode_table_init_root (inode_table_t *table)
         iatt.ia_ino = 1;
         iatt.ia_type = IA_IFDIR;
 
-        __inode_link (root, NULL, NULL, &iatt);
         table->root = root;
+        __inode_link (root, NULL, NULL, &iatt);
 }
 
 
@@ -1307,7 +1165,7 @@ inode_table_t *
 inode_table_new (size_t lru_limit, xlator_t *xl)
 {
         inode_table_t *new = NULL;
-        int            ret = -1;
+        int            ret = 0;
         int            i = 0;
 
         new = (void *)GF_CALLOC(1, sizeof (*new), gf_common_mt_inode_table_t);
@@ -1315,7 +1173,6 @@ inode_table_new (size_t lru_limit, xlator_t *xl)
                 return NULL;
 
         new->xl = xl;
-        new->ctxcount = xl->graph->xl_count + 1;
 
         new->lru_limit = lru_limit;
 
@@ -1327,32 +1184,41 @@ inode_table_new (size_t lru_limit, xlator_t *xl)
 
         new->inode_pool = mem_pool_new (inode_t, lru_limit);
 
-        if (!new->inode_pool)
-                goto out;
+        if (!new->inode_pool) {
+                GF_FREE (new);
+                return NULL;
+        }
 
         new->dentry_pool = mem_pool_new (dentry_t, lru_limit);
 
-        if (!new->dentry_pool)
-                goto out;
+        if (!new->dentry_pool) {
+                GF_FREE (new);
+                return NULL;
+        }
 
         new->inode_hash = (void *)GF_CALLOC (65536,
                                              sizeof (struct list_head),
                                              gf_common_mt_list_head);
-        if (!new->inode_hash)
-                goto out;
+        if (!new->inode_hash) {
+                GF_FREE (new);
+                return NULL;
+        }
 
         new->name_hash = (void *)GF_CALLOC (new->hashsize,
                                             sizeof (struct list_head),
                                             gf_common_mt_list_head);
-        if (!new->name_hash)
-                goto out;
+        if (!new->name_hash) {
+                GF_FREE (new->inode_hash);
+                GF_FREE (new);
+                return NULL;
+        }
 
-        /* if number of fd open in one process is more than this,
-           we may hit perf issues */
-        new->fd_mem_pool = mem_pool_new (fd_t, 1024);
+        new->fd_mem_pool = mem_pool_new (fd_t, 16384);
 
-        if (!new->fd_mem_pool)
-                goto out;
+        if (!new->fd_mem_pool) {
+                GF_FREE (new->inode_hash);
+                GF_FREE (new);
+        }
 
         for (i = 0; i < 65536; i++) {
                 INIT_LIST_HEAD (&new->inode_hash[i]);
@@ -1377,21 +1243,6 @@ inode_table_new (size_t lru_limit, xlator_t *xl)
 
         pthread_mutex_init (&new->lock, NULL);
 
-        ret = 0;
-out:
-        if (ret) {
-                if (new) {
-                        GF_FREE (new->inode_hash);
-                        GF_FREE (new->name_hash);
-                        if (new->dentry_pool)
-                                mem_pool_destroy (new->dentry_pool);
-                        if (new->inode_pool)
-                                mem_pool_destroy (new->inode_pool);
-                        GF_FREE (new);
-                        new = NULL;
-                }
-        }
-
         return new;
 }
 
@@ -1448,7 +1299,8 @@ inode_from_path (inode_table_t *itable, const char *path)
         if (parent)
                 inode_unref (parent);
 
-        GF_FREE (pathname);
+        if (pathname)
+                GF_FREE (pathname);
 
 out:
         return inode;
@@ -1456,59 +1308,45 @@ out:
 
 
 int
-__inode_ctx_set2 (inode_t *inode, xlator_t *xlator, uint64_t *value1_p,
-                  uint64_t *value2_p)
+__inode_ctx_put2 (inode_t *inode, xlator_t *xlator, uint64_t value1,
+                  uint64_t value2)
 {
         int ret = 0;
         int index = 0;
-        int set_idx = -1;
+        int put_idx = -1;
 
         if (!inode || !xlator)
                 return -1;
 
-        for (index = 0; index < inode->table->ctxcount; index++) {
+        for (index = 0; index < xlator->graph->xl_count; index++) {
                 if (!inode->_ctx[index].xl_key) {
-                        if (set_idx == -1)
-                                set_idx = index;
+                        if (put_idx == -1)
+                                put_idx = index;
                         /* dont break, to check if key already exists
                            further on */
                 }
                 if (inode->_ctx[index].xl_key == xlator) {
-                        set_idx = index;
+                        put_idx = index;
                         break;
                 }
         }
 
-        if (set_idx == -1) {
+        if (put_idx == -1) {
                 ret = -1;
                 goto out;;
         }
 
-        inode->_ctx[set_idx].xl_key = xlator;
-        if (value1_p)
-                inode->_ctx[set_idx].value1 = *value1_p;
-        if (value2_p)
-                inode->_ctx[set_idx].value2 = *value2_p;
+        inode->_ctx[put_idx].xl_key = xlator;
+        inode->_ctx[put_idx].value1 = value1;
+        inode->_ctx[put_idx].value2 = value2;
 out:
         return ret;
 }
 
-int
-__inode_ctx_set0 (inode_t *inode, xlator_t *xlator, uint64_t *value1_p)
-{
-        return __inode_ctx_set2 (inode, xlator, value1_p, NULL);
-}
-
-int
-__inode_ctx_set1 (inode_t *inode, xlator_t *xlator, uint64_t *value2_p)
-{
-        return __inode_ctx_set2 (inode, xlator, NULL, value2_p);
-}
-
 
 int
-inode_ctx_set2 (inode_t *inode, xlator_t *xlator, uint64_t *value1_p,
-                uint64_t *value2_p)
+inode_ctx_put2 (inode_t *inode, xlator_t *xlator, uint64_t value1,
+                uint64_t value2)
 {
         int ret = 0;
 
@@ -1517,40 +1355,7 @@ inode_ctx_set2 (inode_t *inode, xlator_t *xlator, uint64_t *value1_p,
 
         LOCK (&inode->lock);
         {
-                ret = __inode_ctx_set2 (inode, xlator, value1_p, value2_p);
-        }
-        UNLOCK (&inode->lock);
-
-        return ret;
-}
-
-int
-inode_ctx_set1 (inode_t *inode, xlator_t *xlator, uint64_t *value2_p)
-{
-        int ret = 0;
-
-        if (!inode || !xlator)
-                return -1;
-
-        LOCK (&inode->lock);
-        {
-                ret = __inode_ctx_set1 (inode, xlator, value2_p);
-        }
-        UNLOCK (&inode->lock);
-
-        return ret;
-}
-int
-inode_ctx_set0 (inode_t *inode, xlator_t *xlator, uint64_t *value1_p)
-{
-        int ret = 0;
-
-        if (!inode || !xlator)
-                return -1;
-
-        LOCK (&inode->lock);
-        {
-                ret = __inode_ctx_set0 (inode, xlator, value1_p);
+                ret = __inode_ctx_put2 (inode, xlator, value1, value2);
         }
         UNLOCK (&inode->lock);
 
@@ -1563,58 +1368,28 @@ __inode_ctx_get2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
                   uint64_t *value2)
 {
         int index = 0;
-        int ret = -1;
+        int ret = 0;
 
         if (!inode || !xlator)
-                goto out;
+                return -1;
 
-        for (index = 0; index < inode->table->ctxcount; index++) {
+        for (index = 0; index < xlator->graph->xl_count; index++) {
                 if (inode->_ctx[index].xl_key == xlator)
                         break;
         }
 
-        if (index == inode->table->ctxcount)
+        if (index == xlator->graph->xl_count) {
+                ret = -1;
                 goto out;
-
-        if (inode->_ctx[index].value1) {
-                if (value1)
-                        *value1 = inode->_ctx[index].value1;
-                ret = 0;
-        }
-        if (inode->_ctx[index].value2) {
-                if (value2)
-                        *value2 = inode->_ctx[index].value2;
-                ret = 0;
         }
-out:
-        return ret;
-}
 
+        if (value1)
+                *value1 = inode->_ctx[index].value1;
 
+        if (value2)
+                *value2 = inode->_ctx[index].value2;
 
-int
-__inode_ctx_get0 (inode_t *inode, xlator_t *xlator, uint64_t *value1)
-{
-        uint64_t tmp_value = 0;
-        int ret = 0;
-
-        ret =  __inode_ctx_get2 (inode, xlator, &tmp_value, NULL);
-        if (!ret)
-                *value1 = tmp_value;
-
-        return ret;
-}
-
-int
-__inode_ctx_get1 (inode_t *inode, xlator_t *xlator, uint64_t *value2)
-{
-        uint64_t tmp_value = 0;
-        int ret = 0;
-
-        ret =  __inode_ctx_get2 (inode, xlator, NULL, &tmp_value);
-        if (!ret)
-                *value2 = tmp_value;
-
+out:
         return ret;
 }
 
@@ -1637,40 +1412,6 @@ inode_ctx_get2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
         return ret;
 }
 
-int
-inode_ctx_get1 (inode_t *inode, xlator_t *xlator, uint64_t *value2)
-{
-        int ret = 0;
-
-        if (!inode || !xlator)
-                return -1;
-
-        LOCK (&inode->lock);
-        {
-                ret = __inode_ctx_get1 (inode, xlator, value2);
-        }
-        UNLOCK (&inode->lock);
-
-        return ret;
-}
-
-int
-inode_ctx_get0 (inode_t *inode, xlator_t *xlator, uint64_t *value1)
-{
-        int ret = 0;
-
-        if (!inode || !xlator)
-                return -1;
-
-        LOCK (&inode->lock);
-        {
-                ret = __inode_ctx_get0 (inode, xlator, value1);
-        }
-        UNLOCK (&inode->lock);
-
-        return ret;
-}
-
 
 int
 inode_ctx_del2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
@@ -1684,20 +1425,19 @@ inode_ctx_del2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
 
         LOCK (&inode->lock);
         {
-                for (index = 0; index < inode->table->ctxcount;
-                     index++) {
+                for (index = 0; index < xlator->graph->xl_count; index++) {
                         if (inode->_ctx[index].xl_key == xlator)
                                 break;
                 }
 
-                if (index == inode->table->ctxcount) {
+                if (index == xlator->graph->xl_count) {
                         ret = -1;
                         goto unlock;
                 }
 
-                if (inode->_ctx[index].value1 && value1)
+                if (value1)
                         *value1 = inode->_ctx[index].value1;
-                if (inode->_ctx[index].value2 && value2)
+                if (value2)
                         *value2 = inode->_ctx[index].value2;
 
                 inode->_ctx[index].key    = 0;
@@ -1710,106 +1450,55 @@ unlock:
         return ret;
 }
 
-/* function behavior:
- - if value1 is set, value1 in ctx is reset to 0 with current value passed
- back in value1 address.
- - if value2 is set, value2 in ctx is reset to 0 with current value passed
- back in value2 address.
- - if both are set, both fields are reset.
-*/
-static int
-__inode_ctx_reset2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
-                    uint64_t *value2)
-{
-        int index = 0;
-        int ret = 0;
-
-        if (!inode || !xlator)
-                return -1;
-
-        LOCK (&inode->lock);
-        {
-                for (index = 0; index < inode->table->ctxcount;
-                     index++) {
-                        if (inode->_ctx[index].xl_key == xlator)
-                                break;
-                }
-
-                if (index == inode->table->ctxcount) {
-                        ret = -1;
-                        goto unlock;
-                }
-
-                if (inode->_ctx[index].value1 && value1) {
-                        *value1 = inode->_ctx[index].value1;
-                        inode->_ctx[index].value1 = 0;
-                }
-                if (inode->_ctx[index].value2 && value2) {
-                        *value2 = inode->_ctx[index].value2;
-                        inode->_ctx[index].value2 = 0;
-                }
-        }
-unlock:
-        UNLOCK (&inode->lock);
-
-        return ret;
-}
 
 int
-inode_ctx_reset2 (inode_t *inode, xlator_t *xlator, uint64_t *value1_p,
-                  uint64_t *value2_p)
+__inode_ctx_put (inode_t *inode, xlator_t *key, uint64_t value)
 {
-        uint64_t tmp_value1 = 0;
-        uint64_t tmp_value2 = 0;
-        int ret = 0;
-
-        ret =  __inode_ctx_reset2 (inode, xlator, &tmp_value1, &tmp_value2);
-        if (!ret) {
-                if (value1_p)
-                        *value1_p = tmp_value1;
-                if (value2_p)
-                        *value2_p = tmp_value2;
-        }
-        return ret;
+        return __inode_ctx_put2 (inode, key, value, 0);
 }
 
+
 int
-inode_ctx_reset1 (inode_t *inode, xlator_t *xlator, uint64_t *value2_p)
+inode_ctx_put (inode_t *inode, xlator_t *key, uint64_t value)
 {
-        uint64_t tmp_value2 = 0;
-        int ret = 0;
+        return inode_ctx_put2 (inode, key, value, 0);
+}
 
-        ret = __inode_ctx_reset2 (inode, xlator, NULL, &tmp_value2);
 
-        if (!ret && value2_p)
-                *value2_p = tmp_value2;
+int
+__inode_ctx_get (inode_t *inode, xlator_t *key, uint64_t *value)
+{
+        return __inode_ctx_get2 (inode, key, value, 0);
+}
 
-        return ret;
 
-}
 int
-inode_ctx_reset0 (inode_t *inode, xlator_t *xlator, uint64_t *value1_p)
+inode_ctx_get (inode_t *inode, xlator_t *key, uint64_t *value)
 {
-        uint64_t tmp_value1 = 0;
-        int ret = 0;
-
-        ret = __inode_ctx_reset2 (inode, xlator, &tmp_value1, NULL);
+        return inode_ctx_get2 (inode, key, value, 0);
+}
 
-        if (!ret && value1_p)
-                *value1_p = tmp_value1;
 
-        return ret;
+int
+inode_ctx_del (inode_t *inode, xlator_t *key, uint64_t *value)
+{
+        return inode_ctx_del2 (inode, key, value, 0);
 }
 
 
 void
 inode_dump (inode_t *inode, char *prefix)
 {
+        char               key[GF_DUMP_MAX_BUF_LEN];
         int                ret       = -1;
         xlator_t          *xl        = NULL;
         int                i         = 0;
         fd_t              *fd        = NULL;
         struct _inode_ctx *inode_ctx = NULL;
+        struct  fd_wrapper {
+                fd_t *fd;
+                struct list_head next;
+        } *fd_wrapper, *tmp;
         struct list_head fd_list;
 
         if (!inode)
@@ -1818,43 +1507,59 @@ inode_dump (inode_t *inode, char *prefix)
         INIT_LIST_HEAD (&fd_list);
 
         ret = TRY_LOCK(&inode->lock);
+
         if (ret != 0) {
+                gf_log ("", GF_LOG_WARNING, "Unable to dump inode"
+                        " errno: %s", strerror (errno));
                 return;
         }
 
         {
-                gf_proc_dump_write("gfid", "%s", uuid_utoa (inode->gfid));
-                gf_proc_dump_write("nlookup", "%ld", inode->nlookup);
-                gf_proc_dump_write("fd-count", "%u", inode->fd_count);
-                gf_proc_dump_write("ref", "%u", inode->ref);
-                gf_proc_dump_write("ia_type", "%d", inode->ia_type);
+                gf_proc_dump_build_key(key, prefix, "gfid");
+                gf_proc_dump_write(key, "%s", uuid_utoa (inode->gfid));
+                gf_proc_dump_build_key(key, prefix, "nlookup");
+                gf_proc_dump_write(key, "%ld", inode->nlookup);
+                gf_proc_dump_build_key(key, prefix, "ref");
+                gf_proc_dump_write(key, "%u", inode->ref);
+                gf_proc_dump_build_key(key, prefix, "ino");
+                gf_proc_dump_write(key, "%ld", inode->ino);
+                gf_proc_dump_build_key(key, prefix, "ia_type");
+                gf_proc_dump_write(key, "%d", inode->ia_type);
                 if (inode->_ctx) {
-                        inode_ctx = GF_CALLOC (inode->table->ctxcount,
+                        inode_ctx = GF_CALLOC (inode->table->xl->graph->xl_count,
                                                sizeof (*inode_ctx),
                                                gf_common_mt_inode_ctx);
                         if (inode_ctx == NULL) {
                                 goto unlock;
                         }
 
-                        for (i = 0; i < inode->table->ctxcount;
-                             i++) {
+                        for (i = 0; i < inode->table->xl->graph->xl_count; i++) {
                                 inode_ctx[i] = inode->_ctx[i];
                         }
                 }
 
-		if (dump_options.xl_options.dump_fdctx != _gf_true)
-			goto unlock;
-
+                if (list_empty (&inode->fd_list)) {
+                        goto unlock;
+                }
 
                 list_for_each_entry (fd, &inode->fd_list, inode_list) {
-                        fd_ctx_dump (fd, prefix);
+                        fd_wrapper = GF_CALLOC (1, sizeof (*fd_wrapper),
+                                                gf_common_mt_char);
+                        if (fd_wrapper == NULL) {
+                                goto unlock;
+                        }
+
+                        INIT_LIST_HEAD (&fd_wrapper->next);
+                        list_add_tail (&fd_wrapper->next, &fd_list);
+
+                        fd_wrapper->fd = _fd_ref (fd);
                 }
         }
 unlock:
         UNLOCK(&inode->lock);
 
         if (inode_ctx && (dump_options.xl_options.dump_inodectx == _gf_true)) {
-                for (i = 0; i < inode->table->ctxcount; i++) {
+                for (i = 0; i < inode->table->xl->graph->xl_count; i++) {
                         if (inode_ctx[i].xl_key) {
                                 xl = (xlator_t *)(long)inode_ctx[i].xl_key;
                                 if (xl->dumpops && xl->dumpops->inodectx)
@@ -1863,7 +1568,21 @@ unlock:
                 }
         }
 
-        GF_FREE (inode_ctx);
+        if (!list_empty (&fd_list)
+            && (dump_options.xl_options.dump_fdctx == _gf_true)) {
+                list_for_each_entry_safe (fd_wrapper, tmp, &fd_list,
+                                          next) {
+                        list_del (&fd_wrapper->next);
+                        fd_ctx_dump (fd_wrapper->fd, prefix);
+
+                        fd_unref (fd_wrapper->fd);
+                        GF_FREE (fd_wrapper);
+                }
+        }
+
+        if (inode_ctx != NULL) {
+                GF_FREE (inode_ctx);
+        }
 
         return;
 }
@@ -1882,6 +1601,8 @@ inode_table_dump (inode_table_t *itable, char *prefix)
         ret = pthread_mutex_trylock(&itable->lock);
 
         if (ret != 0) {
+                gf_log("", GF_LOG_WARNING, "Unable to dump inode table"
+                       " errno: %s", strerror (errno));
                 return;
         }
 
@@ -1905,99 +1626,3 @@ inode_table_dump (inode_table_t *itable, char *prefix)
 
         pthread_mutex_unlock(&itable->lock);
 }
-
-void
-inode_dump_to_dict (inode_t *inode, char *prefix, dict_t *dict)
-{
-        int             ret = -1;
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-
-        ret = TRY_LOCK (&inode->lock);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.gfid", prefix);
-        ret = dict_set_dynstr (dict, key, gf_strdup (uuid_utoa (inode->gfid)));
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.nlookup", prefix);
-        ret = dict_set_uint64 (dict, key, inode->nlookup);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.ref", prefix);
-        ret = dict_set_uint32 (dict, key, inode->ref);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.ia_type", prefix);
-        ret = dict_set_int32 (dict, key, inode->ia_type);
-
-out:
-        UNLOCK (&inode->lock);
-        return;
-}
-
-void
-inode_table_dump_to_dict (inode_table_t *itable, char *prefix, dict_t *dict)
-{
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-        int             ret = 0;
-        inode_t         *inode = NULL;
-        int             count = 0;
-
-        ret = pthread_mutex_trylock (&itable->lock);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.itable.active_size", prefix);
-        ret = dict_set_uint32 (dict, key, itable->active_size);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.itable.lru_size", prefix);
-        ret = dict_set_uint32 (dict, key, itable->lru_size);
-        if (ret)
-                goto out;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.itable.purge_size", prefix);
-        ret = dict_set_uint32 (dict, key, itable->purge_size);
-        if (ret)
-                goto out;
-
-        list_for_each_entry (inode, &itable->active, list) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.itable.active%d", prefix,
-                          count++);
-                inode_dump_to_dict (inode, key, dict);
-        }
-        count = 0;
-
-        list_for_each_entry (inode, &itable->lru, list) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.itable.lru%d", prefix,
-                          count++);
-                inode_dump_to_dict (inode, key, dict);
-        }
-        count = 0;
-
-        list_for_each_entry (inode, &itable->purge, list) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.itable.purge%d", prefix,
-                          count++);
-                inode_dump_to_dict (inode, key, dict);
-        }
-
-out:
-        pthread_mutex_unlock (&itable->lock);
-
-        return;
-}
diff --git a/libglusterfs/src/inode.h b/libglusterfs/src/inode.h
index a88976265..282c2a3e6 100644
--- a/libglusterfs/src/inode.h
+++ b/libglusterfs/src/inode.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _INODE_H
@@ -19,8 +28,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#define DEFAULT_INODE_MEMPOOL_ENTRIES   32 * 1024
-#define INODE_PATH_FMT "<gfid:%s>"
+#define DEFAULT_INODE_MEMPOOL_ENTRIES   16384
 struct _inode_table;
 typedef struct _inode_table inode_table_t;
 
@@ -56,7 +64,6 @@ struct _inode_table {
         struct mem_pool   *inode_pool;  /* memory pool for inodes */
         struct mem_pool   *dentry_pool; /* memory pool for dentrys */
         struct mem_pool   *fd_mem_pool; /* memory pool for fd_t */
-        int                ctxcount;    /* number of slots in inode->ctx */
 };
 
 
@@ -73,12 +80,10 @@ struct _inode_ctx {
                 uint64_t    key;
                 xlator_t   *xl_key;
         };
-        /* if value1 is 0, then field is not set.. */
         union {
                 uint64_t    value1;
                 void       *ptr1;
         };
-        /* if value2 is 0, then field is not set.. */
         union {
                 uint64_t    value2;
                 void       *ptr2;
@@ -90,8 +95,8 @@ struct _inode {
         uuid_t               gfid;
         gf_lock_t            lock;
         uint64_t             nlookup;
-        uint32_t             fd_count;      /* Open fd count */
         uint32_t             ref;           /* reference count on this inode */
+        ino_t                ino;           /* inode number in the storage (persistent) */
         ia_type_t            ia_type;       /* what kind of file */
         struct list_head     fd_list;       /* list of open files on this inode */
         struct list_head     dentry_list;   /* list of directory entries for this inode */
@@ -102,10 +107,6 @@ struct _inode {
 };
 
 
-#define UUID0_STR "00000000-0000-0000-0000-000000000000"
-#define GFID_STR_PFX "<gfid:" UUID0_STR ">"
-#define GFID_STR_PFX_LEN (sizeof (GFID_STR_PFX) - 1)
-
 inode_table_t *
 inode_table_new (size_t lru_limit, xlator_t *xl);
 
@@ -120,7 +121,7 @@ void
 inode_unlink (inode_t *inode, inode_t *parent, const char *name);
 
 inode_t *
-inode_parent (inode_t *inode, uuid_t pargfid, const char *name);
+inode_parent (inode_t *inode, ino_t par, const char *name);
 
 inode_t *
 inode_ref (inode_t *inode);
@@ -135,9 +136,6 @@ int
 inode_forget (inode_t *inode, uint64_t nlookup);
 
 int
-inode_invalidate(inode_t *inode);
-
-int
 inode_rename (inode_table_t *table, inode_t *olddir, const char *oldname,
 	      inode_t *newdir, const char *newname,
 	      inode_t *inode, struct iatt *stbuf);
@@ -145,9 +143,8 @@ inode_rename (inode_table_t *table, inode_t *olddir, const char *oldname,
 inode_t *
 inode_grep (inode_table_t *table, inode_t *parent, const char *name);
 
-int
-inode_grep_for_gfid (inode_table_t *table, inode_t *parent, const char *name,
-                     uuid_t gfid, ia_type_t *type);
+inode_t *
+inode_get (inode_table_t *table, ino_t ino, uint64_t gen);
 
 inode_t *
 inode_find (inode_table_t *table, uuid_t gfid);
@@ -155,97 +152,36 @@ inode_find (inode_table_t *table, uuid_t gfid);
 int
 inode_path (inode_t *inode, const char *name, char **bufp);
 
-int
-__inode_path (inode_t *inode, const char *name, char **bufp);
-
 inode_t *
 inode_from_path (inode_table_t *table, const char *path);
 
-inode_t *
-inode_resolve (inode_table_t *table, char *path);
-
-/* deal with inode ctx's both values */
-
 int
-inode_ctx_set2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
-                uint64_t *value2);
-int
-__inode_ctx_set2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
-                  uint64_t *value2);
+__inode_ctx_put (inode_t *inode, xlator_t *xlator, uint64_t value);
 
 int
-inode_ctx_get2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
-                uint64_t *value2);
-int
-__inode_ctx_get2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
-                  uint64_t *value2);
+inode_ctx_put (inode_t *inode, xlator_t *xlator, uint64_t value);
 
 int
-inode_ctx_del2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
-                uint64_t *value2);
+__inode_ctx_get (inode_t *inode, xlator_t *xlator, uint64_t *value);
 
 int
-inode_ctx_reset2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
-                  uint64_t *value2);
-
-/* deal with inode ctx's 1st value */
+inode_ctx_get (inode_t *inode, xlator_t *xlator, uint64_t *value);
 
 int
-inode_ctx_set0 (inode_t *inode, xlator_t *xlator, uint64_t *value1);
+inode_ctx_del (inode_t *inode, xlator_t *xlator, uint64_t *value);
 
 int
-__inode_ctx_set0 (inode_t *inode, xlator_t *xlator, uint64_t *value1);
-
-int
-inode_ctx_get0 (inode_t *inode, xlator_t *xlator, uint64_t *value1);
-int
-__inode_ctx_get0 (inode_t *inode, xlator_t *xlator, uint64_t *value1);
+inode_ctx_put2 (inode_t *inode, xlator_t *xlator, uint64_t value1,
+                uint64_t value2);
 
 int
-inode_ctx_reset0 (inode_t *inode, xlator_t *xlator, uint64_t *value1);
-
-/* deal with inode ctx's 2st value */
-
-int
-inode_ctx_set1 (inode_t *inode, xlator_t *xlator, uint64_t *value2);
-
-int
-__inode_ctx_set1 (inode_t *inode, xlator_t *xlator, uint64_t *value2);
+inode_ctx_get2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
+                uint64_t *value2);
 
 int
-inode_ctx_get1 (inode_t *inode, xlator_t *xlator, uint64_t *value2);
-int
-__inode_ctx_get1 (inode_t *inode, xlator_t *xlator, uint64_t *value2);
+inode_ctx_del2 (inode_t *inode, xlator_t *xlator, uint64_t *value1,
+                uint64_t *value2);
 
 int
-inode_ctx_reset1 (inode_t *inode, xlator_t *xlator, uint64_t *value2);
-
-
-static inline int
-__inode_ctx_put(inode_t *inode, xlator_t *this, uint64_t v)
-{
-        return __inode_ctx_set0 (inode, this, &v);
-}
-
-static inline int
-inode_ctx_put(inode_t *inode, xlator_t *this, uint64_t v)
-{
-        return inode_ctx_set0 (inode, this, &v);
-}
-
-#define __inode_ctx_set(i,x,v_p) __inode_ctx_set0(i,x,v_p)
-
-#define inode_ctx_set(i,x,v_p) inode_ctx_set0(i,x,v_p)
-
-#define inode_ctx_reset(i,x,v) inode_ctx_reset0(i,x,v)
-
-#define __inode_ctx_get(i,x,v) __inode_ctx_get0(i,x,v)
-
-#define inode_ctx_get(i,x,v) inode_ctx_get0(i,x,v)
-
-#define inode_ctx_del(i,x,v) inode_ctx_del2(i,x,v,0)
-
-gf_boolean_t
 __is_root_gfid (uuid_t gfid);
-
 #endif /* _INODE_H */
diff --git a/libglusterfs/src/iobuf.c b/libglusterfs/src/iobuf.c
index a89e96267..734f59606 100644
--- a/libglusterfs/src/iobuf.c
+++ b/libglusterfs/src/iobuf.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -18,59 +27,11 @@
   TODO: implement destroy margins and prefetching of arenas
 */
 
-#define IOBUF_ARENA_MAX_INDEX  (sizeof (gf_iobuf_init_config) /         \
-                                (sizeof (struct iobuf_init_config)))
-
-/* Make sure this array is sorted based on pagesize */
-struct iobuf_init_config gf_iobuf_init_config[] = {
-        /* { pagesize, num_pages }, */
-        {128, 1024},
-        {512, 512},
-        {2 * 1024, 512},
-        {8 * 1024, 128},
-        {32 * 1024, 64},
-        {128 * 1024, 32},
-        {256 * 1024, 8},
-        {1 * 1024 * 1024, 2},
-};
-
-int
-gf_iobuf_get_arena_index (size_t page_size)
-{
-        int i = -1;
-
-        for (i = 0; i < IOBUF_ARENA_MAX_INDEX; i++) {
-                if (page_size <= gf_iobuf_init_config[i].pagesize)
-                        break;
-        }
-
-        if (i >= IOBUF_ARENA_MAX_INDEX)
-                i = -1;
-
-        return i;
-}
-
-size_t
-gf_iobuf_get_pagesize (size_t page_size)
-{
-        int    i    = 0;
-        size_t size = 0;
-
-        for (i = 0; i < IOBUF_ARENA_MAX_INDEX; i++) {
-                size = gf_iobuf_init_config[i].pagesize;
-                if (page_size <= size)
-                        break;
-        }
-
-        if (i >= IOBUF_ARENA_MAX_INDEX)
-                size = -1;
-
-        return size;
-}
-
 void
 __iobuf_arena_init_iobufs (struct iobuf_arena *iobuf_arena)
 {
+        size_t              arena_size = 0;
+        size_t              page_size = 0;
         int                 iobuf_cnt = 0;
         struct iobuf       *iobuf = NULL;
         int                 offset = 0;
@@ -78,7 +39,9 @@ __iobuf_arena_init_iobufs (struct iobuf_arena *iobuf_arena)
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_arena, out);
 
-        iobuf_cnt  = iobuf_arena->page_count;
+        arena_size = iobuf_arena->iobuf_pool->arena_size;
+        page_size  = iobuf_arena->iobuf_pool->page_size;
+        iobuf_cnt  = arena_size / page_size;
 
         iobuf_arena->iobufs = GF_CALLOC (sizeof (*iobuf), iobuf_cnt,
                                          gf_common_mt_iobuf);
@@ -97,7 +60,7 @@ __iobuf_arena_init_iobufs (struct iobuf_arena *iobuf_arena)
                 list_add (&iobuf->list, &iobuf_arena->passive.list);
                 iobuf_arena->passive_cnt++;
 
-                offset += iobuf_arena->page_size;
+                offset += page_size;
                 iobuf++;
         }
 
@@ -109,16 +72,20 @@ out:
 void
 __iobuf_arena_destroy_iobufs (struct iobuf_arena *iobuf_arena)
 {
+        size_t              arena_size = 0;
+        size_t              page_size = 0;
         int                 iobuf_cnt = 0;
         struct iobuf       *iobuf = NULL;
         int                 i = 0;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_arena, out);
 
-        iobuf_cnt  = iobuf_arena->page_count;
+        arena_size = iobuf_arena->iobuf_pool->arena_size;
+        page_size  = iobuf_arena->iobuf_pool->page_size;
+        iobuf_cnt  = arena_size / page_size;
 
         if (!iobuf_arena->iobufs) {
-                gf_log_callingfn (THIS->name, GF_LOG_ERROR, "iobufs not found");
+                gf_log_callingfn ("", GF_LOG_DEBUG, "iobufs not found");
                 return;
         }
 
@@ -140,26 +107,30 @@ out:
 void
 __iobuf_arena_destroy (struct iobuf_arena *iobuf_arena)
 {
+        struct iobuf_pool *iobuf_pool = NULL;
+
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_arena, out);
 
+        iobuf_pool = iobuf_arena->iobuf_pool;
+
         __iobuf_arena_destroy_iobufs (iobuf_arena);
 
         if (iobuf_arena->mem_base
             && iobuf_arena->mem_base != MAP_FAILED)
-                munmap (iobuf_arena->mem_base, iobuf_arena->arena_size);
+                munmap (iobuf_arena->mem_base, iobuf_pool->arena_size);
 
         GF_FREE (iobuf_arena);
+
 out:
         return;
 }
 
 
 struct iobuf_arena *
-__iobuf_arena_alloc (struct iobuf_pool *iobuf_pool, size_t page_size,
-                     int32_t num_iobufs)
+__iobuf_arena_alloc (struct iobuf_pool *iobuf_pool)
 {
         struct iobuf_arena *iobuf_arena = NULL;
-        size_t              rounded_size = 0;
+        size_t              arena_size = 0;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
 
@@ -173,24 +144,17 @@ __iobuf_arena_alloc (struct iobuf_pool *iobuf_pool, size_t page_size,
         INIT_LIST_HEAD (&iobuf_arena->passive.list);
         iobuf_arena->iobuf_pool = iobuf_pool;
 
-        rounded_size = gf_iobuf_get_pagesize (page_size);
-
-        iobuf_arena->page_size  = rounded_size;
-        iobuf_arena->page_count = num_iobufs;
-
-        iobuf_arena->arena_size = rounded_size * num_iobufs;
-
-        iobuf_arena->mem_base = mmap (NULL, iobuf_arena->arena_size,
-                                      PROT_READ|PROT_WRITE,
+        arena_size = iobuf_pool->arena_size;
+        iobuf_arena->mem_base = mmap (NULL, arena_size, PROT_READ|PROT_WRITE,
                                       MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
         if (iobuf_arena->mem_base == MAP_FAILED) {
-                gf_log (THIS->name, GF_LOG_WARNING, "maping failed");
+                gf_log ("", GF_LOG_WARNING, "maping failed");
                 goto err;
         }
 
         __iobuf_arena_init_iobufs (iobuf_arena);
         if (!iobuf_arena->iobufs) {
-                gf_log (THIS->name, GF_LOG_ERROR, "init failed");
+                gf_log ("", GF_LOG_DEBUG, "init failed");
                 goto err;
         }
 
@@ -207,67 +171,50 @@ out:
 
 
 struct iobuf_arena *
-__iobuf_arena_unprune (struct iobuf_pool *iobuf_pool, size_t page_size)
+__iobuf_arena_unprune (struct iobuf_pool *iobuf_pool)
 {
-        struct iobuf_arena *iobuf_arena  = NULL;
-        struct iobuf_arena *tmp          = NULL;
-        int                 index        = 0;
+        struct iobuf_arena *iobuf_arena = NULL;
+        struct iobuf_arena *tmp = NULL;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
 
-        index = gf_iobuf_get_arena_index (page_size);
-        if (index == -1) {
-                gf_log ("iobuf", GF_LOG_ERROR, "page_size (%zu) of "
-                        "iobufs in arena being added is greater than max "
-                        "available", page_size);
-                return NULL;
-        }
-
-        list_for_each_entry (tmp, &iobuf_pool->purge[index], list) {
+        list_for_each_entry (tmp, &iobuf_pool->purge.list, list) {
                 list_del_init (&tmp->list);
                 iobuf_arena = tmp;
                 break;
         }
+
 out:
         return iobuf_arena;
 }
 
 
 struct iobuf_arena *
-__iobuf_pool_add_arena (struct iobuf_pool *iobuf_pool, size_t page_size,
-                        int32_t num_pages)
+__iobuf_pool_add_arena (struct iobuf_pool *iobuf_pool)
 {
-        struct iobuf_arena *iobuf_arena  = NULL;
-        int                 index        = 0;
-
-        index = gf_iobuf_get_arena_index (page_size);
-        if (index == -1) {
-                gf_log ("iobuf", GF_LOG_ERROR, "page_size (%zu) of "
-                        "iobufs in arena being added is greater than max "
-                        "available", page_size);
-                return NULL;
-        }
+        struct iobuf_arena *iobuf_arena = NULL;
 
-        iobuf_arena = __iobuf_arena_unprune (iobuf_pool, page_size);
+        GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
+
+        iobuf_arena = __iobuf_arena_unprune (iobuf_pool);
 
         if (!iobuf_arena)
-                iobuf_arena = __iobuf_arena_alloc (iobuf_pool, page_size,
-                                                   num_pages);
+                iobuf_arena = __iobuf_arena_alloc (iobuf_pool);
 
         if (!iobuf_arena) {
-                gf_log (THIS->name, GF_LOG_WARNING, "arena not found");
+                gf_log ("", GF_LOG_WARNING, "arena not found");
                 return NULL;
         }
 
-        list_add_tail (&iobuf_arena->list, &iobuf_pool->arenas[index]);
+        list_add_tail (&iobuf_arena->list, &iobuf_pool->arenas.list);
 
+out:
         return iobuf_arena;
 }
 
 
 struct iobuf_arena *
-iobuf_pool_add_arena (struct iobuf_pool *iobuf_pool, size_t page_size,
-                      int32_t num_pages)
+iobuf_pool_add_arena (struct iobuf_pool *iobuf_pool)
 {
         struct iobuf_arena *iobuf_arena = NULL;
 
@@ -275,8 +222,7 @@ iobuf_pool_add_arena (struct iobuf_pool *iobuf_pool, size_t page_size,
 
         pthread_mutex_lock (&iobuf_pool->mutex);
         {
-                iobuf_arena = __iobuf_pool_add_arena (iobuf_pool, page_size,
-                                                      num_pages);
+                iobuf_arena = __iobuf_pool_add_arena (iobuf_pool);
         }
         pthread_mutex_unlock (&iobuf_pool->mutex);
 
@@ -289,113 +235,78 @@ void
 iobuf_pool_destroy (struct iobuf_pool *iobuf_pool)
 {
         struct iobuf_arena *iobuf_arena = NULL;
-        struct iobuf_arena *tmp         = NULL;
-        int                 i           = 0;
+        struct iobuf_arena *tmp = NULL;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
 
-        for (i = 0; i < IOBUF_ARENA_MAX_INDEX; i++) {
-                list_for_each_entry_safe (iobuf_arena, tmp,
-                                          &iobuf_pool->arenas[i], list) {
-                        list_del_init (&iobuf_arena->list);
-                        iobuf_pool->arena_cnt--;
-                        __iobuf_arena_destroy (iobuf_arena);
-                }
+        list_for_each_entry_safe (iobuf_arena, tmp, &iobuf_pool->arenas.list,
+                                  list) {
 
+                list_del_init (&iobuf_arena->list);
+                iobuf_pool->arena_cnt--;
+
+                __iobuf_arena_destroy (iobuf_arena);
         }
 
 out:
         return;
 }
 
-static void
-iobuf_create_stdalloc_arena (struct iobuf_pool *iobuf_pool)
-{
-        struct iobuf_arena *iobuf_arena = NULL;
-
-        /* No locking required here as its called only once during init */
-        iobuf_arena = GF_CALLOC (sizeof (*iobuf_arena), 1,
-                                 gf_common_mt_iobuf_arena);
-        if (!iobuf_arena)
-                goto err;
-
-        INIT_LIST_HEAD (&iobuf_arena->list);
-        INIT_LIST_HEAD (&iobuf_arena->active.list);
-        INIT_LIST_HEAD (&iobuf_arena->passive.list);
-
-        iobuf_arena->iobuf_pool = iobuf_pool;
-
-        iobuf_arena->page_size = 0x7fffffff;
-
-        list_add_tail (&iobuf_arena->list,
-                       &iobuf_pool->arenas[IOBUF_ARENA_MAX_INDEX]);
-
-err:
-        return;
-}
 
 struct iobuf_pool *
-iobuf_pool_new (void)
+iobuf_pool_new (size_t arena_size, size_t page_size)
 {
         struct iobuf_pool  *iobuf_pool = NULL;
-        int                 i          = 0;
-        size_t              page_size  = 0;
-        size_t              arena_size = 0;
-        int32_t             num_pages  = 0;
+
+        if (arena_size < page_size) {
+                gf_log ("", GF_LOG_WARNING,
+                        "arena size (%zu) is less than page size(%zu)",
+                        arena_size, page_size);
+                return NULL;
+        }
 
         iobuf_pool = GF_CALLOC (sizeof (*iobuf_pool), 1,
                                 gf_common_mt_iobuf_pool);
         if (!iobuf_pool)
-                goto out;
+                return NULL;
 
         pthread_mutex_init (&iobuf_pool->mutex, NULL);
-        for (i = 0; i <= IOBUF_ARENA_MAX_INDEX; i++) {
-                INIT_LIST_HEAD (&iobuf_pool->arenas[i]);
-                INIT_LIST_HEAD (&iobuf_pool->filled[i]);
-                INIT_LIST_HEAD (&iobuf_pool->purge[i]);
-        }
-
-        iobuf_pool->default_page_size  = 128 * GF_UNIT_KB;
-
-        arena_size = 0;
-        for (i = 0; i < IOBUF_ARENA_MAX_INDEX; i++) {
-                page_size = gf_iobuf_init_config[i].pagesize;
-                num_pages = gf_iobuf_init_config[i].num_pages;
-
-                iobuf_pool_add_arena (iobuf_pool, page_size, num_pages);
-
-                arena_size += page_size * num_pages;
-        }
-
-        /* Need an arena to handle all the bigger iobuf requests */
-        iobuf_create_stdalloc_arena (iobuf_pool);
+        INIT_LIST_HEAD (&iobuf_pool->arenas.list);
+        INIT_LIST_HEAD (&iobuf_pool->filled.list);
+        INIT_LIST_HEAD (&iobuf_pool->purge.list);
 
         iobuf_pool->arena_size = arena_size;
-out:
+        iobuf_pool->page_size  = page_size;
+
+        iobuf_pool_add_arena (iobuf_pool);
 
         return iobuf_pool;
 }
 
 
 void
-__iobuf_arena_prune (struct iobuf_pool *iobuf_pool,
-                     struct iobuf_arena *iobuf_arena, int index)
+__iobuf_pool_prune (struct iobuf_pool *iobuf_pool)
 {
+        struct iobuf_arena *iobuf_arena = NULL;
+        struct iobuf_arena *tmp = NULL;
+
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
 
-        /* code flow comes here only if the arena is in purge list and we can
-         * free the arena only if we have atleast one arena in 'arenas' list
-         * (ie, at least few iobufs free in arena), that way, there won't
-         * be spurious mmap/unmap of buffers
-         */
-        if (list_empty (&iobuf_pool->arenas[index]))
-                goto out;
+        if (list_empty (&iobuf_pool->arenas.list))
+                /* buffering - preserve this one arena (if at all)
+                   for __iobuf_arena_unprune */
+                return;
 
-        /* All cases matched, destroy */
-        list_del_init (&iobuf_arena->list);
-        iobuf_pool->arena_cnt--;
+        list_for_each_entry_safe (iobuf_arena, tmp, &iobuf_pool->purge.list,
+                                  list) {
+                if (iobuf_arena->active_cnt)
+                        continue;
 
-        __iobuf_arena_destroy (iobuf_arena);
+                list_del_init (&iobuf_arena->list);
+                iobuf_pool->arena_cnt--;
+
+                __iobuf_arena_destroy (iobuf_arena);
+        }
 
 out:
         return;
@@ -405,24 +316,11 @@ out:
 void
 iobuf_pool_prune (struct iobuf_pool *iobuf_pool)
 {
-        struct iobuf_arena *iobuf_arena = NULL;
-        struct iobuf_arena *tmp         = NULL;
-        int                 i           = 0;
-
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
 
         pthread_mutex_lock (&iobuf_pool->mutex);
         {
-                for (i = 0; i < IOBUF_ARENA_MAX_INDEX; i++) {
-                        if (list_empty (&iobuf_pool->arenas[i])) {
-                                continue;
-                        }
-
-                        list_for_each_entry_safe (iobuf_arena, tmp,
-                                                  &iobuf_pool->purge[i], list) {
-                                __iobuf_arena_prune (iobuf_pool, iobuf_arena, i);
-                        }
-                }
+                __iobuf_pool_prune (iobuf_pool);
         }
         pthread_mutex_unlock (&iobuf_pool->mutex);
 
@@ -432,24 +330,15 @@ out:
 
 
 struct iobuf_arena *
-__iobuf_select_arena (struct iobuf_pool *iobuf_pool, size_t page_size)
+__iobuf_select_arena (struct iobuf_pool *iobuf_pool)
 {
-        struct iobuf_arena *iobuf_arena  = NULL;
-        struct iobuf_arena *trav         = NULL;
-        int                 index        = 0;
+        struct iobuf_arena *iobuf_arena = NULL;
+        struct iobuf_arena *trav = NULL;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
 
-        index = gf_iobuf_get_arena_index (page_size);
-        if (index == -1) {
-                gf_log ("iobuf", GF_LOG_ERROR, "page_size (%zu) of "
-                        "iobufs in arena being added is greater than max "
-                        "available", page_size);
-                return NULL;
-        }
-
         /* look for unused iobuf from the head-most arena */
-        list_for_each_entry (trav, &iobuf_pool->arenas[index], list) {
+        list_for_each_entry (trav, &iobuf_pool->arenas.list, list) {
                 if (trav->passive_cnt) {
                         iobuf_arena = trav;
                         break;
@@ -457,9 +346,8 @@ __iobuf_select_arena (struct iobuf_pool *iobuf_pool, size_t page_size)
         }
 
         if (!iobuf_arena) {
-                /* all arenas were full, find the right count to add */
-                iobuf_arena = __iobuf_pool_add_arena (iobuf_pool, page_size,
-                                                      gf_iobuf_init_config[index].num_pages);
+                /* all arenas were full */
+                iobuf_arena = __iobuf_pool_add_arena (iobuf_pool);
         }
 
 out:
@@ -484,12 +372,12 @@ __iobuf_unref (struct iobuf *iobuf)
         return iobuf;
 }
 
+
 struct iobuf *
-__iobuf_get (struct iobuf_arena *iobuf_arena, size_t page_size)
+__iobuf_get (struct iobuf_arena *iobuf_arena)
 {
-        struct iobuf      *iobuf        = NULL;
-        struct iobuf_pool *iobuf_pool   = NULL;
-        int                index        = 0;
+        struct iobuf      *iobuf = NULL;
+        struct iobuf_pool *iobuf_pool = NULL;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_arena, out);
 
@@ -504,140 +392,36 @@ __iobuf_get (struct iobuf_arena *iobuf_arena, size_t page_size)
         list_add (&iobuf->list, &iobuf_arena->active.list);
         iobuf_arena->active_cnt++;
 
-        /* no resetting requied for this element */
-        iobuf_arena->alloc_cnt++;
-
-        if (iobuf_arena->max_active < iobuf_arena->active_cnt)
-                iobuf_arena->max_active = iobuf_arena->active_cnt;
-
         if (iobuf_arena->passive_cnt == 0) {
-                index = gf_iobuf_get_arena_index (page_size);
-                if (index == -1) {
-                        gf_log ("iobuf", GF_LOG_ERROR, "page_size (%zu) of "
-                                "iobufs in arena being added is greater "
-                                "than max available", page_size);
-                        goto out;
-                }
-
                 list_del (&iobuf_arena->list);
-                list_add (&iobuf_arena->list, &iobuf_pool->filled[index]);
+                list_add (&iobuf_arena->list, &iobuf_pool->filled.list);
         }
 
 out:
         return iobuf;
 }
 
-struct iobuf *
-iobuf_get_from_stdalloc (struct iobuf_pool *iobuf_pool, size_t page_size)
-{
-        struct iobuf       *iobuf       = NULL;
-        struct iobuf_arena *iobuf_arena = NULL;
-        struct iobuf_arena *trav        = NULL;
-        int                 ret         = -1;
-
-        /* The first arena in the 'MAX-INDEX' will always be used for misc */
-        list_for_each_entry (trav, &iobuf_pool->arenas[IOBUF_ARENA_MAX_INDEX],
-                             list) {
-                iobuf_arena = trav;
-                break;
-        }
-
-        iobuf = GF_CALLOC (1, sizeof (*iobuf), gf_common_mt_iobuf);
-        if (!iobuf)
-                goto out;
-
-        /* 4096 is the alignment */
-        iobuf->free_ptr = GF_CALLOC (1, ((page_size + GF_IOBUF_ALIGN_SIZE) - 1),
-                                     gf_common_mt_char);
-        if (!iobuf->free_ptr)
-                goto out;
-
-        iobuf->ptr = GF_ALIGN_BUF (iobuf->free_ptr, GF_IOBUF_ALIGN_SIZE);
-        iobuf->iobuf_arena = iobuf_arena;
-        LOCK_INIT (&iobuf->lock);
-
-        /* Hold a ref because you are allocating and using it */
-        iobuf->ref = 1;
-
-        ret = 0;
-out:
-        if (ret && iobuf) {
-                GF_FREE (iobuf->free_ptr);
-                GF_FREE (iobuf);
-                iobuf = NULL;
-        }
-
-        return iobuf;
-}
-
-
-struct iobuf *
-iobuf_get2 (struct iobuf_pool *iobuf_pool, size_t page_size)
-{
-        struct iobuf       *iobuf        = NULL;
-        struct iobuf_arena *iobuf_arena  = NULL;
-        size_t              rounded_size = 0;
-
-        if (page_size == 0) {
-                page_size = iobuf_pool->default_page_size;
-        }
-
-        rounded_size = gf_iobuf_get_pagesize (page_size);
-        if (rounded_size == -1) {
-                /* make sure to provide the requested buffer with standard
-                   memory allocations */
-                iobuf = iobuf_get_from_stdalloc (iobuf_pool, page_size);
-
-                gf_log ("iobuf", GF_LOG_DEBUG, "request for iobuf of size %zu "
-                        "is serviced using standard calloc() (%p) as it "
-                        "exceeds the maximum available buffer size",
-                        page_size, iobuf);
-
-                iobuf_pool->request_misses++;
-                return iobuf;
-        }
-
-        pthread_mutex_lock (&iobuf_pool->mutex);
-        {
-                /* most eligible arena for picking an iobuf */
-                iobuf_arena = __iobuf_select_arena (iobuf_pool, rounded_size);
-                if (!iobuf_arena)
-                        goto unlock;
-
-                iobuf = __iobuf_get (iobuf_arena, rounded_size);
-                if (!iobuf)
-                        goto unlock;
-
-                __iobuf_ref (iobuf);
-         }
-unlock:
-        pthread_mutex_unlock (&iobuf_pool->mutex);
-
-        return iobuf;
-}
 
 struct iobuf *
 iobuf_get (struct iobuf_pool *iobuf_pool)
 {
-        struct iobuf       *iobuf        = NULL;
-        struct iobuf_arena *iobuf_arena  = NULL;
+        struct iobuf       *iobuf = NULL;
+        struct iobuf_arena *iobuf_arena = NULL;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
 
         pthread_mutex_lock (&iobuf_pool->mutex);
         {
                 /* most eligible arena for picking an iobuf */
-                iobuf_arena = __iobuf_select_arena (iobuf_pool,
-                                                    iobuf_pool->default_page_size);
+                iobuf_arena = __iobuf_select_arena (iobuf_pool);
                 if (!iobuf_arena) {
-                        gf_log (THIS->name, GF_LOG_WARNING, "arena not found");
+                        gf_log ("", GF_LOG_WARNING, "arena not found");
                         goto unlock;
                 }
 
-                iobuf = __iobuf_get (iobuf_arena,
-                                     iobuf_pool->default_page_size);
+                iobuf = __iobuf_get (iobuf_arena);
                 if (!iobuf) {
-                        gf_log (THIS->name, GF_LOG_WARNING, "iobuf not found");
+                        gf_log ("", GF_LOG_WARNING, "iobuf not found");
                         goto unlock;
                 }
 
@@ -650,32 +434,20 @@ out:
         return iobuf;
 }
 
+
 void
 __iobuf_put (struct iobuf *iobuf, struct iobuf_arena *iobuf_arena)
 {
         struct iobuf_pool *iobuf_pool = NULL;
-        int                index      = 0;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_arena, out);
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf, out);
 
         iobuf_pool = iobuf_arena->iobuf_pool;
 
-        index = gf_iobuf_get_arena_index (iobuf_arena->page_size);
-        if (index == -1) {
-                gf_log ("iobuf", GF_LOG_DEBUG, "freeing the iobuf (%p) "
-                        "allocated with standard calloc()", iobuf);
-
-                /* free up properly without bothering about lists and all */
-                LOCK_DESTROY (&iobuf->lock);
-                GF_FREE (iobuf->free_ptr);
-                GF_FREE (iobuf);
-                return;
-        }
-
         if (iobuf_arena->passive_cnt == 0) {
                 list_del (&iobuf_arena->list);
-                list_add_tail (&iobuf_arena->list, &iobuf_pool->arenas[index]);
+                list_add_tail (&iobuf_arena->list, &iobuf_pool->arenas.list);
         }
 
         list_del_init (&iobuf->list);
@@ -686,8 +458,7 @@ __iobuf_put (struct iobuf *iobuf, struct iobuf_arena *iobuf_arena)
 
         if (iobuf_arena->active_cnt == 0) {
                 list_del (&iobuf_arena->list);
-                list_add_tail (&iobuf_arena->list, &iobuf_pool->purge[index]);
-                __iobuf_arena_prune (iobuf_pool, iobuf_arena, index);
+                list_add_tail (&iobuf_arena->list, &iobuf_pool->purge.list);
         }
 out:
         return;
@@ -704,13 +475,13 @@ iobuf_put (struct iobuf *iobuf)
 
         iobuf_arena = iobuf->iobuf_arena;
         if (!iobuf_arena) {
-                gf_log (THIS->name, GF_LOG_WARNING, "arena not found");
+                gf_log ("", GF_LOG_WARNING, "arena not found");
                 return;
         }
 
         iobuf_pool = iobuf_arena->iobuf_pool;
         if (!iobuf_pool) {
-                gf_log (THIS->name, GF_LOG_WARNING, "iobuf pool not found");
+                gf_log ("", GF_LOG_WARNING, "iobuf pool not found");
                 return;
         }
 
@@ -720,6 +491,8 @@ iobuf_put (struct iobuf *iobuf)
         }
         pthread_mutex_unlock (&iobuf_pool->mutex);
 
+        iobuf_pool_prune (iobuf_pool);
+
 out:
         return;
 }
@@ -841,29 +614,6 @@ out:
 }
 
 
-void
-iobref_clear (struct iobref *iobref)
-{
-        int i = 0;
-
-        GF_VALIDATE_OR_GOTO ("iobuf", iobref, out);
-
-        for (; i < GF_IOBREF_IOBUF_COUNT; i++) {
-                if (iobref->iobrefs[i] != NULL) {
-                        iobuf_unref (iobref->iobrefs[i]);
-                } else {
-                        /** iobuf's are attched serially */
-                        break;
-                }
-        }
-
-        iobref_unref (iobref);
-
- out:
-        return;
-}
-
-
 int
 __iobref_add (struct iobref *iobref, struct iobuf *iobuf)
 {
@@ -944,16 +694,16 @@ iobuf_size (struct iobuf *iobuf)
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf, out);
 
         if (!iobuf->iobuf_arena) {
-                gf_log (THIS->name, GF_LOG_WARNING, "arena not found");
+                gf_log ("", GF_LOG_WARNING, "arena not found");
                 goto out;
         }
 
         if (!iobuf->iobuf_arena->iobuf_pool) {
-                gf_log (THIS->name, GF_LOG_WARNING, "pool not found");
+                gf_log ("", GF_LOG_WARNING, "pool not found");
                 goto out;
         }
 
-        size = iobuf->iobuf_arena->page_size;
+        size = iobuf->iobuf_arena->iobuf_pool->page_size;
 out:
         return size;
 }
@@ -993,6 +743,8 @@ iobuf_info_dump (struct iobuf *iobuf, const char *key_prefix)
 
         ret = TRY_LOCK(&iobuf->lock);
         if (ret) {
+                gf_log("", GF_LOG_WARNING, "Unable to dump iobuf"
+                       " errno: %s", strerror (errno));
                 return;
         }
         memcpy(&my_iobuf, iobuf, sizeof(my_iobuf));
@@ -1022,12 +774,6 @@ iobuf_arena_info_dump (struct iobuf_arena *iobuf_arena, const char *key_prefix)
         gf_proc_dump_write(key, "%d", iobuf_arena->active_cnt);
         gf_proc_dump_build_key(key, key_prefix, "passive_cnt");
         gf_proc_dump_write(key, "%d", iobuf_arena->passive_cnt);
-        gf_proc_dump_build_key(key, key_prefix, "alloc_cnt");
-        gf_proc_dump_write(key, "%"PRIu64, iobuf_arena->alloc_cnt);
-        gf_proc_dump_build_key(key, key_prefix, "max_active");
-        gf_proc_dump_write(key, "%"PRIu64, iobuf_arena->max_active);
-        gf_proc_dump_build_key(key, key_prefix, "page_size");
-        gf_proc_dump_write(key, "%"PRIu64, iobuf_arena->page_size);
         list_for_each_entry (trav, &iobuf_arena->active.list, list) {
                 gf_proc_dump_build_key(key, key_prefix,"active_iobuf.%d", i++);
                 gf_proc_dump_add_section(key);
@@ -1041,10 +787,10 @@ out:
 void
 iobuf_stats_dump (struct iobuf_pool *iobuf_pool)
 {
+
         char               msg[1024];
         struct iobuf_arena *trav = NULL;
         int                i = 1;
-        int                j = 0;
         int                ret = -1;
 
         GF_VALIDATE_OR_GOTO ("iobuf", iobuf_pool, out);
@@ -1054,42 +800,25 @@ iobuf_stats_dump (struct iobuf_pool *iobuf_pool)
         ret = pthread_mutex_trylock(&iobuf_pool->mutex);
 
         if (ret) {
+                gf_log("", GF_LOG_WARNING, "Unable to dump iobuf pool"
+                       " errno: %s", strerror (errno));
                 return;
         }
         gf_proc_dump_add_section("iobuf.global");
-        gf_proc_dump_write("iobuf_pool","%p", iobuf_pool);
-        gf_proc_dump_write("iobuf_pool.default_page_size", "%d",
-                                                iobuf_pool->default_page_size);
-        gf_proc_dump_write("iobuf_pool.arena_size", "%d",
+        gf_proc_dump_write("iobuf.global.iobuf_pool","%p", iobuf_pool);
+        gf_proc_dump_write("iobuf.global.iobuf_pool.page_size", "%d",
+                           iobuf_pool->page_size);
+        gf_proc_dump_write("iobuf.global.iobuf_pool.arena_size", "%d",
                            iobuf_pool->arena_size);
-        gf_proc_dump_write("iobuf_pool.arena_cnt", "%d",
+        gf_proc_dump_write("iobuf.global.iobuf_pool.arena_cnt", "%d",
                            iobuf_pool->arena_cnt);
-        gf_proc_dump_write("iobuf_pool.request_misses", "%"PRId64,
-                           iobuf_pool->request_misses);
-
-        for (j = 0; j < IOBUF_ARENA_MAX_INDEX; j++) {
-                list_for_each_entry (trav, &iobuf_pool->arenas[j], list) {
-                        snprintf(msg, sizeof(msg),
-                                 "arena.%d", i);
-                        gf_proc_dump_add_section(msg);
-                        iobuf_arena_info_dump(trav,msg);
-                        i++;
-                }
-                list_for_each_entry (trav, &iobuf_pool->purge[j], list) {
-                        snprintf(msg, sizeof(msg),
-                                 "purge.%d", i);
-                        gf_proc_dump_add_section(msg);
-                        iobuf_arena_info_dump(trav,msg);
-                        i++;
-                }
-                list_for_each_entry (trav, &iobuf_pool->filled[j], list) {
-                        snprintf(msg, sizeof(msg),
-                                 "filled.%d", i);
-                        gf_proc_dump_add_section(msg);
-                        iobuf_arena_info_dump(trav,msg);
-                        i++;
-                }
 
+        list_for_each_entry (trav, &iobuf_pool->arenas.list, list) {
+                snprintf(msg, sizeof(msg), "iobuf.global.iobuf_pool.arena.%d",
+                         i);
+                gf_proc_dump_add_section(msg);
+                iobuf_arena_info_dump(trav,msg);
+                i++;
         }
 
         pthread_mutex_unlock(&iobuf_pool->mutex);
diff --git a/libglusterfs/src/iobuf.h b/libglusterfs/src/iobuf.h
index 5595309e1..7c4ee8c26 100644
--- a/libglusterfs/src/iobuf.h
+++ b/libglusterfs/src/iobuf.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _IOBUF_H_
@@ -17,9 +26,6 @@
 #include <sys/mman.h>
 #include <sys/uio.h>
 
-#define GF_VARIABLE_IOBUF_COUNT 32
-#define GF_IOBREF_IOBUF_COUNT 16
-
 /* Lets try to define the new anonymous mapping
  * flag, in case the system is still using the
  * now deprecated MAP_ANON flag.
@@ -31,10 +37,7 @@
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
-#define GF_ALIGN_BUF(ptr,bound) ((void *)((unsigned long)(ptr + bound - 1) & \
-                                          (unsigned long)(~(bound - 1))))
-
-#define GF_IOBUF_ALIGN_SIZE 512
+#define GF_IOBREF_IOBUF_COUNT 16
 
 /* one allocatable unit for the consumers of the IOBUF API */
 /* each unit hosts @page_size bytes of memory */
@@ -48,10 +51,6 @@ struct iobuf_arena;
 /* expandable and contractable pool of memory, internally broken into arenas */
 struct iobuf_pool;
 
-struct iobuf_init_config {
-        size_t   pagesize;
-        int32_t  num_pages;
-};
 
 struct iobuf {
         union {
@@ -67,9 +66,6 @@ struct iobuf {
         int                  ref;  /* 0 == passive, >0 == active */
 
         void                *ptr;  /* usable memory region by the consumer */
-
-        void                *free_ptr; /* in case of stdalloc, this is the
-                                          one to be freed */
 };
 
 
@@ -81,13 +77,6 @@ struct iobuf_arena {
                         struct iobuf_arena *prev;
                 };
         };
-
-        size_t              page_size;  /* size of all iobufs in this arena */
-        size_t              arena_size; /* this is equal to
-                                           (iobuf_pool->arena_size / page_size)
-                                           * page_size */
-        size_t              page_count;
-
         struct iobuf_pool  *iobuf_pool;
 
         void               *mem_base;
@@ -99,34 +88,25 @@ struct iobuf_arena {
         int                 passive_cnt;
         struct iobuf        passive;    /* head node iobuf
                                            (unused by itself) */
-        uint64_t            alloc_cnt;  /* total allocs in this pool */
-        int                 max_active; /* max active buffers at a given time */
 };
 
 
 struct iobuf_pool {
         pthread_mutex_t     mutex;
-        size_t              arena_size; /* size of memory region in
-                                           arena */
-        size_t              default_page_size; /* default size of iobuf */
+        size_t              page_size;  /* size of all iobufs in this pool */
+        size_t              arena_size; /* size of memory region in arena */
 
         int                 arena_cnt;
-        struct list_head    arenas[GF_VARIABLE_IOBUF_COUNT];
-        /* array of arenas. Each element of the array is a list of arenas
-           holding iobufs of particular page_size */
-
-        struct list_head    filled[GF_VARIABLE_IOBUF_COUNT];
-        /* array of arenas without free iobufs */
+        struct iobuf_arena  arenas;     /* head node arena
+                                           (unused by itself) */
+        struct iobuf_arena  filled;     /* arenas without  free iobufs */
+        struct iobuf_arena  purge;      /* arenas which can be purged */
+};
 
-        struct list_head    purge[GF_VARIABLE_IOBUF_COUNT];
-        /* array of of arenas which can be purged */
 
-        uint64_t            request_misses; /* mostly the requests for higher
-                                               value of iobufs */
-};
 
 
-struct iobuf_pool *iobuf_pool_new (void);
+struct iobuf_pool *iobuf_pool_new (size_t arena_size, size_t page_size);
 void iobuf_pool_destroy (struct iobuf_pool *iobuf_pool);
 struct iobuf *iobuf_get (struct iobuf_pool *iobuf_pool);
 void iobuf_unref (struct iobuf *iobuf);
@@ -135,8 +115,8 @@ void iobuf_pool_destroy (struct iobuf_pool *iobuf_pool);
 void iobuf_to_iovec(struct iobuf *iob, struct iovec *iov);
 
 #define iobuf_ptr(iob) ((iob)->ptr)
-#define iobpool_default_pagesize(iobpool) ((iobpool)->default_page_size)
-#define iobuf_pagesize(iob) (iob->iobuf_arena->page_size)
+#define iobpool_pagesize(iobpool) ((iobpool)->page_size)
+#define iobuf_pagesize(iob) (iobpool_pagesize((iob)->iobuf_arena->iobuf_pool))
 
 
 struct iobref {
@@ -150,12 +130,10 @@ struct iobref *iobref_ref (struct iobref *iobref);
 void iobref_unref (struct iobref *iobref);
 int iobref_add (struct iobref *iobref, struct iobuf *iobuf);
 int iobref_merge (struct iobref *to, struct iobref *from);
-void iobref_clear (struct iobref *iobref);
+
 
 size_t iobuf_size (struct iobuf *iobuf);
 size_t iobref_size (struct iobref *iobref);
 void   iobuf_stats_dump (struct iobuf_pool *iobuf_pool);
 
-struct iobuf *
-iobuf_get2 (struct iobuf_pool *iobuf_pool, size_t page_size);
 #endif /* !_IOBUF_H_ */
diff --git a/libglusterfs/src/latency.c b/libglusterfs/src/latency.c
index b22f72950..dfce235c0 100644
--- a/libglusterfs/src/latency.c
+++ b/libglusterfs/src/latency.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -26,87 +35,87 @@ gf_set_fop_from_fn_pointer (call_frame_t *frame, struct xlator_fops *fops, void
 {
         glusterfs_fop_t fop = -1;
 
-        if (fops->stat == *(fop_stat_t *)&fn)
+        if (fops->stat == fn)
                 fop = GF_FOP_STAT;
-        else if (fops->readlink == *(fop_readlink_t *)&fn)
+        else if (fops->readlink == fn)
                 fop = GF_FOP_READLINK;
-        else if (fops->mknod == *(fop_mknod_t *)&fn)
+        else if (fops->mknod == fn)
                 fop = GF_FOP_MKNOD;
-        else if (fops->mkdir == *(fop_mkdir_t *)&fn)
+        else if (fops->mkdir == fn)
                 fop = GF_FOP_MKDIR;
-        else if (fops->unlink == *(fop_unlink_t *)&fn)
+        else if (fops->unlink == fn)
                 fop = GF_FOP_UNLINK;
-        else if (fops->rmdir == *(fop_rmdir_t *)&fn)
+        else if (fops->rmdir == fn)
                 fop = GF_FOP_RMDIR;
-        else if (fops->symlink == *(fop_symlink_t *)&fn)
+        else if (fops->symlink == fn)
                 fop = GF_FOP_SYMLINK;
-        else if (fops->rename == *(fop_rename_t *)&fn)
+        else if (fops->rename == fn)
                 fop = GF_FOP_RENAME;
-        else if (fops->link == *(fop_link_t *)&fn)
+        else if (fops->link == fn)
                 fop = GF_FOP_LINK;
-        else if (fops->truncate == *(fop_truncate_t *)&fn)
+        else if (fops->truncate == fn)
                 fop = GF_FOP_TRUNCATE;
-        else if (fops->open == *(fop_open_t *)&fn)
+        else if (fops->open == fn)
                 fop = GF_FOP_OPEN;
-        else if (fops->readv == *(fop_readv_t *)&fn)
+        else if (fops->readv == fn)
                 fop = GF_FOP_READ;
-        else if (fops->writev == *(fop_writev_t *)&fn)
+        else if (fops->writev == fn)
                 fop = GF_FOP_WRITE;
-        else if (fops->statfs == *(fop_statfs_t *)&fn)
+        else if (fops->statfs == fn)
                 fop = GF_FOP_STATFS;
-        else if (fops->flush == *(fop_flush_t *)&fn)
+        else if (fops->flush == fn)
                 fop = GF_FOP_FLUSH;
-        else if (fops->fsync == *(fop_fsync_t *)&fn)
+        else if (fops->fsync == fn)
                 fop = GF_FOP_FSYNC;
-        else if (fops->setxattr == *(fop_setxattr_t *)&fn)
+        else if (fops->setxattr == fn)
                 fop = GF_FOP_SETXATTR;
-        else if (fops->getxattr == *(fop_getxattr_t *)&fn)
+        else if (fops->getxattr == fn)
                 fop = GF_FOP_GETXATTR;
-        else if (fops->removexattr == *(fop_removexattr_t *)&fn)
+        else if (fops->removexattr == fn)
                 fop = GF_FOP_REMOVEXATTR;
-        else if (fops->opendir == *(fop_opendir_t *)&fn)
+        else if (fops->opendir == fn)
                 fop = GF_FOP_OPENDIR;
-        else if (fops->fsyncdir == *(fop_fsyncdir_t *)&fn)
+        else if (fops->fsyncdir == fn)
                 fop = GF_FOP_FSYNCDIR;
-        else if (fops->access == *(fop_access_t *)&fn)
+        else if (fops->access == fn)
                 fop = GF_FOP_ACCESS;
-        else if (fops->create == *(fop_create_t *)&fn)
+        else if (fops->create == fn)
                 fop = GF_FOP_CREATE;
-        else if (fops->ftruncate == *(fop_ftruncate_t *)&fn)
+        else if (fops->ftruncate == fn)
                 fop = GF_FOP_FTRUNCATE;
-        else if (fops->fstat == *(fop_fstat_t *)&fn)
+        else if (fops->fstat == fn)
                 fop = GF_FOP_FSTAT;
-        else if (fops->lk == *(fop_lk_t *)&fn)
+        else if (fops->lk == fn)
                 fop = GF_FOP_LK;
-        else if (fops->lookup == *(fop_lookup_t *)&fn)
+        else if (fops->lookup == fn)
                 fop = GF_FOP_LOOKUP;
-        else if (fops->readdir == *(fop_readdir_t *)&fn)
+        else if (fops->readdir == fn)
                 fop = GF_FOP_READDIR;
-        else if (fops->inodelk == *(fop_inodelk_t *)&fn)
+        else if (fops->inodelk == fn)
                 fop = GF_FOP_INODELK;
-        else if (fops->finodelk == *(fop_finodelk_t *)&fn)
+        else if (fops->finodelk == fn)
                 fop = GF_FOP_FINODELK;
-        else if (fops->entrylk == *(fop_entrylk_t *)&fn)
+        else if (fops->entrylk == fn)
                 fop = GF_FOP_ENTRYLK;
-        else if (fops->fentrylk == *(fop_fentrylk_t *)&fn)
+        else if (fops->fentrylk == fn)
                 fop = GF_FOP_FENTRYLK;
-        else if (fops->xattrop == *(fop_xattrop_t *)&fn)
+        else if (fops->xattrop == fn)
                 fop = GF_FOP_XATTROP;
-        else if (fops->fxattrop == *(fop_fxattrop_t *)&fn)
+        else if (fops->fxattrop == fn)
                 fop = GF_FOP_FXATTROP;
-        else if (fops->fgetxattr == *(fop_fgetxattr_t *)&fn)
+        else if (fops->fgetxattr == fn)
                 fop = GF_FOP_FGETXATTR;
-        else if (fops->fsetxattr == *(fop_fsetxattr_t *)&fn)
+        else if (fops->fsetxattr == fn)
                 fop = GF_FOP_FSETXATTR;
-        else if (fops->rchecksum == *(fop_rchecksum_t *)&fn)
+        else if (fops->rchecksum == fn)
                 fop = GF_FOP_RCHECKSUM;
-        else if (fops->setattr == *(fop_setattr_t *)&fn)
+        else if (fops->setattr == fn)
                 fop = GF_FOP_SETATTR;
-        else if (fops->fsetattr == *(fop_fsetattr_t *)&fn)
+        else if (fops->fsetattr == fn)
                 fop = GF_FOP_FSETATTR;
-        else if (fops->readdirp == *(fop_readdirp_t *)&fn)
+        else if (fops->readdirp == fn)
                 fop = GF_FOP_READDIRP;
-        else if (fops->getspec == *(fop_getspec_t *)&fn)
+        else if (fops->getspec == fn)
                 fop = GF_FOP_GETSPEC;
         else
                 fop = -1;
@@ -136,22 +145,6 @@ gf_update_latency (call_frame_t *frame)
         lat->mean = lat->mean + (elapsed - lat->mean) / lat->count;
 }
 
-void
-gf_latency_begin (call_frame_t *frame, void *fn)
-{
-        gf_set_fop_from_fn_pointer (frame, frame->this->fops, fn);
-
-        gettimeofday (&frame->begin, NULL);
-}
-
-
-void
-gf_latency_end (call_frame_t *frame)
-{
-        gettimeofday (&frame->end, NULL);
-
-        gf_update_latency (frame);
-}
 
 void
 gf_proc_dump_latency_info (xlator_t *xl)
@@ -164,22 +157,23 @@ gf_proc_dump_latency_info (xlator_t *xl)
         gf_proc_dump_add_section (key_prefix);
 
         for (i = 0; i < GF_FOP_MAXVALUE; i++) {
-                gf_proc_dump_build_key (key, key_prefix,
-                                        (char *)gf_fop_list[i]);
+                gf_proc_dump_build_key (key, key_prefix, gf_fop_list[i]);
 
                 gf_proc_dump_write (key, "%.03f,%"PRId64",%.03f",
                                     xl->latencies[i].mean,
                                     xl->latencies[i].count,
                                     xl->latencies[i].total);
         }
-
-        memset (xl->latencies, 0, sizeof (xl->latencies));
 }
 
 
 void
-gf_latency_toggle (int signum, glusterfs_ctx_t *ctx)
+gf_latency_toggle (int signum)
 {
+        glusterfs_ctx_t *ctx = NULL;
+
+        ctx = glusterfs_ctx_get ();
+
         if (ctx) {
                 ctx->measure_latency = !ctx->measure_latency;
                 gf_log ("[core]", GF_LOG_INFO,
diff --git a/libglusterfs/src/latency.h b/libglusterfs/src/latency.h
index 81acbf484..70499d4ba 100644
--- a/libglusterfs/src/latency.h
+++ b/libglusterfs/src/latency.h
@@ -1,17 +1,25 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __LATENCY_H__
 #define __LATENCY_H__
 
-#include "glusterfs.h"
 
 typedef struct fop_latency {
         uint64_t min;           /* min time for the call (microseconds) */
@@ -23,6 +31,6 @@ typedef struct fop_latency {
 } fop_latency_t;
 
 void
-gf_latency_toggle (int signum, glusterfs_ctx_t *ctx);
+gf_latency_toggle (int signum);
 
 #endif /* __LATENCY_H__ */
diff --git a/libglusterfs/src/list.h b/libglusterfs/src/list.h
index 7f3712b51..db4e1ab30 100644
--- a/libglusterfs/src/list.h
+++ b/libglusterfs/src/list.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _LLIST_H
@@ -175,16 +184,4 @@ list_append_init (struct list_head *list, struct list_head *head)
 	     &pos->member != (head); 					\
 	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
-#define list_for_each_entry_reverse(pos, head, member)                  \
-	for (pos = list_entry((head)->prev, typeof(*pos), member);      \
-	     &pos->member != (head);                                    \
-	     pos = list_entry(pos->member.prev, typeof(*pos), member))
-
-
-#define list_for_each_entry_safe_reverse(pos, n, head, member)          \
-	for (pos = list_entry((head)->prev, typeof(*pos), member),      \
-	        n = list_entry(pos->member.prev, typeof(*pos), member); \
-	     &pos->member != (head);                                    \
-	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
-
 #endif /* _LLIST_H */
diff --git a/libglusterfs/src/lkowner.h b/libglusterfs/src/lkowner.h
deleted file mode 100644
index 969d13e50..000000000
--- a/libglusterfs/src/lkowner.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _LK_OWNER_H
-#define _LK_OWNER_H
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#define GF_MAX_LOCK_OWNER_LEN 1024 /* 1kB as per NLM */
-
-/* 16strings-16strings-... */
-#define GF_LKOWNER_BUF_SIZE  ((GF_MAX_LOCK_OWNER_LEN * 2) +     \
-                              (GF_MAX_LOCK_OWNER_LEN / 8))
-
-typedef struct gf_lkowner_ {
-        int  len;
-        char data[GF_MAX_LOCK_OWNER_LEN];
-} gf_lkowner_t;
-
-
-/* LKOWNER to string functions */
-static inline void
-lkowner_unparse (gf_lkowner_t *lkowner, char *buf, int buf_len)
-{
-        int i = 0;
-        int j = 0;
-
-        for (i = 0; i < lkowner->len; i++) {
-                if (i && !(i % 8)) {
-                        buf[j] = '-';
-                        j++;
-                }
-                sprintf (&buf[j], "%02hhx", lkowner->data[i]);
-                j += 2;
-                if (j == buf_len)
-                        break;
-        }
-        if (j < buf_len)
-                buf[j] = '\0';
-}
-
-static inline void
-set_lk_owner_from_ptr (gf_lkowner_t *lkowner, void *data)
-{
-        int i = 0;
-        int j = 0;
-
-        lkowner->len = sizeof (unsigned long);
-        for (i = 0, j = 0; i < lkowner->len; i++, j += 8) {
-                lkowner->data[i] =  (char)((((unsigned long)data) >> j) & 0xff);
-        }
-}
-
-static inline void
-set_lk_owner_from_uint64 (gf_lkowner_t *lkowner, uint64_t data)
-{
-        int i = 0;
-        int j = 0;
-
-        lkowner->len = 8;
-        for (i = 0, j = 0; i < lkowner->len; i++, j += 8) {
-                lkowner->data[i] =  (char)((data >> j) & 0xff);
-        }
-}
-
-/* Return true if the locks have the same owner */
-static inline int
-is_same_lkowner (gf_lkowner_t *l1, gf_lkowner_t *l2)
-{
-        return ((l1->len == l2->len) && !memcmp(l1->data, l2->data, l1->len));
-}
-
-#endif /* _LK_OWNER_H */
diff --git a/libglusterfs/src/locking.h b/libglusterfs/src/locking.h
index 79c6992af..44ea12eee 100644
--- a/libglusterfs/src/locking.h
+++ b/libglusterfs/src/locking.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _LOCKING_H
diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c
index 5deb90cda..2c24b182d 100644
--- a/libglusterfs/src/logging.c
+++ b/libglusterfs/src/logging.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -22,22 +31,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef GF_USE_SYSLOG
-#include <libintl.h>
-#include <syslog.h>
-#include <sys/stat.h>
-#include "gf-error-codes.h"
-
-#define GF_JSON_MSG_LENGTH      8192
-#define GF_SYSLOG_CEE_FORMAT    \
-        "@cee: {\"msg\": \"%s\", \"gf_code\": \"%u\", \"gf_message\": \"%s\"}"
-#define GF_LOG_CONTROL_FILE     "/etc/glusterfs/logger.conf"
-#endif /* GF_USE_SYSLOG */
-
 #include "xlator.h"
 #include "logging.h"
 #include "defaults.h"
-#include "glusterfs.h"
 
 #ifdef GF_LINUX_HOST_OS
 #include <syslog.h>
@@ -47,44 +43,49 @@
 #include <execinfo.h>
 #endif
 
-/* Ideally this should get moved to logging.h */
-struct _msg_queue {
-        struct list_head msgs;
-};
 
-struct _log_msg {
-        const char *msg;
-        struct list_head queue;
-};
+static pthread_mutex_t  logfile_mutex;
+static char            *filename = NULL;
+static uint8_t          logrotate = 0;
+static FILE            *logfile = NULL;
+static gf_loglevel_t    loglevel = GF_LOG_INFO;
+static int              gf_log_syslog = 1;
+
+char                    gf_log_xl_log_set;
+gf_loglevel_t           gf_log_loglevel; /* extern'd */
+FILE                   *gf_log_logfile;
+
+static char            *cmd_log_filename = NULL;
+static FILE            *cmdlogfile = NULL;
 
 void
 gf_log_logrotate (int signum)
 {
-        THIS->ctx->log.logrotate = 1;
+        logrotate = 1;
 }
 
 void
 gf_log_enable_syslog (void)
 {
-        THIS->ctx->log.gf_log_syslog = 1;
+        gf_log_syslog = 1;
 }
 
 void
 gf_log_disable_syslog (void)
 {
-        THIS->ctx->log.gf_log_syslog = 0;
+        gf_log_syslog = 0;
 }
 
 gf_loglevel_t
 gf_log_get_loglevel (void)
 {
-        return THIS->ctx->log.loglevel;
+        return loglevel;
 }
 
 void
 gf_log_set_loglevel (gf_loglevel_t level)
 {
-        THIS->ctx->log.loglevel = level;
+        gf_log_loglevel = loglevel = level;
 }
 
 
@@ -103,312 +104,86 @@ gf_log_set_xl_loglevel (void *this, gf_loglevel_t level)
         xlator_t *xl = this;
         if (!xl)
                 return;
-        xl->ctx->log.gf_log_xl_log_set = 1;
+        gf_log_xl_log_set = 1;
         xl->loglevel = level;
 }
 
 void
 gf_log_fini (void)
 {
-        pthread_mutex_destroy (&THIS->ctx->log.logfile_mutex);
-}
-
-
-#ifdef GF_USE_SYSLOG
-/**
- * gf_get_error_message -function to get error message for given error code
- * @error_code: error code defined by log book
- *
- * @return: success: string
- *          failure: NULL
- */
-const char *
-gf_get_error_message (int error_code) {
-        return _gf_get_message (error_code);
-}
-
-
-/**
- * gf_openlog -function to open syslog specific to gluster based on
- *             existence of file /etc/glusterfs/logger.conf
- * @ident:    optional identification string similar to openlog()
- * @option:   optional value to option to openlog().  Passing -1 uses
- *            'LOG_PID | LOG_NDELAY' as default
- * @facility: optional facility code similar to openlog().  Passing -1
- *            uses LOG_DAEMON as default
- *
- * @return: void
- */
-void
-gf_openlog (const char *ident, int option, int facility)
-{
-        int _option = option;
-        int _facility = facility;
-
-        if (-1 == _option) {
-                _option = LOG_PID | LOG_NDELAY;
-        }
-        if (-1 == _facility) {
-                _facility = LOG_LOCAL1;
-        }
-
-        setlocale(LC_ALL, "");
-        bindtextdomain("gluster", "/usr/share/locale");
-        textdomain("gluster");
-
-        openlog(ident, _option, _facility);
-}
-
-
-/**
- * _json_escape -function to convert string to json encoded string
- * @str: input string
- * @buf: buffer to store encoded string
- * @len: length of @buf
- *
- * @return: success: last unprocessed character position by pointer in @str
- *          failure: NULL
- *
- * Internal function. Heavily inspired by _ul_str_escape() function in
- * libumberlog
- *
- * Sample output:
- * [1] str = "devel error"
- *     buf = "devel error"
- * [2] str = "devel	error"
- *     buf = "devel\terror"
- * [3] str = "I/O error on "/tmp/foo" file"
- *     buf = "I/O error on \"/tmp/foo\" file"
- * [4] str = "I/O erroron /tmp/bar file"
- *     buf = "I/O error\u001bon /tmp/bar file"
- *
- */
-char *
-_json_escape(const char *str, char *buf, size_t len)
-{
-        static const unsigned char json_exceptions[UCHAR_MAX + 1] =
-                {
-                        [0x01] = 1, [0x02] = 1, [0x03] = 1, [0x04] = 1,
-                        [0x05] = 1, [0x06] = 1, [0x07] = 1, [0x08] = 1,
-                        [0x09] = 1, [0x0a] = 1, [0x0b] = 1, [0x0c] = 1,
-                        [0x0d] = 1, [0x0e] = 1, [0x0f] = 1, [0x10] = 1,
-                        [0x11] = 1, [0x12] = 1, [0x13] = 1, [0x14] = 1,
-                        [0x15] = 1, [0x16] = 1, [0x17] = 1, [0x18] = 1,
-                        [0x19] = 1, [0x1a] = 1, [0x1b] = 1, [0x1c] = 1,
-                        [0x1d] = 1, [0x1e] = 1, [0x1f] = 1,
-                        ['\\'] = 1, ['"'] = 1
-                };
-        static const char  json_hex_chars[16] = "0123456789abcdef";
-        unsigned char     *p = NULL;
-        size_t             pos = 0;
-
-        if (!str || !buf || len <= 0) {
-                return NULL;
-        }
-
-        for (p = (unsigned char *)str;
-             *p && (pos + 1) < len;
-             p++)
-        {
-                if (json_exceptions[*p] == 0) {
-                        buf[pos++] = *p;
-                        continue;
-                }
-
-                if ((pos + 2) >= len) {
-                        break;
-                }
-
-                switch (*p)
-                {
-                case '\b':
-                        buf[pos++] = '\\';
-                        buf[pos++] = 'b';
-                        break;
-                case '\n':
-                        buf[pos++] = '\\';
-                        buf[pos++] = 'n';
-                        break;
-                case '\r':
-                        buf[pos++] = '\\';
-                        buf[pos++] = 'r';
-                        break;
-                case '\t':
-                        buf[pos++] = '\\';
-                        buf[pos++] = 't';
-                        break;
-                case '\\':
-                        buf[pos++] = '\\';
-                        buf[pos++] = '\\';
-                        break;
-                case '"':
-                        buf[pos++] = '\\';
-                        buf[pos++] = '"';
-                        break;
-                default:
-                        if ((pos + 6) >= len) {
-                                buf[pos] = '\0';
-                                return (char *)p;
-                        }
-                        buf[pos++] = '\\';
-                        buf[pos++] = 'u';
-                        buf[pos++] = '0';
-                        buf[pos++] = '0';
-                        buf[pos++] = json_hex_chars[(*p) >> 4];
-                        buf[pos++] = json_hex_chars[(*p) & 0xf];
-                        break;
-                }
-        }
-
-        buf[pos] = '\0';
-        return (char *)p;
+        pthread_mutex_destroy (&logfile_mutex);
 }
 
 
-/**
- * gf_syslog -function to submit message to syslog specific to gluster
- * @error_code:        error code defined by log book
- * @facility_priority: facility_priority of syslog()
- * @format:            optional format string to syslog()
- *
- * @return: void
- */
-void
-gf_syslog (int error_code, int facility_priority, char *format, ...)
-{
-        char       *msg = NULL;
-        char        json_msg[GF_JSON_MSG_LENGTH];
-        GF_UNUSED char       *p = NULL;
-        const char *error_message = NULL;
-        char        json_error_message[GF_JSON_MSG_LENGTH];
-        va_list     ap;
-
-        error_message = gf_get_error_message (error_code);
-
-        va_start (ap, format);
-        if (format) {
-                vasprintf (&msg, format, ap);
-                p = _json_escape (msg, json_msg, GF_JSON_MSG_LENGTH);
-                if (error_message) {
-                        p = _json_escape (error_message, json_error_message,
-                                          GF_JSON_MSG_LENGTH);
-                        syslog (facility_priority, GF_SYSLOG_CEE_FORMAT,
-                                json_msg, error_code, json_error_message);
-                } else {
-                        /* ignore the error code because no error message for it
-                           and use normal syslog */
-                        syslog (facility_priority, "%s", msg);
-                }
-                free (msg);
-        } else {
-                if (error_message) {
-                        /* no user message: treat error_message as msg */
-                        syslog (facility_priority, GF_SYSLOG_CEE_FORMAT,
-                                json_error_message, error_code,
-                                json_error_message);
-                } else {
-                        /* cannot produce log as neither error_message nor
-                           msg available */
-                }
-        }
-        va_end (ap);
-}
-#endif /* GF_USE_SYSLOG */
-
 void
-gf_log_globals_init (void *data)
+gf_log_globals_init (void)
 {
-        glusterfs_ctx_t *ctx = data;
-
-        pthread_mutex_init (&ctx->log.logfile_mutex, NULL);
+        pthread_mutex_init (&logfile_mutex, NULL);
 
-        ctx->log.loglevel         = GF_LOG_INFO;
-        ctx->log.gf_log_syslog    = 1;
-        ctx->log.sys_log_level    = GF_LOG_CRITICAL;
-
-#ifndef GF_USE_SYSLOG
 #ifdef GF_LINUX_HOST_OS
         /* For the 'syslog' output. one can grep 'GlusterFS' in syslog
            for serious logs */
         openlog ("GlusterFS", LOG_PID, LOG_DAEMON);
 #endif
-#endif
 }
 
 int
-gf_log_init (void *data, const char *file, const char *ident)
+gf_log_init (const char *file)
 {
-        glusterfs_ctx_t *ctx = NULL;
-        int     fd = -1;
-
-        ctx = data;
-
-#if defined(GF_USE_SYSLOG)
-        {
-                /* use default ident and option */
-                /* TODO: make FACILITY configurable than LOG_DAEMON */
-                struct stat buf;
-
-                if (stat (GF_LOG_CONTROL_FILE, &buf) == 0) {
-                        /* use syslog logging */
-                        ctx->log.log_control_file_found = 1;
-                        if (ident) {
-                                /* we need to keep this value as */
-                                /* syslog uses it on every logging */
-                                ctx->log.ident = gf_strdup (ident);
-                                gf_openlog (ctx->log.ident, -1, LOG_DAEMON);
-                        } else {
-                                gf_openlog (NULL, -1, LOG_DAEMON);
-                        }
-                } else {
-                        /* use old style logging */
-                        ctx->log.log_control_file_found = 0;
-                }
-        }
-#endif
-
         if (!file){
                 fprintf (stderr, "ERROR: no filename specified\n");
                 return -1;
         }
 
-        if (strcmp (file, "-") == 0) {
-                ctx->log.gf_log_logfile = stderr;
-                ctx->log.logfile = stderr;
-                return 0;
-        }
-
-        ctx->log.filename = gf_strdup (file);
-        if (!ctx->log.filename) {
+        filename = gf_strdup (file);
+        if (!filename) {
                 fprintf (stderr, "ERROR: updating log-filename failed: %s\n",
                          strerror (errno));
                 return -1;
         }
 
-        fd = open (file, O_CREAT | O_RDONLY, S_IRUSR | S_IWUSR);
-        if (fd < 0) {
-                fprintf (stderr, "ERROR: failed to create logfile \"%s\" (%s)\n",
-                         file, strerror (errno));
-                return -1;
-        }
-        close (fd);
-
-        ctx->log.logfile = fopen (file, "a");
-        if (!ctx->log.logfile){
+        logfile = fopen (file, "a");
+        if (!logfile){
                 fprintf (stderr, "ERROR: failed to open logfile \"%s\" (%s)\n",
                          file, strerror (errno));
                 return -1;
         }
 
-        ctx->log.gf_log_logfile = ctx->log.logfile;
+        gf_log_logfile = logfile;
 
         return 0;
 }
 
+
+
+struct _msg_queue {
+        struct list_head msgs;
+};
+
+struct _log_msg {
+        const char *msg;
+        struct list_head queue;
+};
+
+
+void
+gf_log_lock (void)
+{
+        pthread_mutex_lock (&logfile_mutex);
+}
+
+
 void
-set_sys_log_level (gf_loglevel_t level)
+gf_log_unlock (void)
 {
-        THIS->ctx->log.sys_log_level = level;
+        pthread_mutex_unlock (&logfile_mutex);
+}
+
+
+void
+gf_log_cleanup (void)
+{
+        pthread_mutex_destroy (&logfile_mutex);
 }
 
 int
@@ -417,22 +192,22 @@ _gf_log_nomem (const char *domain, const char *file,
                size_t size)
 {
         const char     *basename        = NULL;
+        struct tm      *tm              = NULL;
         xlator_t       *this            = NULL;
         struct timeval  tv              = {0,};
         int             ret             = 0;
-        char            msg[8092]       = {0,};
-        char            timestr[256]    = {0,};
-        char            callstr[4096]   = {0,};
-        glusterfs_ctx_t *ctx = NULL;
+        gf_loglevel_t   xlator_loglevel = 0;
+        char            msg[8092];
+        char            timestr[256];
+        char            callstr[4096];
 
         this = THIS;
-        ctx = this->ctx;
 
-        if (ctx->log.gf_log_xl_log_set) {
-                if (this->loglevel && (level > this->loglevel))
-                        goto out;
-        }
-        if (level > ctx->log.loglevel)
+        xlator_loglevel = this->loglevel;
+        if (xlator_loglevel == 0)
+                xlator_loglevel = loglevel;
+
+        if (level > xlator_loglevel)
                 goto out;
 
         static char *level_strings[] = {"",  /* NONE */
@@ -454,12 +229,6 @@ _gf_log_nomem (const char *domain, const char *file,
                 return -1;
         }
 
-        basename = strrchr (file, '/');
-        if (basename)
-                basename++;
-        else
-                basename = file;
-
 #if HAVE_BACKTRACE
         /* Print 'calling function' */
         do {
@@ -486,45 +255,36 @@ _gf_log_nomem (const char *domain, const char *file,
         } while (0);
 #endif /* HAVE_BACKTRACE */
 
-#if defined(GF_USE_SYSLOG)
-        if (ctx->log.log_control_file_found)
-        {
-                int priority;
-                /* treat GF_LOG_TRACE and GF_LOG_NONE as LOG_DEBUG and
-                   other level as is */
-                if (GF_LOG_TRACE == level || GF_LOG_NONE == level) {
-                        priority = LOG_DEBUG;
-                } else {
-                        priority = level - 1;
-                }
-                gf_syslog (GF_ERR_DEV, priority,
-                           "[%s:%d:%s] %s %s: no memory "
-                           "available for size (%"GF_PRI_SIZET")",
-                           basename, line, function, callstr, domain,
-                           size);
-                goto out;
-        }
-#endif /* GF_USE_SYSLOG */
         ret = gettimeofday (&tv, NULL);
         if (-1 == ret)
                 goto out;
-        gf_time_fmt (timestr, sizeof timestr, tv.tv_sec, gf_timefmt_FT);
-        snprintf (timestr + strlen (timestr), sizeof timestr - strlen (timestr),
-                  ".%"GF_PRI_SUSECONDS, tv.tv_usec);
 
-        ret = sprintf (msg, "[%s] %s [%s:%d:%s] %s %s: no memory "
-                       "available for size (%"GF_PRI_SIZET")",
-                       timestr, level_strings[level],
-                       basename, line, function, callstr,
-                       domain, size);
-        if (-1 == ret) {
-                goto out;
-        }
+        tm    = localtime (&tv.tv_sec);
 
-        pthread_mutex_lock (&ctx->log.logfile_mutex);
+        pthread_mutex_lock (&logfile_mutex);
         {
-                if (ctx->log.logfile) {
-                        fprintf (ctx->log.logfile, "%s\n", msg);
+                strftime (timestr, 256, "%Y-%m-%d %H:%M:%S", tm);
+                snprintf (timestr + strlen (timestr), 256 - strlen (timestr),
+                          ".%"GF_PRI_SUSECONDS, tv.tv_usec);
+
+                basename = strrchr (file, '/');
+                if (basename)
+                        basename++;
+                else
+                        basename = file;
+
+                ret = sprintf (msg, "[%s] %s [%s:%d:%s] %s %s: no memory "
+                               "available for size (%"GF_PRI_SIZET")",
+                               timestr, level_strings[level],
+                               basename, line, function, callstr,
+                               domain, size);
+                if (-1 == ret) {
+                        goto unlock;
+                }
+
+                if (logfile) {
+                        fprintf (logfile, "%s\n", msg);
+                        fflush (logfile);
                 } else {
                         fprintf (stderr, "%s\n", msg);
                 }
@@ -532,13 +292,13 @@ _gf_log_nomem (const char *domain, const char *file,
 #ifdef GF_LINUX_HOST_OS
                 /* We want only serious log in 'syslog', not our debug
                    and trace logs */
-                if (ctx->log.gf_log_syslog && level &&
-                    (level <= ctx->log.sys_log_level))
+                if (gf_log_syslog && level && (level <= GF_LOG_ERROR))
                         syslog ((level-1), "%s\n", msg);
 #endif
         }
 
-        pthread_mutex_unlock (&ctx->log.logfile_mutex);
+unlock:
+        pthread_mutex_unlock (&logfile_mutex);
 out:
         return ret;
  }
@@ -548,6 +308,7 @@ _gf_log_callingfn (const char *domain, const char *file, const char *function,
                    int line, gf_loglevel_t level, const char *fmt, ...)
 {
         const char     *basename        = NULL;
+        struct tm      *tm              = NULL;
         xlator_t       *this            = NULL;
         char           *str1            = NULL;
         char           *str2            = NULL;
@@ -557,17 +318,16 @@ _gf_log_callingfn (const char *domain, const char *file, const char *function,
         struct timeval  tv              = {0,};
         size_t          len             = 0;
         int             ret             = 0;
+        gf_loglevel_t   xlator_loglevel = 0;
         va_list         ap;
-        glusterfs_ctx_t *ctx = NULL;
 
         this = THIS;
-        ctx = this->ctx;
 
-        if (ctx->log.gf_log_xl_log_set) {
-                if (this->loglevel && (level > this->loglevel))
-                        goto out;
-        }
-        if (level > ctx->log.loglevel)
+        xlator_loglevel = this->loglevel;
+        if (xlator_loglevel == 0)
+                xlator_loglevel = loglevel;
+
+        if (level > xlator_loglevel)
                 goto out;
 
         static char *level_strings[] = {"",  /* NONE */
@@ -589,12 +349,6 @@ _gf_log_callingfn (const char *domain, const char *file, const char *function,
                 return -1;
         }
 
-        basename = strrchr (file, '/');
-        if (basename)
-                basename++;
-        else
-                basename = file;
-
 #if HAVE_BACKTRACE
         /* Print 'calling function' */
         do {
@@ -621,65 +375,50 @@ _gf_log_callingfn (const char *domain, const char *file, const char *function,
         } while (0);
 #endif /* HAVE_BACKTRACE */
 
-#if defined(GF_USE_SYSLOG)
-        if (ctx->log.log_control_file_found)
-        {
-                int priority;
-                /* treat GF_LOG_TRACE and GF_LOG_NONE as LOG_DEBUG and
-                   other level as is */
-                if (GF_LOG_TRACE == level || GF_LOG_NONE == level) {
-                        priority = LOG_DEBUG;
-                } else {
-                        priority = level - 1;
-                }
-
-                va_start (ap, fmt);
-                vasprintf (&str2, fmt, ap);
-                va_end (ap);
-
-                gf_syslog (GF_ERR_DEV, priority,
-                           "[%s:%d:%s] %s %d-%s: %s",
-                           basename, line, function,
-                           callstr,
-                           ((this->graph) ? this->graph->id:0), domain,
-                           str2);
-
-                goto out;
-        }
-#endif /* GF_USE_SYSLOG */
         ret = gettimeofday (&tv, NULL);
         if (-1 == ret)
                 goto out;
-        va_start (ap, fmt);
-        gf_time_fmt (timestr, sizeof timestr, tv.tv_sec, gf_timefmt_FT);
-        snprintf (timestr + strlen (timestr), sizeof timestr - strlen (timestr),
-                  ".%"GF_PRI_SUSECONDS, tv.tv_usec);
 
-        ret = gf_asprintf (&str1, "[%s] %s [%s:%d:%s] %s %d-%s: ",
-                           timestr, level_strings[level],
-                           basename, line, function, callstr,
-                           ((this->graph) ? this->graph->id:0), domain);
-        if (-1 == ret) {
-                goto out;
-        }
+        tm    = localtime (&tv.tv_sec);
 
-        ret = vasprintf (&str2, fmt, ap);
-        if (-1 == ret) {
-                goto out;
-        }
+        pthread_mutex_lock (&logfile_mutex);
+        {
+                va_start (ap, fmt);
 
-        va_end (ap);
+                strftime (timestr, 256, "%Y-%m-%d %H:%M:%S", tm);
+                snprintf (timestr + strlen (timestr), 256 - strlen (timestr),
+                          ".%"GF_PRI_SUSECONDS, tv.tv_usec);
+
+                basename = strrchr (file, '/');
+                if (basename)
+                        basename++;
+                else
+                        basename = file;
+
+                ret = gf_asprintf (&str1, "[%s] %s [%s:%d:%s] %s %d-%s: ",
+                                   timestr, level_strings[level],
+                                   basename, line, function, callstr,
+                                   ((this->graph) ? this->graph->id:0), domain);
+                if (-1 == ret) {
+                        goto unlock;
+                }
 
-        len = strlen (str1);
-        msg = GF_MALLOC (len + strlen (str2) + 1, gf_common_mt_char);
+                ret = vasprintf (&str2, fmt, ap);
+                if (-1 == ret) {
+                        goto unlock;
+                }
 
-        strcpy (msg, str1);
-        strcpy (msg + len, str2);
+                va_end (ap);
 
-        pthread_mutex_lock (&ctx->log.logfile_mutex);
-        {
-                if (ctx->log.logfile) {
-                        fprintf (ctx->log.logfile, "%s\n", msg);
+                len = strlen (str1);
+                msg = GF_MALLOC (len + strlen (str2) + 1, gf_common_mt_char);
+
+                strcpy (msg, str1);
+                strcpy (msg + len, str2);
+
+                if (logfile) {
+                        fprintf (logfile, "%s\n", msg);
+                        fflush (logfile);
                 } else {
                         fprintf (stderr, "%s\n", msg);
                 }
@@ -687,21 +426,25 @@ _gf_log_callingfn (const char *domain, const char *file, const char *function,
 #ifdef GF_LINUX_HOST_OS
                 /* We want only serious log in 'syslog', not our debug
                    and trace logs */
-                if (ctx->log.gf_log_syslog && level &&
-                    (level <= ctx->log.sys_log_level))
+                if (gf_log_syslog && level && (level <= GF_LOG_CRITICAL))
                         syslog ((level-1), "%s\n", msg);
 #endif
         }
 
-        pthread_mutex_unlock (&ctx->log.logfile_mutex);
+unlock:
+        pthread_mutex_unlock (&logfile_mutex);
 
-out:
-        GF_FREE (msg);
+        if (msg) {
+                GF_FREE (msg);
+        }
 
-        GF_FREE (str1);
+        if (str1)
+                GF_FREE (str1);
 
-        FREE (str2);
+        if (str2)
+                FREE (str2);
 
+out:
         return ret;
 }
 
@@ -709,28 +452,28 @@ int
 _gf_log (const char *domain, const char *file, const char *function, int line,
          gf_loglevel_t level, const char *fmt, ...)
 {
-        const char    *basename = NULL;
-        FILE          *new_logfile = NULL;
-        va_list        ap;
-        char           timestr[256] = {0,};
+        const char  *basename = NULL;
+        FILE        *new_logfile = NULL;
+        va_list      ap;
+        struct tm   *tm = NULL;
+        char         timestr[256];
         struct timeval tv = {0,};
-        char          *str1 = NULL;
-        char          *str2 = NULL;
-        char          *msg  = NULL;
-        size_t         len  = 0;
-        int            ret  = 0;
-        int            fd   = -1;
-        xlator_t      *this = NULL;
-        glusterfs_ctx_t *ctx = NULL;
+
+        char        *str1 = NULL;
+        char        *str2 = NULL;
+        char        *msg  = NULL;
+        size_t       len  = 0;
+        int          ret  = 0;
+        xlator_t    *this = NULL;
+        gf_loglevel_t xlator_loglevel = 0;
 
         this = THIS;
-        ctx = this->ctx;
 
-        if (ctx->log.gf_log_xl_log_set) {
-                if (this->loglevel && (level > this->loglevel))
-                        goto out;
-        }
-        if (level > ctx->log.loglevel)
+        xlator_loglevel = this->loglevel;
+        if (xlator_loglevel == 0)
+                xlator_loglevel = loglevel;
+
+        if (level > xlator_loglevel)
                 goto out;
 
         static char *level_strings[] = {"",  /* NONE */
@@ -752,221 +495,120 @@ _gf_log (const char *domain, const char *file, const char *function, int line,
                 return -1;
         }
 
-        basename = strrchr (file, '/');
-        if (basename)
-                basename++;
-        else
-                basename = file;
 
-#if defined(GF_USE_SYSLOG)
-        if (ctx->log.log_control_file_found)
-        {
-                int priority;
-                /* treat GF_LOG_TRACE and GF_LOG_NONE as LOG_DEBUG and
-                   other level as is */
-                if (GF_LOG_TRACE == level || GF_LOG_NONE == level) {
-                        priority = LOG_DEBUG;
-                } else {
-                        priority = level - 1;
-                }
+        if (logrotate) {
+                logrotate = 0;
 
-                va_start (ap, fmt);
-                vasprintf (&str2, fmt, ap);
-                va_end (ap);
-
-                gf_syslog (GF_ERR_DEV, priority,
-                           "[%s:%d:%s] %d-%s: %s",
-                           basename, line, function,
-                           ((this->graph) ? this->graph->id:0), domain, str2);
-                goto err;
-        }
-#endif /* GF_USE_SYSLOG */
-
-        if (ctx->log.logrotate) {
-                ctx->log.logrotate = 0;
-
-                fd = open (ctx->log.filename,
-                           O_CREAT | O_RDONLY, S_IRUSR | S_IWUSR);
-                if (fd < 0) {
-                        gf_log ("logrotate", GF_LOG_ERROR,
-                                "%s", strerror (errno));
-                        return -1;
-                }
-                close (fd);
-
-                new_logfile = fopen (ctx->log.filename, "a");
+                new_logfile = fopen (filename, "a");
                 if (!new_logfile) {
                         gf_log ("logrotate", GF_LOG_CRITICAL,
                                 "failed to open logfile %s (%s)",
-                                ctx->log.filename, strerror (errno));
+                                filename, strerror (errno));
                         goto log;
                 }
 
-                pthread_mutex_lock (&ctx->log.logfile_mutex);
-                {
-                        if (ctx->log.logfile)
-                                fclose (ctx->log.logfile);
-
-                        ctx->log.gf_log_logfile = ctx->log.logfile = new_logfile;
-                }
-                pthread_mutex_unlock (&ctx->log.logfile_mutex);
+                if (logfile)
+                        fclose (logfile);
 
+                gf_log_logfile = logfile = new_logfile;
         }
 
 log:
         ret = gettimeofday (&tv, NULL);
         if (-1 == ret)
                 goto out;
-        va_start (ap, fmt);
-        gf_time_fmt (timestr, sizeof timestr, tv.tv_sec, gf_timefmt_FT);
-        snprintf (timestr + strlen (timestr), sizeof timestr - strlen (timestr),
-                  ".%"GF_PRI_SUSECONDS, tv.tv_usec);
 
-        ret = gf_asprintf (&str1, "[%s] %s [%s:%d:%s] %d-%s: ",
-                           timestr, level_strings[level],
-                           basename, line, function,
-                           ((this->graph)?this->graph->id:0), domain);
-        if (-1 == ret) {
-                goto err;
-        }
+        tm    = localtime (&tv.tv_sec);
 
-        ret = vasprintf (&str2, fmt, ap);
-        if (-1 == ret) {
-                goto err;
-        }
+        pthread_mutex_lock (&logfile_mutex);
+        {
+                va_start (ap, fmt);
 
-        va_end (ap);
+                strftime (timestr, 256, "%Y-%m-%d %H:%M:%S", tm);
+                snprintf (timestr + strlen (timestr), 256 - strlen (timestr),
+                          ".%"GF_PRI_SUSECONDS, tv.tv_usec);
+
+                basename = strrchr (file, '/');
+                if (basename)
+                        basename++;
+                else
+                        basename = file;
+
+                ret = gf_asprintf (&str1, "[%s] %s [%s:%d:%s] %d-%s: ",
+                                   timestr, level_strings[level],
+                                   basename, line, function,
+                                   ((this->graph)?this->graph->id:0), domain);
+                if (-1 == ret) {
+                        goto unlock;
+                }
 
-        len = strlen (str1);
-        msg = GF_MALLOC (len + strlen (str2) + 1, gf_common_mt_char);
+                ret = vasprintf (&str2, fmt, ap);
+                if (-1 == ret) {
+                        goto unlock;
+                }
 
-        strcpy (msg, str1);
-        strcpy (msg + len, str2);
+                va_end (ap);
 
-        pthread_mutex_lock (&ctx->log.logfile_mutex);
-        {
+                len = strlen (str1);
+                msg = GF_MALLOC (len + strlen (str2) + 1, gf_common_mt_char);
+
+                strcpy (msg, str1);
+                strcpy (msg + len, str2);
 
-                if (ctx->log.logfile) {
-                        fprintf (ctx->log.logfile, "%s\n", msg);
-                        fflush (ctx->log.logfile);
+                if (logfile) {
+                        fprintf (logfile, "%s\n", msg);
+                        fflush (logfile);
                 } else {
                         fprintf (stderr, "%s\n", msg);
-                        fflush (stderr);
                 }
 
 #ifdef GF_LINUX_HOST_OS
                 /* We want only serious log in 'syslog', not our debug
                    and trace logs */
-                if (ctx->log.gf_log_syslog && level &&
-                    (level <= ctx->log.sys_log_level))
+                if (gf_log_syslog && level && (level <= GF_LOG_CRITICAL))
                         syslog ((level-1), "%s\n", msg);
 #endif
         }
 
-        pthread_mutex_unlock (&ctx->log.logfile_mutex);
-
-err:
-        GF_FREE (msg);
-
-        GF_FREE (str1);
-
-        FREE (str2);
-
-out:
-        return (0);
-}
-
-int
-_gf_log_eh (const char *function, const char *fmt, ...)
-{
-        int          ret   = -1;
-        va_list      ap;
-        char         *str1 = NULL;
-        char         *str2 = NULL;
-        char         *msg  = NULL;
-        xlator_t     *this = NULL;
-
-        this = THIS;
-
-        ret = gf_asprintf (&str1, "[%d] %s: ",
-                           ((this->graph)?this->graph->id:0),
-                           function);
-        if (-1 == ret) {
-                goto out;
-        }
-
-        va_start (ap, fmt);
+unlock:
+        pthread_mutex_unlock (&logfile_mutex);
 
-        ret = vasprintf (&str2, fmt, ap);
-        if (-1 == ret) {
-                goto out;
+        if (msg) {
+                GF_FREE (msg);
         }
 
-        va_end (ap);
-
-        msg = GF_MALLOC (strlen (str1) + strlen (str2) + 1, gf_common_mt_char);
-        if (!msg) {
-                ret = -1;
-                goto out;
-        }
+        if (str1)
+                GF_FREE (str1);
 
-        strcpy (msg, str1);
-        strcat (msg, str2);
-
-        ret = eh_save_history (this->history, msg);
-
-out:
-        GF_FREE (str1);
-
-        /* Use FREE instead of GF_FREE since str2 was allocated by vasprintf */
         if (str2)
                 FREE (str2);
 
-         return ret;
+out:
+        return (0);
 }
 
+
 int
 gf_cmd_log_init (const char *filename)
 {
-        int         fd   = -1;
-        xlator_t   *this = NULL;
-        glusterfs_ctx_t *ctx = NULL;
-
-        this = THIS;
-        ctx  = this->ctx;
-
         if (!filename){
-                gf_log (this->name, GF_LOG_CRITICAL, "gf_cmd_log_init: no "
+                gf_log ("glusterd", GF_LOG_CRITICAL, "gf_cmd_log_init: no "
                         "filename specified\n");
                 return -1;
         }
 
-        ctx->log.cmd_log_filename = gf_strdup (filename);
-        if (!ctx->log.cmd_log_filename) {
-                gf_log (this->name, GF_LOG_CRITICAL,
-                        "gf_cmd_log_init: strdup error\n");
-                return -1;
-        }
-        /* close and reopen cmdlogfile for log rotate*/
-        if (ctx->log.cmdlogfile) {
-                fclose (ctx->log.cmdlogfile);
-                ctx->log.cmdlogfile = NULL;
-        }
-
-        fd = open (ctx->log.cmd_log_filename,
-                   O_CREAT | O_RDONLY, S_IRUSR | S_IWUSR);
-        if (fd < 0) {
-                gf_log (this->name, GF_LOG_CRITICAL,
-                        "%s", strerror (errno));
+        cmd_log_filename = gf_strdup (filename);
+        if (!cmd_log_filename) {
+                gf_log ("glusterd", GF_LOG_CRITICAL, "gf_cmd_log_init: strdup"
+                        " error\n");
                 return -1;
         }
-        close (fd);
 
-        ctx->log.cmdlogfile = fopen (ctx->log.cmd_log_filename, "a");
-        if (!ctx->log.cmdlogfile){
-                gf_log (this->name, GF_LOG_CRITICAL,
+        cmdlogfile = fopen (cmd_log_filename, "a");
+        if (!cmdlogfile){
+                gf_log ("glusterd", GF_LOG_CRITICAL,
                         "gf_cmd_log_init: failed to open logfile \"%s\" "
-                        "(%s)\n", ctx->log.cmd_log_filename, strerror (errno));
+                        "(%s)\n", cmd_log_filename, strerror (errno));
                 return -1;
         }
         return 0;
@@ -975,18 +617,17 @@ gf_cmd_log_init (const char *filename)
 int
 gf_cmd_log (const char *domain, const char *fmt, ...)
 {
-        va_list        ap;
-        char           timestr[64];
+        va_list      ap;
+        struct tm   *tm = NULL;
+        char         timestr[256];
         struct timeval tv = {0,};
-        char          *str1 = NULL;
-        char          *str2 = NULL;
-        char          *msg  = NULL;
-        size_t         len  = 0;
-        int            ret  = 0;
-        glusterfs_ctx_t *ctx = NULL;
-
-        ctx = THIS->ctx;
-        if (!ctx->log.cmdlogfile)
+        char        *str1 = NULL;
+        char        *str2 = NULL;
+        char        *msg  = NULL;
+        size_t       len  = 0;
+        int          ret  = 0;
+
+        if (!cmdlogfile)
                 return -1;
 
 
@@ -999,8 +640,11 @@ gf_cmd_log (const char *domain, const char *fmt, ...)
         ret = gettimeofday (&tv, NULL);
         if (ret == -1)
                 goto out;
+
+        tm = localtime (&tv.tv_sec);
+
         va_start (ap, fmt);
-        gf_time_fmt (timestr, sizeof timestr, tv.tv_sec, gf_timefmt_FT);
+        strftime (timestr, 256, "%Y-%m-%d %H:%M:%S", tm);
         snprintf (timestr + strlen (timestr), 256 - strlen (timestr),
                   ".%"GF_PRI_SUSECONDS, tv.tv_usec);
 
@@ -1023,15 +667,19 @@ gf_cmd_log (const char *domain, const char *fmt, ...)
         strcpy (msg, str1);
         strcpy (msg + len, str2);
 
-        fprintf (ctx->log.cmdlogfile, "%s\n", msg);
-        fflush (ctx->log.cmdlogfile);
+        fprintf (cmdlogfile, "%s\n", msg);
+        fflush (cmdlogfile);
 
 out:
-        GF_FREE (msg);
+        if (msg) {
+                GF_FREE (msg);
+        }
 
-        GF_FREE (str1);
+        if (str1)
+                GF_FREE (str1);
 
-        FREE (str2);
+        if (str2)
+                FREE (str2);
 
         return (0);
 }
diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/logging.h
index cc806a767..62cecc512 100644
--- a/libglusterfs/src/logging.h
+++ b/libglusterfs/src/logging.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __LOGGING_H__
@@ -19,23 +28,21 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <pthread.h>
 
 #ifdef GF_DARWIN_HOST_OS
 #define GF_PRI_FSBLK       "u"
 #define GF_PRI_DEV         PRId32
 #define GF_PRI_NLINK       PRIu16
-#define GF_PRI_SUSECONDS   "06d"
+#define GF_PRI_SUSECONDS   PRId32
 #else
 #define GF_PRI_FSBLK       PRIu64
 #define GF_PRI_DEV         PRIu64
 #define GF_PRI_NLINK       PRIu32
-#define GF_PRI_SUSECONDS   "06ld"
+#define GF_PRI_SUSECONDS   "ld"
 #endif
 #define GF_PRI_BLKSIZE     PRId32
 #define GF_PRI_SIZET       "zu"
 
-
 #if 0
 /* Syslog definitions :-) */
 #define LOG_EMERG   0           /* system is unusable */
@@ -61,67 +68,25 @@ typedef enum {
         GF_LOG_TRACE,      /* full trace of operation */
 } gf_loglevel_t;
 
-#define DEFAULT_LOG_FILE_DIRECTORY            DATADIR "/log/glusterfs"
-#define DEFAULT_LOG_LEVEL                     GF_LOG_INFO
-
-typedef struct gf_log_handle_ {
-        pthread_mutex_t  logfile_mutex;
-        uint8_t          logrotate;
-        gf_loglevel_t    loglevel;
-        int              gf_log_syslog;
-        gf_loglevel_t    sys_log_level;
-        char             gf_log_xl_log_set;
-        char            *filename;
-        FILE            *logfile;
-        FILE            *gf_log_logfile;
-        char            *cmd_log_filename;
-        FILE            *cmdlogfile;
-#ifdef GF_USE_SYSLOG
-        int              log_control_file_found;
-        char            *ident;
-#endif /* GF_USE_SYSLOG */
-
-} gf_log_handle_t;
-
-void gf_log_globals_init (void *ctx);
-int gf_log_init (void *data, const char *filename, const char *ident);
-
-void gf_log_logrotate (int signum);
-
-void gf_log_cleanup (void);
-
-int _gf_log (const char *domain, const char *file,
-             const char *function, int32_t line, gf_loglevel_t level,
-             const char *fmt, ...)
-             __attribute__ ((__format__ (__printf__, 6, 7)));
-int _gf_log_callingfn (const char *domain, const char *file,
-                       const char *function, int32_t line, gf_loglevel_t level,
-                       const char *fmt, ...)
-                       __attribute__ ((__format__ (__printf__, 6, 7)));
-
-int _gf_log_nomem (const char *domain, const char *file,
-                   const char *function, int line, gf_loglevel_t level,
-                   size_t size);
-
-int _gf_log_eh (const char *function, const char *fmt, ...);
-
-
+extern gf_loglevel_t gf_log_loglevel;
+extern char gf_log_xl_log_set;
 
 #define FMT_WARN(fmt...) do { if (0) printf (fmt); } while (0)
 
 #define gf_log(dom, levl, fmt...) do {                                  \
                 FMT_WARN (fmt);                                         \
+                                                                        \
+                if ((levl > gf_log_loglevel) && !gf_log_xl_log_set)     \
+                        break;                                          \
                 _gf_log (dom, __FILE__, __FUNCTION__, __LINE__,         \
                          levl, ##fmt);                                  \
         } while (0)
 
-#define gf_log_eh(fmt...) do {                                          \
-                FMT_WARN (fmt);                                         \
-                _gf_log_eh (__FUNCTION__, ##fmt);                        \
-        } while (0)
-
 #define gf_log_callingfn(dom, levl, fmt...) do {                        \
                 FMT_WARN (fmt);                                         \
+                                                                        \
+                if ((levl > gf_log_loglevel) && !gf_log_xl_log_set)     \
+                        break;                                          \
                 _gf_log_callingfn (dom, __FILE__, __FUNCTION__, __LINE__, \
                                    levl, ##fmt);                        \
         } while (0)
@@ -129,6 +94,8 @@ int _gf_log_eh (const char *function, const char *fmt, ...);
 
 /* No malloc or calloc should be called in this function */
 #define gf_log_nomem(dom, levl, size) do {                              \
+                if ((levl > gf_log_loglevel) && !gf_log_xl_log_set)     \
+                        break;                                          \
                 _gf_log_nomem (dom, __FILE__, __FUNCTION__, __LINE__,   \
                                levl, size);                             \
         } while (0)
@@ -139,6 +106,27 @@ int _gf_log_eh (const char *function, const char *fmt, ...);
                 gf_log (args);                                          \
         }
 
+
+void gf_log_logrotate (int signum);
+
+void gf_log_globals_init (void);
+int gf_log_init (const char *filename);
+void gf_log_cleanup (void);
+
+int _gf_log (const char *domain, const char *file, const char *function,
+             int32_t line, gf_loglevel_t level, const char *fmt, ...);
+int _gf_log_callingfn (const char *domain, const char *file, const char *function,
+                       int32_t line, gf_loglevel_t level, const char *fmt, ...);
+
+int _gf_log_nomem (const char *domain, const char *file,
+                   const char *function, int line, gf_loglevel_t level,
+                   size_t size);
+
+int gf_log_from_client (const char *msg, char *identifier);
+
+void gf_log_lock (void);
+void gf_log_unlock (void);
+
 void gf_log_disable_syslog (void);
 void gf_log_enable_syslog (void);
 gf_loglevel_t gf_log_get_loglevel (void);
@@ -146,13 +134,6 @@ void gf_log_set_loglevel (gf_loglevel_t level);
 gf_loglevel_t gf_log_get_xl_loglevel (void *xl);
 void gf_log_set_xl_loglevel (void *xl, gf_loglevel_t level);
 
-int gf_cmd_log (const char *domain, const char *fmt, ...)
-                __attribute__ ((__format__ (__printf__, 2, 3)));
-
-int gf_cmd_log_init (const char *filename);
-
-void set_sys_log_level (gf_loglevel_t level);
-
 #define GF_DEBUG(xl, format, args...)                           \
         gf_log ((xl)->name, GF_LOG_DEBUG, format, ##args)
 #define GF_INFO(xl, format, args...)                            \
@@ -162,4 +143,7 @@ void set_sys_log_level (gf_loglevel_t level);
 #define GF_ERROR(xl, format, args...)                           \
         gf_log ((xl)->name, GF_LOG_ERROR, format, ##args)
 
+int gf_cmd_log (const char *domain, const char *fmt, ...);
+
+int gf_cmd_log_init (const char *filename);
 #endif /* __LOGGING_H__ */
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c
index b901dd7a8..5fdd5e5f2 100644
--- a/libglusterfs/src/mem-pool.c
+++ b/libglusterfs/src/mem-pool.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #include "mem-pool.h"
@@ -15,12 +24,10 @@
 #include <stdarg.h>
 
 #define GF_MEM_POOL_LIST_BOUNDARY        (sizeof(struct list_head))
-#define GF_MEM_POOL_PTR                  (sizeof(struct mem_pool*))
-#define GF_MEM_POOL_PAD_BOUNDARY         (GF_MEM_POOL_LIST_BOUNDARY  + GF_MEM_POOL_PTR + sizeof(int))
+#define GF_MEM_POOL_PAD_BOUNDARY         (GF_MEM_POOL_LIST_BOUNDARY + sizeof(int))
 #define mem_pool_chunkhead2ptr(head)     ((head) + GF_MEM_POOL_PAD_BOUNDARY)
 #define mem_pool_ptr2chunkhead(ptr)      ((ptr) - GF_MEM_POOL_PAD_BOUNDARY)
 #define is_mem_chunk_in_use(ptr)         (*ptr == 1)
-#define mem_pool_from_ptr(ptr)           ((ptr) + GF_MEM_POOL_LIST_BOUNDARY)
 
 #define GF_MEM_HEADER_SIZE  (4 + sizeof (size_t) + sizeof (xlator_t *) + 4 + 8)
 #define GF_MEM_TRAILER_SIZE 8
@@ -30,18 +37,37 @@
 
 #define GLUSTERFS_ENV_MEM_ACCT_STR  "GLUSTERFS_DISABLE_MEM_ACCT"
 
+static int gf_mem_acct_enable = 0;
+
+int
+gf_mem_acct_is_enabled ()
+{
+        return gf_mem_acct_enable;
+}
+
 void
-gf_mem_acct_enable_set (void *data)
+gf_mem_acct_enable_set ()
 {
-        glusterfs_ctx_t *ctx = NULL;
+        char    *opt = NULL;
+        long    val = -1;
 
-        ctx = data;
+#ifdef DEBUG
+        gf_mem_acct_enable = 1;
+        return;
+#endif
 
-        GF_ASSERT (ctx);
+        opt = getenv (GLUSTERFS_ENV_MEM_ACCT_STR);
 
-        ctx->mem_acct_enable = 1;
+        if (!opt)
+                return;
+
+        val = strtol (opt, NULL, 0);
+
+        if (val)
+                gf_mem_acct_enable = 0;
+        else
+                gf_mem_acct_enable = 1;
 
-        return;
 }
 
 void
@@ -56,17 +82,22 @@ gf_mem_set_acct_info (xlator_t *xl, char **alloc_ptr,
 
         ptr = (char *) (*alloc_ptr);
 
-        GF_ASSERT (xl != NULL);
+        if (!xl) {
+                GF_ASSERT (0);
+        }
 
-        GF_ASSERT (xl->mem_acct.rec != NULL);
+        if (!(xl->mem_acct.rec)) {
+                GF_ASSERT (0);
+        }
 
-        GF_ASSERT (type <= xl->mem_acct.num_types);
+        if (type > xl->mem_acct.num_types) {
+                GF_ASSERT (0);
+        }
 
         LOCK(&xl->mem_acct.rec[type].lock);
         {
                 xl->mem_acct.rec[type].size += size;
                 xl->mem_acct.rec[type].num_allocs++;
-                xl->mem_acct.rec[type].total_allocs++;
                 xl->mem_acct.rec[type].max_size =
                         max (xl->mem_acct.rec[type].max_size,
                              xl->mem_acct.rec[type].size);
@@ -100,7 +131,7 @@ __gf_calloc (size_t nmemb, size_t size, uint32_t type)
         char            *ptr = NULL;
         xlator_t        *xl = NULL;
 
-        if (!THIS->ctx->mem_acct_enable)
+        if (!gf_mem_acct_enable)
                 return CALLOC (nmemb, size);
 
         xl = THIS;
@@ -126,7 +157,7 @@ __gf_malloc (size_t size, uint32_t type)
         char            *ptr = NULL;
         xlator_t        *xl = NULL;
 
-        if (!THIS->ctx->mem_acct_enable)
+        if (!gf_mem_acct_enable)
                 return MALLOC (size);
 
         xl = THIS;
@@ -151,7 +182,7 @@ __gf_realloc (void *ptr, size_t size)
         xlator_t        *xl = NULL;
         uint32_t        type = 0;
 
-        if (!THIS->ctx->mem_acct_enable)
+        if (!gf_mem_acct_enable)
                 return REALLOC (ptr, size);
 
         tot_size = size + GF_MEM_HEADER_SIZE + GF_MEM_TRAILER_SIZE;
@@ -224,7 +255,7 @@ __gf_free (void *free_ptr)
         uint32_t        type = 0;
         xlator_t        *xl = NULL;
 
-        if (!THIS->ctx->mem_acct_enable) {
+        if (!gf_mem_acct_enable) {
                 FREE (free_ptr);
                 return;
         }
@@ -234,16 +265,20 @@ __gf_free (void *free_ptr)
 
         ptr = (char *)free_ptr - 8 - 4;
 
-        //Possible corruption, assert here
-        GF_ASSERT (GF_MEM_HEADER_MAGIC == *(uint32_t *)ptr);
+        if (GF_MEM_HEADER_MAGIC != *(uint32_t *)ptr) {
+                //Possible corruption, assert here
+                GF_ASSERT (0);
+        }
 
         *(uint32_t *)ptr = 0;
 
         ptr = ptr - sizeof(xlator_t *);
         memcpy (&xl, ptr, sizeof(xlator_t *));
 
-        //gf_free expects xl to be available
-        GF_ASSERT (xl != NULL);
+        if (!xl) {
+                //gf_free expects xl to be available
+                GF_ASSERT (0);
+        }
 
         if (!xl->mem_acct.rec) {
                 ptr = (char *)free_ptr - GF_MEM_HEADER_SIZE;
@@ -256,10 +291,11 @@ __gf_free (void *free_ptr)
         ptr = ptr - 4;
         type = *(uint32_t *)ptr;
 
-        // This points to a memory overrun
-        GF_ASSERT (GF_MEM_TRAILER_MAGIC ==
-                *(uint32_t *)((char *)free_ptr + req_size));
-
+        if (GF_MEM_TRAILER_MAGIC != *(uint32_t *)
+            ((char *)free_ptr + req_size)) {
+                // This points to a memory overrun
+                GF_ASSERT (0);
+        }
         *(uint32_t *) ((char *)free_ptr + req_size) = 0;
 
         LOCK (&xl->mem_acct.rec[type].lock);
@@ -276,18 +312,16 @@ free:
 
 struct mem_pool *
 mem_pool_new_fn (unsigned long sizeof_type,
-                 unsigned long count, char *name)
+                 unsigned long count)
 {
         struct mem_pool  *mem_pool = NULL;
         unsigned long     padded_sizeof_type = 0;
         void             *pool = NULL;
         int               i = 0;
-        int               ret = 0;
         struct list_head *list = NULL;
-        glusterfs_ctx_t  *ctx = NULL;
 
         if (!sizeof_type || !count) {
-                gf_log_callingfn ("mem-pool", GF_LOG_ERROR, "invalid argument");
+                gf_log ("mem-pool", GF_LOG_ERROR, "invalid argument");
                 return NULL;
         }
         padded_sizeof_type = sizeof_type + GF_MEM_POOL_PAD_BOUNDARY;
@@ -296,18 +330,8 @@ mem_pool_new_fn (unsigned long sizeof_type,
         if (!mem_pool)
                 return NULL;
 
-        ret = gf_asprintf (&mem_pool->name, "%s:%s", THIS->name, name);
-        if (ret < 0)
-                return NULL;
-
-        if (!mem_pool->name) {
-                GF_FREE (mem_pool);
-                return NULL;
-        }
-
         LOCK_INIT (&mem_pool->lock);
         INIT_LIST_HEAD (&mem_pool->list);
-        INIT_LIST_HEAD (&mem_pool->global_list);
 
         mem_pool->padded_sizeof_type = padded_sizeof_type;
         mem_pool->cold_count = count;
@@ -315,7 +339,6 @@ mem_pool_new_fn (unsigned long sizeof_type,
 
         pool = GF_CALLOC (count, padded_sizeof_type, gf_common_mt_long);
         if (!pool) {
-                GF_FREE (mem_pool->name);
                 GF_FREE (mem_pool);
                 return NULL;
         }
@@ -329,14 +352,6 @@ mem_pool_new_fn (unsigned long sizeof_type,
         mem_pool->pool = pool;
         mem_pool->pool_end = pool + (count * (padded_sizeof_type));
 
-        /* add this pool to the global list */
-        ctx = THIS->ctx;
-        if (!ctx)
-                goto out;
-
-        list_add (&mem_pool->global_list, &ctx->mempool_list);
-
-out:
         return mem_pool;
 }
 
@@ -346,7 +361,7 @@ mem_get0 (struct mem_pool *mem_pool)
         void             *ptr = NULL;
 
         if (!mem_pool) {
-                gf_log_callingfn ("mem-pool", GF_LOG_ERROR, "invalid argument");
+                gf_log ("mem-pool", GF_LOG_ERROR, "invalid argument");
                 return NULL;
         }
 
@@ -364,16 +379,14 @@ mem_get (struct mem_pool *mem_pool)
         struct list_head *list = NULL;
         void             *ptr = NULL;
         int             *in_use = NULL;
-        struct mem_pool **pool_ptr = NULL;
 
         if (!mem_pool) {
-                gf_log_callingfn ("mem-pool", GF_LOG_ERROR, "invalid argument");
+                gf_log ("mem-pool", GF_LOG_ERROR, "invalid argument");
                 return NULL;
         }
 
         LOCK (&mem_pool->lock);
         {
-                mem_pool->alloc_count++;
                 if (mem_pool->cold_count) {
                         list = mem_pool->list.next;
                         list_del (list);
@@ -381,12 +394,8 @@ mem_get (struct mem_pool *mem_pool)
                         mem_pool->hot_count++;
                         mem_pool->cold_count--;
 
-                        if (mem_pool->max_alloc < mem_pool->hot_count)
-                                mem_pool->max_alloc = mem_pool->hot_count;
-
                         ptr = list;
-                        in_use = (ptr + GF_MEM_POOL_LIST_BOUNDARY +
-                                  GF_MEM_POOL_PTR);
+                        in_use = (ptr + GF_MEM_POOL_LIST_BOUNDARY);
                         *in_use = 1;
 
                         goto fwd_addr_out;
@@ -395,7 +404,7 @@ mem_get (struct mem_pool *mem_pool)
                 /* This is a problem area. If we've run out of
                  * chunks in our slab above, we need to allocate
                  * enough memory to service this request.
-                 * The problem is, these individual chunks will fail
+                 * The problem is, these indvidual chunks will fail
                  * the first address range check in __is_member. Now, since
                  * we're not allocating a full second slab, we wont have
                  * enough info perform the range check in __is_member.
@@ -412,22 +421,17 @@ mem_get (struct mem_pool *mem_pool)
                  * because it is too much work knowing that a better slab
                  * allocator is coming RSN.
                  */
-                mem_pool->pool_misses++;
-                mem_pool->curr_stdalloc++;
-                if (mem_pool->max_stdalloc < mem_pool->curr_stdalloc)
-                        mem_pool->max_stdalloc = mem_pool->curr_stdalloc;
-                ptr = GF_CALLOC (1, mem_pool->padded_sizeof_type,
-                                 gf_common_mt_mem_pool);
+                ptr = MALLOC (mem_pool->real_sizeof_type);
 
                 /* Memory coming from the heap need not be transformed from a
                  * chunkhead to a usable pointer since it is not coming from
                  * the pool.
                  */
+                goto unlocked_out;
         }
 fwd_addr_out:
-        pool_ptr = mem_pool_from_ptr (ptr);
-        *pool_ptr = (struct mem_pool *)mem_pool;
         ptr = mem_pool_chunkhead2ptr (ptr);
+unlocked_out:
         UNLOCK (&mem_pool->lock);
 
         return ptr;
@@ -438,7 +442,7 @@ static int
 __is_member (struct mem_pool *pool, void *ptr)
 {
         if (!pool || !ptr) {
-                gf_log_callingfn ("mem-pool", GF_LOG_ERROR, "invalid argument");
+                gf_log ("mem-pool", GF_LOG_ERROR, "invalid argument");
                 return -1;
         }
 
@@ -454,41 +458,25 @@ __is_member (struct mem_pool *pool, void *ptr)
 
 
 void
-mem_put (void *ptr)
+mem_put (struct mem_pool *pool, void *ptr)
 {
         struct list_head *list = NULL;
         int    *in_use = NULL;
         void   *head = NULL;
-        struct mem_pool **tmp = NULL;
-        struct mem_pool *pool = NULL;
 
-        if (!ptr) {
-                gf_log_callingfn ("mem-pool", GF_LOG_ERROR, "invalid argument");
-                return;
-        }
-
-        list = head = mem_pool_ptr2chunkhead (ptr);
-        tmp = mem_pool_from_ptr (head);
-        if (!tmp) {
-                gf_log_callingfn ("mem-pool", GF_LOG_ERROR,
-                                  "ptr header is corrupted");
+        if (!pool || !ptr) {
+                gf_log ("mem-pool", GF_LOG_ERROR, "invalid argument");
                 return;
         }
 
-        pool = *tmp;
-        if (!pool) {
-                gf_log_callingfn ("mem-pool", GF_LOG_ERROR,
-                                  "mem-pool ptr is NULL");
-                return;
-        }
         LOCK (&pool->lock);
         {
 
                 switch (__is_member (pool, ptr))
                 {
                 case 1:
-                        in_use = (head + GF_MEM_POOL_LIST_BOUNDARY +
-                                  GF_MEM_POOL_PTR);
+                        list = head = mem_pool_ptr2chunkhead (ptr);
+                        in_use = (head + GF_MEM_POOL_LIST_BOUNDARY);
                         if (!is_mem_chunk_in_use(in_use)) {
                                 gf_log_callingfn ("mem-pool", GF_LOG_CRITICAL,
                                                   "mem_put called on freed ptr %p of mem "
@@ -518,8 +506,7 @@ mem_put (void *ptr)
                          * not have enough info to distinguish between the two
                          * situations.
                          */
-                        pool->curr_stdalloc--;
-                        GF_FREE (list);
+                        FREE (ptr);
                         break;
                 default:
                         /* log error */
@@ -529,19 +516,14 @@ mem_put (void *ptr)
         UNLOCK (&pool->lock);
 }
 
+
 void
 mem_pool_destroy (struct mem_pool *pool)
 {
         if (!pool)
                 return;
 
-        gf_log (THIS->name, GF_LOG_INFO, "size=%lu max=%d total=%"PRIu64,
-                pool->padded_sizeof_type, pool->max_alloc, pool->alloc_count);
-
-        list_del (&pool->global_list);
-
         LOCK_DESTROY (&pool->lock);
-        GF_FREE (pool->name);
         GF_FREE (pool->pool);
         GF_FREE (pool);
 
diff --git a/libglusterfs/src/mem-pool.h b/libglusterfs/src/mem-pool.h
index 31f49f75c..7092ece30 100644
--- a/libglusterfs/src/mem-pool.h
+++ b/libglusterfs/src/mem-pool.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _MEM_POOL_H_
@@ -30,7 +39,6 @@ struct mem_acct_rec {
         size_t          size;
         size_t          max_size;
         uint32_t        num_allocs;
-        uint32_t        total_allocs;
         uint32_t        max_num_allocs;
         gf_lock_t       lock;
 };
@@ -107,26 +115,7 @@ void* __gf_default_realloc (void *oldptr, size_t size)
 
 #define GF_REALLOC(ptr, size)  __gf_realloc (ptr, size)
 
-#define GF_FREE(free_ptr) __gf_free (free_ptr)
-
-static inline
-char *gf_strndup (const char *src, size_t len)
-{
-        char *dup_str = NULL;
-
-        if (!src) {
-                goto out;
-        }
-
-        dup_str = GF_CALLOC (1, len + 1, gf_common_mt_strdup);
-        if (!dup_str) {
-                goto out;
-        }
-
-        memcpy (dup_str, src, len);
-out:
-        return dup_str;
-}
+#define GF_FREE(free_ptr) __gf_free (free_ptr);
 
 static inline
 char * gf_strdup (const char *src)
@@ -147,21 +136,6 @@ char * gf_strdup (const char *src)
         return dup_str;
 }
 
-static inline void *
-gf_memdup (const void *src, size_t size)
-{
-        void *dup_mem = NULL;
-
-        dup_mem = GF_CALLOC(1, size, gf_common_mt_strdup);
-        if (!dup_mem)
-                goto out;
-
-        memcpy (dup_mem, src, size);
-
-out:
-        return dup_mem;
-}
-
 struct mem_pool {
         struct list_head  list;
         int               hot_count;
@@ -171,26 +145,20 @@ struct mem_pool {
         void             *pool;
         void             *pool_end;
         int               real_sizeof_type;
-        uint64_t          alloc_count;
-        uint64_t          pool_misses;
-        int               max_alloc;
-        int               curr_stdalloc;
-        int               max_stdalloc;
-        char             *name;
-        struct list_head  global_list;
 };
 
 struct mem_pool *
-mem_pool_new_fn (unsigned long sizeof_type, unsigned long count, char *name);
+mem_pool_new_fn (unsigned long sizeof_type, unsigned long count);
 
-#define mem_pool_new(type,count) mem_pool_new_fn (sizeof(type), count, #type)
+#define mem_pool_new(type,count) mem_pool_new_fn (sizeof(type), count)
 
-void mem_put (void *ptr);
+void mem_put (struct mem_pool *pool, void *ptr);
 void *mem_get (struct mem_pool *pool);
 void *mem_get0 (struct mem_pool *pool);
 
 void mem_pool_destroy (struct mem_pool *pool);
 
-void gf_mem_acct_enable_set (void *ctx);
+int gf_mem_acct_is_enabled ();
+void gf_mem_acct_enable_set ();
 
 #endif /* _MEM_POOL_H */
diff --git a/libglusterfs/src/mem-types.h b/libglusterfs/src/mem-types.h
index 9aadbcaec..52a07ebc7 100644
--- a/libglusterfs/src/mem-types.h
+++ b/libglusterfs/src/mem-types.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __MEM_TYPES_H__
@@ -89,34 +98,7 @@ enum gf_common_mem_types_ {
         gf_common_mt_sge                  = 73,
         gf_common_mt_rpcclnt_cb_program_t = 74,
         gf_common_mt_libxl_marker_local   = 75,
-        gf_common_mt_graph_buf            = 76,
-        gf_common_mt_trie_trie            = 77,
-        gf_common_mt_trie_data            = 78,
-        gf_common_mt_trie_node            = 79,
-        gf_common_mt_trie_buf             = 80,
-        gf_common_mt_trie_end             = 81,
-        gf_common_mt_run_argv             = 82,
-        gf_common_mt_run_logbuf           = 83,
-        gf_common_mt_fd_lk_ctx_t          = 84,
-        gf_common_mt_fd_lk_ctx_node_t     = 85,
-        gf_common_mt_buffer_t             = 86,
-        gf_common_mt_circular_buffer_t    = 87,
-        gf_common_mt_eh_t                 = 88,
-        gf_common_mt_store_handle_t       = 89,
-        gf_common_mt_store_iter_t         = 90,
-        gf_common_mt_drc_client_t         = 91,
-        gf_common_mt_drc_globals_t        = 92,
-        gf_common_mt_drc_rbtree_node_t    = 93,
-        gf_common_mt_iov_base_t           = 94,
-        gf_common_mt_groups_t             = 95,
-        gf_common_mt_cliententry_t        = 96,
-        gf_common_mt_clienttable_t        = 97,
-        gf_common_mt_client_t             = 98,
-        gf_common_mt_client_ctx           = 99,
-        gf_common_mt_lock_table           = 100,
-        gf_common_mt_locker               = 101,
-        gf_common_mt_auxgids              = 102,
-        gf_common_mt_syncopctx            = 103,
-        gf_common_mt_end                  = 104
+        gf_common_mt_int32_t              = 76,
+        gf_common_mt_end                  = 77
 };
 #endif
diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c
deleted file mode 100644
index 842b6413a..000000000
--- a/libglusterfs/src/options.c
+++ /dev/null
@@ -1,1127 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include <fnmatch.h>
-
-#include "xlator.h"
-#include "defaults.h"
-
-#define GF_OPTION_LIST_EMPTY(_opt) (_opt->value[0] == NULL)
-
-
-static int
-xlator_option_validate_path (xlator_t *xl, const char *key, const char *value,
-                             volume_option_t *opt, char **op_errstr)
-{
-        int   ret = -1;
-        char  errstr[256];
-
-        if (strstr (value, "../")) {
-                snprintf (errstr, 256,
-                          "invalid path given '%s'",
-                          value);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-                /* Make sure the given path is valid */
-        if (value[0] != '/') {
-                snprintf (errstr, 256,
-                          "option %s %s: '%s' is not an "
-                          "absolute path name",
-                          key, value, value);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-static int
-xlator_option_validate_int (xlator_t *xl, const char *key, const char *value,
-                            volume_option_t *opt, char **op_errstr)
-{
-        long long inputll = 0;
-        int       ret = -1;
-        char      errstr[256];
-
-        /* Check the range */
-        if (gf_string2longlong (value, &inputll) != 0) {
-                snprintf (errstr, 256,
-                          "invalid number format \"%s\" in option \"%s\"",
-                          value, key);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        if ((opt->min == 0) && (opt->max == 0) &&
-            (opt->validate == GF_OPT_VALIDATE_BOTH)) {
-                gf_log (xl->name, GF_LOG_TRACE,
-                        "no range check required for 'option %s %s'",
-                        key, value);
-                ret = 0;
-                goto out;
-        }
-
-        if ((opt->validate == GF_OPT_VALIDATE_MIN)) {
-                if (inputll < opt->min) {
-                        snprintf (errstr, 256,
-                                  "'%lld' in 'option %s %s' is smaller than "
-                                  "minimum value '%.0f'", inputll, key,
-                                  value, opt->min);
-                        gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                        goto out;
-                }
-        } else if ((opt->validate == GF_OPT_VALIDATE_MAX)) {
-                if ((inputll > opt->max)) {
-                        snprintf (errstr, 256,
-                                  "'%lld' in 'option %s %s' is greater than "
-                                  "maximum value '%.0f'", inputll, key,
-                                  value, opt->max);
-                        gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                        goto out;
-                }
-        } else if ((inputll < opt->min) || (inputll > opt->max)) {
-                snprintf (errstr, 256,
-                          "'%lld' in 'option %s %s' is out of range "
-                          "[%.0f - %.0f]",
-                          inputll, key, value, opt->min, opt->max);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-
-static int
-xlator_option_validate_sizet (xlator_t *xl, const char *key, const char *value,
-                              volume_option_t *opt, char **op_errstr)
-{
-        uint64_t  size = 0;
-        int       ret = 0;
-        char      errstr[256];
-
-        /* Check the range */
-        if (gf_string2bytesize (value, &size) != 0) {
-                snprintf (errstr, 256,
-                          "invalid number format \"%s\" in option \"%s\"",
-                          value, key);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                ret = -1;
-                goto out;
-        }
-
-        if ((opt->min == 0) && (opt->max == 0)) {
-                gf_log (xl->name, GF_LOG_TRACE,
-                        "no range check required for 'option %s %s'",
-                        key, value);
-                goto out;
-        }
-
-        if ((size < opt->min) || (size > opt->max)) {
-                if ((strncmp (key, "cache-size", 10) == 0) &&
-                    (size > opt->max)) {
-                       snprintf (errstr, 256, "Cache size %"PRId64" is out of "
-                                 "range [%.0f - %.0f]",
-                                 size, opt->min, opt->max);
-                       gf_log (xl->name, GF_LOG_WARNING, "%s", errstr);
-                } else {
-                        snprintf (errstr, 256,
-                                  "'%"PRId64"' in 'option %s %s' "
-                                  "is out of range [%.0f - %.0f]",
-                                  size, key, value, opt->min, opt->max);
-                        gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                        ret = -1;
-                }
-        }
-
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-
-static int
-xlator_option_validate_bool (xlator_t *xl, const char *key, const char *value,
-                             volume_option_t *opt, char **op_errstr)
-{
-        int          ret = -1;
-        char         errstr[256];
-        gf_boolean_t bool;
-
-
-        /* Check if the value is one of
-           '0|1|on|off|no|yes|true|false|enable|disable' */
-
-        if (gf_string2boolean (value, &bool) != 0) {
-                snprintf (errstr, 256,
-                          "option %s %s: '%s' is not a valid boolean value",
-                          key, value, value);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-
-static int
-xlator_option_validate_xlator (xlator_t *xl, const char *key, const char *value,
-                               volume_option_t *opt, char **op_errstr)
-{
-        int          ret = -1;
-        char         errstr[256];
-        xlator_t    *xlopt = NULL;
-
-
-        /* Check if the value is one of the xlators */
-        xlopt = xl;
-        while (xlopt->prev)
-                xlopt = xlopt->prev;
-
-        while (xlopt) {
-                if (strcmp (value, xlopt->name) == 0) {
-                        ret = 0;
-                        break;
-                }
-                xlopt = xlopt->next;
-        }
-
-        if (!xlopt) {
-                snprintf (errstr, 256,
-                          "option %s %s: '%s' is not a valid volume name",
-                          key, value, value);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-void
-set_error_str (char *errstr, size_t len, volume_option_t *opt, const char *key,
-               const char *value)
-{
-        int i = 0;
-        char given_array[4096] = {0,};
-
-        for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) && opt->value[i];) {
-                strcat (given_array, opt->value[i]);
-                if (((++i) < ZR_OPTION_MAX_ARRAY_SIZE) &&
-                    (opt->value[i]))
-                        strcat (given_array, ", ");
-                else
-                        strcat (given_array, ".");
-        }
-        snprintf (errstr, len, "option %s %s: '%s' is not valid "
-                  "(possible options are %s)", key, value, value, given_array);
-        return;
-}
-
-int
-is_all_whitespaces (const char *value)
-{
-        int i = 0;
-        size_t len = 0;
-
-        if (value == NULL)
-                return -1;
-
-        len = strlen (value);
-
-        for (i = 0; i < len; i++) {
-                if (value[i] == ' ')
-                        continue;
-                else
-                        return 0;
-        }
-
-        return 1;
-}
-
-static int
-xlator_option_validate_str (xlator_t *xl, const char *key, const char *value,
-                            volume_option_t *opt, char **op_errstr)
-{
-        int          ret = -1;
-        int          i = 0;
-        char         errstr[4096] = {0,};
-
-        /* Check if the '*str' is valid */
-        if (GF_OPTION_LIST_EMPTY(opt)) {
-                ret = 0;
-                goto out;
-        }
-
-        if (is_all_whitespaces (value) == 1)
-                goto out;
-
-        for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) && opt->value[i]; i++) {
- #ifdef  GF_DARWIN_HOST_OS
-                if (fnmatch (opt->value[i], value, 0) == 0) {
-                        ret = 0;
-                        break;
-                }
- #else
-                if (fnmatch (opt->value[i], value, FNM_EXTMATCH) == 0) {
-                        ret = 0;
-                        break;
-                }
- #endif
-        }
-
-        if ((i == ZR_OPTION_MAX_ARRAY_SIZE) || (!opt->value[i]))
-                goto out;
-                /* enter here only if
-                 * 1. reached end of opt->value array and haven't
-                 *    validated input
-                 *                      OR
-                 * 2. valid input list is less than
-                 *    ZR_OPTION_MAX_ARRAY_SIZE and input has not
-                 *    matched all possible input values.
-                 */
-
-        ret = 0;
-
-out:
-        if (ret) {
-                set_error_str (errstr, sizeof (errstr), opt, key, value);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                if (op_errstr)
-                        *op_errstr = gf_strdup (errstr);
-        }
-        return ret;
-}
-
-
-static int
-xlator_option_validate_percent (xlator_t *xl, const char *key, const char *value,
-                                volume_option_t *opt, char **op_errstr)
-{
-        double    percent = 0;
-        int       ret = -1;
-        char      errstr[256];
-
-        /* Check if the value is valid percentage */
-        if (gf_string2percent (value, &percent) != 0) {
-                snprintf (errstr, 256,
-                          "invalid percent format \"%s\" in \"option %s\"",
-                          value, key);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        if ((percent < 0.0) || (percent > 100.0)) {
-                snprintf (errstr, 256,
-                          "'%lf' in 'option %s %s' is out of range [0 - 100]",
-                          percent, key, value);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-static int
-xlator_option_validate_percent_or_sizet (xlator_t *xl, const char *key,
-                                         const char *value,
-                                         volume_option_t *opt, char **op_errstr)
-{
-        int          ret = -1;
-        char         errstr[256];
-        uint64_t     size = 0;
-	gf_boolean_t is_percent = _gf_false;
-
-	if (gf_string2percent_or_bytesize (value, &size, &is_percent) == 0) {
-		if (is_percent) {
-			ret = 0;
-			goto out;
-		}
-		/* Check the range */
-		if ((opt->min == 0) && (opt->max == 0)) {
-			gf_log (xl->name, GF_LOG_TRACE,
-				"no range check required for "
-				"'option %s %s'",
-				key, value);
-			ret = 0;
-			goto out;
-		}
-		if ((size < opt->min) || (size > opt->max)) {
-			snprintf (errstr, 256,
-				  "'%"PRId64"' in 'option %s %s'"
-				  " is out of range [%.0f - %.0f]",
-				  size, key, value, opt->min, opt->max);
-			gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-			goto out;
-		}
-		ret = 0;
-		goto out;
-	}
-
-	/* If control reaches here, invalid argument */
-
-	snprintf (errstr, 256,
-		  "invalid number format \"%s\" in \"option %s\"",
-		  value, key);
-	gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-
-
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-
-static int
-xlator_option_validate_time (xlator_t *xl, const char *key, const char *value,
-                             volume_option_t *opt, char **op_errstr)
-{
-        int          ret = -1;
-        char         errstr[256];
-        uint32_t     input_time = 0;
-
-	/* Check if the value is valid time */
-        if (gf_string2time (value, &input_time) != 0) {
-                snprintf (errstr, 256,
-                          "invalid time format \"%s\" in "
-                          "\"option %s\"",
-                          value, key);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        if ((opt->min == 0) && (opt->max == 0)) {
-                gf_log (xl->name, GF_LOG_TRACE,
-                        "no range check required for "
-                        "'option %s %s'",
-                        key, value);
-                ret = 0;
-                goto out;
-        }
-
-        if ((input_time < opt->min) || (input_time > opt->max)) {
-                snprintf (errstr, 256,
-                          "'%"PRIu32"' in 'option %s %s' is "
-                          "out of range [%.0f - %.0f]",
-                          input_time, key, value,
-                          opt->min, opt->max);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-
-static int
-xlator_option_validate_double (xlator_t *xl, const char *key, const char *value,
-                               volume_option_t *opt, char **op_errstr)
-{
-        double    input = 0.0;
-        int       ret = -1;
-        char      errstr[256];
-
-        /* Check the range */
-        if (gf_string2double (value, &input) != 0) {
-                snprintf (errstr, 256,
-                          "invalid number format \"%s\" in option \"%s\"",
-                          value, key);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        if ((opt->min == 0) && (opt->max == 0) &&
-            (opt->validate == GF_OPT_VALIDATE_BOTH)) {
-                gf_log (xl->name, GF_LOG_TRACE,
-                        "no range check required for 'option %s %s'",
-                        key, value);
-                ret = 0;
-                goto out;
-        }
-
-        if ((opt->validate == GF_OPT_VALIDATE_MIN)) {
-                if (input < opt->min) {
-                        snprintf (errstr, 256,
-                                  "'%f' in 'option %s %s' is smaller than "
-                                  "minimum value '%f'", input, key,
-                                  value, opt->min);
-                        gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                        goto out;
-                }
-        } else if ((opt->validate == GF_OPT_VALIDATE_MAX)) {
-                if ((input > opt->max)) {
-                        snprintf (errstr, 256,
-                                  "'%f' in 'option %s %s' is greater than "
-                                  "maximum value '%f'", input, key,
-                                  value, opt->max);
-                        gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                        goto out;
-                }
-        } else if ((input < opt->min) || (input > opt->max)) {
-                snprintf (errstr, 256,
-                          "'%f' in 'option %s %s' is out of range "
-                          "[%f - %f]",
-                          input, key, value, opt->min, opt->max);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret && op_errstr)
-                *op_errstr = gf_strdup (errstr);
-        return ret;
-}
-
-
-static int
-xlator_option_validate_addr (xlator_t *xl, const char *key, const char *value,
-                             volume_option_t *opt, char **op_errstr)
-{
-        int          ret = -1;
-        char         errstr[256];
-
-        if (!valid_internet_address ((char *)value, _gf_false)) {
-                snprintf (errstr, 256,
-                          "option %s %s: '%s'  is not a valid internet-address,"
-                          " it does not conform to standards.",
-                          key, value, value);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                if (op_errstr)
-                        *op_errstr = gf_strdup (errstr);
-        }
-
-        ret = 0;
-
-        return ret;
-}
-
-static int
-xlator_option_validate_addr_list (xlator_t *xl, const char *key,
-                                  const char *value, volume_option_t *opt,
-                                  char **op_errstr)
-{
-        int          ret = -1;
-        char         *dup_val = NULL;
-        char         *addr_tok = NULL;
-        char         *save_ptr = NULL;
-        char         errstr[4096] = {0,};
-
-        dup_val = gf_strdup (value);
-        if (!dup_val)
-                goto out;
-
-        addr_tok = strtok_r (dup_val, ",", &save_ptr);
-        if (addr_tok == NULL)
-                goto out;
-        while (addr_tok) {
-                if (!valid_internet_address (addr_tok, _gf_true))
-                        goto out;
-
-                addr_tok = strtok_r (NULL, ",", &save_ptr);
-        }
-        ret = 0;
-
-out:
-        if (ret) {
-                snprintf (errstr, sizeof (errstr), "option %s %s: '%s' is not "
-                "a valid internet-address-list", key, value, value);
-                gf_log (xl->name, GF_LOG_ERROR, "%s", errstr);
-                if (op_errstr)
-                        *op_errstr = gf_strdup (errstr);
-        }
-        GF_FREE (dup_val);
-
-        return ret;
-}
-
-/*XXX: the rules to validate are as per block-size required for stripe xlator */
-static int
-gf_validate_size (const char *sizestr, volume_option_t *opt)
-{
-        uint64_t                value = 0;
-        int                     ret = 0;
-
-        GF_ASSERT (opt);
-
-        if (gf_string2bytesize (sizestr, &value) != 0 ||
-            value < opt->min ||
-            value % 512) {
-                ret = -1;
-                goto out;
-        }
-
- out:
-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-static int
-gf_validate_number (const char *numstr, volume_option_t *opt)
-{
-        int32_t value;
-        return gf_string2int32 (numstr, &value);
-}
-
-/*  Parses the string to be of the form <key1>:<value1>,<key2>:<value2>...  *
- *  takes two optional validaters key_validator and value_validator         */
-static int
-validate_list_elements (const char *string, volume_option_t *opt,
-                        int (key_validator)( const char *),
-                        int (value_validator)( const char *, volume_option_t *))
-{
-
-        char                    *dup_string = NULL;
-        char                    *str_sav = NULL;
-        char                    *substr_sav = NULL;
-        char                    *str_ptr = NULL;
-        char                    *key = NULL;
-        char                    *value = NULL;
-        int                     ret = 0;
-
-        GF_ASSERT (string);
-
-        dup_string = gf_strdup (string);
-        if (NULL == dup_string)
-                goto out;
-
-        str_ptr = strtok_r (dup_string, ",", &str_sav);
-        if (str_ptr == NULL) {
-                ret = -1;
-                goto out;
-        }
-        while (str_ptr) {
-
-                key = strtok_r (str_ptr, ":", &substr_sav);
-                if (!key ||
-                    (key_validator && key_validator(key))) {
-                        ret = -1;
-                        gf_log (THIS->name, GF_LOG_WARNING,
-                                "invalid list '%s', key '%s' not valid.",
-                                string, key);
-                        goto out;
-                }
-
-                value = strtok_r (NULL, ":", &substr_sav);
-                if (!value ||
-                    (value_validator && value_validator(value, opt))) {
-                        ret = -1;
-                        gf_log (THIS->name, GF_LOG_WARNING,
-                                "invalid list '%s', value '%s' not valid.",
-                                string, key);
-                        goto out;
-                }
-
-                str_ptr = strtok_r (NULL, ",", &str_sav);
-                substr_sav = NULL;
-        }
-
- out:
-        GF_FREE (dup_string);
-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-static int
-xlator_option_validate_priority_list (xlator_t *xl, const char *key,
-                                      const char *value, volume_option_t *opt,
-                                      char **op_errstr)
-{
-        int                     ret =0;
-        char                    errstr[1024] = {0, };
-
-        GF_ASSERT (value);
-
-        ret = validate_list_elements (value, opt, NULL, &gf_validate_number);
-        if (ret) {
-                snprintf (errstr, 1024,
-                          "option %s %s: '%s' is not a valid "
-                          "priority-list", key, value, value);
-                *op_errstr = gf_strdup (errstr);
-        }
-
-        return ret;
-}
-
-static int
-xlator_option_validate_size_list (xlator_t *xl, const char *key,
-                                  const char *value, volume_option_t *opt,
-                                  char **op_errstr)
-{
-
-        int                    ret = 0;
-        char                   errstr[1024] = {0, };
-
-        GF_ASSERT (value);
-
-        ret = gf_validate_size (value, opt);
-        if (ret)
-                ret = validate_list_elements (value, opt, NULL, &gf_validate_size);
-
-        if (ret) {
-                snprintf (errstr, 1024,
-                          "option %s %s: '%s' is not a valid "
-                          "size-list", key, value, value);
-                *op_errstr = gf_strdup (errstr);
-        }
-
-        return ret;
-
-}
-
-static int
-xlator_option_validate_any (xlator_t *xl, const char *key, const char *value,
-                            volume_option_t *opt, char **op_errstr)
-{
-        return 0;
-}
-
-typedef int (xlator_option_validator_t) (xlator_t *xl, const char *key,
-                                         const char *value,
-                                         volume_option_t *opt, char **operrstr);
-
-int
-xlator_option_validate (xlator_t *xl, char *key, char *value,
-                        volume_option_t *opt, char **op_errstr)
-{
-        int       ret = -1;
-        xlator_option_validator_t *validate;
-        xlator_option_validator_t *validators[] = {
-                [GF_OPTION_TYPE_PATH]        = xlator_option_validate_path,
-                [GF_OPTION_TYPE_INT]         = xlator_option_validate_int,
-                [GF_OPTION_TYPE_SIZET]       = xlator_option_validate_sizet,
-                [GF_OPTION_TYPE_BOOL]        = xlator_option_validate_bool,
-                [GF_OPTION_TYPE_XLATOR]      = xlator_option_validate_xlator,
-                [GF_OPTION_TYPE_STR]         = xlator_option_validate_str,
-                [GF_OPTION_TYPE_PERCENT]     = xlator_option_validate_percent,
-                [GF_OPTION_TYPE_PERCENT_OR_SIZET] =
-                xlator_option_validate_percent_or_sizet,
-                [GF_OPTION_TYPE_TIME]        = xlator_option_validate_time,
-                [GF_OPTION_TYPE_DOUBLE]      = xlator_option_validate_double,
-                [GF_OPTION_TYPE_INTERNET_ADDRESS] = xlator_option_validate_addr,
-                [GF_OPTION_TYPE_INTERNET_ADDRESS_LIST] =
-                xlator_option_validate_addr_list,
-                [GF_OPTION_TYPE_PRIORITY_LIST] =
-                xlator_option_validate_priority_list,
-                [GF_OPTION_TYPE_SIZE_LIST]   = xlator_option_validate_size_list,
-                [GF_OPTION_TYPE_ANY]         = xlator_option_validate_any,
-                [GF_OPTION_TYPE_MAX]         = NULL,
-        };
-
-        if (opt->type < 0 || opt->type >= GF_OPTION_TYPE_MAX) {
-                gf_log (xl->name, GF_LOG_ERROR,
-                        "unknown option type '%d'", opt->type);
-                goto out;
-        }
-
-        validate = validators[opt->type];
-
-        ret = validate (xl, key, value, opt, op_errstr);
-out:
-        return ret;
-}
-
-
-volume_option_t *
-xlator_volume_option_get_list (volume_opt_list_t *vol_list, const char *key)
-{
-        volume_option_t         *opt = NULL;
-        volume_opt_list_t       *opt_list = NULL;
-        volume_option_t         *found = NULL;
-        int                      index = 0;
-        int                      i = 0;
-        char                    *cmp_key = NULL;
-
-        if (!vol_list->given_opt) {
-                opt_list = list_entry (vol_list->list.next, volume_opt_list_t,
-                                       list);
-                opt = opt_list->given_opt;
-        } else
-                opt = vol_list->given_opt;
-
-        for (index = 0; opt[index].key[0]; index++) {
-                for (i = 0; i < ZR_VOLUME_MAX_NUM_KEY; i++) {
-                        cmp_key = opt[index].key[i];
-                        if (!cmp_key)
-                                break;
-                        if (fnmatch (cmp_key, key, FNM_NOESCAPE) == 0) {
-                                found = &opt[index];
-                                goto out;
-                        }
-                }
-        }
-out:
-        return found;
-}
-
-
-volume_option_t *
-xlator_volume_option_get (xlator_t *xl, const char *key)
-{
-        volume_opt_list_t       *vol_list = NULL;
-        volume_option_t         *found = NULL;
-
-        list_for_each_entry (vol_list, &xl->volume_options, list) {
-                found = xlator_volume_option_get_list (vol_list, key);
-                if (found)
-                        break;
-        }
-
-        return found;
-}
-
-
-static int
-xl_opt_validate (dict_t *dict, char *key, data_t *value, void *data)
-{
-        xlator_t          *xl = NULL;
-        volume_opt_list_t *vol_opt = NULL;
-        volume_option_t   *opt = NULL;
-        int                ret = 0;
-        char              *errstr = NULL;
-
-        struct {
-                xlator_t           *this;
-                volume_opt_list_t  *vol_opt;
-                char               *errstr;
-        } *stub;
-
-        stub = data;
-        xl = stub->this;
-        vol_opt = stub->vol_opt;
-
-        opt = xlator_volume_option_get_list (vol_opt, key);
-        if (!opt)
-                return 0;
-
-        ret = xlator_option_validate (xl, key, value->data, opt, &errstr);
-        if (ret)
-                gf_log (xl->name, GF_LOG_WARNING, "validate of %s returned %d",
-                        key, ret);
-
-        if (errstr)
-                /* possible small leak of previously set stub->errstr */
-                stub->errstr = errstr;
-
-        if (fnmatch (opt->key[0], key, FNM_NOESCAPE) != 0) {
-                gf_log (xl->name, GF_LOG_WARNING, "option '%s' is deprecated, "
-                        "preferred is '%s', continuing with correction",
-                        key, opt->key[0]);
-                dict_set (dict, opt->key[0], value);
-                dict_del (dict, key);
-        }
-        return 0;
-}
-
-
-int
-xlator_options_validate_list (xlator_t *xl, dict_t *options,
-                              volume_opt_list_t *vol_opt, char **op_errstr)
-{
-        int ret = 0;
-        struct {
-                xlator_t           *this;
-                volume_opt_list_t  *vol_opt;
-                char               *errstr;
-        } stub;
-
-        stub.this = xl;
-        stub.vol_opt = vol_opt;
-        stub.errstr = NULL;
-
-        dict_foreach (options, xl_opt_validate, &stub);
-        if (stub.errstr) {
-                ret = -1;
-                if (op_errstr)
-                        *op_errstr = stub.errstr;
-        }
-
-        return ret;
-}
-
-
-int
-xlator_options_validate (xlator_t *xl, dict_t *options, char **op_errstr)
-{
-        int                ret     = 0;
-        volume_opt_list_t *vol_opt = NULL;
-
-
-        if (!xl) {
-                gf_log (THIS->name, GF_LOG_DEBUG, "'this' not a valid ptr");
-                ret = -1;
-                goto out;
-        }
-
-        if (list_empty (&xl->volume_options))
-                goto out;
-
-        list_for_each_entry (vol_opt, &xl->volume_options, list) {
-                ret = xlator_options_validate_list (xl, options, vol_opt,
-                                                    op_errstr);
-        }
-out:
-        return ret;
-}
-
-
-int
-xlator_validate_rec (xlator_t *xlator, char **op_errstr)
-{
-        int            ret  = -1;
-        xlator_list_t *trav = NULL;
-        xlator_t      *old_THIS = NULL;
-
-        GF_VALIDATE_OR_GOTO ("xlator", xlator, out);
-
-        trav = xlator->children;
-
-        while (trav) {
-                if (xlator_validate_rec (trav->xlator, op_errstr)) {
-                        gf_log ("xlator", GF_LOG_WARNING, "validate_rec failed");
-                        goto out;
-                }
-
-                trav = trav->next;
-        }
-
-        if (xlator_dynload (xlator))
-                gf_log (xlator->name, GF_LOG_DEBUG, "Did not load the symbols");
-
-        old_THIS = THIS;
-        THIS = xlator;
-
-        /* Need this here, as this graph has not yet called init() */
-        if (!xlator->mem_acct.num_types) {
-                if (!xlator->mem_acct_init)
-                        xlator->mem_acct_init = default_mem_acct_init;
-                xlator->mem_acct_init (xlator);
-        }
-
-        ret = xlator_options_validate (xlator, xlator->options, op_errstr);
-        THIS = old_THIS;
-
-        if (ret) {
-                gf_log (xlator->name, GF_LOG_INFO, "%s", *op_errstr);
-                goto out;
-        }
-
-        gf_log (xlator->name, GF_LOG_DEBUG, "Validated options");
-
-        ret = 0;
-out:
-        return ret;
-}
-
-
-int
-graph_reconf_validateopt (glusterfs_graph_t *graph, char **op_errstr)
-{
-        xlator_t *xlator = NULL;
-        int       ret = -1;
-
-        GF_ASSERT (graph);
-
-        xlator = graph->first;
-
-        ret = xlator_validate_rec (xlator, op_errstr);
-
-        return ret;
-}
-
-
-static int
-xlator_reconfigure_rec (xlator_t *old_xl, xlator_t *new_xl)
-{
-        xlator_list_t *trav1    = NULL;
-        xlator_list_t *trav2    = NULL;
-        int32_t        ret      = -1;
-        xlator_t      *old_THIS = NULL;
-
-        GF_VALIDATE_OR_GOTO ("xlator", old_xl, out);
-        GF_VALIDATE_OR_GOTO ("xlator", new_xl, out);
-
-        trav1 = old_xl->children;
-        trav2 = new_xl->children;
-
-        while (trav1 && trav2) {
-                ret = xlator_reconfigure_rec (trav1->xlator, trav2->xlator);
-                if (ret)
-                        goto out;
-
-                gf_log (trav1->xlator->name, GF_LOG_DEBUG, "reconfigured");
-
-                trav1 = trav1->next;
-                trav2 = trav2->next;
-        }
-
-        if (old_xl->reconfigure) {
-                old_THIS = THIS;
-                THIS = old_xl;
-
-                ret = old_xl->reconfigure (old_xl, new_xl->options);
-
-                THIS = old_THIS;
-
-                if (ret)
-                        goto out;
-        } else {
-                gf_log (old_xl->name, GF_LOG_DEBUG, "No reconfigure() found");
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
-
-
-int
-xlator_tree_reconfigure (xlator_t *old_xl, xlator_t *new_xl)
-{
-        xlator_t *new_top = NULL;
-        xlator_t *old_top = NULL;
-
-        GF_ASSERT (old_xl);
-        GF_ASSERT (new_xl);
-
-        old_top = old_xl;
-        new_top = new_xl;
-
-        return xlator_reconfigure_rec (old_top, new_top);
-}
-
-
-int
-xlator_option_info_list (volume_opt_list_t *list, char *key,
-                         char **def_val, char **descr)
-{
-        int                     ret = -1;
-        volume_option_t         *opt = NULL;
-
-
-        opt = xlator_volume_option_get_list (list, key);
-        if (!opt)
-                goto out;
-
-        if (def_val)
-                *def_val = opt->default_value;
-        if (descr)
-                *descr = opt->description;
-
-        ret = 0;
-out:
-        return ret;
-}
-
-
-static int
-pass (char *in, char **out)
-{
-        *out = in;
-        return 0;
-}
-
-
-static int
-xl_by_name (char *in, xlator_t **out)
-{
-        xlator_t  *xl = NULL;
-
-        xl = xlator_search_by_name (THIS, in);
-
-        if (!xl)
-                return -1;
-        *out = xl;
-        return 0;
-}
-
-
-static int
-pc_or_size (char *in, double *out)
-{
-        double  pc = 0;
-        int       ret = 0;
-        uint64_t  size = 0;
-
-        if (gf_string2percent (in, &pc) == 0) {
-                if (pc > 100.0) {
-                        ret = gf_string2bytesize (in, &size);
-                        if (!ret)
-                                *out = size;
-                } else {
-                        *out = pc;
-                }
-        } else {
-                ret = gf_string2bytesize (in, &size);
-                if (!ret)
-                        *out = size;
-        }
-        return ret;
-}
-
-DEFINE_INIT_OPT(char *, str, pass);
-DEFINE_INIT_OPT(uint64_t, uint64, gf_string2uint64);
-DEFINE_INIT_OPT(int64_t, int64, gf_string2int64);
-DEFINE_INIT_OPT(uint32_t, uint32, gf_string2uint32);
-DEFINE_INIT_OPT(int32_t, int32, gf_string2int32);
-DEFINE_INIT_OPT(uint64_t, size, gf_string2bytesize);
-DEFINE_INIT_OPT(double, percent, gf_string2percent);
-DEFINE_INIT_OPT(double, percent_or_size, pc_or_size);
-DEFINE_INIT_OPT(gf_boolean_t, bool, gf_string2boolean);
-DEFINE_INIT_OPT(xlator_t *, xlator, xl_by_name);
-DEFINE_INIT_OPT(char *, path, pass);
-DEFINE_INIT_OPT(double, double, gf_string2double);
-
-
-
-DEFINE_RECONF_OPT(char *, str, pass);
-DEFINE_RECONF_OPT(uint64_t, uint64, gf_string2uint64);
-DEFINE_RECONF_OPT(int64_t, int64, gf_string2int64);
-DEFINE_RECONF_OPT(uint32_t, uint32, gf_string2uint32);
-DEFINE_RECONF_OPT(int32_t, int32, gf_string2int32);
-DEFINE_RECONF_OPT(uint64_t, size, gf_string2bytesize);
-DEFINE_RECONF_OPT(double, percent, gf_string2percent);
-DEFINE_RECONF_OPT(double, percent_or_size, pc_or_size);
-DEFINE_RECONF_OPT(gf_boolean_t, bool, gf_string2boolean);
-DEFINE_RECONF_OPT(xlator_t *, xlator, xl_by_name);
-DEFINE_RECONF_OPT(char *, path, pass);
-DEFINE_RECONF_OPT(double, double, gf_string2double);
diff --git a/libglusterfs/src/options.h b/libglusterfs/src/options.h
deleted file mode 100644
index e2a25baa9..000000000
--- a/libglusterfs/src/options.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _OPTIONS_H
-#define _OPTIONS_H
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <inttypes.h>
-
-#include "xlator.h"
-/* Add possible new type of option you may need */
-typedef enum {
-        GF_OPTION_TYPE_ANY = 0,
-        GF_OPTION_TYPE_STR,
-        GF_OPTION_TYPE_INT,
-        GF_OPTION_TYPE_SIZET,
-        GF_OPTION_TYPE_PERCENT,
-        GF_OPTION_TYPE_PERCENT_OR_SIZET,
-        GF_OPTION_TYPE_BOOL,
-        GF_OPTION_TYPE_XLATOR,
-        GF_OPTION_TYPE_PATH,
-        GF_OPTION_TYPE_TIME,
-        GF_OPTION_TYPE_DOUBLE,
-        GF_OPTION_TYPE_INTERNET_ADDRESS,
-        GF_OPTION_TYPE_INTERNET_ADDRESS_LIST,
-        GF_OPTION_TYPE_PRIORITY_LIST,
-        GF_OPTION_TYPE_SIZE_LIST,
-        GF_OPTION_TYPE_MAX,
-} volume_option_type_t;
-
-typedef enum {
-        GF_OPT_VALIDATE_BOTH = 0,
-        GF_OPT_VALIDATE_MIN,
-        GF_OPT_VALIDATE_MAX,
-} opt_validate_type_t;
-
-#define ZR_VOLUME_MAX_NUM_KEY    4
-#define ZR_OPTION_MAX_ARRAY_SIZE 64
-
-/* Each translator should define this structure */
-typedef struct volume_options {
-        char                    *key[ZR_VOLUME_MAX_NUM_KEY];
-        /* different key, same meaning */
-        volume_option_type_t    type;
-        double                  min;  /* 0 means no range */
-        double                  max;  /* 0 means no range */
-        char                    *value[ZR_OPTION_MAX_ARRAY_SIZE];
-        /* If specified, will check for one of
-           the value from this array */
-        char                    *default_value;
-        char                    *description; /* about the key */
-        /* Required for int options where only the min value
-         * is given and is 0. This will cause validation not to
-         * happen
-         */
-        opt_validate_type_t     validate;
-} volume_option_t;
-
-
-typedef struct vol_opt_list {
-        struct list_head  list;
-        volume_option_t  *given_opt;
-} volume_opt_list_t;
-
-
-int xlator_tree_reconfigure (xlator_t *old_xl, xlator_t *new_xl);
-int xlator_validate_rec (xlator_t *xlator, char **op_errstr);
-int graph_reconf_validateopt (glusterfs_graph_t *graph, char **op_errstr);
-int xlator_option_info_list (volume_opt_list_t *list, char *key,
-                             char **def_val, char **descr);
-/*
-int validate_xlator_volume_options (xlator_t *xl, dict_t *options,
-                                    volume_option_t *opt, char **op_errstr);
-*/
-int xlator_options_validate_list (xlator_t *xl, dict_t *options,
-                                  volume_opt_list_t *list, char **op_errstr);
-int xlator_option_validate (xlator_t *xl, char *key, char *value,
-                            volume_option_t *opt, char **op_errstr);
-int xlator_options_validate (xlator_t *xl, dict_t *options, char **errstr);
-volume_option_t *
-xlator_volume_option_get (xlator_t *xl, const char *key);
-
-volume_option_t *
-xlator_volume_option_get_list (volume_opt_list_t *vol_list, const char *key);
-
-
-#define DECLARE_INIT_OPT(type_t, type)                                  \
-int                                                                     \
-xlator_option_init_##type (xlator_t *this, dict_t *options, char *key,  \
-                           type_t *val_p);
-
-DECLARE_INIT_OPT(char *, str);
-DECLARE_INIT_OPT(uint64_t, uint64);
-DECLARE_INIT_OPT(int64_t, int64);
-DECLARE_INIT_OPT(uint32_t, uint32);
-DECLARE_INIT_OPT(int32_t, int32);
-DECLARE_INIT_OPT(uint64_t, size);
-DECLARE_INIT_OPT(double, percent);
-DECLARE_INIT_OPT(double, percent_or_size);
-DECLARE_INIT_OPT(gf_boolean_t, bool);
-DECLARE_INIT_OPT(xlator_t *, xlator);
-DECLARE_INIT_OPT(char *, path);
-DECLARE_INIT_OPT(double, double);
-
-
-#define DEFINE_INIT_OPT(type_t, type, conv)                             \
-int                                                                     \
-xlator_option_init_##type (xlator_t *this, dict_t *options, char *key,  \
-                           type_t *val_p)                               \
-{                                                                       \
-        int              ret = 0;                                       \
-        volume_option_t *opt = NULL;                                    \
-        char            *def_value = NULL;                              \
-        char            *set_value = NULL;                              \
-        char            *value = NULL;                                  \
-        xlator_t        *old_THIS = NULL;                               \
-                                                                        \
-        opt = xlator_volume_option_get (this, key);                     \
-        if (!opt) {                                                     \
-                gf_log (this->name, GF_LOG_WARNING,                     \
-                        "unknown option: %s", key);                     \
-                ret = -1;                                               \
-                return ret;                                             \
-        }                                                               \
-        def_value = opt->default_value;                                 \
-        ret = dict_get_str (options, key, &set_value);                  \
-                                                                        \
-        if (def_value)                                                  \
-                value = def_value;                                      \
-        if (set_value)                                                  \
-                value = set_value;                                      \
-        if (!value) {                                                   \
-                gf_log (this->name, GF_LOG_TRACE, "option %s not set",  \
-                        key);                                           \
-                *val_p = (type_t)0;                                     \
-                return 0;                                               \
-        }                                                               \
-        if (value == def_value) {                                       \
-                gf_log (this->name, GF_LOG_TRACE,                       \
-                        "option %s using default value %s",             \
-                        key, value);                                    \
-        } else {                                                        \
-                gf_log (this->name, GF_LOG_DEBUG,                       \
-                        "option %s using set value %s",                 \
-                        key, value);                                    \
-        }                                                               \
-        old_THIS = THIS;                                                \
-        THIS = this;                                                    \
-        ret = conv (value, val_p);                                      \
-        THIS = old_THIS;                                                \
-        if (ret)                                                        \
-                return ret;                                             \
-        ret = xlator_option_validate (this, key, value, opt, NULL);     \
-        return ret;                                                     \
-}
-
-#define GF_OPTION_INIT(key, val, type, err_label) do {            \
-        int val_ret = 0;                                          \
-        val_ret = xlator_option_init_##type (THIS, THIS->options, \
-                                             key, &(val));        \
-        if (val_ret)                                              \
-                goto err_label;                                   \
-        } while (0)
-
-
-
-#define DECLARE_RECONF_OPT(type_t, type)                                \
-int                                                                     \
-xlator_option_reconf_##type (xlator_t *this, dict_t *options, char *key,\
-                             type_t *val_p);
-
-DECLARE_RECONF_OPT(char *, str);
-DECLARE_RECONF_OPT(uint64_t, uint64);
-DECLARE_RECONF_OPT(int64_t, int64);
-DECLARE_RECONF_OPT(uint32_t, uint32);
-DECLARE_RECONF_OPT(int32_t, int32);
-DECLARE_RECONF_OPT(uint64_t, size);
-DECLARE_RECONF_OPT(double, percent);
-DECLARE_RECONF_OPT(double, percent_or_size);
-DECLARE_RECONF_OPT(gf_boolean_t, bool);
-DECLARE_RECONF_OPT(xlator_t *, xlator);
-DECLARE_RECONF_OPT(char *, path);
-DECLARE_RECONF_OPT(double, double);
-
-
-#define DEFINE_RECONF_OPT(type_t, type, conv)                            \
-int                                                                      \
-xlator_option_reconf_##type (xlator_t *this, dict_t *options, char *key, \
-                             type_t *val_p)                             \
-{                                                                       \
-        int              ret = 0;                                       \
-        volume_option_t *opt = NULL;                                    \
-        char            *def_value = NULL;                              \
-        char            *set_value = NULL;                              \
-        char            *value = NULL;                                  \
-        xlator_t        *old_THIS = NULL;                               \
-                                                                        \
-        opt = xlator_volume_option_get (this, key);                     \
-        if (!opt) {                                                     \
-                gf_log (this->name, GF_LOG_WARNING,                     \
-                        "unknown option: %s", key);                     \
-                ret = -1;                                               \
-                return ret;                                             \
-        }                                                               \
-        def_value = opt->default_value;                                 \
-        ret = dict_get_str (options, key, &set_value);                  \
-                                                                        \
-        if (def_value)                                                  \
-                value = def_value;                                      \
-        if (set_value)                                                  \
-                value = set_value;                                      \
-        if (!value) {                                                   \
-                gf_log (this->name, GF_LOG_TRACE, "option %s not set",  \
-                        key);                                           \
-                *val_p = (type_t)0;                                     \
-                return 0;                                               \
-        }                                                               \
-        if (value == def_value) {                                       \
-                gf_log (this->name, GF_LOG_TRACE,                       \
-                        "option %s using default value %s",             \
-                        key, value);                                    \
-        } else {                                                        \
-                gf_log (this->name, GF_LOG_DEBUG,                       \
-                        "option %s using set value %s",                 \
-                        key, value);                                    \
-        }                                                               \
-        old_THIS = THIS;                                                \
-        THIS = this;                                                    \
-        ret = conv (value, val_p);                                      \
-        THIS = old_THIS;                                                \
-        if (ret)                                                        \
-                return ret;                                             \
-        ret = xlator_option_validate (this, key, value, opt, NULL);     \
-        return ret;                                                     \
-}
-
-#define GF_OPTION_RECONF(key, val, opt, type, err_label) do {       \
-        int val_ret = 0;                                            \
-        val_ret = xlator_option_reconf_##type (THIS, opt, key,      \
-                                               &(val));             \
-        if (val_ret)                                                \
-                goto err_label;                                     \
-        } while (0)
-
-
-#endif /* !_OPTIONS_H */
diff --git a/libglusterfs/src/rbthash.c b/libglusterfs/src/rbthash.c
index 0d7b9e521..7f67f78d1 100644
--- a/libglusterfs/src/rbthash.c
+++ b/libglusterfs/src/rbthash.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -132,7 +141,6 @@ rbthash_table_init (int buckets, rbt_hasher_t hfunc,
         }
 
         LOCK_INIT (&newtab->tablelock);
-        INIT_LIST_HEAD (&newtab->list);
         newtab->numbuckets = buckets;
         ret = __rbthash_init_buckets (newtab, buckets);
 
@@ -183,7 +191,6 @@ rbthash_init_entry (rbthash_table_t *tbl, void *data, void *key, int keylen)
                 goto free_entry;
         }
 
-        INIT_LIST_HEAD (&entry->list);
         memcpy (entry->key, key, keylen);
         entry->keylen = keylen;
         entry->keyhash = tbl->hashfunc (entry->key, entry->keylen);
@@ -192,7 +199,7 @@ rbthash_init_entry (rbthash_table_t *tbl, void *data, void *key, int keylen)
         ret = 0;
 free_entry:
         if (ret == -1) {
-                mem_put (entry);
+                mem_put (tbl->entrypool, entry);
                 entry = NULL;
         }
 
@@ -208,26 +215,20 @@ rbthash_deinit_entry (rbthash_table_t *tbl, rbthash_entry_t *entry)
         if (!entry)
                 return;
 
-        GF_FREE (entry->key);
+        if (entry->key)
+                GF_FREE (entry->key);
 
         if (tbl) {
                 if ((entry->data) && (tbl->dfunc))
                         tbl->dfunc (entry->data);
-
-                LOCK (&tbl->tablelock);
-                {
-                        list_del_init (&entry->list);
-                }
-                UNLOCK (&tbl->tablelock);
-
-                mem_put (entry);
+                mem_put (tbl->entrypool, entry);
         }
 
         return;
 }
 
 
-static inline struct rbthash_bucket *
+inline struct rbthash_bucket *
 rbthash_entry_bucket (rbthash_table_t *tbl, rbthash_entry_t * entry)
 {
         int     nbucket = 0;
@@ -291,17 +292,11 @@ rbthash_insert (rbthash_table_t *tbl, void *data, void *key, int keylen)
                 rbthash_deinit_entry (tbl, entry);
         }
 
-        LOCK (&tbl->tablelock);
-        {
-                list_add_tail (&entry->list, &tbl->list);
-        }
-        UNLOCK (&tbl->tablelock);
-
 err:
         return ret;
 }
 
-static inline struct rbthash_bucket *
+inline struct rbthash_bucket *
 rbthash_key_bucket (rbthash_table_t *tbl, void *key, int keylen)
 {
         uint32_t        keyhash = 0;
@@ -381,14 +376,7 @@ rbthash_remove (rbthash_table_t *tbl, void *key, int keylen)
 
         GF_FREE (entry->key);
         dataref = entry->data;
-
-        LOCK (&tbl->tablelock);
-        {
-                list_del_init (&entry->list);
-        }
-        UNLOCK (&tbl->tablelock);
-
-        mem_put (entry);
+        mem_put (tbl->entrypool, entry);
 
         return dataref;
 }
@@ -433,26 +421,3 @@ rbthash_table_destroy (rbthash_table_t *tbl)
         GF_FREE (tbl->buckets);
         GF_FREE (tbl);
 }
-
-
-void
-rbthash_table_traverse (rbthash_table_t *tbl, rbt_traverse_t traverse,
-                        void *mydata)
-{
-        rbthash_entry_t *entry = NULL;
-
-        if ((tbl == NULL) || (traverse == NULL)) {
-                goto out;
-        }
-
-        LOCK (&tbl->tablelock);
-        {
-                list_for_each_entry (entry, &tbl->list, list) {
-                        traverse (entry->data, mydata);
-                }
-        }
-        UNLOCK (&tbl->tablelock);
-
-out:
-        return;
-}
diff --git a/libglusterfs/src/rbthash.h b/libglusterfs/src/rbthash.h
index b093ce998..26a354dbf 100644
--- a/libglusterfs/src/rbthash.h
+++ b/libglusterfs/src/rbthash.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __RBTHASH_TABLE_H_
@@ -15,7 +24,6 @@
 #include "mem-pool.h"
 #include "logging.h"
 #include "common-utils.h"
-#include "list.h"
 
 #include <pthread.h>
 
@@ -30,14 +38,12 @@ struct rbthash_bucket {
 typedef struct rbthash_entry {
         void            *data;
         void            *key;
-        int              keylen;
-        uint32_t         keyhash;
-        struct list_head list;
+        int             keylen;
+        uint32_t        keyhash;
 } rbthash_entry_t;
 
 typedef uint32_t (*rbt_hasher_t) (void *data, int len);
 typedef void (*rbt_data_destroyer_t) (void *data);
-typedef void (*rbt_traverse_t) (void *data, void *mydata);
 
 typedef struct rbthash_table {
         int                     size;
@@ -48,7 +54,6 @@ typedef struct rbthash_table {
         rbt_hasher_t            hashfunc;
         rbt_data_destroyer_t    dfunc;
         gf_boolean_t            pool_alloced;
-        struct list_head        list;
 } rbthash_table_t;
 
 extern rbthash_table_t *
@@ -70,8 +75,4 @@ rbthash_replace (rbthash_table_t *tbl, void *key, int keylen, void *newdata);
 
 extern void
 rbthash_table_destroy (rbthash_table_t *tbl);
-
-extern void
-rbthash_table_traverse (rbthash_table_t *tbl, rbt_traverse_t traverse,
-                        void *mydata);
 #endif
diff --git a/libglusterfs/src/run.c b/libglusterfs/src/run.c
deleted file mode 100644
index ebe7f3962..000000000
--- a/libglusterfs/src/run.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <assert.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-
-#ifdef RUN_STANDALONE
-#define GF_CALLOC(n, s, t) calloc(n, s)
-#define GF_ASSERT(cond) assert(cond)
-#define GF_REALLOC(p, s) realloc(p, s)
-#define GF_FREE(p) free(p)
-#define gf_strdup(s) strdup(s)
-#define gf_vasprintf(p, f, va) vasprintf(p, f, va)
-#define gf_loglevel_t int
-#define gf_log(dom, levl, fmt, args...) printf("LOG: " fmt "\n", ##args)
-#define LOG_DEBUG 0
-#ifdef __linux__
-#define GF_LINUX_HOST_OS
-#endif
-#else /* ! RUN_STANDALONE */
-#include "glusterfs.h"
-#include "common-utils.h"
-#endif
-
-#include "run.h"
-
-void
-runinit (runner_t *runner)
-{
-        int i = 0;
-
-        runner->argvlen = 64;
-        runner->argv = GF_CALLOC (runner->argvlen,
-                                  sizeof (*runner->argv),
-                                  gf_common_mt_run_argv);
-        runner->runerr = runner->argv ? 0 : errno;
-        runner->chpid = -1;
-        for (i = 0; i < 3; i++) {
-                runner->chfd[i] = -1;
-                runner->chio[i] = NULL;
-        }
-}
-
-FILE *
-runner_chio (runner_t *runner, int fd)
-{
-        GF_ASSERT (fd > 0 && fd < 3);
-
-        if ((fd > 0) && (fd < 3))
-                return runner->chio[fd];
-
-        return NULL;
-}
-
-static void
-runner_insert_arg (runner_t *runner, char *arg)
-{
-        int i = 0;
-
-        GF_ASSERT (arg);
-
-        if (runner->runerr)
-                return;
-
-        for (i = 0; i < runner->argvlen; i++) {
-                if (runner->argv[i] == NULL)
-                        break;
-        }
-        GF_ASSERT (i < runner->argvlen);
-
-        if (i == runner->argvlen - 1) {
-                runner->argv = GF_REALLOC (runner->argv,
-                                           runner->argvlen * 2 * sizeof (*runner->argv));
-                if (!runner->argv) {
-                        runner->runerr = errno;
-                        return;
-                }
-                memset (/* "+" is aware of the type of its left side,
-                         * no need to multiply with type-size */
-                        runner->argv + runner->argvlen,
-                        0, runner->argvlen * sizeof (*runner->argv));
-                runner->argvlen *= 2;
-        }
-
-        runner->argv[i] = arg;
-}
-
-void
-runner_add_arg (runner_t *runner, const char *arg)
-{
-        arg = gf_strdup (arg);
-        if (!arg) {
-                runner->runerr = errno;
-                return;
-        }
-
-        runner_insert_arg (runner, (char *)arg);
-}
-
-static void
-runner_va_add_args (runner_t *runner, va_list argp)
-{
-        const char *arg;
-
-        while ((arg = va_arg (argp, const char *)))
-                runner_add_arg (runner, arg);
-}
-
-void
-runner_add_args (runner_t *runner, ...)
-{
-        va_list argp;
-
-        va_start (argp, runner);
-        runner_va_add_args (runner, argp);
-        va_end (argp);
-}
-
-void
-runner_argprintf (runner_t *runner, const char *format, ...)
-{
-        va_list argva;
-        char *arg = NULL;
-        int ret = 0;
-
-        va_start (argva, format);
-        ret = gf_vasprintf (&arg, format, argva);
-        va_end (argva);
-
-        if (ret < 0) {
-                runner->runerr = errno;
-                return;
-        }
-
-        runner_insert_arg (runner, arg);
-}
-
-void
-runner_log (runner_t *runner, const char *dom, gf_loglevel_t lvl,
-            const char *msg)
-{
-        char *buf = NULL;
-        size_t len = 0;
-        int i = 0;
-
-        if (runner->runerr)
-                return;
-
-        for (i = 0;; i++) {
-                if (runner->argv[i] == NULL)
-                        break;
-                len += (strlen (runner->argv[i]) + 1);
-        }
-
-        buf = GF_CALLOC (1, len + 1, gf_common_mt_run_logbuf);
-        if (!buf) {
-                runner->runerr = errno;
-                return;
-        }
-        for (i = 0;; i++) {
-                if (runner->argv[i] == NULL)
-                        break;
-                strcat (buf, runner->argv[i]);
-                strcat (buf, " ");
-        }
-        if (len > 0)
-                buf[len - 1] = '\0';
-
-        gf_log (dom, lvl, "%s: %s", msg, buf);
-
-        GF_FREE (buf);
-}
-
-void
-runner_redir (runner_t *runner, int fd, int tgt_fd)
-{
-        GF_ASSERT (fd > 0 && fd < 3);
-
-        if ((fd > 0) && (fd < 3))
-                runner->chfd[fd] = (tgt_fd >= 0) ? tgt_fd : -2;
-}
-
-int
-runner_start (runner_t *runner)
-{
-        int pi[3][2] = {{-1, -1}, {-1, -1}, {-1, -1}};
-        int xpi[2];
-        int ret = 0;
-        int errno_priv = 0;
-        int i = 0;
-        sigset_t set;
-
-        if (runner->runerr) {
-                errno = runner->runerr;
-                return -1;
-        }
-
-        GF_ASSERT (runner->argv[0]);
-
-        /* set up a channel to child to communicate back
-         * possible execve(2) failures
-         */
-        ret = pipe(xpi);
-        if (ret != -1)
-                ret = fcntl (xpi[1], F_SETFD, FD_CLOEXEC);
-
-        for (i = 0; i < 3; i++) {
-                if (runner->chfd[i] != -2)
-                        continue;
-                ret = pipe (pi[i]);
-                if (ret != -1) {
-                        runner->chio[i] = fdopen (pi[i][i ? 0 : 1], i ? "r" : "w");
-                        if (!runner->chio[i])
-                                ret = -1;
-                }
-        }
-
-        if (ret != -1)
-                runner->chpid = fork ();
-        switch (runner->chpid) {
-        case -1:
-                errno_priv = errno;
-                close (xpi[0]);
-                close (xpi[1]);
-                for (i = 0; i < 3; i++) {
-                        close (pi[i][0]);
-                        close (pi[i][1]);
-                }
-                errno = errno_priv;
-                return -1;
-        case 0:
-                for (i = 0; i < 3; i++)
-                        close (pi[i][i ? 0 : 1]);
-                close (xpi[0]);
-                ret = 0;
-
-                for (i = 0; i < 3; i++) {
-                        if (ret == -1)
-                                break;
-                        switch (runner->chfd[i]) {
-                        case -1:
-                                /* no redir */
-                                break;
-                        case -2:
-                                /* redir to pipe */
-                                ret = dup2 (pi[i][i ? 1 : 0], i);
-                                break;
-                        default:
-                                /* redir to file */
-                                ret = dup2 (runner->chfd[i], i);
-                        }
-                }
-
-                if (ret != -1 ) {
-#ifdef GF_LINUX_HOST_OS
-                        DIR *d = NULL;
-                        struct dirent *de = NULL;
-                        char *e = NULL;
-
-                        d = opendir ("/proc/self/fd");
-                        if (d) {
-                                while ((de = readdir (d))) {
-                                        i = strtoul (de->d_name, &e, 10);
-                                        if (*e == '\0' && i > 2 &&
-                                            i != dirfd (d) && i != xpi[1])
-                                                close (i);
-                                }
-                                closedir (d);
-                        } else
-                                ret = -1;
-#else
-                        struct rlimit rl;
-                        ret = getrlimit (RLIMIT_NOFILE, &rl);
-                        GF_ASSERT (ret == 0);
-
-                        for (i = 3; i < rl.rlim_cur; i++) {
-                                if (i != xpi[1])
-                                        close (i);
-                        }
-#endif
-                }
-
-                if (ret != -1) {
-                        /* save child from inheriting our singal handling */
-                        sigemptyset (&set);
-                        sigprocmask (SIG_SETMASK, &set, NULL);
-
-                        execvp (runner->argv[0], runner->argv);
-                }
-                ret = write (xpi[1], &errno, sizeof (errno));
-                _exit (1);
-        }
-
-        errno_priv = errno;
-        for (i = 0; i < 3; i++)
-                close (pi[i][i ? 1 : 0]);
-        close (xpi[1]);
-        if (ret == -1) {
-                for (i = 0; i < 3; i++) {
-                        if (runner->chio[i]) {
-                                fclose (runner->chio[i]);
-                                runner->chio[i] = NULL;
-                        }
-                }
-        } else {
-                ret = read (xpi[0], (char *)&errno_priv, sizeof (errno_priv));
-                close (xpi[0]);
-                if (ret <= 0)
-                        return 0;
-                GF_ASSERT (ret == sizeof (errno_priv));
-        }
-        errno = errno_priv;
-        return -1;
-}
-
-int
-runner_end_reuse (runner_t *runner)
-{
-        int i = 0;
-        int ret = -1;
-        int chstat = 0;
-
-        if (runner->chpid > 0) {
-                if (waitpid (runner->chpid, &chstat, 0) == runner->chpid)
-                        ret = chstat;
-        }
-
-        for (i = 0; i < 3; i++) {
-                if (runner->chio[i]) {
-                        fclose (runner->chio[i]);
-                        runner->chio[i] = NULL;
-                }
-        }
-
-        return ret;
-}
-
-int
-runner_end (runner_t *runner)
-{
-        int i = 0;
-        int ret = -1;
-        char **p = NULL;
-
-        ret = runner_end_reuse (runner);
-
-        if (runner->argv) {
-                for (p = runner->argv; *p; p++)
-                        GF_FREE (*p);
-                GF_FREE (runner->argv);
-        }
-        for (i = 0; i < 3; i++)
-                close (runner->chfd[i]);
-
-        return ret;
-}
-
-static int
-runner_run_generic (runner_t *runner, int (*rfin)(runner_t *runner))
-{
-        int ret = 0;
-
-        ret = runner_start (runner);
-
-        return -(rfin (runner) || ret);
-}
-
-int
-runner_run (runner_t *runner)
-{
-        return runner_run_generic (runner, runner_end);
-}
-
-
-int
-runner_run_nowait (runner_t *runner)
-{
-	int pid;
-
-	pid = fork ();
-
-	if (!pid) {
-		setsid ();
-		_exit (runner_start (runner));
-	}
-
-	if (pid > 0)
-		runner->chpid = pid;
-	return runner_end (runner);
-}
-
-
-int
-runner_run_reuse (runner_t *runner)
-{
-        return runner_run_generic (runner, runner_end_reuse);
-}
-
-int
-runcmd (const char *arg, ...)
-{
-        runner_t runner;
-        va_list argp;
-
-        runinit (&runner);
-        /* ISO C requires a named argument before '...' */
-        runner_add_arg (&runner, arg);
-
-        va_start (argp, arg);
-        runner_va_add_args (&runner, argp);
-        va_end (argp);
-
-        return runner_run (&runner);
-}
-
-#ifdef RUN_DO_TESTS
-static void
-TBANNER (const char *txt)
-{
-        printf("######\n### testing %s\n", txt);
-}
-
-int
-main (int argc, char **argv)
-{
-        runner_t runner;
-        char buf[80];
-        char *wdbuf;;
-        int ret;
-        int fd;
-        long pathmax = pathconf ("/", _PC_PATH_MAX);
-        struct timeval tv = {0,};
-        struct timeval *tvp = NULL;
-
-        wdbuf = malloc (pathmax);
-        assert (wdbuf);
-        getcwd (wdbuf, pathmax);
-
-        TBANNER ("basic functionality");
-        runcmd ("echo", "a", "b", NULL);
-
-        TBANNER ("argv extension");
-        runcmd ("echo", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
-                "11", "12", "13", "14", "15", "16", "17", "18", "19", "20",
-                "21", "22", "23", "24", "25", "26", "27", "28", "29", "30",
-                "31", "32", "33", "34", "35", "36", "37", "38", "39", "40",
-                "41", "42", "43", "44", "45", "46", "47", "48", "49", "50",
-                "51", "52", "53", "54", "55", "56", "57", "58", "59", "60",
-                "61", "62", "63", "64", "65", "66", "67", "68", "69", "70",
-                "71", "72", "73", "74", "75", "76", "77", "78", "79", "80",
-                "81", "82", "83", "84", "85", "86", "87", "88", "89", "90",
-                "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", NULL);
-
-        TBANNER ("add_args, argprintf, log, and popen-style functionality");
-        runinit (&runner);
-        runner_add_args (&runner, "echo", "pid:", NULL);
-        runner_argprintf (&runner, "%d\n", getpid());
-        runner_add_arg (&runner, "wd:");
-        runner_add_arg (&runner, wdbuf);
-        runner_redir (&runner, 1, RUN_PIPE);
-        runner_start (&runner);
-        runner_log (&runner, "(x)", LOG_DEBUG, "starting program");
-        while (fgets (buf, sizeof(buf), runner_chio (&runner, 1)))
-                printf ("got: %s", buf);
-        runner_end (&runner);
-
-        TBANNER ("execve error reporting");
-        ret = runcmd ("bafflavvitty", NULL);
-        printf ("%d %d [%s]\n", ret, errno, strerror (errno));
-
-        TBANNER ("output redirection");
-        fd = mkstemp ("/tmp/foof");
-        assert (fd != -1);
-        runinit (&runner);
-        runner_add_args (&runner, "echo", "foo", NULL);
-        runner_redir (&runner, 1, fd);
-        ret = runner_run (&runner);
-        printf ("%d", ret);
-        if (ret != 0)
-                printf (" %d [%s]", errno, strerror (errno));
-        putchar ('\n');
-
-        if (argc > 1) {
-                tv.tv_sec = strtoul (argv[1], NULL, 10);
-                if (tv.tv_sec > 0)
-                        tvp = &tv;
-                select (0, 0, 0, 0, tvp);
-        }
-
-        return 0;
-}
-#endif
diff --git a/libglusterfs/src/run.h b/libglusterfs/src/run.h
deleted file mode 100644
index d7554ef6d..000000000
--- a/libglusterfs/src/run.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef __RUN_H__
-#define __RUN_H__
-
-#define RUN_PIPE -1
-
-struct runner {
-        char **argv;
-        unsigned argvlen;
-        int runerr;
-        pid_t chpid;
-        int chfd[3];
-        FILE *chio[3];
-};
-
-typedef struct runner runner_t;
-
-/**
- * initialize runner_t instance.
- *
- * @param runner pointer to runner_t instance
- */
-void runinit (runner_t *runner);
-
-/**
- * get FILE pointer to which child's stdio is redirected.
- *
- * @param runner pointer to runner_t instance
- * @param fd specifies which standard file descriptor is
- *        is asked for
- *
- * @see runner_redir()
- */
-FILE *runner_chio (runner_t *runner, int fd);
-
-/**
- * add an argument.
- *
- * 'arg' is duplicated.
- *
- * Errors are deferred, no error handling is necessary.
- *
- * @param runner pointer to runner_t instance
- * @param arg    command line argument
- */
-void runner_add_arg (runner_t *runner, const char *arg);
-
-/**
- * add a sequence of arguments.
- *
- * Variadic function, calls runner_add_arg() on each vararg.
- * Argument sequence MUST be NULL terminated.
- *
- * Errors are deferred, no error handling is necessary.
- *
- * @param runner pointer to runner_t instance
- *
- * @see runner_add_arg()
- */
-void runner_add_args (runner_t *runner, ...);
-
-/**
- * add an argument with printf style formatting.
- *
- * Errors are deferred, no error handling is necessary.
- *
- * @param runner pointer to runner_t instance
- * @param format printf style format specifier
- */
-void runner_argprintf (runner_t *runner, const char *format, ...);
-
-/**
- * log a message about the command to be run.
- *
- * @param runner  pointer to runner_t instance
- *
- * @param dom  log domain
- * @param lvl  log level
- * @param msg  message with which the command is prefixed in log
- *
- * @see gf_log()
- */
-void runner_log (runner_t *runner, const char *dom, gf_loglevel_t lvl,
-                 const char *msg);
-
-/**
- * set up redirection for child.
- *
- * @param runner  pointer to runner_t instance
- *
- * @param fd      fd of child to redirect (0, 1, or 2)
- * @param tgt_fd  fd on parent side to redirect to.
- *                Note that runner_end() will close tgt_fd,
- *                if user needs it in another context it should
- *                be dup'd beforehand.
- *                RUN_PIPE can be used for requiring a
- *                pipe from child to parent. The FILE
- *                created for this purpose will be
- *                accessible via runner_chio() (after
- *                runner_start() has been invoked).
- *
- * @see  runner_start(), dup(2), runner_chio(), runner_start()
- */
-void
-runner_redir (runner_t *runner, int fd, int tgt_fd);
-
-/**
- * spawn child with accumulated arg list.
- *
- * @param runner  pointer to runner_t instance
- *
- * @return  0 on succesful spawn
- *          -1 on failure (either due to earlier errors or execve(2) failing)
- *
- * @see runner_cout()
- */
-int runner_start (runner_t *runner);
-
-/**
- * complete operation and free resources.
- *
- * If child exists, waits for it. Redirections will be closed.
- * Dynamically allocated memory shall be freed.
- *
- * @param runner  pointer to runner_t instance
- *
- * @return  0 if child terminated successfully
- *          -1 if there is no running child
- *          n > 0 if child failed; value to be interpreted as status
- *                in waitpid(2)
- *
- * @see waitpid(2)
- */
-int runner_end (runner_t *runner);
-
-/**
- * variant of runner_end() which does not free internal data
- * so that the runner instance can be run again.
- *
- * @see runner_end()
- */
-int runner_end_reuse (runner_t *runner);
-
-/**
- * spawn and child, take it to completion and free resources.
- *
- * Essentially it's a concatenation of runner_start() and runner_end()
- * with simplified return semantics.
- *
- * @param runner  pointer to runner_t instance
- *
- * @return  0 on success
- *          -1 on failuire
- *
- * @see runner_start(), runner_end()
- */
-int runner_run (runner_t *runner);
-
-/**
- * variant for runner_run() which does not wait for acknowledgement
- * from child, and always assumes it succeeds.
- */
-int runner_run_nowait (runner_t *runner);
-
-/**
- * variant of runner_run() which does not free internal data
- * so that the runner instance can be run again.
- *
- * @see runner_run()
- */
-int runner_run_reuse (runner_t *runner);
-
-/**
- * run a command with args.
- *
- * Variadic function, child process is spawned with
- * the given sequence of args and waited for.
- * Argument sequence MUST be NULL terminated.
- *
- * @return 0 on success
- *         -1 on failure
- */
-int runcmd (const char *arg, ...);
-
-#endif
diff --git a/libglusterfs/src/scheduler.c b/libglusterfs/src/scheduler.c
new file mode 100644
index 000000000..f27875dc2
--- /dev/null
+++ b/libglusterfs/src/scheduler.c
@@ -0,0 +1,91 @@
+/*
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include <dlfcn.h>
+#include <netdb.h>
+#include "xlator.h"
+#include "scheduler.h"
+#include "list.h"
+
+struct sched_ops *
+get_scheduler (xlator_t *xl, const char *name)
+{
+        struct sched_ops  *tmp_sched = NULL;
+        volume_opt_list_t *vol_opt   = NULL;
+        char *sched_file             = NULL;
+        void *handle                 = NULL;
+        int   ret                    = 0;
+
+        if (name == NULL) {
+                gf_log ("scheduler", GF_LOG_ERROR,
+                        "'name' not specified, EINVAL");
+                return NULL;
+        }
+
+        ret = gf_asprintf (&sched_file, "%s/%s.so", SCHEDULERDIR, name);
+        if (-1 == ret) {
+                gf_log ("scheduler", GF_LOG_ERROR, "asprintf failed");
+                return NULL;
+        }
+
+        gf_log ("scheduler", GF_LOG_DEBUG,
+                "attempt to load file %s.so", name);
+
+        handle = dlopen (sched_file, RTLD_LAZY);
+        if (!handle) {
+                gf_log ("scheduler", GF_LOG_ERROR,
+                        "dlopen(%s): %s", sched_file, dlerror ());
+                GF_FREE(sched_file);
+                return NULL;
+        }
+
+        tmp_sched = dlsym (handle, "sched");
+        if (!tmp_sched) {
+                gf_log ("scheduler", GF_LOG_ERROR,
+                        "dlsym(sched) on %s", dlerror ());
+                GF_FREE(sched_file);
+                return NULL;
+        }
+
+        vol_opt = GF_CALLOC (1, sizeof (volume_opt_list_t),
+                             gf_common_mt_volume_opt_list_t);
+        vol_opt->given_opt = dlsym (handle, "options");
+        if (vol_opt->given_opt == NULL) {
+                gf_log ("scheduler", GF_LOG_DEBUG,
+                        "volume option validation not specified");
+        } else {
+                list_add_tail (&vol_opt->list, &xl->volume_options);
+                if (validate_xlator_volume_options (xl, vol_opt->given_opt)
+                    == -1) {
+                        gf_log ("scheduler", GF_LOG_ERROR,
+                                "volume option validation failed");
+                        GF_FREE(sched_file);
+                        return NULL;
+                }
+        }
+        GF_FREE(sched_file);
+        GF_FREE (vol_opt);
+
+        return tmp_sched;
+}
diff --git a/libglusterfs/src/scheduler.h b/libglusterfs/src/scheduler.h
new file mode 100644
index 000000000..acb6597b9
--- /dev/null
+++ b/libglusterfs/src/scheduler.h
@@ -0,0 +1,41 @@
+/*
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _SCHEDULER_H
+#define _SCHEDULER_H
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include "xlator.h"
+
+struct sched_ops {
+  int32_t (*init) (xlator_t *this);
+  void (*fini) (xlator_t *this);
+  void (*update) (xlator_t *this);
+  xlator_t *(*schedule) (xlator_t *this, const void *path);
+  void (*notify) (xlator_t *xl, int32_t event, void *data);
+  int32_t (*mem_acct_init) (xlator_t *this);
+};
+
+extern struct sched_ops *get_scheduler (xlator_t *xl, const char *name);
+
+#endif /* _SCHEDULER_H */
diff --git a/libglusterfs/src/stack.c b/libglusterfs/src/stack.c
index 37b338f51..f4110528c 100644
--- a/libglusterfs/src/stack.c
+++ b/libglusterfs/src/stack.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include "statedump.h"
@@ -26,53 +35,15 @@ int call_frames_count (call_frame_t *call_frame)
         return count;
 }
 
-call_frame_t *
-create_frame (xlator_t *xl, call_pool_t *pool)
-{
-        call_stack_t    *stack = NULL;
-
-        if (!xl || !pool) {
-                return NULL;
-        }
-
-        stack = mem_get0 (pool->stack_mem_pool);
-        if (!stack)
-                return NULL;
-
-        stack->pool = pool;
-        stack->frames.root = stack;
-        stack->frames.this = xl;
-        stack->ctx = xl->ctx;
-
-        if (stack->ctx->measure_latency) {
-                if (gettimeofday (&stack->tv, NULL) == -1)
-                        gf_log ("stack", GF_LOG_ERROR, "gettimeofday () failed."
-                                " (%s)", strerror (errno));
-                memcpy (&stack->frames.begin, &stack->tv, sizeof (stack->tv));
-        }
-
-        LOCK (&pool->lock);
-        {
-                list_add (&stack->all_frames, &pool->all_frames);
-                pool->cnt++;
-        }
-        UNLOCK (&pool->lock);
-
-        LOCK_INIT (&stack->frames.lock);
-        LOCK_INIT (&stack->stack_lock);
-
-        return &stack->frames;
-}
-
 void
 gf_proc_dump_call_frame (call_frame_t *call_frame, const char *key_buf,...)
 {
 
         char prefix[GF_DUMP_MAX_BUF_LEN];
         va_list ap;
+        char key[GF_DUMP_MAX_BUF_LEN];
         call_frame_t my_frame;
         int  ret = -1;
-        char timestr[256] = {0,};
 
         if (!call_frame)
                 return;
@@ -86,45 +57,40 @@ gf_proc_dump_call_frame (call_frame_t *call_frame, const char *key_buf,...)
         va_end(ap);
 
         ret = TRY_LOCK(&call_frame->lock);
-        if (ret)
-                goto out;
+        if (ret) {
+                gf_log("", GF_LOG_WARNING, "Unable to dump call frame"
+                       " errno: %s", strerror (errno));
+                return;
+        }
 
         memcpy(&my_frame, call_frame, sizeof(my_frame));
         UNLOCK(&call_frame->lock);
 
-        if (my_frame.this->ctx->measure_latency) {
-                gf_time_fmt (timestr, sizeof timestr, my_frame.begin.tv_sec,
-                             gf_timefmt_FT);
-                snprintf (timestr + strlen (timestr),
-                          sizeof timestr - strlen (timestr),
-                          ".%"GF_PRI_SUSECONDS, my_frame.begin.tv_usec);
-                gf_proc_dump_write("frame-creation-time", "%s", timestr);
+        gf_proc_dump_build_key(key, prefix,"ref_count");
+        gf_proc_dump_write(key, "%d", my_frame.ref_count);
+        gf_proc_dump_build_key(key, prefix,"translator");
+        gf_proc_dump_write(key, "%s", my_frame.this->name);
+        gf_proc_dump_build_key(key, prefix,"complete");
+        gf_proc_dump_write(key, "%d", my_frame.complete);
+        if (my_frame.parent) {
+                gf_proc_dump_build_key(key, prefix,"parent");
+                gf_proc_dump_write(key, "%s", my_frame.parent->this->name);
         }
-
-        gf_proc_dump_write("ref_count", "%d", my_frame.ref_count);
-        gf_proc_dump_write("translator", "%s", my_frame.this->name);
-        gf_proc_dump_write("complete", "%d", my_frame.complete);
-        if (my_frame.parent)
-                gf_proc_dump_write("parent", "%s", my_frame.parent->this->name);
-
-        if (my_frame.wind_from)
-                gf_proc_dump_write("wind_from", "%s", my_frame.wind_from);
-
-        if (my_frame.wind_to)
-                gf_proc_dump_write("wind_to", "%s", my_frame.wind_to);
-
-        if (my_frame.unwind_from)
-                gf_proc_dump_write("unwind_from", "%s", my_frame.unwind_from);
-
-        if (my_frame.unwind_to)
-                gf_proc_dump_write("unwind_to", "%s", my_frame.unwind_to);
-
-        ret = 0;
-out:
-        if (ret) {
-                gf_proc_dump_write("Unable to dump the frame information",
-                                   "(Lock acquisition failed) %p", my_frame);
-                return;
+        if (my_frame.wind_from) {
+                gf_proc_dump_build_key(key, prefix, "wind_from");
+                gf_proc_dump_write(key, "%s", my_frame.wind_from);
+        }
+        if (my_frame.wind_to) {
+                gf_proc_dump_build_key(key, prefix, "wind_to");
+                gf_proc_dump_write(key, "%s", my_frame.wind_to);
+        }
+        if (my_frame.unwind_from) {
+                gf_proc_dump_build_key(key, prefix, "unwind_from");
+                gf_proc_dump_write(key, "%s", my_frame.unwind_from);
+        }
+        if (my_frame.unwind_to) {
+                gf_proc_dump_build_key(key, prefix, "unwind_to");
+                gf_proc_dump_write(key, "%s", my_frame.unwind_to);
         }
 }
 
@@ -136,7 +102,7 @@ gf_proc_dump_call_stack (call_stack_t *call_stack, const char *key_buf,...)
         va_list ap;
         call_frame_t *trav;
         int32_t cnt, i;
-        char timestr[256] = {0,};
+        char key[GF_DUMP_MAX_BUF_LEN];
 
         if (!call_stack)
                 return;
@@ -150,29 +116,25 @@ gf_proc_dump_call_stack (call_stack_t *call_stack, const char *key_buf,...)
         vsnprintf(prefix, GF_DUMP_MAX_BUF_LEN, key_buf, ap);
         va_end(ap);
 
-        if (call_stack->ctx->measure_latency) {
-                gf_time_fmt (timestr, sizeof timestr, call_stack->tv.tv_sec,
-                             gf_timefmt_FT);
-                snprintf (timestr + strlen (timestr),
-                          sizeof timestr - strlen (timestr),
-                          ".%"GF_PRI_SUSECONDS, call_stack->tv.tv_usec);
-        gf_proc_dump_write("callstack-creation-time", "%s", timestr);
-        }
-
-        gf_proc_dump_write("uid", "%d", call_stack->uid);
-        gf_proc_dump_write("gid", "%d", call_stack->gid);
-        gf_proc_dump_write("pid", "%d", call_stack->pid);
-        gf_proc_dump_write("unique", "%Ld", call_stack->unique);
-        gf_proc_dump_write("lk-owner", "%s", lkowner_utoa (&call_stack->lk_owner));
+        gf_proc_dump_build_key(key, prefix,"uid");
+        gf_proc_dump_write(key, "%d", call_stack->uid);
+        gf_proc_dump_build_key(key, prefix,"gid");
+        gf_proc_dump_write(key, "%d", call_stack->gid);
+        gf_proc_dump_build_key(key, prefix,"pid");
+        gf_proc_dump_write(key, "%d", call_stack->pid);
+        gf_proc_dump_build_key(key, prefix,"unique");
+        gf_proc_dump_write(key, "%Ld", call_stack->unique);
 
+        gf_proc_dump_build_key(key, prefix,"op");
         if (call_stack->type == GF_OP_TYPE_FOP)
-                gf_proc_dump_write("op", "%s",
-                                   (char *)gf_fop_list[call_stack->op]);
-        else
-                gf_proc_dump_write("op", "stack");
+                gf_proc_dump_write(key, "%s", gf_fop_list[call_stack->op]);
+        else if (call_stack->type == GF_OP_TYPE_MGMT)
+                gf_proc_dump_write(key, "%s", gf_mgmt_list[call_stack->op]);
 
-        gf_proc_dump_write("type", "%d", call_stack->type);
-        gf_proc_dump_write("cnt", "%d", cnt);
+        gf_proc_dump_build_key(key, prefix,"type");
+        gf_proc_dump_write(key, "%d", call_stack->type);
+        gf_proc_dump_build_key(key, prefix,"cnt");
+        gf_proc_dump_write(key, "%d", cnt);
 
         trav = &call_stack->frames;
 
@@ -192,20 +154,21 @@ gf_proc_dump_pending_frames (call_pool_t *call_pool)
         call_stack_t     *trav = NULL;
         int              i = 1;
         int              ret = -1;
-        gf_boolean_t     section_added = _gf_true;
 
         if (!call_pool)
                 return;
 
         ret = TRY_LOCK (&(call_pool->lock));
-        if (ret)
-                goto out;
+        if (ret) {
+                gf_log("", GF_LOG_WARNING, "Unable to dump call pool"
+                       " errno: %d", errno);
+                return;
+        }
 
 
         gf_proc_dump_add_section("global.callpool");
-        section_added = _gf_true;
-        gf_proc_dump_write("callpool_address","%p", call_pool);
-        gf_proc_dump_write("callpool.cnt","%d", call_pool->cnt);
+        gf_proc_dump_write("global.callpool","%p", call_pool);
+        gf_proc_dump_write("global.callpool.cnt","%d", call_pool->cnt);
 
 
         list_for_each_entry (trav, &call_pool->all_frames, all_frames) {
@@ -214,209 +177,6 @@ gf_proc_dump_pending_frames (call_pool_t *call_pool)
                 i++;
         }
         UNLOCK (&(call_pool->lock));
-
-        ret = 0;
-out:
-        if (ret) {
-                if (_gf_false == section_added)
-                        gf_proc_dump_add_section("global.callpool");
-                gf_proc_dump_write("Unable to dump the callpool",
-                                   "(Lock acquisition failed) %p",
-                                   call_pool);
-        }
-        return;
-}
-
-void
-gf_proc_dump_call_frame_to_dict (call_frame_t *call_frame,
-                                 char *prefix, dict_t *dict)
-{
-        int             ret = -1;
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-        call_frame_t    tmp_frame = {0,};
-
-        if (!call_frame || !dict)
-                return;
-
-        ret = TRY_LOCK (&call_frame->lock);
-        if (ret)
-                return;
-        memcpy (&tmp_frame, call_frame, sizeof (tmp_frame));
-        UNLOCK (&call_frame->lock);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.refcount", prefix);
-        ret = dict_set_int32 (dict, key, tmp_frame.ref_count);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.translator", prefix);
-        ret = dict_set_dynstr (dict, key, gf_strdup (tmp_frame.this->name));
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.complete", prefix);
-        ret = dict_set_int32 (dict, key, tmp_frame.complete);
-        if (ret)
-                return;
-
-        if (tmp_frame.parent) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.parent", prefix);
-                ret = dict_set_dynstr (dict, key,
-                                    gf_strdup (tmp_frame.parent->this->name));
-                if (ret)
-                        return;
-        }
-
-        if (tmp_frame.wind_from) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.windfrom", prefix);
-                ret = dict_set_dynstr (dict, key,
-                                       gf_strdup (tmp_frame.wind_from));
-                if (ret)
-                        return;
-        }
-
-        if (tmp_frame.wind_to) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.windto", prefix);
-                ret = dict_set_dynstr (dict, key,
-                                       gf_strdup (tmp_frame.wind_to));
-                if (ret)
-                        return;
-        }
-
-        if (tmp_frame.unwind_from) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.unwindfrom", prefix);
-                ret = dict_set_dynstr (dict, key,
-                                       gf_strdup (tmp_frame.unwind_from));
-                if (ret)
-                        return;
-        }
-
-        if (tmp_frame.unwind_to) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "%s.unwind_to", prefix);
-                ret = dict_set_dynstr (dict, key,
-                                       gf_strdup (tmp_frame.unwind_to));
-        }
-
-        return;
-}
-
-void
-gf_proc_dump_call_stack_to_dict (call_stack_t *call_stack,
-                                 char *prefix, dict_t *dict)
-{
-        int             ret = -1;
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-        call_frame_t    *trav = NULL;
-        int             count = 0;
-        int             i = 0;
-
-        if (!call_stack || !dict)
-                return;
-
-        count = call_frames_count (&call_stack->frames);
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.uid", prefix);
-        ret = dict_set_int32 (dict, key, call_stack->uid);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.gid", prefix);
-        ret = dict_set_int32 (dict, key, call_stack->gid);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.pid", prefix);
-        ret = dict_set_int32 (dict, key, call_stack->pid);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.unique", prefix);
-        ret = dict_set_uint64 (dict, key, call_stack->unique);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.op", prefix);
-        if (call_stack->type == GF_OP_TYPE_FOP)
-                ret = dict_set_str (dict, key,
-                                    (char *)gf_fop_list[call_stack->op]);
-        else
-                ret = dict_set_str (dict, key, "other");
-
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.type", prefix);
-        ret = dict_set_int32 (dict, key, call_stack->type);
-        if (ret)
-                return;
-
-        memset (key, 0, sizeof (key));
-        snprintf (key, sizeof (key), "%s.count", prefix);
-        ret = dict_set_int32 (dict, key, count);
-        if (ret)
-                return;
-
-        trav = &call_stack->frames;
-        for (i = 0; i < count; i++) {
-                if (trav) {
-                        memset (key, 0, sizeof (key));
-                        snprintf (key, sizeof (key), "%s.frame%d",
-                                  prefix, i);
-                        gf_proc_dump_call_frame_to_dict (trav, key, dict);
-                        trav = trav->next;
-                }
-        }
-
-        return;
-}
-
-void
-gf_proc_dump_pending_frames_to_dict (call_pool_t *call_pool, dict_t *dict)
-{
-        int             ret = -1;
-        call_stack_t    *trav = NULL;
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-        int             i = 0;
-
-        if (!call_pool || !dict)
-                return;
-
-        ret = TRY_LOCK (&call_pool->lock);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING, "Unable to dump call pool"
-                        " to dict. errno: %d", errno);
-                return;
-        }
-
-        ret = dict_set_int32 (dict, "callpool.count", call_pool->cnt);
-        if (ret)
-                goto out;
-
-        list_for_each_entry (trav, &call_pool->all_frames, all_frames) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "callpool.stack%d", i);
-                gf_proc_dump_call_stack_to_dict (trav, key, dict);
-                i++;
-        }
-
-out:
-        UNLOCK (&call_pool->lock);
-
-        return;
 }
 
 gf_boolean_t
diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h
index f2d2ef950..d867a4d56 100644
--- a/libglusterfs/src/stack.h
+++ b/libglusterfs/src/stack.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -25,8 +34,8 @@ struct _call_stack_t;
 typedef struct _call_stack_t call_stack_t;
 struct _call_frame_t;
 typedef struct _call_frame_t call_frame_t;
-struct call_pool;
-typedef struct call_pool call_pool_t;
+struct _call_pool_t;
+typedef struct _call_pool_t call_pool_t;
 
 #include <sys/time.h>
 
@@ -35,11 +44,9 @@ typedef struct call_pool call_pool_t;
 #include "list.h"
 #include "common-utils.h"
 #include "globals.h"
-#include "lkowner.h"
-#include "client_t.h"
 
 #define NFS_PID 1
-#define LOW_PRIO_PROC_PID -1
+#define SELF_HEAL_PID -1
 typedef int32_t (*ret_fn_t) (call_frame_t *frame,
                              call_frame_t *prev_frame,
                              xlator_t *this,
@@ -47,7 +54,7 @@ typedef int32_t (*ret_fn_t) (call_frame_t *frame,
                              int32_t op_errno,
                              ...);
 
-struct call_pool {
+struct _call_pool_t {
         union {
                 struct list_head   all_frames;
                 struct {
@@ -83,8 +90,6 @@ struct _call_frame_t {
         const char      *unwind_to;
 };
 
-#define SMALL_GROUP_COUNT 128
-
 struct _call_stack_t {
         union {
                 struct list_head      all_frames;
@@ -94,25 +99,20 @@ struct _call_stack_t {
                 };
         };
         call_pool_t                  *pool;
-        gf_lock_t                     stack_lock;
-        client_t                     *client;
+        void                         *trans;
         uint64_t                      unique;
         void                         *state;  /* pointer to request state */
         uid_t                         uid;
         gid_t                         gid;
         pid_t                         pid;
-        uint16_t                      ngrps;
-        uint32_t                      groups_small[SMALL_GROUP_COUNT];
-	uint32_t                     *groups_large;
-	uint32_t                     *groups;
-        gf_lkowner_t                  lk_owner;
-        glusterfs_ctx_t              *ctx;
+        uint32_t                      ngrps;
+        uint32_t                      groups[GF_REQUEST_MAXGROUPS];
+        uint64_t                      lk_owner;
 
         call_frame_t                  frames;
 
         int32_t                       op;
         int8_t                        type;
-        struct timeval                tv;
 };
 
 
@@ -129,10 +129,11 @@ struct _call_stack_t {
 struct xlator_fops;
 
 void
-gf_latency_begin (call_frame_t *frame, void *fn);
+gf_set_fop_from_fn_pointer (call_frame_t *frame, struct xlator_fops *fops,
+                            void *fn);
 
 void
-gf_latency_end (call_frame_t *frame);
+gf_update_latency (call_frame_t *frame);
 
 static inline void
 FRAME_DESTROY (call_frame_t *frame)
@@ -149,10 +150,10 @@ FRAME_DESTROY (call_frame_t *frame)
         }
 
         LOCK_DESTROY (&frame->lock);
-        mem_put (frame);
+        mem_put (frame->root->pool->frame_mem_pool, frame);
 
         if (local)
-                mem_put (local);
+                GF_FREE (local);
 }
 
 
@@ -174,37 +175,16 @@ STACK_DESTROY (call_stack_t *stack)
         }
 
         LOCK_DESTROY (&stack->frames.lock);
-        LOCK_DESTROY (&stack->stack_lock);
 
         while (stack->frames.next) {
                 FRAME_DESTROY (stack->frames.next);
         }
-
-	GF_FREE (stack->groups_large);
-
-        mem_put (stack);
+        mem_put (stack->pool->stack_mem_pool, stack);
 
         if (local)
-                mem_put (local);
+                GF_FREE (local);
 }
 
-static inline void
-STACK_RESET (call_stack_t *stack)
-{
-        void *local = NULL;
-
-        if (stack->frames.local) {
-                local = stack->frames.local;
-                stack->frames.local = NULL;
-        }
-
-        while (stack->frames.next) {
-                FRAME_DESTROY (stack->frames.next);
-        }
-
-        if (local)
-                mem_put (local);
-}
 
 #define cbk(x) cbk_##x
 
@@ -238,48 +218,27 @@ STACK_RESET (call_stack_t *stack)
                 }                                                       \
                 typeof(fn##_cbk) tmp_cbk = rfn;                         \
                 _new->root = frame->root;                               \
+                _new->next = frame->root->frames.next;                  \
+                _new->prev = &frame->root->frames;                      \
+                if (frame->root->frames.next)                           \
+                        frame->root->frames.next->prev = _new;          \
+                frame->root->frames.next = _new;                        \
                 _new->this = obj;                                       \
                 _new->ret = (ret_fn_t) tmp_cbk;                         \
                 _new->parent = frame;                                   \
                 _new->cookie = _new;                                    \
+                LOCK_INIT (&_new->lock);                                \
                 _new->wind_from = __FUNCTION__;                         \
                 _new->wind_to = #fn;                                    \
                 _new->unwind_to = #rfn;                                 \
-                                                                        \
-                LOCK_INIT (&_new->lock);                                \
-                LOCK(&frame->root->stack_lock);                         \
-                {                                                       \
-                        _new->next = frame->root->frames.next;          \
-                        _new->prev = &frame->root->frames;              \
-                        if (frame->root->frames.next)                   \
-                                frame->root->frames.next->prev = _new;  \
-                        frame->root->frames.next = _new;                \
-                        frame->ref_count++;                             \
-                }                                                       \
-                UNLOCK(&frame->root->stack_lock);                       \
+                frame->ref_count++;                                     \
                 old_THIS = THIS;                                        \
                 THIS = obj;                                             \
-                if (frame->this->ctx->measure_latency)                  \
-                        gf_latency_begin (_new, fn);                    \
                 fn (_new, obj, params);                                 \
                 THIS = old_THIS;                                        \
         } while (0)
 
 
-/* make a call without switching frames */
-#define STACK_WIND_TAIL(frame, obj, fn, params ...)                     \
-        do {                                                            \
-                xlator_t     *old_THIS = NULL;                          \
-                                                                        \
-                frame->this = obj;                                      \
-                frame->wind_to = #fn;                                   \
-                old_THIS = THIS;                                        \
-                THIS = obj;                                             \
-                fn (frame, obj, params);                                \
-                THIS = old_THIS;                                        \
-        } while (0)
-
-
 /* make a call with a cookie */
 #define STACK_WIND_COOKIE(frame, rfn, cky, obj, fn, params ...)         \
         do {                                                            \
@@ -293,29 +252,23 @@ STACK_RESET (call_stack_t *stack)
                 }                                                       \
                 typeof(fn##_cbk) tmp_cbk = rfn;                         \
                 _new->root = frame->root;                               \
+                _new->next = frame->root->frames.next;                  \
+                _new->prev = &frame->root->frames;                      \
+                if (frame->root->frames.next)                           \
+                        frame->root->frames.next->prev = _new;          \
+                frame->root->frames.next = _new;                        \
                 _new->this = obj;                                       \
                 _new->ret = (ret_fn_t) tmp_cbk;                         \
                 _new->parent = frame;                                   \
                 _new->cookie = cky;                                     \
+                LOCK_INIT (&_new->lock);                                \
                 _new->wind_from = __FUNCTION__;                         \
                 _new->wind_to = #fn;                                    \
                 _new->unwind_to = #rfn;                                 \
-                LOCK_INIT (&_new->lock);                                \
-                LOCK(&frame->root->stack_lock);                         \
-                {                                                       \
-                        frame->ref_count++;                             \
-                        _new->next = frame->root->frames.next;          \
-                        _new->prev = &frame->root->frames;              \
-                        if (frame->root->frames.next)                   \
-                                frame->root->frames.next->prev = _new;  \
-                        frame->root->frames.next = _new;                \
-                }                                                       \
-                UNLOCK(&frame->root->stack_lock);                       \
+                frame->ref_count++;                                     \
                 fn##_cbk = rfn;                                         \
                 old_THIS = THIS;                                        \
                 THIS = obj;                                             \
-                if (obj->ctx->measure_latency)                          \
-                        gf_latency_begin (_new, fn);                    \
                 fn (_new, obj, params);                                 \
                 THIS = old_THIS;                                        \
         } while (0)
@@ -333,17 +286,11 @@ STACK_RESET (call_stack_t *stack)
                 }                                                       \
                 fn = frame->ret;                                        \
                 _parent = frame->parent;                                \
-                LOCK(&frame->root->stack_lock);                         \
-                {                                                       \
-                        _parent->ref_count--;                           \
-                }                                                       \
-                UNLOCK(&frame->root->stack_lock);                       \
+                _parent->ref_count--;                                   \
                 old_THIS = THIS;                                        \
                 THIS = _parent->this;                                   \
                 frame->complete = _gf_true;                             \
                 frame->unwind_from = __FUNCTION__;                      \
-                if (frame->this->ctx->measure_latency)                  \
-                        gf_latency_end (frame);                         \
                 fn (_parent, frame->cookie, _parent->this, params);     \
                 THIS = old_THIS;                                        \
         } while (0)
@@ -362,40 +309,16 @@ STACK_RESET (call_stack_t *stack)
                 }                                                       \
                 fn = (fop_##op##_cbk_t )frame->ret;                     \
                 _parent = frame->parent;                                \
-                LOCK(&frame->root->stack_lock);                         \
-                {                                                       \
-                        _parent->ref_count--;                           \
-                }                                                       \
-                UNLOCK(&frame->root->stack_lock);                       \
+                _parent->ref_count--;                                   \
                 old_THIS = THIS;                                        \
                 THIS = _parent->this;                                   \
                 frame->complete = _gf_true;                             \
                 frame->unwind_from = __FUNCTION__;                      \
-                if (frame->this->ctx->measure_latency)                  \
-                        gf_latency_end (frame);                         \
                 fn (_parent, frame->cookie, _parent->this, params);     \
                 THIS = old_THIS;                                        \
         } while (0)
 
 
-static inline int
-call_stack_alloc_groups (call_stack_t *stack, int ngrps)
-{
-	if (ngrps <= SMALL_GROUP_COUNT) {
-		stack->groups = stack->groups_small;
-	} else {
-		stack->groups_large = GF_CALLOC (sizeof (gid_t), ngrps,
-						 gf_common_mt_groups_t);
-		if (!stack->groups_large)
-			return -1;
-		stack->groups = stack->groups_large;
-	}
-
-	stack->ngrps = ngrps;
-
-	return 0;
-}
-
 static inline call_frame_t *
 copy_frame (call_frame_t *frame)
 {
@@ -419,30 +342,16 @@ copy_frame (call_frame_t *frame)
         newstack->ngrps = oldstack->ngrps;
         newstack->op  = oldstack->op;
         newstack->type = oldstack->type;
-	if (call_stack_alloc_groups (newstack, oldstack->ngrps) != 0) {
-		mem_put (newstack);
-		return NULL;
-	}
         memcpy (newstack->groups, oldstack->groups,
-                sizeof (gid_t) * oldstack->ngrps);
+                sizeof (uint32_t) * GF_REQUEST_MAXGROUPS);
         newstack->unique = oldstack->unique;
 
         newstack->frames.this = frame->this;
         newstack->frames.root = newstack;
         newstack->pool = oldstack->pool;
         newstack->lk_owner = oldstack->lk_owner;
-        newstack->ctx = oldstack->ctx;
-
-        if (newstack->ctx->measure_latency) {
-                if (gettimeofday (&newstack->tv, NULL) == -1)
-                        gf_log ("stack", GF_LOG_ERROR, "gettimeofday () failed."
-                                " (%s)", strerror (errno));
-                memcpy (&newstack->frames.begin, &newstack->tv,
-                        sizeof (newstack->tv));
-        }
 
         LOCK_INIT (&newstack->frames.lock);
-        LOCK_INIT (&newstack->stack_lock);
 
         LOCK (&oldstack->pool->lock);
         {
@@ -454,9 +363,37 @@ copy_frame (call_frame_t *frame)
         return &newstack->frames;
 }
 
+
+static inline call_frame_t *
+create_frame (xlator_t *xl, call_pool_t *pool)
+{
+        call_stack_t    *stack = NULL;
+
+        if (!xl || !pool) {
+                return NULL;
+        }
+
+        stack = mem_get0 (pool->stack_mem_pool);
+        if (!stack)
+                return NULL;
+
+        stack->pool = pool;
+        stack->frames.root = stack;
+        stack->frames.this = xl;
+
+        LOCK (&pool->lock);
+        {
+                list_add (&stack->all_frames, &pool->all_frames);
+                pool->cnt++;
+        }
+        UNLOCK (&pool->lock);
+
+        LOCK_INIT (&stack->frames.lock);
+
+        return &stack->frames;
+}
+
 void gf_proc_dump_pending_frames(call_pool_t *call_pool);
-void gf_proc_dump_pending_frames_to_dict (call_pool_t *call_pool,
-                                          dict_t *dict);
-call_frame_t *create_frame (xlator_t *xl, call_pool_t *pool);
+
 gf_boolean_t __is_fuse_call (call_frame_t *frame);
 #endif /* _STACK_H */
diff --git a/libglusterfs/src/statedump.c b/libglusterfs/src/statedump.c
index 8175faba4..57447c4d9 100644
--- a/libglusterfs/src/statedump.c
+++ b/libglusterfs/src/statedump.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <stdarg.h>
@@ -14,15 +23,13 @@
 #include "iobuf.h"
 #include "statedump.h"
 #include "stack.h"
-#include "common-utils.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif /* MALLOC_H */
 
 /* We don't want gf_log in this function because it may cause
-   'deadlock' with statedump. This is because statedump happens
-   inside a signal handler and cannot afford to block on a lock.*/
+   'deadlock' with statedump */
 #ifdef gf_log
 # undef gf_log
 #endif
@@ -53,12 +60,17 @@ gf_proc_dump_unlock (void)
         pthread_mutex_unlock (&gf_proc_dump_mutex);
 }
 
+
 static int
-gf_proc_dump_open (char *tmpname)
+gf_proc_dump_open (void)
 {
+        char path[256];
         int  dump_fd = -1;
 
-        dump_fd = mkstemp (tmpname);
+        memset (path, 0, sizeof (path));
+        snprintf (path, sizeof (path), "%s.%d", GF_DUMP_LOGFILE_ROOT, getpid ());
+
+        dump_fd = open (path, O_CREAT|O_RDWR|O_TRUNC|O_APPEND, 0600);
         if (dump_fd < 0)
                 return -1;
 
@@ -66,6 +78,7 @@ gf_proc_dump_open (char *tmpname)
         return 0;
 }
 
+
 static void
 gf_proc_dump_close (void)
 {
@@ -73,52 +86,14 @@ gf_proc_dump_close (void)
         gf_dump_fd = -1;
 }
 
-static int
-gf_proc_dump_set_path (char *dump_options_file)
-{
-        int     ret = -1;
-        FILE    *fp = NULL;
-        char    buf[256];
-        char    *key = NULL, *value = NULL;
-        char    *saveptr = NULL;
-
-        fp = fopen (dump_options_file, "r");
-        if (!fp)
-                goto out;
-
-        ret = fscanf (fp, "%s", buf);
-
-        while (ret != EOF) {
-                key = strtok_r (buf, "=", &saveptr);
-                if (!key) {
-                        ret = fscanf (fp, "%s", buf);
-                        continue;
-                }
-
-                value = strtok_r (NULL, "=", &saveptr);
-
-                if (!value) {
-                        ret = fscanf (fp, "%s", buf);
-                        continue;
-                }
-                if (!strcmp (key, "path")) {
-                        dump_options.dump_path = gf_strdup (value);
-                        break;
-                }
-        }
-
-out:
-        if (fp)
-                fclose (fp);
-        return ret;
-}
 
-int
+void
 gf_proc_dump_add_section (char *key, ...)
 {
 
         char buf[GF_DUMP_MAX_BUF_LEN];
         va_list ap;
+        int     ret;
 
         GF_ASSERT(key);
 
@@ -130,17 +105,18 @@ gf_proc_dump_add_section (char *key, ...)
         va_end (ap);
         snprintf (buf + strlen(buf),
                   GF_DUMP_MAX_BUF_LEN - strlen (buf),  "]\n");
-        return write (gf_dump_fd, buf, strlen (buf));
+        ret = write (gf_dump_fd, buf, strlen (buf));
 }
 
 
-int
+void
 gf_proc_dump_write (char *key, char *value,...)
 {
 
         char         buf[GF_DUMP_MAX_BUF_LEN];
         int          offset = 0;
         va_list      ap;
+        int          ret;
 
         GF_ASSERT (key);
 
@@ -156,12 +132,14 @@ gf_proc_dump_write (char *key, char *value,...)
 
         offset = strlen (buf);
         snprintf (buf + offset, GF_DUMP_MAX_BUF_LEN - offset, "\n");
-        return write (gf_dump_fd, buf, strlen (buf));
+        ret = write (gf_dump_fd, buf, strlen (buf));
 }
 
 static void
 gf_proc_dump_xlator_mem_info (xlator_t *xl)
 {
+        char    key[GF_DUMP_MAX_BUF_LEN];
+        char    prefix[GF_DUMP_MAX_BUF_LEN];
         int     i = 0;
         struct mem_acct rec = {0,};
 
@@ -171,7 +149,7 @@ gf_proc_dump_xlator_mem_info (xlator_t *xl)
         if (!xl->mem_acct.rec)
                 return;
 
-        gf_proc_dump_add_section ("%s.%s - Memory usage", xl->type, xl->name);
+        gf_proc_dump_add_section ("%s.%s - Memory usage", xl->type,xl->name);
         gf_proc_dump_write ("num_types", "%d", xl->mem_acct.num_types);
 
         for (i = 0; i < xl->mem_acct.num_types; i++) {
@@ -179,53 +157,18 @@ gf_proc_dump_xlator_mem_info (xlator_t *xl)
                               sizeof (struct mem_acct))))
                         continue;
 
-                gf_proc_dump_add_section ("%s.%s - usage-type %d memusage",
-                                          xl->type, xl->name, i);
-                gf_proc_dump_write ("size", "%u", xl->mem_acct.rec[i].size);
-                gf_proc_dump_write ("num_allocs", "%u",
-                                    xl->mem_acct.rec[i].num_allocs);
-                gf_proc_dump_write ("max_size", "%u",
-                                    xl->mem_acct.rec[i].max_size);
-                gf_proc_dump_write ("max_num_allocs", "%u",
-                                    xl->mem_acct.rec[i].max_num_allocs);
-                gf_proc_dump_write ("total_allocs", "%u",
-                                    xl->mem_acct.rec[i].total_allocs);
-        }
-
-        return;
-}
-
-static void
-gf_proc_dump_xlator_mem_info_only_in_use (xlator_t *xl)
-{
-        int     i = 0;
-
-        if (!xl)
-                return;
-
-        if (!xl->mem_acct.rec)
-                return;
-
-        gf_proc_dump_add_section ("%s.%s - Memory usage", xl->type, xl->name);
-        gf_proc_dump_write ("num_types", "%d", xl->mem_acct.num_types);
-
-        for (i = 0; i < xl->mem_acct.num_types; i++) {
-                if (!xl->mem_acct.rec[i].size)
-                        continue;
-
                 gf_proc_dump_add_section ("%s.%s - usage-type %d", xl->type,
                                           xl->name,i);
-
-                gf_proc_dump_write ("size", "%u",
-                                    xl->mem_acct.rec[i].size);
-                gf_proc_dump_write ("max_size", "%u",
-                                    xl->mem_acct.rec[i].max_size);
-                gf_proc_dump_write ("num_allocs", "%u",
-                                    xl->mem_acct.rec[i].num_allocs);
-                gf_proc_dump_write ("max_num_allocs", "%u",
-                                    xl->mem_acct.rec[i].max_num_allocs);
-                gf_proc_dump_write ("total_allocs", "%u",
-                                    xl->mem_acct.rec[i].total_allocs);
+                gf_proc_dump_build_key (prefix, "memusage", "%s.%s.type.%d",
+                                        xl->type, xl->name, i);
+                gf_proc_dump_build_key (key, prefix, "size");
+                gf_proc_dump_write (key, "%u", xl->mem_acct.rec[i].size);
+                gf_proc_dump_build_key (key, prefix, "num_allocs");
+                gf_proc_dump_write (key, "%u", xl->mem_acct.rec[i].num_allocs);
+                gf_proc_dump_build_key (key, prefix, "max_size");
+                gf_proc_dump_write (key, "%u", xl->mem_acct.rec[i].max_size);
+                gf_proc_dump_build_key (key, prefix, "max_num_allocs");
+                gf_proc_dump_write (key, "%u", xl->mem_acct.rec[i].max_num_allocs);
         }
 
         return;
@@ -259,243 +202,126 @@ gf_proc_dump_mem_info ()
 
 }
 
-void
-gf_proc_dump_mem_info_to_dict (dict_t *dict)
-{
-        if (!dict)
-                return;
-#ifdef HAVE_MALLOC_STATS
-        struct  mallinfo info;
-        int     ret = -1;
-
-        memset (&info, 0, sizeof(struct mallinfo));
-        info = mallinfo ();
-
-        ret = dict_set_int32 (dict, "mallinfo.arena", info.arena);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.ordblks", info.ordblks);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.smblks", info.smblks);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.hblks", info.hblks);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.hblkhd", info.hblkhd);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.usmblks", info.usmblks);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.fsmblks", info.fsmblks);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.uordblks", info.uordblks);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.fordblks", info.fordblks);
-        if (ret)
-                return;
-
-        ret = dict_set_int32 (dict, "mallinfo.keepcost", info.keepcost);
-        if (ret)
-                return;
-#endif
-        return;
-}
+void gf_proc_dump_latency_info (xlator_t *xl);
 
 void
-gf_proc_dump_mempool_info (glusterfs_ctx_t *ctx)
+gf_proc_dump_xlator_info (xlator_t *this_xl)
 {
-        struct mem_pool *pool = NULL;
-
-        gf_proc_dump_add_section ("mempool");
-
-        list_for_each_entry (pool, &ctx->mempool_list, global_list) {
-                gf_proc_dump_write ("-----", "-----");
-                gf_proc_dump_write ("pool-name", "%s", pool->name);
-                gf_proc_dump_write ("hot-count", "%d", pool->hot_count);
-                gf_proc_dump_write ("cold-count", "%d", pool->cold_count);
-                gf_proc_dump_write ("padded_sizeof", "%lu",
-                                    pool->padded_sizeof_type);
-                gf_proc_dump_write ("alloc-count", "%"PRIu64, pool->alloc_count);
-                gf_proc_dump_write ("max-alloc", "%d", pool->max_alloc);
-
-                gf_proc_dump_write ("pool-misses", "%"PRIu64, pool->pool_misses);
-                gf_proc_dump_write ("max-stdalloc", "%d", pool->max_stdalloc);
-        }
-}
+        glusterfs_ctx_t   *ctx = NULL;
+        xlator_t *fuse_xlator, *this_xlator;
 
-void
-gf_proc_dump_mempool_info_to_dict (glusterfs_ctx_t *ctx, dict_t *dict)
-{
-        struct mem_pool *pool = NULL;
-        char            key[GF_DUMP_MAX_BUF_LEN] = {0,};
-        int             count = 0;
-        int             ret = -1;
+        if (!this_xl)
+                return;
 
-        if (!ctx || !dict)
+        ctx = glusterfs_ctx_get ();
+        if (!ctx)
                 return;
 
-        list_for_each_entry (pool, &ctx->mempool_list, global_list) {
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "pool%d.name", count);
-                ret = dict_set_str (dict, key, pool->name);
-                if (ret)
-                        return;
+        if (ctx->master){
 
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "pool%d.hotcount", count);
-                ret = dict_set_int32 (dict, key, pool->hot_count);
-                if (ret)
-                        return;
+                fuse_xlator = (xlator_t *) ctx->master;
 
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "pool%d.coldcount", count);
-                ret = dict_set_int32 (dict, key, pool->cold_count);
-                if (ret)
+                if (!fuse_xlator->dumpops)
                         return;
 
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "pool%d.paddedsizeof", count);
-                ret = dict_set_uint64 (dict, key, pool->padded_sizeof_type);
-                if (ret)
-                        return;
+                if (fuse_xlator->dumpops->priv &&
+                    GF_PROC_DUMP_IS_XL_OPTION_ENABLED (priv))
+                        fuse_xlator->dumpops->priv (fuse_xlator);
 
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "pool%d.alloccount", count);
-                ret = dict_set_uint64 (dict, key, pool->alloc_count);
-                if (ret)
-                        return;
+                if (fuse_xlator->dumpops->inode &&
+                    GF_PROC_DUMP_IS_XL_OPTION_ENABLED (inode)) {
 
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "pool%d.max_alloc", count);
-                ret = dict_set_int32 (dict, key, pool->max_alloc);
-                if (ret)
-                        return;
+                        if (!ctx->active)
+                                return;
+                        this_xlator = (xlator_t *) ctx->active->top;
 
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "pool%d.max-stdalloc", count);
-                ret = dict_set_int32 (dict, key, pool->max_stdalloc);
-                if (ret)
-                        return;
+                        if (this_xlator && this_xlator->itable)
+                                inode_table_dump (this_xlator->itable,
+                                                  "xlator.mount.fuse.itable");
+                        else
+                                return;
+                }
 
-                memset (key, 0, sizeof (key));
-                snprintf (key, sizeof (key), "pool%d.pool-misses", count);
-                ret = dict_set_uint64 (dict, key, pool->pool_misses);
-                if (ret)
-                        return;
-                count++;
+                if (fuse_xlator->dumpops->fd &&
+                    GF_PROC_DUMP_IS_XL_OPTION_ENABLED (fd))
+                        fuse_xlator->dumpops->fd (fuse_xlator);
         }
-        ret = dict_set_int32 (dict, "mempool-count", count);
-
-        return;
-}
 
-void gf_proc_dump_latency_info (xlator_t *xl);
-
-void
-gf_proc_dump_xlator_info (xlator_t *top)
-{
-        xlator_t        *trav = NULL;
-        glusterfs_ctx_t *ctx = NULL;
-        char             itable_key[1024] = {0,};
 
-        if (!top)
-                return;
-
-        ctx = top->ctx;
-
-        trav = top;
-        while (trav) {
+        while (this_xl) {
 
                 if (ctx->measure_latency)
-                        gf_proc_dump_latency_info (trav);
+                        gf_proc_dump_latency_info (this_xl);
 
-                gf_proc_dump_xlator_mem_info(trav);
+                gf_proc_dump_xlator_mem_info(this_xl);
 
-                if (GF_PROC_DUMP_IS_XL_OPTION_ENABLED (inode) &&
-                    (trav->itable)) {
-                        snprintf (itable_key, 1024, "%d.%s.itable",
-                                  ctx->graph_id, trav->name);
-                }
-
-                if (!trav->dumpops) {
-                        trav = trav->next;
+                if (!this_xl->dumpops) {
+                        this_xl = this_xl->next;
                         continue;
                 }
 
-                if (trav->dumpops->priv &&
+                if (this_xl->dumpops->priv &&
                     GF_PROC_DUMP_IS_XL_OPTION_ENABLED (priv))
-                        trav->dumpops->priv (trav);
+                        this_xl->dumpops->priv (this_xl);
 
-                if (GF_PROC_DUMP_IS_XL_OPTION_ENABLED (inode) &&
-                    (trav->dumpops->inode))
-                        trav->dumpops->inode (trav);
+                if (this_xl->dumpops->inode &&
+                    GF_PROC_DUMP_IS_XL_OPTION_ENABLED (inode))
+                        this_xl->dumpops->inode (this_xl);
 
-                if (trav->dumpops->fd &&
-                    GF_PROC_DUMP_IS_XL_OPTION_ENABLED (fd))
-                        trav->dumpops->fd (trav);
 
-                if (trav->dumpops->history &&
-                    GF_PROC_DUMP_IS_XL_OPTION_ENABLED (history))
-                        trav->dumpops->history (trav);
+                if (this_xl->dumpops->fd &&
+                    GF_PROC_DUMP_IS_XL_OPTION_ENABLED (fd))
+                        this_xl->dumpops->fd (this_xl);
 
-                trav = trav->next;
+                this_xl = this_xl->next;
         }
 
         return;
 }
-
-static void
-gf_proc_dump_oldgraph_xlator_info (xlator_t *top)
+static int
+gf_proc_dump_parse_set_option (char *key, char *value)
 {
-        xlator_t        *trav = NULL;
-
-        if (!top)
-                return;
-
-        trav = top;
-        while (trav) {
-                gf_proc_dump_xlator_mem_info_only_in_use (trav);
+        gf_boolean_t    *opt_key = NULL;
+        gf_boolean_t    opt_value = _gf_false;
+        char buf[GF_DUMP_MAX_BUF_LEN];
+        int ret = -1;
 
-                if (GF_PROC_DUMP_IS_XL_OPTION_ENABLED (inode) &&
-                    (trav->itable)) {
-                        /*TODO: dump inode table info if necessary by
-                          printing the graph id (taken by glusterfs_cbtx_t)
-                          in the key
-                        */
-                }
+        if (!strncasecmp (key, "mem", 3)) {
+                opt_key = &dump_options.dump_mem;
+        } else if (!strncasecmp (key, "iobuf", 5)) {
+                opt_key = &dump_options.dump_iobuf;
+        } else if (!strncasecmp (key, "callpool", 8)) {
+                opt_key = &dump_options.dump_callpool;
+        } else if (!strncasecmp (key, "priv", 4)) {
+                opt_key = &dump_options.xl_options.dump_priv;
+        } else if (!strncasecmp (key, "fd", 2)) {
+                opt_key = &dump_options.xl_options.dump_fd;
+        } else if (!strncasecmp (key, "inode", 5)) {
+                opt_key = &dump_options.xl_options.dump_inode;
+        } else if (!strncasecmp (key, "inodectx", strlen ("inodectx"))) {
+                opt_key = &dump_options.xl_options.dump_inodectx;
+        } else if (!strncasecmp (key, "fdctx", strlen ("fdctx"))) {
+                opt_key = &dump_options.xl_options.dump_fdctx;
+        }
 
-                if (!trav->dumpops) {
-                        trav = trav->next;
-                        continue;
-                }
+        if (!opt_key) {
+                //None of dump options match the key, return back
+                snprintf (buf, sizeof (buf), "[Warning]:None of the options "
+                          "matched key : %s\n", key);
+                ret = write (gf_dump_fd, buf, strlen (buf));
 
-                if (GF_PROC_DUMP_IS_XL_OPTION_ENABLED (inode) &&
-                    (trav->dumpops->inode))
-                        trav->dumpops->inode (trav);
+                return -1;
+        }
 
-                if (trav->dumpops->fd &&
-                    GF_PROC_DUMP_IS_XL_OPTION_ENABLED (fd))
-                        trav->dumpops->fd (trav);
+        opt_value = (strncasecmp (value, "yes", 3) ?
+                     _gf_false: _gf_true);
 
-                trav = trav->next;
-        }
+        GF_PROC_DUMP_SET_OPTION (*opt_key, opt_value);
 
-        return;
+        return 0;
 }
 
+
 static int
 gf_proc_dump_enable_all_options ()
 {
@@ -509,46 +335,6 @@ gf_proc_dump_enable_all_options ()
         GF_PROC_DUMP_SET_OPTION (dump_options.xl_options.dump_inodectx,
                                  _gf_true);
         GF_PROC_DUMP_SET_OPTION (dump_options.xl_options.dump_fdctx, _gf_true);
-        GF_PROC_DUMP_SET_OPTION (dump_options.xl_options.dump_history,
-                                 _gf_true);
-
-        return 0;
-}
-
-gf_boolean_t
-is_gf_proc_dump_all_disabled ()
-{
-        gf_boolean_t all_disabled = _gf_true;
-
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.dump_mem, all_disabled, out);
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.dump_iobuf, all_disabled, out);
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.dump_callpool, all_disabled,
-                                   out);
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.xl_options.dump_priv,
-                                   all_disabled, out);
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.xl_options.dump_inode,
-                                   all_disabled, out);
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.xl_options.dump_fd,
-                                   all_disabled, out);
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.xl_options.dump_inodectx,
-                                   all_disabled, out);
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.xl_options.dump_fdctx,
-                                   all_disabled, out);
-        GF_CHECK_DUMP_OPTION_ENABLED (dump_options.xl_options.dump_history,
-                                   all_disabled, out);
-
-out:
-        return all_disabled;
-}
-
-/* These options are dumped by default if glusterdump.options
-   file exists and it is emtpty
-*/
-static int
-gf_proc_dump_enable_default_options ()
-{
-        GF_PROC_DUMP_SET_OPTION (dump_options.dump_mem, _gf_true);
-        GF_PROC_DUMP_SET_OPTION (dump_options.dump_callpool, _gf_true);
 
         return 0;
 }
@@ -567,62 +353,8 @@ gf_proc_dump_disable_all_options ()
         GF_PROC_DUMP_SET_OPTION (dump_options.xl_options.dump_inodectx,
                                  _gf_false);
         GF_PROC_DUMP_SET_OPTION (dump_options.xl_options.dump_fdctx, _gf_false);
-        GF_PROC_DUMP_SET_OPTION (dump_options.xl_options.dump_history,
-                                 _gf_false);
-        return 0;
-}
 
-static int
-gf_proc_dump_parse_set_option (char *key, char *value)
-{
-        gf_boolean_t    *opt_key = NULL;
-        gf_boolean_t    opt_value = _gf_false;
-        char buf[GF_DUMP_MAX_BUF_LEN];
-        int ret = -1;
-
-        if (!strcasecmp (key, "all")) {
-                (void)gf_proc_dump_enable_all_options ();
-                return 0;
-        } else if (!strcasecmp (key, "mem")) {
-                opt_key = &dump_options.dump_mem;
-        } else if (!strcasecmp (key, "iobuf")) {
-                opt_key = &dump_options.dump_iobuf;
-        } else if (!strcasecmp (key, "callpool")) {
-                opt_key = &dump_options.dump_callpool;
-        } else if (!strcasecmp (key, "priv")) {
-                opt_key = &dump_options.xl_options.dump_priv;
-        } else if (!strcasecmp (key, "fd")) {
-                opt_key = &dump_options.xl_options.dump_fd;
-        } else if (!strcasecmp (key, "inode")) {
-                opt_key = &dump_options.xl_options.dump_inode;
-        } else if (!strcasecmp (key, "inodectx")) {
-                opt_key = &dump_options.xl_options.dump_inodectx;
-        } else if (!strcasecmp (key, "fdctx")) {
-                opt_key = &dump_options.xl_options.dump_fdctx;
-        } else if (!strcasecmp (key, "history")) {
-                opt_key = &dump_options.xl_options.dump_history;
-        }
-
-        if (!opt_key) {
-                //None of dump options match the key, return back
-                snprintf (buf, sizeof (buf), "[Warning]:None of the options "
-                          "matched key : %s\n", key);
-                ret = write (gf_dump_fd, buf, strlen (buf));
-
-                if (ret >= 0)
-                        ret = -1;
-                goto out;
-
-        }
-
-        opt_value = (strncasecmp (value, "yes", 3) ?
-                     _gf_false: _gf_true);
-
-        GF_PROC_DUMP_SET_OPTION (*opt_key, opt_value);
-
-        ret = 0;
-out:
-        return ret;
+        return 0;
 }
 
 static int
@@ -631,44 +363,25 @@ gf_proc_dump_options_init ()
         int     ret = -1;
         FILE    *fp = NULL;
         char    buf[256];
+        char    dumpbuf[GF_DUMP_MAX_BUF_LEN];
         char    *key = NULL, *value = NULL;
         char    *saveptr = NULL;
-        char    dump_option_file[PATH_MAX];
-
-        /* glusterd will create a file glusterdump.<pid>.options and
-           sets the statedump options for the process and the file is removed
-           after the statedump is taken. Direct issue of SIGUSR1 does not have
-           mechanism for considering the statedump options. So to have a way
-           of configuring the statedump of all the glusterfs processes through
-           both cli command and SIGUSR1, glusterdump.options file is searched
-           and the options mentioned in it are given the higher priority.
-        */
-        snprintf (dump_option_file, sizeof (dump_option_file),
-                  DEFAULT_VAR_RUN_DIRECTORY
-                  "/glusterdump.options");
-        fp = fopen (dump_option_file, "r");
-        if (!fp) {
-                snprintf (dump_option_file, sizeof (dump_option_file),
-                          DEFAULT_VAR_RUN_DIRECTORY
-                          "/glusterdump.%d.options", getpid ());
 
-                fp = fopen (dump_option_file, "r");
 
-                if (!fp) {
-                        //ENOENT, return success
-                        (void) gf_proc_dump_enable_all_options ();
-                        return 0;
-                }
+        fp = fopen (GF_DUMP_OPTIONFILE, "r");
+
+        if (!fp) {
+                //ENOENT, return success
+                (void) gf_proc_dump_enable_all_options ();
+                return 0;
         }
 
         (void) gf_proc_dump_disable_all_options ();
 
-        // swallow the errors if setting statedump file path is failed.
-        ret = gf_proc_dump_set_path (dump_option_file);
-
         ret = fscanf (fp, "%s", buf);
 
         while (ret != EOF) {
+
                 key = strtok_r (buf, "=", &saveptr);
                 if (!key) {
                         ret = fscanf (fp, "%s", buf);
@@ -682,128 +395,50 @@ gf_proc_dump_options_init ()
                         continue;
                 }
 
-                gf_proc_dump_parse_set_option (key, value);
-        }
+                snprintf (dumpbuf, sizeof (dumpbuf), "[Debug]:key=%s, value=%s\n",key,value);
+                ret = write (gf_dump_fd, dumpbuf, strlen (dumpbuf));
 
-        if (is_gf_proc_dump_all_disabled ())
-                (void) gf_proc_dump_enable_default_options ();
+                gf_proc_dump_parse_set_option (key, value);
 
-        if (fp)
-                fclose (fp);
+        }
 
         return 0;
 }
 
 void
-gf_proc_dump_info (int signum, glusterfs_ctx_t *ctx)
+gf_proc_dump_info (int signum)
 {
-        int                i                       = 0;
-        int                ret                     = -1;
-        glusterfs_graph_t *trav                    = NULL;
-        char               brick_name[PATH_MAX]    = {0,};
-        char               timestr[256]            = {0,};
-        char               sign_string[512]        = {0,};
-        char               tmp_dump_name[PATH_MAX] = {0,};
-        char               path[PATH_MAX]          = {0,};
-        struct timeval     tv                      = {0,};
+        int               ret = -1;
+        glusterfs_ctx_t   *ctx = NULL;
 
-        gf_proc_dump_lock ();
 
-        if (!ctx)
-                goto out;
-
-        if (ctx->cmd_args.brick_name) {
-                GF_REMOVE_SLASH_FROM_PATH (ctx->cmd_args.brick_name, brick_name);
-        } else
-                strncpy (brick_name, "glusterdump", sizeof (brick_name));
-
-        ret = gf_proc_dump_options_init ();
+        gf_proc_dump_lock ();
+        ret = gf_proc_dump_open ();
         if (ret < 0)
                 goto out;
 
-        snprintf (path, sizeof (path), "%s/%s.%d.dump.%"PRIu64,
-                  ((dump_options.dump_path != NULL)?dump_options.dump_path:
-                   ((ctx->statedump_path != NULL)?ctx->statedump_path:
-                    DEFAULT_VAR_RUN_DIRECTORY)), brick_name, getpid(),
-                  (uint64_t) time (NULL));
-
-        snprintf (tmp_dump_name, PATH_MAX, "%s/dumpXXXXXX",
-                  ((dump_options.dump_path != NULL)?dump_options.dump_path:
-                   ((ctx->statedump_path != NULL)?ctx->statedump_path:
-                    DEFAULT_VAR_RUN_DIRECTORY)));
+        ret = gf_proc_dump_options_init ();
 
-        ret = gf_proc_dump_open (tmp_dump_name);
         if (ret < 0)
                 goto out;
 
-        //continue even though gettimeofday() has failed
-        ret = gettimeofday (&tv, NULL);
-        if (0 == ret) {
-                gf_time_fmt (timestr, sizeof timestr, tv.tv_sec, gf_timefmt_FT);
-                snprintf (timestr + strlen (timestr),
-                          sizeof timestr - strlen (timestr),
-                          ".%"GF_PRI_SUSECONDS, tv.tv_usec);
-        }
-
-        snprintf (sign_string, sizeof (sign_string), "DUMP-START-TIME: %s\n",
-                  timestr);
-
-        //swallow the errors of write for start and end marker
-        ret = write (gf_dump_fd, sign_string, strlen (sign_string));
-
-        memset (sign_string, 0, sizeof (sign_string));
-        memset (timestr, 0, sizeof (timestr));
-        memset (&tv, 0, sizeof (tv));
-
-        if (GF_PROC_DUMP_IS_OPTION_ENABLED (mem)) {
+        if (GF_PROC_DUMP_IS_OPTION_ENABLED (mem))
                 gf_proc_dump_mem_info ();
-                gf_proc_dump_mempool_info (ctx);
-        }
 
-        if (GF_PROC_DUMP_IS_OPTION_ENABLED (iobuf))
-                iobuf_stats_dump (ctx->iobuf_pool);
-        if (GF_PROC_DUMP_IS_OPTION_ENABLED (callpool))
-                gf_proc_dump_pending_frames (ctx->pool);
+        ctx = glusterfs_ctx_get ();
 
-        if (ctx->master) {
-                gf_proc_dump_add_section ("fuse");
-                gf_proc_dump_xlator_info (ctx->master);
-        }
+        if (ctx) {
+                if (GF_PROC_DUMP_IS_OPTION_ENABLED (iobuf))
+                        iobuf_stats_dump (ctx->iobuf_pool);
+                if (GF_PROC_DUMP_IS_OPTION_ENABLED (callpool))
+                        gf_proc_dump_pending_frames (ctx->pool);
+                if (ctx->active)
+                        gf_proc_dump_xlator_info (ctx->active->top);
 
-        if (ctx->active) {
-                gf_proc_dump_add_section ("active graph - %d", ctx->graph_id);
-                gf_proc_dump_xlator_info (ctx->active->top);
         }
 
-        i = 0;
-        list_for_each_entry (trav, &ctx->graphs, list) {
-                if (trav == ctx->active)
-                        continue;
-
-                gf_proc_dump_add_section ("oldgraph[%d]", i);
-
-                gf_proc_dump_oldgraph_xlator_info (trav->top);
-                i++;
-        }
-
-        ret = gettimeofday (&tv, NULL);
-        if (0 == ret) {
-                gf_time_fmt (timestr, sizeof timestr, tv.tv_sec, gf_timefmt_FT);
-                snprintf (timestr + strlen (timestr),
-                          sizeof timestr - strlen (timestr),
-                          ".%"GF_PRI_SUSECONDS, tv.tv_usec);
-        }
-
-        snprintf (sign_string, sizeof (sign_string), "\nDUMP-END-TIME: %s",
-                  timestr);
-        ret = write (gf_dump_fd, sign_string, strlen (sign_string));
-
+        gf_proc_dump_close ();
 out:
-        if (gf_dump_fd != -1)
-                gf_proc_dump_close ();
-        rename (tmp_dump_name, path);
-        GF_FREE (dump_options.dump_path);
-        dump_options.dump_path = NULL;
         gf_proc_dump_unlock ();
 
         return;
diff --git a/libglusterfs/src/statedump.h b/libglusterfs/src/statedump.h
index 8342b120a..43330b37c 100644
--- a/libglusterfs/src/statedump.h
+++ b/libglusterfs/src/statedump.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -17,13 +26,17 @@
 
 #define GF_DUMP_MAX_BUF_LEN 4096
 
+#define GF_DUMP_LOGFILE_ROOT "/tmp/glusterdump"
+#define GF_DUMP_LOGFILE_ROOT_LEN 256
+
+#define GF_DUMP_OPTIONFILE "/tmp/glusterdump.input"
+
 typedef struct gf_dump_xl_options_ {
         gf_boolean_t    dump_priv;
         gf_boolean_t    dump_inode;
         gf_boolean_t    dump_fd;
         gf_boolean_t    dump_inodectx;
         gf_boolean_t    dump_fdctx;
-        gf_boolean_t    dump_history;
 } gf_dump_xl_options_t;
 
 typedef struct gf_dump_options_ {
@@ -31,7 +44,6 @@ typedef struct gf_dump_options_ {
         gf_boolean_t            dump_iobuf;
         gf_boolean_t            dump_callpool;
         gf_dump_xl_options_t    xl_options; //options for all xlators
-        char                    *dump_path;
 } gf_dump_options_t;
 
 extern gf_dump_options_t dump_options;
@@ -56,39 +68,23 @@ void _gf_proc_dump_build_key (char *key, const char *prefix, char *fmt,...)
 
 #define GF_PROC_DUMP_SET_OPTION(opt,val) opt = val
 
-#define GF_CHECK_DUMP_OPTION_ENABLED(option_dump, var, label)      \
-        do {                                                    \
-                if (option_dump == _gf_true) {                  \
-                        var = _gf_false;                        \
-                        goto label;                             \
-                }                                               \
-        } while (0);
-
 void gf_proc_dump_init();
 
 void gf_proc_dump_fini(void);
 
 void gf_proc_dump_cleanup(void);
 
-void gf_proc_dump_info(int signum, glusterfs_ctx_t *ctx);
+void gf_proc_dump_info(int signum);
 
-int gf_proc_dump_add_section(char *key,...);
+void gf_proc_dump_add_section(char *key,...);
 
-int gf_proc_dump_write(char *key, char *value,...);
+void gf_proc_dump_write(char *key, char *value,...);
 
 void inode_table_dump(inode_table_t *itable, char *prefix);
 
-void inode_table_dump_to_dict (inode_table_t *itable, char *prefix, dict_t *dict);
-
 void fdtable_dump(fdtable_t *fdtable, char *prefix);
 
-void fdtable_dump_to_dict (fdtable_t *fdtable, char *prefix, dict_t *dict);
-
 void inode_dump(inode_t *inode, char *prefix);
 
-void gf_proc_dump_mem_info_to_dict (dict_t *dict);
-
-void gf_proc_dump_mempool_info_to_dict (glusterfs_ctx_t *ctx, dict_t *dict);
-
 void glusterd_init (int sig);
 #endif /* STATEDUMP_H */
diff --git a/libglusterfs/src/store.c b/libglusterfs/src/store.c
deleted file mode 100644
index 48c79ee02..000000000
--- a/libglusterfs/src/store.c
+++ /dev/null
@@ -1,692 +0,0 @@
-/*
-   Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include <inttypes.h>
-#include <libgen.h>
-
-#include "glusterfs.h"
-#include "store.h"
-#include "dict.h"
-#include "xlator.h"
-
-int32_t
-gf_store_mkdir (char *path)
-{
-        int32_t     ret = -1;
-
-        ret = mkdir (path, 0777);
-
-        if ((-1 == ret) && (EEXIST != errno)) {
-                gf_log ("", GF_LOG_ERROR, "mkdir() failed on path %s,"
-                        "errno: %s", path, strerror (errno));
-        } else {
-                ret = 0;
-        }
-
-        return ret;
-}
-
-int32_t
-gf_store_handle_create_on_absence (gf_store_handle_t **shandle,
-                                   char *path)
-{
-        GF_ASSERT (shandle);
-        int32_t     ret = 0;
-
-        if (*shandle == NULL) {
-                ret = gf_store_handle_new (path, shandle);
-
-                if (ret) {
-                        gf_log ("", GF_LOG_ERROR, "Unable to create store"
-                                " handle for path: %s", path);
-                }
-        }
-        return ret;
-}
-
-int32_t
-gf_store_mkstemp (gf_store_handle_t *shandle)
-{
-        int     fd = -1;
-        char    tmppath[PATH_MAX] = {0,};
-
-        GF_ASSERT (shandle);
-        GF_ASSERT (shandle->path);
-
-        snprintf (tmppath, sizeof (tmppath), "%s.tmp", shandle->path);
-        fd = open (tmppath, O_RDWR | O_CREAT | O_TRUNC | O_SYNC, 0600);
-        if (fd <= 0) {
-                gf_log ("", GF_LOG_ERROR, "Failed to open %s, error: %s",
-                        tmppath, strerror (errno));
-        }
-
-        return fd;
-}
-
-int
-gf_store_sync_direntry (char *path)
-{
-        int             ret     = -1;
-        int             dirfd   = -1;
-        char            *dir    = NULL;
-        char            *pdir   = NULL;
-        xlator_t        *this = NULL;
-
-        this = THIS;
-
-        dir = gf_strdup (path);
-        if (!dir)
-                goto out;
-
-        pdir = dirname (dir);
-        dirfd = open (pdir, O_RDONLY);
-        if (dirfd == -1) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to open directory "
-                        "%s, due to %s", pdir, strerror (errno));
-                goto out;
-        }
-
-        ret = fsync (dirfd);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to fsync %s, due to "
-                        "%s", pdir, strerror (errno));
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (dirfd >= 0) {
-                ret = close (dirfd);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "Failed to close "
-                                "%s, due to %s", pdir, strerror (errno));
-                }
-        }
-
-        if (dir)
-                GF_FREE (dir);
-
-        return ret;
-}
-
-int32_t
-gf_store_rename_tmppath (gf_store_handle_t *shandle)
-{
-        int32_t         ret = -1;
-        char            tmppath[PATH_MAX] = {0,};
-
-        GF_ASSERT (shandle);
-        GF_ASSERT (shandle->path);
-
-        snprintf (tmppath, sizeof (tmppath), "%s.tmp", shandle->path);
-        ret = rename (tmppath, shandle->path);
-        if (ret) {
-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to rename %s to %s, "
-                        "error: %s", tmppath, shandle->path, strerror (errno));
-                goto out;
-        }
-
-        ret = gf_store_sync_direntry (tmppath);
-out:
-        return ret;
-}
-
-int32_t
-gf_store_unlink_tmppath (gf_store_handle_t *shandle)
-{
-        int32_t         ret = -1;
-        char            tmppath[PATH_MAX] = {0,};
-
-        GF_ASSERT (shandle);
-        GF_ASSERT (shandle->path);
-
-        snprintf (tmppath, sizeof (tmppath), "%s.tmp", shandle->path);
-        ret = unlink (tmppath);
-        if (ret && (errno != ENOENT)) {
-                gf_log ("", GF_LOG_ERROR, "Failed to mv %s to %s, error: %s",
-                        tmppath, shandle->path, strerror (errno));
-        } else {
-                ret = 0;
-        }
-
-        return ret;
-}
-
-int
-gf_store_read_and_tokenize (FILE *file, char *str, char **iter_key,
-                            char **iter_val, gf_store_op_errno_t *store_errno)
-{
-        int32_t     ret = -1;
-        char        *savetok = NULL;
-        char        *key = NULL;
-        char        *value = NULL;
-
-        GF_ASSERT (file);
-        GF_ASSERT (str);
-        GF_ASSERT (iter_key);
-        GF_ASSERT (iter_val);
-        GF_ASSERT (store_errno);
-
-        ret = fscanf (file, "%s", str);
-        if (ret <= 0 || feof (file)) {
-                ret = -1;
-                *store_errno = GD_STORE_EOF;
-                goto out;
-        }
-
-        key = strtok_r (str, "=", &savetok);
-        if (!key) {
-                ret = -1;
-                *store_errno = GD_STORE_KEY_NULL;
-                goto out;
-        }
-
-        value = strtok_r (NULL, "=", &savetok);
-        if (!value) {
-                ret = -1;
-                *store_errno = GD_STORE_VALUE_NULL;
-                goto out;
-        }
-
-        *iter_key = key;
-        *iter_val = value;
-        *store_errno = GD_STORE_SUCCESS;
-        ret = 0;
-out:
-        return ret;
-}
-
-int32_t
-gf_store_retrieve_value (gf_store_handle_t *handle, char *key, char **value)
-{
-        int32_t         ret = -1;
-        char            *scan_str = NULL;
-        char            *iter_key = NULL;
-        char            *iter_val = NULL;
-        char            *free_str = NULL;
-        struct stat     st        = {0,};
-        gf_store_op_errno_t store_errno = GD_STORE_SUCCESS;
-
-        GF_ASSERT (handle);
-
-        if (handle->locked == F_ULOCK)
-                /* no locking is used handle->fd gets closed() after usage */
-                handle->fd = open (handle->path, O_RDWR);
-        else
-                /* handle->fd is valid already, kept open for lockf() */
-                lseek (handle->fd, 0, SEEK_SET);
-
-        if (handle->fd == -1) {
-                gf_log ("", GF_LOG_ERROR, "Unable to open file %s errno: %s",
-                        handle->path, strerror (errno));
-                goto out;
-        }
-        if (!handle->read)
-                handle->read = fdopen (dup(handle->fd), "r");
-        else
-                fseek (handle->read, 0, SEEK_SET);
-
-        if (!handle->read) {
-                gf_log ("", GF_LOG_ERROR, "Unable to open file %s errno: %s",
-                        handle->path, strerror (errno));
-                goto out;
-        }
-
-        ret = fstat (handle->fd, &st);
-        if (ret < 0) {
-                gf_log ("", GF_LOG_WARNING, "stat on file %s failed",
-                        handle->path);
-                ret = -1;
-                store_errno = GD_STORE_STAT_FAILED;
-                goto out;
-        }
-
-        scan_str = GF_CALLOC (1, st.st_size,
-                              gf_common_mt_char);
-        if (scan_str == NULL) {
-                ret = -1;
-                store_errno = GD_STORE_ENOMEM;
-                goto out;
-        }
-
-        free_str = scan_str;
-
-        do {
-                ret = gf_store_read_and_tokenize (handle->read, scan_str,
-                                                  &iter_key, &iter_val,
-                                                  &store_errno);
-                if (ret < 0) {
-                        gf_log ("", GF_LOG_TRACE, "error while reading key "
-                                "'%s': %s", key,
-                                gf_store_strerror (store_errno));
-                        goto out;
-                }
-
-                gf_log ("", GF_LOG_TRACE, "key %s read", iter_key);
-
-                if (!strcmp (key, iter_key)) {
-                        gf_log ("", GF_LOG_DEBUG, "key %s found", key);
-                        ret = 0;
-                        if (iter_val)
-                                *value = gf_strdup (iter_val);
-                        goto out;
-                }
-        } while (1);
-out:
-        if (handle->read) {
-                fclose (handle->read);
-                handle->read = NULL;
-        }
-
-        if (handle->fd > 0 && handle->locked == F_ULOCK) {
-                /* only invalidate handle->fd if not locked */
-                close (handle->fd);
-        }
-
-        GF_FREE (free_str);
-
-        return ret;
-}
-
-int32_t
-gf_store_save_value (int fd, char *key, char *value)
-{
-        int32_t         ret = -1;
-        int             dup_fd = -1;
-        FILE           *fp  = NULL;
-
-        GF_ASSERT (fd > 0);
-        GF_ASSERT (key);
-        GF_ASSERT (value);
-
-        dup_fd = dup (fd);
-        if (dup_fd == -1)
-                goto out;
-
-        fp = fdopen (dup_fd, "a+");
-        if (fp == NULL) {
-                gf_log ("", GF_LOG_WARNING, "fdopen failed.");
-                ret = -1;
-                goto out;
-        }
-
-        ret = fprintf (fp, "%s=%s\n", key, value);
-        if (ret < 0) {
-                gf_log ("", GF_LOG_WARNING, "Unable to store key: %s,"
-                        "value: %s, error: %s", key, value,
-                        strerror (errno));
-                ret = -1;
-                goto out;
-        }
-
-        ret = fflush (fp);
-        if (feof (fp)) {
-                gf_log ("", GF_LOG_WARNING,
-                        "fflush failed, error: %s",
-                        strerror (errno));
-                ret = -1;
-                goto out;
-        }
-
-        ret = 0;
-out:
-        if (fp)
-                fclose (fp);
-
-        gf_log ("", GF_LOG_DEBUG, "returning: %d", ret);
-        return ret;
-}
-
-int32_t
-gf_store_handle_new (char *path, gf_store_handle_t **handle)
-{
-        int32_t                 ret = -1;
-        gf_store_handle_t *shandle = NULL;
-        int                     fd = -1;
-        char                    *spath = NULL;
-
-        shandle = GF_CALLOC (1, sizeof (*shandle), gf_common_mt_store_handle_t);
-        if (!shandle)
-                goto out;
-
-        spath = gf_strdup (path);
-
-        if (!spath)
-                goto out;
-
-        fd = open (path, O_RDWR | O_CREAT | O_APPEND, 0600);
-        if (fd <= 0) {
-                gf_log ("", GF_LOG_ERROR, "Failed to open file: %s, error: %s",
-                        path, strerror (errno));
-                goto out;
-        }
-
-        ret = gf_store_sync_direntry (spath);
-        if (ret)
-                goto out;
-
-        shandle->path = spath;
-        shandle->locked = F_ULOCK;
-        *handle = shandle;
-
-        ret = 0;
-out:
-        if (fd > 0)
-                close (fd);
-
-        if (ret == -1) {
-                GF_FREE (spath);
-                GF_FREE (shandle);
-        }
-
-        gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int
-gf_store_handle_retrieve (char *path, gf_store_handle_t **handle)
-{
-        int32_t                 ret = -1;
-        struct stat statbuf = {0};
-
-        ret = stat (path, &statbuf);
-        if (ret) {
-                gf_log ("", GF_LOG_ERROR, "Path corresponding to "
-                        "%s, returned error: (%s)",
-                        path, strerror (errno));
-                goto out;
-        }
-        ret =  gf_store_handle_new (path, handle);
-out:
-        gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
-
-int32_t
-gf_store_handle_destroy (gf_store_handle_t *handle)
-{
-        int32_t                 ret = -1;
-
-        if (!handle) {
-                ret = 0;
-                goto out;
-        }
-
-        GF_FREE (handle->path);
-
-        GF_FREE (handle);
-
-        ret = 0;
-
-out:
-        gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);
-
-        return ret;
-}
-
-int32_t
-gf_store_iter_new (gf_store_handle_t  *shandle, gf_store_iter_t  **iter)
-{
-        int32_t                 ret = -1;
-        FILE                    *fp = NULL;
-        gf_store_iter_t         *tmp_iter = NULL;
-
-        GF_ASSERT (shandle);
-        GF_ASSERT (iter);
-
-        fp = fopen (shandle->path, "r");
-        if (!fp) {
-                gf_log ("", GF_LOG_ERROR, "Unable to open file %s errno: %d",
-                        shandle->path, errno);
-                goto out;
-        }
-
-        tmp_iter = GF_CALLOC (1, sizeof (*tmp_iter),
-                              gf_common_mt_store_iter_t);
-        if (!tmp_iter)
-                goto out;
-
-        strncpy (tmp_iter->filepath, shandle->path, sizeof (tmp_iter->filepath));
-        tmp_iter->filepath[sizeof (tmp_iter->filepath) - 1] = 0;
-        tmp_iter->file = fp;
-
-        *iter = tmp_iter;
-        tmp_iter = NULL;
-        ret = 0;
-
-out:
-        if (ret && fp)
-                fclose (fp);
-
-        GF_FREE (tmp_iter);
-
-        gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret);
-        return ret;
-}
-
-int32_t
-gf_store_validate_key_value (char *storepath, char *key, char *val,
-                             gf_store_op_errno_t *op_errno)
-{
-        int ret = 0;
-
-        GF_ASSERT (op_errno);
-        GF_ASSERT (storepath);
-
-        if ((key == NULL) && (val == NULL)) {
-                ret = -1;
-                gf_log ("", GF_LOG_ERROR, "Glusterd store may be corrupted, "
-                        "Invalid key and value (null) in %s", storepath);
-                *op_errno = GD_STORE_KEY_VALUE_NULL;
-        } else if (key == NULL) {
-                ret = -1;
-                gf_log ("", GF_LOG_ERROR, "Glusterd store may be corrupted, "
-                        "Invalid key (null) in %s", storepath);
-                *op_errno = GD_STORE_KEY_NULL;
-        } else if (val == NULL) {
-                ret = -1;
-                gf_log ("", GF_LOG_ERROR, "Glusterd store may be corrupted, "
-                        "Invalid value (null) for key %s in %s", key,
-                        storepath);
-                *op_errno = GD_STORE_VALUE_NULL;
-        } else {
-                ret = 0;
-                *op_errno = GD_STORE_SUCCESS;
-        }
-
-        return ret;
-}
-
-int32_t
-gf_store_iter_get_next (gf_store_iter_t *iter, char  **key, char **value,
-                        gf_store_op_errno_t *op_errno)
-{
-        int32_t         ret       = -1;
-        char            *scan_str = NULL;
-        char            *iter_key = NULL;
-        char            *iter_val = NULL;
-        struct stat     st        = {0,};
-        gf_store_op_errno_t store_errno = GD_STORE_SUCCESS;
-
-        GF_ASSERT (iter);
-        GF_ASSERT (key);
-        GF_ASSERT (value);
-
-        ret = stat (iter->filepath, &st);
-        if (ret < 0) {
-                gf_log ("", GF_LOG_WARNING, "stat on file failed");
-                ret = -1;
-                store_errno = GD_STORE_STAT_FAILED;
-                goto out;
-        }
-
-        scan_str = GF_CALLOC (1, st.st_size,
-                              gf_common_mt_char);
-        if (!scan_str) {
-                ret = -1;
-                store_errno = GD_STORE_ENOMEM;
-                goto out;
-        }
-
-        ret = gf_store_read_and_tokenize (iter->file, scan_str,
-                                          &iter_key, &iter_val,
-                                          &store_errno);
-        if (ret < 0) {
-                goto out;
-        }
-
-        ret = gf_store_validate_key_value (iter->filepath, iter_key,
-                                           iter_val, &store_errno);
-        if (ret)
-                goto out;
-
-        *key = gf_strdup (iter_key);
-        if (!*key) {
-                ret = -1;
-                store_errno = GD_STORE_ENOMEM;
-                goto out;
-        }
-        *value = gf_strdup (iter_val);
-        if (!*value) {
-                ret = -1;
-                store_errno = GD_STORE_ENOMEM;
-                goto out;
-        }
-        ret = 0;
-
-out:
-        GF_FREE (scan_str);
-        if (ret) {
-                GF_FREE (*key);
-                GF_FREE (*value);
-                *key = NULL;
-                *value = NULL;
-        }
-        if (op_errno)
-                *op_errno = store_errno;
-
-        gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret);
-        return ret;
-}
-
-int32_t
-gf_store_iter_get_matching (gf_store_iter_t *iter, char *key, char **value)
-{
-        int32_t ret = -1;
-        char    *tmp_key = NULL;
-        char    *tmp_value = NULL;
-
-        ret = gf_store_iter_get_next (iter, &tmp_key, &tmp_value, NULL);
-        while (!ret) {
-                if (!strncmp (key, tmp_key, strlen (key))){
-                        *value = tmp_value;
-                        GF_FREE (tmp_key);
-                        goto out;
-                }
-                GF_FREE (tmp_key);
-                GF_FREE (tmp_value);
-                ret = gf_store_iter_get_next (iter, &tmp_key, &tmp_value,
-                                              NULL);
-        }
-out:
-        return ret;
-}
-
-int32_t
-gf_store_iter_destroy (gf_store_iter_t *iter)
-{
-        int32_t         ret = -1;
-
-        if (!iter)
-                return 0;
-
-        /* gf_store_iter_new will not return a valid iter object with iter->file
-         * being NULL*/
-        ret = fclose (iter->file);
-        if (ret)
-                gf_log ("", GF_LOG_ERROR, "Unable to close file: %s, ret: %d, "
-                        "errno: %d" ,iter->filepath, ret, errno);
-
-        GF_FREE (iter);
-        return ret;
-}
-
-char*
-gf_store_strerror (gf_store_op_errno_t op_errno)
-{
-        switch (op_errno) {
-        case GD_STORE_SUCCESS:
-                return "Success";
-        case GD_STORE_KEY_NULL:
-                return "Invalid Key";
-        case GD_STORE_VALUE_NULL:
-                return "Invalid Value";
-        case GD_STORE_KEY_VALUE_NULL:
-                return "Invalid Key and Value";
-        case GD_STORE_EOF:
-                return "No data";
-        case GD_STORE_ENOMEM:
-                return "No memory";
-        default:
-                return "Invalid errno";
-        }
-        return "Invalid errno";
-}
-
-int
-gf_store_lock (gf_store_handle_t *sh)
-{
-        int                     ret;
-
-        GF_ASSERT (sh);
-        GF_ASSERT (sh->path);
-        GF_ASSERT (sh->locked == F_ULOCK);
-
-        sh->fd = open (sh->path, O_RDWR);
-        if (sh->fd == -1) {
-                gf_log ("", GF_LOG_ERROR, "Failed to open '%s': %s", sh->path,
-                        strerror (errno));
-                return -1;
-        }
-
-        ret = lockf (sh->fd, F_LOCK, 0);
-        if (ret)
-                gf_log ("", GF_LOG_ERROR, "Failed to gain lock on '%s': %s",
-                        sh->path, strerror (errno));
-        else
-                /* sh->locked is protected by the lockf(sh->fd) above */
-                sh->locked = F_LOCK;
-
-        return ret;
-}
-
-void
-gf_store_unlock (gf_store_handle_t *sh)
-{
-        GF_ASSERT (sh);
-        GF_ASSERT (sh->locked == F_LOCK);
-
-        sh->locked = F_ULOCK;
-        lockf (sh->fd, F_ULOCK, 0);
-        close (sh->fd);
-}
-
-int
-gf_store_locked_local (gf_store_handle_t *sh)
-{
-        GF_ASSERT (sh);
-
-        return (sh->locked == F_LOCK);
-}
diff --git a/libglusterfs/src/store.h b/libglusterfs/src/store.h
deleted file mode 100644
index 337103ff7..000000000
--- a/libglusterfs/src/store.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-   Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
-*/
-#ifndef _GLUSTERD_STORE_H_
-#define _GLUSTERD_STORE_H_
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "glusterfs.h"
-
-struct gf_store_handle_ {
-        char    *path;
-        int     fd;
-        FILE    *read;
-        int     locked;   /* state of lockf() */
-};
-
-typedef struct gf_store_handle_ gf_store_handle_t;
-
-struct gf_store_iter_ {
-        FILE    *file;
-        char    filepath[PATH_MAX];
-};
-
-typedef struct gf_store_iter_ gf_store_iter_t;
-
-typedef enum {
-        GD_STORE_SUCCESS,
-        GD_STORE_KEY_NULL,
-        GD_STORE_VALUE_NULL,
-        GD_STORE_KEY_VALUE_NULL,
-        GD_STORE_EOF,
-        GD_STORE_ENOMEM,
-        GD_STORE_STAT_FAILED
-} gf_store_op_errno_t;
-
-int32_t
-gf_store_mkdir (char *path);
-
-int32_t
-gf_store_handle_create_on_absence (gf_store_handle_t **shandle, char *path);
-
-int32_t
-gf_store_mkstemp (gf_store_handle_t *shandle);
-
-int
-gf_store_sync_direntry (char *path);
-
-int32_t
-gf_store_rename_tmppath (gf_store_handle_t *shandle);
-
-int32_t
-gf_store_unlink_tmppath (gf_store_handle_t *shandle);
-
-int
-gf_store_read_and_tokenize (FILE *file, char *str, char **iter_key,
-                            char **iter_val, gf_store_op_errno_t *store_errno);
-
-int32_t
-gf_store_retrieve_value (gf_store_handle_t *handle, char *key, char **value);
-
-int32_t
-gf_store_save_value (int fd, char *key, char *value);
-
-int32_t
-gf_store_handle_new (char *path, gf_store_handle_t **handle);
-
-int
-gf_store_handle_retrieve (char *path, gf_store_handle_t **handle);
-
-int32_t
-gf_store_handle_destroy (gf_store_handle_t *handle);
-
-int32_t
-gf_store_iter_new (gf_store_handle_t  *shandle, gf_store_iter_t  **iter);
-
-int32_t
-gf_store_validate_key_value (char *storepath, char *key, char *val,
-                             gf_store_op_errno_t *op_errno);
-
-int32_t
-gf_store_iter_get_next (gf_store_iter_t *iter, char **key, char **value,
-                        gf_store_op_errno_t *op_errno);
-
-int32_t
-gf_store_iter_get_matching (gf_store_iter_t *iter, char *key, char **value);
-
-int32_t
-gf_store_iter_destroy (gf_store_iter_t *iter);
-
-char*
-gf_store_strerror (gf_store_op_errno_t op_errno);
-
-int
-gf_store_lock (gf_store_handle_t *sh);
-
-void
-gf_store_unlock (gf_store_handle_t *sh);
-
-int
-gf_store_locked_local (gf_store_handle_t *sh);
-
-#endif
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
index c1620bb70..ebeb38c00 100644
--- a/libglusterfs/src/syncop.c
+++ b/libglusterfs/src/syncop.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2013 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -15,250 +24,57 @@
 
 #include "syncop.h"
 
-int
-syncopctx_setfsuid (void *uid)
+call_frame_t *
+syncop_create_frame ()
 {
-	struct syncopctx *opctx = NULL;
-	int               ret = 0;
-
-	/* In args check */
-	if (!uid) {
-		ret = -1;
-		errno = EINVAL;
-		goto out;
-	}
-
-	opctx = syncopctx_getctx ();
-
-	/* alloc for this thread the first time */
-	if (!opctx) {
-		opctx = GF_CALLOC (1, sizeof (*opctx), gf_common_mt_syncopctx);
-		if (!opctx) {
-			ret = -1;
-			goto out;
-		}
-
-		ret = syncopctx_setctx (opctx);
-		if (ret != 0) {
-			GF_FREE (opctx);
-			opctx = NULL;
-			goto out;
-		}
-	}
-
-out:
-	if (opctx && uid) {
-		opctx->uid = *(uid_t *)uid;
-		opctx->valid |= SYNCOPCTX_UID;
-	}
-
-	return ret;
-}
+        struct synctask *task = NULL;
+        struct call_frame_t *frame = NULL;
 
-int
-syncopctx_setfsgid (void *gid)
-{
-	struct syncopctx *opctx = NULL;
-	int               ret = 0;
-
-	/* In args check */
-	if (!gid) {
-		ret = -1;
-		errno = EINVAL;
-		goto out;
-	}
-
-	opctx = syncopctx_getctx ();
-
-	/* alloc for this thread the first time */
-	if (!opctx) {
-		opctx = GF_CALLOC (1, sizeof (*opctx), gf_common_mt_syncopctx);
-		if (!opctx) {
-			ret = -1;
-			goto out;
-		}
-
-		ret = syncopctx_setctx (opctx);
-		if (ret != 0) {
-			GF_FREE (opctx);
-			opctx = NULL;
-			goto out;
-		}
-	}
-
-out:
-	if (opctx && gid) {
-		opctx->gid = *(gid_t *)gid;
-		opctx->valid |= SYNCOPCTX_GID;
-	}
-
-	return ret;
-}
+        task = synctask_get ();
 
-int
-syncopctx_setfsgroups (int count, const void *groups)
-{
-	struct syncopctx *opctx = NULL;
-	gid_t            *tmpgroups = NULL;
-	int               ret = 0;
-
-	/* In args check */
-	if (count != 0 && !groups) {
-		ret = -1;
-		errno = EINVAL;
-		goto out;
-	}
-
-	opctx = syncopctx_getctx ();
-
-	/* alloc for this thread the first time */
-	if (!opctx) {
-		opctx = GF_CALLOC (1, sizeof (*opctx), gf_common_mt_syncopctx);
-		if (!opctx) {
-			ret = -1;
-			goto out;
-		}
-
-		ret = syncopctx_setctx (opctx);
-		if (ret != 0) {
-			GF_FREE (opctx);
-			opctx = NULL;
-			goto out;
-		}
-	}
-
-	/* resize internal groups as required */
-	if (count && opctx->grpsize < count) {
-		if (opctx->groups) {
-			tmpgroups = GF_REALLOC (opctx->groups,
-						(sizeof (gid_t) * count));
-			/* NOTE: Not really required to zero the reallocation,
-			 * as ngrps controls the validity of data,
-			 * making a note irrespective */
-			if (tmpgroups == NULL) {
-				opctx->grpsize = 0;
-				GF_FREE (opctx->groups);
-				opctx->groups = NULL;
-				ret = -1;
-				goto out;
-			}
-		}
-		else {
-			tmpgroups = GF_CALLOC (count, sizeof (gid_t),
-					       gf_common_mt_syncopctx);
-			if (tmpgroups == NULL) {
-				opctx->grpsize = 0;
-				ret = -1;
-				goto out;
-			}
-		}
-
-		opctx->groups = tmpgroups;
-		opctx->grpsize = count;
-	}
-
-	/* copy out the groups passed */
-	if (count)
-		memcpy (opctx->groups, groups, (sizeof (gid_t) * count));
-
-	/* set/reset the ngrps, this is where reset of groups is handled */
-	opctx->ngrps = count;
-	opctx->valid |= SYNCOPCTX_GROUPS;
-
-out:
-	return ret;
+        if (task) {
+                frame = task->opaque;
+        }
+
+        return (call_frame_t *)frame;
 }
 
-static void
-__run (struct synctask *task)
+void
+synctask_yield (struct synctask *task)
 {
-        struct syncenv *env = NULL;
+        struct syncenv   *env = NULL;
 
         env = task->env;
 
-        list_del_init (&task->all_tasks);
-        switch (task->state) {
-        case SYNCTASK_INIT:
-        case SYNCTASK_SUSPEND:
-                break;
-        case SYNCTASK_RUN:
-                gf_log (task->xl->name, GF_LOG_DEBUG,
-                        "re-running already running task");
-                env->runcount--;
-                break;
-        case SYNCTASK_WAIT:
-                env->waitcount--;
-                break;
-        case SYNCTASK_DONE:
-                gf_log (task->xl->name, GF_LOG_WARNING,
-                        "running completed task");
-		return;
-	case SYNCTASK_ZOMBIE:
-		gf_log (task->xl->name, GF_LOG_WARNING,
-			"attempted to wake up zombie!!");
-		return;
+        if (swapcontext (&task->ctx, &env->sched) < 0) {
+                gf_log ("syncop", GF_LOG_ERROR,
+                        "swapcontext failed (%s)", strerror (errno));
         }
-
-        list_add_tail (&task->all_tasks, &env->runq);
-        env->runcount++;
-        task->state = SYNCTASK_RUN;
 }
 
 
-static void
-__wait (struct synctask *task)
+void
+synctask_yawn (struct synctask *task)
 {
-        struct syncenv *env = NULL;
+        struct syncenv  *env = NULL;
 
-        env = task->env;
+        env  = task->env;
 
-        list_del_init (&task->all_tasks);
-        switch (task->state) {
-        case SYNCTASK_INIT:
-        case SYNCTASK_SUSPEND:
-                break;
-        case SYNCTASK_RUN:
-                env->runcount--;
-                break;
-        case SYNCTASK_WAIT:
-                gf_log (task->xl->name, GF_LOG_WARNING,
-                        "re-waiting already waiting task");
-                env->waitcount--;
-                break;
-        case SYNCTASK_DONE:
-                gf_log (task->xl->name, GF_LOG_WARNING,
-                        "running completed task");
-                return;
-	case SYNCTASK_ZOMBIE:
-		gf_log (task->xl->name, GF_LOG_WARNING,
-			"attempted to sleep a zombie!!");
-		return;
+        pthread_mutex_lock (&env->mutex);
+        {
+                list_del_init (&task->all_tasks);
+                list_add (&task->all_tasks, &env->waitq);
         }
-
-        list_add_tail (&task->all_tasks, &env->waitq);
-        env->waitcount++;
-        task->state = SYNCTASK_WAIT;
+        pthread_mutex_unlock (&env->mutex);
 }
 
 
 void
-synctask_yield (struct synctask *task)
+synctask_zzzz (struct synctask *task)
 {
-        xlator_t *oldTHIS = THIS;
+        synctask_yawn (task);
 
-#if defined(__NetBSD__) && defined(_UC_TLSBASE)
-        /* Preserve pthread private pointer through swapcontex() */
-        task->proc->sched.uc_flags &= ~_UC_TLSBASE;
-#endif
-
-        if (task->state != SYNCTASK_DONE)
-                task->state = SYNCTASK_SUSPEND;
-        if (swapcontext (&task->ctx, &task->proc->sched) < 0) {
-                gf_log ("syncop", GF_LOG_ERROR,
-                        "swapcontext failed (%s)", strerror (errno));
-        }
-
-        THIS = oldTHIS;
+        synctask_yield (task);
 }
 
 
@@ -271,30 +87,34 @@ synctask_wake (struct synctask *task)
 
         pthread_mutex_lock (&env->mutex);
         {
-                task->woken = 1;
-
-                if (task->slept)
-                        __run (task);
-
-		pthread_cond_broadcast (&env->cond);
+                list_del_init (&task->all_tasks);
+                list_add_tail (&task->all_tasks, &env->runq);
         }
         pthread_mutex_unlock (&env->mutex);
+
+        pthread_cond_broadcast (&env->cond);
 }
 
+
 void
 synctask_wrap (struct synctask *old_task)
 {
+        int              ret;
         struct synctask *task = NULL;
 
         /* Do not trust the pointer received. It may be
            wrong and can lead to crashes. */
 
         task = synctask_get ();
-        task->ret = task->syncfn (task->opaque);
-        if (task->synccbk)
-                task->synccbk (task->ret, task->frame, task->opaque);
 
-        task->state = SYNCTASK_DONE;
+        ret = task->syncfn (task->opaque);
+        task->synccbk (ret, task->opaque);
+
+        /* cannot destroy @task right here as we are
+           in the execution stack of @task itself
+        */
+        task->complete = 1;
+        synctask_wake (task);
 
         synctask_yield (task);
 }
@@ -306,88 +126,29 @@ synctask_destroy (struct synctask *task)
         if (!task)
                 return;
 
-        FREE (task->stack);
-
-        if (task->opframe)
-                STACK_DESTROY (task->opframe->root);
-
-        if (task->synccbk == NULL) {
-               pthread_mutex_destroy (&task->mutex);
-               pthread_cond_destroy (&task->cond);
-        }
-
+        if (task->stack)
+                FREE (task->stack);
         FREE (task);
 }
 
 
-void
-synctask_done (struct synctask *task)
-{
-        if (task->synccbk) {
-                synctask_destroy (task);
-                return;
-        }
-
-        pthread_mutex_lock (&task->mutex);
-        {
-		task->state = SYNCTASK_ZOMBIE;
-                task->done = 1;
-                pthread_cond_broadcast (&task->cond);
-        }
-        pthread_mutex_unlock (&task->mutex);
-}
-
-
 int
-synctask_setid (struct synctask *task, uid_t uid, gid_t gid)
-{
-        if (!task)
-                return -1;
-
-        if (uid != -1)
-                task->uid = uid;
-
-        if (gid != -1)
-                task->gid = gid;
-
-        return 0;
-}
-
-
-struct synctask *
-synctask_create (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk,
-		 call_frame_t *frame, void *opaque)
+synctask_new (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk,
+              void *opaque)
 {
         struct synctask *newtask = NULL;
-        xlator_t        *this    = THIS;
-
-        VALIDATE_OR_GOTO (env, err);
-        VALIDATE_OR_GOTO (fn, err);
 
         newtask = CALLOC (1, sizeof (*newtask));
         if (!newtask)
-                return NULL;
+                return -ENOMEM;
 
-        newtask->frame      = frame;
-        if (!frame) {
-                newtask->opframe = create_frame (this, this->ctx->pool);
-        } else {
-                newtask->opframe = copy_frame (frame);
-        }
-        if (!newtask->opframe)
-                goto err;
         newtask->env        = env;
-        newtask->xl         = this;
+        newtask->xl         = THIS;
         newtask->syncfn     = fn;
         newtask->synccbk    = cbk;
         newtask->opaque     = opaque;
 
-        /* default to the uid/gid of the passed frame */
-        newtask->uid = newtask->opframe->root->uid;
-        newtask->gid = newtask->opframe->root->gid;
-
         INIT_LIST_HEAD (&newtask->all_tasks);
-        INIT_LIST_HEAD (&newtask->waitq);
 
         if (getcontext (&newtask->ctx) < 0) {
                 gf_log ("syncop", GF_LOG_ERROR,
@@ -406,114 +167,35 @@ synctask_create (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk,
         newtask->ctx.uc_stack.ss_sp   = newtask->stack;
         newtask->ctx.uc_stack.ss_size = env->stacksize;
 
-        makecontext (&newtask->ctx, (void (*)(void)) synctask_wrap, 2, newtask);
-
-        newtask->state = SYNCTASK_INIT;
-
-        newtask->slept = 1;
-
-        if (!cbk) {
-                pthread_mutex_init (&newtask->mutex, NULL);
-                pthread_cond_init (&newtask->cond, NULL);
-                newtask->done = 0;
-        }
+        makecontext (&newtask->ctx, (void *) synctask_wrap, 2, newtask);
 
         synctask_wake (newtask);
-        /*
-         * Make sure someone's there to execute anything we just put on the
-         * run queue.
-         */
-        syncenv_scale(env);
 
-	return newtask;
+        return 0;
 err:
         if (newtask) {
-                FREE (newtask->stack);
-                if (newtask->opframe)
-                        STACK_DESTROY (newtask->opframe->root);
+                if (newtask->stack)
+                        FREE (newtask->stack);
                 FREE (newtask);
         }
-
-        return NULL;
-}
-
-
-int
-synctask_join (struct synctask *task)
-{
-	int ret = 0;
-
-	pthread_mutex_lock (&task->mutex);
-	{
-		while (!task->done)
-			pthread_cond_wait (&task->cond, &task->mutex);
-	}
-	pthread_mutex_unlock (&task->mutex);
-
-	ret = task->ret;
-
-	synctask_destroy (task);
-
-	return ret;
-}
-
-
-int
-synctask_new (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk,
-              call_frame_t *frame, void *opaque)
-{
-	struct synctask *newtask = NULL;
-	int              ret = 0;
-
-	newtask = synctask_create (env, fn, cbk, frame, opaque);
-	if (!newtask)
-		return -1;
-
-        if (!cbk)
-		ret = synctask_join (newtask);
-
-        return ret;
+        return -1;
 }
 
 
 struct synctask *
-syncenv_task (struct syncproc *proc)
+syncenv_task (struct syncenv *env)
 {
-        struct syncenv   *env = NULL;
         struct synctask  *task = NULL;
-        struct timespec   sleep_till = {0, };
-        int               ret = 0;
-
-        env = proc->env;
 
         pthread_mutex_lock (&env->mutex);
         {
-                while (list_empty (&env->runq)) {
-                        sleep_till.tv_sec = time (NULL) + SYNCPROC_IDLE_TIME;
-                        ret = pthread_cond_timedwait (&env->cond, &env->mutex,
-                                                      &sleep_till);
-                        if (!list_empty (&env->runq))
-                                break;
-                        if ((ret == ETIMEDOUT) &&
-                            (env->procs > env->procmin)) {
-                                task = NULL;
-                                env->procs--;
-                                memset (proc, 0, sizeof (*proc));
-                                goto unlock;
-                        }
-                }
+                while (list_empty (&env->runq))
+                        pthread_cond_wait (&env->cond, &env->mutex);
 
                 task = list_entry (env->runq.next, struct synctask, all_tasks);
 
                 list_del_init (&task->all_tasks);
-                env->runcount--;
-
-                task->woken = 0;
-                task->slept = 0;
-
-                task->proc = proc;
         }
-unlock:
         pthread_mutex_unlock (&env->mutex);
 
         return task;
@@ -530,51 +212,30 @@ synctask_switchto (struct synctask *task)
         synctask_set (task);
         THIS = task->xl;
 
-#if defined(__NetBSD__) && defined(_UC_TLSBASE)
-        /* Preserve pthread private pointer through swapcontex() */
-        task->ctx.uc_flags &= ~_UC_TLSBASE;
-#endif
-
-        if (swapcontext (&task->proc->sched, &task->ctx) < 0) {
+        if (swapcontext (&env->sched, &task->ctx) < 0) {
                 gf_log ("syncop", GF_LOG_ERROR,
                         "swapcontext failed (%s)", strerror (errno));
         }
-
-        if (task->state == SYNCTASK_DONE) {
-                synctask_done (task);
-                return;
-        }
-
-        pthread_mutex_lock (&env->mutex);
-        {
-                if (task->woken) {
-                        __run (task);
-                } else {
-                        task->slept = 1;
-                        __wait (task);
-                }
-        }
-        pthread_mutex_unlock (&env->mutex);
 }
 
+
 void *
 syncenv_processor (void *thdata)
 {
         struct syncenv  *env = NULL;
-        struct syncproc *proc = NULL;
         struct synctask *task = NULL;
 
-        proc = thdata;
-        env = proc->env;
+        env = thdata;
 
         for (;;) {
-                task = syncenv_task (proc);
-                if (!task)
-                        break;
+                task = syncenv_task (env);
 
-                synctask_switchto (task);
+                if (task->complete) {
+                        synctask_destroy (task);
+                        continue;
+                }
 
-                syncenv_scale (env);
+                synctask_switchto (task);
         }
 
         return NULL;
@@ -582,45 +243,6 @@ syncenv_processor (void *thdata)
 
 
 void
-syncenv_scale (struct syncenv *env)
-{
-        int  diff = 0;
-        int  scale = 0;
-        int  i = 0;
-        int  ret = 0;
-
-        pthread_mutex_lock (&env->mutex);
-        {
-                if (env->procs > env->runcount)
-                        goto unlock;
-
-                scale = env->runcount;
-                if (scale > env->procmax)
-                        scale = env->procmax;
-                if (scale > env->procs)
-                        diff = scale - env->procs;
-                while (diff) {
-                        diff--;
-                        for (; (i < env->procmax); i++) {
-                                if (env->proc[i].processor == 0)
-                                        break;
-                        }
-
-                        env->proc[i].env = env;
-                        ret = gf_thread_create (&env->proc[i].processor, NULL,
-						syncenv_processor, &env->proc[i]);
-                        if (ret)
-                                break;
-                        env->procs++;
-                        i++;
-                }
-        }
-unlock:
-        pthread_mutex_unlock (&env->mutex);
-}
-
-
-void
 syncenv_destroy (struct syncenv *env)
 {
 
@@ -628,19 +250,10 @@ syncenv_destroy (struct syncenv *env)
 
 
 struct syncenv *
-syncenv_new (size_t stacksize, int procmin, int procmax)
+syncenv_new (size_t stacksize)
 {
         struct syncenv *newenv = NULL;
         int             ret = 0;
-        int             i = 0;
-
-	if (!procmin || procmin < 0)
-		procmin = SYNCENV_PROC_MIN;
-	if (!procmax || procmax > SYNCENV_PROC_MAX)
-		procmax = SYNCENV_PROC_MAX;
-
-	if (procmin > procmax)
-		return NULL;
 
         newenv = CALLOC (1, sizeof (*newenv));
 
@@ -656,17 +269,9 @@ syncenv_new (size_t stacksize, int procmin, int procmax)
         newenv->stacksize    = SYNCENV_DEFAULT_STACKSIZE;
         if (stacksize)
                 newenv->stacksize = stacksize;
-	newenv->procmin = procmin;
-	newenv->procmax = procmax;
-
-        for (i = 0; i < newenv->procmin; i++) {
-                newenv->proc[i].env = newenv;
-                ret = gf_thread_create (&newenv->proc[i].processor, NULL,
-					syncenv_processor, &newenv->proc[i]);
-                if (ret)
-                        break;
-                newenv->procs++;
-        }
+
+        ret = pthread_create (&newenv->processor, NULL,
+                              syncenv_processor, newenv);
 
         if (ret != 0)
                 syncenv_destroy (newenv);
@@ -675,275 +280,13 @@ syncenv_new (size_t stacksize, int procmin, int procmax)
 }
 
 
-int
-synclock_init (synclock_t *lock)
-{
-	if (!lock)
-		return -1;
-
-	pthread_cond_init (&lock->cond, 0);
-	lock->lock = 0;
-	INIT_LIST_HEAD (&lock->waitq);
-
-	return pthread_mutex_init (&lock->guard, 0);
-}
-
-
-int
-synclock_destroy (synclock_t *lock)
-{
-	if (!lock)
-		return -1;
-
-	pthread_cond_destroy (&lock->cond);
-	return pthread_mutex_destroy (&lock->guard);
-}
-
-
-static int
-__synclock_lock (struct synclock *lock)
-{
-	struct synctask *task = NULL;
-
-	if (!lock)
-		return -1;
-
-	task = synctask_get ();
-
-	while (lock->lock) {
-		if (task) {
-			/* called within a synctask */
-			list_add_tail (&task->waitq, &lock->waitq);
-                        pthread_mutex_unlock (&lock->guard);
-                        synctask_yield (task);
-                        /* task is removed from waitq in unlock,
-                         * under lock->guard.*/
-                        pthread_mutex_lock (&lock->guard);
-		} else {
-			/* called by a non-synctask */
-			pthread_cond_wait (&lock->cond, &lock->guard);
-		}
-	}
-
-	lock->lock = _gf_true;
-	lock->owner = task;
-
-	return 0;
-}
-
-
-int
-synclock_lock (synclock_t *lock)
-{
-	int ret = 0;
-
-	pthread_mutex_lock (&lock->guard);
-	{
-		ret = __synclock_lock (lock);
-	}
-	pthread_mutex_unlock (&lock->guard);
-
-	return ret;
-}
-
-
-int
-synclock_trylock (synclock_t *lock)
-{
-	int ret = 0;
-
-	errno = 0;
-
-	pthread_mutex_lock (&lock->guard);
-	{
-		if (lock->lock) {
-			errno = EBUSY;
-			ret = -1;
-			goto unlock;
-		}
-
-		ret = __synclock_lock (lock);
-	}
-unlock:
-	pthread_mutex_unlock (&lock->guard);
-
-	return ret;
-}
-
-
-static int
-__synclock_unlock (synclock_t *lock)
-{
-	struct synctask *task = NULL;
-	struct synctask *curr = NULL;
-
-	if (!lock)
-		return -1;
-
-	curr = synctask_get ();
-
-	if (lock->owner != curr) {
-		/* warn ? */
-	}
-
-	lock->lock = _gf_false;
-
-	/* There could be both synctasks and non synctasks
-	   waiting (or none, or either). As a mid-approach
-	   between maintaining too many waiting counters
-	   at one extreme and a thundering herd on unlock
-	   at the other, call a cond_signal (which wakes
-	   one waiter) and first synctask waiter. So at
-	   most we have two threads waking up to grab the
-	   just released lock.
-	*/
-	pthread_cond_signal (&lock->cond);
-	if (!list_empty (&lock->waitq)) {
-		task = list_entry (lock->waitq.next, struct synctask, waitq);
-                list_del_init (&task->waitq);
-		synctask_wake (task);
-	}
-
-	return 0;
-}
-
-
-int
-synclock_unlock (synclock_t *lock)
-{
-	int ret = 0;
-
-	pthread_mutex_lock (&lock->guard);
-	{
-		ret = __synclock_unlock (lock);
-	}
-	pthread_mutex_unlock (&lock->guard);
-
-	return ret;
-}
-
-/* Barriers */
-
-int
-syncbarrier_init (struct syncbarrier *barrier)
-{
-	if (!barrier) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	pthread_cond_init (&barrier->cond, 0);
-	barrier->count = 0;
-	INIT_LIST_HEAD (&barrier->waitq);
-
-	return pthread_mutex_init (&barrier->guard, 0);
-}
-
-
-int
-syncbarrier_destroy (struct syncbarrier *barrier)
-{
-	if (!barrier) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	pthread_cond_destroy (&barrier->cond);
-	return pthread_mutex_destroy (&barrier->guard);
-}
-
-
-static int
-__syncbarrier_wait (struct syncbarrier *barrier, int waitfor)
-{
-	struct synctask *task = NULL;
-
-	if (!barrier) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	task = synctask_get ();
-
-	while (barrier->count < waitfor) {
-		if (task) {
-			/* called within a synctask */
-			list_add_tail (&task->waitq, &barrier->waitq);
-                        pthread_mutex_unlock (&barrier->guard);
-                        synctask_yield (task);
-                        pthread_mutex_lock (&barrier->guard);
-		} else {
-			/* called by a non-synctask */
-			pthread_cond_wait (&barrier->cond, &barrier->guard);
-		}
-	}
-
-	barrier->count = 0;
-
-	return 0;
-}
-
-
-int
-syncbarrier_wait (struct syncbarrier *barrier, int waitfor)
-{
-	int ret = 0;
-
-	pthread_mutex_lock (&barrier->guard);
-	{
-		ret = __syncbarrier_wait (barrier, waitfor);
-	}
-	pthread_mutex_unlock (&barrier->guard);
-
-	return ret;
-}
-
-
-static int
-__syncbarrier_wake (struct syncbarrier *barrier)
-{
-	struct synctask *task = NULL;
-
-	if (!barrier) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	barrier->count++;
-
-	pthread_cond_signal (&barrier->cond);
-	if (!list_empty (&barrier->waitq)) {
-		task = list_entry (barrier->waitq.next, struct synctask, waitq);
-                list_del_init (&task->waitq);
-		synctask_wake (task);
-	}
-
-	return 0;
-}
-
-
-int
-syncbarrier_wake (struct syncbarrier *barrier)
-{
-	int ret = 0;
-
-	pthread_mutex_lock (&barrier->guard);
-	{
-		ret = __syncbarrier_wake (barrier);
-	}
-	pthread_mutex_unlock (&barrier->guard);
-
-	return ret;
-}
-
-
 /* FOPS */
 
 
 int
 syncop_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int op_ret, int op_errno, inode_t *inode,
-                   struct iatt *iatt, dict_t *xdata, struct iatt *parent)
+                   struct iatt *iatt, dict_t *xattr, struct iatt *parent)
 {
         struct syncargs *args = NULL;
 
@@ -954,9 +297,8 @@ syncop_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         if (op_ret == 0) {
                 args->iatt1  = *iatt;
+                args->xattr  = dict_ref (xattr);
                 args->iatt2  = *parent;
-                if (xdata)
-                        args->xdata  = dict_ref (xdata);
         }
 
         __wake (args);
@@ -966,23 +308,22 @@ syncop_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 
 int
-syncop_lookup (xlator_t *subvol, loc_t *loc, dict_t *xdata_req,
-               struct iatt *iatt, dict_t **xdata_rsp, struct iatt *parent)
+syncop_lookup (xlator_t *subvol, loc_t *loc, dict_t *xattr_req,
+               struct iatt *iatt, dict_t **xattr_rsp, struct iatt *parent)
 {
         struct syncargs args = {0, };
 
         SYNCOP (subvol, (&args), syncop_lookup_cbk, subvol->fops->lookup,
-                loc, xdata_req);
+                loc, xattr_req);
 
         if (iatt)
                 *iatt = args.iatt1;
+        if (xattr_rsp)
+                *xattr_rsp = dict_ref (args.xattr);
         if (parent)
                 *parent = args.iatt2;
-        if (xdata_rsp)
-                *xdata_rsp = args.xdata;
-        else if (args.xdata)
-                dict_unref (args.xdata);
 
+        dict_unref (args.xattr);
         errno = args.op_errno;
         return args.op_ret;
 }
@@ -997,10 +338,8 @@ entry_copy (gf_dirent_t *source)
         sink->d_off = source->d_off;
         sink->d_ino = source->d_ino;
         sink->d_type = source->d_type;
-        sink->d_stat = source->d_stat;
+        uuid_copy (sink->d_stat.ia_gfid, source->d_stat.ia_gfid);
 
-	if (source->inode)
-		sink->inode = inode_ref (source->inode);
         return sink;
 }
 
@@ -1010,7 +349,7 @@ syncop_readdirp_cbk (call_frame_t *frame,
                      xlator_t *this,
                      int32_t op_ret,
                      int32_t op_errno,
-                     gf_dirent_t *entries, dict_t *xdata)
+                     gf_dirent_t *entries)
 {
         struct syncargs *args = NULL;
         gf_dirent_t *entry = NULL;
@@ -1047,76 +386,15 @@ syncop_readdirp (xlator_t *subvol,
                  fd_t *fd,
                  size_t size,
                  off_t off,
-                 dict_t *dict,
                  gf_dirent_t *entries)
 {
         struct syncargs args = {0, };
 
         SYNCOP (subvol, (&args), syncop_readdirp_cbk, subvol->fops->readdirp,
-                fd, size, off, dict);
-
-        if (entries)
-                list_splice_init (&args.entries.list, &entries->list);
-        /* TODO: need to free all the 'args.entries' in 'else' case */
-
-        errno = args.op_errno;
-        return args.op_ret;
-
-}
-
-int32_t
-syncop_readdir_cbk (call_frame_t *frame,
-                    void *cookie,
-                    xlator_t *this,
-                    int32_t op_ret,
-                    int32_t op_errno,
-                    gf_dirent_t *entries, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-        gf_dirent_t *entry = NULL;
-        gf_dirent_t  *tmp = NULL;
-
-        int count = 0;
-
-        args = cookie;
-
-        INIT_LIST_HEAD (&args->entries.list);
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        if (op_ret >= 0) {
-                list_for_each_entry (entry, &entries->list, list) {
-                        tmp = entry_copy (entry);
-                        gf_log (this->name, GF_LOG_TRACE,
-                                "adding entry=%s, count=%d",
-                                tmp->d_name, count);
-                        list_add_tail (&tmp->list, &(args->entries.list));
-                        count++;
-                }
-        }
-
-        __wake (args);
-
-        return 0;
-
-}
-
-int
-syncop_readdir (xlator_t *subvol,
-                fd_t *fd,
-                size_t size,
-                off_t off,
-                gf_dirent_t *entries)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_readdir_cbk, subvol->fops->readdir,
-                fd, size, off, NULL);
+                fd, size, off);
 
         if (entries)
                 list_splice_init (&args.entries.list, &entries->list);
-        /* TODO: need to free all the 'args.entries' in 'else' case */
 
         errno = args.op_errno;
         return args.op_ret;
@@ -1129,7 +407,7 @@ syncop_opendir_cbk (call_frame_t *frame,
                     xlator_t *this,
                     int32_t op_ret,
                     int32_t op_errno,
-                    fd_t *fd, dict_t *xdata)
+                    fd_t *fd)
 {
         struct syncargs *args = NULL;
 
@@ -1151,100 +429,17 @@ syncop_opendir (xlator_t *subvol,
         struct syncargs args = {0, };
 
         SYNCOP (subvol, (&args), syncop_opendir_cbk, subvol->fops->opendir,
-                loc, fd, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-
-}
-
-int
-syncop_fsyncdir_cbk (call_frame_t *frame, void* cookie, xlator_t *this,
-                     int op_ret, int op_errno, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_fsyncdir (xlator_t *subvol, fd_t *fd, int datasync)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_fsyncdir_cbk, subvol->fops->fsyncdir,
-                fd, datasync, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int op_ret, int op_errno, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_removexattr (xlator_t *subvol, loc_t *loc, const char *name)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_removexattr_cbk, subvol->fops->removexattr,
-                loc, name, NULL);
+                loc, fd);
 
         errno = args.op_errno;
         return args.op_ret;
-}
-
-int
-syncop_fremovexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                         int op_ret, int op_errno, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
 
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
 }
 
-int
-syncop_fremovexattr (xlator_t *subvol, fd_t *fd, const char *name)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_fremovexattr_cbk,
-                subvol->fops->fremovexattr, fd, name, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
 
 int
 syncop_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int op_ret, int op_errno, dict_t *xdata)
+                     int op_ret, int op_errno)
 {
         struct syncargs *args = NULL;
 
@@ -1265,105 +460,7 @@ syncop_setxattr (xlator_t *subvol, loc_t *loc, dict_t *dict, int32_t flags)
         struct syncargs args = {0, };
 
         SYNCOP (subvol, (&args), syncop_setxattr_cbk, subvol->fops->setxattr,
-                loc, dict, flags, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int op_ret, int op_errno, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-
-int
-syncop_fsetxattr (xlator_t *subvol, fd_t *fd, dict_t *dict, int32_t flags)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_fsetxattr_cbk, subvol->fops->fsetxattr,
-                fd, dict, flags, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int op_ret, int op_errno, dict_t *dict, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-        if (op_ret >= 0)
-                args->xattr = dict_ref (dict);
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_listxattr (xlator_t *subvol, loc_t *loc, dict_t **dict)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_getxattr_cbk, subvol->fops->getxattr,
-                loc, NULL, NULL);
-
-        if (dict)
-                *dict = args.xattr;
-        else if (args.xattr)
-                dict_unref (args.xattr);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_getxattr (xlator_t *subvol, loc_t *loc, dict_t **dict, const char *key)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_getxattr_cbk, subvol->fops->getxattr,
-                loc, key, NULL);
-
-        if (dict)
-                *dict = args.xattr;
-        else if (args.xattr)
-                dict_unref (args.xattr);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_fgetxattr (xlator_t *subvol, fd_t *fd, dict_t **dict, const char *key)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_getxattr_cbk, subvol->fops->fgetxattr,
-                fd, key, NULL);
-
-        if (dict)
-                *dict = args.xattr;
-        else if (args.xattr)
-                dict_unref (args.xattr);
+                loc, dict, flags);
 
         errno = args.op_errno;
         return args.op_ret;
@@ -1372,7 +469,7 @@ syncop_fgetxattr (xlator_t *subvol, fd_t *fd, dict_t **dict, const char *key)
 int
 syncop_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno,
-                   struct statvfs *buf, dict_t *xdata)
+                   struct statvfs *buf)
 
 {
         struct syncargs *args = NULL;
@@ -1399,7 +496,7 @@ syncop_statfs (xlator_t *subvol, loc_t *loc, struct statvfs *buf)
         struct syncargs args = {0, };
 
         SYNCOP (subvol, (&args), syncop_statfs_cbk, subvol->fops->statfs,
-                loc, NULL);
+                loc);
 
         if (buf)
                 *buf = args.statvfs_buf;
@@ -1411,7 +508,7 @@ syncop_statfs (xlator_t *subvol, loc_t *loc, struct statvfs *buf)
 int
 syncop_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int op_ret, int op_errno,
-                    struct iatt *preop, struct iatt *postop, dict_t *xdata)
+                    struct iatt *preop, struct iatt *postop)
 {
         struct syncargs *args = NULL;
 
@@ -1438,26 +535,7 @@ syncop_setattr (xlator_t *subvol, loc_t *loc, struct iatt *iatt, int valid,
         struct syncargs args = {0, };
 
         SYNCOP (subvol, (&args), syncop_setattr_cbk, subvol->fops->setattr,
-                loc, iatt, valid, NULL);
-
-        if (preop)
-                *preop = args.iatt1;
-        if (postop)
-                *postop = args.iatt2;
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-
-int
-syncop_fsetattr (xlator_t *subvol, fd_t *fd, struct iatt *iatt, int valid,
-                 struct iatt *preop, struct iatt *postop)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_setattr_cbk, subvol->fops->fsetattr,
-                fd, iatt, valid, NULL);
+                loc, iatt, valid);
 
         if (preop)
                 *preop = args.iatt1;
@@ -1467,771 +545,3 @@ syncop_fsetattr (xlator_t *subvol, fd_t *fd, struct iatt *iatt, int valid,
         errno = args.op_errno;
         return args.op_ret;
 }
-
-
-int32_t
-syncop_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                 int32_t op_ret, int32_t op_errno, fd_t *fd, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_open (xlator_t *subvol, loc_t *loc, int32_t flags, fd_t *fd)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_open_cbk, subvol->fops->open,
-                loc, flags, fd, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-
-}
-
-
-int32_t
-syncop_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, struct iovec *vector,
-                  int32_t count, struct iatt *stbuf, struct iobref *iobref,
-                  dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        INIT_LIST_HEAD (&args->entries.list);
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        if (args->op_ret >= 0) {
-                if (iobref)
-                        args->iobref = iobref_ref (iobref);
-                args->vector = iov_dup (vector, count);
-                args->count  = count;
-        }
-
-        __wake (args);
-
-        return 0;
-
-}
-
-int
-syncop_readv (xlator_t *subvol, fd_t *fd, size_t size, off_t off,
-              uint32_t flags, struct iovec **vector, int *count,
-              struct iobref **iobref)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_readv_cbk, subvol->fops->readv,
-                fd, size, off, flags, NULL);
-
-        if (args.op_ret < 0)
-                goto out;
-
-        if (vector)
-                *vector = args.vector;
-        else
-                GF_FREE (args.vector);
-
-        if (count)
-                *count = args.count;
-
-        /* Do we need a 'ref' here? */
-        if (iobref)
-                *iobref = args.iobref;
-        else if (args.iobref)
-                iobref_unref (args.iobref);
-
-out:
-        errno = args.op_errno;
-        return args.op_ret;
-
-}
-
-int
-syncop_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int op_ret, int op_errno, struct iatt *prebuf,
-                   struct iatt *postbuf, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_writev (xlator_t *subvol, fd_t *fd, const struct iovec *vector,
-               int32_t count, off_t offset, struct iobref *iobref,
-               uint32_t flags)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_writev_cbk, subvol->fops->writev,
-                fd, (struct iovec *) vector, count, offset, flags, iobref,
-                NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int syncop_write (xlator_t *subvol, fd_t *fd, const char *buf, int size,
-                  off_t offset, struct iobref *iobref, uint32_t flags)
-{
-        struct syncargs args = {0,};
-        struct iovec    vec  = {0,};
-
-        vec.iov_len = size;
-        vec.iov_base = (void *)buf;
-
-        SYNCOP (subvol, (&args), syncop_writev_cbk, subvol->fops->writev,
-                fd, &vec, 1, offset, flags, iobref, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-
-int
-syncop_close (fd_t *fd)
-{
-        if (fd)
-                fd_unref (fd);
-        return 0;
-}
-
-int32_t
-syncop_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, fd_t *fd, inode_t *inode,
-                   struct iatt *buf, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-	if (buf)
-		args->iatt1 = *buf;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_create (xlator_t *subvol, loc_t *loc, int32_t flags, mode_t mode,
-               fd_t *fd, dict_t *xdata, struct iatt *iatt)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_create_cbk, subvol->fops->create,
-                loc, flags, mode, 0, fd, xdata);
-
-        errno = args.op_errno;
-	if (iatt)
-		*iatt = args.iatt1;
-
-        return args.op_ret;
-
-}
-
-int
-syncop_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int op_ret, int op_errno, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_unlink (xlator_t *subvol, loc_t *loc)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_unlink_cbk, subvol->fops->unlink, loc,
-                0, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int op_ret, int op_errno, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_rmdir (xlator_t *subvol, loc_t *loc)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_rmdir_cbk, subvol->fops->rmdir, loc,
-                0, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-
-int
-syncop_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                 int32_t op_ret, int32_t op_errno, inode_t *inode,
-                 struct iatt *buf, struct iatt *preparent,
-                 struct iatt *postparent, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-
-int
-syncop_link (xlator_t *subvol, loc_t *oldloc, loc_t *newloc)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_link_cbk, subvol->fops->link,
-                oldloc, newloc, NULL);
-
-        errno = args.op_errno;
-
-        return args.op_ret;
-}
-
-
-int
-syncop_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, struct iatt *buf,
-                   struct iatt *preoldparent, struct iatt *postoldparent,
-                   struct iatt *prenewparent, struct iatt *postnewparent,
-                   dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-
-int
-syncop_rename (xlator_t *subvol, loc_t *oldloc, loc_t *newloc)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_rename_cbk, subvol->fops->rename,
-                oldloc, newloc, NULL);
-
-        errno = args.op_errno;
-
-        return args.op_ret;
-}
-
-
-int
-syncop_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int op_ret, int op_errno, struct iatt *prebuf,
-                      struct iatt *postbuf, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_ftruncate (xlator_t *subvol, fd_t *fd, off_t offset)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_ftruncate_cbk, subvol->fops->ftruncate,
-                fd, offset, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_truncate (xlator_t *subvol, loc_t *loc, off_t offset)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_ftruncate_cbk, subvol->fops->truncate,
-                loc, offset, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno,
-                  struct iatt *prebuf, struct iatt *postbuf, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-
-}
-
-int
-syncop_fsync (xlator_t *subvol, fd_t *fd, int dataonly)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_fsync_cbk, subvol->fops->fsync,
-                fd, dataonly, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-
-}
-
-
-int
-syncop_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-
-}
-
-int
-syncop_flush (xlator_t *subvol, fd_t *fd)
-{
-        struct syncargs args = {0};
-
-        SYNCOP (subvol, (&args), syncop_flush_cbk, subvol->fops->flush,
-                fd, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-
-}
-
-int
-syncop_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, struct iatt *stbuf, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-        if (op_ret == 0)
-                args->iatt1 = *stbuf;
-
-        __wake (args);
-
-        return 0;
-
-}
-
-int
-syncop_fstat (xlator_t *subvol, fd_t *fd, struct iatt *stbuf)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_fstat_cbk, subvol->fops->fstat,
-                fd, NULL);
-
-        if (stbuf)
-                *stbuf = args.iatt1;
-
-        errno = args.op_errno;
-        return args.op_ret;
-
-}
-
-int
-syncop_stat (xlator_t *subvol, loc_t *loc, struct iatt *stbuf)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_fstat_cbk, subvol->fops->stat,
-                loc, NULL);
-
-        if (stbuf)
-                *stbuf = args.iatt1;
-
-        errno = args.op_errno;
-        return args.op_ret;
-
-}
-
-int32_t
-syncop_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno, inode_t *inode,
-                    struct iatt *buf, struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-	if (buf)
-		args->iatt1 = *buf;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_symlink (xlator_t *subvol, loc_t *loc, const char *newpath, dict_t *dict,
-		struct iatt *iatt)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_symlink_cbk, subvol->fops->symlink,
-                newpath, loc, 0, dict);
-
-        errno = args.op_errno;
-	if (iatt)
-		*iatt = args.iatt1;
-
-        return args.op_ret;
-
-}
-
-int
-syncop_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int op_ret, int op_errno, const char *path,
-                     struct iatt *stbuf, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        if ((op_ret != -1) && path)
-                args->buffer = gf_strdup (path);
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_readlink (xlator_t *subvol, loc_t *loc, char **buffer, size_t size)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_readlink_cbk, subvol->fops->readlink,
-                loc, size, NULL);
-
-        if (buffer)
-                *buffer = args.buffer;
-        else GF_FREE (args.buffer);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, inode_t *inode,
-                  struct iatt *buf, struct iatt *preparent,
-                  struct iatt *postparent, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-	if (buf)
-		args->iatt1 = *buf;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_mknod (xlator_t *subvol, loc_t *loc, mode_t mode, dev_t rdev,
-              dict_t *dict, struct iatt *iatt)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_mknod_cbk, subvol->fops->mknod,
-                loc, mode, rdev, 0, dict);
-
-        errno = args.op_errno;
-	if (iatt)
-		*iatt = args.iatt1;
-
-        return args.op_ret;
-
-}
-
-
-int
-syncop_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, inode_t *inode,
-                  struct iatt *buf, struct iatt *preparent,
-                  struct iatt *postparent, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-	if (buf)
-		args->iatt1 = *buf;
-
-        __wake (args);
-
-        return 0;
-}
-
-
-int
-syncop_mkdir (xlator_t *subvol, loc_t *loc, mode_t mode, dict_t *dict,
-	      struct iatt *iatt)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_mkdir_cbk, subvol->fops->mkdir,
-                loc, mode, 0, dict);
-
-        errno = args.op_errno;
-	if (iatt)
-		*iatt = args.iatt1;
-
-        return args.op_ret;
-
-}
-
-int
-syncop_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_access (xlator_t *subvol, loc_t *loc, int32_t mask)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_access_cbk, subvol->fops->access,
-                loc, mask, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-
-int
-syncop_fallocate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int op_ret, int op_errno, struct iatt *prebuf,
-                      struct iatt *postbuf, dict_t *xdata)
-{
-	struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-	return 0;
-}
-
-int
-syncop_fallocate(xlator_t *subvol, fd_t *fd, int32_t keep_size, off_t offset,
-		 size_t len)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_fallocate_cbk, subvol->fops->fallocate,
-                fd, keep_size, offset, len, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-
-int
-syncop_discard_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int op_ret, int op_errno, struct iatt *prebuf,
-                    struct iatt *postbuf, dict_t *xdata)
-{
-	struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-	return 0;
-}
-
-int
-syncop_discard(xlator_t *subvol, fd_t *fd, off_t offset, size_t len)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_discard_cbk, subvol->fops->discard,
-                fd, offset, len, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-int
-syncop_zerofill_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int op_ret, int op_errno, struct iatt *prebuf,
-                    struct iatt *postbuf, dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-
-        __wake (args);
-
-        return 0;
-}
-
-int
-syncop_zerofill(xlator_t *subvol, fd_t *fd, off_t offset, size_t len)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_zerofill_cbk, subvol->fops->zerofill,
-                fd, offset, len, NULL);
-
-        errno = args.op_errno;
-        return args.op_ret;
-}
-
-
-int
-syncop_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-	       int op_ret, int op_errno, struct gf_flock *flock,
-	       dict_t *xdata)
-{
-        struct syncargs *args = NULL;
-
-        args = cookie;
-
-        args->op_ret   = op_ret;
-        args->op_errno = op_errno;
-	if (flock)
-		args->flock = *flock;
-        __wake (args);
-
-        return 0;
-}
-
-
-int
-syncop_lk (xlator_t *subvol, fd_t *fd, int cmd, struct gf_flock *flock)
-{
-        struct syncargs args = {0, };
-
-        SYNCOP (subvol, (&args), syncop_lk_cbk, subvol->fops->lk,
-                fd, cmd, flock, NULL);
-
-        errno = args.op_errno;
-	*flock = args.flock;
-
-        return args.op_ret;
-}
diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h
index f790981f0..d17fea58e 100644
--- a/libglusterfs/src/syncop.h
+++ b/libglusterfs/src/syncop.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SYNCOP_H
@@ -21,112 +30,46 @@
 #include <pthread.h>
 #include <ucontext.h>
 
-#define SYNCENV_PROC_MAX 16
-#define SYNCENV_PROC_MIN 2
-#define SYNCPROC_IDLE_TIME 600
-
-/*
- * Flags for syncopctx valid elements
- */
-#define SYNCOPCTX_UID    0x00000001
-#define SYNCOPCTX_GID    0x00000002
-#define SYNCOPCTX_GROUPS 0x00000004
 
 struct synctask;
-struct syncproc;
 struct syncenv;
 
 
-typedef int (*synctask_cbk_t) (int ret, call_frame_t *frame, void *opaque);
+typedef int (*synctask_cbk_t) (int ret, void *opaque);
 
 typedef int (*synctask_fn_t) (void *opaque);
 
 
-typedef enum {
-        SYNCTASK_INIT = 0,
-        SYNCTASK_RUN,
-        SYNCTASK_SUSPEND,
-        SYNCTASK_WAIT,
-        SYNCTASK_DONE,
-	SYNCTASK_ZOMBIE,
-} synctask_state_t;
-
 /* for one sequential execution of @syncfn */
 struct synctask {
         struct list_head    all_tasks;
         struct syncenv     *env;
         xlator_t           *xl;
-        call_frame_t       *frame;
-        call_frame_t       *opframe;
         synctask_cbk_t      synccbk;
         synctask_fn_t       syncfn;
-        synctask_state_t    state;
         void               *opaque;
         void               *stack;
-        int                 woken;
-        int                 slept;
-        int                 ret;
-
-        uid_t               uid;
-        gid_t               gid;
+        int                 complete;
 
         ucontext_t          ctx;
-        struct syncproc    *proc;
-
-        pthread_mutex_t     mutex; /* for synchronous spawning of synctask */
-        pthread_cond_t      cond;
-        int                 done;
-
-	struct list_head    waitq; /* can wait only "once" at a time */
-};
-
-
-struct syncproc {
-        pthread_t           processor;
-        ucontext_t          sched;
-        struct syncenv     *env;
-        struct synctask    *current;
 };
 
 /* hosts the scheduler thread and framework for executing synctasks */
 struct syncenv {
-        struct syncproc     proc[SYNCENV_PROC_MAX];
-        int                 procs;
+        pthread_t           processor;
+        struct synctask    *current;
 
         struct list_head    runq;
-        int                 runcount;
         struct list_head    waitq;
-        int                 waitcount;
-
-	int                 procmin;
-	int                 procmax;
 
         pthread_mutex_t     mutex;
         pthread_cond_t      cond;
 
+        ucontext_t          sched;
         size_t              stacksize;
 };
 
 
-struct synclock {
-	pthread_mutex_t     guard; /* guard the remaining members, pair @cond */
-	pthread_cond_t      cond;  /* waiting non-synctasks */
-	struct list_head    waitq; /* waiting synctasks */
-	gf_boolean_t        lock;  /* _gf_true or _gf_false, lock status */
-	struct synctask    *owner; /* NULL if current owner is not a synctask */
-};
-typedef struct synclock synclock_t;
-
-
-struct syncbarrier {
-	pthread_mutex_t     guard; /* guard the remaining members, pair @cond */
-	pthread_cond_t      cond;  /* waiting non-synctasks */
-	struct list_head    waitq; /* waiting synctasks */
-	int                 count; /* count the number of wakes */
-};
-typedef struct syncbarrier syncbarrier_t;
-
-
 struct syncargs {
         int                 op_ret;
         int                 op_errno;
@@ -135,278 +78,99 @@ struct syncargs {
         dict_t             *xattr;
         gf_dirent_t        entries;
         struct statvfs     statvfs_buf;
-        struct iovec       *vector;
-        int                 count;
-        struct iobref      *iobref;
-        char               *buffer;
-        dict_t             *xdata;
-	struct gf_flock     flock;
-
-        /* some more _cbk needs */
-        uuid_t              uuid;
-        char               *errstr;
-        dict_t             *dict;
-        pthread_mutex_t     lock_dict;
-
-	syncbarrier_t       barrier;
 
         /* do not touch */
-        struct synctask    *task;
         pthread_mutex_t     mutex;
+        char                complete;
         pthread_cond_t      cond;
-	int                 done;
+        struct synctask    *task;
 };
 
-struct syncopctx {
-        unsigned int valid;  /* valid flags for elements that are set */
-        uid_t        uid;
-        gid_t        gid;
-        int          grpsize;
-        int          ngrps;
-        gid_t       *groups;
-};
 
-#define __yawn(args) do {                                       \
-        args->task = synctask_get ();                           \
-        if (args->task)                                         \
-            break;                                              \
-        pthread_mutex_init (&args->mutex, NULL);                \
-        pthread_cond_init (&args->cond, NULL);                  \
-        args->done = 0;                                         \
+#define __yawn(args) do {                                               \
+                struct synctask *task = NULL;                           \
+                                                                        \
+                task = synctask_get ();                                 \
+                if (task) {                                             \
+                        args->task = task;                              \
+                        synctask_yawn (task);                           \
+                } else {                                                \
+                        pthread_mutex_init (&args->mutex, NULL);        \
+                        pthread_cond_init (&args->cond, NULL);          \
+                }                                                       \
         } while (0)
 
 
-#define __wake(args) do {                                       \
-        if (args->task) {                                       \
-                synctask_wake (args->task);                     \
-        } else {                                                \
-                pthread_mutex_lock (&args->mutex);              \
-                {                                               \
-                        args->done = 1;				\
-                        pthread_cond_signal (&args->cond);      \
-                }                                               \
-                pthread_mutex_unlock (&args->mutex);            \
-        }                                                       \
+#define __yield(args) do {                                              \
+                if (args->task) {                                       \
+                        synctask_yield (args->task);                    \
+                } else {                                                \
+                        pthread_mutex_lock (&args->mutex);              \
+                        {                                               \
+                                while (!args->complete)                 \
+                                        pthread_cond_wait (&args->cond, \
+                                                           &args->mutex); \
+                        }                                               \
+                        pthread_mutex_unlock (&args->mutex);            \
+                                                                        \
+                        pthread_mutex_destroy (&args->mutex);           \
+                        pthread_cond_destroy (&args->cond);             \
+                }                                                       \
         } while (0)
 
 
-#define __yield(args) do {						\
-	if (args->task) {				                \
-		synctask_yield (args->task);				\
-	} else {							\
-		pthread_mutex_lock (&args->mutex);			\
-		{							\
-			while (!args->done)				\
-				pthread_cond_wait (&args->cond,		\
-						   &args->mutex);	\
-		}							\
-		pthread_mutex_unlock (&args->mutex);			\
-		pthread_mutex_destroy (&args->mutex);			\
-		pthread_cond_destroy (&args->cond);			\
-	}								\
-	} while (0)
+#define __wake(args) do {                                               \
+                if (args->task) {                                       \
+                        synctask_wake (args->task);                     \
+                } else {                                                \
+                        pthread_mutex_lock (&args->mutex);              \
+                        {                                               \
+                                args->complete = 1;                     \
+                                pthread_cond_broadcast (&args->cond);   \
+                        }                                               \
+                        pthread_mutex_unlock (&args->mutex);            \
+                }                                                       \
+        } while (0)
 
 
 #define SYNCOP(subvol, stb, cbk, op, params ...) do {                   \
-                struct  synctask        *task = NULL;                   \
-                call_frame_t            *frame = NULL;                  \
-                                                                        \
-                task = synctask_get ();                                 \
-                stb->task = task;                                       \
-                if (task)                                               \
-                        frame = task->opframe;                          \
-                else                                                    \
-                        frame = syncop_create_frame (THIS);		\
+                call_frame_t    *frame = NULL;                          \
                                                                         \
-                if (task) {                                             \
-                        frame->root->uid = task->uid;                   \
-                        frame->root->gid = task->gid;                   \
-                }                                                       \
+                frame = syncop_create_frame ();                         \
                                                                         \
                 __yawn (stb);                                           \
-                                                                        \
-                STACK_WIND_COOKIE (frame, cbk, (void *)stb, subvol,     \
-                                   op, params);                         \
-                                                                        \
+                STACK_WIND_COOKIE (frame, cbk, (void *)stb, subvol, op, params); \
                 __yield (stb);                                          \
-                if (task)                                               \
-                        STACK_RESET (frame->root);                      \
-                else                                                    \
-                        STACK_DESTROY (frame->root);                    \
         } while (0)
 
 
 #define SYNCENV_DEFAULT_STACKSIZE (2 * 1024 * 1024)
 
-struct syncenv * syncenv_new (size_t stacksize, int procmin, int procmax);
+struct syncenv * syncenv_new ();
 void syncenv_destroy (struct syncenv *);
-void syncenv_scale (struct syncenv *env);
 
-int synctask_new (struct syncenv *, synctask_fn_t, synctask_cbk_t, call_frame_t* frame, void *);
-struct synctask *synctask_create (struct syncenv *, synctask_fn_t,
-				  synctask_cbk_t, call_frame_t *, void *);
-int synctask_join (struct synctask *task);
+int synctask_new (struct syncenv *, synctask_fn_t, synctask_cbk_t, void *);
+void synctask_zzzz (struct synctask *task);
+void synctask_yawn (struct synctask *task);
 void synctask_wake (struct synctask *task);
 void synctask_yield (struct synctask *task);
-void synctask_waitfor (struct synctask *task, int count);
-
-#define synctask_barrier_init(args) syncbarrier_init (&args->barrier)
-#define synctask_barrier_wait(args, n) syncbarrier_wait (&args->barrier, n)
-#define synctask_barrier_wake(args) syncbarrier_wake (&args->barrier)
-
-int synctask_setid (struct synctask *task, uid_t uid, gid_t gid);
-#define SYNCTASK_SETID(uid, gid) synctask_setid (synctask_get(), uid, gid);
-
-int syncopctx_setfsuid (void *uid);
-int syncopctx_setfsgid (void *gid);
-int syncopctx_setfsgroups (int count, const void *groups);
-
-static inline call_frame_t *
-syncop_create_frame (xlator_t *this)
-{
-	call_frame_t     *frame = NULL;
-	int               ngrps = -1;
-	struct syncopctx *opctx = NULL;
-
-	frame = create_frame (this, this->ctx->pool);
-	if (!frame)
-		return NULL;
-
-	frame->root->pid = getpid ();
-
-	opctx = syncopctx_getctx ();
-	if (opctx && (opctx->valid & SYNCOPCTX_UID))
-		frame->root->uid = opctx->uid;
-	else
-		frame->root->uid = geteuid ();
-
-	if (opctx && (opctx->valid & SYNCOPCTX_GID))
-		frame->root->gid = opctx->gid;
-	else
-		frame->root->gid = getegid ();
-
-	if (opctx && (opctx->valid & SYNCOPCTX_GROUPS)) {
-		ngrps = opctx->ngrps;
-
-		if (ngrps != 0 && opctx->groups != NULL) {
-			if (call_stack_alloc_groups (frame->root, ngrps) != 0) {
-				STACK_DESTROY (frame->root);
-				return NULL;
-			}
-
-			memcpy (frame->root->groups, opctx->groups,
-				(sizeof (gid_t) * ngrps));
-		}
-	}
-	else {
-		ngrps = getgroups (0, 0);
-		if (ngrps < 0) {
-			STACK_DESTROY (frame->root);
-			return NULL;
-		}
-
-		if (call_stack_alloc_groups (frame->root, ngrps) != 0) {
-			STACK_DESTROY (frame->root);
-			return NULL;
-		}
-
-		if (getgroups (ngrps, frame->root->groups) < 0) {
-			STACK_DESTROY (frame->root);
-			return NULL;
-		}
-	}
-
-	return frame;
-}
-
-int synclock_init (synclock_t *lock);
-int synclock_destory (synclock_t *lock);
-int synclock_lock (synclock_t *lock);
-int synclock_trylock (synclock_t *lock);
-int synclock_unlock (synclock_t *lock);
-
-
-int syncbarrier_init (syncbarrier_t *barrier);
-int syncbarrier_wait (syncbarrier_t *barrier, int waitfor);
-int syncbarrier_wake (syncbarrier_t *barrier);
-int syncbarrier_destroy (syncbarrier_t *barrier);
 
 int syncop_lookup (xlator_t *subvol, loc_t *loc, dict_t *xattr_req,
                    /* out */
                    struct iatt *iatt, dict_t **xattr_rsp, struct iatt *parent);
 
 int syncop_readdirp (xlator_t *subvol, fd_t *fd, size_t size, off_t off,
-                     dict_t *dict,
                      /* out */
                      gf_dirent_t *entries);
 
-int syncop_readdir (xlator_t *subvol, fd_t *fd, size_t size, off_t off,
-                    gf_dirent_t *entries);
-
 int syncop_opendir (xlator_t *subvol, loc_t *loc, fd_t *fd);
 
 int syncop_setattr (xlator_t *subvol, loc_t *loc, struct iatt *iatt, int valid,
                     /* out */
                     struct iatt *preop, struct iatt *postop);
 
-int syncop_fsetattr (xlator_t *subvol, fd_t *fd, struct iatt *iatt, int valid,
-                    /* out */
-                    struct iatt *preop, struct iatt *postop);
-
 int syncop_statfs (xlator_t *subvol, loc_t *loc, struct statvfs *buf);
 
 int syncop_setxattr (xlator_t *subvol, loc_t *loc, dict_t *dict, int32_t flags);
-int syncop_fsetxattr (xlator_t *subvol, fd_t *fd, dict_t *dict, int32_t flags);
-int syncop_listxattr (xlator_t *subvol, loc_t *loc, dict_t **dict);
-int syncop_getxattr (xlator_t *xl, loc_t *loc, dict_t **dict, const char *key);
-int syncop_fgetxattr (xlator_t *xl, fd_t *fd, dict_t **dict, const char *key);
-int syncop_removexattr (xlator_t *subvol, loc_t *loc, const char *name);
-int syncop_fremovexattr (xlator_t *subvol, fd_t *fd, const char *name);
-
-int syncop_create (xlator_t *subvol, loc_t *loc, int32_t flags, mode_t mode,
-                   fd_t *fd, dict_t *dict, struct iatt *iatt);
-int syncop_open (xlator_t *subvol, loc_t *loc, int32_t flags, fd_t *fd);
-int syncop_close (fd_t *fd);
-
-int syncop_write (xlator_t *subvol, fd_t *fd, const char *buf, int size,
-                  off_t offset, struct iobref *iobref, uint32_t flags);
-int syncop_writev (xlator_t *subvol, fd_t *fd, const struct iovec *vector,
-                   int32_t count, off_t offset, struct iobref *iobref,
-                   uint32_t flags);
-int syncop_readv (xlator_t *subvol, fd_t *fd, size_t size, off_t off,
-                  uint32_t flags,
-                  /* out */
-                  struct iovec **vector, int *count, struct iobref **iobref);
-
-int syncop_ftruncate (xlator_t *subvol, fd_t *fd, off_t offset);
-int syncop_truncate (xlator_t *subvol, loc_t *loc, off_t offset);
-
-int syncop_unlink (xlator_t *subvol, loc_t *loc);
-int syncop_rmdir (xlator_t *subvol, loc_t *loc);
-
-int syncop_fsync (xlator_t *subvol, fd_t *fd, int dataonly);
-int syncop_flush (xlator_t *subvol, fd_t *fd);
-int syncop_fstat (xlator_t *subvol, fd_t *fd, struct iatt *stbuf);
-int syncop_stat (xlator_t *subvol, loc_t *loc, struct iatt *stbuf);
-
-int syncop_symlink (xlator_t *subvol, loc_t *loc, const char *newpath,
-                    dict_t *dict, struct iatt *iatt);
-int syncop_readlink (xlator_t *subvol, loc_t *loc, char **buffer, size_t size);
-int syncop_mknod (xlator_t *subvol, loc_t *loc, mode_t mode, dev_t rdev,
-                  dict_t *dict, struct iatt *iatt);
-int syncop_mkdir (xlator_t *subvol, loc_t *loc, mode_t mode, dict_t *dict,
-		  struct iatt *iatt);
-int syncop_link (xlator_t *subvol, loc_t *oldloc, loc_t *newloc);
-int syncop_fsyncdir (xlator_t *subvol, fd_t *fd, int datasync);
-int syncop_access (xlator_t *subvol, loc_t *loc, int32_t mask);
-int syncop_fallocate(xlator_t *subvol, fd_t *fd, int32_t keep_size, off_t offset,
-		     size_t len);
-int syncop_discard(xlator_t *subvol, fd_t *fd, off_t offset, size_t len);
-
-int syncop_zerofill(xlator_t *subvol, fd_t *fd, off_t offset, size_t len);
-
-int syncop_rename (xlator_t *subvol, loc_t *oldloc, loc_t *newloc);
-
-int syncop_lk (xlator_t *subvol, fd_t *fd, int cmd, struct gf_flock *flock);
 
 #endif /* _SYNCOP_H */
diff --git a/libglusterfs/src/syscall.c b/libglusterfs/src/syscall.c
index e8954cc23..05afa24f9 100644
--- a/libglusterfs/src/syscall.c
+++ b/libglusterfs/src/syscall.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -232,12 +241,7 @@ sys_statvfs (const char *path, struct statvfs *buf)
 int
 sys_close (int fd)
 {
-        int ret = -1;
-
-        if (fd >= 0)
-                ret = close (fd);
-
-        return ret;
+        return close (fd);
 }
 
 
@@ -264,7 +268,7 @@ sys_lsetxattr (const char *path, const char *name, const void *value,
                size_t size, int flags)
 {
 
-#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
+#ifdef GF_LINUX_HOST_OS
         return lsetxattr (path, name, value, size, flags);
 #endif
 
@@ -289,7 +293,7 @@ ssize_t
 sys_llistxattr (const char *path, char *list, size_t size)
 {
 
-#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
+#ifdef GF_LINUX_HOST_OS
         return llistxattr (path, list, size);
 #endif
 
@@ -312,7 +316,7 @@ ssize_t
 sys_lgetxattr (const char *path, const char *name, void *value, size_t size)
 {
 
-#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
+#ifdef GF_LINUX_HOST_OS
         return lgetxattr (path, name, value, size);
 #endif
 
@@ -336,7 +340,7 @@ ssize_t
 sys_fgetxattr (int filedes, const char *name, void *value, size_t size)
 {
 
-#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
+#ifdef GF_LINUX_HOST_OS
         return fgetxattr (filedes, name, value, size);
 #endif
 
@@ -357,37 +361,11 @@ sys_fgetxattr (int filedes, const char *name, void *value, size_t size)
 
 
 int
-sys_fremovexattr (int filedes, const char *name)
-{
-
-#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
-        return fremovexattr (filedes, name);
-#endif
-
-        errno = ENOSYS;
-        return -1;
-#if 0 /* TODO: to port to other OSes, fill in each of below */
-#ifdef GF_BSD_HOST_OS
-        return extattr_remove_fd (filedes, EXTATTR_NAMESPACE_USER, name);
-#endif
-
-#ifdef GF_SOLARIS_HOST_OS
-        return solaris_fremovexattr (filedes, name);
-#endif
-
-#ifdef GF_DARWIN_HOST_OS
-        return fremovexattr (filedes, name, 0);
-#endif
-#endif
-}
-
-
-int
 sys_fsetxattr (int filedes, const char *name, const void *value,
                size_t size, int flags)
 {
 
-#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
+#ifdef GF_LINUX_HOST_OS
         return fsetxattr (filedes, name, value, size, flags);
 #endif
 
@@ -411,7 +389,7 @@ ssize_t
 sys_flistxattr (int filedes, char *list, size_t size)
 {
 
-#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
+#ifdef GF_LINUX_HOST_OS
         return flistxattr (filedes, list, size);
 #endif
 
@@ -434,7 +412,7 @@ int
 sys_lremovexattr (const char *path, const char *name)
 {
 
-#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
+#ifdef GF_LINUX_HOST_OS
         return lremovexattr (path, name);
 #endif
 
@@ -458,26 +436,3 @@ sys_access (const char *pathname, int mode)
 {
         return access (pathname, mode);
 }
-
-
-int
-sys_fallocate(int fd, int mode, off_t offset, off_t len)
-{
-#ifdef HAVE_FALLOCATE
-	return fallocate(fd, mode, offset, len);
-#endif
-
-#ifdef HAVE_POSIX_FALLOCATE
-	if (mode) {
-		/* keep size not supported */
-		errno = EOPNOTSUPP;
-		return -1;
-	}
-
-	return posix_fallocate(fd, offset, len);
-#endif
-
-	errno = ENOSYS;
-	return -1;
-}
-
diff --git a/libglusterfs/src/syscall.h b/libglusterfs/src/syscall.h
index f1c9f58c3..b8a1c2896 100644
--- a/libglusterfs/src/syscall.h
+++ b/libglusterfs/src/syscall.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __SYSCALL_H__
@@ -131,14 +140,9 @@ int
 sys_lremovexattr (const char *path, const char *name);
 
 int
-sys_fremovexattr (int filedes, const char *name);
-
-int
 sys_access (const char *pathname, int mode);
 
 int
 sys_ftruncate (int fd, off_t length);
 
-int sys_fallocate(int fd, int mode, off_t offset, off_t len);
-
 #endif /* __SYSCALL_H__ */
diff --git a/libglusterfs/src/timer.c b/libglusterfs/src/timer.c
index a059cc212..c2d743b3a 100644
--- a/libglusterfs/src/timer.c
+++ b/libglusterfs/src/timer.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -17,18 +26,19 @@
 #include "logging.h"
 #include "common-utils.h"
 #include "globals.h"
-#include "timespec.h"
+
+#define TS(tv) ((((unsigned long long) tv.tv_sec) * 1000000) + (tv.tv_usec))
 
 gf_timer_t *
 gf_timer_call_after (glusterfs_ctx_t *ctx,
-                     struct timespec delta,
+                     struct timeval delta,
                      gf_timer_cbk_t callbk,
                      void *data)
 {
         gf_timer_registry_t *reg = NULL;
         gf_timer_t *event = NULL;
         gf_timer_t *trav = NULL;
-        uint64_t at = 0;
+        unsigned long long at = 0L;
 
         if (ctx == NULL)
         {
@@ -47,8 +57,10 @@ gf_timer_call_after (glusterfs_ctx_t *ctx,
         if (!event) {
                 return NULL;
         }
-        timespec_now (&event->at);
-        timespec_adjust_delta (&event->at, delta);
+        gettimeofday (&event->at, NULL);
+        event->at.tv_usec = ((event->at.tv_usec + delta.tv_usec) % 1000000);
+        event->at.tv_sec += ((event->at.tv_usec + delta.tv_usec) / 1000000);
+        event->at.tv_sec += delta.tv_sec;
         at = TS (event->at);
         event->callbk = callbk;
         event->data = data;
@@ -124,7 +136,6 @@ void *
 gf_timer_proc (void *ctx)
 {
         gf_timer_registry_t *reg = NULL;
-        const struct timespec sleepts = {.tv_sec = 1, .tv_nsec = 0, };
 
         if (ctx == NULL)
         {
@@ -139,14 +150,14 @@ gf_timer_proc (void *ctx)
         }
 
         while (!reg->fin) {
-                uint64_t now;
-                struct timespec now_ts;
+                unsigned long long now;
+                struct timeval now_tv;
                 gf_timer_t *event = NULL;
 
-                timespec_now (&now_ts);
-                now = TS (now_ts);
+                gettimeofday (&now_tv, NULL);
+                now = TS (now_tv);
                 while (1) {
-                        uint64_t at;
+                        unsigned long long at;
                         char need_cbk = 0;
 
                         pthread_mutex_lock (&reg->lock);
@@ -167,7 +178,7 @@ gf_timer_proc (void *ctx)
                         else
                                 break;
                 }
-                nanosleep (&sleepts, NULL);
+                usleep (1000000);
         }
 
         pthread_mutex_lock (&reg->lock);
@@ -210,7 +221,7 @@ gf_timer_registry_init (glusterfs_ctx_t *ctx)
                 reg->stale.prev = &reg->stale;
 
                 ctx->timer = reg;
-                gf_thread_create (&reg->th, NULL, gf_timer_proc, ctx);
+                pthread_create (&reg->th, NULL, gf_timer_proc, ctx);
         }
 out:
         return ctx->timer;
diff --git a/libglusterfs/src/timer.h b/libglusterfs/src/timer.h
index 2f963adbf..3f1dc7adb 100644
--- a/libglusterfs/src/timer.h
+++ b/libglusterfs/src/timer.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _TIMER_H
@@ -25,7 +34,7 @@ typedef void (*gf_timer_cbk_t) (void *);
 
 struct _gf_timer {
         struct _gf_timer *next, *prev;
-        struct timespec    at;
+        struct timeval    at;
         gf_timer_cbk_t    callbk;
         void             *data;
         xlator_t         *xl;
@@ -44,7 +53,7 @@ typedef struct _gf_timer_registry gf_timer_registry_t;
 
 gf_timer_t *
 gf_timer_call_after (glusterfs_ctx_t *ctx,
-                     struct timespec delta,
+                     struct timeval delta,
                      gf_timer_cbk_t cbk,
                      void *data);
 
diff --git a/libglusterfs/src/timespec.c b/libglusterfs/src/timespec.c
deleted file mode 100644
index a0c281a1e..000000000
--- a/libglusterfs/src/timespec.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-  Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include <stdio.h>
-#include <inttypes.h>
-#if defined GF_LINUX_HOST_OS || defined GF_SOLARIS_HOST_OS || defined GF_BSD_HOST_OS
-#include <time.h>
-#include <sys/time.h>
-#endif
-
-#if defined GF_DARWIN_HOST_OS
-#include <mach/mach_time.h>
-#endif
-
-#include "logging.h"
-#include "time.h"
-
-
-void tv2ts (struct timeval tv, struct timespec *ts)
-{
-        ts->tv_sec  = tv.tv_sec;
-        ts->tv_nsec = tv.tv_usec * 1000;
-}
-
-void timespec_now (struct timespec *ts)
-{
-#if defined GF_LINUX_HOST_OS || defined GF_SOLARIS_HOST_OS || defined GF_BSD_HOST_OS
-
-        if (0 == clock_gettime(CLOCK_MONOTONIC, ts))
-                return;
-        else {
-                struct timeval tv;
-                if (0 == gettimeofday(&tv, NULL))
-                        tv2ts(tv, ts);
-        }
-#elif defined GF_DARWIN_HOST_OS
-        mach_timebase_info_data_t tb = { 0 };
-        static double timebase = 0.0;
-        uint64_t time = 0;
-        mach_timebase_info (&tb);
-
-        timebase *= info.numer;
-        timebase /= info.denom;
-
-        time = mach_absolute_time();
-        time *= timebase;
-
-        ts->tv_sec = (time * NANO);
-        ts->tv_nsec = (time - (ts.tv_sec * GIGA));
-
-#endif /* Platform verification */
-        gf_log_callingfn ("timer", GF_LOG_DEBUG, "%"PRIu64".%09"PRIu64,
-                          ts->tv_sec, ts->tv_nsec);
-}
-
-void timespec_adjust_delta (struct timespec *ts, struct timespec delta)
-{
-        ts->tv_nsec = ((ts->tv_nsec + delta.tv_nsec) % 1000000000);
-        ts->tv_sec += ((ts->tv_nsec + delta.tv_nsec) / 1000000000);
-        ts->tv_sec += delta.tv_sec;
-}
diff --git a/libglusterfs/src/timespec.h b/libglusterfs/src/timespec.h
deleted file mode 100644
index 490255df9..000000000
--- a/libglusterfs/src/timespec.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-  Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef __INCLUDE_TIMESPEC_H__
-#define __INCLUDE_TIMESPEC_H__
-
-#include <stdint.h>
-
-#define TS(ts)  ((ts.tv_sec * 1000000000LL) + ts.tv_nsec)
-#define NANO (+1.0E-9)
-#define GIGA UINT64_C(1000000000)
-
-void tv2ts (struct timeval tv, struct timespec *ts);
-void timespec_now (struct timespec *ts);
-void timespec_adjust_delta (struct timespec *ts, struct timespec delta);
-
-#endif /*  __INCLUDE_TIMESPEC_H__ */
diff --git a/libglusterfs/src/trie-mem-types.h b/libglusterfs/src/trie-mem-types.h
new file mode 100644
index 000000000..6ce4c3a2c
--- /dev/null
+++ b/libglusterfs/src/trie-mem-types.h
@@ -0,0 +1,34 @@
+/*
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __TRIE_MEM_TYPES_H__
+#define __TRIE_MEM_TYPES_H__
+
+#include "mem-types.h"
+
+#define GF_MEM_TYPE_START (gf_common_mt_end + 1)
+
+enum gf_trie_mem_types_ {
+        gf_trie_mt_trie = GF_MEM_TYPE_START,
+        gf_trie_mt_data,
+        gf_trie_mt_node,
+        gf_trie_mt_buf,
+        gf_trie_mt_end,
+};
+#endif
diff --git a/libglusterfs/src/trie.c b/libglusterfs/src/trie.c
index f96bbebf6..2eed6c5d9 100644
--- a/libglusterfs/src/trie.c
+++ b/libglusterfs/src/trie.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <stdio.h>
@@ -14,6 +23,7 @@
 #include <ctype.h>
 
 #include "common-utils.h"
+#include "trie-mem-types.h"
 #include "trie.h"
 
 #define DISTANCE_EDIT 1
@@ -43,7 +53,7 @@ trie_new ()
 {
         trie_t *trie = NULL;
 
-        trie = GF_CALLOC (1, sizeof (*trie),  gf_common_mt_trie_trie);
+        trie = GF_CALLOC (1, sizeof (*trie),  gf_trie_mt_trie);
         if (!trie)
                 return NULL;
 
@@ -60,8 +70,7 @@ trie_subnode (trienode_t *node, int id)
 
         subnode = node->subnodes[id];
         if (!subnode) {
-                subnode = GF_CALLOC (1, sizeof (*subnode),
-                                     gf_common_mt_trie_node);
+                subnode = GF_CALLOC (1, sizeof (*subnode), gf_trie_mt_node);
                 if (!subnode)
                         return NULL;
 
@@ -114,7 +123,8 @@ trienode_free (trienode_t *node)
                         trienode_free (trav);
         }
 
-        GF_FREE (node->data);
+        if (node->data)
+                GF_FREE (node->data);
         GF_FREE (node);
 }
 
@@ -192,7 +202,7 @@ trienode_get_word (trienode_t *node, char **bufp)
 {
         char *buf = NULL;
 
-        buf = GF_CALLOC (1, node->depth + 1, gf_common_mt_trie_buf);
+        buf = GF_CALLOC (1, node->depth + 1, gf_trie_mt_buf);
         if (!buf)
                 return -1;
         *bufp = buf;
@@ -216,8 +226,7 @@ calc_dist (trienode_t *node, void *data)
 
         word = data;
 
-        node->data = GF_CALLOC (node->trie->len, sizeof (int),
-                                gf_common_mt_trie_data);
+        node->data = GF_CALLOC (node->trie->len, sizeof (int), gf_trie_mt_data);
         if (!node->data)
                 return -1;
         row = node->data;
@@ -372,7 +381,8 @@ trie_measure_vec (trie_t *trie, const char *word, struct trienodevec *nodevec)
 static int
 trienode_reset (trienode_t *node, void *data)
 {
-        GF_FREE (node->data);
+        if (node->data)
+                GF_FREE (node->data);
 
         return 0;
 }
diff --git a/libglusterfs/src/trie.h b/libglusterfs/src/trie.h
index 0356e6621..2c2e05320 100644
--- a/libglusterfs/src/trie.h
+++ b/libglusterfs/src/trie.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _TRIE_H_
diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c
index a277c58a8..5c526acd5 100644
--- a/libglusterfs/src/xlator.c
+++ b/libglusterfs/src/xlator.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -20,86 +29,1134 @@
 #include "defaults.h"
 
 #define SET_DEFAULT_FOP(fn) do {			\
-                if (!xl->fops->fn)			\
-                        xl->fops->fn = default_##fn;	\
-        } while (0)
+		if (!xl->fops->fn)			\
+			xl->fops->fn = default_##fn;	\
+	} while (0)
 
 #define SET_DEFAULT_CBK(fn) do {			\
-                if (!xl->cbks->fn)			\
-                        xl->cbks->fn = default_##fn;	\
-        } while (0)
+		if (!xl->cbks->fn)			\
+			xl->cbks->fn = default_##fn;	\
+	} while (0)
 
 
+#define GF_OPTION_LIST_EMPTY(_opt) (_opt->value[0] == NULL)
+
 static void
 fill_defaults (xlator_t *xl)
 {
-        if (xl == NULL)	{
-                gf_log_callingfn ("xlator", GF_LOG_WARNING, "invalid argument");
-                return;
-        }
-
-        SET_DEFAULT_FOP (create);
-        SET_DEFAULT_FOP (open);
-        SET_DEFAULT_FOP (stat);
-        SET_DEFAULT_FOP (readlink);
-        SET_DEFAULT_FOP (mknod);
-        SET_DEFAULT_FOP (mkdir);
-        SET_DEFAULT_FOP (unlink);
-        SET_DEFAULT_FOP (rmdir);
-        SET_DEFAULT_FOP (symlink);
-        SET_DEFAULT_FOP (rename);
-        SET_DEFAULT_FOP (link);
-        SET_DEFAULT_FOP (truncate);
-        SET_DEFAULT_FOP (readv);
-        SET_DEFAULT_FOP (writev);
-        SET_DEFAULT_FOP (statfs);
-        SET_DEFAULT_FOP (flush);
-        SET_DEFAULT_FOP (fsync);
-        SET_DEFAULT_FOP (setxattr);
-        SET_DEFAULT_FOP (getxattr);
-        SET_DEFAULT_FOP (fsetxattr);
-        SET_DEFAULT_FOP (fgetxattr);
-        SET_DEFAULT_FOP (removexattr);
-        SET_DEFAULT_FOP (fremovexattr);
-        SET_DEFAULT_FOP (opendir);
-        SET_DEFAULT_FOP (readdir);
-        SET_DEFAULT_FOP (readdirp);
-        SET_DEFAULT_FOP (fsyncdir);
-        SET_DEFAULT_FOP (access);
-        SET_DEFAULT_FOP (ftruncate);
-        SET_DEFAULT_FOP (fstat);
-        SET_DEFAULT_FOP (lk);
-        SET_DEFAULT_FOP (inodelk);
-        SET_DEFAULT_FOP (finodelk);
-        SET_DEFAULT_FOP (entrylk);
-        SET_DEFAULT_FOP (fentrylk);
-        SET_DEFAULT_FOP (lookup);
-        SET_DEFAULT_FOP (rchecksum);
-        SET_DEFAULT_FOP (xattrop);
-        SET_DEFAULT_FOP (fxattrop);
+	if (xl == NULL)	{
+		gf_log_callingfn ("xlator", GF_LOG_WARNING, "invalid argument");
+		return;
+	}
+
+	SET_DEFAULT_FOP (create);
+	SET_DEFAULT_FOP (open);
+	SET_DEFAULT_FOP (stat);
+	SET_DEFAULT_FOP (readlink);
+	SET_DEFAULT_FOP (mknod);
+	SET_DEFAULT_FOP (mkdir);
+	SET_DEFAULT_FOP (unlink);
+	SET_DEFAULT_FOP (rmdir);
+	SET_DEFAULT_FOP (symlink);
+	SET_DEFAULT_FOP (rename);
+	SET_DEFAULT_FOP (link);
+	SET_DEFAULT_FOP (truncate);
+	SET_DEFAULT_FOP (readv);
+	SET_DEFAULT_FOP (writev);
+	SET_DEFAULT_FOP (statfs);
+	SET_DEFAULT_FOP (flush);
+	SET_DEFAULT_FOP (fsync);
+	SET_DEFAULT_FOP (setxattr);
+	SET_DEFAULT_FOP (getxattr);
+	SET_DEFAULT_FOP (fsetxattr);
+	SET_DEFAULT_FOP (fgetxattr);
+	SET_DEFAULT_FOP (removexattr);
+	SET_DEFAULT_FOP (opendir);
+	SET_DEFAULT_FOP (readdir);
+	SET_DEFAULT_FOP (readdirp);
+	SET_DEFAULT_FOP (fsyncdir);
+	SET_DEFAULT_FOP (access);
+	SET_DEFAULT_FOP (ftruncate);
+	SET_DEFAULT_FOP (fstat);
+	SET_DEFAULT_FOP (lk);
+	SET_DEFAULT_FOP (inodelk);
+	SET_DEFAULT_FOP (finodelk);
+	SET_DEFAULT_FOP (entrylk);
+	SET_DEFAULT_FOP (fentrylk);
+	SET_DEFAULT_FOP (lookup);
+	SET_DEFAULT_FOP (rchecksum);
+	SET_DEFAULT_FOP (xattrop);
+	SET_DEFAULT_FOP (fxattrop);
         SET_DEFAULT_FOP (setattr);
         SET_DEFAULT_FOP (fsetattr);
-	SET_DEFAULT_FOP (fallocate);
-	SET_DEFAULT_FOP (discard);
-        SET_DEFAULT_FOP (zerofill);
 
         SET_DEFAULT_FOP (getspec);
 
-        SET_DEFAULT_CBK (release);
-        SET_DEFAULT_CBK (releasedir);
-        SET_DEFAULT_CBK (forget);
+	SET_DEFAULT_CBK (release);
+	SET_DEFAULT_CBK (releasedir);
+	SET_DEFAULT_CBK (forget);
 
-        if (!xl->notify)
-                xl->notify = default_notify;
+	if (!xl->notify)
+		xl->notify = default_notify;
 
         if (!xl->mem_acct_init)
                 xl->mem_acct_init = default_mem_acct_init;
 
-        return;
+	return;
+}
+
+int 
+_volume_option_value_validate_attacherr (xlator_t *xl,
+                               data_pair_t *pair,
+                               volume_option_t *opt,
+                               char **op_errstr)
+{
+        int       i = 0;
+        int       ret = -1;
+        uint64_t  input_size = 0;
+        long long inputll = 0;
+        char      errstr[256] = {0, };
+
+        /* Key is valid, validate the option */
+        switch (opt->type) {
+        case GF_OPTION_TYPE_PATH:
+        {
+                if (strstr (pair->value->data, "../")) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "invalid path given '%s'",
+                                pair->value->data);
+                        snprintf (errstr, 256,
+                                  "invalid path given '%s'",
+                                  pair->value->data);
+
+                        *op_errstr = gf_strdup (errstr);
+                        ret = -1;
+                        goto out;
+                }
+
+                /* Make sure the given path is valid */
+                if (pair->value->data[0] != '/') {
+                        gf_log (xl->name, GF_LOG_WARNING,
+                                "option %s %s: '%s' is not an "
+                                "absolute path name",
+                                pair->key, pair->value->data,
+                                pair->value->data);
+                        snprintf (errstr, 256,
+                                  "option %s %s: '%s' is not an "
+                                  "absolute path name",
+                                  pair->key, pair->value->data,
+                                  pair->value->data);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_INT:
+        {
+                /* Check the range */
+                if (gf_string2longlong (pair->value->data,
+                                        &inputll) != 0) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "invalid number format \"%s\" in "
+                                "\"option %s\"",
+                                pair->value->data, pair->key);
+                        snprintf (errstr, 256,
+                                  "invalid number format \"%s\" in "
+                                "\"option %s\"",
+                                pair->value->data, pair->key);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+
+                if ((opt->min == 0) && (opt->max == 0)) {
+                        gf_log (xl->name, GF_LOG_DEBUG,
+                                "no range check required for "
+                                "'option %s %s'",
+                                pair->key, pair->value->data);
+                        ret = 0;
+                        break;
+                }
+                if ((inputll < opt->min) ||
+                    (inputll > opt->max)) {
+                        gf_log (xl->name, GF_LOG_WARNING,
+                                "'%lld' in 'option %s %s' is out of "
+                                "range [%"PRId64" - %"PRId64"]",
+                                inputll, pair->key,
+                                pair->value->data,
+                                opt->min, opt->max);
+                        snprintf (errstr, 256,
+                                  "'%lld' in 'option %s %s' is out of "
+                                "range [%"PRId64" - %"PRId64"]",
+                                inputll, pair->key,
+                                pair->value->data,
+                                opt->min, opt->max);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_SIZET:
+        {
+                /* Check the range */
+                if (gf_string2bytesize (pair->value->data,
+                                        &input_size) != 0) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "invalid size format \"%s\" in "
+                                "\"option %s\"",
+                                pair->value->data, pair->key);
+                        snprintf (errstr, 256,
+                                  "invalid size format \"%s\" in "
+                                  "\"option %s\"",
+                                  pair->value->data, pair->key);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+
+                if ((opt->min == 0) && (opt->max == 0)) {
+                        gf_log (xl->name, GF_LOG_DEBUG,
+                                "no range check required for "
+                                "'option %s %s'",
+                                pair->key, pair->value->data);
+                        ret = 0;
+                        break;
+                }
+                if ((input_size < opt->min) ||
+                    (input_size > opt->max)) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "'%"PRId64"' in 'option %s %s' is "
+                                "out of range [%"PRId64" - %"PRId64"]",
+                                input_size, pair->key,
+                                pair->value->data,
+                                opt->min, opt->max);
+                        snprintf (errstr, 256,
+                                  "'%"PRId64"' in 'option %s %s' is "
+                                "out of range [%"PRId64" - %"PRId64"]",
+                                input_size, pair->key,
+                                pair->value->data,
+                                opt->min, opt->max);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_BOOL:
+        {
+                /* Check if the value is one of
+                   '0|1|on|off|no|yes|true|false|enable|disable' */
+                gf_boolean_t bool_value;
+                if (gf_string2boolean (pair->value->data,
+                                       &bool_value) != 0) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "option %s %s: '%s' is not a valid "
+                                "boolean value",
+                                pair->key, pair->value->data,
+                                pair->value->data);
+                        snprintf (errstr, 256,
+                                   "option %s %s: '%s' is not a valid "
+                                   "boolean value",
+                                   pair->key, pair->value->data,
+                                   pair->value->data);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_XLATOR:
+        {
+                /* Check if the value is one of the xlators */
+                xlator_t *xlopt = xl;
+                while (xlopt->prev)
+                        xlopt = xlopt->prev;
+
+                while (xlopt) {
+                        if (strcmp (pair->value->data,
+                                    xlopt->name) == 0) {
+                                ret = 0;
+                                break;
+                        }
+                        xlopt = xlopt->next;
+                }
+                if (!xlopt) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "option %s %s: '%s' is not a "
+                                "valid volume name",
+                                pair->key, pair->value->data,
+                                pair->value->data);
+                        snprintf (errstr, 256,
+                                  "option %s %s: '%s' is not a "
+                                  "valid volume name",
+                                  pair->key, pair->value->data,
+                                  pair->value->data);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_STR:
+        {
+                /* Check if the '*str' is valid */
+                if (GF_OPTION_LIST_EMPTY(opt)) {
+                        ret = 0;
+                        goto out;
+                }
+
+                for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) &&
+                             opt->value[i]; i++) {
+                        if (fnmatch (opt->value[i], pair->value->data,
+                                     FNM_EXTMATCH) == 0) {
+                                ret = 0;
+                                break;
+                        }
+                }
+
+                if ((i == ZR_OPTION_MAX_ARRAY_SIZE)
+                    || ((i < ZR_OPTION_MAX_ARRAY_SIZE)
+                        && (!opt->value[i]))) {
+                        /* enter here only if
+                         * 1. reached end of opt->value array and haven't
+                         *    validated input
+                         *                      OR
+                         * 2. valid input list is less than
+                         *    ZR_OPTION_MAX_ARRAY_SIZE and input has not
+                         *    matched all possible input values.
+                         */
+                        char given_array[4096] = {0,};
+                        for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) &&
+                                     opt->value[i]; i++) {
+                                strcat (given_array, opt->value[i]);
+                                strcat (given_array, ", ");
+                        }
+
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "option %s %s: '%s' is not valid "
+                                "(possible options are %s)",
+                                pair->key, pair->value->data,
+                                pair->value->data, given_array);
+                        snprintf (errstr, 256,
+                                  "option %s %s: '%s' is not valid "
+                                  "(possible options are %s)",
+                                  pair->key, pair->value->data,
+                                  pair->value->data, given_array);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+        }
+        break;
+        case GF_OPTION_TYPE_PERCENT:
+        {
+                uint32_t percent = 0;
+
+
+                /* Check if the value is valid percentage */
+                if (gf_string2percent (pair->value->data,
+                                       &percent) != 0) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "invalid percent format \"%s\" "
+                                "in \"option %s\"",
+                                pair->value->data, pair->key);
+                        snprintf (errstr, 256,
+                                  "invalid percent format \"%s\" "
+                                  "in \"option %s\"",
+                                  pair->value->data, pair->key);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+
+                if ((percent < 0) || (percent > 100)) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "'%d' in 'option %s %s' is out of "
+                                "range [0 - 100]",
+                                percent, pair->key,
+                                pair->value->data);
+                        snprintf (errstr, 256,
+                                   "'%d' in 'option %s %s' is out of "
+                                "range [0 - 100]",
+                                percent, pair->key,
+                                pair->value->data);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_PERCENT_OR_SIZET:
+        {
+                uint32_t percent = 0;
+                uint64_t input_size = 0;
+
+                /* Check if the value is valid percentage */
+                if (gf_string2percent (pair->value->data,
+                                       &percent) == 0) {
+                        if (percent > 100) {
+                                gf_log (xl->name, GF_LOG_DEBUG,
+                                        "value given was greater than 100, "
+                                        "assuming this is actually a size");
+                                if (gf_string2bytesize (pair->value->data,
+                                                        &input_size) == 0) {
+                                        /* Check the range */
+                                        if ((opt->min == 0) &&
+                                            (opt->max == 0)) {
+                                                gf_log (xl->name, GF_LOG_DEBUG,
+                                                        "no range check "
+                                                        "required for "
+                                                        "'option %s %s'",
+                                                        pair->key,
+                                                        pair->value->data);
+                                                // It is a size
+                                                ret = 0;
+                                                goto out;
+                                        }
+                                        if ((input_size < opt->min) ||
+                                            (input_size > opt->max)) {
+                                                gf_log (xl->name, GF_LOG_ERROR,
+                                                        "'%"PRId64"' in "
+                                                        "'option %s %s' is out"
+                                                        " of range [%"PRId64""
+                                                        "- %"PRId64"]",
+                                                        input_size, pair->key,
+                                                        pair->value->data,
+                                                        opt->min, opt->max);
+                                                 snprintf (errstr, 256,
+                                                          "'%"PRId64"' in "
+                                                          "'option %s %s' is "
+                                                          " out of range ["
+                                                          "%"PRId64"- %"PRId64"]",
+                                                          input_size, pair->key,
+                                                          pair->value->data,
+                                                          opt->min, opt->max);
+
+                                                *op_errstr = gf_strdup (errstr);
+                                                goto out;
+                                        }
+                                        // It is a size
+                                        ret = 0;
+                                        goto out;
+                                } else {
+                                        // It's not a percent or size
+                                        gf_log (xl->name, GF_LOG_ERROR,
+                                        "invalid number format \"%s\" "
+                                        "in \"option %s\"",
+                                        pair->value->data, pair->key);
+
+                                        snprintf (errstr, 256,
+                                        "invalid number format \"%s\" "
+                                        "in \"option %s\"",
+                                        pair->value->data, pair->key);
+
+
+                                        *op_errstr = gf_strdup (errstr);
+                                        goto out;
+                                }
+
+                        }
+                        // It is a percent
+                        ret = 0;
+                        goto out;
+                } else {
+                        if (gf_string2bytesize (pair->value->data,
+                                                &input_size) == 0) {
+                                /* Check the range */
+                                if ((opt->min == 0) && (opt->max == 0)) {
+                                        gf_log (xl->name, GF_LOG_DEBUG,
+                                                "no range check required for "
+                                                "'option %s %s'",
+                                                pair->key, pair->value->data);
+                                        // It is a size
+                                        ret = 0;
+                                        goto out;
+                                }
+                                if ((input_size < opt->min) ||
+                                    (input_size > opt->max)) {
+                                        gf_log (xl->name, GF_LOG_ERROR,
+                                                "'%"PRId64"' in 'option %s %s'"
+                                                " is out of range [%"PRId64" -"
+                                                " %"PRId64"]",
+                                                input_size, pair->key,
+                                                pair->value->data,
+                                                opt->min, opt->max);
+                                        snprintf (errstr, 256,
+                                                  "'%"PRId64"' in 'option %s %s'"
+                                                  " is out of range [%"PRId64" -"
+                                                  " %"PRId64"]",
+                                                  input_size, pair->key,
+                                                  pair->value->data,
+                                                  opt->min, opt->max);
+
+                                        *op_errstr = gf_strdup (errstr);
+                                        goto out;
+                                }
+                        } else {
+                                // It's not a percent or size
+                                gf_log (xl->name, GF_LOG_ERROR,
+                                        "invalid number format \"%s\" "
+                                        "in \"option %s\"",
+                                        pair->value->data, pair->key);
+                                snprintf (errstr, 256,
+                                          "invalid number format \"%s\" "
+                                          "in \"option %s\"",
+                                          pair->value->data, pair->key);
+
+                                *op_errstr = gf_strdup (errstr);
+                                goto out;
+                        }
+                        //It is a size
+                        ret = 0;
+                        goto out;
+                }
+
+        }
+        break;
+        case GF_OPTION_TYPE_TIME:
+        {
+                uint32_t input_time = 0;
+
+                /* Check if the value is valid percentage */
+                if (gf_string2time (pair->value->data,
+                                    &input_time) != 0) {
+                        gf_log (xl->name,
+                                GF_LOG_ERROR,
+                                "invalid time format \"%s\" in "
+                                "\"option %s\"",
+                                pair->value->data, pair->key);
+
+                        snprintf (errstr, 256,
+                                  "invalid time format \"%s\" in "
+                                  "\"option %s\"",
+                                  pair->value->data, pair->key);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+
+                if ((opt->min == 0) && (opt->max == 0)) {
+                        gf_log (xl->name, GF_LOG_DEBUG,
+                                "no range check required for "
+                                "'option %s %s'",
+                                pair->key, pair->value->data);
+                        ret = 0;
+                        goto out;
+                }
+                if ((input_time < opt->min) ||
+                    (input_time > opt->max)) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "'%"PRIu32"' in 'option %s %s' is "
+                                "out of range [%"PRId64" - %"PRId64"]",
+                                input_time, pair->key,
+                                pair->value->data,
+                                opt->min, opt->max);
+
+                        snprintf (errstr, 256,
+                                  "'%"PRIu32"' in 'option %s %s' is "
+                                  "out of range [%"PRId64" - %"PRId64"]",
+                                  input_time, pair->key,
+                                  pair->value->data,
+                                  opt->min, opt->max);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_DOUBLE:
+        {
+                double input_time = 0.0;
+
+                /* Check if the value is valid double */
+                if (gf_string2double (pair->value->data,
+                                      &input_time) != 0) {
+                        gf_log (xl->name,
+                                GF_LOG_ERROR,
+                                "invalid double \"%s\" in \"option %s\"",
+                                pair->value->data, pair->key);
+
+                        snprintf (errstr, 256,
+                                  "invalid double \"%s\" in \"option %s\"",
+                                  pair->value->data, pair->key);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+
+                if (input_time < 0.0) {
+                        gf_log (xl->name,
+                                GF_LOG_ERROR,
+                                "invalid time format \"%s\" in \"option %s\"",
+                                pair->value->data, pair->key);
+
+                        snprintf (errstr, 256,
+                                  "invalid double \"%s\" in \"option %s\"",
+                                  pair->value->data, pair->key);
+
+                        *op_errstr = gf_strdup (errstr);
+                        goto out;
+                }
+
+                if ((opt->min == 0) && (opt->max == 0)) {
+                        gf_log (xl->name, GF_LOG_DEBUG,
+                                "no range check required for 'option %s %s'",
+                                pair->key, pair->value->data);
+                        ret = 0;
+                        goto out;
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_INTERNET_ADDRESS:
+        {
+                if (!valid_internet_address (pair->value->data)) {
+                        gf_log (xl->name, GF_LOG_WARNING, "internet address '%s'"
+                                " does not conform to standards.",
+                                pair->value->data);
+
+                        snprintf (errstr, 256,
+                                  "internet address '%s'"
+                                  " does not conform to standards.",
+                                  pair->value->data);
+
+                        *op_errstr = gf_strdup (errstr);
+                }
+                ret = 0;
+        }
+        break;
+        case GF_OPTION_TYPE_ANY:
+                /* NO CHECK */
+                ret = 0;
+                break;
+        }
+
+out:
+        return ret;
+}
+
+
+int
+_volume_option_value_validate (xlator_t *xl,
+			       data_pair_t *pair,
+			       volume_option_t *opt)
+{
+	int       i = 0;
+	int       ret = -1;
+ 	uint64_t  input_size = 0;
+	long long inputll = 0;
+
+	/* Key is valid, validate the option */
+	switch (opt->type) {
+	case GF_OPTION_TYPE_PATH:
+	{
+                if (strstr (pair->value->data, "../")) {
+                        gf_log (xl->name, GF_LOG_ERROR,
+                                "invalid path given '%s'",
+                                pair->value->data);
+                        ret = -1;
+                        goto out;
+                }
+
+                /* Make sure the given path is valid */
+		if (pair->value->data[0] != '/') {
+			gf_log (xl->name, GF_LOG_WARNING,
+				"option %s %s: '%s' is not an "
+				"absolute path name",
+				pair->key, pair->value->data,
+				pair->value->data);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_INT:
+	{
+		/* Check the range */
+		if (gf_string2longlong (pair->value->data,
+					&inputll) != 0) {
+			gf_log (xl->name, GF_LOG_ERROR,
+				"invalid number format \"%s\" in "
+				"\"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((opt->min == 0) && (opt->max == 0)) {
+			gf_log (xl->name, GF_LOG_DEBUG,
+				"no range check required for "
+				"'option %s %s'",
+				pair->key, pair->value->data);
+			ret = 0;
+			break;
+		}
+		if ((inputll < opt->min) ||
+		    (inputll > opt->max)) {
+			gf_log (xl->name, GF_LOG_WARNING,
+				"'%lld' in 'option %s %s' is out of "
+				"range [%"PRId64" - %"PRId64"]",
+				inputll, pair->key,
+				pair->value->data,
+				opt->min, opt->max);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_SIZET:
+	{
+		/* Check the range */
+		if (gf_string2bytesize (pair->value->data,
+					&input_size) != 0) {
+			gf_log (xl->name, GF_LOG_ERROR,
+				"invalid size format \"%s\" in "
+				"\"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((opt->min == 0) && (opt->max == 0)) {
+			gf_log (xl->name, GF_LOG_DEBUG,
+				"no range check required for "
+				"'option %s %s'",
+				pair->key, pair->value->data);
+			ret = 0;
+			break;
+		}
+		if ((input_size < opt->min) ||
+		    (input_size > opt->max)) {
+			gf_log (xl->name, GF_LOG_WARNING,
+				"'%"PRId64"' in 'option %s %s' is "
+				"out of range [%"PRId64" - %"PRId64"]",
+				input_size, pair->key,
+				pair->value->data,
+				opt->min, opt->max);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_BOOL:
+	{
+		/* Check if the value is one of
+		   '0|1|on|off|no|yes|true|false|enable|disable' */
+		gf_boolean_t bool_value;
+		if (gf_string2boolean (pair->value->data,
+				       &bool_value) != 0) {
+			gf_log (xl->name, GF_LOG_ERROR,
+				"option %s %s: '%s' is not a valid "
+				"boolean value",
+				pair->key, pair->value->data,
+				pair->value->data);
+			goto out;
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_XLATOR:
+	{
+		/* Check if the value is one of the xlators */
+		xlator_t *xlopt = xl;
+		while (xlopt->prev)
+			xlopt = xlopt->prev;
+
+		while (xlopt) {
+			if (strcmp (pair->value->data,
+				    xlopt->name) == 0) {
+				ret = 0;
+				break;
+			}
+			xlopt = xlopt->next;
+		}
+		if (!xlopt) {
+			gf_log (xl->name, GF_LOG_ERROR,
+				"option %s %s: '%s' is not a "
+				"valid volume name",
+				pair->key, pair->value->data,
+				pair->value->data);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_STR:
+	{
+		/* Check if the '*str' is valid */
+                if (GF_OPTION_LIST_EMPTY(opt)) {
+                        ret = 0;
+                        goto out;
+                }
+
+		for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) &&
+			     opt->value[i]; i++) {
+ #ifdef  GF_DARWIN_HOST_OS
+                        if (fnmatch (opt->value[i],
+                                     pair->value->data, 0) == 0) {
+ #else
+                        if (fnmatch (opt->value[i],
+                                     pair->value->data, FNM_EXTMATCH) == 0) {
+ #endif
+				ret = 0;
+				break;
+			}
+		}
+
+		if ((i == ZR_OPTION_MAX_ARRAY_SIZE)
+		    || ((i < ZR_OPTION_MAX_ARRAY_SIZE)
+			&& (!opt->value[i]))) {
+			/* enter here only if
+			 * 1. reached end of opt->value array and haven't
+                         *    validated input
+			 *                      OR
+			 * 2. valid input list is less than
+                         *    ZR_OPTION_MAX_ARRAY_SIZE and input has not
+                         *    matched all possible input values.
+			 */
+			char given_array[4096] = {0,};
+			for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) &&
+				     opt->value[i]; i++) {
+				strcat (given_array, opt->value[i]);
+				strcat (given_array, ", ");
+			}
+
+			gf_log (xl->name, GF_LOG_ERROR,
+				"option %s %s: '%s' is not valid "
+				"(possible options are %s)",
+				pair->key, pair->value->data,
+				pair->value->data, given_array);
+
+			goto out;
+		}
+	}
+	break;
+	case GF_OPTION_TYPE_PERCENT:
+	{
+		uint32_t percent = 0;
+
+
+		/* Check if the value is valid percentage */
+		if (gf_string2percent (pair->value->data,
+				       &percent) != 0) {
+			gf_log (xl->name, GF_LOG_ERROR,
+				"invalid percent format \"%s\" "
+				"in \"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((percent < 0) || (percent > 100)) {
+			gf_log (xl->name, GF_LOG_ERROR,
+				"'%d' in 'option %s %s' is out of "
+				"range [0 - 100]",
+				percent, pair->key,
+				pair->value->data);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_PERCENT_OR_SIZET:
+	{
+		uint32_t percent = 0;
+		uint64_t input_size = 0;
+
+		/* Check if the value is valid percentage */
+		if (gf_string2percent (pair->value->data,
+				       &percent) == 0) {
+			if (percent > 100) {
+				gf_log (xl->name, GF_LOG_DEBUG,
+					"value given was greater than 100, "
+					"assuming this is actually a size");
+        		        if (gf_string2bytesize (pair->value->data,
+      	        			                &input_size) == 0) {
+			       	        /* Check the range */
+                                if ((opt->min == 0) && (opt->max == 0)) {
+	       	        		        gf_log (xl->name, GF_LOG_DEBUG,
+        	      	        		        "no range check "
+                                            "required for "
+                	      		       		"'option %s %s'",
+                                            pair->key,
+                                            pair->value->data);
+						// It is a size
+			                        ret = 0;
+       				                goto out;
+              				}
+	        	        	if ((input_size < opt->min) ||
+	      			            (input_size > opt->max)) {
+        	       			        gf_log (xl->name, GF_LOG_ERROR,
+                	      			        "'%"PRId64"' in "
+                                                        "'option %s %s' is out"
+                       	       				" of range [%"PRId64""
+                                                        "- %"PRId64"]",
+               	        	        		input_size, pair->key,
+	       		                        	pair->value->data,
+	       		        	                opt->min, opt->max);
+		       	        	}
+					// It is a size
+		       			ret = 0;
+					goto out;
+				} else {
+					// It's not a percent or size
+					gf_log (xl->name, GF_LOG_ERROR,
+					"invalid number format \"%s\" "
+					"in \"option %s\"",
+					pair->value->data, pair->key);
+				}
+
+			}
+			// It is a percent
+			ret = 0;
+			goto out;
+		} else {
+       		        if (gf_string2bytesize (pair->value->data,
+     	        			        &input_size) == 0) {
+		       	        /* Check the range */
+        			if ((opt->min == 0) && (opt->max == 0)) {
+       	        		        gf_log (xl->name, GF_LOG_DEBUG,
+       	      	        		        "no range check required for "
+               	      		      		"'option %s %s'",
+               	        	        	pair->key, pair->value->data);
+					// It is a size
+		                        ret = 0;
+      				        goto out;
+             			}
+	        	        if ((input_size < opt->min) ||
+      			            (input_size > opt->max)) {
+       	       				gf_log (xl->name, GF_LOG_ERROR,
+               	      			        "'%"PRId64"' in 'option %s %s'"
+                                                " is out of range [%"PRId64" -"
+                                                " %"PRId64"]",
+              	        	        	input_size, pair->key,
+       		                        	pair->value->data,
+       		        	                opt->min, opt->max);
+				}
+			} else {
+				// It's not a percent or size
+				gf_log (xl->name, GF_LOG_ERROR,
+					"invalid number format \"%s\" "
+					"in \"option %s\"",
+					pair->value->data, pair->key);
+			}
+			//It is a size
+                        ret = 0;
+ 		        goto out;
+		}
+
+	}
+	break;
+	case GF_OPTION_TYPE_TIME:
+	{
+		uint32_t input_time = 0;
+
+		/* Check if the value is valid percentage */
+		if (gf_string2time (pair->value->data,
+				    &input_time) != 0) {
+			gf_log (xl->name,
+				GF_LOG_ERROR,
+				"invalid time format \"%s\" in "
+				"\"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((opt->min == 0) && (opt->max == 0)) {
+			gf_log (xl->name, GF_LOG_DEBUG,
+				"no range check required for "
+				"'option %s %s'",
+				pair->key, pair->value->data);
+			ret = 0;
+			goto out;
+		}
+		if ((input_time < opt->min) ||
+		    (input_time > opt->max)) {
+			gf_log (xl->name, GF_LOG_ERROR,
+				"'%"PRIu32"' in 'option %s %s' is "
+				"out of range [%"PRId64" - %"PRId64"]",
+				input_time, pair->key,
+				pair->value->data,
+				opt->min, opt->max);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_DOUBLE:
+	{
+		double input_time = 0.0;
+
+		/* Check if the value is valid double */
+		if (gf_string2double (pair->value->data,
+				      &input_time) != 0) {
+			gf_log (xl->name,
+				GF_LOG_ERROR,
+				"invalid time format \"%s\" in \"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if (input_time < 0.0) {
+			gf_log (xl->name,
+				GF_LOG_ERROR,
+				"invalid time format \"%s\" in \"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((opt->min == 0) && (opt->max == 0)) {
+			gf_log (xl->name, GF_LOG_DEBUG,
+				"no range check required for 'option %s %s'",
+				pair->key, pair->value->data);
+			ret = 0;
+			goto out;
+		}
+		ret = 0;
+	}
+	break;
+        case GF_OPTION_TYPE_INTERNET_ADDRESS:
+        {
+                if (!valid_internet_address (pair->value->data)) {
+			gf_log (xl->name, GF_LOG_WARNING, "internet address '%s'"
+				" does not conform to standards.",
+				pair->value->data);
+		}
+                ret = 0;
+	}
+        break;
+	case GF_OPTION_TYPE_ANY:
+		/* NO CHECK */
+		ret = 0;
+		break;
+	}
+
+out:
+	return ret;
+}
+
+int
+validate_xlator_volume_options_attacherr (xlator_t *xl,
+                                          volume_option_t *opt,
+                                          char **op_errstr)
+{
+        int i = 0;
+        int ret = -1;
+        int index = 0;
+        volume_option_t *trav  = NULL;
+        data_pair_t     *pairs = NULL;
+
+        if (!opt) {
+                ret = 0;
+                goto out;
+        }
+
+        /* First search for not supported options, if any report error */
+        pairs = xl->options->members_list;
+        while (pairs) {
+                ret = -1;
+                for (index = 0;
+                     opt[index].key && opt[index].key[0] ; index++) {
+                        trav = &(opt[index]);
+                        for (i = 0 ;
+                             (i < ZR_VOLUME_MAX_NUM_KEY) &&
+                                     trav->key[i]; i++) {
+                                /* Check if the key is valid */
+                                if (fnmatch (trav->key[i],
+                                             pairs->key, FNM_NOESCAPE) == 0) {
+                                        ret = 0;
+                                        break;
+                                }
+                        }
+                        if (!ret) {
+                                if (i) {
+                                        gf_log (xl->name, GF_LOG_WARNING,
+                                                "option '%s' is deprecated, "
+                                                "preferred is '%s', continuing"
+                                                " with correction",
+                                                trav->key[i], trav->key[0]);
+                                        /* TODO: some bytes lost */
+                                        pairs->key = gf_strdup (trav->key[0]);
+                                }
+                                break;
+                        }
+                }
+                if (!ret) {
+                        ret = _volume_option_value_validate_attacherr (xl,
+                                                                       pairs,
+                                                                       trav,
+                                                                       op_errstr);
+                        if (-1 == ret) {
+                                goto out;
+                        }
+                }
+
+                pairs = pairs->next;
+        }
+
+        ret = 0;
+ out:
+        return ret;
 }
 
 
 int
+validate_xlator_volume_options (xlator_t *xl, volume_option_t *opt)
+{
+	int i = 0;
+	int ret = -1;
+ 	int index = 0;
+ 	volume_option_t *trav  = NULL;
+ 	data_pair_t     *pairs = NULL;
+
+ 	if (!opt) {
+		ret = 0;
+ 		goto out;
+	}
+
+ 	/* First search for not supported options, if any report error */
+ 	pairs = xl->options->members_list;
+ 	while (pairs) {
+		ret = -1;
+        for (index = 0; opt[index].key && opt[index].key[0] ; index++) {
+  			trav = &(opt[index]);
+			for (i = 0 ; (i < ZR_VOLUME_MAX_NUM_KEY) && trav->key[i]; i++) {
+				/* Check if the key is valid */
+				if (fnmatch (trav->key[i],
+					     pairs->key, FNM_NOESCAPE) == 0) {
+					ret = 0;
+					break;
+				}
+			}
+			if (!ret) {
+				if (i) {
+					gf_log (xl->name, GF_LOG_WARNING,
+						"option '%s' is deprecated, "
+						"preferred is '%s', continuing"
+						" with correction",
+						trav->key[i], trav->key[0]);
+					/* TODO: some bytes lost */
+                                        pairs->key = gf_strdup (trav->key[0]);
+				}
+				break;
+			}
+  		}
+  		if (!ret) {
+			ret = _volume_option_value_validate (xl, pairs, trav);
+			if (-1 == ret) {
+				goto out;
+			}
+		}
+
+  		pairs = pairs->next;
+  	}
+
+	ret = 0;
+ out:
+  	return ret;
+}
+
+int32_t
 xlator_set_type_virtual (xlator_t *xl, const char *type)
 {
         GF_VALIDATE_OR_GOTO ("xlator", xl, out);
@@ -113,18 +1170,25 @@ xlator_set_type_virtual (xlator_t *xl, const char *type)
 out:
         return -1;
 }
-
-
-int
+int32_t
 xlator_volopt_dynload (char *xlator_type, void **dl_handle,
-                       volume_opt_list_t *opt_list)
+                    volume_opt_list_t *opt_list)
 {
         int                     ret = -1;
         char                    *name = NULL;
         void                    *handle = NULL;
+        volume_opt_list_t       *vol_opt = NULL;
 
         GF_VALIDATE_OR_GOTO ("xlator", xlator_type, out);
 
+        GF_ASSERT (dl_handle);
+
+        if (*dl_handle)
+                if (dlclose (*dl_handle))
+                        gf_log ("xlator", GF_LOG_WARNING, "Unable to close "
+                                  "previously opened handle( may be stale)."
+                                  "Ignoring the invalid handle");
+
         ret = gf_asprintf (&name, "%s/%s.so", XLATORDIR, xlator_type);
         if (-1 == ret) {
                 gf_log ("xlator", GF_LOG_ERROR, "asprintf failed");
@@ -140,40 +1204,42 @@ xlator_volopt_dynload (char *xlator_type, void **dl_handle,
                 gf_log ("xlator", GF_LOG_WARNING, "%s", dlerror ());
                 goto out;
         }
+        *dl_handle = handle;
 
-        if (!(opt_list->given_opt = dlsym (handle, "options"))) {
-                dlerror ();
-                gf_log ("xlator", GF_LOG_ERROR,
-                        "Failed to load xlator opt table");
+        vol_opt = GF_CALLOC (1, sizeof (volume_opt_list_t),
+                         gf_common_mt_volume_opt_list_t);
+
+        if (!vol_opt) {
                 goto out;
         }
 
-        *dl_handle = handle;
+        if (!(vol_opt->given_opt = dlsym (handle, "options"))) {
+                dlerror ();
+                gf_log ("xlator", GF_LOG_DEBUG,
+                         "Strict option validation not enforced -- neglecting");
+        }
+        list_add (&vol_opt->list, &opt_list->list);
 
         ret = 0;
  out:
-        GF_FREE (name);
-
+        if (name)
+                GF_FREE (name);
         gf_log ("xlator", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
 
 }
 
-
-int
+int32_t
 xlator_dynload (xlator_t *xl)
 {
-        int                ret = -1;
-        char              *name = NULL;
-        void              *handle = NULL;
-        volume_opt_list_t *vol_opt = NULL;
-        class_methods_t   *vtbl = NULL;
+        int   ret = -1;
+	char *name = NULL;
+	void *handle = NULL;
+	volume_opt_list_t *vol_opt = NULL;
 
         GF_VALIDATE_OR_GOTO ("xlator", xl, out);
 
-        INIT_LIST_HEAD (&xl->volume_options);
-
-        ret = gf_asprintf (&name, "%s/%s.so", XLATORDIR, xl->type);
+	ret = gf_asprintf (&name, "%s/%s.so", XLATORDIR, xl->type);
         if (-1 == ret) {
                 gf_log ("xlator", GF_LOG_ERROR, "asprintf failed");
                 goto out;
@@ -181,102 +1247,96 @@ xlator_dynload (xlator_t *xl)
 
         ret = -1;
 
-        gf_log ("xlator", GF_LOG_TRACE, "attempt to load file %s", name);
+	gf_log ("xlator", GF_LOG_TRACE, "attempt to load file %s", name);
 
-        handle = dlopen (name, RTLD_NOW|RTLD_GLOBAL);
-        if (!handle) {
-                gf_log ("xlator", GF_LOG_WARNING, "%s", dlerror ());
+	handle = dlopen (name, RTLD_NOW|RTLD_GLOBAL);
+	if (!handle) {
+		gf_log ("xlator", GF_LOG_WARNING, "%s", dlerror ());
                 goto out;
-        }
+	}
         xl->dlhandle = handle;
 
-        if (!(xl->fops = dlsym (handle, "fops"))) {
-                gf_log ("xlator", GF_LOG_WARNING, "dlsym(fops) on %s",
-                        dlerror ());
+	if (!(xl->fops = dlsym (handle, "fops"))) {
+		gf_log ("xlator", GF_LOG_WARNING, "dlsym(fops) on %s",
+			dlerror ());
                 goto out;
-        }
+	}
 
-        if (!(xl->cbks = dlsym (handle, "cbks"))) {
-                gf_log ("xlator", GF_LOG_WARNING, "dlsym(cbks) on %s",
-                        dlerror ());
+	if (!(xl->cbks = dlsym (handle, "cbks"))) {
+		gf_log ("xlator", GF_LOG_WARNING, "dlsym(cbks) on %s",
+			dlerror ());
                 goto out;
-        }
+	}
 
-        /*
-         * If class_methods exists, its contents override any definitions of
-         * init or fini for that translator.  Otherwise, we fall back to the
-         * older method of looking for init and fini directly.
-         */
-        vtbl = dlsym(handle,"class_methods");
-        if (vtbl) {
-                xl->init        = vtbl->init;
-                xl->fini        = vtbl->fini;
-                xl->reconfigure = vtbl->reconfigure;
-                xl->notify      = vtbl->notify;
-        }
-        else {
-                if (!(*VOID(&xl->init) = dlsym (handle, "init"))) {
-                        gf_log ("xlator", GF_LOG_WARNING, "dlsym(init) on %s",
-                                dlerror ());
-                        goto out;
-                }
+	if (!(xl->init = dlsym (handle, "init"))) {
+		gf_log ("xlator", GF_LOG_WARNING, "dlsym(init) on %s",
+			dlerror ());
+                goto out;
+	}
 
-                if (!(*VOID(&(xl->fini)) = dlsym (handle, "fini"))) {
-                        gf_log ("xlator", GF_LOG_WARNING, "dlsym(fini) on %s",
-                                dlerror ());
-                        goto out;
-                }
-                if (!(*VOID(&(xl->reconfigure)) = dlsym (handle,
-                                                         "reconfigure"))) {
-                        gf_log ("xlator", GF_LOG_TRACE,
-                                "dlsym(reconfigure) on %s -- neglecting",
-                                dlerror());
-                }
-                if (!(*VOID(&(xl->notify)) = dlsym (handle, "notify"))) {
-                        gf_log ("xlator", GF_LOG_TRACE,
-                                "dlsym(notify) on %s -- neglecting",
-                                dlerror ());
-                }
+	if (!(xl->fini = dlsym (handle, "fini"))) {
+		gf_log ("xlator", GF_LOG_WARNING, "dlsym(fini) on %s",
+			dlerror ());
+                goto out;
+	}
 
-        }
+	if (!(xl->notify = dlsym (handle, "notify"))) {
+		gf_log ("xlator", GF_LOG_DEBUG,
+			"dlsym(notify) on %s -- neglecting", dlerror ());
+	}
 
-        if (!(xl->dumpops = dlsym (handle, "dumpops"))) {
-                gf_log ("xlator", GF_LOG_TRACE,
-                        "dlsym(dumpops) on %s -- neglecting", dlerror ());
-        }
+	if (!(xl->dumpops = dlsym (handle, "dumpops"))) {
+		gf_log ("xlator", GF_LOG_DEBUG,
+			"dlsym(dumpops) on %s -- neglecting", dlerror ());
+	}
 
-        if (!(*VOID(&(xl->mem_acct_init)) = dlsym (handle, "mem_acct_init"))) {
-                gf_log (xl->name, GF_LOG_TRACE,
+        if (!(xl->mem_acct_init = dlsym (handle, "mem_acct_init"))) {
+                gf_log (xl->name, GF_LOG_DEBUG,
                         "dlsym(mem_acct_init) on %s -- neglecting",
                         dlerror ());
         }
 
-        vol_opt = GF_CALLOC (1, sizeof (volume_opt_list_t),
+	if (!(xl->reconfigure = dlsym (handle, "reconfigure"))) {
+		gf_log ("xlator", GF_LOG_DEBUG,
+			"dlsym(reconfigure) on %s -- neglecting",
+			dlerror());
+	}
+
+        if (!(xl->validate_options = dlsym (handle, "validate_options"))) {
+                gf_log ("xlator", GF_LOG_DEBUG,
+                        "dlsym(validate_options) on %s -- neglecting",
+                        dlerror());
+        }
+
+
+	INIT_LIST_HEAD (&xl->volume_options);
+
+	vol_opt = GF_CALLOC (1, sizeof (volume_opt_list_t),
                          gf_common_mt_volume_opt_list_t);
 
         if (!vol_opt) {
                 goto out;
         }
 
-        if (!(vol_opt->given_opt = dlsym (handle, "options"))) {
-                dlerror ();
-                gf_log (xl->name, GF_LOG_TRACE,
-                        "Strict option validation not enforced -- neglecting");
-        }
-        INIT_LIST_HEAD (&vol_opt->list);
-        list_add_tail (&vol_opt->list, &xl->volume_options);
+	if (!(vol_opt->given_opt = dlsym (handle, "options"))) {
+		dlerror ();
+		gf_log (xl->name, GF_LOG_DEBUG,
+			"Strict option validation not enforced -- neglecting");
+	}
+	list_add_tail (&vol_opt->list, &xl->volume_options);
 
-        fill_defaults (xl);
+	fill_defaults (xl);
 
         ret = 0;
 
 out:
-        GF_FREE (name);
-        return ret;
+        if (name)
+                GF_FREE (name);
+	return ret;
 }
 
 
-int
+int32_t
 xlator_set_type (xlator_t *xl, const char *type)
 {
         int ret = 0;
@@ -291,77 +1351,61 @@ xlator_set_type (xlator_t *xl, const char *type)
 
 void
 xlator_foreach (xlator_t *this,
-                void (*fn)(xlator_t *each,
-                           void *data),
-                void *data)
+		void (*fn)(xlator_t *each,
+			   void *data),
+		void *data)
 {
-        xlator_t *first    = NULL;
+	xlator_t *first    = NULL;
         xlator_t *old_THIS = NULL;
 
         GF_VALIDATE_OR_GOTO ("xlator", this, out);
         GF_VALIDATE_OR_GOTO ("xlator", fn, out);
+        GF_VALIDATE_OR_GOTO ("xlator", data, out);
 
-        first = this;
+	first = this;
 
-        while (first->prev)
-                first = first->prev;
+	while (first->prev)
+		first = first->prev;
 
-        while (first) {
+	while (first) {
                 old_THIS = THIS;
                 THIS = first;
 
-                fn (first, data);
+		fn (first, data);
 
                 THIS = old_THIS;
-                first = first->next;
-        }
+		first = first->next;
+	}
 
 out:
         return;
 }
 
 
-void
-xlator_foreach_depth_first (xlator_t *this,
-			    void (*fn)(xlator_t *each, void *data),
-			    void *data)
-{
-	xlator_list_t *subv = NULL;
-
-	subv = this->children;
-
-	while (subv) {
-		xlator_foreach_depth_first (subv->xlator, fn, data);
-		subv = subv->next;
-	}
-
-	fn (this, data);
-}
-
-
 xlator_t *
 xlator_search_by_name (xlator_t *any, const char *name)
 {
-        xlator_t *search = NULL;
+	xlator_t *search = NULL;
 
         GF_VALIDATE_OR_GOTO ("xlator", any, out);
         GF_VALIDATE_OR_GOTO ("xlator", name, out);
 
-        search = any;
+	search = any;
 
-        while (search->prev)
-                search = search->prev;
+	while (search->prev)
+		search = search->prev;
 
-        while (search) {
-                if (!strcmp (search->name, name))
-                        break;
-                search = search->next;
-        }
+	while (search) {
+		if (!strcmp (search->name, name))
+			break;
+		search = search->next;
+	}
 
 out:
-        return search;
+	return search;
 }
 
+
 static int
 __xlator_init(xlator_t *xl)
 {
@@ -382,7 +1426,7 @@ __xlator_init(xlator_t *xl)
 int
 xlator_init (xlator_t *xl)
 {
-        int32_t ret = -1;
+	int32_t ret = -1;
 
         GF_VALIDATE_OR_GOTO ("xlator", xl, out);
 
@@ -408,52 +1452,145 @@ xlator_init (xlator_t *xl)
 
         ret = 0;
 out:
-        return ret;
+	return ret;
 }
 
 
 static void
 xlator_fini_rec (xlator_t *xl)
 {
-        xlator_list_t *trav     = NULL;
+	xlator_list_t *trav     = NULL;
         xlator_t      *old_THIS = NULL;
 
         GF_VALIDATE_OR_GOTO ("xlator", xl, out);
 
-        trav = xl->children;
+	trav = xl->children;
 
-        while (trav) {
-                if (!trav->xlator->init_succeeded) {
-                        break;
-                }
+	while (trav) {
+		if (!trav->xlator->init_succeeded) {
+			break;
+		}
 
-                xlator_fini_rec (trav->xlator);
-                gf_log (trav->xlator->name, GF_LOG_DEBUG, "fini done");
-                trav = trav->next;
-        }
+		xlator_fini_rec (trav->xlator);
+		gf_log (trav->xlator->name, GF_LOG_DEBUG, "fini done");
+		trav = trav->next;
+	}
 
-        if (xl->init_succeeded) {
-                if (xl->fini) {
+	if (xl->init_succeeded) {
+		if (xl->fini) {
                         old_THIS = THIS;
                         THIS = xl;
 
-                        xl->fini (xl);
-
-                        if (xl->local_pool)
-                                mem_pool_destroy (xl->local_pool);
+			xl->fini (xl);
 
                         THIS = old_THIS;
-                } else {
-                        gf_log (xl->name, GF_LOG_DEBUG, "No fini() found");
+		} else {
+			gf_log (xl->name, GF_LOG_DEBUG, "No fini() found");
+		}
+		xl->init_succeeded = 0;
+	}
+
+out:
+        return;
+}
+
+static int
+xlator_reconfigure_rec (xlator_t *old_xl, xlator_t *new_xl)
+{
+	xlator_list_t *trav1    = NULL;
+        xlator_list_t *trav2    = NULL;
+        int32_t        ret      = -1;
+        xlator_t      *old_THIS = NULL;
+
+        GF_VALIDATE_OR_GOTO ("xlator", old_xl, out);
+        GF_VALIDATE_OR_GOTO ("xlator", new_xl, out);
+
+	trav1 = old_xl->children;
+        trav2 = new_xl->children;
+
+	while (trav1 && trav2) {
+		ret = xlator_reconfigure_rec (trav1->xlator, trav2->xlator);
+                if (ret)
+                        goto out;
+
+		gf_log (trav1->xlator->name, GF_LOG_DEBUG, "reconfigured");
+
+		trav1 = trav1->next;
+                trav2 = trav2->next;
+	}
+
+        if (old_xl->reconfigure) {
+                old_THIS = THIS;
+                THIS = old_xl;
+
+                ret = old_xl->reconfigure (old_xl, new_xl->options);
+
+                THIS = old_THIS;
+
+                if (ret)
+                        goto out;
+        } else {
+                gf_log (old_xl->name, GF_LOG_DEBUG, "No reconfigure() found");
+        }
+
+        ret = 0;
+out:
+        return ret;
+}
+
+int
+xlator_validate_rec (xlator_t *xlator, char **op_errstr)
+{
+        int            ret  = -1;
+        xlator_list_t *trav = NULL;
+
+        GF_VALIDATE_OR_GOTO ("xlator", xlator, out);
+
+        trav = xlator->children;
+
+        while (trav) {
+                if (xlator_validate_rec (trav->xlator, op_errstr)) {
+                        gf_log ("xlator", GF_LOG_WARNING, "validate_rec failed");
+                        goto out;
+                }
+
+                trav = trav->next;
+        }
+
+        if (xlator_dynload (xlator))
+                gf_log ("", GF_LOG_DEBUG, "Did not load the symbols");
+
+        if (xlator->validate_options) {
+                if (xlator->validate_options (xlator, op_errstr)) {
+                        gf_log ("", GF_LOG_INFO, "%s", *op_errstr);
+                        goto out;
                 }
-                xl->init_succeeded = 0;
+                gf_log (xlator->name, GF_LOG_DEBUG, "Validated option");
+
         }
 
+        gf_log (xlator->name, GF_LOG_DEBUG, "No validate_options() found");
+
+        ret = 0;
 out:
-        return;
+        return ret;
 }
 
+int
+graph_reconf_validateopt (glusterfs_graph_t *graph,
+                          char **op_errstr)
+{
+        xlator_t *xlator = NULL;
+        int ret = -1;
+
+        GF_ASSERT (graph);
+
+        xlator = graph->first;
+
+        ret = xlator_validate_rec (xlator, op_errstr);
 
+        return ret;
+}
 int
 xlator_notify (xlator_t *xl, int event, void *data, ...)
 {
@@ -477,12 +1614,12 @@ xlator_mem_acct_init (xlator_t *xl, int num_types)
         int             i = 0;
         int             ret = 0;
 
+        if (!gf_mem_acct_is_enabled())
+                return 0;
+
         if (!xl)
                 return -1;
 
-        if (!xl->ctx->mem_acct_enable)
-                return 0;
-
         xl->mem_acct.num_types = num_types;
 
         xl->mem_acct.rec = CALLOC(num_types, sizeof(struct mem_acct_rec));
@@ -501,43 +1638,40 @@ xlator_mem_acct_init (xlator_t *xl, int num_types)
         return 0;
 }
 
-
 void
 xlator_tree_fini (xlator_t *xl)
 {
-        xlator_t *top = NULL;
+	xlator_t *top = NULL;
 
         GF_VALIDATE_OR_GOTO ("xlator", xl, out);
 
-        top = xl;
-        xlator_fini_rec (top);
+	top = xl;
+	xlator_fini_rec (top);
 
 out:
         return;
 }
 
 int
-xlator_list_destroy (xlator_list_t *list)
+xlator_tree_reconfigure (xlator_t *old_xl, xlator_t *new_xl)
 {
-        xlator_list_t *next = NULL;
+        xlator_t *new_top = NULL;
+        xlator_t *old_top = NULL;
 
-        while (list) {
-                next = list->next;
-                GF_FREE (list);
-                list = next;
-        }
+        GF_ASSERT (old_xl);
+        GF_ASSERT (new_xl);
 
-        return 0;
+        old_top = old_xl;
+        new_top = new_xl;
+
+	return xlator_reconfigure_rec (old_top, new_top);
 }
 
 
 int
 xlator_tree_free (xlator_t *tree)
 {
-        volume_opt_list_t *vol_opt = NULL;
-        volume_opt_list_t *tmp     = NULL;
-        xlator_t *trav = tree;
-        xlator_t *prev = tree;
+        xlator_t *trav = tree, *prev = tree;
 
         if (!tree) {
                 gf_log ("parser", GF_LOG_ERROR, "Translator tree not found");
@@ -546,19 +1680,9 @@ xlator_tree_free (xlator_t *tree)
 
         while (prev) {
                 trav = prev->next;
-                if (prev->dlhandle)
-                        dlclose (prev->dlhandle);
-                dict_unref (prev->options);
+                dict_destroy (prev->options);
                 GF_FREE (prev->name);
                 GF_FREE (prev->type);
-                xlator_list_destroy (prev->children);
-                xlator_list_destroy (prev->parents);
-
-                list_for_each_entry_safe (vol_opt, tmp, &prev->volume_options,
-                                          list) {
-                        list_del_init (&vol_opt->list);
-                        GF_FREE (vol_opt);
-                }
                 GF_FREE (prev);
                 prev = trav;
         }
@@ -583,122 +1707,67 @@ loc_wipe (loc_t *loc)
                 inode_unref (loc->parent);
                 loc->parent = NULL;
         }
-
-        memset (loc, 0, sizeof (*loc));
 }
 
-int
-loc_path (loc_t *loc, const char *bname)
-{
-        int     ret = 0;
-
-        if (loc->path)
-                goto out;
-
-        ret = -1;
-
-        if (bname && !strlen (bname))
-                bname = NULL;
-
-        if (!bname)
-                goto inode_path;
-
-        if (loc->parent && !uuid_is_null (loc->parent->gfid)) {
-                ret = inode_path (loc->parent, bname, (char**)&loc->path);
-        } else if (!uuid_is_null (loc->pargfid)) {
-                ret = gf_asprintf ((char**)&loc->path, INODE_PATH_FMT"/%s",
-                                   uuid_utoa (loc->pargfid), bname);
-        }
-
-        if (loc->path)
-                goto out;
-
-inode_path:
-        if (loc->inode && !uuid_is_null (loc->inode->gfid)) {
-                ret = inode_path (loc->inode, NULL, (char **)&loc->path);
-        } else if (!uuid_is_null (loc->gfid)) {
-                ret = gf_asprintf ((char**)&loc->path, INODE_PATH_FMT,
-                                   uuid_utoa (loc->gfid));
-        }
-out:
-        return ret;
-}
-
-void
-loc_gfid (loc_t *loc, uuid_t gfid)
-{
-        if (!gfid)
-                goto out;
-        uuid_clear (gfid);
-
-        if (!loc)
-                goto out;
-        else if (!uuid_is_null (loc->gfid))
-                uuid_copy (gfid, loc->gfid);
-        else if (loc->inode && (!uuid_is_null (loc->inode->gfid)))
-                uuid_copy (gfid, loc->inode->gfid);
-out:
-        return;
-}
-
-char*
-loc_gfid_utoa (loc_t *loc)
-{
-        uuid_t gfid;
-        loc_gfid (loc, gfid);
-        return uuid_utoa (gfid);
-}
 
 int
 loc_copy (loc_t *dst, loc_t *src)
 {
-        int ret = -1;
+	int ret = -1;
 
         GF_VALIDATE_OR_GOTO ("xlator", dst, err);
         GF_VALIDATE_OR_GOTO ("xlator", src, err);
 
+	dst->ino = src->ino;
+
         uuid_copy (dst->gfid, src->gfid);
         uuid_copy (dst->pargfid, src->pargfid);
-        uuid_copy (dst->gfid, src->gfid);
 
-        if (src->inode)
-                dst->inode = inode_ref (src->inode);
+	if (src->inode)
+		dst->inode = inode_ref (src->inode);
 
-        if (src->parent)
-                dst->parent = inode_ref (src->parent);
+	if (src->parent)
+		dst->parent = inode_ref (src->parent);
 
-        if (src->path) {
-                dst->path = gf_strdup (src->path);
+        dst->path = gf_strdup (src->path);
 
-                if (!dst->path)
-                        goto out;
+	if (!dst->path)
+		goto out;
 
-                if (src->name)
-                        dst->name = strrchr (dst->path, '/');
-                if (dst->name)
-                        dst->name++;
-        }
+	dst->name = strrchr (dst->path, '/');
+	if (dst->name)
+		dst->name++;
 
-        ret = 0;
+	ret = 0;
 out:
-        if (ret == -1)
-                loc_wipe (dst);
+        if (ret == -1) {
+                if (dst->inode)
+                        inode_unref (dst->inode);
+
+                if (dst->parent)
+                        inode_unref (dst->parent);
+        }
 
 err:
-        return ret;
+	return ret;
 }
 
-gf_boolean_t
-loc_is_root (loc_t *loc)
+
+int
+xlator_list_destroy (xlator_list_t *list)
 {
-        if (loc && __is_root_gfid (loc->gfid)) {
-                return _gf_true;
-        } else if (loc && loc->inode && __is_root_gfid (loc->inode->gfid)) {
-                return _gf_true;
+        xlator_list_t *next = NULL;
+
+        while (list) {
+                next = list->next;
+                GF_FREE (list);
+                list = next;
         }
-        return _gf_false;
+
+        return 0;
 }
 
+
 int
 xlator_destroy (xlator_t *xl)
 {
@@ -708,8 +1777,10 @@ xlator_destroy (xlator_t *xl)
         if (!xl)
                 return 0;
 
-        GF_FREE (xl->name);
-        GF_FREE (xl->type);
+        if (xl->name)
+                GF_FREE (xl->name);
+        if (xl->type)
+                GF_FREE (xl->type);
         if (xl->dlhandle)
                 dlclose (xl->dlhandle);
         if (xl->options)
@@ -728,8 +1799,6 @@ xlator_destroy (xlator_t *xl)
 
         return 0;
 }
-
-
 int
 is_gf_log_command (xlator_t *this, const char *name, char *value)
 {
@@ -773,7 +1842,6 @@ is_gf_log_command (xlator_t *this, const char *name, char *value)
                 ret = 0;
                 goto out;
         }
-
         if (!strcmp (name, "trusted.glusterfs.fuse.set-log-level")) {
                 /* */
                 gf_log (this->name, gf_log_get_xl_loglevel (this),
@@ -784,7 +1852,7 @@ is_gf_log_command (xlator_t *this, const char *name, char *value)
                 goto out;
         }
 
-        ctx = this->ctx;
+        ctx = glusterfs_ctx_get();
         if (!ctx)
                 goto out;
         if (!ctx->active)
@@ -807,7 +1875,6 @@ out:
         return ret;
 }
 
-
 int
 glusterd_check_log_level (const char *value)
 {
@@ -830,9 +1897,56 @@ glusterd_check_log_level (const char *value)
         }
 
         if (log_level == -1)
-                gf_log (THIS->name, GF_LOG_ERROR, "Invalid log-level. possible values "
+                gf_log ("", GF_LOG_ERROR, "Invalid log-level. possible values "
                         "are DEBUG|WARNING|ERROR|CRITICAL|NONE|TRACE");
 
         return log_level;
 }
 
+int
+xlator_get_volopt_info (struct list_head *opt_list, char *key, char **def_val,
+                         char **descr)
+{
+
+        int                     index = 0;
+        int                     ret = -1;
+        volume_opt_list_t       *vol_list = NULL;
+        volume_option_t         *opt = NULL;
+
+        if (!opt_list || !key || !def_val ) {
+                gf_log ("", GF_LOG_WARNING, " Parameters to the function not "
+                         "valid");
+                ret = -1;
+                goto out;
+        }
+
+        if (list_empty (opt_list)) {
+                gf_log ("xlator", GF_LOG_WARNING, "No elements in Volume option"
+                         " list");
+                ret = -1;
+                goto out;
+        }
+
+
+        vol_list = list_entry (opt_list->next, volume_opt_list_t, list);
+
+        opt = vol_list->given_opt;
+
+        for (index = 0; opt[index].key && opt[index].key[0] ; index++) {
+                if (strncmp (key, opt[index].key[0], strlen (key)))
+                        continue;
+
+                *def_val = opt[index].default_value;
+                if (descr)
+                        *descr = opt[index].description;
+                ret = 0;
+                goto out;
+        }
+
+        ret = -1;
+
+out:
+        gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);
+        return ret;
+
+}
diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h
index b57e5873e..1ecde5d5f 100644
--- a/libglusterfs/src/xlator.h
+++ b/libglusterfs/src/xlator.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _XLATOR_H
@@ -20,7 +29,7 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include "event-history.h"
+
 #include "logging.h"
 #include "common-utils.h"
 #include "dict.h"
@@ -65,9 +74,6 @@ typedef int32_t (*event_notify_fn_t) (xlator_t *this, int32_t event, void *data,
 #include "fd.h"
 #include "globals.h"
 #include "iatt.h"
-#include "options.h"
-#include "client_t.h"
-
 
 struct _loc {
         const char *path;
@@ -82,6 +88,9 @@ struct _loc {
          */
         uuid_t      gfid;
         uuid_t      pargfid;
+
+        /* ideally, should not be used */
+        ino_t       ino;
 };
 
 
@@ -98,8 +107,7 @@ typedef int32_t (*fop_rchecksum_cbk_t) (call_frame_t *frame,
                                         int32_t op_ret,
                                         int32_t op_errno,
                                         uint32_t weak_checksum,
-                                        uint8_t *strong_checksum,
-                                        dict_t *xdata);
+                                        uint8_t *strong_checksum);
 
 
 typedef int32_t (*fop_getspec_t) (call_frame_t *frame,
@@ -110,7 +118,7 @@ typedef int32_t (*fop_getspec_t) (call_frame_t *frame,
 typedef int32_t (*fop_rchecksum_t) (call_frame_t *frame,
                                     xlator_t *this,
                                     fd_t *fd, off_t offset,
-                                    int32_t len, dict_t *xdata);
+                                    int32_t len);
 
 
 typedef int32_t (*fop_lookup_cbk_t) (call_frame_t *frame,
@@ -120,7 +128,7 @@ typedef int32_t (*fop_lookup_cbk_t) (call_frame_t *frame,
                                      int32_t op_errno,
                                      inode_t *inode,
                                      struct iatt *buf,
-                                     dict_t *xdata,
+                                     dict_t *xattr,
                                      struct iatt *postparent);
 
 typedef int32_t (*fop_stat_cbk_t) (call_frame_t *frame,
@@ -128,14 +136,14 @@ typedef int32_t (*fop_stat_cbk_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    int32_t op_ret,
                                    int32_t op_errno,
-                                   struct iatt *buf, dict_t *xdata);
+                                   struct iatt *buf);
 
 typedef int32_t (*fop_fstat_cbk_t) (call_frame_t *frame,
                                     void *cookie,
                                     xlator_t *this,
                                     int32_t op_ret,
                                     int32_t op_errno,
-                                    struct iatt *buf, dict_t *xdata);
+                                    struct iatt *buf);
 
 typedef int32_t (*fop_truncate_cbk_t) (call_frame_t *frame,
                                        void *cookie,
@@ -143,7 +151,7 @@ typedef int32_t (*fop_truncate_cbk_t) (call_frame_t *frame,
                                        int32_t op_ret,
                                        int32_t op_errno,
                                        struct iatt *prebuf,
-                                       struct iatt *postbuf, dict_t *xdata);
+                                       struct iatt *postbuf);
 
 typedef int32_t (*fop_ftruncate_cbk_t) (call_frame_t *frame,
                                         void *cookie,
@@ -151,13 +159,13 @@ typedef int32_t (*fop_ftruncate_cbk_t) (call_frame_t *frame,
                                         int32_t op_ret,
                                         int32_t op_errno,
                                         struct iatt *prebuf,
-                                        struct iatt *postbuf, dict_t *xdata);
+                                        struct iatt *postbuf);
 
 typedef int32_t (*fop_access_cbk_t) (call_frame_t *frame,
                                      void *cookie,
                                      xlator_t *this,
                                      int32_t op_ret,
-                                     int32_t op_errno, dict_t *xdata);
+                                     int32_t op_errno);
 
 typedef int32_t (*fop_readlink_cbk_t) (call_frame_t *frame,
                                        void *cookie,
@@ -165,7 +173,7 @@ typedef int32_t (*fop_readlink_cbk_t) (call_frame_t *frame,
                                        int32_t op_ret,
                                        int32_t op_errno,
                                        const char *path,
-                                       struct iatt *buf, dict_t *xdata);
+                                       struct iatt *buf);
 
 typedef int32_t (*fop_mknod_cbk_t) (call_frame_t *frame,
                                     void *cookie,
@@ -175,7 +183,7 @@ typedef int32_t (*fop_mknod_cbk_t) (call_frame_t *frame,
                                     inode_t *inode,
                                     struct iatt *buf,
                                     struct iatt *preparent,
-                                    struct iatt *postparent, dict_t *xdata);
+                                    struct iatt *postparent);
 
 typedef int32_t (*fop_mkdir_cbk_t) (call_frame_t *frame,
                                     void *cookie,
@@ -185,7 +193,7 @@ typedef int32_t (*fop_mkdir_cbk_t) (call_frame_t *frame,
                                     inode_t *inode,
                                     struct iatt *buf,
                                     struct iatt *preparent,
-                                    struct iatt *postparent, dict_t *xdata);
+                                    struct iatt *postparent);
 
 typedef int32_t (*fop_unlink_cbk_t) (call_frame_t *frame,
                                      void *cookie,
@@ -193,7 +201,7 @@ typedef int32_t (*fop_unlink_cbk_t) (call_frame_t *frame,
                                      int32_t op_ret,
                                      int32_t op_errno,
                                      struct iatt *preparent,
-                                     struct iatt *postparent, dict_t *xdata);
+                                     struct iatt *postparent);
 
 typedef int32_t (*fop_rmdir_cbk_t) (call_frame_t *frame,
                                     void *cookie,
@@ -201,7 +209,7 @@ typedef int32_t (*fop_rmdir_cbk_t) (call_frame_t *frame,
                                     int32_t op_ret,
                                     int32_t op_errno,
                                     struct iatt *preparent,
-                                    struct iatt *postparent, dict_t *xdata);
+                                    struct iatt *postparent);
 
 typedef int32_t (*fop_symlink_cbk_t) (call_frame_t *frame,
                                       void *cookie,
@@ -211,7 +219,7 @@ typedef int32_t (*fop_symlink_cbk_t) (call_frame_t *frame,
                                       inode_t *inode,
                                       struct iatt *buf,
                                       struct iatt *preparent,
-                                      struct iatt *postparent, dict_t *xdata);
+                                      struct iatt *postparent);
 
 typedef int32_t (*fop_rename_cbk_t) (call_frame_t *frame,
                                      void *cookie,
@@ -222,7 +230,7 @@ typedef int32_t (*fop_rename_cbk_t) (call_frame_t *frame,
                                      struct iatt *preoldparent,
                                      struct iatt *postoldparent,
                                      struct iatt *prenewparent,
-                                     struct iatt *postnewparent, dict_t *xdata);
+                                     struct iatt *postnewparent);
 
 typedef int32_t (*fop_link_cbk_t) (call_frame_t *frame,
                                    void *cookie,
@@ -232,7 +240,7 @@ typedef int32_t (*fop_link_cbk_t) (call_frame_t *frame,
                                    inode_t *inode,
                                    struct iatt *buf,
                                    struct iatt *preparent,
-                                   struct iatt *postparent, dict_t *xdata);
+                                   struct iatt *postparent);
 
 typedef int32_t (*fop_create_cbk_t) (call_frame_t *frame,
                                      void *cookie,
@@ -243,14 +251,14 @@ typedef int32_t (*fop_create_cbk_t) (call_frame_t *frame,
                                      inode_t *inode,
                                      struct iatt *buf,
                                      struct iatt *preparent,
-                                     struct iatt *postparent, dict_t *xdata);
+                                     struct iatt *postparent);
 
 typedef int32_t (*fop_open_cbk_t) (call_frame_t *frame,
                                    void *cookie,
                                    xlator_t *this,
                                    int32_t op_ret,
                                    int32_t op_errno,
-                                   fd_t *fd, dict_t *xdata);
+                                   fd_t *fd);
 
 typedef int32_t (*fop_readv_cbk_t) (call_frame_t *frame,
                                     void *cookie,
@@ -260,7 +268,7 @@ typedef int32_t (*fop_readv_cbk_t) (call_frame_t *frame,
                                     struct iovec *vector,
                                     int32_t count,
                                     struct iatt *stbuf,
-                                    struct iobref *iobref, dict_t *xdata);
+                                    struct iobref *iobref);
 
 typedef int32_t (*fop_writev_cbk_t) (call_frame_t *frame,
                                      void *cookie,
@@ -268,13 +276,13 @@ typedef int32_t (*fop_writev_cbk_t) (call_frame_t *frame,
                                      int32_t op_ret,
                                      int32_t op_errno,
                                      struct iatt *prebuf,
-                                     struct iatt *postbuf, dict_t *xdata);
+                                     struct iatt *postbuf);
 
 typedef int32_t (*fop_flush_cbk_t) (call_frame_t *frame,
                                     void *cookie,
                                     xlator_t *this,
                                     int32_t op_ret,
-                                    int32_t op_errno, dict_t *xdata);
+                                    int32_t op_errno);
 
 typedef int32_t (*fop_fsync_cbk_t) (call_frame_t *frame,
                                     void *cookie,
@@ -282,124 +290,118 @@ typedef int32_t (*fop_fsync_cbk_t) (call_frame_t *frame,
                                     int32_t op_ret,
                                     int32_t op_errno,
                                     struct iatt *prebuf,
-                                    struct iatt *postbuf, dict_t *xdata);
+                                    struct iatt *postbuf);
 
 typedef int32_t (*fop_opendir_cbk_t) (call_frame_t *frame,
                                       void *cookie,
                                       xlator_t *this,
                                       int32_t op_ret,
                                       int32_t op_errno,
-                                      fd_t *fd, dict_t *xdata);
+                                      fd_t *fd);
 
 typedef int32_t (*fop_fsyncdir_cbk_t) (call_frame_t *frame,
                                        void *cookie,
                                        xlator_t *this,
                                        int32_t op_ret,
-                                       int32_t op_errno, dict_t *xdata);
+                                       int32_t op_errno);
 
 typedef int32_t (*fop_statfs_cbk_t) (call_frame_t *frame,
                                      void *cookie,
                                      xlator_t *this,
                                      int32_t op_ret,
                                      int32_t op_errno,
-                                     struct statvfs *buf, dict_t *xdata);
+                                     struct statvfs *buf);
 
 typedef int32_t (*fop_setxattr_cbk_t) (call_frame_t *frame,
                                        void *cookie,
                                        xlator_t *this,
                                        int32_t op_ret,
-                                       int32_t op_errno, dict_t *xdata);
+                                       int32_t op_errno);
 
 typedef int32_t (*fop_getxattr_cbk_t) (call_frame_t *frame,
                                        void *cookie,
                                        xlator_t *this,
                                        int32_t op_ret,
                                        int32_t op_errno,
-                                       dict_t *dict, dict_t *xdata);
+                                       dict_t *dict);
 
 typedef int32_t (*fop_fsetxattr_cbk_t) (call_frame_t *frame,
                                         void *cookie,
                                         xlator_t *this,
                                         int32_t op_ret,
-                                        int32_t op_errno, dict_t *xdata);
+                                        int32_t op_errno);
 
 typedef int32_t (*fop_fgetxattr_cbk_t) (call_frame_t *frame,
                                         void *cookie,
                                         xlator_t *this,
                                         int32_t op_ret,
                                         int32_t op_errno,
-                                        dict_t *dict, dict_t *xdata);
+                                        dict_t *dict);
 
 typedef int32_t (*fop_removexattr_cbk_t) (call_frame_t *frame,
                                           void *cookie,
                                           xlator_t *this,
                                           int32_t op_ret,
-                                          int32_t op_errno, dict_t *xdata);
-
-typedef int32_t (*fop_fremovexattr_cbk_t) (call_frame_t *frame,
-                                           void *cookie,
-                                           xlator_t *this,
-                                           int32_t op_ret,
-                                           int32_t op_errno, dict_t *xdata);
+                                          int32_t op_errno);
 
 typedef int32_t (*fop_lk_cbk_t) (call_frame_t *frame,
                                  void *cookie,
                                  xlator_t *this,
                                  int32_t op_ret,
                                  int32_t op_errno,
-                                 struct gf_flock *flock, dict_t *xdata);
+                                 struct gf_flock *flock);
 
 typedef int32_t (*fop_inodelk_cbk_t) (call_frame_t *frame,
                                       void *cookie,
                                       xlator_t *this,
                                       int32_t op_ret,
-                                      int32_t op_errno, dict_t *xdata);
+                                      int32_t op_errno);
 
 typedef int32_t (*fop_finodelk_cbk_t) (call_frame_t *frame,
                                        void *cookie,
                                        xlator_t *this,
                                        int32_t op_ret,
-                                       int32_t op_errno, dict_t *xdata);
+                                       int32_t op_errno);
 
 typedef int32_t (*fop_entrylk_cbk_t) (call_frame_t *frame,
                                       void *cookie,
                                       xlator_t *this,
                                       int32_t op_ret,
-                                      int32_t op_errno, dict_t *xdata);
+                                      int32_t op_errno);
 
 typedef int32_t (*fop_fentrylk_cbk_t) (call_frame_t *frame,
                                        void *cookie,
                                        xlator_t *this,
                                        int32_t op_ret,
-                                       int32_t op_errno, dict_t *xdata);
+                                       int32_t op_errno);
 
 typedef int32_t (*fop_readdir_cbk_t) (call_frame_t *frame,
                                       void *cookie,
                                       xlator_t *this,
                                       int32_t op_ret,
                                       int32_t op_errno,
-                                      gf_dirent_t *entries, dict_t *xdata);
+                                      gf_dirent_t *entries);
 
 typedef int32_t (*fop_readdirp_cbk_t) (call_frame_t *frame,
                                        void *cookie,
                                        xlator_t *this,
                                        int32_t op_ret,
                                        int32_t op_errno,
-                                       gf_dirent_t *entries, dict_t *xdata);
+                                       gf_dirent_t *entries);
 
 typedef int32_t (*fop_xattrop_cbk_t) (call_frame_t *frame,
                                       void *cookie,
                                       xlator_t *this,
                                       int32_t op_ret,
                                       int32_t op_errno,
-                                      dict_t *xattr, dict_t *xdata);
+                                      dict_t *xattr);
 
 typedef int32_t (*fop_fxattrop_cbk_t) (call_frame_t *frame,
                                        void *cookie,
                                        xlator_t *this,
                                        int32_t op_ret,
                                        int32_t op_errno,
-                                       dict_t *xattr, dict_t *xdata);
+                                       dict_t *xattr);
 
 
 typedef int32_t (*fop_setattr_cbk_t) (call_frame_t *frame,
@@ -408,7 +410,7 @@ typedef int32_t (*fop_setattr_cbk_t) (call_frame_t *frame,
                                       int32_t op_ret,
                                       int32_t op_errno,
                                       struct iatt *preop_stbuf,
-                                      struct iatt *postop_stbuf, dict_t *xdata);
+                                      struct iatt *postop_stbuf);
 
 typedef int32_t (*fop_fsetattr_cbk_t) (call_frame_t *frame,
                                        void *cookie,
@@ -416,95 +418,72 @@ typedef int32_t (*fop_fsetattr_cbk_t) (call_frame_t *frame,
                                        int32_t op_ret,
                                        int32_t op_errno,
                                        struct iatt *preop_stbuf,
-                                       struct iatt *postop_stbuf, dict_t *xdata);
-
-typedef int32_t (*fop_fallocate_cbk_t) (call_frame_t *frame,
-                                        void *cookie,
-                                        xlator_t *this,
-                                        int32_t op_ret,
-                                        int32_t op_errno,
-                                        struct iatt *preop_stbuf,
-                                        struct iatt *postop_stbuf, dict_t *xdata);
-
-typedef int32_t (*fop_discard_cbk_t) (call_frame_t *frame,
-                                      void *cookie,
-                                      xlator_t *this,
-                                      int32_t op_ret,
-                                      int32_t op_errno,
-                                      struct iatt *preop_stbuf,
-                                      struct iatt *postop_stbuf, dict_t *xdata);
-
-typedef int32_t (*fop_zerofill_cbk_t) (call_frame_t *frame,
-                                      void *cookie,
-                                      xlator_t *this,
-                                      int32_t op_ret,
-                                      int32_t op_errno,
-                                      struct iatt *preop_stbuf,
-                                      struct iatt *postop_stbuf, dict_t *xdata);
+                                       struct iatt *postop_stbuf);
 
 typedef int32_t (*fop_lookup_t) (call_frame_t *frame,
                                  xlator_t *this,
                                  loc_t *loc,
-                                 dict_t *xdata);
+                                 dict_t *xattr_req);
 
 typedef int32_t (*fop_stat_t) (call_frame_t *frame,
                                xlator_t *this,
-                               loc_t *loc, dict_t *xdata);
+                               loc_t *loc);
 
 typedef int32_t (*fop_fstat_t) (call_frame_t *frame,
                                 xlator_t *this,
-                                fd_t *fd, dict_t *xdata);
+                                fd_t *fd);
 
 typedef int32_t (*fop_truncate_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    loc_t *loc,
-                                   off_t offset, dict_t *xdata);
+                                   off_t offset);
 
 typedef int32_t (*fop_ftruncate_t) (call_frame_t *frame,
                                     xlator_t *this,
                                     fd_t *fd,
-                                    off_t offset, dict_t *xdata);
+                                    off_t offset);
 
 typedef int32_t (*fop_access_t) (call_frame_t *frame,
                                  xlator_t *this,
                                  loc_t *loc,
-                                 int32_t mask, dict_t *xdata);
+                                 int32_t mask);
 
 typedef int32_t (*fop_readlink_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    loc_t *loc,
-                                   size_t size, dict_t *xdata);
+                                   size_t size);
 
 typedef int32_t (*fop_mknod_t) (call_frame_t *frame, xlator_t *this,
                                 loc_t *loc, mode_t mode, dev_t rdev,
-                                mode_t umask, dict_t *xdata);
+                                dict_t *params);
 
-typedef int32_t (*fop_mkdir_t) (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                                mode_t mode, mode_t umask, dict_t *xdata);
+typedef int32_t (*fop_mkdir_t) (call_frame_t *frame, xlator_t *this,
+                                loc_t *loc, mode_t mode, dict_t *params);
 
-typedef int32_t (*fop_unlink_t) (call_frame_t *frame, xlator_t *this,
-                                 loc_t *loc, int xflags, dict_t *xdata);
+typedef int32_t (*fop_unlink_t) (call_frame_t *frame,
+                                 xlator_t *this,
+                                 loc_t *loc);
 
 typedef int32_t (*fop_rmdir_t) (call_frame_t *frame, xlator_t *this,
-                                loc_t *loc, int xflags, dict_t *xdata);
+                                loc_t *loc, int flags);
 
 typedef int32_t (*fop_symlink_t) (call_frame_t *frame, xlator_t *this,
                                   const char *linkname, loc_t *loc,
-                                  mode_t umask, dict_t *xdata);
+                                  dict_t *params);
 
 typedef int32_t (*fop_rename_t) (call_frame_t *frame,
                                  xlator_t *this,
                                  loc_t *oldloc,
-                                 loc_t *newloc, dict_t *xdata);
+                                 loc_t *newloc);
 
 typedef int32_t (*fop_link_t) (call_frame_t *frame,
                                xlator_t *this,
                                loc_t *oldloc,
-                               loc_t *newloc, dict_t *xdata);
+                               loc_t *newloc);
 
 typedef int32_t (*fop_create_t) (call_frame_t *frame, xlator_t *this,
                                  loc_t *loc, int32_t flags, mode_t mode,
-                                 mode_t umask, fd_t *fd, dict_t *xdata);
+                                 fd_t *fd, dict_t *params);
 
 /* Tell subsequent writes on the fd_t to fsync after every writev fop without
  * requiring a fsync fop.
@@ -515,16 +494,18 @@ typedef int32_t (*fop_create_t) (call_frame_t *frame, xlator_t *this,
  */
 #define GF_OPEN_NOWB    0x02
 
-typedef int32_t (*fop_open_t) (call_frame_t *frame, xlator_t *this,
-                               loc_t *loc, int32_t flags,
-                               fd_t *fd, dict_t *xdata);
+typedef int32_t (*fop_open_t) (call_frame_t *frame,
+                               xlator_t *this,
+                               loc_t *loc,
+                               int32_t flags,
+                               fd_t *fd,
+                               int32_t wbflags);
 
 typedef int32_t (*fop_readv_t) (call_frame_t *frame,
                                 xlator_t *this,
                                 fd_t *fd,
                                 size_t size,
-                                off_t offset,
-                                uint32_t flags, dict_t *xdata);
+                                off_t offset);
 
 typedef int32_t (*fop_writev_t) (call_frame_t *frame,
                                  xlator_t *this,
@@ -532,153 +513,126 @@ typedef int32_t (*fop_writev_t) (call_frame_t *frame,
                                  struct iovec *vector,
                                  int32_t count,
                                  off_t offset,
-                                 uint32_t flags,
-                                 struct iobref *iobref, dict_t *xdata);
+                                 struct iobref *iobref);
 
 typedef int32_t (*fop_flush_t) (call_frame_t *frame,
                                 xlator_t *this,
-                                fd_t *fd, dict_t *xdata);
+                                fd_t *fd);
 
 typedef int32_t (*fop_fsync_t) (call_frame_t *frame,
                                 xlator_t *this,
                                 fd_t *fd,
-                                int32_t datasync, dict_t *xdata);
+                                int32_t datasync);
 
 typedef int32_t (*fop_opendir_t) (call_frame_t *frame,
                                   xlator_t *this,
                                   loc_t *loc,
-                                  fd_t *fd, dict_t *xdata);
+                                  fd_t *fd);
 
 typedef int32_t (*fop_fsyncdir_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    fd_t *fd,
-                                   int32_t datasync, dict_t *xdata);
+                                   int32_t datasync);
 
 typedef int32_t (*fop_statfs_t) (call_frame_t *frame,
                                  xlator_t *this,
-                                 loc_t *loc, dict_t *xdata);
+                                 loc_t *loc);
 
 typedef int32_t (*fop_setxattr_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    loc_t *loc,
                                    dict_t *dict,
-                                   int32_t flags, dict_t *xdata);
+                                   int32_t flags);
 
 typedef int32_t (*fop_getxattr_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    loc_t *loc,
-                                   const char *name, dict_t *xdata);
+                                   const char *name);
 
 typedef int32_t (*fop_fsetxattr_t) (call_frame_t *frame,
                                     xlator_t *this,
                                     fd_t *fd,
                                     dict_t *dict,
-                                    int32_t flags, dict_t *xdata);
+                                    int32_t flags);
 
 typedef int32_t (*fop_fgetxattr_t) (call_frame_t *frame,
                                     xlator_t *this,
                                     fd_t *fd,
-                                    const char *name, dict_t *xdata);
+                                    const char *name);
 
 typedef int32_t (*fop_removexattr_t) (call_frame_t *frame,
                                       xlator_t *this,
                                       loc_t *loc,
-                                      const char *name, dict_t *xdata);
-
-typedef int32_t (*fop_fremovexattr_t) (call_frame_t *frame,
-                                       xlator_t *this,
-                                       fd_t *fd,
-                                       const char *name, dict_t *xdata);
+                                      const char *name);
 
 typedef int32_t (*fop_lk_t) (call_frame_t *frame,
                              xlator_t *this,
                              fd_t *fd,
                              int32_t cmd,
-                             struct gf_flock *flock, dict_t *xdata);
+                             struct gf_flock *flock);
 
 typedef int32_t (*fop_inodelk_t) (call_frame_t *frame,
                                   xlator_t *this,
                                   const char *volume,
                                   loc_t *loc,
                                   int32_t cmd,
-                                  struct gf_flock *flock, dict_t *xdata);
+                                  struct gf_flock *flock);
 
 typedef int32_t (*fop_finodelk_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    const char *volume,
                                    fd_t *fd,
                                    int32_t cmd,
-                                   struct gf_flock *flock, dict_t *xdata);
+                                   struct gf_flock *flock);
 
 typedef int32_t (*fop_entrylk_t) (call_frame_t *frame,
                                   xlator_t *this,
                                   const char *volume, loc_t *loc,
                                   const char *basename, entrylk_cmd cmd,
-                                  entrylk_type type, dict_t *xdata);
+                                  entrylk_type type);
 
 typedef int32_t (*fop_fentrylk_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    const char *volume, fd_t *fd,
                                    const char *basename, entrylk_cmd cmd,
-                                   entrylk_type type, dict_t *xdata);
+                                   entrylk_type type);
 
 typedef int32_t (*fop_readdir_t) (call_frame_t *frame,
                                   xlator_t *this,
                                   fd_t *fd,
                                   size_t size,
-                                  off_t offset, dict_t *xdata);
+                                  off_t offset);
 
 typedef int32_t (*fop_readdirp_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    fd_t *fd,
                                    size_t size,
-                                   off_t offset,
-                                   dict_t *xdata);
+                                   off_t offset);
 
 typedef int32_t (*fop_xattrop_t) (call_frame_t *frame,
                                   xlator_t *this,
                                   loc_t *loc,
                                   gf_xattrop_flags_t optype,
-                                  dict_t *xattr, dict_t *xdata);
+                                  dict_t *xattr);
 
 typedef int32_t (*fop_fxattrop_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    fd_t *fd,
                                    gf_xattrop_flags_t optype,
-                                   dict_t *xattr, dict_t *xdata);
+                                   dict_t *xattr);
 
 typedef int32_t (*fop_setattr_t) (call_frame_t *frame,
                                   xlator_t *this,
                                   loc_t *loc,
                                   struct iatt *stbuf,
-                                  int32_t valid, dict_t *xdata);
+                                  int32_t valid);
 
 typedef int32_t (*fop_fsetattr_t) (call_frame_t *frame,
                                    xlator_t *this,
                                    fd_t *fd,
                                    struct iatt *stbuf,
-                                   int32_t valid, dict_t *xdata);
+                                   int32_t valid);
 
-typedef int32_t (*fop_fallocate_t) (call_frame_t *frame,
-                                    xlator_t *this,
-                                    fd_t *fd,
-				    int32_t keep_size,
-				    off_t offset,
-				    size_t len,
-                                    dict_t *xdata);
-
-typedef int32_t (*fop_discard_t) (call_frame_t *frame,
-                                  xlator_t *this,
-                                  fd_t *fd,
-				  off_t offset,
-				  size_t len,
-                                  dict_t *xdata);
-typedef int32_t (*fop_zerofill_t) (call_frame_t *frame,
-                                  xlator_t *this,
-                                  fd_t *fd,
-                                  off_t offset,
-                                  size_t len,
-                                  dict_t *xdata);
 
 struct xlator_fops {
         fop_lookup_t         lookup;
@@ -711,7 +665,6 @@ struct xlator_fops {
         fop_fsetxattr_t      fsetxattr;
         fop_fgetxattr_t      fgetxattr;
         fop_removexattr_t    removexattr;
-        fop_fremovexattr_t   fremovexattr;
         fop_lk_t             lk;
         fop_inodelk_t        inodelk;
         fop_finodelk_t       finodelk;
@@ -723,9 +676,6 @@ struct xlator_fops {
         fop_setattr_t        setattr;
         fop_fsetattr_t       fsetattr;
         fop_getspec_t        getspec;
-	fop_fallocate_t	     fallocate;
-	fop_discard_t	     discard;
-        fop_zerofill_t       zerofill;
 
         /* these entries are used for a typechecking hack in STACK_WIND _only_ */
         fop_lookup_cbk_t         lookup_cbk;
@@ -758,7 +708,6 @@ struct xlator_fops {
         fop_fsetxattr_cbk_t      fsetxattr_cbk;
         fop_fgetxattr_cbk_t      fgetxattr_cbk;
         fop_removexattr_cbk_t    removexattr_cbk;
-        fop_fremovexattr_cbk_t   fremovexattr_cbk;
         fop_lk_cbk_t             lk_cbk;
         fop_inodelk_cbk_t        inodelk_cbk;
         fop_finodelk_cbk_t       finodelk_cbk;
@@ -770,9 +719,6 @@ struct xlator_fops {
         fop_setattr_cbk_t        setattr_cbk;
         fop_fsetattr_cbk_t       fsetattr_cbk;
         fop_getspec_cbk_t        getspec_cbk;
-	fop_fallocate_cbk_t	 fallocate_cbk;
-	fop_discard_cbk_t	 discard_cbk;
-        fop_zerofill_cbk_t       zerofill_cbk;
 };
 
 typedef int32_t (*cbk_forget_t) (xlator_t *this,
@@ -781,17 +727,10 @@ typedef int32_t (*cbk_forget_t) (xlator_t *this,
 typedef int32_t (*cbk_release_t) (xlator_t *this,
                                   fd_t *fd);
 
-typedef int32_t (*cbk_invalidate_t)(xlator_t *this, inode_t *inode);
-
-typedef int32_t (*cbk_client_t)(xlator_t *this, client_t *client);
-
 struct xlator_cbks {
-        cbk_forget_t             forget;
-        cbk_release_t            release;
-        cbk_release_t            releasedir;
-	cbk_invalidate_t         invalidate;
-        cbk_client_t             client_destroy;
-        cbk_client_t             client_disconnect;
+        cbk_forget_t    forget;
+        cbk_release_t   release;
+        cbk_release_t   releasedir;
 };
 
 typedef int32_t (*dumpop_priv_t) (xlator_t *this);
@@ -804,32 +743,12 @@ typedef int32_t (*dumpop_inodectx_t) (xlator_t *this, inode_t *ino);
 
 typedef int32_t (*dumpop_fdctx_t) (xlator_t *this, fd_t *fd);
 
-typedef int32_t (*dumpop_priv_to_dict_t) (xlator_t *this, dict_t *dict);
-
-typedef int32_t (*dumpop_inode_to_dict_t) (xlator_t *this, dict_t *dict);
-
-typedef int32_t (*dumpop_fd_to_dict_t) (xlator_t *this, dict_t *dict);
-
-typedef int32_t (*dumpop_inodectx_to_dict_t) (xlator_t *this, inode_t *ino,
-                                              dict_t *dict);
-
-typedef int32_t (*dumpop_fdctx_to_dict_t) (xlator_t *this, fd_t *fd,
-                                           dict_t *dict);
-
-typedef int32_t (*dumpop_eh_t) (xlator_t *this);
-
 struct xlator_dumpops {
-        dumpop_priv_t                   priv;
-        dumpop_inode_t                  inode;
-        dumpop_fd_t                     fd;
-        dumpop_inodectx_t               inodectx;
-        dumpop_fdctx_t                  fdctx;
-        dumpop_priv_to_dict_t           priv_to_dict;
-        dumpop_inode_to_dict_t          inode_to_dict;
-        dumpop_fd_to_dict_t             fd_to_dict;
-        dumpop_inodectx_to_dict_t       inodectx_to_dict;
-        dumpop_fdctx_to_dict_t          fdctx_to_dict;
-        dumpop_eh_t                     history;
+        dumpop_priv_t            priv;
+        dumpop_inode_t           inode;
+        dumpop_fd_t              fd;
+        dumpop_inodectx_t        inodectx;
+        dumpop_fdctx_t           fdctx;
 };
 
 typedef struct xlator_list {
@@ -837,6 +756,46 @@ typedef struct xlator_list {
         struct xlator_list *next;
 } xlator_list_t;
 
+/* Add possible new type of option you may need */
+typedef enum {
+        GF_OPTION_TYPE_ANY = 0,
+        GF_OPTION_TYPE_STR,
+        GF_OPTION_TYPE_INT,
+        GF_OPTION_TYPE_SIZET,
+        GF_OPTION_TYPE_PERCENT,
+        GF_OPTION_TYPE_PERCENT_OR_SIZET,
+        GF_OPTION_TYPE_BOOL,
+        GF_OPTION_TYPE_XLATOR,
+        GF_OPTION_TYPE_PATH,
+        GF_OPTION_TYPE_TIME,
+        GF_OPTION_TYPE_DOUBLE,
+        GF_OPTION_TYPE_INTERNET_ADDRESS,
+} volume_option_type_t;
+
+
+#define ZR_VOLUME_MAX_NUM_KEY    4
+#define ZR_OPTION_MAX_ARRAY_SIZE 64
+
+/* Each translator should define this structure */
+typedef struct volume_options {
+        char                *key[ZR_VOLUME_MAX_NUM_KEY];
+        /* different key, same meaning */
+        volume_option_type_t type;
+        int64_t              min;  /* 0 means no range */
+        int64_t              max;  /* 0 means no range */
+        char                *value[ZR_OPTION_MAX_ARRAY_SIZE];
+        /* If specified, will check for one of
+           the value from this array */
+        char                *default_value;
+        char                *description; /* about the key */
+} volume_option_t;
+
+
+typedef struct vol_opt_list {
+        struct list_head  list;
+        volume_option_t  *given_opt;
+} volume_opt_list_t;
+
 
 struct _xlator {
         /* Built during parsing */
@@ -859,6 +818,7 @@ struct _xlator {
         int32_t           (*init) (xlator_t *this);
         int32_t           (*reconfigure) (xlator_t *this, dict_t *options);
 	int32_t           (*mem_acct_init) (xlator_t *this);
+        int32_t           (*validate_options) (xlator_t *this, char **op_errstr);
 	event_notify_fn_t notify;
 
         gf_loglevel_t    loglevel;   /* Log level for translator */
@@ -867,42 +827,17 @@ struct _xlator {
         fop_latency_t latencies[GF_FOP_MAXVALUE];
 
         /* Misc */
-        eh_t               *history; /* event history context */
         glusterfs_ctx_t    *ctx;
         glusterfs_graph_t  *graph; /* not set for fuse */
         inode_table_t      *itable;
         char                init_succeeded;
         void               *private;
         struct mem_acct     mem_acct;
-        uint64_t            winds;
-        char                switched;
-
-        /* for the memory pool of 'frame->local' */
-        struct mem_pool    *local_pool;
-        gf_boolean_t        is_autoloaded;
 };
 
-typedef struct {
-        int32_t                 (*init) (xlator_t *this);
-        void                    (*fini) (xlator_t *this);
-        int32_t                 (*reconfigure) (xlator_t *this,
-                                                dict_t *options);
-        event_notify_fn_t       notify;
-} class_methods_t;
-
 #define xlator_has_parent(xl) (xl->parents != NULL)
 
-#define XLATOR_NOTIFY(_xl, params ...)          \
-        do {                                    \
-                xlator_t *_old_THIS = NULL;     \
-                                                \
-                _old_THIS = THIS;               \
-                THIS = _xl;                     \
-                                                \
-                ret = _xl->notify (_xl, params);\
-                                                \
-                THIS = _old_THIS;               \
-        } while (0);
+int validate_xlator_volume_options (xlator_t *xl, volume_option_t *opt);
 
 int32_t xlator_set_type_virtual (xlator_t *xl, const char *type);
 
@@ -927,11 +862,6 @@ void xlator_foreach (xlator_t *this,
                                  void *data),
                      void *data);
 
-void xlator_foreach_depth_first (xlator_t *this,
-				 void (*fn) (xlator_t *each,
-					     void *data),
-				 void *data);
-
 xlator_t *xlator_search_by_name (xlator_t *any, const char *name);
 
 void inode_destroy_notify (inode_t *inode, const char *xlname);
@@ -939,22 +869,21 @@ void inode_destroy_notify (inode_t *inode, const char *xlname);
 int loc_copy (loc_t *dst, loc_t *src);
 #define loc_dup(src, dst) loc_copy(dst, src)
 void loc_wipe (loc_t *loc);
-int loc_path (loc_t *loc, const char *bname);
-void loc_gfid (loc_t *loc, uuid_t gfid);
-char* loc_gfid_utoa (loc_t *loc);
-gf_boolean_t loc_is_root (loc_t *loc);
 int xlator_mem_acct_init (xlator_t *xl, int num_types);
+int xlator_tree_reconfigure (xlator_t *old_xl, xlator_t *new_xl);
 int is_gf_log_command (xlator_t *trans, const char *name, char *value);
+int xlator_validate_rec (xlator_t *xlator, char **op_errstr);
+int graph_reconf_validateopt (glusterfs_graph_t *graph, char **op_errstr);
 int glusterd_check_log_level (const char *value);
-int xlator_volopt_dynload (char *xlator_type, void **dl_handle,
-                           volume_opt_list_t *vol_opt_handle);
-enum gf_hdsk_event_notify_op {
-        GF_EN_DEFRAG_STATUS,
-        GF_EN_MAX,
-};
-gf_boolean_t
-is_graph_topology_equal (glusterfs_graph_t *graph1, glusterfs_graph_t *graph2);
-int
-glusterfs_volfile_reconfigure (int oldvollen, FILE *newvolfile_fp,
-                               glusterfs_ctx_t *ctx, const char *oldvolfile);
+int validate_xlator_volume_options_attacherr (xlator_t *xl,
+                                          volume_option_t *opt,
+                                         char **op_errstr);
+int _volume_option_value_validate_attacherr (xlator_t *xl, 
+                               data_pair_t *pair, 
+                               volume_option_t *opt, 
+                               char **op_errstr);
+int32_t xlator_volopt_dynload (char *xlator_type, void **dl_handle,
+                    volume_opt_list_t *vol_opt_handle);
+int xlator_get_volopt_info (struct list_head *opt_list, char *key,
+                            char **def_val, char **descr);
 #endif /* _XLATOR_H */
diff --git a/xlators/encryption/crypt/Makefile.am b/libglusterfsclient/Makefile.am
index d471a3f92..d471a3f92 100644
--- a/xlators/encryption/crypt/Makefile.am
+++ b/libglusterfsclient/Makefile.am
diff --git a/libglusterfsclient/src/Makefile.am b/libglusterfsclient/src/Makefile.am
new file mode 100644
index 000000000..32811c0d5
--- /dev/null
+++ b/libglusterfsclient/src/Makefile.am
@@ -0,0 +1,16 @@
+lib_LTLIBRARIES = libglusterfsclient.la
+noinst_HEADERS = libglusterfsclient-internals.h
+libglusterfsclient_HEADERS = libglusterfsclient.h 
+libglusterfsclientdir = $(includedir)
+
+libglusterfsclient_la_SOURCES = libglusterfsclient.c libglusterfsclient-dentry.c
+libglusterfsclient_la_CFLAGS =  -fPIC -Wall
+libglusterfsclient_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+libglusterfsclient_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D$(GF_HOST_OS) -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" -DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_CFLAGS)
+libglusterfsclient_la_LDFLAGS = -shared -nostartfiles
+
+CLEANFILES = 
+
+$(top_builddir)/libglusterfs/src/libglusterfs.la:
+	$(MAKE) -C $(top_builddir)/libglusterfs/src/ all
+
diff --git a/libglusterfsclient/src/libglusterfsclient-dentry.c b/libglusterfsclient/src/libglusterfsclient-dentry.c
new file mode 100644
index 000000000..feaac7e2f
--- /dev/null
+++ b/libglusterfsclient/src/libglusterfsclient-dentry.c
@@ -0,0 +1,413 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#include "libglusterfsclient.h"
+#include "libglusterfsclient-internals.h"
+#include <libgen.h>
+
+#define LIBGLUSTERFS_CLIENT_DENTRY_LOC_PREPARE(_new_loc, _loc, _parent, \
+                                               _resolved) do {          \
+                size_t pathlen = 0;                                     \
+                size_t resolvedlen = 0;                                 \
+                char *path = NULL;                                      \
+                int pad = 0;                                            \
+                pathlen   = strlen (_loc->path) + 1;                    \
+                path = CALLOC (1, pathlen);                             \
+                _new_loc.parent =  _parent;                             \
+                resolvedlen = strlen (_resolved);                       \
+                strncpy (path, _resolved, resolvedlen);                 \
+                if (resolvedlen == 1) /* only root resolved */          \
+                        pad = 0;                                        \
+                else {                                                  \
+                        pad = 1;                                        \
+                        path[resolvedlen] = '/';                        \
+                }                                                       \
+                strcpy_till (path + resolvedlen + pad,                  \
+                             loc->path + resolvedlen + pad, '/');       \
+                _new_loc.path = path;                                   \
+                _new_loc.name = strrchr (path, '/');                    \
+                if (_new_loc.name)                                      \
+                        _new_loc.name++;                                \
+        }while (0);
+
+
+/* strcpy_till - copy @dname to @dest, until 'delim' is encountered in @dest
+ * @dest - destination string
+ * @dname - source string
+ * @delim - delimiter character
+ *
+ * return - NULL is returned if '0' is encountered in @dname, otherwise returns
+ *          a pointer to remaining string begining in @dest.
+ */
+static char *
+strcpy_till (char *dest, const char *dname, char delim)
+{
+        char *src = NULL;
+        int idx = 0;
+        char *ret = NULL;
+
+        src = (char *)dname;
+        while (src[idx] && (src[idx] != delim)) {
+                dest[idx] = src[idx];
+                idx++;
+        }
+
+        dest[idx] = 0;
+
+        if (src[idx] == 0)
+                ret = NULL;
+        else
+                ret = &(src[idx]);
+
+        return ret;
+}
+
+/* __libgf_client_path_to_parenti - derive parent inode for @path. if immediate 
+ *                            parent is not available in the dentry cache, return nearest
+ *                            available parent inode and set @reslv to the path of
+ *                            the returned directory.
+ *
+ * @itable - inode table
+ * @path   - path whose parent has to be looked up.
+ * @reslv  - if immediate parent is not available, reslv will be set to path of the
+ *           resolved parent.
+ *
+ * return - should never return NULL. should at least return '/' inode.
+ */
+static inode_t *
+__libgf_client_path_to_parenti (libglusterfs_client_ctx_t *ctx,
+                                inode_table_t *itable, const char *path,
+                                char **reslv)
+{
+        char *resolved_till = NULL;
+        char *strtokptr = NULL;
+        char *component = NULL;
+        char *next_component = NULL;
+        char *pathdup = NULL;
+        inode_t *curr = NULL;
+        inode_t *parent = NULL;
+        size_t pathlen = 0;
+        loc_t rootloc = {0, };
+        int ret = -1;
+
+        pathlen = STRLEN_0 (path);
+        resolved_till = CALLOC (1, pathlen);
+
+        GF_VALIDATE_OR_GOTO("libglusterfsclient-dentry", resolved_till, out);
+        pathdup = strdup (path);
+        GF_VALIDATE_OR_GOTO("libglusterfsclient-dentry", pathdup, out);
+
+        parent = inode_ref (itable->root);
+        /* If the root inode's is outdated, send a revalidate on it.
+         * A revalidate on root inode also reduces the window in which an
+         * op will fail over distribute because the layout of the root
+         * directory did not  get constructed when we sent the lookup on
+         * root in glusterfs_init. That can happen when not all children of a
+         * distribute volume were up at the time of glusterfs_init.
+         */
+        if (!libgf_is_iattr_cache_valid (ctx, parent, NULL,
+                                        LIBGF_VALIDATE_LOOKUP)) {
+                libgf_client_loc_fill (&rootloc, ctx, 1, 0, "/");
+                ret = libgf_client_lookup (ctx, &rootloc, NULL, NULL, NULL);
+                if (ret == -1) {
+                        gf_log ("libglusterfsclient-dentry", GF_LOG_ERROR,
+                                "Root inode revalidation failed");
+                        inode_unref (parent);
+                        parent = NULL;
+                        goto out;
+                }
+                libgf_client_loc_wipe (&rootloc);
+        }
+
+        curr = NULL;
+
+        component = strtok_r (pathdup, "/", &strtokptr);
+
+        while (component) {
+                curr = inode_search (itable, parent->ino, component);
+                if (!curr) {
+                        break;
+                }
+                if (!libgf_is_iattr_cache_valid (ctx, curr, NULL,
+                                                LIBGF_VALIDATE_LOOKUP))
+                        break;
+
+                /* It is OK to append the component even if it is the       
+                   last component in the path, because, if 'next_component'
+                   returns NULL, @parent will remain the same and
+                   @resolved_till will not be sent back               
+                */
+                strcat (resolved_till, "/");
+                strcat (resolved_till, component);
+
+                next_component = strtok_r (NULL, "/", &strtokptr);
+
+                if (next_component) {
+                        inode_unref (parent);
+                        parent = curr;
+                        curr = NULL;
+                } else {
+                        /* will break */
+                        inode_unref (curr);
+                }
+
+                component = next_component;
+        }
+
+        if (resolved_till[0] == '\0') {
+                strcat (resolved_till, "/");
+        }
+
+        free (pathdup);
+        
+        if (reslv) {
+                *reslv = resolved_till;
+        } else {
+                FREE (resolved_till);
+        }
+
+out:
+        return parent;
+}
+
+static inline void
+libgf_client_update_resolved (const char *path, char *resolved)
+{
+        int32_t pathlen = 0;
+        char *tmp = NULL, *dest = NULL, *dname = NULL;
+        char append_slash = 0;
+
+        pathlen = strlen (resolved); 
+        tmp = (char *)(resolved + pathlen);
+        if (*((char *) (resolved + pathlen - 1)) != '/') {
+                tmp[0] = '/';
+                append_slash = 1;
+        }
+
+        if (append_slash) {
+                dest = tmp + 1;
+        } else {
+                dest = tmp;
+        }
+
+        if (*((char *) path + pathlen) == '/') {
+                dname = (char *) path + pathlen + 1;
+        } else {
+                dname = (char *) path + pathlen;
+        }
+
+        strcpy_till (dest, dname, '/');
+}
+
+/* __do_path_resolve - resolve @loc->path into @loc->inode and @loc->parent. also
+ *                     update the dentry cache
+ *
+ * @loc             - loc to resolve. 
+ * @ctx             - libglusterfsclient context
+ * @lookup_basename - flag whether to lookup basename(loc->path)
+ *
+ * return - 0 on success
+ *         -1 on failure 
+ *          
+ */
+static int32_t
+__do_path_resolve (loc_t *loc, libglusterfs_client_ctx_t *ctx,
+                   char lookup_basename)
+{
+        int32_t         op_ret = -1;
+        char           *resolved  = NULL;
+        inode_t        *parent = NULL, *inode = NULL;
+        dentry_t       *dentry = NULL;
+        loc_t          new_loc = {0, };
+	char           *pathname = NULL, *directory = NULL;
+	char           *file = NULL;   
+        
+        parent = loc->parent;
+        if (parent) {
+                inode_ref (parent);
+                gf_log ("libglusterfsclient-dentry", GF_LOG_DEBUG,
+                        "loc->parent(%"PRId64") already present. sending "
+                        "lookup for %"PRId64"/%s", parent->ino, parent->ino,
+                        loc->path);
+                resolved = strdup (loc->path);
+                resolved = dirname (resolved);
+        } else {
+                parent = __libgf_client_path_to_parenti (ctx, ctx->itable,
+                                                         loc->path, &resolved);
+        }
+
+        if (parent == NULL) {
+                /* fire in the bush.. run! run!! run!!! */
+                gf_log ("libglusterfsclient-dentry",
+                        GF_LOG_CRITICAL,
+                        "failed to get parent inode number");
+                op_ret = -1;
+                goto out;
+        }               
+
+        gf_log ("libglusterfsclient-dentry",
+                GF_LOG_DEBUG,
+                "resolved path(%s) till %"PRId64"(%s). "
+                "sending lookup for remaining path",
+                loc->path, parent->ino, resolved);
+
+	pathname = strdup (loc->path);
+	directory = dirname (pathname);
+        pathname = NULL;
+
+        while (strcmp (resolved, directory) != 0) 
+        {
+                dentry = NULL;
+
+                LIBGLUSTERFS_CLIENT_DENTRY_LOC_PREPARE (new_loc, loc, parent,
+                                                        resolved);
+
+		if (pathname) {
+			free (pathname);
+			pathname = NULL;
+		}
+
+		pathname = strdup (new_loc.path);
+		file = basename (pathname);
+
+                new_loc.inode = inode_search (ctx->itable, parent->ino, file);
+                if (new_loc.inode) {
+                        if (libgf_is_iattr_cache_valid (ctx, new_loc.inode,
+                                                        NULL,
+                                                        LIBGF_VALIDATE_LOOKUP))
+                                dentry = dentry_search_for_inode (new_loc.inode,
+                                                                  parent->ino,
+                                                                  file);
+                }
+
+                if (dentry == NULL) {
+                        op_ret = libgf_client_lookup (ctx, &new_loc, NULL, NULL,
+                                                      0);
+                        if (op_ret == -1) {
+                                inode_ref (new_loc.parent);
+                                libgf_client_loc_wipe (&new_loc);
+                                goto out;
+                        }
+                }
+
+                parent = inode_ref (new_loc.inode);
+                libgf_client_loc_wipe (&new_loc);
+
+                libgf_client_update_resolved (loc->path, resolved);
+        }
+
+	if (pathname) {
+		free (pathname);
+		pathname = NULL;
+	} 
+
+        if (lookup_basename) {
+                pathname = strdup (loc->path);
+                file = basename (pathname);
+
+                inode = inode_search (ctx->itable, parent->ino, file);
+                if (!inode) {
+                        libgf_client_loc_fill (&new_loc, ctx, 0, parent->ino,
+                                               file);
+
+                        op_ret = libgf_client_lookup (ctx, &new_loc, NULL, NULL,
+                                                      0);
+                        if (op_ret == -1) {
+                                libgf_client_loc_wipe (&new_loc);
+                                goto out;
+                        }
+                
+                        inode = inode_ref (new_loc.inode);
+                        libgf_client_loc_wipe (&new_loc);
+                }
+        }
+
+        op_ret = 0;
+out:
+        loc->inode = inode;
+        loc->parent = parent;
+
+        FREE (resolved);
+	if (pathname) {
+		FREE (pathname);
+	}
+
+	if (directory) {
+		FREE (directory);
+	}
+
+        return op_ret;
+}
+
+
+/* resolves loc->path to loc->parent and loc->inode */
+int32_t
+libgf_client_path_lookup (loc_t *loc,
+                          libglusterfs_client_ctx_t *ctx,
+                          char lookup_basename)
+{
+        char       *pathname  = NULL;
+        char       *directory = NULL;
+        inode_t    *inode = NULL;
+        inode_t    *parent = NULL;
+        int32_t     op_ret = 0;
+
+        pathname  = strdup (loc->path);
+        directory = dirname (pathname);
+        parent = inode_from_path (ctx->itable, directory);
+
+        if (parent != NULL) {
+                loc->parent = parent;
+
+                if (!lookup_basename) {
+                        gf_log ("libglusterfsclient",
+                                GF_LOG_DEBUG,
+                                "resolved dirname(%s) to %"PRId64,
+                                loc->path, parent->ino);
+                        goto out;
+                } else {
+                        inode = inode_from_path (ctx->itable, loc->path);
+                        if (inode != NULL) {
+                                gf_log ("libglusterfsclient",
+                                        GF_LOG_DEBUG,
+                                        "resolved path(%s) to %"PRId64"/%"PRId64,
+                                        loc->path, parent->ino, inode->ino);
+                                loc->inode = inode;
+                                goto out;
+                        }
+                }
+        }
+
+        if (parent) {
+                inode_unref (parent);
+        } else if (inode) {
+                inode_unref (inode);
+                gf_log ("libglusterfsclient",
+                        GF_LOG_ERROR,
+                        "undesired behaviour. inode(%"PRId64") for %s "
+                        "exists without parent (%s)",
+                        inode->ino, loc->path, directory);
+        }
+        op_ret = __do_path_resolve (loc, ctx, lookup_basename);
+out:    
+        if (pathname)
+                free (pathname);
+
+        return op_ret;
+}
diff --git a/libglusterfsclient/src/libglusterfsclient-internals.h b/libglusterfsclient/src/libglusterfsclient-internals.h
new file mode 100755
index 000000000..f1bad1ff3
--- /dev/null
+++ b/libglusterfsclient/src/libglusterfsclient-internals.h
@@ -0,0 +1,298 @@
+/*
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __LIBGLUSTERFSCLIENT_INTERNALS_H
+#define __LIBGLUSTERFSCLIENT_INTERNALS_H
+
+#include <glusterfs.h>
+#include <logging.h>
+#include <inode.h>
+#include <pthread.h>
+#include <stack.h>
+#include <list.h>
+#include <signal.h>
+#include <call-stub.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <fd.h>
+#include <dirent.h>
+
+#define LIBGF_IOBUF_SIZE        (128 *GF_UNIT_KB)
+typedef void (*sighandler_t) (int);
+typedef struct list_head list_head_t;
+
+typedef struct libglusterfs_client_ctx {
+        glusterfs_ctx_t gf_ctx;
+        inode_table_t *itable;
+        pthread_t reply_thread;
+        call_pool_t pool;
+        uint32_t counter;
+        time_t lookup_timeout;
+        time_t stat_timeout;
+        /* We generate a fake fsid for the subvolume being
+         * accessed through this context.
+         */
+        dev_t fake_fsid;
+        pid_t pid;
+}libglusterfs_client_ctx_t;
+
+typedef struct signal_handler {
+        int signo;
+        sighandler_t handler;
+        list_head_t next;
+}libgf_client_signal_handler_t ;
+
+typedef struct {
+        pthread_mutex_t lock;
+        pthread_cond_t reply_cond;
+        call_stub_t *reply_stub;
+        char complete;
+        union {
+                struct {
+                        char is_revalidate;
+                        loc_t *loc;
+                        int32_t size;
+                } lookup;
+        }fop;
+        fd_t *fd;          /* Needed here because we need a ref to the dir
+                              fd in the libgf_client_readdir_cbk in order
+                              to process the dirents received, without
+                              having them added to the reply stub.
+                              Also used in updating iattr cache. See
+                              readv_cbk for eg.
+                              */
+}libgf_client_local_t;
+
+typedef struct {
+        pthread_cond_t init_con_established;
+        pthread_mutex_t lock;
+        char complete;
+}libglusterfs_client_private_t;
+
+typedef struct {
+        pthread_mutex_t lock;
+        uint32_t previous_lookup_time;
+        uint32_t previous_stat_time;
+        struct iatt stbuf;
+} libglusterfs_client_inode_ctx_t;
+
+/* Our dirent cache is very simplistic when it comes to directory
+ * reading workloads. It assumes that all directory traversal operations happen
+ * sequentially and that readdir callers dont go jumping around the directory
+ * using seekdir, rewinddir. Thats why you'll notice that seekdir, rewinddir
+ * API in libglusterfsclient only set the offset. The consequence is that when
+ * libgf_dcache_readdir finds that the offset presented to it, is not
+ * the same as the offset of the previous dirent returned by dcache (..stored
+ * in struct direntcache->prev_off..), it realises that a non-sequential
+ * directory read is in progress and returns 0 to signify that the cache is
+ * not valid.
+ * This could be made a bit more intelligent by using a data structure like
+ * a hash-table or a balanced binary tree that allows us to search for the
+ * existence of particular offsets in the cache without performing a list or
+ * array traversal.
+ * Dont use a simple binary search tree because
+ * there is no guarantee that offsets in a sequential reading of the directory
+ * will be just random integers. If for some reason they are sequential, a BST
+ * will end up becoming a list.
+ */
+struct direntcache {
+        gf_dirent_t entries;            /* Head of list of cached dirents. */
+        gf_dirent_t *next;              /* Pointer to the next entry that
+                                         * should be sent by readdir */
+        uint64_t prev_off;              /* Offset where the next read will
+                                         * happen.
+                                         */
+};
+
+typedef struct {
+        pthread_mutex_t lock;
+        off_t offset;
+        libglusterfs_client_ctx_t *ctx;
+        /* `man readdir` says readdir is non-re-entrant
+         * only if two readdirs are racing on the same
+         * handle.
+         */
+	struct dirent dirp;
+        struct direntcache *dcache;
+        char   vpath[PATH_MAX]; 
+} libglusterfs_client_fd_ctx_t;
+
+typedef struct libglusterfs_client_async_local {
+        void *cbk_data;
+        union {
+                struct {
+                        fd_t *fd;
+                        glusterfs_readv_cbk_t cbk;
+                        char update_offset;
+                }readv_cbk;
+    
+                struct {
+                        fd_t *fd;
+                        glusterfs_write_cbk_t cbk;
+                }write_cbk;
+
+                struct {
+                        fd_t *fd;
+                }close_cbk;
+
+                struct {
+                        void *buf;
+                        size_t size;
+                        loc_t *loc;
+                        char is_revalidate;
+                        glusterfs_get_cbk_t cbk;
+                }lookup_cbk;
+        }fop;
+}libglusterfs_client_async_local_t;
+
+#define LIBGF_STACK_WIND_AND_WAIT(frame, rfn, obj, fn, params ...)      \
+        do {                                                            \
+                STACK_WIND (frame, rfn, obj, fn, params);               \
+                pthread_mutex_lock (&local->lock);                      \
+                {                                                       \
+                        while (!local->complete) {                      \
+                                pthread_cond_wait (&local->reply_cond,  \
+                                                   &local->lock);       \
+                        }                                               \
+                }                                                       \
+                pthread_mutex_unlock (&local->lock);                    \
+        } while (0)
+
+
+#define LIBGF_CLIENT_SIGNAL(signal_handler_list, signo, handler)        \
+        do {                                                            \
+                libgf_client_signal_handler_t *libgf_handler = CALLOC (1, \
+                                                    sizeof (*libgf_handler)); \
+                ERR_ABORT (libgf_handler);                              \
+                libgf_handler->signo = signo;                           \
+                libgf_handler->handler = signal (signo, handler);       \
+                list_add (&libgf_handler->next, signal_handler_list);   \
+        } while (0)                                                           
+
+#define LIBGF_INSTALL_SIGNAL_HANDLERS(signal_handlers)                  \
+        do {                                                            \
+                INIT_LIST_HEAD (&signal_handlers);                      \
+                /* Handle SIGABORT and SIGSEGV */                       \
+                LIBGF_CLIENT_SIGNAL (&signal_handlers, SIGSEGV, gf_print_trace); \
+                LIBGF_CLIENT_SIGNAL (&signal_handlers, SIGABRT, gf_print_trace); \
+                LIBGF_CLIENT_SIGNAL (&signal_handlers, SIGHUP, gf_log_logrotate); \
+                /* LIBGF_CLIENT_SIGNAL (SIGTERM, glusterfs_cleanup_and_exit); */ \
+        } while (0)
+
+#define LIBGF_RESTORE_SIGNAL_HANDLERS(local)                            \
+        do {                                                            \
+                libgf_client_signal_handler_t *ptr = NULL, *tmp = NULL; \
+                list_for_each_entry_safe (ptr, tmp, &local->signal_handlers,\
+                                          next) {                       \
+                        signal (ptr->signo, ptr->handler);              \
+                        FREE (ptr);                                     \
+                }                                                       \
+        } while (0)                                       
+
+#define LIBGF_CLIENT_FOP_ASYNC(ctx, local, ret_fn, op, args ...)        \
+        do {                                                            \
+                call_frame_t *frame = get_call_frame_for_req (ctx, 1);  \
+                xlator_t *xl = frame->this->children ?                  \
+                        frame->this->children->xlator : NULL;           \
+                frame->root->state = ctx;                               \
+                frame->local = local;                                   \
+                STACK_WIND (frame, ret_fn, xl, xl->fops->op, args);     \
+        } while (0)
+
+#define LIBGF_CLIENT_FOP(ctx, stub, op, local, args ...)                \
+        do {                                                            \
+                call_frame_t *frame = get_call_frame_for_req (ctx, 1);  \
+                xlator_t *xl = frame->this->children ?                  \
+                        frame->this->children->xlator : NULL;           \
+                if (!local) {                                           \
+                        local = CALLOC (1, sizeof (*local));            \
+                }                                                       \
+                ERR_ABORT (local);                                      \
+                frame->local = local;                                   \
+                frame->root->state = ctx;                               \
+                pthread_cond_init (&local->reply_cond, NULL);           \
+                pthread_mutex_init (&local->lock, NULL);                \
+                LIBGF_STACK_WIND_AND_WAIT (frame, libgf_client_##op##_cbk, xl, \
+                                           xl->fops->op, args);         \
+                stub = local->reply_stub;                               \
+                FREE (frame->local);                                    \
+                frame->local = NULL;                                    \
+                STACK_DESTROY (frame->root);                            \
+        } while (0)
+
+#define LIBGF_REPLY_NOTIFY(local)                                       \
+        do {                                                            \
+                pthread_mutex_lock (&local->lock);                      \
+                {                                                       \
+                        local->complete = 1;                            \
+                        pthread_cond_broadcast (&local->reply_cond);    \
+                }                                                       \
+                pthread_mutex_unlock (&local->lock);                    \
+        } while (0)
+
+
+void
+libgf_client_loc_wipe (loc_t *loc);
+
+int32_t
+libgf_client_loc_fill (loc_t *loc,
+                       libglusterfs_client_ctx_t *ctx,
+                       ino_t ino,
+                       ino_t par,
+                       const char *name);
+
+int32_t
+libgf_client_path_lookup (loc_t *loc,
+                          libglusterfs_client_ctx_t *ctx,
+                          char lookup_basename);
+
+int32_t
+libgf_client_lookup (libglusterfs_client_ctx_t *ctx,
+                     loc_t *loc,
+                     struct iatt *stbuf,
+                     dict_t **dict,
+                     dict_t *xattr_req);
+
+/* We're not expecting more than 10-15
+ * VMPs per process so a list is acceptable.
+ */
+struct vmp_entry {
+        struct list_head list;
+        char * vmp;
+        int vmplen;
+        glusterfs_handle_t handle;
+};
+
+#define LIBGF_UPDATE_LOOKUP     0x1
+#define LIBGF_UPDATE_STAT       0x2
+#define LIBGF_UPDATE_ALL        (LIBGF_UPDATE_LOOKUP | LIBGF_UPDATE_STAT)
+
+#define LIBGF_VALIDATE_LOOKUP  0x1
+#define LIBGF_VALIDATE_STAT     0x2
+
+#define LIBGF_INVALIDATE_LOOKUP  0x1
+#define LIBGF_INVALIDATE_STAT     0x2
+int
+libgf_is_iattr_cache_valid (libglusterfs_client_ctx_t *ctx, inode_t *inode,
+                            struct iatt *sbuf, int flags);
+
+int
+libgf_update_iattr_cache (inode_t *inode, int flags, struct iatt *buf);
+
+#endif
diff --git a/libglusterfsclient/src/libglusterfsclient.c b/libglusterfsclient/src/libglusterfsclient.c
new file mode 100755
index 000000000..b4c1d1edc
--- /dev/null
+++ b/libglusterfsclient/src/libglusterfsclient.c
@@ -0,0 +1,8169 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <libgen.h>
+#include <stddef.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef GF_SOLARIS_HOST_OS
+#include <sys/statfs.h>
+#endif
+#include <unistd.h>
+#include <xlator.h>
+#include <timer.h>
+#include "defaults.h"
+#include <time.h>
+#include <poll.h>
+#include "transport.h"
+#include "event.h"
+#include "libglusterfsclient.h"
+#include "libglusterfsclient-internals.h"
+#include "compat.h"
+#include "compat-errno.h"
+#ifndef GF_SOLARIS_HOST_OS
+#include <sys/vfs.h>
+#endif
+#include <utime.h>
+#include <sys/param.h>
+#include <list.h>
+#include <stdarg.h>
+#include <sys/statvfs.h>
+#include "hashfn.h"
+#include <sys/select.h>
+
+#define LIBGF_XL_NAME "libglusterfsclient"
+#define LIBGLUSTERFS_INODE_TABLE_LRU_LIMIT 1000 //14057
+#define LIBGF_SENDFILE_BLOCK_SIZE 4096
+#define LIBGF_READDIR_BLOCK     4096
+#define libgf_path_absolute(path) ((path)[0] == '/')
+
+static inline xlator_t *
+libglusterfs_graph (xlator_t *graph);
+int32_t libgf_client_readlink (libglusterfs_client_ctx_t *ctx, loc_t *loc,
+                                        char *buf, size_t bufsize);
+
+int
+libgf_realpath_loc_fill (libglusterfs_client_ctx_t *ctx, char *link,
+                         loc_t *targetloc);
+static int first_init = 1;
+
+/* The global list of virtual mount points */
+struct {
+        struct list_head list;
+        int              entries;
+}vmplist;
+
+
+/* Protects the VMP list above. */
+pthread_mutex_t vmplock = PTHREAD_MUTEX_INITIALIZER;
+
+/* Ensures only one thread is ever calling glusterfs_mount.
+ * Since that function internally calls routines which
+ * use the yacc parser code using global vars, this process
+ * needs to be syncronised.
+ */
+pthread_mutex_t mountlock = PTHREAD_MUTEX_INITIALIZER;
+
+static char cwd[PATH_MAX];
+static char cwd_inited = 0;
+static pthread_mutex_t cwdlock   = PTHREAD_MUTEX_INITIALIZER;
+
+char *
+libgf_vmp_virtual_path (struct vmp_entry *entry, const char *path, char *vpath)
+{
+        char    *tmp = NULL;
+
+        tmp = ((char *)(path + (entry->vmplen-1)));
+        if (strlen (tmp) > 0) {
+                if (tmp[0] != '/') {
+                        vpath[0] = '/';
+                        vpath[1] = '\0';
+                        strcat (&vpath[1], tmp);
+                } else
+                        strcpy (vpath, tmp);
+        } else {
+                vpath[0] = '/';
+                vpath[1] = '\0';
+        }
+
+        return vpath;
+}
+
+char *
+zr_build_process_uuid ()
+{
+	char           tmp_str[1024] = {0,};
+	char           hostname[256] = {0,};
+	struct timeval tv = {0,};
+	struct tm      now = {0, };
+	char           now_str[32];
+
+	if (-1 == gettimeofday(&tv, NULL)) {
+		gf_log ("", GF_LOG_ERROR, 
+			"gettimeofday: failed %s",
+			strerror (errno));		
+	}
+
+	if (-1 == gethostname (hostname, 256)) {
+		gf_log ("", GF_LOG_ERROR, 
+			"gethostname: failed %s",
+			strerror (errno));
+	}
+
+	localtime_r (&tv.tv_sec, &now);
+	strftime (now_str, 32, "%Y/%m/%d-%H:%M:%S", &now);
+	snprintf (tmp_str, 1024, "%s-%d-%s:%ld", 
+		  hostname, getpid(), now_str, tv.tv_usec);
+	
+	return strdup (tmp_str);
+}
+
+
+int32_t
+libgf_client_forget (xlator_t *this,
+		     inode_t *inode)
+{
+        uint64_t ptr = 0;
+	libglusterfs_client_inode_ctx_t *ctx = NULL;
+	
+	inode_ctx_del (inode, this, &ptr);
+        ctx = (libglusterfs_client_inode_ctx_t *)(long) ptr;
+
+	FREE (ctx);
+
+        return 0;
+}
+
+xlator_t *
+libgf_inode_to_xlator (inode_t *inode)
+{
+        if (!inode)
+                return NULL;
+
+        if (!inode->table)
+                return NULL;
+
+        if (!inode->table->xl)
+                return NULL;
+
+        if (!inode->table->xl->ctx)
+                return NULL;
+
+        return inode->table->xl->ctx->top;
+}
+
+libglusterfs_client_fd_ctx_t *
+libgf_get_fd_ctx (fd_t *fd)
+{
+        uint64_t                        ctxaddr = 0;
+        libglusterfs_client_fd_ctx_t    *ctx = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+
+        if (fd_ctx_get (fd, libgf_inode_to_xlator (fd->inode), &ctxaddr) == -1)
+                goto out;
+
+        ctx = (libglusterfs_client_fd_ctx_t *)(long)ctxaddr;
+
+out:
+        return ctx;
+}
+
+libglusterfs_client_fd_ctx_t *
+libgf_alloc_fd_ctx (libglusterfs_client_ctx_t *ctx, fd_t *fd, char *vpath)
+{
+        libglusterfs_client_fd_ctx_t    *fdctx = NULL;
+        uint64_t                        ctxaddr = 0;
+
+        fdctx = CALLOC (1, sizeof (*fdctx));
+        if (fdctx == NULL) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR,
+                        "memory allocation failure");
+                fdctx = NULL;
+                goto out;
+        }
+
+        pthread_mutex_init (&fdctx->lock, NULL);
+        fdctx->ctx = ctx;
+        ctxaddr = (uint64_t) (long)fdctx;
+
+        if (fd->inode) {
+                if (IA_ISDIR (fd->inode->ia_type)) {
+                        fdctx->dcache = CALLOC (1, sizeof (struct direntcache));
+                        if (fdctx->dcache)
+                                INIT_LIST_HEAD (&fdctx->dcache->entries.list);
+                        /* If the calloc fails, we can still continue
+                         * working as the dcache is not required for correct
+                         * operation.
+                         */
+                }
+        }
+
+        if (vpath != NULL) {
+                strcpy (fdctx->vpath, vpath);
+                if (vpath[strlen(vpath) - 1] != '/') {
+                        strcat (fdctx->vpath, "/");
+                }
+        }
+
+        fd_ctx_set (fd, libgf_inode_to_xlator (fd->inode), ctxaddr);
+out:
+        return fdctx;
+}
+
+libglusterfs_client_fd_ctx_t *
+libgf_del_fd_ctx (fd_t *fd)
+{
+        uint64_t                        ctxaddr = 0;
+        libglusterfs_client_fd_ctx_t    *ctx = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+
+        if (fd_ctx_del (fd, libgf_inode_to_xlator (fd->inode) , &ctxaddr) == -1)
+                goto out;
+
+        ctx = (libglusterfs_client_fd_ctx_t *)(long)ctxaddr;
+
+out:
+        return ctx;
+}
+
+void
+libgf_dcache_invalidate (fd_t *fd)
+{
+        libglusterfs_client_fd_ctx_t    *fd_ctx = NULL;
+
+        if (!fd)
+                return;
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+                return;
+        }
+
+        if (!fd_ctx->dcache) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No dcache present");
+                return;
+        }
+
+        if (!list_empty (&fd_ctx->dcache->entries.list))
+                gf_dirent_free (&fd_ctx->dcache->entries);
+
+        INIT_LIST_HEAD (&fd_ctx->dcache->entries.list);
+
+        fd_ctx->dcache->next = NULL;
+        fd_ctx->dcache->prev_off = 0;
+
+        return;
+}
+
+/* The first entry in the entries is always a placeholder
+ * or the list head. The real entries begin from entries->next.
+ */
+int
+libgf_dcache_update (libglusterfs_client_ctx_t *ctx, fd_t *fd,
+                     gf_dirent_t *entries)
+{
+        libglusterfs_client_fd_ctx_t    *fd_ctx = NULL;
+        int                             op_ret = -1;
+
+        if ((!ctx) || (!fd) || (!entries)) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+		goto out;
+        }
+
+        /* dcache is not enabled. */
+        if (!fd_ctx->dcache) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No dcache present");
+                op_ret = 0;
+                goto out;
+        }
+
+        /* If we're updating, we must begin with invalidating any previous
+         * entries.
+         */
+        libgf_dcache_invalidate (fd);
+
+        fd_ctx->dcache->next = entries->next;
+        /* We still need to store a pointer to the head
+         * so we start free'ing from the head when invalidation
+         * is required.
+         *
+         * Need to delink the entries from the list
+         * given to us by an underlying translators. Most translators will
+         * free this list after this call so we must preserve the dirents in
+         * order to cache them.
+         */
+        list_splice_init (&entries->list, &fd_ctx->dcache->entries.list);
+        op_ret = 0;
+out:
+        return op_ret;
+}
+
+int
+libgf_dcache_readdir (libglusterfs_client_ctx_t *ctx, fd_t *fd,
+                      struct dirent *dirp, off_t *offset)
+{
+        libglusterfs_client_fd_ctx_t    *fd_ctx = NULL;
+        int                             cachevalid = 0;
+
+        if ((!ctx) || (!fd) || (!dirp) || (!offset))
+                return 0;
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+                goto out;
+        }
+
+        if (!fd_ctx->dcache) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No dcache present");
+                goto out;
+        }
+
+        /* We've either run out of entries in the cache
+         * or the cache is empty.
+         */
+        if (!fd_ctx->dcache->next) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "No entries present");
+                goto out;
+        }
+
+        /* The dirent list is created as a circular linked list
+         * so this check is needed to ensure, we dont start
+         * reading old entries again.
+         * If we're reached this situation, the cache is exhausted
+         * and we'll need to pre-fetch more entries to continue serving.
+         */
+        if (fd_ctx->dcache->next == &fd_ctx->dcache->entries) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Entries exhausted");
+                goto out;
+        }
+
+        /* During sequential reading we generally expect that the offset
+         * requested is the same as the offset we served in the previous call
+         * to readdir. But, seekdir, rewinddir and libgf_dcache_invalidate
+         * require special handling because seekdir/rewinddir change the offset
+         * in the fd_ctx and libgf_dcache_invalidate changes the prev_off.
+         */
+        if (*offset != fd_ctx->dcache->prev_off) {
+                /* For all cases of the if branch above, we know that the
+                 * cache is now invalid except for the case below. It handles
+                 * the case where the two offset values above are different
+                 * but different because the previous readdir block was
+                 * exhausted, resulting in a prev_off being set to 0 in
+                 * libgf_dcache_invalidate, while the requested offset is non
+                 * zero because that is what we returned for the last dirent
+                 * of the previous readdir block.
+                 */
+                if ((*offset != 0) && (fd_ctx->dcache->prev_off == 0)) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Entries"
+                                " exhausted");
+                        cachevalid = 1;
+                } else
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Dcache"
+                                " invalidated previously");
+        } else
+                cachevalid = 1;
+
+        if (!cachevalid)
+                goto out;
+
+        dirp->d_ino = fd_ctx->dcache->next->d_ino;
+        strncpy (dirp->d_name, fd_ctx->dcache->next->d_name,
+                 fd_ctx->dcache->next->d_len);
+
+        *offset = fd_ctx->dcache->next->d_off;
+        dirp->d_off = *offset;
+        fd_ctx->dcache->prev_off = fd_ctx->dcache->next->d_off;
+        fd_ctx->dcache->next = fd_ctx->dcache->next->next;
+
+out:
+        return cachevalid;
+}
+
+
+int32_t
+libgf_client_release (xlator_t *this,
+		      fd_t *fd)
+{
+	libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (IA_ISDIR (fd->inode->ia_type)) {
+                libgf_dcache_invalidate (fd);
+                FREE (fd_ctx->dcache);
+        }
+
+        libgf_del_fd_ctx (fd);
+        if (fd_ctx != NULL) {
+                pthread_mutex_destroy (&fd_ctx->lock);
+                FREE (fd_ctx);
+        }
+
+	return 0;
+}
+
+libglusterfs_client_inode_ctx_t *
+libgf_get_inode_ctx (inode_t *inode)
+{
+        uint64_t                                ctxaddr = 0;
+        libglusterfs_client_inode_ctx_t         *ictx = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, inode, out);
+        if (inode_ctx_get (inode, libgf_inode_to_xlator (inode), &ctxaddr) < 0)
+                goto out;
+
+        ictx = (libglusterfs_client_inode_ctx_t *)(long)ctxaddr;
+
+out:
+        return ictx;
+}
+
+libglusterfs_client_inode_ctx_t *
+libgf_del_inode_ctx (inode_t *inode)
+{
+        uint64_t                                ctxaddr = 0;
+        libglusterfs_client_inode_ctx_t         *ictx = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, inode, out);
+        if (inode_ctx_del (inode, libgf_inode_to_xlator (inode), &ctxaddr) < 0)
+                goto out;
+
+        ictx = (libglusterfs_client_inode_ctx_t *)(long)ctxaddr;
+
+out:
+        return ictx;
+}
+
+libglusterfs_client_inode_ctx_t *
+libgf_alloc_inode_ctx (libglusterfs_client_ctx_t *ctx, inode_t *inode)
+{
+        uint64_t                                ctxaddr = 0;
+        libglusterfs_client_inode_ctx_t         *ictx = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, inode, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        ictx = CALLOC (1, sizeof (*ictx));
+        if (ictx == NULL) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR,
+                                "memory allocation failure");
+                goto out;
+        }
+
+        pthread_mutex_init (&ictx->lock, NULL);
+        ctxaddr = (uint64_t) (long)ictx;
+        if (inode_ctx_put (inode, libgf_inode_to_xlator (inode), ctxaddr) < 0){
+                FREE (ictx);
+                ictx = NULL;
+        }
+
+out:
+        return ictx;
+}
+
+int
+libgf_transform_iattr (libglusterfs_client_ctx_t *libctx, inode_t *inode,
+                       struct iatt *buf)
+{
+
+        if ((!libctx) || (!buf) || (!inode))
+                return -1;
+
+        buf->ia_dev = libctx->fake_fsid;
+        /* If the inode is root, the inode number must be 1 not the
+         * ino received from the file system.
+         */
+        if ((inode->ino == 1) && (buf))
+                buf->ia_ino = 1;
+
+        return 0;
+}
+
+int
+libgf_update_iattr_cache (inode_t *inode, int flags, struct iatt *buf)
+{
+        libglusterfs_client_inode_ctx_t *inode_ctx = NULL;
+        time_t                          current = 0;
+        int                             op_ret = -1;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, inode, out);
+
+        inode_ctx = libgf_get_inode_ctx (inode);
+        if (!inode_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No inode context"
+                        " present");
+                errno = EINVAL;
+                op_ret = -1;
+                goto out;
+        }
+
+        pthread_mutex_lock (&inode_ctx->lock);
+        {
+                /* Take a timestamp only after we've acquired the
+                 * lock.
+                 */
+                current = time (NULL);
+                if (flags & LIBGF_UPDATE_LOOKUP) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Updating lookup");
+                        inode_ctx->previous_lookup_time = current;
+                }
+
+                if (flags & LIBGF_UPDATE_STAT) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Updating stat");
+
+                        /* Update the cached stat struct only if a new
+                         * stat buf is given.
+                         */
+                        if (buf != NULL) {
+                                inode_ctx->previous_stat_time = current;
+                                memcpy (&inode_ctx->stbuf, buf,
+                                                sizeof (inode_ctx->stbuf));
+                        }
+                }
+        }
+        pthread_mutex_unlock (&inode_ctx->lock);
+        op_ret = 0;
+
+out:
+        return op_ret;
+}
+
+
+int
+libgf_invalidate_iattr_cache (inode_t *inode, int flags)
+{
+        libglusterfs_client_inode_ctx_t         *ictx = NULL;
+
+        if (!inode)
+                return -1;
+
+        ictx = libgf_get_inode_ctx (inode);
+        if (!ictx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No inode context"
+                        " present");
+                return -1;
+        }
+
+        pthread_mutex_lock (&ictx->lock);
+        {
+                if (flags & LIBGF_INVALIDATE_LOOKUP) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Invalidating"
+                                " lookup");
+                        ictx->previous_lookup_time = 0;
+                }
+
+                if (flags & LIBGF_INVALIDATE_STAT) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Invalidating"
+                                " stat");
+                        ictx->previous_stat_time = 0;
+                }
+
+        }
+        pthread_mutex_unlock (&ictx->lock);
+
+        return 0;
+}
+
+
+int
+libgf_is_iattr_cache_valid (libglusterfs_client_ctx_t *ctx, inode_t *inode,
+                            struct iatt *sbuf, int flags)
+{
+        time_t                                  current = 0;
+        time_t                                  prev = 0;
+        libglusterfs_client_inode_ctx_t         *inode_ctx = NULL;
+        int                                     cache_valid = 0;
+        time_t                                  timeout = 0;
+
+        if (inode == NULL)
+                return 0;
+
+        inode_ctx = libgf_get_inode_ctx (inode);
+        if (!inode_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No inode context"
+                        " present\n");
+                return 0;
+        }
+
+        pthread_mutex_lock (&inode_ctx->lock);
+        {
+                current = time (NULL);
+                if (flags & LIBGF_VALIDATE_LOOKUP) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Checking lookup");
+                        prev = inode_ctx->previous_lookup_time;
+                        timeout = ctx->lookup_timeout;
+                } else {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Checking stat");
+                        prev = inode_ctx->previous_stat_time;
+                        timeout = ctx->stat_timeout;
+                }
+
+                /* Even if the timeout is set to -1 to cache
+                 * infinitely, fops like write must invalidate the
+                 * stat cache because writev_cbk cannot update
+                 * the cache using the stat returned to it. This is
+                 * because write-behind can return a stat bufs filled
+                 * with zeroes.
+                 */
+                if (prev == 0) {
+                        cache_valid = 0;
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Cache Invalid");
+                        goto iattr_unlock_out;
+                }
+
+                /* Cache infinitely */
+                if (timeout == (time_t)-1) {
+                        cache_valid = 1;
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Caching On and "
+                                "valid");
+                        goto iattr_unlock_out;
+                }
+
+                /* Disable caching completely */
+                if (timeout == 0) {
+                        cache_valid = 0;
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Cache disabled");
+                        goto iattr_unlock_out;
+                }
+
+                if ((prev > 0) && (timeout >= (current - prev))) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Cache valid");
+                        cache_valid = 1;
+                }
+
+                if (flags & LIBGF_VALIDATE_LOOKUP)
+                        goto iattr_unlock_out;
+
+                if ((cache_valid) && (sbuf))
+                        *sbuf = inode_ctx->stbuf;
+        }
+iattr_unlock_out:
+        pthread_mutex_unlock (&inode_ctx->lock);
+
+        return cache_valid;
+}
+
+int32_t
+libgf_client_releasedir (xlator_t *this,
+			 fd_t *fd)
+{
+	libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (IA_ISDIR (fd->inode->ia_type)) {
+                libgf_dcache_invalidate (fd);
+                FREE (fd_ctx->dcache);
+        }
+
+        libgf_del_fd_ctx (fd);
+        if (fd_ctx != NULL) {
+                pthread_mutex_destroy (&fd_ctx->lock);
+                FREE (fd_ctx);
+        }
+
+	return 0;
+}
+
+void *poll_proc (void *ptr)
+{
+        glusterfs_ctx_t *ctx = ptr;
+
+        event_dispatch (ctx->event_pool);
+
+        return NULL;
+}
+
+
+int32_t
+xlator_graph_init (xlator_t *xl)
+{
+        xlator_t *trav = xl;
+        int32_t ret = -1;
+
+        while (trav->prev)
+                trav = trav->prev;
+
+        while (trav) {
+                if (!trav->ready) {
+                        ret = xlator_tree_init (trav);
+                        if (ret < 0)
+                                break;
+                }
+                trav = trav->next;
+        }
+
+        return ret;
+}
+
+
+void
+xlator_graph_fini (xlator_t *xl)
+{
+	xlator_t *trav = xl;
+	while (trav->prev)
+		trav = trav->prev;
+
+	while (trav) {
+		if (!trav->init_succeeded) {
+			break;
+		}
+
+		xlator_tree_fini (trav);
+		trav = trav->next;
+	}
+}
+
+/* Returns a pointer to the @n'th char matching
+ * @c in string @str, starting the search from right or
+ * end-of-string, rather than starting from left, as rindex
+ * function does.
+ */
+char *
+libgf_rrindex (char *str, int c, int n)
+{
+        int     len = 0;
+        int     occurrence = 0;
+
+        if (str == NULL)
+                return NULL;
+
+        len = strlen (str);
+        /* Point to last character of string. */
+        str += (len - 1);
+        while (len > 0) {
+                if ((int)*str == c) {
+                        ++occurrence;
+                        if (occurrence == n)
+                                break;
+                }
+                --len;
+                --str;
+        }
+
+        return str;
+}
+
+char *
+libgf_trim_to_prev_dir (char * path)
+{
+        char    *idx = NULL;
+        int      len = 0;
+
+        if (!path)
+                return NULL;
+
+        /* Check if we're already at root, if yes
+         * then there is no prev dir.
+         */
+        len = strlen (path);
+        if (len == 1)
+                return path;
+
+        if (path[len - 1] == '/') {
+                path[len - 1] = '\0';
+        }
+
+        idx = libgf_rrindex (path, '/', 1);
+        /* Move to the char after the / */
+        ++idx;
+        *idx = '\0';
+
+        return path;
+}
+
+
+char *
+libgf_prepend_cwd (const char *userpath, char *abspath, int size)
+{
+        if ((!userpath) || (!abspath))
+                return NULL;
+
+        if (!getcwd (abspath, size))
+                return NULL;
+
+        strcat (abspath, "/");
+        strcat (abspath, userpath);
+
+        return abspath;
+}
+
+
+/* Performs a lightweight path resolution that only
+ * looks for . and  .. and replaces those with the
+ * proper names.
+ *
+ * FIXME: This is a stop-gap measure till we have full
+ * fledge path resolution going in here.
+ * Function returns path strdup'ed so remember to FREE the
+ * string as required.
+ */
+char *
+libgf_resolve_path_light (char *path)
+{
+        char            *respath = NULL;
+        char            *saveptr = NULL;
+        char            *tok = NULL;
+        int             len = 0;
+        int             addslash = 0;
+        char            mypath[PATH_MAX];
+
+        if (!path)
+                goto out;
+
+        memset (mypath, 0, PATH_MAX);
+
+        if (!libgf_path_absolute (path))
+                libgf_prepend_cwd (path, mypath, PATH_MAX);
+        else
+                strcpy (mypath, path);
+
+        len = strlen (mypath);
+        if (len == 0) {
+                goto out;
+        }
+
+        respath = calloc (PATH_MAX, sizeof (char));
+        if (respath == NULL) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR,"Memory allocation failed");
+                goto out;
+        }
+
+        /* The path only contains a / or a //, so simply add a /
+         * and return.
+         * This needs special handling because the loop below does
+         * not allow us to do so through strtok.
+         */
+        if (((mypath[0] == '/') && (len == 1))
+                        || (strcmp (mypath, "//") == 0)) {
+                strcat (respath, "/");
+                goto out;
+        }
+
+        tok = strtok_r (mypath, "/", &saveptr);
+        addslash = 0;
+        strcat (respath, "/");
+        while (tok) {
+                if (addslash) {
+                        if ((strcmp (tok, ".") != 0)
+                                        && (strcmp (tok, "..") != 0)) {
+                                strcat (respath, "/");
+                        }
+                }
+
+                if ((strcmp (tok, ".") != 0) && (strcmp (tok, "..") != 0)) {
+                        strcat (respath, tok);
+                        addslash = 1;
+                } else if ((strcmp (tok, "..") == 0)) {
+                        libgf_trim_to_prev_dir (respath);
+                        addslash = 0;
+                }
+
+                tok = strtok_r (NULL, "/", &saveptr);
+        }
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Path: %s, Resolved Path: %s",
+                path, respath);
+out:
+        return respath;
+}
+
+void 
+libgf_client_loc_wipe (loc_t *loc)
+{
+	if (loc->path) {
+		FREE (loc->path);
+	}
+
+	if (loc->parent) { 
+		inode_unref (loc->parent);
+		loc->parent = NULL;
+	}
+
+	if (loc->inode) {
+		inode_unref (loc->inode);
+		loc->inode = NULL;
+	}
+
+	loc->path = loc->name = NULL;
+        loc->ino = 0;
+}
+
+
+int32_t
+libgf_client_loc_fill (loc_t *loc,
+		       libglusterfs_client_ctx_t *ctx,
+		       ino_t ino,
+		       ino_t par,
+		       const char *name)
+{
+        inode_t *inode = NULL, *parent = NULL;
+	int32_t ret = -1;
+	char *path = NULL;
+
+        /* resistance against multiple invocation of loc_fill not to get
+           reference leaks via inode_search() */
+
+        inode = loc->inode;
+	
+        if (!inode) {
+                if (ino)
+                        inode = inode_search (ctx->itable, ino, NULL);
+
+                if (inode)
+                        goto inode_found;
+
+                if (par && name)
+                        inode = inode_search (ctx->itable, par, name);
+        }
+
+inode_found:
+        if (inode) {
+                loc->ino = inode->ino;
+                loc->inode = inode;
+        }
+
+        parent = loc->parent;
+        if (!parent) {
+                if (inode)
+                        parent = inode_parent (inode, par, name);
+                else
+                        parent = inode_search (ctx->itable, par, NULL);
+                loc->parent = parent;
+        }
+  
+	if (!loc->path) {
+		if (name && parent) {
+			ret = inode_path (parent, name, &path);
+			if (ret <= 0) {
+				gf_log ("glusterfs-fuse", GF_LOG_ERROR,
+					"inode_path failed for %"PRId64"/%s",
+					parent->ino, name);
+				goto fail;
+			} else {
+				loc->path = path;
+			}
+		} else 	if (inode) {
+			ret = inode_path (inode, NULL, &path);
+			if (ret <= 0) {
+				gf_log ("glusterfs-fuse", GF_LOG_ERROR,
+					"inode_path failed for %"PRId64,
+					inode->ino);
+				goto fail;
+			} else {
+				loc->path = path;
+			}
+		}
+	}
+
+	if (loc->path) {
+		loc->name = strrchr (loc->path, '/');
+		if (loc->name)
+			loc->name++;
+		else loc->name = "";
+	}
+	
+	if ((ino != 1) &&
+	    (parent == NULL)) {
+		gf_log ("fuse-bridge", GF_LOG_ERROR,
+			"failed to search parent for %"PRId64"/%s (%"PRId64")",
+			(ino_t)par, name, (ino_t)ino);
+		ret = -1;
+		goto fail;
+	}
+	ret = 0;
+fail:
+	return ret;
+}
+
+
+static call_frame_t *
+get_call_frame_for_req (libglusterfs_client_ctx_t *ctx, char d)
+{
+        call_pool_t  *pool = ctx->gf_ctx.pool;
+        xlator_t     *this = ctx->gf_ctx.graph;
+        call_frame_t *frame = NULL;
+  
+
+        frame = create_frame (this, pool);
+
+        frame->root->uid = geteuid ();
+        frame->root->gid = getegid ();
+        frame->root->pid = ctx->pid;
+        frame->root->unique = ctx->counter++;
+  
+        return frame;
+}
+
+void 
+libgf_client_fini (xlator_t *this)
+{
+	FREE (this->private);
+        return;
+}
+
+
+int32_t
+libgf_client_notify (xlator_t *this, 
+                     int32_t event,
+                     void *data, 
+                     ...)
+{
+        libglusterfs_client_private_t *priv = this->private;
+
+        switch (event)
+        {
+        case GF_EVENT_CHILD_UP:
+                pthread_mutex_lock (&priv->lock);
+                {
+                        priv->complete = 1;
+                        pthread_cond_broadcast (&priv->init_con_established);
+                }
+                pthread_mutex_unlock (&priv->lock);
+                break;
+
+        default:
+                default_notify (this, event, data);
+        }
+
+        return 0;
+}
+
+int32_t 
+libgf_client_init (xlator_t *this)
+{
+        return 0;
+}
+
+glusterfs_handle_t 
+glusterfs_init (glusterfs_init_params_t *init_ctx, uint32_t fakefsid)
+{
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_private_t *priv = NULL;
+        FILE *specfp = NULL;
+        xlator_t *graph = NULL, *trav = NULL;
+        call_pool_t *pool = NULL;
+        int32_t ret = 0;
+        struct rlimit lim;
+	uint32_t xl_count = 0;
+        loc_t       new_loc = {0, };
+        struct timeval tv = {0, };
+        uint32_t       len = 0;
+        char           buf[PATH_MAX];
+
+        if (!init_ctx || (!init_ctx->specfile && !init_ctx->specfp)) {
+                errno = EINVAL;
+                return NULL;
+        }
+
+        ctx = CALLOC (1, sizeof (*ctx));
+        if (!ctx) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: out of memory\n",
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__);
+
+                errno = ENOMEM;
+                return NULL;
+        }
+
+        ctx->lookup_timeout = init_ctx->lookup_timeout;
+        ctx->stat_timeout = init_ctx->stat_timeout;
+        ctx->fake_fsid = fakefsid;
+        ctx->pid = getpid ();
+        pthread_mutex_init (&ctx->gf_ctx.lock, NULL);
+  
+        pool = ctx->gf_ctx.pool = CALLOC (1, sizeof (call_pool_t));
+        if (!pool) {
+                errno = ENOMEM;
+                FREE (ctx);
+                return NULL;
+        }
+
+        LOCK_INIT (&pool->lock);
+        INIT_LIST_HEAD (&pool->all_frames);
+
+	/* FIXME: why is count hardcoded to 16384 */
+        ctx->gf_ctx.event_pool = event_pool_new (16384);
+        ctx->gf_ctx.page_size  = LIBGF_IOBUF_SIZE;
+        ctx->gf_ctx.iobuf_pool = iobuf_pool_new (8 * 1048576,
+                                                 ctx->gf_ctx.page_size);
+
+        lim.rlim_cur = RLIM_INFINITY;
+        lim.rlim_max = RLIM_INFINITY;
+        setrlimit (RLIMIT_CORE, &lim);
+        setrlimit (RLIMIT_NOFILE, &lim);
+
+        ctx->gf_ctx.cmd_args.log_level = GF_LOG_WARNING;
+
+        if (init_ctx->logfile)
+                ctx->gf_ctx.cmd_args.log_file = strdup (init_ctx->logfile);
+        else
+                ctx->gf_ctx.cmd_args.log_file = strdup ("/dev/stderr");
+
+        if (init_ctx->loglevel) {
+                if (!strncasecmp (init_ctx->loglevel, "DEBUG",
+                                  strlen ("DEBUG"))) {
+                        ctx->gf_ctx.cmd_args.log_level = GF_LOG_DEBUG;
+                } else if (!strncasecmp (init_ctx->loglevel, "WARNING",
+                                         strlen ("WARNING"))) {
+                        ctx->gf_ctx.cmd_args.log_level = GF_LOG_WARNING;
+                } else if (!strncasecmp (init_ctx->loglevel, "CRITICAL",
+                                         strlen ("CRITICAL"))) {
+                        ctx->gf_ctx.cmd_args.log_level = GF_LOG_CRITICAL;
+                } else if (!strncasecmp (init_ctx->loglevel, "NONE",
+                                         strlen ("NONE"))) {
+                        ctx->gf_ctx.cmd_args.log_level = GF_LOG_NONE;
+                } else if (!strncasecmp (init_ctx->loglevel, "ERROR",
+                                         strlen ("ERROR"))) {
+                        ctx->gf_ctx.cmd_args.log_level = GF_LOG_ERROR;
+                } else if (!strncasecmp (init_ctx->loglevel, "TRACE",
+                                         strlen ("TRACE"))) {
+                        ctx->gf_ctx.cmd_args.log_level = GF_LOG_TRACE;
+                } else {
+			fprintf (stderr, 
+				 "libglusterfsclient: %s:%s():%d: Unrecognized log-level \"%s\", possible values are \"DEBUG|WARNING|[ERROR]|CRITICAL|NONE|TRACE\"\n",
+                                 __FILE__, __PRETTY_FUNCTION__, __LINE__,
+                                 init_ctx->loglevel);
+			FREE (ctx->gf_ctx.cmd_args.log_file);
+                        FREE (ctx->gf_ctx.pool);
+                        FREE (ctx->gf_ctx.event_pool);
+                        FREE (ctx);
+                        errno = EINVAL;
+                        return NULL;
+                }
+        }
+
+	if (first_init)
+        {
+                memset (buf, 0, PATH_MAX);
+
+                if (getcwd (buf, PATH_MAX) == NULL) {
+                        fprintf (stderr, "libglusterfsclient: cannot get "
+                                 "current working directory (%s)",
+                                 strerror (errno));
+			FREE (ctx->gf_ctx.cmd_args.log_file);
+                        FREE (ctx->gf_ctx.pool);
+                        FREE (ctx->gf_ctx.event_pool);
+                        FREE (ctx);
+                        return NULL;
+                }
+
+                len = strlen (buf);
+                if ((buf[len - 1] != '/')) {
+                        if ((len + 2) > PATH_MAX) {
+                                errno = ENAMETOOLONG;
+                                fprintf (stderr, "libglusterfsclient: cannot"
+                                         "get current working directory (%s)",
+                                         strerror (errno));
+                                FREE (ctx->gf_ctx.cmd_args.log_file);
+                                FREE (ctx->gf_ctx.pool);
+                                FREE (ctx->gf_ctx.event_pool);
+                                FREE (ctx);
+                                return NULL;
+                        }
+
+                        strcat (buf, "/");
+                }
+
+                pthread_mutex_lock (&cwdlock);
+                {
+                        strcpy (cwd, buf);
+                        cwd_inited = 1;
+                }
+                pthread_mutex_unlock (&cwdlock);
+
+                ret = gf_log_init (ctx->gf_ctx.cmd_args.log_file);
+                if (ret == -1) {
+			fprintf (stderr, 
+				 "libglusterfsclient: %s:%s():%d: failed to open logfile \"%s\"\n", 
+				 __FILE__, __PRETTY_FUNCTION__, __LINE__, 
+				 ctx->gf_ctx.cmd_args.log_file);
+			FREE (ctx->gf_ctx.cmd_args.log_file);
+                        FREE (ctx->gf_ctx.pool);
+                        FREE (ctx->gf_ctx.event_pool);
+                        FREE (ctx);
+                        return NULL;
+                }
+
+                gf_log_set_loglevel (ctx->gf_ctx.cmd_args.log_level);
+        }
+
+        if (init_ctx->specfp) {
+                specfp = init_ctx->specfp;
+                if (fseek (specfp, 0L, SEEK_SET)) {
+			fprintf (stderr, 
+				 "libglusterfsclient: %s:%s():%d: fseek on volume file stream failed (%s)\n",
+                                 __FILE__, __PRETTY_FUNCTION__, __LINE__,
+                                 strerror (errno));
+			FREE (ctx->gf_ctx.cmd_args.log_file);
+                        FREE (ctx->gf_ctx.pool);
+                        FREE (ctx->gf_ctx.event_pool);
+                        FREE (ctx);
+                        return NULL;
+                }
+        } else if (init_ctx->specfile) { 
+                specfp = fopen (init_ctx->specfile, "r");
+                ctx->gf_ctx.cmd_args.volume_file = strdup (init_ctx->specfile);
+        }
+
+        if (!specfp) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: could not open volfile: %s\n", 
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__,
+                         strerror (errno));
+		FREE (ctx->gf_ctx.cmd_args.log_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_file);
+                FREE (ctx->gf_ctx.pool);
+                FREE (ctx->gf_ctx.event_pool);
+                FREE (ctx);
+                return NULL;
+        }
+
+        if (init_ctx->volume_name) {
+                ctx->gf_ctx.cmd_args.volume_name = strdup (init_ctx->volume_name);
+        }
+
+	graph = file_to_xlator_tree (&ctx->gf_ctx, specfp);
+        if (!graph) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: cannot create configuration graph (%s)\n",
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__,
+                         strerror (errno));
+
+		FREE (ctx->gf_ctx.cmd_args.log_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_name);
+                FREE (ctx->gf_ctx.pool);
+                FREE (ctx->gf_ctx.event_pool);
+                FREE (ctx);
+                return NULL;
+        }
+
+        if (init_ctx->volume_name) {
+                trav = graph;
+                while (trav) {
+                        if (strcmp (trav->name, init_ctx->volume_name) == 0) {
+                                graph = trav;
+                                break;
+                        }
+                        trav = trav->next;
+                }
+        }
+
+        ctx->gf_ctx.graph = libglusterfs_graph (graph);
+        if (!ctx->gf_ctx.graph) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: graph creation failed (%s)\n",
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__,
+                         strerror (errno));
+
+		xlator_tree_free (graph);
+		FREE (ctx->gf_ctx.cmd_args.log_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_name);
+                FREE (ctx->gf_ctx.pool);
+                FREE (ctx->gf_ctx.event_pool);
+                FREE (ctx);
+                return NULL;
+        }
+        graph = ctx->gf_ctx.graph;
+        ctx->gf_ctx.top = graph;
+
+	trav = graph;
+	while (trav) {
+		xl_count++;  /* Getting this value right is very important */
+		trav = trav->next;
+	}
+
+	ctx->gf_ctx.xl_count = xl_count + 1;
+
+        priv = CALLOC (1, sizeof (*priv));
+        if (!priv) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: cannot allocate memory (%s)\n",
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__,
+                         strerror (errno));
+
+		xlator_tree_free (graph);
+		FREE (ctx->gf_ctx.cmd_args.log_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_name);
+                FREE (ctx->gf_ctx.pool);
+                FREE (ctx->gf_ctx.event_pool);
+                /* inode_table_destroy (ctx->itable); */
+                FREE (ctx);
+         
+                return NULL;
+        }
+
+        pthread_cond_init (&priv->init_con_established, NULL);
+        pthread_mutex_init (&priv->lock, NULL);
+
+        graph->private = priv;
+        ctx->itable = inode_table_new (LIBGLUSTERFS_INODE_TABLE_LRU_LIMIT,
+                                       graph);
+        if (!ctx->itable) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: cannot create inode table\n",
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__);
+		xlator_tree_free (graph); 
+		FREE (ctx->gf_ctx.cmd_args.log_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_name);
+
+                FREE (ctx->gf_ctx.pool);
+                FREE (ctx->gf_ctx.event_pool);
+		xlator_tree_free (graph); 
+                /* TODO: destroy graph */
+                /* inode_table_destroy (ctx->itable); */
+                FREE (ctx);
+         
+                return NULL;
+        }
+
+	set_global_ctx_ptr (&ctx->gf_ctx);
+	ctx->gf_ctx.process_uuid = zr_build_process_uuid ();
+
+        if (xlator_graph_init (graph) == -1) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: graph initialization failed\n",
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__);
+		xlator_tree_free (graph);
+		FREE (ctx->gf_ctx.cmd_args.log_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_name);
+                FREE (ctx->gf_ctx.pool);
+                FREE (ctx->gf_ctx.event_pool);
+                /* TODO: destroy graph */
+                /* inode_table_destroy (ctx->itable); */
+                FREE (ctx);
+                return NULL;
+        }
+
+	/* Send notify to all translator saying things are ready */
+	graph->notify (graph, GF_EVENT_PARENT_UP, graph);
+
+        if (gf_timer_registry_init (&ctx->gf_ctx) == NULL) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: timer init failed (%s)\n", 
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__,
+                         strerror (errno));
+
+		xlator_graph_fini (graph);
+		xlator_tree_free (graph);
+		FREE (ctx->gf_ctx.cmd_args.log_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_name);
+
+                FREE (ctx->gf_ctx.pool);
+                FREE (ctx->gf_ctx.event_pool);
+                /* TODO: destroy graph */
+                /* inode_table_destroy (ctx->itable); */
+                FREE (ctx);
+                return NULL;
+        }
+
+        if ((ret = pthread_create (&ctx->reply_thread, NULL, poll_proc,
+                                   (void *)&ctx->gf_ctx))) {
+		fprintf (stderr, 
+			 "libglusterfsclient: %s:%s():%d: reply thread creation failed\n", 
+			 __FILE__, __PRETTY_FUNCTION__, __LINE__);
+		xlator_graph_fini (graph);
+		xlator_tree_free (graph);
+		FREE (ctx->gf_ctx.cmd_args.log_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_file);
+                FREE (ctx->gf_ctx.cmd_args.volume_name);
+
+                FREE (ctx->gf_ctx.pool);
+                FREE (ctx->gf_ctx.event_pool);
+                /* TODO: destroy graph */
+                /* inode_table_destroy (ctx->itable); */
+                FREE (ctx);
+                return NULL;
+        }
+
+        pthread_mutex_lock (&priv->lock); 
+        {
+                while (!priv->complete) {
+                        pthread_cond_wait (&priv->init_con_established,
+                                           &priv->lock);
+                }
+        }
+        pthread_mutex_unlock (&priv->lock);
+
+        /* 
+         * wait for some time to allow initialization of all children of 
+         * distribute before sending lookup on '/'
+         */
+
+        tv.tv_sec = 0;
+        tv.tv_usec = (100 * 1000);
+        select (0, NULL, NULL, NULL, &tv);
+
+        /* workaround for xlators like dht which require lookup to be sent
+         * on / */
+        libgf_client_loc_fill (&new_loc, ctx, 1, 0, "/");
+        ret = libgf_client_lookup (ctx, &new_loc, NULL, NULL, NULL);
+        if (ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR, "lookup of /"
+                        " failed");
+                return NULL;
+        }
+        libgf_client_loc_wipe (&new_loc);
+
+	first_init = 0;
+ 
+        return ctx;
+}
+
+struct vmp_entry *
+libgf_init_vmpentry (char *vmp, glusterfs_handle_t *vmphandle)
+{
+        struct vmp_entry        *entry = NULL;
+        int                     vmplen = 0;
+        int                     appendslash = 0;
+        int                     ret = -1;
+
+        entry = CALLOC (1, sizeof (struct vmp_entry));
+        if (!entry) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR,"Memory allocation failed");
+                return NULL;
+        }
+
+        vmplen = strlen (vmp);
+        if (vmp[vmplen - 1] != '/') {
+                vmplen++;
+                appendslash = 1;
+        }
+
+        entry->vmp = CALLOC (vmplen + 1, sizeof (char));
+        if (!entry->vmp) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Memory allocation "
+                        "failed");
+                goto free_entry;
+        }
+
+        strcpy (entry->vmp, vmp);
+        if (appendslash) {
+                entry->vmp[vmplen-1] = '/';
+                entry->vmp[vmplen] = '\0';
+        }
+ 
+        entry->vmplen = vmplen;
+        entry->handle = vmphandle;
+        INIT_LIST_HEAD (&entry->list);
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "New VMP entry: %s", vmp);
+
+        ret = 0;
+
+free_entry:
+        if (ret == -1) {
+                if (entry->vmp)
+                        FREE (entry->vmp);
+                if (entry)
+                        FREE (entry);
+                entry = NULL;
+        }
+        return entry;
+}
+
+void
+libgf_free_vmp_entry (struct vmp_entry *entry)
+{
+        FREE (entry->vmp);
+        FREE (entry);
+}
+
+int
+libgf_count_path_components (char *path)
+{
+        int     compos = 0;
+        char    *pathdup = NULL;
+        int     len = 0;
+
+        if (!path)
+                return -1;
+
+        pathdup = strdup (path);
+        if (!pathdup)
+                return -1;
+
+        len = strlen (pathdup);
+        if (pathdup[len - 1] == '/')
+                pathdup[len - 1] = '\0';
+
+        path = pathdup;
+        while ((path = strchr (path, '/'))) {
+                compos++;
+                ++path;
+        }
+
+        free (pathdup);
+        return compos;
+}
+
+/* Returns the number of components that match between
+ * the VMP and the path. Assumes string1 is vmp entry.
+ * Assumes both are absolute paths.
+ */
+int
+libgf_strmatchcount (char *string1, char *string2)
+{
+        int     matchcount = 0;
+        char    *s1dup = NULL, *s2dup = NULL;
+        char    *tok1 = NULL, *saveptr1 = NULL;
+        char    *tok2 = NULL, *saveptr2 = NULL;
+
+        if ((!string1) || (!string2))
+                return 0;
+
+        s1dup = strdup (string1);
+        if (!s1dup)
+                return 0;
+
+        s2dup  = strdup (string2);
+        if (!s2dup)
+                goto free_s1;
+
+        string1 = s1dup;
+        string2 = s2dup;
+
+        tok1 = strtok_r(string1, "/", &saveptr1);
+        tok2 = strtok_r (string2, "/", &saveptr2);
+        while (tok1) {
+                if (!tok2)
+                        break;
+
+                if (strcmp (tok1, tok2) != 0)
+                        break;
+
+                matchcount++;
+                tok1 = strtok_r(NULL, "/", &saveptr1);
+                tok2 = strtok_r (NULL, "/", &saveptr2);
+        }
+
+        free (s2dup);
+free_s1:
+        free (s1dup);
+        return matchcount;
+}
+
+int
+libgf_vmp_entry_match (struct vmp_entry *entry, char *path)
+{
+        return libgf_strmatchcount (entry->vmp, path);
+}
+
+#define LIBGF_VMP_EXACT          1
+#define LIBGF_VMP_LONGESTPREFIX  0
+
+
+/* copies vmp from the vmp-entry having glusterfs handle @handle, into @vmp */
+char *
+libgf_vmp_search_vmp (glusterfs_handle_t handle, char *vmp, size_t vmp_size)
+{
+        char             *res   = NULL;
+        struct vmp_entry *entry = NULL;
+
+        if (handle == NULL) {
+                goto out;
+        }
+
+        pthread_mutex_lock (&vmplock);
+        {
+                if (vmplist.entries == 0) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Virtual Mount Point "
+                                "list is empty.");
+                        goto unlock;
+                }
+
+                list_for_each_entry(entry, &vmplist.list, list) {
+                        if (entry->handle == handle) {
+                                if ((vmp_size) < (strlen (entry->vmp) + 1)) {
+                                        errno = ENAMETOOLONG;
+                                        goto unlock;
+                                }
+
+                                strcpy (vmp, entry->vmp);
+                                res = vmp;
+                                break;
+                        }
+                }
+        }
+unlock:
+        pthread_mutex_unlock (&vmplock);
+
+out:
+        return res;
+}
+
+
+struct vmp_entry *
+_libgf_vmp_search_entry (char *path, int searchtype)
+{
+        struct vmp_entry        *entry = NULL;
+        int                     matchcount = 0;
+        struct vmp_entry        *maxentry = NULL;
+        int                     maxcount = 0;
+        int                     vmpcompcount = 0;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "VMP Search: path %s, type: %s",
+                path, (searchtype == LIBGF_VMP_EXACT)?"Exact":"LongestPrefix");
+        if (vmplist.entries == 0) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Virtual Mount Point "
+                        "list is empty.");
+                goto out;
+        }
+
+        list_for_each_entry(entry, &vmplist.list, list) {
+                vmpcompcount = libgf_count_path_components (entry->vmp);
+                matchcount = libgf_vmp_entry_match (entry, path);
+                gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Candidate VMP:  %s,"
+                        " Matchcount: %d", entry->vmp, matchcount);
+                if ((matchcount > maxcount) && (matchcount == vmpcompcount)) {
+                        maxcount = matchcount;
+                        maxentry = entry;
+                }
+        }
+
+        /* To ensure that the longest prefix matched entry is also an exact
+         * match, this is used to check whether duplicate entries are present
+         * in the vmplist.
+         */
+        vmpcompcount = 0;
+        if ((searchtype == LIBGF_VMP_EXACT) && (maxentry)) {
+                vmpcompcount = libgf_count_path_components (maxentry->vmp);
+                matchcount = libgf_count_path_components (path);
+                gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Exact Check: VMP: %s,"
+                        " CompCount: %d, Path: %s, CompCount: %d",
+                        maxentry->vmp, vmpcompcount, path, matchcount);
+                if (vmpcompcount != matchcount) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "No Match");
+                        maxentry = NULL;
+                } else
+                        gf_log (LIBGF_XL_NAME, GF_LOG_TRACE, "Matches!");
+        }
+
+out:        
+        return maxentry;
+} 
+
+/* Used to search for a exactly matching VMP entry.
+ */
+struct vmp_entry *
+libgf_vmp_search_exact_entry (char *path)
+{
+        struct vmp_entry        *entry = NULL;
+
+        if (!path)
+                goto out;
+
+        pthread_mutex_lock (&vmplock);
+        {
+                entry = _libgf_vmp_search_entry (path, LIBGF_VMP_EXACT);
+        }
+        pthread_mutex_unlock (&vmplock);
+
+out:
+        if (entry)
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "VMP Entry found: path :%s"
+                        " vmp: %s", path, entry->vmp);
+        else
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "VMP Entry not found: path"
+                        ": %s", path);
+
+        return entry;
+}
+
+
+/* Used to search for a longest prefix matching VMP entry.
+ */
+struct vmp_entry *
+libgf_vmp_search_entry (char *path)
+{
+        struct vmp_entry        *entry = NULL;
+
+        if (!path)
+                goto out;
+
+        pthread_mutex_lock (&vmplock);
+        {
+                entry = _libgf_vmp_search_entry (path, LIBGF_VMP_LONGESTPREFIX);
+        }
+        pthread_mutex_unlock (&vmplock);
+
+out:
+        if (entry)
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "VMP Entry found: path :%s"
+                        " vmp: %s", path, entry->vmp);
+        else
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "VMP Entry not found: path"
+                        ": %s", path);
+
+        return entry;
+}
+
+int
+libgf_vmp_map_ghandle (char *vmp, glusterfs_handle_t *vmphandle)
+{
+        int                     ret = -1;
+        struct vmp_entry        *vmpentry = NULL;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "New Entry: %s", vmp);
+        vmpentry = libgf_init_vmpentry (vmp, vmphandle);
+        if (!vmpentry) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Failed to create VMP"
+                        " entry");
+                goto out;
+        }
+
+        pthread_mutex_lock (&vmplock);
+        {
+                if (vmplist.entries == 0) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Empty list");
+                        INIT_LIST_HEAD (&vmplist.list);
+                }
+
+                list_add_tail (&vmpentry->list, &vmplist.list);
+                ++vmplist.entries;
+        }
+        pthread_mutex_unlock (&vmplock);
+        ret = 0;
+
+out:
+        return ret;
+}
+
+/* Path must be validated already. */
+glusterfs_handle_t
+libgf_vmp_get_ghandle (char * path)
+{
+        struct vmp_entry        *entry = NULL;
+
+        entry = libgf_vmp_search_entry (path);
+
+        if (entry == NULL)
+                return NULL;
+
+        return entry->handle;
+}
+
+
+/* Returns the handle for the path given in @path,
+ * @path can be a relative path. The point is, here we
+ * perform any path resolution that is needed and then
+ * search for the corresponding vmp handle.
+ * @vpath is a result-value argument in that the virtual
+ * path inside the handle is copied into it.
+ */
+glusterfs_handle_t
+libgf_resolved_path_handle (const char *path, char *vpath)
+{
+        char                    *respath = NULL;
+        struct vmp_entry        *entry = NULL;
+        glusterfs_handle_t      handle = NULL;
+        char                    *tmp = NULL;
+
+        if ((!path) || (!vpath))
+                return NULL;
+
+        /* We only want compaction before VMP entry search because the
+         * VMP cannot be search unless we have an absolute path.
+         * For absolute paths, we search for VMP first, then perform the
+         * path compaction on the  given virtual path.
+         */
+        if (!libgf_path_absolute (path)) {
+                respath = libgf_resolve_path_light ((char *)path);
+                if (respath == NULL)
+                        return NULL;
+        }
+
+        /* This condition is needed because in case of absolute paths, the path
+         * would already include the VMP and we want to ensure that any path
+         * compaction that happens does not exclude the VMP. In the absence of
+         * this condition an absolute path might get compacted to "/", i.e.
+         * exclude the VMP, and the search will fail.
+         *
+         * For relative paths, respath will aleady include a potential VMP
+         * as a consequence of us prepending the CWD in resolve_light above.
+         */
+        if (libgf_path_absolute (path)) {
+                entry = libgf_vmp_search_entry ((char *)path);
+                if (!entry)
+                        goto free_respath;
+                tmp = libgf_vmp_virtual_path (entry, path, vpath);
+                if (!tmp)
+                        goto free_respath;
+
+                respath = libgf_resolve_path_light (vpath);
+                strcpy (vpath, respath);
+        } else {
+                entry = libgf_vmp_search_entry (respath);
+                if (!entry)
+                        goto free_respath;
+                tmp = libgf_vmp_virtual_path (entry, respath, vpath);
+                if (!tmp)
+                        goto free_respath;
+        }
+
+        handle = entry->handle;
+free_respath:
+        if (respath)
+                free (respath); /* Alloced in libgf_resolve_path_light */
+
+        return handle;
+}
+
+
+int
+glusterfs_mount (char *vmp, glusterfs_init_params_t *ipars)
+{
+        glusterfs_handle_t      vmphandle = NULL;
+        int                     ret = -1;
+        char                    *vmp_resolved = NULL;
+        struct vmp_entry        *vmp_entry = NULL;
+        uint32_t                vmphash = 0;
+        
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, vmp, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ipars, out);
+
+        vmp_resolved = libgf_resolve_path_light (vmp);
+        if (!vmp_resolved) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Path compaction failed");
+                goto out;
+        }
+
+        vmphash = (dev_t)ReallySimpleHash (vmp, strlen (vmp));
+        pthread_mutex_lock (&mountlock);
+        {
+                vmp_entry = libgf_vmp_search_exact_entry (vmp);
+                if (vmp_entry) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Entry exists");
+                        ret = 0;
+                        goto unlock;
+                }
+
+                vmphandle = glusterfs_init (ipars, vmphash);
+                if (!vmphandle) {
+                        errno = EINVAL;
+                        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "GlusterFS context"
+                                " init failed");
+                        goto unlock;
+                }
+
+                ret = libgf_vmp_map_ghandle (vmp_resolved, vmphandle);
+                if (ret == -1) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Failed to map new"
+                                " handle: %s", vmp);
+                        glusterfs_fini (vmphandle);
+                }
+        }
+unlock:
+        pthread_mutex_unlock (&mountlock);
+
+out:
+        if (vmp_resolved)
+                FREE (vmp_resolved);
+
+        return ret;
+}
+
+inline int
+_libgf_umount (char *vmp)
+{
+        struct vmp_entry *entry= NULL;
+        int               ret = -1;
+
+        entry = _libgf_vmp_search_entry (vmp, LIBGF_VMP_EXACT);
+        if (entry == NULL) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path (%s) not mounted", vmp);
+                goto out;
+        }
+
+        if (entry->handle == NULL) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path (%s) has no corresponding glusterfs handle",
+                        vmp);
+                goto out;
+        }
+
+/*        ret = glusterfs_fini (entry->handle); */
+        list_del_init (&entry->list);
+        libgf_free_vmp_entry (entry);
+
+        vmplist.entries--; 
+
+out:
+        return ret;
+}
+
+inline int
+libgf_umount (char *vmp)
+{
+        int ret = -1;
+
+        pthread_mutex_lock (&vmplock);
+        { 
+                ret = _libgf_umount (vmp);
+        }
+        pthread_mutex_unlock (&vmplock);
+        
+        return ret;
+}
+
+int
+glusterfs_umount (char *vmp)
+{ 
+        int    ret = -1; 
+        char *vmp_resolved = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, vmp, out);
+
+        vmp_resolved = libgf_resolve_path_light (vmp);
+        if (!vmp_resolved) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Path compaction failed");
+                goto out;
+        }
+
+        ret = libgf_umount (vmp_resolved);
+
+out:
+        if (vmp_resolved)
+                FREE (vmp_resolved);
+
+        return ret;
+}
+
+int
+glusterfs_umount_all (void)
+{
+        struct vmp_entry *entry = NULL, *tmp = NULL;
+
+        pthread_mutex_lock (&vmplock);
+        {
+                if (vmplist.entries > 0) {
+                        list_for_each_entry_safe (entry, tmp, &vmplist.list,
+                                                  list) {
+                                /* even if there are errors, continue with other
+                                   mounts
+                                */
+                                _libgf_umount (entry->vmp);
+                        }
+                }
+        }
+        pthread_mutex_unlock (&vmplock);
+        
+        return 0;
+}
+
+void
+glusterfs_reset (void)
+{
+        INIT_LIST_HEAD (&vmplist.list);
+        vmplist.entries = 0;
+
+        memset (&vmplock, 0, sizeof (vmplock));
+        pthread_mutex_init (&vmplock, NULL);
+
+	first_init = 1;
+}
+
+void 
+glusterfs_log_lock (void)
+{
+	gf_log_lock ();
+}
+
+
+void glusterfs_log_unlock (void)
+{
+	gf_log_unlock ();
+}
+
+
+void
+libgf_wait_for_frames_unwind (libglusterfs_client_ctx_t *ctx)
+{
+        call_pool_t     *pool = NULL;
+        int             canreturn = 0;
+
+        if (!ctx)
+                return;
+
+        pool = (call_pool_t *)ctx->gf_ctx.pool;
+        while (1) {
+                LOCK (&pool->lock);
+                {
+                        if (pool->cnt == 0) {
+                                canreturn = 1;
+                                goto unlock_out;
+                        }
+                }
+unlock_out:
+                UNLOCK (&pool->lock);
+
+                if (canreturn)
+                        break;
+
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Waiting for call frames");
+                sleep (1);
+        }
+
+        return;
+}
+
+
+int 
+glusterfs_fini (glusterfs_handle_t handle)
+{
+	libglusterfs_client_ctx_t *ctx = handle;
+
+        libgf_wait_for_frames_unwind (ctx);
+
+	FREE (ctx->gf_ctx.cmd_args.log_file);
+	FREE (ctx->gf_ctx.cmd_args.volume_file);
+	FREE (ctx->gf_ctx.cmd_args.volume_name);
+	FREE (ctx->gf_ctx.pool);
+        FREE (ctx->gf_ctx.event_pool);
+        mem_pool_destroy (ctx->itable->inode_pool);
+	 mem_pool_destroy (ctx->itable->dentry_pool);
+	 mem_pool_destroy (ctx->itable->fd_mem_pool);
+        /* iobuf_pool_destroy (ctx->gf_ctx.iobuf_pool); */
+        ((gf_timer_registry_t *)ctx->gf_ctx.timer)->fin = 1;
+
+	xlator_graph_fini (ctx->gf_ctx.graph);
+	xlator_tree_free (ctx->gf_ctx.graph);
+	ctx->gf_ctx.graph = NULL;
+        pthread_cancel (ctx->reply_thread);
+
+        FREE (ctx);
+
+        return 0;
+}
+
+
+int32_t 
+libgf_client_lookup_cbk (call_frame_t *frame,
+                         void *cookie,
+                         xlator_t *this,
+                         int32_t op_ret,
+                         int32_t op_errno,
+                         inode_t *inode,
+                         struct iatt *buf,
+                         dict_t *dict,
+                         struct iatt *postparent)
+{
+        libgf_client_local_t *local = frame->local;
+        libglusterfs_client_ctx_t *ctx = frame->root->state;
+	dict_t *xattr_req = NULL;
+
+        if (op_ret == 0) {
+		inode_t *parent = NULL;
+
+		if (local->fop.lookup.loc->ino == 1) {
+			buf->ia_ino = 1;
+		}
+
+		parent = local->fop.lookup.loc->parent;
+                if (inode->ino != 1) {
+                        inode = inode_link (inode, parent,
+                                            local->fop.lookup.loc->name, buf);
+                }
+
+                libgf_transform_iattr (ctx, inode, buf);
+		inode_lookup (inode);
+        } else {
+                if ((local->fop.lookup.is_revalidate == 0) 
+                    && (op_errno == ENOENT)) {
+                        gf_log ("libglusterfsclient", GF_LOG_DEBUG,
+                                "%"PRId64": (op_num=%d) %s => -1 (%s)",
+				frame->root->unique, frame->root->op,
+				local->fop.lookup.loc->path,
+				strerror (op_errno));
+                } else {
+                        gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "%"PRId64": (op_num=%d) %s => -1 (%s)",
+				frame->root->unique, frame->root->op,
+				local->fop.lookup.loc->path,
+				strerror (op_errno));
+                }
+
+                if (local->fop.lookup.is_revalidate == 1) {
+			int32_t ret = 0;
+                        inode_unref (local->fop.lookup.loc->inode);
+                        local->fop.lookup.loc->inode = inode_new (ctx->itable);
+                        local->fop.lookup.is_revalidate = 2;
+
+                        if (local->fop.lookup.size > 0) {
+                                xattr_req = dict_new ();
+                                ret = dict_set (xattr_req, "glusterfs.content",
+                                                data_from_uint64 (local->fop.lookup.size));
+                                if (ret == -1) {
+                                        op_ret = -1;
+                                        /* TODO: set proper error code */
+                                        op_errno = errno;
+                                        inode = NULL;
+                                        buf = NULL;
+                                        dict = NULL;
+                                        dict_unref (xattr_req);
+                                        goto out;
+                                }
+                        }
+
+                        STACK_WIND (frame, libgf_client_lookup_cbk,
+                                    FIRST_CHILD (this),
+                                    FIRST_CHILD (this)->fops->lookup,
+                                    local->fop.lookup.loc, xattr_req);
+
+			if (xattr_req) {
+				dict_unref (xattr_req);
+				xattr_req = NULL;
+			}
+
+                        return 0;
+                }
+        }
+
+out:
+        local->reply_stub = fop_lookup_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                 inode, buf, dict, postparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int32_t
+libgf_client_lookup (libglusterfs_client_ctx_t *ctx,
+                     loc_t *loc,
+                     struct iatt *stbuf,
+                     dict_t **dict,
+		     dict_t *xattr_req)
+{
+        call_stub_t  *stub = NULL;
+        int32_t op_ret;
+        libgf_client_local_t *local = NULL;
+        inode_t *inode = NULL;
+        
+        local = CALLOC (1, sizeof (*local));
+        if (!local) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Memory allocation"
+                        " failed");
+                errno = ENOMEM;
+                return -1;
+        }
+
+        if (loc->inode) {
+                local->fop.lookup.is_revalidate = 1;
+                loc->ino = loc->inode->ino;
+        }
+        else
+                loc->inode = inode_new (ctx->itable);
+
+        local->fop.lookup.loc = loc;
+
+        LIBGF_CLIENT_FOP(ctx, stub, lookup, local, loc, xattr_req);
+
+        op_ret = stub->args.lookup_cbk.op_ret;
+        errno = stub->args.lookup_cbk.op_errno;
+
+        if (op_ret == -1)
+                goto out;
+
+        inode = stub->args.lookup_cbk.inode;
+        if (!(libgf_get_inode_ctx (inode)))
+                libgf_alloc_inode_ctx (ctx, inode);
+        libgf_transform_iattr (ctx, inode, &stub->args.lookup_cbk.buf);
+        libgf_update_iattr_cache (inode, LIBGF_UPDATE_ALL,
+                                        &stub->args.lookup_cbk.buf);
+        if (stbuf)
+                *stbuf = stub->args.lookup_cbk.buf;
+
+        if (dict)
+                *dict = dict_ref (stub->args.lookup_cbk.dict);
+
+        if (inode != loc->inode) {
+                inode_unref (loc->inode);
+                loc->inode = inode_ref (inode);
+        }
+
+out:
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+int 
+glusterfs_glh_get (glusterfs_handle_t handle, const char *path, void *buf,
+                   size_t size, struct stat *stbuf)
+{
+        int32_t op_ret = -1;
+        loc_t loc = {0, };
+        libglusterfs_client_ctx_t *ctx = handle;
+        dict_t *dict = NULL;
+	dict_t *xattr_req = NULL;
+	char *name = NULL, *pathname = NULL;
+        struct iatt iatt = {0,};
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, size %lu", path,
+                (long unsigned)size);
+        if (size < 0) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Invalid size");
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (size == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Path compaction failed");
+                goto out;
+        }
+
+	op_ret = libgf_client_path_lookup (&loc, ctx, 0);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient", GF_LOG_ERROR,
+			"path lookup failed for (%s)", loc.path);
+		goto out;
+	}
+
+	pathname = strdup (loc.path);
+	name = basename (pathname);
+
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino, name);
+        if (op_ret < 0) {
+                gf_log ("libglusterfsclient",
+                        GF_LOG_ERROR,
+                        "libgf_client_loc_fill returned -1, returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (size) { 
+                xattr_req = dict_new ();
+                op_ret = dict_set (xattr_req, "glusterfs.content",
+                                   data_from_uint64 (size));
+                if (op_ret < 0) {
+                        gf_log ("libglusterfsclient",
+                                GF_LOG_ERROR,
+                                "setting requested content size dictionary failed");
+                        goto out;
+                }
+        }
+
+        op_ret = libgf_client_lookup (ctx, &loc, &iatt, &dict, xattr_req);
+        iatt_to_stat (&iatt, stbuf);
+        if (!op_ret && stbuf && (iatt.ia_size <= size) && dict && buf) {
+                data_t *mem_data = NULL;
+                void *mem = NULL;
+                
+                mem_data = dict_get (dict, "glusterfs.content");
+                if (mem_data) {
+                        mem = data_to_ptr (mem_data);
+                }
+                        
+                if (mem != NULL) { 
+                        memcpy (buf, mem, iatt.ia_size);
+                }
+        }
+
+out:
+	if (xattr_req) {
+		dict_unref (xattr_req);
+	}
+        
+	if (dict) {
+		dict_unref (dict);
+	}
+
+	if (pathname) {
+		FREE (pathname);
+	}
+	libgf_client_loc_wipe (&loc);
+
+        return op_ret;
+}
+
+int
+glusterfs_get (const char *path, void *buf, size_t size, struct stat *stbuf)
+{
+        int                     op_ret = -1;
+        glusterfs_handle_t      h      = NULL;
+        char                    vpath[PATH_MAX];
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, buf, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, stbuf, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, size %lu", path,
+                (long unsigned)size);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_get (h, vpath, buf, size, stbuf);
+
+out:
+        return op_ret;
+}
+
+int
+libgf_client_lookup_async_cbk (call_frame_t *frame,
+                               void *cookie,
+                               xlator_t *this,
+                               int32_t op_ret,
+                               int32_t op_errno,
+                               inode_t *inode,
+                               struct iatt *stbuf,
+                               dict_t *dict,
+                               struct iatt *postparent)
+{
+        libglusterfs_client_async_local_t *local = frame->local;
+        glusterfs_get_cbk_t lookup_cbk = local->fop.lookup_cbk.cbk;
+        libglusterfs_client_ctx_t *ctx = frame->root->state;
+	glusterfs_iobuf_t *iobuf = NULL;
+	dict_t *xattr_req = NULL;
+        inode_t *parent = NULL;
+        struct stat stat = {0,};
+
+        if (op_ret == 0) {
+                parent = local->fop.lookup_cbk.loc->parent;
+                inode_link (inode, parent, local->fop.lookup_cbk.loc->name,
+                            stbuf);
+                libgf_transform_iattr (ctx, inode, stbuf);
+                if (!(libgf_get_inode_ctx (inode)))
+                        libgf_alloc_inode_ctx (ctx, inode);
+                libgf_update_iattr_cache (inode, LIBGF_UPDATE_ALL, stbuf);
+                inode_lookup (inode);
+        } else {
+                if ((local->fop.lookup_cbk.is_revalidate == 0) 
+                    && (op_errno == ENOENT)) {
+                        gf_log ("libglusterfsclient", GF_LOG_DEBUG,
+                                "%"PRId64": (op_num=%d) %s => -1 (%s)",
+				frame->root->unique, frame->root->op,
+				local->fop.lookup_cbk.loc->path,
+				strerror (op_errno));
+                } else {
+                        gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "%"PRId64": (op_num=%d) %s => -1 (%s)",
+				frame->root->unique, frame->root->op,
+                                local->fop.lookup_cbk.loc->path,
+				strerror (op_errno));
+                }
+
+                if (local->fop.lookup_cbk.is_revalidate == 1) {
+			int32_t ret = 0;
+                        inode_unref (local->fop.lookup_cbk.loc->inode);
+                        local->fop.lookup_cbk.loc->inode = inode_new (ctx->itable);
+                        local->fop.lookup_cbk.is_revalidate = 2;
+
+                        if (local->fop.lookup_cbk.size > 0) {
+                                xattr_req = dict_new ();
+                                ret = dict_set (xattr_req, "glusterfs.content",
+                                                data_from_uint64 (local->fop.lookup_cbk.size));
+                                if (ret == -1) {
+                                        op_ret = -1;
+                                        /* TODO: set proper error code */
+                                        op_errno = errno;
+                                        inode = NULL;
+                                        stbuf = NULL;
+                                        dict = NULL;
+                                        dict_unref (xattr_req);
+                                        goto out;
+                                }
+                        }
+
+
+                        STACK_WIND (frame, libgf_client_lookup_async_cbk,
+                                    FIRST_CHILD (this),
+                                    FIRST_CHILD (this)->fops->lookup,
+                                    local->fop.lookup_cbk.loc, xattr_req);
+			
+			if (xattr_req) {
+				dict_unref (xattr_req);
+				xattr_req = NULL;
+			}
+
+                        return 0;
+                }
+        }
+
+out:
+        if (!op_ret && local->fop.lookup_cbk.size && dict) {
+                data_t *mem_data = NULL;
+                void *mem = NULL;
+		struct iovec *vector = NULL;
+
+                mem_data = dict_get (dict, "glusterfs.content");
+                if (mem_data) {
+                        mem = data_to_ptr (mem_data);
+                }
+
+                if (mem && stbuf->ia_size <= local->fop.lookup_cbk.size) {
+			iobuf = CALLOC (1, sizeof (*iobuf));
+			ERR_ABORT (iobuf);
+
+			vector = CALLOC (1, sizeof (*vector));
+			ERR_ABORT (vector);
+			vector->iov_base = mem;
+			vector->iov_len = stbuf->ia_size;  
+
+			iobuf->vector = vector;
+			iobuf->count = 1;
+			iobuf->dictref = dict_ref (dict);
+		}
+	}
+
+        iatt_to_stat (stbuf, &stat);
+        lookup_cbk (op_ret, op_errno, iobuf, &stat, local->cbk_data);
+
+	libgf_client_loc_wipe (local->fop.lookup_cbk.loc);
+        free (local->fop.lookup_cbk.loc);
+
+        free (local);
+        frame->local = NULL;
+        STACK_DESTROY (frame->root);
+
+        return 0;
+}
+
+/* TODO: implement async dentry lookup */
+
+int
+glusterfs_get_async (glusterfs_handle_t handle, 
+		     const char *path,
+		     size_t size, 
+		     glusterfs_get_cbk_t cbk,
+		     void *cbk_data)
+{
+        loc_t *loc = NULL;
+        libglusterfs_client_ctx_t *ctx = handle;
+        libglusterfs_client_async_local_t *local = NULL;
+	int32_t op_ret = 0;
+	dict_t *xattr_req = NULL;
+	char *name = NULL, *pathname = NULL;
+
+	if (!ctx || !path || path[0] != '/') {
+		errno = EINVAL;
+		op_ret = -1;
+		goto out;
+	}
+
+        if (size < 0) {
+                errno = EINVAL;
+                op_ret = -1;
+                goto out;
+        }
+
+        if (size == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        local = CALLOC (1, sizeof (*local));
+        local->fop.lookup_cbk.is_revalidate = 1;
+
+        loc = CALLOC (1, sizeof (*loc));
+	loc->path = strdup (path);
+	op_ret = libgf_client_path_lookup (loc, ctx, 1);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"path lookup failed for (%s)", path);
+		goto out;
+	}
+
+	pathname = strdup (path);
+	name = basename (pathname);
+        op_ret = libgf_client_loc_fill (loc, ctx, 0, loc->parent->ino, name);
+	if (op_ret < 0) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"libgf_client_loc_fill returned -1, returning EINVAL");
+		errno = EINVAL;
+		goto out;
+	}
+
+        if (!loc->inode) {
+                loc->inode = inode_new (ctx->itable);
+                local->fop.lookup_cbk.is_revalidate = 0;
+        } 
+
+        local->fop.lookup_cbk.cbk = cbk;
+        local->fop.lookup_cbk.size = size;
+        local->fop.lookup_cbk.loc = loc;
+        local->cbk_data = cbk_data;
+
+        if (size > 0) {
+                xattr_req = dict_new ();
+                op_ret = dict_set (xattr_req, "glusterfs.content",
+                                   data_from_uint64 (size));
+                if (op_ret < 0) {
+                        dict_unref (xattr_req);
+                        xattr_req = NULL;
+                        goto out;
+                }
+        }
+
+        LIBGF_CLIENT_FOP_ASYNC (ctx,
+                                local,
+                                libgf_client_lookup_async_cbk,
+                                lookup,
+                                loc,
+                                xattr_req);
+	if (xattr_req) {
+		dict_unref (xattr_req);
+		xattr_req = NULL;
+	}
+
+out:
+	if (pathname) {
+		FREE (pathname);
+	}
+ 
+        return op_ret;
+}
+
+int32_t
+libgf_client_getxattr_cbk (call_frame_t *frame,
+                           void *cookie,
+                           xlator_t *this,
+                           int32_t op_ret,
+                           int32_t op_errno,
+                           dict_t *dict)
+{
+
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_getxattr_cbk_stub (frame, NULL, op_ret,
+                                                   op_errno, dict);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+size_t 
+libgf_client_getxattr (libglusterfs_client_ctx_t *ctx, 
+                       loc_t *loc,
+                       const char *name,
+                       void *value,
+                       size_t size)
+{
+        call_stub_t  *stub = NULL;
+        int32_t op_ret = 0;
+        libgf_client_local_t *local = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, getxattr, local, loc, name);
+
+        op_ret = stub->args.getxattr_cbk.op_ret;
+        errno = stub->args.getxattr_cbk.op_errno;
+
+        if (op_ret >= 0) {
+                /*
+                  gf_log ("LIBGF_CLIENT", GF_LOG_DEBUG,
+                  "%"PRId64": %s => %d", frame->root->unique,
+                  state->fuse_loc.loc.path, op_ret);
+                */
+
+                data_t *value_data = dict_get (stub->args.getxattr_cbk.dict,
+                                               (char *)name);
+    
+                if (value_data) {
+                        int32_t copy_len = 0;
+
+                        /* Don't return the value for '\0' */
+                        op_ret = value_data->len; 
+                        if ((size > 0) && (value != NULL)) {
+                                copy_len = size < value_data->len ? 
+                                        size : value_data->len;
+                                memcpy (value, value_data->data, copy_len);
+                                op_ret = copy_len;
+                        }
+                } else {
+                        errno = ENODATA;
+                        op_ret = -1;
+                }
+        }
+	
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+#define LIBGF_DO_GETXATTR       1
+#define LIBGF_DO_LGETXATTR      2
+
+ssize_t
+__glusterfs_glh_getxattr (glusterfs_handle_t handle, const char *path,
+                          const char *name, void *value, size_t size,
+                          int whichop)
+{
+        int32_t op_ret = -1;
+        loc_t loc = {0, };
+	libglusterfs_client_ctx_t *ctx = handle;
+	char *file = NULL;
+        char *pathres = NULL, *tmp = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, name, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, name %s, size %lu,"
+                " op %d", path, name, (long unsigned)size, whichop);
+        if (name[0] == '\0') {
+		errno = EINVAL;
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Invalid argument: Name"
+                        " not NULL terminated");
+		goto out;
+	}
+
+        if (size < 0) {
+                errno = EINVAL;
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Invalid argument: size is"
+                        " less than zero");
+                goto out;
+        }
+
+        pathres = strdup (path);
+        if (!pathres) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        loc.path = strdup (pathres);
+	op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+	if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+			"path lookup failed for (%s)", loc.path);
+		goto out;
+	}
+
+	tmp = strdup (pathres);
+	file = basename (tmp);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino, file);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"libgf_client_loc_fill returned -1, returning EINVAL");
+		errno = EINVAL;
+		goto out;
+	}
+
+        if (whichop == LIBGF_DO_LGETXATTR)
+                goto do_getx;
+
+        if (!IA_ISLNK (loc.inode->ia_type))
+                goto do_getx;
+
+        libgf_client_loc_wipe (&loc); 
+        op_ret = libgf_realpath_loc_fill (ctx, (char *)pathres, &loc);
+        if (op_ret == -1) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "realpath failed");
+                goto out;
+        }
+
+do_getx:
+	op_ret = libgf_client_getxattr (ctx, &loc, name, value, size);
+
+out:
+	if (tmp) {
+		FREE (tmp);
+	}
+
+        if (pathres)
+                FREE (pathres);
+
+        libgf_client_loc_wipe (&loc);
+
+        return op_ret;
+}
+
+ssize_t
+glusterfs_glh_getxattr (glusterfs_handle_t handle, const char *path,
+                        const char *name, void *value, size_t size)
+{
+        return __glusterfs_glh_getxattr (handle, path, name, value, size,
+                                         LIBGF_DO_GETXATTR);
+}
+
+ssize_t
+glusterfs_glh_lgetxattr (glusterfs_handle_t handle, const char *path,
+                         const char *name, void *value, size_t size)
+{
+        return __glusterfs_glh_getxattr (handle, path, name, value, size,
+                                         LIBGF_DO_LGETXATTR);
+}
+
+ssize_t
+glusterfs_getxattr (const char *path, const char *name, void *value,
+                        size_t size)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, name, out);
+
+        if ((size > 0) && (value == NULL)) {
+                errno = EINVAL;
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Invalid argument value");
+                goto out;
+        }
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, name %s, size %lu",
+                path, name, (long unsigned)size);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = __glusterfs_glh_getxattr (h, vpath, name, value, size,
+                                           LIBGF_DO_GETXATTR);
+
+out:
+        return op_ret;
+}
+
+ssize_t
+glusterfs_lgetxattr (const char *path, const char *name, void *value,
+                     size_t size)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, name, out);
+
+        if ((size > 0) && (value == NULL)) {
+                errno = EINVAL;
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Invalid argument value");
+                goto out;
+        }
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, name %s, size %lu",
+                path, name, (long unsigned)size);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = __glusterfs_glh_getxattr (h, vpath, name, value, size,
+                                           LIBGF_DO_LGETXATTR);
+
+out:
+        return op_ret;
+}
+
+static int32_t
+libgf_client_open_cbk (call_frame_t *frame,
+                       void *cookie,
+                       xlator_t *this,
+                       int32_t op_ret,
+                       int32_t op_errno,
+                       fd_t *fd)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_open_cbk_stub (frame, NULL, op_ret, op_errno,
+                                               fd);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+
+int 
+libgf_client_open (libglusterfs_client_ctx_t *ctx, 
+                   loc_t *loc, 
+                   fd_t *fd, 
+                   int flags)
+{
+        call_stub_t *stub = NULL;
+        int32_t op_ret = 0;
+        libgf_client_local_t *local = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, open, local, loc, flags, fd, 0);
+
+        op_ret = stub->args.open_cbk.op_ret;
+        errno = stub->args.open_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "open: path %s, status: %d, errno"
+                " %d", loc->path, op_ret, errno);
+        if (op_ret != -1)
+                fd_bind (fd);
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+static int32_t
+libgf_client_create_cbk (call_frame_t *frame,
+                         void *cookie,
+                         xlator_t *this,
+                         int32_t op_ret,
+                         int32_t op_errno,
+                         fd_t *fd,
+                         inode_t *inode,
+                         struct iatt *buf,
+                         struct iatt *preparent,
+                         struct iatt *postparent)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_create_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                 fd, inode, buf, preparent,
+                                                 postparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int 
+libgf_client_creat (libglusterfs_client_ctx_t *ctx,
+                    loc_t *loc,
+                    fd_t *fd,
+                    int flags,
+                    mode_t mode)
+{
+        call_stub_t *stub = NULL;
+        int32_t op_ret = 0;
+        libgf_client_local_t *local = NULL;
+        inode_t *libgf_inode = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, create, local, loc, flags, mode, fd);
+  
+        op_ret = stub->args.create_cbk.op_ret;
+        errno = stub->args.create_cbk.op_errno;
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Create: path %s, status: %d,"
+                " errno: %d", loc->path, op_ret, errno);
+        if (op_ret == -1)
+                goto out;
+
+	libgf_inode = stub->args.create_cbk.inode;
+        inode_link (libgf_inode, loc->parent, loc->name,
+                        &stub->args.create_cbk.buf);
+        libgf_transform_iattr (ctx, libgf_inode, &stub->args.create_cbk.buf);
+
+        inode_lookup (libgf_inode);
+
+        libgf_alloc_inode_ctx (ctx, libgf_inode);
+        libgf_update_iattr_cache (libgf_inode, LIBGF_UPDATE_ALL,
+                                        &stub->args.create_cbk.buf);
+
+out:
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+int32_t
+libgf_client_opendir_cbk (call_frame_t *frame,
+                          void *cookie,
+                          xlator_t *this,
+                          int32_t op_ret,
+                          int32_t op_errno,
+                          fd_t *fd)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_opendir_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                  fd);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int 
+libgf_client_opendir (libglusterfs_client_ctx_t *ctx,
+                      loc_t *loc,
+                      fd_t *fd)
+{
+        call_stub_t *stub = NULL;
+        int32_t op_ret = -1;
+        libgf_client_local_t *local = NULL;
+
+        if (((fd->flags & O_ACCMODE) == O_WRONLY)
+                || ((fd->flags & O_ACCMODE) == O_RDWR)) {
+                errno = EISDIR;
+                goto out;
+        }
+        LIBGF_CLIENT_FOP (ctx, stub, opendir, local, loc, fd);
+
+        op_ret = stub->args.opendir_cbk.op_ret;
+        errno = stub->args.opendir_cbk.op_errno;
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "opendir: path %s, status %d,"
+                " errno %d", loc->path, op_ret, errno);
+        if (op_ret != -1)
+                fd_bind (fd);
+
+	call_stub_destroy (stub);
+out:
+        return op_ret;
+}
+
+glusterfs_file_t 
+glusterfs_glh_open (glusterfs_handle_t handle, const char *path, int flags,...)
+{
+        loc_t loc = {0, };
+        long op_ret = -1;
+        fd_t *fd = NULL;
+	int32_t ret = -1;
+	libglusterfs_client_ctx_t *ctx = handle;
+	char *name = NULL, *pathname = NULL;
+        libglusterfs_client_inode_ctx_t *inode_ctx = NULL;
+        mode_t mode = 0;
+        va_list ap;
+        char *pathres = NULL;
+        char *vpath = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        pathres = strdup (path);
+        if (!pathres) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+	loc.path = strdup (pathres);
+	op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+
+        if ((op_ret == -1) && ((flags & O_CREAT) != O_CREAT)) {
+		gf_log ("libglusterfsclient", GF_LOG_ERROR,
+			"path lookup failed for (%s)", loc.path);
+		goto out;
+	}
+
+        if (!op_ret && ((flags & O_CREAT) == O_CREAT) 
+            && ((flags & O_EXCL) == O_EXCL)) {
+                errno = EEXIST;
+                op_ret = -1;
+                goto out;
+        }
+
+        if (op_ret == 0) {
+                flags &= ~O_CREAT;
+        }
+
+        if ((op_ret == -1) && ((flags & O_CREAT) == O_CREAT)) {
+                libgf_client_loc_wipe (&loc);
+                loc.path = strdup (pathres);
+
+                op_ret = libgf_client_path_lookup (&loc, ctx, 0);
+                if (op_ret == -1) {
+                        gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "path lookup failed for parent while trying to"
+                                " create (%s)", pathres);
+                        goto out;
+                }
+
+                loc.inode = inode_new (ctx->itable);
+        }
+
+	pathname = strdup (pathres);
+	name = basename (pathname);
+
+        ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino, name);
+	if (ret == -1) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"libgf_client_loc_fill returned -1, returning EINVAL");
+		errno = EINVAL;
+		goto out;
+	}
+
+        fd = fd_create (loc.inode, ctx->pid);
+        fd->flags = flags;
+
+        if (((flags & O_CREAT) == O_CREAT)) {
+                /* If we have the st_mode for the basename, check if
+                 * it is a directory here itself, rather than sending
+                 * a network message through libgf_client_creat, and
+                 * then receiving a EISDIR.
+                 */
+                if (IA_ISDIR (loc.inode->ia_type)) {
+                        errno = EISDIR;
+                        op_ret = -1;
+                        goto op_over;
+                }
+                va_start (ap, flags);
+                mode = va_arg (ap, mode_t);
+                va_end (ap);
+                op_ret = libgf_client_creat (ctx, &loc, fd, flags, mode);
+        } else {
+                if (IA_ISDIR (loc.inode->ia_type))
+                        op_ret = libgf_client_opendir (ctx, &loc, fd);
+                else
+                        op_ret = libgf_client_open (ctx, &loc, fd, flags);
+        }
+
+op_over:
+        if (op_ret == -1) {
+                fd_unref (fd);
+                fd = NULL;
+                goto out;
+        }
+
+        vpath = NULL;
+        if (IA_ISDIR (loc.inode->ia_type)) {
+                vpath = (char *)path;
+        }
+
+        if (!libgf_get_fd_ctx (fd)) {
+                if (!libgf_alloc_fd_ctx (ctx, fd, vpath)) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Failed to"
+                                " allocate fd context");
+                        errno = EINVAL;
+                        op_ret = -1;
+                        goto out;
+                }
+        }
+
+        if ((flags & O_TRUNC) && (((flags & O_ACCMODE) == O_RDWR)
+                                  || ((flags & O_ACCMODE) == O_WRONLY))) {
+                inode_ctx = libgf_get_inode_ctx (fd->inode);
+                if (IA_ISREG (inode_ctx->stbuf.ia_type)) {
+                                inode_ctx->stbuf.ia_size = 0;
+                                inode_ctx->stbuf.ia_blocks = 0;
+                }
+        }
+
+out:
+        libgf_client_loc_wipe (&loc);
+
+	if (pathname) {
+		FREE (pathname);
+	}
+
+        if (pathres)
+                FREE (pathres);
+
+        return fd;
+}
+
+glusterfs_file_t
+glusterfs_open (const char *path, int flags, ...)
+{
+        va_list                 ap;
+        glusterfs_file_t        fh   = NULL;
+        glusterfs_handle_t      h    = NULL; 
+        mode_t                  mode = 0;
+        char                    vpath[PATH_MAX];
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        if (flags & O_CREAT) {
+                va_start (ap, flags);
+                mode = va_arg (ap, mode_t);
+                va_end (ap);
+                fh = glusterfs_glh_open (h, vpath, flags, mode);
+        } else
+                fh = glusterfs_glh_open (h, vpath, flags);
+out:
+        return fh;
+}
+
+glusterfs_file_t 
+glusterfs_glh_creat (glusterfs_handle_t handle, const char *path, mode_t mode)
+{
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+	return glusterfs_glh_open (handle, path,
+			       (O_CREAT | O_WRONLY | O_TRUNC), mode);
+}
+
+glusterfs_file_t
+glusterfs_creat (const char *path, mode_t mode)
+{
+        glusterfs_file_t        fh = NULL;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        fh = glusterfs_glh_creat (h, vpath, mode);
+
+out:
+        return fh;
+}
+
+int32_t
+libgf_client_flush_cbk (call_frame_t *frame,
+                        void *cookie,
+                        xlator_t *this,
+                        int32_t op_ret,
+                        int32_t op_errno)
+{
+        libgf_client_local_t *local = frame->local;
+        
+        local->reply_stub = fop_flush_cbk_stub (frame, NULL, op_ret, op_errno);
+        
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+
+int 
+libgf_client_flush (libglusterfs_client_ctx_t *ctx, fd_t *fd)
+{
+        call_stub_t *stub;
+        int32_t op_ret;
+        libgf_client_local_t *local = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, flush, local, fd);
+        
+        op_ret = stub->args.flush_cbk.op_ret;
+        errno = stub->args.flush_cbk.op_errno;
+        
+	call_stub_destroy (stub);        
+        return op_ret;
+}
+
+
+int 
+glusterfs_close (glusterfs_file_t fd)
+{
+        int32_t op_ret = -1;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        if (!fd) {
+                errno = EINVAL;
+		goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+                goto out;
+        }
+        ctx = fd_ctx->ctx;
+
+        op_ret = libgf_client_flush (ctx, (fd_t *)fd);
+
+        fd_unref ((fd_t *)fd);
+
+out:
+        return op_ret;
+}
+
+int32_t
+libgf_client_setxattr_cbk (call_frame_t *frame,
+                           void *cookie,
+                           xlator_t *this,
+                           int32_t op_ret,
+                           int32_t op_errno)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_setxattr_cbk_stub (frame, NULL, op_ret,
+                                                   op_errno);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int
+libgf_client_setxattr (libglusterfs_client_ctx_t *ctx, 
+                       loc_t *loc,
+                       const char *name,
+                       const void *value,
+                       size_t size,
+                       int flags)
+{
+        call_stub_t  *stub = NULL;
+        int32_t op_ret = 0;
+        dict_t *dict;
+        libgf_client_local_t *local = NULL;
+
+        dict = get_new_dict ();
+
+        dict_set (dict, (char *)name,
+                  bin_to_data ((void *)value, size));
+        dict_ref (dict);
+
+
+        LIBGF_CLIENT_FOP (ctx, stub, setxattr, local, loc, dict, flags);
+
+        op_ret = stub->args.setxattr_cbk.op_ret;
+        errno = stub->args.setxattr_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "path %s, name %s, status %d,"
+                "errno %d", loc->path, name, op_ret, errno);
+        dict_unref (dict);
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+
+#define LIBGF_DO_SETXATTR       1
+#define LIBGF_DO_LSETXATTR      2
+
+int 
+__glusterfs_glh_setxattr (glusterfs_handle_t handle, const char *path,
+                          const char *name, const void *value,
+                          size_t size, int flags, int whichop)
+{
+        int32_t op_ret = -1;
+        loc_t loc = {0, };
+	libglusterfs_client_ctx_t *ctx = handle;
+        char *tmppath = NULL;
+        loc_t *realloc = NULL;
+        char *pathres = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "path %s, name %s, op %d", path
+                ,name, whichop);
+        if (size <= 0) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        pathres = strdup (path);
+        if (!pathres) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        loc.path = strdup (pathres);
+	op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient", GF_LOG_ERROR,
+			"path lookup failed for (%s)", pathres);
+		goto out;
+	}
+
+        tmppath = strdup (pathres);
+
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                        basename (tmppath));
+        FREE (tmppath);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"libgf_client_loc_fill returned -1, returning EINVAL");
+		errno = EINVAL;
+		goto out;
+	}
+
+        realloc = &loc;
+        if (whichop == LIBGF_DO_LSETXATTR)
+                goto do_setx;
+
+        if (!IA_ISLNK (loc.inode->ia_type))
+                goto do_setx;
+
+        libgf_client_loc_wipe (&loc);
+        realloc = &loc;
+        libgf_realpath_loc_fill (ctx, (char *)pathres, realloc);
+
+do_setx:
+        if (!op_ret)
+                op_ret = libgf_client_setxattr (ctx, realloc, name, value,
+                                                size, flags);
+
+out:
+        if (pathres)
+                FREE (pathres);
+
+        libgf_client_loc_wipe (realloc);
+        return op_ret;
+}
+
+int
+glusterfs_glh_setxattr (glusterfs_handle_t handle, const char *path,
+                        const char *name, const void *value, size_t size,
+                        int flags)
+{
+        return __glusterfs_glh_setxattr (handle, path, name, value, size, flags
+                                         , LIBGF_DO_SETXATTR);
+}
+
+int
+glusterfs_glh_lsetxattr (glusterfs_handle_t handle, const char *path,
+                         const char *name, const void *value, size_t size,
+                         int flags)
+{
+        return __glusterfs_glh_setxattr (handle, path, name, value, size, flags
+                                         , LIBGF_DO_LSETXATTR);
+}
+
+int
+glusterfs_setxattr (const char *path, const char *name, const void *value,
+                        size_t size, int flags)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, name, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, value, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "path %s, name %s", path, name);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = __glusterfs_glh_setxattr (h, vpath, name, value, size, flags,
+                                           LIBGF_DO_SETXATTR);
+
+out:
+        return op_ret;
+}
+
+int
+glusterfs_lsetxattr (const char *path, const char *name, const void *value,
+                     size_t size, int flags)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, name, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, value, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "path %s, name %s", path, name);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = __glusterfs_glh_setxattr (h, vpath, name, value, size, flags,
+                                           LIBGF_DO_LSETXATTR);
+
+out:
+        return op_ret;
+}
+
+int32_t
+libgf_client_fsetxattr_cbk (call_frame_t *frame,
+                            void *cookie,
+                            xlator_t *this,
+                            int32_t op_ret,
+                            int32_t op_errno)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_fsetxattr_cbk_stub (frame, NULL, op_ret,
+                                                    op_errno);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int
+libgf_client_fsetxattr (libglusterfs_client_ctx_t *ctx, 
+                        fd_t *fd,
+                        const char *name,
+                        const void *value,
+                        size_t size,
+                        int flags)
+{
+        call_stub_t  *stub = NULL;
+        int32_t op_ret = 0;
+        dict_t *dict;
+        libgf_client_local_t *local = NULL;
+
+        dict = get_new_dict ();
+
+        dict_set (dict, (char *)name,
+                  bin_to_data ((void *)value, size));
+        dict_ref (dict);
+
+        LIBGF_CLIENT_FOP (ctx, stub, fsetxattr, local, fd, dict, flags);
+
+        op_ret = stub->args.fsetxattr_cbk.op_ret;
+        errno = stub->args.fsetxattr_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "name %s, status %d, errno %d",
+                name, op_ret, errno);
+        dict_unref (dict);
+	call_stub_destroy (stub);
+
+        return op_ret;
+}
+
+int 
+glusterfs_fsetxattr (glusterfs_file_t fd, 
+                     const char *name,
+                     const void *value, 
+                     size_t size, 
+                     int flags)
+{
+	int32_t op_ret = 0;
+        fd_t *__fd = fd;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        
+        if (!fd) {
+                errno = EINVAL;
+                op_ret = -1;
+                gf_log("libglusterfsclient",
+                       GF_LOG_ERROR,
+                       "invalid fd");
+                goto out;
+        }
+
+        if (size <= 0) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Invalid argument: size is"
+                        " less than or equal to zero");
+                errno = EINVAL;
+                op_ret = -1;
+                goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+		op_ret = -1;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+        op_ret = libgf_client_fsetxattr (ctx, __fd, name, value, size,
+                                         flags);
+        
+out:
+	return op_ret;
+}
+
+int32_t
+libgf_client_fgetxattr_cbk (call_frame_t *frame,
+                            void *cookie,
+                            xlator_t *this,
+                            int32_t op_ret,
+                            int32_t op_errno,
+                            dict_t *dict)
+{
+
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_fgetxattr_cbk_stub (frame, NULL, op_ret,
+                                                    op_errno, dict);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+size_t 
+libgf_client_fgetxattr (libglusterfs_client_ctx_t *ctx, 
+                        fd_t *fd,
+                        const char *name,
+                        void *value,
+                        size_t size)
+{
+        call_stub_t  *stub = NULL;
+        int32_t op_ret = 0;
+        libgf_client_local_t *local = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, fgetxattr, local, fd, name);
+
+        op_ret = stub->args.fgetxattr_cbk.op_ret;
+        errno = stub->args.fgetxattr_cbk.op_errno;
+
+        if (op_ret >= 0) {
+                /*
+                  gf_log ("LIBGF_CLIENT", GF_LOG_DEBUG,
+                  "%"PRId64": %s => %d", frame->root->unique,
+                  state->fuse_loc.loc.path, op_ret);
+                */
+
+                data_t *value_data = dict_get (stub->args.fgetxattr_cbk.dict,
+                                               (char *)name);
+    
+                if (value_data) {
+                        int32_t copy_len = 0;
+
+                        /* Don't return the value for '\0' */
+                        op_ret = value_data->len; 
+                        copy_len = size < value_data->len ? 
+                                size : value_data->len;
+                        memcpy (value, value_data->data, copy_len);
+                } else {
+                        errno = ENODATA;
+                        op_ret = -1;
+                }
+        }
+	
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "name %s, status %d, errno %d",
+                name, op_ret, errno);
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+ssize_t 
+glusterfs_fgetxattr (glusterfs_file_t fd, 
+                     const char *name,
+                     void *value, 
+                     size_t size)
+{
+	int32_t op_ret = 0;
+        libglusterfs_client_ctx_t *ctx;
+        fd_t *__fd = (fd_t *)fd;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "name %s", name);
+        if (size < 0) {
+                errno = EINVAL;
+                op_ret = -1;
+                goto out;
+        }
+
+        if (size == 0)
+                goto out;
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+		op_ret = -1;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+        op_ret = libgf_client_fgetxattr (ctx, __fd, name, value, size);
+out:
+	return op_ret;
+}
+
+ssize_t 
+glusterfs_listxattr (glusterfs_handle_t handle,
+                     const char *path, 
+                     char *list,
+                     size_t size)
+{
+        return ENOSYS;
+}
+
+ssize_t 
+glusterfs_llistxattr (glusterfs_handle_t handle,
+                      const char *path, 
+                      char *list,
+                      size_t size)
+{
+        return ENOSYS;
+}
+
+ssize_t 
+glusterfs_flistxattr (glusterfs_file_t fd, 
+                      char *list,
+                      size_t size)
+{
+        return ENOSYS;
+}
+
+int 
+glusterfs_removexattr (glusterfs_handle_t handle, 
+                       const char *path, 
+                       const char *name)
+{
+        return ENOSYS;
+}
+
+int 
+glusterfs_lremovexattr (glusterfs_handle_t handle, 
+                        const char *path, 
+                        const char *name)
+{
+        return ENOSYS;
+}
+
+int 
+glusterfs_fremovexattr (glusterfs_file_t fd, 
+                        const char *name)
+{
+        return ENOSYS;
+}
+
+int32_t
+libgf_client_readv_cbk (call_frame_t *frame,
+                        void *cookie,
+                        xlator_t *this,
+                        int32_t op_ret,
+                        int32_t op_errno,
+                        struct iovec *vector,
+                        int32_t count,
+                        struct iatt *stbuf,
+                        struct iobref *iobref)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_readv_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                vector, count, stbuf, iobref);
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int
+libgf_client_iobuf_read (libglusterfs_client_ctx_t *ctx, fd_t *fd, void *buf,
+                         size_t size, off_t offset)
+{
+        call_stub_t          *stub = NULL;
+        struct iovec         *vector = NULL;
+        int32_t               op_ret = -1;
+        int                   count = 0;
+        libgf_client_local_t *local = NULL;
+        struct iatt          *stbuf = NULL;
+
+        local = CALLOC (1, sizeof (*local));
+        ERR_ABORT (local);
+        local->fd = fd;
+        LIBGF_CLIENT_FOP (ctx, stub, readv, local, fd, size, offset);
+
+        op_ret = stub->args.readv_cbk.op_ret;
+        errno = stub->args.readv_cbk.op_errno;
+        count = stub->args.readv_cbk.count;
+        vector = stub->args.readv_cbk.vector;
+        if (op_ret > 0) {
+                int i = 0;
+                op_ret = 0;
+                while (size && (i < count)) {
+                        int len = (size < vector[i].iov_len) ?
+                                size : vector[i].iov_len;
+                        memcpy (buf, vector[i++].iov_base, len);
+                        buf += len;
+                        size -= len;
+                        op_ret += len;
+                }
+                stbuf = &stub->args.readv_cbk.stbuf;
+                libgf_transform_iattr (ctx, fd->inode, stbuf);
+                libgf_invalidate_iattr_cache (fd->inode, LIBGF_INVALIDATE_STAT);
+        }
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "size %lu, offset %"PRIu64,
+                (long unsigned)size, offset);
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+libgf_client_read (libglusterfs_client_ctx_t *ctx, fd_t *fd, void *buf,
+                   size_t size, off_t offset)
+{
+        int32_t op_ret = -1;
+        int32_t ret = 0;
+        size_t  tmp   = 0;
+
+        while (size != 0) {
+                tmp = ((size > LIBGF_IOBUF_SIZE) ? LIBGF_IOBUF_SIZE :
+                       size);
+                op_ret = libgf_client_iobuf_read (ctx, fd, buf, tmp, offset);
+                if (op_ret < 0) {
+                        ret = op_ret;
+                        break;
+                }
+
+                ret += op_ret;
+
+                if (op_ret < tmp)
+                        break;
+
+                size -= op_ret;
+                offset += op_ret;
+                buf = (char *)buf + op_ret;
+        }
+
+        return ret;
+}
+
+ssize_t
+glusterfs_read (glusterfs_file_t fd, void *buf, size_t nbytes)
+{
+        int32_t op_ret = -1;
+        off_t offset = 0;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        if (nbytes < 0) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (nbytes == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        if (fd == 0) {
+                errno = EINVAL;
+		goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+		goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                ctx = fd_ctx->ctx;
+                offset = fd_ctx->offset;
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+        op_ret = libgf_client_read (ctx, (fd_t *)fd, buf, nbytes, offset);
+
+        if (op_ret > 0) {
+                offset += op_ret;
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        fd_ctx->offset = offset;
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+        }
+
+out:
+        return op_ret;
+}
+
+
+ssize_t
+libgf_client_iobuf_readv (libglusterfs_client_ctx_t *ctx, fd_t *fd,
+                          const struct iovec *dst_vector, int count,
+                          size_t size, off_t offset, int *idx,
+                          off_t *vec_offset)
+{
+        call_stub_t          *stub       = NULL;
+        struct iovec         *src_vector = NULL;
+        int32_t               op_ret     = -1;
+        libgf_client_local_t *local      = NULL;
+        int                   src        = 0, dst = 0;
+        int                   src_count  = 0, dst_count = 0;
+        int                   len        = 0, src_len = 0, dst_len = 0;
+        off_t                 src_offset = 0, dst_offset = 0;
+        struct iatt          *stbuf      = NULL;
+
+        dst = *idx;
+        dst_offset = *vec_offset;
+
+        local = CALLOC (1, sizeof (*local));
+        ERR_ABORT (local);
+        local->fd = fd;
+        LIBGF_CLIENT_FOP (ctx, stub, readv, local, fd, size, offset);
+
+        op_ret = stub->args.readv_cbk.op_ret;
+        errno = stub->args.readv_cbk.op_errno;
+        src_count = stub->args.readv_cbk.count;
+        src_vector = stub->args.readv_cbk.vector;
+        if (op_ret > 0) {
+                while ((size != 0) && (dst < dst_count) && (src < src_count)) {
+                        src_len = src_vector[src].iov_len - src_offset;
+                        dst_len = dst_vector[dst].iov_len - dst_offset;
+
+                        len = (src_len < dst_len) ? src_len : dst_len;
+                        if (len > size) {
+                                len = size;
+                        }
+
+                        memcpy (dst_vector[dst].iov_base + dst_offset,
+				src_vector[src].iov_base + src_offset, len);
+
+                        size -= len;
+                        src_offset += len;
+                        dst_offset += len;
+
+                        if (src_offset == src_vector[src].iov_len) {
+                                src_offset = 0;
+                                src++;
+                        }
+
+                        if (dst_offset == dst_vector[dst].iov_len) {
+                                dst_offset = 0;
+                                dst++;
+                        }
+                }
+
+                stbuf = &stub->args.readv_cbk.stbuf;
+                libgf_transform_iattr (ctx, fd->inode, stbuf);
+                libgf_invalidate_iattr_cache (fd->inode, LIBGF_UPDATE_STAT);
+        }
+
+        *idx = dst;
+        *vec_offset = dst_offset;
+
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+
+ssize_t
+libgf_client_readv (libglusterfs_client_ctx_t *ctx, fd_t *fd,
+                    const struct iovec *dst_vector, int dst_count, off_t offset)
+{
+        int32_t               op_ret     = -1;
+        size_t                size       = 0, tmp = 0, ret = 0;
+        int                   i          = 0;
+        int                   dst_idx    = 0;
+        off_t                 dst_offset = 0;
+
+        for (i = 0; i < dst_count; i++)
+        {
+                size += dst_vector[i].iov_len;
+        }
+
+        while (size != 0) {
+                tmp = ((size > LIBGF_IOBUF_SIZE) ? LIBGF_IOBUF_SIZE : size);
+                op_ret = libgf_client_iobuf_readv (ctx, fd, dst_vector,
+                                                   dst_count, tmp, offset,
+                                                   &dst_idx, &dst_offset);
+                if (op_ret <= 0) {
+                        break;
+                }
+
+                offset += op_ret;
+                size -= op_ret;
+                ret += op_ret;
+        }
+
+        return ret;
+}
+
+
+ssize_t
+glusterfs_readv (glusterfs_file_t fd, const struct iovec *vec, int count)
+{
+        int32_t op_ret = -1;
+        off_t offset = 0;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        if (count < 0) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (count == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        if (!fd) {
+                errno = EINVAL;
+		goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                ctx = fd_ctx->ctx;
+                offset = fd_ctx->offset;
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+        op_ret = libgf_client_readv (ctx, (fd_t *)fd, vec, count, offset);
+
+        if (op_ret > 0) {
+                offset += op_ret;
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        fd_ctx->offset = offset;
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+        }
+
+out:
+        return op_ret;
+}
+
+
+ssize_t 
+glusterfs_pread (glusterfs_file_t fd, 
+                 void *buf, 
+                 size_t count, 
+                 off_t offset)
+{
+        int32_t op_ret = -1;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        if (count < 0) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (count == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        if (!fd) {
+                errno = EINVAL;
+		goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+
+        op_ret = libgf_client_read (ctx, (fd_t *)fd, buf, count, offset);
+
+out:
+        return op_ret;
+}
+
+
+int
+libgf_client_writev_cbk (call_frame_t *frame,
+                         void *cookie,
+                         xlator_t *this,
+                         int32_t op_ret,
+                         int32_t op_errno,
+                         struct iatt *prebuf,
+                         struct iatt *postbuf)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_writev_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                 prebuf, postbuf);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+
+int
+libgf_client_iobuf_write (libglusterfs_client_ctx_t *ctx, fd_t *fd, char *addr,
+                          size_t size, off_t offset)
+{
+        struct iobref        *ioref = NULL;
+        struct iobuf         *iob = NULL;
+        int                   op_ret = -1;
+        struct iovec          iov = {0, };
+        call_stub_t          *stub = NULL;
+        libgf_client_local_t *local = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, addr, out);
+
+        ioref = iobref_new ();
+        if (!ioref) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Out of memory");
+                goto out;
+        }
+
+        iob = iobuf_get (ctx->gf_ctx.iobuf_pool);
+        if (!iob) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Out of memory");
+                goto out;
+        }
+
+        memcpy (iob->ptr, addr, size);
+        iobref_add (ioref, iob);
+
+        iov.iov_base = iob->ptr;
+        iov.iov_len = size;
+
+        LIBGF_CLIENT_FOP (ctx, stub, writev, local, fd, &iov,
+                          1, offset, ioref);
+
+        op_ret = stub->args.writev_cbk.op_ret;
+        errno = stub->args.writev_cbk.op_errno;
+
+        /* We need to invalidate because it is possible that write-behind
+         * is a translator below us and returns a stat filled with zeroes.
+         */
+        libgf_invalidate_iattr_cache (fd->inode, LIBGF_INVALIDATE_STAT);
+
+out:
+        if (iob) {
+                iobuf_unref (iob);
+        }
+
+        if (ioref) {
+                iobref_unref (ioref);
+        }
+
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+libgf_client_writev (libglusterfs_client_ctx_t *ctx, 
+                     fd_t *fd, 
+                     struct iovec *vector, 
+                     int count, 
+                     off_t offset)
+{
+        int                     op_ret = 0;
+        int                     written = 0;
+        int                     writesize = 0;
+        int                     size = 0;
+        char                   *base = NULL;
+        int                     i = 0;
+
+        for (i = 0; i < count; i++) {
+                size = vector[i].iov_len;
+                base = vector[i].iov_base;
+
+                while (size > 0) {
+                        writesize = (size > LIBGF_IOBUF_SIZE) ?
+                                LIBGF_IOBUF_SIZE : size;
+
+                        written = libgf_client_iobuf_write (ctx, fd, base,
+                                                            writesize, offset);
+
+                        if (written == -1)
+                                goto out;
+
+                        op_ret += written;
+                        base += written;
+                        size -= written;
+                        offset += written;
+                }
+        }
+
+out:
+        return op_ret;
+}
+
+
+ssize_t 
+glusterfs_write (glusterfs_file_t fd, 
+                 const void *buf, 
+                 size_t n)
+{
+        int32_t op_ret = -1;
+        off_t offset = 0;
+        struct iovec vector;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        if (n < 0) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (n == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        if (!fd) {
+                errno = EINVAL;
+		goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                offset = fd_ctx->offset;
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+        vector.iov_base = (void *)buf;
+        vector.iov_len = n;
+
+        op_ret = libgf_client_writev (ctx,
+                                      (fd_t *)fd, 
+                                      &vector, 
+                                      1, 
+                                      offset);
+
+        if (op_ret >= 0) {
+                offset += op_ret;
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        fd_ctx->offset = offset;
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+        }
+
+out:
+        return op_ret;
+}
+
+ssize_t 
+glusterfs_writev (glusterfs_file_t fd, 
+                  const struct iovec *vector,
+                  int count)
+{
+        int32_t op_ret = -1;
+        off_t offset = 0;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        if (count < 0) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (count == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        if (!fd) {
+                errno = EINVAL;
+		goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                offset = fd_ctx->offset;
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+
+        op_ret = libgf_client_writev (ctx,
+                                      (fd_t *)fd, 
+                                      (struct iovec *)vector, 
+                                      count,
+                                      offset);
+
+        if (op_ret >= 0) {
+                offset += op_ret;
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        fd_ctx->offset = offset;
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+        }
+
+out:
+        return op_ret;
+}
+
+
+ssize_t 
+glusterfs_pwrite (glusterfs_file_t fd, 
+                  const void *buf, 
+                  size_t count, 
+                  off_t offset)
+{
+        int32_t op_ret = -1;
+        struct iovec vector;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        if (count < 0) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (count == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        if (!fd) {
+                errno = EINVAL;
+		goto out;
+        }
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+
+        vector.iov_base = (void *)buf;
+        vector.iov_len = count;
+
+        op_ret = libgf_client_writev (ctx,
+                                      (fd_t *)fd, 
+                                      &vector, 
+                                      1, 
+                                      offset);
+
+out:
+        return op_ret;
+}
+
+
+int32_t
+libgf_client_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                           int32_t op_ret, int32_t op_errno,
+                           gf_dirent_t *entries)
+{
+        libgf_client_local_t *local = frame->local;
+
+        /* Note, we dont let entries reach the stub because there it gets copied
+         * while we can simply delink the entries here and link them into our
+         * dcache, thereby avoiding the need to perform more allocations and
+         * copies.
+         */
+        local->reply_stub = fop_readdirp_cbk_stub (frame, NULL, op_ret,
+                                                   op_errno, NULL);
+        if (op_ret > 0)
+                libgf_dcache_update (frame->root->state, local->fd, entries);
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int 
+libgf_client_readdir (libglusterfs_client_ctx_t *ctx, fd_t *fd,
+                      struct dirent *dirp, off_t *offset)
+{  
+        call_stub_t *stub = NULL;
+        int op_ret = -1;
+        libgf_client_local_t *local = NULL;
+
+        if (libgf_dcache_readdir (ctx, fd, dirp, offset))
+                return 1;
+        local = CALLOC (1, sizeof (*local));
+        ERR_ABORT (local);
+        local->fd = fd;
+        LIBGF_CLIENT_FOP (ctx, stub, readdirp, local, fd,
+                          LIBGF_READDIR_BLOCK, *offset);
+
+        errno = stub->args.readdir_cbk.op_errno;
+
+        op_ret = libgf_dcache_readdir (ctx, fd, dirp, offset);
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+
+int
+glusterfs_readdir_r (glusterfs_dir_t dirfd, struct dirent *entry,
+                     struct dirent **result)
+{
+        int                           op_ret = -1;
+        libglusterfs_client_ctx_t    *ctx = NULL;
+        off_t                         offset = 0;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+        struct dirent                *dirp = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, entry, out);
+
+        fd_ctx = libgf_get_fd_ctx (dirfd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "fd context not present");
+                errno = EBADF;
+		goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                ctx = fd_ctx->ctx;
+                offset = fd_ctx->offset;
+                dirp = &fd_ctx->dirp;
+
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "offset %"PRIu64, offset);
+                memset (dirp, 0, sizeof (struct dirent));
+                op_ret = libgf_client_readdir (ctx, (fd_t *)dirfd, dirp,
+                                               &offset);
+                if (op_ret <= 0) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "readdir failed:"
+                                " %s", strerror (errno));
+                        if (result && (op_ret == 0)) {
+                                *result = NULL;
+                        } else if (op_ret < 0){
+                                op_ret = errno;
+                        }
+                        goto unlock;
+                }
+
+                fd_ctx->offset = offset;
+
+                if (result) {
+                        *result = memcpy (entry, dirp, sizeof (*entry));
+                } else {
+                        memcpy (entry, dirp, sizeof (*entry));
+                }
+
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "new offset %"PRIu64", "
+                        " entry %s", offset, entry->d_name);
+                op_ret = 0;
+        }
+unlock:
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+out:
+        return op_ret;
+}
+
+
+void *
+glusterfs_readdir (glusterfs_dir_t dirfd)
+{
+        int op_ret = -1;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        off_t offset = 0;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+        struct dirent *dirp = NULL;
+
+        fd_ctx = libgf_get_fd_ctx (dirfd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "fd context not present");
+                errno = EBADF;
+		goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                ctx = fd_ctx->ctx;
+                offset = fd_ctx->offset;
+                dirp = &fd_ctx->dirp;
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "offset %"PRIu64, offset);
+        memset (dirp, 0, sizeof (struct dirent));
+        op_ret = libgf_client_readdir (ctx, (fd_t *)dirfd, dirp, &offset);
+
+        if (op_ret <= 0) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "readdir failed: %s",
+                        strerror (errno));
+                dirp = NULL;
+                goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                fd_ctx->offset = offset;
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "new offset %"PRIu64", entry %s",
+                offset, dirp->d_name);
+out:
+        return dirp;
+}
+
+
+int
+glusterfs_getdents (glusterfs_file_t fd, struct dirent *dirp,
+                    unsigned int count)
+{
+        int op_ret = -1;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        off_t offset = 0;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                ctx = fd_ctx->ctx;
+                offset = fd_ctx->offset;
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+        op_ret = libgf_client_readdir (ctx, (fd_t *)fd, dirp, &offset);
+
+        if (op_ret > 0) {
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        fd_ctx->offset = offset;
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+        }
+
+out:
+        return op_ret;
+}
+
+
+static int32_t
+libglusterfs_readv_async_cbk (call_frame_t *frame,
+                              void *cookie,
+                              xlator_t *this,
+                              int32_t op_ret,
+                              int32_t op_errno,
+                              struct iovec *vector,
+                              int32_t count,
+                              struct iatt *stbuf,
+                              struct iobref *iobref)
+{
+        glusterfs_iobuf_t *buf;
+        libglusterfs_client_async_local_t *local = frame->local;
+        fd_t *__fd = local->fop.readv_cbk.fd;
+        glusterfs_readv_cbk_t readv_cbk = local->fop.readv_cbk.cbk;
+
+        buf = CALLOC (1, sizeof (*buf));
+        ERR_ABORT (buf);
+
+	if (vector) {
+		buf->vector = iov_dup (vector, count);
+	}
+
+        buf->count = count;
+
+	if (iobref) {
+		buf->iobref = iobref_ref (iobref);
+	}
+
+        if (op_ret > 0) {
+                libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+                fd_ctx = libgf_get_fd_ctx (__fd);
+                
+                /* update offset only if we have used offset stored in fd_ctx */
+                if (local->fop.readv_cbk.update_offset) {
+                        pthread_mutex_lock (&fd_ctx->lock);
+                        {
+                                fd_ctx->offset += op_ret;
+                        }
+                        pthread_mutex_unlock (&fd_ctx->lock);
+                }
+        }
+
+        readv_cbk (op_ret, op_errno, buf, local->cbk_data); 
+
+	FREE (local);
+	frame->local = NULL;
+        STACK_DESTROY (frame->root);
+
+        return 0;
+}
+
+void 
+glusterfs_free (glusterfs_iobuf_t *buf)
+{
+        //iov_free (buf->vector, buf->count);
+        FREE (buf->vector);
+        if (buf->iobref)
+                iobref_unref ((struct iobref *) buf->iobref);
+        if (buf->dictref)
+                dict_unref ((dict_t *) buf->dictref);
+        FREE (buf);
+}
+
+int
+glusterfs_read_async (glusterfs_file_t fd, 
+                      size_t nbytes, 
+                      off_t offset,
+                      glusterfs_readv_cbk_t readv_cbk,
+                      void *cbk_data)
+{
+        libglusterfs_client_ctx_t *ctx;
+        fd_t *__fd = (fd_t *)fd;
+        libglusterfs_client_async_local_t *local = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+	int32_t op_ret = 0;
+
+        if (nbytes < 0) {
+                errno = EINVAL;
+                op_ret = -1;
+                goto out;
+        }
+
+        if (nbytes == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        local = CALLOC (1, sizeof (*local));
+        ERR_ABORT (local);
+        local->fop.readv_cbk.fd = __fd;
+        local->fop.readv_cbk.cbk = readv_cbk;
+        local->cbk_data = cbk_data;
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		op_ret = -1;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+
+        if (offset < 0) {
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        offset = fd_ctx->offset;
+                        local->fop.readv_cbk.update_offset = 1;
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+        }
+
+        LIBGF_CLIENT_FOP_ASYNC (ctx,
+                                local,
+                                libglusterfs_readv_async_cbk,
+                                readv,
+                                __fd,
+                                nbytes,
+                                offset);
+
+out:
+        return op_ret;
+}
+
+static int32_t
+libglusterfs_writev_async_cbk (call_frame_t *frame,
+                               void *cookie,
+                               xlator_t *this,
+                               int32_t op_ret,
+                               int32_t op_errno,
+                               struct iatt *prebuf,
+                               struct iatt *postbuf)
+{
+        libglusterfs_client_async_local_t *local = frame->local;
+        fd_t *fd = NULL;
+        glusterfs_write_cbk_t write_cbk;
+
+        write_cbk = local->fop.write_cbk.cbk;
+        fd = local->fop.write_cbk.fd;
+
+        if (op_ret > 0) {
+                libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+                fd_ctx = libgf_get_fd_ctx (fd);
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        fd_ctx->offset += op_ret;  
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+        }
+
+        write_cbk (op_ret, op_errno, local->cbk_data);
+
+        STACK_DESTROY (frame->root);
+        return 0;
+}
+
+int32_t
+glusterfs_write_async (glusterfs_file_t fd, 
+                       const void *buf, 
+                       size_t nbytes, 
+                       off_t offset,
+                       glusterfs_write_cbk_t write_cbk,
+                       void *cbk_data)
+{
+        fd_t *__fd = (fd_t *)fd;
+        struct iovec vector;
+        off_t __offset = offset;
+        libglusterfs_client_ctx_t *ctx = NULL;
+        libglusterfs_client_async_local_t *local = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+	int32_t op_ret = 0;
+        struct iobref *iobref = NULL;
+
+        if (nbytes == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        if (nbytes < 0) {
+                op_ret = -1;
+                errno = EINVAL;
+                goto out;
+        }
+
+        local = CALLOC (1, sizeof (*local));
+        ERR_ABORT (local);
+        local->fop.write_cbk.fd = __fd;
+        local->fop.write_cbk.cbk = write_cbk;
+        local->cbk_data = cbk_data;
+
+        vector.iov_base = (void *)buf;
+        vector.iov_len = nbytes;
+  
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		op_ret = -1;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+ 
+        if (offset < 0) {
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        __offset = fd_ctx->offset;
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+        }
+
+        iobref = iobref_new ();
+        LIBGF_CLIENT_FOP_ASYNC (ctx,
+                                local,
+                                libglusterfs_writev_async_cbk,
+                                writev,
+                                __fd,
+                                &vector,
+                                1,
+                                __offset,
+                                iobref);
+        iobref_unref (iobref);
+
+out:
+        return op_ret;
+}
+
+off_t
+glusterfs_lseek (glusterfs_file_t fd, off_t offset, int whence)
+{
+        off_t __offset = 0;
+	int32_t op_ret = -1;
+        fd_t *__fd = (fd_t *)fd;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+	libglusterfs_client_ctx_t *ctx = NULL; 
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		__offset = -1;
+		goto out;
+        }
+
+	ctx = fd_ctx->ctx;
+
+        switch (whence)
+        {
+        case SEEK_SET:
+                __offset = offset;
+                break;
+
+        case SEEK_CUR:
+                pthread_mutex_lock (&fd_ctx->lock);
+                {
+                        __offset = fd_ctx->offset;
+                }
+                pthread_mutex_unlock (&fd_ctx->lock);
+
+                __offset += offset;
+                break;
+
+        case SEEK_END:
+	{
+		char cache_valid = 0;
+		off_t end = 0;
+		loc_t loc = {0, };
+		struct iatt stbuf = {0, };
+
+                cache_valid = libgf_is_iattr_cache_valid (ctx, __fd->inode,
+                                                          &stbuf,
+                                                          LIBGF_VALIDATE_STAT);
+                if (cache_valid) {
+			end = stbuf.ia_size;
+		} else {
+			op_ret = libgf_client_loc_fill (&loc, ctx,
+                                                        __fd->inode->ino, 0,
+                                                        NULL);
+			if (op_ret == -1) {
+				gf_log ("libglusterfsclient",
+					GF_LOG_ERROR,
+					"libgf_client_loc_fill returned -1, returning EINVAL");
+				errno = EINVAL;
+				libgf_client_loc_wipe (&loc);
+				__offset = -1;
+				goto out;
+			}
+			
+			op_ret = libgf_client_lookup (ctx, &loc, &stbuf, NULL,
+                                                      NULL);
+			if (op_ret < 0) {
+				__offset = -1;
+				libgf_client_loc_wipe (&loc);
+				goto out;
+			}
+
+			end = stbuf.ia_size;
+		}
+
+                __offset = end + offset; 
+		libgf_client_loc_wipe (&loc);
+	}
+	break;
+
+	default:
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"invalid value for whence");
+		__offset = -1;
+		errno = EINVAL;
+		goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                fd_ctx->offset = __offset;
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+ 
+out: 
+        return __offset;
+}
+
+
+int32_t
+libgf_client_stat_cbk (call_frame_t *frame,
+                       void *cookie,
+                       xlator_t *this,
+                       int32_t op_ret,
+                       int32_t op_errno,
+                       struct iatt *buf)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_stat_cbk_stub (frame, 
+                                               NULL, 
+                                               op_ret, 
+                                               op_errno, 
+                                               buf);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int32_t 
+libgf_client_stat (libglusterfs_client_ctx_t *ctx, 
+                   loc_t *loc,
+                   struct iatt *stbuf)
+{
+        call_stub_t *stub = NULL;
+        int32_t op_ret = 0;
+        libgf_client_local_t *local = NULL;
+        struct iatt cachedbuf = {0, };
+
+        if (libgf_is_iattr_cache_valid (ctx, loc->inode, &cachedbuf,
+                                        LIBGF_VALIDATE_STAT)) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Cache will be used");
+                if (stbuf)
+                        memcpy (stbuf, &cachedbuf, sizeof (struct stat));
+                goto out;
+        }
+
+        LIBGF_CLIENT_FOP (ctx, stub, stat, local, loc);
+ 
+        op_ret = stub->args.stat_cbk.op_ret;
+        errno = stub->args.stat_cbk.op_errno;
+        libgf_transform_iattr (ctx, loc->inode, &stub->args.stat_cbk.buf);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, status %d, errno %d",
+                loc->path, op_ret, errno);
+
+        if (op_ret == 0) {
+                if (stbuf)
+                        *stbuf = stub->args.stat_cbk.buf;
+
+                libgf_update_iattr_cache (loc->inode, LIBGF_UPDATE_STAT,
+                                          &stub->args.stat_cbk.buf);
+        }
+
+	call_stub_destroy (stub);
+
+out:
+        return op_ret;
+}
+
+int
+libgf_realpath_loc_fill (libglusterfs_client_ctx_t *ctx, char *link,
+                                loc_t *targetloc)
+{
+        int             op_ret = -1;
+        char            *target = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, link, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, targetloc, out);
+
+        targetloc->path = glusterfs_glh_realpath (ctx, link, NULL);
+
+        if (targetloc->path == NULL)
+                goto out;
+
+        op_ret = libgf_client_path_lookup (targetloc, ctx, 1);
+        if (op_ret == -1)
+                goto out;
+
+        target = strdup (targetloc->path);
+        op_ret = libgf_client_loc_fill (targetloc, ctx, 0,
+                                               targetloc->parent->ino,
+                                               basename (target));
+        if (op_ret == -1) {
+                errno = EINVAL;
+                goto out;
+        }
+
+out:
+        if (target)
+                FREE (target);
+
+        return op_ret;
+}
+
+#define LIBGF_DO_LSTAT  0x01
+#define LIBGF_DO_STAT   0x02
+
+int
+__glusterfs_stat (glusterfs_handle_t handle, const char *path,
+                  struct stat *buf, int whichstat)
+{
+        int32_t op_ret = -1;
+        loc_t loc = {0, };
+        libglusterfs_client_ctx_t *ctx = handle;
+	char *name = NULL, *pathname = NULL;
+        loc_t targetloc = {0, };
+        loc_t *real_loc = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, op: %d", path,
+                whichstat);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+	op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient", GF_LOG_ERROR,
+			"path lookup failed for (%s)", loc.path);
+		goto out;
+	}
+
+	pathname = strdup (loc.path);
+	name = basename (pathname);
+
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino, name);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"libgf_client_loc_fill returned -1, returning EINVAL");
+		errno = EINVAL;
+		goto out;
+	}
+        real_loc = &loc;
+        /* The stat fop in glusterfs calls lstat. So we have to
+         * provide the POSIX compatible stat fop. To do so, we need to ensure
+         * that if the @path is a symlink, we must perform a stat on the
+         * target of that symlink than the symlink itself(..because if
+         * do a stat on the symlink, we're actually doing what lstat
+         * should do. See posix_stat
+         */
+        if (whichstat & LIBGF_DO_LSTAT)
+                goto lstat_fop;
+
+        if (!IA_ISLNK (loc.inode->ia_type))
+                goto lstat_fop;
+
+        op_ret = libgf_realpath_loc_fill (ctx, (char *)loc.path, &targetloc);
+        if (op_ret == -1)
+                goto out;
+        real_loc = &targetloc;
+
+lstat_fop:
+
+        if (!op_ret) {
+                struct iatt iatt;
+                op_ret = libgf_client_stat (ctx, real_loc, &iatt);
+                iatt_to_stat (&iatt, buf);
+        }
+
+out:
+	if (pathname) {
+		FREE (pathname);
+	}
+
+        libgf_client_loc_wipe (&loc);
+        libgf_client_loc_wipe (&targetloc);
+
+        return op_ret;
+}
+
+int
+glusterfs_glh_stat (glusterfs_handle_t handle, const char *path,
+                    struct stat *buf)
+{
+        return __glusterfs_stat (handle, path, buf, LIBGF_DO_STAT);
+}
+
+int
+glusterfs_stat (const char *path, struct stat *buf)
+{
+        glusterfs_handle_t      h      = NULL;
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, buf, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_stat (h, vpath, buf);
+
+out:
+        return op_ret;
+}
+
+int
+glusterfs_glh_lstat (glusterfs_handle_t handle, const char *path, struct stat *buf)
+{
+        return __glusterfs_stat (handle, path, buf, LIBGF_DO_LSTAT);
+}
+
+int
+glusterfs_lstat (const char *path, struct stat *buf)
+{
+        glusterfs_handle_t      h      = NULL;
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, buf, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_lstat (h, vpath, buf);
+out:
+        return op_ret;
+}
+
+static int32_t
+libgf_client_fstat_cbk (call_frame_t *frame,
+                        void *cookie,
+                        xlator_t *this,
+                        int32_t op_ret,
+                        int32_t op_errno,
+                        struct iatt *buf)
+{  
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_fstat_cbk_stub (frame, 
+                                                NULL, 
+                                                op_ret, 
+                                                op_errno, 
+                                                buf);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+
+}
+
+int32_t
+libgf_client_fstat (libglusterfs_client_ctx_t *ctx, 
+                    fd_t *fd, 
+                    struct stat *buf)
+{
+        call_stub_t *stub = NULL;
+        int32_t op_ret = 0;
+        libgf_client_local_t *local = NULL;
+        struct iatt cachedbuf = {0, };
+
+        if (libgf_is_iattr_cache_valid (ctx, fd->inode, &cachedbuf,
+                                        LIBGF_VALIDATE_STAT)) {
+                if (buf)
+                        memcpy (buf, &cachedbuf, sizeof (struct stat));
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Cache will be used");
+                goto out;
+        }
+
+        LIBGF_CLIENT_FOP (ctx, stub, fstat, local, fd);
+ 
+        op_ret = stub->args.fstat_cbk.op_ret;
+        errno = stub->args.fstat_cbk.op_errno;
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "status %d, errno %d", op_ret,
+                errno);
+
+        if (op_ret == 0) {
+                libgf_transform_iattr (ctx, fd->inode,
+                                       &stub->args.fstat_cbk.buf);
+                if (buf)
+                        iatt_to_stat (&stub->args.fstat_cbk.buf, buf);
+                libgf_update_iattr_cache (fd->inode, LIBGF_UPDATE_STAT,
+                                          &stub->args.fstat_cbk.buf);
+        }
+	call_stub_destroy (stub);
+
+out:
+        return op_ret;
+}
+
+int32_t 
+glusterfs_fstat (glusterfs_file_t fd, struct stat *buf) 
+{
+        libglusterfs_client_ctx_t *ctx;
+        fd_t *__fd = (fd_t *)fd;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+	int32_t op_ret = -1;
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+		op_ret = -1;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+
+	op_ret = libgf_client_fstat (ctx, __fd, buf);
+
+out:
+	return op_ret;
+}
+
+
+static int32_t
+libgf_client_mkdir_cbk (call_frame_t *frame,
+			void *cookie,
+			xlator_t *this,
+			int32_t op_ret,
+			int32_t op_errno,
+			inode_t *inode,
+                        struct iatt *buf,
+                        struct iatt *preparent,
+                        struct iatt *postparent)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_mkdir_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                inode, buf, preparent,
+                                                postparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+
+static int32_t
+libgf_client_mkdir (libglusterfs_client_ctx_t *ctx,
+		    loc_t *loc,
+		    mode_t mode)
+{
+	int32_t op_ret = -1;
+        call_stub_t *stub = NULL;
+        libgf_client_local_t *local = NULL;
+        inode_t *libgf_inode = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, mkdir, local, loc, mode);
+        op_ret = stub->args.mkdir_cbk.op_ret;
+        errno = stub->args.mkdir_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, status %d, errno %d",
+                loc->path, op_ret, errno);
+        if (op_ret == -1)
+                goto out;
+
+	libgf_inode = stub->args.mkdir_cbk.inode;
+        inode_link (libgf_inode, loc->parent, loc->name,
+                        &stub->args.mkdir_cbk.buf);
+        libgf_transform_iattr (ctx, libgf_inode, &stub->args.mkdir_cbk.buf);
+
+        inode_lookup (libgf_inode);
+
+        libgf_alloc_inode_ctx (ctx, libgf_inode);
+        libgf_update_iattr_cache (libgf_inode, LIBGF_UPDATE_ALL,
+                                        &stub->args.mkdir_cbk.buf);
+
+out:
+	call_stub_destroy (stub);
+
+	return op_ret;
+}
+
+
+int32_t
+glusterfs_glh_mkdir (glusterfs_handle_t handle, const char *path, mode_t mode)
+{
+	libglusterfs_client_ctx_t *ctx = handle;
+	loc_t loc = {0, };
+	char *pathname = NULL, *name = NULL;
+	int32_t op_ret = -1;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+	op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+	if (op_ret == 0) {
+                op_ret = -1;
+                errno = EEXIST;
+		goto out;
+	}
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 0);
+        if (op_ret == -1) {
+                errno = ENOENT;
+                goto out;
+        }
+
+	pathname = strdup (loc.path);
+	name = basename (pathname);
+
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino, name);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"libgf_client_loc_fill returned -1, returning EINVAL");
+		errno = EINVAL;
+		goto out;
+	}
+
+        loc.inode = inode_new (ctx->itable);
+	op_ret = libgf_client_mkdir (ctx, &loc, mode); 
+	if (op_ret == -1) {
+		goto out;
+	}
+
+out:
+	libgf_client_loc_wipe (&loc);
+	if (pathname) {
+		free (pathname);
+		pathname = NULL;
+	}
+
+	return op_ret;
+}
+
+int32_t
+glusterfs_mkdir (const char *path, mode_t mode)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_mkdir (h, vpath, mode);
+out:
+        return op_ret;
+}
+
+static int32_t
+libgf_client_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                        int32_t op_ret, int32_t op_errno,struct iatt *preparent,
+                        struct iatt *postparent)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_rmdir_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                preparent, postparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+static int32_t
+libgf_client_rmdir (libglusterfs_client_ctx_t *ctx, loc_t *loc)
+{
+        int32_t op_ret = -1;
+        call_stub_t *stub = NULL;
+        libgf_client_local_t *local = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, rmdir, local, loc);
+
+        op_ret = stub->args.rmdir_cbk.op_ret;
+        errno = stub->args.rmdir_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, status %d, errno %d",
+                loc->path, op_ret, errno);
+        if (stub->args.rmdir_cbk.op_ret != 0)
+                goto out;
+
+        inode_unlink (loc->inode, loc->parent, loc->name);
+
+out:
+	call_stub_destroy (stub);
+
+	return op_ret;
+}
+
+int32_t
+glusterfs_glh_rmdir (glusterfs_handle_t handle, const char *path)
+{
+	libglusterfs_client_ctx_t *ctx = handle;
+	loc_t loc = {0, };
+	char *pathname = NULL, *name = NULL;
+	int32_t op_ret = -1;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        loc.path = libgf_resolve_path_light ((char *)path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Path compaction failed");
+                goto out;
+        }
+
+	op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient", GF_LOG_ERROR,
+			"path lookup failed for (%s)", loc.path);
+		goto out;
+	}
+
+	pathname = strdup (loc.path);
+	name = basename (pathname);
+
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino, name);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"libgf_client_loc_fill returned -1, returning EINVAL");
+		errno = EINVAL;
+		goto out;
+	}
+
+	op_ret = libgf_client_rmdir (ctx, &loc);
+	if (op_ret == -1) {
+		goto out;
+	}
+
+out:
+	libgf_client_loc_wipe (&loc);
+
+	if (pathname) {
+		free (pathname);
+		pathname = NULL;
+	}
+
+	return op_ret;
+}
+
+int32_t
+glusterfs_rmdir (const char *path)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_rmdir (h, vpath);
+out:
+        return op_ret;
+}
+
+int
+libgf_client_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                          int32_t op_ret, int32_t op_errno,
+                          struct iatt *preop, struct iatt *postop)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_setattr_cbk_stub (frame, NULL,
+                                                  op_ret, op_errno,
+                                                  preop, postop);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int
+libgf_client_setattr (libglusterfs_client_ctx_t *ctx, loc_t * loc,
+                      struct iatt *stbuf, int32_t valid)
+{
+        int                             op_ret = -1;
+        libgf_client_local_t            *local = NULL;
+        call_stub_t                     *stub = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, setattr, local, loc,
+                          stbuf, valid);
+
+        op_ret = stub->args.setattr_cbk.op_ret;
+        errno = stub->args.setattr_cbk.op_errno;
+
+        if (op_ret == -1)
+                goto out;
+
+        libgf_transform_iattr (ctx, loc->inode,
+                               &stub->args.setattr_cbk.statpost);
+        libgf_update_iattr_cache (loc->inode, LIBGF_UPDATE_STAT,
+                                  &stub->args.setattr_cbk.statpost);
+out:
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+
+int
+glusterfs_glh_chmod (glusterfs_handle_t handle, const char *path, mode_t mode)
+{
+        int                             op_ret = -1;
+        libglusterfs_client_ctx_t       *ctx = handle;
+        loc_t                           loc = {0, };
+        char                            *name = NULL;
+        struct iatt                     stbuf = {0,};
+        int32_t                         valid = 0;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        stbuf.ia_prot = ia_prot_from_st_mode (mode);
+        valid |= GF_SET_ATTR_MODE;
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1)
+                goto out;
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                                basename (name));
+        if (op_ret == -1) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        op_ret = libgf_client_setattr (ctx, &loc, &stbuf, valid);
+
+out:
+        if (name)
+                FREE (name);
+
+        libgf_client_loc_wipe (&loc);
+        return op_ret;
+}
+
+int
+glusterfs_chmod (const char *path, mode_t mode)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_chmod (h, vpath, mode);
+out:
+        return op_ret;
+}
+
+
+#define LIBGF_DO_CHOWN  1
+#define LIBGF_DO_LCHOWN 2
+
+int
+__glusterfs_chown (glusterfs_handle_t handle, const char *path, uid_t owner,
+                   gid_t group, int whichop)
+{
+        int                             op_ret = -1;
+        libglusterfs_client_ctx_t       *ctx = handle;
+        loc_t                           loc = {0, };
+        char                            *name = NULL;
+        loc_t                           *oploc = NULL;
+        loc_t                           targetloc = {0, };
+        struct iatt                     stbuf = {0,};
+        int32_t                         valid = 0;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, op %d", path, whichop);
+        stbuf.ia_uid = owner;
+        stbuf.ia_gid = group;
+        valid |= (GF_SET_ATTR_UID | GF_SET_ATTR_GID);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1)
+                goto out;
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                        basename ((char *)name));
+        if (op_ret == -1) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        oploc = &loc;
+        if (whichop == LIBGF_DO_LCHOWN)
+                goto do_lchown;
+
+        if (!IA_ISLNK (loc.inode->ia_type))
+                goto do_lchown;
+
+        op_ret = libgf_realpath_loc_fill (ctx, (char *)loc.path, &targetloc);
+        if (op_ret == -1)
+                goto out;
+
+        oploc = &targetloc;
+do_lchown:
+        op_ret = libgf_client_setattr (ctx, oploc, &stbuf, valid);
+out:
+        if (name)
+                FREE (name);
+        libgf_client_loc_wipe (&loc);
+        libgf_client_loc_wipe (&targetloc);
+        return op_ret;
+}
+
+int
+glusterfs_glh_chown (glusterfs_handle_t handle, const char *path, uid_t owner,
+                     gid_t group)
+{
+        return __glusterfs_chown (handle, path, owner, group, LIBGF_DO_CHOWN);
+}
+
+int
+glusterfs_chown (const char *path, uid_t owner, gid_t group)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_chown (h, vpath, owner, group);
+
+out:
+        return op_ret;
+}
+
+int
+glusterfs_glh_lchown (glusterfs_handle_t handle, const char *path, uid_t owner,
+                     gid_t group)
+{
+        return __glusterfs_chown (handle, path, owner, group, LIBGF_DO_LCHOWN);
+}
+
+int
+glusterfs_lchown (const char *path, uid_t owner, gid_t group)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_lchown (h, vpath, owner, group);
+out:
+        return op_ret;
+}
+
+glusterfs_dir_t
+glusterfs_glh_opendir (glusterfs_handle_t handle, const char *path)
+{
+        int                             op_ret = -1;
+        libglusterfs_client_ctx_t       *ctx = handle;
+        loc_t                           loc = {0, };
+        fd_t                            *dirfd = NULL;
+        char                            *name = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+
+        if (op_ret == -1)
+                goto out;
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                        basename (name));
+        if (op_ret == -1) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (!IA_ISDIR (loc.inode->ia_type) && !IA_ISLNK (loc.inode->ia_type)) {
+                errno = ENOTDIR;
+                op_ret = -1;
+                goto out;
+        }
+
+        dirfd = fd_create (loc.inode, ctx->pid);
+        op_ret = libgf_client_opendir (ctx, &loc, dirfd);
+
+        if (op_ret == -1) {
+                fd_unref (dirfd);
+                dirfd = NULL;
+                goto out;
+        }
+
+        if (!libgf_get_fd_ctx (dirfd)) {
+                if (!(libgf_alloc_fd_ctx (ctx, dirfd, (char *)path))) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Context "
+                                "allocation failed");
+                        op_ret = -1;
+                        errno = EINVAL;
+                        goto out;
+                }
+        }
+
+out:
+        if (name)
+                FREE (name);
+
+        if (op_ret == -1) {
+                fd_unref (dirfd);
+                dirfd = NULL;
+        }
+
+        libgf_client_loc_wipe (&loc);
+        return dirfd;
+}
+
+glusterfs_dir_t
+glusterfs_opendir (const char *path)
+{
+        char                    vpath[PATH_MAX];
+        glusterfs_dir_t         dir = NULL;
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        dir = glusterfs_glh_opendir (h, vpath);
+out:
+        return dir;
+}
+
+int
+glusterfs_closedir (glusterfs_dir_t dirfd)
+{
+        int                             op_ret = -1;
+        libglusterfs_client_fd_ctx_t    *fdctx = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, dirfd, out);
+        fdctx = libgf_get_fd_ctx (dirfd);
+
+        if (fdctx == NULL) {
+                errno = EBADF;
+                op_ret = -1;
+                goto out;
+        }
+
+        op_ret = libgf_client_flush (fdctx->ctx, (fd_t *)dirfd);
+        fd_unref ((fd_t *)dirfd);
+
+out:
+        return op_ret;
+}
+
+
+int
+libgf_client_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                           int32_t op_ret, int32_t op_errno,
+                           struct iatt *preop, struct iatt *postop)
+{
+        libgf_client_local_t    *local = frame->local;
+
+        local->reply_stub = fop_fsetattr_cbk_stub (frame, NULL,
+                                                   op_ret, op_errno,
+                                                   preop, postop);
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+
+int
+libgf_client_fsetattr (libglusterfs_client_ctx_t *ctx, fd_t *fd,
+                       struct iatt *stbuf, int32_t valid)
+{
+        int                     op_ret = -1;
+        libgf_client_local_t    *local = NULL;
+        call_stub_t             *stub = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, fsetattr, local, fd, stbuf, valid);
+
+        op_ret = stub->args.fsetattr_cbk.op_ret;
+        errno = stub->args.fsetattr_cbk.op_errno;
+
+        if (op_ret == -1)
+                goto out;
+
+        libgf_transform_iattr (ctx, fd->inode,
+                               &stub->args.fsetattr_cbk.statpost);
+        libgf_update_iattr_cache (fd->inode, LIBGF_UPDATE_STAT,
+                                  &stub->args.fsetattr_cbk.statpost);
+out:
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+
+int
+glusterfs_fchmod (glusterfs_file_t fd, mode_t mode)
+{
+        libglusterfs_client_fd_ctx_t    *fdctx = NULL;
+        int                             op_ret = -1;
+        struct iatt                     stbuf = {0,};
+        int32_t                         valid = 0;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+        fdctx = libgf_get_fd_ctx (fd);
+
+        if (!fdctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "No fd context present");
+                errno = EBADF;
+                goto out;
+        }
+
+        stbuf.ia_prot = ia_prot_from_st_mode (mode);
+        valid |= GF_SET_ATTR_MODE;
+
+        op_ret = libgf_client_fsetattr (fdctx->ctx, fd, &stbuf, valid);
+out:
+        return op_ret;
+}
+
+
+int
+glusterfs_fchown (glusterfs_file_t fd, uid_t uid, gid_t gid)
+{
+        int                             op_ret = -1;
+        libglusterfs_client_fd_ctx_t    *fdctx = NULL;
+        struct iatt                     stbuf = {0,};
+        int32_t                         valid = 0;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+
+        fdctx = libgf_get_fd_ctx (fd);
+        if (!fd) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+                goto out;
+        }
+        stbuf.ia_uid = uid;
+        stbuf.ia_gid = gid;
+
+        valid |= (GF_SET_ATTR_UID | GF_SET_ATTR_GID);
+
+        op_ret = libgf_client_fsetattr (fdctx->ctx, fd, &stbuf, valid);
+
+out:
+        return op_ret;
+}
+
+int
+libgf_client_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *xlator,
+                        int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
+                        struct iatt *postbuf)
+{
+        libgf_client_local_t    *local = frame->local;
+
+        local->reply_stub = fop_fsync_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                prebuf, postbuf);
+
+        LIBGF_REPLY_NOTIFY (local);
+
+        return 0;
+}
+
+int
+libgf_client_fsync (libglusterfs_client_ctx_t *ctx, fd_t *fd)
+{
+        libgf_client_local_t    *local = NULL;
+        call_stub_t             *stub = NULL;
+        int                     op_ret = -1;
+
+        LIBGF_CLIENT_FOP (ctx, stub, fsync, local, fd, 0);
+
+        op_ret = stub->args.fsync_cbk.op_ret;
+        errno = stub->args.fsync_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "status %d, errno %d", op_ret,
+                errno);
+        call_stub_destroy (stub);
+
+        return op_ret;
+}
+
+int
+glusterfs_fsync (glusterfs_file_t *fd)
+{
+        libglusterfs_client_fd_ctx_t    *fdctx = NULL;
+        int                             op_ret = -1;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+
+        fdctx = libgf_get_fd_ctx ((fd_t *)fd);
+        if (!fdctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+                goto out;
+        }
+
+        op_ret = libgf_client_fsync (fdctx->ctx, (fd_t *)fd);
+
+out:
+        return op_ret;
+}
+
+int
+libgf_client_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *xlator
+                                ,int32_t op_ret, int32_t op_errno,
+                                struct iatt *prebuf, struct iatt *postbuf)
+{
+        libgf_client_local_t    *local = frame->local;
+
+        local->reply_stub = fop_ftruncate_cbk_stub (frame, NULL, op_ret,
+                                                    op_errno, prebuf, postbuf);
+
+        LIBGF_REPLY_NOTIFY (local);
+
+        return 0;
+}
+
+int
+libgf_client_ftruncate (libglusterfs_client_ctx_t *ctx, fd_t *fd,
+                                off_t length)
+{
+        libgf_client_local_t            *local = NULL;
+        call_stub_t                     *stub = NULL;
+        int                             op_ret = -1;
+        libglusterfs_client_fd_ctx_t    *fdctx = NULL;
+
+        if (!(((fd->flags & O_ACCMODE) == O_RDWR)
+              || ((fd->flags & O_ACCMODE) == O_WRONLY))) {
+                errno = EBADF;
+                goto out;
+        }
+
+        LIBGF_CLIENT_FOP (ctx, stub, ftruncate, local, fd, length);
+
+        op_ret = stub->args.ftruncate_cbk.op_ret;
+        errno = stub->args.ftruncate_cbk.op_errno;
+
+        if (op_ret == -1)
+                goto out;
+
+        libgf_transform_iattr (ctx, fd->inode,
+                               &stub->args.ftruncate_cbk.postbuf);
+        libgf_update_iattr_cache (fd->inode, LIBGF_UPDATE_STAT,
+                                        &stub->args.ftruncate_cbk.postbuf);
+
+        fdctx = libgf_get_fd_ctx (fd);
+        if (!fd) {
+                errno = EINVAL;
+                op_ret = -1;
+                goto out;
+        }
+
+        pthread_mutex_lock (&fdctx->lock);
+        {
+                fdctx->offset = stub->args.ftruncate_cbk.postbuf.ia_size;
+        }
+        pthread_mutex_unlock (&fdctx->lock);
+
+out:
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+glusterfs_ftruncate (glusterfs_file_t fd, off_t length)
+{
+        libglusterfs_client_fd_ctx_t    *fdctx = NULL;
+        int                             op_ret = -1;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+
+        fdctx = libgf_get_fd_ctx (fd);
+        if (!fdctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+                goto out;
+        }
+
+        op_ret = libgf_client_ftruncate (fdctx->ctx, fd, length);
+
+out:
+        return op_ret;
+}
+
+int
+libgf_client_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                                int32_t op_ret, int32_t op_errno,
+                                inode_t *inode, struct iatt *buf,
+                                struct iatt *preparent, struct iatt *postparent)
+{
+        libgf_client_local_t            *local = frame->local;
+
+        local->reply_stub = fop_link_cbk_stub (frame, NULL, op_ret, op_errno,
+                                               inode, buf, preparent,
+                                               postparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+
+        return 0;
+}
+
+int
+libgf_client_link (libglusterfs_client_ctx_t *ctx, loc_t *old, loc_t *new)
+{
+        call_stub_t                     *stub = NULL;
+        libgf_client_local_t            *local = NULL;
+        int                             op_ret = -1;
+        inode_t                         *inode = NULL;
+        struct iatt                     *sbuf = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, link, local, old, new);
+
+        op_ret = stub->args.link_cbk.op_ret;
+        errno = stub->args.link_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "old %s, new %s, status %d,"
+                " errno %d", old->path, new->path, op_ret, errno);
+        if (op_ret == -1)
+                goto out;
+
+        inode = stub->args.link_cbk.inode;
+        sbuf = &stub->args.link_cbk.buf;
+        inode_link (inode, new->parent, basename ((char *)new->path), sbuf);
+        libgf_transform_iattr (ctx, inode, sbuf);
+        inode_lookup (inode);
+        libgf_update_iattr_cache (inode, LIBGF_UPDATE_STAT, sbuf);
+
+out:
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+glusterfs_glh_link (glusterfs_handle_t handle, const char *oldpath,
+                        const char *newpath)
+{
+        libglusterfs_client_ctx_t       *ctx = handle;
+        int                             op_ret = -1;
+        loc_t                           old = {0,};
+        loc_t                           new = {0,};
+        char                            *oldname = NULL;
+        char                            *newname = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, oldpath, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, newpath, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "old %s, new %s", oldpath,
+                newpath);
+
+        old.path = strdup (oldpath);
+        if (!old.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&old, ctx, 1);
+        if (op_ret == -1) {
+                errno = ENOENT;
+                goto out;
+        }
+
+        oldname = strdup (old.path);
+        op_ret = libgf_client_loc_fill (&old, ctx, 0, old.parent->ino,
+                                                basename (oldname));
+        if (op_ret == -1) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (IA_ISDIR (old.inode->ia_type)) {
+                errno = EPERM;
+                op_ret = -1;
+                goto out;
+        }
+
+        new.path = strdup (newpath);
+        if (!new.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&new, ctx, 1);
+        if (op_ret == 0) {
+                errno = EEXIST;
+                op_ret = -1;
+                goto out;
+        }
+
+        newname = strdup (new.path);
+        new.inode = inode_ref (old.inode);
+        libgf_client_loc_fill (&new, ctx, 0, new.parent->ino,
+                        basename (newname));
+        op_ret = libgf_client_link (ctx, &old, &new);
+
+out:
+        if (oldname)
+                FREE (oldname);
+        if (newname)
+                FREE (newname);
+        libgf_client_loc_wipe (&old);
+        libgf_client_loc_wipe (&new);
+
+        return op_ret;
+}
+
+int
+glusterfs_link (const char *oldpath, const char *newpath)
+{
+        int                     op_ret = -1;
+        char                    oldvpath[PATH_MAX];
+        char                    newvpath[PATH_MAX];
+        glusterfs_handle_t      oldh = NULL;
+        glusterfs_handle_t      newh = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, oldpath, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, newpath, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "old %s, new %s", oldpath,
+                newpath);
+
+        oldh = libgf_resolved_path_handle (oldpath, oldvpath);
+        if (!oldh) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        newh = libgf_resolved_path_handle (newpath, newvpath);
+        if (!newh) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        /* Cannot hard link across glusterfs mounts. */
+        if (newh != oldh) {
+                errno = EXDEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_link (newh, oldvpath, newvpath);
+out:
+        return op_ret;
+}
+
+int32_t
+libgf_client_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                         int32_t op_ret, int32_t op_errno, struct statvfs *buf)
+{
+        libgf_client_local_t    *local = frame->local;
+
+        local->reply_stub = fop_statfs_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                 buf);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int32_t
+libgf_client_statvfs (libglusterfs_client_ctx_t *ctx, loc_t *loc,
+                      struct statvfs *buf)
+{
+        call_stub_t             *stub = NULL;
+        libgf_client_local_t    *local = NULL;
+        int32_t                 op_ret = -1;
+
+        /* statfs fop receives struct statvfs as an argument */
+
+        /* libgf_client_statfs_cbk will be the callback, not
+           libgf_client_statvfs_cbk. see definition of LIBGF_CLIENT_FOP
+        */
+        LIBGF_CLIENT_FOP (ctx, stub, statfs, local, loc);
+
+        op_ret = stub->args.statfs_cbk.op_ret;
+        errno = stub->args.statfs_cbk.op_errno;
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, status %d, errno %d",
+                loc->path, op_ret, errno);
+        if (op_ret == -1)
+                goto out;
+
+        if (buf)
+                memcpy (buf, &stub->args.statfs_cbk.buf, sizeof (*buf));
+out:
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+glusterfs_glh_statfs (glusterfs_handle_t handle, const char *path,
+                        struct statfs *buf)
+{
+        struct statvfs                  stvfs = {0, };
+        int32_t                         op_ret = -1;
+        loc_t                           loc = {0, };
+        libglusterfs_client_ctx_t       *ctx = handle;
+        char                            *name = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path lookup failed for (%s)", loc.path);
+                goto out;
+        }
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                        basename (name));
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1, "
+                                "returning EINVAL");
+                        errno = EINVAL;
+                goto out;
+        }
+
+        op_ret = libgf_client_statvfs (ctx, &loc, &stvfs);
+        if (op_ret == 0) {
+#ifdef GF_SOLARIS_HOST_OS
+		buf->f_fstyp = 0;
+                buf->f_bsize = stvfs.f_bsize;
+                buf->f_blocks = stvfs.f_blocks;
+                buf->f_bfree = stvfs.f_bfree;
+		buf->f_files = stvfs.f_bavail;
+                buf->f_ffree = stvfs.f_ffree;
+#else
+                buf->f_type = 0;
+                buf->f_bsize = stvfs.f_bsize;
+                buf->f_blocks = stvfs.f_blocks;
+                buf->f_bfree = stvfs.f_bfree;
+                buf->f_bavail = stvfs.f_bavail;
+                buf->f_files = stvfs.f_bavail;
+                buf->f_ffree = stvfs.f_ffree;
+                /* FIXME: buf->f_fsid has either "val" or "__val" as member
+                   based on conditional macro expansion. see definition of
+                   fsid_t - Raghu
+                   It seems have different structure member names on
+                   different archs, so I am stepping down to doing a struct
+                   to struct copy. :Shehjar
+                */
+                memcpy (&buf->f_fsid, &stvfs.f_fsid, sizeof (stvfs.f_fsid));
+                buf->f_namelen = stvfs.f_namemax;
+#endif
+        }
+
+out:
+        if (name)
+                FREE (name);
+        libgf_client_loc_wipe (&loc);
+        return op_ret;
+}
+
+int
+glusterfs_statfs (const char *path, struct statfs *buf)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h      = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, buf, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_statfs (h, vpath, buf);
+out:
+        return op_ret;
+}
+
+int
+glusterfs_glh_statvfs (glusterfs_handle_t handle, const char *path,
+                                struct statvfs *buf)
+{
+        int32_t                         op_ret = -1;
+        loc_t                           loc = {0, };
+        libglusterfs_client_ctx_t       *ctx = handle;
+        char                            *name = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path lookup failed for (%s)", loc.path);
+                goto out;
+        }
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                                basename (name));
+	if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1, returning"
+                                " EINVAL");
+                errno = EINVAL;
+                goto out;
+	}
+
+        op_ret = libgf_client_statvfs (ctx, &loc, buf);
+        if (op_ret != -1)
+                /* Should've been a call to libgf_transform_iattr but
+                 * that only handles struct stat
+                 */
+                buf->f_fsid = (unsigned long)ctx->fake_fsid;
+
+out:
+        if (name)
+                FREE (name);
+        libgf_client_loc_wipe (&loc);
+        return op_ret;
+}
+
+int
+glusterfs_statvfs (const char *path, struct statvfs *buf)
+{
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h      = NULL;
+        int                     op_ret = -1;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, buf, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_statvfs (h, vpath, buf);
+out:
+        return op_ret;
+}
+
+int32_t
+libgf_client_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                         int32_t op_ret, int32_t op_errno, struct iatt *buf,
+                         struct iatt *preoldparent, struct iatt *postoldparent,
+                         struct iatt *prenewparent, struct iatt *postnewparent)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_rename_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                 buf, preoldparent,
+                                                 postoldparent, prenewparent,
+                                                 postnewparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int32_t
+libgf_client_rename (libglusterfs_client_ctx_t *ctx, loc_t *oldloc,
+                     loc_t *newloc)
+{
+        int                             op_ret = -1;
+        libgf_client_local_t            *local = NULL;
+        call_stub_t                     *stub = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, rename, local, oldloc, newloc);
+
+        op_ret = stub->args.rename_cbk.op_ret;
+        errno = stub->args.rename_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "old %s, new %s, status %d, errno"
+                " %d", oldloc->path, newloc->path, op_ret, errno);
+        if (op_ret == -1)
+                goto out;
+
+        if (!libgf_get_inode_ctx (newloc->inode))
+                libgf_alloc_inode_ctx (ctx, newloc->inode);
+
+        libgf_transform_iattr (ctx, newloc->inode, &stub->args.rename_cbk.buf);
+        libgf_update_iattr_cache (newloc->inode, LIBGF_UPDATE_STAT,
+                                        &stub->args.rename_cbk.buf);
+
+        inode_unlink (oldloc->inode, oldloc->parent, oldloc->name);
+out:
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+glusterfs_glh_rename (glusterfs_handle_t handle, const char *oldpath,
+                      const char *newpath)
+{
+        int32_t                         op_ret = -1;
+        loc_t                           oldloc = {0, }, newloc = {0, };
+        libglusterfs_client_ctx_t       *ctx = handle;
+        char                            *newname = NULL;
+        char                            *oldname = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, oldpath, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, newpath, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "old %s, new %s", oldpath,
+                newpath);
+
+        oldloc.path = strdup (oldpath);
+        if (!oldloc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&oldloc, ctx, 1);
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path lookup failed for (%s)", oldloc.path);
+                goto out;
+        }
+
+        newloc.path = strdup (newpath);
+        if (!newloc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&newloc, ctx, 1);
+
+        oldname = strdup (oldloc.path);
+        op_ret = libgf_client_loc_fill (&oldloc, ctx, 0, oldloc.parent->ino,
+                                        basename (oldname));
+	if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1,"
+                                " returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        newname = strdup (newloc.path);
+        op_ret = libgf_client_loc_fill (&newloc, ctx, 0, newloc.parent->ino,
+                                        basename (newname));
+	if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1,"
+                                " returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+        op_ret = libgf_client_rename (ctx, &oldloc, &newloc);
+
+out:
+        if (oldname)
+                FREE (oldname);
+        if (newname)
+                FREE (newname);
+        libgf_client_loc_wipe (&newloc);
+        libgf_client_loc_wipe (&oldloc);
+
+        return op_ret;
+}
+
+
+int
+glusterfs_rename (const char *oldpath, const char *newpath)
+{
+        int                     op_ret = -1;
+        char                    oldvpath[PATH_MAX];
+        char                    newvpath[PATH_MAX];
+        glusterfs_handle_t      oldh = NULL;
+        glusterfs_handle_t      newh = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, oldpath, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, newpath, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Old %s, new %s", oldpath,
+                newpath);
+
+        oldh = libgf_resolved_path_handle (oldpath, oldvpath);
+        if (!oldh) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        newh = libgf_resolved_path_handle (newpath, newvpath);
+        if (!newh) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        if (oldh != newh) {
+                errno = EXDEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_rename (oldh, oldvpath, newvpath);
+out:
+        return op_ret;
+}
+
+
+int
+glusterfs_glh_utimes (glusterfs_handle_t handle, const char *path,
+                        const struct timeval times[2])
+{
+        int32_t                         op_ret = -1;
+        loc_t                           loc = {0, };
+        libglusterfs_client_ctx_t       *ctx = handle;
+        char                            *name = NULL;
+        struct iatt                     stbuf = {0,};
+        int32_t                         valid = 0;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+        stbuf.ia_atime = times[0].tv_sec;
+        stbuf.ia_atime_nsec = times[0].tv_usec * 1000;
+        stbuf.ia_mtime = times[1].tv_sec;
+        stbuf.ia_mtime_nsec = times[1].tv_usec * 1000;
+
+        valid |= (GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path lookup failed for (%s)", loc.path);
+                goto out;
+        }
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                                basename (name));
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1"
+                                " returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        op_ret = libgf_client_setattr (ctx, &loc, &stbuf, valid);
+out:
+        if (name)
+                FREE (name);
+        libgf_client_loc_wipe (&loc);
+        return op_ret;
+}
+
+int
+glusterfs_utimes (const char *path, const struct timeval times[2])
+{
+        char                    vpath[PATH_MAX];
+        int                     op_ret = -1;
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_utimes (h, vpath, times);
+out:
+        return op_ret;
+}
+
+int
+glusterfs_glh_utime (glusterfs_handle_t handle, const char *path,
+                        const struct utimbuf *buf)
+{
+        int32_t                         op_ret = -1;
+        loc_t                           loc = {0, };
+        libglusterfs_client_ctx_t       *ctx = handle;
+        char                            *name = NULL;
+        struct iatt                     stbuf = {0,};
+        int32_t                         valid = 0;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+        if (buf) {
+                stbuf.ia_atime = buf->actime;
+                stbuf.ia_atime_nsec = 0;
+
+                stbuf.ia_mtime = buf->modtime;
+                stbuf.ia_mtime_nsec = 0;
+        }
+
+        valid |= (GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path lookup failed for (%s)", loc.path);
+                goto out;
+        }
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                                basename (name));
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1,"
+                                " returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        op_ret = libgf_client_setattr (ctx, &loc, &stbuf, valid);
+out:
+        if (name)
+                FREE (name);
+        libgf_client_loc_wipe (&loc);
+        return op_ret;
+}
+
+int
+glusterfs_utime (const char *path, const struct utimbuf *buf)
+{
+        char                    vpath[PATH_MAX];
+        int                     op_ret = -1;
+        glusterfs_handle_t      h      = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, buf, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_utime (h, vpath, buf);
+out:
+        return op_ret;
+}
+
+static int32_t
+libgf_client_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                                int32_t op_ret, int32_t op_errno,
+                                inode_t *inode, struct iatt *buf,
+                                struct iatt *preparent, struct iatt *postparent)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_mknod_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                inode, buf, preparent,
+                                                postparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+static int32_t
+libgf_client_mknod (libglusterfs_client_ctx_t *ctx, loc_t *loc, mode_t mode,
+                    dev_t rdev)
+{
+        int32_t                 op_ret = -1;
+        call_stub_t             *stub = NULL;
+        libgf_client_local_t    *local = NULL;
+        inode_t                 *inode = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, mknod, local, loc, mode, rdev);
+
+        op_ret = stub->args.mknod_cbk.op_ret;
+        errno = stub->args.mknod_cbk.op_errno;
+        if (op_ret == -1)
+                goto out;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, status %d, errno %d",
+                loc->path, op_ret, errno);
+        inode = stub->args.mknod_cbk.inode;
+        inode_link (inode, loc->parent, loc->name, &stub->args.mknod_cbk.buf);
+        libgf_transform_iattr (ctx, inode, &stub->args.mknod_cbk.buf);
+        inode_lookup (inode);
+
+        if (!libgf_alloc_inode_ctx (ctx, inode))
+                libgf_alloc_inode_ctx (ctx, inode);
+
+        libgf_update_iattr_cache (inode, LIBGF_UPDATE_STAT,
+                                        &stub->args.mknod_cbk.buf);
+
+out:
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+glusterfs_glh_mknod(glusterfs_handle_t handle, const char *path, mode_t mode,
+                        dev_t dev)
+{
+        libglusterfs_client_ctx_t       *ctx = handle;
+        loc_t                           loc = {0, };
+        char                            *name = NULL;
+        int32_t                         op_ret = -1;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == 0) {
+                op_ret = -1;
+                errno = EEXIST;
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 0);
+        if (op_ret == -1) {
+                errno = ENOENT;
+                goto out;
+        }
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                                basename (name));
+	if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1, "
+                                " returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        loc.inode = inode_new (ctx->itable);
+        op_ret = libgf_client_mknod (ctx, &loc, mode, dev);
+
+out:
+	libgf_client_loc_wipe (&loc);
+	if (name)
+                FREE (name);
+
+	return op_ret;
+}
+
+int
+glusterfs_mknod(const char *pathname, mode_t mode, dev_t dev)
+{
+        char                    vpath[PATH_MAX]; 
+        int                     op_ret = -1;
+        glusterfs_handle_t      h      = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, pathname, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", pathname);
+
+        h = libgf_resolved_path_handle (pathname, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+out:
+        return op_ret;
+}
+
+int
+glusterfs_glh_mkfifo (glusterfs_handle_t handle, const char *path, mode_t mode)
+{
+
+        libglusterfs_client_ctx_t       *ctx = handle;
+        loc_t                           loc = {0, };
+        char                            *name = NULL;
+        int32_t                         op_ret = -1;
+        dev_t                           dev = 0;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+        loc.path = libgf_resolve_path_light ((char *)path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Failed to resolve name");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == 0) {
+                op_ret = -1;
+                errno = EEXIST;
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 0);
+        if (op_ret == -1) {
+                errno = ENOENT;
+                goto out;
+        }
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                                basename (name));
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1, "
+                                "returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        loc.inode = inode_new (ctx->itable);
+        op_ret = libgf_client_mknod (ctx, &loc, mode | S_IFIFO, dev);
+
+out:
+	libgf_client_loc_wipe (&loc);
+        if (name)
+                free (name);
+
+        return op_ret;
+}
+
+int
+glusterfs_mkfifo (const char *path, mode_t mode)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_mkfifo (h, vpath, mode);
+out:
+        return op_ret;
+}
+
+int32_t
+libgf_client_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                         int32_t op_ret, int32_t op_errno,
+                         struct iatt *preparent, struct iatt *postparent)
+{
+        libgf_client_local_t    *local = frame->local;
+
+        local->reply_stub = fop_unlink_cbk_stub (frame, NULL, op_ret, op_errno,
+                                                 preparent, postparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int
+libgf_client_unlink (libglusterfs_client_ctx_t *ctx, loc_t *loc)
+{
+        int                             op_ret = -1;
+        libgf_client_local_t            *local = NULL;
+        call_stub_t                     *stub = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, unlink, local, loc);
+
+        op_ret = stub->args.unlink_cbk.op_ret;
+        errno = stub->args.unlink_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", loc->path);
+        if (op_ret == -1)
+                goto out;
+
+        inode_unlink (loc->inode, loc->parent, loc->name);
+
+out:
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+glusterfs_glh_unlink (glusterfs_handle_t handle, const char *path)
+{
+        int32_t                         op_ret = -1;
+        loc_t                           loc = {0, };
+        libglusterfs_client_ctx_t       *ctx = handle;
+        char                            *name = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path lookup failed for (%s)", loc.path);
+                goto out;
+        }
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                                basename (name));
+	if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1, "
+                                " returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        op_ret = libgf_client_unlink (ctx, &loc);
+
+out:
+        if (name)
+                FREE (name);
+        libgf_client_loc_wipe (&loc);
+        return op_ret;
+}
+
+int
+glusterfs_unlink (const char *path)
+{
+        char                    vpath[PATH_MAX];
+        int                     op_ret = -1;
+        glusterfs_handle_t      h      = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_unlink (h, vpath);
+
+out:
+        return op_ret;
+}
+
+static int32_t
+libgf_client_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                                int32_t op_ret, int32_t op_errno,
+                                inode_t *inode, struct iatt *buf,
+                                struct iatt *preparent, struct iatt *postparent)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_symlink_cbk_stub (frame, NULL, op_ret,
+                                                  op_errno, inode, buf,
+                                                  preparent, postparent);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int32_t
+libgf_client_symlink (libglusterfs_client_ctx_t *ctx, const char *linkpath,
+                      loc_t *loc)
+{
+        int                     op_ret = -1;
+        libgf_client_local_t    *local = NULL;
+        call_stub_t             *stub = NULL;
+        inode_t                 *inode = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, symlink, local, linkpath, loc);
+
+        op_ret = stub->args.symlink_cbk.op_ret;
+        errno = stub->args.symlink_cbk.op_errno;
+        if (op_ret == -1)
+                goto out;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "target: %s, link: %s, status %d"
+                " errno %d", linkpath, loc->path, op_ret, errno);
+        inode = stub->args.symlink_cbk.inode;
+        inode_link (inode, loc->parent, loc->name,
+                        &stub->args.symlink_cbk.buf);
+        libgf_transform_iattr (ctx, inode, &stub->args.symlink_cbk.buf);
+        inode_lookup (inode);
+        if (!libgf_get_inode_ctx (inode))
+                libgf_alloc_inode_ctx (ctx, inode);
+
+        libgf_update_iattr_cache (inode, LIBGF_UPDATE_STAT,
+                                        &stub->args.symlink_cbk.buf);
+out:
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+int
+glusterfs_glh_symlink (glusterfs_handle_t handle, const char *oldpath,
+                       const char *newpath)
+{
+        int32_t                         op_ret = -1;
+        libglusterfs_client_ctx_t       *ctx = handle;
+        loc_t                           oldloc = {0, };
+        loc_t                           newloc = {0, };
+        char                            *oldname = NULL;
+        char                            *newname = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, newpath, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "target: %s, link: %s", oldpath,
+                newpath);
+        /* Old path does not need to be interpreted or looked up */
+        oldloc.path = strdup (oldpath);
+
+	newloc.path = strdup (newpath);
+        if (!newloc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+	op_ret = libgf_client_path_lookup (&newloc, ctx, 1);
+	if (op_ret == 0) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "new path (%s) already exists, "
+                        " returning EEXIST", newloc.path);
+                op_ret = -1;
+                errno = EEXIST;
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&newloc, ctx, 0);
+        if (op_ret == -1) {
+                errno = ENOENT;
+                goto out;
+        }
+
+        newloc.inode = inode_new (ctx->itable);
+        newname = strdup (newloc.path);
+        op_ret = libgf_client_loc_fill (&newloc, ctx, 0, newloc.parent->ino,
+                                                basename (newname));
+
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1, "
+                                "returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        op_ret = libgf_client_symlink (ctx, oldpath, &newloc);
+
+out:
+        if (newname)
+                FREE (newname);
+
+        if (oldname)
+                FREE (oldname);
+        libgf_client_loc_wipe (&oldloc);
+        libgf_client_loc_wipe (&newloc);
+        return op_ret;
+}
+
+int
+glusterfs_symlink (const char *oldpath, const char *newpath)
+{
+        char                    vpath[PATH_MAX];
+        int                     op_ret = -1;
+        glusterfs_handle_t      h      = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, oldpath, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, newpath, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "target: %s, link: %s", oldpath,
+                newpath);
+
+        h = libgf_resolved_path_handle (newpath, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_symlink (h, oldpath, vpath);
+out:
+        return op_ret;
+}
+
+
+int32_t
+libgf_client_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                                int32_t op_ret, int32_t op_errno,
+                                const char *path, struct iatt *sbuf)
+{
+        libgf_client_local_t    *local = frame->local;
+
+        local->reply_stub = fop_readlink_cbk_stub (frame, NULL, op_ret,
+                                                   op_errno, path, sbuf);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int32_t
+libgf_client_readlink (libglusterfs_client_ctx_t *ctx, loc_t *loc, char *buf,
+                       size_t bufsize)
+{
+        int                             op_ret = -1;
+        libgf_client_local_t            *local = NULL;
+        call_stub_t                     *stub = NULL;
+        size_t                           cpy_size = 0;
+
+        LIBGF_CLIENT_FOP (ctx, stub, readlink, local, loc, bufsize);
+
+        op_ret = stub->args.readlink_cbk.op_ret;
+        errno = stub->args.readlink_cbk.op_errno;
+
+        if (op_ret != -1) {
+                cpy_size = ((op_ret <= bufsize) ? op_ret : bufsize);
+                memcpy (buf, stub->args.readlink_cbk.buf, cpy_size);
+                op_ret = cpy_size;
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "link: %s, target: %s,"
+                        " status %d, errno %d", loc->path, buf, op_ret, errno);
+        } else
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "link: %s, status %d, "
+                        "errno %d", loc->path, op_ret, errno);
+
+        call_stub_destroy (stub);
+        return op_ret;
+}
+
+ssize_t
+glusterfs_glh_readlink (glusterfs_handle_t handle, const char *path, char *buf,
+                                size_t bufsize)
+{
+        int32_t                         op_ret = -1;
+        loc_t                           loc = {0, };
+        libglusterfs_client_ctx_t       *ctx = handle;
+        char                            *name = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+        if (bufsize < 0) {
+                errno = EINVAL;
+                goto out;
+        }
+
+        if (bufsize == 0) {
+                op_ret = 0;
+                goto out;
+        }
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                        "path lookup failed for (%s)", loc.path);
+                goto out;
+        }
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                                basename (name));
+        if (op_ret == -1) {
+                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                "libgf_client_loc_fill returned -1, "
+                                "returning EINVAL");
+                errno = EINVAL;
+                goto out;
+        }
+
+        op_ret = libgf_client_readlink (ctx, &loc, buf, bufsize);
+
+out:
+        if (name)
+                FREE (name);
+
+        libgf_client_loc_wipe (&loc);
+        return op_ret;
+}
+
+ssize_t
+glusterfs_readlink (const char *path, char *buf, size_t bufsize)
+{
+        char                    vpath[PATH_MAX];
+        int                     op_ret = -1;
+        glusterfs_handle_t      h      = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, buf, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_readlink (h, vpath, buf, bufsize);
+out:
+        return op_ret;
+}
+
+char *
+glusterfs_glh_realpath (glusterfs_handle_t handle, const char *path,
+                                char *resolved_path)
+{
+        char                            *buf = NULL;
+        char                            *rpath = NULL;
+        char                            *start = NULL, *end = NULL;
+        char                            *dest = NULL;
+        libglusterfs_client_ctx_t       *ctx = handle;
+        long int                        path_max = 0;
+        char                            *ptr = NULL;
+        struct stat                     stbuf = {0, };
+        long int                        new_size = 0;
+        char                            *new_rpath = NULL;
+        int                             dest_offset = 0;
+        char                            *rpath_limit = 0;
+        int                             ret = 0, num_links = 0;
+        char                            *vpath = NULL, *tmppath = NULL;
+        char                             absolute_path[PATH_MAX];
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+#ifdef PATH_MAX
+        path_max = PATH_MAX;
+#else
+        path_max = pathconf (path, _PC_PATH_MAX);
+        if (path_max <= 0) {
+                path_max = 1024;
+        }
+#endif
+
+        if (resolved_path == NULL) {
+                rpath = CALLOC (1, path_max);
+                if (rpath == NULL) {
+                        errno = ENOMEM;
+                        goto out;
+                }
+        } else {
+                rpath = resolved_path;
+        }
+
+        rpath_limit = rpath + path_max;
+
+        if (path[0] == '/') {
+                rpath[0] = '/';
+                dest = rpath + 1;
+        } else {
+                /*
+                   FIXME: can $CWD be a valid path on glusterfs server? hence is
+                   it better to handle this case or just return EINVAL for
+                   relative paths?
+                */
+                ptr = getcwd (rpath, path_max);
+                if (ptr == NULL) {
+                        goto err;
+                }
+                dest = rpath + strlen (rpath);
+        }
+
+        for (start = end = (char *)path; *end; start = end) {
+                if (dest[-1] != '/') {
+                        *dest++ = '/';
+                }
+
+                while (*start == '/') {
+                        start++;
+                }
+
+                for (end = start; *end && *end != '/'; end++);
+
+                if ((end - start) == 0) {
+                        break;
+                }
+
+                if ((end - start == 1) && (start[0] == '.')) {
+                        /* do nothing */
+                } else if (((end - start) == 2) && (start[0] == '.')
+                           && (start[1] == '.')) {
+                        if (dest > rpath + 1) {
+                                while (--dest[-1] != '/');
+                        }
+                } else {
+                        if ((dest + (end - start + 1)) >= rpath_limit) {
+                                if (resolved_path == NULL) {
+                                        errno = ENAMETOOLONG;
+                                        if (dest > rpath + 1)
+                                                dest--;
+                                        *dest = '\0';
+                                        goto err;
+                                }
+
+                                dest_offset = dest - rpath;
+                                new_size = rpath_limit - rpath;
+                                if ((end - start + 1) > path_max) {
+                                        new_size = (end - start + 1);
+                                } else {
+                                        new_size = path_max;
+                                }
+
+                                new_rpath = realloc (rpath, new_size);
+                                if (new_rpath == NULL) {
+                                        goto err;
+                                }
+
+
+                                dest = new_rpath + dest_offset;
+                                rpath = new_rpath;
+                                rpath_limit = rpath + new_size;
+                        }
+
+                        memcpy (dest, start, end - start);
+                        dest +=  end - start;
+                        *dest = '\0';
+
+                        ret = glusterfs_glh_lstat (handle, rpath, &stbuf);
+                        if (ret == -1) {
+                                gf_log ("libglusterfsclient", GF_LOG_ERROR,
+                                        "glusterfs_glh_stat returned -1 for"
+                                        " path (%s):(%s)", rpath,
+                                        strerror (errno));
+                                goto err;
+                        }
+
+                        if (S_ISLNK (stbuf.st_mode)) {
+                                buf = calloc (1, path_max);
+                                if (buf == NULL) {
+                                        errno = ENOMEM;
+                                        goto err;
+                                }
+
+                                if (++num_links > MAXSYMLINKS)
+                                {
+                                        errno = ELOOP;
+                                        FREE (buf);
+                                        goto err;
+                                }
+
+                                ret = glusterfs_glh_readlink (handle, rpath,
+                                                              buf,
+                                                              path_max - 1);
+                                if (ret < 0) {
+                                        gf_log ("libglusterfsclient",
+                                                GF_LOG_ERROR,
+                                                "glusterfs_readlink returned %d"
+                                                " for path (%s):(%s)",
+                                                ret, rpath, strerror (errno));
+                                        FREE (buf);
+                                        goto err;
+                                }
+                                buf[ret] = '\0';
+
+                                if (buf[0] != '/') {
+                                        tmppath = strdup (rpath);
+                                        tmppath = dirname (tmppath);
+                                        sprintf (absolute_path, "%s/%s",
+                                                 tmppath, buf);
+                                        FREE (buf);
+                                        buf = libgf_resolve_path_light ((char *)absolute_path);
+                                        FREE (tmppath);
+                                }
+
+                                rpath = glusterfs_glh_realpath (handle, buf,
+                                                                rpath);
+                                FREE (buf);
+                                if (rpath == NULL) {
+                                        goto out;
+                                }
+                                dest = rpath + strlen (rpath);
+
+                        } else if (!S_ISDIR (stbuf.st_mode) && *end != '\0') {
+                                errno = ENOTDIR;
+                                goto err;
+                        }
+                }
+        }
+        if (dest > rpath + 1 && dest[-1] == '/')
+                --dest;
+        *dest = '\0';
+
+out:
+        if (vpath)
+                FREE (vpath);
+        return rpath;
+
+err:
+        if (vpath)
+                FREE (vpath);
+        if (resolved_path == NULL) {
+                FREE (rpath);
+        }
+
+        return NULL;
+}
+
+char *
+glusterfs_realpath (const char *path, char *resolved_path)
+{
+        char                    *res   = NULL;
+        char                     vpath[PATH_MAX];
+        glusterfs_handle_t       h     = NULL;
+        char                    *realp = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        realp = CALLOC (PATH_MAX, sizeof (char));
+        if (!realp)
+                goto out;
+
+        libgf_vmp_search_vmp (h, realp, PATH_MAX);
+        res = glusterfs_glh_realpath (h, vpath, resolved_path);
+        if (!res)
+                goto out;
+
+        /* This copy is needed to ensure that when we return the real resolved
+         * path, we return a path that accounts for the app's view of the
+         * path, i.e. it starts with the VMP, in case this is an absolute path.
+         */
+        if (libgf_path_absolute (path)) {
+                strcat (realp, resolved_path);
+                strcpy (resolved_path, realp);
+        }
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, resolved %s", path,
+                resolved_path);
+out:
+        if (realp)
+                FREE (realp);
+
+        return res;
+}
+
+int
+glusterfs_glh_remove (glusterfs_handle_t handle, const char *path)
+{
+        loc_t                           loc = {0, };
+        int                             op_ret = -1;
+        libglusterfs_client_ctx_t       *ctx = handle;
+        char                            *name = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, handle, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", path);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+        op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+        if (op_ret == -1)
+                goto out;
+
+        name = strdup (loc.path);
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino,
+                                        basename (name));
+        if (op_ret == -1)
+                goto out;
+
+        if (IA_ISDIR (loc.inode->ia_type))
+                op_ret = libgf_client_rmdir (ctx, &loc);
+        else
+                op_ret = libgf_client_unlink (ctx, &loc);
+
+out:
+        if (name)
+                FREE (name);
+        return op_ret;
+
+}
+
+int
+glusterfs_remove(const char *pathname)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, pathname, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s", pathname);
+
+        h = libgf_resolved_path_handle (pathname, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_remove (h, vpath);
+out:
+        return op_ret;
+}
+
+void
+glusterfs_rewinddir (glusterfs_dir_t dirfd)
+{
+        libglusterfs_client_fd_ctx_t    *fd_ctx = NULL;
+
+        fd_ctx = libgf_get_fd_ctx ((fd_t *)dirfd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+                goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                fd_ctx->offset = 0;
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Offset: %"PRIu64,
+                        fd_ctx->offset);
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+out:
+        return;
+}
+
+void
+glusterfs_seekdir (glusterfs_dir_t dirfd, off_t offset)
+{
+        libglusterfs_client_fd_ctx_t    *fd_ctx = NULL;
+
+        fd_ctx = libgf_get_fd_ctx ((fd_t *)dirfd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                fd_ctx->offset = offset;
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Offset: %"PRIu64,
+                        fd_ctx->offset);
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+out:
+        return;
+}
+
+off_t
+glusterfs_telldir (glusterfs_dir_t dirfd)
+{
+        libglusterfs_client_fd_ctx_t    *fd_ctx = NULL;
+	off_t                           off = -1;
+
+        fd_ctx = libgf_get_fd_ctx ((fd_t *)dirfd);
+        if (!fd_ctx) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "No fd context present");
+                errno = EBADF;
+                goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                off = fd_ctx->offset;
+                gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "Offset: %"PRIu64,
+                        fd_ctx->offset);
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+out:
+        return off;
+}
+
+struct libgf_client_sendfile_data {
+        int                reads_sent;
+        int                reads_completed;
+        int                out_fd;
+        int32_t            op_ret;
+        int32_t            op_errno;
+        pthread_mutex_t    lock;
+        pthread_cond_t     cond;
+};
+
+int
+libgf_client_sendfile_read_cbk (int op_ret, int op_errno,
+                                glusterfs_iobuf_t *buf, void *cbk_data)
+{
+        struct libgf_client_sendfile_data *sendfile_data = cbk_data;
+        int                                bytes = 0;
+
+        if (op_ret > 0) {
+                bytes = writev (sendfile_data->out_fd, buf->vector, buf->count);
+                if (bytes != op_ret) {
+                        op_ret = -1;
+                        op_errno = errno;
+                }
+
+                glusterfs_free (buf);
+        }
+
+        pthread_mutex_lock (&sendfile_data->lock);
+        {
+                if (sendfile_data->op_ret != -1) {
+                        if (op_ret == -1) {
+                                sendfile_data->op_ret = -1;
+                                sendfile_data->op_errno = op_errno;
+                        } else {
+                                sendfile_data->op_ret += op_ret;
+                        }
+                }
+
+                sendfile_data->reads_completed++;
+
+                if (sendfile_data->reads_completed
+                    == sendfile_data->reads_sent) {
+                        pthread_cond_broadcast (&sendfile_data->cond);
+                } 
+        }
+        pthread_mutex_unlock (&sendfile_data->lock);
+
+        return 0;
+}
+
+
+ssize_t
+glusterfs_sendfile (int out_fd, glusterfs_file_t in_fd, off_t *offset,
+                    size_t count)
+{
+        ssize_t                           ret = -1;
+        struct libgf_client_sendfile_data cbk_data = {0, };
+        off_t                             off = -1;
+        size_t                            size = 0;
+        int                               flags = 0;
+        int                               non_block = 0;
+
+        
+        pthread_mutex_init (&cbk_data.lock, NULL);
+        pthread_cond_init (&cbk_data.cond, NULL);
+        cbk_data.out_fd = out_fd;
+        
+        if (offset) {
+                off = *offset;
+        }
+
+        flags = fcntl (out_fd, F_GETFL);
+
+        if (flags != -1) {
+                non_block = flags & O_NONBLOCK;
+
+                if (non_block) {
+                        ret = fcntl (out_fd, F_SETFL, flags & ~O_NONBLOCK);
+                }
+        }
+
+        while (count != 0) {
+                /* 
+                 * FIXME: what's the optimal size for reads and writes?
+                 */
+                size = (count > LIBGF_SENDFILE_BLOCK_SIZE) ? 
+                        LIBGF_SENDFILE_BLOCK_SIZE : count;
+
+                /* 
+                 * we don't wait for reply to previous read, we just send all
+                 * reads in a single go.
+                 */
+                ret = glusterfs_read_async (in_fd, size, off,
+                                            libgf_client_sendfile_read_cbk,
+                                            &cbk_data);
+                if (ret == -1) {
+                        break;
+                }
+
+                pthread_mutex_lock (&cbk_data.lock);
+                {
+                        cbk_data.reads_sent++;
+                }
+                pthread_mutex_unlock (&cbk_data.lock);
+
+                if (offset) {
+                        off += size;
+                }
+
+                count -= size;
+        }
+
+        pthread_mutex_lock (&cbk_data.lock);
+        {
+                /* 
+                 * if we've not received replies to all the reads we've sent,
+                 * wait for them
+                 */
+                if (cbk_data.reads_sent > cbk_data.reads_completed) {
+                        pthread_cond_wait (&cbk_data.cond,
+                                           &cbk_data.lock);
+                }
+        }
+        pthread_mutex_unlock (&cbk_data.lock);
+
+        if (offset != NULL) {
+                *offset = off;
+        }
+ 
+        /* if we were able to stack_wind all the reads */
+
+        if (ret == 0) {
+                ret = cbk_data.op_ret;
+                errno = cbk_data.op_errno;
+        }
+
+        if (non_block) {
+                fcntl (out_fd, F_SETFL, flags);
+        }
+
+        return ret;
+}
+
+
+static int32_t
+libgf_client_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                     int32_t op_ret, int32_t op_errno, struct flock *lock)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_lk_cbk_stub (frame, NULL, op_ret, op_errno,
+                                             lock);
+
+        LIBGF_REPLY_NOTIFY (local);
+
+        return 0;
+}
+
+
+int
+libgf_client_lk (libglusterfs_client_ctx_t *ctx, fd_t *fd, int cmd,
+                 struct flock *lock)
+{
+        call_stub_t          *stub = NULL;
+        int32_t               op_ret;
+        libgf_client_local_t *local = NULL;
+        
+        LIBGF_CLIENT_FOP(ctx, stub, lk, local, fd, cmd, lock);
+
+        op_ret = stub->args.lk_cbk.op_ret;
+        errno = stub->args.lk_cbk.op_errno;
+        if (op_ret == 0) {
+                *lock = stub->args.lk_cbk.lock;
+        }
+
+	call_stub_destroy (stub);
+        return op_ret;
+}
+
+
+int
+glusterfs_fcntl (glusterfs_file_t fd, int cmd, ...)
+{
+        int                           ret = -1;
+        struct flock                 *lock = NULL;
+        va_list                       ap;
+        libglusterfs_client_ctx_t    *ctx = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		goto out;
+        }
+
+        ctx = fd_ctx->ctx;
+
+        switch (cmd) {
+        case F_SETLK:
+        case F_SETLKW:
+        case F_GETLK:
+#if F_SETLK != F_SETLK64
+        case F_SETLK64:
+#endif
+#if F_SETLKW != F_SETLKW64
+        case F_SETLKW64:
+#endif
+#if F_GETLK != F_GETLK64
+        case F_GETLK64:
+#endif
+                va_start (ap, cmd);
+                lock = va_arg (ap, struct flock *);
+                va_end (ap);
+
+                if (!lock) {
+                        errno = EINVAL;
+                        goto out;
+                }
+
+                ret = libgf_client_lk (ctx, fd, cmd, lock); 
+                break;
+
+        default:
+                errno = EINVAL;
+                break;
+        }
+
+out:
+        return ret;
+}
+
+
+int
+libgf_client_chdir (const char *path)
+{
+        int                op_ret            = 0;
+        uint32_t           resulting_cwd_len = 0;
+
+        pthread_mutex_lock (&cwdlock);
+        {
+                if (!libgf_path_absolute (path)) {
+                        resulting_cwd_len = strlen (path) + strlen (cwd)
+                                + ((path[strlen (path) - 1] == '/')
+                                   ? 0 : 1) + 1;
+
+                        if (resulting_cwd_len > PATH_MAX) {
+                                op_ret = -1;
+                                errno = ENAMETOOLONG;
+                                goto unlock;
+                        }
+                        strcat (cwd, path);
+                } else {
+                        resulting_cwd_len = strlen (path)
+                                + ((path[strlen (path) - 1] == '/')
+                                   ? 0 : 1) + 1;
+                                
+                        if (resulting_cwd_len > PATH_MAX) {
+                                op_ret = -1;
+                                errno = ENAMETOOLONG;
+                                goto unlock;
+                        }
+
+                        strcpy (cwd, path);
+                }
+
+                if (cwd[strlen (cwd) - 1] != '/') {
+                        strcat (cwd, "/");
+                }
+        }
+unlock:
+        pthread_mutex_unlock (&cwdlock);
+
+        return op_ret;
+}
+
+
+int
+glusterfs_fchdir (glusterfs_file_t fd)
+{
+        int                           op_ret = -1;
+        char                          vpath[PATH_MAX];
+        char                          vmp[PATH_MAX]; 
+        char                         *res    = NULL;
+        libglusterfs_client_fd_ctx_t *fd_ctx = NULL;
+        glusterfs_handle_t            handle = NULL;
+        
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, fd, out);
+
+        /* FIXME: there is a race-condition between glusterfs_fchdir and
+           glusterfs_close. If two threads of application call glusterfs_fchdir
+           and glusterfs_close on the same fd, there is a possibility of
+           glusterfs_fchdir accessing freed memory of fd_ctx.
+        */
+
+        fd_ctx = libgf_get_fd_ctx (fd);
+        if (!fd_ctx) {
+                errno = EBADF;
+		goto out;
+        }
+
+        pthread_mutex_lock (&fd_ctx->lock);
+        {
+                handle = fd_ctx->ctx;
+                strcpy (vpath, fd_ctx->vpath);
+        }
+        pthread_mutex_unlock (&fd_ctx->lock);
+
+        if (vpath[0] == '\0') {
+                errno = ENOTDIR;
+                goto out;
+        }
+
+        res = libgf_vmp_search_vmp (handle, vmp, PATH_MAX);
+        if (res == NULL) {
+                errno = EBADF;
+                goto out;
+        }
+
+        /* both vmp and vpath are terminated with '/'. Also path starts with a
+           '/'. Hence the extra '/' amounts to NULL character at the end of the
+           string.
+        */
+        if ((strlen (vmp) + strlen (vpath)) > PATH_MAX) {
+                errno = ENAMETOOLONG;
+                goto out;
+        }
+
+        pthread_mutex_lock (&cwdlock);
+        {
+                strcpy (cwd, vmp);
+                res = vpath;
+                if (res[0] == '/') {
+                        res++;
+                }
+
+                strcat (cwd, res);
+        }
+        pthread_mutex_unlock (&cwdlock);
+
+        op_ret = 0; 
+out:
+        return op_ret;
+}
+
+
+int
+glusterfs_chdir (const char *path)
+{
+        int32_t            op_ret            = -1;
+        glusterfs_handle_t handle            = NULL;
+        loc_t              loc               = {0, };
+        char               vpath[PATH_MAX]; 
+
+        handle = libgf_resolved_path_handle (path, vpath);
+
+        if (handle != NULL)  {
+                loc.path = strdup (vpath);
+                if (!loc.path) {
+                        gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "Path compaction "
+                                "failed");
+                        goto out;
+                }
+
+                op_ret = libgf_client_path_lookup (&loc, handle, 0);
+        }
+
+        if ((handle == NULL) || (op_ret == 0)) {
+                op_ret = libgf_client_chdir (path);
+        }
+
+out:
+        return op_ret;
+}
+
+
+char *
+glusterfs_getcwd (char *buf, size_t size)
+{
+        char              *res      = NULL;
+        size_t             len      = 0; 
+        loc_t              loc      = {0, };
+        glusterfs_handle_t handle   = NULL;
+        char               vpath[PATH_MAX];
+        int32_t            op_ret   = 0; 
+
+        pthread_mutex_lock (&cwdlock);
+        {
+                if (!cwd_inited) {
+                        errno = ENODEV;
+                        goto unlock;
+                }
+
+                if (buf == NULL) {
+                        buf = CALLOC (1, len);
+                        if (buf == NULL) {
+                                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR,
+                                        "out of memory");
+                                goto unlock;
+                        }
+                } else {
+                        if (size == 0) {
+                                errno = EINVAL;
+                                goto unlock;
+                        }
+
+                        if (len > size) {
+                                errno = ERANGE;
+                                goto unlock;
+                        }
+                }
+
+                strcpy (buf, cwd);
+                res = buf; 
+        }
+unlock:
+        pthread_mutex_unlock (&cwdlock);
+
+        if (res != NULL) {
+                handle = libgf_resolved_path_handle (res, vpath);
+
+                if (handle != NULL)  {
+                        loc.path = strdup (vpath);
+                        if (loc.path == NULL) {
+                                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR,
+                                        "strdup failed");
+                        } else {
+                                op_ret = libgf_client_path_lookup (&loc, handle,
+                                                                   0);
+                                if (op_ret == -1) {
+                                        res = NULL;
+                                }
+                        }
+                }
+        }
+
+        return res;
+}
+
+int32_t
+libgf_client_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                           int32_t op_ret, int32_t op_errno,
+                           struct iatt *prebuf, struct iatt *postbuf)
+{
+        libgf_client_local_t *local = frame->local;
+
+        local->reply_stub = fop_truncate_cbk_stub (frame, NULL, op_ret,
+                                                   op_errno, prebuf, postbuf);
+
+        LIBGF_REPLY_NOTIFY (local);
+        return 0;
+}
+
+int32_t 
+libgf_client_truncate (libglusterfs_client_ctx_t *ctx, 
+                       loc_t *loc, off_t length)
+{
+        call_stub_t *stub = NULL;
+        int32_t op_ret = 0;
+        libgf_client_local_t *local = NULL;
+
+        LIBGF_CLIENT_FOP (ctx, stub, truncate, local, loc, length);
+ 
+        op_ret = stub->args.truncate_cbk.op_ret;
+        errno = stub->args.truncate_cbk.op_errno;
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path %s, status %d, errno %d",
+                loc->path, op_ret, errno);
+
+        if (op_ret == -1) {
+                goto out;
+        }
+
+        libgf_transform_iattr (ctx, loc->inode,
+                               &stub->args.truncate_cbk.postbuf);
+
+        libgf_update_iattr_cache (loc->inode, LIBGF_UPDATE_STAT,
+                                  &stub->args.truncate_cbk.postbuf);
+	call_stub_destroy (stub);
+
+out:
+        return op_ret;
+}
+
+int
+glusterfs_glh_truncate (glusterfs_handle_t handle, const char *path,
+                        off_t length)
+{
+        int32_t op_ret = -1;
+        loc_t loc = {0, };
+        libglusterfs_client_ctx_t *ctx = handle;
+	char *name = NULL, *pathname = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, ctx, out);
+        GF_VALIDATE_ABSOLUTE_PATH_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        loc.path = strdup (path);
+        if (!loc.path) {
+                gf_log (LIBGF_XL_NAME, GF_LOG_ERROR, "strdup failed");
+                goto out;
+        }
+
+	op_ret = libgf_client_path_lookup (&loc, ctx, 1);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient", GF_LOG_ERROR,
+			"path lookup failed for (%s)", loc.path);
+		goto out;
+	}
+
+	pathname = strdup (loc.path);
+	name = basename (pathname);
+
+        op_ret = libgf_client_loc_fill (&loc, ctx, 0, loc.parent->ino, name);
+	if (op_ret == -1) {
+		gf_log ("libglusterfsclient",
+			GF_LOG_ERROR,
+			"libgf_client_loc_fill returned -1, returning EINVAL");
+		errno = EINVAL;
+		goto out;
+	}
+
+        op_ret = libgf_client_truncate (ctx, &loc, length);
+
+out:
+        libgf_client_loc_wipe (&loc);
+
+        return op_ret;
+}
+
+int
+glusterfs_truncate (const char *path, off_t length)
+{
+        int                     op_ret = -1;
+        char                    vpath[PATH_MAX];
+        glusterfs_handle_t      h = NULL;
+
+        GF_VALIDATE_OR_GOTO (LIBGF_XL_NAME, path, out);
+
+        gf_log (LIBGF_XL_NAME, GF_LOG_DEBUG, "path:%s length:%"PRIu64, path,
+                length);
+        h = libgf_resolved_path_handle (path, vpath);
+        if (!h) {
+                errno = ENODEV;
+                goto out;
+        }
+
+        op_ret = glusterfs_glh_truncate (h, vpath, length);
+out:
+        return op_ret;
+}
+
+static struct xlator_fops libgf_client_fops = {
+};
+
+static struct xlator_cbks libgf_client_cbks = {
+        .forget      = libgf_client_forget,
+	.release     = libgf_client_release,
+	.releasedir  = libgf_client_releasedir,
+};
+
+static inline xlator_t *
+libglusterfs_graph (xlator_t *graph)
+{
+        int       ret = 0;
+        xlator_t *top = NULL;
+        xlator_list_t *xlchild, *xlparent;
+
+        top = CALLOC (1, sizeof (*top));
+        ERR_ABORT (top);
+
+        xlchild = CALLOC (1, sizeof(*xlchild));
+        ERR_ABORT (xlchild);
+        xlchild->xlator = graph;
+        top->children = xlchild;
+        top->ctx = graph->ctx;
+        top->next = graph;
+        top->name = strdup (LIBGF_XL_NAME);
+
+        xlparent = CALLOC (1, sizeof(*xlparent));
+        xlparent->xlator = top;
+        graph->parents = xlparent;
+        ret = asprintf (&top->type, LIBGF_XL_NAME);
+        if (-1 == ret) {
+                fprintf (stderr, "failed to set the top xl's type");
+        }
+
+        top->init = libgf_client_init;
+        top->fops = &libgf_client_fops;
+        top->mops = &libgf_client_mops;
+        top->cbks = &libgf_client_cbks; 
+        top->notify = libgf_client_notify;
+        top->fini = libgf_client_fini;
+        //  fill_defaults (top);
+
+        return top;
+}
diff --git a/libglusterfsclient/src/libglusterfsclient.h b/libglusterfsclient/src/libglusterfsclient.h
new file mode 100755
index 000000000..8209b571e
--- /dev/null
+++ b/libglusterfsclient/src/libglusterfsclient.h
@@ -0,0 +1,1372 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _LIBGLUSTERFSCLIENT_H
+#define _LIBGLUSTERFSCLIENT_H
+
+#ifndef __BEGIN_DECLS
+#ifdef __cplusplus
+#define __BEGIN_DECLS extern "C" {
+#else
+#define __BEGIN_DECLS
+#endif
+#endif
+
+#ifndef __END_DECLS
+#ifdef __cplusplus
+#define __END_DECLS }
+#else
+#define __END_DECLS
+#endif
+#endif
+
+
+__BEGIN_DECLS
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <sys/statfs.h>
+#include <sys/statvfs.h>
+#include <utime.h>
+#include <sys/time.h>
+#include <stdint.h>
+
+typedef struct {
+        struct iovec *vector;
+        int           count;
+        void         *iobref;
+        void         *dictref;
+} glusterfs_iobuf_t;
+
+
+typedef
+int (*glusterfs_readv_cbk_t) (int op_ret, int op_errno, glusterfs_iobuf_t *buf,
+			      void *cbk_data);
+
+typedef
+int (*glusterfs_write_cbk_t) (int op_ret, int op_errno, void *cbk_data);
+
+typedef
+int (*glusterfs_get_cbk_t) (int op_ret, int op_errno, glusterfs_iobuf_t *buf,
+			    struct stat *stbuf, void *cbk_data);
+
+
+/* Data Interface
+ * The first section describes the data structures required for
+ * using libglusterfsclient.
+ */
+
+/* This structure needs to be filled up and
+ * passed to te glusterfs_init function which uses
+ * the params passed herein to initialize a glusterfs
+ * client context and then connect to a glusterfs server.
+ */
+typedef struct {
+        char          *logfile;         /* Path to the file which will store
+                                           the log.
+                                           */
+        char          *loglevel;        /* The log level required for
+                                           reporting various events within
+                                           libglusterfsclient.
+                                           */
+        struct {
+                char  *specfile;        /* Users can either open a volume or
+                                           specfile and assign the pointer to
+                                           specfp, or just refer to the volume
+                                           /spec file path in specfile.
+                                           */
+                FILE  *specfp;
+        };
+        char          *volume_name;     /* The volume file could describe many
+                                           volumes but the specific volume
+                                           within that file is chosen by
+                                           specifying the volume name here.
+                                           */
+        unsigned long  lookup_timeout;  /* libglusterclient provides the inode
+                                           numbers to be cached by the library.
+                                           The duration for which these are
+                                           cached are defined by lookup_timeout
+                                           . In Seconds.
+                                           */
+        unsigned long  stat_timeout;    /* The file attributes received from
+                                           a stat syscall can also be cached
+                                           for the duration specified in this
+                                           member. In Seconds.
+                                           */
+} glusterfs_init_params_t;
+
+
+
+/* This is the handle returned by glusterfs_init
+ * once the initialization is complete.
+ * Users should treat this as an opaque handle.
+ */
+typedef void * glusterfs_handle_t;
+
+
+
+/* These identifiers are used as handles for files and dirs.
+ * Users of libglusterfsclient should not in anyway try to interpret
+ * the actual structures these will point to.
+ */
+typedef void * glusterfs_file_t;
+typedef void * glusterfs_dir_t;
+
+
+/* Function Call Interface */
+/* libglusterfsclient initialization function.
+ * @ctx : the structure described above filled with required values.
+ * @fakefsid: User generated fsid to be used to identify this
+ * volume.
+ *
+ * Returns NULL on failure and the non-NULL pointer on success.
+ * On failure, the error description might be present in the logfile
+ * depending on the log level.
+ */
+glusterfs_handle_t
+glusterfs_init (glusterfs_init_params_t *ctx, uint32_t fakefsid);
+
+
+
+/* Used to destroy a glusterfs client context and the
+ * connection to the glusterfs server.
+ *
+ * @handle      : The glusterfs handle returned by glusterfs_init.
+ */
+int
+glusterfs_fini (glusterfs_handle_t handle);
+
+
+
+/* libglusterfs client provides two interfaces.
+ * 1. handle-based interface
+ * Functions that comprise the handle-based interface accept the
+ * glusterfs_handle_t as the first argument. It specifies the
+ * glusterfs client context over which to perform the operation.
+ *
+ * 2. Virtual Mount Point based interface:
+ * Functions that do not require a handle to be given in order to
+ * identify which client context to operate on. This interface
+ * internally determines the corresponding client context for the
+ * given path. The down-side is that a virtual mount point (VMP) needs to be
+ * registered with the library. A VMP is just a string that maps to a
+ * glusterfs_handle_t. The advantage of a VMP based interface is that
+ * a user program using multiple client contexts does not need to
+ * maintain its own mapping between paths and the corresponding
+ * handles.
+ */
+
+
+
+/* glusterfs_mount is the function that allows users to register a VMP
+ * along with the parameters, which will be used to initialize a
+ * context. Applications calling glusterfs_mount do not need to
+ * initialized a context using the glusterfs_init interface.
+ *
+ * @vmp         : The virtual mount point.
+ * @ipars       : Initialization parameters populated as described
+ *              earlier.
+ *
+ * Returns 0 on success, and -1 on failure.
+ */
+int
+glusterfs_mount (char *vmp, glusterfs_init_params_t *ipars);
+
+
+
+/* glusterfs_umount is the VMP equivalent of glusterfs_fini.
+ *
+ * @vmp         : The VMP which was initialized using glusterfs_mount.
+ *
+ * Returns 0 on sucess, and -1 on failure.
+ */
+int
+glusterfs_umount (char *vmp);
+
+
+/* glusterfs_umount_all unmounts all the mounts */
+int
+glusterfs_umount_all (void);
+
+
+/* For smaller files, application can use just
+ * glusterfs_get/glusterfs_get_async
+ * to read the whole content. Limit of the file-sizes to be read in
+ * glusterfs_get/glusterfs_get_async is passed in the size argument
+ */
+
+/* glusterfs_glh_get:
+ * @handle : glusterfs handle
+ * @path   : path to be looked upon
+ * @size   : upper limit of file-sizes to be read in lookup
+ * @stbuf  : attribute buffer
+ */
+
+int
+glusterfs_glh_get (glusterfs_handle_t handle, const char *path, void *buf,
+	       size_t size, struct stat *stbuf);
+
+int
+glusterfs_get (const char *path, void *buf, size_t size, struct stat *stbuf);
+
+int
+glusterfs_get_async (glusterfs_handle_t handle, const char *path, size_t size,
+		     glusterfs_get_cbk_t cbk, void *cbk_data);
+
+
+
+/* Opens a file. Corresponds to the open syscall.
+ *
+ * @handle      : Handle returned from glusterfs_init
+ * @path        : Path to the file or directory on the glusterfs
+ *              export. Must be absolute to the export on the server.
+ * @flags       : flags to control open behaviour.
+ * @...         : The mode_t argument that defines the mode for a new
+ *              file, in case a new file is being created using the
+ *              O_CREAT flag in @flags.
+ *
+ * Returns a non-NULL handle on success. NULL on failure and sets
+ * errno accordingly.
+ */
+glusterfs_file_t
+glusterfs_glh_open (glusterfs_handle_t handle, const char *path, int flags,
+                        ...);
+
+
+/* Opens a file without having to specify a handle.
+ *
+ * @path        : Path to the file to open in the glusterfs export.
+ *              The path to the file in glusterfs export must be
+ *              pre-fixed with the VMP string registered with
+ *              glusterfs_mount.
+ * @flags       : flags to control open behaviour.
+ * @...         : The mode_t argument that defines the mode for a new
+ *              file, in case a new file is being created using the
+ *              O_CREAT flag in @flags.
+ *
+ * Returns 0 on success, -1 on failure with errno set accordingly.
+ */
+glusterfs_file_t
+glusterfs_open (const char *path, int flags, ...);
+
+
+
+/* Creates a file. Corresponds to the creat syscall.
+ *
+ * @handle      : Handle returned from glusterfs_init
+ * @path        : Path to the file that needs to be created in the
+ *              glusterfs export.
+ * @mode        : File creation mode.
+ *
+ * Returns the file handle on success. NULL on error with errno set as
+ * required.
+ */
+glusterfs_file_t
+glusterfs_glh_creat (glusterfs_handle_t handle, const char *path, mode_t mode);
+
+
+
+/* VMP-based creat.
+ * @path        : Path to the file to be created. Must be
+ *              pre-prepended with the VMP string registered with
+ *              glusterfs_mount.
+ * @mode        : File creation mode.
+ *
+ * Returns file handle on success. NULL handle on error with errno set
+ * accordingly.
+ */
+glusterfs_file_t
+glusterfs_creat (const char *path, mode_t mode);
+
+
+
+/* Close the file identified by the handle.
+ *
+ * @fd          : Closes the file.
+ *
+ * Returns 0 on success, -1 on error with errno set accordingly.
+ */
+int
+glusterfs_close (glusterfs_file_t fd);
+
+
+
+/* Get struct stat for the file in path.
+ *
+ * @handle      : The handle that identifies a glusterfs client
+ *              context.
+ * @path        : The file for which we need to get struct stat.
+ * @stbuf       : The buffer into which the file's stat is copied.
+ *
+ * Returns 0 on success and -1 on error with errno set accordingly.
+ */
+int
+glusterfs_glh_stat (glusterfs_handle_t handle, const char *path,
+                        struct stat *stbuf);
+
+
+/* Get struct stat for file in path.
+ *
+ * @path        : The file for which struct stat is required.
+ * @sbuf        : The buffer into which the stat structure is copied.
+ *
+ * Returns 0 on success and -1 on error with errno set accordingly.
+ */
+int
+glusterfs_stat (const char *path, struct stat *buf);
+
+
+
+/* Gets stat struct for the file.
+ *
+ * @handle      : The handle identifying a glusterfs client context.
+ * @path        : Path to the file for which stat structure is
+ *              required. If path is a symlink, the symlink is
+ *              interpreted and the stat structure returned for the
+ *              target of the link.
+ * @buf         : The buffer into which the stat structure is copied.
+ *
+ * Returns 0 on success and -1 on error with errno set accordingly.
+ */
+int
+glusterfs_glh_lstat (glusterfs_handle_t handle, const char *path,
+                        struct stat *buf);
+
+
+
+/* Gets stat struct for a file.
+ *
+ * @path        : The file to get the struct stat for.
+ * @buf         : The receiving struct stat buffer.
+ *
+ * Returns 0 on success and -1 on error with errno set accordingly.
+ */
+int
+glusterfs_lstat (const char *path, struct stat *buf);
+
+
+
+/* Get stat structure for a file.
+ *
+ * @fd          : The file handle identifying a file on the glusterfs
+ *              server.
+ * @stbuf       : The buffer into which the stat data is copied.
+ *
+ * Returns 0 on success and -1 on error with errno set accordingly.
+ */
+int
+glusterfs_fstat (glusterfs_file_t fd, struct stat *stbuf);
+
+int
+glusterfs_glh_setxattr (glusterfs_handle_t handle, const char *path,
+                                const char *name, const void *value,
+                                size_t size, int flags);
+
+int
+glusterfs_glh_lsetxattr (glusterfs_handle_t handle, const char *path,
+                         const char *name, const void *value, size_t size,
+                         int flags);
+
+int
+glusterfs_setxattr (const char *path, const char *name, const void *value,
+                        size_t size, int flags);
+
+int
+glusterfs_lsetxattr (const char *path, const char *name, const void *value,
+                     size_t size, int flags);
+
+int
+glusterfs_fsetxattr (glusterfs_file_t fd, const char *name, const void *value,
+                     size_t size, int flags);
+
+ssize_t
+glusterfs_glh_getxattr (glusterfs_handle_t handle, const char *path,
+		        const char *name, void *value, size_t size);
+
+ssize_t
+glusterfs_glh_lgetxattr (glusterfs_handle_t handle, const char *path,
+		         const char *name, void *value, size_t size);
+
+ssize_t
+glusterfs_getxattr (const char *path, const char *name, void *value,
+                        size_t size);
+
+ssize_t
+glusterfs_lgetxattr (const char *path, const char *name, void *value,
+                     size_t size);
+
+ssize_t
+glusterfs_fgetxattr (glusterfs_file_t fd, const char *name, void *value,
+		     size_t size);
+
+ssize_t
+glusterfs_listxattr (glusterfs_handle_t handle, const char *path, char *list,
+                     size_t size);
+
+ssize_t
+glusterfs_llistxattr (glusterfs_handle_t handle, const char *path, char *list,
+                      size_t size);
+
+ssize_t
+glusterfs_flistxattr (glusterfs_file_t fd, char *list, size_t size);
+
+int
+glusterfs_removexattr (glusterfs_handle_t handle, const char *path,
+		       const char *name);
+
+int
+glusterfs_lremovexattr (glusterfs_handle_t handle, const char *path,
+			const char *name);
+
+int
+glusterfs_fremovexattr (glusterfs_file_t fd, const char *name);
+
+
+
+/* Read data from a file.
+ * @fd          : Handle returned by glusterfs_open or
+ *              glusterfs_glh_open.
+ * @buf         : Buffer to read the data into.
+ * @nbytes      : Number of bytes to read.
+ *
+ * Returns number of bytes actually read on success or -1 on error
+ * with errno set to the appropriate error number.
+ */
+ssize_t
+glusterfs_read (glusterfs_file_t fd, void *buf, size_t nbytes);
+
+
+
+/* Read data into an array of buffers.
+ *
+ * @fd          : File handle returned by glusterfs_open or
+ *              glusterfs_glh_open.
+ * @vec         : Array of buffers into which the data is read.
+ * @count       : Number of iovecs referred to by vec.
+ *
+ * Returns number of bytes read on success or -1 on error with errno
+ * set appropriately.
+ */
+ssize_t
+glusterfs_readv (glusterfs_file_t fd, const struct iovec *vec, int count);
+
+int
+glusterfs_read_async (glusterfs_file_t fd, size_t nbytes, off_t offset,
+                      glusterfs_readv_cbk_t readv_cbk, void *cbk_data);
+
+
+
+/* Write data into a file.
+ *
+ * @fd          : File handle returned from glusterfs_open or
+ *              glusterfs_glh_open.
+ * @buf         : Buffer which is written to the file.
+ * @nbytes      : Number bytes of the @buf written to the file.
+ *
+ * On success, returns number of bytes written. On error, returns -1
+ * with errno set appropriately.
+ */
+ssize_t
+glusterfs_write (glusterfs_file_t fd, const void *buf, size_t nbytes);
+
+
+
+/* Writes an array of buffers into a file.
+ *
+ * @fd          : The file handle returned from glusterfs_open or
+ *              glusterfs_glh_open.
+ * @vector      : Array of buffers to be written to the file.
+ * @count       : Number of separate buffers in the @vector array.
+ *
+ * Returns number of bytes written on success or -1 on error with
+ * errno set approriately.
+ */
+ssize_t
+glusterfs_writev (glusterfs_file_t fd, const struct iovec *vector, int count);
+
+int
+glusterfs_write_async (glusterfs_file_t fd, const void *buf, size_t nbytes,
+                       off_t offset, glusterfs_write_cbk_t write_cbk,
+		       void *cbk_data);
+
+int
+glusterfs_writev_async (glusterfs_file_t fd, const struct iovec *vector,
+			int count, off_t offset,
+			glusterfs_write_cbk_t write_cbk, void *cbk_data);
+
+
+
+/* Read from a file starting at a given offset.
+ *
+ * @fd          : File handle returned from glusterfs_open or
+ *              glusterfs_glh_open.
+ * @buf         : Buffer to read the data into.
+ * @nbytes      : Number of bytes to read.
+ * @offset      : The offset to start reading @nbytes from.
+ *
+ * Returns number of bytes read on success or -1 on error with errno
+ * set appropriately.
+ */
+ssize_t
+glusterfs_pread (glusterfs_file_t fd, void *buf, size_t nbytes, off_t offset);
+
+
+
+/* Write to a file starting at a given offset.
+ *
+ * @fd          : Flie handle returned from glusterfs_open or
+ *              glusterfs_glh_open.
+ * @buf         : Buffer that will be written to the file.
+ * @nbytes      : Number of bytes to write from @buf.
+ * @offset      : The starting offset from where @nbytes will be
+ *              written.
+ *
+ * Returns number of bytes written on success and -1 on error with
+ * errno set appropriately.
+ */
+ssize_t
+glusterfs_pwrite (glusterfs_file_t fd, const void *buf, size_t nbytes,
+		  off_t offset);
+
+
+
+/* Seek to an offset in the file.
+ *
+ * @fd          : File handle in which to seek to. File handle
+ *              returned by glusterfs_open or glusterfs_glh_open.
+ * @offset      : Offset to seek to in the given file.
+ * @whence      : Determines how the offset is interpreted by this
+ *              syscall. The behaviour is similar to the options
+ *              provided by the POSIX lseek system call. See man lseek
+ *              for more details.
+ *
+ * On success, returns the resulting absolute offset in the file after the seek
+ * operation is performed. ON error, returns -1 with errno set
+ * appropriately.
+ */
+off_t
+glusterfs_lseek (glusterfs_file_t fd, off_t offset, int whence);
+
+
+
+/* Create a directory.
+ *
+ * @handle      : The handle of the glusterfs context in which the
+ *              directory needs to be created.
+ * @path        : The absolute path within the glusterfs context where
+ *              the directory needs to be created.
+ * @mode        : The mode bits for the newly created directory.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_mkdir (glusterfs_handle_t handle, const char *path, mode_t mode);
+
+
+
+/* Create a directory.
+ *
+ * @path        : Path to the directory that needs to be created. This
+ *              path must be prefixed with the VMP of the particular glusterfs
+ *              context.
+ * @mode        : Mode flags for the newly created directory.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_mkdir (const char *path, mode_t mode);
+
+
+
+/* Remove a directory.
+ *
+ * @handle      : Handle of the glusterfs context from which to remove
+ *              the directory.
+ * @path        : The path of the directory to be removed in the glusterfs
+ *              context.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_rmdir (glusterfs_handle_t handle, const char *path);
+
+
+
+/* Remove a directory.
+ *
+ * @path        : The absolute path to the directory to be removed.
+ *              This path must be pre-fixed with the VMP of the
+ *              particular glusterfs context in which this directory
+ *              resides.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_rmdir (const char *path);
+
+
+
+/* Read directory entries.
+ *
+ * @fd          : The handle of the directory to be read. This handle
+ *              is the one returned by opendir.
+ *
+ * Returns the directory entry on success and NULL pointer on error
+ * with errno set appropriately.
+ */
+void *
+glusterfs_readdir (glusterfs_dir_t dirfd);
+
+
+
+/* re-entrant version of glusterfs_readdir.
+ *
+ * @dirfd       : The handle of directory to be read. This handle is the one
+ *                returned by opendir.
+ * @entry       : Pointer to storage to store a directory entry. The storage
+ *                pointed to by entry shall be large enough for a dirent with 
+ *                an array of char d_name members containing at least
+ *                {NAME_MAX}+1 elements.
+ * @result      : Upon successful return, the pointer returned at *result shall
+ *                have the same value as the argument entry. Upon reaching the
+ *                end of the directory stream, this pointer shall have the
+ *                value NULL.
+ */
+int
+glusterfs_readdir_r (glusterfs_dir_t dirfd, struct dirent *entry,
+                     struct dirent **result);
+
+/* Close a directory handle.
+ *
+ * @fd          : The directory handle to be closed.
+ *
+ * Returns 0 on success and -1 on error with errno set to 0.
+ */
+int
+glusterfs_closedir (glusterfs_dir_t dirfd);
+/* FIXME: remove getdents */
+int
+glusterfs_getdents (glusterfs_dir_t fd, struct dirent *dirp,
+		    unsigned int count);
+
+
+
+/* Create device node.
+ *
+ * @handle      : glusterfs context in which to create the device
+ *              node.
+ * @pathname    : The absolute path of the device to be created in the
+ *              given glusterfs context.
+ *
+ * @mode        : Mode flags to apply to the newly created node.
+ * @dev         : Device numbers that will apply to the node.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_mknod(glusterfs_handle_t handle, const char *pathname,
+                        mode_t mode, dev_t dev);
+
+
+
+/* Create a device node.
+ *
+ * @pathname    : The full path of the node to be created. This path
+ *              should be pre-pended with the VMP of the glusterfs
+ *              context in which this node is to be created.
+ * @mode        : Mode flags that will be applied to the newly created
+ *              device file.
+ * @dev         : The device numbers that will be associated with the
+ *              device node.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_mknod(const char *pathname, mode_t mode, dev_t dev);
+
+
+
+/* Returns the real absolute path of the given path.
+ *
+ * @handle              : The glusterfs context in which the path resides in.
+ * @path                : The path to be resolved.
+ * @resolved_path       : The resolved path is stored in this buffer
+ *                      provided by the caller.
+ *
+ * Returns a pointer to resolved_path on success and NULL on error
+ * with errno set appropriately.
+ *
+ * See man realpath for details.
+ */
+char *
+glusterfs_glh_realpath (glusterfs_handle_t handle, const char *path,
+                        char *resolved_path);
+
+
+/* Returns the real absolute path of the given path.
+ *
+ * @path                : The path to be resolved. This path must be
+ *                      pre-fixed with the VMP of the glusterfs
+ *                      context in which the file resides.
+ *
+ * @resolved_path       : The resolved path is stored in this user
+ *                      provided buffer.
+ *
+ * Returns a pointer to resolved_path on success, and NULL on error
+ * with errno set appropriately.
+ */
+char *
+glusterfs_realpath (const char *path, char *resolved_path);
+
+
+
+/* Change mode flags on a path.
+ *
+ * @handle      : Handle of the glusterfs instance in which the path
+ *              resides.
+ * @path        : The path whose mode bits need to be changed.
+ * @mode        : The new mode bits.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_chmod (glusterfs_handle_t handle, const char *path, mode_t mode);
+
+
+
+/* Change mode flags on a path.
+ *
+ * @path        : The path whose mode bits need to be changed. The
+ *              path should be pre-fixed with the VMP that identifies the
+ *              glusterfs context within which the path resides.
+ * @mode        : The new mode bits.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_chmod (const char *path, mode_t mode);
+
+
+
+/* Change the owner of a path.
+ * If @path is a symlink, it is dereferenced and the ownership change
+ * happens on the target.
+ *
+ * @handle      : Handle of the glusterfs context in which the path
+ *              resides.
+ * @path        : The path whose owner needs to be changed.
+ * @owner       : ID of the new owner.
+ * @group       : ID of the new group.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_chown (glusterfs_handle_t handle, const char *path, uid_t owner,
+                        gid_t group);
+
+
+
+/* Change the owner of a path.
+ *
+ * If @path is a symlink, it is dereferenced and the ownership change
+ * happens on the target.
+ * @path        : The path whose owner needs to be changed. Path must
+ *              be pre-fixed with the VMP that identifies the
+ *              glusterfs context in which the path resides.
+ * @owner       : ID of the new owner.
+ * @group       : ID of the new group.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_chown (const char *path, uid_t owner, gid_t group);
+
+
+
+/* Change the owner of the file.
+ *
+ * @fd          : Handle of the file whose owner needs to be changed.
+ * @owner       : ID of the new owner.
+ * @group       : ID of the new group.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_fchown (glusterfs_file_t fd, uid_t owner, gid_t group);
+
+
+
+/* Open a directory.
+ *
+ * @handle      : Handle that identifies a glusterfs context.
+ * @path        : Path to the directory in the glusterfs context.
+ *
+ * Returns a non-NULL handle on success and NULL on failure with errno
+ * set appropriately.
+ */
+glusterfs_dir_t
+glusterfs_glh_opendir (glusterfs_handle_t handle, const char *path);
+
+
+
+/* Open a directory.
+ *
+ * @path        : Path to the directory. The path must be prepended
+ *              with the VMP in order to identify the glusterfs
+ *              context in which path resides.
+ *
+ * Returns a non-NULL handle on success and NULL on failure with errno
+ * set appropriately.
+ */
+glusterfs_dir_t
+glusterfs_opendir (const char *path);
+
+
+
+/* Change the mode bits on an open file.
+ *
+ * @fd          : The file whose mode bits need to be changed.
+ * @mode        : The new mode bits.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_fchmod (glusterfs_file_t fd, mode_t mode);
+
+
+
+/* Sync the file contents to storage.
+ *
+ * @fd          : The file whose contents need to be sync'ed to
+ *              storage.
+ *
+ * Return 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_fsync (glusterfs_file_t *fd);
+
+
+
+/* Truncate an open file.
+ *
+ * @fd          : The file to truncate.
+ * @length      : The length to truncate to.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_ftruncate (glusterfs_file_t fd, off_t length);
+
+
+
+/* Create a hard link between two paths.
+ *
+ * @handle      : glusterfs context in which both paths should reside.
+ * @oldpath     : The existing path to link to.
+ * @newpath     : The new path which will be linked to @oldpath.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_link (glusterfs_handle_t handle, const char *oldpath,
+                        const char *newpath);
+
+
+
+/* Create a hard link between two paths.
+ *
+ * @oldpath     : The existing path to link to.
+ * @newpath     : The new path which will be linked to @oldpath.
+ *
+ * Both paths should exist on the same glusterfs context and should be
+ * prefixed with the same VMP.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_link (const char *oldpath, const char *newpath);
+
+
+
+/* Get stats about the underlying file system.
+ *
+ * @handle      : Identifies the glusterfs context in which resides
+ *              the given path.
+ * @path        : stats are returned for the file system on which file
+ *              is located.
+ * @buf         : The buffer into which the stats are copied.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_statfs (glusterfs_handle_t handle, const char *path,
+                        struct statfs *buf);
+
+
+
+/* Get stats about the underlying file system.
+ *
+ * @path        : stats are returned for the file system on which file
+ *              is located. @path must start with the VMP of the
+ *              glusterfs context on which the file reside.
+ * @buf         : The buffer into which the stats are copied.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_statfs (const char *path, struct statfs *buf);
+
+
+
+/* Get stats about the underlying file system.
+ *
+ * @handle      : Identifies the glusterfs context in which resides
+ *              the given path.
+ * @path        : stats are returned for the file system on which file
+ *              is located.
+ * @buf         : The buffer into which the stats are copied.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_statvfs (glusterfs_handle_t handle, const char *path,
+                   struct statvfs *buf);
+
+
+
+/* Get stats about the underlying file system.
+ *
+ * @path        : stats are returned for the file system on which file
+ *              is located. @path must start with the VMP of the
+ *              glusterfs context on which the file reside.
+ * @buf         : The buffer into which the stats are copied.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_statvfs (const char *path, struct statvfs *buf);
+
+
+
+/* Set the atime and mtime values for a given path.
+ *
+ * @handle      : The handle identifying the glusterfs context.
+ * @path        : The path for which the times need to be changed.
+ * @times       : The array containing new time stamps for the file.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_utimes (glusterfs_handle_t handle, const char *path,
+                        const struct timeval times[2]);
+
+
+
+/* Set the atime and mtime values for a given path.
+ *
+ * @path        : The path for which the times need to be changed.
+ * @times       : The array containing new time stamps for the file.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_utimes (const char *path, const struct timeval times[2]);
+
+
+
+/* Set the atime and mtime values for a given path.
+ *
+ * @handle      : The handle identifying the glusterfs context.
+ * @path        : The path for which the times need to be changed.
+ * @buf         : The structure containing new time stamps for the file.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_utime (glusterfs_handle_t handle, const char *path,
+                        const struct utimbuf *buf);
+
+
+
+/* Set the atime and mtime values for a given path.
+ *
+ * @path        : The path for which the times need to be changed.
+ * @buf         : The structure containing new time stamps for the file.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_utime (const char *path, const struct utimbuf *buf);
+
+
+
+/*  Create  FIFO at the given path.
+ *
+ *  @handle     : The glusterfs context in which to create that FIFO.
+ *  @path       : The path within the context where the FIFO is to be
+ *              created.
+ * @mode        : The mode bits for the newly create FIFO.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_mkfifo (glusterfs_handle_t handle, const char *path,
+                        mode_t mode);
+
+
+
+/*  Create  FIFO at the given path.
+ *
+ *  @path       : The path within the context where the FIFO is to be
+ *              created. @path should begin with the VMP of the
+ *              glusterfs context in which the FIFO needs to be
+ *              created.
+ * @mode        : The mode bits for the newly create FIFO.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_mkfifo (const char *path, mode_t mode);
+
+
+
+/* Unlink a file.
+ *
+ * @handle      : Handle that identifies a glusterfs instance.
+ * @path        : Path in the glusterfs instance that needs to be
+ *              unlinked.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_unlink (glusterfs_handle_t handle, const char *path);
+
+
+
+/* Unlink a file.
+ *
+ * @path        : Path in the glusterfs instance that needs to be
+ *              unlinked.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_unlink (const char *path);
+
+
+
+/* Create a symbolic link.
+ *
+ * @handle      : The handle identifying the glusterfs context.
+ * @oldpath     : The existing path to which a symlink needs to be
+ *              created.
+ * @newpath     : The new path which will be symlinked to the
+ *              @oldpath.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_symlink (glusterfs_handle_t handle, const char *oldpath,
+                                const char *newpath);
+
+
+
+/* Create a symbolic link.
+ *
+ * @oldpath     : The existing path to which a symlink needs to be
+ *              created.
+ * @newpath     : The new path which will be symlinked to the
+ *              @oldpath.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_symlink (const char *oldpath, const char *newpath);
+
+
+
+/* Read a symbolic link.
+ *
+ * @handle      : Handle identifying the glusterfs context.
+ * @path        : The symlink that needs to be read.
+ * @buf         : The buffer into which the target of @path will be
+ *              stored.
+ * @bufsize     : Size of the buffer allocated to @buf.
+ *
+ * Returns number of bytes copied into @buf and -1 on error with errno
+ * set appropriately.
+ */
+ssize_t
+glusterfs_glh_readlink (glusterfs_handle_t handle, const char *path, char *buf,
+                                size_t bufsize);
+
+
+
+/* Read a symbolic link.
+ *
+ * @path        : The symlink that needs to be read.
+ * @buf         : The buffer into which the target of @path will be
+ *              stored.
+ * @bufsize     : Size of the buffer allocated to @buf.
+ *
+ * Returns number of bytes copied into @buf and -1 on error with errno
+ * set appropriately.
+ */
+ssize_t
+glusterfs_readlink (const char *path, char *buf, size_t bufsize);
+
+
+
+/* Rename a file or directory.
+ *
+ * @handle      : The identifier of a glusterfs context.
+ * @oldpath     : The path to be renamed.
+ * @newpath     : The new name for the @oldpath.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_rename (glusterfs_handle_t handle, const char *oldpath,
+                      const char *newpath);
+
+
+
+/* Rename a file or directory.
+ * @oldpath     : The path to be renamed.
+ * @newpath     : The new name for the @oldpath.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_rename (const char *oldpath, const char *newpath);
+
+
+
+/* Remove a file or directory in the given glusterfs context.
+ *
+ * @handle      : Handle identifying the glusterfs context.
+ * @path        : Path of the file or directory to be removed.
+ *
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_remove (glusterfs_handle_t handle, const char *path);
+
+
+
+/* Remove a file or directory.
+ *
+ * @path        : Path of the file or directory to be removed. The
+ *              path must be pre-fixed with the VMP.
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_remove (const char *path);
+
+
+
+/* Change the owner of the given path.
+ *
+ * If @path is a symlink, the ownership change happens on the symlink.
+ *
+ * @handle      : Handle identifying the glusterfs client context.
+ * @path        : Path whose owner needs to be changed.
+ * @owner       : New owner ID
+ * @group       : New Group ID
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+int
+glusterfs_glh_lchown (glusterfs_handle_t handle, const char *path, uid_t owner,
+                      gid_t group);
+
+
+
+/* Change the owner of the given path.
+ *
+ * If @path is a symlink, the ownership change happens on the symlink.
+ *
+ * @path        : Path whose owner needs to be changed.
+ * @owner       : New owner ID
+ * @group       : New Group ID
+ *
+ * Returns 0 on success and -1 on error with errno set appropriately.
+ */
+
+int
+glusterfs_lchown (const char *path, uid_t owner, gid_t group);
+
+
+
+/* Rewind directory stream pointer to beginning of the directory.
+ *
+ * @dirfd       : Directory handle returned by glusterfs_open on
+ *              glusterfs_opendir.
+ *
+ * Returns no value.
+ */
+void
+glusterfs_rewinddir (glusterfs_dir_t dirfd);
+
+
+
+/* Seek to the given offset in the directory handle.
+ *
+ * @dirfd       : Directory handle returned by glusterfs_open on
+ *              glusterfs_opendir.
+ * @offset      : The offset to seek to.
+ *
+ * Returns no value.
+ */
+void
+glusterfs_seekdir (glusterfs_dir_t dirfd, off_t offset);
+
+
+
+/* Return the current offset in a directory stream.
+ *
+ * @dirfd       : Directory handle returned by glusterfs_open on
+ *              glusterfs_opendir.
+ *
+ * Returns the offset in the directory or -1 on error with errno set
+ * appropriately.
+ */
+off_t
+glusterfs_telldir (glusterfs_dir_t dirfd);
+
+
+/* Write count bytes from in_fd to out_fd, starting at *offset.
+ * glusterfs_sendfile aims at eliminating memory copy at the end of
+ * each read from in_fd, copying the file directly to out_fd from the buffer 
+ * provided by glusterfs.
+ *
+ * @out_fd: file descriptor opened for writing
+ *
+ * @in_fd: glusterfs file handle to the file to be read from.
+ *
+ * @offset: If offset is not NULL, then it points to a variable holding the file
+ *          offset  from  which  glusterfs_sendfile()  will  start reading data
+ *          from in_fd.  When glusterfs_sendfile() returns, this variable will 
+ *          be set to the offset of the byte following the last byte that was 
+ *          read.  If offset is  not  NULL, then glusterfs_sendfile()  does  not
+ *          modify the current file offset of in_fd; otherwise the current file
+ *          offset is adjusted to reflect the number of bytes read from in_fd.
+ *
+ * @count:  number of bytes to copy between the file descriptors.
+ */
+
+ssize_t
+glusterfs_sendfile (int out_fd, glusterfs_file_t in_fd, off_t *offset,
+                    size_t count);
+
+/* manipulate file descriptor
+ * This api can have 3 forms similar to fcntl(2).
+ *
+ * int
+ * glusterfs_fcntl (glusterfs_file_t fd, int cmd)
+ *
+ * int
+ * glusterfs_fcntl (glusterfs_file_t fd, int cmd, long arg)
+ *
+ * int
+ * glusterfs_fcntl (glusterfs_file_t fd, int cmd, struct flock *lock)
+ *
+ * @fd   : file handle returned by glusterfs_open or glusterfs_create.
+ * @cmd  : Though the aim is to implement all possible commands supported by
+ *         fcntl(2), currently following commands are supported.
+ *         F_SETLK, F_SETLKW, F_GETLK -  used to acquire, release, and test for
+ *                                       the existence of record locks (also 
+ *                                       known as file-segment or file-region
+ *                                       locks). More detailed explanation is
+ *                                       found in 'man 2 fcntl'
+ */
+   
+int
+glusterfs_fcntl (glusterfs_file_t fd, int cmd, ...);
+
+/*
+ * Change the current working directory to @path
+ * 
+ * @path  : path to change the current working directory to.
+ *
+ * Returns 0 on success and -1 on failure with errno set appropriately.
+ */
+int
+glusterfs_chdir (const char *path);
+
+/*
+ * Change the current working directory to the path @fd is opened on.
+ *
+ * @fd   : current working directory will be changed to path @fd is opened on.
+ *
+ * Returns 0 on success and -1 on  with errno set appropriately.
+ */
+int
+glusterfs_fchdir (glusterfs_file_t fd);
+
+/* copies the current working directory into @buf if it is big enough
+ *
+ * @buf: buffer to copy into it. If @buf is NULL, a buffer will be allocated.
+ *       The size of the buffer will be @size if it is not zero, otherwise the
+ *       size will be big enough to hold the current working directory.
+ * @size: size of the buffer.
+ *
+ * Returns the pointer to buffer holding current working directory on success
+ * and NULL on failure.
+ */
+
+char *
+glusterfs_getcwd (char *buf, size_t size);
+
+/*
+ * Truncate the file to a specified length.
+ *
+ * @path   : path to the file.
+ * @length : length to which the file has to be truncated.
+ *
+ * Returns 0 on success and -1 on failure with errno set appropriately 
+ */
+
+int
+glusterfs_truncate (const char *path, off_t length);
+
+
+/* FIXME: review the need for these apis */
+/* added for log related initialization in booster fork implementation */
+void
+glusterfs_reset (void);
+
+void
+glusterfs_log_lock (void);
+
+void
+glusterfs_log_unlock (void);
+/* Used to free the glusterfs_read_buf passed to the application from
+   glusterfs_read_async_cbk
+*/
+void
+glusterfs_free (glusterfs_iobuf_t *buf);
+
+__END_DECLS
+
+#endif /* !_LIBGLUSTERFSCLIENT_H */
diff --git a/mod_glusterfs/Makefile.am b/mod_glusterfs/Makefile.am
new file mode 100644
index 000000000..0abe8dcfc
--- /dev/null
+++ b/mod_glusterfs/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = apache lighttpd
+
+CLEANFILES = 
diff --git a/xlators/features/protect/Makefile.am b/mod_glusterfs/apache/1.3/Makefile.am
index d471a3f92..d471a3f92 100644
--- a/xlators/features/protect/Makefile.am
+++ b/mod_glusterfs/apache/1.3/Makefile.am
diff --git a/mod_glusterfs/apache/1.3/src/Makefile.am b/mod_glusterfs/apache/1.3/src/Makefile.am
new file mode 100644
index 000000000..6bb3075f5
--- /dev/null
+++ b/mod_glusterfs/apache/1.3/src/Makefile.am
@@ -0,0 +1,30 @@
+mod_glusterfs_PROGRAMS = mod_glusterfs.so
+mod_glusterfsdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/apache/1.3
+
+mod_glusterfs_so_SOURCES = mod_glusterfs.c
+
+all: mod_glusterfs.so
+
+mod_glusterfs.so: $(top_srcdir)/mod_glusterfs/apache/1.3/src/mod_glusterfs.c $(top_builddir)/libglusterfsclient/src/libglusterfsclient.la
+	ln -sf $(top_srcdir)/mod_glusterfs/apache/1.3/src/mod_glusterfs.c $(top_builddir)/mod_glusterfs/apache/1.3/src/mod_glusterfs-build.c
+	$(APXS) -c -Wc,-g3 -Wc,-O0 -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -I$(top_srcdir)/libglusterfsclient/src -Wl,-rpath,$(libdir) -Wl,-rpath,$(top_builddir)/libglusterfsclient/src/.libs/ $(top_builddir)/libglusterfsclient/src/.libs/libglusterfsclient.so mod_glusterfs-build.c -o $(top_builddir)/mod_glusterfs/apache/1.3/src/mod_glusterfs.so
+
+$(top_builddir)/libglusterfsclient/src/libglusterfsclient.la:
+	$(MAKE) -C $(top_builddir)/libglusterfsclient/src/ all
+
+install-data-local:
+	@echo ""
+	@echo ""
+	@echo "**********************************************************************************"
+	@echo "* TO INSTALL MODGLUSTERFS, PLEASE USE,                                            "
+	@echo "* $(APXS) -n glusterfs -ia $(mod_glusterfsdir)/mod_glusterfs.so                   "
+	@echo "**********************************************************************************"
+	@echo ""
+	@echo ""
+
+#install:
+#	cp -fv mod_glusterfs.so $(HTTPD_LIBEXECDIR)
+#	cp -fv httpd.conf $(HTTPD_CONF_DIR)
+
+clean:
+	-rm -fv *.so *.o mod_glusterfs-build.c
diff --git a/mod_glusterfs/apache/1.3/src/README.txt b/mod_glusterfs/apache/1.3/src/README.txt
new file mode 100644
index 000000000..378a51d79
--- /dev/null
+++ b/mod_glusterfs/apache/1.3/src/README.txt
@@ -0,0 +1,107 @@
+What is mod_glusterfs?
+======================
+* mod_glusterfs is a module for apache written for efficient serving of files from glusterfs. 
+  mod_glusterfs interfaces with glusterfs using apis provided by libglusterfsclient.
+
+* this README speaks about installation of apache-1.3.x, where x is any minor version.
+
+Prerequisites for mod_glusterfs
+===============================
+Though mod_glusterfs has been written as a module, with an intent of making no changes to the way apache has 
+been built, currently following points have to be taken care of:
+
+* module "so" has to be enabled, for apache to support modules.
+* since glusterfs is compiled with _FILE_OFFSET_BITS=64 and __USE_FILE_OFFSET64 flags, mod_glusterfs and apache 
+  in turn have to be compiled with the above two flags.
+ 
+ $ tar xzvf apache-1.3.9.tar.gz
+ $ cd apache-1.3.9/
+ $ # add -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 to EXTRA_CFLAGS in src/Configuration.
+ $ ./configure --prefix=/usr --enable-module=so 
+ $ cd src
+ $ ./Configure 
+ $ cd ../
+ $ make install  
+ $ httpd -l | grep -i mod_so 
+   mod_so.c
+
+* if multiple apache installations are present, make sure to pass --with-apxs=/path/to/apxs/of/proper/version to configure script while building glusterfs.
+
+Build/Install mod_glusterfs
+===========================
+* mod_glusterfs is provided with glusterfs--mainline--3.0 and all releases from the same branch.
+
+* building glusterfs also builds mod_glusterfs. But 'make install' of glusterfs installs mod_glusterfs.so to 
+  glusterfs install directory instead of the apache modules directory.
+
+* 'make install' of glusterfs will print a message similar to the one given below, which is self explanatory. 
+  Make sure to use apxs of proper apache version in case of multiple apache installations. This will copy 
+  mod_glusterfs.so to modules directory of proper apache version and modify the appropriate httpd.conf to enable
+  mod_glusterfs. 
+
+**********************************************************************************************
+* TO INSTALL MODGLUSTERFS, PLEASE USE,                                            
+* apxs -n mod_glusterfs -ia /usr/lib/glusterfs/1.4.0pre2/apache-1.3/mod_glusterfs.so               
+**********************************************************************************************
+
+Configuration
+=============
+* Following configuration has to be added to httpd.conf.
+
+ <Location "/glusterfs">
+ 	   GlusterfsLogfile "/var/log/glusterfs/glusterfs.log"
+	   GlusterfsLoglevel "warning"
+ 	   GlusterfsVolumeSpecfile "/etc/glusterfs/glusterfs-client.spec"
+	   GlusterfsCacheTimeout "600"
+	   GlusterfsXattrFileSize "65536"
+ 	   SetHandler "glusterfs-handler"
+ </Location>
+
+* GlusterfsVolumeSpecfile (COMPULSORY)
+  Path to the the glusterfs volume specification file.
+
+* GlusterfsLogfile (COMPULSORY)
+  Path to the glusterfs logfile.
+
+* GlusterfsLoglevel (OPTIONAL, default = warning)
+  Severity of messages that are to be logged. Allowed values are critical, error, warning, debug, none 
+  in the decreasing order of severity.
+
+* GlusterfsCacheTimeOut (OPTIONAL, default = 0)
+  Timeout values for glusterfs stat and lookup cache.
+
+* GlusterfsXattrFileSize (OPTIONAL, default = 0)
+  Files with sizes upto and including this value are fetched through the extended attribute interface of 
+  glusterfs rather than the usual open-read-close set of operations. For files of small sizes, it is recommended 
+  to use extended attribute interface.
+
+* With the above configuration all the requests to httpd of the form www.example.org/glusterfs/path/to/file are 
+  served from glusterfs.
+
+Miscellaneous points
+====================
+* httpd by default runs with username "nobody" and group "nogroup". Permissions of logfile and specfile have to 
+  be set suitably.
+
+* Since mod_glusterfs runs with permissions of nobody.nogroup, glusterfs has to use only login based 
+  authentication. See docs/authentication.txt for more details. 
+
+* To copy the data served by httpd into glusterfs mountpoint, glusterfs can be started with the 
+  volume-specification file provided to mod_glusterfs. Any tool like cp can then be used.
+
+* To run in gdb, apache has to be compiled with -lpthread, since libglusterfsclient is multithreaded. 
+  If not on Linux gdb runs into errors like: 
+  "Error while reading shared library symbols:
+   Cannot find new threads: generic error"
+
+* when used with ib-verbs transport, ib_verbs initialization fails.
+  reason for this is that apache runs as non-privileged user and the amount of memory that can be 
+  locked by default is not sufficient for ib-verbs. to fix this, as root run,
+  
+  # ulimit -l unlimited
+
+  and then start apache.
+ 
+TODO
+====
+* directory listing for the directories accessed through mod_glusterfs.
diff --git a/mod_glusterfs/apache/1.3/src/mod_glusterfs.c b/mod_glusterfs/apache/1.3/src/mod_glusterfs.c
new file mode 100644
index 000000000..c1380a4fd
--- /dev/null
+++ b/mod_glusterfs/apache/1.3/src/mod_glusterfs.c
@@ -0,0 +1,507 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CORE_PRIVATE
+#define CORE_PRIVATE
+#endif
+
+#include <httpd.h>
+#include <http_config.h>
+#include <http_core.h>
+#include <http_request.h>
+#include <http_protocol.h>
+#include <http_log.h>
+#include <http_main.h>
+#include <util_script.h>
+#include <libglusterfsclient.h>
+#include <sys/uio.h>
+#include <pthread.h>
+
+#define GLUSTERFS_INVALID_LOGLEVEL "mod_glusterfs: Unrecognized log-level "\
+                                   "\"%s\", possible values are \"DEBUG|"\
+                                   "WARNING|ERROR|CRITICAL|NONE\"\n"
+
+#define GLUSTERFS_HANDLER "glusterfs-handler"
+#define GLUSTERFS_CHUNK_SIZE 131072 
+
+module MODULE_VAR_EXPORT glusterfs_module;
+
+/*TODO: verify error returns to server core */
+
+typedef struct glusterfs_dir_config {
+        char *logfile;
+        char *loglevel;
+        char *specfile;
+        char *mount_dir;
+        char *buf;
+        size_t xattr_file_size;
+        uint32_t cache_timeout;
+} glusterfs_dir_config_t;
+
+typedef struct glusterfs_async_local {
+        int op_ret;
+        int op_errno;
+        char async_read_complete;
+        off_t length;
+        off_t read_bytes;
+        glusterfs_iobuf_t *buf;
+        request_rec *request;
+        pthread_mutex_t lock;
+        pthread_cond_t cond;
+}glusterfs_async_local_t;
+
+#define GLUSTERFS_CMD_PERMS ACCESS_CONF
+
+static glusterfs_dir_config_t *
+mod_glusterfs_dconfig(request_rec *r)
+{
+        glusterfs_dir_config_t *dir_config = NULL;
+        if (r->per_dir_config != NULL) {
+                dir_config = ap_get_module_config (r->per_dir_config,
+                                                   &glusterfs_module);
+        }
+
+        return dir_config;
+}
+
+static 
+const char *add_xattr_file_size(cmd_parms *cmd, void *dummy, char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+        dir_config->xattr_file_size = atoi (arg);
+        return NULL;
+}
+
+static
+const char *set_cache_timeout(cmd_parms *cmd, void *dummy, char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+        dir_config->cache_timeout = atoi (arg);
+        return NULL;
+}
+
+static
+const char *set_loglevel(cmd_parms *cmd, void *dummy, char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+        char *error = NULL;
+        if (strncasecmp (arg, "DEBUG", strlen ("DEBUG")) 
+            && strncasecmp (arg, "WARNING", strlen ("WARNING")) 
+            && strncasecmp (arg, "CRITICAL", strlen ("CRITICAL")) 
+            && strncasecmp (arg, "NONE", strlen ("NONE")) 
+            && strncasecmp (arg, "ERROR", strlen ("ERROR")))
+                error = GLUSTERFS_INVALID_LOGLEVEL;
+        else
+                dir_config->loglevel = arg;
+
+        return error;
+}
+
+static 
+const char *add_logfile(cmd_parms *cmd, void *dummy, char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+        dir_config->logfile = arg;
+
+        return NULL;
+}
+
+static 
+const char *add_specfile(cmd_parms *cmd, void *dummy, char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+
+        dir_config->specfile = arg;
+
+        return NULL;
+}
+
+static void *
+mod_glusterfs_create_dir_config(pool *p, char *dirspec)
+{
+        glusterfs_dir_config_t *dir_config = NULL;
+
+        dir_config = (glusterfs_dir_config_t *) ap_pcalloc(p,
+                                                           sizeof(*dir_config));
+
+        dir_config->mount_dir = dirspec;
+        dir_config->logfile = dir_config->specfile = (char *)0;
+        dir_config->loglevel = "warning";
+        dir_config->cache_timeout = 0;
+        dir_config->buf = NULL;
+
+        return (void *) dir_config;
+}
+
+static void 
+mod_glusterfs_child_init(server_rec *s, pool *p)
+{
+        void **urls = NULL;
+        int n, i;
+        core_server_config *mod_core_config = ap_get_module_config (s->module_config,
+                                                                    &core_module);
+        glusterfs_dir_config_t *dir_config = NULL;
+        glusterfs_init_params_t params = {0, };
+  
+        n = mod_core_config->sec_url->nelts;
+        urls = (void **)mod_core_config->sec_url->elts;
+        for (i = 0; i < n; i++) {
+                dir_config = ap_get_module_config (urls[i], &glusterfs_module);
+
+                if (dir_config) {
+                        memset (&params, 0, sizeof (params));
+
+                        params.logfile = dir_config->logfile;
+                        params.loglevel = dir_config->loglevel;
+                        params.lookup_timeout = dir_config->cache_timeout;
+                        params.stat_timeout = dir_config->cache_timeout;
+                        params.specfile = dir_config->specfile;
+
+                        glusterfs_mount (dir_config->mount_dir, &params);
+                }
+                dir_config = NULL;
+        }
+}
+
+static void 
+mod_glusterfs_child_exit(server_rec *s, pool *p)
+{
+        void **urls = NULL;
+        int n, i;
+        core_server_config *mod_core_config = NULL;
+        glusterfs_dir_config_t *dir_config = NULL;
+  
+        mod_core_config = ap_get_module_config (s->module_config, &core_module);
+        n = mod_core_config->sec_url->nelts;
+        urls = (void **)mod_core_config->sec_url->elts;
+        for (i = 0; i < n; i++) {
+                dir_config = ap_get_module_config (urls[i], &glusterfs_module);
+                if (dir_config) {
+                        glusterfs_umount (dir_config->mount_dir);
+                }
+        }
+}
+
+static int mod_glusterfs_fixup(request_rec *r)
+{
+        glusterfs_dir_config_t *dir_config = NULL;
+        int access_status;
+        int ret;
+        char *path = NULL;
+
+        dir_config = mod_glusterfs_dconfig(r);
+
+        if (dir_config && dir_config->mount_dir
+            && !(strncmp (ap_pstrcat (r->pool, dir_config->mount_dir, "/",
+                                      NULL),
+                          r->uri, strlen (dir_config->mount_dir) + 1)
+                 && !r->handler)) 
+                r->handler = ap_pstrdup (r->pool, GLUSTERFS_HANDLER);
+
+        if (!r->handler || (r->handler && strcmp (r->handler,
+                                                  GLUSTERFS_HANDLER)))
+                return DECLINED;
+
+        path = r->uri;
+
+        memset (&r->finfo, 0, sizeof (r->finfo));
+
+        dir_config->buf = calloc (1, dir_config->xattr_file_size);
+        if (!dir_config->buf) {
+                return HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ret = glusterfs_get (path, dir_config->buf, 
+                             dir_config->xattr_file_size, &r->finfo);
+
+        if (ret == -1 || r->finfo.st_size > dir_config->xattr_file_size
+            || S_ISDIR (r->finfo.st_mode)) {
+                free (dir_config->buf);
+                dir_config->buf = NULL;
+
+                if (ret == -1) {
+                        int error = HTTP_NOT_FOUND;
+                        char *emsg = NULL;
+                        if (r->path_info == NULL) {
+                                emsg = ap_pstrcat(r->pool, strerror (errno),
+                                                  r->filename, NULL);
+                        }
+                        else {
+                                emsg = ap_pstrcat(r->pool, strerror (errno),
+                                                  r->filename, r->path_info,
+                                                  NULL);
+                        }
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
+                                      "%s", emsg);
+                        if (errno != ENOENT) {
+                                error = HTTP_INTERNAL_SERVER_ERROR;
+                        }
+                        return error;
+                }
+        }
+    
+        if (r->uri && strlen (r->uri) && r->uri[strlen(r->uri) - 1] == '/') 
+                r->handler = NULL;
+
+        r->filename = ap_pstrcat (r->pool, r->filename, r->path_info, NULL);
+
+        if ((access_status = ap_find_types(r)) != 0) {
+                return DECLINED;
+        }
+
+        return OK;
+}
+
+
+int 
+mod_glusterfs_readv_async_cbk (int32_t op_ret, int32_t op_errno,
+                               glusterfs_iobuf_t *buf, void *cbk_data)
+{
+        glusterfs_async_local_t *local = cbk_data;
+
+        pthread_mutex_lock (&local->lock);
+        {
+                local->async_read_complete = 1;
+                local->buf = buf;
+                local->op_ret = op_ret;
+                local->op_errno = op_errno;
+                pthread_cond_signal (&local->cond);
+        }
+        pthread_mutex_unlock (&local->lock);
+
+        return 0;
+}
+
+/* use read_async just to avoid memcpy of read buffer in libglusterfsclient */
+static int
+mod_glusterfs_read_async (request_rec *r, glusterfs_file_t fd, off_t offset,
+                          off_t length)
+{
+        glusterfs_async_local_t local;
+        off_t end;
+        int nbytes;
+        int complete;
+        pthread_cond_init (&local.cond, NULL);
+        pthread_mutex_init (&local.lock, NULL);
+  
+        memset (&local, 0, sizeof (local));
+        local.request = r;
+
+        if (length > 0)
+                end = offset + length;
+
+        do {
+                glusterfs_iobuf_t *buf;
+                int i;
+                if (length > 0) {
+                        nbytes = end - offset;
+                        if (nbytes > GLUSTERFS_CHUNK_SIZE)
+                                nbytes = GLUSTERFS_CHUNK_SIZE;
+                } else
+                        nbytes = GLUSTERFS_CHUNK_SIZE;
+
+                glusterfs_read_async(fd, 
+                                     nbytes,
+                                     offset,
+                                     mod_glusterfs_readv_async_cbk,
+                                     (void *)&local);
+
+                pthread_mutex_lock (&local.lock);
+                {
+                        while (!local.async_read_complete) {
+                                pthread_cond_wait (&local.cond, &local.lock);
+                        }
+
+                        local.async_read_complete = 0;
+                        buf = local.buf;
+
+                        if (length < 0)
+                                complete = (local.op_ret <= 0);
+                        else {
+                                local.read_bytes += local.op_ret;
+                                complete = ((local.read_bytes == length) 
+                                            || (local.op_ret < 0));
+                        }
+                }
+                pthread_mutex_unlock (&local.lock);
+
+                for (i = 0; i < buf->count; i++) {
+                        if (ap_rwrite (buf->vector[i].iov_base,
+                                       buf->vector[i].iov_len, r) < 0) {
+                                local.op_ret = -1;
+                                complete = 1;
+                                break;
+                        }
+                }      
+
+                glusterfs_free (buf);
+
+                offset += nbytes;
+        } while (!complete);
+
+        return (local.op_ret < 0 ? SERVER_ERROR : OK);
+}
+
+static int 
+mod_glusterfs_handler(request_rec *r)
+{
+        glusterfs_dir_config_t *dir_config;
+        char *path = NULL;
+        int error = OK;
+        int rangestatus = 0;
+        int errstatus = OK;
+        glusterfs_file_t fd;
+  
+        if (!r->handler || (r->handler && strcmp (r->handler,
+                                                  GLUSTERFS_HANDLER)))
+                return DECLINED;
+
+        if (r->uri[0] == '\0' || r->uri[strlen(r->uri) - 1] == '/') {
+                return DECLINED;
+        }
+  
+        dir_config = mod_glusterfs_dconfig (r);
+  
+        if (r->method_number != M_GET) {
+                return METHOD_NOT_ALLOWED;
+        }
+
+        ap_update_mtime(r, r->finfo.st_mtime);
+        ap_set_last_modified(r);
+        ap_set_etag(r);
+        ap_table_setn(r->headers_out, "Accept-Ranges", "bytes");
+        if (((errstatus = ap_meets_conditions(r)) != OK)
+            || (errstatus = ap_set_content_length(r, r->finfo.st_size))) {
+                return errstatus;
+        }
+        rangestatus =  ap_set_byterange(r);
+        ap_send_http_header(r);
+
+        if (r->finfo.st_size <= dir_config->xattr_file_size && dir_config->buf) {
+                if (!r->header_only) {
+                        error = OK;
+                        ap_log_rerror (APLOG_MARK, APLOG_NOTICE, r, 
+                                       "fetching data from glusterfs through "
+                                       "xattr interface\n");
+      
+                        if (!rangestatus) {
+                                if (ap_rwrite (dir_config->buf,
+                                               r->finfo.st_size, r) < 0) {
+                                        error = HTTP_INTERNAL_SERVER_ERROR;
+                                }
+                        } else {
+                                long offset, length;
+                                while (ap_each_byterange (r, &offset, &length)) {
+                                        if (ap_rwrite (dir_config->buf + offset,
+                                                       length, r) < 0) {
+                                                error = HTTP_INTERNAL_SERVER_ERROR;
+                                                break;
+                                        }
+                                }
+                        }
+                }
+
+                free (dir_config->buf);
+                dir_config->buf = NULL;
+
+                return error;
+        }
+
+        path = r->uri;
+        fd = glusterfs_open (path , O_RDONLY, 0);
+  
+        if (fd == 0) {
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+                              "file permissions deny server access: %s",
+                              r->filename);
+                return FORBIDDEN;
+        }
+  
+        if (!r->header_only) {
+                if (!rangestatus) {
+                        mod_glusterfs_read_async (r, fd, 0, -1);
+                } else {
+                        long offset, length;
+                        while (ap_each_byterange(r, &offset, &length)) {
+                                mod_glusterfs_read_async (r, fd, offset, length);
+                        }
+                }
+        }
+  
+        glusterfs_close (fd);
+        return error;
+}
+
+static const command_rec mod_glusterfs_cmds[] =
+{
+        {"GlusterfsLogfile", add_logfile, NULL,
+         GLUSTERFS_CMD_PERMS, TAKE1,
+         "Glusterfs Logfile"},
+        {"GlusterfsLoglevel", set_loglevel, NULL,
+         GLUSTERFS_CMD_PERMS, TAKE1,
+         "Glusterfs Loglevel:anyone of none, critical, error, warning, debug"},
+        {"GlusterfsCacheTimeout", set_cache_timeout, NULL,
+         GLUSTERFS_CMD_PERMS, TAKE1,
+         "Timeout value in seconds for caching lookups and stats"},
+        {"GlusterfsVolumeSpecfile", add_specfile, NULL,
+         GLUSTERFS_CMD_PERMS, TAKE1,
+         "Glusterfs Specfile required to access contents of this directory"},
+        {"GlusterfsXattrFileSize", add_xattr_file_size, NULL, 
+         GLUSTERFS_CMD_PERMS, TAKE1,
+         "Maximum size of the file to be fetched using xattr interface of "
+         "glusterfs"},
+        {NULL}
+};
+
+static const handler_rec mod_glusterfs_handlers[] =
+{
+        {GLUSTERFS_HANDLER, mod_glusterfs_handler},
+        {NULL}
+};
+
+module glusterfs_module =
+{
+        STANDARD_MODULE_STUFF,
+        NULL, 
+        mod_glusterfs_create_dir_config,  /* per-directory config creator */
+        NULL,
+        NULL,       /* server config creator */
+        NULL,        /* server config merger */
+        mod_glusterfs_cmds,               /* command table */
+        mod_glusterfs_handlers,           /* [7] list of handlers */
+        NULL,  /* [2] filename-to-URI translation */
+        NULL,      /* [5] check/validate user_id */
+        NULL,       /* [6] check user_id is valid *here* */
+        NULL,     /* [4] check access by host address */
+        NULL,       /* [7] MIME type checker/setter */
+        mod_glusterfs_fixup,        /* [8] fixups */
+        NULL,             /* [10] logger */
+#if MODULE_MAGIC_NUMBER >= 19970103
+        NULL,      /* [3] header parser */
+#endif
+#if MODULE_MAGIC_NUMBER >= 19970719
+        mod_glusterfs_child_init,         /* process initializer */
+#endif
+#if MODULE_MAGIC_NUMBER >= 19970728
+        mod_glusterfs_child_exit,         /* process exit/cleanup */
+#endif
+#if MODULE_MAGIC_NUMBER >= 19970902
+        NULL   /* [1] post read_request handling */
+#endif
+};
diff --git a/xlators/features/index/Makefile.am b/mod_glusterfs/apache/2.2/Makefile.am
index a985f42a8..d471a3f92 100644
--- a/xlators/features/index/Makefile.am
+++ b/mod_glusterfs/apache/2.2/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = src
 
-CLEANFILES =
+CLEANFILES = 
diff --git a/mod_glusterfs/apache/2.2/src/Makefile.am b/mod_glusterfs/apache/2.2/src/Makefile.am
new file mode 100644
index 000000000..1e8f3a31e
--- /dev/null
+++ b/mod_glusterfs/apache/2.2/src/Makefile.am
@@ -0,0 +1,31 @@
+mod_glusterfs_PROGRAMS = mod_glusterfs.so
+mod_glusterfsdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/apache/2.2
+
+mod_glusterfs_so_SOURCES = mod_glusterfs.c
+
+all: mod_glusterfs.so
+
+mod_glusterfs.so: $(top_srcdir)/mod_glusterfs/apache/2.2/src/mod_glusterfs.c $(top_builddir)/libglusterfsclient/src/libglusterfsclient.la
+	ln -sf $(top_srcdir)/mod_glusterfs/apache/2.2/src/mod_glusterfs.c $(top_builddir)/mod_glusterfs/apache/2.2/src/mod_glusterfs-build.c
+	$(APXS) -c -o mod_glusterfs.la -Wc,-g3 -Wc,-O0 -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -I$(top_srcdir)/libglusterfsclient/src -L$(top_builddir)/libglusterfsclient/src/.libs/ -lglusterfsclient mod_glusterfs-build.c 
+	-ln -sf .libs/mod_glusterfs.so mod_glusterfs.so
+
+$(top_builddir)/libglusterfsclient/src/libglusterfsclient.la:
+	$(MAKE) -C $(top_builddir)/libglusterfsclient/src/ all
+
+install-data-local:
+	@echo ""
+	@echo ""
+	@echo "**********************************************************************************"
+	@echo "* TO INSTALL MODGLUSTERFS, PLEASE USE,                                            "
+	@echo "* $(APXS) -n glusterfs -ia $(mod_glusterfsdir)/mod_glusterfs.so                "
+	@echo "**********************************************************************************"
+	@echo ""
+	@echo ""
+
+#install:
+#	cp -fv mod_glusterfs.so $(HTTPD_LIBEXECDIR)
+#	cp -fv httpd.conf $(HTTPD_CONF_DIR)
+
+clean:
+	rm -fv *.so *.o
diff --git a/mod_glusterfs/apache/2.2/src/README.txt b/mod_glusterfs/apache/2.2/src/README.txt
new file mode 100644
index 000000000..214a2535b
--- /dev/null
+++ b/mod_glusterfs/apache/2.2/src/README.txt
@@ -0,0 +1,105 @@
+What is mod_glusterfs?
+======================
+* mod_glusterfs is a module for apache written for efficient serving of files from glusterfs. 
+  mod_glusterfs interfaces with glusterfs using apis provided by libglusterfsclient.
+
+* this README speaks about installing mod_glusterfs for httpd-2.2 and higher.
+
+Prerequisites for mod_glusterfs
+===============================
+Though mod_glusterfs has been written as a module, with an intent of making no changes to 
+the way apache has been built, currently following points have to be taken care of:
+
+* since glusterfs is compiled with _FILE_OFFSET_BITS=64 and __USE_FILE_OFFSET64 flags, mod_glusterfs and apache 
+  in turn have to be compiled with the above two flags.
+ 
+ $ tar xzf httpd-2.2.10.tar.gz 
+ $ cd httpd-2.2.10/
+ $ export CFLAGS='-D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64'
+ $ ./configure --prefix=/usr 
+ $ make 
+ $ make install
+ $ httpd -l | grep -i mod_so 
+   mod_so.c
+
+* if multiple apache installations are present, make sure to pass --with-apxs=/path/to/apxs/of/proper/version 
+  to configure script while building glusterfs.
+
+Build/Install mod_glusterfs
+===========================
+* mod_glusterfs is provided with glusterfs--mainline--3.0 and all releases from the same branch.
+
+* building glusterfs also builds mod_glusterfs. But 'make install' of glusterfs installs mod_glusterfs.so to 
+  glusterfs install directory instead of the apache modules directory.
+
+* 'make install' of glusterfs will print a message similar to the one given below, which is self explanatory. 
+  Make sure to use apxs of proper apache version in case of multiple apache installations. This will copy 
+  mod_glusterfs.so to modules directory of proper apache version and modify the appropriate httpd.conf to enable
+  mod_glusterfs. 
+
+**********************************************************************************
+* TO INSTALL MODGLUSTERFS, PLEASE USE,                                            
+* apxs -n glusterfs -ia /usr/lib/glusterfs/2.0.0rc4/apache/2.2/mod_glusterfs.so                
+**********************************************************************************
+
+Configuration
+=============
+* Following configuration has to be added to httpd.conf.
+
+ <Location "/glusterfs">
+ 	   GlusterfsLogfile "/var/log/glusterfs/glusterfs.log"
+	   GlusterfsLoglevel "warning"
+ 	   GlusterfsVolumeSpecfile "/etc/glusterfs/glusterfs-client.spec"
+	   GlusterfsCacheTimeout "600"
+	   GlusterfsXattrFileSize "65536"
+ 	   SetHandler "glusterfs-handler"
+ </Location>
+
+* GlusterfsVolumeSpecfile (COMPULSORY)
+  Path to the the glusterfs volume specification file.
+
+* GlusterfsLogfile (COMPULSORY)
+  Path to the glusterfs logfile.
+
+* GlusterfsLoglevel (OPTIONAL, default = warning)
+  Severity of messages that are to be logged. Allowed values are critical, error, warning, debug, none 
+  in the decreasing order of severity.
+
+* GlusterfsCacheTimeOut (OPTIONAL, default = 0)
+  Timeout values for glusterfs stat and lookup cache.
+
+* GlusterfsXattrFileSize (OPTIONAL, default = 0)
+  Files with sizes upto and including this value are fetched through the extended attribute interface of 
+  glusterfs rather than the usual open-read-close set of operations. For files of small sizes, it is recommended 
+  to use extended attribute interface.
+
+* With the above configuration all the requests to httpd of the form www.example.org/glusterfs/path/to/file are 
+  served from glusterfs.
+
+* mod_glusterfs also implements mod_dir and mod_autoindex behaviour for files under glusterfs mount.
+  Hence it also takes the directives related to both of these modules. For more details, refer the 
+  documentation for both of these modules. 
+
+Miscellaneous points
+====================
+* httpd by default runs with username "nobody" and group "nogroup". Permissions of logfile and specfile have to 
+  be set suitably.
+
+* Since mod_glusterfs runs with permissions of nobody.nogroup, glusterfs has to use only login based 
+  authentication. See docs/authentication.txt for more details. 
+
+* To copy the data served by httpd into glusterfs mountpoint, glusterfs can be started with the 
+  volume-specification file provided to mod_glusterfs. Any tool like cp can then be used.
+
+* To run in gdb, apache has to be compiled with -lpthread, since libglusterfsclient is 
+  multithreaded. If not on Linux gdb runs into errors like: 
+  "Error while reading shared library symbols:
+   Cannot find new threads: generic error"
+
+* when used with ib-verbs transport, ib_verbs initialization fails.
+  reason for this is that apache runs as non-privileged user and the amount of memory that can be 
+  locked by default is not sufficient for ib-verbs. to fix this, as root run,
+  
+  # ulimit -l unlimited
+
+  and then start apache.
diff --git a/mod_glusterfs/apache/2.2/src/mod_glusterfs.c b/mod_glusterfs/apache/2.2/src/mod_glusterfs.c
new file mode 100644
index 000000000..d2b9f3232
--- /dev/null
+++ b/mod_glusterfs/apache/2.2/src/mod_glusterfs.c
@@ -0,0 +1,3627 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CORE_PRIVATE
+#define CORE_PRIVATE
+#endif
+
+#ifndef NO_CONTENT_TYPE
+#define NO_CONTENT_TYPE "none"
+#endif
+
+#define BYTERANGE_FMT "%" APR_OFF_T_FMT "-%" APR_OFF_T_FMT "/%" APR_OFF_T_FMT
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <httpd.h>
+#include <http_config.h>
+#include <http_core.h>
+#include <http_request.h>
+#include <http_protocol.h>
+#include <http_log.h>
+#include <http_main.h>
+#include <util_script.h>
+#include <util_filter.h>
+#include <libglusterfsclient.h>
+#include <sys/uio.h>
+#include <pthread.h>
+#include <apr.h>
+#include <apr_strings.h>
+#include <apr_buckets.h>
+#include <apr_fnmatch.h>
+#include <apr_lib.h>
+
+#define GLUSTERFS_INVALID_LOGLEVEL "mod_glfs: Unrecognized log-level \"%s\", "\
+                                   " possible values are \"DEBUG|WARNING|"\
+                                   "ERROR|CRITICAL|NONE\"\n"
+
+#define GLUSTERFS_HANDLER "glusterfs-handler"
+#define GLUSTERFS_CHUNK_SIZE 131072 
+
+static char c_by_encoding, c_by_type, c_by_path;
+
+#define BY_ENCODING &c_by_encoding
+#define BY_TYPE &c_by_type
+#define BY_PATH &c_by_path
+
+module AP_MODULE_DECLARE_DATA glusterfs_module;
+extern module core_module;
+
+#define NO_OPTIONS          (1 <<  0)  /* Indexing options */
+#define ICONS_ARE_LINKS     (1 <<  1)
+#define SCAN_HTML_TITLES    (1 <<  2)
+#define SUPPRESS_ICON       (1 <<  3)
+#define SUPPRESS_LAST_MOD   (1 <<  4)
+#define SUPPRESS_SIZE       (1 <<  5)
+#define SUPPRESS_DESC       (1 <<  6)
+#define SUPPRESS_PREAMBLE   (1 <<  7)
+#define SUPPRESS_COLSORT    (1 <<  8)
+#define SUPPRESS_RULES      (1 <<  9)
+#define FOLDERS_FIRST       (1 << 10)
+#define VERSION_SORT        (1 << 11)
+#define TRACK_MODIFIED      (1 << 12)
+#define FANCY_INDEXING      (1 << 13)
+#define TABLE_INDEXING      (1 << 14)
+#define IGNORE_CLIENT       (1 << 15)
+#define IGNORE_CASE         (1 << 16)
+#define EMIT_XHTML          (1 << 17)
+#define SHOW_FORBIDDEN      (1 << 18)
+
+#define K_NOADJUST 0
+#define K_ADJUST 1
+#define K_UNSET 2
+
+/*
+ * Define keys for sorting.
+ */
+#define K_NAME 'N'              /* Sort by file name (default) */
+#define K_LAST_MOD 'M'          /* Last modification date */
+#define K_SIZE 'S'              /* Size (absolute, not as displayed) */
+#define K_DESC 'D'              /* Description */
+#define K_VALID "NMSD"          /* String containing _all_ valid K_ opts */
+
+#define D_ASCENDING 'A'
+#define D_DESCENDING 'D'
+#define D_VALID "AD"            /* String containing _all_ valid D_ opts */
+
+/*
+ * These are the dimensions of the default icons supplied with Apache.
+ */
+#define DEFAULT_ICON_WIDTH 20
+#define DEFAULT_ICON_HEIGHT 22
+
+/*
+ * Other default dimensions.
+ */
+#define DEFAULT_NAME_WIDTH 23
+#define DEFAULT_DESC_WIDTH 23
+
+struct mod_glfs_ai_item {
+        char *type;
+        char *apply_to;
+        char *apply_path;
+        char *data;
+};
+
+typedef struct mod_glfs_ai_desc_t {
+        char *pattern;
+        char *description;
+        int full_path;
+        int wildcards;
+} mod_glfs_ai_desc_t;
+
+typedef enum {
+        SLASH_OFF = 0,
+        SLASH_ON,
+        SLASH_UNSET
+} mod_glfs_dir_slash_cfg;
+
+/* static ap_filter_rec_t *mod_glfs_output_filter_handle; */
+
+/*TODO: verify error returns to server core */
+
+typedef struct glusterfs_dir_config {
+        char                   *logfile;
+        char                   *loglevel;
+        char                   *specfile;
+        char                   *mount_dir;
+        char                   *buf;
+
+        size_t                  xattr_file_size;
+        uint32_t                cache_timeout;
+        
+        /* mod_dir options */
+        apr_array_header_t     *index_names;
+        mod_glfs_dir_slash_cfg  do_slash;
+
+        /* autoindex options */
+        char                   *default_icon;
+        char                   *style_sheet;
+        apr_int32_t             opts;
+        apr_int32_t             incremented_opts;
+        apr_int32_t             decremented_opts;
+        int                     name_width;
+        int                     name_adjust;
+        int                     desc_width;
+        int                     desc_adjust;
+        int                     icon_width;
+        int                     icon_height;
+        char                    default_keyid;
+        char                    default_direction;
+
+        apr_array_header_t     *icon_list;
+        apr_array_header_t     *alt_list;
+        apr_array_header_t     *desc_list;
+        apr_array_header_t     *ign_list;
+        apr_array_header_t     *hdr_list;
+        apr_array_header_t     *rdme_list;
+
+        char                   *ctype;
+        char                   *charset;
+} glusterfs_dir_config_t;
+
+typedef struct glusterfs_async_local {
+        int                op_ret;
+        int                op_errno;
+        char               async_read_complete;
+        off_t              length;
+        off_t              read_bytes;
+        glusterfs_iobuf_t *buf;
+        request_rec       *request;
+        pthread_mutex_t    lock;
+        pthread_cond_t     cond;
+}glusterfs_async_local_t;
+
+#define GLUSTERFS_CMD_PERMS ACCESS_CONF
+
+
+static glusterfs_dir_config_t *
+mod_glfs_dconfig (request_rec *r)
+{
+        glusterfs_dir_config_t *dir_config = NULL;
+        if (r->per_dir_config != NULL) {
+                dir_config = ap_get_module_config (r->per_dir_config,
+                                                   &glusterfs_module);
+        }
+
+        return dir_config;
+}
+
+
+static const char *
+cmd_add_xattr_file_size (cmd_parms *cmd, void *dummy, const char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+        dir_config->xattr_file_size = atoi (arg);
+        return NULL;
+}
+
+
+static const char *
+cmd_set_cache_timeout (cmd_parms *cmd, void *dummy, const char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+        dir_config->cache_timeout = atoi (arg);
+        return NULL;
+}
+
+
+static const char *
+cmd_set_loglevel (cmd_parms *cmd, void *dummy, const char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+        char                   *error = NULL;
+        if (strncasecmp (arg, "DEBUG", strlen ("DEBUG")) 
+            && strncasecmp (arg, "WARNING", strlen ("WARNING")) 
+            && strncasecmp (arg, "CRITICAL", strlen ("CRITICAL")) 
+            && strncasecmp (arg, "NONE", strlen ("NONE")) 
+            && strncasecmp (arg, "ERROR", strlen ("ERROR")))
+                error = GLUSTERFS_INVALID_LOGLEVEL;
+        else
+                dir_config->loglevel = apr_pstrdup (cmd->pool, arg);
+
+        return error;
+}
+
+static const char *
+cmd_add_logfile (cmd_parms *cmd, void *dummy, const char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+        dir_config->logfile = apr_pstrdup (cmd->pool, arg);
+
+        return NULL;
+}
+
+
+static const char *
+cmd_add_volume_specfile (cmd_parms *cmd, void *dummy, const char *arg)
+{
+        glusterfs_dir_config_t *dir_config = dummy;
+
+        dir_config->specfile = apr_pstrdup (cmd->pool, arg);
+
+        return NULL;
+}
+
+#define WILDCARDS_REQUIRED 0
+
+static const char *
+cmd_add_desc (cmd_parms *cmd, void *d, const char *desc,
+              const char *to)
+{
+        glusterfs_dir_config_t *dcfg = NULL;
+        mod_glfs_ai_desc_t     *desc_entry = NULL;
+        char                   *prefix = "";
+
+        dcfg = (glusterfs_dir_config_t *) d;
+        desc_entry = (mod_glfs_ai_desc_t *) apr_array_push(dcfg->desc_list);
+        desc_entry->full_path = (ap_strchr_c(to, '/') == NULL) ? 0 : 1;
+        desc_entry->wildcards = (WILDCARDS_REQUIRED
+                                 || desc_entry->full_path
+                                 || apr_fnmatch_test(to));
+        if (desc_entry->wildcards) {
+                prefix = desc_entry->full_path ? "*/" : "*";
+                desc_entry->pattern = apr_pstrcat(dcfg->desc_list->pool,
+                                                  prefix, to, "*", NULL);
+        }
+        else {
+                desc_entry->pattern = apr_pstrdup(dcfg->desc_list->pool, to);
+        }
+        desc_entry->description = apr_pstrdup(dcfg->desc_list->pool, desc);
+        return NULL;
+}
+
+
+static void push_item(apr_array_header_t *arr, char *type, const char *to,
+                      const char *path, const char *data)
+{
+        struct mod_glfs_ai_item *p = NULL;
+
+        p = (struct mod_glfs_ai_item *) apr_array_push(arr);
+
+        if (!to) {
+                to = "";
+        }
+        if (!path) {
+                path = "";
+        }
+
+        p->type = type;
+        p->data = data ? apr_pstrdup(arr->pool, data) : NULL;
+        p->apply_path = apr_pstrcat(arr->pool, path, "*", NULL);
+
+        if ((type == BY_PATH) && (!ap_is_matchexp(to))) {
+                p->apply_to = apr_pstrcat(arr->pool, "*", to, NULL);
+        }
+        else if (to) {
+                p->apply_to = apr_pstrdup(arr->pool, to);
+        }
+        else {
+                p->apply_to = NULL;
+        }
+}
+
+
+static const char *
+cmd_add_ignore (cmd_parms *cmd, void *d, const char *ext)
+{
+        push_item(((glusterfs_dir_config_t *) d)->ign_list, 0, ext, cmd->path,
+                  NULL);
+        return NULL;
+}
+
+
+static const char *
+cmd_add_header (cmd_parms *cmd, void *d, const char *name)
+{
+        push_item(((glusterfs_dir_config_t *) d)->hdr_list, 0, NULL, cmd->path,
+                  name);
+        return NULL;
+}
+
+
+static const char *
+cmd_add_readme (cmd_parms *cmd, void *d, const char *name)
+{
+        push_item(((glusterfs_dir_config_t *) d)->rdme_list, 0, NULL, cmd->path,
+                  name);
+        return NULL;
+}
+
+
+static const char *
+cmd_add_opts (cmd_parms *cmd, void *d, int argc, char *const argv[])
+{
+        int                     i = 0, option = 0;
+        char                   *w = NULL;
+        apr_int32_t             opts;
+        apr_int32_t             opts_add;
+        apr_int32_t             opts_remove;
+        char                    action = 0;
+        glusterfs_dir_config_t *d_cfg = (glusterfs_dir_config_t *) d;
+
+        opts = d_cfg->opts;
+        opts_add = d_cfg->incremented_opts;
+        opts_remove = d_cfg->decremented_opts;
+
+        for (i = 0; i < argc; i++) {
+                w = argv[i];
+
+                if ((*w == '+') || (*w == '-')) {
+                        action = *(w++);
+                }
+                else {
+                        action = '\0';
+                }
+                if (!strcasecmp(w, "FancyIndexing")) {
+                        option = FANCY_INDEXING;
+                }
+                else if (!strcasecmp(w, "FoldersFirst")) {
+                        option = FOLDERS_FIRST;
+                }
+                else if (!strcasecmp(w, "HTMLTable")) {
+                        option = TABLE_INDEXING;
+                }
+                else if (!strcasecmp(w, "IconsAreLinks")) {
+                        option = ICONS_ARE_LINKS;
+                }
+                else if (!strcasecmp(w, "IgnoreCase")) {
+                        option = IGNORE_CASE;
+                }
+                else if (!strcasecmp(w, "IgnoreClient")) {
+                        option = IGNORE_CLIENT;
+                }
+                else if (!strcasecmp(w, "ScanHTMLTitles")) {
+                        option = SCAN_HTML_TITLES;
+                }
+                else if (!strcasecmp(w, "SuppressColumnSorting")) {
+                        option = SUPPRESS_COLSORT;
+                }
+                else if (!strcasecmp(w, "SuppressDescription")) {
+                        option = SUPPRESS_DESC;
+                }
+                else if (!strcasecmp(w, "SuppressHTMLPreamble")) {
+                        option = SUPPRESS_PREAMBLE;
+                }
+                else if (!strcasecmp(w, "SuppressIcon")) {
+                        option = SUPPRESS_ICON;
+                }
+                else if (!strcasecmp(w, "SuppressLastModified")) {
+                        option = SUPPRESS_LAST_MOD;
+                }
+                else if (!strcasecmp(w, "SuppressSize")) {
+                        option = SUPPRESS_SIZE;
+                }
+                else if (!strcasecmp(w, "SuppressRules")) {
+                        option = SUPPRESS_RULES;
+                }
+                else if (!strcasecmp(w, "TrackModified")) {
+                        option = TRACK_MODIFIED;
+                }
+                else if (!strcasecmp(w, "VersionSort")) {
+                        option = VERSION_SORT;
+                }
+                else if (!strcasecmp(w, "XHTML")) {
+                        option = EMIT_XHTML;
+                }
+                else if (!strcasecmp(w, "ShowForbidden")) {
+                        option = SHOW_FORBIDDEN;
+                }
+                else if (!strcasecmp(w, "None")) {
+                        if (action != '\0') {
+                                return "Cannot combine '+' or '-' with 'None' "
+                                        "keyword";
+                        }
+                        opts = NO_OPTIONS;
+                        opts_add = 0;
+                        opts_remove = 0;
+                }
+                else if (!strcasecmp(w, "IconWidth")) {
+                        if (action != '-') {
+                                d_cfg->icon_width = DEFAULT_ICON_WIDTH;
+                        }
+                        else {
+                                d_cfg->icon_width = 0;
+                        }
+                }
+                else if (!strncasecmp(w, "IconWidth=", 10)) {
+                        if (action == '-') {
+                                return "Cannot combine '-' with IconWidth=n";
+                        }
+                        d_cfg->icon_width = atoi(&w[10]);
+                }
+                else if (!strcasecmp(w, "IconHeight")) {
+                        if (action != '-') {
+                                d_cfg->icon_height = DEFAULT_ICON_HEIGHT;
+                        }
+                        else {
+                                d_cfg->icon_height = 0;
+                        }
+                }
+                else if (!strncasecmp(w, "IconHeight=", 11)) {
+                        if (action == '-') {
+                                return "Cannot combine '-' with IconHeight=n";
+                        }
+                        d_cfg->icon_height = atoi(&w[11]);
+                }
+                else if (!strcasecmp(w, "NameWidth")) {
+                        if (action != '-') {
+                                return "NameWidth with no value may only appear"
+                                        " as "
+                                        "'-NameWidth'";
+                        }
+                        d_cfg->name_width = DEFAULT_NAME_WIDTH;
+                        d_cfg->name_adjust = K_NOADJUST;
+                }
+                else if (!strncasecmp(w, "NameWidth=", 10)) {
+                        if (action == '-') {
+                                return "Cannot combine '-' with NameWidth=n";
+                        }
+                        if (w[10] == '*') {
+                                d_cfg->name_adjust = K_ADJUST;
+                        }
+                        else {
+                                int width = atoi(&w[10]);
+
+                                if (width && (width < 5)) {
+                                        return "NameWidth value must be greater"
+                                                " than 5";
+                                }
+                                d_cfg->name_width = width;
+                                d_cfg->name_adjust = K_NOADJUST;
+                        }
+                }
+                else if (!strcasecmp(w, "DescriptionWidth")) {
+                        if (action != '-') {
+                                return "DescriptionWidth with no value may only"
+                                        " appear as "
+                                        "'-DescriptionWidth'";
+                        }
+                        d_cfg->desc_width = DEFAULT_DESC_WIDTH;
+                        d_cfg->desc_adjust = K_NOADJUST;
+                }
+                else if (!strncasecmp(w, "DescriptionWidth=", 17)) {
+                        if (action == '-') {
+                                return "Cannot combine '-' with "
+                                        "DescriptionWidth=n";
+                        }
+                        if (w[17] == '*') {
+                                d_cfg->desc_adjust = K_ADJUST;
+                        }
+                        else {
+                                int width = atoi(&w[17]);
+
+                                if (width && (width < 12)) {
+                                        return "DescriptionWidth value must be "
+                                                "greater than 12";
+                                }
+                                d_cfg->desc_width = width;
+                                d_cfg->desc_adjust = K_NOADJUST;
+                        }
+                }
+                else if (!strncasecmp(w, "Type=", 5)) {
+                        d_cfg->ctype = apr_pstrdup(cmd->pool, &w[5]);
+                }
+                else if (!strncasecmp(w, "Charset=", 8)) {
+                        d_cfg->charset = apr_pstrdup(cmd->pool, &w[8]);
+                }
+                else {
+                        return "Invalid directory indexing option";
+                }
+                if (action == '\0') {
+                        opts |= option;
+                        opts_add = 0;
+                        opts_remove = 0;
+                }
+                else if (action == '+') {
+                        opts_add |= option;
+                        opts_remove &= ~option;
+                }
+                else {
+                        opts_remove |= option;
+                        opts_add &= ~option;
+                }
+        }
+        if ((opts & NO_OPTIONS) && (opts & ~NO_OPTIONS)) {
+                return "Cannot combine other IndexOptions keywords with 'None'";
+        }
+        d_cfg->incremented_opts = opts_add;
+        d_cfg->decremented_opts = opts_remove;
+        d_cfg->opts = opts;
+        return NULL;
+}
+
+
+static const char *
+cmd_set_default_order(cmd_parms *cmd, void *m,
+                      const char *direction, const char *key)
+{
+        glusterfs_dir_config_t *d_cfg = (glusterfs_dir_config_t *) m;
+
+        if (!strcasecmp(direction, "Ascending")) {
+                d_cfg->default_direction = D_ASCENDING;
+        }
+        else if (!strcasecmp(direction, "Descending")) {
+                d_cfg->default_direction = D_DESCENDING;
+        }
+        else {
+                return "First keyword must be 'Ascending' or 'Descending'";
+        }
+
+        if (!strcasecmp(key, "Name")) {
+                d_cfg->default_keyid = K_NAME;
+        }
+        else if (!strcasecmp(key, "Date")) {
+                d_cfg->default_keyid = K_LAST_MOD;
+        }
+        else if (!strcasecmp(key, "Size")) {
+                d_cfg->default_keyid = K_SIZE;
+        }
+        else if (!strcasecmp(key, "Description")) {
+                d_cfg->default_keyid = K_DESC;
+        }
+        else {
+                return "Second keyword must be 'Name', 'Date', 'Size', or "
+                        "'Description'";
+        }
+
+        return NULL;
+}
+
+
+static char c_by_encoding, c_by_type, c_by_path;
+
+#define BY_ENCODING &c_by_encoding
+#define BY_TYPE &c_by_type
+#define BY_PATH &c_by_path
+
+/*
+ * This routine puts the standard HTML header at the top of the index page.
+ * We include the DOCTYPE because we may be using features therefrom (i.e.,
+ * HEIGHT and WIDTH attributes on the icons if we're FancyIndexing).
+ */
+static void emit_preamble(request_rec *r, int xhtml, const char *title)
+{
+        glusterfs_dir_config_t *d;
+
+        d = (glusterfs_dir_config_t *) ap_get_module_config(r->per_dir_config,
+                                                            &glusterfs_module);
+
+        if (xhtml) {
+                ap_rvputs(r, DOCTYPE_XHTML_1_0T,
+                          "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
+                          " <head>\n  <title>Index of ", title,
+                          "</title>\n", NULL);
+        } else {
+                ap_rvputs(r, DOCTYPE_HTML_3_2,
+                          "<html>\n <head>\n"
+                          "  <title>Index of ", title,
+                          "</title>\n", NULL);
+        }
+
+        if (d->style_sheet != NULL) {
+                ap_rvputs(r, "  <link rel=\"stylesheet\" href=\"",
+                          d->style_sheet, "\" type=\"text/css\"",
+                          xhtml ? " />\n" : ">\n", NULL);
+        }
+        ap_rvputs(r, " </head>\n <body>\n", NULL);
+}
+
+
+static const char *cmd_add_alt(cmd_parms *cmd, void *d, const char *alt,
+                               const char *to)
+{
+        if (cmd->info == BY_PATH) {
+                if (!strcmp(to, "**DIRECTORY**")) {
+                        to = "^^DIRECTORY^^";
+                }
+        }
+        if (cmd->info == BY_ENCODING) {
+                char *tmp = apr_pstrdup(cmd->pool, to);
+                ap_str_tolower(tmp);
+                to = tmp;
+        }
+
+        push_item(((glusterfs_dir_config_t *) d)->alt_list, cmd->info, to,
+                  cmd->path, alt);
+        return NULL;
+}
+
+static const char *cmd_add_icon(cmd_parms *cmd, void *d, const char *icon,
+                                const char *to)
+{
+        char *iconbak = apr_pstrdup(cmd->pool, icon);
+        char *alt = NULL, *cl = NULL, *tmp = NULL;
+
+        if (icon[0] == '(') {
+                cl = strchr(iconbak, ')');
+
+                if (cl == NULL) {
+                        return "missing closing paren";
+                }
+                alt = ap_getword_nc(cmd->pool, &iconbak, ',');
+                *cl = '\0';                             /* Lose closing paren */
+                cmd_add_alt(cmd, d, &alt[1], to);
+        }
+        if (cmd->info == BY_PATH) {
+                if (!strcmp(to, "**DIRECTORY**")) {
+                        to = "^^DIRECTORY^^";
+                }
+        }
+        if (cmd->info == BY_ENCODING) {
+                tmp = apr_pstrdup(cmd->pool, to);
+                ap_str_tolower(tmp);
+                to = tmp;
+        }
+
+        push_item(((glusterfs_dir_config_t *) d)->icon_list, cmd->info, to,
+                  cmd->path, iconbak);
+        return NULL;
+}
+
+
+static void *
+mod_glfs_create_dir_config(apr_pool_t *p, char *dirspec)
+{
+        glusterfs_dir_config_t *dir_config = NULL;
+
+        dir_config = (glusterfs_dir_config_t *) apr_pcalloc(p,
+                                                            sizeof(*dir_config));
+
+        dir_config->mount_dir = dirspec;
+        dir_config->logfile = dir_config->specfile = (char *)0;
+        dir_config->loglevel = "warning";
+        dir_config->cache_timeout = 0;
+        dir_config->buf = NULL;
+
+        /* mod_dir options init */
+        dir_config->index_names = NULL;
+        dir_config->do_slash = SLASH_UNSET;
+
+        /* autoindex options init */
+        dir_config->icon_width = 0;
+        dir_config->icon_height = 0;
+        dir_config->name_width = DEFAULT_NAME_WIDTH;
+        dir_config->name_adjust = K_UNSET;
+        dir_config->desc_width = DEFAULT_DESC_WIDTH;
+        dir_config->desc_adjust = K_UNSET;
+        dir_config->icon_list = apr_array_make(p, 4,
+                                               sizeof(struct mod_glfs_ai_item));
+        dir_config->alt_list = apr_array_make(p, 4,
+                                              sizeof(struct mod_glfs_ai_item));
+        dir_config->desc_list = apr_array_make(p, 4,
+                                               sizeof(mod_glfs_ai_desc_t));
+        dir_config->ign_list = apr_array_make(p, 4,
+                                              sizeof(struct mod_glfs_ai_item));
+        dir_config->hdr_list = apr_array_make(p, 4,
+                                              sizeof(struct mod_glfs_ai_item));
+        dir_config->rdme_list = apr_array_make(p, 4,
+                                               sizeof(struct mod_glfs_ai_item));
+        dir_config->opts = 0;
+        dir_config->incremented_opts = 0;
+        dir_config->decremented_opts = 0;
+        dir_config->default_keyid = '\0';
+        dir_config->default_direction = '\0';
+
+        return (void *) dir_config;
+}
+
+
+static void *
+mod_glfs_merge_dir_config(apr_pool_t *p, void *parent_conf,
+                          void *newloc_conf)
+{
+        glusterfs_dir_config_t *new = NULL;
+        glusterfs_dir_config_t *add = NULL;
+        glusterfs_dir_config_t *base = NULL;
+
+        new = (glusterfs_dir_config_t *) 
+                apr_pcalloc(p, sizeof(glusterfs_dir_config_t));
+        add = newloc_conf;
+        base = parent_conf;
+
+        if (add->logfile)
+                new->logfile = apr_pstrdup (p, add->logfile);
+
+        if (add->loglevel)
+                new->loglevel = apr_pstrdup (p, add->loglevel);
+
+        if (add->specfile)
+                new->specfile = apr_pstrdup (p, add->specfile);
+
+        if (add->mount_dir)
+                new->mount_dir = apr_pstrdup (p, add->mount_dir);
+
+        new->xattr_file_size = add->xattr_file_size;
+        new->cache_timeout = add->cache_timeout;
+        new->buf = add->buf;
+
+        /* mod_dir */
+        new->index_names = add->index_names ? 
+                add->index_names : base->index_names;
+        new->do_slash =
+                (add->do_slash == SLASH_UNSET) ? base->do_slash : add->do_slash;
+
+        /* auto index */
+        new->default_icon = add->default_icon ? add->default_icon
+                : base->default_icon;
+        new->style_sheet = add->style_sheet ? add->style_sheet
+                : base->style_sheet;
+        new->icon_height = add->icon_height ? 
+                add->icon_height : base->icon_height;
+        new->icon_width = add->icon_width ? add->icon_width : base->icon_width;
+
+        new->ctype = add->ctype ? add->ctype : base->ctype;
+        new->charset = add->charset ? add->charset : base->charset;
+
+        new->alt_list = apr_array_append(p, add->alt_list, base->alt_list);
+        new->ign_list = apr_array_append(p, add->ign_list, base->ign_list);
+        new->hdr_list = apr_array_append(p, add->hdr_list, base->hdr_list);
+        new->desc_list = apr_array_append(p, add->desc_list, base->desc_list);
+        new->icon_list = apr_array_append(p, add->icon_list, base->icon_list);
+        new->rdme_list = apr_array_append(p, add->rdme_list, base->rdme_list);
+        if (add->opts & NO_OPTIONS) {
+                /*
+                 * If the current directory says 'no options' then we also
+                 * clear any incremental mods from being inheritable further down.
+                 */
+                new->opts = NO_OPTIONS;
+                new->incremented_opts = 0;
+                new->decremented_opts = 0;
+        }
+        else {
+                /*
+                 * If there were any nonincremental options selected for
+                 * this directory, they dominate and we don't inherit *anything.*
+                 * Contrariwise, we *do* inherit if the only settings here are
+                 * incremental ones.
+                 */
+                if (add->opts == 0) {
+                        new->incremented_opts = (base->incremented_opts
+                                                 | add->incremented_opts)
+                                & ~add->decremented_opts;
+                        new->decremented_opts = (base->decremented_opts
+                                                 | add->decremented_opts);
+                        /*
+                         * We may have incremental settings, so make sure we 
+                         * don't inadvertently inherit an IndexOptions None 
+                         * from above.
+                         */
+                        new->opts = (base->opts & ~NO_OPTIONS);
+                }
+                else {
+                        /*
+                         * There are local nonincremental settings, which clear
+                         * all inheritance from above.  They *are* the new 
+                         * base settings.
+                         */
+                        new->opts = add->opts;;
+                }
+                /*
+                 * We're guaranteed that there'll be no overlap between
+                 * the add-options and the remove-options.
+                 */
+                new->opts |= new->incremented_opts;
+                new->opts &= ~new->decremented_opts;
+        }
+        /*
+         * Inherit the NameWidth settings if there aren't any specific to
+         * the new location; otherwise we'll end up using the defaults set 
+         * in the config-rec creation routine.
+         */
+        if (add->name_adjust == K_UNSET) {
+                new->name_width = base->name_width;
+                new->name_adjust = base->name_adjust;
+        }
+        else {
+                new->name_width = add->name_width;
+                new->name_adjust = add->name_adjust;
+        }
+
+        /*
+         * Likewise for DescriptionWidth.
+         */
+        if (add->desc_adjust == K_UNSET) {
+                new->desc_width = base->desc_width;
+                new->desc_adjust = base->desc_adjust;
+        }
+        else {
+                new->desc_width = add->desc_width;
+                new->desc_adjust = add->desc_adjust;
+        }
+
+        new->default_keyid = add->default_keyid ? add->default_keyid
+                : base->default_keyid;
+        new->default_direction = add->default_direction ? add->default_direction
+                : base->default_direction;
+
+        return (void *) new;
+}
+
+
+static void 
+mod_glfs_child_init(apr_pool_t *p, server_rec *s)
+{
+        int                      i = 0, num_sec = 0, ret = 0;
+        core_server_config      *sconf = NULL;
+        ap_conf_vector_t       **sec_ent = NULL;
+        glusterfs_dir_config_t  *dir_config = NULL;
+        glusterfs_init_params_t  ctx = {0, };
+  
+        sconf = (core_server_config *) ap_get_module_config (s->module_config,
+                                                             &core_module);
+        sec_ent = (ap_conf_vector_t **) sconf->sec_url->elts;
+        num_sec = sconf->sec_url->nelts;
+
+        for (i = 0; i < num_sec; i++) {
+                dir_config = ap_get_module_config (sec_ent[i],
+                                                   &glusterfs_module);
+
+                if (dir_config) {
+                        memset (&ctx, 0, sizeof (ctx));
+
+                        ctx.logfile = dir_config->logfile;
+                        ctx.loglevel = dir_config->loglevel;
+                        ctx.lookup_timeout = dir_config->cache_timeout;
+                        ctx.stat_timeout = dir_config->cache_timeout;
+                        ctx.specfile = dir_config->specfile;
+
+                        ret = glusterfs_mount (dir_config->mount_dir, &ctx);
+                        if (ret != 0) {
+                                ap_log_error(APLOG_MARK, APLOG_ERR,
+                                             APR_EGENERAL, s, 
+                                             "mod_glfs_child_init: "
+                                             "glusterfs_init failed, check "
+                                             "glusterfs logfile %s for more "
+                                             "details", 
+                                             dir_config->logfile);
+                        }
+                }
+                dir_config = NULL;
+        }
+}
+
+
+static void 
+mod_glfs_child_exit(server_rec *s, apr_pool_t *p)
+{
+        int                      i = 0, num_sec = 0;
+        core_server_config      *sconf = NULL;
+        ap_conf_vector_t       **sec_ent = NULL;
+        glusterfs_dir_config_t  *dir_config = NULL;
+        glusterfs_init_params_t  ctx = {0, };
+
+        sconf = ap_get_module_config(s->module_config,
+                                     &core_module);
+        sec_ent = (ap_conf_vector_t **) sconf->sec_url->elts;
+        num_sec = sconf->sec_url->nelts;
+        for (i = 0; i < num_sec; i++) {
+                dir_config = ap_get_module_config (sec_ent[i],
+                                                   &glusterfs_module);
+                if (dir_config) {
+                        glusterfs_umount (dir_config->mount_dir);
+                }
+        }
+}
+
+static apr_filetype_e filetype_from_mode(mode_t mode)
+{
+        apr_filetype_e type = APR_NOFILE;
+
+        if (S_ISREG(mode))
+                type = APR_REG;
+        else if (S_ISDIR(mode))
+                type = APR_DIR;
+        else if (S_ISCHR(mode))
+                type = APR_CHR;
+        else if (S_ISBLK(mode))
+                type = APR_BLK;
+        else if (S_ISFIFO(mode))
+                type = APR_PIPE;
+        else if (S_ISLNK(mode))
+                type = APR_LNK;
+        else if (S_ISSOCK(mode))
+                type = APR_SOCK;
+        else
+                type = APR_UNKFILE;
+        return type;
+}
+
+
+static void fill_out_finfo(apr_finfo_t *finfo, struct stat *info,
+                           apr_int32_t wanted)
+{ 
+        finfo->valid = APR_FINFO_MIN | APR_FINFO_IDENT | APR_FINFO_NLINK
+                | APR_FINFO_OWNER | APR_FINFO_PROT;
+        finfo->protection = apr_unix_mode2perms(info->st_mode);
+        finfo->filetype = filetype_from_mode(info->st_mode);
+        finfo->user = info->st_uid;
+        finfo->group = info->st_gid;
+        finfo->size = info->st_size;
+        finfo->device = info->st_dev;
+        finfo->nlink = info->st_nlink;
+
+        /* Check for overflow if storing a 64-bit st_ino in a 32-bit
+         * apr_ino_t for LFS builds: */
+        if (sizeof(apr_ino_t) >= sizeof(info->st_ino)
+            || (apr_ino_t)info->st_ino == info->st_ino) {
+                finfo->inode = info->st_ino;
+        } else {
+                finfo->valid &= ~APR_FINFO_INODE;
+        }
+
+        apr_time_ansi_put(&finfo->atime, info->st_atime);
+#ifdef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
+        finfo->atime += info->st_atim.tv_nsec / APR_TIME_C(1000);
+#elif defined(HAVE_STRUCT_STAT_ST_ATIMENSEC)
+        finfo->atime += info->st_atimensec / APR_TIME_C(1000);
+#elif defined(HAVE_STRUCT_STAT_ST_ATIME_N)
+        finfo->ctime += info->st_atime_n / APR_TIME_C(1000);
+#endif
+
+        apr_time_ansi_put(&finfo->mtime, info->st_mtime);
+#ifdef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
+        finfo->mtime += info->st_mtim.tv_nsec / APR_TIME_C(1000);
+#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
+        finfo->mtime += info->st_mtimensec / APR_TIME_C(1000);
+#elif defined(HAVE_STRUCT_STAT_ST_MTIME_N)
+        finfo->ctime += info->st_mtime_n / APR_TIME_C(1000);
+#endif
+
+        apr_time_ansi_put(&finfo->ctime, info->st_ctime);
+#ifdef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC
+        finfo->ctime += info->st_ctim.tv_nsec / APR_TIME_C(1000);
+#elif defined(HAVE_STRUCT_STAT_ST_CTIMENSEC)
+        finfo->ctime += info->st_ctimensec / APR_TIME_C(1000);
+#elif defined(HAVE_STRUCT_STAT_ST_CTIME_N)
+        finfo->ctime += info->st_ctime_n / APR_TIME_C(1000);
+#endif
+
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
+#ifdef DEV_BSIZE
+        finfo->csize = (apr_off_t)info->st_blocks * (apr_off_t)DEV_BSIZE;
+#else
+        finfo->csize = (apr_off_t)info->st_blocks * (apr_off_t)512;
+#endif
+        finfo->valid |= APR_FINFO_CSIZE;
+#endif
+}
+
+
+static int 
+mod_glfs_map_to_storage(request_rec *r)
+{
+        glusterfs_dir_config_t *dir_config = NULL, *tmp = NULL;
+        int                     access_status = 0, ret = 0;
+        char                   *path = NULL;
+        struct stat             st = {0, };
+        core_server_config     *sconf = NULL;
+        ap_conf_vector_t      **sec_ent = NULL;
+        int                     num_sec = 0, i = 0;
+
+        sconf = (core_server_config *) ap_get_module_config (r->server->module_config,
+                                                             &core_module);
+        sec_ent = (ap_conf_vector_t **) sconf->sec_url->elts;
+        num_sec = sconf->sec_url->nelts;
+
+        for (i = 0; i < num_sec; i++) {
+                tmp = ap_get_module_config (sec_ent[i], &glusterfs_module);
+
+                if (tmp && !strncmp (tmp->mount_dir, r->uri,
+                                     strlen (tmp->mount_dir))) {
+                        if (!dir_config || 
+                            strlen (tmp->mount_dir) 
+                            > strlen (dir_config->mount_dir)) {
+                                dir_config = tmp;
+                        }
+                }
+
+        }
+
+        if (dir_config && dir_config->mount_dir 
+            && !(strncmp (apr_pstrcat (r->pool, dir_config->mount_dir, "/",
+                                       NULL), r->uri,
+                          strlen (dir_config->mount_dir) + 1)
+                 && !r->handler)) 
+                r->handler = GLUSTERFS_HANDLER;
+
+        if (!r->handler || (r->handler && strcmp (r->handler,
+                                                  GLUSTERFS_HANDLER)))
+                return DECLINED;
+
+        path = r->uri;
+
+        memset (&r->finfo, 0, sizeof (r->finfo));
+
+        dir_config->buf = calloc (1, dir_config->xattr_file_size);
+        if (!dir_config->buf) {
+                return HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ret = glusterfs_get (path, dir_config->buf, 
+                             dir_config->xattr_file_size, &st);
+
+        if (ret == -1 || st.st_size > dir_config->xattr_file_size 
+            || S_ISDIR (st.st_mode)) {
+                free (dir_config->buf);
+                dir_config->buf = NULL;
+
+                if (ret == -1) {
+                        int error = HTTP_NOT_FOUND;
+                        char *emsg = NULL;
+                        if (r->path_info == NULL) {
+                                emsg = apr_pstrcat(r->pool, strerror (errno),
+                                                   r->filename, NULL);
+                        }
+                        else {
+                                emsg = apr_pstrcat(r->pool, strerror (errno),
+                                                   r->filename, r->path_info,
+                                                   NULL);
+                        }
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0,
+                                      r, "%s", emsg);
+                        if (errno != ENOENT) {
+                                error = HTTP_INTERNAL_SERVER_ERROR;
+                        }
+                        return error;
+                }
+        }
+
+        r->finfo.pool = r->pool;
+        r->finfo.fname = r->filename;
+        fill_out_finfo (&r->finfo, &st, 
+                        APR_FINFO_MIN | APR_FINFO_IDENT | APR_FINFO_NLINK |
+                        APR_FINFO_OWNER | APR_FINFO_PROT);
+                        
+        /* allow core module to run directory_walk() and location_walk() */
+        return DECLINED;
+}
+
+
+static int 
+mod_glfs_readv_async_cbk (int32_t op_ret, int32_t op_errno,
+                          glusterfs_iobuf_t *buf, void *cbk_data)
+{
+        glusterfs_async_local_t *local = cbk_data;
+
+        pthread_mutex_lock (&local->lock);
+        {
+                local->async_read_complete = 1;
+                local->buf = buf;
+                local->op_ret = op_ret;
+                local->op_errno = op_errno;
+                pthread_cond_signal (&local->cond);
+        }
+        pthread_mutex_unlock (&local->lock);
+
+        return 0;
+}
+
+/* use read_async just to avoid memcpy of read buffer in libglusterfsclient */
+static int
+mod_glfs_read_async (request_rec *r, apr_bucket_brigade *bb,
+                     glusterfs_file_t fd,
+                     apr_off_t offset, apr_off_t length)
+{
+        glusterfs_async_local_t local = {0, };
+        off_t                   end = 0;
+        int                     nbytes = 0, complete = 0;
+        conn_rec               *c = r->connection;
+        apr_bucket             *e = NULL;
+        apr_status_t            status = APR_SUCCESS;
+        glusterfs_iobuf_t      *buf = NULL;
+                
+        if (length == 0) {
+                return 0;
+        }
+
+        pthread_cond_init (&local.cond, NULL);
+        pthread_mutex_init (&local.lock, NULL);
+  
+        memset (&local, 0, sizeof (local));
+        local.request = r;
+
+        if (length > 0)
+                end = offset + length;
+
+        do {
+                if (length > 0) {
+                        nbytes = end - offset;
+                        if (nbytes > GLUSTERFS_CHUNK_SIZE)
+                                nbytes = GLUSTERFS_CHUNK_SIZE;
+                } else
+                        nbytes = GLUSTERFS_CHUNK_SIZE;
+
+                glusterfs_read_async(fd, 
+                                     nbytes,
+                                     offset,
+                                     mod_glfs_readv_async_cbk,
+                                     (void *)&local);
+
+                pthread_mutex_lock (&local.lock);
+                {
+                        while (!local.async_read_complete) {
+                                pthread_cond_wait (&local.cond, &local.lock);
+                        }
+
+                        local.async_read_complete = 0;
+                        buf = local.buf;
+
+                        if (length < 0)
+                                complete = (local.op_ret <= 0);
+                        else {
+                                local.read_bytes += local.op_ret;
+                                complete = ((local.read_bytes == length) ||
+                                            (local.op_ret < 0));
+                        }
+                }
+                pthread_mutex_unlock (&local.lock);
+
+                if (!bb) {
+                        bb = apr_brigade_create (r->pool, c->bucket_alloc); 
+                }
+                apr_brigade_writev (bb, NULL, NULL, buf->vector, buf->count);
+
+                /* 
+                 * make sure all the data is written out, since we call 
+                 * glusterfs_free on buf once ap_pass_brigade returns
+                 */
+                e = apr_bucket_flush_create (c->bucket_alloc);
+                APR_BRIGADE_INSERT_TAIL (bb, e);
+
+                status = ap_pass_brigade (r->output_filters, bb);
+                if (status != APR_SUCCESS) {
+                        /* no way to know what type of error occurred */
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r,
+                                      "mod_glfs_handler: ap_pass_brigade "
+                                      "returned %i",
+                                      status);
+                        complete = 1;
+                        local.op_ret = -1;
+                }
+
+                glusterfs_free (buf);
+
+                /* 
+                 * bb has already been cleaned up by core_output_filter, 
+                 * just being paranoid
+                 */
+                apr_brigade_cleanup (bb);
+
+                offset += nbytes;
+        } while (!complete);
+
+        return (local.op_ret < 0 ? HTTP_INTERNAL_SERVER_ERROR : OK);
+}
+
+static int 
+parse_byterange(char *range, apr_off_t clength,
+                apr_off_t *start, apr_off_t *end)
+{
+        char       *dash = NULL, *errp = NULL;
+        apr_off_t   number;
+
+        dash = strchr(range, '-');
+        if (!dash) {
+                return 0;
+        }
+
+        if ((dash == range)) {
+                /* In the form "-5" */
+                if (apr_strtoff(&number, dash+1, &errp, 10) || *errp) {
+                        return 0;
+                }
+                *start = clength - number;
+                *end = clength - 1; 
+        }
+        else {
+                *dash++ = '\0';
+                if (apr_strtoff(&number, range, &errp, 10) || *errp) {
+                        return 0;
+                }
+                *start = number;
+                if (*dash) {
+                        if (apr_strtoff(&number, dash, &errp, 10) || *errp) {
+                                return 0;
+                        }
+                        *end = number;
+                }
+                else {                  /* "5-" */
+                        *end = clength - 1;
+                }
+        }
+
+        if (*start < 0) {
+                *start = 0;
+        }
+
+        if (*end >= clength) {
+                *end = clength - 1;
+        }
+
+        if (*start > *end) {
+                return -1;
+        }
+
+        return (*start > 0 || *end < clength);
+}
+
+
+static int use_range_x(request_rec *r)
+{
+        const char *ua = NULL;
+        return (apr_table_get(r->headers_in, "Request-Range")
+                || ((ua = apr_table_get(r->headers_in, "User-Agent"))
+                    && ap_strstr_c(ua, "MSIE 3")));
+}
+
+
+static int ap_set_byterange(request_rec *r)
+{
+        const char *range = NULL, *if_range = NULL, *match = NULL, *ct = NULL;
+        int         num_ranges = 0;
+
+        if (r->assbackwards) {
+                return 0;
+        }
+
+        /* Check for Range request-header (HTTP/1.1) or Request-Range for
+         * backwards-compatibility with second-draft Luotonen/Franks
+         * byte-ranges (e.g. Netscape Navigator 2-3).
+         *
+         * We support this form, with Request-Range, and (farther down) we
+         * send multipart/x-byteranges instead of multipart/byteranges for
+         * Request-Range based requests to work around a bug in Netscape
+         * Navigator 2-3 and MSIE 3.
+         */
+
+        if (!(range = apr_table_get(r->headers_in, "Range"))) {
+                range = apr_table_get(r->headers_in, "Request-Range");
+        }
+
+        if (!range || strncasecmp(range, "bytes=", 6) || r->status != HTTP_OK) {
+                return 0;
+        }
+
+        /* is content already a single range? */
+        if (apr_table_get(r->headers_out, "Content-Range")) {
+                return 0;
+        }
+
+        /* is content already a multiple range? */
+        if ((ct = apr_table_get(r->headers_out, "Content-Type"))
+            && (!strncasecmp(ct, "multipart/byteranges", 20)
+                || !strncasecmp(ct, "multipart/x-byteranges", 22))) {
+                return 0;
+        }
+
+        /* Check the If-Range header for Etag or Date.
+         * Note that this check will return false (as required) if either
+         * of the two etags are weak.
+         */
+        if ((if_range = apr_table_get(r->headers_in, "If-Range"))) {
+                if (if_range[0] == '"') {
+                        if (!(match = apr_table_get(r->headers_out, "Etag"))
+                            || (strcmp(if_range, match) != 0)) {
+                                return 0;
+                        }
+                }
+                else if (!(match = apr_table_get(r->headers_out,
+                                                 "Last-Modified"))
+                         || (strcmp(if_range, match) != 0)) {
+                        return 0;
+                }
+        }
+
+        if (!ap_strchr_c(range, ',')) {
+                /* a single range */
+                num_ranges = 1;
+        }
+        else {
+                /* a multiple range */
+                num_ranges = 2;
+        }
+
+        r->status = HTTP_PARTIAL_CONTENT;
+        r->range = range + 6;
+
+        return num_ranges;
+}
+
+
+static void
+mod_glfs_handle_byte_ranges (request_rec *r, glusterfs_file_t fd,
+                             int num_ranges)
+{
+        conn_rec           *c = r->connection;
+        char               *ts = NULL, *boundary = NULL, *bound_head = NULL;
+        const char         *orig_ct = NULL;
+        char               *current = NULL, *end = NULL;
+        apr_bucket_brigade *bsend = NULL;
+        apr_bucket         *e = NULL;
+        apr_off_t           range_start, range_end;
+        apr_status_t        rv = APR_SUCCESS;
+        char                found = 0;
+        apr_bucket         *e2 = NULL, *ec = NULL;
+
+        orig_ct = ap_make_content_type (r, r->content_type);
+
+        if (num_ranges > 1) {
+                boundary = apr_psprintf(r->pool, "%" APR_UINT64_T_HEX_FMT "%lx",
+                                        (apr_uint64_t)r->request_time,
+                                        (long) getpid());
+
+                ap_set_content_type(r, apr_pstrcat(r->pool, "multipart",
+                                                   use_range_x(r) ? "/x-" : "/",
+                                                   "byteranges; boundary=",
+                                                   boundary, NULL));
+
+                if (strcasecmp(orig_ct, NO_CONTENT_TYPE)) {
+                        bound_head = apr_pstrcat(r->pool,
+                                                 CRLF "--", boundary,
+                                                 CRLF "Content-type: ",
+                                                 orig_ct,
+                                                 CRLF "Content-range: bytes ",
+                                                 NULL);
+                }
+                else {
+                        /* if we have no type for the content, do our best */
+                        bound_head = apr_pstrcat(r->pool,
+                                                 CRLF "--", boundary,
+                                                 CRLF "Content-range: bytes ",
+                                                 NULL);
+                }
+        }
+
+        while ((current = ap_getword(r->pool, &r->range, ','))
+               && (rv = parse_byterange(current, r->finfo.size, &range_start,
+                                        &range_end))) {
+                bsend = NULL;
+                if (rv == -1) {
+                        continue;
+                }
+
+                found = 1;
+
+                /* For single range requests, we must produce Content-Range 
+                 * header. Otherwise, we need to produce the multipart 
+                 * boundaries.
+                 */
+                if (num_ranges == 1) {
+                        apr_table_setn(r->headers_out, "Content-Range",
+                                       apr_psprintf(r->pool,
+                                                    "bytes " BYTERANGE_FMT,
+                                                    range_start, range_end,
+                                                    r->finfo.size));
+                }
+                else {
+                        /* this brigade holds what we will be sending */
+                        bsend = apr_brigade_create(r->pool, c->bucket_alloc);
+
+                        e = apr_bucket_pool_create(bound_head,
+                                                   strlen(bound_head),
+                                                   r->pool, c->bucket_alloc);
+                        APR_BRIGADE_INSERT_TAIL(bsend, e);
+
+                        ts = apr_psprintf(r->pool, BYTERANGE_FMT CRLF CRLF,
+                                          range_start, range_end,
+                                          r->finfo.size);
+                        e = apr_bucket_pool_create(ts, strlen(ts), r->pool,
+                                                   c->bucket_alloc);
+                        APR_BRIGADE_INSERT_TAIL(bsend, e);
+                }
+                mod_glfs_read_async (r, bsend, fd, range_start,
+                                     (range_end + 1 - range_start));
+        }
+
+        bsend = apr_brigade_create (r->pool, c->bucket_alloc);
+
+        if (found == 0) {
+                r->status = HTTP_OK;
+                /* bsend is assumed to be empty if we get here. */
+                e = ap_bucket_error_create(HTTP_RANGE_NOT_SATISFIABLE, NULL,
+                                           r->pool, c->bucket_alloc);
+                APR_BRIGADE_INSERT_TAIL(bsend, e);
+                e = apr_bucket_eos_create(c->bucket_alloc);
+                APR_BRIGADE_INSERT_TAIL(bsend, e);
+                ap_pass_brigade (r->output_filters, bsend);
+                return;
+        }
+
+        if (num_ranges > 1) {
+                /* add the final boundary */
+                end = apr_pstrcat(r->pool, CRLF "--", boundary, "--" CRLF,
+                                  NULL);
+//                ap_xlate_proto_to_ascii(end, strlen(end));
+                e = apr_bucket_pool_create(end, strlen(end), r->pool,
+                                           c->bucket_alloc);
+                APR_BRIGADE_INSERT_TAIL(bsend, e);
+        }
+
+        ap_pass_brigade (r->output_filters, bsend);
+}
+
+
+
+/****************************************************************
+ *
+ * Looking things up in config entries...
+ */
+
+/* Structure used to hold entries when we're actually building an index */
+
+struct ent {
+        char       *name;
+        char       *icon;
+        char       *alt;
+        char       *desc;
+        apr_off_t   size;
+        apr_time_t  lm;
+        struct ent *next;
+        int         ascending, ignore_case, version_sort;
+        char        key;
+        int         isdir;
+};
+
+static char *find_item(request_rec *r, apr_array_header_t *list, int path_only)
+{
+        const char              *content_type = NULL;
+        const char              *content_encoding = NULL;
+        char                    *path = NULL;
+        int                      i = 0;
+        struct mod_glfs_ai_item *items = NULL;
+        struct mod_glfs_ai_item *p = NULL;
+
+        content_type = ap_field_noparam(r->pool, r->content_type);
+        content_encoding = r->content_encoding;
+        path = r->filename;
+        items = (struct mod_glfs_ai_item *) list->elts;
+
+        for (i = 0; i < list->nelts; ++i) {
+                p = &items[i];
+                /* Special cased for ^^DIRECTORY^^ and ^^BLANKICON^^ */
+                if ((path[0] == '^') || (!ap_strcmp_match(path,
+                                                          p->apply_path))) {
+                        if (!*(p->apply_to)) {
+                                return p->data;
+                        }
+                        else if (p->type == BY_PATH || path[0] == '^') {
+                                if (!ap_strcmp_match(path, p->apply_to)) {
+                                        return p->data;
+                                }
+                        }
+                        else if (!path_only) {
+                                if (!content_encoding) {
+                                        if (p->type == BY_TYPE) {
+                                                if (content_type
+                                                    && !ap_strcasecmp_match(content_type,
+                                                                            p->apply_to)) {
+                                                        return p->data;
+                                                }
+                                        }
+                                }
+                                else {
+                                        if (p->type == BY_ENCODING) {
+                                                if (!ap_strcasecmp_match(content_encoding,
+                                                                         p->apply_to)) {
+                                                        return p->data;
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+        return NULL;
+}
+
+#define find_icon(d,p,t) find_item(p,d->icon_list,t)
+#define find_alt(d,p,t) find_item(p,d->alt_list,t)
+#define find_header(d,p) find_item(p,d->hdr_list,0)
+#define find_readme(d,p) find_item(p,d->rdme_list,0)
+
+static char *find_default_item(char *bogus_name, apr_array_header_t *list)
+{
+        request_rec r;
+        /* Bleah.  I tried to clean up find_item, and it lead to this bit
+         * of ugliness.   Note that the fields initialized are precisely
+         * those that find_item looks at...
+         */
+        r.filename = bogus_name;
+        r.content_type = r.content_encoding = NULL;
+        return find_item(&r, list, 1);
+}
+
+#define find_default_icon(d,n) find_default_item(n, d->icon_list)
+#define find_default_alt(d,n) find_default_item(n, d->alt_list)
+
+/*
+ * Look through the list of pattern/description pairs and return the first one
+ * if any) that matches the filename in the request.  If multiple patterns
+ * match, only the first one is used; since the order in the array is the
+ * same as the order in which directives were processed, earlier matching
+ * directives will dominate.
+ */
+
+#ifdef CASE_BLIND_FILESYSTEM
+#define MATCH_FLAGS APR_FNM_CASE_BLIND
+#else
+#define MATCH_FLAGS 0
+#endif
+
+static char *find_desc(glusterfs_dir_config_t *dcfg, const char *filename_full)
+{
+        int                 i = 0;
+        mod_glfs_ai_desc_t *list = NULL;
+        const char         *filename_only = NULL, *filename = NULL;
+        mod_glfs_ai_desc_t *tuple = &list[i];
+        int                 found = 0;
+
+        list = (mod_glfs_ai_desc_t *) dcfg->desc_list->elts;
+        /*
+         * If the filename includes a path, extract just the name itself
+         * for the simple matches.
+         */
+        if ((filename_only = ap_strrchr_c(filename_full, '/')) == NULL) {
+                filename_only = filename_full;
+        }
+        else {
+                filename_only++;
+        }
+        for (i = 0; i < dcfg->desc_list->nelts; ++i) {
+                /*
+                 * Only use the full-path filename if the pattern contains '/'s.
+                 */
+                filename = (tuple->full_path) ? filename_full : filename_only;
+                /*
+                 * Make the comparison using the cheapest method; only do
+                 * wildcard checking if we must.
+                 */
+                if (tuple->wildcards) {
+                        found = (apr_fnmatch(tuple->pattern, filename,
+                                             MATCH_FLAGS) == 0);
+                }
+                else {
+                        found = (ap_strstr_c(filename, tuple->pattern) != NULL);
+                }
+                if (found) {
+                        return tuple->description;
+                }
+        }
+        return NULL;
+}
+
+static int ignore_entry(glusterfs_dir_config_t *d, char *path)
+{
+        apr_array_header_t      *list = d->ign_list;
+        struct mod_glfs_ai_item *items = (struct mod_glfs_ai_item *) list->elts;
+        char                    *tt = NULL, *ap = NULL;
+        int                      i = 0;
+        struct mod_glfs_ai_item *p = &items[i];
+
+        if ((tt = strrchr(path, '/')) == NULL) {
+                tt = path;
+        }
+        else {
+                tt++;
+        }
+
+        for (i = 0; i < list->nelts; ++i) {
+                p = &items[i];
+                if ((ap = strrchr(p->apply_to, '/')) == NULL) {
+                        ap = p->apply_to;
+                }
+                else {
+                        ap++;
+                }
+
+#ifndef CASE_BLIND_FILESYSTEM
+                if (!ap_strcmp_match(path, p->apply_path)
+                    && !ap_strcmp_match(tt, ap)) {
+                        return 1;
+                }
+#else  /* !CASE_BLIND_FILESYSTEM */
+                /*
+                 * On some platforms, the match must be case-blind.  This is really
+                 * a factor of the filesystem involved, but we can't detect that
+                 * reliably - so we have to granularise at the OS level.
+                 */
+                if (!ap_strcasecmp_match(path, p->apply_path)
+                    && !ap_strcasecmp_match(tt, ap)) {
+                        return 1;
+                }
+#endif /* !CASE_BLIND_FILESYSTEM */
+        }
+        return 0;
+}
+
+/*****************************************************************
+ *
+ * Actually generating output
+ */
+
+/*
+ * Elements of the emitted document:
+ *      Preamble
+ *              Emitted unless SUPPRESS_PREAMBLE is set AND ap_run_sub_req
+ *              succeeds for the (content_type == text/html) header file.
+ *      Header file
+ *              Emitted if found (and able).
+ *      H1 tag line
+ *              Emitted if a header file is NOT emitted.
+ *      Directory stuff
+ *              Always emitted.
+ *      HR
+ *              Emitted if FANCY_INDEXING is set.
+ *      Readme file
+ *              Emitted if found (and able).
+ *      ServerSig
+ *              Emitted if ServerSignature is not Off AND a readme file
+ *              is NOT emitted.
+ *      Postamble
+ *              Emitted unless SUPPRESS_PREAMBLE is set AND ap_run_sub_req
+ *              succeeds for the (content_type == text/html) readme file.
+ */
+
+
+/*
+ * emit a plain text file
+ */
+static void do_emit_plain(request_rec *r, apr_file_t *f)
+{
+        char         buf[AP_IOBUFSIZE + 1];
+        int          ch = 0;
+        apr_size_t   i = 0, c = 0, n = 0;
+        apr_status_t rv = APR_SUCCESS;
+
+        ap_rputs("<pre>\n", r);
+        while (!apr_file_eof(f)) {
+                do {
+                        n = sizeof(char) * AP_IOBUFSIZE;
+                        rv = apr_file_read(f, buf, &n);
+                } while (APR_STATUS_IS_EINTR(rv));
+                if (n == 0 || rv != APR_SUCCESS) {
+                        /* ###: better error here? */
+                        break;
+                }
+                buf[n] = '\0';
+                c = 0;
+                while (c < n) {
+                        for (i = c; i < n; i++) {
+                                if (buf[i] == '<' || buf[i] == '>'
+                                    || buf[i] == '&') {
+                                        break;
+                                }
+                        }
+                        ch = buf[i];
+                        buf[i] = '\0';
+                        ap_rputs(&buf[c], r);
+                        if (ch == '<') {
+                                ap_rputs("&lt;", r);
+                        }
+                        else if (ch == '>') {
+                                ap_rputs("&gt;", r);
+                        }
+                        else if (ch == '&') {
+                                ap_rputs("&amp;", r);
+                        }
+                        c = i + 1;
+                }
+        }
+        ap_rputs("</pre>\n", r);
+}
+
+/*
+ * Handle the preamble through the H1 tag line, inclusive.  Locate
+ * the file with a subrequests.  Process text/html documents by actually
+ * running the subrequest; text/xxx documents get copied verbatim,
+ * and any other content type is ignored.  This means that a non-text
+ * document (such as HEADER.gif) might get multiviewed as the result
+ * instead of a text document, meaning nothing will be displayed, but
+ * oh well.
+ */
+static void emit_head(request_rec *r, char *header_fname, int suppress_amble,
+                      int emit_xhtml, char *title)
+{
+        apr_table_t *hdrs = r->headers_in;
+        apr_file_t  *f = NULL;
+        request_rec *rr = NULL;
+        int          emit_amble = 1;
+        int          emit_H1 = 1;
+        const char  *r_accept = NULL;
+        const char  *r_accept_enc = NULL;
+
+        /*
+         * If there's a header file, send a subrequest to look for it.  If it's
+         * found and html do the subrequest, otherwise handle it
+         */
+        r_accept = apr_table_get(hdrs, "Accept");
+        r_accept_enc = apr_table_get(hdrs, "Accept-Encoding");
+        apr_table_setn(hdrs, "Accept", "text/html, text/plain");
+        apr_table_unset(hdrs, "Accept-Encoding");
+
+
+        if ((header_fname != NULL) && r->args) {
+                header_fname = apr_pstrcat(r->pool, header_fname, "?", r->args,
+                                           NULL);
+        }
+
+        if ((header_fname != NULL)
+            && (rr = ap_sub_req_lookup_uri(header_fname, r, r->output_filters))
+            && (rr->status == HTTP_OK)
+            && (rr->filename != NULL)
+            && (rr->finfo.filetype == APR_REG)) {
+                /*
+                 * Check for the two specific cases we allow: text/html and
+                 * text/anything-else.  The former is allowed to be processed for
+                 * SSIs.
+                 */
+                if (rr->content_type != NULL) {
+                        if (!strcasecmp(ap_field_noparam(r->pool,
+                                                         rr->content_type),
+                                        "text/html")) {
+                                ap_filter_t *f = NULL;
+        
+                                /* Hope everything will work... */
+                                emit_amble = 0;
+                                emit_H1 = 0;
+
+                                if (! suppress_amble) {
+                                        emit_preamble(r, emit_xhtml, title);
+                                }
+                                /* This is a hack, but I can't find any better 
+                                 * way to do this. The problem is that we have 
+                                 * already created the sub-request,
+                                 * but we just inserted the OLD_WRITE filter, 
+                                 * and the sub-request needs to pass its data 
+                                 * through the OLD_WRITE filter, or things go 
+                                 * horribly wrong (missing data, data in
+                                 * the wrong order, etc).  To fix it, if you 
+                                 * create a sub-request and then insert the 
+                                 * OLD_WRITE filter before you run the request, 
+                                 * you need to make sure that the sub-request
+                                 * data goes through the OLD_WRITE filter.  Just
+                                 * steal this code.  The long-term solution is 
+                                 * to remove the ap_r* functions.
+                                 */
+                                for (f=rr->output_filters;
+                                     f->frec != ap_subreq_core_filter_handle;
+                                     f = f->next);
+                                f->next = r->output_filters;
+
+                                /*
+                                 * If there's a problem running the subrequest, 
+                                 * display the preamble if we didn't do it 
+                                 * before -- the header file didn't get displayed.
+                                 */
+                                if (ap_run_sub_req(rr) != OK) {
+                                        /* It didn't work */
+                                        emit_amble = suppress_amble;
+                                        emit_H1 = 1;
+                                }
+                        }
+                        else if (!strncasecmp("text/", rr->content_type, 5)) {
+                                /*
+                                 * If we can open the file, prefix it with the 
+                                 * preamble regardless; since we'll be sending 
+                                 * a <pre> block around the file's contents, 
+                                 * any HTML header it had won't end up
+                                 * where it belongs.
+                                 */
+                                if (apr_file_open(&f, rr->filename, APR_READ,
+                                                  APR_OS_DEFAULT, r->pool) 
+                                    == APR_SUCCESS) {
+                                        emit_preamble(r, emit_xhtml, title);
+                                        emit_amble = 0;
+                                        do_emit_plain(r, f);
+                                        apr_file_close(f);
+                                        emit_H1 = 0;
+                                }
+                        }
+                }
+        }
+
+        if (r_accept) {
+                apr_table_setn(hdrs, "Accept", r_accept);
+        }
+        else {
+                apr_table_unset(hdrs, "Accept");
+        }
+
+        if (r_accept_enc) {
+                apr_table_setn(hdrs, "Accept-Encoding", r_accept_enc);
+        }
+
+        if (emit_amble) {
+                emit_preamble(r, emit_xhtml, title);
+        }
+        if (emit_H1) {
+                ap_rvputs(r, "<h1>Index of ", title, "</h1>\n", NULL);
+        }
+        if (rr != NULL) {
+                ap_destroy_sub_req(rr);
+        }
+}
+
+
+/*
+ * Handle the Readme file through the postamble, inclusive.  Locate
+ * the file with a subrequests.  Process text/html documents by actually
+ * running the subrequest; text/xxx documents get copied verbatim,
+ * and any other content type is ignored.  This means that a non-text
+ * document (such as FOOTER.gif) might get multiviewed as the result
+ * instead of a text document, meaning nothing will be displayed, but
+ * oh well.
+ */
+static void emit_tail(request_rec *r, char *readme_fname, int suppress_amble)
+{
+        apr_file_t  *f = NULL;
+        request_rec *rr = NULL;
+        int          suppress_post = 0, suppress_sig = 0;
+
+        /*
+         * If there's a readme file, send a subrequest to look for it.  If it's
+         * found and a text file, handle it -- otherwise fall through and
+         * pretend there's nothing there.
+         */
+        if ((readme_fname != NULL)
+            && (rr = ap_sub_req_lookup_uri(readme_fname, r, r->output_filters))
+            && (rr->status == HTTP_OK)
+            && (rr->filename != NULL)
+            && rr->finfo.filetype == APR_REG) {
+                /*
+                 * Check for the two specific cases we allow: text/html and
+                 * text/anything-else.  The former is allowed to be processed for
+                 * SSIs.
+                 */
+                if (rr->content_type != NULL) {
+                        if (!strcasecmp(ap_field_noparam(r->pool,
+                                                         rr->content_type),
+                                        "text/html")) {
+                                ap_filter_t *f;
+                                for (f=rr->output_filters;
+                                     f->frec != ap_subreq_core_filter_handle;
+                                     f = f->next);
+                                f->next = r->output_filters;
+
+
+                                if (ap_run_sub_req(rr) == OK) {
+                                        /* worked... */
+                                        suppress_sig = 1;
+                                        suppress_post = suppress_amble;
+                                }
+                        }
+                        else if (!strncasecmp("text/", rr->content_type, 5)) {
+                                /*
+                                 * If we can open the file, suppress the signature.
+                                 */
+                                if (apr_file_open(&f, rr->filename, APR_READ,
+                                                  APR_OS_DEFAULT, r->pool)
+                                    == APR_SUCCESS) {
+                                        do_emit_plain(r, f);
+                                        apr_file_close(f);
+                                        suppress_sig = 1;
+                                }
+                        }
+                }
+        }
+
+        if (!suppress_sig) {
+                ap_rputs(ap_psignature("", r), r);
+        }
+        if (!suppress_post) {
+                ap_rputs("</body></html>\n", r);
+        }
+        if (rr != NULL) {
+                ap_destroy_sub_req(rr);
+        }
+}
+
+
+static char *find_title(request_rec *r)
+{
+        char        titlebuf[MAX_STRING_LEN], *find = "<title>";
+        apr_file_t *thefile = NULL;
+        int         x = 0, y = 0, p = 0;
+        apr_size_t  n;
+
+        if (r->status != HTTP_OK) {
+                return NULL;
+        }
+        if ((r->content_type != NULL)
+            && (!strcasecmp(ap_field_noparam(r->pool, r->content_type),
+                            "text/html")
+                || !strcmp(r->content_type, INCLUDES_MAGIC_TYPE))
+            && !r->content_encoding) {
+                if (apr_file_open(&thefile, r->filename, APR_READ,
+                                  APR_OS_DEFAULT, r->pool) != APR_SUCCESS) {
+                        return NULL;
+                }
+                n = sizeof(char) * (MAX_STRING_LEN - 1);
+                apr_file_read(thefile, titlebuf, &n);
+                if (n <= 0) {
+                        apr_file_close(thefile);
+                        return NULL;
+                }
+                titlebuf[n] = '\0';
+                for (x = 0, p = 0; titlebuf[x]; x++) {
+                        if (apr_tolower(titlebuf[x]) == find[p]) {
+                                if (!find[++p]) {
+                                        if ((p = ap_ind(&titlebuf[++x], '<'))
+                                            != -1) {
+                                                titlebuf[x + p] = '\0';
+                                        }
+                                        /* Scan for line breaks for Tanmoy's 
+                                           secretary
+                                        */
+                                        for (y = x; titlebuf[y]; y++) {
+                                                if ((titlebuf[y] == CR) 
+                                                    || (titlebuf[y] == LF)) {
+                                                        if (y == x) {
+                                                                x++;
+                                                        }
+                                                        else {
+                                                                titlebuf[y] = ' ';
+                                                        }
+                                                }
+                                        }
+                                        apr_file_close(thefile);
+                                        return apr_pstrdup(r->pool,
+                                                           &titlebuf[x]);
+                                }
+                        }
+                        else {
+                                p = 0;
+                        }
+                }
+                apr_file_close(thefile);
+        }
+        return NULL;
+}
+
+static struct ent *make_parent_entry(apr_int32_t autoindex_opts,
+                                     glusterfs_dir_config_t *d,
+                                     request_rec *r, char keyid,
+                                     char direction)
+{
+        struct ent *p = NULL;
+        char       *testpath = NULL;
+        /*
+         * p->name is now the true parent URI.
+         * testpath is a crafted lie, so that the syntax '/some/..'
+         * (or simply '..')be used to describe 'up' from '/some/'
+         * when processeing IndexIgnore, and Icon|Alt|Desc configs.
+         */
+
+        p = (struct ent *) apr_pcalloc(r->pool, sizeof(struct ent));
+        /* The output has always been to the parent.  Don't make ourself
+         * our own parent (worthless cyclical reference).
+         */
+        if (!(p->name = ap_make_full_path(r->pool, r->uri, "../"))) {
+                return (NULL);
+        }
+        ap_getparents(p->name);
+        if (!*p->name) {
+                return (NULL);
+        }
+
+        /* IndexIgnore has always compared "/thispath/.." */
+        testpath = ap_make_full_path(r->pool, r->filename, "..");
+        if (ignore_entry(d, testpath)) {
+                return (NULL);
+        }
+
+        p->size = -1;
+        p->lm = -1;
+        p->key = apr_toupper(keyid);
+        p->ascending = (apr_toupper(direction) == D_ASCENDING);
+        p->version_sort = autoindex_opts & VERSION_SORT;
+        if (autoindex_opts & FANCY_INDEXING) {
+                if (!(p->icon = find_default_icon(d, testpath))) {
+                        p->icon = find_default_icon(d, "^^DIRECTORY^^");
+                }
+                if (!(p->alt = find_default_alt(d, testpath))) {
+                        if (!(p->alt = find_default_alt(d, "^^DIRECTORY^^"))) {
+                                p->alt = "DIR";
+                        }
+                }
+                p->desc = find_desc(d, testpath);
+        }
+        return p;
+}
+
+static struct ent *make_autoindex_entry(const apr_finfo_t *dirent,
+                                        int autoindex_opts,
+                                        glusterfs_dir_config_t *d,
+                                        request_rec *r, char keyid,
+                                        char direction,
+                                        const char *pattern)
+{
+        request_rec *rr = NULL;
+        struct ent  *p = NULL;
+        int          show_forbidden = 0;
+
+        /* Dot is ignored, Parent is handled by make_parent_entry() */
+        if ((dirent->name[0] == '.') && (!dirent->name[1]
+                                         || ((dirent->name[1] == '.')
+                                             && !dirent->name[2])))
+                return (NULL);
+
+        /*
+         * On some platforms, the match must be case-blind.  This is really
+         * a factor of the filesystem involved, but we can't detect that
+         * reliably - so we have to granularise at the OS level.
+         */
+        if (pattern && (apr_fnmatch(pattern, dirent->name,
+                                    APR_FNM_NOESCAPE | APR_FNM_PERIOD
+#ifdef CASE_BLIND_FILESYSTEM
+                                    | APR_FNM_CASE_BLIND
+#endif
+                                )
+                        != APR_SUCCESS)) {
+                return (NULL);
+        }
+
+        if (ignore_entry(d, ap_make_full_path(r->pool,
+                                              r->filename, dirent->name))) {
+                return (NULL);
+        }
+
+        if (!(rr = ap_sub_req_lookup_dirent(dirent, r, AP_SUBREQ_NO_ARGS,
+                                            NULL))) {
+                return (NULL);
+        }
+
+        if((autoindex_opts & SHOW_FORBIDDEN)
+           && (rr->status == HTTP_UNAUTHORIZED
+               || rr->status == HTTP_FORBIDDEN)) {
+                show_forbidden = 1;
+        }
+
+        if ((rr->finfo.filetype != APR_DIR && rr->finfo.filetype != APR_REG)
+            || !(rr->status == OK || ap_is_HTTP_SUCCESS(rr->status)
+                 || ap_is_HTTP_REDIRECT(rr->status)
+                 || show_forbidden == 1)) {
+                ap_destroy_sub_req(rr);
+                return (NULL);
+        }
+
+        p = (struct ent *) apr_pcalloc(r->pool, sizeof(struct ent));
+        if (dirent->filetype == APR_DIR) {
+                p->name = apr_pstrcat(r->pool, dirent->name, "/", NULL);
+        }
+        else {
+                p->name = apr_pstrdup(r->pool, dirent->name);
+        }
+        p->size = -1;
+        p->icon = NULL;
+        p->alt = NULL;
+        p->desc = NULL;
+        p->lm = -1;
+        p->isdir = 0;
+        p->key = apr_toupper(keyid);
+        p->ascending = (apr_toupper(direction) == D_ASCENDING);
+        p->version_sort = !!(autoindex_opts & VERSION_SORT);
+        p->ignore_case = !!(autoindex_opts & IGNORE_CASE);
+
+        if (autoindex_opts & (FANCY_INDEXING | TABLE_INDEXING)) {
+                p->lm = rr->finfo.mtime;
+                if (dirent->filetype == APR_DIR) {
+                        if (autoindex_opts & FOLDERS_FIRST) {
+                                p->isdir = 1;
+                        }
+                        rr->filename = ap_make_dirstr_parent (rr->pool,
+                                                              rr->filename);
+
+                        /* omit the trailing slash (1.3 compat) */
+                        rr->filename[strlen(rr->filename) - 1] = '\0';
+
+                        if (!(p->icon = find_icon(d, rr, 1))) {
+                                p->icon = find_default_icon(d, "^^DIRECTORY^^");
+                        }
+                        if (!(p->alt = find_alt(d, rr, 1))) {
+                                if (!(p->alt = find_default_alt(d,
+                                                                "^^DIRECTORY^^"))) {
+                                        p->alt = "DIR";
+                                }
+                        }
+                }
+                else {
+                        p->icon = find_icon(d, rr, 0);
+                        p->alt = find_alt(d, rr, 0);
+                        p->size = rr->finfo.size;
+                }
+
+                p->desc = find_desc(d, rr->filename);
+
+                if ((!p->desc) && (autoindex_opts & SCAN_HTML_TITLES)) {
+                        p->desc = apr_pstrdup(r->pool, find_title(rr));
+                }
+        }
+        ap_destroy_sub_req(rr);
+        /*
+         * We don't need to take any special action for the file size key.
+         * If we did, it would go here.
+         */
+        if (keyid == K_LAST_MOD) {
+                if (p->lm < 0) {
+                        p->lm = 0;
+                }
+        }
+        return (p);
+}
+
+static char *terminate_description(glusterfs_dir_config_t *d, char *desc,
+                                   apr_int32_t autoindex_opts, int desc_width)
+{
+        int          maxsize = desc_width;
+        register int x = 0;
+
+        /*
+         * If there's no DescriptionWidth in effect, default to the old
+         * behaviour of adjusting the description size depending upon
+         * what else is being displayed.  Otherwise, stick with the
+         * setting.
+         */
+        if (d->desc_adjust == K_UNSET) {
+                if (autoindex_opts & SUPPRESS_ICON) {
+                        maxsize += 6;
+                }
+                if (autoindex_opts & SUPPRESS_LAST_MOD) {
+                        maxsize += 19;
+                }
+                if (autoindex_opts & SUPPRESS_SIZE) {
+                        maxsize += 7;
+                }
+        }
+        for (x = 0; desc[x] && ((maxsize > 0) || (desc[x] == '<')); x++) {
+                if (desc[x] == '<') {
+                        while (desc[x] != '>') {
+                                if (!desc[x]) {
+                                        maxsize = 0;
+                                        break;
+                                }
+                                ++x;
+                        }
+                }
+                else if (desc[x] == '&') {
+                        /* entities like &auml; count as one character */
+                        --maxsize;
+                        for ( ; desc[x] != ';'; ++x) {
+                                if (desc[x] == '\0') {
+                                        maxsize = 0;
+                                        break;
+                                }
+                        }
+                }
+                else {
+                        --maxsize;
+                }
+        }
+        if (!maxsize && desc[x] != '\0') {
+                desc[x - 1] = '>';      /* Grump. */
+                desc[x] = '\0';         /* Double Grump! */
+        }
+        return desc;
+}
+
+/*
+ * Emit the anchor for the specified field.  If a field is the key for the
+ * current request, the link changes its meaning to reverse the order when
+ * selected again.  Non-active fields always start in ascending order.
+ */
+static void emit_link(request_rec *r, const char *anchor, char column,
+                      char curkey, char curdirection,
+                      const char *colargs, int nosort)
+{
+        char qvalue[9];
+
+        if (!nosort) {
+
+                qvalue[0] = '?';
+                qvalue[1] = 'C';
+                qvalue[2] = '=';
+                qvalue[3] = column;
+                qvalue[4] = ';';
+                qvalue[5] = 'O';
+                qvalue[6] = '=';
+                /* reverse? */
+                qvalue[7] = ((curkey == column) && (curdirection == D_ASCENDING))
+                        ? D_DESCENDING : D_ASCENDING;
+                qvalue[8] = '\0';
+                ap_rvputs(r, "<a href=\"", qvalue, colargs ? colargs : "",
+                          "\">", anchor, "</a>", NULL);
+        }
+        else {
+                ap_rputs(anchor, r);
+        }
+}
+
+static void output_directories(struct ent **ar, int n,
+                               glusterfs_dir_config_t *d, request_rec *r,
+                               apr_int32_t autoindex_opts, char keyid,
+                               char direction, const char *colargs)
+{
+        int            x = 0;
+        apr_size_t     rv = APR_SUCCESS;
+        char          *name = NULL, *tp = NULL;
+        int            static_columns = 0;
+        apr_pool_t    *scratch = NULL;
+        int            name_width = 0, desc_width = 0, cols = 0;
+        char          *name_scratch = NULL, *pad_scratch = NULL, *breakrow = "";
+        char          *anchor = NULL, *t = NULL, *t2 = NULL;
+        int            nwidth = 0;
+        char           time_str[MAX_STRING_LEN];
+        apr_time_exp_t ts = {0, };
+        char           buf[5];
+
+        name = r->uri;
+        static_columns = !!(autoindex_opts & SUPPRESS_COLSORT);
+        apr_pool_create(&scratch, r->pool);
+        if (name[0] == '\0') {
+                name = "/";
+        }
+
+        name_width = d->name_width;
+        desc_width = d->desc_width;
+
+        if ((autoindex_opts & (FANCY_INDEXING | TABLE_INDEXING))
+            == FANCY_INDEXING) {
+                if (d->name_adjust == K_ADJUST) {
+                        for (x = 0; x < n; x++) {
+                                int t = 0;
+                                t = strlen(ar[x]->name);
+                                if (t > name_width) {
+                                        name_width = t;
+                                }
+                        }
+                }
+
+                if (d->desc_adjust == K_ADJUST) {
+                        for (x = 0; x < n; x++) {
+                                if (ar[x]->desc != NULL) {
+                                        int t = 0;
+                                        t = strlen(ar[x]->desc);
+                                        if (t > desc_width) {
+                                                desc_width = t;
+                                        }
+                                }
+                        }
+                }
+        }
+        name_scratch = apr_palloc(r->pool, name_width + 1);
+        pad_scratch = apr_palloc(r->pool, name_width + 1);
+        memset(pad_scratch, ' ', name_width);
+        pad_scratch[name_width] = '\0';
+
+        if (autoindex_opts & TABLE_INDEXING) {
+                cols = 1;
+                ap_rputs("<table><tr>", r);
+                if (!(autoindex_opts & SUPPRESS_ICON)) {
+                        ap_rputs("<th>", r);
+                        if ((tp = find_default_icon(d, "^^BLANKICON^^"))) {
+                                ap_rvputs(r, "<img src=\"",
+                                          ap_escape_html(scratch, tp),
+                                          "\" alt=\"[ICO]\"", NULL);
+                                if (d->icon_width) {
+                                        ap_rprintf(r, " width=\"%d\"",
+                                                   d->icon_width);
+                                }
+                                if (d->icon_height) {
+                                        ap_rprintf(r, " height=\"%d\"",
+                                                   d->icon_height);
+                                }
+
+                                if (autoindex_opts & EMIT_XHTML) {
+                                        ap_rputs(" /", r);
+                                }
+                                ap_rputs("></th>", r);
+                        }
+                        else {
+                                ap_rputs("&nbsp;</th>", r);
+                        }
+
+                        ++cols;
+                }
+                ap_rputs("<th>", r);
+                emit_link(r, "Name", K_NAME, keyid, direction,
+                          colargs, static_columns);
+                if (!(autoindex_opts & SUPPRESS_LAST_MOD)) {
+                        ap_rputs("</th><th>", r);
+                        emit_link(r, "Last modified", K_LAST_MOD, keyid,
+                                  direction, colargs, static_columns);
+                        ++cols;
+                }
+                if (!(autoindex_opts & SUPPRESS_SIZE)) {
+                        ap_rputs("</th><th>", r);
+                        emit_link(r, "Size", K_SIZE, keyid, direction,
+                                  colargs, static_columns);
+                        ++cols;
+                }
+                if (!(autoindex_opts & SUPPRESS_DESC)) {
+                        ap_rputs("</th><th>", r);
+                        emit_link(r, "Description", K_DESC, keyid, direction,
+                                  colargs, static_columns);
+                        ++cols;
+                }
+                if (!(autoindex_opts & SUPPRESS_RULES)) {
+                        breakrow = apr_psprintf(r->pool,
+                                                "<tr><th colspan=\"%d\">"
+                                                "<hr%s></th></tr>\n", cols,
+                                                (autoindex_opts & EMIT_XHTML) 
+                                                ? " /" : "");
+                }
+                ap_rvputs(r, "</th></tr>", breakrow, NULL);
+        }
+        else if (autoindex_opts & FANCY_INDEXING) {
+                ap_rputs("<pre>", r);
+                if (!(autoindex_opts & SUPPRESS_ICON)) {
+                        if ((tp = find_default_icon(d, "^^BLANKICON^^"))) {
+                                ap_rvputs(r, "<img src=\"",
+                                          ap_escape_html(scratch, tp),
+                                          "\" alt=\"Icon \"", NULL);
+                                if (d->icon_width) {
+                                        ap_rprintf(r, " width=\"%d\"",
+                                                   d->icon_width);
+                                }
+                                if (d->icon_height) {
+                                        ap_rprintf(r, " height=\"%d\"",
+                                                   d->icon_height);
+                                }
+
+                                if (autoindex_opts & EMIT_XHTML) {
+                                        ap_rputs(" /", r);
+                                }
+                                ap_rputs("> ", r);
+                        }
+                        else {
+                                ap_rputs("      ", r);
+                        }
+                }
+                emit_link(r, "Name", K_NAME, keyid, direction,
+                          colargs, static_columns);
+                ap_rputs(pad_scratch + 4, r);
+                /*
+                 * Emit the guaranteed-at-least-one-space-between-columns byte.
+                 */
+                ap_rputs(" ", r);
+                if (!(autoindex_opts & SUPPRESS_LAST_MOD)) {
+                        emit_link(r, "Last modified", K_LAST_MOD, keyid,
+                                  direction, colargs, static_columns);
+                        ap_rputs("      ", r);
+                }
+                if (!(autoindex_opts & SUPPRESS_SIZE)) {
+                        emit_link(r, "Size", K_SIZE, keyid, direction,
+                                  colargs, static_columns);
+                        ap_rputs("  ", r);
+                }
+                if (!(autoindex_opts & SUPPRESS_DESC)) {
+                        emit_link(r, "Description", K_DESC, keyid, direction,
+                                  colargs, static_columns);
+                }
+                if (!(autoindex_opts & SUPPRESS_RULES)) {
+                        ap_rputs("<hr", r);
+                        if (autoindex_opts & EMIT_XHTML) {
+                                ap_rputs(" /", r);
+                        }
+                        ap_rputs(">", r);
+                }
+                else {
+                        ap_rputc('\n', r);
+                }
+        }
+        else {
+                ap_rputs("<ul>", r);
+        }
+
+        for (x = 0; x < n; x++) {
+                apr_pool_clear(scratch);
+
+                t = ar[x]->name;
+                anchor = ap_escape_html(scratch, ap_os_escape_path(scratch, t,
+                                                                   0));
+
+                if (!x && t[0] == '/') {
+                        t2 = "Parent Directory";
+                }
+                else {
+                        t2 = t;
+                }
+
+                if (autoindex_opts & TABLE_INDEXING) {
+                        ap_rputs("<tr>", r);
+                        if (!(autoindex_opts & SUPPRESS_ICON)) {
+                                ap_rputs("<td valign=\"top\">", r);
+                                if (autoindex_opts & ICONS_ARE_LINKS) {
+                                        ap_rvputs(r, "<a href=\"", anchor,
+                                                  "\">", NULL);
+                                }
+                                if ((ar[x]->icon) || d->default_icon) {
+                                        ap_rvputs(r, "<img src=\"",
+                                                  ap_escape_html(scratch,
+                                                                 ar[x]->icon ?
+                                                                 ar[x]->icon
+                                                                 : d->default_icon),
+                                                  "\" alt=\"[",
+                                                  (ar[x]->alt ? 
+                                                   ar[x]->alt : "   "),
+                                                  "]\"", NULL);
+                                        if (d->icon_width) {
+                                                ap_rprintf(r, " width=\"%d\"",
+                                                           d->icon_width);
+                                        }
+                                        if (d->icon_height) {
+                                                ap_rprintf(r, " height=\"%d\"",
+                                                           d->icon_height);
+                                        }
+
+                                        if (autoindex_opts & EMIT_XHTML) {
+                                                ap_rputs(" /", r);
+                                        }
+                                        ap_rputs(">", r);
+                                }
+                                else {
+                                        ap_rputs("&nbsp;", r);
+                                }
+                                if (autoindex_opts & ICONS_ARE_LINKS) {
+                                        ap_rputs("</a></td>", r);
+                                }
+                                else {
+                                        ap_rputs("</td>", r);
+                                }
+                        }
+                        if (d->name_adjust == K_ADJUST) {
+                                ap_rvputs(r, "<td><a href=\"", anchor, "\">",
+                                          ap_escape_html(scratch, t2), "</a>",
+                                          NULL);
+                        }
+                        else {
+                                nwidth = strlen(t2);
+                                if (nwidth > name_width) {
+                                        memcpy(name_scratch, t2, name_width - 3);
+                                        name_scratch[name_width - 3] = '.';
+                                        name_scratch[name_width - 2] = '.';
+                                        name_scratch[name_width - 1] = '>';
+                                        name_scratch[name_width] = 0;
+                                        t2 = name_scratch;
+                                        nwidth = name_width;
+                                }
+                                ap_rvputs(r, "<td><a href=\"", anchor, "\">",
+                                          ap_escape_html(scratch, t2),
+                                          "</a>", pad_scratch + nwidth, NULL);
+                        }
+                        if (!(autoindex_opts & SUPPRESS_LAST_MOD)) {
+                                if (ar[x]->lm != -1) {
+                                        char time_str[MAX_STRING_LEN];
+                                        apr_time_exp_t ts;
+                                        apr_time_exp_lt(&ts, ar[x]->lm);
+                                        apr_strftime(time_str, &rv,
+                                                     MAX_STRING_LEN,
+                                                     "</td><td align=\"right\""
+                                                     ">%d-%b-%Y %H:%M  ",
+                                                     &ts);
+                                        ap_rputs(time_str, r);
+                                }
+                                else {
+                                        ap_rputs("</td><td>&nbsp;", r);
+                                }
+                        }
+                        if (!(autoindex_opts & SUPPRESS_SIZE)) {
+                                ap_rvputs(r, "</td><td align=\"right\">",
+                                          apr_strfsize(ar[x]->size, buf), NULL);
+                        }
+                        if (!(autoindex_opts & SUPPRESS_DESC)) {
+                                if (ar[x]->desc) {
+                                        if (d->desc_adjust == K_ADJUST) {
+                                                ap_rvputs(r, "</td><td>",
+                                                          ar[x]->desc, NULL);
+                                        }
+                                        else {
+                                                ap_rvputs(r, "</td><td>",
+                                                          terminate_description(d, ar[x]->desc,
+                                                                                autoindex_opts,
+                                                                                desc_width), NULL);
+                                        }
+                                }
+                        }
+                        else {
+                                ap_rputs("</td><td>&nbsp;", r);
+                        }
+                        ap_rputs("</td></tr>\n", r);
+                }
+                else if (autoindex_opts & FANCY_INDEXING) {
+                        if (!(autoindex_opts & SUPPRESS_ICON)) {
+                                if (autoindex_opts & ICONS_ARE_LINKS) {
+                                        ap_rvputs(r, "<a href=\"", anchor,
+                                                  "\">", NULL);
+                                }
+                                if ((ar[x]->icon) || d->default_icon) {
+                                        ap_rvputs(r, "<img src=\"",
+                                                  ap_escape_html(scratch,
+                                                                 ar[x]->icon ?
+                                                                 ar[x]->icon
+                                                                 : d->default_icon),
+                                                  "\" alt=\"[",
+                                                  (ar[x]->alt ? ar[x]->alt 
+                                                   : "   "),
+                                                  "]\"", NULL);
+                                        if (d->icon_width) {
+                                                ap_rprintf(r, " width=\"%d\"",
+                                                           d->icon_width);
+                                        }
+                                        if (d->icon_height) {
+                                                ap_rprintf(r, " height=\"%d\"",
+                                                           d->icon_height);
+                                        }
+
+                                        if (autoindex_opts & EMIT_XHTML) {
+                                                ap_rputs(" /", r);
+                                        }
+                                        ap_rputs(">", r);
+                                }
+                                else {
+                                        ap_rputs("     ", r);
+                                }
+                                if (autoindex_opts & ICONS_ARE_LINKS) {
+                                        ap_rputs("</a> ", r);
+                                }
+                                else {
+                                        ap_rputc(' ', r);
+                                }
+                        }
+                        nwidth = strlen(t2);
+                        if (nwidth > name_width) {
+                                memcpy(name_scratch, t2, name_width - 3);
+                                name_scratch[name_width - 3] = '.';
+                                name_scratch[name_width - 2] = '.';
+                                name_scratch[name_width - 1] = '>';
+                                name_scratch[name_width] = 0;
+                                t2 = name_scratch;
+                                nwidth = name_width;
+                        }
+                        ap_rvputs(r, "<a href=\"", anchor, "\">",
+                                  ap_escape_html(scratch, t2),
+                                  "</a>", pad_scratch + nwidth, NULL);
+                        /*
+                         * The blank before the storm.. er, before the next
+                         * field.
+                         */
+                        ap_rputs(" ", r);
+                        if (!(autoindex_opts & SUPPRESS_LAST_MOD)) {
+                                if (ar[x]->lm != -1) {
+                                        apr_time_exp_lt(&ts, ar[x]->lm);
+                                        apr_strftime(time_str, &rv,
+                                                     MAX_STRING_LEN,
+                                                     "%d-%b-%Y %H:%M  ", &ts);
+                                        ap_rputs(time_str, r);
+                                }
+                                else {
+                                        /* Length="22-Feb-1998 23:42  " 
+                                         * (see 4 lines above)
+                                         */
+                                        ap_rputs("                   ", r);
+                                }
+                        }
+                        if (!(autoindex_opts & SUPPRESS_SIZE)) {
+                                ap_rputs(apr_strfsize(ar[x]->size, buf), r);
+                                ap_rputs("  ", r);
+                        }
+                        if (!(autoindex_opts & SUPPRESS_DESC)) {
+                                if (ar[x]->desc) {
+                                        ap_rputs(terminate_description(d,
+                                                                       ar[x]->desc,
+                                                                       autoindex_opts,
+                                                                       desc_width), r);
+                                }
+                        }
+                        ap_rputc('\n', r);
+                }
+                else {
+                        ap_rvputs(r, "<li><a href=\"", anchor, "\"> ",
+                                  ap_escape_html(scratch, t2),
+                                  "</a></li>\n", NULL);
+                }
+        }
+        if (autoindex_opts & TABLE_INDEXING) {
+                ap_rvputs(r, breakrow, "</table>\n", NULL);
+        }
+        else if (autoindex_opts & FANCY_INDEXING) {
+                if (!(autoindex_opts & SUPPRESS_RULES)) {
+                        ap_rputs("<hr", r);
+                        if (autoindex_opts & EMIT_XHTML) {
+                                ap_rputs(" /", r);
+                        }
+                        ap_rputs("></pre>\n", r);
+                }
+                else {
+                        ap_rputs("</pre>\n", r);
+                }
+        }
+        else {
+                ap_rputs("</ul>\n", r);
+        }
+}
+
+/*
+ * Compare two file entries according to the sort criteria.  The return
+ * is essentially a signum function value.
+ */
+
+static int dsortf(struct ent **e1, struct ent **e2)
+{
+        struct ent *c1 = NULL, *c2 = NULL;
+        int         result = 0;
+
+        /*
+         * First, see if either of the entries is for the parent directory.
+         * If so, that *always* sorts lower than anything else.
+         */
+        if ((*e1)->name[0] == '/') {
+                return -1;
+        }
+        if ((*e2)->name[0] == '/') {
+                return 1;
+        }
+        /*
+         * Now see if one's a directory and one isn't, if we're set
+         * isdir for FOLDERS_FIRST.
+         */
+        if ((*e1)->isdir != (*e2)->isdir) {
+                return (*e1)->isdir ? -1 : 1;
+        }
+        /*
+         * All of our comparisons will be of the c1 entry against the c2 one,
+         * so assign them appropriately to take care of the ordering.
+         */
+        if ((*e1)->ascending) {
+                c1 = *e1;
+                c2 = *e2;
+        }
+        else {
+                c1 = *e2;
+                c2 = *e1;
+        }
+
+        switch (c1->key) {
+        case K_LAST_MOD:
+                if (c1->lm > c2->lm) {
+                        return 1;
+                }
+                else if (c1->lm < c2->lm) {
+                        return -1;
+                }
+                break;
+        case K_SIZE:
+                if (c1->size > c2->size) {
+                        return 1;
+                }
+                else if (c1->size < c2->size) {
+                        return -1;
+                }
+                break;
+        case K_DESC:
+                if (c1->version_sort) {
+                        result = apr_strnatcmp(c1->desc ? c1->desc : "",
+                                               c2->desc ? c2->desc : "");
+                }
+                else {
+                        result = strcmp(c1->desc ? c1->desc : "",
+                                        c2->desc ? c2->desc : "");
+                }
+                if (result) {
+                        return result;
+                }
+                break;
+        }
+
+        /* names may identical when treated case-insensitively,
+         * so always fall back on strcmp() flavors to put entries
+         * in deterministic order.  This means that 'ABC' and 'abc'
+         * will always appear in the same order, rather than
+         * variably between 'ABC abc' and 'abc ABC' order.
+         */
+
+        if (c1->version_sort) {
+                if (c1->ignore_case) {
+                        result = apr_strnatcasecmp (c1->name, c2->name);
+                }
+                if (!result) {
+                        result = apr_strnatcmp(c1->name, c2->name);
+                }
+        }
+
+        /* The names may be identical in respects other other than
+         * filename case when strnatcmp is used above, so fall back
+         * to strcmp on conflicts so that fn1.01.zzz and fn1.1.zzz
+         * are also sorted in a deterministic order.
+         */
+
+        if (!result && c1->ignore_case) {
+                result = strcasecmp (c1->name, c2->name);
+        }
+
+        if (!result) {
+                result = strcmp (c1->name, c2->name);
+        }
+
+        return result;
+}
+
+
+static int 
+mod_glfs_index_directory (request_rec *r,
+                          glusterfs_dir_config_t *autoindex_conf)
+{
+        char                   *title_name = NULL, *title_endp = NULL;
+        char                   *pstring = NULL, *colargs = NULL;
+        char                   *path = NULL, *fname = NULL, *charset = NULL;
+        char                   *fullpath = NULL, *name = NULL, *ctype = NULL;
+        apr_finfo_t             dirent;
+        glusterfs_file_t        fd = NULL;
+        apr_status_t            status = APR_SUCCESS;
+        int                     num_ent = 0, x;
+        struct ent             *head = NULL, *p = NULL;
+        struct ent            **ar = NULL;
+        const char             *qstring = NULL;
+        apr_int32_t             autoindex_opts = autoindex_conf->opts;
+        char                    keyid, direction;
+        apr_size_t              dirpathlen;
+        glusterfs_dir_config_t *dir_config = NULL;
+        int                     ret = -1;
+        struct dirent          *entry = NULL;
+        struct stat             st = {0, };
+
+        name = r->filename;
+        title_name = ap_escape_html(r->pool, r->uri);
+        ctype = "text/html";
+        dir_config = mod_glfs_dconfig (r);
+        if (dir_config == NULL)  {
+                return HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        path = r->uri;
+        fd = glusterfs_open (path, O_RDONLY, 0);
+        if (fd == 0) {
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                              "file permissions deny server access: %s",
+                              r->filename);
+                return HTTP_FORBIDDEN;
+        }
+
+        if (autoindex_conf->ctype) {
+                ctype = autoindex_conf->ctype;
+        }
+        if (autoindex_conf->charset) {
+                charset = autoindex_conf->charset;
+        }
+        else {
+#if APR_HAS_UNICODE_FS
+                charset = "UTF-8";
+#else
+                charset = "ISO-8859-1";
+#endif
+        }
+        if (*charset) {
+                ap_set_content_type(r, apr_pstrcat(r->pool, ctype, ";charset=",
+                                                   charset, NULL));
+        }
+        else {
+                ap_set_content_type(r, ctype);
+        }
+
+        if (autoindex_opts & TRACK_MODIFIED) {
+                ap_update_mtime(r, r->finfo.mtime);
+                ap_set_last_modified(r);
+                ap_set_etag(r);
+        }
+        if (r->header_only) {
+                glusterfs_close (fd);
+                return 0;
+        }
+
+        /*
+         * If there is no specific ordering defined for this directory,
+         * default to ascending by filename.
+         */
+        keyid = autoindex_conf->default_keyid
+                ? autoindex_conf->default_keyid : K_NAME;
+        direction = autoindex_conf->default_direction
+                ? autoindex_conf->default_direction : D_ASCENDING;
+
+        /*
+         * Figure out what sort of indexing (if any) we're supposed to use.
+         *
+         * If no QUERY_STRING was specified or client query strings have been
+         * explicitly disabled.
+         * If we are ignoring the client, suppress column sorting as well.
+         */
+        if (autoindex_opts & IGNORE_CLIENT) {
+                qstring = NULL;
+                autoindex_opts |= SUPPRESS_COLSORT;
+                colargs = "";
+        }
+        else {
+                char fval[5], vval[5], *ppre = "", *epattern = "";
+                fval[0] = '\0'; vval[0] = '\0';
+                qstring = r->args;
+
+                while (qstring && *qstring) {
+
+                        /* C= First Sort key Column (N, M, S, D) */
+                        if (   qstring[0] == 'C' && qstring[1] == '='
+                               && qstring[2] && strchr(K_VALID, qstring[2])
+                               && (   qstring[3] == '&' || qstring[3] == ';'
+                                      || !qstring[3])) {
+                                keyid = qstring[2];
+                                qstring += qstring[3] ? 4 : 3;
+                        }
+
+                        /* O= Sort order (A, D) */
+                        else if (   qstring[0] == 'O' && qstring[1] == '='
+                                    && (   (qstring[2] == D_ASCENDING)
+                                           || (qstring[2] == D_DESCENDING))
+                                    && (   qstring[3] == '&' 
+                                           || qstring[3] == ';'
+                                           || !qstring[3])) {
+                                direction = qstring[2];
+                                qstring += qstring[3] ? 4 : 3;
+                        }
+
+                        /* F= Output Format (0 plain, 1 fancy (pre), 2 table) */
+                        else if (   qstring[0] == 'F' && qstring[1] == '='
+                                    && qstring[2] && strchr("012", qstring[2])
+                                    && (   qstring[3] == '&' || qstring[3] == ';'
+                                           || !qstring[3])) {
+                                if (qstring[2] == '0') {
+                                        autoindex_opts &= ~(FANCY_INDEXING
+                                                            | TABLE_INDEXING);
+                                }
+                                else if (qstring[2] == '1') {
+                                        autoindex_opts = (autoindex_opts
+                                                          | FANCY_INDEXING)
+                                                & ~TABLE_INDEXING;
+                                }
+                                else if (qstring[2] == '2') {
+                                        autoindex_opts |= FANCY_INDEXING
+                                                | TABLE_INDEXING;
+                                }
+                                strcpy(fval, ";F= ");
+                                fval[3] = qstring[2];
+                                qstring += qstring[3] ? 4 : 3;
+                        }
+
+                        /* V= Version sort (0, 1) */
+                        else if (   qstring[0] == 'V' && qstring[1] == '='
+                                    && (qstring[2] == '0' || qstring[2] == '1')
+                                    && (   qstring[3] == '&' || qstring[3] == ';'
+                                           || !qstring[3])) {
+                                if (qstring[2] == '0') {
+                                        autoindex_opts &= ~VERSION_SORT;
+                                }
+                                else if (qstring[2] == '1') {
+                                        autoindex_opts |= VERSION_SORT;
+                                }
+                                strcpy(vval, ";V= ");
+                                vval[3] = qstring[2];
+                                qstring += qstring[3] ? 4 : 3;
+                        }
+
+                        /* P= wildcard pattern (*.foo) */
+                        else if (qstring[0] == 'P' && qstring[1] == '=') {
+                                const char *eos = qstring += 2; /* for efficiency */
+
+                                while (*eos && *eos != '&' && *eos != ';') {
+                                        ++eos;
+                                }
+
+                                if (eos == qstring) {
+                                        pstring = NULL;
+                                }
+                                else {
+                                        pstring = apr_pstrndup(r->pool, qstring,
+                                                               eos - qstring);
+                                        if (ap_unescape_url(pstring) != OK) {
+                                                /* ignore the pattern, if it's bad. */
+                                                pstring = NULL;
+                                        }
+                                        else {
+                                                ppre = ";P=";
+                                                /* be correct */
+                                                epattern = ap_escape_uri(r->pool,
+                                                                         pstring);
+                                        }
+                                }
+
+                                if (*eos && *++eos) {
+                                        qstring = eos;
+                                }
+                                else {
+                                        qstring = NULL;
+                                }
+                        }
+
+                        /* Syntax error?  Ignore the remainder! */
+                        else {
+                                qstring = NULL;
+                        }
+                }
+                colargs = apr_pstrcat(r->pool, fval, vval, ppre, epattern,
+                                      NULL);
+        }
+
+        /* Spew HTML preamble */
+        title_endp = title_name + strlen(title_name) - 1;
+
+        while (title_endp > title_name && *title_endp == '/') {
+                *title_endp-- = '\0';
+        }
+
+        emit_head(r, find_header(autoindex_conf, r),
+                  autoindex_opts & SUPPRESS_PREAMBLE,
+                  autoindex_opts & EMIT_XHTML, title_name);
+
+        /*
+         * Since we don't know how many dir. entries there are, put them into a
+         * linked list and then arrayificate them so qsort can use them.
+         */
+        head = NULL;
+        p = make_parent_entry(autoindex_opts, autoindex_conf, r, keyid,
+                              direction);
+        if (p != NULL) {
+                p->next = head;
+                head = p;
+                num_ent++;
+        }
+        fullpath = apr_palloc(r->pool, APR_PATH_MAX);
+        dirpathlen = strlen(name);
+        memcpy(fullpath, name, dirpathlen);
+
+        do {
+                entry = glusterfs_readdir (fd);
+                if (entry == NULL) {
+                        break;
+                }
+
+                fname = apr_pstrcat (r->pool, path, entry->d_name, NULL);
+
+                ret = glusterfs_stat (fname, &st);
+                if (ret != 0) {
+                        break;
+                }
+                
+                dirent.fname = fname;
+                dirent.name = apr_pstrdup (r->pool, entry->d_name);
+                fill_out_finfo (&dirent, &st, 
+                                APR_FINFO_MIN | APR_FINFO_IDENT
+                                | APR_FINFO_NLINK | APR_FINFO_OWNER
+                                | APR_FINFO_PROT);
+
+                p = make_autoindex_entry(&dirent, autoindex_opts,
+                                         autoindex_conf, r,
+                                         keyid, direction, pstring);
+                if (p != NULL) {
+                        p->next = head;
+                        head = p;
+                        num_ent++;
+                }
+        } while (1);
+
+        if (num_ent > 0) {
+                ar = (struct ent **) apr_palloc(r->pool,
+                                                num_ent * sizeof(struct ent *));
+                p = head;
+                x = 0;
+                while (p) {
+                        ar[x++] = p;
+                        p = p->next;
+                }
+
+                qsort((void *) ar, num_ent, sizeof(struct ent *),
+                      (int (*)(const void *, const void *)) dsortf);
+        }
+        output_directories(ar, num_ent, autoindex_conf, r, autoindex_opts,
+                           keyid, direction, colargs);
+        glusterfs_close (fd);
+
+        emit_tail(r, find_readme(autoindex_conf, r),
+                  autoindex_opts & SUPPRESS_PREAMBLE);
+
+        return 0;
+}
+
+
+static int 
+handle_autoindex(request_rec *r)
+{
+        glusterfs_dir_config_t *dir_config = NULL;
+        int allow_opts;
+
+        allow_opts = ap_allow_options(r);
+
+        r->allowed |= (AP_METHOD_BIT << M_GET);
+        if (r->method_number != M_GET) {
+                return DECLINED;
+        }
+
+        dir_config = mod_glfs_dconfig (r);
+
+        /* OK, nothing easy.  Trot out the heavy artillery... */
+
+        if (allow_opts & OPT_INDEXES) {
+                int errstatus;
+
+                if ((errstatus = ap_discard_request_body(r)) != OK) {
+                        return errstatus;
+                }
+
+                /* KLUDGE --- make the sub_req lookups happen in the right 
+                 * directory. Fixing this in the sub_req_lookup functions 
+                 * themselves is difficult, and would probably break 
+                 * virtual includes...
+                 */
+
+                if (r->filename[strlen(r->filename) - 1] != '/') {
+                        r->filename = apr_pstrcat(r->pool, r->filename, "/",
+                                                  NULL);
+                }
+                return mod_glfs_index_directory(r, dir_config);
+        } else {
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                              "Directory index forbidden by "
+                              "Options directive: %s", r->filename);
+                return HTTP_FORBIDDEN;
+        }
+}
+
+
+static int 
+mod_glfs_handler (request_rec *r)
+{
+        conn_rec               *c = r->connection;
+        apr_bucket_brigade     *bb;
+        apr_bucket             *e;
+        core_dir_config        *d;
+        int                     errstatus;
+        glusterfs_file_t        fd = NULL;
+        apr_status_t            status;
+        glusterfs_dir_config_t *dir_config = NULL;
+        char                   *path = NULL;
+        int                     num_ranges = 0;
+        apr_size_t              size = 0;
+        apr_off_t               range_start = 0, range_end = 0;
+        char                   *current = NULL;
+        apr_status_t            rv = 0;
+        core_request_config    *req_cfg = NULL;
+
+        /* XXX if/when somebody writes a content-md5 filter we either need to
+         *     remove this support or coordinate when to use the filter vs.
+         *     when to use this code
+         *     The current choice of when to compute the md5 here matches the 1.3
+         *     support fairly closely (unlike 1.3, we don't handle computing md5
+         *     when the charset is translated).
+         */
+
+        int bld_content_md5;
+        if (!r->handler || (r->handler
+                            && strcmp (r->handler, GLUSTERFS_HANDLER)))
+                return DECLINED;
+
+        if (r->uri[0] == '\0') {
+                return DECLINED;
+        }
+  
+        if (r->finfo.filetype == APR_DIR) {
+                return handle_autoindex (r);
+        }
+
+        dir_config = mod_glfs_dconfig (r);
+
+        ap_allow_standard_methods(r, MERGE_ALLOW, M_GET, -1);
+  
+        /* We understood the (non-GET) method, but it might not be legal for
+           this particular resource. Check to see if the 'deliver_script'
+           flag is set. If so, then we go ahead and deliver the file since
+           it isn't really content (only GET normally returns content).
+
+           Note: based on logic further above, the only possible non-GET
+           method at this point is POST. In the future, we should enable
+           script delivery for all methods.  */
+        if (r->method_number != M_GET) {
+                req_cfg = ap_get_module_config(r->request_config, &core_module);
+                if (!req_cfg->deliver_script) {
+                        /* The flag hasn't been set for this request. Punt. */
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                                      "This resource does not accept the %s "
+                                      "method.",
+                                      r->method);
+                        return HTTP_METHOD_NOT_ALLOWED;
+                }
+        }
+
+        d = (core_dir_config *)ap_get_module_config(r->per_dir_config,
+                                                    &core_module);
+        bld_content_md5 = (d->content_md5 & 1)
+                && r->output_filters->frec->ftype != AP_FTYPE_RESOURCE;
+
+        if ((errstatus = ap_discard_request_body(r)) != OK) {
+                return errstatus;
+        }
+
+        if (r->finfo.filetype == 0) {
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                              "File does not exist: %s", r->filename);
+                return HTTP_NOT_FOUND;
+        }
+
+        if ((r->used_path_info != AP_REQ_ACCEPT_PATH_INFO) &&
+            r->path_info && *r->path_info)
+        {
+                /* default to reject */
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                              "File does not exist: %s",
+                              apr_pstrcat(r->pool, r->filename, r->path_info,
+                                          NULL));
+                return HTTP_NOT_FOUND;
+        }
+
+        ap_update_mtime (r, r->finfo.mtime);
+        ap_set_last_modified (r);
+        ap_set_etag (r);
+        apr_table_setn (r->headers_out, "Accept-Ranges", "bytes");
+
+        num_ranges = ap_set_byterange(r);
+        if (num_ranges == 0) {
+                size = r->finfo.size;
+        } else {
+                char *tmp = apr_pstrdup (r->pool, r->range);
+                while ((current = ap_getword(r->pool, (const char **)&tmp, ','))
+                       && (rv = parse_byterange(current, r->finfo.size,
+                                                &range_start, &range_end))) {
+                        size += (range_end - range_start);
+                }
+        }
+
+        ap_set_content_length (r, size);
+                        
+        if ((errstatus = ap_meets_conditions(r)) != OK) {
+                r->status = errstatus;
+        }
+
+        /* 
+         * file is small enough to have already got the content in 
+         * glusterfs_lookup
+        */
+        if (r->finfo.size <= dir_config->xattr_file_size && dir_config->buf) {
+                if (bld_content_md5) {
+                        apr_table_setn (r->headers_out, "Content-MD5",
+                                        (const char *)ap_md5_binary(r->pool,
+                                                                    dir_config->buf
+                                                                    , r->finfo.size));
+                }
+
+                ap_log_rerror (APLOG_MARK, APLOG_NOTICE, 0, r, 
+                               "fetching data from glusterfs through xattr "
+                               "interface\n");
+                
+                bb = apr_brigade_create(r->pool, c->bucket_alloc);
+
+                e = apr_bucket_heap_create (dir_config->buf, r->finfo.size,
+                                            free, c->bucket_alloc);
+                APR_BRIGADE_INSERT_TAIL (bb, e);
+                
+                e = apr_bucket_eos_create(c->bucket_alloc);
+                APR_BRIGADE_INSERT_TAIL(bb, e);
+
+                dir_config->buf = NULL;
+
+                /* let the byterange_filter handle multipart requests */
+                status = ap_pass_brigade(r->output_filters, bb);
+                if (status == APR_SUCCESS
+                    || r->status != HTTP_OK
+                    || c->aborted) {
+                        return OK;
+                }
+                else {
+                        /* no way to know what type of error occurred */
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r,
+                                      "mod_glfs_handler: ap_pass_brigade "
+                                      "returned %i",
+                                      status);
+                        return HTTP_INTERNAL_SERVER_ERROR;
+                }
+        }
+        
+        /* do standard open/read/close to fetch content */
+        path = r->uri;
+        
+        fd = glusterfs_open (path, O_RDONLY, 0);
+        if (fd == 0) {
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                              "file permissions deny server access: %s",
+                              r->filename);
+                return HTTP_FORBIDDEN;
+        }
+
+        /* 
+         * byterange_filter cannot handle range requests, since we are not 
+         * sending the whole data in a single brigade
+         */
+
+
+        if (num_ranges == 0) {
+                mod_glfs_read_async (r, NULL, fd, 0, -1);
+        } else {
+                mod_glfs_handle_byte_ranges (r, fd, num_ranges);
+        }
+                
+        glusterfs_close (fd);
+}
+
+
+#if 0
+static apr_status_t 
+mod_glfs_output_filter (ap_filter_t *f,
+                        apr_bucket_brigade *b)
+{
+        size_t size = 0;
+        apr_bucket_t *e = NULL; 
+        size = atol (apr_table_get (r->notes, MOD_GLFS_SIZE));
+        
+        for (e = APR_BRIGADE_FIRST(b);
+             e != APR_BRIGADE_SENTINEL(b);
+             e = APR_BUCKET_NEXT(e))
+        {
+                /* FIXME: can there be more than one heap buckets? */
+                if (e->type == &apr_bucket_type_heap) {
+                        break;
+                }
+        }
+
+        if (e != APR_BRIGADE_SENTINEL(b)) {
+                e->length = size;
+        }
+
+        return ap_pass_brigade (f->next, b);
+}
+#endif
+
+static int 
+mod_glfs_fixup_dir(request_rec *r)
+{
+        glusterfs_dir_config_t  *d = NULL;
+        char                    *dummy_ptr[1];
+        char                   **names_ptr = NULL, *name_ptr = NULL;
+        int                      num_names;
+        int                      error_notfound = 0;
+        char                    *ifile = NULL;
+        request_rec             *rr = NULL;
+
+        /* only handle requests against directories */
+        if (r->finfo.filetype != APR_DIR) {
+                return DECLINED;
+        }
+
+        if (!r->handler || strcmp (r->handler, GLUSTERFS_HANDLER)) {
+                return DECLINED;
+        }
+
+        /* Never tolerate path_info on dir requests */
+        if (r->path_info && *r->path_info) {
+                return DECLINED;
+        }
+
+        d = (glusterfs_dir_config_t *)ap_get_module_config(r->per_dir_config,
+                                                           &glusterfs_module);
+
+        /* Redirect requests that are not '/' terminated */
+        if (r->uri[0] == '\0' || r->uri[strlen(r->uri) - 1] != '/')
+        {
+                if (!d->do_slash) {
+                        return DECLINED;
+                }
+
+                /* Only redirect non-get requests if we have no note to warn
+                 * that this browser cannot handle redirs on non-GET requests
+                 * (such as Microsoft's WebFolders).
+                 */
+                if ((r->method_number != M_GET)
+                    && apr_table_get(r->subprocess_env, "redirect-carefully")) {
+                        return DECLINED;
+                }
+
+                if (r->args != NULL) {
+                        ifile = apr_pstrcat(r->pool, ap_escape_uri(r->pool,
+                                                                   r->uri),
+                                            "/", "?", r->args, NULL);
+                }
+                else {
+                        ifile = apr_pstrcat(r->pool, ap_escape_uri(r->pool,
+                                                                   r->uri),
+                                            "/", NULL);
+                }
+
+                apr_table_setn(r->headers_out, "Location",
+                               ap_construct_url(r->pool, ifile, r));
+                return HTTP_MOVED_PERMANENTLY;
+        }
+
+        if (d->index_names) {
+                names_ptr = (char **)d->index_names->elts;
+                num_names = d->index_names->nelts;
+        }
+        else {
+                dummy_ptr[0] = AP_DEFAULT_INDEX;
+                names_ptr = dummy_ptr;
+                num_names = 1;
+        }
+
+        for (; num_names; ++names_ptr, --num_names) {
+                /* XXX: Is this name_ptr considered escaped yet, or not??? */
+                name_ptr = *names_ptr;
+
+                /* Once upon a time args were handled _after_ the successful
+                 * redirect. But that redirect might then _refuse_ the 
+                 * given r->args, creating a nasty tangle.  It seems safer to 
+                 * consider the r->args while we determine if name_ptr is our 
+                 * viable index, and therefore set them up correctly on redirect.
+                 */
+                if (r->args != NULL) {
+                        name_ptr = apr_pstrcat(r->pool, name_ptr, "?", r->args,
+                                               NULL);
+                }
+
+                rr = ap_sub_req_lookup_uri(name_ptr, r, NULL);
+
+                /* The sub request lookup is very liberal, and the core 
+                 * map_to_storage handler will almost always result in HTTP_OK 
+                 * as /foo/index.html may be /foo with PATH_INFO="/index.html",
+                 * or even / with PATH_INFO="/foo/index.html". To get around 
+                 * this we insist that the the index be a regular filetype.
+                 *
+                 * Another reason is that the core handler also makes the 
+                 * assumption that if r->finfo is still NULL by the time it 
+                 * gets called, the file does not exist.
+                 */
+                if (rr->status == HTTP_OK
+                    && (   (rr->handler && !strcmp(rr->handler, "proxy-server"))
+                           || rr->finfo.filetype == APR_REG)) {
+                        ap_internal_fast_redirect(rr, r);
+                        return OK;
+                }
+
+                /* If the request returned a redirect, propagate it to the 
+                 * client
+                 */
+
+                if (ap_is_HTTP_REDIRECT(rr->status)
+                    || (rr->status == HTTP_NOT_ACCEPTABLE && num_names == 1)
+                    || (rr->status == HTTP_UNAUTHORIZED && num_names == 1)) {
+
+                        apr_pool_join(r->pool, rr->pool);
+                        error_notfound = rr->status;
+                        r->notes = apr_table_overlay(r->pool, r->notes,
+                                                     rr->notes);
+                        r->headers_out = apr_table_overlay(r->pool,
+                                                           r->headers_out,
+                                                           rr->headers_out);
+                        r->err_headers_out = apr_table_overlay(r->pool,
+                                                               r->err_headers_out,
+                                                               rr->err_headers_out);
+                        return error_notfound;
+                }
+
+                /* If the request returned something other than 404 (or 200),
+                 * it means the module encountered some sort of problem. To be
+                 * secure, we should return the error, rather than allow 
+                 * autoindex to create a (possibly unsafe) directory index.
+                 *
+                 * So we store the error, and if none of the listed files
+                 * exist, we return the last error response we got, instead
+                 * of a directory listing.
+                 */
+                if (rr->status && rr->status != HTTP_NOT_FOUND
+                    && rr->status != HTTP_OK) {
+                        error_notfound = rr->status;
+                }
+
+                ap_destroy_sub_req(rr);
+        }
+
+        if (error_notfound) {
+                return error_notfound;
+        }
+
+        /* nothing for us to do, pass on through */
+        return DECLINED;
+}
+
+
+static void 
+mod_glfs_register_hooks(apr_pool_t *p)
+{
+        ap_hook_child_init (mod_glfs_child_init, NULL, NULL, APR_HOOK_MIDDLE);
+        ap_hook_handler (mod_glfs_handler, NULL, NULL, APR_HOOK_REALLY_FIRST);
+        ap_hook_map_to_storage (mod_glfs_map_to_storage, NULL, NULL,
+                                APR_HOOK_REALLY_FIRST);
+        ap_hook_fixups(mod_glfs_fixup_dir,NULL,NULL,APR_HOOK_LAST);
+
+/*    mod_glfs_output_filter_handle = 
+      ap_register_output_filter ("MODGLFS", mod_glfs_output_filter,
+      NULL, AP_FTYPE_PROTOCOL); */
+}
+
+static const char *
+cmd_add_index (cmd_parms *cmd, void *dummy, const char *arg)
+{
+        glusterfs_dir_config_t *d = dummy;
+
+        if (!d->index_names) {
+                d->index_names = apr_array_make(cmd->pool, 2, sizeof(char *));
+        }
+        *(const char **)apr_array_push(d->index_names) = arg;
+        return NULL;
+}
+
+static const char *
+cmd_configure_slash (cmd_parms *cmd, void *d_, int arg)
+{
+        glusterfs_dir_config_t *d = d_;
+
+        d->do_slash = arg ? SLASH_ON : SLASH_OFF;
+        return NULL;
+}
+
+#define DIR_CMD_PERMS OR_INDEXES
+
+static const 
+command_rec mod_glfs_cmds[] =
+{
+        AP_INIT_TAKE1(
+                "GlusterfsLogfile",
+                cmd_add_logfile,
+                NULL,
+                ACCESS_CONF, /*FIXME: allow overriding in .htaccess files */
+                "Glusterfs logfile"
+                ),
+
+        AP_INIT_TAKE1(
+                "GlusterfsLoglevel",
+                cmd_set_loglevel,
+                NULL,
+                ACCESS_CONF,
+                "Glusterfs loglevel:anyone of none, critical, error, warning, "
+                "debug"
+                ),
+
+        AP_INIT_TAKE1(
+                "GlusterfsCacheTimeout",
+                cmd_set_cache_timeout,
+                NULL,
+                ACCESS_CONF,
+                "Timeout value in seconds for lookup and stat cache of "
+                "libglusterfsclient"
+                ),
+
+        AP_INIT_TAKE1(
+                "GlusterfsVolumeSpecfile",
+                cmd_add_volume_specfile,
+                NULL,
+                ACCESS_CONF,
+                "Glusterfs Volume specfication file specifying filesystem "
+                "under this directory"
+                ),
+
+        AP_INIT_TAKE1(
+                "GlusterfsXattrFileSize",
+                cmd_add_xattr_file_size,
+                NULL,
+                ACCESS_CONF,
+                "Maximum size of the file that can be fetched through "
+                "extended attribute interface of libglusterfsclient"
+                ),
+
+        /* mod_dir cmds */
+        AP_INIT_ITERATE("DirectoryIndex", cmd_add_index, 
+                        NULL, DIR_CMD_PERMS,
+                        "a list of file names"),
+
+        AP_INIT_FLAG("DirectorySlash", cmd_configure_slash, 
+                     NULL, DIR_CMD_PERMS,
+                     "On or Off"),
+
+        /* autoindex cmds */
+        AP_INIT_ITERATE2("AddIcon", cmd_add_icon, 
+                         BY_PATH, DIR_CMD_PERMS,
+                         "an icon URL followed by one or more filenames"),
+
+        AP_INIT_ITERATE2("AddIconByType", cmd_add_icon, 
+                         BY_TYPE, DIR_CMD_PERMS,
+                         "an icon URL followed by one or more MIME types"),
+
+        AP_INIT_ITERATE2("AddIconByEncoding", cmd_add_icon, 
+                         BY_ENCODING, DIR_CMD_PERMS,
+                         "an icon URL followed by one or more content encodings"),
+
+        AP_INIT_ITERATE2("AddAlt", cmd_add_alt, BY_PATH, 
+                         DIR_CMD_PERMS,
+                         "alternate descriptive text followed by one or more "
+                         "filenames"),
+
+        AP_INIT_ITERATE2("AddAltByType", cmd_add_alt, 
+                         BY_TYPE, DIR_CMD_PERMS,
+                         "alternate descriptive text followed by one or more "
+                         "MIME types"),
+
+        AP_INIT_ITERATE2("AddAltByEncoding", cmd_add_alt, 
+                         BY_ENCODING, DIR_CMD_PERMS,
+                         "alternate descriptive text followed by one or more "
+                         "content encodings"),
+
+        AP_INIT_TAKE_ARGV("IndexOptions", cmd_add_opts, 
+                          NULL, DIR_CMD_PERMS,
+                          "one or more index options [+|-][]"),
+
+        AP_INIT_TAKE2("IndexOrderDefault", cmd_set_default_order, 
+                      NULL, DIR_CMD_PERMS,
+                      "{Ascending,Descending} {Name,Size,Description,Date}"),
+
+        AP_INIT_ITERATE("IndexIgnore", cmd_add_ignore, 
+                        NULL, DIR_CMD_PERMS,
+                        "one or more file extensions"),
+
+        AP_INIT_ITERATE2("AddDescription", cmd_add_desc, 
+                         BY_PATH, DIR_CMD_PERMS,
+                         "Descriptive text followed by one or more filenames"),
+
+        AP_INIT_TAKE1("HeaderName", cmd_add_header, 
+                      NULL, DIR_CMD_PERMS,
+                      "a filename"),
+
+        AP_INIT_TAKE1("ReadmeName", cmd_add_readme, 
+                      NULL, DIR_CMD_PERMS,
+                      "a filename"),
+
+        AP_INIT_RAW_ARGS("FancyIndexing", ap_set_deprecated, 
+                         NULL, OR_ALL,
+                         "The FancyIndexing directive is no longer supported. "
+                         "Use IndexOptions FancyIndexing."),
+
+        AP_INIT_TAKE1("DefaultIcon", ap_set_string_slot,
+                      (void *)APR_OFFSETOF(glusterfs_dir_config_t,
+                                           default_icon),
+                      DIR_CMD_PERMS, "an icon URL"),
+
+        AP_INIT_TAKE1("IndexStyleSheet", ap_set_string_slot,
+                      (void *)APR_OFFSETOF(glusterfs_dir_config_t, style_sheet),
+                      DIR_CMD_PERMS, "URL to style sheet"),
+
+        {NULL}
+};
+
+module AP_MODULE_DECLARE_DATA glusterfs_module =
+{
+        STANDARD20_MODULE_STUFF,
+        mod_glfs_create_dir_config,
+        mod_glfs_merge_dir_config,
+        NULL, //mod_glfs_create_server_config,
+        NULL, //mod_glfs_merge_server_config,
+        mod_glfs_cmds,
+        mod_glfs_register_hooks,
+};
diff --git a/mod_glusterfs/apache/Makefile.am b/mod_glusterfs/apache/Makefile.am
new file mode 100644
index 000000000..bda039310
--- /dev/null
+++ b/mod_glusterfs/apache/Makefile.am
@@ -0,0 +1,10 @@
+SUBDIRS = $(MOD_GLUSTERFS_HTTPD_VERSION)
+
+EXTRA_DIST = 1.3/Makefile.am 1.3/Makefile.in \
+	     1.3/src/Makefile.am 1.3/src/Makefile.in \
+	     1.3/src/mod_glusterfs.c \
+	     1.3/src/README.txt \
+	     2.2/Makefile.am 2.2/Makefile.in \
+	     2.2/src/Makefile.am 2.2/src/Makefile.in \
+	     2.2/src/mod_glusterfs.c
+CLEANFILES = 
diff --git a/mod_glusterfs/lighttpd/1.4/Makefile.am b/mod_glusterfs/lighttpd/1.4/Makefile.am
new file mode 100644
index 000000000..eda329111
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.4/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = Makefile.am.diff mod_glusterfs.c mod_glusterfs.h README.txt
+
+CLEANFILES = 
diff --git a/mod_glusterfs/lighttpd/1.4/Makefile.am.diff b/mod_glusterfs/lighttpd/1.4/Makefile.am.diff
new file mode 100644
index 000000000..375696b5d
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.4/Makefile.am.diff
@@ -0,0 +1,29 @@
+--- lighttpd-1.4.19/src/Makefile.am	2008-04-16 18:42:18.000000000 +0400
++++ lighttpd-1.4.19.mod/src/Makefile.am	2008-04-16 18:41:11.000000000 +0400
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = $(FAM_CFLAGS)
++AM_CFLAGS = $(FAM_CFLAGS)  -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64
+ 
+ noinst_PROGRAMS=proc_open lemon # simple-fcgi #graphic evalo bench ajp ssl error_test adserver gen-license
+ sbin_PROGRAMS=lighttpd lighttpd-angel
+@@ -241,6 +241,11 @@
+ mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+ mod_accesslog_la_LIBADD = $(common_libadd)
+ 
++lib_LTLIBRARIES += mod_glusterfs.la
++mod_glusterfs_la_SOURCES = mod_glusterfs.c
++mod_glusterfs_la_CFLAGS = $(AM_CFLAGS) 
++mod_glusterfs_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -lglusterfsclient -lpthread
++mod_glusterfs_la_LIBADD = $(common_libadd) 
+ 
+ hdr = server.h buffer.h network.h log.h keyvalue.h \
+       response.h request.h fastcgi.h chunk.h \
+@@ -254,7 +259,7 @@
+       configparser.h mod_ssi_exprparser.h \
+       sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
+       splaytree.h proc_open.h status_counter.h \
+-      mod_magnet_cache.h
++      mod_magnet_cache.h mod_glusterfs.h
+ 
+ DEFS= @DEFS@ -DLIBRARY_DIR="\"$(libdir)\"" -DSBIN_DIR="\"$(sbindir)\""
+ 
diff --git a/mod_glusterfs/lighttpd/1.4/README.txt b/mod_glusterfs/lighttpd/1.4/README.txt
new file mode 100644
index 000000000..786a146e4
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.4/README.txt
@@ -0,0 +1,57 @@
+Introduction
+============
+mod_glusterfs is a module written for lighttpd to speed up the access of files present on glusterfs. mod_glusterfs uses libglusterfsclient library provided for glusterfs and hence can be used without fuse (File System in User Space).
+
+Usage
+=====
+To use mod_glusterfs with lighttpd-1.4, copy mod_glusterfs.c and mod_glusterfs.h into src/ of lighttpd-1.4 source tree, and apply the Makefile.am.diff to src/Makefile.am. Re-run ./autogen.sh on the top level of the lighttpd-1.4 build tree and recompile.
+
+# cp mod_glusterfs.[ch] /home/glusterfs/lighttpd-1.4/src/
+# cp Makefile.am.diff /home/glusterfs/lighttpd-1.4/
+# cd /home/glusterfs/lighttpd-1.4
+# patch -p1 < Makefile.am.diff 
+# ./autogen.sh
+# ./configure
+# make
+# make install
+
+Configuration
+=============
+* mod_glusterfs should be listed at the begining of the list server.modules in lighttpd.conf. 
+
+Below is a snippet from lighttpd.conf concerning to mod_glusterfs.
+
+$HTTP["url"] =~ "^/glusterfs" {
+	glusterfs.prefix = "/glusterfs" 
+	glusterfs.document-root = "/home/glusterfs/document-root"
+	glusterfs.logfile = "/var/log/glusterfs-logfile"
+	glusterfs.volume-specfile = "/etc/glusterfs/glusterfs.vol"
+	glusterfs.loglevel = "error"
+	glusterfs.cache-timeout = 300
+	glusterfs.xattr-interface-size-limit = "65536"
+}
+
+* $HTTP["url"] =~ "^/glusterfs"
+  A perl style regular expression used to match against the url. If regular expression matches the url, the url is handled by mod_glusterfs. Note that the pattern given here should match glusterfs.prefix.
+
+* glusterfs.prefix (COMPULSORY)
+  A string to be present at the starting of the file path in the url so that the file would be handled by glusterfs.
+  Eg., A GET request on the url http://www.example.com/glusterfs-prefix/some-dir/example-file will result in fetching of the file "/some-dir/example-file" from glusterfs mount if glusterfs.prefix is set to "/glusterfs-prefix".
+
+* glusterfs.volume-specfile (COMPULSORY)
+  Path to the the glusterfs volume specification file.
+
+* glusterfs.logfile (COMPULSORY)
+  Path to the glusterfs logfile.
+
+* glusterfs.loglevel (OPTIONAL, default = warning)
+  Allowed values are critical, error, warning, debug, none in the decreasing order of severity of error conditions.
+
+* glusterfs.cache-timeout (OPTIONAL, default = 0)
+  Timeout values for glusterfs stat and lookup cache.
+
+* glusterfs.document-root (COMPULSORY)
+  An absolute path, relative to which all the files are fetched from glusterfs.
+
+* glusterfs.xattr-interface-size-limit (OPTIONAL, default = 0)
+  Files with sizes upto and including this value are fetched through the extended attribute interface of glusterfs rather than the usual open-read-close set of operations. For files of small sizes, it is recommended to use extended attribute interface.
diff --git a/mod_glusterfs/lighttpd/1.4/mod_glusterfs.c b/mod_glusterfs/lighttpd/1.4/mod_glusterfs.c
new file mode 100644
index 000000000..295c9704c
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.4/mod_glusterfs.c
@@ -0,0 +1,1820 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <pthread.h>
+#include <sys/types.h>
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <unistd.h>
+#include <assert.h>
+
+#include "base.h"
+#include "log.h"
+#include "buffer.h"
+
+#include "plugin.h"
+
+#include "stat_cache.h"
+#include "mod_glusterfs.h"
+#include "etag.h"
+#include "http_chunk.h"
+#include "response.h"
+
+#include "fdevent.h"
+#include <libglusterfsclient.h>
+
+#ifdef HAVE_ATTR_ATTRIBUTES_H
+#include <attr/attributes.h>
+#endif
+
+#ifdef HAVE_FAM_H
+# include <fam.h>
+#endif
+
+#include "sys-mmap.h"
+
+/* NetBSD 1.3.x needs it */
+#ifndef MAP_FAILED
+# define MAP_FAILED -1
+#endif
+
+#ifndef O_LARGEFILE
+# define O_LARGEFILE 0
+#endif
+
+#ifndef HAVE_LSTAT
+#define lstat stat
+#endif
+
+#if 0
+/* 
+   enables debug code for testing if all nodes in the stat-cache as accessable
+*/
+#define DEBUG_STAT_CACHE
+#endif
+
+#ifdef HAVE_LSTAT
+#undef HAVE_LSTAT
+#endif
+
+#define GLUSTERFS_FILE_CHUNK (FILE_CHUNK + 1)
+
+/* 
+   Keep this value large. Each glusterfs_async_read of GLUSTERFS_CHUNK_SIZE
+   results in a network_backend_write of the read data
+*/
+
+#define GLUSTERFS_CHUNK_SIZE 8192
+
+/**
+ * this is a staticfile for a lighttpd plugin
+ *
+ */
+
+typedef struct glusterfs_async_local {
+        int op_ret;
+        int op_errno;
+        char async_read_complete;
+        off_t length;
+        size_t read_bytes;
+        glusterfs_iobuf_t *buf;
+        pthread_mutex_t lock;
+        pthread_cond_t cond;
+} glusterfs_async_local_t;
+
+
+typedef struct {
+        glusterfs_file_t fd;
+        void *buf;
+        buffer *glusterfs_path;
+        /*  off_t response_content_length; */
+        int prefix;
+}mod_glusterfs_ctx_t;
+
+/* plugin config for all request/connections */
+typedef struct {
+        buffer *logfile;
+        buffer *loglevel;
+        buffer *specfile;
+        buffer *prefix;
+        buffer *xattr_file_size;
+        buffer *document_root;
+        array *exclude_exts;
+        unsigned short cache_timeout;
+        char mounted;
+} plugin_config;
+
+static int (*network_backend_write)(struct server *srv, connection *con, int fd,
+                                    chunkqueue *cq);
+
+typedef struct {
+        PLUGIN_DATA;
+        buffer *range_buf;
+        plugin_config **config_storage;
+  
+        plugin_config conf;
+} plugin_data;
+
+typedef struct {
+        chunkqueue *cq;
+        glusterfs_iobuf_t *buf;
+        size_t length;
+}mod_glusterfs_chunkqueue;
+
+#ifdef HAVE_FAM_H
+typedef struct {
+        FAMRequest *req;
+        FAMConnection *fc;
+
+        buffer *name;
+
+        int version;
+} fam_dir_entry;
+#endif
+
+/* the directory name is too long to always compare on it
+ * - we need a hash
+ * - the hash-key is used as sorting criteria for a tree
+ * - a splay-tree is used as we can use the caching effect of it
+ */
+
+/* we want to cleanup the stat-cache every few seconds, let's say 10
+ *
+ * - remove entries which are outdated since 30s
+ * - remove entries which are fresh but havn't been used since 60s
+ * - if we don't have a stat-cache entry for a directory, release it from the 
+ *   monitor
+ */
+
+#ifdef DEBUG_STAT_CACHE
+typedef struct {
+        int *ptr;
+
+        size_t used;
+        size_t size;
+} fake_keys;
+
+static fake_keys ctrl;
+#endif
+
+int 
+mod_glusterfs_readv_async_cbk (int op_ret, int op_errno,
+                               glusterfs_iobuf_t *buf,
+                               void *cbk_data)
+{
+        glusterfs_async_local_t *local = cbk_data;
+        pthread_mutex_lock (&local->lock);
+        {
+                local->async_read_complete = 1;
+                local->buf = buf;
+                local->op_ret = op_ret;
+                local->op_errno = op_errno;
+                pthread_cond_signal (&local->cond);
+        }
+        pthread_mutex_unlock (&local->lock);
+
+        return 0;
+}
+
+static int
+mod_glusterfs_read_async (server *srv, connection *con, chunk *glusterfs_chunk)
+{
+        glusterfs_async_local_t local;
+        off_t end = 0;
+        int nbytes;
+        int complete;
+        chunkqueue *cq = NULL;
+        chunk *c = NULL;
+        off_t offset = glusterfs_chunk->file.start;
+        size_t length = glusterfs_chunk->file.length;
+        glusterfs_file_t fd = glusterfs_chunk->file.name;
+
+        pthread_cond_init (&local.cond, NULL);
+        pthread_mutex_init (&local.lock, NULL);
+  
+        //local.fd = fd;
+        memset (&local, 0, sizeof (local));
+
+        if (length > 0)
+                end = offset + length;
+
+        cq = chunkqueue_init ();
+        if (!cq) {
+                con->http_status = 500;
+                return HANDLER_FINISHED;
+        }
+
+        do {
+                glusterfs_iobuf_t *buf;
+                int i;
+                if (length > 0) {
+                        nbytes = end - offset;
+                        if (nbytes > GLUSTERFS_CHUNK_SIZE)
+                                nbytes = GLUSTERFS_CHUNK_SIZE;
+                } else
+                        nbytes = GLUSTERFS_CHUNK_SIZE;
+
+                glusterfs_read_async(fd, 
+                                     nbytes,
+                                     offset,
+                                     mod_glusterfs_readv_async_cbk,
+                                     (void *)&local);
+
+                pthread_mutex_lock (&local.lock);
+                {
+                        while (!local.async_read_complete) {
+                                pthread_cond_wait (&local.cond, &local.lock);
+                        }
+
+                        local.async_read_complete = 0;
+                        buf = local.buf;
+
+                        if ((int)length < 0)
+                                complete = (local.op_ret <= 0);
+                        else {
+                                local.read_bytes += local.op_ret;
+                                complete = ((local.read_bytes == length)
+                                            || (local.op_ret <= 0));
+                        }
+                }
+                pthread_mutex_unlock (&local.lock);
+
+                if (local.op_ret > 0) {
+                        unsigned long check = 0;
+                        for (i = 0; i < buf->count; i++) {
+                                buffer *nw_write_buf = buffer_init ();
+
+                                check += buf->vector[i].iov_len;        
+
+                                nw_write_buf->used = buf->vector[i].iov_len + 1;
+                                nw_write_buf->size = buf->vector[i].iov_len;
+                                nw_write_buf->ptr = buf->vector[i].iov_base;
+
+                                offset += local.op_ret;
+                                chunkqueue_append_buffer_weak(cq, nw_write_buf);
+                        }
+  
+                        network_backend_write (srv, con, con->fd, cq);
+  
+                        if (chunkqueue_written (cq) != local.op_ret) {
+                                mod_glusterfs_chunkqueue *gf_cq;
+                                glusterfs_chunk->file.start = offset;
+                                if ((int)glusterfs_chunk->file.length > 0)
+                                        glusterfs_chunk->file.length -= local.read_bytes;
+
+                                gf_cq = calloc (1, sizeof (*gf_cq));
+                                /* ERR_ABORT (gf_cq); */
+                                gf_cq->cq = cq;
+                                gf_cq->buf = buf;
+                                gf_cq->length = local.op_ret;
+                                glusterfs_chunk->file.mmap.start =(char *)gf_cq;
+                                return local.read_bytes;
+                        }
+      
+                        for (c = cq->first ; c; c = c->next) 
+                                c->mem->ptr = NULL;
+
+                        chunkqueue_reset (cq);
+                }
+
+                glusterfs_free (buf);
+        } while (!complete);
+
+        chunkqueue_free (cq);
+        glusterfs_close (fd);
+
+        if (local.op_ret < 0)
+                con->http_status = 500;
+
+        return (local.op_ret < 0 ? HANDLER_FINISHED : HANDLER_GO_ON);
+}
+
+int mod_glusterfs_network_backend_write(struct server *srv, connection *con,
+                                        int fd, chunkqueue *cq)
+{
+        chunk *c, *prev, *first;
+        int chunks_written = 0;
+        int error = 0;
+
+        for (first = prev = c = cq->first; c; c = c->next, chunks_written++) {
+
+                if (c->type == MEM_CHUNK && c->mem->used && !c->mem->ptr) {
+                        if (cq->first != c) {
+                                prev->next = NULL;
+
+                                /* call stored network_backend_write */
+                                network_backend_write (srv, con, fd, cq);
+
+                                prev->next = c;
+                        } 
+                        cq->first = c->next;
+
+                        if (c->file.fd < 0) {
+                                error = HANDLER_ERROR;
+                                break;
+                        }
+
+                        if (c->file.mmap.start) {
+                                chunk *tmp;
+                                mod_glusterfs_chunkqueue *gf_cq = NULL;
+
+                                gf_cq = (mod_glusterfs_chunkqueue *)c->file.mmap.start;
+
+                                network_backend_write (srv, con, fd, gf_cq->cq);
+
+                                if ((size_t)chunkqueue_written (gf_cq->cq) 
+                                    != gf_cq->length) {
+                                        cq->first = first;
+                                        return chunks_written;
+                                }
+                                for (tmp = gf_cq->cq->first ; tmp;
+                                     tmp = tmp->next)
+                                        tmp->mem->ptr = NULL;
+
+                                chunkqueue_free (gf_cq->cq);
+                                glusterfs_free (gf_cq->buf);
+                                free (gf_cq);
+                                c->file.mmap.start = NULL;
+                        }
+      
+                        mod_glusterfs_read_async (srv, con, c);
+                        if (c->file.mmap.start) {
+                                /* pending chunkqueue from
+                                   mod_glusterfs_read_async to be written to
+                                   network */
+                                cq->first = first;
+                                return chunks_written;
+                        }
+
+                        buffer_free (c->mem);
+                        c->mem = NULL;
+
+                        c->type = FILE_CHUNK;
+                        c->offset = c->file.length = 0;
+                        c->file.name = NULL;
+
+                        if (first == c)
+                                first = c->next;
+
+                        if (cq->last == c)
+                                cq->last = NULL;
+
+                        prev->next = c->next;
+
+                        free(c);
+                }     
+                prev = c;
+        }
+
+        network_backend_write (srv, con, fd, cq);
+
+        cq->first = first;
+
+        return chunks_written;
+}
+
+int chunkqueue_append_glusterfs_file (connection *con, glusterfs_file_t fd,
+                                      off_t offset, size_t len, size_t buf_size)
+{
+        chunk *c = NULL;
+        c = chunkqueue_get_append_tempfile (con->write_queue);
+  
+        if (c->file.is_temp) {
+                close (c->file.fd);
+                unlink (c->file.name->ptr);
+        }
+
+        c->type = MEM_CHUNK;
+
+        buffer_free (c->mem);
+
+        c->mem = buffer_init ();
+        c->mem->used = len + 1;
+        c->mem->size = buf_size;
+        c->mem->ptr = NULL;
+        c->offset = 0;
+
+        buffer_free (c->file.name);
+
+        /* fd returned by libglusterfsclient is a pointer */
+        c->file.name = (buffer *)fd;
+        c->file.start = offset;
+        c->file.length = len;
+
+        //c->file.fd = fd;
+        c->file.mmap.start = NULL;
+        return 0;
+}
+
+/* init the plugin data */
+INIT_FUNC(mod_glusterfs_init) {
+        plugin_data *p;
+
+        p = calloc(1, sizeof(*p));
+        network_backend_write = NULL;
+
+        return p;
+}
+
+/* detroy the plugin data */
+FREE_FUNC(mod_glusterfs_free) {
+        plugin_data *p = p_d;
+
+        UNUSED (srv);
+
+        if (!p) return HANDLER_GO_ON;
+  
+        if (p->config_storage) {
+                size_t i;
+                for (i = 0; i < srv->config_context->used; i++) {
+                        plugin_config *s = p->config_storage[i];
+      
+                        buffer_free (s->logfile);
+                        buffer_free (s->loglevel);
+                        buffer_free (s->specfile);
+                        buffer_free (s->prefix);
+                        buffer_free (s->xattr_file_size);
+                        buffer_free (s->document_root);
+                        array_free (s->exclude_exts);
+  
+                        free (s);
+                }
+                free (p->config_storage);
+        }
+        buffer_free (p->range_buf);
+
+        free (p);
+  
+        return HANDLER_GO_ON;
+}
+
+SETDEFAULTS_FUNC(mod_glusterfs_set_defaults) {
+        plugin_data *p = p_d;
+        size_t i = 0;
+  
+        config_values_t cv[] = {
+                { "glusterfs.logfile",              NULL, T_CONFIG_STRING,
+                  T_CONFIG_SCOPE_CONNECTION },
+    
+                { "glusterfs.loglevel",             NULL, T_CONFIG_STRING,
+                  T_CONFIG_SCOPE_CONNECTION },    
+
+                { "glusterfs.volume-specfile",      NULL, T_CONFIG_STRING,
+                  T_CONFIG_SCOPE_CONNECTION }, 
+
+                { "glusterfs.cache-timeout",        NULL, T_CONFIG_SHORT,
+                  T_CONFIG_SCOPE_CONNECTION },
+    
+                { "glusterfs.exclude-extensions",   NULL, T_CONFIG_ARRAY,
+                  T_CONFIG_SCOPE_CONNECTION },
+    
+                /*TODO: get the prefix from config_conext and 
+                  remove glusterfs.prefix from conf file */
+                { "glusterfs.prefix",               NULL, T_CONFIG_STRING,
+                  T_CONFIG_SCOPE_CONNECTION },
+    
+                { "glusterfs.xattr-interface-size-limit", NULL, T_CONFIG_STRING,
+                  T_CONFIG_SCOPE_CONNECTION },
+
+                { "glusterfs.document-root",        NULL, T_CONFIG_STRING,
+                  T_CONFIG_SCOPE_CONNECTION },
+    
+                { NULL,                          NULL, T_CONFIG_UNSET,
+                  T_CONFIG_SCOPE_UNSET }
+        };
+  
+        p->config_storage = calloc(1,
+                                   srv->config_context->used
+                                   * sizeof(specific_config *));
+        /* ERR_ABORT (p->config_storage);*/
+        p->range_buf = buffer_init ();
+  
+        for (i = 0; i < srv->config_context->used; i++) {
+                plugin_config *s;
+
+                s = calloc(1, sizeof(plugin_config));
+                /* ERR_ABORT (s); */
+                s->logfile = buffer_init ();
+                s->loglevel = buffer_init ();
+                s->specfile = buffer_init ();
+                s->document_root = buffer_init ();
+                s->exclude_exts = array_init ();
+                s->prefix = buffer_init ();
+                s->xattr_file_size = buffer_init ();
+    
+                cv[0].destination = s->logfile;
+                cv[1].destination = s->loglevel;
+                cv[2].destination = s->specfile;
+                cv[3].destination = &s->cache_timeout;
+                cv[4].destination = s->exclude_exts;
+                cv[5].destination = s->prefix;
+                cv[6].destination = s->xattr_file_size;
+                cv[7].destination = s->document_root;
+                p->config_storage[i] = s;
+    
+                if (0 != config_insert_values_global(srv,
+                                                     ((data_config *)srv->config_context->data[i])->value,
+                                                     cv)) {
+                        return HANDLER_FINISHED;
+                }
+        }
+  
+        return HANDLER_GO_ON;
+}
+
+#define PATCH(x)                                \
+        p->conf.x = s->x;
+
+static int mod_glusterfs_patch_connection(server *srv, connection *con,
+                                          plugin_data *p) {
+        size_t i, j;
+        plugin_config *s;
+
+        /* skip the first, the global context */
+        /* 
+           glusterfs related config can only occur inside 
+           $HTTP["url"] == "<glusterfs-prefix>"
+        */
+        p->conf.logfile = NULL;
+        p->conf.loglevel = NULL;
+        p->conf.specfile = NULL;
+        p->conf.cache_timeout = 0;
+        p->conf.exclude_exts = NULL;
+        p->conf.prefix = NULL;
+        p->conf.xattr_file_size = NULL;
+        p->conf.document_root = NULL;
+
+        for (i = 1; i < srv->config_context->used; i++) {
+                data_config *dc = (data_config *)srv->config_context->data[i];
+                s = p->config_storage[i];
+
+                /* condition didn't match */
+                if (!config_check_cond(srv, con, dc)) continue;
+    
+                /* merge config */
+                for (j = 0; j < dc->value->used; j++) {
+                        data_unset *du = dc->value->data[j];
+      
+                        if (buffer_is_equal_string (du->key,
+                                                    CONST_STR_LEN("glusterfs.logfile"))) {
+                                PATCH (logfile);
+                        } else if (buffer_is_equal_string (du->key,
+                                                           CONST_STR_LEN("glusterfs.loglevel"))) {
+                                PATCH (loglevel);
+                        } else if (buffer_is_equal_string (du->key,
+                                                           CONST_STR_LEN ("glusterfs.volume-specfile"))) {
+                                PATCH (specfile);
+                        } else if (buffer_is_equal_string (du->key,
+                                                           CONST_STR_LEN("glusterfs.cache-timeout"))) {
+                                PATCH (cache_timeout);
+                        } else if (buffer_is_equal_string (du->key,
+                                                           CONST_STR_LEN ("glusterfs.exclude-extensions"))) {
+                                PATCH (exclude_exts);
+                        } else if (buffer_is_equal_string (du->key,
+                                                           CONST_STR_LEN ("glusterfs.prefix"))) {
+                                PATCH (prefix);
+                        } else if (buffer_is_equal_string (du->key,
+                                                           CONST_STR_LEN ("glusterfs.xattr-interface-size-limit"))) {
+                                PATCH (xattr_file_size);
+                        } else if (buffer_is_equal_string (du->key,
+                                                           CONST_STR_LEN ("glusterfs.document-root"))) {
+                                PATCH (document_root);
+                        }
+                }
+        }
+        return 0;
+}
+
+#undef PATCH
+
+static int http_response_parse_range(server *srv, connection *con,
+                                     plugin_data *p) {
+        int multipart = 0;
+        int error;
+        off_t start, end;
+        const char *s, *minus;
+        char *boundary = "fkj49sn38dcn3";
+        data_string *ds;
+        stat_cache_entry *sce = NULL;
+        buffer *content_type = NULL;
+        size_t size = 0;
+        mod_glusterfs_ctx_t *ctx = con->plugin_ctx[p->id];
+
+        if (p->conf.xattr_file_size && p->conf.xattr_file_size->ptr) {
+                size = atoi (p->conf.xattr_file_size->ptr);
+        }
+
+        if (HANDLER_ERROR == stat_cache_get_entry(srv, con, con->physical.path,
+                                                  &sce)) {
+                SEGFAULT();
+        }
+  
+        start = 0;
+        end = sce->st.st_size - 1;
+  
+        con->response.content_length = 0;
+  
+        if (NULL != (ds = (data_string *)array_get_element(con->response.headers,
+                                                           "Content-Type"))) {
+                content_type = ds->value;
+        }
+  
+        for (s = con->request.http_range, error = 0;
+             !error && *s && NULL != (minus = strchr(s, '-')); ) {
+                char *err;
+                off_t la, le;
+    
+                if (s == minus) {
+                        /* -<stop> */
+      
+                        le = strtoll(s, &err, 10);
+      
+                        if (le == 0) {
+                                /* RFC 2616 - 14.35.1 */
+        
+                                con->http_status = 416;
+                                error = 1;
+                        } else if (*err == '\0') {
+                                /* end */
+                                s = err;
+        
+                                end = sce->st.st_size - 1;
+                                start = sce->st.st_size + le;
+                        } else if (*err == ',') {
+                                multipart = 1;
+                                s = err + 1;
+        
+                                end = sce->st.st_size - 1;
+                                start = sce->st.st_size + le;
+                        } else {
+                                error = 1;
+                        }
+      
+                } else if (*(minus+1) == '\0' || *(minus+1) == ',') {
+                        /* <start>- */
+      
+                        la = strtoll(s, &err, 10);
+      
+                        if (err == minus) {
+                                /* ok */
+        
+                                if (*(err + 1) == '\0') {
+                                        s = err + 1;
+          
+                                        end = sce->st.st_size - 1;
+                                        start = la;
+          
+                                } else if (*(err + 1) == ',') {
+                                        multipart = 1;
+                                        s = err + 2;
+          
+                                        end = sce->st.st_size - 1;
+                                        start = la;
+                                } else {
+                                        error = 1;
+                                }
+                        } else {
+                                /* error */
+                                error = 1;
+                        }
+                } else {
+                        /* <start>-<stop> */
+      
+                        la = strtoll(s, &err, 10);
+
+                        if (err == minus) {
+                                le = strtoll(minus+1, &err, 10);
+        
+                                /* RFC 2616 - 14.35.1 */
+                                if (la > le) {
+                                        error = 1;
+                                }
+        
+                                if (*err == '\0') {
+                                        /* ok, end*/
+                                        s = err;
+
+                                        end = le;
+                                        start = la;
+                                } else if (*err == ',') {
+                                        multipart = 1;
+                                        s = err + 1;
+          
+                                        end = le;
+                                        start = la;
+                                } else {
+                                        /* error */
+          
+                                        error = 1;
+                                }
+                        } else {
+                                /* error */
+        
+                                error = 1;
+                        }
+                }
+    
+                if (!error) {
+                        if (start < 0) start = 0;
+      
+                        /* RFC 2616 - 14.35.1 */
+                        if (end > sce->st.st_size - 1) end = sce->st.st_size - 1;
+      
+                        if (start > sce->st.st_size - 1) {
+                                error = 1;
+        
+                                con->http_status = 416;
+                        }
+                }
+    
+                if (!error) {
+                        if (multipart) {
+                                /* write boundary-header */
+                                buffer *b;
+        
+                                b = chunkqueue_get_append_buffer(con->write_queue);
+        
+                                buffer_copy_string(b, "\r\n--");
+                                buffer_append_string(b, boundary);
+        
+                                /* write Content-Range */
+                                buffer_append_string(b, "\r\nContent-Range: "
+                                                     "bytes ");
+                                buffer_append_off_t(b, start);
+                                buffer_append_string(b, "-");
+                                buffer_append_off_t(b, end);
+                                buffer_append_string(b, "/");
+                                buffer_append_off_t(b, sce->st.st_size);
+        
+                                buffer_append_string(b, "\r\nContent-Type: ");
+                                buffer_append_string_buffer(b, content_type);
+        
+                                /* write END-OF-HEADER */
+                                buffer_append_string(b, "\r\n\r\n");
+        
+                                con->response.content_length += b->used - 1;
+
+                        }
+
+                        if ((size_t)sce->st.st_size >= size) {
+                                chunkqueue_append_glusterfs_file(con, ctx->fd,
+                                                                 start,
+                                                                 end - start,
+                                                                 size);
+                        } else {
+                                if (!start) {
+                                        buffer *mem = buffer_init ();
+                                        mem->ptr = ctx->buf;
+                                        mem->used = mem->size = sce->st.st_size;
+                                        http_chunk_append_buffer (srv, con, mem);
+                                        ctx->buf = NULL;
+                                } else {
+                                        chunkqueue_append_mem (con->write_queue,
+                                                               ((char *)ctx->buf)
+                                                               + start,
+                                                               end - start + 1);
+                                }
+                        }
+
+                        con->response.content_length += end - start + 1;
+                }
+        }
+
+        if (ctx->buf) {
+                free (ctx->buf);
+                ctx->buf = NULL;
+        }
+
+        /* something went wrong */
+        if (error) return -1;
+  
+        if (multipart) {
+                /* add boundary end */
+                buffer *b;
+    
+                b = chunkqueue_get_append_buffer(con->write_queue);
+    
+                buffer_copy_string_len(b, "\r\n--", 4);
+                buffer_append_string(b, boundary);
+                buffer_append_string_len(b, "--\r\n", 4);
+    
+                con->response.content_length += b->used - 1;
+    
+                /* set header-fields */
+
+                buffer_copy_string(p->range_buf, "multipart/byteranges; boundary=");
+                buffer_append_string(p->range_buf, boundary);
+
+                /* overwrite content-type */
+                response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"),
+                                          CONST_BUF_LEN(p->range_buf));
+        } else {
+                /* add Content-Range-header */
+    
+                buffer_copy_string(p->range_buf, "bytes ");
+                buffer_append_off_t(p->range_buf, start);
+                buffer_append_string(p->range_buf, "-");
+                buffer_append_off_t(p->range_buf, end);
+                buffer_append_string(p->range_buf, "/");
+                buffer_append_off_t(p->range_buf, sce->st.st_size);
+    
+                response_header_insert(srv, con, CONST_STR_LEN("Content-Range"),
+                                       CONST_BUF_LEN(p->range_buf));
+        }
+        
+        /* ok, the file is set-up */
+        return 0;
+}
+
+PHYSICALPATH_FUNC(mod_glusterfs_handle_physical) {
+        plugin_data *p = p_d;
+        stat_cache_entry *sce;
+        mod_glusterfs_ctx_t *plugin_ctx = NULL;
+        size_t size = 0;
+        int ret = 0;
+
+        if (con->http_status != 0) return HANDLER_GO_ON;
+        if (con->uri.path->used == 0) return HANDLER_GO_ON;
+        if (con->physical.path->used == 0) return HANDLER_GO_ON;
+
+        if (con->mode != DIRECT) return HANDLER_GO_ON;
+
+        /*
+          network_backend_write = srv->network_backend_write;
+          srv->network_backend_write = mod_glusterfs_network_backend_write;
+        */
+
+        switch (con->request.http_method) {
+        case HTTP_METHOD_GET:
+        case HTTP_METHOD_POST:
+        case HTTP_METHOD_HEAD:
+                break;
+
+        default:
+                return HANDLER_GO_ON;
+        }
+
+        mod_glusterfs_patch_connection(srv, con, p);
+        if (!p->conf.prefix || p->conf.prefix->used == 0) {
+                return HANDLER_GO_ON;
+        }
+
+        if (!p->conf.document_root || p->conf.document_root->used == 0) {
+                log_error_write(srv, __FILE__, __LINE__, "s",
+                                "glusterfs.document-root is not specified");
+                con->http_status = 500;
+                return HANDLER_FINISHED;
+        }
+
+        if (!p->conf.mounted) {
+                glusterfs_init_params_t ctx;
+
+                if (!p->conf.specfile || p->conf.specfile->used == 0) {
+                        return HANDLER_GO_ON;
+                }
+                memset (&ctx, 0, sizeof (ctx));
+
+                ctx.specfile = p->conf.specfile->ptr;
+                ctx.logfile = p->conf.logfile->ptr;
+                ctx.loglevel = p->conf.loglevel->ptr;
+                ctx.lookup_timeout = ctx.stat_timeout = p->conf.cache_timeout;
+
+                ret = glusterfs_mount (p->conf.prefix->ptr, &ctx);
+                if (ret != 0) {
+                        con->http_status = 500;
+                        log_error_write(srv, __FILE__, __LINE__,  "sbs",
+                                        "glusterfs initialization failed, "
+                                        "please check your configuration. "
+                                        "Glusterfs logfile ",
+                                        p->conf.logfile,
+                                        "might contain details");
+                        return HANDLER_FINISHED;
+                }
+                p->conf.mounted = 1;
+        }
+
+        size = 0;
+        if (p->conf.xattr_file_size && p->conf.xattr_file_size->ptr) 
+                size = atoi (p->conf.xattr_file_size->ptr);
+
+        if (!con->plugin_ctx[p->id]) {
+/* FIXME: what if multiple files are requested from a single connection? */ 
+/* TODO: check whether this works fine for HTTP protocol 1.1 */
+
+                buffer *tmp_buf = buffer_init_buffer (con->physical.basedir);
+
+                plugin_ctx = calloc (1, sizeof (*plugin_ctx));
+                /* ERR_ABORT (plugin_ctx); */
+                con->plugin_ctx[p->id] = plugin_ctx;
+    
+                buffer_append_string_buffer (tmp_buf, p->conf.prefix);
+                buffer_path_simplify (tmp_buf, tmp_buf);
+
+                plugin_ctx->prefix = tmp_buf->used - 1;
+                if (tmp_buf->ptr[plugin_ctx->prefix - 1] == '/')
+                        plugin_ctx->prefix--;
+
+                buffer_free (tmp_buf);
+        } else 
+                /*FIXME: error!! error!! */
+                plugin_ctx = con->plugin_ctx[p->id];
+
+
+        if (size) 
+        {
+                plugin_ctx->buf = malloc (size);
+                /* ERR_ABORT (plugin_ctx->buf); */
+        }
+
+        plugin_ctx->glusterfs_path = buffer_init ();
+        buffer_copy_string_buffer (plugin_ctx->glusterfs_path,
+                                   p->conf.prefix);
+        buffer_append_string (plugin_ctx->glusterfs_path,
+                              p->conf.document_root->ptr);
+        buffer_append_string (plugin_ctx->glusterfs_path, "/");
+        buffer_append_string (plugin_ctx->glusterfs_path,
+                              con->physical.path->ptr + plugin_ctx->prefix);
+        buffer_path_simplify (plugin_ctx->glusterfs_path,
+                              plugin_ctx->glusterfs_path);
+ 
+        if (glusterfs_stat_cache_get_entry (srv, con,
+                                            plugin_ctx->glusterfs_path,
+                                            con->physical.path, plugin_ctx->buf,
+                                            size, &sce) == HANDLER_ERROR) {
+                if (errno == ENOENT)
+                        con->http_status = 404;
+                else 
+                        con->http_status = 403;
+
+                free (plugin_ctx->buf);
+                buffer_free (plugin_ctx->glusterfs_path);
+                plugin_ctx->glusterfs_path = NULL;
+                plugin_ctx->buf = NULL;
+
+                free (plugin_ctx);
+                con->plugin_ctx[p->id] = NULL;
+
+                return HANDLER_FINISHED;
+        }
+
+        if (!(S_ISREG (sce->st.st_mode) && (size_t)sce->st.st_size < size)) {
+                free (plugin_ctx->buf);
+                plugin_ctx->buf = NULL;
+        }
+
+        return HANDLER_GO_ON;
+}
+
+static int http_chunk_append_len(server *srv, connection *con, size_t len) {
+        size_t i, olen = len, j;
+        buffer *b;
+
+        b = srv->tmp_chunk_len;
+
+        if (len == 0) {
+                buffer_copy_string(b, "0");
+        } else {
+                for (i = 0; i < 8 && len; i++) {
+                        len >>= 4;
+                }
+    
+                /* i is the number of hex digits we have */
+                buffer_prepare_copy(b, i + 1);
+    
+                for (j = i-1, len = olen; j+1 > 0; j--) {
+                        b->ptr[j] = (len & 0xf) + (((len & 0xf) <= 9) ? 
+                                                   '0' : 'a' - 10);
+                        len >>= 4;
+                }
+                b->used = i;
+                b->ptr[b->used++] = '\0';
+        }
+  
+        buffer_append_string(b, "\r\n");
+        chunkqueue_append_buffer(con->write_queue, b);
+  
+        return 0;
+}
+
+int http_chunk_append_glusterfs_file_chunk(server *srv, connection *con,
+                                           glusterfs_file_t fd, off_t offset,
+                                           off_t len, size_t buf_size) {
+        chunkqueue *cq;
+
+        if (!con) return -1;
+
+        cq = con->write_queue;
+
+        if (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) {
+                http_chunk_append_len(srv, con, len);
+        }
+
+        chunkqueue_append_glusterfs_file (con, fd, offset, len, buf_size);
+
+        if ((con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) 
+            && (len > 0)) {
+                chunkqueue_append_mem(cq, "\r\n", 2 + 1);
+        }
+
+        return 0;
+}
+
+int http_chunk_append_glusterfs_mem(server *srv, connection *con,
+                                    char * mem, size_t len,
+                                    size_t buf_size) 
+{
+        chunkqueue *cq = NULL;
+        buffer *buf = NULL;
+ 
+        if (!con) return -1;
+  
+        cq = con->write_queue;
+  
+        if (len == 0) {
+                free (mem);
+                if (con->response.transfer_encoding 
+                    & HTTP_TRANSFER_ENCODING_CHUNKED) {
+                        chunkqueue_append_mem(cq, "0\r\n\r\n", 5 + 1);
+                } else {
+                        chunkqueue_append_mem(cq, "", 1);
+                }
+                return 0;
+        }
+
+        if (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) {
+                http_chunk_append_len(srv, con, len - 1);
+        }
+  
+        buf = buffer_init ();
+
+        buf->used = len + 1;
+        buf->size = buf_size;
+        buf->ptr = (char *)mem;
+        chunkqueue_append_buffer_weak (cq, buf);
+
+        if (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) {
+                chunkqueue_append_mem(cq, "\r\n", 2 + 1);
+        }
+
+        return 0;
+}
+
+
+
+URIHANDLER_FUNC(mod_glusterfs_subrequest) {
+        plugin_data *p = p_d;
+        stat_cache_entry *sce = NULL;
+        int s_len;
+        char allow_caching = 1;
+        size_t size = 0;
+        mod_glusterfs_ctx_t *ctx = con->plugin_ctx[p->id];
+
+        /* someone else has done a decision for us */
+        if (con->http_status != 0) return HANDLER_GO_ON;
+        if (con->uri.path->used == 0) return HANDLER_GO_ON;
+        if (con->physical.path->used == 0) return HANDLER_GO_ON;
+  
+        /* someone else has handled this request */
+        if (con->mode != DIRECT) return HANDLER_GO_ON;
+  
+        /* we only handle GET, POST and HEAD */
+        switch(con->request.http_method) {
+        case HTTP_METHOD_GET:
+        case HTTP_METHOD_POST:
+        case HTTP_METHOD_HEAD:
+                break;
+        default:
+                return HANDLER_GO_ON;
+        }
+  
+        mod_glusterfs_patch_connection(srv, con, p);
+  
+        if (!p->conf.prefix || !p->conf.prefix->used)
+                return HANDLER_GO_ON;
+
+        s_len = con->uri.path->used - 1;
+        /* ignore certain extensions */
+        /*
+          for (k = 0; k < p->conf.exclude_exts->used; k++) {
+          data_string *ds;
+          ds = (data_string *)p->conf.exclude_exts->data[k];
+          
+          if (ds->value->used == 0) continue;
+    
+          if (!strncmp (ds->value->ptr, con->uri.path->ptr,
+                        strlen (ds->value->ptr)))
+          break;
+          }
+  
+          if (k == p->conf.exclude_exts->used) {
+          return HANDLER_GO_ON;
+          }
+        */
+
+        if (con->conf.log_request_handling) {
+                log_error_write(srv, __FILE__, __LINE__,  "s",
+                                "-- serving file from glusterfs");
+        }
+
+        if (HANDLER_ERROR == stat_cache_get_entry(srv, con, con->physical.path,
+                                                  &sce)) {
+                con->http_status = 403;
+                
+                log_error_write(srv, __FILE__, __LINE__, "sbsb",
+                                "not a regular file:", con->uri.path,
+                                "->", con->physical.path);
+    
+                free (ctx);
+                con->plugin_ctx[p->id] = NULL;
+
+                return HANDLER_FINISHED;
+        }
+
+        if (con->uri.path->ptr[s_len] == '/' || !S_ISREG(sce->st.st_mode)) {
+                free (ctx);
+                con->plugin_ctx[p->id] = NULL;
+                return HANDLER_FINISHED;
+        }
+
+        if (p->conf.xattr_file_size && p->conf.xattr_file_size->ptr)
+                size = atoi (p->conf.xattr_file_size->ptr);
+
+        if ((size_t)sce->st.st_size > size) {
+                ctx->fd = glusterfs_open (ctx->glusterfs_path->ptr, O_RDONLY,
+                                          0);
+    
+                if (((long)ctx->fd) == 0) {
+                        con->http_status = 403;
+                        free (ctx);
+                        con->plugin_ctx[p->id] = NULL;
+                        return HANDLER_FINISHED;
+                }
+        }
+
+        buffer_free (ctx->glusterfs_path);
+        ctx->glusterfs_path = NULL;
+
+        /* we only handline regular files */
+#ifdef HAVE_LSTAT
+        if ((sce->is_symlink == 1) && !con->conf.follow_symlink) {
+                con->http_status = 403;
+          
+                if (con->conf.log_request_handling) {
+                        log_error_write(srv, __FILE__, __LINE__,  "s",
+                                        "-- access denied due symlink "
+                                        "restriction");
+                        log_error_write(srv, __FILE__, __LINE__,  "sb",
+                                        "Path         :", con->physical.path);
+                }
+    
+                buffer_reset(con->physical.path);
+                free (ctx);
+                con->plugin_ctx[p->id] = NULL;
+                return HANDLER_FINISHED;
+        }
+#endif
+        if (!S_ISREG(sce->st.st_mode)) {
+                con->http_status = 404;
+    
+                if (con->conf.log_file_not_found) {
+                        log_error_write(srv, __FILE__, __LINE__, "sbsb",
+                                        "not a regular file:", con->uri.path,
+                                        "->", sce->name);
+                }
+    
+                free (ctx);
+                con->plugin_ctx[p->id] = NULL;
+
+                return HANDLER_FINISHED;
+        }
+
+        /* mod_compress might set several data directly, don't overwrite them */
+
+        /* set response content-type, if not set already */
+  
+        if (NULL == array_get_element(con->response.headers, "Content-Type")) {
+                if (buffer_is_empty(sce->content_type)) {
+                        /* we are setting application/octet-stream, but also "
+                         * announce that this header field might change in "
+                         * the seconds few requests. This should fix the 
+                         * aggressive caching of FF and the script download
+                         * seen by the first installations
+                         */
+                        response_header_overwrite(srv, con,
+                                                  CONST_STR_LEN("Content-Type"),
+                                                  CONST_STR_LEN("application/"
+                                                                "octet-stream"));
+      
+                        allow_caching = 0;
+                } else {
+                        response_header_overwrite(srv, con,
+                                                  CONST_STR_LEN("Content-Type"),
+                                                  CONST_BUF_LEN(sce->content_type));
+                }
+        }
+  
+        if (con->conf.range_requests) {
+                response_header_overwrite(srv, con,
+                                          CONST_STR_LEN("Accept-Ranges"),
+                                          CONST_STR_LEN("bytes"));
+        }
+
+        /* TODO: Allow Cachable requests */     
+#if 0
+        if (allow_caching) {
+                if (p->conf.etags_used && con->etag_flags != 0 
+                    && !buffer_is_empty(sce->etag)) {
+                        if (NULL == array_get_element(con->response.headers,
+                                                      "ETag")) {
+                                /* generate e-tag */
+                                etag_mutate(con->physical.etag, sce->etag);
+        
+                                response_header_overwrite(srv, con,
+                                                          CONST_STR_LEN("ETag"),
+                                                          CONST_BUF_LEN(con->physical.etag));
+                        }
+                }
+    
+                /* prepare header */
+                if (NULL == (ds = (data_string *)array_get_element(con->response.headers,
+                                                                   "Last-Modified"))) {
+                        mtime = strftime_cache_get(srv, sce->st.st_mtime);
+                        response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"),
+                                                  CONST_BUF_LEN(mtime));
+                } else {
+                        mtime = ds->value;
+                }
+    
+                if (HANDLER_FINISHED == http_response_handle_cachable(srv, con,
+                                                                      mtime)) {
+                        free (ctx);
+                        con->plugin_ctx[p->id] = NULL;
+                        return HANDLER_FINISHED;
+                }
+        }
+#endif 
+  
+        /*TODO: Read about etags */
+        if (con->request.http_range && con->conf.range_requests) {
+                int do_range_request = 1;
+                data_string *ds = NULL;
+                buffer *mtime = NULL;
+                /* check if we have a conditional GET */
+    
+                /* prepare header */
+                if (NULL == (ds = (data_string *)array_get_element(con->response.headers,
+                                                                   "Last-Modified"))) {
+                        mtime = strftime_cache_get(srv, sce->st.st_mtime);
+                        response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"),
+                                                  CONST_BUF_LEN(mtime));
+                } else {
+                        mtime = ds->value;
+                }
+
+                if (NULL != (ds = (data_string *)array_get_element(con->request.headers,
+                                                                   "If-Range"))) {
+                        /* if the value is the same as our ETag, we do a Range-request,
+                         * otherwise a full 200 */
+            
+                        if (ds->value->ptr[0] == '"') {
+                                /**
+                                 * client wants a ETag
+                                 */
+                                if (!con->physical.etag) {
+                                        do_range_request = 0;
+                                } else if (!buffer_is_equal(ds->value,
+                                                            con->physical.etag)) {
+                                        do_range_request = 0;
+                                }
+                        } else if (!mtime) {
+                                /**
+                                 * we don't have a Last-Modified and can match 
+                                 * the If-Range: 
+                                 *
+                                 * sending all
+                                 */
+                                do_range_request = 0;
+                        } else if (!buffer_is_equal(ds->value, mtime)) {
+                                do_range_request = 0;
+                        }
+                }
+    
+                if (do_range_request) {
+                        /* content prepared, I'm done */
+                        con->file_finished = 1;
+            
+                        if (0 == http_response_parse_range(srv, con, p)) {
+                                con->http_status = 206;
+                        }
+
+                        free (ctx);
+                        con->plugin_ctx[p->id] = NULL;
+                        return HANDLER_FINISHED;
+                }
+        }
+  
+        /* if we are still here, prepare body */
+
+        /* we add it here for all requests
+         * the HEAD request will drop it afterwards again
+         */
+        /*TODO check whether 1 should be subtracted */
+
+        if (p->conf.xattr_file_size && p->conf.xattr_file_size->ptr)
+                size = atoi (p->conf.xattr_file_size->ptr);
+
+        if (size <= (size_t)sce->st.st_size) {
+                http_chunk_append_glusterfs_file_chunk (srv, con, ctx->fd, 0,
+                                                        sce->st.st_size, size);
+        } else {
+                http_chunk_append_glusterfs_mem (srv, con, ctx->buf,
+                                                 sce->st.st_size, size);
+        }
+        
+        con->http_status = 200;
+        con->file_finished = 1;
+  
+        free (ctx);
+        con->plugin_ctx[p->id] = NULL;
+
+        return HANDLER_FINISHED;
+}
+
+#if 0
+URIHANDLER_FUNC(mod_glusterfs_request_done)
+{
+        mod_glusterfs_iobuf_t *cur = first, *prev;
+        while (cur) {
+                prev =  cur;
+                glusterfs_free (cur->buf);
+                cur = cur->next;
+                free (prev);
+        }
+        first = NULL
+                }
+#endif
+
+/* this function is called at dlopen() time and inits the callbacks */
+CONNECTION_FUNC(mod_glusterfs_connection_reset) 
+{
+        (void) p_d;
+        (void) con;
+        if (!network_backend_write)
+                network_backend_write = srv->network_backend_write;
+
+        srv->network_backend_write = mod_glusterfs_network_backend_write;
+
+        return HANDLER_GO_ON;
+}
+
+int mod_glusterfs_plugin_init(plugin *p) {
+        p->version     = LIGHTTPD_VERSION_ID;
+        p->name        = buffer_init_string("glusterfs");
+        p->init        = mod_glusterfs_init;
+        p->handle_physical = mod_glusterfs_handle_physical;
+        p->handle_subrequest_start = mod_glusterfs_subrequest;
+        //      p->handle_request_done = mod_glusterfs_request_done;
+        p->set_defaults  = mod_glusterfs_set_defaults;
+        p->connection_reset = mod_glusterfs_connection_reset;
+        p->cleanup     = mod_glusterfs_free;
+  
+        p->data        = NULL;
+  
+        return 0;
+}
+
+
+/* mod_glusterfs_stat_cache */
+static stat_cache_entry * stat_cache_entry_init(void) {
+        stat_cache_entry *sce = NULL;
+  
+        sce = calloc(1, sizeof(*sce));
+        /* ERR_ABORT (sce); */
+  
+        sce->name = buffer_init();
+        sce->etag = buffer_init();
+        sce->content_type = buffer_init();
+
+        return sce;
+}
+
+#ifdef HAVE_FAM_H
+static fam_dir_entry * fam_dir_entry_init(void) {
+        fam_dir_entry *fam_dir = NULL;
+  
+        fam_dir = calloc(1, sizeof(*fam_dir));
+        /* ERR_ABORT (fam_dir); */
+  
+        fam_dir->name = buffer_init();
+  
+        return fam_dir;
+}
+
+static void fam_dir_entry_free(void *data) {
+        fam_dir_entry *fam_dir = data;
+
+        if (!fam_dir) return;
+
+        FAMCancelMonitor(fam_dir->fc, fam_dir->req);
+
+        buffer_free(fam_dir->name);
+        free(fam_dir->req);
+
+        free(fam_dir);
+}
+#endif
+
+#ifdef HAVE_XATTR
+static int stat_cache_attr_get(buffer *buf, char *name) {
+        int attrlen;
+        int ret;
+  
+        attrlen = 1024;
+        buffer_prepare_copy(buf, attrlen);
+        attrlen--;
+        if(0 == (ret = attr_get(name, "Content-Type", buf->ptr, &attrlen, 0))) {
+                buf->used = attrlen + 1;
+                buf->ptr[attrlen] = '\0';
+        }
+        return ret;
+}
+#endif
+
+/* the famous DJB hash function for strings */
+static uint32_t hashme(buffer *str) {
+        uint32_t hash = 5381;
+        const char *s;
+        for (s = str->ptr; *s; s++) {
+                hash = ((hash << 5) + hash) + *s;
+        }
+  
+        hash &= ~(1 << 31); /* strip the highest bit */
+  
+        return hash;
+}
+
+
+#ifdef HAVE_LSTAT
+static int stat_cache_lstat(server *srv, buffer *dname, struct stat *lst) {
+        if (lstat(dname->ptr, lst) == 0) {
+                return S_ISLNK(lst->st_mode) ? 0 : 1;
+        }
+        else {
+                log_error_write(srv, __FILE__, __LINE__, "sbs",
+                                "lstat failed for:",
+                                dname, strerror(errno));
+        };
+        return -1;
+}
+#endif
+
+/***
+ *
+ *
+ *
+ * returns:
+ *  - HANDLER_FINISHED on cache-miss (don't forget to reopen the file)
+ *  - HANDLER_ERROR on stat() failed -> see errno for problem
+ */
+
+handler_t glusterfs_stat_cache_get_entry(server *srv, 
+                                         connection *con, 
+                                         buffer *glusterfs_path,
+                                         buffer *name, 
+                                         void *buf, 
+                                         size_t size, 
+                                         stat_cache_entry **ret_sce) 
+{
+#ifdef HAVE_FAM_H
+        fam_dir_entry *fam_dir = NULL;
+        int dir_ndx = -1;
+        splay_tree *dir_node = NULL;
+#endif
+        stat_cache_entry *sce = NULL;
+        stat_cache *sc;
+        struct stat st; 
+        size_t k;
+#ifdef DEBUG_STAT_CACHE
+        size_t i;
+#endif
+        int file_ndx;
+        splay_tree *file_node = NULL;
+
+        *ret_sce = NULL;
+        memset (&st, 0, sizeof (st));
+
+        /*
+         * check if the directory for this file has changed
+         */
+
+        sc = srv->stat_cache;
+
+        buffer_copy_string_buffer(sc->hash_key, name);
+        buffer_append_long(sc->hash_key, con->conf.follow_symlink);
+
+        file_ndx = hashme(sc->hash_key);
+        sc->files = splaytree_splay(sc->files, file_ndx);
+
+#ifdef DEBUG_STAT_CACHE
+        for (i = 0; i < ctrl.used; i++) {
+                if (ctrl.ptr[i] == file_ndx) break;
+        }
+#endif
+
+        if (sc->files && (sc->files->key == file_ndx)) {
+#ifdef DEBUG_STAT_CACHE
+                /* it was in the cache */
+                assert(i < ctrl.used);
+#endif
+
+                /* we have seen this file already and
+                 * don't stat() it again in the same second */
+
+                file_node = sc->files;
+
+                sce = file_node->data;
+
+                /* check if the name is the same, we might have a collision */
+
+                if (buffer_is_equal(name, sce->name)) {
+                        if (srv->srvconf.stat_cache_engine 
+                            == STAT_CACHE_ENGINE_SIMPLE) {
+                                if (sce->stat_ts == srv->cur_ts && !buf) {
+                                        *ret_sce = sce;
+                                        return HANDLER_GO_ON;
+                                }
+                        }
+                } else {
+                        /* oops, a collision,
+                         *
+                         * file_node is used by the FAM check below to see if 
+                         * we know this file and if we can save a stat().
+                         *
+                         * BUT, the sce is not reset here as the entry into 
+                         * the cache is ok, we it is just not pointing to 
+                         * our requested file.
+                         */
+
+                        file_node = NULL;
+                }
+        } else {
+#ifdef DEBUG_STAT_CACHE
+                if (i != ctrl.used) {
+                        fprintf(stderr, "%s.%d: %08x was already inserted "
+                                "but not found in cache, %s\n",
+                                __FILE__, __LINE__, file_ndx, name->ptr);
+                }
+                assert(i == ctrl.used);
+#endif
+        }
+        /*
+         * *lol*
+         * - open() + fstat() on a named-pipe results in a (intended) hang.
+         * - stat() if regular file + open() to see if we can read from it is 
+         *   better
+         *
+         * */
+        if (-1 == glusterfs_get (glusterfs_path->ptr, buf, size, &st)) {
+                return HANDLER_ERROR;
+        }
+
+        if (NULL == sce) {
+                int osize = 0;
+
+                if (sc->files) {
+                        osize = sc->files->size;
+                }
+
+                sce = stat_cache_entry_init();
+                buffer_copy_string_buffer(sce->name, name);
+
+                sc->files = splaytree_insert(sc->files, file_ndx, sce);
+#ifdef DEBUG_STAT_CACHE
+                if (ctrl.size == 0) {
+                        ctrl.size = 16;
+                        ctrl.used = 0;
+                        ctrl.ptr = malloc(ctrl.size * sizeof(*ctrl.ptr));
+                        /* ERR_ABORT (ctrl.ptr); */
+                } else if (ctrl.size == ctrl.used) {
+                        ctrl.size += 16;
+                        ctrl.ptr = realloc(ctrl.ptr,
+                                           ctrl.size * sizeof(*ctrl.ptr));
+                        /* ERR_ABORT (ctrl.ptr); */
+                }
+
+                ctrl.ptr[ctrl.used++] = file_ndx;
+
+                assert(sc->files);
+                assert(sc->files->data == sce);
+                assert(osize + 1 == splaytree_size(sc->files));
+#endif
+        }
+
+        sce->st = st;
+        sce->stat_ts = srv->cur_ts;
+
+        /* catch the obvious symlinks
+         *
+         * this is not a secure check as we still have a race-condition between
+         * the stat() and the open. We can only solve this by
+         * 1. open() the file
+         * 2. fstat() the fd
+         *
+         * and keeping the file open for the rest of the time. But this can
+         * only be done at network level.
+         *
+         * per default it is not a symlink
+         * */
+#ifdef HAVE_LSTAT
+        sce->is_symlink = 0;
+
+        /* we want to only check for symlinks if we should block symlinks.
+         */
+        if (!con->conf.follow_symlink) {
+                if (stat_cache_lstat(srv, name, &lst)  == 0) {
+#ifdef DEBUG_STAT_CACHE
+                        log_error_write(srv, __FILE__, __LINE__, "sb",
+                                        "found symlink", name);
+#endif
+                        sce->is_symlink = 1;
+                }
+
+                /*
+                 * we assume "/" can not be symlink, so
+                 * skip the symlink stuff if our path is /
+                 **/
+                else if ((name->used > 2)) {
+                        buffer *dname;
+                        char *s_cur;
+
+                        dname = buffer_init();
+                        buffer_copy_string_buffer(dname, name);
+
+                        while ((s_cur = strrchr(dname->ptr,'/'))) {
+                                *s_cur = '\0';
+                                dname->used = s_cur - dname->ptr + 1;
+                                if (dname->ptr == s_cur) {
+#ifdef DEBUG_STAT_CACHE
+                                        log_error_write(srv, __FILE__, __LINE__,
+                                                        "s", "reached /");
+#endif
+                                        break;
+                                }
+#ifdef DEBUG_STAT_CACHE
+                                log_error_write(srv, __FILE__, __LINE__, "sbs",
+                                                "checking if", dname, "is a "
+                                                "symlink");
+#endif
+                                if (stat_cache_lstat(srv, dname, &lst)  == 0) {
+                                        sce->is_symlink = 1;
+#ifdef DEBUG_STAT_CACHE
+                                        log_error_write(srv, __FILE__, __LINE__,
+                                                        "sb",
+                                                        "found symlink", dname);
+#endif
+                                        break;
+                                };
+                        };
+                        buffer_free(dname);
+                };
+        };
+#endif
+
+        if (S_ISREG(st.st_mode)) {
+                /* determine mimetype */
+                buffer_reset(sce->content_type);
+
+                for (k = 0; k < con->conf.mimetypes->used; k++) {
+                        data_string *ds = NULL;
+                        buffer *type = NULL;
+
+                        ds = (data_string *)con->conf.mimetypes->data[k];
+                        type = ds->key;
+                        if (type->used == 0) continue;
+
+                        /* check if the right side is the same */
+                        if (type->used > name->used) continue;
+
+                        if (0 == strncasecmp(name->ptr + name->used - type->used,
+                                             type->ptr, type->used - 1)) {
+                                buffer_copy_string_buffer(sce->content_type,
+                                                          ds->value);
+                                break;
+                        }
+                }
+                etag_create(sce->etag, &(sce->st), con->etag_flags);
+#ifdef HAVE_XATTR
+                if (con->conf.use_xattr && buffer_is_empty(sce->content_type)) {
+                        stat_cache_attr_get(sce->content_type, name->ptr);
+                }
+#endif
+        } else if (S_ISDIR(st.st_mode)) {
+                etag_create(sce->etag, &(sce->st), con->etag_flags);
+        }
+
+#ifdef HAVE_FAM_H
+        if (sc->fam &&
+            (srv->srvconf.stat_cache_engine == STAT_CACHE_ENGINE_FAM)) {
+                /* is this directory already registered ? */
+                if (!dir_node) {
+                        fam_dir = fam_dir_entry_init();
+                        fam_dir->fc = sc->fam;
+
+                        buffer_copy_string_buffer(fam_dir->name, sc->dir_name);
+
+                        fam_dir->version = 1;
+
+                        fam_dir->req = calloc(1, sizeof(FAMRequest));
+                        /* ERR_ABORT (fam_dir->req); */
+
+                        if (0 != FAMMonitorDirectory(sc->fam, fam_dir->name->ptr,
+                                                     fam_dir->req, fam_dir)) {
+
+                                log_error_write(srv, __FILE__, __LINE__, "sbsbs",
+                                                "monitoring dir failed:",
+                                                fam_dir->name, 
+                                                "file:", name,
+                                                FamErrlist[FAMErrno]);
+
+                                fam_dir_entry_free(fam_dir);
+                        } else {
+                                int osize = 0;
+
+                                if (sc->dirs) {
+                                        osize = sc->dirs->size;
+                                }
+
+                                sc->dirs = splaytree_insert(sc->dirs, dir_ndx,
+                                                            fam_dir);
+                                assert(sc->dirs);
+                                assert(sc->dirs->data == fam_dir);
+                                assert(osize == (sc->dirs->size - 1));
+                        }
+                } else {
+                        fam_dir = dir_node->data;
+                }
+
+                /* bind the fam_fc to the stat() cache entry */
+
+                if (fam_dir) {
+                        sce->dir_version = fam_dir->version;
+                        sce->dir_ndx     = dir_ndx;
+                }
+        }
+#endif
+
+        *ret_sce = sce;
+
+        return HANDLER_GO_ON;
+}
+
+/**
+ * remove stat() from cache which havn't been stat()ed for
+ * more than 10 seconds
+ *
+ *
+ * walk though the stat-cache, collect the ids which are too old
+ * and remove them in a second loop
+ */
+
+static int stat_cache_tag_old_entries(server *srv, splay_tree *t, int *keys,
+                                      size_t *ndx) {
+        stat_cache_entry *sce;
+
+        if (!t) return 0;
+
+        stat_cache_tag_old_entries(srv, t->left, keys, ndx);
+        stat_cache_tag_old_entries(srv, t->right, keys, ndx);
+
+        sce = t->data;
+
+        if (srv->cur_ts - sce->stat_ts > 2) {
+                keys[(*ndx)++] = t->key;
+        }
+
+        return 0;
+}
diff --git a/mod_glusterfs/lighttpd/1.4/mod_glusterfs.h b/mod_glusterfs/lighttpd/1.4/mod_glusterfs.h
new file mode 100644
index 000000000..9d73d6999
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.4/mod_glusterfs.h
@@ -0,0 +1,32 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _MOD_GLUSTERFS_FILE_CACHE_H_
+#define _MOD_GLUSTERFS_FILE_CACHE_H_
+
+#include "stat_cache.h"
+#include <libglusterfsclient.h>
+#include "base.h"
+
+handler_t glusterfs_stat_cache_get_entry(server *srv, connection *con,
+                                         buffer *glusterfs_path, buffer *name,
+                                         void *buf, size_t size,
+                                         stat_cache_entry **fce);
+
+#endif
diff --git a/mod_glusterfs/lighttpd/1.5/Makefile.am b/mod_glusterfs/lighttpd/1.5/Makefile.am
new file mode 100644
index 000000000..eda329111
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.5/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = Makefile.am.diff mod_glusterfs.c mod_glusterfs.h README.txt
+
+CLEANFILES = 
diff --git a/mod_glusterfs/lighttpd/1.5/Makefile.am.diff b/mod_glusterfs/lighttpd/1.5/Makefile.am.diff
new file mode 100644
index 000000000..375696b5d
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.5/Makefile.am.diff
@@ -0,0 +1,29 @@
+--- lighttpd-1.4.19/src/Makefile.am	2008-04-16 18:42:18.000000000 +0400
++++ lighttpd-1.4.19.mod/src/Makefile.am	2008-04-16 18:41:11.000000000 +0400
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = $(FAM_CFLAGS)
++AM_CFLAGS = $(FAM_CFLAGS)  -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64
+ 
+ noinst_PROGRAMS=proc_open lemon # simple-fcgi #graphic evalo bench ajp ssl error_test adserver gen-license
+ sbin_PROGRAMS=lighttpd lighttpd-angel
+@@ -241,6 +241,11 @@
+ mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+ mod_accesslog_la_LIBADD = $(common_libadd)
+ 
++lib_LTLIBRARIES += mod_glusterfs.la
++mod_glusterfs_la_SOURCES = mod_glusterfs.c
++mod_glusterfs_la_CFLAGS = $(AM_CFLAGS) 
++mod_glusterfs_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -lglusterfsclient -lpthread
++mod_glusterfs_la_LIBADD = $(common_libadd) 
+ 
+ hdr = server.h buffer.h network.h log.h keyvalue.h \
+       response.h request.h fastcgi.h chunk.h \
+@@ -254,7 +259,7 @@
+       configparser.h mod_ssi_exprparser.h \
+       sys-mmap.h sys-socket.h mod_cml.h mod_cml_funcs.h \
+       splaytree.h proc_open.h status_counter.h \
+-      mod_magnet_cache.h
++      mod_magnet_cache.h mod_glusterfs.h
+ 
+ DEFS= @DEFS@ -DLIBRARY_DIR="\"$(libdir)\"" -DSBIN_DIR="\"$(sbindir)\""
+ 
diff --git a/mod_glusterfs/lighttpd/1.5/README.txt b/mod_glusterfs/lighttpd/1.5/README.txt
new file mode 100644
index 000000000..bdbdfffbc
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.5/README.txt
@@ -0,0 +1,57 @@
+Introduction
+============
+mod_glusterfs is a module written for lighttpd to speed up the access of files present on glusterfs. mod_glusterfs uses libglusterfsclient library provided for glusterfs and hence can be used without fuse (File System in User Space).
+
+Usage
+=====
+To use mod_glusterfs with lighttpd-1.5, copy mod_glusterfs.c and mod_glusterfs.h into src/ of lighttpd-1.5 source tree, and apply the Makefile.am.diff to src/Makefile.am. Re-run ./autogen.sh on the top level of the lighttpd-1.5 build tree and recompile.
+
+# cp mod_glusterfs.[ch] /home/glusterfs/lighttpd-1.5/src/
+# cp Makefile.am.diff /home/glusterfs/lighttpd-1.5/
+# cd /home/glusterfs/lighttpd-1.5
+# patch -p1 < Makefile.am.diff 
+# ./autogen.sh
+# ./configure
+# make
+# make install
+
+Configuration
+=============
+* mod_glusterfs should be listed at the begining of the list server.modules in lighttpd.conf. 
+
+Below is a snippet from lighttpd.conf concerning to mod_glusterfs.
+
+$HTTP["url"] =~ "^/glusterfs" {
+	glusterfs.prefix = "/glusterfs" 
+	glusterfs.logfile = "/var/log/glusterfs-logfile"
+	glusterfs.document-root = "/home/glusterfs/document-root"
+	glusterfs.volume-specfile = "/etc/glusterfs/glusterfs.vol"
+	glusterfs.loglevel = "error"
+	glusterfs.cache-timeout = 300
+	glusterfs.xattr-interface-size-limit = "65536"
+}
+
+* $HTTP["url"] =~ "^/glusterfs"
+  A perl style regular expression used to match against the url. If regular expression matches the url, the url is handled by mod_glusterfs. Note that the pattern given here should match glusterfs.prefix.
+
+* glusterfs.prefix (COMPULSORY)
+  A string to be present at the starting of the file path in the url so that the file would be handled by glusterfs.
+  Eg., A GET request on the url http://www.example.com/glusterfs-prefix/some-dir/example-file will result in fetching of the file "/some-dir/example-file" from glusterfs mount if glusterfs.prefix is set to "/glusterfs-prefix".
+
+* glusterfs.volume-specfile (COMPULSORY)
+  Path to the the glusterfs volume specification file.
+
+* glusterfs.logfile (COMPULSORY)
+  Path to the glusterfs logfile.
+
+* glusterfs.loglevel (OPTIONAL, default = warning)
+  Allowed values are critical, error, warning, debug, none in the decreasing order of severity of error conditions.
+
+* glusterfs.cache-timeout (OPTIONAL, default = 0)
+  Timeout values for glusterfs stat and lookup cache.
+
+* glusterfs.document-root (COMPULSORY)
+  An absolute path, relative to which all the files are fetched from glusterfs.
+
+* glusterfs.xattr-interface-size-limit (OPTIONAL, default = 0)
+  Files with sizes upto and including this value are fetched through the extended attribute interface of glusterfs rather than the usual open-read-close set of operations. For files of small sizes, it is recommended to use extended attribute interface.
diff --git a/mod_glusterfs/lighttpd/1.5/mod_glusterfs.c b/mod_glusterfs/lighttpd/1.5/mod_glusterfs.c
new file mode 100644
index 000000000..67f7a7eac
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.5/mod_glusterfs.c
@@ -0,0 +1,1476 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <pthread.h>
+#include <sys/types.h>
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <unistd.h>
+#include <assert.h>
+
+#include "base.h"
+#include "log.h"
+#include "buffer.h"
+
+#include "plugin.h"
+
+#include "stat_cache.h"
+#include "mod_glusterfs.h"
+#include "etag.h"
+#include "response.h"
+
+#include "fdevent.h"
+#include "joblist.h"
+#include "http_req_range.h"
+#include "connections.h"
+#include "configfile.h"
+
+#include <libglusterfsclient.h>
+
+#ifdef HAVE_ATTR_ATTRIBUTES_H
+#include <attr/attributes.h>
+#endif
+
+#ifdef HAVE_FAM_H
+# include <fam.h>
+#endif
+
+#include "sys-mmap.h"
+
+/* NetBSD 1.3.x needs it */
+#ifndef MAP_FAILED
+# define MAP_FAILED -1
+#endif
+
+#ifndef O_LARGEFILE
+# define O_LARGEFILE 0
+#endif
+
+#ifndef HAVE_LSTAT
+#define lstat stat
+#endif
+
+#if 0
+/* enables debug code for testing if all nodes in the stat-cache as accessable */
+#define DEBUG_STAT_CACHE
+#endif
+
+#ifdef HAVE_LSTAT
+#undef HAVE_LSTAT
+#endif
+
+#define GLUSTERFS_FILE_CHUNK (FILE_CHUNK + 1)
+
+/* Keep this value large. Each glusterfs_async_read of GLUSTERFS_CHUNK_SIZE results in a network_backend_write of the read data*/
+
+#define GLUSTERFS_CHUNK_SIZE 8192
+
+/**
+ * this is a staticfile for a lighttpd plugin
+ *
+ */
+
+
+/* plugin config for all request/connections */
+
+typedef struct {
+        buffer *logfile;
+        buffer *loglevel;
+        buffer *specfile;
+        buffer *prefix;
+        buffer *xattr_file_size;
+        buffer *document_root;
+        array *exclude_exts;
+        unsigned short cache_timeout;
+
+        /* FIXME: its a pointer, hence cant be short */
+        unsigned long handle;
+} plugin_config;
+
+static network_status_t (*network_backend_write)(struct server *srv, connection *con, iosocket *sock, chunkqueue *cq);
+
+typedef struct {
+        PLUGIN_DATA;
+        buffer *range_buf;
+        plugin_config **config_storage;
+        http_req_range *ranges;
+        plugin_config conf;
+} plugin_data;
+
+typedef struct glusterfs_async_local {
+        int op_ret;
+        int op_errno;
+        pthread_mutex_t lock;
+        pthread_cond_t cond;
+        connection *con;
+        server *srv;
+        plugin_data *p;
+
+        union {
+                struct {
+                        char async_read_complete;
+                        off_t length;
+                        size_t read_bytes;
+                        glusterfs_read_buf_t *buf;
+                }readv;
+
+                struct {
+                        buffer *name;
+                        buffer *hash_key;
+                        size_t size;
+                }lookup;
+        }fop;
+} glusterfs_async_local_t;
+
+typedef struct {
+        unsigned long fd;
+        buffer *glusterfs_path;
+        void *buf;
+        off_t response_content_length;
+        int prefix;
+}mod_glusterfs_ctx_t;
+
+typedef struct {
+        chunkqueue *cq;
+        glusterfs_read_buf_t *buf;
+        size_t length;
+}mod_glusterfs_chunkqueue;
+
+#ifdef HAVE_FAM_H
+typedef struct {
+        FAMRequest *req;
+        FAMConnection *fc;
+
+        buffer *name;
+
+        int version;
+} fam_dir_entry;
+#endif
+
+/* the directory name is too long to always compare on it
+ * - we need a hash
+ * - the hash-key is used as sorting criteria for a tree
+ * - a splay-tree is used as we can use the caching effect of it
+ */
+
+/* we want to cleanup the stat-cache every few seconds, let's say 10
+ *
+ * - remove entries which are outdated since 30s
+ * - remove entries which are fresh but havn't been used since 60s
+ * - if we don't have a stat-cache entry for a directory, release it from the monitor
+ */
+
+#ifdef DEBUG_STAT_CACHE
+typedef struct {
+        int *ptr;
+
+        size_t used;
+        size_t size;
+} fake_keys;
+
+static fake_keys ctrl;
+#endif
+
+static stat_cache_entry * 
+stat_cache_entry_init(void) 
+{
+        stat_cache_entry *sce = NULL;
+
+        sce = calloc(1, sizeof(*sce));
+        /* ERR_ABORT (sce); */
+
+        sce->name = buffer_init();
+        sce->etag = buffer_init();
+        sce->content_type = buffer_init();
+
+        return sce;
+}
+
+int chunkqueue_append_glusterfs_mem (chunkqueue *cq, const char * mem, size_t len) {
+        buffer *buf = NULL;
+ 
+        buf = chunkqueue_get_append_buffer (cq);
+
+        if (buf->ptr)
+                free (buf->ptr);
+
+        buf->used = len + 1;
+        buf->ptr = (char *)mem;
+        buf->size = len;
+
+        return 0;
+}
+
+static int
+glusterfs_lookup_async_cbk (int op_ret, 
+                            int op_errno,
+                            void *buf,
+                            struct stat *st,
+                            void *cbk_data)
+{
+        glusterfs_async_local_t *local = cbk_data;
+
+        mod_glusterfs_ctx_t *ctx = NULL;
+        ctx = local->con->plugin_ctx[local->p->id];
+
+        assert (ctx->buf== buf);
+
+        if (op_ret || !(S_ISREG (st->st_mode) && (size_t)st->st_size <= local->fop.lookup.size)) {
+
+                free (ctx->buf);
+                ctx->buf = NULL;
+
+                if (op_ret) {
+                        buffer_free (ctx->glusterfs_path);
+                        ctx->glusterfs_path = NULL;
+                        free (ctx);
+                        local->con->plugin_ctx[local->p->id] = NULL;
+
+                        if (op_errno == ENOENT)
+                                local->con->http_status = 404;
+                        else 
+                                local->con->http_status = 403;
+                }
+        }
+
+        if (!op_ret) {
+                stat_cache_entry *sce = NULL;
+                stat_cache *sc = local->srv->stat_cache;
+
+                sce = (stat_cache_entry *)g_hash_table_lookup(sc->files, local->fop.lookup.hash_key);
+
+                if (!sce) {
+                        sce = stat_cache_entry_init();
+
+                        buffer_copy_string_buffer(sce->name, local->fop.lookup.name);
+                        g_hash_table_insert(sc->files, buffer_init_string(BUF_STR(local->fop.lookup.hash_key)), sce);
+                }
+
+                sce->state = STAT_CACHE_ENTRY_STAT_FINISHED;
+                sce->stat_ts = time (NULL);
+                memcpy (&sce->st, st, sizeof (*st));
+        }
+
+        g_async_queue_push (local->srv->joblist_queue, local->con);
+        /*
+          joblist_append (local->srv, local->con);
+          kill (getpid(), SIGUSR1);
+        */
+        free (local);
+        return 0;
+}
+
+static handler_t
+glusterfs_stat_cache_get_entry_async (server *srv, 
+                                      connection *con, 
+                                      plugin_data *p,
+                                      buffer *glusterfs_path,
+                                      buffer *name,
+                                      void *buf,
+                                      size_t size,
+                                      stat_cache_entry **ret_sce)
+{
+        stat_cache_entry *sce = NULL;
+        stat_cache *sc;
+        glusterfs_async_local_t *local = NULL;
+
+        *ret_sce = NULL;
+
+        /*
+         * check if the directory for this file has changed
+         */
+
+        sc = srv->stat_cache;
+
+        buffer_copy_string_buffer(sc->hash_key, name);
+        buffer_append_long(sc->hash_key, con->conf.follow_symlink);
+
+        if ((sce = (stat_cache_entry *)g_hash_table_lookup(sc->files, sc->hash_key))) {
+                /* know this entry already */
+
+                if (sce->state == STAT_CACHE_ENTRY_STAT_FINISHED && 
+                    !buf) {
+                        /* verify that this entry is still fresh */
+
+                        *ret_sce = sce;
+
+                        return HANDLER_GO_ON;
+                }
+        }
+
+
+        /*
+         * *lol*
+         * - open() + fstat() on a named-pipe results in a (intended) hang.
+         * - stat() if regular file + open() to see if we can read from it is better
+         *
+         * */
+
+        /* pass a job to the stat-queue */
+
+        local = calloc (1, sizeof (*local));
+        /* ERR_ABORT (local); */
+        local->con = con;
+        local->srv = srv;
+        local->p = p;
+        local->fop.lookup.name = buffer_init_buffer (name);
+        local->fop.lookup.hash_key = buffer_init_buffer (sc->hash_key);
+        local->fop.lookup.size = size;
+
+        if (glusterfs_lookup_async ((libglusterfs_handle_t )p->conf.handle, glusterfs_path->ptr, buf, size, glusterfs_lookup_async_cbk, (void *) local)) {
+                free (local);
+                return HANDLER_ERROR;
+        }
+
+        return HANDLER_WAIT_FOR_EVENT;
+}
+
+int 
+mod_glusterfs_readv_async_cbk (glusterfs_read_buf_t *buf,
+                               void *cbk_data)
+{
+        glusterfs_async_local_t *local = cbk_data;
+        pthread_mutex_lock (&local->lock);
+        {
+                local->fop.readv.async_read_complete = 1;
+                local->fop.readv.buf = buf;
+
+                pthread_cond_signal (&local->cond);
+        }
+        pthread_mutex_unlock (&local->lock);
+
+        return 0;
+}
+
+network_status_t 
+mod_glusterfs_read_async (server *srv, connection *con, chunk *glusterfs_chunk)
+{
+        glusterfs_async_local_t local;
+        off_t end = 0;
+        int nbytes;
+        int complete;
+        chunkqueue *cq = NULL;
+        chunk *c = NULL;
+        off_t offset = glusterfs_chunk->file.start;
+        size_t length = glusterfs_chunk->file.length;
+        unsigned long fd = (unsigned long)glusterfs_chunk->file.name;
+        network_status_t ret;
+
+        pthread_cond_init (&local.cond, NULL);
+        pthread_mutex_init (&local.lock, NULL);
+  
+        //local.fd = fd;
+        memset (&local, 0, sizeof (local));
+
+        if (length > 0)
+                end = offset + length;
+
+        cq = chunkqueue_init ();
+        if (!cq) {
+                con->http_status = 500;
+                return NETWORK_STATUS_FATAL_ERROR;
+        }
+
+        do {
+                glusterfs_read_buf_t *buf;
+                int i;
+                if (length > 0) {
+                        nbytes = end - offset;
+                        if (nbytes > GLUSTERFS_CHUNK_SIZE)
+                                nbytes = GLUSTERFS_CHUNK_SIZE;
+                } else
+                        nbytes = GLUSTERFS_CHUNK_SIZE;
+
+                glusterfs_read_async(fd, 
+                                     nbytes,
+                                     offset,
+                                     mod_glusterfs_readv_async_cbk,
+                                     (void *)&local);
+
+                pthread_mutex_lock (&local.lock);
+                {
+                        while (!local.fop.readv.async_read_complete) {
+                                pthread_cond_wait (&local.cond, &local.lock);
+                        }
+
+                        local.op_ret = local.fop.readv.buf->op_ret;
+                        local.op_errno = local.fop.readv.buf->op_errno;
+
+                        local.fop.readv.async_read_complete = 0;
+                        buf = local.fop.readv.buf;
+
+                        if ((int)length < 0)
+                                complete = (local.fop.readv.buf->op_ret <= 0);
+                        else {
+                                local.fop.readv.read_bytes += local.fop.readv.buf->op_ret;
+                                complete = ((local.fop.readv.read_bytes == length) || (local.fop.readv.buf->op_ret <= 0));
+                        }
+                }
+                pthread_mutex_unlock (&local.lock);
+
+                if (local.op_ret > 0) {
+                        for (i = 0; i < buf->count; i++) {
+                                buffer *nw_write_buf = chunkqueue_get_append_buffer (cq);
+
+                                nw_write_buf->used = nw_write_buf->size = buf->vector[i].iov_len + 1;
+                                nw_write_buf->ptr = buf->vector[i].iov_base;
+
+                                //      buffer_copy_memory (nw_write_buf, buf->vector[i].iov_base, buf->vector[i].iov_len + 1);
+                                offset += local.op_ret;
+                        }
+  
+                        ret = network_backend_write (srv, con, con->sock, cq);
+  
+                        if (chunkqueue_written (cq) != local.op_ret) {
+                                mod_glusterfs_chunkqueue *gf_cq;
+                                glusterfs_chunk->file.start = offset;
+                                if ((int)glusterfs_chunk->file.length > 0)
+                                        glusterfs_chunk->file.length -= local.fop.readv.read_bytes;
+
+                                gf_cq = calloc (1, sizeof (*gf_cq));
+                                /* ERR_ABORT (qf_cq); */
+                                gf_cq->cq = cq;
+                                gf_cq->buf = buf;
+                                gf_cq->length = local.op_ret;
+                                glusterfs_chunk->file.mmap.start = (char *)gf_cq;
+                                return ret;
+                        }
+      
+                        for (c = cq->first ; c; c = c->next) 
+                                c->mem->ptr = NULL;
+
+                        chunkqueue_reset (cq);
+                }
+
+                glusterfs_free (buf);
+        } while (!complete);
+
+        chunkqueue_free (cq);
+        glusterfs_close (fd);
+
+        if (local.op_ret < 0)
+                con->http_status = 500;
+
+        return (local.op_ret < 0 ? NETWORK_STATUS_FATAL_ERROR : NETWORK_STATUS_SUCCESS);
+}
+
+network_status_t mod_glusterfs_network_backend_write(struct server *srv, connection *con, iosocket *sock, chunkqueue *cq)
+{
+        chunk *c, *prev, *first;
+        int chunks_written = 0;
+        int error = 0;
+        network_status_t ret;
+
+        for (first = prev = c = cq->first; c; c = c->next, chunks_written++) {
+
+                if (c->type == MEM_CHUNK && c->mem->used && !c->mem->ptr) {
+                        if (cq->first != c) {
+                                prev->next = NULL;
+
+                                /* call stored network_backend_write */
+                                ret = network_backend_write (srv, con, sock, cq);
+
+                                prev->next = c;
+                                if (ret != NETWORK_STATUS_SUCCESS) {
+                                        cq->first = first;
+                                        return ret;
+                                }
+                        } 
+                        cq->first = c->next;
+
+                        if (c->file.fd < 0) {
+                                error = HANDLER_ERROR;
+                                break;
+                        }
+
+                        if (c->file.mmap.start) {
+                                chunk *tmp;
+                                size_t len;
+                                mod_glusterfs_chunkqueue *gf_cq = (mod_glusterfs_chunkqueue *)c->file.mmap.start;
+
+                                ret = network_backend_write (srv, con, sock, gf_cq->cq);
+
+                                if ((len = (size_t)chunkqueue_written (gf_cq->cq)) != gf_cq->length) {
+                                        gf_cq->length -= len;
+                                        cq->first = first;
+                                        chunkqueue_remove_finished_chunks (gf_cq->cq);
+                                        return ret;
+                                }
+
+                                for (tmp = gf_cq->cq->first ; tmp; tmp = tmp->next)
+                                        tmp->mem->ptr = NULL;
+
+                                chunkqueue_free (gf_cq->cq);
+                                glusterfs_free (gf_cq->buf);
+                                free (gf_cq);
+                                c->file.mmap.start = NULL;
+                        }
+      
+                        ret = mod_glusterfs_read_async (srv, con, c); //c->file.fd, c->file.start, -1);//c->file.length);
+                        if (c->file.mmap.start) {
+                                /* pending chunkqueue from mod_glusterfs_read_async to be written to network */
+                                cq->first = first;
+                                return ret;
+                        }
+
+                        buffer_free (c->mem);
+                        c->mem = NULL;
+
+                        c->type = FILE_CHUNK;
+                        c->offset = c->file.length = 0;
+                        c->file.name = NULL;
+
+                        if (first == c)
+                                first = c->next;
+
+                        if (cq->last == c)
+                                cq->last = NULL;
+
+                        prev->next = c->next;
+
+                        free(c);
+                }     
+                prev = c;
+        }
+
+        ret = network_backend_write (srv, con, sock, cq);
+
+        cq->first = first;
+
+        return ret;
+}
+
+#if 0
+int chunkqueue_append_glusterfs_file (chunkqueue *cq, unsigned long fd, off_t offset, off_t len)
+{
+        chunk *c = NULL;
+        c = chunkqueue_get_append_tempfile (cq);
+  
+        if (c->file.is_temp) {
+                close (c->file.fd);
+                unlink (c->file.name->ptr);
+        }
+
+        c->type = MEM_CHUNK;
+
+        c->mem = buffer_init ();
+        c->mem->used = len + 1;
+        c->mem->ptr = NULL;
+        c->offset = 0;
+
+        /*  buffer_copy_string_buffer (c->file.name, fn); */
+        c->file.start = offset;
+        c->file.length = len;
+        /*  buffer_free (c->file.name); */
+
+        /* identify chunk as glusterfs related */
+        c->file.mmap.start = MAP_FAILED;
+        /*  c->file.mmap.length = c->file.mmap.offset = len;*/
+
+        return 0;
+}
+#endif
+
+int chunkqueue_append_dummy_mem_chunk (chunkqueue *cq, off_t len)
+{
+        chunk *c = NULL;
+        c = chunkqueue_get_append_tempfile (cq);
+  
+        if (c->file.is_temp) {
+                close (c->file.fd);
+                unlink (c->file.name->ptr);
+                c->file.is_temp = 0;
+        }
+
+        c->type = MEM_CHUNK;
+
+        c->mem->used = len + 1;
+        c->offset = len;
+        c->mem->ptr = NULL;
+
+        return 0;
+}
+
+int chunkqueue_append_glusterfs_file (chunkqueue *cq, unsigned long fd, off_t offset, off_t len)
+{
+        chunk *c = NULL;
+        c = chunkqueue_get_append_tempfile (cq);
+  
+        if (c->file.is_temp) {
+                close (c->file.fd);
+                unlink (c->file.name->ptr);
+                c->file.is_temp = 0;
+        }
+
+        c->type = MEM_CHUNK;
+
+        c->mem = buffer_init ();
+        c->mem->used = len + 1;
+        c->mem->ptr = NULL;
+        c->offset = 0;
+
+        /*  buffer_copy_string_buffer (c->file.name, fn); */
+        buffer_free (c->file.name);
+
+        /* fd returned by libglusterfsclient is a pointer */
+        c->file.name = (buffer *)fd;
+        c->file.start = offset;
+        c->file.length = len;
+
+        //c->file.fd = fd;
+        c->file.mmap.start = NULL;
+        return 0;
+}
+
+/* init the plugin data */
+INIT_FUNC(mod_glusterfs_init) {
+        plugin_data *p;
+
+        UNUSED (srv);
+        p = calloc(1, sizeof(*p));
+        /* ERR_ABORT (p); */
+        network_backend_write = NULL;
+        p->ranges = http_request_range_init();
+        return p;
+}
+
+/* detroy the plugin data */
+FREE_FUNC(mod_glusterfs_free) {
+        plugin_data *p = p_d;
+
+        UNUSED (srv);
+
+        if (!p) return HANDLER_GO_ON;
+  
+        if (p->config_storage) {
+                size_t i;
+                for (i = 0; i < srv->config_context->used; i++) {
+                        plugin_config *s = p->config_storage[i];
+      
+                        buffer_free (s->logfile);
+                        buffer_free (s->loglevel);
+                        buffer_free (s->specfile);
+                        buffer_free (s->prefix);
+                        buffer_free (s->xattr_file_size);
+                        buffer_free (s->document_root);
+                        array_free (s->exclude_exts);
+  
+                        free (s);
+                }
+                free (p->config_storage);
+        }
+        buffer_free (p->range_buf);
+        http_request_range_free (p->ranges);
+
+        free (p);
+  
+        return HANDLER_GO_ON;
+}
+
+SETDEFAULTS_FUNC(mod_glusterfs_set_defaults) {
+        plugin_data *p = p_d;
+        size_t i = 0;
+  
+        config_values_t cv[] = {
+                { "glusterfs.logfile",              NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+    
+                { "glusterfs.loglevel",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },         
+                { "glusterfs.volume-specfile",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },          
+                { "glusterfs.cache-timeout",              NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },
+    
+                { "glusterfs.exclude-extensions",   NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },
+    
+                /*TODO: get the prefix from config_conext and remove glusterfs.prefix from conf file */
+                { "glusterfs.prefix", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+    
+                { "glusterfs.xattr-interface-size-limit", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+
+                { "glusterfs.document-root", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+    
+                { NULL,                          NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
+        };
+  
+        p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *));
+        /* ERR_ABORT (p->config_storage); */
+        p->range_buf = buffer_init ();
+  
+        for (i = 0; i < srv->config_context->used; i++) {
+                plugin_config *s;
+
+                s = calloc(1, sizeof(plugin_config));
+                /* ERR_ABORT (s); */
+                s->logfile = buffer_init ();
+                s->loglevel = buffer_init ();
+                s->specfile = buffer_init ();
+                s->exclude_exts = array_init ();
+                s->prefix = buffer_init ();
+                s->xattr_file_size = buffer_init ();
+                s->document_root = buffer_init ();
+    
+                cv[0].destination = s->logfile;
+                cv[1].destination = s->loglevel;
+                cv[2].destination = s->specfile;
+                cv[3].destination = &s->cache_timeout;
+                cv[4].destination = s->exclude_exts;
+                cv[5].destination = s->prefix;
+                cv[6].destination = s->xattr_file_size;
+                cv[7].destination = s->document_root;
+
+                p->config_storage[i] = s;
+    
+                if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) {
+                        return HANDLER_FINISHED;
+                }
+        }
+  
+        return HANDLER_GO_ON;
+}
+
+#define PATCH(x)                                \
+        p->conf.x = s->x;
+
+static int mod_glusterfs_patch_connection(server *srv, connection *con, plugin_data *p) {
+        size_t i, j;
+        plugin_config *s;
+
+        p->conf.logfile = NULL;
+        p->conf.loglevel = NULL;
+        p->conf.specfile = NULL;
+        p->conf.cache_timeout = 0;
+        p->conf.exclude_exts = NULL;
+        p->conf.prefix = NULL;
+        p->conf.xattr_file_size = NULL;
+        p->conf.exclude_exts = NULL;
+
+        /* skip the first, the global context */
+        /* glusterfs related config can only occur inside $HTTP["url"] == "<glusterfs-prefix>" */
+        for (i = 1; i < srv->config_context->used; i++) {
+                data_config *dc = (data_config *)srv->config_context->data[i];
+                s = p->config_storage[i];
+
+                /* condition didn't match */
+                if (!config_check_cond(srv, con, dc)) continue;
+    
+                /* merge config */
+                for (j = 0; j < dc->value->used; j++) {
+                        data_unset *du = dc->value->data[j];
+      
+                        if (buffer_is_equal_string (du->key, CONST_STR_LEN("glusterfs.logfile"))) {
+                                PATCH (logfile);
+                        } else if (buffer_is_equal_string (du->key, CONST_STR_LEN("glusterfs.loglevel"))) {
+                                PATCH (loglevel);
+                        } else if (buffer_is_equal_string (du->key, CONST_STR_LEN ("glusterfs.volume-specfile"))) {
+                                PATCH (specfile);
+                        } else if (buffer_is_equal_string (du->key, CONST_STR_LEN("glusterfs.cache-timeout"))) {
+                                PATCH (cache_timeout);
+                        } else if (buffer_is_equal_string (du->key, CONST_STR_LEN ("glusterfs.exclude-extensions"))) {
+                                PATCH (exclude_exts);
+                        } else if (buffer_is_equal_string (du->key, CONST_STR_LEN ("glusterfs.prefix"))) {
+                                PATCH (prefix);
+                        } else if (buffer_is_equal_string (du->key, CONST_STR_LEN ("glusterfs.xattr-interface-size-limit"))) {
+                                PATCH (xattr_file_size);
+                        } else if (buffer_is_equal_string (du->key, CONST_STR_LEN ("glusterfs.document-root"))) {
+                                PATCH (document_root);
+                        }
+                }
+        }
+        return 0;
+}
+
+#undef PATCH
+
+static int http_response_parse_range(server *srv, connection *con, plugin_data *p) {
+        int multipart = 0;
+        char *boundary = "fkj49sn38dcn3";
+        data_string *ds;
+        stat_cache_entry *sce = NULL;
+        buffer *content_type = NULL;
+        buffer *range = NULL;
+        http_req_range *ranges, *r;
+        mod_glusterfs_ctx_t *ctx = con->plugin_ctx[p->id];
+        size_t size = 0;
+
+        if (!ctx) {
+                return -1;
+        }
+
+        if (NULL != (ds = (data_string *)array_get_element(con->request.headers, CONST_STR_LEN("Range")))) {
+                range = ds->value;
+        } else {
+                /* we don't have a Range header */
+
+                return -1;
+        }
+
+        if (HANDLER_ERROR == stat_cache_get_entry(srv, con, con->physical.path, &sce)) {
+                SEGFAULT();
+        }
+
+        ctx->response_content_length = con->response.content_length = 0;
+
+        if (NULL != (ds = (data_string *)array_get_element(con->response.headers, CONST_STR_LEN("Content-Type")))) {
+                content_type = ds->value;
+        }
+
+        /* start the range-header parser
+         * bytes=<num>  */
+
+        ranges = p->ranges;
+        http_request_range_reset(ranges);
+        switch (http_request_range_parse(range, ranges)) {
+        case PARSE_ERROR:
+                return -1; /* no range valid Range Header */
+        case PARSE_SUCCESS:
+                break;
+        default:
+                TRACE("%s", "foobar");
+                return -1;
+        }
+
+        if (ranges->next) {
+                multipart = 1;
+        }
+
+        if (p->conf.xattr_file_size && p->conf.xattr_file_size->ptr) {
+                size = atoi (p->conf.xattr_file_size->ptr);
+        }
+
+        /* patch the '-1' */
+        for (r = ranges; r; r = r->next) {
+                if (r->start == -1) {
+                        /* -<end>
+                         *
+                         * the last <end> bytes  */
+                        r->start = sce->st.st_size - r->end;
+                        r->end = sce->st.st_size - 1;
+                }
+                if (r->end == -1) {
+                        /* <start>-
+                         * all but the first <start> bytes */
+
+                        r->end = sce->st.st_size - 1;
+                }
+
+                if (r->end > sce->st.st_size - 1) {
+                        /* RFC 2616 - 14.35.1
+                         *
+                         * if last-byte-pos not present or > size-of-file
+                         * take the size-of-file
+                         *
+                         *  */
+                        r->end = sce->st.st_size - 1;
+                }
+
+                if (r->start > sce->st.st_size - 1) {
+                        /* RFC 2616 - 14.35.1
+                         *
+                         * if first-byte-pos > file-size, 416
+                         */
+
+                        con->http_status = 416;
+                        return -1;
+                }
+
+                if (r->start > r->end) {
+                        /* RFC 2616 - 14.35.1
+                         *
+                         * if last-byte-pos is present, it has to be >= first-byte-pos
+                         *
+                         * invalid ranges have to be handle as no Range specified
+                         *  */
+
+                        return -1;
+                }
+        }
+
+        if (r) {
+                /* we ran into an range violation */
+                return -1;
+        }
+
+        if (multipart) {
+                buffer *b;
+                for (r = ranges; r; r = r->next) {
+                        /* write boundary-header */
+
+                        b = chunkqueue_get_append_buffer(con->send);
+
+                        buffer_copy_string(b, "\r\n--");
+                        buffer_append_string(b, boundary);
+
+                        /* write Content-Range */
+                        buffer_append_string(b, "\r\nContent-Range: bytes ");
+                        buffer_append_off_t(b, r->start);
+                        buffer_append_string(b, "-");
+                        buffer_append_off_t(b, r->end);
+                        buffer_append_string(b, "/");
+                        buffer_append_off_t(b, sce->st.st_size);
+
+                        buffer_append_string(b, "\r\nContent-Type: ");
+                        buffer_append_string_buffer(b, content_type);
+
+                        /* write END-OF-HEADER */
+                        buffer_append_string(b, "\r\n\r\n");
+
+                        con->response.content_length += b->used - 1;
+                        ctx->response_content_length += b->used - 1;
+                        con->send->bytes_in += b->used - 1;
+
+                        if ((size_t)sce->st.st_size > size) {
+                                chunkqueue_append_glusterfs_file(con->send_raw, ctx->fd, r->start, r->end - r->start + 1);
+                                con->send_raw->bytes_in += (r->end - r->start + 1);
+                                chunkqueue_append_dummy_mem_chunk (con->send, r->end - r->start + 1);
+                        } else {
+                                chunkqueue_append_mem (con->send, ((char *)ctx->buf) + r->start, r->end - r->start + 1); 
+                                free (ctx->buf);
+                                ctx->buf = NULL;
+                        }
+                
+                        con->response.content_length += r->end - r->start + 1;
+                        ctx->response_content_length += r->end - r->start + 1;
+                        con->send->bytes_in += r->end - r->start + 1;
+                }
+
+                /* add boundary end */
+                b = chunkqueue_get_append_buffer(con->send);
+
+                buffer_copy_string_len(b, "\r\n--", 4);
+                buffer_append_string(b, boundary);
+                buffer_append_string_len(b, "--\r\n", 4);
+
+                con->response.content_length += b->used - 1;
+                ctx->response_content_length += b->used - 1;
+                con->send->bytes_in += b->used - 1;
+
+                /* set header-fields */
+
+                buffer_copy_string(p->range_buf, "multipart/byteranges; boundary=");
+                buffer_append_string(p->range_buf, boundary);
+
+                /* overwrite content-type */
+                response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(p->range_buf));
+
+        } else {
+                r = ranges;
+
+                chunkqueue_append_glusterfs_file(con->send_raw, ctx->fd, r->start, r->end - r->start + 1);
+                con->send_raw->bytes_in += (r->end - r->start + 1);
+                chunkqueue_append_dummy_mem_chunk (con->send, r->end - r->start + 1);
+                con->response.content_length += r->end - r->start + 1;
+                ctx->response_content_length += r->end - r->start + 1;
+                con->send->bytes_in += r->end - r->start + 1;
+
+                buffer_copy_string(p->range_buf, "bytes ");
+                buffer_append_off_t(p->range_buf, r->start);
+                buffer_append_string(p->range_buf, "-");
+                buffer_append_off_t(p->range_buf, r->end);
+                buffer_append_string(p->range_buf, "/");
+                buffer_append_off_t(p->range_buf, sce->st.st_size);
+
+                response_header_insert(srv, con, CONST_STR_LEN("Content-Range"), CONST_BUF_LEN(p->range_buf));
+        }
+
+        /* ok, the file is set-up */
+        return 0;
+}
+
+PHYSICALPATH_FUNC(mod_glusterfs_handle_physical) {
+        plugin_data *p = p_d;
+        stat_cache_entry *sce;
+        size_t size = 0;
+        handler_t ret = 0;
+        mod_glusterfs_ctx_t *plugin_ctx = NULL;
+
+        if (con->http_status != 0) return HANDLER_GO_ON;
+        if (con->uri.path->used == 0) return HANDLER_GO_ON;
+        if (con->physical.path->used == 0) return HANDLER_GO_ON;
+
+        if (con->mode != DIRECT) return HANDLER_GO_ON;
+
+        /*
+          network_backend_write = srv->network_backend_write;
+          srv->network_backend_write = mod_glusterfs_network_backend_write;
+        */
+
+        switch (con->request.http_method) {
+        case HTTP_METHOD_GET:
+        case HTTP_METHOD_POST:
+        case HTTP_METHOD_HEAD:
+                break;
+
+        default:
+                return HANDLER_GO_ON;
+        }
+
+        mod_glusterfs_patch_connection(srv, con, p);
+
+        if (!p->conf.prefix || !p->conf.prefix->ptr) {
+                return HANDLER_GO_ON;
+        }
+
+        if (!p->conf.document_root || p->conf.document_root->used == 0) {
+                log_error_write(srv, __FILE__, __LINE__, "s", "glusterfs.document-root is not specified");
+                con->http_status = 500;
+                return HANDLER_FINISHED;
+        }
+
+        if (p->conf.handle <= 0) {
+                glusterfs_init_ctx_t ctx;
+
+                if (!p->conf.specfile || p->conf.specfile->used == 0) {
+                        return HANDLER_GO_ON;
+                }
+                memset (&ctx, 0, sizeof (ctx));
+
+                ctx.specfile = p->conf.specfile->ptr;
+                ctx.logfile = p->conf.logfile->ptr;
+                ctx.loglevel = p->conf.loglevel->ptr;
+                ctx.lookup_timeout = ctx.stat_timeout = p->conf.cache_timeout;
+
+                p->conf.handle = (unsigned long)glusterfs_init (&ctx);
+
+                if (p->conf.handle <= 0) {
+                        con->http_status = 500;
+                        log_error_write(srv, __FILE__, __LINE__,  "sbs",  "glusterfs initialization failed, please check your configuration. Glusterfs logfile ", p->conf.logfile, "might contain details");
+                        return HANDLER_FINISHED;
+                }
+        }
+
+        size = 0;
+        if (p->conf.xattr_file_size && p->conf.xattr_file_size->ptr) 
+                size = atoi (p->conf.xattr_file_size->ptr);
+
+        if (!con->plugin_ctx[p->id]) {
+                buffer *tmp_buf = buffer_init_buffer (con->physical.basedir);
+
+                plugin_ctx = calloc (1, sizeof (*plugin_ctx));
+                /* ERR_ABORT (plugin_ctx); */
+                con->plugin_ctx[p->id] = plugin_ctx;
+    
+                buffer_append_string_buffer (tmp_buf, p->conf.prefix);
+                buffer_path_simplify (tmp_buf, tmp_buf);
+
+                plugin_ctx->prefix = tmp_buf->used - 1;
+                if (tmp_buf->ptr[plugin_ctx->prefix - 1] == '/')
+                        plugin_ctx->prefix--;
+
+                buffer_free (tmp_buf);
+        } else 
+                /*FIXME: error!! error!! */
+                plugin_ctx = con->plugin_ctx[p->id];
+
+
+        if (size) 
+        {
+                plugin_ctx->buf = malloc (size);
+                /* ERR_ABORT (plugin_ctx->buf); */
+        }
+
+        plugin_ctx->glusterfs_path = buffer_init ();
+        buffer_copy_string_buffer (plugin_ctx->glusterfs_path, p->conf.document_root);
+        buffer_append_string (plugin_ctx->glusterfs_path, "/");
+        buffer_append_string (plugin_ctx->glusterfs_path, con->physical.path->ptr + plugin_ctx->prefix);
+        buffer_path_simplify (plugin_ctx->glusterfs_path, plugin_ctx->glusterfs_path);
+
+        ret = glusterfs_stat_cache_get_entry_async (srv, con, p, plugin_ctx->glusterfs_path, con->physical.path, plugin_ctx->buf, size, &sce);
+
+        if (ret == HANDLER_ERROR) {
+                free (plugin_ctx->buf);
+                plugin_ctx->buf = NULL;
+
+                buffer_free (plugin_ctx->glusterfs_path);
+                plugin_ctx->glusterfs_path = NULL;
+
+                free (plugin_ctx);
+                con->plugin_ctx[p->id] = NULL;
+
+                con->http_status = 500;
+                ret = HANDLER_FINISHED;
+        }
+
+        return ret;
+}
+
+URIHANDLER_FUNC(mod_glusterfs_subrequest) {
+        plugin_data *p = p_d;
+        stat_cache_entry *sce = NULL;
+        int s_len;
+        unsigned long fd;
+        char allow_caching = 1;
+        size_t size = 0;
+        mod_glusterfs_ctx_t *ctx = con->plugin_ctx[p->id];
+
+        /* someone else has done a decision for us */
+        if (con->http_status != 0) return HANDLER_GO_ON;
+        if (con->uri.path->used == 0) return HANDLER_GO_ON;
+        if (con->physical.path->used == 0) return HANDLER_GO_ON;
+  
+        /* someone else has handled this request */
+        if (con->mode != DIRECT) return HANDLER_GO_ON;
+  
+        /* we only handle GET, POST and HEAD */
+        switch(con->request.http_method) {
+        case HTTP_METHOD_GET:
+        case HTTP_METHOD_POST:
+        case HTTP_METHOD_HEAD:
+                break;
+        default:
+                return HANDLER_GO_ON;
+        }
+  
+        mod_glusterfs_patch_connection(srv, con, p);
+  
+        if (!p->conf.prefix || !p->conf.prefix->ptr)
+                return HANDLER_GO_ON;
+
+        if (!ctx) {
+                con->http_status = 500;
+                return HANDLER_FINISHED;
+        }
+
+        s_len = con->uri.path->used - 1;
+        /* ignore certain extensions */
+        /*
+          for (k = 0; k < p->conf.exclude_exts->used; k++) {
+          data_string *ds;
+          ds = (data_string *)p->conf.exclude_exts->data[k];
+          
+          if (ds->value->used == 0) continue;
+    
+          if (!strncmp (ds->value->ptr, con->uri.path->ptr, strlen (ds->value->ptr)))
+          break;
+          }
+  
+          if (k == p->conf.exclude_exts->used) {
+          return HANDLER_GO_ON;
+          }
+        */
+
+        if (con->conf.log_request_handling) {
+                log_error_write(srv, __FILE__, __LINE__,  "s",  "-- serving file from glusterfs");
+        }
+
+        if (HANDLER_ERROR == stat_cache_get_entry(srv, con, con->physical.path, &sce)) {
+                con->http_status = 403;
+
+                /* this might happen if the sce is removed from stat-cache after a successful glusterfs_lookup */
+                if (ctx) {
+                        if (ctx->buf) {
+                                free (ctx->buf);
+                                ctx->buf = NULL;
+                        }
+
+                        if (ctx->glusterfs_path) {
+                                buffer_free (ctx->glusterfs_path);
+                                ctx->glusterfs_path = NULL;
+                        }               
+                        free (ctx);
+                        con->plugin_ctx[p->id] = NULL;
+                }
+
+                log_error_write(srv, __FILE__, __LINE__, "sbsb",
+                                "not a regular file:", con->uri.path,
+                                "->", con->physical.path);
+    
+                return HANDLER_FINISHED;
+        }
+
+        if (con->uri.path->ptr[s_len] == '/' || !S_ISREG(sce->st.st_mode)) {
+                if (ctx) {
+                        if (ctx->glusterfs_path) {
+                                buffer_free (ctx->glusterfs_path);
+                                ctx->glusterfs_path = NULL;
+                        }
+
+                        free (ctx);
+                        con->plugin_ctx[p->id] = NULL;
+                }
+
+                return HANDLER_FINISHED;
+        }
+
+        if (p->conf.xattr_file_size && p->conf.xattr_file_size->ptr)
+                size = atoi (p->conf.xattr_file_size->ptr);
+
+        if ((size_t)sce->st.st_size > size) {
+    
+                fd = glusterfs_open ((libglusterfs_handle_t ) ((unsigned long)p->conf.handle), ctx->glusterfs_path->ptr, O_RDONLY, 0);
+    
+                if (!fd) {
+                        if (ctx) {
+                                if (ctx->glusterfs_path) {
+                                        buffer_free (ctx->glusterfs_path);
+                                        ctx->glusterfs_path = NULL;
+                                }
+
+                                free (ctx);
+                                con->plugin_ctx[p->id] = NULL;
+                        }
+
+                        con->http_status = 403;
+                        return HANDLER_FINISHED;
+                }
+                ctx->fd = fd;
+        }
+
+        /* we only handline regular files */
+#ifdef HAVE_LSTAT
+        if ((sce->is_symlink == 1) && !con->conf.follow_symlink) {
+                con->http_status = 403;
+          
+                if (con->conf.log_request_handling) {
+                        log_error_write(srv, __FILE__, __LINE__,  "s",  "-- access denied due symlink restriction");
+                        log_error_write(srv, __FILE__, __LINE__,  "sb", "Path         :", con->physical.path);
+                }
+    
+                buffer_reset(con->physical.path);
+                if (ctx) {
+                        if (ctx->glusterfs_path) {
+                                buffer_free (ctx->glusterfs_path);
+                                ctx->glusterfs_path = NULL;
+                        }
+
+                        free (ctx);
+                        con->plugin_ctx[p->id] = NULL;
+                }
+
+                return HANDLER_FINISHED;
+        }
+#endif
+        if (!S_ISREG(sce->st.st_mode)) {
+                con->http_status = 404;
+    
+                if (con->conf.log_file_not_found) {
+                        log_error_write(srv, __FILE__, __LINE__, "sbsb",
+                                        "not a regular file:", con->uri.path,
+                                        "->", sce->name);
+                }
+    
+                if (ctx) {
+                        if (ctx->glusterfs_path) {
+                                buffer_free (ctx->glusterfs_path);
+                                ctx->glusterfs_path = NULL;
+                        }
+
+                        free (ctx);
+                        con->plugin_ctx[p->id] = NULL;
+                }
+
+                return HANDLER_FINISHED;
+        }
+
+        /* mod_compress might set several data directly, don't overwrite them */
+
+        /* set response content-type, if not set already */
+  
+        if (NULL == array_get_element(con->response.headers, CONST_STR_LEN("Content-Type"))) {
+                if (buffer_is_empty(sce->content_type)) {
+                        /* we are setting application/octet-stream, but also announce that
+                         * this header field might change in the seconds few requests 
+                         *
+                         * This should fix the aggressive caching of FF and the script download
+                         * seen by the first installations
+                         */
+                        response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("application/octet-stream"));
+      
+                        allow_caching = 0;
+                } else {
+                        response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type));
+                }
+        }
+  
+        if (con->conf.range_requests) {
+                response_header_overwrite(srv, con, CONST_STR_LEN("Accept-Ranges"), CONST_STR_LEN("bytes"));
+        }
+
+        /* TODO: Allow Cachable requests */     
+#if 0
+        if (allow_caching) {
+                if (p->conf.etags_used && con->etag_flags != 0 && !buffer_is_empty(sce->etag)) {
+                        if (NULL == array_get_element(con->response.headers, "ETag")) {
+                                /* generate e-tag */
+                                etag_mutate(con->physical.etag, sce->etag);
+        
+                                response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
+                        }
+                }
+    
+                /* prepare header */
+                if (NULL == (ds = (data_string *)array_get_element(con->response.headers, "Last-Modified"))) {
+                        mtime = strftime_cache_get(srv, sce->st.st_mtime);
+                        response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
+                } else {
+                        mtime = ds->value;
+                }
+    
+                if (HANDLER_FINISHED == http_response_handle_cachable(srv, con, mtime)) {
+                        if (ctx) {
+                                if (ctx->glusterfs_path) {
+                                        buffer_free (ctx->glusterfs_path);
+                                        ctx->glusterfs_path = NULL;
+                                }
+
+                                free (ctx);
+                                con->plugin_ctx[p->id] = NULL;
+                        }
+
+                        return HANDLER_FINISHED;
+                }
+        }
+#endif 
+  
+        /*TODO: Read about etags */
+        if (NULL != array_get_element(con->request.headers, CONST_STR_LEN("Range")) && con->conf.range_requests) {
+                int do_range_request = 1;
+                data_string *ds = NULL;
+                buffer *mtime = NULL;
+                /* check if we have a conditional GET */
+    
+                /* prepare header */
+                if (NULL == (ds = (data_string *)array_get_element(con->response.headers, CONST_STR_LEN("Last-Modified")))) {
+                        mtime = strftime_cache_get(srv, sce->st.st_mtime);
+                        response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
+                } else {
+                        mtime = ds->value;
+                }
+
+                if (NULL != (ds = (data_string *)array_get_element(con->request.headers, CONST_STR_LEN("If-Range")))) {
+                        /* if the value is the same as our ETag, we do a Range-request,
+                         * otherwise a full 200 */
+            
+                        if (ds->value->ptr[0] == '"') {
+                                /**
+                                 * client wants a ETag
+                                 */
+                                if (!con->physical.etag) {
+                                        do_range_request = 0;
+                                } else if (!buffer_is_equal(ds->value, con->physical.etag)) {
+                                        do_range_request = 0;
+                                }
+                        } else if (!mtime) {
+                                /**
+                                 * we don't have a Last-Modified and can match the If-Range: 
+                                 *
+                                 * sending all
+                                 */
+                                do_range_request = 0;
+                        } else if (!buffer_is_equal(ds->value, mtime)) {
+                                do_range_request = 0;
+                        }
+                }
+    
+                if (do_range_request) {
+                        /* content prepared, I'm done */
+                        con->send->is_closed = 1; 
+            
+                        if (0 == http_response_parse_range(srv, con, p)) {
+                                con->http_status = 206;
+                        }
+                        if (ctx) {
+                                if (ctx->glusterfs_path) {
+                                        buffer_free (ctx->glusterfs_path);
+                                        ctx->glusterfs_path = NULL;
+                                }
+                                free (ctx);
+                                con->plugin_ctx[p->id] = NULL;
+                        }
+
+                        return HANDLER_FINISHED;
+                }
+        }
+  
+        /* if we are still here, prepare body */
+
+        /* we add it here for all requests
+         * the HEAD request will drop it afterwards again
+         */
+
+        if (p->conf.xattr_file_size && p->conf.xattr_file_size->ptr)
+                size = atoi (p->conf.xattr_file_size->ptr);
+
+        if (size < (size_t)sce->st.st_size) {
+                chunkqueue_append_glusterfs_file (con->send_raw, fd, 0, sce->st.st_size);
+                con->send_raw->bytes_in += sce->st.st_size;
+                chunkqueue_append_dummy_mem_chunk (con->send, sce->st.st_size);
+        } else {
+                if (!ctx->buf) {
+                        con->http_status = 404;
+                        return HANDLER_ERROR;
+                }
+                chunkqueue_append_glusterfs_mem (con->send, ctx->buf, sce->st.st_size);
+                ctx->buf = NULL;
+        }
+        ctx->response_content_length = con->response.content_length = sce->st.st_size;
+  
+        con->send->is_closed = 1;
+        con->send->bytes_in = sce->st.st_size;
+
+        return HANDLER_FINISHED;
+}
+
+/* this function is called at dlopen() time and inits the callbacks */
+CONNECTION_FUNC(mod_glusterfs_connection_reset) 
+{
+        (void) p_d;
+        (void) con;
+        if (!network_backend_write)
+                network_backend_write = srv->network_backend_write;
+
+        srv->network_backend_write = mod_glusterfs_network_backend_write;
+
+        return HANDLER_GO_ON;
+}
+
+URIHANDLER_FUNC(mod_glusterfs_response_done) {
+        plugin_data *p = p_d;
+        UNUSED (srv);
+        mod_glusterfs_ctx_t *ctx = con->plugin_ctx[p->id];
+        
+        con->plugin_ctx[p->id] = NULL;
+        if (ctx->glusterfs_path) {
+                free (ctx->glusterfs_path);
+        }
+
+        free (ctx);
+        return HANDLER_GO_ON;
+}
+
+int mod_glusterfs_plugin_init(plugin *p) {
+        p->version     = LIGHTTPD_VERSION_ID;
+        p->name        = buffer_init_string("glusterfs");
+        p->init        = mod_glusterfs_init;
+        p->handle_physical = mod_glusterfs_handle_physical;
+        p->handle_start_backend = mod_glusterfs_subrequest;
+        p->handle_response_done = mod_glusterfs_response_done;
+        p->set_defaults  = mod_glusterfs_set_defaults;
+        p->connection_reset = mod_glusterfs_connection_reset;
+        p->cleanup     = mod_glusterfs_free;
+  
+        p->data        = NULL;
+  
+        return 0;
+}
diff --git a/mod_glusterfs/lighttpd/1.5/mod_glusterfs.h b/mod_glusterfs/lighttpd/1.5/mod_glusterfs.h
new file mode 100644
index 000000000..5f9bb2c5b
--- /dev/null
+++ b/mod_glusterfs/lighttpd/1.5/mod_glusterfs.h
@@ -0,0 +1,29 @@
+/*
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _MOD_GLUSTERFS_FILE_CACHE_H_
+#define _MOD_GLUSTERFS_FILE_CACHE_H_
+
+#include "stat_cache.h"
+#include <libglusterfsclient.h>
+#include "base.h"
+
+handler_t glusterfs_stat_cache_get_entry(server *srv, connection *con, libglusterfs_handle_t handle, buffer *glusterfs_path, buffer *name, void *buf, size_t size, stat_cache_entry **fce);
+
+#endif
diff --git a/mod_glusterfs/lighttpd/Makefile.am b/mod_glusterfs/lighttpd/Makefile.am
new file mode 100644
index 000000000..c934412b3
--- /dev/null
+++ b/mod_glusterfs/lighttpd/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = 1.4 1.5
+
+CLEANFILES = 
diff --git a/rfc.sh b/rfc.sh
index 04efa6f3e..274d9d137 100755
--- a/rfc.sh
+++ b/rfc.sh
@@ -1,10 +1,10 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 
-branch="master";
+branch="release-3.2";
 
 
-set_hooks_commit_msg()
+function set_hooks_commit_msg()
 {
     f=".git/hooks/commit-msg";
     u="http://review.gluster.com/tools/hooks/commit-msg";
@@ -16,13 +16,10 @@ set_hooks_commit_msg()
     curl -o $f $u || wget -O $f $u;
 
     chmod +x .git/hooks/commit-msg;
-
-    # Let the 'Change-Id: ' header get assigned on first run of rfc.sh
-    GIT_EDITOR=true git commit --amend;
 }
 
 
-is_num()
+function is_num()
 {
     local num;
 
@@ -32,18 +29,18 @@ is_num()
 }
 
 
-rebase_changes()
+function rebase_changes()
 {
-    git fetch origin;
+    git fetch --all;
 
     GIT_EDITOR=$0 git rebase -i origin/$branch;
 }
 
 
-editor_mode()
+function editor_mode()
 {
     if [ $(basename "$1") = "git-rebase-todo" ]; then
-        sed 's/^pick /reword /g' "$1" > $1.new && mv $1.new $1;
+        sed -i 's/^pick /reword /g' "$1";
         return;
     fi
 
@@ -63,8 +60,7 @@ editor_mode()
                 continue;
             fi
 
-            sed "/^Change-Id:/{p; s/^.*$/BUG: $bug/;}" $1 > $1.new && \
-                mv $1.new $1;
+            sed -i "s/^\(Change-Id: .*\)$/\1\nBUG: $bug/g" $1;
             return;
         done
     fi
@@ -77,37 +73,31 @@ EOF
 }
 
 
-assert_diverge()
+function assert_diverge()
 {
     git diff origin/$branch..HEAD | grep -q .;
 }
 
 
-main()
+function main()
 {
-    set_hooks_commit_msg;
-
     if [ -e "$1" ]; then
         editor_mode "$@";
         return;
     fi
 
+    set_hooks_commit_msg;
+
     rebase_changes;
 
     assert_diverge;
 
     bug=$(git show --format='%b' | grep -i '^BUG: ' | awk '{print $2}');
 
-    if [ "$DRY_RUN" = 1 ]; then
-        drier='echo -e Please use the following command to send your commits to review:\n\n'
-    else
-        drier=
-    fi
-
     if [ -z "$bug" ]; then
-        $drier git push origin HEAD:refs/for/$branch/rfc;
+        git push origin HEAD:refs/for/$branch/rfc;
     else
-        $drier git push origin HEAD:refs/for/$branch/bug-$bug;
+        git push origin HEAD:refs/for/$branch/bug-$bug;
     fi
 }
 
diff --git a/rpc/rpc-lib/src/Makefile.am b/rpc/rpc-lib/src/Makefile.am
index f19c3c8a4..fcf091e9b 100644
--- a/rpc/rpc-lib/src/Makefile.am
+++ b/rpc/rpc-lib/src/Makefile.am
@@ -2,18 +2,15 @@ lib_LTLIBRARIES = libgfrpc.la
 
 libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
 	rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \
-	rpc-drc.c
-
+	rpc-common.c
 libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \
-	rpc-clnt.h rpcsvc-common.h protocol-common.h rpc-drc.h
+	rpc-clnt.h rpcsvc-common.h protocol-common.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
 	-I$(top_srcdir)/rpc/xdr/src \
-	-DRPC_TRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport\" \
-	-I$(top_srcdir)/contrib/rbtree
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
+	-DRPC_TRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport\"
 
 CLEANFILES = *~
diff --git a/rpc/rpc-lib/src/auth-glusterfs.c b/rpc/rpc-lib/src/auth-glusterfs.c
index db488434c..4faaddb9e 100644
--- a/rpc/rpc-lib/src/auth-glusterfs.c
+++ b/rpc/rpc-lib/src/auth-glusterfs.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -20,9 +29,94 @@
 #include "dict.h"
 #include "xdr-rpc.h"
 #include "xdr-common.h"
-#include "rpc-common-xdr.h"
 
-/* V1 */
+bool_t
+xdr_auth_glusterfs_parms (XDR *xdrs, auth_glusterfs_parms *objp)
+{
+	register int32_t *buf;
+
+	int i;
+
+	if (xdrs->x_op == XDR_ENCODE) {
+		 if (!xdr_u_quad_t (xdrs, &objp->lk_owner))
+			 return FALSE;
+		buf = XDR_INLINE (xdrs, (4 +  16 )* BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_u_int (xdrs, &objp->pid))
+				 return FALSE;
+			 if (!xdr_u_int (xdrs, &objp->uid))
+				 return FALSE;
+			 if (!xdr_u_int (xdrs, &objp->gid))
+				 return FALSE;
+			 if (!xdr_u_int (xdrs, &objp->ngrps))
+				 return FALSE;
+			 if (!xdr_vector (xdrs, (char *)objp->groups, 16,
+				sizeof (u_int), (xdrproc_t) xdr_u_int))
+				 return FALSE;
+		} else {
+			IXDR_PUT_U_LONG(buf, objp->pid);
+			IXDR_PUT_U_LONG(buf, objp->uid);
+			IXDR_PUT_U_LONG(buf, objp->gid);
+			IXDR_PUT_U_LONG(buf, objp->ngrps);
+			{
+				register u_int *genp;
+
+				for (i = 0, genp = objp->groups;
+					i < 16; ++i) {
+					IXDR_PUT_U_LONG(buf, *genp++);
+				}
+			}
+		}
+		return TRUE;
+	} else if (xdrs->x_op == XDR_DECODE) {
+		 if (!xdr_u_quad_t (xdrs, &objp->lk_owner))
+			 return FALSE;
+		buf = XDR_INLINE (xdrs, (4 +  16 )* BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_u_int (xdrs, &objp->pid))
+				 return FALSE;
+			 if (!xdr_u_int (xdrs, &objp->uid))
+				 return FALSE;
+			 if (!xdr_u_int (xdrs, &objp->gid))
+				 return FALSE;
+			 if (!xdr_u_int (xdrs, &objp->ngrps))
+				 return FALSE;
+			 if (!xdr_vector (xdrs, (char *)objp->groups, 16,
+				sizeof (u_int), (xdrproc_t) xdr_u_int))
+				 return FALSE;
+		} else {
+			objp->pid = IXDR_GET_U_LONG(buf);
+			objp->uid = IXDR_GET_U_LONG(buf);
+			objp->gid = IXDR_GET_U_LONG(buf);
+			objp->ngrps = IXDR_GET_U_LONG(buf);
+			{
+				register u_int *genp;
+
+				for (i = 0, genp = objp->groups;
+					i < 16; ++i) {
+					*genp++ = IXDR_GET_U_LONG(buf);
+				}
+			}
+		}
+	 return TRUE;
+	}
+
+	 if (!xdr_u_quad_t (xdrs, &objp->lk_owner))
+		 return FALSE;
+	 if (!xdr_u_int (xdrs, &objp->pid))
+		 return FALSE;
+	 if (!xdr_u_int (xdrs, &objp->uid))
+		 return FALSE;
+	 if (!xdr_u_int (xdrs, &objp->gid))
+		 return FALSE;
+	 if (!xdr_u_int (xdrs, &objp->ngrps))
+		 return FALSE;
+	 if (!xdr_vector (xdrs, (char *)objp->groups, 16,
+		sizeof (u_int), (xdrproc_t) xdr_u_int))
+		 return FALSE;
+	return TRUE;
+}
+
 
 ssize_t
 xdr_to_glusterfs_auth (char *buf, struct auth_glusterfs_parms *req)
@@ -52,7 +146,7 @@ auth_glusterfs_request_init (rpcsvc_request_t *req, void *priv)
 {
         if (!req)
                 return -1;
-        memset (req->verf.authdata, 0, GF_MAX_AUTH_BYTES);
+        memset (req->verf.authdata, 0, RPCSVC_MAX_AUTH_BYTES);
         req->verf.datalen = 0;
         req->verf.flavour = AUTH_NULL;
 
@@ -61,12 +155,9 @@ auth_glusterfs_request_init (rpcsvc_request_t *req, void *priv)
 
 int auth_glusterfs_authenticate (rpcsvc_request_t *req, void *priv)
 {
+        int                          ret = RPCSVC_AUTH_REJECT;
         struct auth_glusterfs_parms  au = {0,};
-
-        int ret      = RPCSVC_AUTH_REJECT;
-        int j        = 0;
-        int i        = 0;
-        int gidcount = 0;
+        int                          gidcount = 0;
 
         if (!req)
                 return ret;
@@ -82,11 +173,7 @@ int auth_glusterfs_authenticate (rpcsvc_request_t *req, void *priv)
         req->pid = au.pid;
         req->uid = au.uid;
         req->gid = au.gid;
-        req->lk_owner.len = 8;
-        {
-                for (i = 0; i < req->lk_owner.len; i++, j += 8)
-                        req->lk_owner.data[i] = (char)((au.lk_owner >> j) & 0xff);
-        }
+        req->lk_owner = au.lk_owner;
         req->auxgidcount = au.ngrps;
 
         if (req->auxgidcount > 16) {
@@ -96,30 +183,12 @@ int auth_glusterfs_authenticate (rpcsvc_request_t *req, void *priv)
                 goto err;
         }
 
-	if (req->auxgidcount > SMALL_GROUP_COUNT) {
-		req->auxgidlarge = GF_CALLOC(req->auxgidcount,
-					     sizeof(req->auxgids[0]),
-					     gf_common_mt_auxgids);
-		req->auxgids = req->auxgidlarge;
-	} else {
-		req->auxgids = req->auxgidsmall;
-	}
-
-	if (!req->auxgids) {
-		gf_log ("auth-glusterfs", GF_LOG_WARNING,
-			"cannot allocate gid list");
-		ret = RPCSVC_AUTH_REJECT;
-		goto err;
-	}
-
         for (gidcount = 0; gidcount < au.ngrps; ++gidcount)
                 req->auxgids[gidcount] = au.groups[gidcount];
 
-        RPC_AUTH_ROOT_SQUASH(req);
-
         gf_log (GF_RPCSVC, GF_LOG_TRACE, "Auth Info: pid: %u, uid: %d"
-                ", gid: %d, owner: %s",
-                req->pid, req->uid, req->gid, lkowner_utoa (&req->lk_owner));
+                ", gid: %d, owner: %"PRId64,
+                req->pid, req->uid, req->gid, req->lk_owner);
         ret = RPCSVC_AUTH_ACCEPT;
 err:
         return ret;
@@ -144,133 +213,3 @@ rpcsvc_auth_glusterfs_init (rpcsvc_t *svc, dict_t *options)
 {
         return &rpcsvc_auth_glusterfs;
 }
-
-/* V2 */
-
-ssize_t
-xdr_to_glusterfs_auth_v2 (char *buf, struct auth_glusterfs_parms_v2 *req)
-{
-        XDR     xdr;
-        ssize_t ret = -1;
-
-        if ((!buf) || (!req))
-                return -1;
-
-        xdrmem_create (&xdr, buf, GF_MAX_AUTH_BYTES, XDR_DECODE);
-        if (!xdr_auth_glusterfs_parms_v2 (&xdr, req)) {
-                gf_log ("", GF_LOG_WARNING,
-                        "failed to decode glusterfs v2 parameters");
-                ret  = -1;
-                goto ret;
-        }
-
-        ret = (((size_t)(&xdr)->x_private) - ((size_t)(&xdr)->x_base));
-ret:
-        return ret;
-
-}
-int
-auth_glusterfs_v2_request_init (rpcsvc_request_t *req, void *priv)
-{
-        if (!req)
-                return -1;
-        memset (req->verf.authdata, 0, GF_MAX_AUTH_BYTES);
-        req->verf.datalen = 0;
-        req->verf.flavour = AUTH_NULL;
-
-        return 0;
-}
-
-int auth_glusterfs_v2_authenticate (rpcsvc_request_t *req, void *priv)
-{
-        struct auth_glusterfs_parms_v2  au = {0,};
-        int ret = RPCSVC_AUTH_REJECT;
-        int i   = 0;
-
-        if (!req)
-                return ret;
-
-        ret = xdr_to_glusterfs_auth_v2 (req->cred.authdata, &au);
-        if (ret == -1) {
-                gf_log ("", GF_LOG_WARNING,
-                        "failed to decode glusterfs credentials");
-                ret = RPCSVC_AUTH_REJECT;
-                goto err;
-        }
-
-        req->pid = au.pid;
-        req->uid = au.uid;
-        req->gid = au.gid;
-        req->lk_owner.len = au.lk_owner.lk_owner_len;
-        req->auxgidcount = au.groups.groups_len;
-
-        if (req->auxgidcount > GF_MAX_AUX_GROUPS) {
-                gf_log ("", GF_LOG_WARNING,
-                        "more than max aux gids found (%d) , truncating it "
-                        "to %d and continuing", au.groups.groups_len,
-                        GF_MAX_AUX_GROUPS);
-                req->auxgidcount = GF_MAX_AUX_GROUPS;
-        }
-
-        if (req->lk_owner.len > GF_MAX_LOCK_OWNER_LEN) {
-                gf_log ("", GF_LOG_WARNING,
-                        "lkowner field > 1k, failing authentication");
-                ret = RPCSVC_AUTH_REJECT;
-                goto err;
-        }
-
-	if (req->auxgidcount > SMALL_GROUP_COUNT) {
-		req->auxgidlarge = GF_CALLOC(req->auxgidcount,
-					     sizeof(req->auxgids[0]),
-					     gf_common_mt_auxgids);
-		req->auxgids = req->auxgidlarge;
-	} else {
-		req->auxgids = req->auxgidsmall;
-	}
-
-	if (!req->auxgids) {
-		gf_log ("auth-glusterfs-v2", GF_LOG_WARNING,
-			"cannot allocate gid list");
-		ret = RPCSVC_AUTH_REJECT;
-		goto err;
-	}
-
-        for (i = 0; i < req->auxgidcount; ++i)
-                req->auxgids[i] = au.groups.groups_val[i];
-
-        for (i = 0; i < au.lk_owner.lk_owner_len; ++i)
-                req->lk_owner.data[i] = au.lk_owner.lk_owner_val[i];
-
-        RPC_AUTH_ROOT_SQUASH(req);
-
-        gf_log (GF_RPCSVC, GF_LOG_TRACE, "Auth Info: pid: %u, uid: %d"
-                ", gid: %d, owner: %s",
-                req->pid, req->uid, req->gid, lkowner_utoa (&req->lk_owner));
-        ret = RPCSVC_AUTH_ACCEPT;
-err:
-        /* TODO: instead use alloca() for these variables */
-        free (au.groups.groups_val);
-        free (au.lk_owner.lk_owner_val);
-
-        return ret;
-}
-
-rpcsvc_auth_ops_t auth_glusterfs_ops_v2 = {
-        .transport_init         = NULL,
-        .request_init           = auth_glusterfs_v2_request_init,
-        .authenticate           = auth_glusterfs_v2_authenticate
-};
-
-rpcsvc_auth_t rpcsvc_auth_glusterfs_v2 = {
-        .authname       = "AUTH_GLUSTERFS-v2",
-        .authnum        = AUTH_GLUSTERFS_v2,
-        .authops        = &auth_glusterfs_ops_v2,
-        .authprivate    = NULL
-};
-
-
-rpcsvc_auth_t *
-rpcsvc_auth_glusterfs_v2_init (rpcsvc_t *svc, dict_t *options)
-{
-        return &rpcsvc_auth_glusterfs_v2;
-}
diff --git a/rpc/rpc-lib/src/auth-null.c b/rpc/rpc-lib/src/auth-null.c
index ebdcc8ff8..ee50ab669 100644
--- a/rpc/rpc-lib/src/auth-null.c
+++ b/rpc/rpc-lib/src/auth-null.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -25,10 +34,10 @@ auth_null_request_init (rpcsvc_request_t *req, void *priv)
         if (!req)
                 return -1;
 
-        memset (req->cred.authdata, 0, GF_MAX_AUTH_BYTES);
+        memset (req->cred.authdata, 0, RPCSVC_MAX_AUTH_BYTES);
         req->cred.datalen = 0;
 
-        memset (req->verf.authdata, 0, GF_MAX_AUTH_BYTES);
+        memset (req->verf.authdata, 0, RPCSVC_MAX_AUTH_BYTES);
         req->verf.datalen = 0;
 
         return 0;
diff --git a/rpc/rpc-lib/src/auth-unix.c b/rpc/rpc-lib/src/auth-unix.c
index fa5f0576e..c48743db9 100644
--- a/rpc/rpc-lib/src/auth-unix.c
+++ b/rpc/rpc-lib/src/auth-unix.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -26,7 +35,7 @@ auth_unix_request_init (rpcsvc_request_t *req, void *priv)
 {
         if (!req)
                 return -1;
-        memset (req->verf.authdata, 0, GF_MAX_AUTH_BYTES);
+        memset (req->verf.authdata, 0, RPCSVC_MAX_AUTH_BYTES);
         req->verf.datalen = 0;
         req->verf.flavour = AUTH_NULL;
 
@@ -42,7 +51,6 @@ int auth_unix_authenticate (rpcsvc_request_t *req, void *priv)
         if (!req)
                 return ret;
 
-	req->auxgids = req->auxgidsmall;
         ret = xdr_to_auth_unix_cred (req->cred.authdata, req->cred.datalen,
                                      &aup, machname, req->auxgids);
         if (ret == -1) {
diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index 4bca0f558..bb8088b1e 100644
--- a/rpc/rpc-lib/src/protocol-common.h
+++ b/rpc/rpc-lib/src/protocol-common.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _PROTOCOL_COMMON_H
@@ -55,10 +64,6 @@ enum gf_fop_procnum {
         GFS3_OP_READDIRP,
         GFS3_OP_RELEASE,
         GFS3_OP_RELEASEDIR,
-        GFS3_OP_FREMOVEXATTR,
-	GFS3_OP_FALLOCATE,
-	GFS3_OP_DISCARD,
-        GFS3_OP_ZEROFILL,
         GFS3_OP_MAXVALUE,
 } ;
 
@@ -67,11 +72,47 @@ enum gf_handshake_procnum {
         GF_HNDSK_SETVOLUME,
         GF_HNDSK_GETSPEC,
         GF_HNDSK_PING,
-        GF_HNDSK_SET_LK_VER,
-        GF_HNDSK_EVENT_NOTIFY,
         GF_HNDSK_MAXVALUE,
 };
 
+enum gf_mgmt_procnum_ {
+        GD_MGMT_NULL,    /* 0 */
+        GD_MGMT_PROBE_QUERY,
+        GD_MGMT_FRIEND_ADD,
+        GD_MGMT_CLUSTER_LOCK,
+        GD_MGMT_CLUSTER_UNLOCK,
+        GD_MGMT_STAGE_OP,
+        GD_MGMT_COMMIT_OP,
+        GD_MGMT_FRIEND_REMOVE,
+        GD_MGMT_FRIEND_UPDATE,
+        GD_MGMT_CLI_PROBE,
+        GD_MGMT_CLI_DEPROBE,
+        GD_MGMT_CLI_LIST_FRIENDS,
+        GD_MGMT_CLI_CREATE_VOLUME,
+        GD_MGMT_CLI_GET_VOLUME,
+        GD_MGMT_CLI_DELETE_VOLUME,
+        GD_MGMT_CLI_START_VOLUME,
+        GD_MGMT_CLI_STOP_VOLUME,
+        GD_MGMT_CLI_RENAME_VOLUME,
+        GD_MGMT_CLI_DEFRAG_VOLUME,
+        GD_MGMT_CLI_SET_VOLUME,
+        GD_MGMT_CLI_ADD_BRICK,
+        GD_MGMT_CLI_REMOVE_BRICK,
+        GD_MGMT_CLI_REPLACE_BRICK,
+        GD_MGMT_CLI_LOG_FILENAME,
+        GD_MGMT_CLI_LOG_LOCATE,
+        GD_MGMT_CLI_LOG_ROTATE,
+        GD_MGMT_CLI_SYNC_VOLUME,
+        GD_MGMT_CLI_RESET_VOLUME,
+        GD_MGMT_CLI_FSM_LOG,
+        GD_MGMT_CLI_GSYNC_SET,
+        GD_MGMT_CLI_PROFILE_VOLUME,
+        GD_MGMT_BRICK_OP,
+        GD_MGMT_MAXVALUE,
+};
+
+typedef enum gf_mgmt_procnum_ gf_mgmt_procnum;
+
 enum gf_pmap_procnum {
         GF_PMAP_NULL = 0,
         GF_PMAP_PORTBYBRICK,
@@ -97,29 +138,37 @@ enum gf_probe_resp {
 	GF_PROBE_FRIEND,
         GF_PROBE_ANOTHER_CLUSTER,
         GF_PROBE_VOLUME_CONFLICT,
-        GF_PROBE_SAME_UUID,
         GF_PROBE_UNKNOWN_PEER,
-        GF_PROBE_ADD_FAILED,
-        GF_PROBE_QUORUM_NOT_MET
+        GF_PROBE_ADD_FAILED
 };
 
 enum gf_deprobe_resp {
         GF_DEPROBE_SUCCESS,
         GF_DEPROBE_LOCALHOST,
         GF_DEPROBE_NOT_FRIEND,
-        GF_DEPROBE_BRICK_EXIST,
-        GF_DEPROBE_FRIEND_DOWN,
-        GF_DEPROBE_QUORUM_NOT_MET,
+        GF_DEPROBE_BRICK_EXIST
 };
 
 enum gf_cbk_procnum {
         GF_CBK_NULL = 0,
         GF_CBK_FETCHSPEC,
         GF_CBK_INO_FLUSH,
-        GF_CBK_EVENT_NOTIFY,
         GF_CBK_MAXVALUE,
 };
 
+enum glusterd_mgmt_procnum {
+        GLUSTERD_MGMT_NULL,    /* 0 */
+        GLUSTERD_MGMT_PROBE_QUERY,
+        GLUSTERD_MGMT_FRIEND_ADD,
+        GLUSTERD_MGMT_CLUSTER_LOCK,
+        GLUSTERD_MGMT_CLUSTER_UNLOCK,
+        GLUSTERD_MGMT_STAGE_OP,
+        GLUSTERD_MGMT_COMMIT_OP,
+        GLUSTERD_MGMT_FRIEND_REMOVE,
+        GLUSTERD_MGMT_FRIEND_UPDATE,
+        GLUSTERD_MGMT_MAXVALUE,
+};
+
 enum gluster_cli_procnum {
         GLUSTER_CLI_NULL,    /* 0 */
         GLUSTER_CLI_PROBE,
@@ -137,6 +186,8 @@ enum gluster_cli_procnum {
         GLUSTER_CLI_ADD_BRICK,
         GLUSTER_CLI_REMOVE_BRICK,
         GLUSTER_CLI_REPLACE_BRICK,
+        GLUSTER_CLI_LOG_FILENAME,
+        GLUSTER_CLI_LOG_LOCATE,
         GLUSTER_CLI_LOG_ROTATE,
         GLUSTER_CLI_GETSPEC,
         GLUSTER_CLI_PMAP_PORTBYBRICK,
@@ -148,74 +199,35 @@ enum gluster_cli_procnum {
         GLUSTER_CLI_QUOTA,
         GLUSTER_CLI_TOP_VOLUME,
         GLUSTER_CLI_GETWD,
-        GLUSTER_CLI_STATUS_VOLUME,
-        GLUSTER_CLI_STATUS_ALL,
-        GLUSTER_CLI_MOUNT,
-        GLUSTER_CLI_UMOUNT,
-        GLUSTER_CLI_HEAL_VOLUME,
-        GLUSTER_CLI_STATEDUMP_VOLUME,
-        GLUSTER_CLI_LIST_VOLUME,
-        GLUSTER_CLI_CLRLOCKS_VOLUME,
-        GLUSTER_CLI_UUID_RESET,
-        GLUSTER_CLI_UUID_GET,
-        GLUSTER_CLI_COPY_FILE,
-        GLUSTER_CLI_SYS_EXEC,
         GLUSTER_CLI_MAXVALUE,
 };
 
-enum glusterd_mgmt_procnum {
-        GLUSTERD_MGMT_NULL,    /* 0 */
-        GLUSTERD_MGMT_CLUSTER_LOCK,
-        GLUSTERD_MGMT_CLUSTER_UNLOCK,
-        GLUSTERD_MGMT_STAGE_OP,
-        GLUSTERD_MGMT_COMMIT_OP,
-        GLUSTERD_MGMT_MAXVALUE,
+enum gf_brick_procnum {
+        GF_BRICK_NULL = 0,
+        GF_BRICK_TERMINATE = 1,
+        GF_BRICK_XLATOR_INFO = 2,
+        GF_BRICK_MAX_VALUE
 };
 
-enum glusterd_friend_procnum {
-        GLUSTERD_FRIEND_NULL,    /* 0 */
-        GLUSTERD_PROBE_QUERY,
-        GLUSTERD_FRIEND_ADD,
-        GLUSTERD_FRIEND_REMOVE,
-        GLUSTERD_FRIEND_UPDATE,
-        GLUSTERD_FRIEND_MAXVALUE,
-};
 
-enum glusterd_brick_procnum {
-        GLUSTERD_BRICK_NULL,    /* 0 */
-        GLUSTERD_BRICK_TERMINATE,
-        GLUSTERD_BRICK_XLATOR_INFO,
-        GLUSTERD_BRICK_XLATOR_OP,
-        GLUSTERD_BRICK_STATUS,
-        GLUSTERD_BRICK_OP,
-        GLUSTERD_BRICK_XLATOR_DEFRAG,
-        GLUSTERD_NODE_PROFILE,
-        GLUSTERD_NODE_STATUS,
-        GLUSTERD_BRICK_MAXVALUE,
-};
+#define GLUSTER3_1_FOP_PROGRAM   1298437 /* Completely random */
+#define GLUSTER3_1_FOP_VERSION   310 /* 3.1.0 */
+#define GLUSTER3_1_FOP_PROCCNT   GFS3_OP_MAXVALUE
 
-enum glusterd_mgmt_hndsk_procnum {
-        GD_MGMT_HNDSK_NULL,
-        GD_MGMT_HNDSK_VERSIONS,
-        GD_MGMT_HNDSK_VERSIONS_ACK,
-        GD_MGMT_HNDSK_MAXVALUE,
-};
+#define GLUSTERD1_MGMT_PROGRAM   1298433 /* Completely random */
+#define GLUSTERD1_MGMT_VERSION   1   /* 0.0.1 */
+#define GLUSTERD1_MGMT_PROCCNT   GD_MGMT_MAXVALUE
+
+#define GD_MGMT_PROGRAM          1238433 /* Completely random */
+#define GD_MGMT_VERSION          1   /* 0.0.1 */
+#define GD_MGMT_PROCCNT          GLUSTERD_MGMT_MAXVALUE
 
-typedef enum {
-        GF_AFR_OP_INVALID,
-        GF_AFR_OP_HEAL_INDEX,
-        GF_AFR_OP_HEAL_FULL,
-        GF_AFR_OP_INDEX_SUMMARY,
-        GF_AFR_OP_HEALED_FILES,
-        GF_AFR_OP_HEAL_FAILED_FILES,
-        GF_AFR_OP_SPLIT_BRAIN_FILES,
-        GF_AFR_OP_STATISTICS,
-        GF_AFR_OP_STATISTICS_HEAL_COUNT,
-        GF_AFR_OP_STATISTICS_HEAL_COUNT_PER_REPLICA,
-} gf_xl_afr_op_t ;
+#define GLUSTER_CLI_PROGRAM      1238463 /* Completely random */
+#define GLUSTER_CLI_VERSION      1   /* 0.0.1 */
+#define GLUSTER_CLI_PROCCNT      GLUSTER_CLI_MAXVALUE
 
 #define GLUSTER_HNDSK_PROGRAM    14398633 /* Completely random */
-#define GLUSTER_HNDSK_VERSION    2   /* 0.0.2 */
+#define GLUSTER_HNDSK_VERSION    1   /* 0.0.1 */
 
 #define GLUSTER_PMAP_PROGRAM     34123456
 #define GLUSTER_PMAP_VERSION     1
@@ -223,25 +235,10 @@ typedef enum {
 #define GLUSTER_CBK_PROGRAM      52743234 /* Completely random */
 #define GLUSTER_CBK_VERSION      1   /* 0.0.1 */
 
-#define GLUSTER_FOP_PROGRAM   1298437 /* Completely random */
-#define GLUSTER_FOP_VERSION   330 /* 3.3.0 */
-#define GLUSTER_FOP_PROCCNT   GFS3_OP_MAXVALUE
-
-/* Second version */
-#define GD_MGMT_PROGRAM          1238433 /* Completely random */
-#define GD_MGMT_VERSION          2   /* 0.0.2 */
-
-#define GD_FRIEND_PROGRAM        1238437 /* Completely random */
-#define GD_FRIEND_VERSION        2  /* 0.0.2 */
-
-#define GLUSTER_CLI_PROGRAM      1238463 /* Completely random */
-#define GLUSTER_CLI_VERSION      2   /* 0.0.2 */
-
-#define GD_BRICK_PROGRAM         4867634 /*Completely random*/
-#define GD_BRICK_VERSION         2
-
-/* OP-VERSION handshake */
-#define GD_MGMT_HNDSK_PROGRAM    1239873 /* Completely random */
-#define GD_MGMT_HNDSK_VERSION    1
+#define GLUSTER_HNDSK_PROGRAM    14398633 /* Completely random */
+#define GLUSTER_HNDSK_VERSION    1   /* 0.0.1 */
 
+#define GLUSTERFS_PROGRAM       4867634 /*Completely random*/
+#define GLUSTERFS_VERSION       1
+#define GLUSTERFS_PROCCNT       GF_BRICK_MAX_VALUE
 #endif /* !_PROTOCOL_COMMON_H */
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index ac98a5c91..a22d154db 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -14,7 +23,7 @@
 #include "config.h"
 #endif
 
-#define RPC_CLNT_DEFAULT_REQUEST_COUNT 512
+#define RPC_CLNT_DEFAULT_REQUEST_COUNT 4096
 
 #include "rpc-clnt.h"
 #include "byte-order.h"
@@ -23,7 +32,6 @@
 #include "protocol-common.h"
 #include "mem-pool.h"
 #include "xdr-rpc.h"
-#include "rpc-common-xdr.h"
 
 void
 rpc_clnt_reply_deinit (struct rpc_req *req, struct mem_pool *pool);
@@ -61,21 +69,6 @@ __saved_frames_get_timedout (struct saved_frames *frames, uint32_t timeout,
 	return bailout_frame;
 }
 
-static int
-_is_lock_fop (struct saved_frame *sframe)
-{
-        int     fop     = 0;
-
-        if (SFRAME_GET_PROGNUM (sframe) == GLUSTER_FOP_PROGRAM &&
-            SFRAME_GET_PROGVER (sframe) == GLUSTER_FOP_VERSION)
-                fop = SFRAME_GET_PROCNUM (sframe);
-
-        return ((fop == GFS3_OP_LK) ||
-                (fop == GFS3_OP_INODELK) ||
-                (fop == GFS3_OP_FINODELK) ||
-                (fop == GFS3_OP_ENTRYLK) ||
-                (fop == GFS3_OP_FENTRYLK));
-}
 
 struct saved_frame *
 __saved_frames_put (struct saved_frames *frames, void *frame,
@@ -97,11 +90,7 @@ __saved_frames_put (struct saved_frames *frames, void *frame,
         saved_frame->rpcreq       = rpcreq;
 	gettimeofday (&saved_frame->saved_at, NULL);
 
-        if (_is_lock_fop (saved_frame))
-                list_add_tail (&saved_frame->list, &frames->lk_sf.list);
-        else
-                list_add_tail (&saved_frame->list, &frames->sf.list);
-
+	list_add_tail (&saved_frame->list, &frames->sf.list);
 	frames->count++;
 
 out:
@@ -128,7 +117,7 @@ saved_frames_delete (struct saved_frame *saved_frame,
                                        conn->rpc_clnt->reqpool);
         }
 
-        mem_put (saved_frame);
+        mem_put (conn->rpc_clnt->saved_frames_pool, saved_frame);
 out:
         return;
 }
@@ -144,8 +133,9 @@ call_bail (void *data)
         struct saved_frame    *saved_frame = NULL;
         struct saved_frame    *trav = NULL;
         struct saved_frame    *tmp = NULL;
+        struct tm              frame_sent_tm;
         char                   frame_sent[256] = {0,};
-        struct timespec        timeout = {0,};
+        struct timeval         timeout = {0,};
         struct iovec           iov = {0,};
 
         GF_VALIDATE_OR_GOTO ("client", data, out);
@@ -163,7 +153,7 @@ call_bail (void *data)
                    call-once timer */
                 if (conn->timer) {
                         timeout.tv_sec = 10;
-                        timeout.tv_nsec = 0;
+                        timeout.tv_usec = 0;
 
                         gf_timer_call_cancel (clnt->ctx, conn->timer);
                         conn->timer = gf_timer_call_after (clnt->ctx,
@@ -173,8 +163,7 @@ call_bail (void *data)
 
                         if (conn->timer == NULL) {
                                 gf_log (conn->trans->name, GF_LOG_WARNING,
-                                        "Cannot create bailout timer for %s",
-                                        conn->trans->peerinfo.identifier);
+                                        "Cannot create bailout timer");
                         }
                 }
 
@@ -191,21 +180,21 @@ call_bail (void *data)
         pthread_mutex_unlock (&conn->lock);
 
         list_for_each_entry_safe (trav, tmp, &list, list) {
-                gf_time_fmt (frame_sent, sizeof frame_sent,
-                             trav->saved_at.tv_sec, gf_timefmt_FT);
+                localtime_r (&trav->saved_at.tv_sec, &frame_sent_tm);
+                strftime (frame_sent, 32, "%Y-%m-%d %H:%M:%S", &frame_sent_tm);
                 snprintf (frame_sent + strlen (frame_sent),
                           256 - strlen (frame_sent),
                           ".%"GF_PRI_SUSECONDS, trav->saved_at.tv_usec);
 
 		gf_log (conn->trans->name, GF_LOG_ERROR,
-			"bailing out frame type(%s) op(%s(%d)) xid = 0x%x "
-                        "sent = %s. timeout = %d for %s",
+			"bailing out frame type(%s) op(%s(%d)) xid = 0x%ux "
+                        "sent = %s. timeout = %d",
 			trav->rpcreq->prog->progname,
                         (trav->rpcreq->prog->procnames) ?
                         trav->rpcreq->prog->procnames[trav->rpcreq->procnum] :
                         "--",
                         trav->rpcreq->procnum, trav->rpcreq->xid, frame_sent,
-                        conn->frame_timeout, conn->trans->peerinfo.identifier);
+                        conn->frame_timeout);
 
                 clnt = rpc_clnt_ref (clnt);
                 trav->rpcreq->rpc_status = -1;
@@ -214,7 +203,7 @@ call_bail (void *data)
                 rpc_clnt_reply_deinit (trav->rpcreq, clnt->reqpool);
                 clnt = rpc_clnt_unref (clnt);
                 list_del_init (&trav->list);
-                mem_put (trav);
+                mem_put (conn->rpc_clnt->saved_frames_pool, trav);
         }
 out:
         return;
@@ -227,7 +216,7 @@ __save_frame (struct rpc_clnt *rpc_clnt, call_frame_t *frame,
               struct rpc_req *rpcreq)
 {
         rpc_clnt_connection_t *conn        = NULL;
-        struct timespec        timeout     = {0, };
+        struct timeval         timeout     = {0, };
         struct saved_frame    *saved_frame = NULL;
 
         conn = &rpc_clnt->conn;
@@ -241,7 +230,7 @@ __save_frame (struct rpc_clnt *rpc_clnt, call_frame_t *frame,
         /* TODO: make timeout configurable */
         if (conn->timer == NULL) {
                 timeout.tv_sec  = 10;
-                timeout.tv_nsec = 0;
+                timeout.tv_usec = 0;
                 conn->timer = gf_timer_call_after (rpc_clnt->ctx,
                                                    timeout,
                                                    call_bail,
@@ -265,7 +254,6 @@ saved_frames_new (void)
 	}
 
 	INIT_LIST_HEAD (&saved_frames->sf.list);
-	INIT_LIST_HEAD (&saved_frames->lk_sf.list);
 
 	return saved_frames;
 }
@@ -287,15 +275,7 @@ __saved_frame_copy (struct saved_frames *frames, int64_t callid,
 		if (tmp->rpcreq->xid == callid) {
 			*saved_frame = *tmp;
                         ret = 0;
-			goto out;
-		}
-	}
-
-	list_for_each_entry (tmp, &frames->lk_sf.list, list) {
-		if (tmp->rpcreq->xid == callid) {
-			*saved_frame = *tmp;
-                        ret = 0;
-			goto out;
+			break;
 		}
 	}
 
@@ -315,20 +295,10 @@ __saved_frame_get (struct saved_frames *frames, int64_t callid)
 			list_del_init (&tmp->list);
 			frames->count--;
 			saved_frame = tmp;
-			goto out;
+			break;
 		}
 	}
 
-	list_for_each_entry (tmp, &frames->lk_sf.list, list) {
-		if (tmp->rpcreq->xid == callid) {
-			list_del_init (&tmp->list);
-			frames->count--;
-			saved_frame = tmp;
-			goto out;
-		}
-	}
-
-out:
 	if (saved_frame) {
                 THIS  = saved_frame->capital_this;
         }
@@ -340,16 +310,19 @@ out:
 void
 saved_frames_unwind (struct saved_frames *saved_frames)
 {
+        struct rpc_clnt      *clnt = NULL;
 	struct saved_frame   *trav = NULL;
 	struct saved_frame   *tmp = NULL;
-        char                  timestr[1024] = {0,};
-        struct iovec          iov = {0,};
+        struct mem_pool      *saved_frames_pool = NULL;
+        struct tm            *frame_sent_tm = NULL;
+        char                 timestr[256] = {0,};
 
-        list_splice_init (&saved_frames->lk_sf.list, &saved_frames->sf.list);
+        struct iovec          iov = {0,};
 
 	list_for_each_entry_safe (trav, tmp, &saved_frames->sf.list, list) {
-                gf_time_fmt (timestr, sizeof timestr,
-                             trav->saved_at.tv_sec, gf_timefmt_FT);
+                frame_sent_tm = localtime (&trav->saved_at.tv_sec);
+                strftime (timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S",
+                          frame_sent_tm);
                 snprintf (timestr + strlen (timestr),
                           sizeof(timestr) - strlen (timestr),
                           ".%"GF_PRI_SUSECONDS, trav->saved_at.tv_usec);
@@ -360,23 +333,26 @@ saved_frames_unwind (struct saved_frames *saved_frames)
                 gf_log_callingfn (trav->rpcreq->conn->trans->name,
                                   GF_LOG_ERROR,
                                   "forced unwinding frame type(%s) op(%s(%d)) "
-                                  "called at %s (xid=0x%x)",
+                                  "called at %s",
                                   trav->rpcreq->prog->progname,
                                   ((trav->rpcreq->prog->procnames) ?
                                    trav->rpcreq->prog->procnames[trav->rpcreq->procnum]
                                    : "--"),
-                                  trav->rpcreq->procnum, timestr,
-                                  trav->rpcreq->xid);
+                                  trav->rpcreq->procnum, timestr);
 		saved_frames->count--;
 
+                clnt = rpc_clnt_ref (trav->rpcreq->conn->rpc_clnt);
                 trav->rpcreq->rpc_status = -1;
                 trav->rpcreq->cbkfn (trav->rpcreq, &iov, 1, trav->frame);
 
+                saved_frames_pool
+                        = trav->rpcreq->conn->rpc_clnt->saved_frames_pool;
                 rpc_clnt_reply_deinit (trav->rpcreq,
                                        trav->rpcreq->conn->rpc_clnt->reqpool);
 
+                clnt = rpc_clnt_unref (clnt);
 		list_del_init (&trav->list);
-                mem_put (trav);
+                mem_put (saved_frames_pool, trav);
 	}
 }
 
@@ -398,7 +374,7 @@ rpc_clnt_reconnect (void *trans_ptr)
 {
         rpc_transport_t         *trans = NULL;
         rpc_clnt_connection_t   *conn  = NULL;
-        struct timespec          ts    = {0, 0};
+        struct timeval           tv    = {0, 0};
         int32_t                  ret   = 0;
         struct rpc_clnt         *clnt  = NULL;
 
@@ -417,15 +393,14 @@ rpc_clnt_reconnect (void *trans_ptr)
                 conn->reconnect = 0;
 
                 if (conn->connected == 0) {
-                        ts.tv_sec = 3;
-                        ts.tv_nsec = 0;
+                        tv.tv_sec = 3;
 
                         gf_log (trans->name, GF_LOG_TRACE,
                                 "attempting reconnect");
-                        ret = rpc_transport_connect (trans,
-                                                     conn->config.remote_port);
+                        ret = rpc_transport_connect (trans, conn->config.remote_port);
+
                         conn->reconnect =
-                                gf_timer_call_after (clnt->ctx, ts,
+                                gf_timer_call_after (clnt->ctx, tv,
                                                      rpc_clnt_reconnect,
                                                      trans);
                 } else {
@@ -446,7 +421,7 @@ rpc_clnt_reconnect (void *trans_ptr)
 int
 rpc_clnt_fill_request_info (struct rpc_clnt *clnt, rpc_request_info_t *info)
 {
-        struct saved_frame  saved_frame;
+        struct saved_frame  saved_frame = {{}, 0};
         int                 ret         = -1;
 
         pthread_mutex_lock (&clnt->conn.lock);
@@ -457,8 +432,7 @@ rpc_clnt_fill_request_info (struct rpc_clnt *clnt, rpc_request_info_t *info)
         pthread_mutex_unlock (&clnt->conn.lock);
 
         if (ret == -1) {
-                gf_log (clnt->conn.trans->name, GF_LOG_CRITICAL,
-                        "cannot lookup the saved "
+                gf_log (clnt->conn.trans->name, GF_LOG_CRITICAL, "cannot lookup the saved "
                         "frame corresponding to xid (%d)", info->xid);
                 goto out;
         }
@@ -532,12 +506,6 @@ rpc_clnt_connection_cleanup (rpc_clnt_connection_t *conn)
                 }
 
                 conn->connected = 0;
-
-                if (conn->ping_timer) {
-                        gf_timer_call_cancel (clnt->ctx, conn->ping_timer);
-                        conn->ping_timer = NULL;
-                        conn->ping_started = 0;
-                }
         }
         pthread_mutex_unlock (&conn->lock);
 
@@ -628,7 +596,7 @@ rpc_clnt_reply_deinit (struct rpc_req *req, struct mem_pool *pool)
                 iobref_unref (req->rsp_iobref);
         }
 
-        mem_put (req);
+        mem_put (pool, req);
 out:
         return;
 }
@@ -662,14 +630,15 @@ rpc_clnt_reply_init (rpc_clnt_connection_t *conn, rpc_transport_pollin_t *msg,
                 goto out;
         }
 
-        gf_log (conn->trans->name, GF_LOG_TRACE,
-                "received rpc message (RPC XID: 0x%x"
+        gf_log (conn->trans->name, GF_LOG_TRACE, "received rpc message (RPC XID: 0x%ux"
                 " Program: %s, ProgVers: %d, Proc: %d) from rpc-transport (%s)",
                 saved_frame->rpcreq->xid,
                 saved_frame->rpcreq->prog->progname,
                 saved_frame->rpcreq->prog->progver,
                 saved_frame->rpcreq->procnum, conn->trans->name);
 
+        req->rpc_status = 0;
+
 out:
         if (ret != 0) {
                 req->rpc_status = -1;
@@ -726,8 +695,7 @@ rpc_clnt_handle_cbk (struct rpc_clnt *clnt, rpc_transport_pollin_t *msg)
 
         if (found && (procnum < program->numactors) &&
             (program->actors[procnum].actor)) {
-                program->actors[procnum].actor (clnt, program->mydata,
-                                                &progmsg);
+                program->actors[procnum].actor (&progmsg);
         }
 
 out:
@@ -778,7 +746,7 @@ rpc_clnt_handle_reply (struct rpc_clnt *clnt, rpc_transport_pollin_t *pollin)
 out:
 
         if (saved_frame) {
-                mem_put (saved_frame);
+                mem_put (conn->rpc_clnt->saved_frames_pool, saved_frame);
         }
 
         clnt = rpc_clnt_unref (clnt);
@@ -821,19 +789,17 @@ out:
         return;
 }
 
-static void
-rpc_clnt_destroy (struct rpc_clnt *rpc);
 
 int
 rpc_clnt_notify (rpc_transport_t *trans, void *mydata,
                  rpc_transport_event_t event, void *data, ...)
 {
-        rpc_clnt_connection_t  *conn        = NULL;
-        struct rpc_clnt        *clnt        = NULL;
-        int                     ret         = -1;
-        rpc_request_info_t     *req_info    = NULL;
-        rpc_transport_pollin_t *pollin      = NULL;
-        struct timespec         ts          = {0, };
+        rpc_clnt_connection_t  *conn     = NULL;
+        struct rpc_clnt        *clnt     = NULL;
+        int                     ret      = -1;
+        rpc_request_info_t     *req_info = NULL;
+        rpc_transport_pollin_t *pollin   = NULL;
+        struct timeval          tv       = {0, };
 
         conn = mydata;
         if (conn == NULL) {
@@ -850,13 +816,11 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata,
 
                 pthread_mutex_lock (&conn->lock);
                 {
-                        if (!conn->rpc_clnt->disabled
-                            && (conn->reconnect == NULL)) {
-                                ts.tv_sec = 10;
-                                ts.tv_nsec = 0;
+                        if (conn->reconnect == NULL) {
+                                tv.tv_sec = 10;
 
                                 conn->reconnect =
-                                        gf_timer_call_after (clnt->ctx, ts,
+                                        gf_timer_call_after (clnt->ctx, tv,
                                                              rpc_clnt_reconnect,
                                                              conn->trans);
                         }
@@ -864,13 +828,15 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata,
                 pthread_mutex_unlock (&conn->lock);
 
                 if (clnt->notifyfn)
-                        ret = clnt->notifyfn (clnt, clnt->mydata,
-                                              RPC_CLNT_DISCONNECT, NULL);
+                        ret = clnt->notifyfn (clnt, clnt->mydata, RPC_CLNT_DISCONNECT,
+                                              NULL);
                 break;
         }
 
         case RPC_TRANSPORT_CLEANUP:
-                rpc_clnt_destroy (clnt);
+                /* this event should not be received on a client for, a
+                 * transport is only disconnected, but never destroyed.
+                 */
                 ret = 0;
                 break;
 
@@ -883,12 +849,6 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata,
 
         case RPC_TRANSPORT_MSG_RECEIVED:
         {
-                pthread_mutex_lock (&conn->lock);
-                {
-                        gettimeofday (&conn->last_received, NULL);
-                }
-                pthread_mutex_unlock (&conn->lock);
-
                 pollin = data;
                 if (pollin->is_reply)
                         ret = rpc_clnt_handle_reply (clnt, pollin);
@@ -914,17 +874,8 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata,
 
         case RPC_TRANSPORT_CONNECT:
         {
-                /* Every time there is a disconnection, processes
-                   should try to connect to 'glusterd' (ie, default
-                   port) or whichever port given as 'option remote-port'
-                   in volume file. */
-                /* Below code makes sure the (re-)configured port lasts
-                   for just one successful attempt */
-                conn->config.remote_port = 0;
-
                 if (clnt->notifyfn)
-                        ret = clnt->notifyfn (clnt, clnt->mydata,
-                                              RPC_CLNT_CONNECT, NULL);
+                        ret = clnt->notifyfn (clnt, clnt->mydata, RPC_CLNT_CONNECT, NULL);
                 break;
         }
 
@@ -948,7 +899,7 @@ rpc_clnt_connection_deinit (rpc_clnt_connection_t *conn)
 }
 
 
-static inline int
+inline int
 rpc_clnt_connection_init (struct rpc_clnt *clnt, glusterfs_ctx_t *ctx,
                           dict_t *options, char *name)
 {
@@ -1005,8 +956,8 @@ out:
 }
 
 struct rpc_clnt *
-rpc_clnt_new (dict_t *options, glusterfs_ctx_t *ctx, char *name,
-              uint32_t reqpool_size)
+rpc_clnt_new (dict_t *options,
+              glusterfs_ctx_t *ctx, char *name)
 {
         int                    ret  = -1;
         struct rpc_clnt       *rpc  = NULL;
@@ -1019,10 +970,8 @@ rpc_clnt_new (dict_t *options, glusterfs_ctx_t *ctx, char *name,
         pthread_mutex_init (&rpc->lock, NULL);
         rpc->ctx = ctx;
 
-        if (!reqpool_size)
-                reqpool_size = RPC_CLNT_DEFAULT_REQUEST_COUNT;
-
-        rpc->reqpool = mem_pool_new (struct rpc_req, reqpool_size);
+        rpc->reqpool = mem_pool_new (struct rpc_req,
+                                     RPC_CLNT_DEFAULT_REQUEST_COUNT);
         if (rpc->reqpool == NULL) {
                 pthread_mutex_destroy (&rpc->lock);
                 GF_FREE (rpc);
@@ -1031,7 +980,7 @@ rpc_clnt_new (dict_t *options, glusterfs_ctx_t *ctx, char *name,
         }
 
         rpc->saved_frames_pool = mem_pool_new (struct saved_frame,
-                                               reqpool_size);
+                                              RPC_CLNT_DEFAULT_REQUEST_COUNT);
         if (rpc->saved_frames_pool == NULL) {
                 pthread_mutex_destroy (&rpc->lock);
                 mem_pool_destroy (rpc->reqpool);
@@ -1052,8 +1001,6 @@ rpc_clnt_new (dict_t *options, glusterfs_ctx_t *ctx, char *name,
                 goto out;
         }
 
-        rpc->auth_null = dict_get_str_boolean (options, "auth-null", 0);
-
         rpc = rpc_clnt_ref (rpc);
         INIT_LIST_HEAD (&rpc->programs);
 
@@ -1089,7 +1036,7 @@ rpc_clnt_register_notify (struct rpc_clnt *rpc, rpc_clnt_notify_t fn,
 }
 
 ssize_t
-xdr_serialize_glusterfs_auth (char *dest, struct auth_glusterfs_parms_v2 *au)
+xdr_serialize_glusterfs_auth (char *dest, struct auth_glusterfs_parms *au)
 {
         ssize_t ret = -1;
         XDR     xdr;
@@ -1097,11 +1044,11 @@ xdr_serialize_glusterfs_auth (char *dest, struct auth_glusterfs_parms_v2 *au)
         if ((!dest) || (!au))
                 return -1;
 
-        xdrmem_create (&xdr, dest, GF_MAX_AUTH_BYTES, XDR_ENCODE);
+        xdrmem_create (&xdr, dest, 1024,
+                       XDR_ENCODE);
 
-        if (!xdr_auth_glusterfs_parms_v2 (&xdr, au)) {
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to encode auth glusterfs elements");
+        if (!xdr_auth_glusterfs_parms (&xdr, au)) {
+                gf_log ("", GF_LOG_WARNING, "failed to encode auth glusterfs elements");
                 ret = -1;
                 goto ret;
         }
@@ -1114,8 +1061,8 @@ ret:
 
 
 int
-rpc_clnt_fill_request (int prognum, int progver, int procnum,
-                       uint64_t xid, struct auth_glusterfs_parms_v2 *au,
+rpc_clnt_fill_request (int prognum, int progver, int procnum, int payload,
+                       uint64_t xid, struct auth_glusterfs_parms *au,
                        struct rpc_msg *request, char *auth_data)
 {
         int   ret          = -1;
@@ -1134,26 +1081,19 @@ rpc_clnt_fill_request (int prognum, int progver, int procnum,
         request->rm_call.cb_vers = progver;
         request->rm_call.cb_proc = procnum;
 
-        /* TODO: Using AUTH_(GLUSTERFS/NULL) in a kludgy way for time-being.
-         * Make it modular in future so it is easy to plug-in new
-         * authentication schemes.
+        /* TODO: Using AUTH_GLUSTERFS for time-being. Make it modular in
+         * future so it is easy to plug-in new authentication schemes.
          */
-        if (auth_data) {
-                ret = xdr_serialize_glusterfs_auth (auth_data, au);
-                if (ret == -1) {
-                        gf_log ("rpc-clnt", GF_LOG_DEBUG,
-                                "cannot encode credentials");
-                        goto out;
-                }
-
-                request->rm_call.cb_cred.oa_flavor = AUTH_GLUSTERFS_v2;
-                request->rm_call.cb_cred.oa_base   = auth_data;
-                request->rm_call.cb_cred.oa_length = ret;
-        } else {
-                request->rm_call.cb_cred.oa_flavor = AUTH_NULL;
-                request->rm_call.cb_cred.oa_base   = NULL;
-                request->rm_call.cb_cred.oa_length = 0;
+        ret = xdr_serialize_glusterfs_auth (auth_data, au);
+        if (ret == -1) {
+                gf_log ("rpc-clnt", GF_LOG_DEBUG, "cannot encode credentials");
+                goto out;
         }
+
+        request->rm_call.cb_cred.oa_flavor = AUTH_GLUSTERFS;
+        request->rm_call.cb_cred.oa_base   = auth_data;
+        request->rm_call.cb_cred.oa_length = ret;
+
         request->rm_call.cb_verf.oa_flavor = AUTH_NONE;
         request->rm_call.cb_verf.oa_base = NULL;
         request->rm_call.cb_verf.oa_length = 0;
@@ -1201,53 +1141,46 @@ out:
 
 struct iobuf *
 rpc_clnt_record_build_record (struct rpc_clnt *clnt, int prognum, int progver,
-                              int procnum, size_t hdrsize, uint64_t xid,
-                              struct auth_glusterfs_parms_v2 *au,
-                              struct iovec *recbuf)
+                              int procnum, size_t payload, uint64_t xid,
+                              struct auth_glusterfs_parms *au, struct iovec *recbuf)
 {
-        struct rpc_msg  request                      = {0, };
-        struct iobuf   *request_iob                  = NULL;
-        char           *record                       = NULL;
-        struct iovec    recordhdr                    = {0, };
-        size_t          pagesize                     = 0;
-        int             ret                          = -1;
-        size_t          xdr_size                     = 0;
-        char            auth_data[GF_MAX_AUTH_BYTES] = {0, };
+        struct rpc_msg           request                            = {0, };
+        struct iobuf            *request_iob                        = NULL;
+        char                    *record                             = NULL;
+        struct iovec             recordhdr                          = {0, };
+        size_t                   pagesize                           = 0;
+        int                      ret                                = -1;
+        char                     auth_data[RPC_CLNT_MAX_AUTH_BYTES] = {0, };
 
         if ((!clnt) || (!recbuf) || (!au)) {
                 goto out;
         }
 
-        /* Fill the rpc structure and XDR it into the buffer got above. */
-        if (clnt->auth_null)
-                ret = rpc_clnt_fill_request (prognum, progver, procnum,
-                                             xid, NULL, &request, NULL);
-        else
-                ret = rpc_clnt_fill_request (prognum, progver, procnum,
-                                             xid, au, &request, auth_data);
-
-        if (ret == -1) {
-                gf_log (clnt->conn.trans->name, GF_LOG_WARNING,
-                        "cannot build a rpc-request xid (%"PRIu64")", xid);
-                goto out;
-        }
-
-        xdr_size = xdr_sizeof ((xdrproc_t)xdr_callmsg, &request);
-
         /* First, try to get a pointer into the buffer which the RPC
          * layer can use.
          */
-        request_iob = iobuf_get2 (clnt->ctx->iobuf_pool, (xdr_size + hdrsize));
+        request_iob = iobuf_get (clnt->ctx->iobuf_pool);
         if (!request_iob) {
                 goto out;
         }
 
-        pagesize = iobuf_pagesize (request_iob);
+        pagesize = ((struct iobuf_pool *)clnt->ctx->iobuf_pool)->page_size;
 
         record = iobuf_ptr (request_iob);  /* Now we have it. */
 
+        /* Fill the rpc structure and XDR it into the buffer got above. */
+        ret = rpc_clnt_fill_request (prognum, progver, procnum, payload, xid,
+                                     au, &request, auth_data);
+        if (ret == -1) {
+                gf_log (clnt->conn.trans->name, GF_LOG_WARNING,
+                        "cannot build a rpc-request xid (%"PRIu64")", xid);
+                goto out;
+        }
+
         recordhdr = rpc_clnt_record_build_header (record, pagesize, &request,
-                                                  hdrsize);
+                                                  payload);
+
+        //GF_FREE (request.rm_call.cb_cred.oa_base);
 
         if (!recordhdr.iov_base) {
                 gf_log (clnt->conn.trans->name, GF_LOG_ERROR,
@@ -1268,45 +1201,39 @@ out:
 
 struct iobuf *
 rpc_clnt_record (struct rpc_clnt *clnt, call_frame_t *call_frame,
-                 rpc_clnt_prog_t *prog, int procnum, size_t hdrlen,
+                 rpc_clnt_prog_t *prog,int procnum, size_t payload_len,
                  struct iovec *rpchdr, uint64_t callid)
 {
-        struct auth_glusterfs_parms_v2  au          = {0, };
-        struct iobuf                   *request_iob = NULL;
-        char                            owner[4] = {0,};
+        struct auth_glusterfs_parms  au                    = {0, };
+        struct iobuf                *request_iob           = NULL;
 
         if (!prog || !rpchdr || !call_frame) {
                 goto out;
         }
 
-        au.pid                   = call_frame->root->pid;
-        au.uid                   = call_frame->root->uid;
-        au.gid                   = call_frame->root->gid;
-        au.groups.groups_len     = call_frame->root->ngrps;
-        au.lk_owner.lk_owner_len = call_frame->root->lk_owner.len;
-
-        if (au.groups.groups_len)
-                au.groups.groups_val = call_frame->root->groups;
+        au.pid      = call_frame->root->pid;
+        au.uid      = call_frame->root->uid;
+        au.gid      = call_frame->root->gid;
+        au.ngrps    = call_frame->root->ngrps;
+        au.lk_owner = call_frame->root->lk_owner;
+        if (!au.lk_owner)
+                au.lk_owner = au.pid;
 
-        if (call_frame->root->lk_owner.len)
-                au.lk_owner.lk_owner_val = call_frame->root->lk_owner.data;
-        else {
-                owner[0] = (char)(au.pid & 0xff);
-                owner[1] = (char)((au.pid >> 8) & 0xff);
-                owner[2] = (char)((au.pid >> 16) & 0xff);
-                owner[3] = (char)((au.pid >> 24) & 0xff);
+        gf_log (clnt->conn.trans->name, GF_LOG_TRACE, "Auth Info: pid: %u, uid: %d"
+                ", gid: %d, owner: %"PRId64,
+                au.pid, au.uid, au.gid, au.lk_owner);
 
-                au.lk_owner.lk_owner_val = owner;
-                au.lk_owner.lk_owner_len = 4;
-        }
+        memcpy (au.groups, call_frame->root->groups, sizeof (au.groups));
 
-        gf_log (clnt->conn.trans->name, GF_LOG_TRACE, "Auth Info: pid: %u, uid: %d"
-                ", gid: %d, owner: %s", au.pid, au.uid, au.gid,
-                lkowner_utoa (&call_frame->root->lk_owner));
+        //rpc_transport_get_myname (clnt->conn.trans, myname, UNIX_PATH_MAX);
+        //au.aup_machname = myname;
 
+        /* Assuming the client program would like to speak to the same versioned
+         * program on server.
+         */
         request_iob = rpc_clnt_record_build_record (clnt, prog->prognum,
                                                     prog->progver,
-                                                    procnum, hdrlen,
+                                                    procnum, payload_len,
                                                     callid, &au,
                                                     rpchdr);
         if (!request_iob) {
@@ -1321,7 +1248,7 @@ out:
 
 int
 rpcclnt_cbk_program_register (struct rpc_clnt *clnt,
-                              rpcclnt_cb_program_t *program, void *mydata)
+                              rpcclnt_cb_program_t *program)
 {
         int                   ret                = -1;
         char                  already_registered = 0;
@@ -1361,8 +1288,6 @@ rpcclnt_cbk_program_register (struct rpc_clnt *clnt,
         memcpy (tmp, program, sizeof (*tmp));
         INIT_LIST_HEAD (&tmp->program);
 
-        tmp->mydata = mydata;
-
         pthread_mutex_lock (&clnt->lock);
         {
                 list_add_tail (&tmp->program, &clnt->programs);
@@ -1410,12 +1335,6 @@ rpc_clnt_submit (struct rpc_clnt *rpc, rpc_clnt_prog_t *prog,
                 goto out;
         }
 
-        conn = &rpc->conn;
-
-        if (conn->trans == NULL) {
-                goto out;
-        }
-
         rpcreq = mem_get (rpc->reqpool);
         if (rpcreq == NULL) {
                 goto out;
@@ -1435,6 +1354,8 @@ rpc_clnt_submit (struct rpc_clnt *rpc, rpc_clnt_prog_t *prog,
 
         callid = rpc_clnt_new_callid (rpc);
 
+        conn = &rpc->conn;
+
         rpcreq->prog = prog;
         rpcreq->procnum = procnum;
         rpcreq->conn = conn;
@@ -1447,6 +1368,11 @@ rpc_clnt_submit (struct rpc_clnt *rpc, rpc_clnt_prog_t *prog,
                 proglen += iov_length (proghdr, proghdrcount);
         }
 
+        if (progpayload) {
+                proglen += iov_length (progpayload,
+                                       progpayloadcount);
+        }
+
         request_iob = rpc_clnt_record (rpc, frame, prog,
                                        procnum, proglen,
                                        &rpchdr, callid);
@@ -1476,8 +1402,8 @@ rpc_clnt_submit (struct rpc_clnt *rpc, rpc_clnt_prog_t *prog,
         pthread_mutex_lock (&conn->lock);
         {
                 if (conn->connected == 0) {
-                        ret = rpc_transport_connect (conn->trans,
-                                                     conn->config.remote_port);
+                        rpc_transport_connect (conn->trans,
+                                               conn->config.remote_port);
                 }
 
                 ret = rpc_transport_submit_request (rpc->conn.trans,
@@ -1485,18 +1411,19 @@ rpc_clnt_submit (struct rpc_clnt *rpc, rpc_clnt_prog_t *prog,
                 if (ret == -1) {
                         gf_log (conn->trans->name, GF_LOG_WARNING,
                                 "failed to submit rpc-request "
-                                "(XID: 0x%x Program: %s, ProgVers: %d, "
+                                "(XID: 0x%ux Program: %s, ProgVers: %d, "
                                 "Proc: %d) to rpc-transport (%s)", rpcreq->xid,
                                 rpcreq->prog->progname, rpcreq->prog->progver,
                                 rpcreq->procnum, rpc->conn.trans->name);
                 }
 
                 if ((ret >= 0) && frame) {
+                        gettimeofday (&conn->last_sent, NULL);
                         /* Save the frame in queue */
                         __save_frame (rpc, frame, rpcreq);
 
                         gf_log ("rpc-clnt", GF_LOG_TRACE, "submitted request "
-                                "(XID: 0x%x Program: %s, ProgVers: %d, "
+                                "(XID: 0x%ux Program: %s, ProgVers: %d, "
                                 "Proc: %d) to rpc-transport (%s)", rpcreq->xid,
                                 rpcreq->prog->progname, rpcreq->prog->progver,
                                 rpcreq->procnum, rpc->conn.trans->name);
@@ -1511,9 +1438,7 @@ rpc_clnt_submit (struct rpc_clnt *rpc, rpc_clnt_prog_t *prog,
         ret = 0;
 
 out:
-        if (request_iob) {
-                iobuf_unref (request_iob);
-        }
+        iobuf_unref (request_iob);
 
         if (new_iobref && iobref) {
                 iobref_unref (iobref);
@@ -1523,7 +1448,7 @@ out:
                 if (rpcreq) {
                         rpcreq->rpc_status = -1;
                         cbkfn (rpcreq, NULL, 0, frame);
-                        mem_put (rpcreq);
+                        mem_put (rpc->reqpool, rpcreq);
                 }
         }
         return ret;
@@ -1545,21 +1470,19 @@ rpc_clnt_ref (struct rpc_clnt *rpc)
 
 
 static void
-rpc_clnt_trigger_destroy (struct rpc_clnt *rpc)
-{
-        if (!rpc)
-                return;
-
-        rpc_clnt_disable (rpc);
-        rpc_transport_unref (rpc->conn.trans);
-}
-
-static void
 rpc_clnt_destroy (struct rpc_clnt *rpc)
 {
         if (!rpc)
                 return;
 
+        if (rpc->conn.trans) {
+                rpc->conn.trans->mydata = NULL;
+                rpc_transport_unref (rpc->conn.trans);
+                //rpc_transport_destroy (rpc->conn.trans);
+        }
+
+        rpc_clnt_connection_cleanup (&rpc->conn);
+        rpc_clnt_reconnect_cleanup (&rpc->conn);
         saved_frames_destroy (rpc->conn.saved_frames);
         pthread_mutex_destroy (&rpc->lock);
         pthread_mutex_destroy (&rpc->conn.lock);
@@ -1586,78 +1509,13 @@ rpc_clnt_unref (struct rpc_clnt *rpc)
         }
         pthread_mutex_unlock (&rpc->lock);
         if (!count) {
-                rpc_clnt_trigger_destroy (rpc);
+                rpc_clnt_destroy (rpc);
                 return NULL;
         }
         return rpc;
 }
 
 
-char
-rpc_clnt_is_disabled (struct rpc_clnt *rpc)
-{
-
-        rpc_clnt_connection_t *conn = NULL;
-        char                   disabled = 0;
-
-        if (!rpc) {
-                goto out;
-        }
-
-        conn = &rpc->conn;
-
-        pthread_mutex_lock (&conn->lock);
-        {
-                disabled = rpc->disabled;
-        }
-        pthread_mutex_unlock (&conn->lock);
-
-out:
-        return disabled;
-}
-
-void
-rpc_clnt_disable (struct rpc_clnt *rpc)
-{
-        rpc_clnt_connection_t *conn = NULL;
-
-        if (!rpc) {
-                goto out;
-        }
-
-        conn = &rpc->conn;
-
-        pthread_mutex_lock (&conn->lock);
-        {
-                rpc->disabled = 1;
-
-                if (conn->timer) {
-                        gf_timer_call_cancel (rpc->ctx, conn->timer);
-                        conn->timer = NULL;
-                }
-
-                if (conn->reconnect) {
-                        gf_timer_call_cancel (rpc->ctx, conn->reconnect);
-                        conn->reconnect = NULL;
-                }
-                conn->connected = 0;
-
-                if (conn->ping_timer) {
-                        gf_timer_call_cancel (rpc->ctx, conn->ping_timer);
-                        conn->ping_timer = NULL;
-                        conn->ping_started = 0;
-                }
-
-        }
-        pthread_mutex_unlock (&conn->lock);
-
-        rpc_transport_disconnect (rpc->conn.trans);
-
-out:
-        return;
-}
-
-
 void
 rpc_clnt_reconfig (struct rpc_clnt *rpc, struct rpc_clnt_config *config)
 {
@@ -1685,7 +1543,7 @@ rpc_clnt_reconfig (struct rpc_clnt *rpc, struct rpc_clnt_config *config)
                         if (strcmp (rpc->conn.config.remote_host,
                                     config->remote_host))
                                 gf_log (rpc->conn.trans->name, GF_LOG_INFO,
-                                        "changing hostname to %s (from %s)",
+                                        "changing port to %s (from %s)",
                                         config->remote_host,
                                         rpc->conn.config.remote_host);
                         FREE (rpc->conn.config.remote_host);
@@ -1698,3 +1556,54 @@ rpc_clnt_reconfig (struct rpc_clnt *rpc, struct rpc_clnt_config *config)
                 rpc->conn.config.remote_host = gf_strdup (config->remote_host);
         }
 }
+
+int
+rpc_clnt_transport_unix_options_build (dict_t **options, char *filepath)
+{
+        dict_t                  *dict = NULL;
+        char                    *fpath = NULL;
+        int                     ret = -1;
+
+        GF_ASSERT (filepath);
+        GF_ASSERT (options);
+
+        dict = dict_new ();
+        if (!dict)
+                goto out;
+
+        fpath = gf_strdup (filepath);
+        if (!fpath) {
+                ret = -1;
+                goto out;
+        }
+
+        ret = dict_set_dynstr (dict, "transport.socket.connect-path", fpath);
+        if (ret)
+                goto out;
+
+        ret = dict_set_str (dict, "transport.address-family", "unix");
+        if (ret)
+                goto out;
+
+        ret = dict_set_str (dict, "transport.socket.nodelay", "off");
+        if (ret)
+                goto out;
+
+        ret = dict_set_str (dict, "transport-type", "socket");
+        if (ret)
+                goto out;
+
+        ret = dict_set_str (dict, "transport.socket.keepalive", "off");
+        if (ret)
+                goto out;
+
+        *options = dict;
+out:
+        if (ret) {
+                if (fpath)
+                        GF_FREE (fpath);
+                if (dict)
+                        dict_unref (dict);
+        }
+        return ret;
+}
diff --git a/rpc/rpc-lib/src/rpc-clnt.h b/rpc/rpc-lib/src/rpc-clnt.h
index 584963ad0..c2bc4c0b6 100644
--- a/rpc/rpc-lib/src/rpc-clnt.h
+++ b/rpc/rpc-lib/src/rpc-clnt.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __RPC_CLNT_H
@@ -22,10 +31,8 @@ typedef enum {
         RPC_CLNT_MSG
 } rpc_clnt_event_t;
 
-
-#define SFRAME_GET_PROGNUM(sframe) (sframe->rpcreq->prog->prognum)
-#define SFRAME_GET_PROGVER(sframe) (sframe->rpcreq->prog->progver)
-#define SFRAME_GET_PROCNUM(sframe) (sframe->rpcreq->procnum)
+#define AUTH_GLUSTERFS  5
+#define RPC_CLNT_MAX_AUTH_BYTES 1024
 
 struct xptr_clnt;
 struct rpc_req;
@@ -59,7 +66,6 @@ struct saved_frame {
 struct saved_frames {
 	int64_t            count;
 	struct saved_frame sf;
-	struct saved_frame lk_sf;
 };
 
 
@@ -78,7 +84,7 @@ typedef struct rpc_clnt_program {
         int                   numproc;
 } rpc_clnt_prog_t;
 
-typedef int (*rpcclnt_cb_fn) (struct rpc_clnt *rpc, void *mydata, void *data);
+typedef int (*rpcclnt_cb_fn) (void *data);
 
 /* The descriptor for each procedure/actor that runs
  * over the RPC service.
@@ -106,17 +112,15 @@ typedef struct rpcclnt_cb_program {
 
         /* list member to link to list of registered services with rpc_clnt */
         struct list_head        program;
-
-        /* Needed for passing back in cb_actor */
-        void                   *mydata;
 } rpcclnt_cb_program_t;
 
 
 
+#define RPC_MAX_AUTH_BYTES   400
 typedef struct rpc_auth_data {
-        int  flavour;
-        int  datalen;
-        char authdata[GF_MAX_AUTH_BYTES];
+        int             flavour;
+        int             datalen;
+        char            authdata[RPC_MAX_AUTH_BYTES];
 } rpc_auth_data_t;
 
 
@@ -163,7 +167,7 @@ struct rpc_req {
         void                  *conn_private;
 };
 
-typedef struct rpc_clnt {
+struct rpc_clnt {
         pthread_mutex_t        lock;
         rpc_clnt_notify_t      notifyfn;
         rpc_clnt_connection_t  conn;
@@ -180,13 +184,11 @@ typedef struct rpc_clnt {
 
         glusterfs_ctx_t       *ctx;
         int                   refcount;
-        int                   auth_null;
-        char                  disabled;
-} rpc_clnt_t;
+};
 
 
 struct rpc_clnt *rpc_clnt_new (dict_t *options, glusterfs_ctx_t *ctx,
-                               char *name, uint32_t reqpool_size);
+                               char *name);
 
 int rpc_clnt_start (struct rpc_clnt *rpc);
 
@@ -222,11 +224,10 @@ rpc_clnt_ref (struct rpc_clnt *rpc);
 struct rpc_clnt *
 rpc_clnt_unref (struct rpc_clnt *rpc);
 
-int rpc_clnt_connection_cleanup (rpc_clnt_connection_t *conn);
-
 void rpc_clnt_set_connected (rpc_clnt_connection_t *conn);
 
 void rpc_clnt_unset_connected (rpc_clnt_connection_t *conn);
+
 void rpc_clnt_reconnect (void *trans_ptr);
 
 void rpc_clnt_reconfig (struct rpc_clnt *rpc, struct rpc_clnt_config *config);
@@ -235,12 +236,8 @@ void rpc_clnt_reconfig (struct rpc_clnt *rpc, struct rpc_clnt_config *config);
  * procedure handlers.
  */
 int rpcclnt_cbk_program_register (struct rpc_clnt *svc,
-                                  rpcclnt_cb_program_t *program, void *mydata);
-
-void
-rpc_clnt_disable (struct rpc_clnt *rpc);
-
-char
-rpc_clnt_is_disabled (struct rpc_clnt *rpc);
+                                  rpcclnt_cb_program_t *program);
 
+int
+rpc_clnt_transport_unix_options_build (dict_t **options, char *filepath);
 #endif /* !_RPC_CLNT_H */
diff --git a/rpc/rpc-lib/src/rpc-common.c b/rpc/rpc-lib/src/rpc-common.c
new file mode 100644
index 000000000..36088fd9e
--- /dev/null
+++ b/rpc/rpc-lib/src/rpc-common.c
@@ -0,0 +1,139 @@
+/*
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "logging.h"
+#include "xdr-common.h"
+
+ssize_t
+xdr_serialize_generic (struct iovec outmsg, void *res, xdrproc_t proc)
+{
+        ssize_t ret = -1;
+        XDR     xdr;
+
+        if ((!outmsg.iov_base) || (!res) || (!proc))
+                return -1;
+
+        xdrmem_create (&xdr, outmsg.iov_base, (unsigned int)outmsg.iov_len,
+                       XDR_ENCODE);
+
+        if (!proc (&xdr, res)) {
+                gf_log_callingfn ("xdr", GF_LOG_WARNING,
+                                  "XDR encoding failed");
+                ret = -1;
+                goto ret;
+        }
+
+        ret = xdr_encoded_length (xdr);
+
+ret:
+        return ret;
+}
+
+
+ssize_t
+xdr_to_generic (struct iovec inmsg, void *args, xdrproc_t proc)
+{
+        XDR     xdr;
+        ssize_t ret = -1;
+
+        if ((!inmsg.iov_base) || (!args) || (!proc))
+                return -1;
+
+        xdrmem_create (&xdr, inmsg.iov_base, (unsigned int)inmsg.iov_len,
+                       XDR_DECODE);
+
+        if (!proc (&xdr, args)) {
+                gf_log_callingfn ("xdr", GF_LOG_WARNING,
+                                  "XDR decoding failed");
+                ret  = -1;
+                goto ret;
+        }
+
+        ret = xdr_decoded_length (xdr);
+ret:
+        return ret;
+}
+
+
+bool_t
+xdr_gf_dump_req (XDR *xdrs, gf_dump_req *objp)
+{
+	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf_prog_detail (XDR *xdrs, gf_prog_detail *objp)
+{
+	 if (!xdr_string (xdrs, &objp->progname, ~0))
+		 return FALSE;
+	 if (!xdr_u_quad_t (xdrs, &objp->prognum))
+		 return FALSE;
+	 if (!xdr_u_quad_t (xdrs, &objp->progver))
+		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (gf_prog_detail), (xdrproc_t) xdr_gf_prog_detail))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf_dump_rsp (XDR *xdrs, gf_dump_rsp *objp)
+{
+	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->prog, sizeof (gf_prog_detail), (xdrproc_t) xdr_gf_prog_detail))
+		 return FALSE;
+	return TRUE;
+}
+
+
+ssize_t
+xdr_serialize_dump_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf_dump_rsp);
+}
+
+ssize_t
+xdr_to_dump_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf_dump_req);
+}
+
+
+ssize_t
+xdr_from_dump_req (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf_dump_req);
+}
+
+ssize_t
+xdr_to_dump_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf_dump_rsp);
+}
diff --git a/rpc/rpc-lib/src/rpc-drc.c b/rpc/rpc-lib/src/rpc-drc.c
deleted file mode 100644
index 8181e6aee..000000000
--- a/rpc/rpc-lib/src/rpc-drc.c
+++ /dev/null
@@ -1,872 +0,0 @@
-/*
-  Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "rpcsvc.h"
-#ifndef RPC_DRC_H
-#include "rpc-drc.h"
-#endif
-#include "locking.h"
-#include "hashfn.h"
-#include "common-utils.h"
-#include "statedump.h"
-#include "mem-pool.h"
-
-#include <netinet/in.h>
-#include <unistd.h>
-
-/**
- * rpcsvc_drc_op_destroy - Destroys the cached reply
- *
- * @param drc - the main drc structure
- * @param reply - the cached reply to destroy
- * @return NULL if reply is destroyed, reply otherwise
- */
-static drc_cached_op_t *
-rpcsvc_drc_op_destroy (rpcsvc_drc_globals_t *drc, drc_cached_op_t *reply)
-{
-        GF_ASSERT (drc);
-        GF_ASSERT (reply);
-
-        if (reply->state == DRC_OP_IN_TRANSIT)
-                return reply;
-
-        iobref_unref (reply->msg.iobref);
-        if (reply->msg.rpchdr)
-                GF_FREE (reply->msg.rpchdr);
-        if (reply->msg.proghdr)
-                GF_FREE (reply->msg.proghdr);
-        if (reply->msg.progpayload)
-                GF_FREE (reply->msg.progpayload);
-
-        list_del (&reply->global_list);
-        reply->client->op_count--;
-        drc->op_count--;
-        mem_put (reply);
-        reply = NULL;
-
-        return reply;
-}
-
-/**
- * rpcsvc_drc_op_rb_unref - This function is used in rb tree cleanup only
- *
- * @param reply - the cached reply to unref
- * @param drc - the main drc structure
- * @return void
- */
-static void
-rpcsvc_drc_rb_op_destroy (void *reply, void *drc)
-{
-        rpcsvc_drc_op_destroy (drc, (drc_cached_op_t *)reply);
-}
-
-/**
- * rpcsvc_remove_drc_client - Cleanup the drc client
- *
- * @param client - the drc client to be removed
- * @return void
- */
-static void
-rpcsvc_remove_drc_client (drc_client_t *client)
-{
-        rb_destroy (client->rbtree, rpcsvc_drc_rb_op_destroy);
-        list_del (&client->client_list);
-        GF_FREE (client);
-}
-
-/**
- * rpcsvc_client_lookup - Given a sockaddr_storage, find the client if it exists
- *
- * @param drc - the main drc structure
- * @param sockaddr - the network address of the client to be looked up
- * @return drc client if it exists, NULL otherwise
- */
-static drc_client_t *
-rpcsvc_client_lookup (rpcsvc_drc_globals_t *drc,
-                      struct sockaddr_storage *sockaddr)
-{
-        drc_client_t    *client = NULL;
-
-        GF_ASSERT (drc);
-        GF_ASSERT (sockaddr);
-
-        if (list_empty (&drc->clients_head))
-            return NULL;
-
-        list_for_each_entry (client, &drc->clients_head, client_list) {
-                if (gf_sock_union_equal_addr (&client->sock_union,
-                                              (union gf_sock_union *)sockaddr))
-                        return client;
-        }
-
-        return NULL;
-}
-
-/**
- * drc_compare_reqs - Used by rbtree to determine if incoming req matches with
- *                    an existing node(cached reply) in rbtree
- *
- * @param item - pointer to the incoming req
- * @param rb_node_data - pointer to an rbtree node (cached reply)
- * @param param - drc pointer - unused here, but used in *op_destroy
- * @return 0 if req matches reply, else (req->xid - reply->xid)
- */
-int
-drc_compare_reqs (const void *item, const void *rb_node_data, void *param)
-{
-        int               ret      = -1;
-        rpcsvc_request_t *req      = NULL;
-        drc_cached_op_t  *reply    = NULL;
-
-        GF_ASSERT (item);
-        GF_ASSERT (rb_node_data);
-        GF_ASSERT (param);
-
-        req = (rpcsvc_request_t *)item;
-        reply = (drc_cached_op_t *)rb_node_data;
-
-        ret = req->xid - reply->xid;
-        if (ret != 0)
-                return ret;
-
-        if (req->prognum == reply->prognum &&
-            req->procnum == reply->procnum &&
-            req->progver == reply->progversion)
-                return 0;
-
-        return 1;
-}
-
-/**
- * drc_rb_calloc - used by rbtree api to allocate memory for nodes
- *
- * @param allocator - the libavl_allocator structure used by rbtree
- * @param size - not needed by this function
- * @return pointer to new cached reply (node in rbtree)
- */
-static void *
-drc_rb_calloc (struct libavl_allocator *allocator, size_t size)
-{
-        rpcsvc_drc_globals_t *drc = NULL;
-
-        /* get the drc pointer by simple typecast, since allocator
-         * is the first member of rpcsvc_drc_globals_t
-         */
-        drc = (rpcsvc_drc_globals_t *)allocator;
-
-        return mem_get (drc->mempool);
-}
-
-/**
- * drc_rb_free - used by rbtree api to free a node
- *
- * @param a - the libavl_allocator structure used by rbtree api
- * @param block - node that needs to be freed
- * @return void
- */
-static void
-drc_rb_free (struct libavl_allocator *a, void *block)
-{
-        mem_put (block);
-}
-
-/**
- * drc_init_client_cache - initialize a drc client and its rb tree
- *
- * @param drc - the main drc structure
- * @param client - the drc client to be initialized
- * @return 0 on success, -1 on failure
- */
-static int
-drc_init_client_cache (rpcsvc_drc_globals_t *drc, drc_client_t *client)
-{
-        GF_ASSERT (drc);
-        GF_ASSERT (client);
-
-        drc->allocator.libavl_malloc = drc_rb_calloc;
-        drc->allocator.libavl_free = drc_rb_free;
-
-        client->rbtree = rb_create (drc_compare_reqs, drc,
-                                    (struct libavl_allocator *)drc);
-        if (!client->rbtree) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "rb tree creation failed");
-                return -1;
-        }
-
-        return 0;
-}
-
-/**
- * rpcsvc_get_drc_client - find the drc client with given sockaddr, else
- *                         allocate and initialize a new drc client
- *
- * @param drc - the main drc structure
- * @param sockaddr - network address of client
- * @return drc client on success, NULL on failure
- */
-static drc_client_t *
-rpcsvc_get_drc_client (rpcsvc_drc_globals_t *drc,
-                       struct sockaddr_storage *sockaddr)
-{
-        drc_client_t      *client      = NULL;
-
-        GF_ASSERT (drc);
-        GF_ASSERT (sockaddr);
-
-        client = rpcsvc_client_lookup (drc, sockaddr);
-        if (client)
-                goto out;
-
-        /* if lookup fails, allocate cache for the new client */
-        client = GF_CALLOC (1, sizeof (drc_client_t),
-                            gf_common_mt_drc_client_t);
-        if (!client)
-                goto out;
-
-        client->ref = 0;
-        client->sock_union = (union gf_sock_union)*sockaddr;
-        client->op_count = 0;
-
-        if (drc_init_client_cache (drc, client)) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG,
-                        "initialization of drc client failed");
-                GF_FREE (client);
-                client = NULL;
-                goto out;
-        }
-        drc->client_count++;
-
-        list_add (&client->client_list, &drc->clients_head);
-
- out:
-        return client;
-}
-
-/**
- * rpcsvc_need_drc - Determine if a request needs DRC service
- *
- * @param req - incoming request
- * @return 1 if DRC is needed for req, 0 otherwise
- */
-int
-rpcsvc_need_drc (rpcsvc_request_t *req)
-{
-        rpcsvc_actor_t           *actor = NULL;
-        rpcsvc_drc_globals_t     *drc   = NULL;
-
-        GF_ASSERT (req);
-        GF_ASSERT (req->svc);
-
-        drc = req->svc->drc;
-
-        if (!drc || drc->status == DRC_UNINITIATED)
-                return 0;
-
-        actor = rpcsvc_program_actor (req);
-        if (!actor)
-                return 0;
-
-        return (actor->op_type == DRC_NON_IDEMPOTENT
-                && drc->type != DRC_TYPE_NONE);
-}
-
-/**
- * rpcsvc_drc_client_ref - ref the drc client
- *
- * @param client - the drc client to ref
- * @return client
- */
-static drc_client_t *
-rpcsvc_drc_client_ref (drc_client_t *client)
-{
-        GF_ASSERT (client);
-        client->ref++;
-        return client;
-}
-
-/**
- * rpcsvc_drc_client_unref - unref the drc client, and destroy
- *                           the client on last unref
- *
- * @param drc - the main drc structure
- * @param client - the drc client to unref
- * @return NULL if it is the last unref, client otherwise
- */
-static drc_client_t *
-rpcsvc_drc_client_unref (rpcsvc_drc_globals_t *drc, drc_client_t *client)
-{
-        GF_ASSERT (drc);
-        GF_ASSERT (client->ref);
-
-        client->ref--;
-        if (!client->ref) {
-                drc->client_count--;
-                rpcsvc_remove_drc_client (client);
-                client = NULL;
-        }
-
-        return client;
-}
-
-/**
- * rpcsvc_drc_lookup - lookup a request to see if it is already cached
- *
- * @param req - incoming request
- * @return cached reply of req if found, NULL otherwise
- */
-drc_cached_op_t *
-rpcsvc_drc_lookup (rpcsvc_request_t *req)
-{
-        drc_client_t           *client = NULL;
-        drc_cached_op_t        *reply  = NULL;
-
-        GF_ASSERT (req);
-
-        if (!req->trans->drc_client) {
-                client = rpcsvc_get_drc_client (req->svc->drc,
-                                                &req->trans->peerinfo.sockaddr);
-                if (!client)
-                        goto out;
-                req->trans->drc_client = client;
-        }
-
-        client = rpcsvc_drc_client_ref (req->trans->drc_client);
-
-        if (client->op_count == 0)
-                goto out;
-
-        reply = rb_find (client->rbtree, req);
-
- out:
-        if (client)
-                rpcsvc_drc_client_unref (req->svc->drc, client);
-
-        return reply;
-}
-
-/**
- * rpcsvc_send_cached_reply - send the cached reply for the incoming request
- *
- * @param req - incoming request (which is a duplicate in this case)
- * @param reply - the cached reply for req
- * @return 0 on successful reply submission, -1 or other non-zero value otherwise
- */
-int
-rpcsvc_send_cached_reply (rpcsvc_request_t *req, drc_cached_op_t *reply)
-{
-        int     ret = 0;
-
-        GF_ASSERT (req);
-        GF_ASSERT (reply);
-
-        gf_log (GF_RPCSVC, GF_LOG_DEBUG, "sending cached reply: xid: %d, "
-                "client: %s", req->xid, req->trans->peerinfo.identifier);
-
-        rpcsvc_drc_client_ref (reply->client);
-        ret = rpcsvc_transport_submit (req->trans,
-                     reply->msg.rpchdr, reply->msg.rpchdrcount,
-                     reply->msg.proghdr, reply->msg.proghdrcount,
-                     reply->msg.progpayload, reply->msg.progpayloadcount,
-                     reply->msg.iobref, req->trans_private);
-        rpcsvc_drc_client_unref (req->svc->drc, reply->client);
-
-        return ret;
-}
-
-/**
- * rpcsvc_cache_reply - cache the reply for the processed request 'req'
- *
- * @param req - processed request
- * @param iobref - iobref structure of the reply
- * @param rpchdr - rpc header of the reply
- * @param rpchdrcount - size of rpchdr
- * @param proghdr - program header of the reply
- * @param proghdrcount - size of proghdr
- * @param payload - payload of the reply if any
- * @param payloadcount - size of payload
- * @return 0 on success, -1 on failure
- */
-int
-rpcsvc_cache_reply (rpcsvc_request_t *req, struct iobref *iobref,
-                    struct iovec *rpchdr, int rpchdrcount,
-                    struct iovec *proghdr, int proghdrcount,
-                    struct iovec *payload, int payloadcount)
-{
-        int                       ret              = -1;
-        drc_cached_op_t          *reply            = NULL;
-
-        GF_ASSERT (req);
-        GF_ASSERT (req->reply);
-
-        reply = req->reply;
-
-        reply->state = DRC_OP_CACHED;
-
-        reply->msg.iobref = iobref_ref (iobref);
-
-        reply->msg.rpchdrcount = rpchdrcount;
-        reply->msg.rpchdr = iov_dup (rpchdr, rpchdrcount);
-
-        reply->msg.proghdrcount = proghdrcount;
-        reply->msg.proghdr = iov_dup (proghdr, proghdrcount);
-
-        reply->msg.progpayloadcount = payloadcount;
-        if (payloadcount)
-                reply->msg.progpayload = iov_dup (payload, payloadcount);
-
-        //        rpcsvc_drc_client_unref (req->svc->drc, req->trans->drc_client);
-        //        rpcsvc_drc_op_unref (req->svc->drc, reply);
-        ret = 0;
-
-        return ret;
-}
-
-/**
- * rpcsvc_vacate_drc_entries - free up some percentage of drc cache
- *                             based on the lru factor
- *
- * @param drc - the main drc structure
- * @return void
- */
-static void
-rpcsvc_vacate_drc_entries (rpcsvc_drc_globals_t *drc)
-{
-        uint32_t            i           = 0;
-        uint32_t            n           = 0;
-        drc_cached_op_t    *reply       = NULL;
-        drc_cached_op_t    *tmp         = NULL;
-        drc_client_t       *client      = NULL;
-
-        GF_ASSERT (drc);
-
-        n = drc->global_cache_size / drc->lru_factor;
-
-        list_for_each_entry_safe_reverse (reply, tmp, &drc->cache_head, global_list) {
-                /* Don't delete ops that are in transit */
-                if (reply->state == DRC_OP_IN_TRANSIT)
-                        continue;
-
-                client = reply->client;
-
-                (void *)rb_delete (client->rbtree, reply);
-
-                rpcsvc_drc_op_destroy (drc, reply);
-                rpcsvc_drc_client_unref (drc, client);
-                i++;
-                if (i >= n)
-                        break;
-        }
-}
-
-/**
- * rpcsvc_add_op_to_cache - insert the cached op into the client rbtree and drc list
- *
- * @param drc - the main drc structure
- * @param reply - the op to be inserted
- * @return 0 on success, -1 on failure
- */
-static int
-rpcsvc_add_op_to_cache (rpcsvc_drc_globals_t *drc, drc_cached_op_t *reply)
-{
-        drc_client_t        *client         = NULL;
-        drc_cached_op_t    **tmp_reply      = NULL;
-
-        GF_ASSERT (drc);
-        GF_ASSERT (reply);
-
-        client = reply->client;
-
-        /* cache is full, free up some space */
-        if (drc->op_count >= drc->global_cache_size)
-                rpcsvc_vacate_drc_entries (drc);
-
-        tmp_reply = (drc_cached_op_t **)rb_probe (client->rbtree, reply);
-        if (*tmp_reply != reply) {
-                /* should never happen */
-                gf_log (GF_RPCSVC, GF_LOG_ERROR,
-                        "DRC failed to detect duplicates");
-                return -1;
-        } else if (*tmp_reply == NULL) {
-                /* mem alloc failed */
-                return -1;
-        }
-
-        client->op_count++;
-        list_add (&reply->global_list, &drc->cache_head);
-        drc->op_count++;
-
-        return 0;
-}
-
-/**
- * rpcsvc_cache_request - cache the in-transition incoming request
- *
- * @param req - incoming request
- * @return 0 on success, -1 on failure
- */
-int
-rpcsvc_cache_request (rpcsvc_request_t *req)
-{
-        int                        ret            = -1;
-        drc_client_t              *client         = NULL;
-        drc_cached_op_t           *reply          = NULL;
-        rpcsvc_drc_globals_t      *drc            = NULL;
-
-        GF_ASSERT (req);
-
-        drc = req->svc->drc;
-
-        client = req->trans->drc_client;
-        if (!client) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "drc client is NULL");
-                goto out;
-        }
-
-        reply = mem_get (drc->mempool);
-        if (!reply)
-                goto out;
-
-        reply->client = rpcsvc_drc_client_ref (client);
-        reply->xid = req->xid;
-        reply->prognum = req->prognum;
-        reply->progversion = req->progver;
-        reply->procnum = req->procnum;
-        reply->state = DRC_OP_IN_TRANSIT;
-        req->reply = reply;
-
-        ret = rpcsvc_add_op_to_cache (drc, reply);
-        if (ret) {
-                req->reply = NULL;
-                rpcsvc_drc_op_destroy (drc, reply);
-                rpcsvc_drc_client_unref (drc, client);
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "Failed to add op to drc cache");
-        }
-
- out:
-        return ret;
-}
-
-/**
- *
- * rpcsvc_drc_priv - function which dumps the drc state
- *
- * @param drc - the main drc structure
- * @return 0 on success, -1 on failure
- */
-int32_t
-rpcsvc_drc_priv (rpcsvc_drc_globals_t *drc)
-{
-        int                      i                         = 0;
-        char                     key[GF_DUMP_MAX_BUF_LEN]  = {0};
-        drc_client_t            *client                    = NULL;
-        char                     ip[INET6_ADDRSTRLEN]      = {0};
-
-        if (!drc || drc->status == DRC_UNINITIATED) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "DRC is "
-                        "uninitialized, not dumping its state");
-                return 0;
-        }
-
-        gf_proc_dump_add_section("rpc.drc");
-
-        if (TRY_LOCK (&drc->lock))
-                return -1;
-
-        gf_proc_dump_build_key (key, "drc", "type");
-        gf_proc_dump_write (key, "%d", drc->type);
-
-        gf_proc_dump_build_key (key, "drc", "client_count");
-        gf_proc_dump_write (key, "%d", drc->client_count);
-
-        gf_proc_dump_build_key (key, "drc", "current_cache_size");
-        gf_proc_dump_write (key, "%d", drc->op_count);
-
-        gf_proc_dump_build_key (key, "drc", "max_cache_size");
-        gf_proc_dump_write (key, "%d", drc->global_cache_size);
-
-        gf_proc_dump_build_key (key, "drc", "lru_factor");
-        gf_proc_dump_write (key, "%d", drc->lru_factor);
-
-        gf_proc_dump_build_key (key, "drc", "duplicate_request_count");
-        gf_proc_dump_write (key, "%d", drc->cache_hits);
-
-        gf_proc_dump_build_key (key, "drc", "in_transit_duplicate_requests");
-        gf_proc_dump_write (key, "%d", drc->intransit_hits);
-
-        list_for_each_entry (client, &drc->clients_head, client_list) {
-                gf_proc_dump_build_key (key, "client", "%d.ip-address", i);
-                memset (ip, 0, INET6_ADDRSTRLEN);
-                switch (client->sock_union.storage.ss_family) {
-                case AF_INET:
-                        gf_proc_dump_write (key, "%s", inet_ntop (AF_INET,
-                                &client->sock_union.sin.sin_addr.s_addr,
-                                ip, INET_ADDRSTRLEN));
-                        break;
-                case AF_INET6:
-                        gf_proc_dump_write (key, "%s", inet_ntop (AF_INET6,
-                                &client->sock_union.sin6.sin6_addr,
-                                ip, INET6_ADDRSTRLEN));
-                        break;
-                default:
-                        gf_proc_dump_write (key, "%s", "N/A");
-                }
-
-                gf_proc_dump_build_key (key, "client", "%d.ref_count", i);
-                gf_proc_dump_write (key, "%d", client->ref);
-                gf_proc_dump_build_key (key, "client", "%d.op_count", i);
-                gf_proc_dump_write (key, "%d", client->op_count);
-                i++;
-        }
-
-        UNLOCK (&drc->lock);
-        return 0;
-}
-
-/**
- * rpcsvc_drc_notify - function which is notified of RPC transport events
- *
- * @param svc - pointer to rpcsvc_t structure of the rpc
- * @param xl - pointer to the xlator
- * @param event - the event which triggered this notify
- * @param data - the transport structure
- * @return 0 on success, -1 on failure
- */
-int
-rpcsvc_drc_notify (rpcsvc_t *svc, void *xl,
-                   rpcsvc_event_t event, void *data)
-{
-        int                       ret          = -1;
-        rpc_transport_t          *trans        = NULL;
-        drc_client_t             *client       = NULL;
-        rpcsvc_drc_globals_t     *drc          = NULL;
-
-        GF_ASSERT (svc);
-        GF_ASSERT (svc->drc);
-        GF_ASSERT (data);
-
-        drc = svc->drc;
-
-        if (drc->status == DRC_UNINITIATED ||
-            drc->type == DRC_TYPE_NONE)
-                return 0;
-
-        LOCK (&drc->lock);
-
-        trans = (rpc_transport_t *)data;
-        client = rpcsvc_get_drc_client (drc, &trans->peerinfo.sockaddr);
-        if (!client)
-                goto out;
-
-        switch (event) {
-        case RPCSVC_EVENT_ACCEPT:
-                trans->drc_client = rpcsvc_drc_client_ref (client);
-                ret = 0;
-                break;
-
-        case RPCSVC_EVENT_DISCONNECT:
-                ret = 0;
-                if (list_empty (&drc->clients_head))
-                        break;
-                /* should be the last unref */
-                rpcsvc_drc_client_unref (drc, client);
-                trans->drc_client = NULL;
-                break;
-
-        default:
-                break;
-        }
-
- out:
-        UNLOCK (&drc->lock);
-        return ret;
-}
-
-/**
- * rpcsvc_drc_init - Initialize the duplicate request cache service
- *
- * @param svc - pointer to rpcsvc_t structure of the rpc
- * @param options - the options dictionary which configures drc
- * @return 0 on success, non-zero integer on failure
- */
-int
-rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options)
-{
-        int                         ret            = 0;
-        uint32_t                    drc_type       = 0;
-        uint32_t                    drc_size       = 0;
-        uint32_t                    drc_factor     = 0;
-        rpcsvc_drc_globals_t       *drc            = NULL;
-        static gf_boolean_t         drc_inited     = _gf_false;
-
-        GF_ASSERT (svc);
-        GF_ASSERT (options);
-
-        /* Already inited */
-        if (drc_inited)
-                return 0;
-
-        if (!svc->drc) {
-                drc = GF_CALLOC (1, sizeof (rpcsvc_drc_globals_t),
-                                 gf_common_mt_drc_globals_t);
-                if (!drc)
-                        return -1;
-
-                svc->drc = drc;
-                LOCK_INIT (&drc->lock);
-        } else {
-                drc = svc->drc;
-        }
-
-        LOCK (&drc->lock);
-        if (drc->type != DRC_TYPE_NONE) {
-                ret = 0;
-                goto out;
-        }
-
-        /* Toggle DRC on/off, when more drc types(persistent/cluster)
-           are added, we shouldn't treat this as boolean */
-        ret = dict_get_str_boolean (options, "nfs.drc", _gf_true);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_INFO, "drc user options need second look");
-                ret = _gf_true;
-        }
-        drc->enable_drc = ret;
-
-        if (ret == _gf_false) {
-                /* drc off */
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "DRC is off");
-                ret = 0;
-                goto out;
-        }
-
-        /* Specify type of DRC to be used */
-        ret = dict_get_uint32 (options, "nfs.drc-type", &drc_type);
-        if (ret) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "drc type not set."
-                        " Continuing with default");
-                drc_type = DRC_DEFAULT_TYPE;
-        }
-
-        drc->type = drc_type;
-
-        /* Set the global cache size (no. of ops to cache) */
-        ret = dict_get_uint32 (options, "nfs.drc-size", &drc_size);
-        if (ret) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "drc size not set."
-                        " Continuing with default size");
-                drc_size = DRC_DEFAULT_CACHE_SIZE;
-        }
-
-        drc->global_cache_size = drc_size;
-
-        /* Mempool for cached ops */
-        drc->mempool = mem_pool_new (drc_cached_op_t, drc->global_cache_size);
-        if (!drc->mempool) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to get mempool for"
-                        " DRC, drc-size: %d", drc->global_cache_size);
-                ret = -1;
-                goto out;
-        }
-
-        /* What percent of cache to be evicted whenever it fills up */
-        ret = dict_get_uint32 (options, "nfs.drc-lru-factor", &drc_factor);
-        if (ret) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "drc lru factor not set."
-                        " Continuing with policy default");
-                drc_factor = DRC_DEFAULT_LRU_FACTOR;
-        }
-
-        drc->lru_factor = (drc_lru_factor_t) drc_factor;
-
-        INIT_LIST_HEAD (&drc->clients_head);
-        INIT_LIST_HEAD (&drc->cache_head);
-
-        ret = rpcsvc_register_notify (svc, rpcsvc_drc_notify, THIS);
-        if (ret) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR,
-                        "registration of drc_notify function failed");
-                goto out;
-        }
-
-        gf_log (GF_RPCSVC, GF_LOG_DEBUG, "drc init successful");
-        drc->status = DRC_INITIATED;
-        drc_inited = _gf_true;
-
- out:
-        UNLOCK (&drc->lock);
-        if (ret == -1) {
-                if (drc->mempool) {
-                        mem_pool_destroy (drc->mempool);
-                        drc->mempool = NULL;
-                }
-                GF_FREE (drc);
-                svc->drc = NULL;
-        }
-        return ret;
-}
-
-int
-rpcsvc_drc_reconfigure (rpcsvc_t *svc, dict_t *options)
-{
-        int                     ret        = -1;
-        gf_boolean_t            enable_drc = _gf_false;
-        rpcsvc_drc_globals_t    *drc       = NULL;
-        uint32_t                drc_size   = 0;
-
-        if ((!svc) || (!options))
-                return (-1);
-
-        drc = svc->drc;
-        /* reconfig for drc-size */
-        if (dict_get_uint32 (options, "nfs.drc-size", &drc_size))
-                drc_size = DRC_DEFAULT_CACHE_SIZE;
-
-        if (drc->global_cache_size != drc_size) {
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "nfs.drc-size size can not "
-                        "be reconfigured without NFS server restart.");
-                return (-1);
-        }
-
-        /* reconfig for nfs.drc */
-        ret = dict_get_str_boolean (options, "nfs.drc", _gf_true);
-        if (ret < 0) {
-                ret = _gf_true;
-        }
-        enable_drc = ret;
-
-        if (drc->enable_drc == enable_drc)
-                return 0;
-
-        drc->enable_drc = enable_drc;
-        if (enable_drc) {
-                if (drc == NULL)
-                        return rpcsvc_drc_init(svc, options);
-        } else {
-                if (drc == NULL)
-                        return (0);
-
-                LOCK (&drc->lock);
-                (void) rpcsvc_unregister_notify (svc, rpcsvc_drc_notify, THIS);
-                if (drc->mempool) {
-                        mem_pool_destroy (drc->mempool);
-                        drc->mempool = NULL;
-                }
-                UNLOCK (&drc->lock);
-                GF_FREE (drc);
-                svc->drc = NULL;
-        }
-
-        return (0);
-}
diff --git a/rpc/rpc-lib/src/rpc-drc.h b/rpc/rpc-lib/src/rpc-drc.h
deleted file mode 100644
index 7dfaef978..000000000
--- a/rpc/rpc-lib/src/rpc-drc.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-  Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef RPC_DRC_H
-#define RPC_DRC_H
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "rpcsvc-common.h"
-#include "rpcsvc.h"
-#include "locking.h"
-#include "dict.h"
-#include "rb.h"
-
-/* per-client cache structure */
-struct drc_client {
-        uint32_t                   ref;
-        union gf_sock_union        sock_union;
-        /* pointers to the cache */
-        struct rb_table           *rbtree;
-        /* no. of ops currently cached */
-        uint32_t                   op_count;
-        struct list_head           client_list;
-};
-
-struct drc_cached_op {
-        drc_op_state_t                 state;
-        uint32_t                       xid;
-        int                            prognum;
-        int                            progversion;
-        int                            procnum;
-        rpc_transport_msg_t            msg;
-        drc_client_t                  *client;
-        struct list_head               client_list;
-        struct list_head               global_list;
-        int32_t                        ref;
-};
-
-/* global drc definitions */
-enum drc_status {
-        DRC_UNINITIATED,
-        DRC_INITIATED
-};
-typedef enum drc_status drc_status_t;
-
-struct drc_globals {
-        /* allocator must be the first member since
-         * it is used so in gf_libavl_allocator
-         */
-        struct libavl_allocator   allocator;
-        drc_type_t                type;
-        /* configurable size parameter */
-        uint32_t                  global_cache_size;
-        drc_lru_factor_t          lru_factor;
-        gf_lock_t                 lock;
-        drc_status_t              status;
-        uint32_t                  op_count;
-        uint64_t                  cache_hits;
-        uint64_t                  intransit_hits;
-        struct mem_pool          *mempool;
-        struct list_head          cache_head;
-        uint32_t                  client_count;
-        struct list_head          clients_head;
-        gf_boolean_t              enable_drc;
-};
-
-int
-rpcsvc_need_drc (rpcsvc_request_t *req);
-
-drc_cached_op_t *
-rpcsvc_drc_lookup (rpcsvc_request_t *req);
-
-int
-rpcsvc_send_cached_reply (rpcsvc_request_t *req, drc_cached_op_t *reply);
-
-int
-rpcsvc_cache_reply (rpcsvc_request_t *req, struct iobref *iobref,
-                    struct iovec *rpchdr, int rpchdrcount,
-                    struct iovec *proghdr, int proghdrcount,
-                    struct iovec *payload, int payloadcount);
-
-int
-rpcsvc_cache_request (rpcsvc_request_t *req);
-
-int32_t
-rpcsvc_drc_priv (rpcsvc_drc_globals_t *drc);
-
-int
-rpcsvc_drc_init (rpcsvc_t *svc, dict_t *options);
-
-int
-rpcsvc_drc_reconfigure (rpcsvc_t *svc, dict_t *options);
-
-#endif /* RPC_DRC_H */
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index c24d41084..feccd4054 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <dlfcn.h>
@@ -33,8 +42,431 @@
 #define GF_OPTION_LIST_EMPTY(_opt) (_opt->value[0] == NULL)
 #endif
 
+int
+__volume_option_value_validate (char *name,
+                                data_pair_t *pair,
+                                volume_option_t *opt)
+{
+	int       i = 0;
+	int       ret = -1;
+	uint64_t  input_size = 0;
+	long long inputll = 0;
+
+	/* Key is valid, validate the option */
+	switch (opt->type) {
+        case GF_OPTION_TYPE_XLATOR:
+                break;
+
+	case GF_OPTION_TYPE_PATH:
+	{
+                if (strstr (pair->value->data, "../")) {
+                        gf_log (name, GF_LOG_ERROR,
+                                "invalid path given '%s'",
+                                pair->value->data);
+                        ret = -1;
+                        goto out;
+                }
+
+                /* Make sure the given path is valid */
+		if (pair->value->data[0] != '/') {
+			gf_log (name, GF_LOG_WARNING,
+				"option %s %s: '%s' is not an "
+				"absolute path name",
+				pair->key, pair->value->data,
+				pair->value->data);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_INT:
+	{
+		/* Check the range */
+		if (gf_string2longlong (pair->value->data,
+					&inputll) != 0) {
+			gf_log (name, GF_LOG_ERROR,
+				"invalid number format \"%s\" in "
+				"\"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((opt->min == 0) && (opt->max == 0)) {
+			gf_log (name, GF_LOG_DEBUG,
+				"no range check required for "
+				"'option %s %s'",
+				pair->key, pair->value->data);
+			ret = 0;
+			break;
+		}
+		if ((inputll < opt->min) ||
+		    (inputll > opt->max)) {
+			gf_log (name, GF_LOG_WARNING,
+				"'%lld' in 'option %s %s' is out of "
+				"range [%"PRId64" - %"PRId64"]",
+				inputll, pair->key,
+				pair->value->data,
+				opt->min, opt->max);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_SIZET:
+	{
+		/* Check the range */
+		if (gf_string2bytesize (pair->value->data,
+					&input_size) != 0) {
+			gf_log (name, GF_LOG_ERROR,
+				"invalid size format \"%s\" in "
+				"\"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((opt->min == 0) && (opt->max == 0)) {
+			gf_log (name, GF_LOG_DEBUG,
+				"no range check required for "
+				"'option %s %s'",
+				pair->key, pair->value->data);
+			ret = 0;
+			break;
+		}
+		if ((input_size < opt->min) ||
+		    (input_size > opt->max)) {
+			gf_log (name, GF_LOG_ERROR,
+				"'%"PRId64"' in 'option %s %s' is "
+				"out of range [%"PRId64" - %"PRId64"]",
+				input_size, pair->key,
+				pair->value->data,
+				opt->min, opt->max);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_BOOL:
+	{
+		/* Check if the value is one of
+		   '0|1|on|off|no|yes|true|false|enable|disable' */
+		gf_boolean_t bool_value;
+		if (gf_string2boolean (pair->value->data,
+				       &bool_value) != 0) {
+			gf_log (name, GF_LOG_ERROR,
+				"option %s %s: '%s' is not a valid "
+				"boolean value",
+				pair->key, pair->value->data,
+				pair->value->data);
+			goto out;
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_STR:
+	{
+		/* Check if the '*str' is valid */
+                if (GF_OPTION_LIST_EMPTY(opt)) {
+                        ret = 0;
+                        goto out;
+                }
+
+		for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) &&
+			     opt->value[i]; i++) {
+			if (strcasecmp (opt->value[i],
+					pair->value->data) == 0) {
+				ret = 0;
+				break;
+			}
+		}
+
+		if ((i == ZR_OPTION_MAX_ARRAY_SIZE)
+		    || ((i < ZR_OPTION_MAX_ARRAY_SIZE)
+			&& (!opt->value[i]))) {
+			/* enter here only if
+			 * 1. reached end of opt->value array and haven't
+                         *    validated input
+			 *                      OR
+			 * 2. valid input list is less than
+                         *    ZR_OPTION_MAX_ARRAY_SIZE and input has not
+                         *    matched all possible input values.
+			 */
+			char given_array[4096] = {0,};
+			for (i = 0; (i < ZR_OPTION_MAX_ARRAY_SIZE) &&
+				     opt->value[i]; i++) {
+				strcat (given_array, opt->value[i]);
+				strcat (given_array, ", ");
+			}
+
+			gf_log (name, GF_LOG_ERROR,
+				"option %s %s: '%s' is not valid "
+				"(possible options are %s)",
+				pair->key, pair->value->data,
+				pair->value->data, given_array);
+
+			goto out;
+		}
+	}
+	break;
+	case GF_OPTION_TYPE_PERCENT:
+	{
+		uint32_t percent = 0;
+
+
+		/* Check if the value is valid percentage */
+		if (gf_string2percent (pair->value->data,
+				       &percent) != 0) {
+			gf_log (name, GF_LOG_ERROR,
+				"invalid percent format \"%s\" "
+				"in \"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((percent < 0) || (percent > 100)) {
+			gf_log (name, GF_LOG_ERROR,
+				"'%d' in 'option %s %s' is out of "
+				"range [0 - 100]",
+				percent, pair->key,
+				pair->value->data);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_PERCENT_OR_SIZET:
+	{
+		uint32_t percent = 0;
+		uint64_t input_size = 0;
+
+		/* Check if the value is valid percentage */
+		if (gf_string2percent (pair->value->data,
+				       &percent) == 0) {
+			if (percent > 100) {
+				gf_log (name, GF_LOG_DEBUG,
+					"value given was greater than 100, "
+					"assuming this is actually a size");
+		        if (gf_string2bytesize (pair->value->data,
+				                &input_size) == 0) {
+				        /* Check the range */
+				if ((opt->min == 0) &&
+                                            (opt->max == 0)) {
+				        gf_log (name, GF_LOG_DEBUG,
+				        "no range check "
+                                                        "required for "
+					"'option %s %s'",
+				pair->key,
+                                                        pair->value->data);
+						// It is a size
+			                        ret = 0;
+				                goto out;
+				}
+			if ((input_size < opt->min) ||
+				            (input_size > opt->max)) {
+				        gf_log (name, GF_LOG_ERROR,
+				        "'%"PRId64"' in "
+                                                        "'option %s %s' is out"
+					" of range [%"PRId64""
+                                                        "- %"PRId64"]",
+				input_size, pair->key,
+				pair->value->data,
+				                opt->min, opt->max);
+				}
+					// It is a size
+					ret = 0;
+					goto out;
+				} else {
+					// It's not a percent or size
+					gf_log (name, GF_LOG_ERROR,
+					"invalid number format \"%s\" "
+					"in \"option %s\"",
+					pair->value->data, pair->key);
+				}
+
+			}
+			// It is a percent
+			ret = 0;
+			goto out;
+		} else {
+		        if (gf_string2bytesize (pair->value->data,
+				        &input_size) == 0) {
+			        /* Check the range */
+			if ((opt->min == 0) && (opt->max == 0)) {
+			        gf_log (name, GF_LOG_DEBUG,
+				        "no range check required for "
+					"'option %s %s'",
+			pair->key, pair->value->data);
+					// It is a size
+		                        ret = 0;
+				        goto out;
+			}
+		        if ((input_size < opt->min) ||
+			            (input_size > opt->max)) {
+					gf_log (name, GF_LOG_ERROR,
+				        "'%"PRId64"' in 'option %s %s'"
+                                                " is out of range [%"PRId64" -"
+                                                " %"PRId64"]",
+			input_size, pair->key,
+			pair->value->data,
+			                opt->min, opt->max);
+				}
+			} else {
+				// It's not a percent or size
+				gf_log (name, GF_LOG_ERROR,
+					"invalid number format \"%s\" "
+					"in \"option %s\"",
+					pair->value->data, pair->key);
+			}
+			//It is a size
+                        ret = 0;
+		        goto out;
+		}
 
+	}
+	break;
+	case GF_OPTION_TYPE_TIME:
+	{
+		uint32_t input_time = 0;
+
+		/* Check if the value is valid percentage */
+		if (gf_string2time (pair->value->data,
+				    &input_time) != 0) {
+			gf_log (name,
+				GF_LOG_ERROR,
+				"invalid time format \"%s\" in "
+				"\"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((opt->min == 0) && (opt->max == 0)) {
+			gf_log (name, GF_LOG_DEBUG,
+				"no range check required for "
+				"'option %s %s'",
+				pair->key, pair->value->data);
+			ret = 0;
+			goto out;
+		}
+		if ((input_time < opt->min) ||
+		    (input_time > opt->max)) {
+			gf_log (name, GF_LOG_ERROR,
+				"'%"PRIu32"' in 'option %s %s' is "
+				"out of range [%"PRId64" - %"PRId64"]",
+				input_time, pair->key,
+				pair->value->data,
+				opt->min, opt->max);
+		}
+		ret = 0;
+	}
+	break;
+	case GF_OPTION_TYPE_DOUBLE:
+	{
+		double input_time = 0.0;
+
+		/* Check if the value is valid double */
+		if (gf_string2double (pair->value->data,
+				      &input_time) != 0) {
+			gf_log (name,
+				GF_LOG_ERROR,
+				"invalid time format \"%s\" in \"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if (input_time < 0.0) {
+			gf_log (name,
+				GF_LOG_ERROR,
+				"invalid time format \"%s\" in \"option %s\"",
+				pair->value->data, pair->key);
+			goto out;
+		}
+
+		if ((opt->min == 0) && (opt->max == 0)) {
+			gf_log (name, GF_LOG_DEBUG,
+				"no range check required for 'option %s %s'",
+				pair->key, pair->value->data);
+			ret = 0;
+			goto out;
+		}
+		ret = 0;
+	}
+	break;
+        case GF_OPTION_TYPE_INTERNET_ADDRESS:
+        {
+                if (!valid_internet_address (pair->value->data)) {
+			gf_log (name, GF_LOG_ERROR,
+			        "internet address '%s' does not conform to"
+				"standards.", pair->value->data);
+                }
+                ret = 0;
+	}
+        break;
+	case GF_OPTION_TYPE_ANY:
+		/* NO CHECK */
+		ret = 0;
+		break;
+	}
+
+out:
+	return ret;
+}
+
+/* FIXME: this procedure should be removed from transport */
 int
+validate_volume_options (char *name, dict_t *options, volume_option_t *opt)
+{
+	int i = 0;
+	int ret = -1;
+	int index = 0;
+	volume_option_t *trav  = NULL;
+	data_pair_t     *pairs = NULL;
+
+	if (!opt) {
+		ret = 0;
+		goto out;
+	}
+
+	/* First search for not supported options, if any report error */
+	pairs = options->members_list;
+	while (pairs) {
+		ret = -1;
+		for (index = 0;
+		     opt[index].key && opt[index].key[0] ; index++) {
+			trav = &(opt[index]);
+			for (i = 0 ;
+			     (i < ZR_VOLUME_MAX_NUM_KEY) &&
+				     trav->key[i]; i++) {
+				/* Check if the key is valid */
+				if (fnmatch (trav->key[i],
+					     pairs->key, FNM_NOESCAPE) == 0) {
+					ret = 0;
+					break;
+				}
+			}
+			if (!ret) {
+				if (i) {
+					gf_log (name, GF_LOG_WARNING,
+						"option '%s' is deprecated, "
+						"preferred is '%s', continuing"
+						" with correction",
+						trav->key[i], trav->key[0]);
+					/* TODO: some bytes lost */
+					pairs->key = gf_strdup (trav->key[0]);
+				}
+				break;
+			}
+		}
+		if (!ret) {
+			ret = __volume_option_value_validate (name, pairs, trav);
+			if (-1 == ret) {
+				goto out;
+			}
+		}
+
+		pairs = pairs->next;
+	}
+
+	ret = 0;
+ out:
+	return ret;
+}
+
+int32_t
 rpc_transport_get_myaddr (rpc_transport_t *this, char *peeraddr, int addrlen,
                           struct sockaddr_storage *sa, size_t salen)
 {
@@ -69,19 +501,6 @@ out:
         return ret;
 }
 
-int
-rpc_transport_throttle (rpc_transport_t *this, gf_boolean_t onoff)
-{
-        int ret = 0;
-
-        if (!this->ops->throttle)
-                return -ENOSYS;
-
-        ret = this->ops->throttle (this, onoff);
-
-        return ret;
-}
-
 int32_t
 rpc_transport_get_peeraddr (rpc_transport_t *this, char *peeraddr, int addrlen,
                             struct sockaddr_storage *sa, size_t salen)
@@ -102,7 +521,7 @@ rpc_transport_pollin_destroy (rpc_transport_pollin_t *pollin)
         if (pollin->iobref) {
                 iobref_unref (pollin->iobref);
         }
-
+ 
         if (pollin->hdr_iobuf) {
                 iobuf_unref (pollin->hdr_iobuf);
         }
@@ -157,8 +576,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
 	int32_t ret = -1;
 	int8_t is_tcp = 0, is_unix = 0, is_ibsdp = 0;
 	volume_opt_list_t *vol_opt = NULL;
-        gf_boolean_t bind_insecure = _gf_false;
-        xlator_t   *this = NULL;
+        gf_boolean_t client_bind_insecure = _gf_false;
 
 	GF_VALIDATE_OR_GOTO("rpc-transport", options, fail);
 	GF_VALIDATE_OR_GOTO("rpc-transport", ctx, fail);
@@ -183,7 +601,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
 			gf_log ("dict", GF_LOG_DEBUG,
 				"setting transport-type failed");
                 else
-                        gf_log ("rpc-transport", GF_LOG_DEBUG,
+                        gf_log ("rpc-transport", GF_LOG_WARNING,
                                 "missing 'option transport-type'. defaulting to "
                                 "\"socket\"");
 	} else {
@@ -223,26 +641,19 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
 		}
 	}
 
-        /* client-bind-insecure is for clients protocol, and
-         * bind-insecure for glusterd. Both mutually exclusive
-        */
         ret = dict_get_str (options, "client-bind-insecure", &type);
-        if (ret)
-                ret = dict_get_str (options, "bind-insecure", &type);
         if (ret == 0) {
-                ret = gf_string2boolean (type, &bind_insecure);
+                ret = gf_string2boolean (type, &client_bind_insecure);
                 if (ret < 0) {
                         gf_log ("rcp-transport", GF_LOG_WARNING,
-                                "bind-insecure option %s is not a"
+                                "client-bind-insecure option %s is not a"
                                 " valid bool option", type);
                         goto fail;
                 }
-                if (_gf_true == bind_insecure)
-                        trans->bind_insecure = 1;
-                else
-                        trans->bind_insecure = 0;
+                if (_gf_true == client_bind_insecure)
+                        trans->client_bind_insecure = 1;
         } else {
-                trans->bind_insecure = 0;
+                trans->client_bind_insecure = 0;
         }
 
 	ret = dict_get_str (options, "transport-type", &type);
@@ -264,15 +675,13 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
 	handle = dlopen (name, RTLD_NOW|RTLD_GLOBAL);
 	if (handle == NULL) {
 		gf_log ("rpc-transport", GF_LOG_ERROR, "%s", dlerror ());
-		gf_log ("rpc-transport", GF_LOG_WARNING,
+		gf_log ("rpc-transport", GF_LOG_ERROR,
 			"volume '%s': transport-type '%s' is not valid or "
 			"not found on this machine",
 			trans_name, type);
 		goto fail;
 	}
 
-        trans->dl_handle = handle;
-
 	trans->ops = dlsym (handle, "tops");
 	if (trans->ops == NULL) {
 		gf_log ("rpc-transport", GF_LOG_ERROR,
@@ -280,22 +689,22 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
 		goto fail;
 	}
 
-	*VOID(&(trans->init)) = dlsym (handle, "init");
+	trans->init = dlsym (handle, "init");
 	if (trans->init == NULL) {
 		gf_log ("rpc-transport", GF_LOG_ERROR,
 			"dlsym (gf_rpc_transport_init) on %s", dlerror ());
 		goto fail;
 	}
 
-	*VOID(&(trans->fini)) = dlsym (handle, "fini");
+	trans->fini = dlsym (handle, "fini");
 	if (trans->fini == NULL) {
 		gf_log ("rpc-transport", GF_LOG_ERROR,
 			"dlsym (gf_rpc_transport_fini) on %s", dlerror ());
 		goto fail;
 	}
 
-        *VOID(&(trans->reconfigure)) = dlsym (handle, "reconfigure");
-        if (trans->reconfigure == NULL) {
+        trans->reconfigure = dlsym (handle, "reconfigure");
+        if (trans->fini == NULL) {
                 gf_log ("rpc-transport", GF_LOG_DEBUG,
                         "dlsym (gf_rpc_transport_reconfigure) on %s", dlerror());
         }
@@ -306,16 +715,16 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
                 goto fail;
         }
 
-        this = THIS;
 	vol_opt->given_opt = dlsym (handle, "options");
 	if (vol_opt->given_opt == NULL) {
 		gf_log ("rpc-transport", GF_LOG_DEBUG,
 			"volume option validation not specified");
 	} else {
-                INIT_LIST_HEAD (&vol_opt->list);
-		list_add_tail (&vol_opt->list, &(this->volume_options));
-                if (xlator_options_validate_list (this, options, vol_opt,
-                                                  NULL)) {
+                /* FIXME: is adding really needed? */
+		/* list_add_tail (&vol_opt->list, &xl->volume_options); */
+		if (-1 ==
+		    validate_volume_options (trans_name, options,
+                                             vol_opt->given_opt)) {
 			gf_log ("rpc-transport", GF_LOG_ERROR,
 				"volume option validation failed");
 			goto fail;
@@ -325,7 +734,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
         trans->options = options;
 
         pthread_mutex_init (&trans->lock, NULL);
-        trans->xl = this;
+        trans->xl = THIS;
 
 	ret = trans->init (trans);
 	if (ret != 0) {
@@ -334,29 +743,32 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
 		goto fail;
 	}
 
-        return_trans = trans;
+	return_trans = trans;
 
-        GF_FREE (name);
+        if (name) {
+                GF_FREE (name);
+        }
 
+        GF_FREE (vol_opt);
 	return return_trans;
 
 fail:
         if (trans) {
-                GF_FREE (trans->name);
-
-                if (trans->dl_handle)
-                        dlclose (trans->dl_handle);
+                if (trans->name) {
+                        GF_FREE (trans->name);
+                }
 
                 GF_FREE (trans);
         }
 
-        GF_FREE (name);
-
-        if (vol_opt && !list_empty (&vol_opt->list)) {
-                list_del_init (&vol_opt->list);
+        if (vol_opt) {
                 GF_FREE (vol_opt);
         }
 
+        if (name) {
+                GF_FREE (name);
+        }
+
         return NULL;
 }
 
@@ -442,10 +854,8 @@ rpc_transport_destroy (rpc_transport_t *this)
 
 	pthread_mutex_destroy (&this->lock);
 
-        GF_FREE (this->name);
-
-        if (this->dl_handle)
-                dlclose (this->dl_handle);
+        if (this->name)
+                GF_FREE (this->name);
 
 	GF_FREE (this);
 fail:
@@ -482,17 +892,14 @@ rpc_transport_unref (rpc_transport_t *this)
 
 	pthread_mutex_lock (&this->lock);
 	{
-                refcount = --this->refcount;
+		refcount = --this->refcount;
 	}
 	pthread_mutex_unlock (&this->lock);
 
 	if (refcount == 0) {
                 if (this->mydata)
-                        this->notify (this, this->mydata, RPC_TRANSPORT_CLEANUP,
-                                      NULL);
-                this->mydata = NULL;
-                this->notify = NULL;
-                rpc_transport_destroy (this);
+                        this->notify (this, this->mydata, RPC_TRANSPORT_CLEANUP, NULL);
+		rpc_transport_destroy (this);
 	}
 
 	ret = 0;
@@ -534,8 +941,6 @@ out:
         return ret;
 }
 
-
-
 //give negative values to skip setting that value
 //this function asserts if both the values are negative.
 //why call it if you dont set it.
@@ -562,65 +967,7 @@ out:
 }
 
 int
-rpc_transport_unix_options_build (dict_t **options, char *filepath,
-                                  int frame_timeout)
-{
-        dict_t                  *dict = NULL;
-        char                    *fpath = NULL;
-        int                     ret = -1;
-
-        GF_ASSERT (filepath);
-        GF_ASSERT (options);
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        fpath = gf_strdup (filepath);
-        if (!fpath) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = dict_set_dynstr (dict, "transport.socket.connect-path", fpath);
-        if (ret)
-                goto out;
-
-        ret = dict_set_str (dict, "transport.address-family", "unix");
-        if (ret)
-                goto out;
-
-        ret = dict_set_str (dict, "transport.socket.nodelay", "off");
-        if (ret)
-                goto out;
-
-        ret = dict_set_str (dict, "transport-type", "socket");
-        if (ret)
-                goto out;
-
-        ret = dict_set_str (dict, "transport.socket.keepalive", "off");
-        if (ret)
-                goto out;
-
-        if (frame_timeout > 0) {
-                ret = dict_set_int32 (dict, "frame-timeout", frame_timeout);
-                if (ret)
-                        goto out;
-        }
-
-        *options = dict;
-out:
-        if (ret) {
-                GF_FREE (fpath);
-                if (dict)
-                        dict_unref (dict);
-        }
-        return ret;
-}
-
-int
-rpc_transport_inet_options_build (dict_t **options, const char *hostname,
-                                  int port)
+rpc_transport_inet_options_build (dict_t **options, const char *hostname, int port)
 {
         dict_t          *dict = NULL;
         char            *host = NULL;
@@ -642,27 +989,27 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
 
         ret = dict_set_dynstr (dict, "remote-host", host);
         if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to set remote-host with %s", host);
+                gf_log ("", GF_LOG_WARNING, "failed to set remote-host with %s",
+                        host);
                 goto out;
         }
 
         ret = dict_set_int32 (dict, "remote-port", port);
         if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to set remote-port with %d", port);
+                gf_log ("", GF_LOG_WARNING, "failed to set remote-port with %d",
+                        port);
                 goto out;
         }
         ret = dict_set_str (dict, "transport.address-family", "inet");
         if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING,
+                gf_log ("", GF_LOG_WARNING,
                         "failed to set addr-family with inet");
                 goto out;
         }
 
         ret = dict_set_str (dict, "transport-type", "socket");
         if (ret) {
-                gf_log (THIS->name, GF_LOG_WARNING,
+                gf_log ("", GF_LOG_WARNING,
                         "failed to set trans-type with socket");
                 goto out;
         }
@@ -670,7 +1017,8 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
         *options = dict;
 out:
         if (ret) {
-                GF_FREE (host);
+                if (host)
+                        GF_FREE (host);
                 if (dict)
                         dict_unref (dict);
         }
diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h
index 2db9072ae..27470e47f 100644
--- a/rpc/rpc-lib/src/rpc-transport.h
+++ b/rpc/rpc-lib/src/rpc-transport.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __RPC_TRANSPORT_H__
@@ -31,15 +40,11 @@
 #define MAX_IOVEC 16
 #endif
 
-#ifndef AI_ADDRCONFIG
-#define AI_ADDRCONFIG 0
-#endif /* AI_ADDRCONFIG */
-
 /* Given the 4-byte fragment header, returns non-zero if this fragment
- * is the last fragment for the RPC record being assembled.
+ * is the last fragment for the RPC record being assemebled.
  * RPC Record marking standard defines a 32 bit value as the fragment
  * header with the MSB signifying whether the fragment is the last
- * fragment for the record being assembled.
+ * fragment for the record being asembled.
  */
 #define RPC_LASTFRAG(fraghdr) ((uint32_t)(fraghdr & 0x80000000U))
 
@@ -68,14 +73,9 @@ typedef struct rpc_transport rpc_transport_t;
 #include "rpcsvc-common.h"
 
 struct peer_info {
-        struct sockaddr_storage sockaddr;
-        socklen_t sockaddr_len;
-        char identifier[UNIX_PATH_MAX];
-        // OP-VERSION of clients
-        uint32_t max_op_version;
-        uint32_t min_op_version;
-        //Volume mounted by client
-        char volname[1024];
+	struct sockaddr_storage sockaddr;
+	socklen_t sockaddr_len;
+	char identifier[UNIX_PATH_MAX];
 };
 typedef struct peer_info peer_info_t;
 
@@ -178,42 +178,40 @@ typedef int (*rpc_transport_notify_t) (rpc_transport_t *, void *mydata,
 
 
 struct rpc_transport {
-        struct rpc_transport_ops  *ops;
+	struct rpc_transport_ops  *ops;
         rpc_transport_t           *listener; /* listener transport to which
                                               * request for creation of this
                                               * transport came from. valid only
                                               * on server process.
                                               */
-
-        void                      *private;
-        struct _client_t          *xl_private;
+        
+	void                      *private;
+        void                      *xl_private;
         void                      *xl;       /* Used for THIS */
-        void                      *mydata;
-        pthread_mutex_t            lock;
-        int32_t                    refcount;
-
-        int32_t                    outstanding_rpc_count;
+	void                      *mydata;
+	pthread_mutex_t            lock;
+	int32_t                    refcount;
 
         glusterfs_ctx_t           *ctx;
         dict_t                    *options;
         char                      *name;
-        void                      *dnscache;
-        void                      *drc_client;
-        data_t                    *buf;
-        int32_t                  (*init)   (rpc_transport_t *this);
-        void                     (*fini)   (rpc_transport_t *this);
+	void                      *dnscache;
+	data_t                    *buf;
+ 	int32_t                  (*init)   (rpc_transport_t *this);
+	void                     (*fini)   (rpc_transport_t *this);
+        int32_t                  (*validate_options) (rpc_transport_t *this, 
+                                                      char **op_errstr);
         int                      (*reconfigure) (rpc_transport_t *this, dict_t *options);
         rpc_transport_notify_t     notify;
         void                      *notify_data;
-        peer_info_t                peerinfo;
-        peer_info_t                myinfo;
+	peer_info_t                peerinfo;
+	peer_info_t                myinfo;
 
         uint64_t                   total_bytes_read;
         uint64_t                   total_bytes_write;
 
         struct list_head           list;
-        int                        bind_insecure;
-        void                      *dl_handle; /* handle of dlopen() */
+        int                        client_bind_insecure;
 };
 
 struct rpc_transport_ops {
@@ -224,9 +222,9 @@ struct rpc_transport_ops {
                                    rpc_transport_req_t *req);
         int32_t (*submit_reply)   (rpc_transport_t *this,
                                    rpc_transport_reply_t *reply);
-        int32_t (*connect)        (rpc_transport_t *this, int port);
-        int32_t (*listen)         (rpc_transport_t *this);
-        int32_t (*disconnect)     (rpc_transport_t *this);
+	int32_t (*connect)        (rpc_transport_t *this, int port);
+	int32_t (*listen)         (rpc_transport_t *this);
+	int32_t (*disconnect)     (rpc_transport_t *this);
         int32_t (*get_peername)   (rpc_transport_t *this, char *hostname,
                                    int hostlen);
         int32_t (*get_peeraddr)   (rpc_transport_t *this, char *peeraddr,
@@ -237,7 +235,6 @@ struct rpc_transport_ops {
         int32_t (*get_myaddr)     (rpc_transport_t *this, char *peeraddr,
                                    int addrlen, struct sockaddr_storage *sa,
                                    socklen_t sasize);
-        int32_t (*throttle)       (rpc_transport_t *this, gf_boolean_t onoff);
 };
 
 
@@ -291,9 +288,6 @@ int32_t
 rpc_transport_get_myaddr (rpc_transport_t *this, char *peeraddr, int addrlen,
                           struct sockaddr_storage *sa, size_t salen);
 
-int
-rpc_transport_throttle (rpc_transport_t *this, gf_boolean_t onoff);
-
 rpc_transport_pollin_t *
 rpc_transport_pollin_alloc (rpc_transport_t *this, struct iovec *vector,
                             int count, struct iobuf *hdr_iobuf,
@@ -306,9 +300,5 @@ rpc_transport_keepalive_options_set (dict_t *options, int32_t interval,
                                      int32_t time);
 
 int
-rpc_transport_unix_options_build (dict_t **options, char *filepath,
-                                  int frame_timeout);
-
-int
 rpc_transport_inet_options_build (dict_t **options, const char *hostname, int port);
 #endif /* __RPC_TRANSPORT_H__ */
diff --git a/rpc/rpc-lib/src/rpcsvc-auth.c b/rpc/rpc-lib/src/rpcsvc-auth.c
index 4cb86a758..8c0038e7f 100644
--- a/rpc/rpc-lib/src/rpcsvc-auth.c
+++ b/rpc/rpc-lib/src/rpcsvc-auth.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include "rpcsvc.h"
@@ -20,8 +29,6 @@ rpcsvc_auth_unix_init (rpcsvc_t *svc, dict_t *options);
 
 extern rpcsvc_auth_t *
 rpcsvc_auth_glusterfs_init (rpcsvc_t *svc, dict_t *options);
-extern rpcsvc_auth_t *
-rpcsvc_auth_glusterfs_v2_init (rpcsvc_t *svc, dict_t *options);
 
 int
 rpcsvc_auth_add_initer (struct list_head *list, char *idfier,
@@ -59,16 +66,6 @@ rpcsvc_auth_add_initers (rpcsvc_t *svc)
                 goto err;
         }
 
-
-        ret = rpcsvc_auth_add_initer (&svc->authschemes, "auth-glusterfs-v2",
-                                      (rpcsvc_auth_initer_t)
-                                      rpcsvc_auth_glusterfs_v2_init);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR,
-                        "Failed to add AUTH_GLUSTERFS-v2");
-                goto err;
-        }
-
         ret = rpcsvc_auth_add_initer (&svc->authschemes, "auth-unix",
                                       (rpcsvc_auth_initer_t)
                                       rpcsvc_auth_unix_init);
@@ -178,29 +175,6 @@ err:
 }
 
 int
-rpcsvc_set_addr_namelookup (rpcsvc_t *svc, dict_t *options)
-{
-        int             ret;
-        static char     *addrlookup_key = "rpc-auth.addr.namelookup";
-
-        if (!svc || !options)
-                return (-1);
-
-        /* By default it's disabled */
-        ret = dict_get_str_boolean (options, addrlookup_key, _gf_false);
-        if (ret < 0) {
-                svc->addr_namelookup = _gf_false;
-        } else {
-                svc->addr_namelookup = ret;
-        }
-
-        if (svc->addr_namelookup)
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "Addr-Name lookup enabled");
-
-        return (0);
-}
-
-int
 rpcsvc_set_allow_insecure (rpcsvc_t *svc, dict_t *options)
 {
         int             ret = -1;
@@ -227,26 +201,6 @@ rpcsvc_set_allow_insecure (rpcsvc_t *svc, dict_t *options)
 }
 
 int
-rpcsvc_set_root_squash (rpcsvc_t *svc, dict_t *options)
-{
-        int  ret = -1;
-
-        GF_ASSERT (svc);
-        GF_ASSERT (options);
-
-        ret = dict_get_str_boolean (options, "root-squash", 0);
-        if (ret != -1)
-                svc->root_squash = ret;
-        else
-                svc->root_squash = _gf_false;
-
-        if (svc->root_squash)
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "root squashing enabled ");
-
-        return 0;
-}
-
-int
 rpcsvc_auth_init (rpcsvc_t *svc, dict_t *options)
 {
         int             ret = -1;
@@ -255,8 +209,6 @@ rpcsvc_auth_init (rpcsvc_t *svc, dict_t *options)
                 return -1;
 
         (void) rpcsvc_set_allow_insecure (svc, options);
-        (void) rpcsvc_set_root_squash (svc, options);
-        (void) rpcsvc_set_addr_namelookup (svc, options);
         ret = rpcsvc_auth_add_initers (svc);
         if (ret == -1) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to add initers");
@@ -273,25 +225,6 @@ out:
         return ret;
 }
 
-int
-rpcsvc_auth_reconf (rpcsvc_t *svc, dict_t *options)
-{
-        int ret = 0;
-
-        if ((!svc) || (!options))
-                return (-1);
-
-        ret = rpcsvc_set_allow_insecure (svc, options);
-        if (ret)
-                return (-1);
-
-        ret = rpcsvc_set_root_squash (svc, options);
-        if (ret)
-                return (-1);
-
-        return rpcsvc_set_addr_namelookup (svc, options);
-}
-
 
 rpcsvc_auth_t *
 __rpcsvc_auth_get_handler (rpcsvc_request_t *req)
@@ -370,9 +303,6 @@ rpcsvc_auth_request_init (rpcsvc_request_t *req)
         if (!auth->authops->request_init)
                 ret = auth->authops->request_init (req, auth->authprivate);
 
-	req->auxgids = req->auxgidsmall; /* reset to auxgidlarge during
-					    unsersialize if necessary */
-	req->auxgidlarge = NULL;
 err:
         return ret;
 }
@@ -388,8 +318,8 @@ rpcsvc_authenticate (rpcsvc_request_t *req)
         if (!req)
                 return ret;
 
-        /* FIXME use rpcsvc_request_prog_minauth() */
-        minauth = 0;
+        //minauth = rpcsvc_request_prog_minauth (req);
+        minauth = 1;
         if (minauth > rpcsvc_request_cred_flavour (req)) {
                 gf_log (GF_RPCSVC, GF_LOG_WARNING, "Auth too weak");
                 rpcsvc_request_set_autherr (req, AUTH_TOOWEAK);
@@ -409,57 +339,6 @@ err:
         return ret;
 }
 
-int
-rpcsvc_auth_array (rpcsvc_t *svc, char *volname, int *autharr, int arrlen)
-{
-        int             count      = 0;
-        int             result     = RPCSVC_AUTH_REJECT;
-        char           *srchstr    = NULL;
-        int             ret        = 0;
-
-        struct rpcsvc_auth_list *auth = NULL;
-        struct rpcsvc_auth_list *tmp = NULL;
-
-        if ((!svc) || (!autharr) || (!volname))
-                return -1;
-
-        memset (autharr, 0, arrlen * sizeof(int));
-        if (list_empty (&svc->authschemes)) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "No authentication!");
-                goto err;
-        }
-
-        list_for_each_entry_safe (auth, tmp, &svc->authschemes, authlist) {
-                if (count >= arrlen)
-                        break;
-
-                result = gf_asprintf (&srchstr, "rpc-auth.%s.%s",
-                                      auth->name, volname);
-                if (result == -1) {
-                        count = -1;
-                        goto err;
-                }
-
-                ret = dict_get_str_boolean (svc->options, srchstr, 0xC00FFEE);
-                GF_FREE (srchstr);
-
-                switch (ret) {
-                case _gf_true:
-                        result = RPCSVC_AUTH_ACCEPT;
-                        autharr[count] = auth->auth->authnum;
-                        ++count;
-                        break;
-                case _gf_false:
-                        result = RPCSVC_AUTH_REJECT;
-                        break;
-                default:
-                        result = RPCSVC_AUTH_DONTCARE;
-                }
-        }
-
-err:
-        return count;
-}
 
 gid_t *
 rpcsvc_auth_unix_auxgids (rpcsvc_request_t *req, int *arrlen)
@@ -468,13 +347,9 @@ rpcsvc_auth_unix_auxgids (rpcsvc_request_t *req, int *arrlen)
                 return NULL;
 
         /* In case of AUTH_NULL auxgids are not used */
-        switch (req->cred.flavour) {
-        case AUTH_UNIX:
-        case AUTH_GLUSTERFS:
-        case AUTH_GLUSTERFS_v2:
-                break;
-        default:
-                gf_log ("rpc", GF_LOG_DEBUG, "auth type not unix or glusterfs");
+        if ((req->cred.flavour != AUTH_UNIX) &&
+            (req->cred.flavour != AUTH_GLUSTERFS)) {
+                gf_log ("", GF_LOG_DEBUG, "auth type not unix or glusterfs");
                 return NULL;
         }
 
diff --git a/rpc/rpc-lib/src/rpcsvc-common.h b/rpc/rpc-lib/src/rpcsvc-common.h
index aed55e039..f08b45c57 100644
--- a/rpc/rpc-lib/src/rpcsvc-common.h
+++ b/rpc/rpc-lib/src/rpcsvc-common.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPCSVC_COMMON_H
@@ -30,8 +39,6 @@ struct rpcsvc_state;
 typedef int (*rpcsvc_notify_t) (struct rpcsvc_state *, void *mydata,
                                 rpcsvc_event_t, void *data);
 
-struct drc_globals;
-typedef struct drc_globals rpcsvc_drc_globals_t;
 
 /* Contains global state required for all the RPC services.
  */
@@ -52,75 +59,24 @@ typedef struct rpcsvc_state {
         dict_t                  *options;
 
         /* Allow insecure ports. */
-        gf_boolean_t            allow_insecure;
-        gf_boolean_t            register_portmap;
-        gf_boolean_t            root_squash;
+        int                     allow_insecure;
+
         glusterfs_ctx_t         *ctx;
 
         /* list of connections which will listen for incoming connections */
-        struct list_head        listeners;
+        struct list_head         listeners;
 
         /* list of programs registered with rpcsvc */
-        struct list_head        programs;
+        struct list_head         programs;
 
         /* list of notification callbacks */
-        struct list_head        notify;
-        int                     notify_count;
+        struct list_head         notify;
+        int                      notify_count;
 
         void                    *mydata; /* This is xlator */
-        rpcsvc_notify_t         notifyfn;
+        rpcsvc_notify_t          notifyfn;
         struct mem_pool         *rxpool;
-        rpcsvc_drc_globals_t    *drc;
-
-	/* per-client limit of outstanding rpc requests */
-        int                     outstanding_rpc_limit;
-        gf_boolean_t            addr_namelookup;
 } rpcsvc_t;
 
-/* DRC START */
-enum drc_op_type {
-        DRC_NA              = 0,
-        DRC_IDEMPOTENT      = 1,
-        DRC_NON_IDEMPOTENT  = 2
-};
-typedef enum drc_op_type drc_op_type_t;
-
-enum drc_type {
-        DRC_TYPE_NONE        = 0,
-        DRC_TYPE_IN_MEMORY   = 1
-};
-typedef enum drc_type drc_type_t;
-
-enum drc_lru_factor {
-        DRC_LRU_5_PC       = 20,
-        DRC_LRU_10_PC      = 10,
-        DRC_LRU_25_PC      = 4,
-        DRC_LRU_50_PC      = 2
-};
-typedef enum drc_lru_factor drc_lru_factor_t;
-
-enum drc_xid_state {
-        DRC_XID_MONOTONOUS  = 0,
-        DRC_XID_WRAPPED     = 1
-};
-typedef enum drc_xid_state drc_xid_state_t;
-
-enum drc_op_state {
-        DRC_OP_IN_TRANSIT    = 0,
-        DRC_OP_CACHED        = 1
-};
-typedef enum drc_op_state drc_op_state_t;
-
-enum drc_policy {
-        DRC_LRU              = 0
-};
-typedef enum drc_policy drc_policy_t;
-
-/* Default policies for DRC */
-#define DRC_DEFAULT_TYPE               DRC_TYPE_IN_MEMORY
-#define DRC_DEFAULT_CACHE_SIZE         0x20000
-#define DRC_DEFAULT_LRU_FACTOR         DRC_LRU_25_PC
-
-/* DRC END */
 
 #endif /* #ifndef _RPCSVC_COMMON_H */
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 037c157f2..1ed0c562b 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -25,10 +34,6 @@
 #include "iobuf.h"
 #include "globals.h"
 #include "xdr-common.h"
-#include "xdr-generic.h"
-#include "rpc-common-xdr.h"
-#include "syncop.h"
-#include "rpc-drc.h"
 
 #include <errno.h>
 #include <pthread.h>
@@ -42,7 +47,6 @@
 #include <stdio.h>
 
 #include "xdr-rpcclnt.h"
-#include "glusterfs-acl.h"
 
 struct rpcsvc_program gluster_dump_prog;
 
@@ -101,63 +105,7 @@ out:
         return;
 }
 
-rpcsvc_vector_sizer
-rpcsvc_get_program_vector_sizer (rpcsvc_t *svc, uint32_t prognum,
-                                 uint32_t progver, uint32_t procnum)
-{
-        rpcsvc_program_t        *program = NULL;
-        char                    found    = 0;
 
-        if (!svc)
-                return NULL;
-
-        pthread_mutex_lock (&svc->rpclock);
-        {
-                list_for_each_entry (program, &svc->programs, program) {
-                        if ((program->prognum == prognum)
-                            && (program->progver == progver)) {
-                                found = 1;
-                                break;
-                        }
-                }
-        }
-        pthread_mutex_unlock (&svc->rpclock);
-
-        if (found)
-                return program->actors[procnum].vector_sizer;
-        else
-                return NULL;
-}
-
-int
-rpcsvc_request_outstanding (rpcsvc_t *svc, rpc_transport_t *trans, int delta)
-{
-        int ret = 0;
-        int old_count = 0;
-        int new_count = 0;
-        int limit = 0;
-
-        pthread_mutex_lock (&trans->lock);
-        {
-                limit = svc->outstanding_rpc_limit;
-                if (!limit)
-                        goto unlock;
-
-                old_count = trans->outstanding_rpc_count;
-                trans->outstanding_rpc_count += delta;
-                new_count = trans->outstanding_rpc_count;
-
-                if (old_count <= limit && new_count > limit)
-                        ret = rpc_transport_throttle (trans, _gf_true);
-
-                if (old_count > limit && new_count <= limit)
-                        ret = rpc_transport_throttle (trans, _gf_false);
-        }
-unlock:
-        pthread_mutex_unlock (&trans->lock);
-
-        return ret;
-}
 
 
 /* This needs to change to returning errors, since
@@ -195,11 +143,7 @@ rpcsvc_program_actor (rpcsvc_request_t *req)
 
         if (!found) {
                 if (err != PROG_MISMATCH) {
-                        /* log in DEBUG when nfs clients try to see if
-                         * ACL requests are accepted by nfs server
-                         */
-                        gf_log (GF_RPCSVC, (req->prognum == ACL_PROGRAM) ?
-                                GF_LOG_DEBUG : GF_LOG_WARNING,
+                        gf_log (GF_RPCSVC, GF_LOG_WARNING,
                                 "RPC program not available (req %u %u)",
                                 req->prognum, req->progver);
                         err = PROG_UNAVAIL;
@@ -238,8 +182,6 @@ rpcsvc_program_actor (rpcsvc_request_t *req)
                 goto err;
         }
 
-        req->synctask = program->synctask;
-
         err = SUCCESS;
         gf_log (GF_RPCSVC, GF_LOG_TRACE, "Actor found: %s - %s",
                 program->progname, actor->procname);
@@ -252,9 +194,9 @@ err:
 
 
 /* this procedure can only pass 4 arguments to registered notifyfn. To send more
- * arguments call wrapper->notify directly.
+ * arguements call wrapper->notify directly.
  */
-static inline void
+inline void
 rpcsvc_program_notify (rpcsvc_listener_t *listener, rpcsvc_event_t event,
                        void *data)
 {
@@ -277,7 +219,7 @@ out:
 }
 
 
-static inline int
+inline int
 rpcsvc_accept (rpcsvc_t *svc, rpc_transport_t *listen_trans,
                rpc_transport_t *new_trans)
 {
@@ -307,21 +249,9 @@ rpcsvc_request_destroy (rpcsvc_request_t *req)
                 iobref_unref (req->iobref);
         }
 
-        if (req->hdr_iobuf)
-                iobuf_unref (req->hdr_iobuf);
-
-        /* This marks the "end" of an RPC request. Reply is
-           completely written to the socket and is on the way
-           to the client. It is time to decrement the
-           outstanding request counter by 1.
-        */
-        rpcsvc_request_outstanding (req->svc, req->trans, -1);
-
         rpc_transport_unref (req->trans);
 
-	GF_FREE (req->auxgidlarge);
-
-        mem_put (req);
+        mem_put (req->svc->rxpool, req);
 
 out:
         return;
@@ -350,9 +280,7 @@ rpcsvc_request_init (rpcsvc_t *svc, rpc_transport_t *trans,
         req->msg[0] = progmsg;
         req->iobref = iobref_ref (msg->iobref);
         if (msg->vectored) {
-                /* msg->vector[2] is defined in structure. prevent a
-                   out of bound access */
-                for (i = 1; i < min (msg->count, 2); i++) {
+                for (i = 1; i < msg->count; i++) {
                         req->msg[i] = msg->vector[i];
                 }
         }
@@ -403,12 +331,6 @@ rpcsvc_request_create (rpcsvc_t *svc, rpc_transport_t *trans,
                 goto err;
         }
 
-        /* We just received a new request from the wire. Account for
-           it in the outsanding request counter to make sure we don't
-           ingest too many concurrent requests from the same client.
-        */
-        ret = rpcsvc_request_outstanding (svc, trans, +1);
-
         msgbuf = msg->vector[0].iov_base;
         msglen = msg->vector[0].iov_len;
 
@@ -468,7 +390,6 @@ rpcsvc_request_create (rpcsvc_t *svc, rpc_transport_t *trans,
          * since we are not handling authentication failures for now.
          */
         req->rpc_status = MSG_ACCEPTED;
-        req->reply = NULL;
         ret = 0;
 err:
         if (ret == -1) {
@@ -484,39 +405,14 @@ err:
 
 
 int
-rpcsvc_check_and_reply_error (int ret, call_frame_t *frame, void *opaque)
-{
-        rpcsvc_request_t  *req = NULL;
-
-        req = opaque;
-
-        if (ret)
-                gf_log ("rpcsvc", GF_LOG_ERROR,
-                        "rpc actor failed to complete successfully");
-
-        if (ret == RPCSVC_ACTOR_ERROR) {
-                ret = rpcsvc_error_reply (req);
-                if (ret)
-                        gf_log ("rpcsvc", GF_LOG_WARNING,
-                                "failed to queue error reply");
-        }
-
-        return 0;
-}
-
-int
 rpcsvc_handle_rpc_call (rpcsvc_t *svc, rpc_transport_t *trans,
                         rpc_transport_pollin_t *msg)
 {
-        rpcsvc_actor_t         *actor          = NULL;
-        rpcsvc_actor            actor_fn       = NULL;
-        rpcsvc_request_t       *req            = NULL;
-        int                     ret            = -1;
-        uint16_t                port           = 0;
-        gf_boolean_t            is_unix        = _gf_false;
-        gf_boolean_t            unprivileged   = _gf_false;
-        drc_cached_op_t        *reply          = NULL;
-        rpcsvc_drc_globals_t   *drc            = NULL;
+        rpcsvc_actor_t          *actor = NULL;
+        rpcsvc_request_t        *req = NULL;
+        int                     ret = -1;
+        uint16_t                port = 0;
+        gf_boolean_t            is_unix = _gf_false;
 
         if (!trans || !svc)
                 return -1;
@@ -546,13 +442,16 @@ rpcsvc_handle_rpc_call (rpcsvc_t *svc, rpc_transport_t *trans,
 
                 gf_log ("rpcsvc", GF_LOG_TRACE, "Client port: %d", (int)port);
 
-                if (port > 1024)
-                        unprivileged = _gf_true;
+                if ((port > 1024) && (0 == svc->allow_insecure)) {  //Non-privileged user, fail request
+                        gf_log ("glusterd", GF_LOG_ERROR, "Request received from non-"
+                                "privileged port. Failing request");
+                        return -1;
+                }
         }
 
         req = rpcsvc_request_create (svc, trans, msg);
         if (!req)
-                goto out;
+                goto err;
 
         if (!rpcsvc_request_accepted (req))
                 goto err_reply;
@@ -561,85 +460,40 @@ rpcsvc_handle_rpc_call (rpcsvc_t *svc, rpc_transport_t *trans,
         if (!actor)
                 goto err_reply;
 
-        if (0 == svc->allow_insecure && unprivileged && !actor->unprivileged) {
-                        /* Non-privileged user, fail request */
-                        gf_log ("glusterd", GF_LOG_ERROR,
-                                "Request received from non-"
-                                "privileged port. Failing request");
-                        rpcsvc_request_destroy (req);
-                        return -1;
-        }
-
-        /* DRC */
-        if (rpcsvc_need_drc (req)) {
-                drc = req->svc->drc;
-
-                LOCK (&drc->lock);
-                reply = rpcsvc_drc_lookup (req);
-
-                /* retransmission of completed request, send cached reply */
-                if (reply && reply->state == DRC_OP_CACHED) {
-                        gf_log (GF_RPCSVC, GF_LOG_INFO, "duplicate request:"
-                                " XID: 0x%x", req->xid);
-                        ret = rpcsvc_send_cached_reply (req, reply);
-                        drc->cache_hits++;
-                        UNLOCK (&drc->lock);
-                        goto out;
-
-                } /* retransmitted request, original op in transit, drop it */
-                else if (reply && reply->state == DRC_OP_IN_TRANSIT) {
-                        gf_log (GF_RPCSVC, GF_LOG_INFO, "op in transit,"
-                                " discarding. XID: 0x%x", req->xid);
-                        ret = 0;
-                        drc->intransit_hits++;
-                        rpcsvc_request_destroy (req);
-                        UNLOCK (&drc->lock);
-                        goto out;
-
-                } /* fresh request, cache it as in-transit and proceed */
-                else {
-                        ret = rpcsvc_cache_request (req);
-                }
-                UNLOCK (&drc->lock);
-        }
-
-        if (req->rpc_err == SUCCESS) {
+        if (actor && (req->rpc_err == SUCCESS)) {
                 /* Before going to xlator code, set the THIS properly */
                 THIS = svc->mydata;
 
-                actor_fn = actor->actor;
-
-                if (!actor_fn) {
-                        rpcsvc_request_seterr (req, PROC_UNAVAIL);
-                        /* LOG TODO: print more info about procnum,
-                           prognum etc, also print transport info */
-                        gf_log (GF_RPCSVC, GF_LOG_ERROR,
-                                "No vectored handler present");
-                        ret = RPCSVC_ACTOR_ERROR;
-                        goto err_reply;
-                }
-
-                if (req->synctask) {
-                        if (msg->hdr_iobuf)
-                                req->hdr_iobuf = iobuf_ref (msg->hdr_iobuf);
-
-                        ret = synctask_new (THIS->ctx->env,
-                                            (synctask_fn_t) actor_fn,
-                                            rpcsvc_check_and_reply_error, NULL,
-                                            req);
-                } else {
-                        ret = actor_fn (req);
+                if (req->count == 2) {
+                        if (actor->vector_actor) {
+                                ret = actor->vector_actor (req, &req->msg[1], 1,
+                                                           req->iobref);
+                        } else {
+                                rpcsvc_request_seterr (req, PROC_UNAVAIL);
+                                /* LOG TODO: print more info about procnum,
+                                   prognum etc, also print transport info */
+                                gf_log (GF_RPCSVC, GF_LOG_ERROR,
+                                        "No vectored handler present");
+                                ret = RPCSVC_ACTOR_ERROR;
+                        }
+                } else if (actor->actor) {
+                        ret = actor->actor (req);
                 }
         }
 
 err_reply:
+        if (ret == RPCSVC_ACTOR_ERROR) {
+                ret = rpcsvc_error_reply (req);
+        }
+
+        if (ret)
+                gf_log ("rpcsvc", GF_LOG_WARNING, "failed to queue error reply");
 
-        ret = rpcsvc_check_and_reply_error (ret, NULL, req);
         /* No need to propagate error beyond this function since the reply
          * has now been queued. */
         ret = 0;
 
-out:
+err:
         return ret;
 }
 
@@ -651,49 +505,46 @@ rpcsvc_handle_disconnect (rpcsvc_t *svc, rpc_transport_t *trans)
         rpcsvc_notify_wrapper_t *wrappers = NULL, *wrapper;
         int32_t                  ret      = -1, i = 0, wrapper_count = 0;
         rpcsvc_listener_t       *listener = NULL;
-
+ 
         event = (trans->listener == NULL) ? RPCSVC_EVENT_LISTENER_DEAD
                 : RPCSVC_EVENT_DISCONNECT;
-
+ 
         pthread_mutex_lock (&svc->rpclock);
         {
-                if (!svc->notify_count)
-                        goto unlock;
-
                 wrappers = GF_CALLOC (svc->notify_count, sizeof (*wrapper),
                                       gf_common_mt_rpcsvc_wrapper_t);
                 if (!wrappers) {
                         goto unlock;
                 }
-
+ 
                 list_for_each_entry (wrapper, &svc->notify, list) {
                         if (wrapper->notify) {
                                 wrappers[i++] = *wrapper;
                         }
                 }
-
+ 
                 wrapper_count = i;
         }
 unlock:
         pthread_mutex_unlock (&svc->rpclock);
-
+ 
         if (wrappers) {
                 for (i = 0; i < wrapper_count; i++) {
                         wrappers[i].notify (svc, wrappers[i].data,
                                             event, trans);
                 }
-
+ 
                 GF_FREE (wrappers);
         }
-
+ 
         if (event == RPCSVC_EVENT_LISTENER_DEAD) {
                 listener = rpcsvc_get_listener (svc, -1, trans->listener);
                 rpcsvc_listener_destroy (listener);
         }
-
+ 
         return ret;
 }
-
+ 
 
 int
 rpcsvc_notify (rpc_transport_t *trans, void *mydata,
@@ -800,7 +651,7 @@ err:
         return txrecord;
 }
 
-static inline int
+inline int
 rpcsvc_get_callid (rpcsvc_t *rpc)
 {
         return GF_UNIVERSAL_ANSWER;
@@ -883,36 +734,33 @@ rpcsvc_callback_build_record (rpcsvc_t *rpc, int prognum, int progver,
         char                    *record      = NULL;
         struct iovec             recordhdr   = {0, };
         size_t                   pagesize    = 0;
-        size_t                   xdr_size    = 0;
         int                      ret         = -1;
 
         if ((!rpc) || (!recbuf)) {
                 goto out;
         }
 
-        /* Fill the rpc structure and XDR it into the buffer got above. */
-        ret = rpcsvc_fill_callback (prognum, progver, procnum, payload, xid,
-                                    &request);
-        if (ret == -1) {
-                gf_log ("rpcsvc", GF_LOG_WARNING, "cannot build a rpc-request "
-                        "xid (%"PRIu64")", xid);
-                goto out;
-        }
-
         /* First, try to get a pointer into the buffer which the RPC
          * layer can use.
          */
-        xdr_size = xdr_sizeof ((xdrproc_t)xdr_callmsg, &request);
-
-        request_iob = iobuf_get2 (rpc->ctx->iobuf_pool, (xdr_size + payload));
+        request_iob = iobuf_get (rpc->ctx->iobuf_pool);
         if (!request_iob) {
                 goto out;
         }
 
-        pagesize = iobuf_pagesize (request_iob);
+        pagesize = ((struct iobuf_pool *)rpc->ctx->iobuf_pool)->page_size;
 
         record = iobuf_ptr (request_iob);  /* Now we have it. */
 
+        /* Fill the rpc structure and XDR it into the buffer got above. */
+        ret = rpcsvc_fill_callback (prognum, progver, procnum, payload, xid,
+                                    &request);
+        if (ret == -1) {
+                gf_log ("rpcsvc", GF_LOG_WARNING, "cannot build a rpc-request "
+                        "xid (%"PRIu64")", xid);
+                goto out;
+        }
+
         recordhdr = rpcsvc_callback_build_header (record, pagesize, &request,
                                                   payload);
 
@@ -986,22 +834,21 @@ out:
         return ret;
 }
 
-int
-rpcsvc_transport_submit (rpc_transport_t *trans, struct iovec *rpchdr,
-                         int rpchdrcount, struct iovec *proghdr,
-                         int proghdrcount, struct iovec *progpayload,
-                         int progpayloadcount, struct iobref *iobref,
-                         void *priv)
+inline int
+rpcsvc_transport_submit (rpc_transport_t *trans, struct iovec *hdrvec,
+                         int hdrcount, struct iovec *proghdr, int proghdrcount,
+                         struct iovec *progpayload, int progpayloadcount,
+                         struct iobref *iobref, void *priv)
 {
         int                   ret   = -1;
         rpc_transport_reply_t reply = {{0, }};
 
-        if ((!trans) || (!rpchdr) || (!rpchdr->iov_base)) {
+        if ((!trans) || (!hdrvec) || (!hdrvec->iov_base)) {
                 goto out;
         }
 
-        reply.msg.rpchdr = rpchdr;
-        reply.msg.rpchdrcount = rpchdrcount;
+        reply.msg.rpchdr = hdrvec;
+        reply.msg.rpchdrcount = hdrcount;
         reply.msg.proghdr = proghdr;
         reply.msg.proghdrcount = proghdrcount;
         reply.msg.progpayload = progpayload;
@@ -1057,14 +904,13 @@ out:
  */
 struct iobuf *
 rpcsvc_record_build_record (rpcsvc_request_t *req, size_t payload,
-                            size_t hdrlen, struct iovec *recbuf)
+                            struct iovec *recbuf)
 {
         struct rpc_msg          reply;
         struct iobuf            *replyiob = NULL;
         char                    *record = NULL;
         struct iovec            recordhdr = {0, };
         size_t                  pagesize = 0;
-        size_t                  xdr_size = 0;
         rpcsvc_t                *svc = NULL;
         int                     ret = -1;
 
@@ -1072,25 +918,19 @@ rpcsvc_record_build_record (rpcsvc_request_t *req, size_t payload,
                 return NULL;
 
         svc = req->svc;
-
-        /* Fill the rpc structure and XDR it into the buffer got above. */
-        ret = rpcsvc_fill_reply (req, &reply);
-        if (ret)
-                goto err_exit;
-
-        xdr_size = xdr_sizeof ((xdrproc_t)xdr_replymsg, &reply);
-
-        /* Payload would include 'readv' size etc too, where as
-           that comes as another payload iobuf */
-        replyiob = iobuf_get2 (svc->ctx->iobuf_pool, (xdr_size + hdrlen));
+        replyiob = iobuf_get (svc->ctx->iobuf_pool);
+        pagesize = iobpool_pagesize ((struct iobuf_pool *)svc->ctx->iobuf_pool);
         if (!replyiob) {
                 goto err_exit;
         }
 
-        pagesize = iobuf_pagesize (replyiob);
-
         record = iobuf_ptr (replyiob);  /* Now we have it. */
 
+        /* Fill the rpc structure and XDR it into the buffer got above. */
+        ret = rpcsvc_fill_reply (req, &reply);
+        if (ret)
+                goto err_exit;
+
         recordhdr = rpcsvc_record_build_header (record, pagesize, reply,
                                                 payload);
         if (!recordhdr.iov_base) {
@@ -1145,9 +985,7 @@ rpcsvc_submit_generic (rpcsvc_request_t *req, struct iovec *proghdr,
         struct iovec            recordhdr  = {0, };
         rpc_transport_t        *trans      = NULL;
         size_t                  msglen     = 0;
-        size_t                  hdrlen     = 0;
         char                    new_iobref = 0;
-        rpcsvc_drc_globals_t   *drc        = NULL;
 
         if ((!req) || (!req->trans))
                 return -1;
@@ -1165,7 +1003,7 @@ rpcsvc_submit_generic (rpcsvc_request_t *req, struct iovec *proghdr,
         gf_log (GF_RPCSVC, GF_LOG_TRACE, "Tx message: %zu", msglen);
 
         /* Build the buffer containing the encoded RPC reply. */
-        replyiob = rpcsvc_record_build_record (req, msglen, hdrlen, &recordhdr);
+        replyiob = rpcsvc_record_build_record (req, msglen, &recordhdr);
         if (!replyiob) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR,"Reply record creation failed");
                 goto disconnect_exit;
@@ -1182,31 +1020,20 @@ rpcsvc_submit_generic (rpcsvc_request_t *req, struct iovec *proghdr,
 
         iobref_add (iobref, replyiob);
 
-        /* cache the request in the duplicate request cache for appropriate ops */
-        if (req->reply) {
-                drc = req->svc->drc;
-
-                LOCK (&drc->lock);
-                ret = rpcsvc_cache_reply (req, iobref, &recordhdr, 1,
-                                          proghdr, hdrcount,
-                                          payload, payloadcount);
-                UNLOCK (&drc->lock);
-        }
-
         ret = rpcsvc_transport_submit (trans, &recordhdr, 1, proghdr, hdrcount,
                                        payload, payloadcount, iobref,
                                        req->trans_private);
 
         if (ret == -1) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "failed to submit message "
-                        "(XID: 0x%x, Program: %s, ProgVers: %d, Proc: %d) to "
+                        "(XID: 0x%ux, Program: %s, ProgVers: %d, Proc: %d) to "
                         "rpc-transport (%s)", req->xid,
                         req->prog ? req->prog->progname : "(not matched)",
                         req->prog ? req->prog->progver : 0,
                         req->procnum, trans->name);
         } else {
                 gf_log (GF_RPCSVC, GF_LOG_TRACE,
-                        "submitted reply for rpc-message (XID: 0x%x, "
+                        "submitted reply for rpc-message (XID: 0x%ux, "
                         "Program: %s, ProgVers: %d, Proc: %d) to rpc-transport "
                         "(%s)", req->xid, req->prog ? req->prog->progname: "-",
                         req->prog ? req->prog->progver : 0,
@@ -1236,7 +1063,7 @@ rpcsvc_error_reply (rpcsvc_request_t *req)
         if (!req)
                 return -1;
 
-        gf_log_callingfn ("", GF_LOG_DEBUG, "sending a RPC error reply");
+        gf_log_callingfn ("", GF_LOG_WARNING, "sending a RPC error reply");
 
         /* At this point the req should already have been filled with the
          * appropriate RPC error numbers.
@@ -1249,13 +1076,12 @@ rpcsvc_error_reply (rpcsvc_request_t *req)
 inline int
 rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port)
 {
-        int                ret   = -1; /* FAIL */
+        int                ret   = 0;
 
         if (!newprog) {
                 goto out;
         }
 
-        /* pmap_set() returns 0 for FAIL and 1 for SUCCESS */
         if (!(pmap_set (newprog->prognum, newprog->progver, IPPROTO_TCP,
                         port))) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "Could not register with"
@@ -1263,7 +1089,7 @@ rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port)
                 goto out;
         }
 
-        ret = 0; /* SUCCESS */
+        ret = 0;
 out:
         return ret;
 }
@@ -1272,7 +1098,7 @@ out:
 inline int
 rpcsvc_program_unregister_portmap (rpcsvc_program_t *prog)
 {
-        int ret = -1;
+        int ret = 0;
 
         if (!prog)
                 goto out;
@@ -1288,11 +1114,6 @@ out:
         return ret;
 }
 
-int
-rpcsvc_register_portmap_enabled (rpcsvc_t *svc)
-{
-        return svc->register_portmap;
-}
 
 int32_t
 rpcsvc_get_listener_port (rpcsvc_listener_t *listener)
@@ -1331,7 +1152,7 @@ rpcsvc_get_listener (rpcsvc_t *svc, uint16_t port, rpc_transport_t *trans)
 {
         rpcsvc_listener_t  *listener      = NULL;
         char                found         = 0;
-        uint32_t            listener_port = 0;
+        uint32_t            listener_port = 0; 
 
         if (!svc) {
                 goto out;
@@ -1394,44 +1215,28 @@ rpcsvc_submit_message (rpcsvc_request_t *req, struct iovec *proghdr,
 
 
 int
-rpcsvc_program_unregister (rpcsvc_t *svc, rpcsvc_program_t *program)
+rpcsvc_program_unregister (rpcsvc_t *svc, rpcsvc_program_t *prog)
 {
         int                     ret = -1;
-        rpcsvc_program_t        *prog = NULL;
-        if (!svc || !program) {
+
+        if (!svc || !prog) {
                 goto out;
         }
 
-        ret = rpcsvc_program_unregister_portmap (program);
+        ret = rpcsvc_program_unregister_portmap (prog);
         if (ret == -1) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "portmap unregistration of"
                         " program failed");
                 goto out;
         }
 
-        pthread_mutex_lock (&svc->rpclock);
-        {
-                list_for_each_entry (prog, &svc->programs, program) {
-                        if ((prog->prognum == program->prognum)
-                            && (prog->progver == program->progver)) {
-                                break;
-                        }
-                }
-        }
-        pthread_mutex_unlock (&svc->rpclock);
-
-        if (prog == NULL) {
-                ret = -1;
-                goto out;
-        }
-
         gf_log (GF_RPCSVC, GF_LOG_DEBUG, "Program unregistered: %s, Num: %d,"
                 " Ver: %d, Port: %d", prog->progname, prog->prognum,
                 prog->progver, prog->progport);
 
         pthread_mutex_lock (&svc->rpclock);
         {
-                list_del_init (&prog->program);
+                list_del (&prog->program);
         }
         pthread_mutex_unlock (&svc->rpclock);
 
@@ -1439,8 +1244,8 @@ rpcsvc_program_unregister (rpcsvc_t *svc, rpcsvc_program_t *program)
 out:
         if (ret == -1) {
                 gf_log (GF_RPCSVC, GF_LOG_ERROR, "Program unregistration failed"
-                        ": %s, Num: %d, Ver: %d, Port: %d", program->progname,
-                        program->prognum, program->progver, program->progport);
+                        ": %s, Num: %d, Ver: %d, Port: %d", prog->progname,
+                        prog->prognum, prog->progver, prog->progport);
         }
 
         return ret;
@@ -1538,7 +1343,7 @@ rpcsvc_create_listener (rpcsvc_t *svc, dict_t *options, char *name)
 {
         rpc_transport_t   *trans    = NULL;
         rpcsvc_listener_t *listener = NULL;
-        int32_t            ret      = -1;
+        int32_t            ret      = -1; 
 
         if (!svc || !options) {
                 goto out;
@@ -1629,7 +1434,6 @@ rpcsvc_create_listeners (rpcsvc_t *svc, dict_t *options, char *name)
                 }
 
                 GF_FREE (transport_name);
-                transport_name = NULL;
                 count++;
         }
 
@@ -1641,13 +1445,17 @@ rpcsvc_create_listeners (rpcsvc_t *svc, dict_t *options, char *name)
         transport_type = NULL;
 
 out:
-        GF_FREE (str);
-
-        GF_FREE (transport_type);
+        if (str != NULL) {
+                GF_FREE (str);
+        }
 
-        GF_FREE (tmp);
+        if (transport_type != NULL) {
+                GF_FREE (transport_type);
+        }
 
-        GF_FREE (transport_name);
+        if (tmp != NULL) {
+                GF_FREE (tmp);
+        }
 
         return count;
 }
@@ -1769,6 +1577,7 @@ out:
         return ret;
 }
 
+
 static void
 free_prog_details (gf_dump_rsp *rsp)
 {
@@ -1824,17 +1633,15 @@ rpcsvc_dump (rpcsvc_request_t *req)
         uint32_t     dump_rsp_len      = 0;
 
         if (!req)
-                goto sendrsp;
+                goto fail;
 
         ret = build_prog_details (req, &rsp);
         if (ret < 0) {
                 op_errno = -ret;
-                goto sendrsp;
+                goto fail;
         }
 
-        op_errno = 0;
-
-sendrsp:
+fail:
         rsp.op_errno = gf_errno_to_error (op_errno);
         rsp.op_ret   = ret;
 
@@ -1844,14 +1651,17 @@ sendrsp:
         iov.iov_base = rsp_buf;
         iov.iov_len  = dump_rsp_len;
 
-        ret = xdr_serialize_generic (iov, &rsp, (xdrproc_t)xdr_gf_dump_rsp);
+        ret = xdr_serialize_dump_rsp (iov, &rsp);
         if (ret < 0) {
-                ret = RPCSVC_ACTOR_ERROR;
-        } else {
-                rpcsvc_submit_generic (req, &iov, 1, NULL, 0, NULL);
-                ret = 0;
+                if (req)
+                        req->rpc_err = GARBAGE_ARGS;
+                op_errno = EINVAL;
+                goto fail;
         }
 
+        ret = rpcsvc_submit_generic (req, &iov, 1, NULL, 0,
+                                     NULL);
+
         free_prog_details (&rsp);
 
         return ret;
@@ -1860,119 +1670,8 @@ sendrsp:
 int
 rpcsvc_init_options (rpcsvc_t *svc, dict_t *options)
 {
-        char            *optstr = NULL;
-        int             ret = -1;
-
-        if ((!svc) || (!options))
-                return -1;
-
         svc->memfactor = RPCSVC_DEFAULT_MEMFACTOR;
-
-        svc->register_portmap = _gf_true;
-        if (dict_get (options, "rpc.register-with-portmap")) {
-                ret = dict_get_str (options, "rpc.register-with-portmap",
-                                    &optstr);
-                if (ret < 0) {
-                        gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to parse "
-                                "dict");
-                        goto out;
-                }
-
-                ret = gf_string2boolean (optstr, &svc->register_portmap);
-                if (ret < 0) {
-                        gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to parse bool "
-                                "string");
-                        goto out;
-                }
-        }
-
-        if (!svc->register_portmap)
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "Portmap registration "
-                        "disabled");
-
-        ret = rpcsvc_set_outstanding_rpc_limit (svc, options);
-out:
-        return ret;
-}
-
-int
-rpcsvc_reconfigure_options (rpcsvc_t *svc, dict_t *options)
-{
-        xlator_t         *xlator    = NULL;
-        xlator_list_t    *volentry  = NULL;
-        char             *srchkey   = NULL;
-        char             *keyval    = NULL;
-        int              ret        = -1;
-
-        if ((!svc) || (!svc->options) || (!options))
-                return (-1);
-
-        /* Fetch the xlator from svc */
-        xlator = (xlator_t *) svc->mydata;
-        if (!xlator)
-                return (-1);
-
-        /* Reconfigure the volume specific rpc-auth.addr allow part */
-        volentry = xlator->children;
-        while (volentry) {
-                ret = gf_asprintf (&srchkey, "rpc-auth.addr.%s.allow",
-                                             volentry->xlator->name);
-                if (ret == -1) {
-                        gf_log (GF_RPCSVC, GF_LOG_ERROR, "asprintf failed");
-                        return (-1);
-                }
-
-                /* If found the srchkey, delete old key/val pair
-                 * and set the key with new value.
-                 */
-                if (!dict_get_str (options, srchkey, &keyval)) {
-                        dict_del (svc->options, srchkey);
-                        ret = dict_set_str (svc->options, srchkey, keyval);
-                        if (ret < 0) {
-                                gf_log (GF_RPCSVC, GF_LOG_ERROR,
-                                        "dict_set_str error");
-                                GF_FREE (srchkey);
-                                return (-1);
-                        }
-                }
-
-                GF_FREE (srchkey);
-                volentry = volentry->next;
-        }
-
-        /* Reconfigure the volume specific rpc-auth.addr reject part */
-        volentry = xlator->children;
-        while (volentry) {
-                ret = gf_asprintf (&srchkey, "rpc-auth.addr.%s.reject",
-                                             volentry->xlator->name);
-                if (ret == -1) {
-                        gf_log (GF_RPCSVC, GF_LOG_ERROR, "asprintf failed");
-                        return (-1);
-                }
-
-                /* If found the srchkey, delete old key/val pair
-                 * and set the key with new value.
-                 */
-                if (!dict_get_str (options, srchkey, &keyval)) {
-                        dict_del (svc->options, srchkey);
-                        ret = dict_set_str (svc->options, srchkey, keyval);
-                        if (ret < 0) {
-                                gf_log (GF_RPCSVC, GF_LOG_ERROR,
-                                        "dict_set_str error");
-                                GF_FREE (srchkey);
-                                return (-1);
-                        }
-                }
-
-                GF_FREE (srchkey);
-                volentry = volentry->next;
-        }
-
-        ret = rpcsvc_init_options (svc, options);
-        if (ret)
-                return (-1);
-
-        return rpcsvc_auth_reconf (svc, options);
+        return 0;
 }
 
 int
@@ -2014,63 +1713,21 @@ rpcsvc_transport_unix_options_build (dict_t **options, char *filepath)
         *options = dict;
 out:
         if (ret) {
-                GF_FREE (fpath);
+                if (fpath)
+                        GF_FREE (fpath);
                 if (dict)
                         dict_unref (dict);
         }
         return ret;
 }
 
-/*
- * Reconfigure() the rpc.outstanding-rpc-limit param.
- */
-int
-rpcsvc_set_outstanding_rpc_limit (rpcsvc_t *svc, dict_t *options)
-{
-        int            ret        = -1; /* FAILURE */
-        int            rpclim     = 0;
-        static char    *rpclimkey = "rpc.outstanding-rpc-limit";
-
-        if ((!svc) || (!options))
-                return (-1);
-
-        /* Reconfigure() the rpc.outstanding-rpc-limit param */
-        ret = dict_get_int32 (options, rpclimkey, &rpclim);
-        if (ret < 0) {
-                /* Fall back to default for FAILURE */
-                rpclim = RPCSVC_DEFAULT_OUTSTANDING_RPC_LIMIT;
-        } else {
-                /* SUCCESS: round off to multiple of 8.
-                 * If the input value fails Boundary check, fall back to
-                 * default i.e. RPCSVC_DEFAULT_OUTSTANDING_RPC_LIMIT.
-                 * NB: value 0 is special, means its unset i.e. unlimited.
-                 */
-                rpclim = ((rpclim + 8 - 1) >> 3) * 8;
-                if (rpclim < RPCSVC_MIN_OUTSTANDING_RPC_LIMIT) {
-                        rpclim = RPCSVC_DEFAULT_OUTSTANDING_RPC_LIMIT;
-                } else if (rpclim > RPCSVC_MAX_OUTSTANDING_RPC_LIMIT) {
-                        rpclim = RPCSVC_MAX_OUTSTANDING_RPC_LIMIT;
-                }
-        }
-
-        if (svc->outstanding_rpc_limit != rpclim) {
-                svc->outstanding_rpc_limit = rpclim;
-                gf_log (GF_RPCSVC, GF_LOG_INFO,
-                                   "Configured %s with value %d",
-                                   rpclimkey, rpclim);
-        }
-
-        return (0);
-}
-
 /* The global RPC service initializer.
  */
 rpcsvc_t *
-rpcsvc_init (xlator_t *xl, glusterfs_ctx_t *ctx, dict_t *options,
-             uint32_t poolcount)
+rpcsvc_init (glusterfs_ctx_t *ctx, dict_t *options)
 {
         rpcsvc_t          *svc              = NULL;
-        int                ret              = -1;
+        int                ret              = -1, poolcount = 0;
 
         if ((!ctx) || (!options))
                 return NULL;
@@ -2091,8 +1748,7 @@ rpcsvc_init (xlator_t *xl, glusterfs_ctx_t *ctx, dict_t *options,
                 goto free_svc;
         }
 
-        if (!poolcount)
-                poolcount = RPCSVC_POOLCOUNT_MULT * svc->memfactor;
+        poolcount   = RPCSVC_POOLCOUNT_MULT * svc->memfactor;
 
         gf_log (GF_RPCSVC, GF_LOG_TRACE, "rx pool: %d", poolcount);
         svc->rxpool = mem_pool_new (rpcsvc_request_t, poolcount);
@@ -2112,7 +1768,6 @@ rpcsvc_init (xlator_t *xl, glusterfs_ctx_t *ctx, dict_t *options,
         ret = -1;
         svc->options = options;
         svc->ctx = ctx;
-        svc->mydata = xl;
         gf_log (GF_RPCSVC, GF_LOG_DEBUG, "RPC service inited.");
 
         gluster_dump_prog.options = options;
@@ -2123,7 +1778,6 @@ rpcsvc_init (xlator_t *xl, glusterfs_ctx_t *ctx, dict_t *options,
                         "failed to register DUMP program");
                 goto free_svc;
         }
-
         ret = 0;
 free_svc:
         if (ret == -1) {
@@ -2135,339 +1789,10 @@ free_svc:
 }
 
 
-int
-rpcsvc_transport_peer_check_search (dict_t *options, char *pattern,
-                                    char *ip, char *hostname)
-{
-        int                      ret           = -1;
-        char                    *addrtok       = NULL;
-        char                    *addrstr       = NULL;
-        char                    *dup_addrstr   = NULL;
-        char                    *svptr         = NULL;
-
-        if ((!options) || (!ip))
-                return -1;
-
-        ret = dict_get_str (options, pattern, &addrstr);
-        if (ret < 0) {
-                ret = -1;
-                goto err;
-        }
-
-        if (!addrstr) {
-                ret = -1;
-                goto err;
-        }
-
-        dup_addrstr = gf_strdup (addrstr);
-        addrtok = strtok_r (dup_addrstr, ",", &svptr);
-        while (addrtok) {
-
-                /* CASEFOLD not present on Solaris */
-#ifdef FNM_CASEFOLD
-                ret = fnmatch (addrtok, ip, FNM_CASEFOLD);
-#else
-                ret = fnmatch (addrtok, ip, 0);
-#endif
-                if (ret == 0)
-                        goto err;
-
-                /* compare hostnames if applicable */
-                if (hostname) {
-#ifdef FNM_CASEFOLD
-                        ret = fnmatch (addrtok, hostname, FNM_CASEFOLD);
-#else
-                        ret = fnmatch (addrtok, hostname, 0);
-#endif
-                        if (ret == 0)
-                                goto err;
-                }
-
-                addrtok = strtok_r (NULL, ",", &svptr);
-        }
-
-        ret = -1;
-err:
-        GF_FREE (dup_addrstr);
-
-        return ret;
-}
-
-
-static int
-rpcsvc_transport_peer_check_allow (dict_t *options, char *volname,
-                                   char *ip, char *hostname)
-{
-        int      ret     = RPCSVC_AUTH_DONTCARE;
-        char    *srchstr = NULL;
-
-        if ((!options) || (!ip) || (!volname))
-                return ret;
-
-        ret = gf_asprintf (&srchstr, "rpc-auth.addr.%s.allow", volname);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "asprintf failed");
-                ret = RPCSVC_AUTH_DONTCARE;
-                goto out;
-        }
-
-        ret = rpcsvc_transport_peer_check_search (options, srchstr,
-                                                  ip, hostname);
-        GF_FREE (srchstr);
-
-        if (ret == 0)
-                ret = RPCSVC_AUTH_ACCEPT;
-        else
-                ret = RPCSVC_AUTH_REJECT;
-out:
-        return ret;
-}
-
-static int
-rpcsvc_transport_peer_check_reject (dict_t *options, char *volname,
-                                    char *ip, char *hostname)
-{
-        int      ret     = RPCSVC_AUTH_DONTCARE;
-        char    *srchstr = NULL;
-
-        if ((!options) || (!ip) || (!volname))
-                return ret;
-
-        ret = gf_asprintf (&srchstr, "rpc-auth.addr.%s.reject",
-                           volname);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "asprintf failed");
-                ret = RPCSVC_AUTH_REJECT;
-                goto out;
-        }
-
-        ret = rpcsvc_transport_peer_check_search (options, srchstr,
-                                                  ip, hostname);
-        GF_FREE (srchstr);
-
-        if (ret == 0)
-                ret = RPCSVC_AUTH_REJECT;
-        else
-                ret = RPCSVC_AUTH_DONTCARE;
-out:
-        return ret;
-}
-
-
-/* Combines rpc auth's allow and reject options.
- * Order of checks is important.
- * First,              REJECT if either rejects.
- * If neither rejects, ACCEPT if either accepts.
- * If neither accepts, DONTCARE
- */
-int
-rpcsvc_combine_allow_reject_volume_check (int allow, int reject)
-{
-        if (allow == RPCSVC_AUTH_REJECT ||
-            reject == RPCSVC_AUTH_REJECT)
-                return RPCSVC_AUTH_REJECT;
-
-        if (allow == RPCSVC_AUTH_ACCEPT ||
-            reject == RPCSVC_AUTH_ACCEPT)
-                return RPCSVC_AUTH_ACCEPT;
-
-        return RPCSVC_AUTH_DONTCARE;
-}
-
-int
-rpcsvc_auth_check (rpcsvc_t *svc, char *volname,
-                   rpc_transport_t *trans)
-{
-        int     ret                            = RPCSVC_AUTH_REJECT;
-        int     accept                         = RPCSVC_AUTH_REJECT;
-        int     reject                         = RPCSVC_AUTH_REJECT;
-        char   *hostname                       = NULL;
-        char   *ip                             = NULL;
-        char    client_ip[RPCSVC_PEER_STRLEN]  = {0};
-        char   *allow_str                      = NULL;
-        char   *reject_str                     = NULL;
-        char   *srchstr                        = NULL;
-        dict_t *options                        = NULL;
-
-        if (!svc || !volname || !trans)
-                return ret;
-
-        /* Fetch the options from svc struct and validate */
-        options = svc->options;
-        if (!options)
-                return ret;
-
-        ret = rpcsvc_transport_peername (trans, client_ip, RPCSVC_PEER_STRLEN);
-        if (ret != 0) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to get remote addr: "
-                        "%s", gai_strerror (ret));
-                return RPCSVC_AUTH_REJECT;
-        }
-
-        /* Accept if its the default case: Allow all, Reject none
-         * The default volfile always contains a 'allow *' rule
-         * for each volume. If allow rule is missing (which implies
-         * there is some bad volfile generating code doing this), we
-         * assume no one is allowed mounts, and thus, we reject mounts.
-         */
-        ret = gf_asprintf (&srchstr, "rpc-auth.addr.%s.allow", volname);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "asprintf failed");
-                return RPCSVC_AUTH_REJECT;
-        }
-
-        ret = dict_get_str (options, srchstr, &allow_str);
-        GF_FREE (srchstr);
-        if (ret < 0)
-                return RPCSVC_AUTH_REJECT;
-
-        ret = gf_asprintf (&srchstr, "rpc-auth.addr.%s.reject", volname);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "asprintf failed");
-                return RPCSVC_AUTH_REJECT;
-        }
-
-        ret = dict_get_str (options, srchstr, &reject_str);
-        GF_FREE (srchstr);
-        if (reject_str == NULL && !strcmp ("*", allow_str))
-                return RPCSVC_AUTH_ACCEPT;
-
-        /* Non-default rule, authenticate */
-        if (!get_host_name (client_ip, &ip))
-                ip = client_ip;
-
-        /* addr-namelookup check */
-        if (svc->addr_namelookup == _gf_true) {
-                ret = gf_get_hostname_from_ip (ip, &hostname);
-                if (ret) {
-                        if (hostname)
-                                GF_FREE (hostname);
-                        /* failed to get hostname, but hostname auth
-                         * is enabled, so authentication will not be
-                         * 100% correct. reject mounts
-                         */
-                        return RPCSVC_AUTH_REJECT;
-                }
-        }
-
-        accept = rpcsvc_transport_peer_check_allow (options, volname,
-                                                    ip, hostname);
-
-        reject = rpcsvc_transport_peer_check_reject (options, volname,
-                                                     ip, hostname);
-
-        if (hostname)
-                GF_FREE (hostname);
-        return rpcsvc_combine_allow_reject_volume_check (accept, reject);
-}
-
-int
-rpcsvc_transport_privport_check (rpcsvc_t *svc, char *volname,
-                                 rpc_transport_t *trans)
-{
-        union gf_sock_union     sock_union;
-        int                     ret = RPCSVC_AUTH_REJECT;
-        socklen_t               sinsize = sizeof (&sock_union.sin);
-        char                    *srchstr = NULL;
-        char                    *valstr = NULL;
-        uint16_t                port = 0;
-        gf_boolean_t            insecure = _gf_false;
-
-        memset (&sock_union, 0, sizeof (sock_union));
-
-        if ((!svc) || (!volname) || (!trans))
-                return ret;
-
-        ret = rpcsvc_transport_peeraddr (trans, NULL, 0, &sock_union.storage,
-                                         sinsize);
-        if (ret != 0) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to get peer addr: %s",
-                        gai_strerror (ret));
-                ret = RPCSVC_AUTH_REJECT;
-                goto err;
-        }
-
-        port = ntohs (sock_union.sin.sin_port);
-        gf_log (GF_RPCSVC, GF_LOG_TRACE, "Client port: %d", (int)port);
-        /* If the port is already a privileged one, dont bother with checking
-         * options.
-         */
-        if (port <= 1024) {
-                ret = RPCSVC_AUTH_ACCEPT;
-                goto err;
-        }
-
-        /* Disabled by default */
-        ret = gf_asprintf (&srchstr, "rpc-auth.ports.%s.insecure", volname);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "asprintf failed");
-                ret = RPCSVC_AUTH_REJECT;
-                goto err;
-        }
-
-        ret = dict_get_str (svc->options, srchstr, &valstr);
-        if (ret) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to"
-                        " read rpc-auth.ports.insecure value");
-                goto err;
-        }
-
-        ret = gf_string2boolean (valstr, &insecure);
-        if (ret) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Failed to"
-                        " convert rpc-auth.ports.insecure value");
-                goto err;
-        }
-
-        ret = insecure ? RPCSVC_AUTH_ACCEPT : RPCSVC_AUTH_REJECT;
-
-        if (ret == RPCSVC_AUTH_ACCEPT)
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "Unprivileged port allowed");
-        else
-                gf_log (GF_RPCSVC, GF_LOG_DEBUG, "Unprivileged port not"
-                        " allowed");
-
-err:
-        if (srchstr)
-                GF_FREE (srchstr);
-
-        return ret;
-}
-
-
-char *
-rpcsvc_volume_allowed (dict_t *options, char *volname)
-{
-        char    globalrule[] = "rpc-auth.addr.allow";
-        char    *srchstr = NULL;
-        char    *addrstr = NULL;
-        int     ret = -1;
-
-        if ((!options) || (!volname))
-                return NULL;
-
-        ret = gf_asprintf (&srchstr, "rpc-auth.addr.%s.allow", volname);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "asprintf failed");
-                goto out;
-        }
-
-        if (!dict_get (options, srchstr))
-                ret = dict_get_str (options, globalrule, &addrstr);
-        else
-                ret = dict_get_str (options, srchstr, &addrstr);
-
-out:
-        GF_FREE (srchstr);
-
-        return addrstr;
-}
-
-
 rpcsvc_actor_t gluster_dump_actors[] = {
-        [GF_DUMP_NULL]      = {"NULL",     GF_DUMP_NULL,     NULL,        NULL, 0, DRC_NA},
-        [GF_DUMP_DUMP]      = {"DUMP",     GF_DUMP_DUMP,     rpcsvc_dump, NULL, 0, DRC_NA},
-        [GF_DUMP_MAXVALUE]  = {"MAXVALUE", GF_DUMP_MAXVALUE, NULL,        NULL, 0, DRC_NA},
+        [GF_DUMP_NULL] = {"NULL", GF_DUMP_NULL, NULL, NULL, NULL },
+        [GF_DUMP_DUMP] = {"DUMP", GF_DUMP_DUMP, rpcsvc_dump, NULL, NULL },
+        [GF_DUMP_MAXVALUE] = {"MAXVALUE", GF_DUMP_MAXVALUE, NULL, NULL, NULL },
 };
 
 
diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h
index cbc1f4226..e90da9e40 100644
--- a/rpc/rpc-lib/src/rpcsvc.h
+++ b/rpc/rpc-lib/src/rpcsvc.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPCSVC_H
@@ -25,7 +34,6 @@
 #include "iobuf.h"
 #include "xdr-rpc.h"
 #include "glusterfs.h"
-#include "xlator.h"
 #include "rpcsvc-common.h"
 
 #include <pthread.h>
@@ -34,28 +42,24 @@
 #include <rpc/rpc_msg.h>
 #include "compat.h"
 
+#ifndef NGRPS
+#define NGRPS 16
+#endif /* !NGRPS */
+
 #ifndef MAX_IOVEC
 #define MAX_IOVEC 16
 #endif
 
-#define RPCSVC_DEFAULT_OUTSTANDING_RPC_LIMIT 64
-#define RPCSVC_MAX_OUTSTANDING_RPC_LIMIT 65536
-#define RPCSVC_MIN_OUTSTANDING_RPC_LIMIT 0 /* No limit i.e. Unlimited */
-
 #define GF_RPCSVC       "rpc-service"
 #define RPCSVC_THREAD_STACK_SIZE ((size_t)(1024 * GF_UNIT_KB))
 
 #define RPCSVC_FRAGHDR_SIZE  4       /* 4-byte RPC fragment header size */
 #define RPCSVC_DEFAULT_LISTEN_PORT      GF_DEFAULT_BASE_PORT
-#define RPCSVC_DEFAULT_MEMFACTOR        8
+#define RPCSVC_DEFAULT_MEMFACTOR        15
 #define RPCSVC_EVENTPOOL_SIZE_MULT      1024
-#define RPCSVC_POOLCOUNT_MULT           64
+#define RPCSVC_POOLCOUNT_MULT           35
 #define RPCSVC_CONN_READ        (128 * GF_UNIT_KB)
 #define RPCSVC_PAGE_SIZE        (128 * GF_UNIT_KB)
-#define RPC_ROOT_UID             0
-#define RPC_ROOT_GID             0
-#define RPC_NOBODY_UID           65534
-#define RPC_NOBODY_GID           65534
 
 /* RPC Record States */
 #define RPCSVC_READ_FRAGHDR     1
@@ -110,6 +114,8 @@
 #define AUTH_KERB       4               /* kerberos style */
 #endif /* */
 
+#define AUTH_GLUSTERFS  5
+
 typedef struct rpcsvc_program rpcsvc_program_t;
 
 struct rpcsvc_notify_wrapper {
@@ -136,17 +142,15 @@ struct rpcsvc_config {
         int    max_block_size;
 };
 
+#define RPCSVC_MAX_AUTH_BYTES   400
 typedef struct rpcsvc_auth_data {
         int             flavour;
         int             datalen;
-        char            authdata[GF_MAX_AUTH_BYTES];
+        char            authdata[RPCSVC_MAX_AUTH_BYTES];
 } rpcsvc_auth_data_t;
 
 #define rpcsvc_auth_flavour(au)    ((au).flavour)
 
-typedef struct drc_client drc_client_t;
-typedef struct drc_cached_op drc_cached_op_t;
-
 /* The container for the RPC call handed up to an actor.
  * Dynamically allocated. Lives till the call reply is completely
  * transmitted.
@@ -179,15 +183,13 @@ struct rpcsvc_request {
         gid_t                   gid;
         pid_t                   pid;
 
-        gf_lkowner_t            lk_owner;
+        uint64_t                lk_owner;
         uint64_t                gfs_id;
 
-        /* Might want to move this to AUTH_UNIX specific state since this array
-         * is not available for every authentication scheme.
+        /* Might want to move this to AUTH_UNIX specifix state since this array
+         * is not available for every authenticatino scheme.
          */
-        gid_t                   *auxgids;
-        gid_t                   auxgidsmall[SMALL_GROUP_COUNT];
-        gid_t                   *auxgidlarge;
+        gid_t                   auxgids[NGRPS];
         int                     auxgidcount;
 
 
@@ -214,8 +216,8 @@ struct rpcsvc_request {
         int                     auth_err;
 
         /* There can be cases of RPC requests where the reply needs to
-         * be built from multiple sources. E.g. where even the NFS reply
-         * can contain a payload, as in the NFSv3 read reply. Here the RPC header
+         * be built from multiple sources. For eg. where even the NFS reply can
+         * contain a payload, as in the NFSv3 read reply. Here the RPC header
          * ,NFS header and the read data are brought together separately from
          * different buffers, so we need to stage the buffers temporarily here
          * before all of them get added to the connection's transmission list.
@@ -237,9 +239,6 @@ struct rpcsvc_request {
          */
         rpcsvc_auth_data_t      verf;
 
-	/* Execute this request's actor function as a synctask? */
-	gf_boolean_t            synctask;
-
         /* Container for a RPC program wanting to store a temp
          * request-specific item.
          */
@@ -247,56 +246,29 @@ struct rpcsvc_request {
 
         /* Container for transport to store request-specific item */
         void                    *trans_private;
-
-        /* we need to ref the 'iobuf' in case of 'synctasking' it */
-        struct iobuf            *hdr_iobuf;
-
-        /* pointer to cached reply for use in DRC */
-        drc_cached_op_t         *reply;
 };
 
 #define rpcsvc_request_program(req) ((rpcsvc_program_t *)((req)->prog))
-#define rpcsvc_request_procnum(req) (((req)->procnum))
-#define rpcsvc_request_program_private(req) (((rpcsvc_program_t *)((req)->prog))->private)
+#define rpcsvc_request_program_private(req) (((rpcsvc_program_t *)((req)->program))->private)
 #define rpcsvc_request_accepted(req)    ((req)->rpc_status == MSG_ACCEPTED)
 #define rpcsvc_request_accepted_success(req) ((req)->rpc_err == SUCCESS)
+#define rpcsvc_request_uid(req)         ((req)->uid)
+#define rpcsvc_request_gid(req)         ((req)->gid)
 #define rpcsvc_request_prog_minauth(req) (rpcsvc_request_program(req)->min_auth)
 #define rpcsvc_request_cred_flavour(req) (rpcsvc_auth_flavour(req->cred))
 #define rpcsvc_request_verf_flavour(req) (rpcsvc_auth_flavour(req->verf))
-#define rpcsvc_request_service(req)      ((req)->svc)
+
 #define rpcsvc_request_uid(req)         ((req)->uid)
 #define rpcsvc_request_gid(req)         ((req)->gid)
 #define rpcsvc_request_private(req)     ((req)->private)
 #define rpcsvc_request_xid(req)         ((req)->xid)
 #define rpcsvc_request_set_private(req,prv)  (req)->private = (void *)(prv)
-#define rpcsvc_request_iobref_ref(req)  (iobref_ref ((req)->iobref))
 #define rpcsvc_request_record_ref(req)  (iobuf_ref ((req)->recordiob))
 #define rpcsvc_request_record_unref(req) (iobuf_unref ((req)->recordiob))
-#define rpcsvc_request_record_iob(req)   ((req)->recordiob)
-#define rpcsvc_request_set_vecstate(req, state)  ((req)->vecstate = state)
-#define rpcsvc_request_vecstate(req) ((req)->vecstate)
-#define rpcsvc_request_transport(req) ((req)->trans)
-#define rpcsvc_request_transport_ref(req) (rpc_transport_ref((req)->trans))
-#define RPC_AUTH_ROOT_SQUASH(req)                                       \
-        do {                                                            \
-                int gidcount = 0;                                       \
-                if (req->svc->root_squash) {                            \
-                        if (req->uid == RPC_ROOT_UID)                   \
-                                req->uid = RPC_NOBODY_UID;              \
-                        if (req->gid == RPC_ROOT_GID)                   \
-                                req->gid = RPC_NOBODY_GID;              \
-                        for (gidcount = 0; gidcount < req->auxgidcount; \
-                             ++gidcount) {                              \
-                                if (!req->auxgids[gidcount])            \
-                                        req->auxgids[gidcount] =        \
-                                                RPC_NOBODY_GID;         \
-                        }                                               \
-                }                                                       \
-        } while (0);
+
 
 #define RPCSVC_ACTOR_SUCCESS    0
 #define RPCSVC_ACTOR_ERROR      (-1)
-#define RPCSVC_ACTOR_IGNORE     (-2)
 
 /* Functor for every type of protocol actor
  * must be defined like this.
@@ -311,8 +283,10 @@ struct rpcsvc_request {
  *
  */
 typedef int (*rpcsvc_actor) (rpcsvc_request_t *req);
-typedef int (*rpcsvc_vector_sizer) (int state, ssize_t *readsize,
-                                    char *base_addr, char *curr_addr);
+typedef int (*rpcsvc_vector_actor) (rpcsvc_request_t *req, struct iovec *vec,
+                                    int count, struct iobref *iobref);
+typedef int (*rpcsvc_vector_sizer) (rpcsvc_request_t *req, ssize_t *readsize,
+                                    int *newiob);
 
 /* Every protocol actor will also need to specify the function the RPC layer
  * will use to serialize or encode the message into XDR format just before
@@ -326,6 +300,7 @@ typedef void *(*rpcsvc_encode_reply) (void *msg);
  */
 typedef void (*rpcsvc_deallocate_reply) (void *msg);
 
+
 #define RPCSVC_NAME_MAX            32
 /* The descriptor for each procedure/actor that runs
  * over the RPC service.
@@ -341,13 +316,11 @@ typedef struct rpcsvc_actor_desc {
          * the XDR scheme, RPC cannot guarantee memory aligned addresses for
          * the resulting message-specific structures. Allowing a specialized
          * handler for letting the RPC program read the data from the network
-         * directly into its aligned buffers.
+         * directly into its alligned buffers.
          */
+        rpcsvc_vector_actor     vector_actor;
         rpcsvc_vector_sizer     vector_sizer;
 
-        /* Can actor be ran on behalf an unprivileged requestor? */
-        gf_boolean_t            unprivileged;
-        drc_op_type_t           op_type;
 } rpcsvc_actor_t;
 
 /* Describes a program and its version along with the function pointers
@@ -402,9 +375,6 @@ struct rpcsvc_program {
          */
         int                     min_auth;
 
-	/* Execute actor function as a synctask? */
-	gf_boolean_t            synctask;
-
         /* list member to link to list of registered services with rpcsvc */
         struct list_head        program;
 };
@@ -440,21 +410,11 @@ rpcsvc_listener_destroy (rpcsvc_listener_t *listener);
 extern int
 rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port);
 
-extern int
-rpcsvc_program_unregister_portmap (rpcsvc_program_t *newprog);
-
-extern int
-rpcsvc_register_portmap_enabled (rpcsvc_t *svc);
-
 /* Inits the global RPC service data structures.
  * Called in main.
  */
 extern rpcsvc_t *
-rpcsvc_init (xlator_t *xl, glusterfs_ctx_t *ctx, dict_t *options,
-             uint32_t poolcount);
-
-extern int
-rpcsvc_reconfigure_options (rpcsvc_t *svc, dict_t *options);
+rpcsvc_init (glusterfs_ctx_t *ctx, dict_t *options);
 
 int
 rpcsvc_register_notify (rpcsvc_t *svc, rpcsvc_notify_t notify, void *mydata);
@@ -466,13 +426,6 @@ int
 rpcsvc_unregister_notify (rpcsvc_t *svc, rpcsvc_notify_t notify, void *mydata);
 
 int
-rpcsvc_transport_submit (rpc_transport_t *trans, struct iovec *rpchdr,
-                         int rpchdrcount, struct iovec *proghdr,
-                         int proghdrcount, struct iovec *progpayload,
-                         int progpayloadcount, struct iobref *iobref,
-                         void *priv);
-
-int
 rpcsvc_submit_message (rpcsvc_request_t *req, struct iovec *proghdr,
                        int hdrcount, struct iovec *payload, int payloadcount,
                        struct iobref *iobref);
@@ -493,17 +446,17 @@ rpcsvc_error_reply (rpcsvc_request_t *req);
 extern int
 rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen);
 
-extern int
+extern inline int
 rpcsvc_transport_peeraddr (rpc_transport_t *trans, char *addrstr, int addrlen,
                            struct sockaddr_storage *returnsa, socklen_t sasize);
 
 extern int
-rpcsvc_auth_check (rpcsvc_t *svc, char *volname, rpc_transport_t *trans);
+rpcsvc_transport_peer_check (dict_t *options, char *volname,
+                             rpc_transport_t *trans);
 
 extern int
 rpcsvc_transport_privport_check (rpcsvc_t *svc, char *volname,
                                  rpc_transport_t *trans);
-
 #define rpcsvc_request_seterr(req, err)                 (req)->rpc_err = err
 #define rpcsvc_request_set_autherr(req, err)            (req)->auth_err = err
 
@@ -559,9 +512,6 @@ extern int
 rpcsvc_auth_init (rpcsvc_t *svc, dict_t *options);
 
 extern int
-rpcsvc_auth_reconf (rpcsvc_t *svc, dict_t *options);
-
-extern int
 rpcsvc_auth_transport_init (rpc_transport_t *xprt);
 
 extern int
@@ -578,6 +528,9 @@ rpcsvc_auth_array (rpcsvc_t *svc, char *volname, int *autharr, int arrlen);
 extern gid_t *
 rpcsvc_auth_unix_auxgids (rpcsvc_request_t *req, int *arrlen);
 
+extern int
+rpcsvc_combine_gen_spec_volume_checks (int gen, int spec);
+
 extern char *
 rpcsvc_volume_allowed (dict_t *options, char *volname);
 
@@ -585,22 +538,8 @@ int rpcsvc_callback_submit (rpcsvc_t *rpc, rpc_transport_t *trans,
                             rpcsvc_cbk_program_t *prog, int procnum,
                             struct iovec *proghdr, int proghdrcount);
 
-rpcsvc_actor_t *
-rpcsvc_program_actor (rpcsvc_request_t *req);
-
 int
 rpcsvc_transport_unix_options_build (dict_t **options, char *filepath);
 int
 rpcsvc_set_allow_insecure (rpcsvc_t *svc, dict_t *options);
-int
-rpcsvc_set_addr_namelookup (rpcsvc_t *svc, dict_t *options);
-int
-rpcsvc_set_root_squash (rpcsvc_t *svc, dict_t *options);
-int
-rpcsvc_set_outstanding_rpc_limit (rpcsvc_t *svc, dict_t *options);
-int
-rpcsvc_auth_array (rpcsvc_t *svc, char *volname, int *autharr, int arrlen);
-rpcsvc_vector_sizer
-rpcsvc_get_program_vector_sizer (rpcsvc_t *svc, uint32_t prognum,
-                                 uint32_t progver, uint32_t procnum);
 #endif
diff --git a/rpc/rpc-lib/src/xdr-common.h b/rpc/rpc-lib/src/xdr-common.h
index 34dc9c6a2..3e9a5c325 100644
--- a/rpc/rpc-lib/src/xdr-common.h
+++ b/rpc/rpc-lib/src/xdr-common.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _XDR_COMMON_H_
@@ -21,10 +30,6 @@
 #include <rpc/xdr.h>
 #include <sys/uio.h>
 
-#ifdef __NetBSD__
-#include <dirent.h>
-#endif /* __NetBSD__ */
-
 enum gf_dump_procnum {
         GF_DUMP_NULL,
         GF_DUMP_DUMP,
@@ -34,7 +39,6 @@ enum gf_dump_procnum {
 #define GLUSTER_DUMP_PROGRAM 123451501 /* Completely random */
 #define GLUSTER_DUMP_VERSION 1
 
-#define GF_MAX_AUTH_BYTES   2048
 
 #if GF_DARWIN_HOST_OS
 #define xdr_u_quad_t xdr_u_int64_t
@@ -43,14 +47,6 @@ enum gf_dump_procnum {
 #define uint64_t u_int64_t
 #endif
 
-#if defined(__NetBSD__)
-#define xdr_u_quad_t xdr_u_int64_t
-#define xdr_quad_t   xdr_int64_t
-#define xdr_uint32_t xdr_u_int32_t
-#define xdr_uint64_t xdr_u_int64_t
-#endif
-
-
 #if GF_SOLARIS_HOST_OS
 #define u_quad_t uint64_t
 #define quad_t int64_t
@@ -59,9 +55,57 @@ enum gf_dump_procnum {
 #define xdr_uint32_t xdr_uint32_t
 #endif
 
+struct auth_glusterfs_parms {
+	uint64_t lk_owner;
+	u_int pid;
+	u_int uid;
+	u_int gid;
+	u_int ngrps;
+	u_int groups[16];
+} __attribute__((packed));
+typedef struct auth_glusterfs_parms auth_glusterfs_parms;
+
+struct gf_dump_req {
+	uint64_t gfs_id;
+} __attribute__((packed));
+typedef struct gf_dump_req gf_dump_req;
+
+struct gf_prog_detail {
+	char    *progname;
+	uint64_t prognum;
+	uint64_t progver;
+	struct gf_prog_detail *next;
+} __attribute__((packed));
+typedef struct gf_prog_detail gf_prog_detail;
+
+struct gf_dump_rsp {
+	uint64_t gfs_id;
+	int op_ret;
+	int op_errno;
+	struct gf_prog_detail *prog;
+}__attribute__((packed));
+typedef struct gf_dump_rsp gf_dump_rsp;
+
+extern bool_t
+xdr_auth_glusterfs_parms (XDR *xdrs, auth_glusterfs_parms *objp);
+extern bool_t xdr_gf_dump_req (XDR *, gf_dump_req*);
+extern bool_t xdr_gf_prog_detail (XDR *, gf_prog_detail*);
+extern bool_t xdr_gf_dump_rsp (XDR *, gf_dump_rsp*);
+
+ssize_t
+xdr_serialize_dump_rsp (struct iovec outmsg, void *rsp);
+ssize_t
+xdr_to_dump_req (struct iovec inmsg, void *args);
+ssize_t
+xdr_from_dump_req (struct iovec outmsg, void *rsp);
+ssize_t
+xdr_to_dump_rsp (struct iovec inmsg, void *args);
+
+#define XDR_BYTES_PER_UNIT      4
+
 /* Returns the address of the byte that follows the
  * last byte used for decoding the previous xdr component.
- * E.g. once the RPC call for NFS has been decoded, the macro will return
+ * For eg, once the RPC call for NFS has been decoded, thie macro will return
  * the address from which the NFS header starts.
  */
 #define xdr_decoded_remaining_addr(xdr)        ((&xdr)->x_private)
diff --git a/rpc/rpc-lib/src/xdr-rpc.c b/rpc/rpc-lib/src/xdr-rpc.c
index adb48a531..58a8a5fe6 100644
--- a/rpc/rpc-lib/src/xdr-rpc.c
+++ b/rpc/rpc-lib/src/xdr-rpc.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -34,7 +43,7 @@ xdr_to_rpc_call (char *msgbuf, size_t len, struct rpc_msg *call,
                  struct iovec *payload, char *credbytes, char *verfbytes)
 {
         XDR                     xdr;
-        char                    opaquebytes[GF_MAX_AUTH_BYTES];
+        char                    opaquebytes[MAX_AUTH_BYTES];
         struct opaque_auth      *oa = NULL;
         int ret = -1;
 
@@ -108,7 +117,7 @@ rpc_fill_denied_reply (struct rpc_msg *reply, int rjstat, int auth_err)
         reply->rm_reply.rp_stat = MSG_DENIED;
         reply->rjcted_rply.rj_stat = rjstat;
         if (rjstat == RPC_MISMATCH) {
-                /* No problem with hardcoding
+                /* No problem with hardocoding
                  * RPC version numbers. We only support
                  * v2 anyway.
                  */
diff --git a/rpc/rpc-lib/src/xdr-rpc.h b/rpc/rpc-lib/src/xdr-rpc.h
index f5f4a941e..5dbbbe580 100644
--- a/rpc/rpc-lib/src/xdr-rpc.h
+++ b/rpc/rpc-lib/src/xdr-rpc.h
@@ -1,14 +1,23 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _XDR_RPC_H_
+#ifndef _XDR_RPC_H
 #define _XDR_RPC_H_
 
 #ifndef _CONFIG_H
@@ -30,14 +39,6 @@
 #include <rpc/xdr.h>
 #include <sys/uio.h>
 
-#include "xdr-common.h"
-
-typedef enum {
-        AUTH_GLUSTERFS = 5,
-        AUTH_GLUSTERFS_v2 = 390039, /* using a number from  'unused' range,
-                                       from the list available in RFC5531 */
-} gf_rpc_authtype_t;
-
 /* Converts a given network buffer from its XDR format to a structure
  * that contains everything an RPC call needs to work.
  */
@@ -61,7 +62,7 @@ rpc_reply_to_xdr (struct rpc_msg *reply, char *dest, size_t len,
 extern int
 xdr_to_auth_unix_cred (char *msgbuf, int msglen, struct authunix_parms *au,
                        char *machname, gid_t *gids);
-/* Macros that simplify accessing the members of an RPC call structure. */
+/* Macros that simplify accesing the members of an RPC call structure. */
 #define rpc_call_xid(call)              ((call)->rm_xid)
 #define rpc_call_direction(call)        ((call)->rm_direction)
 #define rpc_call_rpcvers(call)          ((call)->ru.RM_cmb.cb_rpcvers)
diff --git a/rpc/rpc-lib/src/xdr-rpcclnt.c b/rpc/rpc-lib/src/xdr-rpcclnt.c
index 810d1961b..69daa98cb 100644
--- a/rpc/rpc-lib/src/xdr-rpcclnt.c
+++ b/rpc/rpc-lib/src/xdr-rpcclnt.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
diff --git a/rpc/rpc-lib/src/xdr-rpcclnt.h b/rpc/rpc-lib/src/xdr-rpcclnt.h
index c08d872f8..aaba00df0 100644
--- a/rpc/rpc-lib/src/xdr-rpcclnt.h
+++ b/rpc/rpc-lib/src/xdr-rpcclnt.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _XDR_RPCCLNT_H
@@ -24,7 +33,7 @@
 #include <rpc/rpc_msg.h>
 #include <rpc/auth_unix.h>
 
-/* Macros that simplify accessing the members of an RPC call structure. */
+/* Macros that simplify accesing the members of an RPC call structure. */
 #define rpc_reply_xid(reply)              ((reply)->rm_xid)
 #define rpc_reply_status(reply)           ((reply)->ru.RM_rmb.rp_stat)
 #define rpc_accepted_reply_status(reply)  ((reply)->acpted_rply.ar_stat)
diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
index 2bf7cf238..bc888b175 100644
--- a/rpc/rpc-transport/rdma/src/Makefile.am
+++ b/rpc/rpc-transport/rdma/src/Makefile.am
@@ -3,20 +3,18 @@
 transport_LTLIBRARIES = rdma.la
 transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
 
-rdma_la_LDFLAGS = -module -avoid-version
+rdma_la_LDFLAGS = -module -avoidversion
 
 rdma_la_SOURCES = rdma.c name.c
 rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la     \
-	-libverbs -lrdmacm
+	-libverbs
 
 noinst_HEADERS = rdma.h name.h
 	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
 	-I$(top_srcdir)/xlators/protocol/lib/src/ -shared -nostartfiles $(GF_CFLAGS)
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) \
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)  \
 	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
-	-I$(top_srcdir)/rpc/xdr/src
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
+	-I$(top_srcdir)/xlators/protocol/lib/src -shared -nostartfiles $(GF_CFLAGS)
 
 CLEANFILES = *~
diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c
index c57428ad6..d15bbb45d 100644
--- a/rpc/rpc-transport/rdma/src/name.c
+++ b/rpc/rpc-transport/rdma/src/name.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <sys/types.h>
@@ -13,7 +22,12 @@
 #include <errno.h>
 #include <netdb.h>
 #include <string.h>
-#include <rdma/rdma_cma.h>
+
+#ifdef CLIENT_PORT_CEILING
+#undef CLIENT_PORT_CEILING
+#endif
+
+#define CLIENT_PORT_CEILING 1024
 
 #ifndef AF_INET_SDP
 #define AF_INET_SDP 27
@@ -21,8 +35,6 @@
 
 #include "rpc-transport.h"
 #include "rdma.h"
-#include "common-utils.h"
-
 
 int32_t
 gf_resolve_ip6 (const char *hostname,
@@ -32,43 +44,28 @@ gf_resolve_ip6 (const char *hostname,
                 struct addrinfo **addr_info);
 
 static int32_t
-af_inet_bind_to_port_lt_ceiling (struct rdma_cm_id *cm_id,
-                                 struct sockaddr *sockaddr,
+af_inet_bind_to_port_lt_ceiling (int fd, struct sockaddr *sockaddr,
                                  socklen_t sockaddr_len, int ceiling)
 {
-        int32_t        ret        = -1;
-        uint16_t      port        = ceiling - 1;
-        // by default assume none of the ports are blocked and all are available
-        gf_boolean_t  ports[1024] = {_gf_false,};
-        int           i           = 0;
-
-        ret = gf_process_reserved_ports (ports);
-        if (ret != 0) {
-                for (i = 0; i < 1024; i++)
-                        ports[i] = _gf_false;
-        }
+        int32_t ret = -1;
+        /*  struct sockaddr_in sin = {0, }; */
+        uint16_t port = ceiling - 1;
 
         while (port)
         {
                 switch (sockaddr->sa_family)
                 {
                 case AF_INET6:
-                        ((struct sockaddr_in6 *)sockaddr)->sin6_port
-                                = htons (port);
+                        ((struct sockaddr_in6 *)sockaddr)->sin6_port = htons (port);
                         break;
 
                 case AF_INET_SDP:
                 case AF_INET:
-                        ((struct sockaddr_in *)sockaddr)->sin_port
-                                = htons (port);
+                        ((struct sockaddr_in *)sockaddr)->sin_port = htons (port);
                         break;
                 }
-                // ignore the reserved ports
-                if (ports[port] == _gf_true) {
-                        port--;
-                        continue;
-                }
-                ret = rdma_bind_addr (cm_id, sockaddr);
+
+                ret = bind (fd, sockaddr, sockaddr_len);
 
                 if (ret == 0)
                         break;
@@ -82,10 +79,11 @@ af_inet_bind_to_port_lt_ceiling (struct rdma_cm_id *cm_id,
         return ret;
 }
 
-#if 0
 static int32_t
-af_unix_client_bind (rpc_transport_t *this, struct sockaddr *sockaddr,
-                     socklen_t sockaddr_len, struct rdma_cm_id *cm_id)
+af_unix_client_bind (rpc_transport_t *this,
+                     struct sockaddr *sockaddr,
+                     socklen_t sockaddr_len,
+                     int sock)
 {
         data_t *path_data = NULL;
         struct sockaddr_un *addr = NULL;
@@ -97,7 +95,7 @@ af_unix_client_bind (rpc_transport_t *this, struct sockaddr *sockaddr,
                 char *path = data_to_str (path_data);
                 if (!path || strlen (path) > UNIX_PATH_MAX) {
                         gf_log (this->name, GF_LOG_DEBUG,
-                                "transport.rdma.bind-path not specified "
+                                "transport.rdma.bind-path not specfied "
                                 "for unix socket, letting connect to assign "
                                 "default value");
                         goto err;
@@ -117,7 +115,6 @@ af_unix_client_bind (rpc_transport_t *this, struct sockaddr *sockaddr,
 err:
         return ret;
 }
-#endif
 
 static int32_t
 client_fill_address_family (rpc_transport_t *this, struct sockaddr *sockaddr)
@@ -165,11 +162,13 @@ client_fill_address_family (rpc_transport_t *this, struct sockaddr *sockaddr)
                         sockaddr->sa_family = AF_INET6;
                 } else if (!strcasecmp (address_family, "inet-sdp")) {
                         sockaddr->sa_family = AF_INET_SDP;
+                } else if (!strcasecmp (address_family, "inet/inet6")
+                           || !strcasecmp (address_family, "inet6/inet")) {
+                        sockaddr->sa_family = AF_UNSPEC;
                 } else {
                         gf_log (this->name, GF_LOG_ERROR,
                                 "unknown address-family (%s) specified",
                                 address_family);
-                        sockaddr->sa_family = AF_UNSPEC;
                         return -1;
                 }
         }
@@ -364,8 +363,6 @@ af_inet_server_get_local_sockaddr (rpc_transport_t *this,
         if (listen_port_data) {
                 listen_port = data_to_uint16 (listen_port_data);
         } else {
-                listen_port = GF_DEFAULT_RDMA_LISTEN_PORT;
-
                 if (addr->sa_family == AF_INET6) {
                         struct sockaddr_in6 *in = (struct sockaddr_in6 *) addr;
                         in->sin6_addr = in6addr_any;
@@ -416,8 +413,10 @@ out:
 }
 
 int32_t
-gf_rdma_client_bind (rpc_transport_t *this, struct sockaddr *sockaddr,
-                     socklen_t *sockaddr_len, struct rdma_cm_id *cm_id)
+gf_rdma_client_bind (rpc_transport_t *this,
+                     struct sockaddr *sockaddr,
+                     socklen_t *sockaddr_len,
+                     int sock)
 {
         int ret = 0;
 
@@ -429,24 +428,22 @@ gf_rdma_client_bind (rpc_transport_t *this, struct sockaddr *sockaddr,
                 *sockaddr_len = sizeof (struct sockaddr_in);
 
         case AF_INET6:
-                ret = af_inet_bind_to_port_lt_ceiling (cm_id, sockaddr,
+                ret = af_inet_bind_to_port_lt_ceiling (sock, sockaddr,
                                                        *sockaddr_len,
-                                                       GF_CLIENT_PORT_CEILING);
+                                                       CLIENT_PORT_CEILING);
                 if (ret == -1) {
                         gf_log (this->name, GF_LOG_WARNING,
-                                "cannot bind rdma_cm_id to port "
-                                "less than %d (%s)", GF_CLIENT_PORT_CEILING,
-                                strerror (errno));
+                                "cannot bind inet socket (%d) to port "
+                                "less than %d (%s)",
+                                sock, CLIENT_PORT_CEILING, strerror (errno));
                         ret = 0;
                 }
                 break;
 
         case AF_UNIX:
                 *sockaddr_len = sizeof (struct sockaddr_un);
-#if 0
                 ret = af_unix_client_bind (this, (struct sockaddr *)sockaddr,
                                            *sockaddr_len, sock);
-#endif
                 break;
 
         default:
@@ -533,19 +530,21 @@ gf_rdma_server_get_local_sockaddr (rpc_transport_t *this,
                         addr->sa_family = AF_INET_SDP;
                 } else if (!strcasecmp (address_family, "unix")) {
                         addr->sa_family = AF_UNIX;
+                } else if (!strcasecmp (address_family, "inet/inet6")
+                           || !strcasecmp (address_family, "inet6/inet")) {
+                        addr->sa_family = AF_UNSPEC;
                 } else {
                         gf_log (this->name, GF_LOG_ERROR,
                                 "unknown address family (%s) specified",
                                 address_family);
-                        addr->sa_family = AF_UNSPEC;
                         ret = -1;
                         goto err;
                 }
         } else {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "option address-family not specified, defaulting "
-                        "to inet");
-                addr->sa_family = AF_INET;
+                        "to inet/inet6");
+                addr->sa_family = AF_UNSPEC;
         }
 
         switch (addr->sa_family)
@@ -578,33 +577,40 @@ fill_inet6_inet_identifiers (rpc_transport_t *this, struct sockaddr_storage *add
 {
         int32_t ret = 0, tmpaddr_len = 0;
         char service[NI_MAXSERV], host[NI_MAXHOST];
-        union gf_sock_union sock_union;
+        struct sockaddr_storage tmpaddr;
 
-        memset (&sock_union, 0, sizeof (sock_union));
-        sock_union.storage = *addr;
+        memset (&tmpaddr, 0, sizeof (tmpaddr));
+        tmpaddr = *addr;
         tmpaddr_len = addr_len;
 
-        if (sock_union.sa.sa_family == AF_INET6) {
+        if (((struct sockaddr *) &tmpaddr)->sa_family == AF_INET6) {
                 int32_t one_to_four, four_to_eight, twelve_to_sixteen;
                 int16_t eight_to_ten, ten_to_twelve;
 
                 one_to_four = four_to_eight = twelve_to_sixteen = 0;
                 eight_to_ten = ten_to_twelve = 0;
 
-                one_to_four = sock_union.sin6.sin6_addr.s6_addr32[0];
-                four_to_eight = sock_union.sin6.sin6_addr.s6_addr32[1];
+                one_to_four = ((struct sockaddr_in6 *)
+                               &tmpaddr)->sin6_addr.s6_addr32[0];
+                four_to_eight = ((struct sockaddr_in6 *)
+                                 &tmpaddr)->sin6_addr.s6_addr32[1];
 #ifdef GF_SOLARIS_HOST_OS
-                eight_to_ten = S6_ADDR16(sock_union.sin6.sin6_addr)[4];
+                eight_to_ten = S6_ADDR16(((struct sockaddr_in6 *)
+                                          &tmpaddr)->sin6_addr)[4];
 #else
-                eight_to_ten = sock_union.sin6.sin6_addr.s6_addr16[4];
+                eight_to_ten = ((struct sockaddr_in6 *)
+                                &tmpaddr)->sin6_addr.s6_addr16[4];
 #endif
 
 #ifdef GF_SOLARIS_HOST_OS
-                ten_to_twelve = S6_ADDR16(sock_union.sin6.sin6_addr)[5];
+                ten_to_twelve = S6_ADDR16(((struct sockaddr_in6 *)
+                                           &tmpaddr)->sin6_addr)[5];
 #else
-                ten_to_twelve = sock_union.sin6.sin6_addr.s6_addr16[5];
+                ten_to_twelve = ((struct sockaddr_in6 *)
+                                 &tmpaddr)->sin6_addr.s6_addr16[5];
 #endif
-                twelve_to_sixteen = sock_union.sin6.sin6_addr.s6_addr32[3];
+                twelve_to_sixteen = ((struct sockaddr_in6 *)
+                                     &tmpaddr)->sin6_addr.s6_addr32[3];
 
                 /* ipv4 mapped ipv6 address has
                    bits 0-80: 0
@@ -616,8 +622,8 @@ fill_inet6_inet_identifiers (rpc_transport_t *this, struct sockaddr_storage *add
                     four_to_eight == 0 &&
                     eight_to_ten == 0 &&
                     ten_to_twelve == -1) {
-                        struct sockaddr_in *in_ptr = &sock_union.sin;
-                        memset (&sock_union, 0, sizeof (sock_union));
+                        struct sockaddr_in *in_ptr = (struct sockaddr_in *)&tmpaddr;
+                        memset (&tmpaddr, 0, sizeof (tmpaddr));
 
                         in_ptr->sin_family = AF_INET;
                         in_ptr->sin_port = ((struct sockaddr_in6 *)addr)->sin6_port;
@@ -626,7 +632,7 @@ fill_inet6_inet_identifiers (rpc_transport_t *this, struct sockaddr_storage *add
                 }
         }
 
-        ret = getnameinfo (&sock_union.sa,
+        ret = getnameinfo ((struct sockaddr *) &tmpaddr,
                            tmpaddr_len,
                            host, sizeof (host),
                            service, sizeof (service),
diff --git a/rpc/rpc-transport/rdma/src/name.h b/rpc/rpc-transport/rdma/src/name.h
index 742fc5fc3..1f6fc89fd 100644
--- a/rpc/rpc-transport/rdma/src/name.h
+++ b/rpc/rpc-transport/rdma/src/name.h
@@ -1,23 +1,35 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _IB_VERBS_NAME_H
 #define _IB_VERBS_NAME_H
 
-#include <rdma/rdma_cma.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 #include "compat.h"
 
 int32_t
-gf_rdma_client_bind (rpc_transport_t *this, struct sockaddr *sockaddr,
-                     socklen_t *sockaddr_len, struct rdma_cm_id *cm_id);
+gf_rdma_client_bind (rpc_transport_t *this,
+                     struct sockaddr *sockaddr,
+                     socklen_t *sockaddr_len,
+                     int sock);
 
 int32_t
 gf_rdma_client_get_remote_sockaddr (rpc_transport_t *this,
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
index 6e6099a98..c59410f4c 100644
--- a/rpc/rpc-transport/rdma/src/rdma.c
+++ b/rpc/rpc-transport/rdma/src/rdma.c
@@ -1,13 +1,23 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
+
 #ifndef _CONFIG_H
 #define _CONFIG_H
 #include "config.h"
@@ -20,47 +30,119 @@
 #include "name.h"
 #include "byte-order.h"
 #include "xlator.h"
-#include "xdr-rpc.h"
 #include <signal.h>
 
-#define GF_RDMA_LOG_NAME "rpc-transport/rdma"
+#define RDMA_LOG_NAME "rpc-transport/rdma"
 
 static int32_t
-__gf_rdma_ioq_churn (gf_rdma_peer_t *peer);
+__rdma_ioq_churn (rdma_peer_t *peer);
 
-gf_rdma_post_t *
-gf_rdma_post_ref (gf_rdma_post_t *post);
+rdma_post_t *
+rdma_post_ref (rdma_post_t *post);
 
 int
-gf_rdma_post_unref (gf_rdma_post_t *post);
+rdma_post_unref (rdma_post_t *post);
 
-static void *
-gf_rdma_send_completion_proc (void *data);
+int32_t
+gf_resolve_ip6 (const char *hostname,
+                uint16_t port,
+                int family,
+                void **dnscache,
+                struct addrinfo **addr_info);
+
+static uint16_t
+rdma_get_local_lid (struct ibv_context *context,
+                    int32_t port)
+{
+        struct ibv_port_attr attr;
 
-static void *
-gf_rdma_recv_completion_proc (void *data);
+        if (ibv_query_port (context, port, &attr))
+                return 0;
 
-void *
-gf_rdma_async_event_thread (void *context);
+        return attr.lid;
+}
 
-static int32_t
-gf_rdma_create_qp (rpc_transport_t *this);
+static const char *
+get_port_state_str(enum ibv_port_state pstate)
+{
+        switch (pstate) {
+        case IBV_PORT_DOWN:          return "PORT_DOWN";
+        case IBV_PORT_INIT:          return "PORT_INIT";
+        case IBV_PORT_ARMED:         return "PORT_ARMED";
+        case IBV_PORT_ACTIVE:        return "PORT_ACTIVE";
+        case IBV_PORT_ACTIVE_DEFER:  return "PORT_ACTIVE_DEFER";
+        default:                     return "invalid state";
+        }
+}
 
 static int32_t
-__gf_rdma_teardown (rpc_transport_t *this);
+ib_check_active_port (struct ibv_context *ctx, uint8_t port)
+{
+        struct ibv_port_attr port_attr;
 
-static int32_t
-gf_rdma_teardown (rpc_transport_t *this);
+        int32_t ret           = 0;
+        const char *state_str = NULL;
+
+        if (!ctx) {
+                gf_log_callingfn (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                  "Error in supplied context");
+                return -1;
+        }
+
+        ret = ibv_query_port (ctx, port, &port_attr);
+
+        if (ret) {
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "Failed to query port %u properties", port);
+                return -1;
+        }
+
+        state_str = get_port_state_str (port_attr.state);
+        gf_log (RDMA_LOG_NAME, GF_LOG_TRACE,
+                "Infiniband PORT: (%u) STATE: (%s)",
+                port, state_str);
+
+        if (port_attr.state == IBV_PORT_ACTIVE)
+                return 0;
+
+        return -1;
+}
 
 static int32_t
-gf_rdma_disconnect (rpc_transport_t *this);
+ib_get_active_port (struct ibv_context *ib_ctx)
+{
+        struct ibv_device_attr ib_device_attr;
 
-static void
-gf_rdma_cm_handle_disconnect (rpc_transport_t *this);
+        int32_t ret     = -1;
+        uint8_t ib_port = 0;
+
+        if (!ib_ctx) {
+                gf_log_callingfn (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                  "Error in supplied context");
+                return -1;
+        }
+        if (ibv_query_device (ib_ctx, &ib_device_attr)) {
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "Failed to query device properties");
+                return -1;
+        }
+
+        for (ib_port = 1; ib_port <= ib_device_attr.phys_port_cnt; ++ib_port) {
+                ret = ib_check_active_port (ib_ctx, ib_port);
+                if (ret == 0)
+                        return ib_port;
+
+                gf_log (RDMA_LOG_NAME, GF_LOG_TRACE,
+                        "Port:(%u) not active", ib_port);
+                continue;
+        }
+        return ret;
+}
 
 
 static void
-gf_rdma_put_post (gf_rdma_queue_t *queue, gf_rdma_post_t *post)
+rdma_put_post (rdma_queue_t *queue,
+               rdma_post_t *post)
 {
         post->ctx.is_request = 0;
 
@@ -85,15 +167,14 @@ gf_rdma_put_post (gf_rdma_queue_t *queue, gf_rdma_post_t *post)
 }
 
 
-static gf_rdma_post_t *
-gf_rdma_new_post (rpc_transport_t *this, gf_rdma_device_t *device, int32_t len,
-                  gf_rdma_post_type_t type)
+static rdma_post_t *
+rdma_new_post (rdma_device_t *device, int32_t len, rdma_post_type_t type)
 {
-        gf_rdma_post_t *post = NULL;
-        int             ret  = -1;
+        rdma_post_t *post = NULL;
+        int          ret  = -1;
 
-        post = (gf_rdma_post_t *) GF_CALLOC (1, sizeof (*post),
-                                             gf_common_mt_rdma_post_t);
+        post = (rdma_post_t *) GF_CALLOC (1, sizeof (*post),
+                                          gf_common_mt_rdma_post_t);
         if (post == NULL) {
                 goto out;
         }
@@ -104,7 +185,7 @@ gf_rdma_new_post (rpc_transport_t *this, gf_rdma_device_t *device, int32_t len,
 
         post->buf = valloc (len);
         if (!post->buf) {
-                gf_log_nomem (GF_RDMA_LOG_NAME, GF_LOG_ERROR, len);
+                gf_log_nomem (RDMA_LOG_NAME, GF_LOG_ERROR, len);
                 goto out;
         }
 
@@ -113,9 +194,8 @@ gf_rdma_new_post (rpc_transport_t *this, gf_rdma_device_t *device, int32_t len,
                                post->buf_size,
                                IBV_ACCESS_LOCAL_WRITE);
         if (!post->mr) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "memory registration failed (%s)",
-                        strerror (errno));
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "memory registration failed");
                 goto out;
         }
 
@@ -125,7 +205,9 @@ gf_rdma_new_post (rpc_transport_t *this, gf_rdma_device_t *device, int32_t len,
         ret = 0;
 out:
         if (ret != 0) {
-                free (post->buf);
+                if (post->buf != NULL) {
+                        free (post->buf);
+                }
 
                 GF_FREE (post);
                 post = NULL;
@@ -135,10 +217,10 @@ out:
 }
 
 
-static gf_rdma_post_t *
-gf_rdma_get_post (gf_rdma_queue_t *queue)
+static rdma_post_t *
+rdma_get_post (rdma_queue_t *queue)
 {
-        gf_rdma_post_t *post = NULL;
+        rdma_post_t *post;
 
         pthread_mutex_lock (&queue->lock);
         {
@@ -165,7 +247,7 @@ gf_rdma_get_post (gf_rdma_queue_t *queue)
 }
 
 void
-gf_rdma_destroy_post (gf_rdma_post_t *post)
+rdma_destroy_post (rdma_post_t *post)
 {
         ibv_dereg_mr (post->mr);
         free (post->buf);
@@ -174,12 +256,10 @@ gf_rdma_destroy_post (gf_rdma_post_t *post)
 
 
 static int32_t
-__gf_rdma_quota_get (gf_rdma_peer_t *peer)
+__rdma_quota_get (rdma_peer_t *peer)
 {
-        int32_t            ret  = -1;
-        gf_rdma_private_t *priv = NULL;
-
-        priv = peer->trans->private;
+        int32_t ret = -1;
+        rdma_private_t *priv = peer->trans->private;
 
         if (priv->connected && peer->quota > 0) {
                 ret = peer->quota--;
@@ -188,9 +268,25 @@ __gf_rdma_quota_get (gf_rdma_peer_t *peer)
         return ret;
 }
 
+/*
+  static int32_t
+  rdma_quota_get (rdma_peer_t *peer)
+  {
+  int32_t ret = -1;
+  rdma_private_t *priv = peer->trans->private;
+
+  pthread_mutex_lock (&priv->write_mutex);
+  {
+  ret = __rdma_quota_get (peer);
+  }
+  pthread_mutex_unlock (&priv->write_mutex);
+
+  return ret;
+  }
+*/
 
 static void
-__gf_rdma_ioq_entry_free (gf_rdma_ioq_t *entry)
+__rdma_ioq_entry_free (rdma_ioq_t *entry)
 {
         list_del_init (&entry->list);
 
@@ -203,920 +299,47 @@ __gf_rdma_ioq_entry_free (gf_rdma_ioq_t *entry)
                 iobref_unref (entry->msg.request.rsp_iobref);
                 entry->msg.request.rsp_iobref = NULL;
         }
-
-        mem_put (entry);
+        /* TODO: use mem-pool */
+        mem_put (entry->pool, entry);
 }
 
 
 static void
-__gf_rdma_ioq_flush (gf_rdma_peer_t *peer)
+__rdma_ioq_flush (rdma_peer_t *peer)
 {
-        gf_rdma_ioq_t *entry = NULL, *dummy = NULL;
+        rdma_ioq_t *entry = NULL, *dummy = NULL;
 
         list_for_each_entry_safe (entry, dummy, &peer->ioq, list) {
-                __gf_rdma_ioq_entry_free (entry);
-        }
-}
-
-
-static int32_t
-__gf_rdma_disconnect (rpc_transport_t *this)
-{
-        gf_rdma_private_t *priv = NULL;
-
-        priv = this->private;
-
-        if (priv->connected) {
-                rdma_disconnect (priv->peer.cm_id);
-        }
-
-        return 0;
-}
-
-
-static void
-gf_rdma_queue_init (gf_rdma_queue_t *queue)
-{
-        pthread_mutex_init (&queue->lock, NULL);
-
-        queue->active_posts.next = &queue->active_posts;
-        queue->active_posts.prev = &queue->active_posts;
-        queue->passive_posts.next = &queue->passive_posts;
-        queue->passive_posts.prev = &queue->passive_posts;
-}
-
-
-static void
-__gf_rdma_destroy_queue (gf_rdma_post_t *post)
-{
-        gf_rdma_post_t *tmp = NULL;
-
-        while (post->next != post) {
-                tmp = post->next;
-
-                post->next = post->next->next;
-                post->next->prev = post;
-
-                gf_rdma_destroy_post (tmp);
-        }
-}
-
-
-static void
-gf_rdma_destroy_queue (gf_rdma_queue_t *queue)
-{
-        if (queue == NULL) {
-                goto out;
-        }
-
-        pthread_mutex_lock (&queue->lock);
-        {
-                if (queue->passive_count > 0) {
-                        __gf_rdma_destroy_queue (&queue->passive_posts);
-                        queue->passive_count = 0;
-                }
-
-                if (queue->active_count > 0) {
-                        __gf_rdma_destroy_queue (&queue->active_posts);
-                        queue->active_count = 0;
-                }
-        }
-        pthread_mutex_unlock (&queue->lock);
-
-out:
-        return;
-}
-
-
-static void
-gf_rdma_destroy_posts (rpc_transport_t *this)
-{
-        gf_rdma_device_t  *device = NULL;
-        gf_rdma_private_t *priv   = NULL;
-
-        if (this == NULL) {
-                goto out;
-        }
-
-        priv = this->private;
-        device = priv->device;
-
-        gf_rdma_destroy_queue (&device->sendq);
-        gf_rdma_destroy_queue (&device->recvq);
-
-out:
-        return;
-}
-
-
-static int32_t
-__gf_rdma_create_posts (rpc_transport_t *this, int32_t count, int32_t size,
-                        gf_rdma_queue_t *q, gf_rdma_post_type_t type)
-{
-        int32_t            i      = 0;
-        int32_t            ret    = 0;
-        gf_rdma_private_t *priv   = NULL;
-        gf_rdma_device_t  *device = NULL;
-
-        priv = this->private;
-        device = priv->device;
-
-        for (i=0 ; i<count ; i++) {
-                gf_rdma_post_t *post = NULL;
-
-                post = gf_rdma_new_post (this, device, size + 2048, type);
-                if (!post) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "post creation failed");
-                        ret = -1;
-                        break;
-                }
-
-                gf_rdma_put_post (q, post);
+                __rdma_ioq_entry_free (entry);
         }
-        return ret;
 }
 
 
 static int32_t
-gf_rdma_post_recv (struct ibv_srq *srq,
-                   gf_rdma_post_t *post)
-{
-        struct ibv_sge list = {
-                .addr   = (unsigned long) post->buf,
-                .length = post->buf_size,
-                .lkey   = post->mr->lkey
-        };
-
-        struct ibv_recv_wr wr = {
-                .wr_id  = (unsigned long) post,
-                .sg_list = &list,
-                .num_sge = 1,
-        }, *bad_wr;
-
-        gf_rdma_post_ref (post);
-
-        return ibv_post_srq_recv (srq, &wr, &bad_wr);
-}
-
-
-static int32_t
-gf_rdma_create_posts (rpc_transport_t *this)
-{
-        int32_t            i       = 0, ret = 0;
-        gf_rdma_post_t    *post    = NULL;
-        gf_rdma_private_t *priv    = NULL;
-        gf_rdma_options_t *options = NULL;
-        gf_rdma_device_t  *device  = NULL;
-
-        priv = this->private;
-        options = &priv->options;
-        device = priv->device;
-
-        ret =  __gf_rdma_create_posts (this, options->send_count,
-                                       options->send_size,
-                                       &device->sendq, GF_RDMA_SEND_POST);
-        if (!ret)
-                ret =  __gf_rdma_create_posts (this, options->recv_count,
-                                               options->recv_size,
-                                               &device->recvq,
-                                               GF_RDMA_RECV_POST);
-
-        if (!ret) {
-                for (i=0 ; i<options->recv_count ; i++) {
-                        post = gf_rdma_get_post (&device->recvq);
-                        if (gf_rdma_post_recv (device->srq, post) != 0) {
-                                ret = -1;
-                                break;
-                        }
-                }
-        }
-
-        if (ret)
-                gf_rdma_destroy_posts (this);
-
-        return ret;
-}
-
-
-static void
-gf_rdma_destroy_cq (rpc_transport_t *this)
-{
-        gf_rdma_private_t *priv   = NULL;
-        gf_rdma_device_t  *device = NULL;
-
-        priv = this->private;
-        device = priv->device;
-
-        if (device->recv_cq)
-                ibv_destroy_cq (device->recv_cq);
-        device->recv_cq = NULL;
-
-        if (device->send_cq)
-                ibv_destroy_cq (device->send_cq);
-        device->send_cq = NULL;
-
-        return;
-}
-
-
-static int32_t
-gf_rdma_create_cq (rpc_transport_t *this)
-{
-        gf_rdma_private_t      *priv        = NULL;
-        gf_rdma_options_t      *options     = NULL;
-        gf_rdma_device_t       *device      = NULL;
-        uint64_t                send_cqe    = 0;
-        int32_t                 ret         = 0;
-        struct ibv_device_attr  device_attr = {{0}, };
-
-        priv = this->private;
-        options = &priv->options;
-        device = priv->device;
-
-        device->recv_cq = ibv_create_cq (priv->device->context,
-                                         options->recv_count * 2,
-                                         device,
-                                         device->recv_chan,
-                                         0);
-        if (!device->recv_cq) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "creation of CQ for device %s failed",
-                        device->device_name);
-                ret = -1;
-                goto out;
-        } else if (ibv_req_notify_cq (device->recv_cq, 0)) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "ibv_req_notify_cq on recv CQ of device %s failed",
-                        device->device_name);
-                ret = -1;
-                goto out;
-        }
-
-        do {
-                ret = ibv_query_device (priv->device->context, &device_attr);
-                if (ret != 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "ibv_query_device on %s returned %d (%s)",
-                                priv->device->device_name, ret,
-                                (ret > 0) ? strerror (ret) : "");
-                        ret = -1;
-                        goto out;
-                }
-
-                send_cqe = options->send_count * 128;
-                send_cqe = (send_cqe > device_attr.max_cqe)
-                        ? device_attr.max_cqe : send_cqe;
-
-                /* TODO: make send_cq size dynamically adaptive */
-                device->send_cq = ibv_create_cq (priv->device->context,
-                                                 send_cqe, device,
-                                                 device->send_chan, 0);
-                if (!device->send_cq) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "creation of send_cq for device %s failed",
-                                device->device_name);
-                        ret = -1;
-                        goto out;
-                }
-
-                if (ibv_req_notify_cq (device->send_cq, 0)) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "ibv_req_notify_cq on send_cq for device %s"
-                                " failed",  device->device_name);
-                        ret = -1;
-                        goto out;
-                }
-        } while (0);
-
-out:
-        if (ret != 0)
-                gf_rdma_destroy_cq (this);
-
-        return ret;
-}
-
-
-static gf_rdma_device_t *
-gf_rdma_get_device (rpc_transport_t *this, struct ibv_context *ibctx,
-                    char *device_name)
-{
-        glusterfs_ctx_t   *ctx      = NULL;
-        gf_rdma_private_t *priv     = NULL;
-        gf_rdma_options_t *options  = NULL;
-        int32_t            ret      = 0;
-        int32_t            i        = 0;
-        gf_rdma_device_t  *trav     = NULL, *device = NULL;
-        gf_rdma_ctx_t     *rdma_ctx = NULL;
-
-        priv        = this->private;
-        options     = &priv->options;
-        ctx         = this->ctx;
-        rdma_ctx    = ctx->ib;
-
-        trav = rdma_ctx->device;
-
-        while (trav) {
-                if (!strcmp (trav->device_name, device_name))
-                        break;
-                trav = trav->next;
-        }
-
-        if (!trav) {
-                trav = GF_CALLOC (1, sizeof (*trav),
-                                  gf_common_mt_rdma_device_t);
-                if (trav == NULL) {
-                        goto out;
-                }
-
-                priv->device = trav;
-                trav->context = ibctx;
-
-                trav->request_ctx_pool
-                        = mem_pool_new (gf_rdma_request_context_t,
-                                        GF_RDMA_POOL_SIZE);
-                if (trav->request_ctx_pool == NULL) {
-                        goto out;
-                }
-
-                trav->ioq_pool
-                        = mem_pool_new (gf_rdma_ioq_t, GF_RDMA_POOL_SIZE);
-                if (trav->ioq_pool == NULL) {
-                        goto out;
-                }
-
-                trav->reply_info_pool = mem_pool_new (gf_rdma_reply_info_t,
-                                                      GF_RDMA_POOL_SIZE);
-                if (trav->reply_info_pool == NULL) {
-                        goto out;
-                }
-
-                trav->device_name = gf_strdup (device_name);
-
-                trav->next = rdma_ctx->device;
-                rdma_ctx->device = trav;
-
-                trav->send_chan = ibv_create_comp_channel (trav->context);
-                if (!trav->send_chan) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not create send completion channel for "
-                                "device (%s)", device_name);
-                        goto out;
-                }
-
-                trav->recv_chan = ibv_create_comp_channel (trav->context);
-                if (!trav->recv_chan) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not create recv completion channel for "
-                                "device (%s)", device_name);
-
-                        /* TODO: cleanup current mess */
-                        goto out;
-                }
-
-                if (gf_rdma_create_cq (this) < 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not create CQ for device (%s)",
-                                device_name);
-                        goto out;
-                }
-
-                /* protection domain */
-                trav->pd = ibv_alloc_pd (trav->context);
-
-                if (!trav->pd) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not allocate protection domain for "
-                                "device (%s)", device_name);
-                        goto out;
-                }
-
-                struct ibv_srq_init_attr attr = {
-                        .attr = {
-                                .max_wr = options->recv_count,
-                                .max_sge = 1,
-                                .srq_limit = 10
-                        }
-                };
-                trav->srq = ibv_create_srq (trav->pd, &attr);
-
-                if (!trav->srq) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not create SRQ for device (%s)",
-                                device_name);
-                        goto out;
-                }
-
-                /* queue init */
-                gf_rdma_queue_init (&trav->sendq);
-                gf_rdma_queue_init (&trav->recvq);
-
-                if (gf_rdma_create_posts (this) < 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not allocate posts for device (%s)",
-                                device_name);
-                        goto out;
-                }
-
-                /* completion threads */
-                ret = gf_thread_create (&trav->send_thread, NULL,
-					gf_rdma_send_completion_proc,
-					trav->send_chan);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not create send completion thread for "
-                                "device (%s)", device_name);
-                        goto out;
-                }
-
-                ret = gf_thread_create (&trav->recv_thread, NULL,
-					 gf_rdma_recv_completion_proc,
-					 trav->recv_chan);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not create recv completion thread "
-                                "for device (%s)", device_name);
-                        return NULL;
-                }
-
-                ret = gf_thread_create (&trav->async_event_thread, NULL,
-					 gf_rdma_async_event_thread,
-					 ibctx);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "could not create async_event_thread");
-                        return NULL;
-                }
-
-                /* qpreg */
-                pthread_mutex_init (&trav->qpreg.lock, NULL);
-                for (i=0; i<42; i++) {
-                        trav->qpreg.ents[i].next = &trav->qpreg.ents[i];
-                        trav->qpreg.ents[i].prev = &trav->qpreg.ents[i];
-                }
-        }
-
-        device = trav;
-        trav = NULL;
-out:
-
-        if (trav != NULL) {
-                gf_rdma_destroy_posts (this);
-                mem_pool_destroy (trav->ioq_pool);
-                mem_pool_destroy (trav->request_ctx_pool);
-                mem_pool_destroy (trav->reply_info_pool);
-                ibv_dealloc_pd (trav->pd);
-                gf_rdma_destroy_cq (this);
-                ibv_destroy_comp_channel (trav->recv_chan);
-                ibv_destroy_comp_channel (trav->send_chan);
-                GF_FREE ((char *)trav->device_name);
-                GF_FREE (trav);
-        }
-
-        return device;
-}
-
-
-static rpc_transport_t *
-gf_rdma_transport_new (rpc_transport_t *listener, struct rdma_cm_id *cm_id)
-{
-        gf_rdma_private_t *listener_priv = NULL, *priv = NULL;
-        rpc_transport_t   *this          = NULL, *new = NULL;
-        gf_rdma_options_t *options       = NULL;
-        char              *device_name   = NULL;
-
-        listener_priv = listener->private;
-
-        this = GF_CALLOC (1, sizeof (rpc_transport_t),
-                          gf_common_mt_rpc_transport_t);
-        if (this == NULL) {
-                goto out;
-        }
-
-        this->listener = listener;
-
-        priv = GF_CALLOC (1, sizeof (gf_rdma_private_t),
-                          gf_common_mt_rdma_private_t);
-        if (priv == NULL) {
-                goto out;
-        }
-
-        this->private = priv;
-        priv->options = listener_priv->options;
-
-        priv->listener = listener;
-        priv->entity = GF_RDMA_SERVER;
-
-        options = &priv->options;
-
-        this->ops = listener->ops;
-        this->init = listener->init;
-        this->fini = listener->fini;
-        this->ctx = listener->ctx;
-        this->name = gf_strdup (listener->name);
-        this->notify = listener->notify;
-        this->mydata = listener->mydata;
-
-        this->myinfo.sockaddr_len = sizeof (cm_id->route.addr.src_addr);
-        memcpy (&this->myinfo.sockaddr, &cm_id->route.addr.src_addr,
-                this->myinfo.sockaddr_len);
-
-        this->peerinfo.sockaddr_len = sizeof (cm_id->route.addr.dst_addr);
-        memcpy (&this->peerinfo.sockaddr, &cm_id->route.addr.dst_addr,
-                this->peerinfo.sockaddr_len);
-
-        priv->peer.trans = this;
-        gf_rdma_get_transport_identifiers (this);
-
-        device_name = (char *)ibv_get_device_name (cm_id->verbs->device);
-        if (device_name == NULL) {
-                gf_log (listener->name, GF_LOG_WARNING,
-                        "cannot get device name (peer:%s me:%s)",
-                        this->peerinfo.identifier, this->myinfo.identifier);
-                goto out;
-        }
-
-        priv->device = gf_rdma_get_device (this, cm_id->verbs,
-                                           device_name);
-        if (priv->device == NULL) {
-                gf_log (listener->name, GF_LOG_WARNING,
-                        "cannot get infiniband device %s (peer:%s me:%s)",
-                        device_name, this->peerinfo.identifier,
-                        this->myinfo.identifier);
-                goto out;
-        }
-
-        priv->peer.send_count = options->send_count;
-        priv->peer.recv_count = options->recv_count;
-        priv->peer.send_size = options->send_size;
-        priv->peer.recv_size = options->recv_size;
-        priv->peer.cm_id = cm_id;
-        INIT_LIST_HEAD (&priv->peer.ioq);
-
-        pthread_mutex_init (&priv->write_mutex, NULL);
-        pthread_mutex_init (&priv->recv_mutex, NULL);
-
-        cm_id->context = this;
-
-        new = rpc_transport_ref (this);
-        this = NULL;
-out:
-        if (this != NULL) {
-                if (this->private != NULL) {
-                        GF_FREE (this->private);
-                }
-
-                if (this->name != NULL) {
-                        GF_FREE (this->name);
-                }
-
-                GF_FREE (this);
-        }
-
-        return new;
-}
-
-
-static int
-gf_rdma_cm_handle_connect_request (struct rdma_cm_event *event)
-{
-        int                     ret         = -1;
-        rpc_transport_t        *this        = NULL, *listener = NULL;
-        struct rdma_cm_id      *child_cm_id = NULL, *listener_cm_id = NULL;
-	struct rdma_conn_param  conn_param  = {0, };
-        gf_rdma_private_t      *priv        = NULL;
-        gf_rdma_options_t      *options     = NULL;
-
-        child_cm_id = event->id;
-        listener_cm_id = event->listen_id;
-
-        listener = listener_cm_id->context;
-        priv = listener->private;
-        options = &priv->options;
-
-        this = gf_rdma_transport_new (listener, child_cm_id);
-        if (this == NULL) {
-                gf_log (listener->name, GF_LOG_WARNING,
-                        "could not create a transport for incoming connection"
-                        " (me.name:%s me.identifier:%s)", listener->name,
-                        listener->myinfo.identifier);
-                rdma_destroy_id (child_cm_id);
-                goto out;
-        }
-
-        gf_log (listener->name, GF_LOG_TRACE,
-                "got a connect request (me:%s peer:%s)",
-                listener->myinfo.identifier, this->peerinfo.identifier);
-
-        ret = gf_rdma_create_qp (this);
-        if (ret < 0) {
-                gf_log (listener->name, GF_LOG_WARNING,
-                        "could not create QP (peer:%s me:%s)",
-                        this->peerinfo.identifier, this->myinfo.identifier);
-                gf_rdma_cm_handle_disconnect (this);
-                goto out;
-        }
-
-	conn_param.responder_resources = 1;
-	conn_param.initiator_depth = 1;
-        conn_param.retry_count = options->attr_retry_cnt;
-        conn_param.rnr_retry_count = options->attr_rnr_retry;
-
-	ret = rdma_accept(child_cm_id, &conn_param);
-	if (ret < 0) {
-                gf_log (listener->name, GF_LOG_WARNING, "rdma_accept failed "
-                        "peer:%s me:%s (%s)", this->peerinfo.identifier,
-                        this->myinfo.identifier, strerror (errno));
-                gf_rdma_cm_handle_disconnect (this);
-                goto out;
-	}
-
-        ret = 0;
-
-out:
-        return ret;
-}
-
-
-static int
-gf_rdma_cm_handle_route_resolved (struct rdma_cm_event *event)
-{
-	struct rdma_conn_param  conn_param = {0, };
-	int                     ret        = 0;
-        rpc_transport_t        *this       = NULL;
-        gf_rdma_private_t      *priv       = NULL;
-        gf_rdma_peer_t         *peer       = NULL;
-        gf_rdma_options_t      *options    = NULL;
-
-        if (event == NULL) {
-                goto out;
-        }
-
-        this = event->id->context;
-
-        priv = this->private;
-        peer = &priv->peer;
-        options = &priv->options;
-
-        ret = gf_rdma_create_qp (this);
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "could not create QP (peer:%s me:%s)",
-                        this->peerinfo.identifier, this->myinfo.identifier);
-                gf_rdma_cm_handle_disconnect (this);
-                goto out;
-        }
-
-	memset(&conn_param, 0, sizeof conn_param);
-	conn_param.responder_resources = 1;
-	conn_param.initiator_depth = 1;
-	conn_param.retry_count = options->attr_retry_cnt;
-        conn_param.rnr_retry_count = options->attr_rnr_retry;
-
-	ret = rdma_connect(peer->cm_id, &conn_param);
-	if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "rdma_connect failed (%s)", strerror (errno));
-                gf_rdma_cm_handle_disconnect (this);
-                goto out;
-	}
-
-        gf_log (this->name, GF_LOG_TRACE, "route resolved (me:%s peer:%s)",
-                this->myinfo.identifier, this->peerinfo.identifier);
-
-        ret = 0;
-out:
-        return ret;
-}
-
-
-static int
-gf_rdma_cm_handle_addr_resolved (struct rdma_cm_event *event)
-{
-        rpc_transport_t   *this = NULL;
-        gf_rdma_peer_t    *peer = NULL;
-        gf_rdma_private_t *priv = NULL;
-        int                ret  = 0;
-
-        this = event->id->context;
-
-        priv = this->private;
-        peer = &priv->peer;
-
-        GF_ASSERT (peer->cm_id == event->id);
-
-        this->myinfo.sockaddr_len = sizeof (peer->cm_id->route.addr.src_addr);
-        memcpy (&this->myinfo.sockaddr, &peer->cm_id->route.addr.src_addr,
-                this->myinfo.sockaddr_len);
-
-        this->peerinfo.sockaddr_len = sizeof (peer->cm_id->route.addr.dst_addr);
-        memcpy (&this->peerinfo.sockaddr, &peer->cm_id->route.addr.dst_addr,
-                this->peerinfo.sockaddr_len);
-
-        gf_rdma_get_transport_identifiers (this);
-
-        ret = rdma_resolve_route(peer->cm_id, 2000);
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "rdma_resolve_route failed (me:%s peer:%s) (%s)",
-                        this->myinfo.identifier, this->peerinfo.identifier,
-                        strerror (errno));
-                gf_rdma_cm_handle_disconnect (this);
-        }
-
-        gf_log (this->name, GF_LOG_TRACE, "Address resolved (me:%s peer:%s)",
-                this->myinfo.identifier, this->peerinfo.identifier);
-
-        return ret;
-}
-
-
-static void
-gf_rdma_cm_handle_disconnect (rpc_transport_t *this)
+__rdma_disconnect (rpc_transport_t *this)
 {
-        gf_rdma_private_t *priv       = NULL;
-        char               need_unref = 0, connected = 0;
-
-        priv = this->private;
-        gf_log (this->name, GF_LOG_DEBUG,
-                "peer disconnected, cleaning up");
-
-        pthread_mutex_lock (&priv->write_mutex);
-        {
-                if (priv->peer.cm_id != NULL) {
-                        need_unref = 1;
-                        connected = priv->connected;
-                        priv->connected = 0;
-                }
-
-                __gf_rdma_teardown (this);
-        }
-        pthread_mutex_unlock (&priv->write_mutex);
-
-        if (connected) {
-                rpc_transport_notify (this, RPC_TRANSPORT_DISCONNECT, this);
-        }
-
-        if (need_unref)
-                rpc_transport_unref (this);
-
-}
-
-
-static int
-gf_rdma_cm_handle_event_established (struct rdma_cm_event *event)
-{
-        rpc_transport_t   *this  = NULL;
-        gf_rdma_private_t *priv  = NULL;
-        struct rdma_cm_id *cm_id = NULL;
-        int                ret   = 0;
-
-        cm_id = event->id;
-        this = cm_id->context;
-        priv = this->private;
-
-        priv->connected = 1;
-
-        pthread_mutex_lock (&priv->write_mutex);
-        {
-                priv->peer.quota = 1;
-                priv->peer.quota_set = 0;
-        }
-        pthread_mutex_unlock (&priv->write_mutex);
-
-        if (priv->entity == GF_RDMA_CLIENT) {
-                ret = rpc_transport_notify (this, RPC_TRANSPORT_CONNECT, this);
-
-        } else if (priv->entity == GF_RDMA_SERVER) {
-                ret = rpc_transport_notify (priv->listener,
-                                            RPC_TRANSPORT_ACCEPT, this);
-        }
-
-        if (ret < 0) {
-                gf_rdma_disconnect (this);
-        }
-
-        gf_log (this->name, GF_LOG_TRACE,
-                "recieved event RDMA_CM_EVENT_ESTABLISHED (me:%s peer:%s)",
-                this->myinfo.identifier, this->peerinfo.identifier);
-
-        return ret;
-}
-
-
-static int
-gf_rdma_cm_handle_event_error (rpc_transport_t *this)
-{
-        gf_rdma_private_t *priv  = NULL;
-
-        priv = this->private;
-
-        if (priv->entity != GF_RDMA_SERVER_LISTENER) {
-                gf_rdma_cm_handle_disconnect (this);
-        }
-
-        return 0;
-}
-
-
-static int
-gf_rdma_cm_handle_device_removal (struct rdma_cm_event *event)
-{
-        return 0;
-}
-
-
-static void *
-gf_rdma_cm_event_handler (void *data)
-{
-        struct rdma_cm_event      *event         = NULL;
-        int                        ret           = 0;
-        rpc_transport_t           *this          = NULL;
-        struct rdma_event_channel *event_channel = NULL;
-
-        event_channel = data;
+        rdma_private_t *priv = this->private;
+        int32_t ret = 0;
 
-        while (1) {
-                ret = rdma_get_cm_event (event_channel, &event);
-                if (ret != 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "rdma_cm_get_event failed (%s)",
+        if (priv->connected || priv->tcp_connected) {
+                fcntl (priv->sock, F_SETFL, O_NONBLOCK);
+                if (shutdown (priv->sock, SHUT_RDWR) != 0) {
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                                "shutdown () - error: %s",
                                 strerror (errno));
-                        break;
-                }
-
-                switch (event->event) {
-                case RDMA_CM_EVENT_ADDR_RESOLVED:
-                        gf_rdma_cm_handle_addr_resolved (event);
-                        break;
-
-                case RDMA_CM_EVENT_ROUTE_RESOLVED:
-                        gf_rdma_cm_handle_route_resolved (event);
-                        break;
-
-                case RDMA_CM_EVENT_CONNECT_REQUEST:
-                        gf_rdma_cm_handle_connect_request (event);
-                        break;
-
-                case RDMA_CM_EVENT_ESTABLISHED:
-                        gf_rdma_cm_handle_event_established (event);
-                        break;
-
-                case RDMA_CM_EVENT_ADDR_ERROR:
-                case RDMA_CM_EVENT_ROUTE_ERROR:
-                case RDMA_CM_EVENT_CONNECT_ERROR:
-                case RDMA_CM_EVENT_UNREACHABLE:
-                case RDMA_CM_EVENT_REJECTED:
-                        this = event->id->context;
-
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "cma event %s, error %d (me:%s peer:%s)\n",
-                                rdma_event_str(event->event), event->status,
-                                this->myinfo.identifier,
-                                this->peerinfo.identifier);
-
-                        rdma_ack_cm_event (event);
-                        event = NULL;
-
-                        gf_rdma_cm_handle_event_error (this);
-                        continue;
-
-                case RDMA_CM_EVENT_DISCONNECTED:
-                        this = event->id->context;
-
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "recieved disconnect (me:%s peer:%s)\n",
-                                this->myinfo.identifier,
-                                this->peerinfo.identifier);
-
-                        rdma_ack_cm_event (event);
-                        event = NULL;
-
-                        gf_rdma_cm_handle_disconnect (this);
-                        continue;
-
-                case RDMA_CM_EVENT_DEVICE_REMOVAL:
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "device removed");
-                        gf_rdma_cm_handle_device_removal (event);
-                        break;
-
-                default:
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "unhandled event: %s, ignoring",
-                                rdma_event_str(event->event));
-                        break;
+                        ret = -errno;
+                        priv->tcp_connected = 0;
                 }
-
-                rdma_ack_cm_event (event);
         }
 
-        return NULL;
+        return ret;
 }
 
 
 static int32_t
-gf_rdma_post_send (struct ibv_qp *qp, gf_rdma_post_t *post, int32_t len)
+rdma_post_send (struct ibv_qp *qp,
+                rdma_post_t *post,
+                int32_t len)
 {
         struct ibv_sge list = {
                 .addr = (unsigned long) post->buf,
@@ -1139,64 +362,63 @@ gf_rdma_post_send (struct ibv_qp *qp, gf_rdma_post_t *post, int32_t len)
 }
 
 int
-__gf_rdma_encode_error(gf_rdma_peer_t *peer, gf_rdma_reply_info_t *reply_info,
-                       struct iovec *rpchdr, gf_rdma_header_t *hdr,
-                       gf_rdma_errcode_t err)
+__rdma_encode_error(rdma_peer_t *peer, rdma_reply_info_t *reply_info,
+                    struct iovec *rpchdr, uint32_t *ptr,
+                    rdma_errcode_t err)
 {
+        uint32_t       *startp = NULL;
         struct rpc_msg *rpc_msg = NULL;
 
+        startp = ptr;
         if (reply_info != NULL) {
-                hdr->rm_xid = hton32(reply_info->rm_xid);
+                *ptr++ = hton32(reply_info->rm_xid);
         } else {
                 rpc_msg = rpchdr[0].iov_base; /* assume rpchdr contains
                                                * only one vector.
                                                * (which is true)
                                                */
-                hdr->rm_xid = rpc_msg->rm_xid;
+                *ptr++ = rpc_msg->rm_xid;
         }
 
-        hdr->rm_vers = hton32(GF_RDMA_VERSION);
-        hdr->rm_credit = hton32(peer->send_count);
-        hdr->rm_type = hton32(GF_RDMA_ERROR);
-        hdr->rm_body.rm_error.rm_type = hton32(err);
+        *ptr++ = hton32(RDMA_VERSION);
+        *ptr++ = hton32(peer->send_count);
+        *ptr++ = hton32(RDMA_ERROR);
+        *ptr++ = hton32(err);
         if (err == ERR_VERS) {
-                hdr->rm_body.rm_error.rm_version.gf_rdma_vers_low
-                        = hton32(GF_RDMA_VERSION);
-                hdr->rm_body.rm_error.rm_version.gf_rdma_vers_high
-                        = hton32(GF_RDMA_VERSION);
+                *ptr++ = hton32(RDMA_VERSION);
+                *ptr++ = hton32(RDMA_VERSION);
         }
 
-        return sizeof (*hdr);
+        return (int)((unsigned long)ptr - (unsigned long)startp);
 }
 
 
 int32_t
-__gf_rdma_send_error (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
-                      gf_rdma_post_t *post, gf_rdma_reply_info_t *reply_info,
-                      gf_rdma_errcode_t err)
+__rdma_send_error (rdma_peer_t *peer, rdma_ioq_t *entry, rdma_post_t *post,
+                   rdma_reply_info_t *reply_info, rdma_errcode_t err)
 {
-        int32_t  ret = -1, len = 0;
+        int32_t  ret = -1, len;
 
-        len = __gf_rdma_encode_error (peer, reply_info, entry->rpchdr,
-                                      (gf_rdma_header_t *)post->buf, err);
+        len = __rdma_encode_error (peer, reply_info, entry->rpchdr,
+                                   (uint32_t *)post->buf, err);
         if (len == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_ERROR,
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
                         "encode error returned -1");
                 goto out;
         }
 
-        gf_rdma_post_ref (post);
+        rdma_post_ref (post);
 
-        ret = gf_rdma_post_send (peer->qp, post, len);
+        ret = rdma_post_send (peer->qp, post, len);
         if (!ret) {
                 ret = len;
         } else {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "gf_rdma_post_send (to %s) failed with ret = %d (%s)",
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
+                        "rdma_post_send (to %s) failed with ret = %d (%s)",
                         peer->trans->peerinfo.identifier, ret,
                         (ret > 0) ? strerror (ret) : "");
-                gf_rdma_post_unref (post);
-                __gf_rdma_disconnect (peer->trans);
+                rdma_post_unref (post);
+                __rdma_disconnect (peer->trans);
                 ret = -1;
         }
 
@@ -1206,24 +428,24 @@ out:
 
 
 int32_t
-__gf_rdma_create_read_chunks_from_vector (gf_rdma_peer_t *peer,
-                                          gf_rdma_read_chunk_t **readch_ptr,
-                                          int32_t *pos, struct iovec *vector,
-                                          int count,
-                                          gf_rdma_request_context_t *request_ctx)
+__rdma_create_read_chunks_from_vector (rdma_peer_t *peer,
+                                       rdma_read_chunk_t **readch_ptr,
+                                       int32_t *pos, struct iovec *vector,
+                                       int count,
+                                       rdma_request_context_t *request_ctx)
 {
-        int                   i      = 0;
-        gf_rdma_private_t    *priv   = NULL;
-        gf_rdma_device_t     *device = NULL;
-        struct ibv_mr        *mr     = NULL;
-        gf_rdma_read_chunk_t *readch = NULL;
-        int32_t               ret    = -1;
-
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, peer, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, readch_ptr, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, *readch_ptr, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, request_ctx, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, vector, out);
+        int                i      = 0;
+        rdma_private_t    *priv   = NULL;
+        rdma_device_t     *device = NULL;
+        struct ibv_mr     *mr     = NULL;
+        rdma_read_chunk_t *readch = NULL;
+        int32_t            ret    = -1;
+
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, peer, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, readch_ptr, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, *readch_ptr, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, request_ctx, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, vector, out);
 
         priv = peer->trans->private;
         device = priv->device;
@@ -1237,10 +459,8 @@ __gf_rdma_create_read_chunks_from_vector (gf_rdma_peer_t *peer,
                                  vector[i].iov_len,
                                  IBV_ACCESS_REMOTE_READ);
                 if (!mr) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "memory registration failed (%s) (peer:%s)",
-                                strerror (errno),
-                                peer->trans->peerinfo.identifier);
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "memory registration failed");
                         goto out;
                 }
 
@@ -1265,72 +485,77 @@ out:
 
 
 int32_t
-__gf_rdma_create_read_chunks (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
-                              gf_rdma_chunktype_t type, uint32_t **ptr,
-                              gf_rdma_request_context_t *request_ctx)
+__rdma_create_read_chunks (rdma_peer_t *peer, rdma_ioq_t *entry,
+                           rdma_chunktype_t type, uint32_t **ptr,
+                           rdma_request_context_t *request_ctx)
 {
         int32_t            ret      = -1;
+        rdma_device_t     *device   = NULL;
+        rdma_private_t    *priv     = NULL;
         int                pos      = 0;
 
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, peer, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, entry, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, ptr, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, *ptr, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, request_ctx, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, peer, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, entry, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, ptr, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, *ptr, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, request_ctx, out);
+
+        priv = peer->trans->private;
+        device = priv->device;
 
         request_ctx->iobref = iobref_ref (entry->iobref);
 
-        if (type == gf_rdma_areadch) {
+        if (type == rdma_areadch) {
                 pos = 0;
-                ret = __gf_rdma_create_read_chunks_from_vector (peer,
-                                                                (gf_rdma_read_chunk_t **)ptr,
-                                                                &pos,
-                                                                entry->rpchdr,
-                                                                entry->rpchdr_count,
-                                                                request_ctx);
+                ret = __rdma_create_read_chunks_from_vector (peer,
+                                                             (rdma_read_chunk_t **)ptr,
+                                                             &pos,
+                                                             entry->rpchdr,
+                                                             entry->rpchdr_count,
+                                                             request_ctx);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "cannot create read chunks from vector "
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                                "cannot create read chunks from vector, "
                                 "entry->rpchdr");
                         goto out;
                 }
 
-                ret = __gf_rdma_create_read_chunks_from_vector (peer,
-                                                                (gf_rdma_read_chunk_t **)ptr,
-                                                                &pos,
-                                                                entry->proghdr,
-                                                                entry->proghdr_count,
-                                                                request_ctx);
+                ret = __rdma_create_read_chunks_from_vector (peer,
+                                                             (rdma_read_chunk_t **)ptr,
+                                                             &pos,
+                                                             entry->proghdr,
+                                                             entry->proghdr_count,
+                                                             request_ctx);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "cannot create read chunks from vector "
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                                "cannot create read chunks from vector, "
                                 "entry->proghdr");
                 }
 
                 if (entry->prog_payload_count != 0) {
-                        ret = __gf_rdma_create_read_chunks_from_vector (peer,
-                                                                        (gf_rdma_read_chunk_t **)ptr,
-                                                                        &pos,
-                                                                        entry->prog_payload,
-                                                                        entry->prog_payload_count,
-                                                                        request_ctx);
+                        ret = __rdma_create_read_chunks_from_vector (peer,
+                                                                     (rdma_read_chunk_t **)ptr,
+                                                                     &pos,
+                                                                     entry->prog_payload,
+                                                                     entry->prog_payload_count,
+                                                                     request_ctx);
                         if (ret == -1) {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                        "cannot create read chunks from vector"
+                                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                                        "cannot create read chunks from vector,"
                                         " entry->prog_payload");
                         }
                 }
         } else {
                 pos = iov_length (entry->rpchdr, entry->rpchdr_count);
-                ret = __gf_rdma_create_read_chunks_from_vector (peer,
-                                                                (gf_rdma_read_chunk_t **)ptr,
-                                                                &pos,
-                                                                entry->prog_payload,
-                                                                entry->prog_payload_count,
-                                                                request_ctx);
+                ret = __rdma_create_read_chunks_from_vector (peer,
+                                                             (rdma_read_chunk_t **)ptr,
+                                                             &pos,
+                                                             entry->prog_payload,
+                                                             entry->prog_payload_count,
+                                                             request_ctx);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "cannot create read chunks from vector "
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                                "cannot create read chunks from vector, "
                                 "entry->prog_payload");
                 }
         }
@@ -1344,23 +569,23 @@ out:
 
 
 int32_t
-__gf_rdma_create_write_chunks_from_vector (gf_rdma_peer_t *peer,
-                                           gf_rdma_write_chunk_t **writech_ptr,
-                                           struct iovec *vector, int count,
-                                           gf_rdma_request_context_t *request_ctx)
+__rdma_create_write_chunks_from_vector (rdma_peer_t *peer,
+                                        rdma_write_chunk_t **writech_ptr,
+                                        struct iovec *vector, int count,
+                                        rdma_request_context_t *request_ctx)
 {
-        int                    i       = 0;
-        gf_rdma_private_t     *priv    = NULL;
-        gf_rdma_device_t      *device  = NULL;
-        struct ibv_mr         *mr      = NULL;
-        gf_rdma_write_chunk_t *writech = NULL;
-        int32_t                ret     = -1;
-
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, peer, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, writech_ptr, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, *writech_ptr, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, request_ctx, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, vector, out);
+        int                 i       = 0;
+        rdma_private_t     *priv    = NULL;
+        rdma_device_t      *device  = NULL;
+        struct ibv_mr      *mr      = NULL;
+        rdma_write_chunk_t *writech = NULL;
+        int32_t             ret     = -1;
+
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, peer, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, writech_ptr, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, *writech_ptr, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, request_ctx, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, vector, out);
 
         writech = *writech_ptr;
 
@@ -1373,10 +598,8 @@ __gf_rdma_create_write_chunks_from_vector (gf_rdma_peer_t *peer,
                                  IBV_ACCESS_REMOTE_WRITE
                                  | IBV_ACCESS_LOCAL_WRITE);
                 if (!mr) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "memory registration failed (%s) (peer:%s)",
-                                strerror (errno),
-                                peer->trans->peerinfo.identifier);
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "memory registration failed");
                         goto out;
                 }
 
@@ -1399,23 +622,23 @@ out:
 
 
 int32_t
-__gf_rdma_create_write_chunks (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
-                               gf_rdma_chunktype_t chunk_type, uint32_t **ptr,
-                               gf_rdma_request_context_t *request_ctx)
+__rdma_create_write_chunks (rdma_peer_t *peer, rdma_ioq_t *entry,
+                            rdma_chunktype_t chunk_type, uint32_t **ptr,
+                            rdma_request_context_t *request_ctx)
 {
-        int32_t                ret    = -1;
-        gf_rdma_write_array_t *warray = NULL;
+        int32_t             ret      = -1;
+        rdma_write_array_t *warray   = NULL;
 
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, peer, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, ptr, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, *ptr, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, request_ctx, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, entry, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, peer, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, ptr, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, *ptr, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, request_ctx, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, entry, out);
 
-        if ((chunk_type == gf_rdma_replych)
+        if ((chunk_type == rdma_replych)
             && ((entry->msg.request.rsphdr_count != 1) ||
                 (entry->msg.request.rsphdr_vec[0].iov_base == NULL))) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
                         (entry->msg.request.rsphdr_count == 1)
                         ? "chunktype specified as reply chunk but the vector "
                         "specifying the buffer to be used for holding reply"
@@ -1426,10 +649,10 @@ __gf_rdma_create_write_chunks (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
         }
 
 /*
-  if ((chunk_type == gf_rdma_writech)
+  if ((chunk_type == rdma_writech)
   && ((entry->msg.request.rsphdr_count == 0)
   || (entry->msg.request.rsphdr_vec[0].iov_base == NULL))) {
-  gf_log (GF_RDMA_LOG_NAME, GF_LOG_DEBUG,
+  gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
   "vector specifying buffer to hold the program's reply "
   "header should also be provided when buffers are "
   "provided for holding the program's payload in reply");
@@ -1437,21 +660,21 @@ __gf_rdma_create_write_chunks (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
   }
 */
 
-        if (chunk_type == gf_rdma_writech) {
-                warray = (gf_rdma_write_array_t *)*ptr;
+        if (chunk_type == rdma_writech) {
+                warray = (rdma_write_array_t *)*ptr;
                 warray->wc_discrim = hton32 (1);
                 warray->wc_nchunks
                         = hton32 (entry->msg.request.rsp_payload_count);
 
                 *ptr = (uint32_t *)&warray->wc_array[0];
 
-                ret = __gf_rdma_create_write_chunks_from_vector (peer,
-                                                                 (gf_rdma_write_chunk_t **)ptr,
-                                                                 entry->msg.request.rsp_payload,
-                                                                 entry->msg.request.rsp_payload_count,
-                                                                 request_ctx);
+                ret = __rdma_create_write_chunks_from_vector (peer,
+                                                              (rdma_write_chunk_t **)ptr,
+                                                              entry->msg.request.rsp_payload,
+                                                              entry->msg.request.rsp_payload_count,
+                                                              request_ctx);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                                 "cannot create write chunks from vector "
                                 "entry->rpc_payload");
                         goto out;
@@ -1469,19 +692,19 @@ __gf_rdma_create_write_chunks (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
                 **ptr = 0;
                 *ptr = *ptr + 1;
 
-                warray = (gf_rdma_write_array_t *)*ptr;
+                warray = (rdma_write_array_t *)*ptr;
                 warray->wc_discrim = hton32 (1);
                 warray->wc_nchunks = hton32 (entry->msg.request.rsphdr_count);
 
                 *ptr = (uint32_t *)&warray->wc_array[0];
 
-                ret = __gf_rdma_create_write_chunks_from_vector (peer,
-                                                                 (gf_rdma_write_chunk_t **)ptr,
-                                                                 entry->msg.request.rsphdr_vec,
-                                                                 entry->msg.request.rsphdr_count,
-                                                                 request_ctx);
+                ret = __rdma_create_write_chunks_from_vector (peer,
+                                                              (rdma_write_chunk_t **)ptr,
+                                                              entry->msg.request.rsphdr_vec,
+                                                              entry->msg.request.rsphdr_count,
+                                                              request_ctx);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                                 "cannot create write chunks from vector "
                                 "entry->rpchdr");
                         goto out;
@@ -1497,8 +720,8 @@ out:
 }
 
 
-static inline void
-__gf_rdma_deregister_mr (struct ibv_mr **mr, int count)
+inline void
+__rdma_deregister_mr (struct ibv_mr **mr, int count)
 {
         int i = 0;
 
@@ -1516,15 +739,15 @@ out:
 
 
 static int32_t
-__gf_rdma_quota_put (gf_rdma_peer_t *peer)
+__rdma_quota_put (rdma_peer_t *peer)
 {
-        int32_t ret = 0;
+        int32_t ret;
 
         peer->quota++;
         ret = peer->quota;
 
         if (!list_empty (&peer->ioq)) {
-                ret = __gf_rdma_ioq_churn (peer);
+                ret = __rdma_ioq_churn (peer);
         }
 
         return ret;
@@ -1532,15 +755,14 @@ __gf_rdma_quota_put (gf_rdma_peer_t *peer)
 
 
 static int32_t
-gf_rdma_quota_put (gf_rdma_peer_t *peer)
+rdma_quota_put (rdma_peer_t *peer)
 {
-        int32_t            ret  = 0;
-        gf_rdma_private_t *priv = NULL;
+        int32_t ret;
+        rdma_private_t *priv = peer->trans->private;
 
-        priv = peer->trans->private;
         pthread_mutex_lock (&priv->write_mutex);
         {
-                ret = __gf_rdma_quota_put (peer);
+                ret = __rdma_quota_put (peer);
         }
         pthread_mutex_unlock (&priv->write_mutex);
 
@@ -1550,11 +772,11 @@ gf_rdma_quota_put (gf_rdma_peer_t *peer)
 
 /* to be called with priv->mutex held */
 void
-__gf_rdma_request_context_destroy (gf_rdma_request_context_t *context)
+__rdma_request_context_destroy (rdma_request_context_t *context)
 {
-        gf_rdma_peer_t    *peer = NULL;
-        gf_rdma_private_t *priv = NULL;
-        int32_t            ret  = 0;
+        rdma_peer_t    *peer = NULL;
+        rdma_private_t *priv = NULL;
+        int32_t         ret  = 0;
 
         if (context == NULL) {
                 goto out;
@@ -1562,18 +784,18 @@ __gf_rdma_request_context_destroy (gf_rdma_request_context_t *context)
 
         peer = context->peer;
 
-        __gf_rdma_deregister_mr (context->mr, context->mr_count);
+        __rdma_deregister_mr (context->mr, context->mr_count);
 
         priv = peer->trans->private;
 
         if (priv->connected) {
-                ret = __gf_rdma_quota_put (peer);
+                ret = __rdma_quota_put (peer);
                 if (ret < 0) {
                         gf_log ("rdma", GF_LOG_DEBUG,
                                 "failed to send "
                                 "message");
-                        mem_put (context);
-                        __gf_rdma_disconnect (peer->trans);
+                        mem_put (context->pool, context);
+                        __rdma_disconnect (peer->trans);
                         goto out;
                 }
         }
@@ -1588,21 +810,22 @@ __gf_rdma_request_context_destroy (gf_rdma_request_context_t *context)
                 context->rsp_iobref = NULL;
         }
 
-        mem_put (context);
+        mem_put (context->pool, context);
 
 out:
         return;
 }
 
 
+
 void
-gf_rdma_post_context_destroy (gf_rdma_post_context_t *ctx)
+rdma_post_context_destroy (rdma_post_context_t *ctx)
 {
         if (ctx == NULL) {
                 goto out;
         }
 
-        __gf_rdma_deregister_mr (ctx->mr, ctx->mr_count);
+        __rdma_deregister_mr (ctx->mr, ctx->mr_count);
 
         if (ctx->iobref != NULL) {
                 iobref_unref (ctx->iobref);
@@ -1618,8 +841,30 @@ out:
 }
 
 
+static int32_t
+rdma_post_recv (struct ibv_srq *srq,
+                rdma_post_t *post)
+{
+        struct ibv_sge list = {
+                .addr   = (unsigned long) post->buf,
+                .length = post->buf_size,
+                .lkey   = post->mr->lkey
+        };
+
+        struct ibv_recv_wr wr = {
+                .wr_id  = (unsigned long) post,
+                .sg_list = &list,
+                .num_sge = 1,
+        }, *bad_wr;
+
+        rdma_post_ref (post);
+
+        return ibv_post_srq_recv (srq, &wr, &bad_wr);
+}
+
+
 int
-gf_rdma_post_unref (gf_rdma_post_t *post)
+rdma_post_unref (rdma_post_t *post)
 {
         int refcount = -1;
 
@@ -1634,11 +879,11 @@ gf_rdma_post_unref (gf_rdma_post_t *post)
         pthread_mutex_unlock (&post->lock);
 
         if (refcount == 0) {
-                gf_rdma_post_context_destroy (&post->ctx);
-                if (post->type == GF_RDMA_SEND_POST) {
-                        gf_rdma_put_post (&post->device->sendq, post);
+                rdma_post_context_destroy (&post->ctx);
+                if (post->type == RDMA_SEND_POST) {
+                        rdma_put_post (&post->device->sendq, post);
                 } else {
-                        gf_rdma_post_recv (post->device->srq, post);
+                        rdma_post_recv (post->device->srq, post);
                 }
         }
 out:
@@ -1647,7 +892,7 @@ out:
 
 
 int
-gf_rdma_post_get_refcount (gf_rdma_post_t *post)
+rdma_post_get_refcount (rdma_post_t *post)
 {
         int refcount = -1;
 
@@ -1665,8 +910,8 @@ out:
         return refcount;
 }
 
-gf_rdma_post_t *
-gf_rdma_post_ref (gf_rdma_post_t *post)
+rdma_post_t *
+rdma_post_ref (rdma_post_t *post)
 {
         if (post == NULL) {
                 goto out;
@@ -1684,32 +929,31 @@ out:
 
 
 int32_t
-__gf_rdma_ioq_churn_request (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
-                             gf_rdma_post_t *post)
+__rdma_ioq_churn_request (rdma_peer_t *peer, rdma_ioq_t *entry,
+                          rdma_post_t *post)
 {
-        gf_rdma_chunktype_t        rtype               = gf_rdma_noch;
-        gf_rdma_chunktype_t        wtype               = gf_rdma_noch;
-        uint64_t                   send_size           = 0;
-        gf_rdma_header_t          *hdr                 = NULL;
-        struct rpc_msg            *rpc_msg             = NULL;
-        uint32_t                  *chunkptr            = NULL;
-        char                      *buf                 = NULL;
-        int32_t                    ret                 = 0;
-        gf_rdma_private_t         *priv                = NULL;
-        gf_rdma_device_t          *device              = NULL;
-        int                        chunk_count         = 0;
-        gf_rdma_request_context_t *request_ctx         = NULL;
-        uint32_t                   prog_payload_length = 0, len = 0;
-        struct rpc_req            *rpc_req             = NULL;
-
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, peer, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, entry, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, post, out);
+        rdma_chunktype_t        rtype               = rdma_noch, wtype = rdma_noch;
+        uint64_t                send_size           = 0;
+        rdma_header_t          *hdr                 = NULL;
+        struct rpc_msg         *rpc_msg             = NULL;
+        uint32_t               *chunkptr            = NULL;
+        char                   *buf                 = NULL;
+        int32_t                 ret                 = 0;
+        rdma_private_t         *priv                = NULL;
+        rdma_device_t          *device              = NULL;
+        int                     chunk_count         = 0;
+        rdma_request_context_t *request_ctx         = NULL;
+        uint32_t                prog_payload_length = 0, len = 0;
+        struct rpc_req         *rpc_req             = NULL;
+
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, peer, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, entry, out);
+        GF_VALIDATE_OR_GOTO (RDMA_LOG_NAME, post, out);
 
         if ((entry->msg.request.rsphdr_count != 0)
             && (entry->msg.request.rsp_payload_count != 0)) {
                 ret = -1;
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
                         "both write-chunklist and reply-chunk cannot be "
                         "present");
                 goto out;
@@ -1719,7 +963,7 @@ __gf_rdma_ioq_churn_request (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
         priv = peer->trans->private;
         device = priv->device;
 
-        hdr = (gf_rdma_header_t *)post->buf;
+        hdr = (rdma_header_t *)post->buf;
 
         send_size = iov_length (entry->rpchdr, entry->rpchdr_count)
                 + iov_length (entry->proghdr, entry->proghdr_count)
@@ -1732,43 +976,43 @@ __gf_rdma_ioq_churn_request (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
         }
 
         if (send_size > GLUSTERFS_RDMA_INLINE_THRESHOLD) {
-                rtype = gf_rdma_areadch;
+                rtype = rdma_areadch;
         } else if ((send_size + prog_payload_length)
                    < GLUSTERFS_RDMA_INLINE_THRESHOLD) {
-                rtype = gf_rdma_noch;
+                rtype = rdma_noch;
         } else if (entry->prog_payload_count != 0) {
-                rtype = gf_rdma_readch;
+                rtype = rdma_readch;
         }
 
         if (entry->msg.request.rsphdr_count != 0) {
-                wtype = gf_rdma_replych;
+                wtype = rdma_replych;
         } else if (entry->msg.request.rsp_payload_count != 0) {
-                wtype = gf_rdma_writech;
+                wtype = rdma_writech;
         }
 
-        if (rtype == gf_rdma_readch) {
+        if (rtype == rdma_readch) {
                 chunk_count += entry->prog_payload_count;
-        } else if (rtype == gf_rdma_areadch) {
+        } else if (rtype == rdma_areadch) {
                 chunk_count += entry->rpchdr_count;
                 chunk_count += entry->proghdr_count;
         }
 
-        if (wtype == gf_rdma_writech) {
+        if (wtype == rdma_writech) {
                 chunk_count += entry->msg.request.rsp_payload_count;
-        } else if (wtype == gf_rdma_replych) {
+        } else if (wtype == rdma_replych) {
                 chunk_count += entry->msg.request.rsphdr_count;
         }
 
-        if (chunk_count > GF_RDMA_MAX_SEGMENTS) {
+        if (chunk_count > RDMA_MAX_SEGMENTS) {
                 ret = -1;
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
                         "chunk count(%d) exceeding maximum allowed RDMA "
-                        "segment count(%d)", chunk_count, GF_RDMA_MAX_SEGMENTS);
+                        "segment count(%d)", chunk_count, RDMA_MAX_SEGMENTS);
                 goto out;
         }
 
-        if ((wtype != gf_rdma_noch) || (rtype != gf_rdma_noch)) {
-                request_ctx = mem_get (device->request_ctx_pool);
+        if ((wtype != rdma_noch) || (rtype != rdma_noch)) {
+                request_ctx = mem_get (priv->device->request_ctx_pool);
                 if (request_ctx == NULL) {
                         ret = -1;
                         goto out;
@@ -1776,7 +1020,7 @@ __gf_rdma_ioq_churn_request (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
 
                 memset (request_ctx, 0, sizeof (*request_ctx));
 
-                request_ctx->pool = device->request_ctx_pool;
+                request_ctx->pool = priv->device->request_ctx_pool;
                 request_ctx->peer = peer;
 
                 entry->msg.request.rpc_req->conn_private = request_ctx;
@@ -1793,21 +1037,20 @@ __gf_rdma_ioq_churn_request (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
                                            * since rpc_msg->rm_xid is already
                                            * hton32ed value of actual xid
                                            */
-        hdr->rm_vers   = hton32 (GF_RDMA_VERSION);
+        hdr->rm_vers   = hton32 (RDMA_VERSION);
         hdr->rm_credit = hton32 (peer->send_count);
-        if (rtype == gf_rdma_areadch) {
-                hdr->rm_type = hton32 (GF_RDMA_NOMSG);
+        if (rtype == rdma_areadch) {
+                hdr->rm_type = hton32 (RDMA_NOMSG);
         } else {
-                hdr->rm_type   = hton32 (GF_RDMA_MSG);
+                hdr->rm_type   = hton32 (RDMA_MSG);
         }
 
         chunkptr = &hdr->rm_body.rm_chunks[0];
-        if (rtype != gf_rdma_noch) {
-                ret = __gf_rdma_create_read_chunks (peer, entry, rtype,
-                                                    &chunkptr,
-                                                    request_ctx);
+        if (rtype != rdma_noch) {
+                ret = __rdma_create_read_chunks (peer, entry, rtype, &chunkptr,
+                                                 request_ctx);
                 if (ret != 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                                 "creation of read chunks failed");
                         goto out;
                 }
@@ -1815,12 +1058,11 @@ __gf_rdma_ioq_churn_request (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
                 *chunkptr++ = 0; /* no read chunks */
         }
 
-        if (wtype != gf_rdma_noch) {
-                ret = __gf_rdma_create_write_chunks (peer, entry, wtype,
-                                                     &chunkptr,
-                                                     request_ctx);
+        if (wtype != rdma_noch) {
+                ret = __rdma_create_write_chunks (peer, entry, wtype, &chunkptr,
+                                                  request_ctx);
                 if (ret != 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                                 "creation of write/reply chunk failed");
                         goto out;
                 }
@@ -1831,14 +1073,14 @@ __gf_rdma_ioq_churn_request (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
 
         buf = (char *)chunkptr;
 
-        if (rtype != gf_rdma_areadch) {
+        if (rtype != rdma_areadch) {
                 iov_unload (buf, entry->rpchdr, entry->rpchdr_count);
                 buf += iov_length (entry->rpchdr, entry->rpchdr_count);
 
                 iov_unload (buf, entry->proghdr, entry->proghdr_count);
                 buf += iov_length (entry->proghdr, entry->proghdr_count);
 
-                if (rtype != gf_rdma_readch) {
+                if (rtype != rdma_readch) {
                         iov_unload (buf, entry->prog_payload,
                                     entry->prog_payload_count);
                         buf += iov_length (entry->prog_payload,
@@ -1848,18 +1090,18 @@ __gf_rdma_ioq_churn_request (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
 
         len = buf - post->buf;
 
-        gf_rdma_post_ref (post);
+        rdma_post_ref (post);
 
-        ret = gf_rdma_post_send (peer->qp, post, len);
+        ret = rdma_post_send (peer->qp, post, len);
         if (!ret) {
                 ret = len;
         } else {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "gf_rdma_post_send (to %s) failed with ret = %d (%s)",
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
+                        "rdma_post_send (to %s) failed with ret = %d (%s)",
                         peer->trans->peerinfo.identifier, ret,
                         (ret > 0) ? strerror (ret) : "");
-                gf_rdma_post_unref (post);
-                __gf_rdma_disconnect (peer->trans);
+                rdma_post_unref (post);
+                __rdma_disconnect (peer->trans);
                 ret = -1;
         }
 
@@ -1868,7 +1110,7 @@ out:
                 rpc_req = entry->msg.request.rpc_req;
 
                 if (request_ctx != NULL) {
-                        __gf_rdma_request_context_destroy (rpc_req->conn_private);
+                        __rdma_request_context_destroy (rpc_req->conn_private);
                 }
 
                 rpc_req->conn_private = NULL;
@@ -1878,9 +1120,9 @@ out:
 }
 
 
-static inline void
-__gf_rdma_fill_reply_header (gf_rdma_header_t *header, struct iovec *rpchdr,
-                             gf_rdma_reply_info_t *reply_info, int credits)
+inline void
+__rdma_fill_reply_header (rdma_header_t *header, struct iovec *rpchdr,
+                          rdma_reply_info_t *reply_info, int credits)
 {
         struct rpc_msg *rpc_msg = NULL;
 
@@ -1894,8 +1136,8 @@ __gf_rdma_fill_reply_header (gf_rdma_header_t *header, struct iovec *rpchdr,
                 header->rm_xid = rpc_msg->rm_xid;
         }
 
-        header->rm_type = hton32 (GF_RDMA_MSG);
-        header->rm_vers = hton32 (GF_RDMA_VERSION);
+        header->rm_type = hton32 (RDMA_MSG);
+        header->rm_vers = hton32 (RDMA_VERSION);
         header->rm_credit = hton32 (credits);
 
         header->rm_body.rm_chunks[0] = 0; /* no read chunks */
@@ -1907,36 +1149,36 @@ __gf_rdma_fill_reply_header (gf_rdma_header_t *header, struct iovec *rpchdr,
 
 
 int32_t
-__gf_rdma_send_reply_inline (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
-                             gf_rdma_post_t *post,
-                             gf_rdma_reply_info_t *reply_info)
+__rdma_send_reply_inline (rdma_peer_t *peer, rdma_ioq_t *entry,
+                          rdma_post_t *post, rdma_reply_info_t *reply_info)
 {
-        gf_rdma_header_t *header    = NULL;
-        int32_t           send_size = 0, ret = 0;
-        char             *buf       = NULL;
+        rdma_header_t  *header    = NULL;
+        int32_t         send_size = 0, ret = 0;
+        char           *buf       = NULL;
+        rdma_private_t *priv      = NULL;
+        rdma_device_t  *device    = NULL;
+
+        priv = peer->trans->private;
+        device = priv->device;
 
         send_size = iov_length (entry->rpchdr, entry->rpchdr_count)
                 + iov_length (entry->proghdr, entry->proghdr_count)
                 + iov_length (entry->prog_payload, entry->prog_payload_count)
-                + sizeof (gf_rdma_header_t); /*
-                                              * remember, no chunklists in the
-                                              * reply
-                                              */
+                + sizeof (rdma_header_t); /*
+                                           * remember, no chunklists in the
+                                           * reply
+                                           */
 
         if (send_size > GLUSTERFS_RDMA_INLINE_THRESHOLD) {
-                ret = __gf_rdma_send_error (peer, entry, post, reply_info,
-                                            ERR_CHUNK);
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "msg size (%d) is greater than maximum size "
-                        "of msg that can be sent inlined (%d)",
-                        send_size, GLUSTERFS_RDMA_INLINE_THRESHOLD);
+                ret = __rdma_send_error (peer, entry, post, reply_info,
+                                         ERR_CHUNK);
                 goto out;
         }
 
-        header = (gf_rdma_header_t *)post->buf;
+        header = (rdma_header_t *)post->buf;
 
-        __gf_rdma_fill_reply_header (header, entry->rpchdr, reply_info,
-                                     peer->send_count);
+        __rdma_fill_reply_header (header, entry->rpchdr, reply_info,
+                                  peer->send_count);
 
         buf = (char *)&header->rm_body.rm_chunks[3];
 
@@ -1957,18 +1199,18 @@ __gf_rdma_send_reply_inline (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
                                    entry->prog_payload_count);
         }
 
-        gf_rdma_post_ref (post);
+        rdma_post_ref (post);
 
-        ret = gf_rdma_post_send (peer->qp, post, (buf - post->buf));
+        ret = rdma_post_send (peer->qp, post, (buf - post->buf));
         if (!ret) {
                 ret = send_size;
         } else {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "posting send (to %s) failed with ret = %d (%s)",
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
+                        "rdma_post_send (to %s) failed with ret = %d (%s)",
                         peer->trans->peerinfo.identifier, ret,
                         (ret > 0) ? strerror (ret) : "");
-                gf_rdma_post_unref (post);
-                __gf_rdma_disconnect (peer->trans);
+                rdma_post_unref (post);
+                __rdma_disconnect (peer->trans);
                 ret = -1;
         }
 
@@ -1978,18 +1220,17 @@ out:
 
 
 int32_t
-__gf_rdma_reply_encode_write_chunks (gf_rdma_peer_t *peer,
-                                     uint32_t payload_size,
-                                     gf_rdma_post_t *post,
-                                     gf_rdma_reply_info_t *reply_info,
-                                     uint32_t **ptr)
+__rdma_reply_encode_write_chunks (rdma_peer_t *peer, uint32_t payload_size,
+                                  rdma_post_t *post,
+                                  rdma_reply_info_t *reply_info,
+                                  uint32_t **ptr)
 {
-        uint32_t               chunk_size   = 0;
-        int32_t                ret          = -1;
-        gf_rdma_write_array_t *target_array = NULL;
-        int                    i            = 0;
+        uint32_t            chunk_size   = 0;
+        int32_t             ret          = -1;
+        rdma_write_array_t *target_array = NULL;
+        int                 i            = 0;
 
-        target_array = (gf_rdma_write_array_t *)*ptr;
+        target_array = (rdma_write_array_t *)*ptr;
 
         for (i = 0; i < reply_info->wc_array->wc_nchunks; i++) {
                 chunk_size +=
@@ -1997,7 +1238,7 @@ __gf_rdma_reply_encode_write_chunks (gf_rdma_peer_t *peer,
         }
 
         if (chunk_size < payload_size) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_DEBUG,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "length of payload (%d) is exceeding the total "
                         "write chunk length (%d)", payload_size, chunk_size);
                 goto out;
@@ -2028,17 +1269,18 @@ out:
 
 
 inline int32_t
-__gf_rdma_register_local_mr_for_rdma (gf_rdma_peer_t *peer,
-                                      struct iovec *vector, int count,
-                                      gf_rdma_post_context_t *ctx)
+__rdma_register_local_mr_for_rdma (rdma_peer_t *peer,
+                                   struct iovec *vector, int count,
+                                   rdma_post_context_t *ctx)
 {
-        int                i      = 0;
-        int32_t            ret    = -1;
-        gf_rdma_private_t *priv   = NULL;
-        gf_rdma_device_t  *device = NULL;
+        int             i      = 0;
+        int32_t         ret    = -1;
+        rdma_private_t *priv   = NULL;
+        rdma_device_t  *device = NULL;
 
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, ctx, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, vector, out);
+        if ((ctx == NULL) || (vector == NULL)) {
+                goto out;
+        }
 
         priv = peer->trans->private;
         device = priv->device;
@@ -2059,9 +1301,6 @@ __gf_rdma_register_local_mr_for_rdma (gf_rdma_peer_t *peer,
                                                      vector[i].iov_len,
                                                      IBV_ACCESS_LOCAL_WRITE);
                 if (ctx->mr[ctx->mr_count] == NULL) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "registering memory for IBV_ACCESS_LOCAL_WRITE "
-                                "failed (%s)", strerror (errno));
                         goto out;
                 }
 
@@ -2077,15 +1316,15 @@ out:
  * 2. modifies vec
  */
 int32_t
-__gf_rdma_write (gf_rdma_peer_t *peer, gf_rdma_post_t *post, struct iovec *vec,
-                 uint32_t xfer_len, int *idx, gf_rdma_write_chunk_t *writech)
+__rdma_write (rdma_peer_t *peer, rdma_post_t *post, struct iovec *vec,
+              uint32_t xfer_len, int *idx, rdma_write_chunk_t *writech)
 {
-        int             size    = 0, num_sge = 0, i = 0;
-        int32_t         ret     = -1;
-        struct ibv_sge *sg_list = NULL;
-        struct ibv_send_wr wr   = {
-                .opcode         = IBV_WR_RDMA_WRITE,
-                .send_flags     = IBV_SEND_SIGNALED,
+        int                size = 0, num_sge = 0, i = 0;
+        int32_t            ret  = -1;
+        struct ibv_sge    *sg_list = NULL;
+        struct ibv_send_wr wr = {
+                .opcode     = IBV_WR_RDMA_WRITE,
+                .send_flags = IBV_SEND_SIGNALED,
         }, *bad_wr;
 
         if ((peer == NULL) || (writech == NULL) || (idx == NULL)
@@ -2099,8 +1338,7 @@ __gf_rdma_write (gf_rdma_peer_t *peer, gf_rdma_post_t *post, struct iovec *vec,
 
         num_sge = i - *idx;
 
-        sg_list = GF_CALLOC (num_sge, sizeof (struct ibv_sge),
-                             gf_common_mt_sge);
+        sg_list = GF_CALLOC (num_sge, sizeof (struct ibv_sge), gf_common_mt_sge);
         if (sg_list == NULL) {
                 ret = -1;
                 goto out;
@@ -2126,14 +1364,13 @@ __gf_rdma_write (gf_rdma_peer_t *peer, gf_rdma_post_t *post, struct iovec *vec,
 
         wr.sg_list = sg_list;
         wr.num_sge = num_sge;
-        wr.wr_id = (unsigned long) gf_rdma_post_ref (post);
+        wr.wr_id = (unsigned long) rdma_post_ref (post);
         wr.wr.rdma.rkey = writech->wc_target.rs_handle;
         wr.wr.rdma.remote_addr = writech->wc_target.rs_offset;
 
         ret = ibv_post_send(peer->qp, &wr, &bad_wr);
         if (ret) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "rdma write to "
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING, "rdma write to "
                         "client (%s) failed with ret = %d (%s)",
                         peer->trans->peerinfo.identifier, ret,
                         (ret > 0) ? strerror (ret) : "");
@@ -2147,14 +1384,13 @@ out:
 
 
 int32_t
-__gf_rdma_do_gf_rdma_write (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
-                            struct iovec *vector, int count,
-                            struct iobref *iobref,
-                            gf_rdma_reply_info_t *reply_info)
+__rdma_do_rdma_write (rdma_peer_t *peer, rdma_post_t *post,
+                      struct iovec *vector, int count, struct iobref *iobref,
+                      rdma_reply_info_t *reply_info)
 {
-        int      i            = 0, payload_idx = 0;
-        uint32_t payload_size = 0, xfer_len = 0;
-        int32_t  ret          = -1;
+        int             i                     = 0, payload_idx = 0;
+        uint32_t        payload_size          = 0, xfer_len = 0;
+        int32_t         ret                   = -1;
 
         if (count != 0) {
                 payload_size = iov_length (vector, count);
@@ -2165,11 +1401,9 @@ __gf_rdma_do_gf_rdma_write (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
                 goto out;
         }
 
-        ret = __gf_rdma_register_local_mr_for_rdma (peer, vector, count,
-                                                    &post->ctx);
+        ret = __rdma_register_local_mr_for_rdma (peer, vector, count,
+                                                 &post->ctx);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "registering memory region for rdma failed");
                 goto out;
         }
 
@@ -2181,13 +1415,9 @@ __gf_rdma_do_gf_rdma_write (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
                 xfer_len = min (payload_size,
                                 reply_info->wc_array->wc_array[i].wc_target.rs_length);
 
-                ret = __gf_rdma_write (peer, post, vector, xfer_len,
-                                       &payload_idx,
-                                       &reply_info->wc_array->wc_array[i]);
+                ret = __rdma_write (peer, post, vector, xfer_len, &payload_idx,
+                                    &reply_info->wc_array->wc_array[i]);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "rdma write to client (%s) failed",
-                                peer->trans->peerinfo.identifier);
                         goto out;
                 }
 
@@ -2202,41 +1432,44 @@ out:
 
 
 int32_t
-__gf_rdma_send_reply_type_nomsg (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
-                                 gf_rdma_post_t *post,
-                                 gf_rdma_reply_info_t *reply_info)
+__rdma_send_reply_type_nomsg (rdma_peer_t *peer, rdma_ioq_t *entry,
+                              rdma_post_t *post, rdma_reply_info_t *reply_info)
 {
-        gf_rdma_header_t *header       = NULL;
-        char             *buf          = NULL;
-        uint32_t          payload_size = 0;
-        int               count        = 0, i = 0;
-        int32_t           ret          = 0;
-        struct iovec      vector[MAX_IOVEC];
+        rdma_header_t      *header       = NULL;
+        char               *buf          = NULL;
+        uint32_t            payload_size = 0;
+        int                 count        = 0, i = 0;
+        rdma_private_t     *priv         = NULL;
+        rdma_device_t      *device       = NULL;
+        int32_t             ret          = 0;
+        struct iovec        vector[MAX_IOVEC];
 
-        header = (gf_rdma_header_t *)post->buf;
+        priv = peer->trans->private;
+        device = priv->device;
 
-        __gf_rdma_fill_reply_header (header, entry->rpchdr, reply_info,
-                                     peer->send_count);
+        header = (rdma_header_t *)post->buf;
 
-        header->rm_type = hton32 (GF_RDMA_NOMSG);
+        __rdma_fill_reply_header (header, entry->rpchdr, reply_info,
+                                  peer->send_count);
+
+        header->rm_type = hton32 (RDMA_NOMSG);
 
         payload_size = iov_length (entry->rpchdr, entry->rpchdr_count) +
                 iov_length (entry->proghdr, entry->proghdr_count);
 
         /* encode reply chunklist */
         buf = (char *)&header->rm_body.rm_chunks[2];
-        ret = __gf_rdma_reply_encode_write_chunks (peer, payload_size, post,
-                                                   reply_info,
-                                                   (uint32_t **)&buf);
+        ret = __rdma_reply_encode_write_chunks (peer, payload_size, post,
+                                                reply_info, (uint32_t **)&buf);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "encoding write chunks failed");
-                ret = __gf_rdma_send_error (peer, entry, post, reply_info,
-                                            ERR_CHUNK);
+                ret = __rdma_send_error (peer, entry, post, reply_info,
+                                         ERR_CHUNK);
                 goto out;
         }
 
-        gf_rdma_post_ref (post);
+        rdma_post_ref (post);
 
         for (i = 0; i < entry->rpchdr_count; i++) {
                 vector[count++] = entry->rpchdr[i];
@@ -2246,24 +1479,21 @@ __gf_rdma_send_reply_type_nomsg (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
                 vector[count++] = entry->proghdr[i];
         }
 
-        ret = __gf_rdma_do_gf_rdma_write (peer, post, vector, count,
-                                          entry->iobref, reply_info);
+        ret = __rdma_do_rdma_write (peer, post, vector, count, entry->iobref,
+                                    reply_info);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "rdma write to peer (%s) failed",
-                        peer->trans->peerinfo.identifier);
-                gf_rdma_post_unref (post);
+                rdma_post_unref (post);
                 goto out;
         }
 
-        ret = gf_rdma_post_send (peer->qp, post, (buf - post->buf));
+        ret = rdma_post_send (peer->qp, post, (buf - post->buf));
         if (ret) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "posting a send request to client (%s) failed with "
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
+                        "rdma_post_send to client (%s) failed with "
                         "ret = %d (%s)", peer->trans->peerinfo.identifier, ret,
                         (ret > 0) ? strerror (ret) : "");
                 ret = -1;
-                gf_rdma_post_unref (post);
+                rdma_post_unref (post);
         } else {
                 ret = payload_size;
         }
@@ -2274,64 +1504,65 @@ out:
 
 
 int32_t
-__gf_rdma_send_reply_type_msg (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
-                               gf_rdma_post_t *post,
-                               gf_rdma_reply_info_t *reply_info)
+__rdma_send_reply_type_msg (rdma_peer_t *peer, rdma_ioq_t *entry,
+                            rdma_post_t *post, rdma_reply_info_t *reply_info)
 {
-        gf_rdma_header_t *header       = NULL;
-        int32_t           send_size    = 0, ret = 0;
-        char             *ptr          = NULL;
-        uint32_t          payload_size = 0;
+        rdma_header_t      *header       = NULL;
+        int32_t             send_size    = 0, ret = 0;
+        char               *ptr          = NULL;
+        uint32_t            payload_size = 0;
+        rdma_private_t     *priv         = NULL;
+        rdma_device_t      *device       = NULL;
+
+        priv = peer->trans->private;
+        device = priv->device;
 
         send_size = iov_length (entry->rpchdr, entry->rpchdr_count)
                 + iov_length (entry->proghdr, entry->proghdr_count)
                 + GLUSTERFS_RDMA_MAX_HEADER_SIZE;
 
         if (send_size > GLUSTERFS_RDMA_INLINE_THRESHOLD) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
                         "client has provided only write chunks, but the "
                         "combined size of rpc and program header (%d) is "
                         "exceeding the size of msg that can be sent using "
                         "RDMA send (%d)", send_size,
                         GLUSTERFS_RDMA_INLINE_THRESHOLD);
 
-                ret = __gf_rdma_send_error (peer, entry, post, reply_info,
-                                            ERR_CHUNK);
+                ret = __rdma_send_error (peer, entry, post, reply_info,
+                                         ERR_CHUNK);
                 goto out;
         }
 
-        header = (gf_rdma_header_t *)post->buf;
+        header = (rdma_header_t *)post->buf;
 
-        __gf_rdma_fill_reply_header (header, entry->rpchdr, reply_info,
-                                     peer->send_count);
+        __rdma_fill_reply_header (header, entry->rpchdr, reply_info,
+                                  peer->send_count);
 
         payload_size = iov_length (entry->prog_payload,
                                    entry->prog_payload_count);
         ptr = (char *)&header->rm_body.rm_chunks[1];
 
-        ret = __gf_rdma_reply_encode_write_chunks (peer, payload_size, post,
-                                                   reply_info,
-                                                   (uint32_t **)&ptr);
+        ret = __rdma_reply_encode_write_chunks (peer, payload_size, post,
+                                                reply_info, (uint32_t **)&ptr);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "encoding write chunks failed");
-                ret = __gf_rdma_send_error (peer, entry, post, reply_info,
-                                            ERR_CHUNK);
+                ret = __rdma_send_error (peer, entry, post, reply_info,
+                                         ERR_CHUNK);
                 goto out;
         }
 
         *(uint32_t *)ptr = 0;          /* terminate reply chunklist */
         ptr += sizeof (uint32_t);
 
-        gf_rdma_post_ref (post);
+        rdma_post_ref (post);
 
-        ret = __gf_rdma_do_gf_rdma_write (peer, post, entry->prog_payload,
-                                          entry->prog_payload_count,
-                                          entry->iobref, reply_info);
+        ret = __rdma_do_rdma_write (peer, post, entry->prog_payload,
+                                    entry->prog_payload_count, entry->iobref,
+                                    reply_info);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING, "rdma write to peer "
-                        "(%s) failed", peer->trans->peerinfo.identifier);
-                gf_rdma_post_unref (post);
+                rdma_post_unref (post);
                 goto out;
         }
 
@@ -2341,13 +1572,13 @@ __gf_rdma_send_reply_type_msg (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
         iov_unload (ptr, entry->proghdr, entry->proghdr_count);
         ptr += iov_length (entry->proghdr, entry->proghdr_count);
 
-        ret = gf_rdma_post_send (peer->qp, post, (ptr - post->buf));
+        ret = rdma_post_send (peer->qp, post, (ptr - post->buf));
         if (ret) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
                         "rdma send to client (%s) failed with ret = %d (%s)",
                         peer->trans->peerinfo.identifier, ret,
                         (ret > 0) ? strerror (ret) : "");
-                gf_rdma_post_unref (post);
+                rdma_post_unref (post);
                 ret = -1;
         } else {
                 ret = send_size + payload_size;
@@ -2359,7 +1590,7 @@ out:
 
 
 void
-gf_rdma_reply_info_destroy (gf_rdma_reply_info_t *reply_info)
+rdma_reply_info_destroy (rdma_reply_info_t *reply_info)
 {
         if (reply_info == NULL) {
                 goto out;
@@ -2370,17 +1601,17 @@ gf_rdma_reply_info_destroy (gf_rdma_reply_info_t *reply_info)
                 reply_info->wc_array = NULL;
         }
 
-        mem_put (reply_info);
+        mem_put (reply_info->pool, reply_info);
 out:
         return;
 }
 
 
-gf_rdma_reply_info_t *
-gf_rdma_reply_info_alloc (gf_rdma_peer_t *peer)
+rdma_reply_info_t *
+rdma_reply_info_alloc (rdma_peer_t *peer)
 {
-        gf_rdma_reply_info_t *reply_info = NULL;
-        gf_rdma_private_t    *priv       = NULL;
+        rdma_reply_info_t *reply_info = NULL;
+        rdma_private_t    *priv       = NULL;
 
         priv = peer->trans->private;
 
@@ -2398,16 +1629,15 @@ out:
 
 
 int32_t
-__gf_rdma_ioq_churn_reply (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
-                           gf_rdma_post_t *post)
+__rdma_ioq_churn_reply (rdma_peer_t *peer, rdma_ioq_t *entry, rdma_post_t *post)
 {
-        gf_rdma_reply_info_t *reply_info = NULL;
-        int32_t               ret        = -1;
-        gf_rdma_chunktype_t   type       = gf_rdma_noch;
+        rdma_reply_info_t  *reply_info = NULL;
+        int32_t             ret        = -1;
+        rdma_chunktype_t    type       = rdma_noch;
 
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, peer, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, entry, out);
-        GF_VALIDATE_OR_GOTO (GF_RDMA_LOG_NAME, post, out);
+        if ((peer == NULL) || (entry == NULL) || (post == NULL)) {
+                goto out;
+        }
 
         reply_info = entry->msg.reply_info;
         if (reply_info != NULL) {
@@ -2415,47 +1645,29 @@ __gf_rdma_ioq_churn_reply (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry,
         }
 
         switch (type) {
-        case gf_rdma_noch:
-                ret = __gf_rdma_send_reply_inline (peer, entry, post,
-                                                   reply_info);
-                if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "failed to send reply to peer (%s) as an "
-                                "inlined rdma msg",
-                                peer->trans->peerinfo.identifier);
-                }
+        case rdma_noch:
+                ret = __rdma_send_reply_inline (peer, entry, post, reply_info);
                 break;
 
-        case gf_rdma_replych:
-                ret = __gf_rdma_send_reply_type_nomsg (peer, entry, post,
-                                                       reply_info);
-                if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "failed to send reply to peer (%s) as "
-                                "RDMA_NOMSG", peer->trans->peerinfo.identifier);
-                }
+        case rdma_replych:
+                ret = __rdma_send_reply_type_nomsg (peer, entry, post,
+                                                    reply_info);
                 break;
 
-        case gf_rdma_writech:
-                ret = __gf_rdma_send_reply_type_msg (peer, entry, post,
-                                                     reply_info);
-                if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "failed to send reply with write chunks "
-                                "to peer (%s)",
-                                peer->trans->peerinfo.identifier);
-                }
+        case rdma_writech:
+                ret = __rdma_send_reply_type_msg (peer, entry, post,
+                                                  reply_info);
                 break;
 
         default:
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "invalid chunktype (%d) specified for sending reply "
-                        " (peer:%s)", type, peer->trans->peerinfo.identifier);
+                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
+                        "invalid chunktype (%d) specified for sending reply",
+                        type);
                 break;
         }
 
         if (reply_info != NULL) {
-                gf_rdma_reply_info_destroy (reply_info);
+                rdma_reply_info_destroy (reply_info);
         }
 out:
         return ret;
@@ -2463,54 +1675,40 @@ out:
 
 
 int32_t
-__gf_rdma_ioq_churn_entry (gf_rdma_peer_t *peer, gf_rdma_ioq_t *entry)
+__rdma_ioq_churn_entry (rdma_peer_t *peer, rdma_ioq_t *entry)
 {
-        int32_t            ret     = 0, quota = 0;
-        gf_rdma_private_t *priv    = NULL;
-        gf_rdma_device_t  *device  = NULL;
-        gf_rdma_options_t *options = NULL;
-        gf_rdma_post_t    *post    = NULL;
+        int32_t         ret     = 0, quota = 0;
+        rdma_private_t *priv    = NULL;
+        rdma_device_t  *device  = NULL;
+        rdma_options_t *options = NULL;
+        rdma_post_t    *post    = NULL;
 
         priv = peer->trans->private;
         options = &priv->options;
         device = priv->device;
 
-        quota = __gf_rdma_quota_get (peer);
+        quota = __rdma_quota_get (peer);
         if (quota > 0) {
-                post = gf_rdma_get_post (&device->sendq);
+                post = rdma_get_post (&device->sendq);
                 if (post == NULL) {
-                        post = gf_rdma_new_post (peer->trans, device,
-                                                 (options->send_size + 2048),
-                                                 GF_RDMA_SEND_POST);
+                        post = rdma_new_post (device,
+                                              (options->send_size + 2048),
+                                              RDMA_SEND_POST);
                 }
 
                 if (post == NULL) {
                         ret = -1;
-                        gf_log_callingfn (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                          "not able to get a post to send msg");
                         goto out;
                 }
 
                 if (entry->is_request) {
-                        ret = __gf_rdma_ioq_churn_request (peer, entry, post);
-                        if (ret < 0) {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                        "failed to process request ioq entry "
-                                        "to peer(%s)",
-                                        peer->trans->peerinfo.identifier);
-                        }
+                        ret = __rdma_ioq_churn_request (peer, entry, post);
                 } else {
-                        ret = __gf_rdma_ioq_churn_reply (peer, entry, post);
-                        if (ret < 0) {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                        "failed to process reply ioq entry "
-                                        "to peer (%s)",
-                                        peer->trans->peerinfo.identifier);
-                        }
+                        ret = __rdma_ioq_churn_reply (peer, entry, post);
                 }
 
                 if (ret != 0) {
-                        __gf_rdma_ioq_entry_free (entry);
+                        __rdma_ioq_entry_free (entry);
                 }
         } else {
                 ret = 0;
@@ -2522,17 +1720,17 @@ out:
 
 
 static int32_t
-__gf_rdma_ioq_churn (gf_rdma_peer_t *peer)
+__rdma_ioq_churn (rdma_peer_t *peer)
 {
-        gf_rdma_ioq_t *entry = NULL;
-        int32_t        ret   = 0;
+        rdma_ioq_t *entry = NULL;
+        int32_t ret = 0;
 
         while (!list_empty (&peer->ioq))
         {
                 /* pick next entry */
                 entry = peer->ioq_next;
 
-                ret = __gf_rdma_ioq_churn_entry (peer, entry);
+                ret = __rdma_ioq_churn_entry (peer, entry);
 
                 if (ret <= 0)
                         break;
@@ -2540,7 +1738,7 @@ __gf_rdma_ioq_churn (gf_rdma_peer_t *peer)
 
         /*
           list_for_each_entry_safe (entry, dummy, &peer->ioq, list) {
-          ret = __gf_rdma_ioq_churn_entry (peer, entry);
+          ret = __rdma_ioq_churn_entry (peer, entry);
           if (ret <= 0) {
           break;
           }
@@ -2552,35 +1750,28 @@ __gf_rdma_ioq_churn (gf_rdma_peer_t *peer)
 
 
 static int32_t
-gf_rdma_writev (rpc_transport_t *this, gf_rdma_ioq_t *entry)
+rdma_writev (rpc_transport_t *this,
+             rdma_ioq_t *entry)
 {
-        int32_t            ret  = 0, need_append = 1;
-        gf_rdma_private_t *priv = NULL;
-        gf_rdma_peer_t    *peer = NULL;
+        int32_t ret = 0, need_append = 1;
+        rdma_private_t *priv = this->private;
+        rdma_peer_t  *peer = NULL;
 
-        priv = this->private;
         pthread_mutex_lock (&priv->write_mutex);
         {
                 if (!priv->connected) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "rdma is not connected to peer (%s)",
-                                this->peerinfo.identifier);
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "rdma is not connected to post a "
+                                "send request");
                         ret = -1;
                         goto unlock;
                 }
 
                 peer = &priv->peer;
                 if (list_empty (&peer->ioq)) {
-                        ret = __gf_rdma_ioq_churn_entry (peer, entry);
+                        ret = __rdma_ioq_churn_entry (peer, entry);
                         if (ret != 0) {
                                 need_append = 0;
-
-                                if (ret < 0) {
-                                        gf_log (this->name, GF_LOG_WARNING,
-                                                "processing ioq entry destined "
-                                                "to (%s) failed",
-                                                this->peerinfo.identifier);
-                                }
                         }
                 }
 
@@ -2594,20 +1785,20 @@ unlock:
 }
 
 
-gf_rdma_ioq_t *
-gf_rdma_ioq_new (rpc_transport_t *this, rpc_transport_data_t *data)
+rdma_ioq_t *
+rdma_ioq_new (rpc_transport_t *this, rpc_transport_data_t *data)
 {
-        gf_rdma_ioq_t       *entry = NULL;
-        int                  count = 0, i = 0;
-        rpc_transport_msg_t *msg   = NULL;
-        gf_rdma_private_t   *priv  = NULL;
+        rdma_ioq_t          *entry     = NULL;
+        int                  count     = 0, i = 0;
+        rpc_transport_msg_t *msg       = NULL;
+        rdma_private_t      *priv      = NULL;
 
         if ((data == NULL) || (this == NULL)) {
                 goto out;
         }
 
         priv = this->private;
-
+        /* TODO: use mem-pool */
         entry = mem_get (priv->device->ioq_pool);
         if (entry == NULL) {
                 goto out;
@@ -2685,11 +1876,12 @@ out:
 
 
 int32_t
-gf_rdma_submit_request (rpc_transport_t *this, rpc_transport_req_t *req)
+rdma_submit_request (rpc_transport_t *this,
+                     rpc_transport_req_t *req)
 {
-        int32_t               ret   = 0;
-        gf_rdma_ioq_t        *entry = NULL;
-        rpc_transport_data_t  data  = {0, };
+        int32_t               ret = 0;
+        rdma_ioq_t       *entry = NULL;
+        rpc_transport_data_t  data = {0, };
 
         if (req == NULL) {
                 goto out;
@@ -2698,22 +1890,16 @@ gf_rdma_submit_request (rpc_transport_t *this, rpc_transport_req_t *req)
         data.is_request = 1;
         data.data.req = *req;
 
-        entry = gf_rdma_ioq_new (this, &data);
+        entry = rdma_ioq_new (this, &data);
         if (entry == NULL) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "getting a new ioq entry failed (peer:%s)",
-                        this->peerinfo.identifier);
                 goto out;
         }
 
-        ret = gf_rdma_writev (this, entry);
+        ret = rdma_writev (this, entry);
 
         if (ret > 0) {
                 ret = 0;
         } else if (ret < 0) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "sending request to peer (%s) failed",
-                        this->peerinfo.identifier);
                 rpc_transport_disconnect (this);
         }
 
@@ -2722,11 +1908,11 @@ out:
 }
 
 int32_t
-gf_rdma_submit_reply (rpc_transport_t *this, rpc_transport_reply_t *reply)
+rdma_submit_reply (rpc_transport_t *this, rpc_transport_reply_t *reply)
 {
-        int32_t               ret   = 0;
-        gf_rdma_ioq_t        *entry = NULL;
-        rpc_transport_data_t  data  = {0, };
+        int32_t               ret = 0;
+        rdma_ioq_t           *entry = NULL;
+        rpc_transport_data_t  data = {0, };
 
         if (reply == NULL) {
                 goto out;
@@ -2734,21 +1920,15 @@ gf_rdma_submit_reply (rpc_transport_t *this, rpc_transport_reply_t *reply)
 
         data.data.reply = *reply;
 
-        entry = gf_rdma_ioq_new (this, &data);
+        entry = rdma_ioq_new (this, &data);
         if (entry == NULL) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "getting a new ioq entry failed (peer:%s)",
-                        this->peerinfo.identifier);
                 goto out;
         }
 
-        ret = gf_rdma_writev (this, entry);
+        ret = rdma_writev (this, entry);
         if (ret > 0) {
                 ret = 0;
         } else if (ret < 0) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "sending request to peer (%s) failed",
-                        this->peerinfo.identifier);
                 rpc_transport_disconnect (this);
         }
 
@@ -2756,15 +1936,196 @@ out:
         return ret;
 }
 
+#if 0
+static int
+rdma_receive (rpc_transport_t *this, char **hdr_p, size_t *hdrlen_p,
+              struct iobuf **iobuf_p)
+{
+        rdma_private_t *priv = this->private;
+        /* TODO: return error if !priv->connected, check with locks */
+        /* TODO: boundry checks for data_ptr/offset */
+        char *copy_from = NULL;
+        rdma_header_t *header = NULL;
+        uint32_t size1, size2, data_len = 0;
+        char *hdr = NULL;
+        struct iobuf *iobuf = NULL;
+        int32_t ret = 0;
+
+        pthread_mutex_lock (&priv->recv_mutex);
+        {
+/*
+  while (!priv->data_ptr)
+  pthread_cond_wait (&priv->recv_cond, &priv->recv_mutex);
+*/
+
+                copy_from = priv->data_ptr + priv->data_offset;
+
+                priv->data_ptr = NULL;
+                data_len = priv->data_len;
+                pthread_cond_broadcast (&priv->recv_cond);
+        }
+        pthread_mutex_unlock (&priv->recv_mutex);
+
+        header = (rdma_header_t *)copy_from;
+        if (strcmp (header->colonO, ":O")) {
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                        "%s: corrupt header received", this->name);
+                ret = -1;
+                goto err;
+        }
+
+        size1 = ntoh32 (header->size1);
+        size2 = ntoh32 (header->size2);
+
+        if (data_len != (size1 + size2 + sizeof (*header))) {
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                        "%s: sizeof data read from transport is not equal "
+                        "to the size specified in the header",
+                        this->name);
+                ret = -1;
+                goto err;
+        }
+
+        copy_from += sizeof (*header);
+
+        if (size1) {
+                hdr = GF_CALLOC (1, size1, gf_common_mt_char);
+                if (!hdr) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "unable to allocate header for peer %s",
+                                this->peerinfo.identifier);
+                        ret = -ENOMEM;
+                        goto err;
+                }
+                memcpy (hdr, copy_from, size1);
+                copy_from += size1;
+                *hdr_p = hdr;
+        }
+        *hdrlen_p = size1;
+
+        if (size2) {
+                iobuf = iobuf_get (this->ctx->iobuf_pool);
+                if (!iobuf) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "unable to allocate IO buffer for peer %s",
+                                this->peerinfo.identifier);
+                        ret = -ENOMEM;
+                        goto err;
+                }
+                memcpy (iobuf->ptr, copy_from, size2);
+                *iobuf_p = iobuf;
+        }
+
+err:
+        return ret;
+}
+#endif
+
+
+static void
+rdma_destroy_cq (rpc_transport_t *this)
+{
+        rdma_private_t *priv = this->private;
+        rdma_device_t *device = priv->device;
+
+        if (device->recv_cq)
+                ibv_destroy_cq (device->recv_cq);
+        device->recv_cq = NULL;
+
+        if (device->send_cq)
+                ibv_destroy_cq (device->send_cq);
+        device->send_cq = NULL;
+
+        return;
+}
+
+
+static int32_t
+rdma_create_cq (rpc_transport_t *this)
+{
+        rdma_private_t        *priv        = NULL;
+        rdma_options_t        *options     = NULL;
+        rdma_device_t         *device      = NULL;
+        uint64_t               send_cqe    = 0;
+        int32_t                ret         = 0;
+        struct ibv_device_attr device_attr = {{0}, };
+
+        priv = this->private;
+        options = &priv->options;
+        device = priv->device;
+
+        device->recv_cq = ibv_create_cq (priv->device->context,
+                                         options->recv_count * 2,
+                                         device,
+                                         device->recv_chan,
+                                         0);
+        if (!device->recv_cq) {
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "%s: creation of CQ for device %s failed",
+                        this->name, device->device_name);
+                ret = -1;
+                goto out;
+        } else if (ibv_req_notify_cq (device->recv_cq, 0)) {
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "%s: ibv_req_notify_cq on recv CQ of device %s failed",
+                        this->name, device->device_name);
+                ret = -1;
+                goto out;
+        }
+
+        do {
+                ret = ibv_query_device (priv->device->context, &device_attr);
+                if (ret != 0) {
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: ibv_query_device on %s returned %d (%s)",
+                                this->name, priv->device->device_name, ret,
+                                (ret > 0) ? strerror (ret) : "");
+                        ret = -1;
+                        goto out;
+                }
+
+                send_cqe = options->send_count * 128;
+                send_cqe = (send_cqe > device_attr.max_cqe)
+                        ? device_attr.max_cqe : send_cqe;
+
+                /* TODO: make send_cq size dynamically adaptive */
+                device->send_cq = ibv_create_cq (priv->device->context,
+                                                 send_cqe, device,
+                                                 device->send_chan, 0);
+                if (!device->send_cq) {
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: creation of send_cq for device %s failed",
+                                this->name, device->device_name);
+                        ret = -1;
+                        goto out;
+                }
+
+                if (ibv_req_notify_cq (device->send_cq, 0)) {
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: ibv_req_notify_cq on send_cq for device %s"
+                                " failed", this->name, device->device_name);
+                        ret = -1;
+                        goto out;
+                }
+        } while (0);
+
+out:
+        if (ret != 0)
+                rdma_destroy_cq (this);
+
+        return ret;
+}
+
 
 static int
-gf_rdma_register_peer (gf_rdma_device_t *device, int32_t qp_num,
-                       gf_rdma_peer_t *peer)
+rdma_register_peer (rdma_device_t *device,
+                    int32_t qp_num,
+                    rdma_peer_t *peer)
 {
-        struct _qpent   *ent   = NULL;
-        gf_rdma_qpreg_t *qpreg = NULL;
-        int32_t          hash  = 0;
-        int              ret   = -1;
+        struct _qpent *ent   = NULL;
+        rdma_qpreg_t  *qpreg = NULL;
+        int32_t        hash  = 0;
+        int            ret   = -1;
 
         qpreg = &device->qpreg;
         hash = qp_num % 42;
@@ -2805,41 +2166,37 @@ unlock:
 
 
 static void
-gf_rdma_unregister_peer (gf_rdma_device_t *device, int32_t qp_num)
+rdma_unregister_peer (rdma_device_t *device,
+                      int32_t qp_num)
 {
-        struct _qpent   *ent   = NULL;
-        gf_rdma_qpreg_t *qpreg = NULL;
-        int32_t          hash  = 0;
-
-        qpreg = &device->qpreg;
-        hash = qp_num % 42;
+        struct _qpent *ent;
+        rdma_qpreg_t *qpreg = &device->qpreg;
+        int32_t hash = qp_num % 42;
 
         pthread_mutex_lock (&qpreg->lock);
-        {
-                ent = qpreg->ents[hash].next;
-                while ((ent != &qpreg->ents[hash]) && (ent->qp_num != qp_num))
-                        ent = ent->next;
-                if (ent->qp_num != qp_num) {
-                        pthread_mutex_unlock (&qpreg->lock);
-                        return;
-                }
-                ent->prev->next = ent->next;
-                ent->next->prev = ent->prev;
-                /* TODO: unref reg->peer */
-                GF_FREE (ent);
-                qpreg->count--;
-        }
+        ent = qpreg->ents[hash].next;
+        while ((ent != &qpreg->ents[hash]) && (ent->qp_num != qp_num))
+                ent = ent->next;
+        if (ent->qp_num != qp_num) {
+                pthread_mutex_unlock (&qpreg->lock);
+                return;
+        }
+        ent->prev->next = ent->next;
+        ent->next->prev = ent->prev;
+        /* TODO: unref reg->peer */
+        GF_FREE (ent);
+        qpreg->count--;
         pthread_mutex_unlock (&qpreg->lock);
 }
 
 
-static gf_rdma_peer_t *
-__gf_rdma_lookup_peer (gf_rdma_device_t *device, int32_t qp_num)
+static rdma_peer_t *
+__rdma_lookup_peer (rdma_device_t *device, int32_t qp_num)
 {
-        struct _qpent   *ent   = NULL;
-        gf_rdma_peer_t  *peer  = NULL;
-        gf_rdma_qpreg_t *qpreg = NULL;
-        int32_t          hash  = 0;
+        struct _qpent    *ent   = NULL;
+        rdma_peer_t  *peer  = NULL;
+        rdma_qpreg_t *qpreg = NULL;
+        int32_t hash            = 0;
 
         qpreg = &device->qpreg;
         hash = qp_num % 42;
@@ -2854,16 +2211,34 @@ __gf_rdma_lookup_peer (gf_rdma_device_t *device, int32_t qp_num)
         return peer;
 }
 
+/*
+  static rdma_peer_t *
+  rdma_lookup_peer (rdma_device_t *device,
+  int32_t qp_num)
+  {
+  rdma_qpreg_t *qpreg = NULL;
+  rdma_peer_t  *peer  = NULL;
+
+  qpreg = &device->qpreg;
+  pthread_mutex_lock (&qpreg->lock);
+  {
+  peer = __rdma_lookup_peer (device, qp_num);
+  }
+  pthread_mutex_unlock (&qpreg->lock);
+
+  return peer;
+  }
+*/
+
 
 static void
-__gf_rdma_destroy_qp (rpc_transport_t *this)
+__rdma_destroy_qp (rpc_transport_t *this)
 {
-        gf_rdma_private_t *priv = NULL;
+        rdma_private_t *priv = this->private;
 
-        priv = this->private;
         if (priv->peer.qp) {
-                gf_rdma_unregister_peer (priv->device, priv->peer.qp->qp_num);
-                rdma_destroy_qp (priv->peer.cm_id);
+                rdma_unregister_peer (priv->device, priv->peer.qp->qp_num);
+                ibv_destroy_qp (priv->peer.qp);
         }
         priv->peer.qp = NULL;
 
@@ -2872,38 +2247,15 @@ __gf_rdma_destroy_qp (rpc_transport_t *this)
 
 
 static int32_t
-gf_rdma_create_qp (rpc_transport_t *this)
+rdma_create_qp (rpc_transport_t *this)
 {
-        gf_rdma_private_t *priv        = NULL;
-        gf_rdma_device_t  *device      = NULL;
-        int32_t            ret         = 0;
-        gf_rdma_peer_t    *peer        = NULL;
-        char              *device_name = NULL;
-
-        priv = this->private;
+        rdma_private_t *priv = this->private;
+        rdma_options_t *options = &priv->options;
+        rdma_device_t *device = priv->device;
+        int32_t ret = 0;
+        rdma_peer_t *peer;
 
         peer = &priv->peer;
-
-        device_name = (char *)ibv_get_device_name (peer->cm_id->verbs->device);
-        if (device_name == NULL) {
-                ret = -1;
-                gf_log (this->name, GF_LOG_WARNING, "cannot get device_name");
-                goto out;
-        }
-
-        device = gf_rdma_get_device (this, peer->cm_id->verbs,
-                                     device_name);
-        if (device == NULL) {
-                ret = -1;
-                gf_log (this->name, GF_LOG_WARNING, "cannot get device for "
-                        "device %s", device_name);
-                goto out;
-        }
-
-        if (priv->device == NULL) {
-                priv->device = device;
-        }
-
         struct ibv_qp_init_attr init_attr = {
                 .send_cq        = device->send_cq,
                 .recv_cq        = device->recv_cq,
@@ -2917,73 +2269,333 @@ gf_rdma_create_qp (rpc_transport_t *this)
                 .qp_type = IBV_QPT_RC
         };
 
-        ret = rdma_create_qp(peer->cm_id, device->pd, &init_attr);
-        if (ret != 0) {
-                gf_log (peer->trans->name, GF_LOG_CRITICAL,
-                        "%s: could not create QP (%s)", this->name,
-                        strerror (errno));
+        struct ibv_qp_attr attr = {
+                .qp_state        = IBV_QPS_INIT,
+                .pkey_index      = 0,
+                .port_num        = options->port,
+                .qp_access_flags
+                = IBV_ACCESS_REMOTE_READ | IBV_ACCESS_REMOTE_WRITE
+        };
+
+        peer->qp = ibv_create_qp (device->pd, &init_attr);
+        if (!peer->qp) {
+                gf_log (RDMA_LOG_NAME,
+                        GF_LOG_CRITICAL,
+                        "%s: could not create QP",
+                        this->name);
+                ret = -1;
+                goto out;
+        } else if (ibv_modify_qp (peer->qp, &attr,
+                                  IBV_QP_STATE              |
+                                  IBV_QP_PKEY_INDEX         |
+                                  IBV_QP_PORT               |
+                                  IBV_QP_ACCESS_FLAGS)) {
+                gf_log (RDMA_LOG_NAME,
+                        GF_LOG_ERROR,
+                        "%s: failed to modify QP to INIT state",
+                        this->name);
                 ret = -1;
                 goto out;
         }
 
-        peer->qp = peer->cm_id->qp;
+        peer->local_lid = rdma_get_local_lid (device->context,
+                                              options->port);
+        peer->local_qpn = peer->qp->qp_num;
+        peer->local_psn = lrand48 () & 0xffffff;
 
-        ret = gf_rdma_register_peer (device, peer->qp->qp_num, peer);
+        ret = rdma_register_peer (device, peer->qp->qp_num, peer);
 
 out:
         if (ret == -1)
-                __gf_rdma_destroy_qp (this);
+                __rdma_destroy_qp (this);
 
         return ret;
 }
 
 
+static void
+rdma_destroy_posts (rpc_transport_t *this)
+{
+
+}
+
+
 static int32_t
-__gf_rdma_teardown (rpc_transport_t *this)
+__rdma_create_posts (rpc_transport_t *this, int32_t count, int32_t size,
+                     rdma_queue_t *q, rdma_post_type_t type)
 {
-        gf_rdma_private_t *priv = NULL;
-        gf_rdma_peer_t    *peer = NULL;
+        int32_t i;
+        int32_t ret = 0;
+        rdma_private_t *priv = this->private;
+        rdma_device_t *device = priv->device;
 
-        priv = this->private;
-        peer = &priv->peer;
+        for (i=0 ; i<count ; i++) {
+                rdma_post_t *post;
+
+                post = rdma_new_post (device, size + 2048, type);
+                if (!post) {
+                        gf_log (RDMA_LOG_NAME,
+                                GF_LOG_ERROR,
+                                "%s: post creation failed",
+                                this->name);
+                        ret = -1;
+                        break;
+                }
+
+                rdma_put_post (q, post);
+        }
+        return ret;
+}
+
+
+static int32_t
+rdma_create_posts (rpc_transport_t *this)
+{
+        int32_t i, ret;
+        rdma_post_t *post = NULL;
+        rdma_private_t *priv = this->private;
+        rdma_options_t *options = &priv->options;
+        rdma_device_t *device = priv->device;
+
+        ret =  __rdma_create_posts (this, options->send_count,
+                                    options->send_size,
+                                    &device->sendq, RDMA_SEND_POST);
+        if (!ret)
+                ret =  __rdma_create_posts (this, options->recv_count,
+                                            options->recv_size,
+                                            &device->recvq, RDMA_RECV_POST);
 
-        if (peer->cm_id->qp != NULL) {
-                __gf_rdma_destroy_qp (this);
+        if (!ret) {
+                for (i=0 ; i<options->recv_count ; i++) {
+                        post = rdma_get_post (&device->recvq);
+                        if (rdma_post_recv (device->srq, post) != 0) {
+                                ret = -1;
+                                break;
+                        }
+                }
         }
 
-        if (!list_empty (&priv->peer.ioq)) {
-                __gf_rdma_ioq_flush (peer);
+        if (ret)
+                rdma_destroy_posts (this);
+
+        return ret;
+}
+
+
+static int32_t
+rdma_connect_qp (rpc_transport_t *this)
+{
+        rdma_private_t *priv = this->private;
+        rdma_options_t *options = &priv->options;
+        struct ibv_qp_attr attr = {
+                .qp_state               = IBV_QPS_RTR,
+                .path_mtu               = options->mtu,
+                .dest_qp_num            = priv->peer.remote_qpn,
+                .rq_psn                 = priv->peer.remote_psn,
+                .max_dest_rd_atomic     = 1,
+                .min_rnr_timer          = 12,
+                .qp_access_flags
+                = IBV_ACCESS_REMOTE_READ | IBV_ACCESS_REMOTE_WRITE,
+                .ah_attr                = {
+                        .is_global      = 0,
+                        .dlid           = priv->peer.remote_lid,
+                        .sl             = 0,
+                        .src_path_bits  = 0,
+                        .port_num       = options->port
+                }
+        };
+        if (ibv_modify_qp (priv->peer.qp, &attr,
+                           IBV_QP_STATE              |
+                           IBV_QP_AV                 |
+                           IBV_QP_PATH_MTU           |
+                           IBV_QP_DEST_QPN           |
+                           IBV_QP_RQ_PSN             |
+                           IBV_QP_MAX_DEST_RD_ATOMIC |
+                           IBV_QP_MIN_RNR_TIMER)) {
+                gf_log (RDMA_LOG_NAME,
+                        GF_LOG_CRITICAL,
+                        "Failed to modify QP to RTR\n");
+                return -1;
         }
 
-        if (peer->cm_id != NULL) {
-                rdma_destroy_id (peer->cm_id);
-                peer->cm_id = NULL;
+        /* TODO: make timeout and retry_cnt configurable from options */
+        attr.qp_state       = IBV_QPS_RTS;
+        attr.timeout        = 14;
+        attr.retry_cnt      = 7;
+        attr.rnr_retry      = 7;
+        attr.sq_psn         = priv->peer.local_psn;
+        attr.max_rd_atomic  = 1;
+        if (ibv_modify_qp (priv->peer.qp, &attr,
+                           IBV_QP_STATE              |
+                           IBV_QP_TIMEOUT            |
+                           IBV_QP_RETRY_CNT          |
+                           IBV_QP_RNR_RETRY          |
+                           IBV_QP_SQ_PSN             |
+                           IBV_QP_MAX_QP_RD_ATOMIC)) {
+                gf_log (RDMA_LOG_NAME,
+                        GF_LOG_CRITICAL,
+                        "Failed to modify QP to RTS\n");
+                return -1;
         }
 
-        /* TODO: decrement cq size */
         return 0;
 }
 
-
 static int32_t
-gf_rdma_teardown (rpc_transport_t *this)
+__rdma_teardown (rpc_transport_t *this)
 {
-        int32_t ret = 0;
-        gf_rdma_private_t *priv = NULL;
+        rdma_private_t *priv = this->private;
 
-        if (this == NULL) {
-                goto out;
+        __rdma_destroy_qp (this);
+
+        if (!list_empty (&priv->peer.ioq)) {
+                __rdma_ioq_flush (&priv->peer);
         }
 
+        /* TODO: decrement cq size */
+        return 0;
+}
+
+/*
+ * return value:
+ *   0 = success (completed)
+ *  -1 = error
+ * > 0 = incomplete
+ */
+
+static int
+__tcp_rwv (rpc_transport_t *this, struct iovec *vector, int count,
+           struct iovec **pending_vector, int *pending_count,
+           int write)
+{
+        rdma_private_t *priv = NULL;
+        int sock = -1;
+        int ret = -1;
+        struct iovec *opvector = vector;
+        int opcount = count;
+        int moved = 0;
+
         priv = this->private;
+        sock = priv->sock;
 
-        pthread_mutex_lock (&priv->write_mutex);
+        while (opcount)
         {
-                ret = __gf_rdma_teardown (this);
+                if (write)
+                {
+                        ret = writev (sock, opvector, opcount);
+
+                        if (ret == 0 || (ret == -1 && errno == EAGAIN))
+                        {
+                                /* done for now */
+                                break;
+                        }
+                }
+                else
+                {
+                        ret = readv (sock, opvector, opcount);
+
+                        if (ret == -1 && errno == EAGAIN)
+                        {
+                                /* done for now */
+                                break;
+                        }
+                }
+
+                if (ret == 0)
+                {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "EOF from peer %s", this->peerinfo.identifier);
+                        opcount = -1;
+                        errno = ENOTCONN;
+                        break;
+                }
+
+                if (ret == -1)
+                {
+                        if (errno == EINTR)
+                                continue;
+
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "%s failed (%s)", write ? "writev" : "readv",
+                                strerror (errno));
+                        if (write && !priv->connected &&
+                            (errno == ECONNREFUSED))
+                                gf_log (this->name, GF_LOG_ERROR,
+                                        "possible mismatch of 'rpc-transport-type'"
+                                        " in protocol server and client. "
+                                        "check volume file");
+                        opcount = -1;
+                        break;
+                }
+
+                moved = 0;
+
+                while (moved < ret)
+                {
+                        if ((ret - moved) >= opvector[0].iov_len)
+                        {
+                                moved += opvector[0].iov_len;
+                                opvector++;
+                                opcount--;
+                        }
+                        else
+                        {
+                                opvector[0].iov_len -= (ret - moved);
+                                opvector[0].iov_base += (ret - moved);
+                                moved += (ret - moved);
+                        }
+                        while (opcount && !opvector[0].iov_len)
+                        {
+                                opvector++;
+                                opcount--;
+                        }
+                }
+        }
+
+        if (pending_vector)
+                *pending_vector = opvector;
+
+        if (pending_count)
+                *pending_count = opcount;
+
+        return opcount;
+}
+
+
+static int
+__tcp_readv (rpc_transport_t *this, struct iovec *vector, int count,
+             struct iovec **pending_vector, int *pending_count)
+{
+        int ret = -1;
+
+        ret = __tcp_rwv (this, vector, count,
+                         pending_vector, pending_count, 0);
+
+        return ret;
+}
+
+
+static int
+__tcp_writev (rpc_transport_t *this, struct iovec *vector, int count,
+              struct iovec **pending_vector, int *pending_count)
+{
+        int ret = -1;
+        rdma_private_t *priv = this->private;
+
+        ret = __tcp_rwv (this, vector, count, pending_vector,
+                         pending_count, 1);
+
+        if (ret > 0) {
+                /* TODO: Avoid multiple calls when socket is already
+                   registered for POLLOUT */
+                priv->idx = event_select_on (this->ctx->event_pool,
+                                             priv->sock, priv->idx, -1, 1);
+        } else if (ret == 0) {
+                priv->idx = event_select_on (this->ctx->event_pool,
+                                             priv->sock,
+                                             priv->idx, -1, 0);
         }
-        pthread_mutex_unlock (&priv->write_mutex);
 
-out:
         return ret;
 }
 
@@ -2995,12 +2607,12 @@ out:
  * event is sent to upper layers.
  */
 int32_t
-gf_rdma_get_write_chunklist (char **ptr, gf_rdma_write_array_t **write_ary)
+rdma_get_write_chunklist (char **ptr, rdma_write_array_t **write_ary)
 {
-        gf_rdma_write_array_t *from = NULL, *to = NULL;
-        int32_t                ret  = -1, size = 0, i = 0;
+        rdma_write_array_t *from = NULL, *to = NULL;
+        int32_t             ret  = -1, size = 0, i = 0;
 
-        from = (gf_rdma_write_array_t *) *ptr;
+        from = (rdma_write_array_t *) *ptr;
         if (from->wc_discrim == 0) {
                 ret = 0;
                 goto out;
@@ -3009,7 +2621,7 @@ gf_rdma_get_write_chunklist (char **ptr, gf_rdma_write_array_t **write_ary)
         from->wc_nchunks = ntoh32 (from->wc_nchunks);
 
         size = sizeof (*from)
-                + (sizeof (gf_rdma_write_chunk_t) * from->wc_nchunks);
+                + (sizeof (rdma_write_chunk_t) * from->wc_nchunks);
 
         to = GF_CALLOC (1, size, gf_common_mt_char);
         if (to == NULL) {
@@ -3043,13 +2655,13 @@ out:
  * rdma-reads and hence readchunk-list can point to memory held by post.
  */
 int32_t
-gf_rdma_get_read_chunklist (char **ptr, gf_rdma_read_chunk_t **readch)
+rdma_get_read_chunklist (char **ptr, rdma_read_chunk_t **readch)
 {
-        int32_t               ret   = -1;
-        gf_rdma_read_chunk_t *chunk = NULL;
-        int                   i     = 0;
+        int32_t            ret      = -1;
+        rdma_read_chunk_t *chunk    = NULL;
+        int                i        = 0;
 
-        chunk = (gf_rdma_read_chunk_t *)*ptr;
+        chunk = (rdma_read_chunk_t *)*ptr;
         if (chunk[0].rc_discrim == 0) {
                 ret = 0;
                 goto out;
@@ -3075,30 +2687,25 @@ out:
 
 
 inline int32_t
-gf_rdma_decode_error_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
-                          size_t bytes_in_post)
+rdma_decode_error_msg (rdma_peer_t *peer, rdma_post_t *post,
+                       size_t bytes_in_post)
 {
-        gf_rdma_header_t *header  = NULL;
-        struct iobuf     *iobuf   = NULL;
-        struct iobref    *iobref  = NULL;
-        int32_t           ret     = -1;
-        struct rpc_msg    rpc_msg = {0, };
+        rdma_header_t *header = NULL;
+        struct iobuf  *iobuf  = NULL;
+        struct iobref *iobref = NULL;
+        int32_t        ret    = -1;
 
-        header = (gf_rdma_header_t *)post->buf;
+        header = (rdma_header_t *)post->buf;
         header->rm_body.rm_error.rm_type
                 = ntoh32 (header->rm_body.rm_error.rm_type);
         if (header->rm_body.rm_error.rm_type == ERR_VERS) {
-                header->rm_body.rm_error.rm_version.gf_rdma_vers_low =
-                        ntoh32 (header->rm_body.rm_error.rm_version.gf_rdma_vers_low);
-                header->rm_body.rm_error.rm_version.gf_rdma_vers_high =
-                        ntoh32 (header->rm_body.rm_error.rm_version.gf_rdma_vers_high);
+                header->rm_body.rm_error.rm_version.rdma_vers_low =
+                        ntoh32 (header->rm_body.rm_error.rm_version.rdma_vers_low);
+                header->rm_body.rm_error.rm_version.rdma_vers_high =
+                        ntoh32 (header->rm_body.rm_error.rm_version.rdma_vers_high);
         }
 
-        rpc_msg.rm_xid = header->rm_xid;
-        rpc_msg.rm_direction = REPLY;
-        rpc_msg.rm_reply.rp_stat = MSG_DENIED;
-
-        iobuf = iobuf_get2 (peer->trans->ctx->iobuf_pool, bytes_in_post);
+        iobuf = iobuf_get (peer->trans->ctx->iobuf_pool);
         if (iobuf == NULL) {
                 ret = -1;
                 goto out;
@@ -3112,15 +2719,15 @@ gf_rdma_decode_error_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
 
         iobref_add (iobref, iobuf);
         iobuf_unref (iobuf);
-
-        ret = rpc_reply_to_xdr (&rpc_msg, iobuf_ptr (iobuf),
-                                iobuf_pagesize (iobuf), &post->ctx.vector[0]);
-        if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "Failed to create RPC reply");
-                goto out;
-        }
-
+        /*
+         * FIXME: construct an appropriate rpc-msg here, what is being sent
+         * to rpc is not correct.
+         */
+        post->ctx.vector[0].iov_base = iobuf_ptr (iobuf);
+        post->ctx.vector[0].iov_len = bytes_in_post;
+
+        memcpy (post->ctx.vector[0].iov_base, (char *)post->buf,
+                post->ctx.vector[0].iov_len);
         post->ctx.count = 1;
 
         iobuf = NULL;
@@ -3142,34 +2749,30 @@ out:
 
 
 int32_t
-gf_rdma_decode_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
-                    gf_rdma_read_chunk_t **readch, size_t bytes_in_post)
+rdma_decode_msg (rdma_peer_t *peer, rdma_post_t *post,
+                 rdma_read_chunk_t **readch, size_t bytes_in_post)
 {
-        int32_t                ret        = -1;
-        gf_rdma_header_t      *header     = NULL;
-        gf_rdma_reply_info_t  *reply_info = NULL;
-        char                  *ptr        = NULL;
-        gf_rdma_write_array_t *write_ary  = NULL;
-        size_t                 header_len = 0;
+        int32_t             ret        = -1;
+        rdma_header_t      *header     = NULL;
+        rdma_reply_info_t  *reply_info = NULL;
+        char               *ptr        = NULL;
+        rdma_write_array_t *write_ary  = NULL;
+        size_t              header_len = 0;
 
-        header = (gf_rdma_header_t *)post->buf;
+        header = (rdma_header_t *)post->buf;
 
         ptr = (char *)&header->rm_body.rm_chunks[0];
 
-        ret = gf_rdma_get_read_chunklist (&ptr, readch);
+        ret = rdma_get_read_chunklist (&ptr, readch);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "cannot get read chunklist from msg");
                 goto out;
         }
 
         /* skip terminator of read-chunklist */
         ptr = ptr + sizeof (uint32_t);
 
-        ret = gf_rdma_get_write_chunklist (&ptr, &write_ary);
+        ret = rdma_get_write_chunklist (&ptr, &write_ary);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "cannot get write chunklist from msg");
                 goto out;
         }
 
@@ -3177,35 +2780,29 @@ gf_rdma_decode_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
         ptr = ptr + sizeof (uint32_t);
 
         if (write_ary != NULL) {
-                reply_info = gf_rdma_reply_info_alloc (peer);
+                reply_info = rdma_reply_info_alloc (peer);
                 if (reply_info == NULL) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "reply_info_alloc failed");
                         ret = -1;
                         goto out;
                 }
 
-                reply_info->type = gf_rdma_writech;
+                reply_info->type = rdma_writech;
                 reply_info->wc_array = write_ary;
                 reply_info->rm_xid = header->rm_xid;
         } else {
-                ret = gf_rdma_get_write_chunklist (&ptr, &write_ary);
+                ret = rdma_get_write_chunklist (&ptr, &write_ary);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "cannot get reply chunklist from msg");
                         goto out;
                 }
 
                 if (write_ary != NULL) {
-                        reply_info = gf_rdma_reply_info_alloc (peer);
+                        reply_info = rdma_reply_info_alloc (peer);
                         if (reply_info == NULL) {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                        "reply_info_alloc_failed");
                                 ret = -1;
                                 goto out;
                         }
 
-                        reply_info->type = gf_rdma_replych;
+                        reply_info->type = rdma_replych;
                         reply_info->wc_array = write_ary;
                         reply_info->rm_xid = header->rm_xid;
                 }
@@ -3213,18 +2810,16 @@ gf_rdma_decode_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
 
         /* skip terminator of reply chunk */
         ptr = ptr + sizeof (uint32_t);
-        if (header->rm_type != GF_RDMA_NOMSG) {
-                header_len = (long)ptr - (long)post->buf;
-                post->ctx.vector[0].iov_len = (bytes_in_post - header_len);
-
-                post->ctx.hdr_iobuf = iobuf_get2 (peer->trans->ctx->iobuf_pool,
-                                                  (bytes_in_post - header_len));
+        if (header->rm_type != RDMA_NOMSG) {
+                post->ctx.hdr_iobuf = iobuf_get (peer->trans->ctx->iobuf_pool);
                 if (post->ctx.hdr_iobuf == NULL) {
                         ret = -1;
                         goto out;
                 }
 
+                header_len = (long)ptr - (long)post->buf;
                 post->ctx.vector[0].iov_base = iobuf_ptr (post->ctx.hdr_iobuf);
+                post->ctx.vector[0].iov_len = bytes_in_post - header_len;
                 memcpy (post->ctx.vector[0].iov_base, ptr,
                         post->ctx.vector[0].iov_len);
                 post->ctx.count = 1;
@@ -3238,7 +2833,9 @@ out:
                         *readch = NULL;
                 }
 
-                GF_FREE (write_ary);
+                if (write_ary != NULL) {
+                        GF_FREE (write_ary);
+                }
         }
 
         return ret;
@@ -3247,13 +2844,13 @@ out:
 
 /* Assumes only one of either write-chunklist or a reply chunk is present */
 int32_t
-gf_rdma_decode_header (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
-                       gf_rdma_read_chunk_t **readch, size_t bytes_in_post)
+rdma_decode_header (rdma_peer_t *peer, rdma_post_t *post,
+                    rdma_read_chunk_t **readch, size_t bytes_in_post)
 {
-        int32_t           ret    = -1;
-        gf_rdma_header_t *header = NULL;
+        int32_t             ret        = -1;
+        rdma_header_t      *header     = NULL;
 
-        header = (gf_rdma_header_t *)post->buf;
+        header = (rdma_header_t *)post->buf;
 
         header->rm_xid = ntoh32 (header->rm_xid);
         header->rm_vers = ntoh32 (header->rm_vers);
@@ -3261,39 +2858,31 @@ gf_rdma_decode_header (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
         header->rm_type = ntoh32 (header->rm_type);
 
         switch (header->rm_type) {
-        case GF_RDMA_MSG:
-        case GF_RDMA_NOMSG:
-                ret = gf_rdma_decode_msg (peer, post, readch, bytes_in_post);
-                if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "cannot decode msg of type (%d)",
-                                header->rm_type);
-                }
-
+        case RDMA_MSG:
+        case RDMA_NOMSG:
+                ret = rdma_decode_msg (peer, post, readch, bytes_in_post);
                 break;
 
-        case GF_RDMA_MSGP:
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "rdma msg of msg-type GF_RDMA_MSGP should not have "
-                        "been received");
+        case RDMA_MSGP:
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "rdma msg of msg-type RDMA_MSGP should not have been "
+                        "received");
                 ret = -1;
                 break;
 
-        case GF_RDMA_DONE:
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "rdma msg of msg-type GF_RDMA_DONE should not have "
-                        "been received");
+        case RDMA_DONE:
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "rdma msg of msg-type RDMA_DONE should not have been "
+                        "received");
                 ret = -1;
                 break;
 
-        case GF_RDMA_ERROR:
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "received a msg of type RDMA_ERROR");
-                ret = gf_rdma_decode_error_msg (peer, post, bytes_in_post);
+        case RDMA_ERROR:
+                /* ret = rdma_decode_error_msg (peer, post, bytes_in_post); */
                 break;
 
         default:
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "unknown rdma msg-type (%d)", header->rm_type);
         }
 
@@ -3302,17 +2891,15 @@ gf_rdma_decode_header (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
 
 
 int32_t
-__gf_rdma_read (gf_rdma_peer_t *peer, gf_rdma_post_t *post, struct iovec *to,
-                gf_rdma_read_chunk_t *readch)
+__rdma_read (rdma_peer_t *peer, rdma_post_t *post, struct iovec *to,
+             rdma_read_chunk_t *readch)
 {
-        int32_t            ret  = -1;
+        int32_t            ret = -1;
         struct ibv_sge     list = {0, };
-        struct ibv_send_wr wr   = {0, }, *bad_wr = NULL;
+        struct ibv_send_wr wr = {0, }, *bad_wr = NULL;
 
-        ret = __gf_rdma_register_local_mr_for_rdma (peer, to, 1, &post->ctx);
+        ret = __rdma_register_local_mr_for_rdma (peer, to, 1, &post->ctx);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "registering local memory for rdma read failed");
                 goto out;
         }
 
@@ -3320,7 +2907,7 @@ __gf_rdma_read (gf_rdma_peer_t *peer, gf_rdma_post_t *post, struct iovec *to,
         list.length = to->iov_len;
         list.lkey = post->ctx.mr[post->ctx.mr_count - 1]->lkey;
 
-        wr.wr_id      = (unsigned long) gf_rdma_post_ref (post);
+        wr.wr_id      = (unsigned long) rdma_post_ref (post);
         wr.sg_list    = &list;
         wr.num_sge    = 1;
         wr.opcode     = IBV_WR_RDMA_READ;
@@ -3330,13 +2917,12 @@ __gf_rdma_read (gf_rdma_peer_t *peer, gf_rdma_post_t *post, struct iovec *to,
 
         ret = ibv_post_send (peer->qp, &wr, &bad_wr);
         if (ret) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "rdma read from client "
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG, "rdma read from client "
                         "(%s) failed with ret = %d (%s)",
                         peer->trans->peerinfo.identifier,
                         ret, (ret > 0) ? strerror (ret) : "");
                 ret = -1;
-                gf_rdma_post_unref (post);
+                rdma_post_unref (post);
         }
 out:
         return ret;
@@ -3344,14 +2930,13 @@ out:
 
 
 int32_t
-gf_rdma_do_reads (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
-                  gf_rdma_read_chunk_t *readch)
+rdma_do_reads (rdma_peer_t *peer, rdma_post_t *post, rdma_read_chunk_t *readch)
 {
-        int32_t            ret   = -1, i = 0, count = 0;
-        size_t             size  = 0;
-        char              *ptr   = NULL;
-        struct iobuf      *iobuf = NULL;
-        gf_rdma_private_t *priv  = NULL;
+        int32_t         ret    = -1, i = 0, count = 0;
+        size_t          size   = 0;
+        char           *ptr    = NULL;
+        struct iobuf   *iobuf  = NULL;
+        rdma_private_t *priv   = NULL;
 
         priv = peer->trans->private;
 
@@ -3360,15 +2945,24 @@ gf_rdma_do_reads (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
         }
 
         if (i == 0) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "message type specified as rdma-read but there are no "
                         "rdma read-chunks present");
                 goto out;
         }
 
-        post->ctx.gf_rdma_reads = i;
+        post->ctx.rdma_reads = i;
+
+        if (size > peer->trans->ctx->page_size) {
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "total size of rdma-read (%lu) is greater than "
+                        "page-size (%lu). This is not supported till variable "
+                        "sized iobufs are implemented", (unsigned long)size,
+                        (unsigned long)peer->trans->ctx->page_size);
+                goto out;
+        }
 
-        iobuf = iobuf_get2 (peer->trans->ctx->iobuf_pool, size);
+        iobuf = iobuf_get (peer->trans->ctx->iobuf_pool);
         if (iobuf == NULL) {
                 goto out;
         }
@@ -3390,10 +2984,6 @@ gf_rdma_do_reads (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
         pthread_mutex_lock (&priv->write_mutex);
         {
                 if (!priv->connected) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "transport not connected to peer (%s), "
-                                "not doing rdma reads",
-                                peer->trans->peerinfo.identifier);
                         goto unlock;
                 }
 
@@ -3403,13 +2993,10 @@ gf_rdma_do_reads (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
                         post->ctx.vector[count].iov_len
                                 = readch[i].rc_target.rs_length;
 
-                        ret = __gf_rdma_read (peer, post,
-                                              &post->ctx.vector[count],
-                                              &readch[i]);
+                        ret = __rdma_read (peer, post,
+                                           &post->ctx.vector[count],
+                                           &readch[i]);
                         if (ret == -1) {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                        "rdma read from peer (%s) failed",
-                                        peer->trans->peerinfo.identifier);
                                 goto unlock;
                         }
 
@@ -3433,16 +3020,16 @@ out:
 
 
 int32_t
-gf_rdma_pollin_notify (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
+rdma_pollin_notify (rdma_peer_t *peer, rdma_post_t *post)
 {
-        int32_t                    ret             = -1;
-        enum msg_type              msg_type        = 0;
-        struct rpc_req            *rpc_req         = NULL;
-        gf_rdma_request_context_t *request_context = NULL;
-        rpc_request_info_t         request_info    = {0, };
-        gf_rdma_private_t         *priv            = NULL;
-        uint32_t                  *ptr             = NULL;
-        rpc_transport_pollin_t    *pollin          = NULL;
+        int32_t                 ret             = -1;
+        enum msg_type           msg_type        = 0;
+        struct rpc_req         *rpc_req         = NULL;
+        rdma_request_context_t *request_context = NULL;
+        rpc_request_info_t      request_info    = {0, };
+        rdma_private_t         *priv            = NULL;
+        uint32_t               *ptr             = NULL;
+        rpc_transport_pollin_t *pollin          = NULL;
 
         if ((peer == NULL) || (post == NULL)) {
                 goto out;
@@ -3483,7 +3070,7 @@ gf_rdma_pollin_notify (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
                                             RPC_TRANSPORT_MAP_XID_REQUEST,
                                             &request_info);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_DEBUG,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                                 "cannot get request information from rpc "
                                 "layer");
                         goto out;
@@ -3491,7 +3078,7 @@ gf_rdma_pollin_notify (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
 
                 rpc_req = request_info.rpc_req;
                 if (rpc_req == NULL) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_DEBUG,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                                 "rpc request structure not found");
                         ret = -1;
                         goto out;
@@ -3504,11 +3091,11 @@ gf_rdma_pollin_notify (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
                 if (request_context != NULL) {
                         pthread_mutex_lock (&priv->write_mutex);
                         {
-                                __gf_rdma_request_context_destroy (request_context);
+                                __rdma_request_context_destroy (request_context);
                         }
                         pthread_mutex_unlock (&priv->write_mutex);
                 } else {
-                        gf_rdma_quota_put (peer);
+                        rdma_quota_put (peer);
                 }
 
                 pollin->is_reply = 1;
@@ -3516,10 +3103,6 @@ gf_rdma_pollin_notify (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
 
         ret = rpc_transport_notify (peer->trans, RPC_TRANSPORT_MSG_RECEIVED,
                                     pollin);
-        if (ret < 0) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "transport_notify failed");
-        }
 
 out:
         if (pollin != NULL) {
@@ -3532,19 +3115,19 @@ out:
 
 
 int32_t
-gf_rdma_recv_reply (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
+rdma_recv_reply (rdma_peer_t *peer, rdma_post_t *post)
 {
-        int32_t                    ret          = -1;
-        gf_rdma_header_t          *header       = NULL;
-        gf_rdma_reply_info_t      *reply_info   = NULL;
-        gf_rdma_write_array_t     *wc_array     = NULL;
-        int                        i            = 0;
-        uint32_t                  *ptr          = NULL;
-        gf_rdma_request_context_t *ctx          = NULL;
-        rpc_request_info_t         request_info = {0, };
-        struct rpc_req            *rpc_req      = NULL;
-
-        header = (gf_rdma_header_t *)post->buf;
+        int32_t                      ret          = -1;
+        rdma_header_t               *header       = NULL;
+        rdma_reply_info_t           *reply_info   = NULL;
+        rdma_write_array_t          *wc_array     = NULL;
+        int                          i            = 0;
+        uint32_t                    *ptr          = NULL;
+        rdma_request_context_t      *ctx          = NULL;
+        rpc_request_info_t           request_info = {0, };
+        struct rpc_req              *rpc_req      = NULL;
+
+        header = (rdma_header_t *)post->buf;
         reply_info = post->ctx.reply_info;
 
         /* no write chunklist, just notify upper layers */
@@ -3555,7 +3138,7 @@ gf_rdma_recv_reply (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
 
         wc_array = reply_info->wc_array;
 
-        if (header->rm_type == GF_RDMA_NOMSG) {
+        if (header->rm_type == RDMA_NOMSG) {
                 post->ctx.vector[0].iov_base
                         = (void *)(long)wc_array->wc_array[0].wc_target.rs_offset;
                 post->ctx.vector[0].iov_len
@@ -3580,15 +3163,15 @@ gf_rdma_recv_reply (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
                                     RPC_TRANSPORT_MAP_XID_REQUEST,
                                     &request_info);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "cannot get request information (peer:%s) from rpc "
-                        "layer", peer->trans->peerinfo.identifier);
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                        "cannot get request information from rpc "
+                        "layer");
                 goto out;
         }
 
         rpc_req = request_info.rpc_req;
         if (rpc_req == NULL) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "rpc request structure not found");
                 ret = -1;
                 goto out;
@@ -3601,15 +3184,11 @@ gf_rdma_recv_reply (gf_rdma_peer_t *peer, gf_rdma_post_t *post)
 
         ret = 0;
 
-        gf_rdma_reply_info_destroy (reply_info);
+        rdma_reply_info_destroy (reply_info);
 
 out:
         if (ret == 0) {
-                ret = gf_rdma_pollin_notify (peer, post);
-                if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "pollin notify failed");
-                }
+                ret = rdma_pollin_notify (peer, post);
         }
 
         return ret;
@@ -3617,22 +3196,17 @@ out:
 
 
 inline int32_t
-gf_rdma_recv_request (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
-                      gf_rdma_read_chunk_t *readch)
+rdma_recv_request (rdma_peer_t *peer, rdma_post_t *post,
+                   rdma_read_chunk_t *readch)
 {
         int32_t ret = -1;
 
         if (readch != NULL) {
-                ret = gf_rdma_do_reads (peer, post, readch);
-                if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "rdma read from peer (%s) failed",
-                                peer->trans->peerinfo.identifier);
-                }
+                ret = rdma_do_reads (peer, post, readch);
         } else {
-                ret = gf_rdma_pollin_notify (peer, post);
+                ret = rdma_pollin_notify (peer, post);
                 if (ret == -1) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                                 "pollin notification failed");
                 }
         }
@@ -3641,59 +3215,38 @@ gf_rdma_recv_request (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
 }
 
 void
-gf_rdma_process_recv (gf_rdma_peer_t *peer, struct ibv_wc *wc)
+rdma_process_recv (rdma_peer_t *peer, struct ibv_wc *wc)
 {
-        gf_rdma_post_t       *post     = NULL;
-        gf_rdma_read_chunk_t *readch   = NULL;
-        int                   ret      = -1;
-        uint32_t             *ptr      = NULL;
-        enum msg_type         msg_type = 0;
-        gf_rdma_header_t     *header   = NULL;
-        gf_rdma_private_t    *priv     = NULL;
-
-        post = (gf_rdma_post_t *) (long) wc->wr_id;
+        rdma_post_t            *post       = NULL;
+        rdma_read_chunk_t      *readch     = NULL;
+        int                     ret        = -1;
+        uint32_t               *ptr        = NULL;
+        enum msg_type           msg_type   = 0;
+        rdma_header_t          *header     = NULL;
+
+        post = (rdma_post_t *) (long) wc->wr_id;
         if (post == NULL) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "no post found in successful work completion element");
                 goto out;
         }
 
-        ret = gf_rdma_decode_header (peer, post, &readch, wc->byte_len);
+        ret = rdma_decode_header (peer, post, &readch, wc->byte_len);
         if (ret == -1) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "decoding of header failed");
                 goto out;
         }
 
-        header = (gf_rdma_header_t *)post->buf;
-
-	priv = peer->trans->private;
-
-        pthread_mutex_lock (&priv->write_mutex);
-        {
-                if (!priv->peer.quota_set) {
-                        priv->peer.quota_set = 1;
-
-                        /* Initially peer.quota is set to 1 as per RFC 5666. We
-                         * have to account for the quota used while sending
-                         * first msg (which may or may not be returned to pool
-                         * at this point) while deriving peer.quota from
-                         * header->rm_credit. Hence the arithmatic below,
-                         * instead of directly setting it to header->rm_credit.
-                         */
-                        priv->peer.quota = header->rm_credit
-                                - ( 1 - priv->peer.quota);
-                }
-        }
-        pthread_mutex_unlock (&priv->write_mutex);
+        header = (rdma_header_t *)post->buf;
 
         switch (header->rm_type) {
-        case GF_RDMA_MSG:
+        case RDMA_MSG:
                 ptr = (uint32_t *)post->ctx.vector[0].iov_base;
                 msg_type = ntoh32 (*(ptr + 1));
                 break;
 
-        case GF_RDMA_NOMSG:
+        case RDMA_NOMSG:
                 if (readch != NULL) {
                         msg_type = CALL;
                 } else {
@@ -3701,49 +3254,31 @@ gf_rdma_process_recv (gf_rdma_peer_t *peer, struct ibv_wc *wc)
                 }
                 break;
 
-        case GF_RDMA_ERROR:
-                if (header->rm_body.rm_error.rm_type == ERR_CHUNK) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "peer (%s), couldn't encode or decode the msg "
-                                "properly or write chunks were not provided "
-                                "for replies that were bigger than "
-                                "RDMA_INLINE_THRESHOLD (%d)",
-                                peer->trans->peerinfo.identifier,
-                                GLUSTERFS_RDMA_INLINE_THRESHOLD);
-                        ret = gf_rdma_pollin_notify (peer, post);
-                        if (ret == -1) {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_DEBUG,
-                                        "pollin notification failed");
-                        }
-                        goto out;
-                } else {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_ERROR,
-                                "an error has happened while transmission of "
-                                "msg, disconnecting the transport");
-                        ret = -1;
-                        goto out;
-                }
+        case RDMA_ERROR:
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "an error has happened while transmission of msg, "
+                        "disconnecting the transport");
+                rpc_transport_disconnect (peer->trans);
+                goto out;
+
+/*                ret = rdma_pollin_notify (peer, post);
+                  if (ret == -1) {
+                  gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                  "pollin notification failed");
+                  }
+                  goto out;
+*/
 
         default:
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                         "invalid rdma msg-type (%d)", header->rm_type);
-                goto out;
+                break;
         }
 
         if (msg_type == CALL) {
-                ret = gf_rdma_recv_request (peer, post, readch);
-                if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "receiving a request from peer (%s) failed",
-                                peer->trans->peerinfo.identifier);
-                }
+                ret = rdma_recv_request (peer, post, readch);
         } else {
-                ret = gf_rdma_recv_reply (peer, post);
-                if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "receiving a reply from peer (%s) failed",
-                                peer->trans->peerinfo.identifier);
-                }
+                ret = rdma_recv_reply (peer, post);
         }
 
 out:
@@ -3754,50 +3289,14 @@ out:
         return;
 }
 
-void *
-gf_rdma_async_event_thread (void *context)
-{
-        struct ibv_async_event event;
-        int ret;
-
-        while (1) {
-                do {
-                        ret = ibv_get_async_event((struct ibv_context *)context,
-                                                  &event);
-
-                        if (ret && errno != EINTR) {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                        "Error getting event (%s)",
-                                        strerror (errno));
-                        }
-                } while(ret && errno == EINTR);
-
-                switch (event.event_type) {
-                case IBV_EVENT_SRQ_LIMIT_REACHED:
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                                "recieved srq_limit reached");
-                        break;
-
-                default:
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_DEBUG,
-                                "event (%d) recieved", event.event_type);
-                        break;
-                }
-
-                ibv_ack_async_event(&event);
-        }
-
-        return 0;
-}
-
 
 static void *
-gf_rdma_recv_completion_proc (void *data)
+rdma_recv_completion_proc (void *data)
 {
         struct ibv_comp_channel *chan      = NULL;
-        gf_rdma_device_t        *device    = NULL;;
-        gf_rdma_post_t          *post      = NULL;
-        gf_rdma_peer_t          *peer      = NULL;
+        rdma_device_t           *device    = NULL;;
+        rdma_post_t             *post      = NULL;
+        rdma_peer_t             *peer      = NULL;
         struct ibv_cq           *event_cq  = NULL;
         struct ibv_wc            wc        = {0, };
         void                    *event_ctx = NULL;
@@ -3808,7 +3307,7 @@ gf_rdma_recv_completion_proc (void *data)
         while (1) {
                 ret = ibv_get_cq_event (chan, &event_cq, &event_ctx);
                 if (ret) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_ERROR,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
                                 "ibv_get_cq_event failed, terminating recv "
                                 "thread %d (%d)", ret, errno);
                         continue;
@@ -3818,26 +3317,26 @@ gf_rdma_recv_completion_proc (void *data)
 
                 ret = ibv_req_notify_cq (event_cq, 0);
                 if (ret) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_ERROR,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
                                 "ibv_req_notify_cq on %s failed, terminating "
                                 "recv thread: %d (%d)",
                                 device->device_name, ret, errno);
                         continue;
                 }
 
-                device = (gf_rdma_device_t *) event_ctx;
+                device = (rdma_device_t *) event_ctx;
 
                 while ((ret = ibv_poll_cq (event_cq, 1, &wc)) > 0) {
-                        post = (gf_rdma_post_t *) (long) wc.wr_id;
+                        post = (rdma_post_t *) (long) wc.wr_id;
 
                         pthread_mutex_lock (&device->qpreg.lock);
                         {
-                                peer = __gf_rdma_lookup_peer (device,
-                                                              wc.qp_num);
+                                peer = __rdma_lookup_peer (device,
+                                                           wc.qp_num);
 
                                 /*
                                  * keep a refcount on transport so that it
-                                 * does not get freed because of some error
+                                 * doesnot get freed because of some error
                                  * indicated by wc.status till we are done
                                  * with usage of peer and thereby that of trans.
                                  */
@@ -3848,7 +3347,7 @@ gf_rdma_recv_completion_proc (void *data)
                         pthread_mutex_unlock (&device->qpreg.lock);
 
                         if (wc.status != IBV_WC_SUCCESS) {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_ERROR,
+                                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
                                         "recv work request on `%s' returned "
                                         "error (%d)", device->device_name,
                                         wc.status);
@@ -3858,26 +3357,26 @@ gf_rdma_recv_completion_proc (void *data)
                                 }
 
                                 if (post) {
-                                        gf_rdma_post_unref (post);
+                                        rdma_post_unref (post);
                                 }
                                 continue;
                         }
 
                         if (peer) {
-                                gf_rdma_process_recv (peer, &wc);
+                                rdma_process_recv (peer, &wc);
                                 rpc_transport_unref (peer->trans);
                         } else {
-                                gf_log (GF_RDMA_LOG_NAME,
+                                gf_log (RDMA_LOG_NAME,
                                         GF_LOG_DEBUG,
                                         "could not lookup peer for qp_num: %d",
                                         wc.qp_num);
                         }
 
-                        gf_rdma_post_unref (post);
+                        rdma_post_unref (post);
                 }
 
                 if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME,
+                        gf_log (RDMA_LOG_NAME,
                                 GF_LOG_ERROR,
                                 "ibv_poll_cq on `%s' returned error "
                                 "(ret = %d, errno = %d)",
@@ -3892,11 +3391,11 @@ gf_rdma_recv_completion_proc (void *data)
 
 
 void
-gf_rdma_handle_failed_send_completion (gf_rdma_peer_t *peer, struct ibv_wc *wc)
+rdma_handle_failed_send_completion (rdma_peer_t *peer, struct ibv_wc *wc)
 {
-        gf_rdma_post_t    *post   = NULL;
-        gf_rdma_device_t  *device = NULL;
-        gf_rdma_private_t *priv   = NULL;
+        rdma_post_t    *post   = NULL;
+        rdma_device_t  *device = NULL;
+        rdma_private_t *priv   = NULL;
 
         if (peer != NULL) {
                 priv = peer->trans->private;
@@ -3906,9 +3405,9 @@ gf_rdma_handle_failed_send_completion (gf_rdma_peer_t *peer, struct ibv_wc *wc)
         }
 
 
-        post = (gf_rdma_post_t *) (long) wc->wr_id;
+        post = (rdma_post_t *) (long) wc->wr_id;
 
-        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
                 "send work request on `%s' returned error "
                 "wc.status = %d, wc.vendor_err = %d, post->buf = %p, "
                 "wc.byte_len = %d, post->reused = %d",
@@ -3933,22 +3432,20 @@ gf_rdma_handle_failed_send_completion (gf_rdma_peer_t *peer, struct ibv_wc *wc)
 
 
 void
-gf_rdma_handle_successful_send_completion (gf_rdma_peer_t *peer,
-                                           struct ibv_wc *wc)
+rdma_handle_successful_send_completion (rdma_peer_t *peer, struct ibv_wc *wc)
 {
-        gf_rdma_post_t   *post   = NULL;
-        int               reads  = 0, ret = 0;
-        gf_rdma_header_t *header = NULL;
+        rdma_post_t            *post     = NULL;
+        int                     reads    = 0, ret = 0;
 
         if (wc->opcode != IBV_WC_RDMA_READ) {
                 goto out;
         }
 
-        post = (gf_rdma_post_t *)(long) wc->wr_id;
+        post = (rdma_post_t *)(long) wc->wr_id;
 
         pthread_mutex_lock (&post->lock);
         {
-                reads = --post->ctx.gf_rdma_reads;
+                reads = --post->ctx.rdma_reads;
         }
         pthread_mutex_unlock (&post->lock);
 
@@ -3957,14 +3454,7 @@ gf_rdma_handle_successful_send_completion (gf_rdma_peer_t *peer,
                 goto out;
         }
 
-        header = (gf_rdma_header_t *)post->buf;
-
-        if (header->rm_type == GF_RDMA_NOMSG) {
-                post->ctx.count = 1;
-                post->ctx.vector[0].iov_len += post->ctx.vector[1].iov_len;
-        }
-
-        ret = gf_rdma_pollin_notify (peer, post);
+        ret = rdma_pollin_notify (peer, post);
         if ((ret == -1) && (peer != NULL)) {
                 rpc_transport_disconnect (peer->trans);
         }
@@ -3975,14 +3465,14 @@ out:
 
 
 static void *
-gf_rdma_send_completion_proc (void *data)
+rdma_send_completion_proc (void *data)
 {
         struct ibv_comp_channel *chan       = NULL;
-        gf_rdma_post_t          *post       = NULL;
-        gf_rdma_peer_t          *peer       = NULL;
+        rdma_post_t             *post       = NULL;
+        rdma_peer_t             *peer       = NULL;
         struct ibv_cq           *event_cq   = NULL;
         void                    *event_ctx  = NULL;
-        gf_rdma_device_t        *device     = NULL;
+        rdma_device_t           *device     = NULL;
         struct ibv_wc            wc         = {0, };
         char                     is_request = 0;
         int32_t                  ret        = 0, quota_ret = 0;
@@ -3991,7 +3481,7 @@ gf_rdma_send_completion_proc (void *data)
         while (1) {
                 ret = ibv_get_cq_event (chan, &event_cq, &event_ctx);
                 if (ret) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_ERROR,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
                                 "ibv_get_cq_event on failed, terminating "
                                 "send thread: %d (%d)", ret, errno);
                         continue;
@@ -4001,7 +3491,7 @@ gf_rdma_send_completion_proc (void *data)
 
                 ret = ibv_req_notify_cq (event_cq, 0);
                 if (ret) {
-                        gf_log (GF_RDMA_LOG_NAME,  GF_LOG_ERROR,
+                        gf_log (RDMA_LOG_NAME,  GF_LOG_ERROR,
                                 "ibv_req_notify_cq on %s failed, terminating "
                                 "send thread: %d (%d)",
                                 device->device_name, ret, errno);
@@ -4009,11 +3499,11 @@ gf_rdma_send_completion_proc (void *data)
                 }
 
                 while ((ret = ibv_poll_cq (event_cq, 1, &wc)) > 0) {
-                        post = (gf_rdma_post_t *) (long) wc.wr_id;
+                        post = (rdma_post_t *) (long) wc.wr_id;
 
                         pthread_mutex_lock (&device->qpreg.lock);
                         {
-                                peer = __gf_rdma_lookup_peer (device, wc.qp_num);
+                                peer = __rdma_lookup_peer (device, wc.qp_num);
 
                                 /*
                                  * keep a refcount on transport so that it
@@ -4028,32 +3518,32 @@ gf_rdma_send_completion_proc (void *data)
                         pthread_mutex_unlock (&device->qpreg.lock);
 
                         if (wc.status != IBV_WC_SUCCESS) {
-                                gf_rdma_handle_failed_send_completion (peer, &wc);
+                                rdma_handle_failed_send_completion (peer, &wc);
                         } else {
-                                gf_rdma_handle_successful_send_completion (peer,
-                                                                           &wc);
+                                rdma_handle_successful_send_completion (peer,
+                                                                        &wc);
                         }
 
                         if (post) {
                                 is_request = post->ctx.is_request;
 
-                                ret = gf_rdma_post_unref (post);
+                                ret = rdma_post_unref (post);
                                 if ((ret == 0)
                                     && (wc.status == IBV_WC_SUCCESS)
                                     && !is_request
-                                    && (post->type == GF_RDMA_SEND_POST)
+                                    && (post->type == RDMA_SEND_POST)
                                     && (peer != NULL)) {
-                                        /* An GF_RDMA_RECV_POST can end up in
-                                         * gf_rdma_send_completion_proc for
+                                        /* An RDMA_RECV_POST can end up in
+                                         * rdma_send_completion_proc for
                                          * rdma-reads, and we do not take
-                                         * quota for getting an GF_RDMA_RECV_POST.
+                                         * quota for getting an RDMA_RECV_POST.
                                          */
 
                                         /*
                                          * if it is request, quota is returned
                                          * after reply has come.
                                          */
-                                        quota_ret = gf_rdma_quota_put (peer);
+                                        quota_ret = rdma_quota_put (peer);
                                         if (quota_ret < 0) {
                                                 gf_log ("rdma", GF_LOG_DEBUG,
                                                         "failed to send "
@@ -4065,14 +3555,14 @@ gf_rdma_send_completion_proc (void *data)
                         if (peer) {
                                 rpc_transport_unref (peer->trans);
                         } else {
-                                gf_log (GF_RDMA_LOG_NAME, GF_LOG_DEBUG,
+                                gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
                                         "could not lookup peer for qp_num: %d",
                                         wc.qp_num);
                         }
                 }
 
                 if (ret < 0) {
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_ERROR,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
                                 "ibv_poll_cq on `%s' returned error (ret = %d,"
                                 " errno = %d)",
                                 device->device_name, ret, errno);
@@ -4087,24 +3577,19 @@ gf_rdma_send_completion_proc (void *data)
 
 
 static void
-gf_rdma_options_init (rpc_transport_t *this)
+rdma_options_init (rpc_transport_t *this)
 {
-        gf_rdma_private_t *priv    = NULL;
-        gf_rdma_options_t *options = NULL;
-        int32_t            mtu     = 0;
-        data_t            *temp    = NULL;
+        rdma_private_t *priv = this->private;
+        rdma_options_t *options = &priv->options;
+        int32_t mtu;
+        data_t *temp;
 
         /* TODO: validate arguments from options below */
 
-        priv = this->private;
-        options = &priv->options;
         options->send_size = GLUSTERFS_RDMA_INLINE_THRESHOLD;/*this->ctx->page_size * 4;  512 KB*/
         options->recv_size = GLUSTERFS_RDMA_INLINE_THRESHOLD;/*this->ctx->page_size * 4;  512 KB*/
         options->send_count = 4096;
         options->recv_count = 4096;
-	options->attr_timeout = GF_RDMA_TIMEOUT;
-	options->attr_retry_cnt = GF_RDMA_RETRY_CNT;
-	options->attr_rnr_retry = GF_RDMA_RNR_RETRY;
 
         temp = dict_get (this->options,
                          "transport.rdma.work-request-send-count");
@@ -4114,22 +3599,7 @@ gf_rdma_options_init (rpc_transport_t *this)
         temp = dict_get (this->options,
                          "transport.rdma.work-request-recv-count");
         if (temp)
-		options->recv_count = data_to_int32 (temp);
-
-	temp = dict_get (this->options, "transport.rdma.attr-timeout");
-
-	if (temp)
-		options->attr_timeout = data_to_uint8 (temp);
-
-	temp = dict_get (this->options, "transport.rdma.attr-retry-cnt");
-
-	if (temp)
-		options->attr_retry_cnt = data_to_uint8 (temp);
-
-	temp = dict_get (this->options, "transport.rdma.attr-rnr-retry");
-
-	if (temp)
-		options->attr_rnr_retry = data_to_uint8 (temp);
+                options->recv_count = data_to_int32 (temp);
 
         options->port = 1;
         temp = dict_get (this->options,
@@ -4155,12 +3625,12 @@ gf_rdma_options_init (rpc_transport_t *this)
                 break;
         default:
                 if (temp)
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
                                 "%s: unrecognized MTU value '%s', defaulting "
                                 "to '2048'", this->name,
                                 data_to_str (temp));
                 else
-                        gf_log (GF_RDMA_LOG_NAME, GF_LOG_TRACE,
+                        gf_log (RDMA_LOG_NAME, GF_LOG_TRACE,
                                 "%s: defaulting MTU to '2048'",
                                 this->name);
                 options->mtu = IBV_MTU_2048;
@@ -4175,250 +3645,1112 @@ gf_rdma_options_init (rpc_transport_t *this)
         return;
 }
 
+static void
+rdma_queue_init (rdma_queue_t *queue)
+{
+        pthread_mutex_init (&queue->lock, NULL);
 
-gf_rdma_ctx_t *
-__gf_rdma_ctx_create (void)
+        queue->active_posts.next = &queue->active_posts;
+        queue->active_posts.prev = &queue->active_posts;
+        queue->passive_posts.next = &queue->passive_posts;
+        queue->passive_posts.prev = &queue->passive_posts;
+}
+
+
+static rdma_device_t *
+rdma_get_device (rpc_transport_t *this,
+                 struct ibv_context *ibctx)
 {
-        gf_rdma_ctx_t *rdma_ctx = NULL;
-        int            ret      = -1;
+        glusterfs_ctx_t *ctx    = NULL;
+        rdma_private_t *priv    = NULL;
+        rdma_options_t *options = NULL;
+        char *device_name       = NULL;
+        uint32_t port           = 0;
+        uint8_t active_port     = 0;
+        int32_t ret             = 0;
+        int32_t i               = 0;
 
-        rdma_ctx = GF_CALLOC (1, sizeof (*rdma_ctx), gf_common_mt_char);
-        if (rdma_ctx == NULL) {
-                goto out;
-        }
+        rdma_device_t *trav = NULL;
 
-        rdma_ctx->rdma_cm_event_channel = rdma_create_event_channel ();
-        if (rdma_ctx->rdma_cm_event_channel == NULL) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "rdma_cm event channel creation failed (%s)",
-                        strerror (errno));
-                goto out;
-        }
+        priv        = this->private;
+        options     = &priv->options;
+        device_name = priv->options.device_name;
+        ctx         = this->ctx;
+        trav        = ctx->ib;
+        port        = priv->options.port;
 
-        ret = gf_thread_create (&rdma_ctx->rdma_cm_thread, NULL,
-				gf_rdma_cm_event_handler,
-				rdma_ctx->rdma_cm_event_channel);
-        if (ret != 0) {
-                gf_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING,
-                        "creation of thread to handle rdma-cm events "
-                        "failed (%s)", strerror (ret));
-                goto out;
+        while (trav) {
+                if ((!strcmp (trav->device_name, device_name)) &&
+                    (trav->port == port))
+                        break;
+                trav = trav->next;
         }
 
-out:
-        if (ret < 0) {
-                if (rdma_ctx->rdma_cm_event_channel != NULL) {
-                        rdma_destroy_event_channel (rdma_ctx->rdma_cm_event_channel);
+        if (!trav) {
+
+                trav = GF_CALLOC (1, sizeof (*trav),
+                                  gf_common_mt_rdma_device_t);
+                if (trav == NULL) {
+                        return NULL;
                 }
 
-                GF_FREE (rdma_ctx);
-                rdma_ctx = NULL;
-        }
+                priv->device = trav;
+
+                trav->context = ibctx;
+
+                ret = ib_get_active_port (trav->context);
+
+                if (ret < 0) {
+                        if (!port) {
+                                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                        "Failed to find any active ports and "
+                                        "none specified in volume file,"
+                                        " exiting");
+                                GF_FREE (trav);
+                                return NULL;
+                        }
+                }
+
+                trav->request_ctx_pool = mem_pool_new (rdma_request_context_t,
+                                                       RDMA_POOL_SIZE);
+                if (trav->request_ctx_pool == NULL) {
+                        return NULL;
+                }
+
+                trav->ioq_pool = mem_pool_new (rdma_ioq_t, RDMA_POOL_SIZE);
+                if (trav->ioq_pool == NULL) {
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        return NULL;
+                }
+
+                trav->reply_info_pool = mem_pool_new (rdma_reply_info_t,
+                                                      RDMA_POOL_SIZE);
+                if (trav->reply_info_pool == NULL) {
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->ioq_pool);
+                        return NULL;
+                }
+
+
+                active_port = ret;
+
+                if (port) {
+                        ret = ib_check_active_port (trav->context, port);
+                        if (ret < 0) {
+                                gf_log (RDMA_LOG_NAME, GF_LOG_WARNING,
+                                        "On device %s: provided port:%u is "
+                                        "found to be offline, continuing to "
+                                        "use the same port", device_name, port);
+                        }
+                } else {
+                        priv->options.port = active_port;
+                        port = active_port;
+                        gf_log (RDMA_LOG_NAME, GF_LOG_TRACE,
+                                "Port unspecified in volume file using active "
+                                "port: %u", port);
+                }
+
+                trav->device_name = gf_strdup (device_name);
+                trav->port = port;
+
+                trav->next = ctx->ib;
+                ctx->ib = trav;
+
+                trav->send_chan = ibv_create_comp_channel (trav->context);
+                if (!trav->send_chan) {
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: could not create send completion channel",
+                                device_name);
+                        mem_pool_destroy (trav->ioq_pool);
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->reply_info_pool);
+                        GF_FREE ((char *)trav->device_name);
+                        GF_FREE (trav);
+                        return NULL;
+                }
+
+                trav->recv_chan = ibv_create_comp_channel (trav->context);
+                if (!trav->recv_chan) {
+                        mem_pool_destroy (trav->ioq_pool);
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->reply_info_pool);
+                        ibv_destroy_comp_channel (trav->send_chan);
+                        GF_FREE ((char *)trav->device_name);
+                        GF_FREE (trav);
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "could not create recv completion channel");
+                        /* TODO: cleanup current mess */
+                        return NULL;
+                }
+
+                if (rdma_create_cq (this) < 0) {
+                        mem_pool_destroy (trav->ioq_pool);
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->reply_info_pool);
+                        ibv_destroy_comp_channel (trav->recv_chan);
+                        ibv_destroy_comp_channel (trav->send_chan);
+                        GF_FREE ((char *)trav->device_name);
+                        GF_FREE (trav);
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: could not create CQ",
+                                this->name);
+                        return NULL;
+                }
+
+                /* protection domain */
+                trav->pd = ibv_alloc_pd (trav->context);
+
+                if (!trav->pd) {
+                        mem_pool_destroy (trav->ioq_pool);
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->reply_info_pool);
+                        rdma_destroy_cq (this);
+                        ibv_destroy_comp_channel (trav->recv_chan);
+                        ibv_destroy_comp_channel (trav->send_chan);
+                        GF_FREE ((char *)trav->device_name);
+                        GF_FREE (trav);
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: could not allocate protection domain",
+                                this->name);
+                        return NULL;
+                }
+
+                struct ibv_srq_init_attr attr = {
+                        .attr = {
+                                .max_wr = options->recv_count,
+                                .max_sge = 1
+                        }
+                };
+                trav->srq = ibv_create_srq (trav->pd, &attr);
+
+                if (!trav->srq) {
+                        mem_pool_destroy (trav->ioq_pool);
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->reply_info_pool);
+                        ibv_dealloc_pd (trav->pd);
+                        rdma_destroy_cq (this);
+                        ibv_destroy_comp_channel (trav->recv_chan);
+                        ibv_destroy_comp_channel (trav->send_chan);
+                        GF_FREE ((char *)trav->device_name);
+                        GF_FREE (trav);
+
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: could not create SRQ",
+                                this->name);
+                        return NULL;
+                }
+
+                /* queue init */
+                rdma_queue_init (&trav->sendq);
+                rdma_queue_init (&trav->recvq);
+
+                if (rdma_create_posts (this) < 0) {
+                        mem_pool_destroy (trav->ioq_pool);
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->reply_info_pool);
+                        ibv_dealloc_pd (trav->pd);
+                        rdma_destroy_cq (this);
+                        ibv_destroy_comp_channel (trav->recv_chan);
+                        ibv_destroy_comp_channel (trav->send_chan);
+                        GF_FREE ((char *)trav->device_name);
+                        GF_FREE (trav);
+
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: could not allocate posts",
+                                this->name);
+                        return NULL;
+                }
+
+                /* completion threads */
+                ret = pthread_create (&trav->send_thread,
+                                      NULL,
+                                      rdma_send_completion_proc,
+                                      trav->send_chan);
+                if (ret) {
+                        rdma_destroy_posts (this);
+                        mem_pool_destroy (trav->ioq_pool);
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->reply_info_pool);
+                        ibv_dealloc_pd (trav->pd);
+                        rdma_destroy_cq (this);
+                        ibv_destroy_comp_channel (trav->recv_chan);
+                        ibv_destroy_comp_channel (trav->send_chan);
+                        GF_FREE ((char *)trav->device_name);
+                        GF_FREE (trav);
+
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "could not create send completion thread");
+                        return NULL;
+                }
 
-        return rdma_ctx;
+                ret = pthread_create (&trav->recv_thread,
+                                      NULL,
+                                      rdma_recv_completion_proc,
+                                      trav->recv_chan);
+                if (ret) {
+                        rdma_destroy_posts (this);
+                        mem_pool_destroy (trav->ioq_pool);
+                        mem_pool_destroy (trav->request_ctx_pool);
+                        mem_pool_destroy (trav->reply_info_pool);
+                        ibv_dealloc_pd (trav->pd);
+                        rdma_destroy_cq (this);
+                        ibv_destroy_comp_channel (trav->recv_chan);
+                        ibv_destroy_comp_channel (trav->send_chan);
+                        GF_FREE ((char *)trav->device_name);
+                        GF_FREE (trav);
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "could not create recv completion thread");
+                        return NULL;
+                }
+
+                /* qpreg */
+                pthread_mutex_init (&trav->qpreg.lock, NULL);
+                for (i=0; i<42; i++) {
+                        trav->qpreg.ents[i].next = &trav->qpreg.ents[i];
+                        trav->qpreg.ents[i].prev = &trav->qpreg.ents[i];
+                }
+        }
+        return trav;
 }
 
 static int32_t
-gf_rdma_init (rpc_transport_t *this)
+rdma_init (rpc_transport_t *this)
 {
-        gf_rdma_private_t   *priv    = NULL;
-        int32_t              ret     = 0;
-        glusterfs_ctx_t     *ctx     = NULL;
-        gf_rdma_options_t   *options = NULL;
+        rdma_private_t *priv = this->private;
+        rdma_options_t *options = &priv->options;
+        struct ibv_device **dev_list;
+        struct ibv_context *ib_ctx = NULL;
+        int32_t ret = 0;
 
-        ctx= this->ctx;
+        ibv_fork_init ();
+        rdma_options_init (this);
 
-        priv = this->private;
+        {
+                dev_list = ibv_get_device_list (NULL);
 
-        ibv_fork_init ();
-        gf_rdma_options_init (this);
+                if (!dev_list) {
+                        gf_log (RDMA_LOG_NAME,
+                                GF_LOG_CRITICAL,
+                                "Failed to get IB devices");
+                        ret = -1;
+                        goto cleanup;
+                }
 
-        options = &priv->options;
-        priv->peer.send_count = options->send_count;
-        priv->peer.recv_count = options->recv_count;
-        priv->peer.send_size = options->send_size;
-        priv->peer.recv_size = options->recv_size;
+                if (!*dev_list) {
+                        gf_log (RDMA_LOG_NAME,
+                                GF_LOG_CRITICAL,
+                                "No IB devices found");
+                        ret = -1;
+                        goto cleanup;
+                }
+
+                if (!options->device_name) {
+                        if (*dev_list) {
+                                options->device_name =
+                                        gf_strdup (ibv_get_device_name (*dev_list));
+                        } else {
+                                gf_log (RDMA_LOG_NAME, GF_LOG_CRITICAL,
+                                        "IB device list is empty. Check for "
+                                        "'ib_uverbs' module");
+                                return -1;
+                                goto cleanup;
+                        }
+                }
+
+                while (*dev_list) {
+                        if (!strcmp (ibv_get_device_name (*dev_list),
+                                     options->device_name)) {
+                                ib_ctx = ibv_open_device (*dev_list);
+
+                                if (!ib_ctx) {
+                                        gf_log (RDMA_LOG_NAME,
+                                                GF_LOG_ERROR,
+                                                "Failed to get infiniband"
+                                                "device context");
+                                        ret = -1;
+                                        goto cleanup;
+                                }
+                                break;
+                        }
+                        ++dev_list;
+                }
+
+                priv->device = rdma_get_device (this, ib_ctx);
+
+                if (!priv->device) {
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "could not create rdma device for %s",
+                                options->device_name);
+                        ret = -1;
+                        goto cleanup;
+                }
+        }
 
         priv->peer.trans = this;
         INIT_LIST_HEAD (&priv->peer.ioq);
 
+        pthread_mutex_init (&priv->read_mutex, NULL);
         pthread_mutex_init (&priv->write_mutex, NULL);
         pthread_mutex_init (&priv->recv_mutex, NULL);
         pthread_cond_init (&priv->recv_cond, NULL);
 
-        pthread_mutex_lock (&ctx->lock);
+cleanup:
+        if (-1 == ret) {
+                if (ib_ctx)
+                        ibv_close_device (ib_ctx);
+        }
+
+        if (dev_list)
+                ibv_free_device_list (dev_list);
+
+        return ret;
+}
+
+
+static int32_t
+rdma_disconnect (rpc_transport_t *this)
+{
+        rdma_private_t *priv = this->private;
+        int32_t ret = 0;
+
+        pthread_mutex_lock (&priv->write_mutex);
         {
-                if (ctx->ib == NULL) {
-                        ctx->ib = __gf_rdma_ctx_create ();
-                        if (ctx->ib == NULL) {
-                                ret = -1;
+                ret = __rdma_disconnect (this);
+        }
+        pthread_mutex_unlock (&priv->write_mutex);
+
+        return ret;
+}
+
+
+static int32_t
+__tcp_connect_finish (int fd)
+{
+        int ret = -1;
+        int optval = 0;
+        socklen_t optlen = sizeof (int);
+
+        ret = getsockopt (fd, SOL_SOCKET, SO_ERROR,
+                          (void *)&optval, &optlen);
+
+        if (ret == 0 && optval)
+        {
+                errno = optval;
+                ret = -1;
+        }
+
+        return ret;
+}
+
+static inline void
+rdma_fill_handshake_data (char *buf, struct rdma_nbio *nbio,
+                          rdma_private_t *priv)
+{
+        sprintf (buf,
+                 "QP1:RECV_BLKSIZE=%08x:SEND_BLKSIZE=%08x\n"
+                 "QP1:LID=%04x:QPN=%06x:PSN=%06x\n",
+                 priv->peer.recv_size,
+                 priv->peer.send_size,
+                 priv->peer.local_lid,
+                 priv->peer.local_qpn,
+                 priv->peer.local_psn);
+
+        nbio->vector.iov_base = buf;
+        nbio->vector.iov_len = strlen (buf) + 1;
+        nbio->count = 1;
+        return;
+}
+
+static inline void
+rdma_fill_handshake_ack (char *buf, struct rdma_nbio *nbio)
+{
+        sprintf (buf, "DONE\n");
+        nbio->vector.iov_base = buf;
+        nbio->vector.iov_len = strlen (buf) + 1;
+        nbio->count = 1;
+        return;
+}
+
+static int
+rdma_handshake_pollin (rpc_transport_t *this)
+{
+        int ret = 0;
+        rdma_private_t *priv = this->private;
+        char *buf = priv->handshake.incoming.buf;
+        int32_t recv_buf_size, send_buf_size;
+        socklen_t sock_len;
+
+        if (priv->handshake.incoming.state == RDMA_HANDSHAKE_COMPLETE) {
+                return -1;
+        }
+
+        pthread_mutex_lock (&priv->write_mutex);
+        {
+                while (priv->handshake.incoming.state != RDMA_HANDSHAKE_COMPLETE)
+                {
+                        switch (priv->handshake.incoming.state)
+                        {
+                        case RDMA_HANDSHAKE_START:
+                                buf = priv->handshake.incoming.buf = GF_CALLOC (1, 256, gf_common_mt_char);
+                                rdma_fill_handshake_data (buf, &priv->handshake.incoming, priv);
+                                buf[0] = 0;
+                                priv->handshake.incoming.state = RDMA_HANDSHAKE_RECEIVING_DATA;
+                                break;
+
+                        case RDMA_HANDSHAKE_RECEIVING_DATA:
+                                ret = __tcp_readv (this,
+                                                   &priv->handshake.incoming.vector,
+                                                   priv->handshake.incoming.count,
+                                                   &priv->handshake.incoming.pending_vector,
+                                                   &priv->handshake.incoming.pending_count);
+                                if (ret == -1) {
+                                        goto unlock;
+                                }
+
+                                if (ret > 0) {
+                                        gf_log (this->name, GF_LOG_TRACE,
+                                                "partial header read on NB socket. continue later");
+                                        goto unlock;
+                                }
+
+                                if (!ret) {
+                                        priv->handshake.incoming.state = RDMA_HANDSHAKE_RECEIVED_DATA;
+                                }
+                                break;
+
+                        case RDMA_HANDSHAKE_RECEIVED_DATA:
+                                ret = sscanf (buf,
+                                              "QP1:RECV_BLKSIZE=%08x:SEND_BLKSIZE=%08x\n"
+                                              "QP1:LID=%04x:QPN=%06x:PSN=%06x\n",
+                                              &recv_buf_size,
+                                              &send_buf_size,
+                                              &priv->peer.remote_lid,
+                                              &priv->peer.remote_qpn,
+                                              &priv->peer.remote_psn);
+
+                                if ((ret != 5) && (strncmp (buf, "QP1:", 4))) {
+                                        gf_log (RDMA_LOG_NAME,
+                                                GF_LOG_CRITICAL,
+                                                "%s: remote-host(%s)'s "
+                                                "transport type is different",
+                                                this->name,
+                                                this->peerinfo.identifier);
+                                        ret = -1;
+                                        goto unlock;
+                                }
+
+                                if (recv_buf_size < priv->peer.recv_size)
+                                        priv->peer.recv_size = recv_buf_size;
+                                if (send_buf_size < priv->peer.send_size)
+                                        priv->peer.send_size = send_buf_size;
+
+                                gf_log (RDMA_LOG_NAME, GF_LOG_TRACE,
+                                        "%s: transacted recv_size=%d "
+                                        "send_size=%d",
+                                        this->name, priv->peer.recv_size,
+                                        priv->peer.send_size);
+
+                                priv->peer.quota = priv->peer.send_count;
+
+                                if (rdma_connect_qp (this)) {
+                                        gf_log (RDMA_LOG_NAME,
+                                                GF_LOG_ERROR,
+                                                "%s: failed to connect with "
+                                                "remote QP", this->name);
+                                        ret = -1;
+                                        goto unlock;
+                                }
+                                rdma_fill_handshake_ack (buf, &priv->handshake.incoming);
+                                buf[0] = 0;
+                                priv->handshake.incoming.state = RDMA_HANDSHAKE_RECEIVING_ACK;
+                                break;
+
+                        case RDMA_HANDSHAKE_RECEIVING_ACK:
+                                ret = __tcp_readv (this,
+                                                   &priv->handshake.incoming.vector,
+                                                   priv->handshake.incoming.count,
+                                                   &priv->handshake.incoming.pending_vector,
+                                                   &priv->handshake.incoming.pending_count);
+                                if (ret == -1) {
+                                        goto unlock;
+                                }
+
+                                if (ret > 0) {
+                                        gf_log (this->name, GF_LOG_TRACE,
+                                                "partial header read on NB "
+                                                "socket. continue later");
+                                        goto unlock;
+                                }
+
+                                if (!ret) {
+                                        priv->handshake.incoming.state = RDMA_HANDSHAKE_RECEIVED_ACK;
+                                }
+                                break;
+
+                        case RDMA_HANDSHAKE_RECEIVED_ACK:
+                                if (strncmp (buf, "DONE", 4)) {
+                                        gf_log (RDMA_LOG_NAME,
+                                                GF_LOG_DEBUG,
+                                                "%s: handshake-3 did not "
+                                                "return 'DONE' (%s)",
+                                                this->name, buf);
+                                        ret = -1;
+                                        goto unlock;
+                                }
+                                ret = 0;
+                                priv->connected = 1;
+                                sock_len = sizeof (struct sockaddr_storage);
+                                getpeername (priv->sock,
+                                             (struct sockaddr *) &this->peerinfo.sockaddr,
+                                             &sock_len);
+
+                                GF_FREE (priv->handshake.incoming.buf);
+                                priv->handshake.incoming.buf = NULL;
+                                priv->handshake.incoming.state = RDMA_HANDSHAKE_COMPLETE;
                         }
                 }
         }
-        pthread_mutex_unlock (&ctx->lock);
+unlock:
+        pthread_mutex_unlock (&priv->write_mutex);
+
+        if (ret == -1) {
+                rpc_transport_disconnect (this);
+        } else {
+                ret = 0;
+        }
+
+
+        if (!ret && priv->connected) {
+                if (priv->is_server) {
+                        ret = rpc_transport_notify (priv->listener,
+                                                    RPC_TRANSPORT_ACCEPT,
+                                                    this);
+                } else {
+                        ret = rpc_transport_notify (this, RPC_TRANSPORT_CONNECT,
+                                                    this);
+                }
+        }
 
         return ret;
 }
 
+static int
+rdma_handshake_pollout (rpc_transport_t *this)
+{
+        rdma_private_t *priv = this->private;
+        char *buf = priv->handshake.outgoing.buf;
+        int32_t ret = 0;
 
-static int32_t
-gf_rdma_disconnect (rpc_transport_t *this)
+        if (priv->handshake.outgoing.state == RDMA_HANDSHAKE_COMPLETE) {
+                return 0;
+        }
+
+        pthread_mutex_unlock (&priv->write_mutex);
+        {
+                while (priv->handshake.outgoing.state != RDMA_HANDSHAKE_COMPLETE)
+                {
+                        switch (priv->handshake.outgoing.state)
+                        {
+                        case RDMA_HANDSHAKE_START:
+                                buf = priv->handshake.outgoing.buf = GF_CALLOC (1, 256, gf_common_mt_char);
+                                rdma_fill_handshake_data (buf, &priv->handshake.outgoing, priv);
+                                priv->handshake.outgoing.state = RDMA_HANDSHAKE_SENDING_DATA;
+                                break;
+
+                        case RDMA_HANDSHAKE_SENDING_DATA:
+                                ret = __tcp_writev (this,
+                                                    &priv->handshake.outgoing.vector,
+                                                    priv->handshake.outgoing.count,
+                                                    &priv->handshake.outgoing.pending_vector,
+                                                    &priv->handshake.outgoing.pending_count);
+                                if (ret == -1) {
+                                        goto unlock;
+                                }
+
+                                if (ret > 0) {
+                                        gf_log (this->name, GF_LOG_TRACE,
+                                                "partial header read on NB socket. continue later");
+                                        goto unlock;
+                                }
+
+                                if (!ret) {
+                                        priv->handshake.outgoing.state = RDMA_HANDSHAKE_SENT_DATA;
+                                }
+                                break;
+
+                        case RDMA_HANDSHAKE_SENT_DATA:
+                                rdma_fill_handshake_ack (buf, &priv->handshake.outgoing);
+                                priv->handshake.outgoing.state = RDMA_HANDSHAKE_SENDING_ACK;
+                                break;
+
+                        case RDMA_HANDSHAKE_SENDING_ACK:
+                                ret = __tcp_writev (this,
+                                                    &priv->handshake.outgoing.vector,
+                                                    priv->handshake.outgoing.count,
+                                                    &priv->handshake.outgoing.pending_vector,
+                                                    &priv->handshake.outgoing.pending_count);
+
+                                if (ret == -1) {
+                                        goto unlock;
+                                }
+
+                                if (ret > 0) {
+                                        gf_log (this->name, GF_LOG_TRACE,
+                                                "partial header read on NB "
+                                                "socket. continue later");
+                                        goto unlock;
+                                }
+
+                                if (!ret) {
+                                        GF_FREE (priv->handshake.outgoing.buf);
+                                        priv->handshake.outgoing.buf = NULL;
+                                        priv->handshake.outgoing.state = RDMA_HANDSHAKE_COMPLETE;
+                                }
+                                break;
+                        }
+                }
+        }
+unlock:
+        pthread_mutex_unlock (&priv->write_mutex);
+
+        if (ret == -1) {
+                rpc_transport_disconnect (this);
+        } else {
+                ret = 0;
+        }
+
+        return ret;
+}
+
+static int
+rdma_handshake_pollerr (rpc_transport_t *this)
 {
-        gf_rdma_private_t *priv = NULL;
-        int32_t            ret  = 0;
+        rdma_private_t *priv = this->private;
+        int32_t ret = 0;
+        char need_unref = 0, connected = 0;
 
-        priv = this->private;
-        gf_log_callingfn (this->name, GF_LOG_WARNING,
-                          "disconnect called (peer:%s)",
-                          this->peerinfo.identifier);
+        gf_log (RDMA_LOG_NAME, GF_LOG_DEBUG,
+                "%s: peer disconnected, cleaning up",
+                this->name);
 
         pthread_mutex_lock (&priv->write_mutex);
         {
-                ret = __gf_rdma_disconnect (this);
+                __rdma_teardown (this);
+
+                connected = priv->connected;
+                if (priv->sock != -1) {
+                        event_unregister (this->ctx->event_pool,
+                                          priv->sock, priv->idx);
+                        need_unref = 1;
+
+                        if (close (priv->sock) != 0) {
+                                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                        "close () - error: %s",
+                                        strerror (errno));
+                                ret = -errno;
+                        }
+                        priv->tcp_connected = priv->connected = 0;
+                        priv->sock = -1;
+                }
+
+                if (priv->handshake.incoming.buf) {
+                        GF_FREE (priv->handshake.incoming.buf);
+                        priv->handshake.incoming.buf = NULL;
+                }
+
+                priv->handshake.incoming.state = RDMA_HANDSHAKE_START;
+
+                if (priv->handshake.outgoing.buf) {
+                        GF_FREE (priv->handshake.outgoing.buf);
+                        priv->handshake.outgoing.buf = NULL;
+                }
+
+                priv->handshake.outgoing.state = RDMA_HANDSHAKE_START;
+        }
+        pthread_mutex_unlock (&priv->write_mutex);
+
+        if (connected) {
+                rpc_transport_notify (this, RPC_TRANSPORT_DISCONNECT, this);
+        }
+
+        if (need_unref)
+                rpc_transport_unref (this);
+
+        return 0;
+}
+
+
+static int
+tcp_connect_finish (rpc_transport_t *this)
+{
+        rdma_private_t *priv = this->private;
+        int error = 0, ret = 0;
+
+        pthread_mutex_lock (&priv->write_mutex);
+        {
+                ret = __tcp_connect_finish (priv->sock);
+
+                if (!ret) {
+                        this->myinfo.sockaddr_len =
+                                sizeof (this->myinfo.sockaddr);
+                        ret = getsockname (priv->sock,
+                                           (struct sockaddr *)&this->myinfo.sockaddr,
+                                           &this->myinfo.sockaddr_len);
+                        if (ret == -1)
+                        {
+                                gf_log (this->name, GF_LOG_ERROR,
+                                        "getsockname on new client-socket %d "
+                                        "failed (%s)",
+                                        priv->sock, strerror (errno));
+                                close (priv->sock);
+                                error = 1;
+                                goto unlock;
+                        }
+
+                        gf_rdma_get_transport_identifiers (this);
+                        priv->tcp_connected = 1;
+                }
+
+                if (ret == -1 && errno != EINPROGRESS) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "tcp connect to %s failed (%s)",
+                                this->peerinfo.identifier, strerror (errno));
+                        error = 1;
+                }
         }
+unlock:
         pthread_mutex_unlock (&priv->write_mutex);
 
+        if (error) {
+                rpc_transport_disconnect (this);
+        }
+
         return ret;
 }
 
+static int
+rdma_event_handler (int fd, int idx, void *data,
+                    int poll_in, int poll_out, int poll_err)
+{
+        rpc_transport_t *this = data;
+        rdma_private_t *priv = this->private;
+        rdma_options_t *options = NULL;
+        int ret = 0;
+
+        if (!priv->tcp_connected) {
+                ret = tcp_connect_finish (this);
+                if (priv->tcp_connected) {
+                        options = &priv->options;
+
+                        priv->peer.send_count = options->send_count;
+                        priv->peer.recv_count = options->recv_count;
+                        priv->peer.send_size = options->send_size;
+                        priv->peer.recv_size = options->recv_size;
+
+                        if ((ret = rdma_create_qp (this)) < 0) {
+                                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                        "%s: could not create QP",
+                                        this->name);
+                                rpc_transport_disconnect (this);
+                        }
+                }
+        }
+
+        if (!ret && poll_out && priv->tcp_connected) {
+                ret = rdma_handshake_pollout (this);
+        }
+
+        if (!ret && !poll_err && poll_in && priv->tcp_connected) {
+                if (priv->handshake.incoming.state == RDMA_HANDSHAKE_COMPLETE) {
+                        gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                                "%s: pollin received on tcp socket (peer: %s) "
+                                "after handshake is complete",
+                                this->name, this->peerinfo.identifier);
+                        rdma_handshake_pollerr (this);
+                        return 0;
+                }
+                ret = rdma_handshake_pollin (this);
+        }
+
+        if (ret < 0 || poll_err) {
+                ret = rdma_handshake_pollerr (this);
+        }
+
+        return 0;
+}
+
+static int
+__tcp_nonblock (int fd)
+{
+        int flags = 0;
+        int ret = -1;
+
+        flags = fcntl (fd, F_GETFL);
+
+        if (flags != -1)
+                ret = fcntl (fd, F_SETFL, flags | O_NONBLOCK);
+
+        return ret;
+}
 
 static int32_t
-gf_rdma_connect (struct rpc_transport *this, int port)
+rdma_connect (struct rpc_transport *this, int port)
 {
-        gf_rdma_private_t   *priv         = NULL;
-        int32_t              ret          = 0;
-        union gf_sock_union  sock_union   = {{0, }, };
-        socklen_t            sockaddr_len = 0;
-        gf_rdma_peer_t      *peer         = NULL;
-        gf_rdma_ctx_t       *rdma_ctx     = NULL;
-        gf_boolean_t         connected    = _gf_false;
+        dict_t *options = this->options;
 
-        priv = this->private;
+        rdma_private_t *priv = this->private;
 
-        peer = &priv->peer;
+        int32_t ret = 0;
+        gf_boolean_t non_blocking = 1;
+        struct sockaddr_storage sockaddr;
+        socklen_t sockaddr_len = 0;
 
-        rpc_transport_ref (this);
+        if (priv->connected) {
+                return 0;
+        }
+
+        if (dict_get (options, "non-blocking-io")) {
+                char *nb_connect = data_to_str (dict_get (this->options,
+                                                          "non-blocking-io"));
+
+                if (gf_string2boolean (nb_connect, &non_blocking) == -1) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "'non-blocking-io' takes only boolean "
+                                "options, not taking any action");
+                        non_blocking = 1;
+                }
+        }
 
         ret = gf_rdma_client_get_remote_sockaddr (this,
-                                                  &sock_union.sa,
+                                                  (struct sockaddr *)&sockaddr,
                                                   &sockaddr_len, port);
         if (ret != 0) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "cannot get remote address to connect");
-                goto out;
+                return ret;
         }
 
-        rdma_ctx = this->ctx->ib;
-
         pthread_mutex_lock (&priv->write_mutex);
         {
-                if (peer->cm_id != NULL) {
-                        ret = -1;
-                        errno = EINPROGRESS;
-                        connected = _gf_true;
+                if (priv->sock != -1) {
+                        ret = 0;
                         goto unlock;
                 }
 
-                priv->entity = GF_RDMA_CLIENT;
+                priv->sock = socket (((struct sockaddr *)&sockaddr)->sa_family,
+                                     SOCK_STREAM, 0);
 
-                ret = rdma_create_id (rdma_ctx->rdma_cm_event_channel,
-                                      &peer->cm_id, this, RDMA_PS_TCP);
-                if (ret != 0) {
+                if (priv->sock == -1) {
                         gf_log (this->name, GF_LOG_ERROR,
-                                "creation of rdma_cm_id failed (%s)",
-                                strerror (errno));
+                                "socket () - error: %s", strerror (errno));
                         ret = -errno;
                         goto unlock;
                 }
 
-                memcpy (&this->peerinfo.sockaddr, &sock_union.storage,
-                        sockaddr_len);
+                gf_log (this->name, GF_LOG_TRACE,
+                        "socket fd = %d", priv->sock);
+
+                memcpy (&this->peerinfo.sockaddr, &sockaddr, sockaddr_len);
                 this->peerinfo.sockaddr_len = sockaddr_len;
 
                 if (port > 0)
-                        sock_union.sin.sin_port = htons (port);
+                        ((struct sockaddr_in *) (&sockaddr))->sin_port
+                                = htons (port);
 
                 ((struct sockaddr *) &this->myinfo.sockaddr)->sa_family =
                         ((struct sockaddr *)&this->peerinfo.sockaddr)->sa_family;
 
+                if (non_blocking)
+                {
+                        ret = __tcp_nonblock (priv->sock);
+
+                        if (ret == -1)
+                        {
+                                gf_log (this->name, GF_LOG_ERROR,
+                                        "could not set socket %d to non "
+                                        "blocking mode (%s)",
+                                        priv->sock, strerror (errno));
+                                close (priv->sock);
+                                priv->sock = -1;
+                                goto unlock;
+                        }
+                }
+
                 ret = gf_rdma_client_bind (this,
                                            (struct sockaddr *)&this->myinfo.sockaddr,
-                                           &this->myinfo.sockaddr_len,
-                                           peer->cm_id);
-                if (ret != 0) {
+                                           &this->myinfo.sockaddr_len, priv->sock);
+                if (ret == -1)
+                {
                         gf_log (this->name, GF_LOG_WARNING,
                                 "client bind failed: %s", strerror (errno));
+                        close (priv->sock);
+                        priv->sock = -1;
                         goto unlock;
                 }
 
-                ret = rdma_resolve_addr (peer->cm_id, NULL, &sock_union.sa,
-                                         2000);
-                if (ret != 0) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "rdma_resolve_addr failed (%s)",
+                ret = connect (priv->sock,
+                               (struct sockaddr *)&this->peerinfo.sockaddr,
+                               this->peerinfo.sockaddr_len);
+                if (ret == -1 && errno != EINPROGRESS)
+                {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "connection attempt failed (%s)",
                                 strerror (errno));
+                        close (priv->sock);
+                        priv->sock = -1;
                         goto unlock;
                 }
 
-                priv->connected = 0;
+                priv->tcp_connected = priv->connected = 0;
+
+                rpc_transport_ref (this);
+
+                priv->handshake.incoming.state = RDMA_HANDSHAKE_START;
+                priv->handshake.outgoing.state = RDMA_HANDSHAKE_START;
+
+                priv->idx = event_register (this->ctx->event_pool,
+                                            priv->sock, rdma_event_handler,
+                                            this, 1, 1);
         }
 unlock:
         pthread_mutex_unlock (&priv->write_mutex);
 
-out:
-        if (ret != 0) {
-                if (!connected) {
-                        gf_rdma_teardown (this);
-                }
+        return ret;
+}
 
-                rpc_transport_unref (this);
+static int
+rdma_server_event_handler (int fd, int idx, void *data,
+                           int poll_in, int poll_out, int poll_err)
+{
+        int32_t main_sock = -1;
+        rpc_transport_t *this, *trans = data;
+        rdma_private_t *priv = NULL;
+        rdma_private_t *trans_priv = (rdma_private_t *) trans->private;
+        rdma_options_t *options = NULL;
+
+        if (!poll_in) {
+                return 0;
         }
 
-        return ret;
-}
+        this = GF_CALLOC (1, sizeof (rpc_transport_t),
+                          gf_common_mt_rpc_transport_t);
+        if (this == NULL) {
+                return -1;
+        }
 
+        this->listener = trans;
 
-static int32_t
-gf_rdma_listen (rpc_transport_t *this)
-{
-        union gf_sock_union  sock_union   = {{0, }, };
-        socklen_t            sockaddr_len = 0;
-        gf_rdma_private_t   *priv         = NULL;
-        gf_rdma_peer_t      *peer         = NULL;
-        int                  ret          = 0;
-        gf_rdma_ctx_t       *rdma_ctx     = NULL;
-        char                 service[NI_MAXSERV], host[NI_MAXHOST];
+        priv = GF_CALLOC (1, sizeof (rdma_private_t),
+                          gf_common_mt_rdma_private_t);
+        if (priv == NULL) {
+                GF_FREE (priv);
+                return -1;
+        }
+        this->private = priv;
+        /* Copy all the rdma related values in priv, from trans_priv
+           as other than QP, all the values remain same */
+        priv->device = trans_priv->device;
+        priv->options = trans_priv->options;
+        priv->is_server = 1;
+        priv->listener = trans;
 
-        priv = this->private;
-        peer = &priv->peer;
+        options = &priv->options;
+
+        this->ops = trans->ops;
+        this->init = trans->init;
+        this->fini = trans->fini;
+        this->ctx = trans->ctx;
+        this->name = gf_strdup (trans->name);
+        this->notify = trans->notify;
+        this->mydata = trans->mydata;
+
+        memcpy (&this->myinfo.sockaddr, &trans->myinfo.sockaddr,
+                trans->myinfo.sockaddr_len);
+        this->myinfo.sockaddr_len = trans->myinfo.sockaddr_len;
+
+        main_sock = (trans_priv)->sock;
+        this->peerinfo.sockaddr_len = sizeof (this->peerinfo.sockaddr);
+        priv->sock = accept (main_sock,
+                             (struct sockaddr *)&this->peerinfo.sockaddr,
+                             &this->peerinfo.sockaddr_len);
+        if (priv->sock == -1) {
+                gf_log ("rdma/server", GF_LOG_ERROR,
+                        "accept() failed: %s",
+                        strerror (errno));
+                GF_FREE (this->private);
+                GF_FREE (this);
+                return -1;
+        }
+
+        priv->peer.trans = this;
+        rpc_transport_ref (this);
+
+        gf_rdma_get_transport_identifiers (this);
+
+        priv->tcp_connected = 1;
+        priv->handshake.incoming.state = RDMA_HANDSHAKE_START;
+        priv->handshake.outgoing.state = RDMA_HANDSHAKE_START;
+
+        priv->peer.send_count = options->send_count;
+        priv->peer.recv_count = options->recv_count;
+        priv->peer.send_size = options->send_size;
+        priv->peer.recv_size = options->recv_size;
+        INIT_LIST_HEAD (&priv->peer.ioq);
 
-        priv->entity = GF_RDMA_SERVER_LISTENER;
+        if (rdma_create_qp (this) < 0) {
+                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
+                        "%s: could not create QP",
+                        this->name);
+                rpc_transport_disconnect (this);
+                return -1;
+        }
 
-        rdma_ctx = this->ctx->ib;
+        priv->idx = event_register (this->ctx->event_pool, priv->sock,
+                                    rdma_event_handler, this, 1, 1);
 
-        ret = gf_rdma_server_get_local_sockaddr (this, &sock_union.sa,
+        pthread_mutex_init (&priv->read_mutex, NULL);
+        pthread_mutex_init (&priv->write_mutex, NULL);
+        pthread_mutex_init (&priv->recv_mutex, NULL);
+        /*  pthread_cond_init (&priv->recv_cond, NULL); */
+        return 0;
+}
+
+static int32_t
+rdma_listen (rpc_transport_t *this)
+{
+        struct sockaddr_storage sockaddr;
+        socklen_t sockaddr_len;
+        rdma_private_t *priv = this->private;
+        int opt = 1, ret = 0;
+        char service[NI_MAXSERV], host[NI_MAXHOST];
+
+        memset (&sockaddr, 0, sizeof (sockaddr));
+        ret = gf_rdma_server_get_local_sockaddr (this,
+                                                 (struct sockaddr *)&sockaddr,
                                                  &sockaddr_len);
         if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
+                gf_log (this->name, GF_LOG_DEBUG,
                         "cannot find network address of server to bind to");
                 goto err;
         }
 
-        ret = rdma_create_id (rdma_ctx->rdma_cm_event_channel,
-                              &peer->cm_id, this, RDMA_PS_TCP);
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "creation of rdma_cm_id failed (%s)",
+        priv->sock = socket (((struct sockaddr *)&sockaddr)->sa_family,
+                             SOCK_STREAM, 0);
+        if (priv->sock == -1) {
+                gf_log ("rdma/server", GF_LOG_CRITICAL,
+                        "init: failed to create socket, error: %s",
                         strerror (errno));
+                GF_FREE (this->private);
+                ret = -1;
                 goto err;
         }
 
-        memcpy (&this->myinfo.sockaddr, &sock_union.storage,
-                sockaddr_len);
+        memcpy (&this->myinfo.sockaddr, &sockaddr, sockaddr_len);
         this->myinfo.sockaddr_len = sockaddr_len;
 
         ret = getnameinfo ((struct sockaddr *)&this->myinfo.sockaddr,
-                           this->myinfo.sockaddr_len, host, sizeof (host),
+                           this->myinfo.sockaddr_len,
+                           host, sizeof (host),
                            service, sizeof (service),
                            NI_NUMERICHOST);
         if (ret != 0) {
@@ -4426,58 +4758,57 @@ gf_rdma_listen (rpc_transport_t *this)
                         "getnameinfo failed (%s)", gai_strerror (ret));
                 goto err;
         }
-
         sprintf (this->myinfo.identifier, "%s:%s", host, service);
 
-        ret = rdma_bind_addr (peer->cm_id, &sock_union.sa);
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "rdma_bind_addr failed (%s)", strerror (errno));
+        setsockopt (priv->sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof (opt));
+        if (bind (priv->sock,
+                  (struct sockaddr *)&sockaddr,
+                  sockaddr_len) != 0) {
+                ret = -1;
+                gf_log ("rdma/server", GF_LOG_ERROR,
+                        "init: failed to bind to socket for %s (%s)",
+                        this->myinfo.identifier, strerror (errno));
                 goto err;
         }
 
-        ret = rdma_listen (peer->cm_id, 10);
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "rdma_listen failed (%s)", strerror (errno));
+        if (listen (priv->sock, 10) != 0) {
+                gf_log ("rdma/server", GF_LOG_ERROR,
+                        "init: listen () failed on socket for %s (%s)",
+                        this->myinfo.identifier, strerror (errno));
+                ret = -1;
                 goto err;
         }
 
-        rpc_transport_ref (this);
+        /* Register the main socket */
+        priv->idx = event_register (this->ctx->event_pool, priv->sock,
+                                    rdma_server_event_handler,
+                                    rpc_transport_ref (this), 1, 0);
 
-        ret = 0;
 err:
-        if (ret < 0) {
-                if (peer->cm_id != NULL) {
-                        rdma_destroy_id (peer->cm_id);
-                        peer->cm_id = NULL;
-                }
-        }
-
         return ret;
 }
 
-
 struct rpc_transport_ops tops = {
-        .submit_request = gf_rdma_submit_request,
-        .submit_reply   = gf_rdma_submit_reply,
-        .connect        = gf_rdma_connect,
-        .disconnect     = gf_rdma_disconnect,
-        .listen         = gf_rdma_listen,
+        .submit_request = rdma_submit_request,
+        .submit_reply   = rdma_submit_reply,
+        .connect        = rdma_connect,
+        .disconnect     = rdma_disconnect,
+        .listen         = rdma_listen,
 };
 
 int32_t
 init (rpc_transport_t *this)
 {
-        gf_rdma_private_t *priv = NULL;
+        rdma_private_t *priv = NULL;
 
         priv = GF_CALLOC (1, sizeof (*priv), gf_common_mt_rdma_private_t);
         if (!priv)
                 return -1;
 
         this->private = priv;
+        priv->sock = -1;
 
-        if (gf_rdma_init (this)) {
+        if (rdma_init (this)) {
                 gf_log (this->name, GF_LOG_ERROR,
                         "Failed to initialize IB Device");
                 return -1;
@@ -4490,15 +4821,19 @@ void
 fini (struct rpc_transport *this)
 {
         /* TODO: verify this function does graceful finish */
-        gf_rdma_private_t *priv = NULL;
-
-        priv = this->private;
-
+        rdma_private_t *priv = this->private;
         this->private = NULL;
 
         if (priv) {
                 pthread_mutex_destroy (&priv->recv_mutex);
                 pthread_mutex_destroy (&priv->write_mutex);
+                pthread_mutex_destroy (&priv->read_mutex);
+
+                /*  pthread_cond_destroy (&priv->recv_cond); */
+                if (priv->sock != -1) {
+                        event_unregister (this->ctx->event_pool,
+                                          priv->sock, priv->idx);
+                }
 
                 gf_log (this->name, GF_LOG_TRACE,
                         "called fini on transport: %p", this);
@@ -4538,18 +4873,6 @@ struct volume_options options[] = {
                     "transport.rdma.remote-port"},
           .type  = GF_OPTION_TYPE_INT
         },
-	{ .key   = {"transport.rdma.attr-timeout",
-		    "rdma-attr-timeout"},
-          .type  = GF_OPTION_TYPE_INT
-        },
-	{ .key   = {"transport.rdma.attr-retry-cnt",
-		    "rdma-attr-retry-cnt"},
-          .type  = GF_OPTION_TYPE_INT
-        },
-	{ .key   = {"transport.rdma.attr-rnr-retry",
-		    "rdma-attr-rnr-retry"},
-          .type  = GF_OPTION_TYPE_INT
-        },
         { .key   = {"transport.rdma.listen-port", "listen-port"},
           .type  = GF_OPTION_TYPE_INT
         },
diff --git a/rpc/rpc-transport/rdma/src/rdma.h b/rpc/rpc-transport/rdma/src/rdma.h
index 7f76244f0..be6957659 100644
--- a/rpc/rpc-transport/rdma/src/rdma.h
+++ b/rpc/rpc-transport/rdma/src/rdma.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _XPORT_RDMA_H
@@ -29,59 +38,53 @@
 #include <list.h>
 #include <arpa/inet.h>
 #include <infiniband/verbs.h>
-#include <rdma/rdma_cma.h>
 
 /* FIXME: give appropriate values to these macros */
 #define GF_DEFAULT_RDMA_LISTEN_PORT (GF_DEFAULT_BASE_PORT + 1)
 
-/* If you are changing GF_RDMA_MAX_SEGMENTS, please make sure to update
- * GLUSTERFS_GF_RDMA_MAX_HEADER_SIZE defined in glusterfs.h .
+/* If you are changing RDMA_MAX_SEGMENTS, please make sure to update
+ * GLUSTERFS_RDMA_MAX_HEADER_SIZE defined in glusterfs.h .
  */
-#define GF_RDMA_MAX_SEGMENTS           8
+#define RDMA_MAX_SEGMENTS           8
 
-#define GF_RDMA_VERSION                1
-#define GF_RDMA_POOL_SIZE              512
+#define RDMA_VERSION                1
+#define RDMA_POOL_SIZE              512
 
-/* Additional attributes */
-#define GF_RDMA_TIMEOUT                14
-#define GF_RDMA_RETRY_CNT              7
-#define GF_RDMA_RNR_RETRY              7
-
-typedef enum gf_rdma_errcode {
+typedef enum rdma_errcode {
         ERR_VERS = 1,
         ERR_CHUNK = 2
-}gf_rdma_errcode_t;
+}rdma_errcode_t;
 
-struct gf_rdma_err_vers {
-        uint32_t gf_rdma_vers_low; /* Version range supported by peer */
-        uint32_t gf_rdma_vers_high;
+struct rdma_err_vers {
+        uint32_t rdma_vers_low; /* Version range supported by peer */
+        uint32_t rdma_vers_high;
 }__attribute__ ((packed));
-typedef struct gf_rdma_err_vers gf_rdma_err_vers_t;
-
-typedef enum gf_rdma_proc {
-        GF_RDMA_MSG   = 0,           /* An RPC call or reply msg */
-        GF_RDMA_NOMSG = 1,           /* An RPC call or reply msg - separate body */
-        GF_RDMA_MSGP  = 2,           /* An RPC call or reply msg with padding */
-        GF_RDMA_DONE  = 3,           /* Client signals reply completion */
-        GF_RDMA_ERROR = 4            /* An RPC RDMA encoding error */
-}gf_rdma_proc_t;
-
-typedef enum gf_rdma_chunktype {
-        gf_rdma_noch = 0,         /* no chunk */
-        gf_rdma_readch,           /* some argument through rdma read */
-        gf_rdma_areadch,          /* entire request through rdma read */
-        gf_rdma_writech,          /* some result through rdma write */
-        gf_rdma_replych           /* entire reply through rdma write */
-}gf_rdma_chunktype_t;
-
-/* If you are modifying __gf_rdma_header, please make sure to change
- * GLUSTERFS_GF_RDMA_MAX_HEADER_SIZE defined in glusterfs.h to reflect your changes
+typedef struct rdma_err_vers rdma_err_vers_t;
+
+typedef enum rdma_proc {
+        RDMA_MSG   = 0,           /* An RPC call or reply msg */
+        RDMA_NOMSG = 1,           /* An RPC call or reply msg - separate body */
+        RDMA_MSGP  = 2,           /* An RPC call or reply msg with padding */
+        RDMA_DONE  = 3,           /* Client signals reply completion */
+        RDMA_ERROR = 4            /* An RPC RDMA encoding error */
+}rdma_proc_t;
+
+typedef enum rdma_chunktype {
+        rdma_noch = 0,         /* no chunk */
+        rdma_readch,           /* some argument through rdma read */
+        rdma_areadch,          /* entire request through rdma read */
+        rdma_writech,          /* some result through rdma write */
+        rdma_replych           /* entire reply through rdma write */
+}rdma_chunktype_t;
+
+/* If you are modifying __rdma_header, please make sure to change
+ * GLUSTERFS_RDMA_MAX_HEADER_SIZE defined in glusterfs.h to reflect your changes
  */
-struct __gf_rdma_header {
+struct __rdma_header {
         uint32_t rm_xid;    /* Mirrors the RPC header xid */
         uint32_t rm_vers;   /* Version of this protocol */
         uint32_t rm_credit; /* Buffers requested/granted */
-        uint32_t rm_type;   /* Type of message (enum gf_rdma_proc) */
+        uint32_t rm_type;   /* Type of message (enum rdma_proc) */
         union {
                 struct {                          /* no chunks */
                         uint32_t rm_empty[3];     /* 3 empty chunk lists */
@@ -95,49 +98,49 @@ struct __gf_rdma_header {
 
                 struct {
                         uint32_t rm_type;
-                        gf_rdma_err_vers_t rm_version;
+                        rdma_err_vers_t rm_version;
                 }__attribute__ ((packed)) rm_error;
 
                 uint32_t rm_chunks[0];    /* read, write and reply chunks */
         }__attribute__ ((packed)) rm_body;
 } __attribute__((packed));
-typedef struct __gf_rdma_header gf_rdma_header_t;
+typedef struct __rdma_header rdma_header_t;
 
-/* If you are modifying __gf_rdma_segment or __gf_rdma_read_chunk, please make sure
- * to change GLUSTERFS_GF_RDMA_MAX_HEADER_SIZE defined in glusterfs.h to reflect
+/* If you are modifying __rdma_segment or __rdma_read_chunk, please make sure
+ * to change GLUSTERFS_RDMA_MAX_HEADER_SIZE defined in glusterfs.h to reflect
  * your changes.
  */
-struct __gf_rdma_segment {
+struct __rdma_segment {
         uint32_t rs_handle;       /* Registered memory handle */
         uint32_t rs_length;       /* Length of the chunk in bytes */
         uint64_t rs_offset;       /* Chunk virtual address or offset */
 } __attribute__((packed));
-typedef struct __gf_rdma_segment gf_rdma_segment_t;
+typedef struct __rdma_segment rdma_segment_t;
 
 /* read chunk(s), encoded as a linked list. */
-struct __gf_rdma_read_chunk {
+struct __rdma_read_chunk {
         uint32_t       rc_discrim;      /* 1 indicates presence */
         uint32_t       rc_position;     /* Position in XDR stream */
-        gf_rdma_segment_t rc_target;
+        rdma_segment_t rc_target;
 } __attribute__((packed));
-typedef struct __gf_rdma_read_chunk gf_rdma_read_chunk_t;
+typedef struct __rdma_read_chunk rdma_read_chunk_t;
 
 /* write chunk, and reply chunk. */
-struct __gf_rdma_write_chunk {
-        gf_rdma_segment_t wc_target;
+struct __rdma_write_chunk {
+        rdma_segment_t wc_target;
 } __attribute__((packed));
-typedef struct __gf_rdma_write_chunk gf_rdma_write_chunk_t;
+typedef struct __rdma_write_chunk rdma_write_chunk_t;
 
 /* write chunk(s), encoded as a counted array. */
-struct __gf_rdma_write_array {
+struct __rdma_write_array {
         uint32_t wc_discrim;      /* 1 indicates presence */
         uint32_t wc_nchunks;      /* Array count */
-        struct __gf_rdma_write_chunk wc_array[0];
+        struct __rdma_write_chunk wc_array[0];
 } __attribute__((packed));
-typedef struct __gf_rdma_write_array gf_rdma_write_array_t;
+typedef struct __rdma_write_array rdma_write_array_t;
 
 /* options per transport end point */
-struct __gf_rdma_options {
+struct __rdma_options {
         int32_t port;
         char *device_name;
         enum ibv_mtu mtu;
@@ -145,29 +148,26 @@ struct __gf_rdma_options {
         int32_t  recv_count;
         uint64_t recv_size;
         uint64_t send_size;
-	uint8_t  attr_timeout;
-	uint8_t  attr_retry_cnt;
-	uint8_t  attr_rnr_retry;
 };
-typedef struct __gf_rdma_options gf_rdma_options_t;
+typedef struct __rdma_options rdma_options_t;
 
-struct __gf_rdma_reply_info {
+struct __rdma_reply_info {
         uint32_t            rm_xid;      /* xid in network endian */
-        gf_rdma_chunktype_t    type;        /*
-                                          * can be either gf_rdma_replych
-                                          * or gf_rdma_writech.
+        rdma_chunktype_t    type;        /*
+                                          * can be either rdma_replych
+                                          * or rdma_writech.
                                           */
-        gf_rdma_write_array_t *wc_array;
+        rdma_write_array_t *wc_array;
         struct mem_pool    *pool;
 };
-typedef struct __gf_rdma_reply_info gf_rdma_reply_info_t;
+typedef struct __rdma_reply_info rdma_reply_info_t;
 
-struct __gf_rdma_ioq {
+struct __rdma_ioq {
         union {
                 struct list_head list;
                 struct {
-                        struct __gf_rdma_ioq    *next;
-                        struct __gf_rdma_ioq    *prev;
+                        struct __rdma_ioq    *next;
+                        struct __rdma_ioq    *prev;
                 };
         };
 
@@ -182,8 +182,8 @@ struct __gf_rdma_ioq {
         struct iobref     *iobref;
 
         union {
-                struct __gf_rdma_ioq_request {
-                        /* used to build reply_chunk for GF_RDMA_NOMSG type msgs */
+                struct __rdma_ioq_request {
+                        /* used to build reply_chunk for RDMA_NOMSG type msgs */
                         struct iovec rsphdr_vec[MAX_IOVEC];
                         int          rsphdr_count;
 
@@ -200,183 +200,205 @@ struct __gf_rdma_ioq {
                         struct iobref  *rsp_iobref;
                 }request;
 
-                gf_rdma_reply_info_t  *reply_info;
+                rdma_reply_info_t  *reply_info;
         }msg;
 
         struct mem_pool *pool;
 };
-typedef struct __gf_rdma_ioq gf_rdma_ioq_t;
+typedef struct __rdma_ioq rdma_ioq_t;
 
-typedef enum __gf_rdma_send_post_type {
-        GF_RDMA_SEND_POST_NO_CHUNKLIST,    /* post which is sent using rdma-send
+typedef enum __rdma_send_post_type {
+        RDMA_SEND_POST_NO_CHUNKLIST,    /* post which is sent using rdma-send
                                          * and the msg carries no
                                          * chunklists.
                                          */
-        GF_RDMA_SEND_POST_READ_CHUNKLIST,  /* post which is sent using rdma-send
+        RDMA_SEND_POST_READ_CHUNKLIST,  /* post which is sent using rdma-send
                                          * and the msg carries only read
                                          * chunklist.
                                          */
-        GF_RDMA_SEND_POST_WRITE_CHUNKLIST, /* post which is sent using
+        RDMA_SEND_POST_WRITE_CHUNKLIST, /* post which is sent using
                                          * rdma-send and the msg carries
                                          * only write chunklist.
                                          */
-        GF_RDMA_SEND_POST_READ_WRITE_CHUNKLIST, /* post which is sent using
+        RDMA_SEND_POST_READ_WRITE_CHUNKLIST, /* post which is sent using
                                               * rdma-send and the msg
                                               * carries both read and
                                               * write chunklists.
                                               */
-        GF_RDMA_SEND_POST_GF_RDMA_READ,              /* RDMA read */
-        GF_RDMA_SEND_POST_GF_RDMA_WRITE,             /* RDMA write */
-}gf_rdma_send_post_type_t;
+        RDMA_SEND_POST_RDMA_READ,              /* RDMA read */
+        RDMA_SEND_POST_RDMA_WRITE,             /* RDMA write */
+}rdma_send_post_type_t;
 
 /* represents one communication peer, two per transport_t */
-struct __gf_rdma_peer {
-        rpc_transport_t   *trans;
-        struct rdma_cm_id *cm_id;
-        struct ibv_qp     *qp;
-        pthread_t          rdma_event_thread;
-        char               quota_set;
+struct __rdma_peer {
+        rpc_transport_t *trans;
+        struct ibv_qp *qp;
 
         int32_t recv_count;
         int32_t send_count;
         int32_t recv_size;
         int32_t send_size;
 
-        int32_t                        quota;
+        int32_t quota;
         union {
-                struct list_head       ioq;
+                struct list_head     ioq;
                 struct {
-                        gf_rdma_ioq_t *ioq_next;
-                        gf_rdma_ioq_t *ioq_prev;
+                        rdma_ioq_t        *ioq_next;
+                        rdma_ioq_t        *ioq_prev;
                 };
         };
 
         /* QP attributes, needed to connect with remote QP */
-        int32_t               local_lid;
-        int32_t               local_psn;
-        int32_t               local_qpn;
-        int32_t               remote_lid;
-        int32_t               remote_psn;
-        int32_t               remote_qpn;
+        int32_t local_lid;
+        int32_t local_psn;
+        int32_t local_qpn;
+        int32_t remote_lid;
+        int32_t remote_psn;
+        int32_t remote_qpn;
 };
-typedef struct __gf_rdma_peer gf_rdma_peer_t;
+typedef struct __rdma_peer rdma_peer_t;
 
-struct __gf_rdma_post_context {
-        struct ibv_mr     *mr[GF_RDMA_MAX_SEGMENTS];
+struct __rdma_post_context {
+        struct ibv_mr     *mr[RDMA_MAX_SEGMENTS];
         int                mr_count;
         struct iovec       vector[MAX_IOVEC];
         int                count;
         struct iobref     *iobref;
         struct iobuf      *hdr_iobuf;
         char               is_request;
-        int                gf_rdma_reads;
-        gf_rdma_reply_info_t *reply_info;
+        int                rdma_reads;
+        rdma_reply_info_t *reply_info;
 };
-typedef struct __gf_rdma_post_context gf_rdma_post_context_t;
+typedef struct __rdma_post_context rdma_post_context_t;
 
 typedef enum {
-        GF_RDMA_SEND_POST,
-        GF_RDMA_RECV_POST
-} gf_rdma_post_type_t;
+        RDMA_SEND_POST,
+        RDMA_RECV_POST
+} rdma_post_type_t;
 
-struct __gf_rdma_post {
-        struct __gf_rdma_post *next, *prev;
+struct __rdma_post {
+        struct __rdma_post *next, *prev;
         struct ibv_mr *mr;
         char *buf;
         int32_t buf_size;
         char aux;
         int32_t reused;
-        struct __gf_rdma_device  *device;
-        gf_rdma_post_type_t      type;
-        gf_rdma_post_context_t   ctx;
+        struct __rdma_device  *device;
+        rdma_post_type_t      type;
+        rdma_post_context_t   ctx;
         int                   refcount;
         pthread_mutex_t       lock;
 };
-typedef struct __gf_rdma_post gf_rdma_post_t;
+typedef struct __rdma_post rdma_post_t;
 
-struct __gf_rdma_queue {
-        gf_rdma_post_t active_posts, passive_posts;
+struct __rdma_queue {
+        rdma_post_t active_posts, passive_posts;
         int32_t active_count, passive_count;
         pthread_mutex_t lock;
 };
-typedef struct __gf_rdma_queue gf_rdma_queue_t;
+typedef struct __rdma_queue rdma_queue_t;
 
-struct __gf_rdma_qpreg {
+struct __rdma_qpreg {
         pthread_mutex_t lock;
         int32_t count;
         struct _qpent {
                 struct _qpent *next, *prev;
                 int32_t qp_num;
-                gf_rdma_peer_t *peer;
+                rdma_peer_t *peer;
         } ents[42];
 };
-typedef struct __gf_rdma_qpreg gf_rdma_qpreg_t;
+typedef struct __rdma_qpreg rdma_qpreg_t;
 
 /* context per device, stored in global glusterfs_ctx_t->ib */
-struct __gf_rdma_device {
-        struct __gf_rdma_device *next;
+struct __rdma_device {
+        struct __rdma_device *next;
         const char *device_name;
         struct ibv_context *context;
         int32_t port;
         struct ibv_pd *pd;
         struct ibv_srq *srq;
-        gf_rdma_qpreg_t qpreg;
+        rdma_qpreg_t qpreg;
         struct ibv_comp_channel *send_chan, *recv_chan;
         struct ibv_cq *send_cq, *recv_cq;
-        gf_rdma_queue_t sendq, recvq;
-        pthread_t send_thread, recv_thread, async_event_thread;
+        rdma_queue_t sendq, recvq;
+        pthread_t send_thread, recv_thread;
         struct mem_pool *request_ctx_pool;
         struct mem_pool *ioq_pool;
         struct mem_pool *reply_info_pool;
 };
-typedef struct __gf_rdma_device gf_rdma_device_t;
+typedef struct __rdma_device rdma_device_t;
 
-struct __gf_rdma_ctx {
-        gf_rdma_device_t          *device;
-        struct rdma_event_channel *rdma_cm_event_channel;
-        pthread_t                  rdma_cm_thread;
+typedef enum {
+        RDMA_HANDSHAKE_START = 0,
+        RDMA_HANDSHAKE_SENDING_DATA,
+        RDMA_HANDSHAKE_RECEIVING_DATA,
+        RDMA_HANDSHAKE_SENT_DATA,
+        RDMA_HANDSHAKE_RECEIVED_DATA,
+        RDMA_HANDSHAKE_SENDING_ACK,
+        RDMA_HANDSHAKE_RECEIVING_ACK,
+        RDMA_HANDSHAKE_RECEIVED_ACK,
+        RDMA_HANDSHAKE_COMPLETE,
+} rdma_handshake_state_t;
+
+struct rdma_nbio {
+        int state;
+        char *buf;
+        int count;
+        struct iovec vector;
+        struct iovec *pending_vector;
+        int pending_count;
 };
-typedef struct __gf_rdma_ctx gf_rdma_ctx_t;
 
-struct __gf_rdma_request_context {
-        struct ibv_mr   *mr[GF_RDMA_MAX_SEGMENTS];
+struct __rdma_request_context {
+        struct ibv_mr   *mr[RDMA_MAX_SEGMENTS];
         int              mr_count;
         struct mem_pool *pool;
-        gf_rdma_peer_t     *peer;
+        rdma_peer_t     *peer;
         struct iobref   *iobref;
         struct iobref   *rsp_iobref;
 };
-typedef struct __gf_rdma_request_context gf_rdma_request_context_t;
-
-typedef enum {
-        GF_RDMA_SERVER_LISTENER,
-        GF_RDMA_SERVER,
-        GF_RDMA_CLIENT,
-} gf_rdma_transport_entity_t;
-
-struct __gf_rdma_private {
-        int32_t        idx;
-        unsigned char  connected;
-        in_addr_t      addr;
+typedef struct __rdma_request_context rdma_request_context_t;
+
+struct __rdma_private {
+        int32_t sock;
+        int32_t idx;
+        unsigned char connected;
+        unsigned char tcp_connected;
+        unsigned char ib_connected;
+        in_addr_t addr;
         unsigned short port;
 
         /* IB Verbs Driver specific variables, pointers */
-        gf_rdma_peer_t           peer;
-        struct __gf_rdma_device *device;
-        gf_rdma_options_t        options;
+        rdma_peer_t peer;
+        struct __rdma_device *device;
+        rdma_options_t options;
 
         /* Used by trans->op->receive */
-        char    *data_ptr;
-        int32_t  data_offset;
-        int32_t  data_len;
+        char *data_ptr;
+        int32_t data_offset;
+        int32_t data_len;
 
         /* Mutex */
-        pthread_mutex_t             write_mutex;
-        rpc_transport_t            *listener;
-        pthread_mutex_t             recv_mutex;
-        pthread_cond_t              recv_cond;
-        gf_rdma_transport_entity_t  entity;
+        pthread_mutex_t read_mutex;
+        pthread_mutex_t write_mutex;
+        pthread_barrier_t handshake_barrier;
+        char handshake_ret;
+        char is_server;
+        rpc_transport_t *listener;
+
+        pthread_mutex_t recv_mutex;
+        pthread_cond_t  recv_cond;
+
+        /* used during rdma_handshake */
+        struct {
+                struct rdma_nbio incoming;
+                struct rdma_nbio outgoing;
+                int               state;
+                rdma_header_t header;
+                char *buf;
+                size_t size;
+        } handshake;
 };
-typedef struct __gf_rdma_private    gf_rdma_private_t;
+typedef struct __rdma_private rdma_private_t;
 
-#endif /* _XPORT_GF_RDMA_H */
+#endif /* _XPORT_RDMA_H */
diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
index 71e6ed6ff..2c918c7e3 100644
--- a/rpc/rpc-transport/socket/src/Makefile.am
+++ b/rpc/rpc-transport/socket/src/Makefile.am
@@ -3,15 +3,13 @@ noinst_HEADERS = socket.h name.h
 rpctransport_LTLIBRARIES = socket.la
 rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
 
-socket_la_LDFLAGS = -module -avoid-version
+socket_la_LDFLAGS = -module -avoidversion
 
 socket_la_SOURCES = socket.c name.c
-socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl
+socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) \
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
 	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
-	-I$(top_srcdir)/rpc/xdr/src/
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
+	-I$(top_srcdir)/rpc/xdr/src/ -shared -nostartfiles $(GF_CFLAGS)
 
 CLEANFILES = *~
diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c
index 1647d5b6b..a739583d7 100644
--- a/rpc/rpc-transport/socket/src/name.c
+++ b/rpc/rpc-transport/socket/src/name.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <sys/types.h>
@@ -15,13 +24,18 @@
 #include <netdb.h>
 #include <string.h>
 
+#ifdef CLIENT_PORT_CEILING
+#undef CLIENT_PORT_CEILING
+#endif
+
+#define CLIENT_PORT_CEILING 1024
+
 #ifndef AF_INET_SDP
 #define AF_INET_SDP 27
 #endif
 
 #include "rpc-transport.h"
 #include "socket.h"
-#include "common-utils.h"
 
 int32_t
 gf_resolve_ip6 (const char *hostname,
@@ -34,17 +48,9 @@ static int32_t
 af_inet_bind_to_port_lt_ceiling (int fd, struct sockaddr *sockaddr,
                                  socklen_t sockaddr_len, int ceiling)
 {
-        int32_t        ret        = -1;
-        uint16_t      port        = ceiling - 1;
-        // by default assume none of the ports are blocked and all are available
-        gf_boolean_t  ports[1024] = {_gf_false,};
-        int           i           = 0;
-
-        ret = gf_process_reserved_ports (ports);
-        if (ret != 0) {
-                for (i = 0; i < 1024; i++)
-                        ports[i] = _gf_false;
-        }
+        int32_t ret = -1;
+        /*  struct sockaddr_in sin = {0, }; */
+        uint16_t port = ceiling - 1;
 
         while (port)
         {
@@ -59,11 +65,7 @@ af_inet_bind_to_port_lt_ceiling (int fd, struct sockaddr *sockaddr,
                         ((struct sockaddr_in *)sockaddr)->sin_port = htons (port);
                         break;
                 }
-                // ignore the reserved ports
-                if (ports[port] == _gf_true) {
-                        port--;
-                        continue;
-                }
+
                 ret = bind (fd, sockaddr, sockaddr_len);
 
                 if (ret == 0)
@@ -93,7 +95,7 @@ af_unix_client_bind (rpc_transport_t *this,
                 char *path = data_to_str (path_data);
                 if (!path || strlen (path) > UNIX_PATH_MAX) {
                         gf_log (this->name, GF_LOG_TRACE,
-                                "bind-path not specified for unix socket, "
+                                "bind-path not specfied for unix socket, "
                                 "letting connect to assign default value");
                         goto err;
                 }
@@ -109,7 +111,7 @@ af_unix_client_bind (rpc_transport_t *this,
                 }
         } else {
                 gf_log (this->name, GF_LOG_TRACE,
-                        "bind-path not specified for unix socket, "
+                        "bind-path not specfied for unix socket, "
                         "letting connect to assign default value");
         }
 
@@ -140,24 +142,24 @@ client_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family)
                 if (!(remote_host_data || connect_path_data) ||
                     (remote_host_data && connect_path_data)) {
                         gf_log (this->name, GF_LOG_ERROR,
-                                "transport.address-family not specified. "
-                                "Could not guess default value from (remote-host:%s or "
-                                "transport.unix.connect-path:%s) options",
+                                "transport.address-family not specified and "
+                                "not able to determine the "
+                                "same from other options (remote-host:%s and "
+                                "transport.unix.connect-path:%s)",
                                 data_to_str (remote_host_data),
                                 data_to_str (connect_path_data));
-                        *sa_family = AF_UNSPEC;
                         goto out;
                 }
 
                 if (remote_host_data) {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "address-family not specified, guessing it "
-                                "to be inet from (remote-host: %s)", data_to_str (remote_host_data));
-                        *sa_family = AF_INET;
+                                "to be inet/inet6");
+                        *sa_family = AF_UNSPEC;
                 } else {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "address-family not specified, guessing it "
-                                "to be unix from (transport.unix.connect-path: %s)", data_to_str (connect_path_data));
+                                "to be unix");
                         *sa_family = AF_UNIX;
                 }
 
@@ -171,11 +173,13 @@ client_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family)
                         *sa_family = AF_INET6;
                 } else if (!strcasecmp (address_family, "inet-sdp")) {
                         *sa_family = AF_INET_SDP;
+                } else if (!strcasecmp (address_family, "inet/inet6")
+                           || !strcasecmp (address_family, "inet6/inet")) {
+                        *sa_family = AF_UNSPEC;
                 } else {
                         gf_log (this->name, GF_LOG_ERROR,
                                 "unknown address-family (%s) specified",
                                 address_family);
-                        *sa_family = AF_UNSPEC;
                         goto out;
                 }
         }
@@ -351,7 +355,7 @@ af_inet_server_get_local_sockaddr (rpc_transport_t *this,
                                    struct sockaddr *addr,
                                    socklen_t *addr_len)
 {
-        struct addrinfo hints, *res = 0, *rp = NULL;
+        struct addrinfo hints, *res = 0;
         data_t *listen_port_data = NULL, *listen_host_data = NULL;
         uint16_t listen_port = -1;
         char service[NI_MAXSERV], *listen_host = NULL;
@@ -397,7 +401,7 @@ af_inet_server_get_local_sockaddr (rpc_transport_t *this,
         memset (&hints, 0, sizeof (hints));
         hints.ai_family = addr->sa_family;
         hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags    = AI_PASSIVE | AI_ADDRCONFIG;
+        hints.ai_flags    = AI_ADDRCONFIG | AI_PASSIVE;
 
         ret = getaddrinfo(listen_host, service, &hints, &res);
         if (ret != 0) {
@@ -407,20 +411,9 @@ af_inet_server_get_local_sockaddr (rpc_transport_t *this,
                 ret = -1;
                 goto out;
         }
-        /* IPV6 server can handle both ipv4 and ipv6 clients */
-        for (rp = res; rp != NULL; rp = rp->ai_next) {
-                if (rp->ai_addr == NULL)
-                        continue;
-                if (rp->ai_family == AF_INET6) {
-                        memcpy (addr, rp->ai_addr, rp->ai_addrlen);
-                        *addr_len = rp->ai_addrlen;
-                }
-        }
 
-        if (!(*addr_len)) {
-                memcpy (addr, res->ai_addr, res->ai_addrlen);
-                *addr_len = res->ai_addrlen;
-        }
+        memcpy (addr, res->ai_addr, res->ai_addrlen);
+        *addr_len = res->ai_addrlen;
 
         freeaddrinfo (res);
 
@@ -444,14 +437,14 @@ client_bind (rpc_transport_t *this,
                 *sockaddr_len = sizeof (struct sockaddr_in);
 
         case AF_INET6:
-                if (!this->bind_insecure) {
+                if (!this->client_bind_insecure) {
                         ret = af_inet_bind_to_port_lt_ceiling (sock, sockaddr,
-                                                       *sockaddr_len, GF_CLIENT_PORT_CEILING);
+                                                       *sockaddr_len, CLIENT_PORT_CEILING);
                 }
                 if (ret == -1) {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "cannot bind inet socket (%d) to port less than %d (%s)",
-                                sock, GF_CLIENT_PORT_CEILING, strerror (errno));
+                                sock, CLIENT_PORT_CEILING, strerror (errno));
                         ret = 0;
                 }
                 break;
@@ -546,16 +539,18 @@ server_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family)
                         *sa_family = AF_INET_SDP;
                 } else if (!strcasecmp (address_family, "unix")) {
                         *sa_family = AF_UNIX;
+                } else if (!strcasecmp (address_family, "inet/inet6")
+                           || !strcasecmp (address_family, "inet6/inet")) {
+                        *sa_family = AF_UNSPEC;
                 } else {
                         gf_log (this->name, GF_LOG_ERROR,
                                 "unknown address family (%s) specified", address_family);
-                        *sa_family = AF_UNSPEC;
                         goto out;
                 }
         } else {
                 gf_log (this->name, GF_LOG_DEBUG,
-                        "option address-family not specified, defaulting to inet");
-                *sa_family = AF_INET;
+                        "option address-family not specified, defaulting to inet/inet6");
+                *sa_family = AF_UNSPEC;
         }
 
         ret = 0;
@@ -609,7 +604,7 @@ int32_t
 fill_inet6_inet_identifiers (rpc_transport_t *this, struct sockaddr_storage *addr,
                              int32_t addr_len, char *identifier)
 {
-        union gf_sock_union sock_union;
+        struct sockaddr_storage tmpaddr;
 
         char    service[NI_MAXSERV] = {0,};
         char    host[NI_MAXHOST]    = {0,};
@@ -621,26 +616,26 @@ fill_inet6_inet_identifiers (rpc_transport_t *this, struct sockaddr_storage *add
         int16_t eight_to_ten        = 0;
         int16_t ten_to_twelve       = 0;
 
-        memset (&sock_union, 0, sizeof (sock_union));
-        sock_union.storage = *addr;
+        memset (&tmpaddr, 0, sizeof (tmpaddr));
+        tmpaddr = *addr;
         tmpaddr_len = addr_len;
 
-        if (sock_union.sa.sa_family == AF_INET6) {
-                one_to_four = sock_union.sin6.sin6_addr.s6_addr32[0];
-                four_to_eight = sock_union.sin6.sin6_addr.s6_addr32[1];
+        if (((struct sockaddr *) &tmpaddr)->sa_family == AF_INET6) {
+                one_to_four = ((struct sockaddr_in6 *) &tmpaddr)->sin6_addr.s6_addr32[0];
+                four_to_eight = ((struct sockaddr_in6 *) &tmpaddr)->sin6_addr.s6_addr32[1];
 #ifdef GF_SOLARIS_HOST_OS
-                eight_to_ten = S6_ADDR16(sock_union.sin6.sin6_addr)[4];
+                eight_to_ten = S6_ADDR16(((struct sockaddr_in6 *) &tmpaddr)->sin6_addr)[4];
 #else
-                eight_to_ten = sock_union.sin6.sin6_addr.s6_addr16[4];
+                eight_to_ten = ((struct sockaddr_in6 *) &tmpaddr)->sin6_addr.s6_addr16[4];
 #endif
 
 #ifdef GF_SOLARIS_HOST_OS
-                ten_to_twelve = S6_ADDR16(sock_union.sin6.sin6_addr)[5];
+                ten_to_twelve = S6_ADDR16(((struct sockaddr_in6 *) &tmpaddr)->sin6_addr)[5];
 #else
-                ten_to_twelve = sock_union.sin6.sin6_addr.s6_addr16[5];
+                ten_to_twelve = ((struct sockaddr_in6 *) &tmpaddr)->sin6_addr.s6_addr16[5];
 #endif
 
-                twelve_to_sixteen = sock_union.sin6.sin6_addr.s6_addr32[3];
+                twelve_to_sixteen = ((struct sockaddr_in6 *) &tmpaddr)->sin6_addr.s6_addr32[3];
 
                 /* ipv4 mapped ipv6 address has
                    bits 0-80: 0
@@ -652,8 +647,8 @@ fill_inet6_inet_identifiers (rpc_transport_t *this, struct sockaddr_storage *add
                     four_to_eight == 0 &&
                     eight_to_ten == 0 &&
                     ten_to_twelve == -1) {
-                        struct sockaddr_in *in_ptr = &sock_union.sin;
-                        memset (&sock_union, 0, sizeof (sock_union));
+                        struct sockaddr_in *in_ptr = (struct sockaddr_in *)&tmpaddr;
+                        memset (&tmpaddr, 0, sizeof (tmpaddr));
 
                         in_ptr->sin_family = AF_INET;
                         in_ptr->sin_port = ((struct sockaddr_in6 *)addr)->sin6_port;
@@ -662,7 +657,7 @@ fill_inet6_inet_identifiers (rpc_transport_t *this, struct sockaddr_storage *add
                 }
         }
 
-        ret = getnameinfo (&sock_union.sa,
+        ret = getnameinfo ((struct sockaddr *) &tmpaddr,
                            tmpaddr_len,
                            host, sizeof (host),
                            service, sizeof (service),
diff --git a/rpc/rpc-transport/socket/src/name.h b/rpc/rpc-transport/socket/src/name.h
index 0a13d8a96..0ca67d2e4 100644
--- a/rpc/rpc-transport/socket/src/name.h
+++ b/rpc/rpc-transport/socket/src/name.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SOCKET_NAME_H
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 93da3f296..0aa8c0e39 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -28,408 +37,104 @@
 /* ugly #includes below */
 #include "protocol-common.h"
 #include "glusterfs3-xdr.h"
-#include "xdr-nfs3.h"
-#include "rpcsvc.h"
+#include "glusterfs3.h"
 
 #include <fcntl.h>
 #include <errno.h>
 #include <netinet/tcp.h>
 #include <rpc/xdr.h>
-#include <sys/ioctl.h>
+
 #define GF_LOG_ERRNO(errno) ((errno == ENOTCONN) ? GF_LOG_DEBUG : GF_LOG_ERROR)
 #define SA(ptr) ((struct sockaddr *)ptr)
 
-#define SSL_ENABLED_OPT     "transport.socket.ssl-enabled"
-#define SSL_OWN_CERT_OPT    "transport.socket.ssl-own-cert"
-#define SSL_PRIVATE_KEY_OPT "transport.socket.ssl-private-key"
-#define SSL_CA_LIST_OPT     "transport.socket.ssl-ca-list"
-#define OWN_THREAD_OPT      "transport.socket.own-thread"
-
-/* TBD: do automake substitutions etc. (ick) to set these. */
-#if !defined(DEFAULT_CERT_PATH)
-#define DEFAULT_CERT_PATH   "/etc/ssl/glusterfs.pem"
-#endif
-#if !defined(DEFAULT_KEY_PATH)
-#define DEFAULT_KEY_PATH    "/etc/ssl/glusterfs.key"
-#endif
-#if !defined(DEFAULT_CA_PATH)
-#define DEFAULT_CA_PATH     "/etc/ssl/glusterfs.ca"
-#endif
-
-#define POLL_MASK_INPUT  (POLLIN | POLLPRI)
-#define POLL_MASK_OUTPUT (POLLOUT)
-#define POLL_MASK_ERROR  (POLLERR | POLLHUP | POLLNVAL)
 
-typedef int SSL_unary_func (SSL *);
-typedef int SSL_trinary_func (SSL *, void *, int);
-
-#define __socket_proto_reset_pending(priv) do {                         \
-                struct gf_sock_incoming_frag *frag;                     \
-                frag = &priv->incoming.frag;                            \
-                                                                        \
-                memset (&frag->vector, 0, sizeof (frag->vector));       \
-                frag->pending_vector = &frag->vector;                   \
-                frag->pending_vector->iov_base = frag->fragcurrent;     \
-                priv->incoming.pending_vector =  frag->pending_vector;  \
-        } while (0)
+#define __socket_proto_reset_pending(priv) do {                 \
+                memset (&priv->incoming.frag.vector, 0,         \
+                        sizeof (priv->incoming.frag.vector));   \
+                priv->incoming.frag.pending_vector =            \
+                        &priv->incoming.frag.vector;            \
+                priv->incoming.frag.pending_vector->iov_base =  \
+                        priv->incoming.frag.fragcurrent;        \
+                priv->incoming.pending_vector =                 \
+                        priv->incoming.frag.pending_vector;     \
+        } while (0);
 
 
 #define __socket_proto_update_pending(priv)                             \
         do {                                                            \
-                uint32_t remaining;                                     \
-                struct gf_sock_incoming_frag *frag;                     \
-                frag = &priv->incoming.frag;                            \
-                if (frag->pending_vector->iov_len == 0) {               \
-                        remaining = (RPC_FRAGSIZE (priv->incoming.fraghdr) \
-                                     - frag->bytes_read);               \
+                uint32_t remaining_fragsize = 0;                        \
+                if (priv->incoming.frag.pending_vector->iov_len == 0) { \
+                        remaining_fragsize = RPC_FRAGSIZE (priv->incoming.fraghdr) \
+                                - priv->incoming.frag.bytes_read;       \
                                                                         \
-                        frag->pending_vector->iov_len =                 \
-                                (remaining > frag->remaining_size)      \
-                                ? frag->remaining_size : remaining;     \
+                        priv->incoming.frag.pending_vector->iov_len =   \
+                                remaining_fragsize > priv->incoming.frag.remaining_size \
+                                ? priv->incoming.frag.remaining_size : remaining_fragsize; \
                                                                         \
-                        frag->remaining_size -=                         \
-                                frag->pending_vector->iov_len;          \
+                        priv->incoming.frag.remaining_size -=           \
+                                priv->incoming.frag.pending_vector->iov_len; \
                 }                                                       \
-        } while (0)
+        } while (0);
 
 #define __socket_proto_update_priv_after_read(priv, ret, bytes_read)    \
         {                                                               \
-                struct gf_sock_incoming_frag *frag;                     \
-                frag = &priv->incoming.frag;                            \
+                priv->incoming.frag.fragcurrent += bytes_read;          \
+                priv->incoming.frag.bytes_read += bytes_read;           \
                                                                         \
-                frag->fragcurrent += bytes_read;                        \
-                frag->bytes_read += bytes_read;                         \
-                                                                        \
-                if ((ret > 0) || (frag->remaining_size != 0)) {         \
-                        if (frag->remaining_size != 0 && ret == 0) {    \
+                if ((ret > 0) || (priv->incoming.frag.remaining_size != 0)) { \
+                        if (priv->incoming.frag.remaining_size != 0) {  \
                                 __socket_proto_reset_pending (priv);    \
                         }                                               \
                                                                         \
-                        gf_log (this->name, GF_LOG_TRACE,               \
-                                "partial read on non-blocking socket"); \
+                        gf_log (this->name, GF_LOG_TRACE, "partial read on non-blocking socket"); \
                                                                         \
                         break;                                          \
                 }                                                       \
         }
 
-#define __socket_proto_init_pending(priv,size)                          \
+#define __socket_proto_init_pending(priv, size)                         \
         do {                                                            \
-            uint32_t remaining = 0;                                     \
-            struct gf_sock_incoming_frag *frag;                         \
-            frag = &priv->incoming.frag;                                \
-                                                                        \
-            remaining = (RPC_FRAGSIZE (priv->incoming.fraghdr)          \
-                         - frag->bytes_read);                           \
+                uint32_t remaining_fragsize = 0;                        \
+                remaining_fragsize = RPC_FRAGSIZE (priv->incoming.fraghdr) \
+                        - priv->incoming.frag.bytes_read;               \
                                                                         \
-            __socket_proto_reset_pending (priv);                        \
+                __socket_proto_reset_pending (priv);                    \
                                                                         \
-            frag->pending_vector->iov_len =                             \
-                    (remaining > size) ? size : remaining;              \
+                priv->incoming.frag.pending_vector->iov_len =           \
+                        remaining_fragsize > size ? size : remaining_fragsize; \
                                                                         \
-            frag->remaining_size = (size - frag->pending_vector->iov_len); \
+                priv->incoming.frag.remaining_size =                    \
+                        size - priv->incoming.frag.pending_vector->iov_len; \
                                                                         \
-            } while(0)
+        } while (0);
 
 
 /* This will be used in a switch case and breaks from the switch case if all
  * the pending data is not read.
  */
 #define __socket_proto_read(priv, ret)                                  \
-                {                                                       \
+        {                                                               \
                 size_t bytes_read = 0;                                  \
-                struct gf_sock_incoming *in;                            \
-                in = &priv->incoming;                                   \
                                                                         \
                 __socket_proto_update_pending (priv);                   \
                                                                         \
                 ret = __socket_readv (this,                             \
-                                      in->pending_vector, 1,            \
-                                      &in->pending_vector,              \
-                                      &in->pending_count,               \
+                                      priv->incoming.pending_vector, 1, \
+                                      &priv->incoming.pending_vector,   \
+                                      &priv->incoming.pending_count,    \
                                       &bytes_read);                     \
-                if (ret == -1)                                          \
+                if (ret == -1) {                                        \
+                        gf_log (this->name, GF_LOG_WARNING,             \
+                                "reading from socket failed. Error (%s), " \
+                                "peer (%s)", strerror (errno),          \
+                                this->peerinfo.identifier);             \
                         break;                                          \
+                }                                                       \
                 __socket_proto_update_priv_after_read (priv, ret, bytes_read); \
         }
 
-static int socket_init (rpc_transport_t *this);
-
-static void
-ssl_dump_error_stack (const char *caller)
-{
-	unsigned long  errnum = 0;
-	char           errbuf[120] = {0,};
-
-	/* OpenSSL docs explicitly give 120 as the error-string length. */
-
-	while ((errnum = ERR_get_error())) {
-		ERR_error_string(errnum,errbuf);
-		gf_log(caller,GF_LOG_ERROR,"  %s",errbuf);
-	}
-}
-
-static int
-ssl_do (rpc_transport_t *this, void *buf, size_t len, SSL_trinary_func *func)
-{
-	int               r = (-1);
-	struct pollfd     pfd = {-1,};
-	socket_private_t *priv = NULL;
-
-	GF_VALIDATE_OR_GOTO(this->name,this->private,out);
-	priv = this->private;
-
-	for (;;) {
-		if (buf) {
-                        if (priv->connected == -1) {
-                                /*
-                                 * Fields in the SSL structure (especially
-                                 * the BIO pointers) are not valid at this
-                                 * point, so we'll segfault if we pass them
-                                 * to SSL_read/SSL_write.
-                                 */
-                                gf_log(this->name,GF_LOG_INFO,
-                                       "lost connection in %s", __func__);
-                                break;
-                        }
-			r = func(priv->ssl_ssl,buf,len);
-		}
-		else {
-                        /*
-                         * We actually need these functions to get to
-                         * priv->connected == 1.
-                         */
-			r = ((SSL_unary_func *)func)(priv->ssl_ssl);
-		}
-		switch (SSL_get_error(priv->ssl_ssl,r)) {
-		case SSL_ERROR_NONE:
-			return r;
-		case SSL_ERROR_WANT_READ:
-			pfd.fd = priv->sock;
-			pfd.events = POLLIN;
-			if (poll(&pfd,1,-1) < 0) {
-				gf_log(this->name,GF_LOG_ERROR,"poll error %d",
-				       errno);
-			}
-			break;
-		case SSL_ERROR_WANT_WRITE:
-			pfd.fd = priv->sock;
-			pfd.events = POLLOUT;
-			if (poll(&pfd,1,-1) < 0) {
-				gf_log(this->name,GF_LOG_ERROR,"poll error %d",
-				       errno);
-			}
-			break;
-		case SSL_ERROR_SYSCALL:
-			/* This is what we get when remote disconnects. */
-			gf_log(this->name,GF_LOG_DEBUG,
-			       "syscall error (probably remote disconnect)");
-			errno = ENODATA;
-			goto out;
-		default:
-			errno = EIO;
-			goto out;	/* "break" would just loop again */
-		}
-	}
-out:
-	return -1;
-}
-
-#define ssl_connect_one(t)   ssl_do((t),NULL,0,(SSL_trinary_func *)SSL_connect)
-#define ssl_accept_one(t)    ssl_do((t),NULL,0,(SSL_trinary_func *)SSL_accept)
-#define ssl_read_one(t,b,l)  ssl_do((t),(b),(l),(SSL_trinary_func *)SSL_read)
-#define ssl_write_one(t,b,l) ssl_do((t),(b),(l),(SSL_trinary_func *)SSL_write)
-
-static int
-ssl_setup_connection (rpc_transport_t *this, int server)
-{
-	X509             *peer = NULL;
-	char              peer_CN[256] = "";
-	int               ret = -1;
-	socket_private_t *priv = NULL;
-
-	GF_VALIDATE_OR_GOTO(this->name,this->private,done);
-	priv = this->private;
-
-	priv->ssl_ssl = SSL_new(priv->ssl_ctx);
-	if (!priv->ssl_ssl) {
-		gf_log(this->name,GF_LOG_ERROR,"SSL_new failed");
-		ssl_dump_error_stack(this->name);
-		goto done;
-	}
-	priv->ssl_sbio = BIO_new_socket(priv->sock,BIO_NOCLOSE);
-	if (!priv->ssl_sbio) {
-		gf_log(this->name,GF_LOG_ERROR,"BIO_new_socket failed");
-		ssl_dump_error_stack(this->name);
-		goto free_ssl;
-	}
-	SSL_set_bio(priv->ssl_ssl,priv->ssl_sbio,priv->ssl_sbio);
-
-	if (server) {
-		ret = ssl_accept_one(this);
-	}
-	else {
-		ret = ssl_connect_one(this);
-	}
-
-	/* Make sure _the call_ succeeded. */
-	if (ret < 0) {
-		goto ssl_error;
-	}
-
-	/* Make sure _SSL verification_ succeeded, yielding an identity. */
-	if (SSL_get_verify_result(priv->ssl_ssl) != X509_V_OK) {
-		goto ssl_error;
-	}
-	peer = SSL_get_peer_certificate(priv->ssl_ssl);
-	if (!peer) {
-		goto ssl_error;
-	}
-
-	/* Finally, everything seems OK. */
-	X509_NAME_get_text_by_NID(X509_get_subject_name(peer),
-		NID_commonName, peer_CN, sizeof(peer_CN)-1);
-	peer_CN[sizeof(peer_CN)-1] = '\0';
-	gf_log(this->name,GF_LOG_INFO,"peer CN = %s", peer_CN);
-	return 0;
-
-	/* Error paths. */
-ssl_error:
-	gf_log(this->name,GF_LOG_ERROR,"SSL connect error");
-	ssl_dump_error_stack(this->name);
-free_ssl:
-	SSL_free(priv->ssl_ssl);
-        priv->ssl_ssl = NULL;
-done:
-	return ret;
-}
-
-
-static void
-ssl_teardown_connection (socket_private_t *priv)
-{
-        SSL_shutdown(priv->ssl_ssl);
-        SSL_clear(priv->ssl_ssl);
-        SSL_free(priv->ssl_ssl);
-        priv->ssl_ssl = NULL;
-}
-
-
-static ssize_t
-__socket_ssl_readv (rpc_transport_t *this, struct iovec *opvector, int opcount)
-{
-	socket_private_t    *priv = NULL;
-	int                  sock = -1;
-	int                  ret = -1;
-
-	priv = this->private;
-	sock = priv->sock;
-
-	if (priv->use_ssl) {
-		ret = ssl_read_one (this, opvector->iov_base, opvector->iov_len);
-	} else {
-		ret = readv (sock, opvector, opcount);
-	}
-
-	return ret;
-}
-
-
-static ssize_t
-__socket_ssl_read (rpc_transport_t *this, void *buf, size_t count)
-{
-	struct iovec iov = {0, };
-	int          ret = -1;
 
-	iov.iov_base = buf;
-	iov.iov_len = count;
-
-	ret = __socket_ssl_readv (this, &iov, 1);
-
-	return ret;
-}
-
-
-static int
-__socket_cached_read (rpc_transport_t *this, struct iovec *opvector, int opcount)
-{
-	socket_private_t   *priv = NULL;
-	int                 sock = -1;
-	struct gf_sock_incoming *in = NULL;
-	int                 req_len = -1;
-	int                 ret = -1;
-
-	priv = this->private;
-	sock = priv->sock;
-	in = &priv->incoming;
-	req_len = iov_length (opvector, opcount);
-
-	if (in->record_state == SP_STATE_READING_FRAGHDR) {
-		in->ra_read = 0;
-		in->ra_served = 0;
-		in->ra_max = 0;
-		in->ra_buf = NULL;
-		goto uncached;
-	}
-
-	if (!in->ra_max) {
-		/* first call after passing SP_STATE_READING_FRAGHDR */
-		in->ra_max = min (RPC_FRAGSIZE (in->fraghdr), GF_SOCKET_RA_MAX);
-		/* Note that the in->iobuf is the primary iobuf into which
-		   headers are read into. By using this itself as our
-		   read-ahead cache, we can avoid memory copies in iov_load
-		*/
-		in->ra_buf = iobuf_ptr (in->iobuf);
-	}
-
-	/* fill read-ahead */
-	if (in->ra_read < in->ra_max) {
-		ret = __socket_ssl_read (this, &in->ra_buf[in->ra_read],
-					 (in->ra_max - in->ra_read));
-		if (ret > 0)
-			in->ra_read += ret;
-
-		/* we proceed to test if there is still cached data to
-		   be served even if readahead could not progress */
-	}
-
-	/* serve cached */
-	if (in->ra_served < in->ra_read) {
-		ret = iov_load (opvector, opcount, &in->ra_buf[in->ra_served],
-				min (req_len, (in->ra_read - in->ra_served)));
-
-		in->ra_served += ret;
-		/* Do not read uncached and cached in the same call */
-		goto out;
-	}
-
-	if (in->ra_read < in->ra_max)
-		/* If there was no cached data to be served, (and we are
-		   guaranteed to have already performed an attempt to progress
-		   readahead above), and we have not yet read out the full
-		   readahead capacity, then bail out for now without doing
-		   the uncached read below (as that will overtake future cached
-		   read)
-		*/
-		goto out;
-uncached:
-	ret = __socket_ssl_readv (this, opvector, opcount);
-out:
-	return ret;
-}
-
-static gf_boolean_t
-__does_socket_rwv_error_need_logging (socket_private_t *priv, int write)
-{
-        int read = !write;
-
-        if (priv->connected == -1) /* Didn't even connect, of course it fails */
-                return _gf_false;
-
-        if (read && (priv->read_fail_log == _gf_false))
-                return _gf_false;
-
-        return _gf_true;
-}
+int socket_init (rpc_transport_t *this);
 
 /*
  * return value:
@@ -438,7 +143,7 @@ __does_socket_rwv_error_need_logging (socket_private_t *priv, int write)
  * > 0 = incomplete
  */
 
-static int
+int
 __socket_rwv (rpc_transport_t *this, struct iovec *vector, int count,
               struct iovec **pending_vector, int *pending_count, size_t *bytes,
               int write)
@@ -463,22 +168,9 @@ __socket_rwv (rpc_transport_t *this, struct iovec *vector, int count,
                 *bytes = 0;
         }
 
-        while (opcount > 0) {
-                if (opvector->iov_len == 0) {
-                        gf_log(this->name,GF_LOG_DEBUG,
-                               "would have passed zero length to read/write");
-                        ++opvector;
-                        --opcount;
-                        continue;
-                }
+        while (opcount) {
                 if (write) {
-			if (priv->use_ssl) {
-				ret = ssl_write_one(this,
-					opvector->iov_base, opvector->iov_len);
-			}
-			else {
-				ret = writev (sock, opvector, opcount);
-			}
+                        ret = writev (sock, opvector, opcount);
 
                         if (ret == 0 || (ret == -1 && errno == EAGAIN)) {
                                 /* done for now */
@@ -486,13 +178,7 @@ __socket_rwv (rpc_transport_t *this, struct iovec *vector, int count,
                         }
                         this->total_bytes_write += ret;
                 } else {
-			ret = __socket_cached_read (this, opvector, opcount);
-
-			if (ret == 0) {
-				gf_log(this->name,GF_LOG_DEBUG,"EOF on socket");
-				errno = ENODATA;
-				ret = -1;
-			}
+                        ret = readv (sock, opvector, opcount);
                         if (ret == -1 && errno == EAGAIN) {
                                 /* done for now */
                                 break;
@@ -513,18 +199,9 @@ __socket_rwv (rpc_transport_t *this, struct iovec *vector, int count,
                         if (errno == EINTR)
                                 continue;
 
-                        if (__does_socket_rwv_error_need_logging (priv,
-                                                                  write)) {
-                                gf_log (this->name, GF_LOG_WARNING,
-                                        "%s on %s failed (%s)",
-                                        write ? "writev":"readv",
-                                        this->peerinfo.identifier,
-                                        strerror (errno));
-                        }
-
-			if (priv->use_ssl) {
-				ssl_dump_error_stack(this->name);
-			}
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "%s failed (%s)", write ? "writev" : "readv",
+                                strerror (errno));
                         opcount = -1;
                         break;
                 }
@@ -536,17 +213,6 @@ __socket_rwv (rpc_transport_t *this, struct iovec *vector, int count,
                 moved = 0;
 
                 while (moved < ret) {
-                        if (!opcount) {
-                                gf_log(this->name,GF_LOG_DEBUG,
-                                       "ran out of iov, moved %d/%d",
-                                       moved, ret);
-                                goto ran_out;
-                        }
-                        if (!opvector[0].iov_len) {
-                                opvector++;
-                                opcount--;
-                                continue;
-                        }
                         if ((ret - moved) >= opvector[0].iov_len) {
                                 moved += opvector[0].iov_len;
                                 opvector++;
@@ -556,11 +222,13 @@ __socket_rwv (rpc_transport_t *this, struct iovec *vector, int count,
                                 opvector[0].iov_base += (ret - moved);
                                 moved += (ret - moved);
                         }
+                        while (opcount && !opvector[0].iov_len) {
+                                opvector++;
+                                opcount--;
+                        }
                 }
         }
 
-ran_out:
-
         if (pending_vector)
                 *pending_vector = opvector;
 
@@ -572,7 +240,7 @@ out:
 }
 
 
-static int
+int
 __socket_readv (rpc_transport_t *this, struct iovec *vector, int count,
                 struct iovec **pending_vector, int *pending_count,
                 size_t *bytes)
@@ -586,7 +254,7 @@ __socket_readv (rpc_transport_t *this, struct iovec *vector, int count,
 }
 
 
-static int
+int
 __socket_writev (rpc_transport_t *this, struct iovec *vector, int count,
                  struct iovec **pending_vector, int *pending_count)
 {
@@ -599,55 +267,26 @@ __socket_writev (rpc_transport_t *this, struct iovec *vector, int count,
 }
 
 
-static int
-__socket_shutdown (rpc_transport_t *this)
-{
-        int               ret = -1;
-        socket_private_t *priv = this->private;
-
-        priv->connected = -1;
-        ret = shutdown (priv->sock, SHUT_RDWR);
-        if (ret) {
-                /* its already disconnected.. no need to understand
-                   why it failed to shutdown in normal cases */
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "shutdown() returned %d. %s",
-                        ret, strerror (errno));
-        }
-
-        return ret;
-}
-
-static int
+int
 __socket_disconnect (rpc_transport_t *this)
 {
-        int               ret = -1;
         socket_private_t *priv = NULL;
+        int               ret = -1;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
 
-        gf_log (this->name, GF_LOG_TRACE,
-                "disconnecting %p, state=%u gen=%u sock=%d", this,
-                priv->ot_state, priv->ot_gen, priv->sock);
-
         if (priv->sock != -1) {
-                ret = __socket_shutdown(this);
-		if (priv->own_thread) {
-                        /*
-                         * Without this, reconnect (= disconnect + connect)
-                         * won't work except by accident.
-                         */
-                        close(priv->sock);
-                        priv->sock = -1;
-                        gf_log (this->name, GF_LOG_TRACE,
-                                "OT_PLEASE_DIE on %p", this);
-                        priv->ot_state = OT_PLEASE_DIE;
-                }
-                else if (priv->use_ssl) {
-                        ssl_teardown_connection(priv);
+                priv->connected = -1;
+                ret = shutdown (priv->sock, SHUT_RDWR);
+                if (ret) {
+                        /* its already disconnected.. no need to understand
+                           why it failed to shutdown in normal cases */
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "shutdown() returned %d. %s",
+                                ret, strerror (errno));
                 }
         }
 
@@ -656,7 +295,7 @@ out:
 }
 
 
-static int
+int
 __socket_server_bind (rpc_transport_t *this)
 {
         socket_private_t *priv = NULL;
@@ -679,12 +318,12 @@ __socket_server_bind (rpc_transport_t *this)
                         strerror (errno));
         }
 
-        /* reuse-address doesn't work for unix type sockets */
+        //reuse-address doesnt work for unix type sockets
         if (AF_UNIX == SA (&this->myinfo.sockaddr)->sa_family) {
                 memcpy (&unix_addr, SA (&this->myinfo.sockaddr),
                         this->myinfo.sockaddr_len);
                 reuse_check_sock = socket (AF_UNIX, SOCK_STREAM, 0);
-                if (reuse_check_sock >= 0) {
+                if (reuse_check_sock > 0) {
                         ret = connect (reuse_check_sock, SA (&unix_addr),
                                        this->myinfo.sockaddr_len);
                         if ((ret == -1) && (ECONNREFUSED == errno)) {
@@ -712,7 +351,7 @@ out:
 }
 
 
-static int
+int
 __socket_nonblock (int fd)
 {
         int flags = 0;
@@ -726,7 +365,8 @@ __socket_nonblock (int fd)
         return ret;
 }
 
-static int
+
+int
 __socket_nodelay (int fd)
 {
         int     on = 1;
@@ -735,7 +375,7 @@ __socket_nodelay (int fd)
         ret = setsockopt (fd, IPPROTO_TCP, TCP_NODELAY,
                           &on, sizeof (on));
         if (!ret)
-                gf_log (THIS->name, GF_LOG_TRACE,
+                gf_log ("", GF_LOG_TRACE,
                         "NODELAY enabled for socket %d", fd);
 
         return ret;
@@ -743,7 +383,7 @@ __socket_nodelay (int fd)
 
 
 static int
-__socket_keepalive (int fd, int family, int keepalive_intvl, int keepalive_idle)
+__socket_keepalive (int fd, int keepalive_intvl, int keepalive_idle)
 {
         int     on = 1;
         int     ret = -1;
@@ -758,7 +398,7 @@ __socket_keepalive (int fd, int family, int keepalive_intvl, int keepalive_idle)
         if (keepalive_intvl == GF_USE_DEFAULT_KEEPALIVE)
                 goto done;
 
-#if !defined(GF_LINUX_HOST_OS) && !defined(__NetBSD__)
+#ifndef GF_LINUX_HOST_OS
 #ifdef GF_SOLARIS_HOST_OS
         ret = setsockopt (fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive_intvl,
                           sizeof (keepalive_intvl));
@@ -772,29 +412,24 @@ __socket_keepalive (int fd, int family, int keepalive_intvl, int keepalive_idle)
                 goto err;
         }
 #else
-        if (family != AF_INET)
-                goto done;
-
         ret = setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &keepalive_idle,
                           sizeof (keepalive_intvl));
         if (ret == -1) {
                 gf_log ("socket", GF_LOG_WARNING,
-                        "failed to set keep idle %d on socket %d, %s",
-                        keepalive_idle, fd, strerror(errno));
+                        "failed to set keep idle on socket %d", fd);
                 goto err;
         }
-        ret = setsockopt (fd, IPPROTO_TCP , TCP_KEEPINTVL, &keepalive_intvl,
+        ret = setsockopt (fd, IPPROTO_TCP, TCP_KEEPINTVL, &keepalive_intvl,
                           sizeof (keepalive_intvl));
         if (ret == -1) {
                 gf_log ("socket", GF_LOG_WARNING,
-                        "failed to set keep interval %d on socket %d, %s",
-                        keepalive_intvl, fd, strerror(errno));
+                        "failed to set keep alive interval on socket %d", fd);
                 goto err;
         }
 #endif
 
 done:
-        gf_log (THIS->name, GF_LOG_TRACE, "Keep-alive enabled for socket %d, interval "
+        gf_log ("", GF_LOG_TRACE, "Keep-alive enabled for socket %d, interval "
                 "%d, idle: %d", fd, keepalive_intvl, keepalive_idle);
 
 err:
@@ -802,7 +437,7 @@ err:
 }
 
 
-static int
+int
 __socket_connect_finish (int fd)
 {
         int       ret = -1;
@@ -820,7 +455,7 @@ __socket_connect_finish (int fd)
 }
 
 
-static void
+void
 __socket_reset (rpc_transport_t *this)
 {
         socket_private_t *priv = NULL;
@@ -841,7 +476,9 @@ __socket_reset (rpc_transport_t *this)
                 iobuf_unref (priv->incoming.iobuf);
         }
 
-        GF_FREE (priv->incoming.request_info);
+        if (priv->incoming.request_info != NULL) {
+                GF_FREE (priv->incoming.request_info);
+        }
 
         memset (&priv->incoming, 0, sizeof (priv->incoming));
 
@@ -857,13 +494,13 @@ out:
 }
 
 
-static void
+void
 socket_set_lastfrag (uint32_t *fragsize) {
         (*fragsize) |= 0x80000000U;
 }
 
 
-static void
+void
 socket_set_frag_header_size (uint32_t size, char *haddr)
 {
         size = htonl (size);
@@ -871,14 +508,14 @@ socket_set_frag_header_size (uint32_t size, char *haddr)
 }
 
 
-static void
+void
 socket_set_last_frag_header_size (uint32_t size, char *haddr)
 {
         socket_set_lastfrag (&size);
         socket_set_frag_header_size (size, haddr);
 }
 
-static struct ioq *
+struct ioq *
 __socket_ioq_new (rpc_transport_t *this, rpc_transport_msg_t *msg)
 {
         struct ioq       *entry = NULL;
@@ -945,7 +582,7 @@ out:
 }
 
 
-static void
+void
 __socket_ioq_entry_free (struct ioq *entry)
 {
         GF_VALIDATE_OR_GOTO ("socket", entry, out);
@@ -962,7 +599,7 @@ out:
 }
 
 
-static void
+void
 __socket_ioq_flush (rpc_transport_t *this)
 {
         socket_private_t *priv = NULL;
@@ -983,12 +620,10 @@ out:
 }
 
 
-static int
-__socket_ioq_churn_entry (rpc_transport_t *this, struct ioq *entry, int direct)
+int
+__socket_ioq_churn_entry (rpc_transport_t *this, struct ioq *entry)
 {
-        int               ret = -1;
-	socket_private_t *priv = NULL;
-	char              a_byte = 0;
+        int ret = -1;
 
         ret = __socket_writev (this, entry->pending_vector,
                                entry->pending_count,
@@ -999,25 +634,13 @@ __socket_ioq_churn_entry (rpc_transport_t *this, struct ioq *entry, int direct)
                 /* current entry was completely written */
                 GF_ASSERT (entry->pending_count == 0);
                 __socket_ioq_entry_free (entry);
-		priv = this->private;
-		if (priv->own_thread) {
-			/*
-			 * The pipe should only remain readable if there are
-			 * more entries after this, so drain the byte
-			 * representing this entry.
-			 */
-			if (!direct && read(priv->pipe[0],&a_byte,1) < 1) {
-				gf_log(this->name,GF_LOG_WARNING,
-				       "read error on pipe");
-			}
-		}
         }
 
         return ret;
 }
 
 
-static int
+int
 __socket_ioq_churn (rpc_transport_t *this)
 {
         socket_private_t *priv = NULL;
@@ -1033,13 +656,13 @@ __socket_ioq_churn (rpc_transport_t *this)
                 /* pick next entry */
                 entry = priv->ioq_next;
 
-                ret = __socket_ioq_churn_entry (this, entry, 0);
+                ret = __socket_ioq_churn_entry (this, entry);
 
                 if (ret != 0)
                         break;
         }
 
-        if (!priv->own_thread && list_empty (&priv->ioq)) {
+        if (list_empty (&priv->ioq)) {
                 /* all pending writes done, not interested in POLLOUT */
                 priv->idx = event_select_on (this->ctx->event_pool,
                                              priv->sock, priv->idx, -1, 0);
@@ -1050,7 +673,7 @@ out:
 }
 
 
-static int
+int
 socket_event_poll_err (rpc_transport_t *this)
 {
         socket_private_t *priv = NULL;
@@ -1075,7 +698,7 @@ out:
 }
 
 
-static int
+int
 socket_event_poll_out (rpc_transport_t *this)
 {
         socket_private_t *priv = NULL;
@@ -1105,45 +728,43 @@ out:
 }
 
 
-static inline int
+inline int
 __socket_read_simple_msg (rpc_transport_t *this)
 {
-        int                           ret            = 0;
-        uint32_t                      remaining_size = 0;
-        size_t                        bytes_read     = 0;
-        socket_private_t             *priv           = NULL;
-        struct gf_sock_incoming      *in             = NULL;
-        struct gf_sock_incoming_frag *frag           = NULL;
+        socket_private_t *priv           = NULL;
+        int               ret            = 0;
+        uint32_t          remaining_size = 0;
+        size_t            bytes_read     = 0;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
 
-        in = &priv->incoming;
-        frag = &in->frag;
-
-        switch (frag->simple_state) {
+        switch (priv->incoming.frag.simple_state) {
 
         case SP_STATE_SIMPLE_MSG_INIT:
-                remaining_size = RPC_FRAGSIZE (in->fraghdr) - frag->bytes_read;
+                remaining_size = RPC_FRAGSIZE (priv->incoming.fraghdr)
+                        - priv->incoming.frag.bytes_read;
 
                 __socket_proto_init_pending (priv, remaining_size);
 
-                frag->simple_state = SP_STATE_READING_SIMPLE_MSG;
+                priv->incoming.frag.simple_state =
+                        SP_STATE_READING_SIMPLE_MSG;
 
                 /* fall through */
 
         case SP_STATE_READING_SIMPLE_MSG:
                 ret = 0;
 
-                remaining_size = RPC_FRAGSIZE (in->fraghdr) - frag->bytes_read;
+                remaining_size = RPC_FRAGSIZE (priv->incoming.fraghdr)
+                        - priv->incoming.frag.bytes_read;
 
                 if (remaining_size > 0) {
                         ret = __socket_readv (this,
-                                              in->pending_vector, 1,
-                                              &in->pending_vector,
-                                              &in->pending_count,
+                                              priv->incoming.pending_vector, 1,
+                                              &priv->incoming.pending_vector,
+                                              &priv->incoming.pending_count,
                                               &bytes_read);
                 }
 
@@ -1155,8 +776,8 @@ __socket_read_simple_msg (rpc_transport_t *this)
                         break;
                 }
 
-                frag->bytes_read += bytes_read;
-                frag->fragcurrent += bytes_read;
+                priv->incoming.frag.bytes_read += bytes_read;
+                priv->incoming.frag.fragcurrent += bytes_read;
 
                 if (ret > 0) {
                         gf_log (this->name, GF_LOG_TRACE,
@@ -1165,7 +786,8 @@ __socket_read_simple_msg (rpc_transport_t *this)
                 }
 
                 if (ret == 0) {
-                        frag->simple_state =  SP_STATE_SIMPLE_MSG_INIT;
+                        priv->incoming.frag.simple_state
+                                =  SP_STATE_SIMPLE_MSG_INIT;
                 }
         }
 
@@ -1174,7 +796,7 @@ out:
 }
 
 
-static inline int
+inline int
 __socket_read_simple_request (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1185,14 +807,9 @@ __socket_read_simple_request (rpc_transport_t *this)
 
 #define rpc_verf_addr(fragcurrent) (fragcurrent - 4)
 
-#define rpc_msgtype_addr(buf) (buf + 4)
 
-#define rpc_prognum_addr(buf) (buf + RPC_MSGTYPE_SIZE + 4)
-#define rpc_progver_addr(buf) (buf + RPC_MSGTYPE_SIZE + 8)
-#define rpc_procnum_addr(buf) (buf + RPC_MSGTYPE_SIZE + 12)
-
-static inline int
-__socket_read_vectored_request (rpc_transport_t *this, rpcsvc_vector_sizer vector_sizer)
+inline int
+__socket_read_vectored_request (rpc_transport_t *this)
 {
         socket_private_t *priv                   = NULL;
         int               ret                    = 0;
@@ -1200,27 +817,17 @@ __socket_read_vectored_request (rpc_transport_t *this, rpcsvc_vector_sizer vecto
         char             *addr                   = NULL;
         struct iobuf     *iobuf                  = NULL;
         uint32_t          remaining_size         = 0;
-        ssize_t           readsize               = 0;
-        size_t            size                   = 0;
-        struct gf_sock_incoming      *in         = NULL;
-        struct gf_sock_incoming_frag *frag       = NULL;
-        sp_rpcfrag_request_state_t   *request    = NULL;
+        uint32_t          gluster_write_proc_len = 0;
+        gfs3_write_req    write_req              = {{0,},};
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
 
-        /* used to reduce the indirection */
-        in = &priv->incoming;
-        frag = &in->frag;
-        request = &frag->call_body.request;
-
-        switch (request->vector_state) {
+        switch (priv->incoming.frag.call_body.request.vector_state) {
         case SP_STATE_VECTORED_REQUEST_INIT:
-                request->vector_sizer_state = 0;
-
-                addr = rpc_cred_addr (iobuf_ptr (in->iobuf));
+                addr = rpc_cred_addr (iobuf_ptr (priv->incoming.iobuf));
 
                 /* also read verf flavour and verflen */
                 credlen = ntoh32 (*((uint32_t *)addr))
@@ -1228,114 +835,82 @@ __socket_read_vectored_request (rpc_transport_t *this, rpcsvc_vector_sizer vecto
 
                 __socket_proto_init_pending (priv, credlen);
 
-                request->vector_state = SP_STATE_READING_CREDBYTES;
+                priv->incoming.frag.call_body.request.vector_state =
+                        SP_STATE_READING_CREDBYTES;
 
                 /* fall through */
 
         case SP_STATE_READING_CREDBYTES:
                 __socket_proto_read (priv, ret);
 
-                request->vector_state = SP_STATE_READ_CREDBYTES;
+                priv->incoming.frag.call_body.request.vector_state =
+                        SP_STATE_READ_CREDBYTES;
 
                 /* fall through */
 
         case SP_STATE_READ_CREDBYTES:
-                addr = rpc_verf_addr (frag->fragcurrent);
-                verflen = ntoh32 (*((uint32_t *)addr));
+                addr = rpc_verf_addr (priv->incoming.frag.fragcurrent);
+
+                /* FIXME: Also handle procedures other than glusterfs-write
+                 * here
+                 */
+                /* also read proc-header */
+                gluster_write_proc_len = xdr_sizeof ((xdrproc_t) xdr_gfs3_write_req,
+                                                     &write_req);
 
-                if (verflen == 0) {
-                        request->vector_state = SP_STATE_READ_VERFBYTES;
-                        goto sp_state_read_verfbytes;
+                if (gluster_write_proc_len == 0) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "xdr_sizeof on gfs3_write_req failed");
+                        ret = -1;
+                        goto out;
                 }
+
+                verflen = ntoh32 (*((uint32_t *)addr))
+                        + gluster_write_proc_len;
+
                 __socket_proto_init_pending (priv, verflen);
 
-                request->vector_state = SP_STATE_READING_VERFBYTES;
+                priv->incoming.frag.call_body.request.vector_state
+                        = SP_STATE_READING_VERFBYTES;
 
                 /* fall through */
 
         case SP_STATE_READING_VERFBYTES:
                 __socket_proto_read (priv, ret);
 
-                request->vector_state = SP_STATE_READ_VERFBYTES;
+                priv->incoming.frag.call_body.request.vector_state =
+                        SP_STATE_READ_VERFBYTES;
 
                 /* fall through */
 
         case SP_STATE_READ_VERFBYTES:
-sp_state_read_verfbytes:
-		/* set the base_addr 'persistently' across multiple calls
-		   into the state machine */
-                in->proghdr_base_addr = frag->fragcurrent;
-
-                request->vector_sizer_state =
-                        vector_sizer (request->vector_sizer_state,
-                                      &readsize, in->proghdr_base_addr,
-                                      frag->fragcurrent);
-                __socket_proto_init_pending (priv, readsize);
-
-                request->vector_state = SP_STATE_READING_PROGHDR;
-
-                /* fall through */
-
-        case SP_STATE_READING_PROGHDR:
-                __socket_proto_read (priv, ret);
-
-		request->vector_state =	SP_STATE_READ_PROGHDR;
-
-		/* fall through */
-
-	case SP_STATE_READ_PROGHDR:
-sp_state_read_proghdr:
-                request->vector_sizer_state =
-                        vector_sizer (request->vector_sizer_state,
-                                      &readsize, in->proghdr_base_addr,
-                                      frag->fragcurrent);
-                if (readsize == 0) {
-                        request->vector_state = SP_STATE_READ_PROGHDR_XDATA;
-			goto sp_state_read_proghdr_xdata;
-                }
-
-		__socket_proto_init_pending (priv, readsize);
-
-                request->vector_state =	SP_STATE_READING_PROGHDR_XDATA;
-
-		/* fall through */
-
-	case SP_STATE_READING_PROGHDR_XDATA:
-		__socket_proto_read (priv, ret);
-
-		request->vector_state =	SP_STATE_READ_PROGHDR;
-		/* check if the vector_sizer() has more to say */
-		goto sp_state_read_proghdr;
-
-        case SP_STATE_READ_PROGHDR_XDATA:
-sp_state_read_proghdr_xdata:
-                if (in->payload_vector.iov_base == NULL) {
-
-                        size = RPC_FRAGSIZE (in->fraghdr) - frag->bytes_read;
-                        iobuf = iobuf_get2 (this->ctx->iobuf_pool, size);
+                if (priv->incoming.payload_vector.iov_base == NULL) {
+                        iobuf = iobuf_get (this->ctx->iobuf_pool);
                         if (!iobuf) {
                                 ret = -1;
                                 break;
                         }
 
-                        if (in->iobref == NULL) {
-                                in->iobref = iobref_new ();
-                                if (in->iobref == NULL) {
+                        if (priv->incoming.iobref == NULL) {
+                                priv->incoming.iobref = iobref_new ();
+                                if (priv->incoming.iobref == NULL) {
                                         ret = -1;
                                         iobuf_unref (iobuf);
                                         break;
                                 }
                         }
 
-                        iobref_add (in->iobref, iobuf);
+                        iobref_add (priv->incoming.iobref, iobuf);
                         iobuf_unref (iobuf);
 
-                        in->payload_vector.iov_base = iobuf_ptr (iobuf);
+                        priv->incoming.payload_vector.iov_base
+                                = iobuf_ptr (iobuf);
 
-                        frag->fragcurrent = iobuf_ptr (iobuf);
+                        priv->incoming.frag.fragcurrent = iobuf_ptr (iobuf);
                 }
 
-                request->vector_state = SP_STATE_READING_PROG;
+                priv->incoming.frag.call_body.request.vector_state =
+                        SP_STATE_READING_PROG;
 
                 /* fall through */
 
@@ -1346,15 +921,19 @@ sp_state_read_proghdr_xdata:
 
                 ret = __socket_read_simple_msg (this);
 
-                remaining_size = RPC_FRAGSIZE (in->fraghdr) - frag->bytes_read;
+                remaining_size = RPC_FRAGSIZE (priv->incoming.fraghdr)
+                        - priv->incoming.frag.bytes_read;
 
-                if ((ret == -1) ||
-                    ((ret == 0) && (remaining_size == 0)
-                     && RPC_LASTFRAG (in->fraghdr))) {
-                        request->vector_state = SP_STATE_VECTORED_REQUEST_INIT;
-                        in->payload_vector.iov_len
-                                = ((unsigned long)frag->fragcurrent
-                                   - (unsigned long)in->payload_vector.iov_base);
+                if ((ret == -1)
+                    || ((ret == 0)
+                        && (remaining_size == 0)
+                        && RPC_LASTFRAG (priv->incoming.fraghdr))) {
+                        priv->incoming.frag.call_body.request.vector_state
+                                = SP_STATE_VECTORED_REQUEST_INIT;
+                        priv->incoming.payload_vector.iov_len
+                                = (unsigned long)priv->incoming.frag.fragcurrent
+                                - (unsigned long)
+                                priv->incoming.payload_vector.iov_base;
                 }
                 break;
         }
@@ -1363,77 +942,70 @@ out:
         return ret;
 }
 
-static inline int
+
+#define rpc_msgtype_addr(buf) (buf + 4)
+
+#define rpc_prognum_addr(buf) (buf + RPC_MSGTYPE_SIZE + 4)
+
+#define rpc_procnum_addr(buf) (buf + RPC_MSGTYPE_SIZE + 12)
+
+
+inline int
 __socket_read_request (rpc_transport_t *this)
 {
         socket_private_t *priv               = NULL;
-        uint32_t          prognum            = 0, procnum = 0, progver = 0;
+        uint32_t          prognum            = 0, procnum = 0;
         uint32_t          remaining_size     = 0;
         int               ret                = -1;
         char             *buf                = NULL;
-        rpcsvc_vector_sizer     vector_sizer = NULL;
-        struct gf_sock_incoming      *in         = NULL;
-        struct gf_sock_incoming_frag *frag       = NULL;
-        sp_rpcfrag_request_state_t   *request    = NULL;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
 
-        /* used to reduce the indirection */
-        in = &priv->incoming;
-        frag = &in->frag;
-        request = &frag->call_body.request;
-
-        switch (request->header_state) {
+        switch (priv->incoming.frag.call_body.request.header_state) {
 
         case SP_STATE_REQUEST_HEADER_INIT:
 
                 __socket_proto_init_pending (priv, RPC_CALL_BODY_SIZE);
 
-                request->header_state = SP_STATE_READING_RPCHDR1;
+                priv->incoming.frag.call_body.request.header_state
+                        = SP_STATE_READING_RPCHDR1;
 
                 /* fall through */
 
         case SP_STATE_READING_RPCHDR1:
                 __socket_proto_read (priv, ret);
 
-                request->header_state = SP_STATE_READ_RPCHDR1;
+                priv->incoming.frag.call_body.request.header_state =
+                        SP_STATE_READ_RPCHDR1;
 
                 /* fall through */
 
         case SP_STATE_READ_RPCHDR1:
-                buf = rpc_prognum_addr (iobuf_ptr (in->iobuf));
+                buf = rpc_prognum_addr (iobuf_ptr (priv->incoming.iobuf));
                 prognum = ntoh32 (*((uint32_t *)buf));
 
-                buf = rpc_progver_addr (iobuf_ptr (in->iobuf));
-                progver = ntoh32 (*((uint32_t *)buf));
-
-                buf = rpc_procnum_addr (iobuf_ptr (in->iobuf));
+                buf = rpc_procnum_addr (iobuf_ptr (priv->incoming.iobuf));
                 procnum = ntoh32 (*((uint32_t *)buf));
 
-                if (priv->is_server) {
-                        /* this check is needed as rpcsvc and rpc-clnt
-                         * actor structures are not same */
-                        vector_sizer =
-                                rpcsvc_get_program_vector_sizer ((rpcsvc_t *)this->mydata,
-                                                                 prognum, progver, procnum);
-                }
-
-                if (vector_sizer) {
-                        ret = __socket_read_vectored_request (this, vector_sizer);
+                if ((prognum == GLUSTER3_1_FOP_PROGRAM)
+                    && (procnum == GF_FOP_WRITE)) {
+                        ret = __socket_read_vectored_request (this);
                 } else {
                         ret = __socket_read_simple_request (this);
                 }
 
-                remaining_size = RPC_FRAGSIZE (in->fraghdr) - frag->bytes_read;
+                remaining_size = RPC_FRAGSIZE (priv->incoming.fraghdr)
+                        - priv->incoming.frag.bytes_read;
 
                 if ((ret == -1)
                     || ((ret == 0)
                         && (remaining_size == 0)
-                        && (RPC_LASTFRAG (in->fraghdr)))) {
-                        request->header_state = SP_STATE_REQUEST_HEADER_INIT;
+                        && (RPC_LASTFRAG (priv->incoming.fraghdr)))) {
+                        priv->incoming.frag.call_body.request.header_state =
+                                SP_STATE_REQUEST_HEADER_INIT;
                 }
 
                 break;
@@ -1444,40 +1016,35 @@ out:
 }
 
 
-static inline int
+inline int
 __socket_read_accepted_successful_reply (rpc_transport_t *this)
 {
-        socket_private_t *priv              = NULL;
-        int               ret               = 0;
-        struct iobuf     *iobuf             = NULL;
-        gfs3_read_rsp     read_rsp          = {0, };
-        ssize_t           size              = 0;
-        ssize_t           default_read_size = 0;
-        char             *proghdr_buf       = NULL;
-        XDR               xdr;
-        struct gf_sock_incoming      *in         = NULL;
-        struct gf_sock_incoming_frag *frag       = NULL;
+        socket_private_t *priv                     = NULL;
+        int               ret                      = 0;
+        struct iobuf     *iobuf                    = NULL;
+        uint32_t          gluster_read_rsp_hdr_len = 0;
+        gfs3_read_rsp     read_rsp                 = {0, };
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
 
-        /* used to reduce the indirection */
-        in = &priv->incoming;
-        frag = &in->frag;
-
-        switch (frag->call_body.reply.accepted_success_state) {
+        switch (priv->incoming.frag.call_body.reply.accepted_success_state) {
 
         case SP_STATE_ACCEPTED_SUCCESS_REPLY_INIT:
-                default_read_size = xdr_sizeof ((xdrproc_t) xdr_gfs3_read_rsp,
-                                                &read_rsp);
-
-                proghdr_buf = frag->fragcurrent;
+                gluster_read_rsp_hdr_len = xdr_sizeof ((xdrproc_t) xdr_gfs3_read_rsp,
+                                                       &read_rsp);
 
-                __socket_proto_init_pending (priv, default_read_size);
+                if (gluster_read_rsp_hdr_len == 0) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "xdr_sizeof on gfs3_read_rsp failed");
+                        ret = -1;
+                        goto out;
+                }
+                __socket_proto_init_pending (priv, gluster_read_rsp_hdr_len);
 
-                frag->call_body.reply.accepted_success_state
+                priv->incoming.frag.call_body.reply.accepted_success_state
                         = SP_STATE_READING_PROC_HEADER;
 
                 /* fall through */
@@ -1485,70 +1052,34 @@ __socket_read_accepted_successful_reply (rpc_transport_t *this)
         case SP_STATE_READING_PROC_HEADER:
                 __socket_proto_read (priv, ret);
 
-                /* there can be 'xdata' in read response, figure it out */
-                xdrmem_create (&xdr, proghdr_buf, default_read_size,
-                               XDR_DECODE);
-
-                /* This will fail if there is xdata sent from server, if not,
-                   well and good, we don't need to worry about  */
-                xdr_gfs3_read_rsp (&xdr, &read_rsp);
-
-                free (read_rsp.xdata.xdata_val);
-
-                /* need to round off to proper roof (%4), as XDR packing pads
-                   the end of opaque object with '0' */
-                size = roof (read_rsp.xdata.xdata_len, 4);
-
-                if (!size) {
-                        frag->call_body.reply.accepted_success_state
-                                = SP_STATE_READ_PROC_OPAQUE;
-                        goto read_proc_opaque;
-                }
-
-                __socket_proto_init_pending (priv, size);
-
-                frag->call_body.reply.accepted_success_state
-                        = SP_STATE_READING_PROC_OPAQUE;
-
-        case SP_STATE_READING_PROC_OPAQUE:
-                __socket_proto_read (priv, ret);
-
-                frag->call_body.reply.accepted_success_state
-                        = SP_STATE_READ_PROC_OPAQUE;
-
-        case SP_STATE_READ_PROC_OPAQUE:
-        read_proc_opaque:
-                if (in->payload_vector.iov_base == NULL) {
-
-                        size = (RPC_FRAGSIZE (in->fraghdr) - frag->bytes_read);
+                priv->incoming.frag.call_body.reply.accepted_success_state
+                        = SP_STATE_READ_PROC_HEADER;
 
-                        iobuf = iobuf_get2 (this->ctx->iobuf_pool, size);
+                if (priv->incoming.payload_vector.iov_base == NULL) {
+                        iobuf = iobuf_get (this->ctx->iobuf_pool);
                         if (iobuf == NULL) {
                                 ret = -1;
                                 goto out;
                         }
 
-                        if (in->iobref == NULL) {
-                                in->iobref = iobref_new ();
-                                if (in->iobref == NULL) {
+                        if (priv->incoming.iobref == NULL) {
+                                priv->incoming.iobref = iobref_new ();
+                                if (priv->incoming.iobref == NULL) {
                                         ret = -1;
                                         iobuf_unref (iobuf);
                                         goto out;
                                 }
                         }
 
-                        iobref_add (in->iobref, iobuf);
+                        iobref_add (priv->incoming.iobref, iobuf);
                         iobuf_unref (iobuf);
 
-                        in->payload_vector.iov_base = iobuf_ptr (iobuf);
-
-                        in->payload_vector.iov_len = size;
+                        priv->incoming.payload_vector.iov_base
+                                = iobuf_ptr (iobuf);
                 }
 
-                frag->fragcurrent = in->payload_vector.iov_base;
-
-                frag->call_body.reply.accepted_success_state
-                        = SP_STATE_READ_PROC_HEADER;
+                priv->incoming.frag.fragcurrent
+                        = priv->incoming.payload_vector.iov_base;
 
                 /* fall through */
 
@@ -1556,8 +1087,9 @@ __socket_read_accepted_successful_reply (rpc_transport_t *this)
                 /* now read the entire remaining msg into new iobuf */
                 ret = __socket_read_simple_msg (this);
                 if ((ret == -1)
-                    || ((ret == 0) && RPC_LASTFRAG (in->fraghdr))) {
-                        frag->call_body.reply.accepted_success_state
+                    || ((ret == 0)
+                        && RPC_LASTFRAG (priv->incoming.fraghdr))) {
+                        priv->incoming.frag.call_body.reply.accepted_success_state
                                 = SP_STATE_ACCEPTED_SUCCESS_REPLY_INIT;
                 }
 
@@ -1571,7 +1103,7 @@ out:
 #define rpc_reply_verflen_addr(fragcurrent) ((char *)fragcurrent - 4)
 #define rpc_reply_accept_status_addr(fragcurrent) ((char *)fragcurrent - 4)
 
-static inline int
+inline int
 __socket_read_accepted_reply (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
@@ -1579,24 +1111,19 @@ __socket_read_accepted_reply (rpc_transport_t *this)
         char             *buf            = NULL;
         uint32_t          verflen        = 0, len = 0;
         uint32_t          remaining_size = 0;
-        struct gf_sock_incoming      *in         = NULL;
-        struct gf_sock_incoming_frag *frag       = NULL;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
-        /* used to reduce the indirection */
-        in = &priv->incoming;
-        frag = &in->frag;
 
-        switch (frag->call_body.reply.accepted_state) {
+        switch (priv->incoming.frag.call_body.reply.accepted_state) {
 
         case SP_STATE_ACCEPTED_REPLY_INIT:
                 __socket_proto_init_pending (priv,
                                              RPC_AUTH_FLAVOUR_N_LENGTH_SIZE);
 
-                frag->call_body.reply.accepted_state
+                priv->incoming.frag.call_body.reply.accepted_state
                         = SP_STATE_READING_REPLY_VERFLEN;
 
                 /* fall through */
@@ -1604,13 +1131,13 @@ __socket_read_accepted_reply (rpc_transport_t *this)
         case SP_STATE_READING_REPLY_VERFLEN:
                 __socket_proto_read (priv, ret);
 
-                frag->call_body.reply.accepted_state
+                priv->incoming.frag.call_body.reply.accepted_state
                         = SP_STATE_READ_REPLY_VERFLEN;
 
                 /* fall through */
 
         case SP_STATE_READ_REPLY_VERFLEN:
-                buf = rpc_reply_verflen_addr (frag->fragcurrent);
+                buf = rpc_reply_verflen_addr (priv->incoming.frag.fragcurrent);
 
                 verflen = ntoh32 (*((uint32_t *) buf));
 
@@ -1619,7 +1146,7 @@ __socket_read_accepted_reply (rpc_transport_t *this)
 
                 __socket_proto_init_pending (priv, len);
 
-                frag->call_body.reply.accepted_state
+                priv->incoming.frag.call_body.reply.accepted_state
                         = SP_STATE_READING_REPLY_VERFBYTES;
 
                 /* fall through */
@@ -1627,19 +1154,19 @@ __socket_read_accepted_reply (rpc_transport_t *this)
         case SP_STATE_READING_REPLY_VERFBYTES:
                 __socket_proto_read (priv, ret);
 
-                frag->call_body.reply.accepted_state
+                priv->incoming.frag.call_body.reply.accepted_state
                         = SP_STATE_READ_REPLY_VERFBYTES;
 
-                buf = rpc_reply_accept_status_addr (frag->fragcurrent);
+                buf = rpc_reply_accept_status_addr (priv->incoming.frag.fragcurrent);
 
-                frag->call_body.reply.accept_status
+                priv->incoming.frag.call_body.reply.accept_status
                         = ntoh32 (*(uint32_t *) buf);
 
                 /* fall through */
 
         case SP_STATE_READ_REPLY_VERFBYTES:
 
-                if (frag->call_body.reply.accept_status
+                if (priv->incoming.frag.call_body.reply.accept_status
                     == SUCCESS) {
                         ret = __socket_read_accepted_successful_reply (this);
                 } else {
@@ -1649,13 +1176,14 @@ __socket_read_accepted_reply (rpc_transport_t *this)
                         ret = __socket_read_simple_msg (this);
                 }
 
-                remaining_size = RPC_FRAGSIZE (in->fraghdr)
-                        - frag->bytes_read;
+                remaining_size = RPC_FRAGSIZE (priv->incoming.fraghdr)
+                        - priv->incoming.frag.bytes_read;
 
                 if ((ret == -1)
-                    || ((ret == 0) && (remaining_size == 0)
-                        && (RPC_LASTFRAG (in->fraghdr)))) {
-                        frag->call_body.reply.accepted_state
+                    || ((ret == 0)
+                        && (remaining_size == 0)
+                        && (RPC_LASTFRAG (priv->incoming.fraghdr)))) {
+                        priv->incoming.frag.call_body.reply.accepted_state
                                 = SP_STATE_ACCEPTED_REPLY_INIT;
                 }
 
@@ -1667,7 +1195,7 @@ out:
 }
 
 
-static inline int
+inline int
 __socket_read_denied_reply (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1677,29 +1205,25 @@ __socket_read_denied_reply (rpc_transport_t *this)
 #define rpc_reply_status_addr(fragcurrent) ((char *)fragcurrent - 4)
 
 
-static inline int
+inline int
 __socket_read_vectored_reply (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
         int               ret            = 0;
         char             *buf            = NULL;
         uint32_t          remaining_size = 0;
-        struct gf_sock_incoming      *in         = NULL;
-        struct gf_sock_incoming_frag *frag       = NULL;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
-        in = &priv->incoming;
-        frag = &in->frag;
 
-        switch (frag->call_body.reply.status_state) {
+        switch (priv->incoming.frag.call_body.reply.status_state) {
 
         case SP_STATE_ACCEPTED_REPLY_INIT:
                 __socket_proto_init_pending (priv, RPC_REPLY_STATUS_SIZE);
 
-                frag->call_body.reply.status_state
+                priv->incoming.frag.call_body.reply.status_state
                         = SP_STATE_READING_REPLY_STATUS;
 
                 /* fall through */
@@ -1707,33 +1231,37 @@ __socket_read_vectored_reply (rpc_transport_t *this)
         case SP_STATE_READING_REPLY_STATUS:
                 __socket_proto_read (priv, ret);
 
-                buf = rpc_reply_status_addr (frag->fragcurrent);
+                buf = rpc_reply_status_addr (priv->incoming.frag.fragcurrent);
 
-                frag->call_body.reply.accept_status
+                priv->incoming.frag.call_body.reply.accept_status
                         = ntoh32 (*((uint32_t *) buf));
 
-                frag->call_body.reply.status_state
+                priv->incoming.frag.call_body.reply.status_state
                         = SP_STATE_READ_REPLY_STATUS;
 
                 /* fall through */
 
         case SP_STATE_READ_REPLY_STATUS:
-                if (frag->call_body.reply.accept_status == MSG_ACCEPTED) {
+                if (priv->incoming.frag.call_body.reply.accept_status
+                    == MSG_ACCEPTED) {
                         ret = __socket_read_accepted_reply (this);
                 } else {
                         ret = __socket_read_denied_reply (this);
                 }
 
-                remaining_size = RPC_FRAGSIZE (in->fraghdr) - frag->bytes_read;
+                remaining_size = RPC_FRAGSIZE (priv->incoming.fraghdr)
+                        - priv->incoming.frag.bytes_read;
 
                 if ((ret == -1)
-                    || ((ret == 0) && (remaining_size == 0)
-                        && (RPC_LASTFRAG (in->fraghdr)))) {
-                        frag->call_body.reply.status_state
+                    || ((ret == 0)
+                        && (remaining_size == 0)
+                        && (RPC_LASTFRAG (priv->incoming.fraghdr)))) {
+                        priv->incoming.frag.call_body.reply.status_state
                                 = SP_STATE_ACCEPTED_REPLY_INIT;
-                        in->payload_vector.iov_len
-                                = (unsigned long)frag->fragcurrent
-                                - (unsigned long)in->payload_vector.iov_base;
+                        priv->incoming.payload_vector.iov_len
+                                = (unsigned long)priv->incoming.frag.fragcurrent
+                                - (unsigned long)
+                                priv->incoming.payload_vector.iov_base;
                 }
                 break;
         }
@@ -1743,7 +1271,7 @@ out:
 }
 
 
-static inline int
+inline int
 __socket_read_simple_reply (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1751,7 +1279,7 @@ __socket_read_simple_reply (rpc_transport_t *this)
 
 #define rpc_xid_addr(buf) (buf)
 
-static inline int
+inline int
 __socket_read_reply (rpc_transport_t *this)
 {
         socket_private_t   *priv         = NULL;
@@ -1759,29 +1287,26 @@ __socket_read_reply (rpc_transport_t *this)
         int32_t             ret          = -1;
         rpc_request_info_t *request_info = NULL;
         char                map_xid      = 0;
-        struct gf_sock_incoming      *in         = NULL;
-        struct gf_sock_incoming_frag *frag       = NULL;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
-        in = &priv->incoming;
-        frag = &in->frag;
 
-        buf = rpc_xid_addr (iobuf_ptr (in->iobuf));
+        buf = rpc_xid_addr (iobuf_ptr (priv->incoming.iobuf));
 
-        if (in->request_info == NULL) {
-                in->request_info = GF_CALLOC (1, sizeof (*request_info),
-                                              gf_common_mt_rpc_trans_reqinfo_t);
-                if (in->request_info == NULL) {
+        if (priv->incoming.request_info == NULL) {
+                priv->incoming.request_info = GF_CALLOC (1,
+                                                         sizeof (*request_info),
+                                                         gf_common_mt_rpc_trans_reqinfo_t);
+                if (priv->incoming.request_info == NULL) {
                         goto out;
                 }
 
                 map_xid = 1;
         }
 
-        request_info = in->request_info;
+        request_info = priv->incoming.request_info;
 
         if (map_xid) {
                 request_info->xid = ntoh32 (*((uint32_t *) buf));
@@ -1793,22 +1318,24 @@ __socket_read_reply (rpc_transport_t *this)
                 {
                         ret = rpc_transport_notify (this,
                                                     RPC_TRANSPORT_MAP_XID_REQUEST,
-                                                    in->request_info);
+                                                    priv->incoming.request_info);
                 }
                 pthread_mutex_lock (&priv->lock);
 
                 if (ret == -1) {
-                        gf_log (this->name, GF_LOG_WARNING,
+                        gf_log ("", GF_LOG_WARNING,
                                 "notify for event MAP_XID failed");
                         goto out;
                 }
         }
 
-        if ((request_info->prognum == GLUSTER_FOP_PROGRAM)
+        if ((request_info->prognum == GLUSTER3_1_FOP_PROGRAM)
             && (request_info->procnum == GF_FOP_READ)) {
                 if (map_xid && request_info->rsp.rsp_payload_count != 0) {
-                        in->iobref = iobref_ref (request_info->rsp.rsp_iobref);
-                        in->payload_vector = *request_info->rsp.rsp_payload;
+                        priv->incoming.iobref
+                                = iobref_ref (request_info->rsp.rsp_iobref);
+                        priv->incoming.payload_vector
+                                = *request_info->rsp.rsp_payload;
                 }
 
                 ret = __socket_read_vectored_reply (this);
@@ -1821,47 +1348,42 @@ out:
 
 
 /* returns the number of bytes yet to be read in a fragment */
-static inline int
+inline int
 __socket_read_frag (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
         int32_t           ret            = 0;
         char             *buf            = NULL;
         uint32_t          remaining_size = 0;
-        struct gf_sock_incoming      *in         = NULL;
-        struct gf_sock_incoming_frag *frag       = NULL;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
-        /* used to reduce the indirection */
-        in = &priv->incoming;
-        frag = &in->frag;
 
-        switch (frag->state) {
+        switch (priv->incoming.frag.state) {
         case SP_STATE_NADA:
                 __socket_proto_init_pending (priv, RPC_MSGTYPE_SIZE);
 
-                frag->state = SP_STATE_READING_MSGTYPE;
+                priv->incoming.frag.state = SP_STATE_READING_MSGTYPE;
 
                 /* fall through */
 
         case SP_STATE_READING_MSGTYPE:
                 __socket_proto_read (priv, ret);
 
-                frag->state = SP_STATE_READ_MSGTYPE;
+                priv->incoming.frag.state = SP_STATE_READ_MSGTYPE;
                 /* fall through */
 
         case SP_STATE_READ_MSGTYPE:
-                buf = rpc_msgtype_addr (iobuf_ptr (in->iobuf));
-                in->msg_type = ntoh32 (*((uint32_t *)buf));
+                buf = rpc_msgtype_addr (iobuf_ptr (priv->incoming.iobuf));
+                priv->incoming.msg_type = ntoh32 (*((uint32_t *)buf));
 
-                if (in->msg_type == CALL) {
+                if (priv->incoming.msg_type == CALL) {
                         ret = __socket_read_request (this);
-                } else if (in->msg_type == REPLY) {
+                } else if (priv->incoming.msg_type == REPLY) {
                         ret = __socket_read_reply (this);
-                } else if (in->msg_type == GF_UNIVERSAL_ANSWER) {
+                } else if (priv->incoming.msg_type == GF_UNIVERSAL_ANSWER) {
                         gf_log ("rpc", GF_LOG_ERROR,
                                 "older version of protocol/process trying to "
                                 "connect from %s. use newer version on that node",
@@ -1869,17 +1391,19 @@ __socket_read_frag (rpc_transport_t *this)
                 } else {
                         gf_log ("rpc", GF_LOG_ERROR,
                                 "wrong MSG-TYPE (%d) received from %s",
-                                in->msg_type,
+                                priv->incoming.msg_type,
                                 this->peerinfo.identifier);
                         ret = -1;
                 }
 
-                remaining_size = RPC_FRAGSIZE (in->fraghdr) - frag->bytes_read;
+                remaining_size = RPC_FRAGSIZE (priv->incoming.fraghdr)
+                        - priv->incoming.frag.bytes_read;
 
                 if ((ret == -1)
-                    || ((ret == 0) && (remaining_size == 0)
-                        && (RPC_LASTFRAG (in->fraghdr)))) {
-                        frag->state = SP_STATE_NADA;
+                    || ((ret == 0)
+                        && (remaining_size == 0)
+                        && (RPC_LASTFRAG (priv->incoming.fraghdr)))) {
+                        priv->incoming.frag.state = SP_STATE_NADA;
                 }
 
                 break;
@@ -1890,36 +1414,31 @@ out:
 }
 
 
-static inline
+inline
 void __socket_reset_priv (socket_private_t *priv)
 {
-        struct gf_sock_incoming      *in         = NULL;
-
-        /* used to reduce the indirection */
-        in = &priv->incoming;
-
-        if (in->iobref) {
-                iobref_unref (in->iobref);
-                in->iobref = NULL;
+        if (priv->incoming.iobref) {
+                iobref_unref (priv->incoming.iobref);
+                priv->incoming.iobref = NULL;
         }
 
-        if (in->iobuf) {
-                iobuf_unref (in->iobuf);
+        if (priv->incoming.iobuf) {
+                iobuf_unref (priv->incoming.iobuf);
         }
 
-        if (in->request_info != NULL) {
-                GF_FREE (in->request_info);
-                in->request_info = NULL;
+        if (priv->incoming.request_info != NULL) {
+                GF_FREE (priv->incoming.request_info);
+                priv->incoming.request_info = NULL;
         }
 
-        memset (&in->payload_vector, 0,
-                sizeof (in->payload_vector));
+        memset (&priv->incoming.payload_vector, 0,
+                sizeof (priv->incoming.payload_vector));
 
-        in->iobuf = NULL;
+        priv->incoming.iobuf = NULL;
 }
 
 
-static int
+int
 __socket_proto_state_machine (rpc_transport_t *this,
                               rpc_transport_pollin_t **pollin)
 {
@@ -1928,40 +1447,53 @@ __socket_proto_state_machine (rpc_transport_t *this,
         struct iobuf     *iobuf  = NULL;
         struct iobref    *iobref = NULL;
         struct iovec      vector[2];
-        struct gf_sock_incoming      *in         = NULL;
-        struct gf_sock_incoming_frag *frag       = NULL;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
 
         priv = this->private;
-        /* used to reduce the indirection */
-        in = &priv->incoming;
-        frag = &in->frag;
-
-        while (in->record_state != SP_STATE_COMPLETE) {
-                switch (in->record_state) {
+        while (priv->incoming.record_state != SP_STATE_COMPLETE) {
+                switch (priv->incoming.record_state) {
 
                 case SP_STATE_NADA:
-                        in->total_bytes_read = 0;
-                        in->payload_vector.iov_len = 0;
+                        iobuf = iobuf_get (this->ctx->iobuf_pool);
+                        if (!iobuf) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
+
+                        priv->incoming.iobuf = iobuf;
+                        priv->incoming.iobuf_size = 0;
+                        priv->incoming.total_bytes_read = 0;
+                        priv->incoming.payload_vector.iov_len = 0;
 
-                        in->pending_vector = in->vector;
-                        in->pending_vector->iov_base =  &in->fraghdr;
+                        priv->incoming.pending_vector = priv->incoming.vector;
+                        priv->incoming.pending_vector->iov_base =
+                                &priv->incoming.fraghdr;
 
-                        in->pending_vector->iov_len  = sizeof (in->fraghdr);
+                        priv->incoming.frag.fragcurrent = iobuf_ptr (iobuf);
+                        priv->incoming.pending_vector->iov_len  =
+                                sizeof (priv->incoming.fraghdr);
 
-                        in->record_state = SP_STATE_READING_FRAGHDR;
+                        priv->incoming.record_state = SP_STATE_READING_FRAGHDR;
 
                         /* fall through */
 
                 case SP_STATE_READING_FRAGHDR:
-                        ret = __socket_readv (this, in->pending_vector, 1,
-                                              &in->pending_vector,
-                                              &in->pending_count,
+                        ret = __socket_readv (this,
+                                              priv->incoming.pending_vector, 1,
+                                              &priv->incoming.pending_vector,
+                                              &priv->incoming.pending_count,
                                               NULL);
-                        if (ret == -1)
+                        if (ret == -1) {
+                                gf_log (this->name,
+                                        ((priv->connected == 1) ?
+                                         GF_LOG_WARNING : GF_LOG_DEBUG),
+                                        "reading from socket failed. Error (%s)"
+                                        ", peer (%s)", strerror (errno),
+                                        this->peerinfo.identifier);
                                 goto out;
+                        }
 
                         if (ret > 0) {
                                 gf_log (this->name, GF_LOG_TRACE, "partial "
@@ -1970,40 +1502,33 @@ __socket_proto_state_machine (rpc_transport_t *this,
                         }
 
                         if (ret == 0) {
-                                in->record_state = SP_STATE_READ_FRAGHDR;
+                                priv->incoming.record_state =
+                                        SP_STATE_READ_FRAGHDR;
                         }
                         /* fall through */
 
                 case SP_STATE_READ_FRAGHDR:
 
-                        in->fraghdr = ntoh32 (in->fraghdr);
-                        in->total_bytes_read += RPC_FRAGSIZE(in->fraghdr);
-                        iobuf = iobuf_get2 (this->ctx->iobuf_pool,
-                                            (in->total_bytes_read +
-                                             sizeof (in->fraghdr)));
-                        if (!iobuf) {
-                                ret = -ENOMEM;
-                                goto out;
-                        }
-
-                        in->iobuf = iobuf;
-                        in->iobuf_size = 0;
-                        frag->fragcurrent = iobuf_ptr (iobuf);
-                        in->record_state = SP_STATE_READING_FRAG;
+                        priv->incoming.fraghdr = ntoh32 (priv->incoming.fraghdr);
+                        priv->incoming.record_state = SP_STATE_READING_FRAG;
+                        priv->incoming.total_bytes_read
+                                += RPC_FRAGSIZE(priv->incoming.fraghdr);
                         /* fall through */
 
                 case SP_STATE_READING_FRAG:
                         ret = __socket_read_frag (this);
 
-                        if ((ret == -1) ||
-                            (frag->bytes_read != RPC_FRAGSIZE (in->fraghdr))) {
+                        if ((ret == -1)
+                            || (priv->incoming.frag.bytes_read !=
+                                RPC_FRAGSIZE (priv->incoming.fraghdr))) {
                                 goto out;
                         }
 
-                        frag->bytes_read = 0;
+                        priv->incoming.frag.bytes_read = 0;
 
-                        if (!RPC_LASTFRAG (in->fraghdr)) {
-                                in->record_state = SP_STATE_READING_FRAGHDR;
+                        if (!RPC_LASTFRAG (priv->incoming.fraghdr)) {
+                                priv->incoming.record_state =
+                                        SP_STATE_READING_FRAGHDR;
                                 break;
                         }
 
@@ -2012,52 +1537,57 @@ __socket_proto_state_machine (rpc_transport_t *this,
                          */
                         if (pollin != NULL) {
                                 int count = 0;
-                                in->iobuf_size = (in->total_bytes_read -
-                                                  in->payload_vector.iov_len);
+                                priv->incoming.iobuf_size
+                                        = priv->incoming.total_bytes_read
+                                        - priv->incoming.payload_vector.iov_len;
 
                                 memset (vector, 0, sizeof (vector));
 
-                                if (in->iobref == NULL) {
-                                        in->iobref = iobref_new ();
-                                        if (in->iobref == NULL) {
+                                if (priv->incoming.iobref == NULL) {
+                                        priv->incoming.iobref = iobref_new ();
+                                        if (priv->incoming.iobref == NULL) {
                                                 ret = -1;
                                                 goto out;
                                         }
                                 }
 
-                                vector[count].iov_base = iobuf_ptr (in->iobuf);
-                                vector[count].iov_len = in->iobuf_size;
+                                vector[count].iov_base
+                                        = iobuf_ptr (priv->incoming.iobuf);
+                                vector[count].iov_len
+                                        = priv->incoming.iobuf_size;
 
-                                iobref = in->iobref;
+                                iobref = priv->incoming.iobref;
 
                                 count++;
 
-                                if (in->payload_vector.iov_base != NULL) {
-                                        vector[count] = in->payload_vector;
+                                if (priv->incoming.payload_vector.iov_base
+                                    != NULL) {
+                                        vector[count]
+                                                = priv->incoming.payload_vector;
                                         count++;
                                 }
 
                                 *pollin = rpc_transport_pollin_alloc (this,
                                                                       vector,
                                                                       count,
-                                                                      in->iobuf,
+                                                                      priv->incoming.iobuf,
                                                                       iobref,
-                                                                      in->request_info);
-                                iobuf_unref (in->iobuf);
-                                in->iobuf = NULL;
+                                                                      priv->incoming.request_info);
+                                iobuf_unref (priv->incoming.iobuf);
+                                priv->incoming.iobuf = NULL;
 
                                 if (*pollin == NULL) {
-                                        gf_log (this->name, GF_LOG_WARNING,
+                                        gf_log ("", GF_LOG_WARNING,
                                                 "transport pollin allocation failed");
                                         ret = -1;
                                         goto out;
                                 }
-                                if (in->msg_type == REPLY)
+                                if (priv->incoming.msg_type == REPLY)
                                         (*pollin)->is_reply = 1;
 
-                                in->request_info = NULL;
+                                priv->incoming.request_info = NULL;
                         }
-                        in->record_state = SP_STATE_COMPLETE;
+                        priv->incoming.record_state = SP_STATE_COMPLETE;
                         break;
 
                 case SP_STATE_COMPLETE:
@@ -2069,8 +1599,8 @@ __socket_proto_state_machine (rpc_transport_t *this,
                 }
         }
 
-        if (in->record_state == SP_STATE_COMPLETE) {
-                in->record_state = SP_STATE_NADA;
+        if (priv->incoming.record_state == SP_STATE_COMPLETE) {
+                priv->incoming.record_state = SP_STATE_NADA;
                 __socket_reset_priv (priv);
         }
 
@@ -2082,7 +1612,7 @@ out:
 }
 
 
-static int
+int
 socket_proto_state_machine (rpc_transport_t *this,
                             rpc_transport_pollin_t **pollin)
 {
@@ -2105,22 +1635,18 @@ out:
 }
 
 
-static int
+int
 socket_event_poll_in (rpc_transport_t *this)
 {
         int                     ret    = -1;
         rpc_transport_pollin_t *pollin = NULL;
-        socket_private_t       *priv = this->private;
 
         ret = socket_proto_state_machine (this, &pollin);
 
         if (pollin != NULL) {
-                priv->ot_state = OT_CALLBACK;
                 ret = rpc_transport_notify (this, RPC_TRANSPORT_MSG_RECEIVED,
                                             pollin);
-                if (priv->ot_state == OT_CALLBACK) {
-                        priv->ot_state = OT_RUNNING;
-                }
+
                 rpc_transport_pollin_destroy (pollin);
         }
 
@@ -2128,7 +1654,7 @@ socket_event_poll_in (rpc_transport_t *this)
 }
 
 
-static int
+int
 socket_connect_finish (rpc_transport_t *this)
 {
         int                   ret        = -1;
@@ -2143,11 +1669,9 @@ socket_connect_finish (rpc_transport_t *this)
 
         pthread_mutex_lock (&priv->lock);
         {
-                if (priv->connected != 0)
+                if (priv->connected)
                         goto unlock;
 
-                get_transport_identifiers (this);
-
                 ret = __socket_connect_finish (priv->sock);
 
                 if (ret == -1 && errno == EINPROGRESS)
@@ -2162,6 +1686,8 @@ socket_connect_finish (rpc_transport_t *this)
                                 priv->connect_finish_log = 1;
                         }
                         __socket_disconnect (this);
+                        notify_rpc = 1;
+                        event = RPC_TRANSPORT_DISCONNECT;
                         goto unlock;
                 }
 
@@ -2186,6 +1712,7 @@ socket_connect_finish (rpc_transport_t *this)
                         priv->connected = 1;
                         priv->connect_finish_log = 0;
                         event = RPC_TRANSPORT_CONNECT;
+                        get_transport_identifiers (this);
                 }
         }
 unlock:
@@ -2200,13 +1727,13 @@ out:
 
 
 /* reads rpc_requests during pollin */
-static int
+int
 socket_event_handler (int fd, int idx, void *data,
                       int poll_in, int poll_out, int poll_err)
 {
-        rpc_transport_t  *this = NULL;
+        rpc_transport_t      *this = NULL;
         socket_private_t *priv = NULL;
-	int               ret = -1;
+        int               ret = 0;
 
         this = data;
         GF_VALIDATE_OR_GOTO ("socket", this, out);
@@ -2216,13 +1743,16 @@ socket_event_handler (int fd, int idx, void *data,
         THIS = this->xl;
         priv = this->private;
 
+
         pthread_mutex_lock (&priv->lock);
         {
                 priv->idx = idx;
         }
         pthread_mutex_unlock (&priv->lock);
 
-	ret = (priv->connected == 1) ? 0 : socket_connect_finish(this);
+        if (!priv->connected) {
+                ret = socket_connect_finish (this);
+        }
 
         if (!ret && poll_out) {
                 ret = socket_event_poll_out (this);
@@ -2238,198 +1768,14 @@ socket_event_handler (int fd, int idx, void *data,
                         "disconnecting now");
                 socket_event_poll_err (this);
                 rpc_transport_unref (this);
-	}
-
-out:
-	return ret;
-}
-
-
-static void *
-socket_poller (void *ctx)
-{
-        rpc_transport_t  *this = ctx;
-        socket_private_t *priv = this->private;
-	struct pollfd     pfd[2] = {{0,},};
-	gf_boolean_t      to_write = _gf_false;
-	int               ret = 0;
-        uint32_t          gen = 0;
-
-        priv->ot_state = OT_RUNNING;
-
-        if (priv->use_ssl) {
-                if (ssl_setup_connection(this,priv->connected) < 0) {
-                        gf_log (this->name,GF_LOG_ERROR, "%s setup failed",
-                                priv->connected ? "server" : "client");
-                        goto err;
-                }
         }
 
-        if (!priv->bio) {
-                ret = __socket_nonblock (priv->sock);
-                if (ret == -1) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "NBIO on %d failed (%s)",
-                                priv->sock, strerror (errno));
-                        goto err;
-                }
-        }
-
-        if (priv->connected == 0) {
-		THIS = this->xl;
-                ret = socket_connect_finish (this);
-                if (ret != 0) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "asynchronous socket_connect_finish failed");
-                }
-        }
-
-        ret = rpc_transport_notify (this->listener,
-                                    RPC_TRANSPORT_ACCEPT, this);
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "asynchronous rpc_transport_notify failed");
-        }
-
-        gen = priv->ot_gen;
-	for (;;) {
-		pthread_mutex_lock(&priv->lock);
-		to_write = !list_empty(&priv->ioq);
-		pthread_mutex_unlock(&priv->lock);
-		pfd[0].fd = priv->pipe[0];
-		pfd[0].events = POLL_MASK_ERROR;
-		pfd[0].revents = 0;
-		pfd[1].fd = priv->sock;
-		pfd[1].events = POLL_MASK_INPUT | POLL_MASK_ERROR;
-		pfd[1].revents = 0;
-		if (to_write) {
-			pfd[1].events |= POLL_MASK_OUTPUT;
-		}
-		else {
-			pfd[0].events |= POLL_MASK_INPUT;
-		}
-		if (poll(pfd,2,-1) < 0) {
-			gf_log(this->name,GF_LOG_ERROR,"poll failed");
-			break;
-		}
-		if (pfd[0].revents & POLL_MASK_ERROR) {
-			gf_log(this->name,GF_LOG_ERROR,
-			       "poll error on pipe");
-			break;
-		}
-		/* Only glusterd actually seems to need this. */
-		THIS = this->xl;
-		if (pfd[1].revents & POLL_MASK_INPUT) {
-			ret = socket_event_poll_in(this);
-			if (ret >= 0) {
-				/* Suppress errors while making progress. */
-				pfd[1].revents &= ~POLL_MASK_ERROR;
-			}
-			else if (errno == ENOTCONN) {
-				ret = 0;
-			}
-                        if (priv->ot_state == OT_PLEASE_DIE) {
-                                gf_log (this->name, GF_LOG_TRACE,
-                                        "OT_IDLE on %p (input request)",
-                                        this);
-                                priv->ot_state = OT_IDLE;
-                                break;
-                        }
-		}
-		else if (pfd[1].revents & POLL_MASK_OUTPUT) {
-			ret = socket_event_poll_out(this);
-			if (ret >= 0) {
-				/* Suppress errors while making progress. */
-				pfd[1].revents &= ~POLL_MASK_ERROR;
-			}
-			else if (errno == ENOTCONN) {
-				ret = 0;
-			}
-                        if (priv->ot_state == OT_PLEASE_DIE) {
-                                gf_log (this->name, GF_LOG_TRACE,
-                                        "OT_IDLE on %p (output request)",
-                                        this);
-                                priv->ot_state = OT_IDLE;
-                                break;
-                        }
-		}
-		else {
-			/*
-			 * This usually means that we left poll() because
-			 * somebody pushed a byte onto our pipe.  That wakeup
-			 * is why the pipe is there, but once awake we can do
-			 * all the checking we need on the next iteration.
-			 */
-			ret = 0;
-		}
-		if (pfd[1].revents & POLL_MASK_ERROR) {
-			gf_log(this->name,GF_LOG_ERROR,
-			       "poll error on socket");
-			break;
-		}
-		if (ret < 0) {
-			gf_log(this->name,GF_LOG_ERROR,
-			       "error in polling loop");
-			break;
-		}
-                if (priv->ot_gen != gen) {
-                        gf_log (this->name, GF_LOG_TRACE,
-                                "generation mismatch, my %u != %u",
-                                gen, priv->ot_gen);
-                        return NULL;
-                }
-	}
-
-err:
-	/* All (and only) I/O errors should come here. */
-        pthread_mutex_lock(&priv->lock);
-        if (priv->ssl_ssl) {
-                /*
-                 * We're always responsible for this part, but only actually
-                 * have to do it if we got far enough for ssl_ssl to be valid
-                 * (i.e. errors in ssl_setup_connection don't count).
-                 */
-                ssl_teardown_connection(priv);
-        }
-        __socket_shutdown(this);
-        close(priv->sock);
-        priv->sock = -1;
-        priv->ot_state = OT_IDLE;
-        pthread_mutex_unlock(&priv->lock);
-        rpc_transport_notify (this->listener, RPC_TRANSPORT_DISCONNECT,
-                              this);
-        rpc_transport_unref (this);
-	return NULL;
+out:
+        return 0;
 }
 
 
-static void
-socket_spawn (rpc_transport_t *this)
-{
-        socket_private_t        *priv   = this->private;
-
-        switch (priv->ot_state) {
-        case OT_IDLE:
-        case OT_PLEASE_DIE:
-                break;
-        default:
-                gf_log (this->name, GF_LOG_WARNING,
-                        "refusing to start redundant poller");
-                return;
-        }
-
-        priv->ot_gen += 7;
-        priv->ot_state = OT_SPAWNING;
-        gf_log (this->name, GF_LOG_TRACE,
-                "spawning %p with gen %u", this, priv->ot_gen);
-
-        if (gf_thread_create(&priv->thread,NULL,socket_poller,this) != 0) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "could not create poll thread");
-        }
-}
-
-static int
+int
 socket_server_event_handler (int fd, int idx, void *data,
                              int poll_in, int poll_out, int poll_err)
 {
@@ -2467,7 +1813,20 @@ socket_server_event_handler (int fd, int idx, void *data,
                                 goto unlock;
                         }
 
-                        if (priv->nodelay && (new_sockaddr.ss_family != AF_UNIX)) {
+                        if (!priv->bio) {
+                                ret = __socket_nonblock (new_sock);
+
+                                if (ret == -1) {
+                                        gf_log (this->name, GF_LOG_WARNING,
+                                                "NBIO on %d failed (%s)",
+                                                new_sock, strerror (errno));
+
+                                        close (new_sock);
+                                        goto unlock;
+                                }
+                        }
+
+                        if (priv->nodelay) {
                                 ret = __socket_nodelay (new_sock);
                                 if (ret == -1) {
                                         gf_log (this->name, GF_LOG_WARNING,
@@ -2477,10 +1836,8 @@ socket_server_event_handler (int fd, int idx, void *data,
                                 }
                         }
 
-                        if (priv->keepalive &&
-                            new_sockaddr.ss_family != AF_UNIX) {
+                        if (priv->keepalive) {
                                 ret = __socket_keepalive (new_sock,
-                                                          new_sockaddr.ss_family,
                                                           priv->keepaliveintvl,
                                                           priv->keepaliveidle);
                                 if (ret == -1)
@@ -2494,15 +1851,6 @@ socket_server_event_handler (int fd, int idx, void *data,
                         if (!new_trans)
                                 goto unlock;
 
-                        ret = pthread_mutex_init(&new_trans->lock, NULL);
-                        if (ret == -1) {
-                                gf_log (this->name, GF_LOG_WARNING,
-                                        "pthread_mutex_init() failed: %s",
-                                        strerror (errno));
-                                close (new_sock);
-                                goto unlock;
-                        }
-
                         new_trans->name = gf_strdup (this->name);
 
                         memcpy (&new_trans->peerinfo.sockaddr, &new_sockaddr,
@@ -2524,11 +1872,7 @@ socket_server_event_handler (int fd, int idx, void *data,
                         }
 
                         get_transport_identifiers (new_trans);
-                        ret = socket_init(new_trans);
-                        if (ret != 0) {
-                                close(new_sock);
-                                goto unlock;
-                        }
+                        socket_init (new_trans);
                         new_trans->ops = this->ops;
                         new_trans->init = this->init;
                         new_trans->fini = this->fini;
@@ -2539,74 +1883,30 @@ socket_server_event_handler (int fd, int idx, void *data,
                         new_trans->listener = this;
                         new_priv = new_trans->private;
 
-			new_priv->use_ssl = priv->use_ssl;
-			new_priv->sock = new_sock;
-			new_priv->own_thread = priv->own_thread;
-
-                        new_priv->ssl_ctx = priv->ssl_ctx;
-			if (priv->use_ssl && !priv->own_thread) {
-				if (ssl_setup_connection(new_trans,1) < 0) {
-					gf_log(this->name,GF_LOG_ERROR,
-					       "server setup failed");
-					close(new_sock);
-					goto unlock;
-				}
-			}
-
-                        if (!priv->bio && !priv->own_thread) {
-                                ret = __socket_nonblock (new_sock);
-
-                                if (ret == -1) {
-                                        gf_log (this->name, GF_LOG_WARNING,
-                                                "NBIO on %d failed (%s)",
-                                                new_sock, strerror (errno));
-
-                                        close (new_sock);
-                                        goto unlock;
-                                }
-                        }
-
                         pthread_mutex_lock (&new_priv->lock);
                         {
-                                /*
-                                 * In the own_thread case, this is used to
-                                 * indicate that we're initializing a server
-                                 * connection.
-                                 */
+                                new_priv->sock = new_sock;
                                 new_priv->connected = 1;
-                                new_priv->is_server = _gf_true;
                                 rpc_transport_ref (new_trans);
 
-				if (new_priv->own_thread) {
-					if (pipe(new_priv->pipe) < 0) {
-						gf_log(this->name,GF_LOG_ERROR,
-						       "could not create pipe");
-					}
-                                        socket_spawn(new_trans);
-				}
-				else {
-					new_priv->idx =
-						event_register (ctx->event_pool,
-								new_sock,
-								socket_event_handler,
-								new_trans,
-								1, 0);
-					if (new_priv->idx == -1)
-						ret = -1;
-				}
+                                new_priv->idx =
+                                        event_register (ctx->event_pool,
+                                                        new_sock,
+                                                        socket_event_handler,
+                                                        new_trans, 1, 0);
 
+                                if (new_priv->idx == -1)
+                                        ret = -1;
                         }
                         pthread_mutex_unlock (&new_priv->lock);
                         if (ret == -1) {
-                                gf_log (this->name, GF_LOG_WARNING,
+                                gf_log ("", GF_LOG_WARNING,
                                         "failed to register the socket with event");
                                 goto unlock;
                         }
 
-                        if (!priv->own_thread) {
-                                ret = rpc_transport_notify (this,
-                                        RPC_TRANSPORT_ACCEPT, new_trans);
-                        }
+                        ret = rpc_transport_notify (this, RPC_TRANSPORT_ACCEPT,
+                                                    new_trans);
                 }
         }
 unlock:
@@ -2617,7 +1917,7 @@ out:
 }
 
 
-static int
+int
 socket_disconnect (rpc_transport_t *this)
 {
         socket_private_t *priv = NULL;
@@ -2639,18 +1939,16 @@ out:
 }
 
 
-static int
+int
 socket_connect (rpc_transport_t *this, int port)
 {
         int                      ret = -1;
         int                      sock = -1;
         socket_private_t        *priv = NULL;
+        struct sockaddr_storage  sockaddr = {0, };
         socklen_t                sockaddr_len = 0;
         glusterfs_ctx_t         *ctx = NULL;
         sa_family_t              sa_family = {0, };
-        char                    *local_addr   = NULL;
-        union gf_sock_union      sock_union;
-        struct sockaddr_in      *addr         = NULL;
 
         GF_VALIDATE_OR_GOTO ("socket", this, err);
         GF_VALIDATE_OR_GOTO ("socket", this->private, err);
@@ -2673,39 +1971,20 @@ socket_connect (rpc_transport_t *this, int port)
         if (sock != -1) {
                 gf_log_callingfn (this->name, GF_LOG_TRACE,
                                   "connect () called on transport already connected");
-                errno = EINPROGRESS;
-                ret = -1;
+                ret = 0;
                 goto err;
         }
 
-        gf_log (this->name, GF_LOG_TRACE,
-                "connecting %p, state=%u gen=%u sock=%d", this,
-                priv->ot_state, priv->ot_gen, priv->sock);
-
-        ret = socket_client_get_remote_sockaddr (this, &sock_union.sa,
+        ret = socket_client_get_remote_sockaddr (this, SA (&sockaddr),
                                                  &sockaddr_len, &sa_family);
         if (ret == -1) {
                 /* logged inside client_get_remote_sockaddr */
                 goto err;
         }
 
-        if (port > 0) {
-                sock_union.sin.sin_port = htons (port);
-        }
-        if (ntohs(sock_union.sin.sin_port) == GF_DEFAULT_SOCKET_LISTEN_PORT) {
-                if (priv->use_ssl) {
-                        gf_log(this->name,GF_LOG_DEBUG,
-                               "disabling SSL for portmapper connection");
-                        priv->use_ssl = _gf_false;
-                }
-        }
-        else {
-                if (priv->ssl_enabled && !priv->use_ssl) {
-                        gf_log(this->name,GF_LOG_DEBUG,
-                               "re-enabling SSL for I/O connection");
-                        priv->use_ssl = _gf_true;
-                }
-        }
+        if (port > 0)
+                ((struct sockaddr_in *) (&sockaddr))->sin_port = htons (port);
+
         pthread_mutex_lock (&priv->lock);
         {
                 if (priv->sock != -1) {
@@ -2714,8 +1993,7 @@ socket_connect (rpc_transport_t *this, int port)
                         goto unlock;
                 }
 
-                memcpy (&this->peerinfo.sockaddr, &sock_union.storage,
-                        sockaddr_len);
+                memcpy (&this->peerinfo.sockaddr, &sockaddr, sockaddr_len);
                 this->peerinfo.sockaddr_len = sockaddr_len;
 
                 priv->sock = socket (sa_family, SOCK_STREAM, 0);
@@ -2729,41 +2007,49 @@ socket_connect (rpc_transport_t *this, int port)
                 /* Cant help if setting socket options fails. We can continue
                  * working nonetheless.
                  */
-                if (priv->windowsize != 0) {
-                        if (setsockopt (priv->sock, SOL_SOCKET, SO_RCVBUF,
-                                        &priv->windowsize,
-                                        sizeof (priv->windowsize)) < 0) {
-                                gf_log (this->name, GF_LOG_ERROR,
-                                        "setting receive window "
-                                        "size failed: %d: %d: %s",
-                                        priv->sock, priv->windowsize,
-                                        strerror (errno));
-                        }
+                if (setsockopt (priv->sock, SOL_SOCKET, SO_RCVBUF,
+                                &priv->windowsize,
+                                sizeof (priv->windowsize)) < 0) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "setting receive window size failed: %d: %d: "
+                                "%s", priv->sock, priv->windowsize,
+                                strerror (errno));
+                }
+
+                if (setsockopt (priv->sock, SOL_SOCKET, SO_SNDBUF,
+                                &priv->windowsize,
+                                sizeof (priv->windowsize)) < 0) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "setting send window size failed: %d: %d: "
+                                "%s", priv->sock, priv->windowsize,
+                                strerror (errno));
+                }
 
-                        if (setsockopt (priv->sock, SOL_SOCKET, SO_SNDBUF,
-                                        &priv->windowsize,
-                                        sizeof (priv->windowsize)) < 0) {
+
+                if (priv->nodelay) {
+                        ret = __socket_nodelay (priv->sock);
+                        if (ret == -1) {
                                 gf_log (this->name, GF_LOG_ERROR,
-                                        "setting send window size "
-                                        "failed: %d: %d: %s",
-                                        priv->sock, priv->windowsize,
+                                        "setsockopt() failed for NODELAY (%s)",
                                         strerror (errno));
                         }
                 }
 
-                if (priv->nodelay && (sa_family != AF_UNIX)) {
-                        ret = __socket_nodelay (priv->sock);
+                if (!priv->bio) {
+                        ret = __socket_nonblock (priv->sock);
 
                         if (ret == -1) {
                                 gf_log (this->name, GF_LOG_ERROR,
-                                        "NODELAY on %d failed (%s)",
+                                        "NBIO on %d failed (%s)",
                                         priv->sock, strerror (errno));
+                                close (priv->sock);
+                                priv->sock = -1;
+                                goto unlock;
                         }
                 }
 
-                if (priv->keepalive && sa_family != AF_UNIX) {
+                if (priv->keepalive) {
                         ret = __socket_keepalive (priv->sock,
-                                                  sa_family,
                                                   priv->keepaliveintvl,
                                                   priv->keepaliveidle);
                         if (ret == -1)
@@ -2775,15 +2061,6 @@ socket_connect (rpc_transport_t *this, int port)
                 SA (&this->myinfo.sockaddr)->sa_family =
                         SA (&this->peerinfo.sockaddr)->sa_family;
 
-                /* If a source addr is explicitly specified, use it */
-                ret = dict_get_str (this->options,
-                                    "transport.socket.source-addr",
-                                    &local_addr);
-                if (!ret && SA (&this->myinfo.sockaddr)->sa_family == AF_INET) {
-                        addr = (struct sockaddr_in *)(&this->myinfo.sockaddr);
-                        ret = inet_pton (AF_INET, local_addr, &(addr->sin_addr.s_addr));
-                }
-
                 ret = client_bind (this, SA (&this->myinfo.sockaddr),
                                    &this->myinfo.sockaddr_len, priv->sock);
                 if (ret == -1) {
@@ -2794,86 +2071,29 @@ socket_connect (rpc_transport_t *this, int port)
                         goto unlock;
                 }
 
-                if (!priv->use_ssl && !priv->bio && !priv->own_thread) {
-                        ret = __socket_nonblock (priv->sock);
-                        if (ret == -1) {
-                                gf_log (this->name, GF_LOG_ERROR,
-                                        "NBIO on %d failed (%s)",
-                                        priv->sock, strerror (errno));
-                                close (priv->sock);
-                                priv->sock = -1;
-                                goto unlock;
-                        }
-                }
-
                 ret = connect (priv->sock, SA (&this->peerinfo.sockaddr),
                                this->peerinfo.sockaddr_len);
 
-                if (ret == -1 && ((errno != EINPROGRESS) && (errno != ENOENT))) {
-                        /* For unix path based sockets, the socket path is
-                         * cryptic (md5sum of path) and may not be useful for
-                         * the user in debugging so log it in DEBUG
-                         */
-                        gf_log (this->name, ((sa_family == AF_UNIX) ?
-                                GF_LOG_DEBUG : GF_LOG_ERROR),
-                                "connection attempt on %s failed, (%s)",
-                                this->peerinfo.identifier, strerror (errno));
+                if (ret == -1 && errno != EINPROGRESS) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "connection attempt failed (%s)",
+                                strerror (errno));
                         close (priv->sock);
                         priv->sock = -1;
                         goto unlock;
                 }
 
-		if (priv->use_ssl && !priv->own_thread) {
-			ret = ssl_setup_connection(this,0);
-			if (ret < 0) {
-				gf_log(this->name,GF_LOG_ERROR,
-					"client setup failed");
-				close(priv->sock);
-				priv->sock = -1;
-				goto unlock;
-			}
-		}
-
-                if (!priv->bio && !priv->own_thread) {
-                        ret = __socket_nonblock (priv->sock);
-
-                        if (ret == -1) {
-                                gf_log (this->name, GF_LOG_ERROR,
-                                        "NBIO on %d failed (%s)",
-                                        priv->sock, strerror (errno));
-                                close (priv->sock);
-                                priv->sock = -1;
-                                goto unlock;
-                        }
-                }
-
-                /*
-                 * In the own_thread case, this is used to indicate that we're
-                 * initializing a client connection.
-                 */
                 priv->connected = 0;
-                priv->is_server = _gf_false;
+
                 rpc_transport_ref (this);
 
-		if (priv->own_thread) {
-			if (pipe(priv->pipe) < 0) {
-				gf_log(this->name,GF_LOG_ERROR,
-				       "could not create pipe");
-			}
-
-                        this->listener = this;
-                        socket_spawn(this);
-		}
-		else {
-			priv->idx = event_register (ctx->event_pool, priv->sock,
-						    socket_event_handler,
-						    this, 1, 1);
-			if (priv->idx == -1) {
-				gf_log ("", GF_LOG_WARNING,
-					"failed to register the event");
-				ret = -1;
-			}
-		}
+                priv->idx = event_register (ctx->event_pool, priv->sock,
+                                            socket_event_handler, this, 1, 1);
+                if (priv->idx == -1) {
+                        gf_log ("", GF_LOG_WARNING,
+                                "failed to register the event");
+                        ret = -1;
+                }
         }
 unlock:
         pthread_mutex_unlock (&priv->lock);
@@ -2883,14 +2103,14 @@ err:
 }
 
 
-static int
+int
 socket_listen (rpc_transport_t *this)
 {
         socket_private_t *       priv = NULL;
         int                      ret = -1;
         int                      sock = -1;
         struct sockaddr_storage  sockaddr;
-        socklen_t                sockaddr_len = 0;
+        socklen_t                sockaddr_len;
         peer_info_t             *myinfo = NULL;
         glusterfs_ctx_t         *ctx = NULL;
         sa_family_t              sa_family = {0, };
@@ -2910,7 +2130,7 @@ socket_listen (rpc_transport_t *this)
 
         if (sock != -1)  {
                 gf_log_callingfn (this->name, GF_LOG_DEBUG,
-                                  "already listening");
+                                  "alreading listening");
                 return ret;
         }
 
@@ -2943,29 +2163,25 @@ socket_listen (rpc_transport_t *this)
                 /* Cant help if setting socket options fails. We can continue
                  * working nonetheless.
                  */
-                if (priv->windowsize != 0) {
-                        if (setsockopt (priv->sock, SOL_SOCKET, SO_RCVBUF,
-                                        &priv->windowsize,
-                                        sizeof (priv->windowsize)) < 0) {
-                                gf_log (this->name, GF_LOG_ERROR,
-                                        "setting receive window size "
-                                        "failed: %d: %d: %s", priv->sock,
-                                        priv->windowsize,
-                                        strerror (errno));
-                        }
+                if (setsockopt (priv->sock, SOL_SOCKET, SO_RCVBUF,
+                                &priv->windowsize,
+                                sizeof (priv->windowsize)) < 0) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "setting receive window size failed: %d: %d: "
+                                "%s", priv->sock, priv->windowsize,
+                                strerror (errno));
+                }
 
-                        if (setsockopt (priv->sock, SOL_SOCKET, SO_SNDBUF,
-                                        &priv->windowsize,
-                                        sizeof (priv->windowsize)) < 0) {
-                                gf_log (this->name, GF_LOG_ERROR,
-                                        "setting send window size failed:"
-                                        " %d: %d: %s", priv->sock,
-                                        priv->windowsize,
-                                        strerror (errno));
-                        }
+                if (setsockopt (priv->sock, SOL_SOCKET, SO_SNDBUF,
+                                &priv->windowsize,
+                                sizeof (priv->windowsize)) < 0) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "setting send window size failed: %d: %d: "
+                                "%s", priv->sock, priv->windowsize,
+                                strerror (errno));
                 }
 
-                if (priv->nodelay && (sa_family != AF_UNIX)) {
+                if (priv->nodelay) {
                         ret = __socket_nodelay (priv->sock);
                         if (ret == -1) {
                                 gf_log (this->name, GF_LOG_ERROR,
@@ -3034,7 +2250,7 @@ out:
 }
 
 
-static int32_t
+int32_t
 socket_submit_request (rpc_transport_t *this, rpc_transport_req_t *req)
 {
         socket_private_t *priv = NULL;
@@ -3043,7 +2259,6 @@ socket_submit_request (rpc_transport_t *this, rpc_transport_req_t *req)
         char              need_append = 1;
         struct ioq       *entry = NULL;
         glusterfs_ctx_t  *ctx = NULL;
-	char              a_byte = 'j';
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
@@ -3069,31 +2284,21 @@ socket_submit_request (rpc_transport_t *this, rpc_transport_req_t *req)
                         goto unlock;
 
                 if (list_empty (&priv->ioq)) {
-                        ret = __socket_ioq_churn_entry (this, entry, 1);
+                        ret = __socket_ioq_churn_entry (this, entry);
 
-                        if (ret == 0) {
+                        if (ret == 0)
                                 need_append = 0;
-			}
-                        if (ret > 0) {
+
+                        if (ret > 0)
                                 need_poll_out = 1;
-			}
                 }
 
                 if (need_append) {
                         list_add_tail (&entry->list, &priv->ioq);
-			if (priv->own_thread) {
-				/*
-				 * Make sure the polling thread wakes up, by
-				 * writing a byte to represent this entry.
-				 */
-				if (write(priv->pipe[1],&a_byte,1) < 1) {
-					gf_log(this->name,GF_LOG_WARNING,
-					       "write error on pipe");
-				}
-			}
                         ret = 0;
                 }
-                if (!priv->own_thread && need_poll_out) {
+
+                if (need_poll_out) {
                         /* first entry to wait. continue writing on POLLOUT */
                         priv->idx = event_select_on (ctx->event_pool,
                                                      priv->sock,
@@ -3108,7 +2313,7 @@ out:
 }
 
 
-static int32_t
+int32_t
 socket_submit_reply (rpc_transport_t *this, rpc_transport_reply_t *reply)
 {
         socket_private_t *priv = NULL;
@@ -3117,7 +2322,6 @@ socket_submit_reply (rpc_transport_t *this, rpc_transport_reply_t *reply)
         char              need_append = 1;
         struct ioq       *entry = NULL;
         glusterfs_ctx_t  *ctx = NULL;
-	char              a_byte = 'd';
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
@@ -3136,44 +2340,33 @@ socket_submit_reply (rpc_transport_t *this, rpc_transport_reply_t *reply)
                         }
                         goto unlock;
                 }
-
                 priv->submit_log = 0;
                 entry = __socket_ioq_new (this, &reply->msg);
                 if (!entry)
                         goto unlock;
-
                 if (list_empty (&priv->ioq)) {
-                        ret = __socket_ioq_churn_entry (this, entry, 1);
+                        ret = __socket_ioq_churn_entry (this, entry);
 
-                        if (ret == 0) {
+                        if (ret == 0)
                                 need_append = 0;
-			}
-                        if (ret > 0) {
+
+                        if (ret > 0)
                                 need_poll_out = 1;
-			}
                 }
 
                 if (need_append) {
                         list_add_tail (&entry->list, &priv->ioq);
-			if (priv->own_thread) {
-				/*
-				 * Make sure the polling thread wakes up, by
-				 * writing a byte to represent this entry.
-				 */
-				if (write(priv->pipe[1],&a_byte,1) < 1) {
-					gf_log(this->name,GF_LOG_WARNING,
-					       "write error on pipe");
-				}
-			}
                         ret = 0;
                 }
-                if (!priv->own_thread && need_poll_out) {
+
+                if (need_poll_out) {
                         /* first entry to wait. continue writing on POLLOUT */
                         priv->idx = event_select_on (ctx->event_pool,
                                                      priv->sock,
                                                      priv->idx, -1, 1);
                 }
         }
+
 unlock:
         pthread_mutex_unlock (&priv->lock);
 
@@ -3182,7 +2375,7 @@ out:
 }
 
 
-static int32_t
+int32_t
 socket_getpeername (rpc_transport_t *this, char *hostname, int hostlen)
 {
         int32_t ret = -1;
@@ -3201,7 +2394,7 @@ out:
 }
 
 
-static int32_t
+int32_t
 socket_getpeeraddr (rpc_transport_t *this, char *peeraddr, int addrlen,
                     struct sockaddr_storage *sa, socklen_t salen)
 {
@@ -3215,14 +2408,13 @@ socket_getpeeraddr (rpc_transport_t *this, char *peeraddr, int addrlen,
         if (peeraddr != NULL) {
                 ret = socket_getpeername (this, peeraddr, addrlen);
         }
-        ret = 0;
 
 out:
         return ret;
 }
 
 
-static int32_t
+int32_t
 socket_getmyname (rpc_transport_t *this, char *hostname, int hostlen)
 {
         int32_t ret = -1;
@@ -3241,7 +2433,7 @@ out:
 }
 
 
-static int32_t
+int32_t
 socket_getmyaddr (rpc_transport_t *this, char *myaddr, int addrlen,
                   struct sockaddr_storage *sa, socklen_t salen)
 {
@@ -3261,25 +2453,6 @@ out:
 }
 
 
-static int
-socket_throttle (rpc_transport_t *this, gf_boolean_t onoff)
-{
-        socket_private_t *priv = NULL;
-
-        priv = this->private;
-
-        /* The way we implement throttling is by taking off
-           POLLIN event from the polled flags. This way we
-           never get called with the POLLIN event and therefore
-           will never read() any more data until throttling
-           is turned off.
-        */
-        priv->idx = event_select_on (this->ctx->event_pool, priv->sock,
-                                     priv->idx, (int) !onoff, -1);
-        return 0;
-}
-
-
 struct rpc_transport_ops tops = {
         .listen             = socket_listen,
         .connect            = socket_connect,
@@ -3290,17 +2463,15 @@ struct rpc_transport_ops tops = {
         .get_peeraddr       = socket_getpeeraddr,
         .get_myname         = socket_getmyname,
         .get_myaddr         = socket_getmyaddr,
-	.throttle           = socket_throttle,
 };
 
 int
 reconfigure (rpc_transport_t *this, dict_t *options)
 {
-        socket_private_t *priv          = NULL;
-        gf_boolean_t      tmp_bool      = _gf_false;
-        char             *optstr        = NULL;
-        int               ret           = 0;
-        uint64_t          windowsize    = 0;
+        socket_private_t *priv = NULL;
+        gf_boolean_t      tmp_bool = _gf_false;
+        char             *optstr = NULL;
+        int               ret = 0;
 
         GF_VALIDATE_OR_GOTO ("socket", this, out);
         GF_VALIDATE_OR_GOTO ("socket", this->private, out);
@@ -3328,26 +2499,13 @@ reconfigure (rpc_transport_t *this, dict_t *options)
         }
         else
                 priv->keepalive = 1;
-
-        optstr = NULL;
-        if (dict_get_str (this->options, "tcp-window-size",
-                          &optstr) == 0) {
-                if (gf_string2bytesize (optstr, &windowsize) != 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "invalid number format: %s", optstr);
-                        goto out;
-                }
-        }
-
-        priv->windowsize = (int)windowsize;
-
         ret = 0;
 out:
         return ret;
 
 }
 
-static int
+int
 socket_init (rpc_transport_t *this)
 {
         socket_private_t *priv = NULL;
@@ -3356,7 +2514,6 @@ socket_init (rpc_transport_t *this)
         char             *optstr = NULL;
         uint32_t          keepalive = 0;
         uint32_t          backlog = 0;
-	int               session_id = 0;
 
         if (this->private) {
                 gf_log_callingfn (this->name, GF_LOG_ERROR,
@@ -3368,7 +2525,6 @@ socket_init (rpc_transport_t *this)
         if (!priv) {
                 return -1;
         }
-        memset(priv,0,sizeof(*priv));
 
         pthread_mutex_init (&priv->lock, NULL);
 
@@ -3378,6 +2534,7 @@ socket_init (rpc_transport_t *this)
         priv->nodelay = 1;
         priv->bio = 0;
         priv->windowsize = GF_DEFAULT_SOCKET_WINDOW_SIZE;
+
         INIT_LIST_HEAD (&priv->ioq);
 
         /* All the below section needs 'this->options' to be present */
@@ -3422,8 +2579,9 @@ socket_init (rpc_transport_t *this)
                 }
         }
 
+
         optstr = NULL;
-        if (dict_get_str (this->options, "tcp-window-size",
+        if (dict_get_str (this->options, "transport.window-size",
                           &optstr) == 0) {
                 if (gf_string2bytesize (optstr, &windowsize) != 0) {
                         gf_log (this->name, GF_LOG_ERROR,
@@ -3432,9 +2590,8 @@ socket_init (rpc_transport_t *this)
                 }
         }
 
-        priv->windowsize = (int)windowsize;
-
         optstr = NULL;
+
         /* Enable Keep-alive by default. */
         priv->keepalive = 1;
         priv->keepaliveintvl = 2;
@@ -3470,150 +2627,11 @@ socket_init (rpc_transport_t *this)
                 priv->backlog = backlog;
         }
 
-        optstr = NULL;
-
-         /* Check if socket read failures are to be logged */
-        priv->read_fail_log = 1;
-        if (dict_get (this->options, "transport.socket.read-fail-log")) {
-                optstr = data_to_str (dict_get (this->options, "transport.socket.read-fail-log"));
-                if (gf_string2boolean (optstr, &tmp_bool) == -1) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                   "'transport.socket.read-fail-log' takes only "
-                                   "boolean options; logging socket read fails");
-                }
-                else if (tmp_bool == _gf_false) {
-                        priv->read_fail_log = 0;
-                }
-        }
-
         priv->windowsize = (int)windowsize;
-
-        priv->ssl_enabled = _gf_false;
-	if (dict_get_str(this->options,SSL_ENABLED_OPT,&optstr) == 0) {
-                if (gf_string2boolean (optstr, &priv->ssl_enabled) != 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-				"invalid value given for ssl-enabled boolean");
-		}
-	}
-
-        priv->ssl_own_cert = DEFAULT_CERT_PATH;
-	if (dict_get_str(this->options,SSL_OWN_CERT_OPT,&optstr) == 0) {
-                if (!priv->ssl_enabled) {
-                        gf_log(this->name,GF_LOG_WARNING,
-                               "%s specified without %s (ignored)",
-                               SSL_OWN_CERT_OPT, SSL_ENABLED_OPT);
-                }
-                priv->ssl_own_cert = optstr;
-	}
-        priv->ssl_own_cert = gf_strdup(priv->ssl_own_cert);
-
-        priv->ssl_private_key = DEFAULT_KEY_PATH;
-	if (dict_get_str(this->options,SSL_PRIVATE_KEY_OPT,&optstr) == 0) {
-                if (!priv->ssl_enabled) {
-                        gf_log(this->name,GF_LOG_WARNING,
-                               "%s specified without %s (ignored)",
-                               SSL_PRIVATE_KEY_OPT, SSL_ENABLED_OPT);
-                }
-                priv->ssl_private_key = optstr;
-	}
-        priv->ssl_private_key = gf_strdup(priv->ssl_private_key);
-
-        priv->ssl_ca_list = DEFAULT_CA_PATH;
-	if (dict_get_str(this->options,SSL_CA_LIST_OPT,&optstr) == 0) {
-                if (!priv->ssl_enabled) {
-                        gf_log(this->name,GF_LOG_WARNING,
-                               "%s specified without %s (ignored)",
-                               SSL_CA_LIST_OPT, SSL_ENABLED_OPT);
-                }
-                priv->ssl_ca_list = optstr;
-	}
-        priv->ssl_ca_list = gf_strdup(priv->ssl_ca_list);
-
-        gf_log(this->name,GF_LOG_INFO,"SSL support is %s",
-               priv->ssl_enabled ? "ENABLED" : "NOT enabled");
-        /*
-         * This might get overridden temporarily in socket_connect (q.v.)
-         * if we're using the glusterd portmapper.
-         */
-        priv->use_ssl = priv->ssl_enabled;
-
-	priv->own_thread = priv->use_ssl;
-	if (dict_get_str(this->options,OWN_THREAD_OPT,&optstr) == 0) {
-                if (gf_string2boolean (optstr, &priv->own_thread) != 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-				"invalid value given for own-thread boolean");
-		}
-	}
-	gf_log(this->name,GF_LOG_INFO,"using %s polling thread",
-	       priv->own_thread ? "private" : "system");
-
-	if (priv->use_ssl) {
-		SSL_library_init();
-		SSL_load_error_strings();
-		priv->ssl_meth = (SSL_METHOD *)TLSv1_method();
-		priv->ssl_ctx = SSL_CTX_new(priv->ssl_meth);
-
-                if (SSL_CTX_set_cipher_list(priv->ssl_ctx,
-                                            "HIGH:-SSLv2") == 0) {
-                        gf_log(this->name,GF_LOG_ERROR,
-                               "failed to find any valid ciphers");
-                        goto err;
-                }
-
-		if (!SSL_CTX_use_certificate_chain_file(priv->ssl_ctx,
-							priv->ssl_own_cert)) {
-			gf_log(this->name,GF_LOG_ERROR,
-			       "could not load our cert");
-			goto err;
-		}
-
-		if (!SSL_CTX_use_PrivateKey_file(priv->ssl_ctx,
-						 priv->ssl_private_key,
-						 SSL_FILETYPE_PEM)) {
-			gf_log(this->name,GF_LOG_ERROR,
-			       "could not load private key");
-			goto err;
-		}
-
-		if (!SSL_CTX_load_verify_locations(priv->ssl_ctx,
-						   priv->ssl_ca_list,0)) {
-			gf_log(this->name,GF_LOG_ERROR,
-			       "could not load CA list");
-			goto err;
-		}
-
-#if (OPENSSL_VERSION_NUMBER < 0x00905100L)
-		SSL_CTX_set_verify_depth(ctx,1);
-#endif
-
-		priv->ssl_session_id = ++session_id;
-		SSL_CTX_set_session_id_context(priv->ssl_ctx,
-					       (void *)&priv->ssl_session_id,
-					       sizeof(priv->ssl_session_id));
-
-		SSL_CTX_set_verify(priv->ssl_ctx,SSL_VERIFY_PEER,0);
-	}
-
-        if (priv->own_thread) {
-                priv->ot_state = OT_IDLE;
-        }
-
 out:
         this->private = priv;
-        return 0;
 
-err:
-        if (priv->ssl_own_cert) {
-                GF_FREE(priv->ssl_own_cert);
-        }
-        if (priv->ssl_private_key) {
-                GF_FREE(priv->ssl_private_key);
-        }
-        if (priv->ssl_ca_list) {
-                GF_FREE(priv->ssl_ca_list);
-        }
-        GF_FREE(priv);
-        return -1;
+        return 0;
 }
 
 
@@ -3639,15 +2657,6 @@ fini (rpc_transport_t *this)
                         "transport %p destroyed", this);
 
                 pthread_mutex_destroy (&priv->lock);
-		if (priv->ssl_private_key) {
-			GF_FREE(priv->ssl_private_key);
-		}
-		if (priv->ssl_own_cert) {
-			GF_FREE(priv->ssl_own_cert);
-		}
-		if (priv->ssl_ca_list) {
-			GF_FREE(priv->ssl_ca_list);
-		}
                 GF_FREE (priv);
         }
 
@@ -3692,17 +2701,18 @@ struct volume_options options[] = {
         },
         { .key   = { "transport.address-family",
                      "address-family" },
-          .value = {"inet", "inet6", "unix", "inet-sdp" },
+          .value = {"inet", "inet6", "inet/inet6", "inet6/inet",
+                    "unix", "inet-sdp" },
           .type  = GF_OPTION_TYPE_STR
         },
 
         { .key   = {"non-blocking-io"},
           .type  = GF_OPTION_TYPE_BOOL
         },
-        { .key   = {"tcp-window-size"},
+        { .key   = {"transport.window-size"},
           .type  = GF_OPTION_TYPE_SIZET,
           .min   = GF_MIN_SOCKET_WINDOW_SIZE,
-          .max   = GF_MAX_SOCKET_WINDOW_SIZE
+          .max   = GF_MAX_SOCKET_WINDOW_SIZE,
         },
         { .key   = {"transport.socket.nodelay"},
           .type  = GF_OPTION_TYPE_BOOL
@@ -3722,23 +2732,5 @@ struct volume_options options[] = {
         { .key   = {"transport.socket.listen-backlog"},
           .type  = GF_OPTION_TYPE_INT
         },
-        { .key   = {"transport.socket.read-fail-log"},
-          .type  = GF_OPTION_TYPE_BOOL
-        },
-        { .key   = {SSL_ENABLED_OPT},
-          .type  = GF_OPTION_TYPE_BOOL
-        },
-	{ .key   = {SSL_OWN_CERT_OPT},
-	  .type  = GF_OPTION_TYPE_STR
-	},
-	{ .key   = {SSL_PRIVATE_KEY_OPT},
-	  .type  = GF_OPTION_TYPE_STR
-	},
-	{ .key   = {SSL_CA_LIST_OPT},
-	  .type  = GF_OPTION_TYPE_STR
-	},
-	{ .key   = {OWN_THREAD_OPT},
-	  .type  = GF_OPTION_TYPE_BOOL
-	},
         { .key = {NULL} }
 };
diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h
index e0b412fcc..50ad5cdac 100644
--- a/rpc/rpc-transport/socket/src/socket.h
+++ b/rpc/rpc-transport/socket/src/socket.h
@@ -1,18 +1,25 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SOCKET_H
 #define _SOCKET_H
 
-#include <openssl/ssl.h>
-#include <openssl/err.h>
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -34,17 +41,19 @@
 
 #define RPC_MAX_FRAGMENT_SIZE 0x7fffffff
 
-/* The default window size will be 0, indicating not to set
- * it to any size. Default size of Linux is found to be
- * performance friendly.
+/* This is the size set through setsockopt for
+ * both the TCP receive window size and the
+ * send buffer size.
+ * Till the time iobuf size becomes configurable, this size is set to include
+ * two iobufs + the GlusterFS protocol headers.
  * Linux allows us to over-ride the max values for the system.
  * Should we over-ride them? Because if we set a value larger than the default
  * setsockopt will fail. Having larger values might be beneficial for
  * IB links.
  */
-#define GF_DEFAULT_SOCKET_WINDOW_SIZE   (0)
+#define GF_DEFAULT_SOCKET_WINDOW_SIZE   (512 * GF_UNIT_KB)
 #define GF_MAX_SOCKET_WINDOW_SIZE       (1 * GF_UNIT_MB)
-#define GF_MIN_SOCKET_WINDOW_SIZE       (0)
+#define GF_MIN_SOCKET_WINDOW_SIZE       (128 * GF_UNIT_KB)
 #define GF_USE_DEFAULT_KEEPALIVE        (-1)
 
 typedef enum {
@@ -72,14 +81,6 @@ typedef enum {
         SP_STATE_READ_CREDBYTES,        /* read credential data. */
         SP_STATE_READING_VERFBYTES,
         SP_STATE_READ_VERFBYTES,        /* read verifier data */
-        SP_STATE_READING_PROGHDR,
-        SP_STATE_READ_PROGHDR,
-        SP_STATE_READING_PROGHDR_XDATA,
-        SP_STATE_READ_PROGHDR_XDATA,    /* It's a bad "name" in the generic
-					   RPC state machine, but greatly
-					   aids code review (and xdata is
-					   the only "consumer" of this state)
-					*/
         SP_STATE_READING_PROG,
 } sp_rpcfrag_vectored_request_state_t;
 
@@ -111,7 +112,6 @@ struct ioq {
 typedef struct {
         sp_rpcfrag_request_header_state_t header_state;
         sp_rpcfrag_vectored_request_state_t vector_state;
-        int vector_sizer_state;
 } sp_rpcfrag_request_state_t;
 
 typedef enum {
@@ -123,8 +123,6 @@ typedef enum {
 typedef enum {
         SP_STATE_ACCEPTED_SUCCESS_REPLY_INIT,
         SP_STATE_READING_PROC_HEADER,
-        SP_STATE_READING_PROC_OPAQUE,
-        SP_STATE_READ_PROC_OPAQUE,
         SP_STATE_READ_PROC_HEADER,
 } sp_rpcfrag_vectored_reply_accepted_success_state_t;
 
@@ -143,60 +141,10 @@ typedef struct {
         sp_rpcfrag_vectored_reply_accepted_success_state_t accepted_success_state;
 } sp_rpcfrag_vectored_reply_state_t;
 
-struct gf_sock_incoming_frag {
-        char         *fragcurrent;
-        uint32_t      bytes_read;
-        uint32_t      remaining_size;
-        struct iovec  vector;
-        struct iovec *pending_vector;
-        union {
-                sp_rpcfrag_request_state_t        request;
-                sp_rpcfrag_vectored_reply_state_t reply;
-        } call_body;
-
-        sp_rpcfrag_simple_msg_state_t     simple_state;
-        sp_rpcfrag_state_t state;
-};
-
-#define GF_SOCKET_RA_MAX 1024
-
-struct gf_sock_incoming {
-        sp_rpcrecord_state_t  record_state;
-        struct gf_sock_incoming_frag frag;
-        char                *proghdr_base_addr;
-        struct iobuf        *iobuf;
-        size_t               iobuf_size;
-        struct iovec         vector[2];
-        int                  count;
-        struct iovec         payload_vector;
-        struct iobref       *iobref;
-        rpc_request_info_t  *request_info;
-        struct iovec        *pending_vector;
-        int                  pending_count;
-        uint32_t             fraghdr;
-        char                 complete_record;
-        msg_type_t           msg_type;
-        size_t               total_bytes_read;
-
-	size_t               ra_read;
-	size_t               ra_max;
-	size_t               ra_served;
-	char                *ra_buf;
-};
-
-typedef enum {
-        OT_IDLE,        /* Uninitialized or termination complete. */
-        OT_SPAWNING,    /* Past pthread_create but not in thread yet. */
-        OT_RUNNING,     /* Poller thread running normally. */
-        OT_CALLBACK,    /* Poller thread in the middle of a callback. */
-        OT_PLEASE_DIE,  /* Poller termination requested. */
-} ot_state_t;
-
 typedef struct {
         int32_t                sock;
         int32_t                idx;
-        /* -1 = not connected. 0 = in progress. 1 = connected */
-        char                   connected;
+        unsigned char          connected; // -1 = not connected. 0 = in progress. 1 = connected
         char                   bio;
         char                   connect_finish_log;
         char                   submit_log;
@@ -207,7 +155,36 @@ typedef struct {
                         struct ioq        *ioq_prev;
                 };
         };
-        struct gf_sock_incoming incoming;
+        struct {
+                sp_rpcrecord_state_t  record_state;
+                struct {
+                        char         *fragcurrent;
+                        uint32_t      bytes_read;
+                        uint32_t      remaining_size;
+                        struct iovec  vector;
+                        struct iovec *pending_vector;
+                        union {
+                                sp_rpcfrag_request_state_t        request;
+                                sp_rpcfrag_vectored_reply_state_t reply;
+                        } call_body;
+
+                        sp_rpcfrag_simple_msg_state_t     simple_state;
+                        sp_rpcfrag_state_t state;
+                } frag;
+                struct iobuf        *iobuf;
+                size_t               iobuf_size;
+                struct iovec         vector[2];
+                int                  count;
+                struct iovec         payload_vector;
+                struct iobref       *iobref;
+                rpc_request_info_t  *request_info;
+                struct iovec        *pending_vector;
+                int                  pending_count;
+                uint32_t             fraghdr;
+                char                 complete_record;
+                msg_type_t           msg_type;
+                size_t               total_bytes_read;
+        } incoming;
         pthread_mutex_t        lock;
         int                    windowsize;
         char                   lowlat;
@@ -216,23 +193,6 @@ typedef struct {
         int                    keepaliveidle;
         int                    keepaliveintvl;
         uint32_t               backlog;
-        gf_boolean_t           read_fail_log;
-        gf_boolean_t           ssl_enabled;
-	gf_boolean_t           use_ssl;
-	SSL_METHOD            *ssl_meth;
-	SSL_CTX               *ssl_ctx;
-	int                    ssl_session_id;
-	BIO                   *ssl_sbio;
-	SSL                   *ssl_ssl;
-	char                  *ssl_own_cert;
-	char                  *ssl_private_key;
-	char                  *ssl_ca_list;
-	pthread_t              thread;
-	int                    pipe[2];
-	gf_boolean_t           own_thread;
-        ot_state_t             ot_state;
-        uint32_t               ot_gen;
-        gf_boolean_t           is_server;
 } socket_private_t;
 
 
diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am
index 949e75e8d..981f319b3 100644
--- a/rpc/xdr/src/Makefile.am
+++ b/rpc/xdr/src/Makefile.am
@@ -1,25 +1,22 @@
 lib_LTLIBRARIES = libgfxdr.la
 
-libgfxdr_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
+libgfxdr_la_CFLAGS = -fPIC  -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
 
-libgfxdr_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \
+libgfxdr_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 \
+			-D_GNU_SOURCE -D$(GF_HOST_OS) \
 			-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src
 
 libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
 		$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la
 
-libgfxdr_la_SOURCES =  xdr-generic.c rpc-common-xdr.c \
-			glusterfs3-xdr.c \
-			cli1-xdr.c \
-			glusterd1-xdr.c \
-			portmap-xdr.c \
-			nlm4-xdr.c xdr-nfs3.c msg-nfs3.c nsm-xdr.c \
-			nlmcbk-xdr.c acl3-xdr.c
+libgfxdr_la_SOURCES =  xdr-generic.c \
+			glusterfs3-xdr.c glusterfs3.c \
+			cli1-xdr.c cli1.c \
+			glusterd1-xdr.c glusterd1.c \
+			portmap-xdr.c portmap.c
 
-noinst_HEADERS = xdr-generic.h rpc-common-xdr.h \
+noinst_HEADERS = xdr-generic.h \
 		glusterfs3-xdr.h glusterfs3.h \
-		cli1-xdr.h \
-		glusterd1-xdr.h \
-		portmap-xdr.h \
-		nlm4-xdr.h xdr-nfs3.h msg-nfs3.h nsm-xdr.h \
-		nlmcbk-xdr.h acl3-xdr.h
+		cli1-xdr.h cli1.h \
+		glusterd1-xdr.h glusterd1.h \
+		portmap-xdr.h portmap.h
diff --git a/rpc/xdr/src/acl.x b/rpc/xdr/src/acl.x
deleted file mode 100644
index 6cf4f1d3b..000000000
--- a/rpc/xdr/src/acl.x
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
- * This file is part of GlusterFS.
- *
- * This file is licensed to you under your choice of the GNU Lesser
- * General Public License, version 3 or any later version (LGPLv3 or
- * later), or the GNU General Public License, version 2 (GPLv2), in all
- * cases as published by the Free Software Foundation.
- */
-
-
-struct aclentry {
-	int type;
-	int uid;
-	int perm;
-};
-
-struct getaclargs {
-	netobj	fh;
-	int		mask;
-};
-
-struct getaclreply {
-	int status;
-	int attr_follows;
-	struct fattr3 attr;
-	int	mask;
-	int aclcount;
-	struct aclentry aclentry<>;
-	int daclcount;
-	struct aclentry daclentry<>;
-};
-
-struct setaclargs {
-	netobj fh;
-	int mask;
-	int aclcount;
-	struct aclentry aclentry<>;
-	int daclcount;
-	struct aclentry daclentry<>;
-};
-
-struct setaclreply {
-	int status;
-	int attr_follows;
-	struct fattr3 attr;
-};
-
diff --git a/rpc/xdr/src/acl3-xdr.c b/rpc/xdr/src/acl3-xdr.c
deleted file mode 100644
index 8fbaeff16..000000000
--- a/rpc/xdr/src/acl3-xdr.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
- * This file is part of GlusterFS.
- *
- * This file is licensed to you under your choice of the GNU Lesser
- * General Public License, version 3 or any later version (LGPLv3 or
- * later), or the GNU General Public License, version 2 (GPLv2), in all
- * cases as published by the Free Software Foundation.
- */
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "acl3-xdr.h"
-
-bool_t
-xdr_aclentry (XDR *xdrs, aclentry *objp)
-{
-	 if (!xdr_int (xdrs, &objp->type))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->uid))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->perm))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_getaclargs (XDR *xdrs, getaclargs *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->fh))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->mask))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_getaclreply (XDR *xdrs, getaclreply *objp)
-{
-	 if (!xdr_int (xdrs, &objp->status))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->attr_follows))
-		 return FALSE;
-	 if (!xdr_fattr3 (xdrs, &objp->attr))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->mask))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->aclcount))
-		 return FALSE;
-	 if (!xdr_array (xdrs, (char **)&objp->aclentry.aclentry_val, (u_int *) &objp->aclentry.aclentry_len, ~0,
-		sizeof (aclentry), (xdrproc_t) xdr_aclentry))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->daclcount))
-		 return FALSE;
-	 if (!xdr_array (xdrs, (char **)&objp->daclentry.daclentry_val, (u_int *) &objp->daclentry.daclentry_len, ~0,
-		sizeof (aclentry), (xdrproc_t) xdr_aclentry))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_setaclargs (XDR *xdrs, setaclargs *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->fh))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->mask))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->aclcount))
-		 return FALSE;
-	 if (!xdr_array (xdrs, (char **)&objp->aclentry.aclentry_val, (u_int *) &objp->aclentry.aclentry_len, ~0,
-		sizeof (aclentry), (xdrproc_t) xdr_aclentry))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->daclcount))
-		 return FALSE;
-	 if (!xdr_array (xdrs, (char **)&objp->daclentry.daclentry_val, (u_int *) &objp->daclentry.daclentry_len, ~0,
-		sizeof (aclentry), (xdrproc_t) xdr_aclentry))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_setaclreply (XDR *xdrs, setaclreply *objp)
-{
-	 if (!xdr_int (xdrs, &objp->status))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->attr_follows))
-		 return FALSE;
-	 if (!xdr_fattr3 (xdrs, &objp->attr))
-		 return FALSE;
-	return TRUE;
-}
diff --git a/rpc/xdr/src/acl3-xdr.h b/rpc/xdr/src/acl3-xdr.h
deleted file mode 100644
index 7cebaed69..000000000
--- a/rpc/xdr/src/acl3-xdr.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2012 Red Hat, Inc. <http://www.redhat.com>
- * This file is part of GlusterFS.
- *
- * This file is licensed to you under your choice of the GNU Lesser
- * General Public License, version 3 or any later version (LGPLv3 or
- * later), or the GNU General Public License, version 2 (GPLv2), in all
- * cases as published by the Free Software Foundation.
- */
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _ACL_H_RPCGEN
-#define _ACL_H_RPCGEN
-
-#include <rpc/rpc.h>
-#include "xdr-nfs3.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-struct aclentry {
-	int type;
-	int uid;
-	int perm;
-};
-typedef struct aclentry aclentry;
-
-struct getaclargs {
-	netobj fh;
-	int mask;
-};
-typedef struct getaclargs getaclargs;
-
-struct getaclreply {
-	int status;
-	int attr_follows;
-	struct fattr3 attr;
-	int mask;
-	int aclcount;
-	struct {
-		u_int aclentry_len;
-		struct aclentry *aclentry_val;
-	} aclentry;
-	int daclcount;
-	struct {
-		u_int daclentry_len;
-		struct aclentry *daclentry_val;
-	} daclentry;
-};
-typedef struct getaclreply getaclreply;
-
-struct setaclargs {
-	netobj fh;
-	int mask;
-	int aclcount;
-	struct {
-		u_int aclentry_len;
-		struct aclentry *aclentry_val;
-	} aclentry;
-	int daclcount;
-	struct {
-		u_int daclentry_len;
-		struct aclentry *daclentry_val;
-	} daclentry;
-};
-typedef struct setaclargs setaclargs;
-
-struct setaclreply {
-	int status;
-	int attr_follows;
-	struct fattr3 attr;
-};
-typedef struct setaclreply setaclreply;
-
-#define ACL3_NULL 0
-#define ACL3_GETACL 1
-#define ACL3_SETACL 2
-#define ACL3_PROC_COUNT 3
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_aclentry (XDR *, aclentry*);
-extern  bool_t xdr_getaclargs (XDR *, getaclargs*);
-extern  bool_t xdr_getaclreply (XDR *, getaclreply*);
-extern  bool_t xdr_setaclargs (XDR *, setaclargs*);
-extern  bool_t xdr_setaclreply (XDR *, setaclreply*);
-
-#else /* K&R C */
-extern bool_t xdr_aclentry ();
-extern bool_t xdr_getaclargs ();
-extern bool_t xdr_getaclreply ();
-extern bool_t xdr_setaclargs ();
-extern bool_t xdr_setaclreply ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_ACL_H_RPCGEN */
diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c
index 7d85b43c1..ae6d03352 100644
--- a/rpc/xdr/src/cli1-xdr.c
+++ b/rpc/xdr/src/cli1-xdr.c
@@ -1,21 +1,22 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
-#include "xdr-common.h"
-#include "compat.h"
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
 
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
 
 /*
  * Please do not edit this file.
@@ -23,12 +24,11 @@
  */
 
 #include "cli1-xdr.h"
+#include "compat.h"
 
 bool_t
-xdr_gf_cli_defrag_type (XDR *xdrs, gf_cli_defrag_type *objp)
+xdr_gf1_cluster_type (XDR *xdrs, gf1_cluster_type *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -36,10 +36,8 @@ xdr_gf_cli_defrag_type (XDR *xdrs, gf_cli_defrag_type *objp)
 }
 
 bool_t
-xdr_gf_defrag_status_t (XDR *xdrs, gf_defrag_status_t *objp)
+xdr_gf1_cli_replace_op (XDR *xdrs, gf1_cli_replace_op *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -47,10 +45,8 @@ xdr_gf_defrag_status_t (XDR *xdrs, gf_defrag_status_t *objp)
 }
 
 bool_t
-xdr_gf1_cluster_type (XDR *xdrs, gf1_cluster_type *objp)
+xdr_gf_quota_type (XDR *xdrs, gf_quota_type *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -58,10 +54,8 @@ xdr_gf1_cluster_type (XDR *xdrs, gf1_cluster_type *objp)
 }
 
 bool_t
-xdr_gf1_cli_replace_op (XDR *xdrs, gf1_cli_replace_op *objp)
+xdr_gf1_cli_friends_list (XDR *xdrs, gf1_cli_friends_list *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -69,10 +63,8 @@ xdr_gf1_cli_replace_op (XDR *xdrs, gf1_cli_replace_op *objp)
 }
 
 bool_t
-xdr_gf1_op_commands (XDR *xdrs, gf1_op_commands *objp)
+xdr_gf1_cli_get_volume (XDR *xdrs, gf1_cli_get_volume *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -80,10 +72,8 @@ xdr_gf1_op_commands (XDR *xdrs, gf1_op_commands *objp)
 }
 
 bool_t
-xdr_gf_quota_type (XDR *xdrs, gf_quota_type *objp)
+xdr_gf1_cli_sync_volume (XDR *xdrs, gf1_cli_sync_volume *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -91,10 +81,8 @@ xdr_gf_quota_type (XDR *xdrs, gf_quota_type *objp)
 }
 
 bool_t
-xdr_gf1_cli_friends_list (XDR *xdrs, gf1_cli_friends_list *objp)
+xdr_gf1_cli_op_flags (XDR *xdrs, gf1_cli_op_flags *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -102,10 +90,8 @@ xdr_gf1_cli_friends_list (XDR *xdrs, gf1_cli_friends_list *objp)
 }
 
 bool_t
-xdr_gf1_cli_get_volume (XDR *xdrs, gf1_cli_get_volume *objp)
+xdr_gf1_cli_gsync_set (XDR *xdrs, gf1_cli_gsync_set *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -113,10 +99,8 @@ xdr_gf1_cli_get_volume (XDR *xdrs, gf1_cli_get_volume *objp)
 }
 
 bool_t
-xdr_gf1_cli_sync_volume (XDR *xdrs, gf1_cli_sync_volume *objp)
+xdr_gf1_cli_stats_op (XDR *xdrs, gf1_cli_stats_op *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -124,132 +108,314 @@ xdr_gf1_cli_sync_volume (XDR *xdrs, gf1_cli_sync_volume *objp)
 }
 
 bool_t
-xdr_gf1_cli_op_flags (XDR *xdrs, gf1_cli_op_flags *objp)
+xdr_gf1_cli_top_op (XDR *xdrs, gf1_cli_top_op *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
+         if (!xdr_enum (xdrs, (enum_t *) objp))
+                 return FALSE;
+        return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_probe_req (XDR *xdrs, gf1_cli_probe_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->hostname, ~0))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->port))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_gsync_set (XDR *xdrs, gf1_cli_gsync_set *objp)
+xdr_gf1_cli_probe_rsp (XDR *xdrs, gf1_cli_probe_rsp *objp)
 {
 	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
+	if (xdrs->x_op == XDR_ENCODE) {
+		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_int (xdrs, &objp->op_ret))
+				 return FALSE;
+			 if (!xdr_int (xdrs, &objp->op_errno))
+				 return FALSE;
+			 if (!xdr_int (xdrs, &objp->port))
+				 return FALSE;
+
+		} else {
+		IXDR_PUT_LONG(buf, objp->op_ret);
+		IXDR_PUT_LONG(buf, objp->op_errno);
+		IXDR_PUT_LONG(buf, objp->port);
+		}
+		 if (!xdr_string (xdrs, &objp->hostname, ~0))
+			 return FALSE;
+		return TRUE;
+	} else if (xdrs->x_op == XDR_DECODE) {
+		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_int (xdrs, &objp->op_ret))
+				 return FALSE;
+			 if (!xdr_int (xdrs, &objp->op_errno))
+				 return FALSE;
+			 if (!xdr_int (xdrs, &objp->port))
+				 return FALSE;
+
+		} else {
+		objp->op_ret = IXDR_GET_LONG(buf);
+		objp->op_errno = IXDR_GET_LONG(buf);
+		objp->port = IXDR_GET_LONG(buf);
+		}
+		 if (!xdr_string (xdrs, &objp->hostname, ~0))
+			 return FALSE;
+	 return TRUE;
+	}
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->port))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->hostname, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_stats_op (XDR *xdrs, gf1_cli_stats_op *objp)
+xdr_gf1_cli_deprobe_req (XDR *xdrs, gf1_cli_deprobe_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
+	 if (!xdr_string (xdrs, &objp->hostname, ~0))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->port))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_top_op (XDR *xdrs, gf1_cli_top_op *objp)
+xdr_gf1_cli_deprobe_rsp (XDR *xdrs, gf1_cli_deprobe_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->hostname, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf_cli_status_type (XDR *xdrs, gf_cli_status_type *objp)
+xdr_gf1_cli_peer_list_req (XDR *xdrs, gf1_cli_peer_list_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
+	 if (!xdr_int (xdrs, &objp->flags))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf_cli_req (XDR *xdrs, gf_cli_req *objp)
+xdr_gf1_cli_peer_list_rsp (XDR *xdrs, gf1_cli_peer_list_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->friends.friends_val, (u_int *) &objp->friends.friends_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_get_vol_req (XDR *xdrs, gf1_cli_get_vol_req *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->flags))
+		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf_cli_rsp (XDR *xdrs, gf_cli_rsp *objp)
+xdr_gf1_cli_get_vol_rsp (XDR *xdrs, gf1_cli_get_vol_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->volumes.volumes_val, (u_int *) &objp->volumes.volumes_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_create_vol_req (XDR *xdrs, gf1_cli_create_vol_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_gf1_cluster_type (xdrs, &objp->type))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->count))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->bricks.bricks_val, (u_int *) &objp->bricks.bricks_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_create_vol_rsp (XDR *xdrs, gf1_cli_create_vol_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_delete_vol_req (XDR *xdrs, gf1_cli_delete_vol_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_peer_list_req (XDR *xdrs, gf1_cli_peer_list_req *objp)
+xdr_gf1_cli_delete_vol_rsp (XDR *xdrs, gf1_cli_delete_vol_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_start_vol_req (XDR *xdrs, gf1_cli_start_vol_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->flags))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_start_vol_rsp (XDR *xdrs, gf1_cli_start_vol_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_peer_list_rsp (XDR *xdrs, gf1_cli_peer_list_rsp *objp)
+xdr_gf1_cli_stop_vol_req (XDR *xdrs, gf1_cli_stop_vol_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->flags))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_stop_vol_rsp (XDR *xdrs, gf1_cli_stop_vol_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->friends.friends_val, (u_int *) &objp->friends.friends_len, ~0))
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_fsm_log_req (XDR *xdrs, gf1_cli_fsm_log_req *objp)
+xdr_gf1_cli_rename_vol_req (XDR *xdrs, gf1_cli_rename_vol_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_string (xdrs, &objp->name, ~0))
+	 if (!xdr_string (xdrs, &objp->old_volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->new_volname, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_fsm_log_rsp (XDR *xdrs, gf1_cli_fsm_log_rsp *objp)
+xdr_gf1_cli_rename_vol_rsp (XDR *xdrs, gf1_cli_rename_vol_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_defrag_vol_req (XDR *xdrs, gf1_cli_defrag_vol_req *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->cmd))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_defrag_vol_rsp (XDR *xdrs, gf1_cli_defrag_vol_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_u_quad_t (xdrs, &objp->files))
+		 return FALSE;
+	 if (!xdr_u_quad_t (xdrs, &objp->size))
+		 return FALSE;
+	 if (!xdr_u_quad_t (xdrs, &objp->lookedup_files))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf2_cli_defrag_vol_rsp (XDR *xdrs, gf2_cli_defrag_vol_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -257,44 +423,108 @@ xdr_gf1_cli_fsm_log_rsp (XDR *xdrs, gf1_cli_fsm_log_rsp *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->fsm_log.fsm_log_val, (u_int *) &objp->fsm_log.fsm_log_len, ~0))
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_u_quad_t (xdrs, &objp->files))
+		 return FALSE;
+	 if (!xdr_u_quad_t (xdrs, &objp->size))
+		 return FALSE;
+	 if (!xdr_u_quad_t (xdrs, &objp->lookedup_files))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_getwd_req (XDR *xdrs, gf1_cli_getwd_req *objp)
+xdr_gf1_cli_add_brick_req (XDR *xdrs, gf1_cli_add_brick_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_int (xdrs, &objp->unused))
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->count))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->bricks.bricks_val, (u_int *) &objp->bricks.bricks_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_getwd_rsp (XDR *xdrs, gf1_cli_getwd_rsp *objp)
+xdr_gf1_cli_add_brick_rsp (XDR *xdrs, gf1_cli_add_brick_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
-	 if (!xdr_string (xdrs, &objp->wd, ~0))
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_mount_req (XDR *xdrs, gf1_cli_mount_req *objp)
+xdr_gf1_cli_remove_brick_req (XDR *xdrs, gf1_cli_remove_brick_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_string (xdrs, &objp->label, ~0))
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->count))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->bricks.bricks_val, (u_int *) &objp->bricks.bricks_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_remove_brick_rsp (XDR *xdrs, gf1_cli_remove_brick_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_replace_brick_req (XDR *xdrs, gf1_cli_replace_brick_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_gf1_cli_replace_op (xdrs, &objp->op))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->bricks.bricks_val, (u_int *) &objp->bricks.bricks_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_replace_brick_rsp (XDR *xdrs, gf1_cli_replace_brick_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->status, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_reset_vol_req (XDR *xdrs, gf1_cli_reset_vol_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
@@ -302,27 +532,135 @@ xdr_gf1_cli_mount_req (XDR *xdrs, gf1_cli_mount_req *objp)
 }
 
 bool_t
-xdr_gf1_cli_mount_rsp (XDR *xdrs, gf1_cli_mount_rsp *objp)
+xdr_gf1_cli_reset_vol_rsp (XDR *xdrs, gf1_cli_reset_vol_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_quota_req (XDR *xdrs, gf1_cli_quota_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_quota_rsp (XDR *xdrs, gf1_cli_quota_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->limit_list, ~0))
+		 return FALSE;
+	 if (!xdr_gf_quota_type (xdrs, &objp->type))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_set_vol_req (XDR *xdrs, gf1_cli_set_vol_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_set_vol_rsp (XDR *xdrs, gf1_cli_set_vol_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_log_filename_req (XDR *xdrs, gf1_cli_log_filename_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->brick, ~0))
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gf1_cli_umount_req (XDR *xdrs, gf1_cli_umount_req *objp)
+xdr_gf1_cli_log_filename_rsp (XDR *xdrs, gf1_cli_log_filename_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
-	 if (!xdr_int (xdrs, &objp->lazy))
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->errstr, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_log_locate_req (XDR *xdrs, gf1_cli_log_locate_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->brick, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_sync_volume_req (XDR *xdrs, gf1_cli_sync_volume_req *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->flags))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->hostname, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_log_locate_rsp (XDR *xdrs, gf1_cli_log_locate_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
@@ -330,14 +668,151 @@ xdr_gf1_cli_umount_req (XDR *xdrs, gf1_cli_umount_req *objp)
 }
 
 bool_t
-xdr_gf1_cli_umount_rsp (XDR *xdrs, gf1_cli_umount_rsp *objp)
+xdr_gf1_cli_log_rotate_req (XDR *xdrs, gf1_cli_log_rotate_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->brick, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_log_rotate_rsp (XDR *xdrs, gf1_cli_log_rotate_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->errstr, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_sync_volume_rsp (XDR *xdrs, gf1_cli_sync_volume_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_fsm_log_req (XDR *xdrs, gf1_cli_fsm_log_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->name, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_fsm_log_rsp (XDR *xdrs, gf1_cli_fsm_log_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->fsm_log.fsm_log_val, (u_int *) &objp->fsm_log.fsm_log_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_gsync_set_req (XDR *xdrs, gf1_cli_gsync_set_req *objp)
+{
+
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_gsync_set_rsp (XDR *xdrs, gf1_cli_gsync_set_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->type))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_name, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->subop, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->master, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->slave, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->gsync_prefix, ~0))
+		 return FALSE;
+        if (!xdr_string (xdrs, &objp->glusterd_workdir, ~0))
+                return FALSE;
+        if (!xdr_bytes (xdrs, (char **)&objp->status_dict.status_dict_val,
+                        (u_int *) &objp->status_dict.status_dict_len, ~0))
+                return FALSE;
+
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_stats_volume_req (XDR *xdrs, gf1_cli_stats_volume_req *objp)
+{
+
+	 if (!xdr_string (xdrs, &objp->volname, ~0))
+		 return FALSE;
+	 if (!xdr_gf1_cli_stats_op (xdrs, &objp->op))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict_req.dict_req_val, (u_int *) &objp->dict_req.dict_req_len, ~0))
+		 return FALSE;
+
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_stats_volume_rsp (XDR *xdrs, gf1_cli_stats_volume_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
+		 return FALSE;
+	 if (!xdr_bytes (xdrs, (char **)&objp->stats_info.stats_info_val, (u_int *) &objp->stats_info.stats_info_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_getwd_req (XDR *xdrs, gf1_cli_getwd_req *objp)
+{
+	 if (!xdr_int (xdrs, &objp->unused))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf1_cli_getwd_rsp (XDR *xdrs, gf1_cli_getwd_rsp *objp)
+{
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->wd, ~0))
+		 return FALSE;
 	return TRUE;
 }
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h
index d418fabf3..516000e79 100644
--- a/rpc/xdr/src/cli1-xdr.h
+++ b/rpc/xdr/src/cli1-xdr.h
@@ -1,27 +1,29 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
-#include "xdr-common.h"
-#include "compat.h"
-
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
 /*
- * Please do not edit this file.
- * It was generated using rpcgen.
+ * Most content of this file is generated using rpcgen. There are very few
+ * additions done to this file (changes can be seen by running 'rpcgen'
+ * and taking a diff of this file with rpcgen generated file
  */
 
+#include "xdr-common.h"
+
 #ifndef _CLI1_XDR_H_RPCGEN
 #define _CLI1_XDR_H_RPCGEN
 
@@ -33,33 +35,10 @@ extern "C" {
 #endif
 
 
-enum gf_cli_defrag_type {
-	GF_DEFRAG_CMD_START = 1,
-	GF_DEFRAG_CMD_STOP = 1 + 1,
-	GF_DEFRAG_CMD_STATUS = 1 + 2,
-	GF_DEFRAG_CMD_START_LAYOUT_FIX = 1 + 3,
-	GF_DEFRAG_CMD_START_FORCE = 1 + 4,
-};
-typedef enum gf_cli_defrag_type gf_cli_defrag_type;
-
-enum gf_defrag_status_t {
-	GF_DEFRAG_STATUS_NOT_STARTED = 0,
-	GF_DEFRAG_STATUS_STARTED = 1,
-	GF_DEFRAG_STATUS_STOPPED = 2,
-	GF_DEFRAG_STATUS_COMPLETE = 3,
-	GF_DEFRAG_STATUS_FAILED = 4,
-	GF_DEFRAG_STATUS_LAYOUT_FIX_STARTED = 5,
-	GF_DEFRAG_STATUS_LAYOUT_FIX_STOPPED = 6,
-	GF_DEFRAG_STATUS_LAYOUT_FIX_COMPLETE = 7,
-	GF_DEFRAG_STATUS_LAYOUT_FIX_FAILED = 8,
-};
-typedef enum gf_defrag_status_t gf_defrag_status_t;
-
 enum gf1_cluster_type {
 	GF_CLUSTER_TYPE_NONE = 0,
 	GF_CLUSTER_TYPE_STRIPE = 0 + 1,
 	GF_CLUSTER_TYPE_REPLICATE = 0 + 2,
-	GF_CLUSTER_TYPE_STRIPE_REPLICATE = 0 + 3,
 };
 typedef enum gf1_cluster_type gf1_cluster_type;
 
@@ -74,16 +53,6 @@ enum gf1_cli_replace_op {
 };
 typedef enum gf1_cli_replace_op gf1_cli_replace_op;
 
-enum gf1_op_commands {
-	GF_OP_CMD_NONE = 0,
-	GF_OP_CMD_START = 0 + 1,
-	GF_OP_CMD_COMMIT = 0 + 2,
-	GF_OP_CMD_STOP = 0 + 3,
-	GF_OP_CMD_STATUS = 0 + 4,
-	GF_OP_CMD_COMMIT_FORCE = 0 + 5,
-};
-typedef enum gf1_op_commands gf1_op_commands;
-
 enum gf_quota_type {
 	GF_QUOTA_OPTION_TYPE_NONE = 0,
 	GF_QUOTA_OPTION_TYPE_ENABLE = 0 + 1,
@@ -96,8 +65,7 @@ enum gf_quota_type {
 typedef enum gf_quota_type gf_quota_type;
 
 enum gf1_cli_friends_list {
-	GF_CLI_LIST_PEERS = 1,
-	GF_CLI_LIST_POOL_NODES = 2,
+	GF_CLI_LIST_ALL = 1,
 };
 typedef enum gf1_cli_friends_list gf1_cli_friends_list;
 
@@ -123,10 +91,9 @@ enum gf1_cli_gsync_set {
 	GF_GSYNC_OPTION_TYPE_START = 1,
 	GF_GSYNC_OPTION_TYPE_STOP = 2,
 	GF_GSYNC_OPTION_TYPE_CONFIG = 3,
-	GF_GSYNC_OPTION_TYPE_STATUS = 4,
-	GF_GSYNC_OPTION_TYPE_ROTATE = 5,
-	GF_GSYNC_OPTION_TYPE_CREATE = 6,
-	GF_GSYNC_OPTION_TYPE_DELETE = 7,
+        GF_GSYNC_OPTION_TYPE_STATUS = 4,
+        GF_GSYNC_OPTION_TYPE_ROTATE = 5,
+
 };
 typedef enum gf1_cli_gsync_set gf1_cli_gsync_set;
 
@@ -135,77 +102,352 @@ enum gf1_cli_stats_op {
 	GF_CLI_STATS_START = 1,
 	GF_CLI_STATS_STOP = 2,
 	GF_CLI_STATS_INFO = 3,
-	GF_CLI_STATS_TOP = 4,
+        GF_CLI_STATS_TOP = 4,
 };
 typedef enum gf1_cli_stats_op gf1_cli_stats_op;
 
 enum gf1_cli_top_op {
-	GF_CLI_TOP_NONE = 0,
-	GF_CLI_TOP_OPEN = 0 + 1,
-	GF_CLI_TOP_READ = 0 + 2,
-	GF_CLI_TOP_WRITE = 0 + 3,
-	GF_CLI_TOP_OPENDIR = 0 + 4,
-	GF_CLI_TOP_READDIR = 0 + 5,
-	GF_CLI_TOP_READ_PERF = 0 + 6,
-	GF_CLI_TOP_WRITE_PERF = 0 + 7,
+        GF_CLI_TOP_NONE = 0,
+        GF_CLI_TOP_OPEN = 0 + 1,
+        GF_CLI_TOP_READ = 0 + 2,
+        GF_CLI_TOP_WRITE = 0 + 3,
+        GF_CLI_TOP_OPENDIR = 0 + 4,
+        GF_CLI_TOP_READDIR = 0 + 5,
+        GF_CLI_TOP_READ_PERF = 0 + 6,
+        GF_CLI_TOP_WRITE_PERF = 0 + 7,
 };
 typedef enum gf1_cli_top_op gf1_cli_top_op;
 
-enum gf_cli_status_type {
-	GF_CLI_STATUS_NONE = 0x0000,
-	GF_CLI_STATUS_MEM = 0x0001,
-	GF_CLI_STATUS_CLIENTS = 0x0002,
-	GF_CLI_STATUS_INODE = 0x0004,
-	GF_CLI_STATUS_FD = 0x0008,
-	GF_CLI_STATUS_CALLPOOL = 0x0010,
-	GF_CLI_STATUS_DETAIL = 0x0020,
-	GF_CLI_STATUS_TASKS = 0x0040,
-	GF_CLI_STATUS_MASK = 0x00FF,
-	GF_CLI_STATUS_VOL = 0x0100,
-	GF_CLI_STATUS_ALL = 0x0200,
-	GF_CLI_STATUS_BRICK = 0x0400,
-	GF_CLI_STATUS_NFS = 0x0800,
-	GF_CLI_STATUS_SHD = 0x1000,
-};
-typedef enum gf_cli_status_type gf_cli_status_type;
-
-struct gf_cli_req {
+struct gf1_cli_probe_req {
+	char *hostname;
+	int port;
+};
+typedef struct gf1_cli_probe_req gf1_cli_probe_req;
+
+struct gf1_cli_probe_rsp {
+	int op_ret;
+	int op_errno;
+	int port;
+	char *hostname;
+};
+typedef struct gf1_cli_probe_rsp gf1_cli_probe_rsp;
+
+struct gf1_cli_deprobe_req {
+	char *hostname;
+	int port;
+};
+typedef struct gf1_cli_deprobe_req gf1_cli_deprobe_req;
+
+struct gf1_cli_deprobe_rsp {
+	int op_ret;
+	int op_errno;
+	char *hostname;
+};
+typedef struct gf1_cli_deprobe_rsp gf1_cli_deprobe_rsp;
+
+struct gf1_cli_peer_list_req {
+	int flags;
 	struct {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
 };
-typedef struct gf_cli_req gf_cli_req;
+typedef struct gf1_cli_peer_list_req gf1_cli_peer_list_req;
 
-struct gf_cli_rsp {
+struct gf1_cli_peer_list_rsp {
 	int op_ret;
 	int op_errno;
-	char *op_errstr;
+	struct {
+		u_int friends_len;
+		char *friends_val;
+	} friends;
+};
+typedef struct gf1_cli_peer_list_rsp gf1_cli_peer_list_rsp;
+
+struct gf1_cli_get_vol_req {
+	int flags;
 	struct {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
 };
-typedef struct gf_cli_rsp gf_cli_rsp;
+typedef struct gf1_cli_get_vol_req gf1_cli_get_vol_req;
 
-struct gf1_cli_peer_list_req {
+struct gf1_cli_get_vol_rsp {
+	int op_ret;
+	int op_errno;
+	struct {
+		u_int volumes_len;
+		char *volumes_val;
+	} volumes;
+};
+typedef struct gf1_cli_get_vol_rsp gf1_cli_get_vol_rsp;
+
+struct gf1_cli_create_vol_req {
+	char *volname;
+	gf1_cluster_type type;
+	int count;
+	struct {
+		u_int bricks_len;
+		char *bricks_val;
+	} bricks;
+};
+typedef struct gf1_cli_create_vol_req gf1_cli_create_vol_req;
+
+struct gf1_cli_create_vol_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	char *op_errstr;
+};
+typedef struct gf1_cli_create_vol_rsp gf1_cli_create_vol_rsp;
+
+struct gf1_cli_delete_vol_req {
+	char *volname;
+};
+typedef struct gf1_cli_delete_vol_req gf1_cli_delete_vol_req;
+
+struct gf1_cli_delete_vol_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	char *op_errstr;
+};
+typedef struct gf1_cli_delete_vol_rsp gf1_cli_delete_vol_rsp;
+
+struct gf1_cli_start_vol_req {
+	char *volname;
+	int flags;
+};
+typedef struct gf1_cli_start_vol_req gf1_cli_start_vol_req;
+
+struct gf1_cli_start_vol_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	char *op_errstr;
+};
+typedef struct gf1_cli_start_vol_rsp gf1_cli_start_vol_rsp;
+
+struct gf1_cli_stop_vol_req {
+	char *volname;
 	int flags;
+};
+typedef struct gf1_cli_stop_vol_req gf1_cli_stop_vol_req;
+
+struct gf1_cli_stop_vol_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	char *op_errstr;
+};
+typedef struct gf1_cli_stop_vol_rsp gf1_cli_stop_vol_rsp;
+
+struct gf1_cli_rename_vol_req {
+	char *old_volname;
+	char *new_volname;
+};
+typedef struct gf1_cli_rename_vol_req gf1_cli_rename_vol_req;
+
+struct gf1_cli_rename_vol_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+};
+typedef struct gf1_cli_rename_vol_rsp gf1_cli_rename_vol_rsp;
+
+struct gf1_cli_defrag_vol_req {
+	int cmd;
+	char *volname;
+};
+typedef struct gf1_cli_defrag_vol_req gf1_cli_defrag_vol_req;
+
+struct gf1_cli_defrag_vol_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	u_quad_t files;
+	u_quad_t size;
+	u_quad_t lookedup_files;
+};
+typedef struct gf1_cli_defrag_vol_rsp gf1_cli_defrag_vol_rsp;
+
+struct gf2_cli_defrag_vol_rsp {
+	int op_ret;
+	int op_errno;
+	char *op_errstr;
+	char *volname;
+	u_quad_t files;
+	u_quad_t size;
+	u_quad_t lookedup_files;
+};
+typedef struct gf2_cli_defrag_vol_rsp gf2_cli_defrag_vol_rsp;
+
+struct gf1_cli_add_brick_req {
+	char *volname;
+	int count;
+	struct {
+		u_int bricks_len;
+		char *bricks_val;
+	} bricks;
+};
+typedef struct gf1_cli_add_brick_req gf1_cli_add_brick_req;
+
+struct gf1_cli_add_brick_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	char *op_errstr;
+};
+typedef struct gf1_cli_add_brick_rsp gf1_cli_add_brick_rsp;
+
+struct gf1_cli_remove_brick_req {
+	char *volname;
+	int count;
+	struct {
+		u_int bricks_len;
+		char *bricks_val;
+	} bricks;
+};
+typedef struct gf1_cli_remove_brick_req gf1_cli_remove_brick_req;
+
+struct gf1_cli_remove_brick_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	char *op_errstr;
+};
+typedef struct gf1_cli_remove_brick_rsp gf1_cli_remove_brick_rsp;
+
+struct gf1_cli_replace_brick_req {
+	char *volname;
+	gf1_cli_replace_op op;
+	struct {
+		u_int bricks_len;
+		char *bricks_val;
+	} bricks;
+};
+typedef struct gf1_cli_replace_brick_req gf1_cli_replace_brick_req;
+
+struct gf1_cli_replace_brick_rsp {
+	int op_ret;
+	int op_errno;
+	char *op_errstr;
+	char *volname;
+	char *status;
+};
+typedef struct gf1_cli_replace_brick_rsp gf1_cli_replace_brick_rsp;
+
+struct gf1_cli_reset_vol_req {
+	char *volname;
 	struct {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
 };
-typedef struct gf1_cli_peer_list_req gf1_cli_peer_list_req;
+typedef struct gf1_cli_reset_vol_req gf1_cli_reset_vol_req;
 
-struct gf1_cli_peer_list_rsp {
+struct gf1_cli_reset_vol_rsp {
 	int op_ret;
 	int op_errno;
+	char *volname;
+	char *op_errstr;
+};
+typedef struct gf1_cli_reset_vol_rsp gf1_cli_reset_vol_rsp;
+
+struct gf1_cli_quota_req {
+	char *volname;
 	struct {
-		u_int friends_len;
-		char *friends_val;
-	} friends;
+		u_int dict_len;
+		char *dict_val;
+	} dict;
 };
-typedef struct gf1_cli_peer_list_rsp gf1_cli_peer_list_rsp;
+typedef struct gf1_cli_quota_req gf1_cli_quota_req;
+
+struct gf1_cli_quota_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	char *op_errstr;
+	char *limit_list;
+	gf_quota_type type;
+};
+typedef struct gf1_cli_quota_rsp gf1_cli_quota_rsp;
+
+struct gf1_cli_set_vol_req {
+	char *volname;
+	struct {
+		u_int dict_len;
+		char *dict_val;
+	} dict;
+};
+typedef struct gf1_cli_set_vol_req gf1_cli_set_vol_req;
+
+struct gf1_cli_set_vol_rsp {
+	int op_ret;
+	int op_errno;
+	char *volname;
+	char *op_errstr;
+	struct {
+		u_int dict_len;
+		char *dict_val;
+	} dict;
+};
+typedef struct gf1_cli_set_vol_rsp gf1_cli_set_vol_rsp;
+
+struct gf1_cli_log_filename_req {
+	char *volname;
+	char *brick;
+	char *path;
+};
+typedef struct gf1_cli_log_filename_req gf1_cli_log_filename_req;
+
+struct gf1_cli_log_filename_rsp {
+	int op_ret;
+	int op_errno;
+	char *errstr;
+};
+typedef struct gf1_cli_log_filename_rsp gf1_cli_log_filename_rsp;
+
+struct gf1_cli_log_locate_req {
+	char *volname;
+	char *brick;
+};
+typedef struct gf1_cli_log_locate_req gf1_cli_log_locate_req;
+
+struct gf1_cli_sync_volume_req {
+	int flags;
+	char *volname;
+	char *hostname;
+};
+typedef struct gf1_cli_sync_volume_req gf1_cli_sync_volume_req;
+
+struct gf1_cli_log_locate_rsp {
+	int op_ret;
+	int op_errno;
+	char *path;
+};
+typedef struct gf1_cli_log_locate_rsp gf1_cli_log_locate_rsp;
+
+struct gf1_cli_log_rotate_req {
+	char *volname;
+	char *brick;
+};
+typedef struct gf1_cli_log_rotate_req gf1_cli_log_rotate_req;
+
+struct gf1_cli_log_rotate_rsp {
+	int op_ret;
+	int op_errno;
+	char *errstr;
+};
+typedef struct gf1_cli_log_rotate_rsp gf1_cli_log_rotate_rsp;
+
+struct gf1_cli_sync_volume_rsp {
+	int op_ret;
+	int op_errno;
+	char *op_errstr;
+};
+typedef struct gf1_cli_sync_volume_rsp gf1_cli_sync_volume_rsp;
 
 struct gf1_cli_fsm_log_req {
 	char *name;
@@ -223,83 +465,131 @@ struct gf1_cli_fsm_log_rsp {
 };
 typedef struct gf1_cli_fsm_log_rsp gf1_cli_fsm_log_rsp;
 
-struct gf1_cli_getwd_req {
-	int unused;
+struct gf1_cli_gsync_set_req {
+	struct {
+		u_int dict_len;
+		char *dict_val;
+	} dict;
 };
-typedef struct gf1_cli_getwd_req gf1_cli_getwd_req;
+typedef struct gf1_cli_gsync_set_req gf1_cli_gsync_set_req;
 
-struct gf1_cli_getwd_rsp {
+struct gf1_cli_gsync_set_rsp {
 	int op_ret;
 	int op_errno;
-	char *wd;
+	char *op_errstr;
+	int type;
+	char *op_name;
+	char *subop;
+	char *master;
+	char *slave;
+	char *gsync_prefix;
+        char *glusterd_workdir;
+	struct {
+		u_int status_dict_len;
+		char *status_dict_val;
+	} status_dict;
 };
-typedef struct gf1_cli_getwd_rsp gf1_cli_getwd_rsp;
+typedef struct gf1_cli_gsync_set_rsp gf1_cli_gsync_set_rsp;
 
-struct gf1_cli_mount_req {
-	char *label;
+struct gf1_cli_stats_volume_req {
+	char *volname;
+	gf1_cli_stats_op op;
 	struct {
-		u_int dict_len;
-		char *dict_val;
-	} dict;
+		u_int dict_req_len;
+		char* dict_req_val;
+	} dict_req;
 };
-typedef struct gf1_cli_mount_req gf1_cli_mount_req;
+typedef struct gf1_cli_stats_volume_req gf1_cli_stats_volume_req;
 
-struct gf1_cli_mount_rsp {
+struct gf1_cli_stats_volume_rsp {
 	int op_ret;
 	int op_errno;
-	char *path;
+	char *op_errstr;
+	struct {
+		u_int stats_info_len;
+		char *stats_info_val;
+	} stats_info;
 };
-typedef struct gf1_cli_mount_rsp gf1_cli_mount_rsp;
+typedef struct gf1_cli_stats_volume_rsp gf1_cli_stats_volume_rsp;
 
-struct gf1_cli_umount_req {
-	int lazy;
-	char *path;
+struct gf1_cli_getwd_req {
+	int unused;
 };
-typedef struct gf1_cli_umount_req gf1_cli_umount_req;
+typedef struct gf1_cli_getwd_req gf1_cli_getwd_req;
 
-struct gf1_cli_umount_rsp {
+struct gf1_cli_getwd_rsp {
 	int op_ret;
 	int op_errno;
+	char *wd;
 };
-typedef struct gf1_cli_umount_rsp gf1_cli_umount_rsp;
+typedef struct gf1_cli_getwd_rsp gf1_cli_getwd_rsp;
 
 /* the xdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_gf_cli_defrag_type (XDR *, gf_cli_defrag_type*);
-extern  bool_t xdr_gf_defrag_status_t (XDR *, gf_defrag_status_t*);
 extern  bool_t xdr_gf1_cluster_type (XDR *, gf1_cluster_type*);
 extern  bool_t xdr_gf1_cli_replace_op (XDR *, gf1_cli_replace_op*);
-extern  bool_t xdr_gf1_op_commands (XDR *, gf1_op_commands*);
-extern  bool_t xdr_gf_quota_type (XDR *, gf_quota_type*);
 extern  bool_t xdr_gf1_cli_friends_list (XDR *, gf1_cli_friends_list*);
 extern  bool_t xdr_gf1_cli_get_volume (XDR *, gf1_cli_get_volume*);
 extern  bool_t xdr_gf1_cli_sync_volume (XDR *, gf1_cli_sync_volume*);
 extern  bool_t xdr_gf1_cli_op_flags (XDR *, gf1_cli_op_flags*);
 extern  bool_t xdr_gf1_cli_gsync_set (XDR *, gf1_cli_gsync_set*);
-extern  bool_t xdr_gf1_cli_stats_op (XDR *, gf1_cli_stats_op*);
 extern  bool_t xdr_gf1_cli_top_op (XDR *, gf1_cli_top_op*);
-extern  bool_t xdr_gf_cli_status_type (XDR *, gf_cli_status_type*);
-extern  bool_t xdr_gf_cli_req (XDR *, gf_cli_req*);
-extern  bool_t xdr_gf_cli_rsp (XDR *, gf_cli_rsp*);
+extern  bool_t xdr_gf1_cli_stats_op (XDR *, gf1_cli_stats_op*);
+extern  bool_t xdr_gf_quota_type (XDR *, gf_quota_type*);
+extern  bool_t xdr_gf1_cli_probe_req (XDR *, gf1_cli_probe_req*);
+extern  bool_t xdr_gf1_cli_probe_rsp (XDR *, gf1_cli_probe_rsp*);
+extern  bool_t xdr_gf1_cli_deprobe_req (XDR *, gf1_cli_deprobe_req*);
+extern  bool_t xdr_gf1_cli_deprobe_rsp (XDR *, gf1_cli_deprobe_rsp*);
 extern  bool_t xdr_gf1_cli_peer_list_req (XDR *, gf1_cli_peer_list_req*);
 extern  bool_t xdr_gf1_cli_peer_list_rsp (XDR *, gf1_cli_peer_list_rsp*);
+extern  bool_t xdr_gf1_cli_get_vol_req (XDR *, gf1_cli_get_vol_req*);
+extern  bool_t xdr_gf1_cli_get_vol_rsp (XDR *, gf1_cli_get_vol_rsp*);
+extern  bool_t xdr_gf1_cli_create_vol_req (XDR *, gf1_cli_create_vol_req*);
+extern  bool_t xdr_gf1_cli_create_vol_rsp (XDR *, gf1_cli_create_vol_rsp*);
+extern  bool_t xdr_gf1_cli_delete_vol_req (XDR *, gf1_cli_delete_vol_req*);
+extern  bool_t xdr_gf1_cli_delete_vol_rsp (XDR *, gf1_cli_delete_vol_rsp*);
+extern  bool_t xdr_gf1_cli_start_vol_req (XDR *, gf1_cli_start_vol_req*);
+extern  bool_t xdr_gf1_cli_start_vol_rsp (XDR *, gf1_cli_start_vol_rsp*);
+extern  bool_t xdr_gf1_cli_stop_vol_req (XDR *, gf1_cli_stop_vol_req*);
+extern  bool_t xdr_gf1_cli_stop_vol_rsp (XDR *, gf1_cli_stop_vol_rsp*);
+extern  bool_t xdr_gf1_cli_rename_vol_req (XDR *, gf1_cli_rename_vol_req*);
+extern  bool_t xdr_gf1_cli_rename_vol_rsp (XDR *, gf1_cli_rename_vol_rsp*);
+extern  bool_t xdr_gf1_cli_defrag_vol_req (XDR *, gf1_cli_defrag_vol_req*);
+extern  bool_t xdr_gf1_cli_defrag_vol_rsp (XDR *, gf1_cli_defrag_vol_rsp*);
+extern  bool_t xdr_gf2_cli_defrag_vol_rsp (XDR *, gf2_cli_defrag_vol_rsp*);
+extern  bool_t xdr_gf1_cli_add_brick_req (XDR *, gf1_cli_add_brick_req*);
+extern  bool_t xdr_gf1_cli_add_brick_rsp (XDR *, gf1_cli_add_brick_rsp*);
+extern  bool_t xdr_gf1_cli_remove_brick_req (XDR *, gf1_cli_remove_brick_req*);
+extern  bool_t xdr_gf1_cli_remove_brick_rsp (XDR *, gf1_cli_remove_brick_rsp*);
+extern  bool_t xdr_gf1_cli_replace_brick_req (XDR *, gf1_cli_replace_brick_req*);
+extern  bool_t xdr_gf1_cli_replace_brick_rsp (XDR *, gf1_cli_replace_brick_rsp*);
+extern  bool_t xdr_gf1_cli_reset_vol_req (XDR *, gf1_cli_reset_vol_req*);
+extern  bool_t xdr_gf1_cli_reset_vol_rsp (XDR *, gf1_cli_reset_vol_rsp*);
+extern  bool_t xdr_gf1_cli_quota_req (XDR *, gf1_cli_quota_req*);
+extern  bool_t xdr_gf1_cli_quota_rsp (XDR *, gf1_cli_quota_rsp*);
+extern  bool_t xdr_gf1_cli_set_vol_req (XDR *, gf1_cli_set_vol_req*);
+extern  bool_t xdr_gf1_cli_set_vol_rsp (XDR *, gf1_cli_set_vol_rsp*);
+extern  bool_t xdr_gf1_cli_log_filename_req (XDR *, gf1_cli_log_filename_req*);
+extern  bool_t xdr_gf1_cli_log_filename_rsp (XDR *, gf1_cli_log_filename_rsp*);
+extern  bool_t xdr_gf1_cli_log_locate_req (XDR *, gf1_cli_log_locate_req*);
+extern  bool_t xdr_gf1_cli_sync_volume_req (XDR *, gf1_cli_sync_volume_req*);
+extern  bool_t xdr_gf1_cli_log_locate_rsp (XDR *, gf1_cli_log_locate_rsp*);
+extern  bool_t xdr_gf1_cli_log_rotate_req (XDR *, gf1_cli_log_rotate_req*);
+extern  bool_t xdr_gf1_cli_log_rotate_rsp (XDR *, gf1_cli_log_rotate_rsp*);
+extern  bool_t xdr_gf1_cli_sync_volume_rsp (XDR *, gf1_cli_sync_volume_rsp*);
 extern  bool_t xdr_gf1_cli_fsm_log_req (XDR *, gf1_cli_fsm_log_req*);
 extern  bool_t xdr_gf1_cli_fsm_log_rsp (XDR *, gf1_cli_fsm_log_rsp*);
+extern  bool_t xdr_gf1_cli_gsync_set_req (XDR *, gf1_cli_gsync_set_req*);
+extern  bool_t xdr_gf1_cli_gsync_set_rsp (XDR *, gf1_cli_gsync_set_rsp*);
+extern  bool_t xdr_gf1_cli_stats_volume_req (XDR *, gf1_cli_stats_volume_req*);
+extern  bool_t xdr_gf1_cli_stats_volume_rsp (XDR *, gf1_cli_stats_volume_rsp*);
 extern  bool_t xdr_gf1_cli_getwd_req (XDR *, gf1_cli_getwd_req*);
 extern  bool_t xdr_gf1_cli_getwd_rsp (XDR *, gf1_cli_getwd_rsp*);
-extern  bool_t xdr_gf1_cli_mount_req (XDR *, gf1_cli_mount_req*);
-extern  bool_t xdr_gf1_cli_mount_rsp (XDR *, gf1_cli_mount_rsp*);
-extern  bool_t xdr_gf1_cli_umount_req (XDR *, gf1_cli_umount_req*);
-extern  bool_t xdr_gf1_cli_umount_rsp (XDR *, gf1_cli_umount_rsp*);
 
 #else /* K&R C */
-extern bool_t xdr_gf_cli_defrag_type ();
-extern bool_t xdr_gf_defrag_status_t ();
 extern bool_t xdr_gf1_cluster_type ();
 extern bool_t xdr_gf1_cli_replace_op ();
-extern bool_t xdr_gf1_op_commands ();
-extern bool_t xdr_gf_quota_type ();
 extern bool_t xdr_gf1_cli_friends_list ();
 extern bool_t xdr_gf1_cli_get_volume ();
 extern bool_t xdr_gf1_cli_sync_volume ();
@@ -307,19 +597,56 @@ extern bool_t xdr_gf1_cli_op_flags ();
 extern bool_t xdr_gf1_cli_gsync_set ();
 extern bool_t xdr_gf1_cli_stats_op ();
 extern bool_t xdr_gf1_cli_top_op ();
-extern bool_t xdr_gf_cli_status_type ();
-extern bool_t xdr_gf_cli_req ();
-extern bool_t xdr_gf_cli_rsp ();
+extern bool_t xdr_gf_quota_type ();
+extern bool_t xdr_gf1_cli_probe_req ();
+extern bool_t xdr_gf1_cli_probe_rsp ();
+extern bool_t xdr_gf1_cli_deprobe_req ();
+extern bool_t xdr_gf1_cli_deprobe_rsp ();
 extern bool_t xdr_gf1_cli_peer_list_req ();
 extern bool_t xdr_gf1_cli_peer_list_rsp ();
+extern bool_t xdr_gf1_cli_get_vol_req ();
+extern bool_t xdr_gf1_cli_get_vol_rsp ();
+extern bool_t xdr_gf1_cli_create_vol_req ();
+extern bool_t xdr_gf1_cli_create_vol_rsp ();
+extern bool_t xdr_gf1_cli_delete_vol_req ();
+extern bool_t xdr_gf1_cli_delete_vol_rsp ();
+extern bool_t xdr_gf1_cli_start_vol_req ();
+extern bool_t xdr_gf1_cli_start_vol_rsp ();
+extern bool_t xdr_gf1_cli_stop_vol_req ();
+extern bool_t xdr_gf1_cli_stop_vol_rsp ();
+extern bool_t xdr_gf1_cli_rename_vol_req ();
+extern bool_t xdr_gf1_cli_rename_vol_rsp ();
+extern bool_t xdr_gf1_cli_defrag_vol_req ();
+extern bool_t xdr_gf1_cli_defrag_vol_rsp ();
+extern bool_t xdr_gf2_cli_defrag_vol_rsp ();
+extern bool_t xdr_gf1_cli_add_brick_req ();
+extern bool_t xdr_gf1_cli_add_brick_rsp ();
+extern bool_t xdr_gf1_cli_remove_brick_req ();
+extern bool_t xdr_gf1_cli_remove_brick_rsp ();
+extern bool_t xdr_gf1_cli_replace_brick_req ();
+extern bool_t xdr_gf1_cli_replace_brick_rsp ();
+extern bool_t xdr_gf1_cli_reset_vol_req ();
+extern bool_t xdr_gf1_cli_reset_vol_rsp ();
+extern bool_t xdr_gf1_cli_quota_req ();
+extern bool_t xdr_gf1_cli_quota_rsp ();
+extern bool_t xdr_gf1_cli_set_vol_req ();
+extern bool_t xdr_gf1_cli_set_vol_rsp ();
+extern bool_t xdr_gf1_cli_log_filename_req ();
+extern bool_t xdr_gf1_cli_log_filename_rsp ();
+extern bool_t xdr_gf1_cli_log_locate_req ();
+extern bool_t xdr_gf1_cli_sync_volume_req ();
+extern bool_t xdr_gf1_cli_log_locate_rsp ();
+extern bool_t xdr_gf1_cli_log_rotate_req ();
+extern bool_t xdr_gf1_cli_log_rotate_rsp ();
+extern bool_t xdr_gf1_cli_sync_volume_rsp ();
 extern bool_t xdr_gf1_cli_fsm_log_req ();
 extern bool_t xdr_gf1_cli_fsm_log_rsp ();
+extern bool_t xdr_gf1_cli_gsync_set_req ();
+extern bool_t xdr_gf1_cli_gsync_set_rsp ();
+extern bool_t xdr_gf1_cli_stats_volume_req ();
+extern bool_t xdr_gf1_cli_stats_volume_rsp ();
 extern bool_t xdr_gf1_cli_getwd_req ();
 extern bool_t xdr_gf1_cli_getwd_rsp ();
-extern bool_t xdr_gf1_cli_mount_req ();
-extern bool_t xdr_gf1_cli_mount_rsp ();
-extern bool_t xdr_gf1_cli_umount_req ();
-extern bool_t xdr_gf1_cli_umount_rsp ();
 
 #endif /* K&R C */
 
@@ -327,4 +654,4 @@ extern bool_t xdr_gf1_cli_umount_rsp ();
 }
 #endif
 
-#endif /* !_CLI1_XDR_H_RPCGEN */
+#endif /* !_CLI1-XDR_H_RPCGEN */
diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x
index cc7ca8e24..c244e61a8 100644
--- a/rpc/xdr/src/cli1-xdr.x
+++ b/rpc/xdr/src/cli1-xdr.x
@@ -1,28 +1,7 @@
- enum gf_cli_defrag_type {
-        GF_DEFRAG_CMD_START = 1,
-        GF_DEFRAG_CMD_STOP,
-        GF_DEFRAG_CMD_STATUS,
-        GF_DEFRAG_CMD_START_LAYOUT_FIX,
-        GF_DEFRAG_CMD_START_FORCE /* used by remove-brick data migration */
-} ;
-
- enum gf_defrag_status_t {
-        GF_DEFRAG_STATUS_NOT_STARTED,
-        GF_DEFRAG_STATUS_STARTED,
-        GF_DEFRAG_STATUS_STOPPED,
-        GF_DEFRAG_STATUS_COMPLETE,
-        GF_DEFRAG_STATUS_FAILED,
-        GF_DEFRAG_STATUS_LAYOUT_FIX_STARTED,
-        GF_DEFRAG_STATUS_LAYOUT_FIX_STOPPED,
-        GF_DEFRAG_STATUS_LAYOUT_FIX_COMPLETE,
-        GF_DEFRAG_STATUS_LAYOUT_FIX_FAILED
-} ;
-
  enum gf1_cluster_type {
         GF_CLUSTER_TYPE_NONE = 0,
         GF_CLUSTER_TYPE_STRIPE,
-        GF_CLUSTER_TYPE_REPLICATE,
-        GF_CLUSTER_TYPE_STRIPE_REPLICATE
+        GF_CLUSTER_TYPE_REPLICATE
 } ;
 
  enum gf1_cli_replace_op {
@@ -35,15 +14,6 @@
         GF_REPLACE_OP_COMMIT_FORCE
 } ;
 
- enum gf1_op_commands {
-        GF_OP_CMD_NONE = 0,
-        GF_OP_CMD_START,
-        GF_OP_CMD_COMMIT,
-        GF_OP_CMD_STOP,
-        GF_OP_CMD_STATUS,
-        GF_OP_CMD_COMMIT_FORCE
-} ;
-
 enum gf_quota_type {
         GF_QUOTA_OPTION_TYPE_NONE = 0,
         GF_QUOTA_OPTION_TYPE_ENABLE,
@@ -55,8 +25,7 @@ enum gf_quota_type {
 };
 
 enum gf1_cli_friends_list {
-        GF_CLI_LIST_PEERS = 1,
-        GF_CLI_LIST_POOL_NODES = 2
+        GF_CLI_LIST_ALL = 1
 } ;
 
 enum gf1_cli_get_volume {
@@ -79,9 +48,7 @@ enum gf1_cli_gsync_set {
         GF_GSYNC_OPTION_TYPE_STOP,
         GF_GSYNC_OPTION_TYPE_CONFIG,
         GF_GSYNC_OPTION_TYPE_STATUS,
-        GF_GSYNC_OPTION_TYPE_ROTATE,
-        GF_GSYNC_OPTION_TYPE_CREATE,
-        GF_GSYNC_OPTION_TYPE_DELETE
+        GF_GSYNC_OPTION_TYPE_ROTATE
 };
 
 enum gf1_cli_stats_op {
@@ -103,34 +70,27 @@ enum gf1_cli_top_op {
         GF_CLI_TOP_WRITE_PERF
 };
 
-/* The unconventional hex numbers help us perform
-   bit-wise operations which reduces complexity */
-enum gf_cli_status_type {
-        GF_CLI_STATUS_NONE         = 0x0000,
-        GF_CLI_STATUS_MEM          = 0x0001,    /*0000000000001*/
-        GF_CLI_STATUS_CLIENTS      = 0x0002,    /*0000000000010*/
-        GF_CLI_STATUS_INODE        = 0x0004,    /*0000000000100*/
-        GF_CLI_STATUS_FD           = 0x0008,    /*0000000001000*/
-        GF_CLI_STATUS_CALLPOOL     = 0x0010,    /*0000000010000*/
-        GF_CLI_STATUS_DETAIL       = 0x0020,    /*0000000100000*/
-        GF_CLI_STATUS_TASKS        = 0x0040,    /*0000001000000*/
-        GF_CLI_STATUS_MASK         = 0x00FF,    /*0000011111111 Used to get the op*/
-        GF_CLI_STATUS_VOL          = 0x0100,    /*0000100000000*/
-        GF_CLI_STATUS_ALL          = 0x0200,    /*0001000000000*/
-        GF_CLI_STATUS_BRICK        = 0x0400,    /*0010000000000*/
-        GF_CLI_STATUS_NFS          = 0x0800,    /*0100000000000*/
-        GF_CLI_STATUS_SHD          = 0x1000     /*1000000000000*/
-};
-
- struct gf_cli_req {
-        opaque  dict<>;
+ struct gf1_cli_probe_req {
+        string  hostname<>;
+	int	port;
 }  ;
 
- struct gf_cli_rsp {
+ struct gf1_cli_probe_rsp {
         int     op_ret;
         int     op_errno;
-        string  op_errstr<>;
-        opaque  dict<>;
+	int	port;
+        string  hostname<>;
+}  ;
+
+ struct gf1_cli_deprobe_req {
+        string  hostname<>;
+	int	port;
+}  ;
+
+ struct gf1_cli_deprobe_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  hostname<>;
 }  ;
 
 struct gf1_cli_peer_list_req {
@@ -144,6 +104,221 @@ struct gf1_cli_peer_list_rsp {
         opaque  friends<>;
 } ;
 
+struct gf1_cli_get_vol_req {
+        int     flags;
+        opaque  dict<>;
+}  ;
+
+struct gf1_cli_get_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        opaque  volumes<>;
+} ;
+
+ struct gf1_cli_create_vol_req {
+        string  volname<>;
+        gf1_cluster_type type;
+        int     count;
+        opaque  bricks<>;
+}  ;
+
+ struct gf1_cli_create_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+	 string  op_errstr<>;
+}  ;
+
+ struct gf1_cli_delete_vol_req {
+        string volname<>;
+}  ;
+
+ struct gf1_cli_delete_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+        string  op_errstr<>;
+}  ;
+
+ struct gf1_cli_start_vol_req {
+        string volname<>;
+        int flags;
+}  ;
+
+
+ struct gf1_cli_start_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+        string  op_errstr<>;
+}  ;
+
+ struct gf1_cli_stop_vol_req {
+        string volname<>;
+        int flags;
+}  ;
+
+
+ struct gf1_cli_stop_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+        string  op_errstr<>;
+}  ;
+
+
+ struct gf1_cli_rename_vol_req {
+        string old_volname<>;
+        string new_volname<>;
+}  ;
+
+ struct gf1_cli_rename_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+}  ;
+
+ struct gf1_cli_defrag_vol_req {
+        int    cmd;
+        string volname<>;
+}  ;
+
+ struct gf1_cli_defrag_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+        unsigned hyper   files;
+        unsigned hyper   size;
+        unsigned hyper   lookedup_files;
+}  ;
+
+
+ struct gf2_cli_defrag_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  op_errstr<>;
+        string  volname<>;
+        unsigned hyper   files;
+        unsigned hyper   size;
+        unsigned hyper   lookedup_files;
+}  ;
+
+ struct gf1_cli_add_brick_req {
+        string volname<>;
+        int    count;
+        opaque bricks<>;
+}  ;
+
+ struct gf1_cli_add_brick_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+	 string  op_errstr<>;
+}  ;
+
+ struct gf1_cli_remove_brick_req {
+        string volname<>;
+        int    count;
+        opaque bricks<>;
+}  ;
+
+
+ struct gf1_cli_remove_brick_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+        string  op_errstr<>;
+}  ;
+
+ struct gf1_cli_replace_brick_req {
+        string volname<>;
+        gf1_cli_replace_op op;
+        opaque bricks<>;
+}  ;
+
+ struct gf1_cli_replace_brick_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  op_errstr<>;
+        string  volname<>;
+        string  status<>;
+}  ;
+
+struct gf1_cli_reset_vol_req {
+        string volname<>;
+        opaque dict<>;
+} ;
+
+
+ struct gf1_cli_reset_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+	string  op_errstr<>;
+}  ;
+
+
+
+struct gf1_cli_set_vol_req {
+        string volname<>;
+        opaque dict<>;
+} ;
+
+
+ struct gf1_cli_set_vol_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+        string  op_errstr<>;
+        opaque  dict<>;
+}  ;
+
+struct gf1_cli_log_filename_req {
+        string volname<>;
+        string brick<>;
+        string path<>;
+};
+
+struct gf1_cli_log_filename_rsp {
+	int op_ret;
+	int op_errno;
+        string errstr<>;
+};
+
+struct gf1_cli_log_locate_req {
+	string volname<>;
+        string brick<>;
+};
+
+struct gf1_cli_sync_volume_req {
+        int    flags;
+        string volname<>;
+        string hostname<>;
+};
+
+struct gf1_cli_log_locate_rsp {
+	int op_ret;
+	int op_errno;
+        string path<>;
+};
+
+struct gf1_cli_log_rotate_req {
+	string volname<>;
+        string brick<>;
+};
+
+struct gf1_cli_log_rotate_rsp {
+        int op_ret;
+        int op_errno;
+        string errstr<>;
+};
+
+struct gf1_cli_sync_volume_rsp {
+	int op_ret;
+	int op_errno;
+        string op_errstr<>;
+};
+
 struct gf1_cli_fsm_log_req {
         string name<>;
 };
@@ -155,33 +330,56 @@ struct gf1_cli_fsm_log_rsp {
         opaque fsm_log<>;
 };
 
-struct gf1_cli_getwd_req {
-        int     unused;
-} ;
+struct gf1_cli_gsync_set_req {
+        opaque dict<>;
+};
 
-struct gf1_cli_getwd_rsp {
+struct gf1_cli_gsync_set_rsp {
         int     op_ret;
         int     op_errno;
-        string  wd<>;
+        string  op_errstr<>;
+        int     type;
+        string  op_name<>;
+        string  subop<>;
+        string  master<>;
+        string  slave<>;
+        string  gsync_prefix<>;
+        string  glusterd_workdir<>;
+        opaque  status_dict<>;
 };
 
-struct gf1_cli_mount_req {
-        string label<>;
-        opaque dict<>;
+struct gf1_cli_stats_volume_req {
+        string           volname<>;
+        gf1_cli_stats_op op;
 };
 
-struct gf1_cli_mount_rsp {
-       int op_ret;
-       int op_errno;
-       string path<>;
+struct gf1_cli_stats_volume_rsp {
+	int    op_ret;
+	int    op_errno;
+        string op_errstr<>;
+        opaque stats_info<>;
 };
 
-struct gf1_cli_umount_req {
-        int lazy;
-        string path<>;
+struct gf1_cli_quota_req {
+        string volname<>;
+        opaque dict<>;
+} ;
+
+struct gf1_cli_quota_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  volname<>;
+        string  op_errstr<>;
+        string  limit_list<>;
+        gf_quota_type type;
 };
 
-struct gf1_cli_umount_rsp {
-       int op_ret;
-       int op_errno;
+struct gf1_cli_getwd_req {
+        int     unused;
+} ;
+
+struct gf1_cli_getwd_rsp {
+        int     op_ret;
+        int     op_errno;
+        string  wd<>;
 };
diff --git a/rpc/xdr/src/cli1.c b/rpc/xdr/src/cli1.c
new file mode 100644
index 000000000..bdfc32ac5
--- /dev/null
+++ b/rpc/xdr/src/cli1.c
@@ -0,0 +1,742 @@
+/*
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "cli1.h"
+#include "xdr-generic.h"
+
+ssize_t
+gf_xdr_serialize_cli_probe_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_probe_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_probe_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_probe_req);
+}
+
+ssize_t
+gf_xdr_to_cli_probe_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_probe_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_probe_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_probe_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_deprobe_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_deprobe_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_deprobe_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_deprobe_req);
+}
+
+ssize_t
+gf_xdr_to_cli_deprobe_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_deprobe_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_deprobe_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_deprobe_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_peer_list_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_peer_list_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_peer_list_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_peer_list_req);
+}
+
+ssize_t
+gf_xdr_to_cli_peer_list_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_peer_list_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_peer_list_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_peer_list_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_get_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_get_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_get_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_get_vol_req);
+}
+
+ssize_t
+gf_xdr_to_cli_get_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_get_vol_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_get_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_get_vol_req);
+}
+ssize_t
+gf_xdr_serialize_cli_create_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_create_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_create_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_create_vol_req);
+}
+
+ssize_t
+gf_xdr_to_cli_create_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_create_vol_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_create_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_create_vol_req);
+}
+
+
+ssize_t
+gf_xdr_serialize_cli_delete_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_delete_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_delete_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_delete_vol_req);
+}
+
+
+ssize_t
+gf_xdr_to_cli_delete_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_delete_vol_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_delete_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_delete_vol_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_start_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_start_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_start_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_start_vol_req);
+}
+
+ssize_t
+gf_xdr_to_cli_start_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_start_vol_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_start_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_start_vol_req);
+}
+
+
+ssize_t
+gf_xdr_serialize_cli_stop_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_stop_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_stop_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_stop_vol_req);
+}
+
+ssize_t
+gf_xdr_to_cli_stop_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_stop_vol_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_stop_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_stop_vol_req);
+}
+
+
+ssize_t
+gf_xdr_serialize_cli_rename_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_rename_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_rename_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_rename_vol_req);
+}
+
+ssize_t
+gf_xdr_to_cli_rename_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_rename_vol_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_rename_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_rename_vol_req);
+}
+
+
+ssize_t
+gf_xdr_serialize_cli_defrag_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_defrag_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_defrag_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_defrag_vol_rsp);
+}
+
+ssize_t
+gf_xdr_serialize_cli_defrag_vol_rsp_v2 (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf2_cli_defrag_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_defrag_vol_rsp_v2 (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf2_cli_defrag_vol_rsp);
+}
+
+ssize_t
+gf_xdr_to_cli_defrag_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_defrag_vol_req);
+}
+
+ssize_t
+gf_xdr_from_cli_defrag_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_defrag_vol_req);
+}
+
+
+
+ssize_t
+gf_xdr_serialize_cli_add_brick_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_add_brick_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_add_brick_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_add_brick_req);
+}
+
+ssize_t
+gf_xdr_to_cli_add_brick_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_add_brick_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_add_brick_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_add_brick_req);
+}
+
+
+ssize_t
+gf_xdr_serialize_cli_remove_brick_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_remove_brick_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_remove_brick_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_remove_brick_req);
+}
+
+
+ssize_t
+gf_xdr_to_cli_remove_brick_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_remove_brick_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_remove_brick_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_remove_brick_req);
+}
+
+
+ssize_t
+gf_xdr_serialize_cli_replace_brick_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_replace_brick_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_replace_brick_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_replace_brick_req);
+}
+
+ssize_t
+gf_xdr_to_cli_replace_brick_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_replace_brick_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_replace_brick_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_replace_brick_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_reset_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_reset_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_reset_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_reset_vol_req);
+}
+
+ssize_t
+gf_xdr_to_cli_reset_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_reset_vol_rsp);
+}
+
+
+ssize_t
+gf_xdr_from_cli_reset_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_reset_vol_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_gsync_set_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_gsync_set_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_gsync_set_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_gsync_set_req);
+}
+
+ssize_t
+gf_xdr_to_cli_gsync_set_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_gsync_set_rsp);
+}
+
+
+ssize_t
+gf_xdr_from_cli_gsync_set_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_gsync_set_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_quota_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_quota_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_quota_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_quota_req);
+}
+
+ssize_t
+gf_xdr_to_cli_quota_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_quota_rsp);
+}
+
+
+ssize_t
+gf_xdr_from_cli_quota_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_quota_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_set_vol_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_set_vol_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_set_vol_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_set_vol_req);
+}
+
+ssize_t
+gf_xdr_to_cli_set_vol_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_set_vol_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_set_vol_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_set_vol_req);
+}
+
+/* log */
+ssize_t
+gf_xdr_serialize_cli_log_filename_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_log_filename_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_log_filename_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_log_filename_req);
+}
+
+ssize_t
+gf_xdr_to_cli_log_filename_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_log_filename_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_log_filename_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_log_filename_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_log_locate_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_log_locate_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_log_locate_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_log_locate_req);
+}
+
+ssize_t
+gf_xdr_to_cli_log_locate_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_log_locate_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_log_locate_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_log_locate_req);
+}
+
+ssize_t
+gf_xdr_serialize_cli_log_rotate_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf1_cli_log_rotate_rsp);
+
+}
+
+ssize_t
+gf_xdr_to_cli_log_rotate_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_log_rotate_req);
+}
+
+ssize_t
+gf_xdr_to_cli_log_rotate_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_log_rotate_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_log_rotate_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf1_cli_log_rotate_req);
+}
+
+ssize_t
+gf_xdr_to_cli_sync_volume_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_sync_volume_req);
+}
+
+ssize_t
+gf_xdr_from_cli_sync_volume_req (struct iovec outmsg, void *args)
+{
+        return xdr_serialize_generic (outmsg, (void *)args,
+                                     (xdrproc_t)xdr_gf1_cli_sync_volume_req);
+}
+
+ssize_t
+gf_xdr_to_cli_sync_volume_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_sync_volume_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_sync_volume_rsp (struct iovec outmsg, void *args)
+{
+        return xdr_serialize_generic (outmsg, (void *)args,
+                                      (xdrproc_t)xdr_gf1_cli_sync_volume_rsp);
+}
+
+ssize_t
+gf_xdr_to_cli_fsm_log_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_fsm_log_req);
+}
+
+ssize_t
+gf_xdr_from_cli_fsm_log_req (struct iovec outmsg, void *args)
+{
+        return xdr_serialize_generic (outmsg, (void *)args,
+                                     (xdrproc_t)xdr_gf1_cli_fsm_log_req);
+}
+
+ssize_t
+gf_xdr_to_cli_fsm_log_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_fsm_log_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_fsm_log_rsp (struct iovec outmsg, void *args)
+{
+        return xdr_serialize_generic (outmsg, (void *)args,
+                                      (xdrproc_t)xdr_gf1_cli_fsm_log_rsp);
+}
+
+ssize_t
+gf_xdr_to_cli_stats_volume_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_stats_volume_req);
+}
+
+ssize_t
+gf_xdr_from_cli_stats_volume_req (struct iovec outmsg, void *args)
+{
+        return xdr_serialize_generic (outmsg, (void *)args,
+                                     (xdrproc_t)xdr_gf1_cli_stats_volume_req);
+}
+
+ssize_t
+gf_xdr_to_cli_stats_volume_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_stats_volume_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_stats_volume_rsp (struct iovec outmsg, void *args)
+{
+        return xdr_serialize_generic (outmsg, (void *)args,
+                                      (xdrproc_t)xdr_gf1_cli_stats_volume_rsp);
+}
+
+ssize_t
+gf_xdr_to_cli_getwd_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_getwd_req);
+}
+
+ssize_t
+gf_xdr_from_cli_getwd_req (struct iovec outmsg, void *args)
+{
+        return xdr_serialize_generic (outmsg, (void *)args,
+                                     (xdrproc_t)xdr_gf1_cli_getwd_req);
+}
+
+ssize_t
+gf_xdr_to_cli_getwd_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gf1_cli_getwd_rsp);
+}
+
+ssize_t
+gf_xdr_from_cli_getwd_rsp (struct iovec outmsg, void *args)
+{
+        return xdr_serialize_generic (outmsg, (void *)args,
+                                      (xdrproc_t)xdr_gf1_cli_getwd_rsp);
+}
diff --git a/rpc/xdr/src/cli1.h b/rpc/xdr/src/cli1.h
new file mode 100644
index 000000000..bb58de645
--- /dev/null
+++ b/rpc/xdr/src/cli1.h
@@ -0,0 +1,330 @@
+/*
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef _CLI1_H
+#define _CLI1_H
+
+#include <sys/uio.h>
+
+#include "cli1-xdr.h"
+
+enum gf_cli_defrag_type {
+        GF_DEFRAG_CMD_START = 1,
+        GF_DEFRAG_CMD_STOP,
+        GF_DEFRAG_CMD_STATUS,
+        GF_DEFRAG_CMD_START_LAYOUT_FIX,
+        GF_DEFRAG_CMD_START_MIGRATE_DATA,
+};
+
+ssize_t
+gf_xdr_serialize_cli_probe_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_probe_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_probe_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_probe_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_deprobe_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_deprobe_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_deprobe_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_deprobe_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_peer_list_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_peer_list_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_peer_list_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_peer_list_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_create_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_create_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_create_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_create_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_delete_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_delete_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_delete_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_delete_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_start_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_start_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_start_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_start_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_stop_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_stop_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_stop_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_stop_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_rename_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_rename_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_rename_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_rename_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_defrag_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_defrag_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_defrag_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_to_cli_defrag_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_serialize_cli_defrag_vol_rsp_v2 (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_defrag_vol_rsp_v2 (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_serialize_cli_add_brick_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_add_brick_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_add_brick_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_add_brick_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_remove_brick_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_remove_brick_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_remove_brick_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_remove_brick_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_replace_brick_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_replace_brick_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_replace_brick_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_replace_brick_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_reset_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_reset_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_reset_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_reset_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_gsync_set_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_gsync_set_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_gsync_set_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_gsync_set_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_quota_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_quota_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_quota_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_quota_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_set_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_set_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_set_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_set_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_get_vol_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_get_vol_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_get_vol_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_get_vol_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_log_filename_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_log_filename_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_log_filename_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_log_filename_req (struct iovec outmsg, void *req);
+
+
+ssize_t
+gf_xdr_serialize_cli_log_locate_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_log_locate_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_log_locate_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_log_locate_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_serialize_cli_log_rotate_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gf_xdr_to_cli_log_rotate_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_log_rotate_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_log_rotate_req (struct iovec outmsg, void *req);
+
+ssize_t
+gf_xdr_to_cli_sync_volume_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_sync_volume_req (struct iovec outmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_sync_volume_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_sync_volume_rsp (struct iovec outmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_fsm_log_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_fsm_log_req (struct iovec outmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_fsm_log_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_fsm_log_rsp (struct iovec outmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_stats_volume_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_stats_volume_req (struct iovec outmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_stats_volume_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_stats_volume_rsp (struct iovec outmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_getwd_req (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_getwd_req (struct iovec outmsg, void *args);
+
+ssize_t
+gf_xdr_to_cli_getwd_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gf_xdr_from_cli_getwd_rsp (struct iovec outmsg, void *args);
+#endif /* !_CLI1_H */
diff --git a/rpc/xdr/src/glusterd1-xdr.c b/rpc/xdr/src/glusterd1-xdr.c
index 213b48bc6..c0fc0029b 100644
--- a/rpc/xdr/src/glusterd1-xdr.c
+++ b/rpc/xdr/src/glusterd1-xdr.c
@@ -1,21 +1,21 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
-#include "xdr-common.h"
-#include "compat.h"
+  GlusterFS 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.
 
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see
+  <http://www.gnu.org/licenses/>.
+*/
 
 /*
  * Please do not edit this file.
@@ -23,12 +23,11 @@
  */
 
 #include "glusterd1-xdr.h"
+#include "compat.h"
 
 bool_t
 xdr_glusterd_volume_status (XDR *xdrs, glusterd_volume_status *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
@@ -38,8 +37,6 @@ xdr_glusterd_volume_status (XDR *xdrs, glusterd_volume_status *objp)
 bool_t
 xdr_gd1_mgmt_probe_req (XDR *xdrs, gd1_mgmt_probe_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -54,57 +51,6 @@ xdr_gd1_mgmt_probe_req (XDR *xdrs, gd1_mgmt_probe_req *objp)
 bool_t
 xdr_gd1_mgmt_probe_rsp (XDR *xdrs, gd1_mgmt_probe_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
-			sizeof (u_char), (xdrproc_t) xdr_u_char))
-			 return FALSE;
-		 if (!xdr_string (xdrs, &objp->hostname, ~0))
-			 return FALSE;
-		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
-		if (buf == NULL) {
-			 if (!xdr_int (xdrs, &objp->port))
-				 return FALSE;
-			 if (!xdr_int (xdrs, &objp->op_ret))
-				 return FALSE;
-			 if (!xdr_int (xdrs, &objp->op_errno))
-				 return FALSE;
-
-		} else {
-		IXDR_PUT_LONG(buf, objp->port);
-		IXDR_PUT_LONG(buf, objp->op_ret);
-		IXDR_PUT_LONG(buf, objp->op_errno);
-		}
-		 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
-			 return FALSE;
-		return TRUE;
-	} else if (xdrs->x_op == XDR_DECODE) {
-		 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
-			sizeof (u_char), (xdrproc_t) xdr_u_char))
-			 return FALSE;
-		 if (!xdr_string (xdrs, &objp->hostname, ~0))
-			 return FALSE;
-		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
-		if (buf == NULL) {
-			 if (!xdr_int (xdrs, &objp->port))
-				 return FALSE;
-			 if (!xdr_int (xdrs, &objp->op_ret))
-				 return FALSE;
-			 if (!xdr_int (xdrs, &objp->op_errno))
-				 return FALSE;
-
-		} else {
-		objp->port = IXDR_GET_LONG(buf);
-		objp->op_ret = IXDR_GET_LONG(buf);
-		objp->op_errno = IXDR_GET_LONG(buf);
-		}
-		 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
-			 return FALSE;
-	 return TRUE;
-	}
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -117,16 +63,12 @@ xdr_gd1_mgmt_probe_rsp (XDR *xdrs, gd1_mgmt_probe_rsp *objp)
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
-	 if (!xdr_string (xdrs, &objp->op_errstr, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gd1_mgmt_friend_req (XDR *xdrs, gd1_mgmt_friend_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -143,8 +85,6 @@ xdr_gd1_mgmt_friend_req (XDR *xdrs, gd1_mgmt_friend_req *objp)
 bool_t
 xdr_gd1_mgmt_friend_rsp (XDR *xdrs, gd1_mgmt_friend_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -163,8 +103,6 @@ xdr_gd1_mgmt_friend_rsp (XDR *xdrs, gd1_mgmt_friend_rsp *objp)
 bool_t
 xdr_gd1_mgmt_unfriend_req (XDR *xdrs, gd1_mgmt_unfriend_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -179,8 +117,6 @@ xdr_gd1_mgmt_unfriend_req (XDR *xdrs, gd1_mgmt_unfriend_req *objp)
 bool_t
 xdr_gd1_mgmt_unfriend_rsp (XDR *xdrs, gd1_mgmt_unfriend_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -199,8 +135,6 @@ xdr_gd1_mgmt_unfriend_rsp (XDR *xdrs, gd1_mgmt_unfriend_rsp *objp)
 bool_t
 xdr_gd1_mgmt_cluster_lock_req (XDR *xdrs, gd1_mgmt_cluster_lock_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -211,8 +145,6 @@ xdr_gd1_mgmt_cluster_lock_req (XDR *xdrs, gd1_mgmt_cluster_lock_req *objp)
 bool_t
 xdr_gd1_mgmt_cluster_lock_rsp (XDR *xdrs, gd1_mgmt_cluster_lock_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -227,8 +159,6 @@ xdr_gd1_mgmt_cluster_lock_rsp (XDR *xdrs, gd1_mgmt_cluster_lock_rsp *objp)
 bool_t
 xdr_gd1_mgmt_cluster_unlock_req (XDR *xdrs, gd1_mgmt_cluster_unlock_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -239,8 +169,6 @@ xdr_gd1_mgmt_cluster_unlock_req (XDR *xdrs, gd1_mgmt_cluster_unlock_req *objp)
 bool_t
 xdr_gd1_mgmt_cluster_unlock_rsp (XDR *xdrs, gd1_mgmt_cluster_unlock_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -255,8 +183,6 @@ xdr_gd1_mgmt_cluster_unlock_rsp (XDR *xdrs, gd1_mgmt_cluster_unlock_rsp *objp)
 bool_t
 xdr_gd1_mgmt_stage_op_req (XDR *xdrs, gd1_mgmt_stage_op_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -271,9 +197,8 @@ xdr_gd1_mgmt_stage_op_req (XDR *xdrs, gd1_mgmt_stage_op_req *objp)
 bool_t
 xdr_gd1_mgmt_stage_op_rsp (XDR *xdrs, gd1_mgmt_stage_op_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
+        register int32_t *buf;
 
 	if (xdrs->x_op == XDR_ENCODE) {
 		 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
@@ -342,8 +267,6 @@ xdr_gd1_mgmt_stage_op_rsp (XDR *xdrs, gd1_mgmt_stage_op_rsp *objp)
 bool_t
 xdr_gd1_mgmt_commit_op_req (XDR *xdrs, gd1_mgmt_commit_op_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -359,7 +282,6 @@ bool_t
 xdr_gd1_mgmt_commit_op_rsp (XDR *xdrs, gd1_mgmt_commit_op_rsp *objp)
 {
 	register int32_t *buf;
-        buf = NULL;
 
 
 	if (xdrs->x_op == XDR_ENCODE) {
@@ -429,8 +351,6 @@ xdr_gd1_mgmt_commit_op_rsp (XDR *xdrs, gd1_mgmt_commit_op_rsp *objp)
 bool_t
 xdr_gd1_mgmt_friend_update (XDR *xdrs, gd1_mgmt_friend_update *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -445,8 +365,6 @@ xdr_gd1_mgmt_friend_update (XDR *xdrs, gd1_mgmt_friend_update *objp)
 bool_t
 xdr_gd1_mgmt_friend_update_rsp (XDR *xdrs, gd1_mgmt_friend_update_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_vector (xdrs, (char *)objp->uuid, 16,
 		sizeof (u_char), (xdrproc_t) xdr_u_char))
@@ -463,8 +381,6 @@ xdr_gd1_mgmt_friend_update_rsp (XDR *xdrs, gd1_mgmt_friend_update_rsp *objp)
 bool_t
 xdr_gd1_mgmt_brick_op_req (XDR *xdrs, gd1_mgmt_brick_op_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_string (xdrs, &objp->name, ~0))
 		 return FALSE;
@@ -478,8 +394,6 @@ xdr_gd1_mgmt_brick_op_req (XDR *xdrs, gd1_mgmt_brick_op_req *objp)
 bool_t
 xdr_gd1_mgmt_brick_op_rsp (XDR *xdrs, gd1_mgmt_brick_op_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
diff --git a/rpc/xdr/src/glusterd1-xdr.h b/rpc/xdr/src/glusterd1-xdr.h
index c35930cad..12c625b8d 100644
--- a/rpc/xdr/src/glusterd1-xdr.h
+++ b/rpc/xdr/src/glusterd1-xdr.h
@@ -1,21 +1,22 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
-#include "xdr-common.h"
-#include "compat.h"
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
 
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
 
 /*
  * Please do not edit this file.
@@ -53,7 +54,6 @@ struct gd1_mgmt_probe_rsp {
 	int port;
 	int op_ret;
 	int op_errno;
-	char *op_errstr;
 };
 typedef struct gd1_mgmt_probe_rsp gd1_mgmt_probe_rsp;
 
@@ -252,4 +252,4 @@ extern bool_t xdr_gd1_mgmt_brick_op_rsp ();
 }
 #endif
 
-#endif /* !_GLUSTERD1_XDR_H_RPCGEN */
+#endif /* !_GLUSTERD1-XDR_H_RPCGEN */
diff --git a/rpc/xdr/src/glusterd1-xdr.x b/rpc/xdr/src/glusterd1-xdr.x
index fc1bb58b4..c30c71e02 100644
--- a/rpc/xdr/src/glusterd1-xdr.x
+++ b/rpc/xdr/src/glusterd1-xdr.x
@@ -16,7 +16,6 @@
         int     port;
         int     op_ret;
         int     op_errno;
-        string op_errstr<>;
 }  ;
 
 struct gd1_mgmt_friend_req {
diff --git a/rpc/xdr/src/glusterd1.c b/rpc/xdr/src/glusterd1.c
new file mode 100644
index 000000000..22b5c8386
--- /dev/null
+++ b/rpc/xdr/src/glusterd1.c
@@ -0,0 +1,262 @@
+/*
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "glusterd1.h"
+
+
+ssize_t
+gd_xdr_serialize_mgmt_probe_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gd1_mgmt_probe_rsp);
+
+}
+
+ssize_t
+gd_xdr_serialize_mgmt_friend_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gd1_mgmt_friend_rsp);
+
+}
+
+ssize_t
+gd_xdr_serialize_mgmt_cluster_lock_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                (xdrproc_t)xdr_gd1_mgmt_cluster_lock_rsp);
+
+}
+
+ssize_t
+gd_xdr_serialize_mgmt_cluster_unlock_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_rsp);
+
+}
+
+ssize_t
+gd_xdr_serialize_mgmt_stage_op_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                (xdrproc_t)xdr_gd1_mgmt_stage_op_rsp);
+
+}
+
+ssize_t
+gd_xdr_serialize_mgmt_commit_op_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                (xdrproc_t)xdr_gd1_mgmt_commit_op_rsp);
+
+}
+
+ssize_t
+gd_xdr_serialize_mgmt_friend_update_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                (xdrproc_t)xdr_gd1_mgmt_friend_update_rsp);
+
+}
+/* Decode */
+
+
+ssize_t
+gd_xdr_to_mgmt_probe_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_probe_req);
+}
+
+ssize_t
+gd_xdr_to_mgmt_friend_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_friend_req);
+}
+
+ssize_t
+gd_xdr_to_mgmt_friend_update (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_friend_update);
+}
+
+ssize_t
+gd_xdr_to_mgmt_cluster_lock_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_cluster_lock_req);
+}
+
+ssize_t
+gd_xdr_to_mgmt_cluster_unlock_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_req);
+}
+
+ssize_t
+gd_xdr_to_mgmt_stage_op_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_stage_op_req);
+}
+
+
+ssize_t
+gd_xdr_to_mgmt_commit_op_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_commit_op_req);
+}
+
+ssize_t
+gd_xdr_to_mgmt_probe_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_probe_rsp);
+}
+
+ssize_t
+gd_xdr_to_mgmt_friend_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_friend_rsp);
+}
+
+ssize_t
+gd_xdr_to_mgmt_cluster_lock_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_cluster_lock_rsp);
+}
+
+ssize_t
+gd_xdr_to_mgmt_cluster_unlock_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_rsp);
+}
+
+ssize_t
+gd_xdr_to_mgmt_stage_op_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_stage_op_rsp);
+}
+
+ssize_t
+gd_xdr_to_mgmt_commit_op_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_commit_op_rsp);
+}
+
+ssize_t
+gd_xdr_to_mgmt_friend_update_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_friend_update_rsp);
+}
+
+ssize_t
+gd_xdr_from_mgmt_probe_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gd1_mgmt_probe_req);
+
+}
+
+ssize_t
+gd_xdr_from_mgmt_friend_update (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gd1_mgmt_friend_update);
+
+}
+
+ssize_t
+gd_xdr_from_mgmt_friend_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gd1_mgmt_friend_req);
+
+}
+
+ssize_t
+gd_xdr_from_mgmt_cluster_lock_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gd1_mgmt_cluster_lock_req);
+
+}
+
+ssize_t
+gd_xdr_from_mgmt_cluster_unlock_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_req);
+
+}
+
+ssize_t
+gd_xdr_from_mgmt_stage_op_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gd1_mgmt_stage_op_req);
+}
+
+
+ssize_t
+gd_xdr_from_mgmt_commit_op_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gd1_mgmt_commit_op_req);
+}
+
+ssize_t
+gd_xdr_to_mgmt_brick_op_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_brick_op_req);
+}
+
+ssize_t
+gd_xdr_from_mgmt_brick_op_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gd1_mgmt_brick_op_req);
+}
+
+ssize_t
+gd_xdr_to_mgmt_brick_op_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
+}
+
+ssize_t
+gd_xdr_serialize_mgmt_brick_op_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                (xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
+}
diff --git a/rpc/xdr/src/glusterd1.h b/rpc/xdr/src/glusterd1.h
new file mode 100644
index 000000000..1bc5b0c3a
--- /dev/null
+++ b/rpc/xdr/src/glusterd1.h
@@ -0,0 +1,125 @@
+/*
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef _GLUSTERD1_H
+#define _GLUSTERD1_H
+
+#include <sys/uio.h>
+
+#include "xdr-generic.h"
+#include "glusterd1-xdr.h"
+
+ssize_t
+gd_xdr_to_mgmt_probe_req (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_to_mgmt_probe_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_serialize_mgmt_probe_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gd_xdr_from_mgmt_probe_req (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_to_mgmt_friend_req (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_to_mgmt_friend_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_serialize_mgmt_friend_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gd_xdr_from_mgmt_friend_req (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_to_mgmt_cluster_lock_req (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_to_mgmt_cluster_lock_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_serialize_mgmt_cluster_lock_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gd_xdr_from_mgmt_cluster_lock_req (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_to_mgmt_cluster_unlock_req (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_to_mgmt_cluster_unlock_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_serialize_mgmt_cluster_unlock_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gd_xdr_from_mgmt_cluster_unlock_req (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_to_mgmt_stage_op_req (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_to_mgmt_stage_op_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_serialize_mgmt_stage_op_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gd_xdr_from_mgmt_stage_op_req (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_to_mgmt_commit_op_req (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_to_mgmt_commit_op_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_serialize_mgmt_commit_op_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gd_xdr_from_mgmt_commit_op_req (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_to_mgmt_friend_update (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_from_mgmt_friend_update (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_serialize_mgmt_friend_update_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+gd_xdr_to_mgmt_friend_update_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_to_mgmt_brick_op_req (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_from_mgmt_brick_op_req (struct iovec outmsg, void *req);
+
+ssize_t
+gd_xdr_to_mgmt_brick_op_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+gd_xdr_serialize_mgmt_brick_op_rsp (struct iovec outmsg, void *rsp);
+
+#endif /* !_MSG_GD_XDR_H */
diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c
index 3205c551e..cc43f22cf 100644
--- a/rpc/xdr/src/glusterfs3-xdr.c
+++ b/rpc/xdr/src/glusterfs3-xdr.c
@@ -1,21 +1,22 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
-#include "xdr-common.h"
-#include "compat.h"
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
 
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
 
 /*
  * Please do not edit this file.
@@ -23,12 +24,11 @@
  */
 
 #include "glusterfs3-xdr.h"
+#include "compat.h"
 
 bool_t
 xdr_gf_statfs (XDR *xdrs, gf_statfs *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_u_quad_t (xdrs, &objp->bsize))
 		 return FALSE;
@@ -58,8 +58,6 @@ xdr_gf_statfs (XDR *xdrs, gf_statfs *objp)
 bool_t
 xdr_gf_proto_flock (XDR *xdrs, gf_proto_flock *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_u_int (xdrs, &objp->type))
 		 return FALSE;
@@ -71,7 +69,7 @@ xdr_gf_proto_flock (XDR *xdrs, gf_proto_flock *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->pid))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->lk_owner.lk_owner_val, (u_int *) &objp->lk_owner.lk_owner_len, ~0))
+	 if (!xdr_u_quad_t (xdrs, &objp->owner))
 		 return FALSE;
 	return TRUE;
 }
@@ -80,8 +78,6 @@ bool_t
 xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 {
 	register int32_t *buf;
-        buf = NULL;
-
 
 	if (xdrs->x_op == XDR_ENCODE) {
 		 if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
@@ -140,7 +136,7 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 		return TRUE;
 	} else if (xdrs->x_op == XDR_DECODE) {
 		 if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
-			 return FALSE;
+                        return FALSE;
 		 if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
 			 return FALSE;
 		 if (!xdr_u_quad_t (xdrs, &objp->ia_dev))
@@ -195,7 +191,7 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 	 return TRUE;
 	}
 
-	 if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
+         if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
 		 return FALSE;
@@ -235,12 +231,10 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 bool_t
 xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -248,8 +242,6 @@ xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp)
 bool_t
 xdr_gfs3_stat_rsp (XDR *xdrs, gfs3_stat_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -257,22 +249,18 @@ xdr_gfs3_stat_rsp (XDR *xdrs, gfs3_stat_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->stat))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -280,8 +268,6 @@ xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp)
 bool_t
 xdr_gfs3_readlink_rsp (XDR *xdrs, gfs3_readlink_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -291,28 +277,25 @@ xdr_gfs3_readlink_rsp (XDR *xdrs, gfs3_readlink_rsp *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->dev))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
 		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->umask))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
+                         (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -320,8 +303,6 @@ xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
 bool_t
 xdr_gfs3_mknod_rsp (XDR *xdrs, gfs3_mknod_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -333,26 +314,23 @@ xdr_gfs3_mknod_rsp (XDR *xdrs, gfs3_mknod_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
 		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->umask))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
+                         (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -360,8 +338,6 @@ xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp)
 bool_t
 xdr_gfs3_mkdir_rsp (XDR *xdrs, gfs3_mkdir_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -373,33 +349,25 @@ xdr_gfs3_mkdir_rsp (XDR *xdrs, gfs3_mkdir_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_unlink_req (XDR *xdrs, gfs3_unlink_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
+                 return FALSE;
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->xflags))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_unlink_rsp (XDR *xdrs, gfs3_unlink_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -409,33 +377,27 @@ xdr_gfs3_unlink_rsp (XDR *xdrs, gfs3_unlink_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_rmdir_req (XDR *xdrs, gfs3_rmdir_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->xflags))
+                 return FALSE;
+         if (!xdr_int (xdrs, &objp->flags))
+                 return FALSE;
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_rmdir_rsp (XDR *xdrs, gfs3_rmdir_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -445,26 +407,23 @@ xdr_gfs3_rmdir_rsp (XDR *xdrs, gfs3_rmdir_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
+                 return FALSE;
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->umask))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->linkname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
+                         (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -472,8 +431,6 @@ xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp)
 bool_t
 xdr_gfs3_symlink_rsp (XDR *xdrs, gfs3_symlink_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -485,26 +442,24 @@ xdr_gfs3_symlink_rsp (XDR *xdrs, gfs3_symlink_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->oldgfid, 16))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->newgfid, 16))
+                 return FALSE;
+	 if (!xdr_string (xdrs, &objp->oldpath, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->oldbname, ~0))
 		 return FALSE;
-	 if (!xdr_string (xdrs, &objp->newbname, ~0))
+	 if (!xdr_string (xdrs, &objp->newpath, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->newbname, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -512,8 +467,6 @@ xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
 bool_t
 xdr_gfs3_rename_rsp (XDR *xdrs, gfs3_rename_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -529,24 +482,22 @@ xdr_gfs3_rename_rsp (XDR *xdrs, gfs3_rename_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postnewparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->oldgfid, 16))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->newgfid, 16))
+                 return FALSE;
+	 if (!xdr_string (xdrs, &objp->oldpath, ~0))
 		 return FALSE;
-	 if (!xdr_string (xdrs, &objp->newbname, ~0))
+	 if (!xdr_string (xdrs, &objp->newpath, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->newbname, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -554,8 +505,6 @@ xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
 bool_t
 xdr_gfs3_link_rsp (XDR *xdrs, gfs3_link_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -567,22 +516,18 @@ xdr_gfs3_link_rsp (XDR *xdrs, gfs3_link_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->offset))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -590,8 +535,6 @@ xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp)
 bool_t
 xdr_gfs3_truncate_rsp (XDR *xdrs, gfs3_truncate_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -601,22 +544,20 @@ xdr_gfs3_truncate_rsp (XDR *xdrs, gfs3_truncate_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->poststat))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_u_int (xdrs, &objp->wbflags))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -624,8 +565,6 @@ xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp)
 bool_t
 xdr_gfs3_open_rsp (XDR *xdrs, gfs3_open_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -633,16 +572,12 @@ xdr_gfs3_open_rsp (XDR *xdrs, gfs3_open_rsp *objp)
 		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_read_req (XDR *xdrs, gfs3_read_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -652,18 +587,12 @@ xdr_gfs3_read_req (XDR *xdrs, gfs3_read_req *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->flag))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_read_rsp (XDR *xdrs, gfs3_read_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -673,26 +602,26 @@ xdr_gfs3_read_rsp (XDR *xdrs, gfs3_read_rsp *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
+
+         return TRUE;
 }
 
 bool_t
 xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->path, ~0))
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
+                         (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -700,8 +629,6 @@ xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp)
 bool_t
 xdr_gfs3_lookup_rsp (XDR *xdrs, gfs3_lookup_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -711,7 +638,8 @@ xdr_gfs3_lookup_rsp (XDR *xdrs, gfs3_lookup_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
+                         (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -719,8 +647,6 @@ xdr_gfs3_lookup_rsp (XDR *xdrs, gfs3_lookup_rsp *objp)
 bool_t
 xdr_gfs3_write_req (XDR *xdrs, gfs3_write_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -730,18 +656,12 @@ xdr_gfs3_write_req (XDR *xdrs, gfs3_write_req *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->flag))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_write_rsp (XDR *xdrs, gfs3_write_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -751,20 +671,16 @@ xdr_gfs3_write_rsp (XDR *xdrs, gfs3_write_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->poststat))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -772,8 +688,6 @@ xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp)
 bool_t
 xdr_gfs3_statfs_rsp (XDR *xdrs, gfs3_statfs_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -781,16 +695,12 @@ xdr_gfs3_statfs_rsp (XDR *xdrs, gfs3_statfs_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_statfs (xdrs, &objp->statfs))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -802,16 +712,12 @@ xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
 		 return FALSE;
 	 if (!xdr_gf_proto_flock (xdrs, &objp->flock))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_lk_rsp (XDR *xdrs, gfs3_lk_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -819,16 +725,12 @@ xdr_gfs3_lk_rsp (XDR *xdrs, gfs3_lk_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_proto_flock (xdrs, &objp->flock))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -838,9 +740,9 @@ xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
 		 return FALSE;
 	 if (!xdr_gf_proto_flock (xdrs, &objp->flock))
 		 return FALSE;
-	 if (!xdr_string (xdrs, &objp->volume, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->volume, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -848,8 +750,6 @@ xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
 bool_t
 xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -863,31 +763,23 @@ xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->volume, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_flush_req (XDR *xdrs, gfs3_flush_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fsync_req (XDR *xdrs, gfs3_fsync_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -895,16 +787,12 @@ xdr_gfs3_fsync_req (XDR *xdrs, gfs3_fsync_req *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->data))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fsync_rsp (XDR *xdrs, gfs3_fsync_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -914,16 +802,12 @@ xdr_gfs3_fsync_rsp (XDR *xdrs, gfs3_fsync_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->poststat))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -931,7 +815,7 @@ xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -939,8 +823,6 @@ xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
 bool_t
 xdr_gfs3_fsetxattr_req (XDR *xdrs, gfs3_fsetxattr_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -950,16 +832,12 @@ xdr_gfs3_fsetxattr_req (XDR *xdrs, gfs3_fsetxattr_req *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -967,7 +845,7 @@ xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -975,8 +853,6 @@ xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
 bool_t
 xdr_gfs3_xattrop_rsp (XDR *xdrs, gfs3_xattrop_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -984,16 +860,12 @@ xdr_gfs3_xattrop_rsp (XDR *xdrs, gfs3_xattrop_rsp *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fxattrop_req (XDR *xdrs, gfs3_fxattrop_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1003,16 +875,12 @@ xdr_gfs3_fxattrop_req (XDR *xdrs, gfs3_fxattrop_req *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fxattrop_rsp (XDR *xdrs, gfs3_fxattrop_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1020,24 +888,20 @@ xdr_gfs3_fxattrop_rsp (XDR *xdrs, gfs3_fxattrop_rsp *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->namelen))
 		 return FALSE;
-	 if (!xdr_string (xdrs, &objp->name, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->name, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -1045,8 +909,6 @@ xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp)
 bool_t
 xdr_gfs3_getxattr_rsp (XDR *xdrs, gfs3_getxattr_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1054,16 +916,12 @@ xdr_gfs3_getxattr_rsp (XDR *xdrs, gfs3_getxattr_rsp *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fgetxattr_req (XDR *xdrs, gfs3_fgetxattr_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1073,16 +931,12 @@ xdr_gfs3_fgetxattr_req (XDR *xdrs, gfs3_fgetxattr_req *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->name, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fgetxattr_rsp (XDR *xdrs, gfs3_fgetxattr_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1090,52 +944,29 @@ xdr_gfs3_fgetxattr_rsp (XDR *xdrs, gfs3_fgetxattr_rsp *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_removexattr_req (XDR *xdrs, gfs3_removexattr_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_string (xdrs, &objp->name, ~0))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gfs3_fremovexattr_req (XDR *xdrs, gfs3_fremovexattr_req *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_opaque (xdrs, objp->gfid, 16))
-		 return FALSE;
-	 if (!xdr_quad_t (xdrs, &objp->fd))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->name, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -1143,8 +974,6 @@ xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp)
 bool_t
 xdr_gfs3_opendir_rsp (XDR *xdrs, gfs3_opendir_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1152,16 +981,12 @@ xdr_gfs3_opendir_rsp (XDR *xdrs, gfs3_opendir_rsp *objp)
 		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fsyncdir_req (XDR *xdrs, gfs3_fsyncdir_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1169,16 +994,12 @@ xdr_gfs3_fsyncdir_req (XDR *xdrs, gfs3_fsyncdir_req *objp)
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->data))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_readdir_req (XDR *xdrs, gfs3_readdir_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1188,16 +1009,12 @@ xdr_gfs3_readdir_req (XDR *xdrs, gfs3_readdir_req *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1207,6 +1024,26 @@ xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf_setvolume_req (XDR *xdrs, gf_setvolume_req *objp)
+{
+
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_gf_setvolume_rsp (XDR *xdrs, gf_setvolume_rsp *objp)
+{
+
+	 if (!xdr_int (xdrs, &objp->op_ret))
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->op_errno))
+		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
@@ -1215,14 +1052,12 @@ xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
 bool_t
 xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mask))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -1230,67 +1065,19 @@ xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp)
 bool_t
 xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-			 return FALSE;
-		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
-		if (buf == NULL) {
-			 if (!xdr_u_int (xdrs, &objp->flags))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->mode))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->umask))
-				 return FALSE;
-
-		} else {
-		IXDR_PUT_U_LONG(buf, objp->flags);
-		IXDR_PUT_U_LONG(buf, objp->mode);
-		IXDR_PUT_U_LONG(buf, objp->umask);
-		}
-		 if (!xdr_string (xdrs, &objp->bname, ~0))
-			 return FALSE;
-		 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-			 return FALSE;
-		return TRUE;
-	} else if (xdrs->x_op == XDR_DECODE) {
-		 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-			 return FALSE;
-		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
-		if (buf == NULL) {
-			 if (!xdr_u_int (xdrs, &objp->flags))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->mode))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->umask))
-				 return FALSE;
-
-		} else {
-		objp->flags = IXDR_GET_U_LONG(buf);
-		objp->mode = IXDR_GET_U_LONG(buf);
-		objp->umask = IXDR_GET_U_LONG(buf);
-		}
-		 if (!xdr_string (xdrs, &objp->bname, ~0))
-			 return FALSE;
-		 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-			 return FALSE;
-	 return TRUE;
-	}
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
 		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->umask))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
+                         (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -1298,8 +1085,6 @@ xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
 bool_t
 xdr_gfs3_create_rsp (XDR *xdrs, gfs3_create_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1313,16 +1098,12 @@ xdr_gfs3_create_rsp (XDR *xdrs, gfs3_create_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_ftruncate_req (XDR *xdrs, gfs3_ftruncate_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1330,16 +1111,12 @@ xdr_gfs3_ftruncate_req (XDR *xdrs, gfs3_ftruncate_req *objp)
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->offset))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_ftruncate_rsp (XDR *xdrs, gfs3_ftruncate_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1349,31 +1126,23 @@ xdr_gfs3_ftruncate_rsp (XDR *xdrs, gfs3_ftruncate_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->poststat))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fstat_req (XDR *xdrs, gfs3_fstat_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fstat_rsp (XDR *xdrs, gfs3_fstat_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1381,16 +1150,12 @@ xdr_gfs3_fstat_rsp (XDR *xdrs, gfs3_fstat_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->stat))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1400,20 +1165,18 @@ xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp)
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->namelen))
 		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->path, ~0))
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->name, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->volume, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1429,16 +1192,13 @@ xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->volume, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
+
 bool_t
 xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1446,7 +1206,7 @@ xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->valid))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
+	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -1454,8 +1214,6 @@ xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
 bool_t
 xdr_gfs3_setattr_rsp (XDR *xdrs, gfs3_setattr_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1465,16 +1223,12 @@ xdr_gfs3_setattr_rsp (XDR *xdrs, gfs3_setattr_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->statpost))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fsetattr_req (XDR *xdrs, gfs3_fsetattr_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
@@ -1482,16 +1236,12 @@ xdr_gfs3_fsetattr_req (XDR *xdrs, gfs3_fsetattr_req *objp)
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->valid))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_fsetattr_rsp (XDR *xdrs, gfs3_fsetattr_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1501,135 +1251,12 @@ xdr_gfs3_fsetattr_rsp (XDR *xdrs, gfs3_fsetattr_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->statpost))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-xdr_gfs3_fallocate_req (XDR *xdrs, gfs3_fallocate_req *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_opaque (xdrs, objp->gfid, 16))
-		 return FALSE;
-	 if (!xdr_quad_t (xdrs, &objp->fd))
-		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->flags))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->offset))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->size))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gfs3_fallocate_rsp (XDR *xdrs, gfs3_fallocate_rsp *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_int (xdrs, &objp->op_ret))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->op_errno))
-		 return FALSE;
-	 if (!xdr_gf_iatt (xdrs, &objp->statpre))
-		 return FALSE;
-	 if (!xdr_gf_iatt (xdrs, &objp->statpost))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gfs3_discard_req (XDR *xdrs, gfs3_discard_req *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_opaque (xdrs, objp->gfid, 16))
-		 return FALSE;
-	 if (!xdr_quad_t (xdrs, &objp->fd))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->offset))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->size))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gfs3_discard_rsp (XDR *xdrs, gfs3_discard_rsp *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_int (xdrs, &objp->op_ret))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->op_errno))
-		 return FALSE;
-	 if (!xdr_gf_iatt (xdrs, &objp->statpre))
-		 return FALSE;
-	 if (!xdr_gf_iatt (xdrs, &objp->statpost))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gfs3_zerofill_req (XDR *xdrs, gfs3_zerofill_req *objp)
-{
-        register int32_t *buf;
-        buf = NULL;
-
-        if (!xdr_opaque (xdrs, objp->gfid, 16))
-                return FALSE;
-        if (!xdr_quad_t (xdrs, &objp->fd))
-                return FALSE;
-        if (!xdr_u_quad_t (xdrs, &objp->offset))
-                return FALSE;
-        if (!xdr_u_quad_t (xdrs, &objp->size))
-                return FALSE;
-        if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val,
-             (u_int *) &objp->xdata.xdata_len, ~0))
-                return FALSE;
-        return TRUE;
-}
-
-bool_t
-xdr_gfs3_zerofill_rsp (XDR *xdrs, gfs3_zerofill_rsp *objp)
-{
-        register int32_t *buf;
-        buf = NULL;
-
-        if (!xdr_int (xdrs, &objp->op_ret))
-                return FALSE;
-        if (!xdr_int (xdrs, &objp->op_errno))
-                return FALSE;
-        if (!xdr_gf_iatt (xdrs, &objp->statpre))
-                return FALSE;
-        if (!xdr_gf_iatt (xdrs, &objp->statpost))
-                return FALSE;
-        if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val,
-             (u_int *) &objp->xdata.xdata_len, ~0))
-                return FALSE;
-        return TRUE;
-}
-
-
-bool_t
 xdr_gfs3_rchecksum_req (XDR *xdrs, gfs3_rchecksum_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
@@ -1637,8 +1264,6 @@ xdr_gfs3_rchecksum_req (XDR *xdrs, gfs3_rchecksum_req *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->len))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
@@ -1646,7 +1271,6 @@ bool_t
 xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
 {
 	register int32_t *buf;
-        buf = NULL;
 
 
 	if (xdrs->x_op == XDR_ENCODE) {
@@ -1666,8 +1290,6 @@ xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
 		}
 		 if (!xdr_bytes (xdrs, (char **)&objp->strong_checksum.strong_checksum_val, (u_int *) &objp->strong_checksum.strong_checksum_len, ~0))
 			 return FALSE;
-		 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-			 return FALSE;
 		return TRUE;
 	} else if (xdrs->x_op == XDR_DECODE) {
 		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
@@ -1686,8 +1308,6 @@ xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
 		}
 		 if (!xdr_bytes (xdrs, (char **)&objp->strong_checksum.strong_checksum_val, (u_int *) &objp->strong_checksum.strong_checksum_len, ~0))
 			 return FALSE;
-		 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-			 return FALSE;
 	 return TRUE;
 	}
 
@@ -1699,57 +1319,23 @@ xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
 		 return FALSE;
 	 if (!xdr_bytes (xdrs, (char **)&objp->strong_checksum.strong_checksum_val, (u_int *) &objp->strong_checksum.strong_checksum_len, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_setvolume_req (XDR *xdrs, gf_setvolume_req *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_setvolume_rsp (XDR *xdrs, gf_setvolume_rsp *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_int (xdrs, &objp->op_ret))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->op_errno))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gf_getspec_req (XDR *xdrs, gf_getspec_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->key, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gf_getspec_rsp (XDR *xdrs, gf_getspec_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1757,42 +1343,12 @@ xdr_gf_getspec_rsp (XDR *xdrs, gf_getspec_rsp *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->spec, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_mgmt_hndsk_req (XDR *xdrs, gf_mgmt_hndsk_req *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_bytes (xdrs, (char **)&objp->hndsk.hndsk_val, (u_int *) &objp->hndsk.hndsk_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_mgmt_hndsk_rsp (XDR *xdrs, gf_mgmt_hndsk_rsp *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_int (xdrs, &objp->op_ret))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->op_errno))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->hndsk.hndsk_val, (u_int *) &objp->hndsk.hndsk_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gf_log_req (XDR *xdrs, gf_log_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_bytes (xdrs, (char **)&objp->msg.msg_val, (u_int *) &objp->msg.msg_len, ~0))
 		 return FALSE;
@@ -1802,15 +1358,11 @@ xdr_gf_log_req (XDR *xdrs, gf_log_req *objp)
 bool_t
 xdr_gf_notify_req (XDR *xdrs, gf_notify_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->buf, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
@@ -1818,8 +1370,6 @@ bool_t
 xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
 {
 	register int32_t *buf;
-        buf = NULL;
-
 
 	if (xdrs->x_op == XDR_ENCODE) {
 		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
@@ -1838,8 +1388,6 @@ xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
 		}
 		 if (!xdr_string (xdrs, &objp->buf, ~0))
 			 return FALSE;
-		 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-			 return FALSE;
 		return TRUE;
 	} else if (xdrs->x_op == XDR_DECODE) {
 		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
@@ -1858,8 +1406,6 @@ xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
 		}
 		 if (!xdr_string (xdrs, &objp->buf, ~0))
 			 return FALSE;
-		 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-			 return FALSE;
 	 return TRUE;
 	}
 
@@ -1871,62 +1417,46 @@ xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->buf, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_releasedir_req (XDR *xdrs, gfs3_releasedir_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_release_req (XDR *xdrs, gfs3_release_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gf_common_rsp (XDR *xdrs, gf_common_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
+
 bool_t
 xdr_gfs3_dirlist (XDR *xdrs, gfs3_dirlist *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_u_quad_t (xdrs, &objp->d_ino))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->d_off))
@@ -1945,30 +1475,22 @@ xdr_gfs3_dirlist (XDR *xdrs, gfs3_dirlist *objp)
 bool_t
 xdr_gfs3_readdir_rsp (XDR *xdrs, gfs3_readdir_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
 	 if (!xdr_pointer (xdrs, (char **)&objp->reply, sizeof (gfs3_dirlist), (xdrproc_t) xdr_gfs3_dirlist))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
 	return TRUE;
 }
 
 bool_t
 xdr_gfs3_dirplist (XDR *xdrs, gfs3_dirplist *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_u_quad_t (xdrs, &objp->d_ino))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->d_off))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->d_len))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->d_type))
@@ -1977,8 +1499,6 @@ xdr_gfs3_dirplist (XDR *xdrs, gfs3_dirplist *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->stat))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
-		 return FALSE;
 	 if (!xdr_pointer (xdrs, (char **)&objp->nextentry, sizeof (gfs3_dirplist), (xdrproc_t) xdr_gfs3_dirplist))
 		 return FALSE;
 	return TRUE;
@@ -1987,72 +1507,11 @@ xdr_gfs3_dirplist (XDR *xdrs, gfs3_dirplist *objp)
 bool_t
 xdr_gfs3_readdirp_rsp (XDR *xdrs, gfs3_readdirp_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_int (xdrs, &objp->op_ret))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->op_errno))
-		 return FALSE;
-	 if (!xdr_pointer (xdrs, (char **)&objp->reply, sizeof (gfs3_dirplist), (xdrproc_t) xdr_gfs3_dirplist))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_set_lk_ver_rsp (XDR *xdrs, gf_set_lk_ver_rsp *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_int (xdrs, &objp->op_ret))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->op_errno))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->lk_ver))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_set_lk_ver_req (XDR *xdrs, gf_set_lk_ver_req *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_string (xdrs, &objp->uid, ~0))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->lk_ver))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_event_notify_req (XDR *xdrs, gf_event_notify_req *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_int (xdrs, &objp->op))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_event_notify_rsp (XDR *xdrs, gf_event_notify_rsp *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+	 if (!xdr_pointer (xdrs, (char **)&objp->reply, sizeof (struct gfs3_dirplist), (xdrproc_t) xdr_gfs3_dirplist))
 		 return FALSE;
 	return TRUE;
 }
diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h
index 13566e694..00720e138 100644
--- a/rpc/xdr/src/glusterfs3-xdr.h
+++ b/rpc/xdr/src/glusterfs3-xdr.h
@@ -1,32 +1,35 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
-#include "xdr-common.h"
-#include "compat.h"
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
 
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
 
 /*
- * Please do not edit this file.
- * It was generated using rpcgen.
+ * Most content of this file is generated using rpcgen. There are very few
+ * additions done to this file (changes can be seen by doing
+ * 'rpcgen glusterfs3.x' and taking a diff of this file with rpcgen
+ * generated file.
  */
 
-#ifndef _GLUSTERFS3_XDR_H_RPCGEN
-#define _GLUSTERFS3_XDR_H_RPCGEN
-
-#include <rpc/rpc.h>
+#ifndef _GLUSTERFS3_H_RPCGEN
+#define _GLUSTERFS3_H_RPCGEN
 
+//#include <rpc/rpc.h>
+#include "xdr-common.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,10 +57,7 @@ struct gf_proto_flock {
 	u_quad_t start;
 	u_quad_t len;
 	u_int pid;
-	struct {
-		u_int lk_owner_len;
-		char *lk_owner_val;
-	} lk_owner;
+	u_quad_t owner;
 };
 typedef struct gf_proto_flock gf_proto_flock;
 
@@ -82,12 +82,10 @@ struct gf_iatt {
 };
 typedef struct gf_iatt gf_iatt;
 
+/* Gluster FS Payload structures */
 struct gfs3_stat_req {
 	char gfid[16];
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_stat_req gfs3_stat_req;
 
@@ -95,20 +93,13 @@ struct gfs3_stat_rsp {
 	int op_ret;
 	int op_errno;
 	struct gf_iatt stat;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_stat_rsp gfs3_stat_rsp;
 
 struct gfs3_readlink_req {
 	char gfid[16];
 	u_int size;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_readlink_req gfs3_readlink_req;
 
@@ -117,10 +108,6 @@ struct gfs3_readlink_rsp {
 	int op_errno;
 	struct gf_iatt buf;
 	char *path;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_readlink_rsp gfs3_readlink_rsp;
 
@@ -128,12 +115,12 @@ struct gfs3_mknod_req {
 	char pargfid[16];
 	u_quad_t dev;
 	u_int mode;
-	u_int umask;
+	char *path;
 	char *bname;
 	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+		u_int dict_len;
+		char *dict_val;
+	} dict;
 };
 typedef struct gfs3_mknod_req gfs3_mknod_req;
 
@@ -143,22 +130,18 @@ struct gfs3_mknod_rsp {
 	struct gf_iatt stat;
 	struct gf_iatt preparent;
 	struct gf_iatt postparent;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_mknod_rsp gfs3_mknod_rsp;
 
 struct gfs3_mkdir_req {
 	char pargfid[16];
 	u_int mode;
-	u_int umask;
+	char *path;
 	char *bname;
 	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+		u_int dict_len;
+		char *dict_val;
+	} dict;
 };
 typedef struct gfs3_mkdir_req gfs3_mkdir_req;
 
@@ -168,21 +151,13 @@ struct gfs3_mkdir_rsp {
 	struct gf_iatt stat;
 	struct gf_iatt preparent;
 	struct gf_iatt postparent;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_mkdir_rsp gfs3_mkdir_rsp;
 
 struct gfs3_unlink_req {
 	char pargfid[16];
+	char *path;
 	char *bname;
-	u_int xflags;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_unlink_req gfs3_unlink_req;
 
@@ -191,21 +166,14 @@ struct gfs3_unlink_rsp {
 	int op_errno;
 	struct gf_iatt preparent;
 	struct gf_iatt postparent;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_unlink_rsp gfs3_unlink_rsp;
 
 struct gfs3_rmdir_req {
 	char pargfid[16];
-	int xflags;
+	int flags;
+	char *path;
 	char *bname;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_rmdir_req gfs3_rmdir_req;
 
@@ -214,22 +182,18 @@ struct gfs3_rmdir_rsp {
 	int op_errno;
 	struct gf_iatt preparent;
 	struct gf_iatt postparent;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_rmdir_rsp gfs3_rmdir_rsp;
 
 struct gfs3_symlink_req {
 	char pargfid[16];
+	char *path;
 	char *bname;
-	u_int umask;
 	char *linkname;
 	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+		u_int dict_len;
+		char *dict_val;
+	} dict;
 };
 typedef struct gfs3_symlink_req gfs3_symlink_req;
 
@@ -239,22 +203,16 @@ struct gfs3_symlink_rsp {
 	struct gf_iatt stat;
 	struct gf_iatt preparent;
 	struct gf_iatt postparent;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_symlink_rsp gfs3_symlink_rsp;
 
 struct gfs3_rename_req {
 	char oldgfid[16];
 	char newgfid[16];
+	char *oldpath;
 	char *oldbname;
+	char *newpath;
 	char *newbname;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_rename_req gfs3_rename_req;
 
@@ -266,21 +224,15 @@ struct gfs3_rename_rsp {
 	struct gf_iatt postoldparent;
 	struct gf_iatt prenewparent;
 	struct gf_iatt postnewparent;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_rename_rsp gfs3_rename_rsp;
 
 struct gfs3_link_req {
 	char oldgfid[16];
 	char newgfid[16];
+	char *oldpath;
+	char *newpath;
 	char *newbname;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_link_req gfs3_link_req;
 
@@ -290,20 +242,13 @@ struct gfs3_link_rsp {
 	struct gf_iatt stat;
 	struct gf_iatt preparent;
 	struct gf_iatt postparent;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_link_rsp gfs3_link_rsp;
 
 struct gfs3_truncate_req {
 	char gfid[16];
 	u_quad_t offset;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_truncate_req gfs3_truncate_req;
 
@@ -312,20 +257,14 @@ struct gfs3_truncate_rsp {
 	int op_errno;
 	struct gf_iatt prestat;
 	struct gf_iatt poststat;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_truncate_rsp gfs3_truncate_rsp;
 
 struct gfs3_open_req {
 	char gfid[16];
 	u_int flags;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	u_int wbflags;
+	char *path;
 };
 typedef struct gfs3_open_req gfs3_open_req;
 
@@ -333,10 +272,6 @@ struct gfs3_open_rsp {
 	int op_ret;
 	int op_errno;
 	quad_t fd;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_open_rsp gfs3_open_rsp;
 
@@ -345,11 +280,6 @@ struct gfs3_read_req {
 	quad_t fd;
 	u_quad_t offset;
 	u_int size;
-	u_int flag;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_read_req gfs3_read_req;
 
@@ -358,10 +288,6 @@ struct gfs3_read_rsp {
 	int op_errno;
 	struct gf_iatt stat;
 	u_int size;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_read_rsp gfs3_read_rsp;
 
@@ -369,11 +295,12 @@ struct gfs3_lookup_req {
 	char gfid[16];
 	char pargfid[16];
 	u_int flags;
+	char *path;
 	char *bname;
 	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+		u_int dict_len;
+		char *dict_val;
+	} dict;
 };
 typedef struct gfs3_lookup_req gfs3_lookup_req;
 
@@ -383,9 +310,9 @@ struct gfs3_lookup_rsp {
 	struct gf_iatt stat;
 	struct gf_iatt postparent;
 	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+		u_int dict_len;
+		char *dict_val;
+	} dict;
 };
 typedef struct gfs3_lookup_rsp gfs3_lookup_rsp;
 
@@ -394,11 +321,6 @@ struct gfs3_write_req {
 	quad_t fd;
 	u_quad_t offset;
 	u_int size;
-	u_int flag;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_write_req gfs3_write_req;
 
@@ -407,19 +329,12 @@ struct gfs3_write_rsp {
 	int op_errno;
 	struct gf_iatt prestat;
 	struct gf_iatt poststat;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_write_rsp gfs3_write_rsp;
 
 struct gfs3_statfs_req {
 	char gfid[16];
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_statfs_req gfs3_statfs_req;
 
@@ -427,10 +342,6 @@ struct gfs3_statfs_rsp {
 	int op_ret;
 	int op_errno;
 	struct gf_statfs statfs;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_statfs_rsp gfs3_statfs_rsp;
 
@@ -440,10 +351,6 @@ struct gfs3_lk_req {
 	u_int cmd;
 	u_int type;
 	struct gf_proto_flock flock;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_lk_req gfs3_lk_req;
 
@@ -451,10 +358,6 @@ struct gfs3_lk_rsp {
 	int op_ret;
 	int op_errno;
 	struct gf_proto_flock flock;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_lk_rsp gfs3_lk_rsp;
 
@@ -463,11 +366,8 @@ struct gfs3_inodelk_req {
 	u_int cmd;
 	u_int type;
 	struct gf_proto_flock flock;
+	char *path;
 	char *volume;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_inodelk_req gfs3_inodelk_req;
 
@@ -478,20 +378,12 @@ struct gfs3_finodelk_req {
 	u_int type;
 	struct gf_proto_flock flock;
 	char *volume;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_finodelk_req gfs3_finodelk_req;
 
 struct gfs3_flush_req {
 	char gfid[16];
 	quad_t fd;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_flush_req gfs3_flush_req;
 
@@ -499,10 +391,6 @@ struct gfs3_fsync_req {
 	char gfid[16];
 	quad_t fd;
 	u_int data;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fsync_req gfs3_fsync_req;
 
@@ -511,10 +399,6 @@ struct gfs3_fsync_rsp {
 	int op_errno;
 	struct gf_iatt prestat;
 	struct gf_iatt poststat;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fsync_rsp gfs3_fsync_rsp;
 
@@ -525,10 +409,7 @@ struct gfs3_setxattr_req {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_setxattr_req gfs3_setxattr_req;
 
@@ -540,10 +421,6 @@ struct gfs3_fsetxattr_req {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fsetxattr_req gfs3_fsetxattr_req;
 
@@ -554,10 +431,7 @@ struct gfs3_xattrop_req {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_xattrop_req gfs3_xattrop_req;
 
@@ -568,10 +442,6 @@ struct gfs3_xattrop_rsp {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_xattrop_rsp gfs3_xattrop_rsp;
 
@@ -583,10 +453,6 @@ struct gfs3_fxattrop_req {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fxattrop_req gfs3_fxattrop_req;
 
@@ -597,21 +463,14 @@ struct gfs3_fxattrop_rsp {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fxattrop_rsp gfs3_fxattrop_rsp;
 
 struct gfs3_getxattr_req {
 	char gfid[16];
 	u_int namelen;
+	char *path;
 	char *name;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_getxattr_req gfs3_getxattr_req;
 
@@ -622,10 +481,6 @@ struct gfs3_getxattr_rsp {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_getxattr_rsp gfs3_getxattr_rsp;
 
@@ -634,10 +489,6 @@ struct gfs3_fgetxattr_req {
 	quad_t fd;
 	u_int namelen;
 	char *name;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fgetxattr_req gfs3_fgetxattr_req;
 
@@ -648,40 +499,19 @@ struct gfs3_fgetxattr_rsp {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fgetxattr_rsp gfs3_fgetxattr_rsp;
 
 struct gfs3_removexattr_req {
 	char gfid[16];
+	char *path;
 	char *name;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_removexattr_req gfs3_removexattr_req;
 
-struct gfs3_fremovexattr_req {
-	char gfid[16];
-	quad_t fd;
-	char *name;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
-};
-typedef struct gfs3_fremovexattr_req gfs3_fremovexattr_req;
-
 struct gfs3_opendir_req {
 	char gfid[16];
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_opendir_req gfs3_opendir_req;
 
@@ -689,10 +519,6 @@ struct gfs3_opendir_rsp {
 	int op_ret;
 	int op_errno;
 	quad_t fd;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_opendir_rsp gfs3_opendir_rsp;
 
@@ -700,10 +526,6 @@ struct gfs3_fsyncdir_req {
 	char gfid[16];
 	quad_t fd;
 	int data;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fsyncdir_req gfs3_fsyncdir_req;
 
@@ -712,10 +534,6 @@ struct gfs3_readdir_req {
 	quad_t fd;
 	u_quad_t offset;
 	u_int size;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_readdir_req gfs3_readdir_req;
 
@@ -724,20 +542,31 @@ struct gfs3_readdirp_req {
 	quad_t fd;
 	u_quad_t offset;
 	u_int size;
+};
+typedef struct gfs3_readdirp_req gfs3_readdirp_req;
+
+struct gf_setvolume_req {
 	struct {
 		u_int dict_len;
 		char *dict_val;
 	} dict;
 };
-typedef struct gfs3_readdirp_req gfs3_readdirp_req;
+typedef struct gf_setvolume_req gf_setvolume_req;
+
+struct gf_setvolume_rsp {
+	int op_ret;
+	int op_errno;
+	struct {
+		u_int dict_len;
+		char *dict_val;
+	} dict;
+};
+typedef struct gf_setvolume_rsp gf_setvolume_rsp;
 
 struct gfs3_access_req {
 	char gfid[16];
 	u_int mask;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_access_req gfs3_access_req;
 
@@ -745,12 +574,12 @@ struct gfs3_create_req {
 	char pargfid[16];
 	u_int flags;
 	u_int mode;
-	u_int umask;
+	char *path;
 	char *bname;
 	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+		u_int dict_len;
+		char *dict_val;
+	} dict;
 };
 typedef struct gfs3_create_req gfs3_create_req;
 
@@ -761,10 +590,6 @@ struct gfs3_create_rsp {
 	u_quad_t fd;
 	struct gf_iatt preparent;
 	struct gf_iatt postparent;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_create_rsp gfs3_create_rsp;
 
@@ -772,10 +597,6 @@ struct gfs3_ftruncate_req {
 	char gfid[16];
 	quad_t fd;
 	u_quad_t offset;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_ftruncate_req gfs3_ftruncate_req;
 
@@ -784,20 +605,12 @@ struct gfs3_ftruncate_rsp {
 	int op_errno;
 	struct gf_iatt prestat;
 	struct gf_iatt poststat;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_ftruncate_rsp gfs3_ftruncate_rsp;
 
 struct gfs3_fstat_req {
 	char gfid[16];
 	quad_t fd;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fstat_req gfs3_fstat_req;
 
@@ -805,10 +618,6 @@ struct gfs3_fstat_rsp {
 	int op_ret;
 	int op_errno;
 	struct gf_iatt stat;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fstat_rsp gfs3_fstat_rsp;
 
@@ -817,12 +626,9 @@ struct gfs3_entrylk_req {
 	u_int cmd;
 	u_int type;
 	u_quad_t namelen;
+	char *path;
 	char *name;
 	char *volume;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_entrylk_req gfs3_entrylk_req;
 
@@ -834,10 +640,6 @@ struct gfs3_fentrylk_req {
 	u_quad_t namelen;
 	char *name;
 	char *volume;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fentrylk_req gfs3_fentrylk_req;
 
@@ -845,10 +647,7 @@ struct gfs3_setattr_req {
 	char gfid[16];
 	struct gf_iatt stbuf;
 	int valid;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
+	char *path;
 };
 typedef struct gfs3_setattr_req gfs3_setattr_req;
 
@@ -857,10 +656,6 @@ struct gfs3_setattr_rsp {
 	int op_errno;
 	struct gf_iatt statpre;
 	struct gf_iatt statpost;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_setattr_rsp gfs3_setattr_rsp;
 
@@ -868,10 +663,6 @@ struct gfs3_fsetattr_req {
 	quad_t fd;
 	struct gf_iatt stbuf;
 	int valid;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fsetattr_req gfs3_fsetattr_req;
 
@@ -880,95 +671,13 @@ struct gfs3_fsetattr_rsp {
 	int op_errno;
 	struct gf_iatt statpre;
 	struct gf_iatt statpost;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_fsetattr_rsp gfs3_fsetattr_rsp;
 
-struct gfs3_fallocate_req {
-	char gfid[16];
-	quad_t fd;
-	u_int flags;
-	u_quad_t offset;
-	u_quad_t size;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
-};
-typedef struct gfs3_fallocate_req gfs3_fallocate_req;
-
-struct gfs3_fallocate_rsp {
-	int op_ret;
-	int op_errno;
-	struct gf_iatt statpre;
-	struct gf_iatt statpost;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
-};
-typedef struct gfs3_fallocate_rsp gfs3_fallocate_rsp;
-
-struct gfs3_discard_req {
-	char gfid[16];
-	quad_t fd;
-	u_quad_t offset;
-	u_quad_t size;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
-};
-typedef struct gfs3_discard_req gfs3_discard_req;
-
-struct gfs3_discard_rsp {
-	int op_ret;
-	int op_errno;
-	struct gf_iatt statpre;
-	struct gf_iatt statpost;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
-};
-typedef struct gfs3_discard_rsp gfs3_discard_rsp;
-
-struct gfs3_zerofill_req {
-        char gfid[16];
-        quad_t fd;
-        u_quad_t offset;
-        u_quad_t size;
-        struct {
-                u_int xdata_len;
-                char *xdata_val;
-        } xdata;
-};
-typedef struct gfs3_zerofill_req gfs3_zerofill_req;
-
-struct gfs3_zerofill_rsp {
-        int op_ret;
-        int op_errno;
-        struct gf_iatt statpre;
-        struct gf_iatt statpost;
-        struct {
-                u_int xdata_len;
-                char *xdata_val;
-        } xdata;
-};
-typedef struct gfs3_zerofill_rsp gfs3_zerofill_rsp;
-
-
 struct gfs3_rchecksum_req {
 	quad_t fd;
 	u_quad_t offset;
 	u_int len;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_rchecksum_req gfs3_rchecksum_req;
 
@@ -980,38 +689,12 @@ struct gfs3_rchecksum_rsp {
 		u_int strong_checksum_len;
 		char *strong_checksum_val;
 	} strong_checksum;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_rchecksum_rsp gfs3_rchecksum_rsp;
 
-struct gf_setvolume_req {
-	struct {
-		u_int dict_len;
-		char *dict_val;
-	} dict;
-};
-typedef struct gf_setvolume_req gf_setvolume_req;
-
-struct gf_setvolume_rsp {
-	int op_ret;
-	int op_errno;
-	struct {
-		u_int dict_len;
-		char *dict_val;
-	} dict;
-};
-typedef struct gf_setvolume_rsp gf_setvolume_rsp;
-
 struct gf_getspec_req {
 	u_int flags;
 	char *key;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gf_getspec_req gf_getspec_req;
 
@@ -1019,31 +702,9 @@ struct gf_getspec_rsp {
 	int op_ret;
 	int op_errno;
 	char *spec;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gf_getspec_rsp gf_getspec_rsp;
 
-struct gf_mgmt_hndsk_req {
-	struct {
-		u_int hndsk_len;
-		char *hndsk_val;
-	} hndsk;
-};
-typedef struct gf_mgmt_hndsk_req gf_mgmt_hndsk_req;
-
-struct gf_mgmt_hndsk_rsp {
-	int op_ret;
-	int op_errno;
-	struct {
-		u_int hndsk_len;
-		char *hndsk_val;
-	} hndsk;
-};
-typedef struct gf_mgmt_hndsk_rsp gf_mgmt_hndsk_rsp;
-
 struct gf_log_req {
 	struct {
 		u_int msg_len;
@@ -1055,10 +716,6 @@ typedef struct gf_log_req gf_log_req;
 struct gf_notify_req {
 	u_int flags;
 	char *buf;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gf_notify_req gf_notify_req;
 
@@ -1067,40 +724,24 @@ struct gf_notify_rsp {
 	int op_errno;
 	u_int flags;
 	char *buf;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gf_notify_rsp gf_notify_rsp;
 
 struct gfs3_releasedir_req {
 	char gfid[16];
 	quad_t fd;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_releasedir_req gfs3_releasedir_req;
 
 struct gfs3_release_req {
 	char gfid[16];
 	quad_t fd;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_release_req gfs3_release_req;
 
 struct gf_common_rsp {
 	int op_ret;
 	int op_errno;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gf_common_rsp gf_common_rsp;
 
@@ -1118,10 +759,6 @@ struct gfs3_readdir_rsp {
 	int op_ret;
 	int op_errno;
 	struct gfs3_dirlist *reply;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_readdir_rsp gfs3_readdir_rsp;
 
@@ -1132,10 +769,6 @@ struct gfs3_dirplist {
 	u_int d_type;
 	char *name;
 	struct gf_iatt stat;
-	struct {
-		u_int dict_len;
-		char *dict_val;
-	} dict;
 	struct gfs3_dirplist *nextentry;
 };
 typedef struct gfs3_dirplist gfs3_dirplist;
@@ -1144,45 +777,9 @@ struct gfs3_readdirp_rsp {
 	int op_ret;
 	int op_errno;
 	struct gfs3_dirplist *reply;
-	struct {
-		u_int xdata_len;
-		char *xdata_val;
-	} xdata;
 };
 typedef struct gfs3_readdirp_rsp gfs3_readdirp_rsp;
 
-struct gf_set_lk_ver_rsp {
-	int op_ret;
-	int op_errno;
-	int lk_ver;
-};
-typedef struct gf_set_lk_ver_rsp gf_set_lk_ver_rsp;
-
-struct gf_set_lk_ver_req {
-	char *uid;
-	int lk_ver;
-};
-typedef struct gf_set_lk_ver_req gf_set_lk_ver_req;
-
-struct gf_event_notify_req {
-	int op;
-	struct {
-		u_int dict_len;
-		char *dict_val;
-	} dict;
-};
-typedef struct gf_event_notify_req gf_event_notify_req;
-
-struct gf_event_notify_rsp {
-	int op_ret;
-	int op_errno;
-	struct {
-		u_int dict_len;
-		char *dict_val;
-	} dict;
-};
-typedef struct gf_event_notify_rsp gf_event_notify_rsp;
-
 /* the xdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
@@ -1237,12 +834,13 @@ extern  bool_t xdr_gfs3_getxattr_rsp (XDR *, gfs3_getxattr_rsp*);
 extern  bool_t xdr_gfs3_fgetxattr_req (XDR *, gfs3_fgetxattr_req*);
 extern  bool_t xdr_gfs3_fgetxattr_rsp (XDR *, gfs3_fgetxattr_rsp*);
 extern  bool_t xdr_gfs3_removexattr_req (XDR *, gfs3_removexattr_req*);
-extern  bool_t xdr_gfs3_fremovexattr_req (XDR *, gfs3_fremovexattr_req*);
 extern  bool_t xdr_gfs3_opendir_req (XDR *, gfs3_opendir_req*);
 extern  bool_t xdr_gfs3_opendir_rsp (XDR *, gfs3_opendir_rsp*);
 extern  bool_t xdr_gfs3_fsyncdir_req (XDR *, gfs3_fsyncdir_req*);
 extern  bool_t xdr_gfs3_readdir_req (XDR *, gfs3_readdir_req*);
 extern  bool_t xdr_gfs3_readdirp_req (XDR *, gfs3_readdirp_req*);
+extern  bool_t xdr_gf_setvolume_req (XDR *, gf_setvolume_req*);
+extern  bool_t xdr_gf_setvolume_rsp (XDR *, gf_setvolume_rsp*);
 extern  bool_t xdr_gfs3_access_req (XDR *, gfs3_access_req*);
 extern  bool_t xdr_gfs3_create_req (XDR *, gfs3_create_req*);
 extern  bool_t xdr_gfs3_create_rsp (XDR *, gfs3_create_rsp*);
@@ -1256,20 +854,10 @@ extern  bool_t xdr_gfs3_setattr_req (XDR *, gfs3_setattr_req*);
 extern  bool_t xdr_gfs3_setattr_rsp (XDR *, gfs3_setattr_rsp*);
 extern  bool_t xdr_gfs3_fsetattr_req (XDR *, gfs3_fsetattr_req*);
 extern  bool_t xdr_gfs3_fsetattr_rsp (XDR *, gfs3_fsetattr_rsp*);
-extern  bool_t xdr_gfs3_fallocate_req (XDR *, gfs3_fallocate_req*);
-extern  bool_t xdr_gfs3_fallocate_rsp (XDR *, gfs3_fallocate_rsp*);
-extern  bool_t xdr_gfs3_discard_req (XDR *, gfs3_discard_req*);
-extern  bool_t xdr_gfs3_discard_rsp (XDR *, gfs3_discard_rsp*);
-extern  bool_t xdr_gfs3_zerofill_req (XDR *, gfs3_zerofill_req*);
-extern  bool_t xdr_gfs3_zerofill_rsp (XDR *, gfs3_zerofill_rsp*);
 extern  bool_t xdr_gfs3_rchecksum_req (XDR *, gfs3_rchecksum_req*);
 extern  bool_t xdr_gfs3_rchecksum_rsp (XDR *, gfs3_rchecksum_rsp*);
-extern  bool_t xdr_gf_setvolume_req (XDR *, gf_setvolume_req*);
-extern  bool_t xdr_gf_setvolume_rsp (XDR *, gf_setvolume_rsp*);
 extern  bool_t xdr_gf_getspec_req (XDR *, gf_getspec_req*);
 extern  bool_t xdr_gf_getspec_rsp (XDR *, gf_getspec_rsp*);
-extern  bool_t xdr_gf_mgmt_hndsk_req (XDR *, gf_mgmt_hndsk_req*);
-extern  bool_t xdr_gf_mgmt_hndsk_rsp (XDR *, gf_mgmt_hndsk_rsp*);
 extern  bool_t xdr_gf_log_req (XDR *, gf_log_req*);
 extern  bool_t xdr_gf_notify_req (XDR *, gf_notify_req*);
 extern  bool_t xdr_gf_notify_rsp (XDR *, gf_notify_rsp*);
@@ -1280,10 +868,6 @@ extern  bool_t xdr_gfs3_dirlist (XDR *, gfs3_dirlist*);
 extern  bool_t xdr_gfs3_readdir_rsp (XDR *, gfs3_readdir_rsp*);
 extern  bool_t xdr_gfs3_dirplist (XDR *, gfs3_dirplist*);
 extern  bool_t xdr_gfs3_readdirp_rsp (XDR *, gfs3_readdirp_rsp*);
-extern  bool_t xdr_gf_set_lk_ver_rsp (XDR *, gf_set_lk_ver_rsp*);
-extern  bool_t xdr_gf_set_lk_ver_req (XDR *, gf_set_lk_ver_req*);
-extern  bool_t xdr_gf_event_notify_req (XDR *, gf_event_notify_req*);
-extern  bool_t xdr_gf_event_notify_rsp (XDR *, gf_event_notify_rsp*);
 
 #else /* K&R C */
 extern bool_t xdr_gf_statfs ();
@@ -1337,12 +921,13 @@ extern bool_t xdr_gfs3_getxattr_rsp ();
 extern bool_t xdr_gfs3_fgetxattr_req ();
 extern bool_t xdr_gfs3_fgetxattr_rsp ();
 extern bool_t xdr_gfs3_removexattr_req ();
-extern bool_t xdr_gfs3_fremovexattr_req ();
 extern bool_t xdr_gfs3_opendir_req ();
 extern bool_t xdr_gfs3_opendir_rsp ();
 extern bool_t xdr_gfs3_fsyncdir_req ();
 extern bool_t xdr_gfs3_readdir_req ();
 extern bool_t xdr_gfs3_readdirp_req ();
+extern bool_t xdr_gf_setvolume_req ();
+extern bool_t xdr_gf_setvolume_rsp ();
 extern bool_t xdr_gfs3_access_req ();
 extern bool_t xdr_gfs3_create_req ();
 extern bool_t xdr_gfs3_create_rsp ();
@@ -1356,20 +941,10 @@ extern bool_t xdr_gfs3_setattr_req ();
 extern bool_t xdr_gfs3_setattr_rsp ();
 extern bool_t xdr_gfs3_fsetattr_req ();
 extern bool_t xdr_gfs3_fsetattr_rsp ();
-extern bool_t xdr_gfs3_fallocate_req ();
-extern bool_t xdr_gfs3_fallocate_rsp ();
-extern bool_t xdr_gfs3_discard_req ();
-extern bool_t xdr_gfs3_discard_rsp ();
-extern bool_t xdr_gfs3_zerofill_req ();
-extern bool_t xdr_gfs3_zerofill_rsp ();
 extern bool_t xdr_gfs3_rchecksum_req ();
 extern bool_t xdr_gfs3_rchecksum_rsp ();
-extern bool_t xdr_gf_setvolume_req ();
-extern bool_t xdr_gf_setvolume_rsp ();
 extern bool_t xdr_gf_getspec_req ();
 extern bool_t xdr_gf_getspec_rsp ();
-extern bool_t xdr_gf_mgmt_hndsk_req ();
-extern bool_t xdr_gf_mgmt_hndsk_rsp ();
 extern bool_t xdr_gf_log_req ();
 extern bool_t xdr_gf_notify_req ();
 extern bool_t xdr_gf_notify_rsp ();
@@ -1380,10 +955,6 @@ extern bool_t xdr_gfs3_dirlist ();
 extern bool_t xdr_gfs3_readdir_rsp ();
 extern bool_t xdr_gfs3_dirplist ();
 extern bool_t xdr_gfs3_readdirp_rsp ();
-extern bool_t xdr_gf_set_lk_ver_rsp ();
-extern bool_t xdr_gf_set_lk_ver_req ();
-extern bool_t xdr_gf_event_notify_req ();
-extern bool_t xdr_gf_event_notify_rsp ();
 
 #endif /* K&R C */
 
@@ -1391,4 +962,4 @@ extern bool_t xdr_gf_event_notify_rsp ();
 }
 #endif
 
-#endif /* !_GLUSTERFS3_XDR_H_RPCGEN */
+#endif /* !_GLUSTERFS3_H_RPCGEN */
diff --git a/rpc/xdr/src/glusterfs3-xdr.x b/rpc/xdr/src/glusterfs3-xdr.x
index 1edbda3ad..592f7ed70 100644
--- a/rpc/xdr/src/glusterfs3-xdr.x
+++ b/rpc/xdr/src/glusterfs3-xdr.x
@@ -19,7 +19,7 @@ struct gf_proto_flock {
 	unsigned hyper start;
 	unsigned hyper len;
         unsigned int   pid;
-        opaque         lk_owner<>;
+        unsigned hyper owner;
 } ;
 
 
@@ -45,27 +45,26 @@ struct gf_iatt {
 
 struct gfs3_stat_req {
         opaque gfid[16];
-        opaque   xdata<>; /* Extra data */
+        string         path<>;     /* NULL terminated */
+
 };
 struct gfs3_stat_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_iatt stat;
-        opaque   xdata<>; /* Extra data */
 } ;
 
 
 struct gfs3_readlink_req {
         opaque gfid[16];
 	unsigned int   size;
-        opaque   xdata<>; /* Extra data */
+	string         path<>;     /* NULL terminated */
 }  ;
  struct gfs3_readlink_rsp {
         int    op_ret;
         int    op_errno;
         struct gf_iatt buf;
         string      path<>; /* NULL terminated */
-        opaque   xdata<>; /* Extra data */
 } ;
 
 
@@ -73,9 +72,9 @@ struct gfs3_readlink_req {
         opaque  pargfid[16];
 	unsigned hyper dev;
 	unsigned int mode;
-        unsigned int umask;
+	string     path<>;     /* NULL terminated */
 	string     bname<>; /* NULL terminated */
-        opaque   xdata<>; /* Extra data */
+        opaque     dict<>;
 } ;
  struct gfs3_mknod_rsp {
         int    op_ret;
@@ -83,16 +82,15 @@ struct gfs3_readlink_req {
 	struct gf_iatt stat;
         struct gf_iatt preparent;
         struct gf_iatt postparent;
-        opaque   xdata<>; /* Extra data */
 };
 
 
  struct  gfs3_mkdir_req {
         opaque  pargfid[16];
 	unsigned int mode;
-        unsigned int umask;
+	string     path<>;     /* NULL terminated */
 	string     bname<>; /* NULL terminated */
-        opaque     xdata<>; /* Extra data */
+        opaque     dict<>;
 } ;
  struct  gfs3_mkdir_rsp {
         int    op_ret;
@@ -100,46 +98,42 @@ struct gfs3_readlink_req {
 	struct gf_iatt stat;
         struct gf_iatt preparent;
         struct gf_iatt postparent;
-        opaque   xdata<>; /* Extra data */
 } ;
 
 
  struct   gfs3_unlink_req {
         opaque  pargfid[16];
+	string     path<>;     /* NULL terminated */
 	string     bname<>; /* NULL terminated */
-        unsigned int xflags;
-        opaque   xdata<>; /* Extra data */
 };
  struct   gfs3_unlink_rsp {
         int    op_ret;
         int    op_errno;
         struct gf_iatt preparent;
         struct gf_iatt postparent;
-        opaque   xdata<>; /* Extra data */
 };
 
 
  struct   gfs3_rmdir_req {
         opaque  pargfid[16];
-        int        xflags;
+        int        flags;
+	string     path<>;
 	string     bname<>; /* NULL terminated */
-        opaque     xdata<>; /* Extra data */
 };
  struct   gfs3_rmdir_rsp {
         int    op_ret;
         int    op_errno;
         struct gf_iatt preparent;
         struct gf_iatt postparent;
-        opaque   xdata<>; /* Extra data */
 };
 
 
  struct   gfs3_symlink_req {
         opaque  pargfid[16];
+	string     path<>;
 	string     bname<>;
-        unsigned int umask;
 	string     linkname<>;
-        opaque   xdata<>; /* Extra data */
+        opaque     dict<>;
 };
  struct  gfs3_symlink_rsp {
         int    op_ret;
@@ -147,16 +141,16 @@ struct gfs3_readlink_req {
 	struct gf_iatt stat;
         struct gf_iatt preparent;
         struct gf_iatt postparent;
-        opaque   xdata<>; /* Extra data */
 };
 
 
  struct   gfs3_rename_req {
         opaque  oldgfid[16];
         opaque  newgfid[16];
+	string       oldpath<>;
 	string       oldbname<>; /* NULL terminated */
+	string       newpath<>;
 	string       newbname<>; /* NULL terminated */
-        opaque   xdata<>; /* Extra data */
 };
  struct   gfs3_rename_rsp {
         int    op_ret;
@@ -166,15 +160,15 @@ struct gfs3_readlink_req {
         struct gf_iatt postoldparent;
         struct gf_iatt prenewparent;
         struct gf_iatt postnewparent;
-        opaque   xdata<>; /* Extra data */
 };
 
 
  struct  gfs3_link_req {
         opaque  oldgfid[16];
         opaque  newgfid[16];
+	string       oldpath<>;
+	string       newpath<>;
 	string       newbname<>;
-        opaque   xdata<>; /* Extra data */
 };
  struct   gfs3_link_rsp {
         int    op_ret;
@@ -182,33 +176,31 @@ struct gfs3_readlink_req {
 	struct gf_iatt stat;
         struct gf_iatt preparent;
         struct gf_iatt postparent;
-        opaque   xdata<>; /* Extra data */
 };
 
  struct   gfs3_truncate_req {
         opaque gfid[16];
 	unsigned hyper offset;
-        opaque   xdata<>; /* Extra data */
+	string     path<>;
 };
  struct   gfs3_truncate_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_iatt prestat;
         struct gf_iatt poststat;
-        opaque   xdata<>; /* Extra data */
 };
 
 
  struct   gfs3_open_req {
         opaque gfid[16];
 	unsigned int flags;
-        opaque   xdata<>; /* Extra data */
+        unsigned int wbflags;
+	string     path<>;
 };
  struct   gfs3_open_rsp {
         int    op_ret;
         int    op_errno;
 	hyper fd;
-        opaque   xdata<>; /* Extra data */
 };
 
 
@@ -217,30 +209,28 @@ struct gfs3_readlink_req {
 	hyper  fd;
 	unsigned hyper offset;
 	unsigned int size;
-        unsigned int flag;
-        opaque   xdata<>; /* Extra data */
 };
  struct  gfs3_read_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_iatt stat;
         unsigned int size;
-        opaque   xdata<>; /* Extra data */
 } ;
 
 struct   gfs3_lookup_req {
         opaque gfid[16];
         opaque  pargfid[16];
 	unsigned int flags;
+	string     path<>;
 	string     bname<>;
-        opaque   xdata<>; /* Extra data */
+        opaque     dict<>;
 };
  struct   gfs3_lookup_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_iatt stat;
         struct gf_iatt postparent;
-        opaque   xdata<>; /* Extra data */
+	opaque             dict<>;
 } ;
 
 
@@ -250,27 +240,23 @@ struct   gfs3_lookup_req {
 	hyper  fd;
 	unsigned hyper offset;
 	unsigned int size;
-        unsigned int flag;
-        opaque   xdata<>; /* Extra data */
 };
  struct gfs3_write_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_iatt prestat;
         struct gf_iatt poststat;
-        opaque   xdata<>; /* Extra data */
 } ;
 
 
  struct gfs3_statfs_req  {
         opaque gfid[16];
-        opaque   xdata<>; /* Extra data */
+	string     path<>;
 }  ;
  struct gfs3_statfs_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_statfs statfs;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
  struct gfs3_lk_req {
@@ -279,13 +265,11 @@ struct   gfs3_lookup_req {
 	unsigned int        cmd;
 	unsigned int        type;
 	struct gf_proto_flock flock;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct gfs3_lk_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_proto_flock flock;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
  struct gfs3_inodelk_req {
@@ -293,8 +277,8 @@ struct   gfs3_lookup_req {
 	unsigned int cmd;
 	unsigned int type;
 	struct gf_proto_flock flock;
+	string     path<>;
         string     volume<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 struct   gfs3_finodelk_req {
@@ -304,14 +288,12 @@ struct   gfs3_finodelk_req {
 	unsigned int type;
 	struct gf_proto_flock flock;
         string volume<>;
-        opaque   xdata<>; /* Extra data */
 } ;
 
 
  struct gfs3_flush_req {
         opaque gfid[16];
 	hyper  fd;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
@@ -319,14 +301,12 @@ struct   gfs3_finodelk_req {
         opaque gfid[16];
 	hyper  fd;
 	unsigned int data;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct gfs3_fsync_rsp {
         int    op_ret;
         int    op_errno;
         struct gf_iatt prestat;
         struct gf_iatt poststat;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
@@ -334,7 +314,7 @@ struct   gfs3_finodelk_req {
         opaque gfid[16];
 	unsigned int flags;
         opaque     dict<>;
-        opaque   xdata<>; /* Extra data */
+	string     path<>;
 }  ;
 
 
@@ -344,7 +324,6 @@ struct   gfs3_finodelk_req {
 	hyper  fd;
 	unsigned int flags;
         opaque     dict<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
@@ -353,14 +332,13 @@ struct   gfs3_finodelk_req {
         opaque gfid[16];
 	unsigned int flags;
         opaque     dict<>;
-        opaque   xdata<>; /* Extra data */
+	string     path<>;
 }  ;
 
  struct gfs3_xattrop_rsp  {
         int    op_ret;
         int    op_errno;
 	opaque  dict<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
@@ -369,28 +347,25 @@ struct   gfs3_finodelk_req {
 	hyper  fd;
 	unsigned int flags;
 	opaque     dict<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
  struct gfs3_fxattrop_rsp  {
         int    op_ret;
         int    op_errno;
 	opaque  dict<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
  struct gfs3_getxattr_req  {
         opaque gfid[16];
 	unsigned int namelen;
+	string     path<>;
 	string     name<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct gfs3_getxattr_rsp {
         int    op_ret;
         int    op_errno;
 	opaque     dict<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
@@ -399,40 +374,30 @@ struct   gfs3_finodelk_req {
 	hyper  fd;
         unsigned int namelen;
 	string     name<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct gfs3_fgetxattr_rsp {
         int    op_ret;
         int    op_errno;
         opaque     dict<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
  struct gfs3_removexattr_req {
         opaque gfid[16];
+	string     path<>;
 	string     name<>;
-        opaque   xdata<>; /* Extra data */
-}  ;
-
- struct gfs3_fremovexattr_req {
-        opaque gfid[16];
-        hyper  fd;
-	string     name<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
 
  struct gfs3_opendir_req {
         opaque gfid[16];
-        opaque   xdata<>; /* Extra data */
+	string     path<>;
 }  ;
  struct gfs3_opendir_rsp {
         int    op_ret;
         int    op_errno;
 	hyper fd;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
@@ -440,7 +405,6 @@ struct   gfs3_finodelk_req {
         opaque gfid[16];
 	hyper  fd;
 	int  data;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
  struct   gfs3_readdir_req  {
@@ -448,7 +412,6 @@ struct   gfs3_finodelk_req {
 	hyper  fd;
 	unsigned hyper offset;
 	unsigned int size;
-        opaque   xdata<>; /* Extra data */
 };
 
  struct gfs3_readdirp_req {
@@ -456,14 +419,22 @@ struct   gfs3_finodelk_req {
 	hyper  fd;
 	unsigned hyper offset;
 	unsigned int size;
-        opaque dict<>;
 }  ;
 
 
+ struct gf_setvolume_req {
+        opaque dict<>;
+}  ;
+ struct  gf_setvolume_rsp {
+        int    op_ret;
+        int    op_errno;
+        opaque dict<>;
+} ;
+
 struct gfs3_access_req  {
         opaque gfid[16];
 	unsigned int mask;
-        opaque   xdata<>; /* Extra data */
+	string     path<>;
 } ;
 
 
@@ -471,9 +442,9 @@ struct gfs3_create_req {
         opaque  pargfid[16];
 	unsigned int flags;
 	unsigned int mode;
-	unsigned int umask;
+	string     path<>;
 	string     bname<>;
-        opaque   xdata<>; /* Extra data */
+        opaque     dict<>;
 }  ;
 struct  gfs3_create_rsp {
         int    op_ret;
@@ -482,7 +453,6 @@ struct  gfs3_create_rsp {
 	unsigned hyper       fd;
         struct gf_iatt preparent;
         struct gf_iatt postparent;
-        opaque   xdata<>; /* Extra data */
 } ;
 
 
@@ -491,27 +461,23 @@ struct   gfs3_ftruncate_req  {
         opaque gfid[16];
 	hyper  fd;
 	unsigned hyper offset;
-        opaque   xdata<>; /* Extra data */
 } ;
 struct   gfs3_ftruncate_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_iatt prestat;
         struct gf_iatt poststat;
-        opaque   xdata<>; /* Extra data */
 } ;
 
 
 struct gfs3_fstat_req {
         opaque gfid[16];
 	hyper  fd;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct gfs3_fstat_rsp {
         int    op_ret;
         int    op_errno;
 	struct gf_iatt stat;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
@@ -521,9 +487,9 @@ struct gfs3_fstat_req {
 	unsigned int  cmd;
 	unsigned int  type;
 	unsigned hyper  namelen;
+	string      path<>;
 	string      name<>;
         string      volume<>;
-        opaque   xdata<>; /* Extra data */
 };
 
  struct   gfs3_fentrylk_req {
@@ -534,7 +500,6 @@ struct gfs3_fstat_req {
 	unsigned hyper  namelen;
 	string      name<>;
         string      volume<>;
-        opaque   xdata<>; /* Extra data */
 };
 
 
@@ -542,160 +507,79 @@ struct gfs3_fstat_req {
         opaque gfid[16];
         struct gf_iatt stbuf;
         int        valid;
-        opaque   xdata<>; /* Extra data */
+        string           path<>;
 }  ;
  struct gfs3_setattr_rsp {
         int    op_ret;
         int    op_errno;
         struct gf_iatt statpre;
         struct gf_iatt statpost;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
  struct gfs3_fsetattr_req {
         hyper        fd;
         struct gf_iatt stbuf;
         int        valid;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct gfs3_fsetattr_rsp {
         int    op_ret;
         int    op_errno;
         struct gf_iatt statpre;
         struct gf_iatt statpost;
-        opaque   xdata<>; /* Extra data */
-}  ;
-
- struct gfs3_fallocate_req {
-	opaque		gfid[16];
-        hyper		fd;
-	unsigned int	flags;
-	unsigned hyper	offset;
-	unsigned hyper	size;
-        opaque   xdata<>; /* Extra data */
-}  ;
-
- struct gfs3_fallocate_rsp {
-        int    op_ret;
-        int    op_errno;
-        struct gf_iatt statpre;
-        struct gf_iatt statpost;
-        opaque   xdata<>; /* Extra data */
-}  ;
-
- struct gfs3_discard_req {
-	opaque		gfid[16];
-        hyper		fd;
-	unsigned hyper	offset;
-	unsigned hyper	size;
-        opaque   xdata<>; /* Extra data */
-}  ;
-
- struct gfs3_discard_rsp {
-        int    op_ret;
-        int    op_errno;
-        struct gf_iatt statpre;
-        struct gf_iatt statpost;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
- struct gfs3_zerofill_req {
-        opaque          gfid[16];
-        hyper           fd;
-        unsigned hyper  offset;
-        unsigned hyper  size;
-        opaque   xdata<>;
-}  ;
-
- struct gfs3_zerofill_rsp {
-        int    op_ret;
-        int    op_errno;
-        struct gf_iatt statpre;
-        struct gf_iatt statpost;
-        opaque   xdata<>;
-}  ;
-
-
  struct gfs3_rchecksum_req {
         hyper   fd;
         unsigned hyper  offset;
         unsigned int  len;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct gfs3_rchecksum_rsp {
         int    op_ret;
         int    op_errno;
         unsigned int weak_checksum;
         opaque   strong_checksum<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 
- struct gf_setvolume_req {
-        opaque dict<>;
-}  ;
- struct  gf_setvolume_rsp {
-        int    op_ret;
-        int    op_errno;
-        opaque dict<>;
-} ;
-
-
  struct gf_getspec_req {
 	unsigned int flags;
 	string     key<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct  gf_getspec_rsp {
         int    op_ret;
         int    op_errno;
 	string spec<>;
-        opaque   xdata<>; /* Extra data */
 } ;
 
- struct gf_mgmt_hndsk_req {
-        opaque   hndsk<>;
-}  ;
-
- struct  gf_mgmt_hndsk_rsp {
-        int    op_ret;
-        int    op_errno;
-        opaque   hndsk<>;
-} ;
 
  struct   gf_log_req {
-        opaque    msg<>;
-} ;
+	opaque     msg<>;
+};
 
  struct gf_notify_req {
 	unsigned int  flags;
         string buf<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
  struct gf_notify_rsp {
         int    op_ret;
         int    op_errno;
 	unsigned int  flags;
         string buf<>;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 struct gfs3_releasedir_req {
         opaque gfid[16];
 	hyper  fd;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 struct gfs3_release_req {
         opaque gfid[16];
 	hyper  fd;
-        opaque   xdata<>; /* Extra data */
 }  ;
 
 struct gf_common_rsp {
        int    op_ret;
        int    op_errno;
-        opaque   xdata<>; /* Extra data */
 } ;
 
 struct gfs3_dirlist {
@@ -712,7 +596,6 @@ struct gfs3_readdir_rsp {
        int op_ret;
        int op_errno;
        struct gfs3_dirlist *reply;
-        opaque   xdata<>; /* Extra data */
 };
 
 struct gfs3_dirplist {
@@ -722,7 +605,6 @@ struct gfs3_dirplist {
        unsigned int d_type;
        string name<>;
        struct gf_iatt stat;
-       opaque dict<>;
        struct gfs3_dirplist *nextentry;
 };
 
@@ -730,27 +612,5 @@ struct gfs3_readdirp_rsp {
        int op_ret;
        int op_errno;
        struct gfs3_dirplist *reply;
-        opaque   xdata<>; /* Extra data */
 };
 
-struct gf_set_lk_ver_rsp {
-       int op_ret;
-       int op_errno;
-       int lk_ver;
-};
-
-struct gf_set_lk_ver_req {
-       string uid<>;
-       int lk_ver;
-};
-
-struct gf_event_notify_req {
-	int op;
-	opaque dict<>;
-};
-
-struct gf_event_notify_rsp {
-	int op_ret;
-	int op_errno;
-	opaque dict<>;
-};
diff --git a/rpc/xdr/src/glusterfs3.c b/rpc/xdr/src/glusterfs3.c
new file mode 100644
index 000000000..fe9fff53a
--- /dev/null
+++ b/rpc/xdr/src/glusterfs3.c
@@ -0,0 +1,1137 @@
+/*
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "glusterfs3.h"
+#include "xdr-generic.h"
+
+
+/* Encode */
+
+ssize_t
+xdr_serialize_getspec_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf_getspec_rsp);
+
+}
+
+ssize_t
+xdr_serialize_lookup_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_lookup_rsp);
+
+}
+
+ssize_t
+xdr_serialize_common_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf_common_rsp);
+
+}
+
+ssize_t
+xdr_serialize_setvolume_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf_setvolume_rsp);
+
+}
+ssize_t
+xdr_serialize_statfs_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_statfs_rsp);
+
+}
+ssize_t
+xdr_serialize_stat_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_stat_rsp);
+
+}
+ssize_t
+xdr_serialize_fstat_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fstat_rsp);
+
+}
+ssize_t
+xdr_serialize_open_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_open_rsp);
+
+}
+ssize_t
+xdr_serialize_read_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_read_rsp);
+
+}
+ssize_t
+xdr_serialize_write_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_write_rsp);
+
+}
+ssize_t
+xdr_serialize_rename_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_rename_rsp);
+
+}
+ssize_t
+xdr_serialize_fsync_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fsync_rsp);
+
+}
+ssize_t
+xdr_serialize_rmdir_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_rmdir_rsp);
+}
+ssize_t
+xdr_serialize_unlink_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_unlink_rsp);
+}
+ssize_t
+xdr_serialize_writev_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_write_rsp);
+}
+ssize_t
+xdr_serialize_readv_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_read_rsp);
+}
+ssize_t
+xdr_serialize_readdir_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_readdir_rsp);
+}
+ssize_t
+xdr_serialize_readdirp_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_readdirp_rsp);
+}
+ssize_t
+xdr_serialize_rchecksum_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_rchecksum_rsp);
+}
+ssize_t
+xdr_serialize_setattr_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_setattr_rsp);
+}
+ssize_t
+xdr_serialize_fsetattr_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fsetattr_rsp);
+}
+
+ssize_t
+xdr_serialize_readlink_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_readlink_rsp);
+
+}
+ssize_t
+xdr_serialize_symlink_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_symlink_rsp);
+
+}
+ssize_t
+xdr_serialize_create_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_create_rsp);
+
+}
+ssize_t
+xdr_serialize_link_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_link_rsp);
+
+}
+ssize_t
+xdr_serialize_mkdir_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_mkdir_rsp);
+
+}
+ssize_t
+xdr_serialize_mknod_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_mknod_rsp);
+
+}
+ssize_t
+xdr_serialize_getxattr_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_getxattr_rsp);
+
+}
+ssize_t
+xdr_serialize_fgetxattr_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fgetxattr_rsp);
+
+}
+ssize_t
+xdr_serialize_xattrop_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_xattrop_rsp);
+
+}
+ssize_t
+xdr_serialize_fxattrop_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fxattrop_rsp);
+}
+
+ssize_t
+xdr_serialize_truncate_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_truncate_rsp);
+}
+
+ssize_t
+xdr_serialize_lk_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_lk_rsp);
+}
+
+ssize_t
+xdr_serialize_opendir_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_opendir_rsp);
+}
+
+ssize_t
+xdr_serialize_ftruncate_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_serialize_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_ftruncate_rsp);
+}
+
+
+ssize_t
+xdr_to_lookup_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_lookup_req);
+}
+
+ssize_t
+xdr_to_getspec_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_gf_getspec_req);
+
+}
+
+ssize_t
+xdr_to_setvolume_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_gf_setvolume_req);
+
+}
+
+ssize_t
+xdr_to_statfs_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_statfs_req);
+
+}
+
+ssize_t
+xdr_to_fsync_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_fsync_req);
+
+}
+
+ssize_t
+xdr_to_flush_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_flush_req);
+
+}
+
+ssize_t
+xdr_to_xattrop_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_xattrop_req);
+
+}
+
+ssize_t
+xdr_to_fxattrop_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_fxattrop_req);
+
+}
+
+ssize_t
+xdr_to_getxattr_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_getxattr_req);
+
+}
+ssize_t
+xdr_to_fgetxattr_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_fgetxattr_req);
+
+}
+ssize_t
+xdr_to_open_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_open_req);
+
+}
+ssize_t
+xdr_to_create_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_create_req);
+
+}
+ssize_t
+xdr_to_symlink_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_symlink_req);
+}
+ssize_t
+xdr_to_link_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_link_req);
+}
+ssize_t
+xdr_to_readlink_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_readlink_req);
+}
+ssize_t
+xdr_to_rename_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_rename_req);
+}
+ssize_t
+xdr_to_mkdir_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_mkdir_req);
+}
+ssize_t
+xdr_to_mknod_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_mknod_req);
+}
+ssize_t
+xdr_to_readv_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_read_req);
+}
+ssize_t
+xdr_to_writev_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_write_req);
+}
+
+ssize_t
+xdr_to_readdir_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_readdir_req);
+}
+
+ssize_t
+xdr_to_opendir_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_opendir_req);
+}
+
+ssize_t
+xdr_to_rmdir_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_rmdir_req);
+}
+
+ssize_t
+xdr_to_fsetxattr_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_fsetxattr_req);
+}
+ssize_t
+xdr_to_setattr_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_setattr_req);
+}
+ssize_t
+xdr_to_fsetattr_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_fsetattr_req);
+}
+
+ssize_t
+xdr_to_finodelk_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_finodelk_req);
+}
+
+ssize_t
+xdr_to_inodelk_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_inodelk_req);
+}
+
+ssize_t
+xdr_to_ftruncate_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_ftruncate_req);
+}
+
+ssize_t
+xdr_to_fsyncdir_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_fsyncdir_req);
+}
+
+ssize_t
+xdr_to_fstat_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_fstat_req);
+}
+ssize_t
+xdr_to_rchecksum_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_rchecksum_req);
+}
+ssize_t
+xdr_to_removexattr_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_removexattr_req);
+}
+ssize_t
+xdr_to_setxattr_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_setxattr_req);
+}
+
+ssize_t
+xdr_to_fentrylk_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_fentrylk_req);
+}
+
+ssize_t
+xdr_to_entrylk_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_entrylk_req);
+}
+
+ssize_t
+xdr_to_lk_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_lk_req);
+}
+
+ssize_t
+xdr_to_stat_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_stat_req);
+}
+
+ssize_t
+xdr_to_release_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_release_req);
+}
+
+ssize_t
+xdr_to_readdirp_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_readdirp_req);
+}
+ssize_t
+xdr_to_truncate_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_truncate_req);
+}
+ssize_t
+xdr_to_access_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_access_req);
+}
+ssize_t
+xdr_to_unlink_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_gfs3_unlink_req);
+}
+
+ssize_t
+xdr_from_lookup_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_lookup_req);
+
+}
+
+ssize_t
+xdr_from_stat_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_stat_req);
+
+}
+
+ssize_t
+xdr_from_fstat_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_fstat_req);
+
+}
+
+ssize_t
+xdr_from_mkdir_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_mkdir_req);
+
+}
+
+ssize_t
+xdr_from_mknod_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_mknod_req);
+
+}
+
+ssize_t
+xdr_from_symlink_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_symlink_req);
+
+}
+
+ssize_t
+xdr_from_readlink_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_readlink_req);
+
+}
+
+ssize_t
+xdr_from_rename_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_rename_req);
+
+}
+
+ssize_t
+xdr_from_link_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_link_req);
+
+}
+
+ssize_t
+xdr_from_create_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_create_req);
+
+}
+
+ssize_t
+xdr_from_open_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_open_req);
+
+}
+
+ssize_t
+xdr_from_opendir_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_opendir_req);
+
+}
+
+ssize_t
+xdr_from_readdir_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_readdir_req);
+
+}
+
+ssize_t
+xdr_from_readdirp_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_readdirp_req);
+
+}
+
+ssize_t
+xdr_from_fsyncdir_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_fsyncdir_req);
+
+}
+ssize_t
+xdr_from_releasedir_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_releasedir_req);
+
+}
+ssize_t
+xdr_from_release_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_release_req);
+
+}
+ssize_t
+xdr_from_lk_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_lk_req);
+
+}
+ssize_t
+xdr_from_entrylk_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_entrylk_req);
+
+}
+ssize_t
+xdr_from_fentrylk_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_fentrylk_req);
+
+}
+ssize_t
+xdr_from_inodelk_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_inodelk_req);
+
+}
+ssize_t
+xdr_from_finodelk_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_finodelk_req);
+
+}
+ssize_t
+xdr_from_setxattr_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_setxattr_req);
+
+}
+ssize_t
+xdr_from_fsetxattr_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_fsetxattr_req);
+
+}
+ssize_t
+xdr_from_getxattr_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_getxattr_req);
+
+}
+ssize_t
+xdr_from_fgetxattr_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_fgetxattr_req);
+
+}
+ssize_t
+xdr_from_removexattr_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_removexattr_req);
+
+}
+ssize_t
+xdr_from_xattrop_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_xattrop_req);
+
+}
+ssize_t
+xdr_from_fxattrop_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_fxattrop_req);
+
+}
+ssize_t
+xdr_from_access_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_access_req);
+
+}
+ssize_t
+xdr_from_setattr_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_setattr_req);
+
+}
+ssize_t
+xdr_from_truncate_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_truncate_req);
+
+}
+ssize_t
+xdr_from_ftruncate_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_ftruncate_req);
+
+}
+ssize_t
+xdr_from_fsetattr_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_fsetattr_req);
+
+}
+ssize_t
+xdr_from_readv_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_read_req);
+
+}
+ssize_t
+xdr_from_writev_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_write_req);
+
+}
+ssize_t
+xdr_from_fsync_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_fsync_req);
+
+}
+ssize_t
+xdr_from_flush_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_flush_req);
+
+}
+ssize_t
+xdr_from_statfs_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_statfs_req);
+
+}
+ssize_t
+xdr_from_rchecksum_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_rchecksum_req);
+
+}
+ssize_t
+xdr_from_getspec_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf_getspec_req);
+
+}
+ssize_t
+xdr_from_setvolume_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gf_setvolume_req);
+
+}
+ssize_t
+xdr_from_rmdir_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_rmdir_req);
+
+}
+ssize_t
+xdr_from_unlink_req (struct iovec outmsg, void *req)
+{
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_unlink_req);
+
+}
+
+/* Client decode */
+
+ssize_t
+xdr_to_lookup_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_lookup_rsp);
+
+}
+
+ssize_t
+xdr_to_stat_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_stat_rsp);
+
+}
+
+ssize_t
+xdr_to_fstat_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fstat_rsp);
+
+}
+
+ssize_t
+xdr_to_mkdir_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_mkdir_rsp);
+
+}
+
+ssize_t
+xdr_to_mknod_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_mknod_rsp);
+
+}
+
+ssize_t
+xdr_to_symlink_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_symlink_rsp);
+
+}
+
+ssize_t
+xdr_to_readlink_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_readlink_rsp);
+
+}
+
+ssize_t
+xdr_to_rename_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_rename_rsp);
+
+}
+
+ssize_t
+xdr_to_link_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_link_rsp);
+
+}
+
+ssize_t
+xdr_to_create_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_create_rsp);
+
+}
+
+ssize_t
+xdr_to_open_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_open_rsp);
+
+}
+
+ssize_t
+xdr_to_opendir_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_opendir_rsp);
+
+}
+
+ssize_t
+xdr_to_readdir_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_readdir_rsp);
+
+}
+
+ssize_t
+xdr_to_readdirp_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_readdirp_rsp);
+
+}
+ssize_t
+xdr_to_lk_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_lk_rsp);
+
+}
+ssize_t
+xdr_to_getxattr_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_getxattr_rsp);
+
+}
+ssize_t
+xdr_to_fgetxattr_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fgetxattr_rsp);
+
+}
+ssize_t
+xdr_to_xattrop_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_xattrop_rsp);
+
+}
+ssize_t
+xdr_to_fxattrop_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fxattrop_rsp);
+
+}
+ssize_t
+xdr_to_setattr_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_setattr_rsp);
+
+}
+ssize_t
+xdr_to_truncate_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_truncate_rsp);
+
+}
+ssize_t
+xdr_to_ftruncate_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_ftruncate_rsp);
+
+}
+ssize_t
+xdr_to_fsetattr_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fsetattr_rsp);
+
+}
+ssize_t
+xdr_to_readv_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_read_rsp);
+
+}
+ssize_t
+xdr_to_writev_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_write_rsp);
+
+}
+ssize_t
+xdr_to_fsync_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_fsync_rsp);
+
+}
+ssize_t
+xdr_to_statfs_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_statfs_rsp);
+
+}
+ssize_t
+xdr_to_rchecksum_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gfs3_rchecksum_rsp);
+
+}
+ssize_t
+xdr_to_getspec_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf_getspec_rsp);
+
+}
+ssize_t
+xdr_to_setvolume_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                                      (xdrproc_t)xdr_gf_setvolume_rsp);
+
+}
+ssize_t
+xdr_to_rmdir_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                               (xdrproc_t)xdr_gfs3_rmdir_rsp);
+
+}
+ssize_t
+xdr_to_unlink_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                               (xdrproc_t)xdr_gfs3_unlink_rsp);
+
+}
+ssize_t
+xdr_to_common_rsp (struct iovec outmsg, void *rsp)
+{
+        return xdr_to_generic (outmsg, (void *)rsp,
+                               (xdrproc_t)xdr_gf_common_rsp);
+
+}
+
+ssize_t
+xdr_to_mgmt_probe_query_req (struct iovec outmsg, void *req)
+{
+
+        return xdr_serialize_generic (outmsg, (void *)req,
+                                      (xdrproc_t)xdr_gfs3_setattr_req);
+}
diff --git a/rpc/xdr/src/glusterfs3.h b/rpc/xdr/src/glusterfs3.h
index 798413e31..d7fd2abd7 100644
--- a/rpc/xdr/src/glusterfs3.h
+++ b/rpc/xdr/src/glusterfs3.h
@@ -1,19 +1,28 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
+
 #ifndef _GLUSTERFS3_H
 #define _GLUSTERFS3_H
 
 #include <sys/uio.h>
 
-#include "xdr-generic.h"
 #include "glusterfs3-xdr.h"
 #include "iatt.h"
 
@@ -44,8 +53,6 @@
 
 #define GF_O_LARGEFILE     0100000
 
-#define GF_O_FMODE_EXEC        040
-
 #define XLATE_BIT(from, to, bit)    do {                \
                 if (from & bit)                         \
                         to = to | GF_##bit;             \
@@ -104,7 +111,6 @@ gf_flags_from_flags (uint32_t flags)
         XLATE_BIT (flags, gf_flags, O_CLOEXEC);
 #endif
         XLATE_BIT (flags, gf_flags, O_LARGEFILE);
-        XLATE_BIT (flags, gf_flags, O_FMODE_EXEC);
 
         return gf_flags;
 }
@@ -135,7 +141,6 @@ gf_flags_to_flags (uint32_t gf_flags)
         UNXLATE_BIT (gf_flags, flags, O_CLOEXEC);
 #endif
         UNXLATE_BIT (gf_flags, flags, O_LARGEFILE);
-        UNXLATE_BIT (gf_flags, flags, O_FMODE_EXEC);
 
         return flags;
 }
@@ -191,11 +196,7 @@ gf_proto_flock_to_flock (struct gf_proto_flock *gf_proto_flock, struct gf_flock
 	gf_flock->l_start    = gf_proto_flock->start;
 	gf_flock->l_len      = gf_proto_flock->len;
 	gf_flock->l_pid      = gf_proto_flock->pid;
-        gf_flock->l_owner.len = gf_proto_flock->lk_owner.lk_owner_len;
-        if (gf_flock->l_owner.len &&
-            (gf_flock->l_owner.len < GF_MAX_LOCK_OWNER_LEN))
-                memcpy (gf_flock->l_owner.data, gf_proto_flock->lk_owner.lk_owner_val,
-                        gf_flock->l_owner.len);
+	gf_flock->l_owner    = gf_proto_flock->owner;
 }
 
 
@@ -210,9 +211,7 @@ gf_proto_flock_from_flock (struct gf_proto_flock *gf_proto_flock, struct gf_floc
 	gf_proto_flock->start    =  (gf_flock->l_start);
 	gf_proto_flock->len      =  (gf_flock->l_len);
 	gf_proto_flock->pid      =  (gf_flock->l_pid);
-	gf_proto_flock->lk_owner.lk_owner_len =  gf_flock->l_owner.len;
-        if (gf_flock->l_owner.len)
-                gf_proto_flock->lk_owner.lk_owner_val = gf_flock->l_owner.data;
+	gf_proto_flock->owner    =  (gf_flock->l_owner);
 }
 
 static inline void
@@ -267,4 +266,486 @@ gf_stat_from_iatt (struct gf_iatt *gf_stat, struct iatt *iatt)
 	gf_stat->ia_ctime_nsec = iatt->ia_ctime_nsec ;
 }
 
+/* FOPS */
+ssize_t
+xdr_serialize_lookup_rsp (struct iovec outmsg, void *resp);
+
+ssize_t
+xdr_serialize_getspec_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_common_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_setvolume_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_open_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_create_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_mknod_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_mkdir_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_symlink_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_link_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_rename_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_writev_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_readv_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_readdir_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_readdirp_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_opendir_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_setattr_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_fsetattr_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_truncate_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_ftruncate_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_statfs_rsp (struct iovec outmsg, void *rsp);
+
+
+ssize_t
+xdr_serialize_lk_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_xattrop_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_fxattrop_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_getxattr_rsp (struct iovec outmsg, void *rsp);
+
+
+ssize_t
+xdr_serialize_fgetxattr_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_unlink_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_rmdir_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_rchecksum_rsp (struct iovec outmsg, void *rsp);
+
+
+ssize_t
+xdr_serialize_fstat_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_fsync_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_readlink_rsp (struct iovec outmsg, void *rsp);
+
+ssize_t
+xdr_serialize_stat_rsp (struct iovec outmsg, void *rsp);
+
+
+ssize_t
+xdr_to_lookup_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_getspec_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_setvolume_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_statfs_req (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_stat_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_getattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fstat_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_setattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fsetattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_readv_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_writev_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fsetattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_readlink_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_create_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_open_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_release_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_xattrop_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fxattrop_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_setxattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fsetxattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_flush_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_unlink_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fsync_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_ftruncate_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_truncate_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_getxattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fgetxattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_removexattr_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_entrylk_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fentrylk_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_inodelk_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_finodelk_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_lk_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_access_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_opendir_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_readdirp_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_readdir_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fsyncdir_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_mknod_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_mkdir_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_symlink_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_rmdir_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_rchecksum_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_rename_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_link_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_from_lookup_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_getspec_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_stat_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_access_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_truncate_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_ftruncate_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_readlink_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_writev_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_readv_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_flush_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_fstat_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_fsync_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_open_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_unlink_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_rmdir_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_fsyncdir_req (struct iovec outmsg, void *args);
+
+
+ssize_t
+xdr_from_fsetxattr_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_setxattr_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_getxattr_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_fgetxattr_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_statfs_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_opendir_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_lk_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_inodelk_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_finodelk_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_entrylk_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_fentrylk_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_removexattr_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_xattrop_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_fxattrop_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_rchecksum_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_readdir_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_readdirp_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_setattr_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_fsetattr_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_symlink_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_rename_req (struct iovec outmsg, void *args);
+
+
+ssize_t
+xdr_from_link_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_rename_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_create_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_mkdir_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_mknod_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_releasedir_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_release_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_setvolume_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_to_setvolume_rsp (struct iovec inmsg, void *args);
+
+
+
+ssize_t
+xdr_to_statfs_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_stat_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fstat_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_rename_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_readlink_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_link_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_access_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_truncate_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_ftruncate_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_unlink_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_rmdir_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_open_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_create_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_mkdir_rsp (struct iovec inmsg, void *args);
+
+
+ssize_t
+xdr_to_mknod_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_setattr_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fsetattr_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_common_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_getxattr_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fxattrop_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_xattrop_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_symlink_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_fgetxattr_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_rchecksum_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_lk_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_readdirp_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_readdir_rsp (struct iovec inmsg, void *args);
+ssize_t
+xdr_to_opendir_rsp (struct iovec inmsg, void *args);
+ssize_t
+xdr_to_lookup_rsp (struct iovec inmsg, void *args);
+ssize_t
+xdr_to_readv_rsp (struct iovec inmsg, void *args);
+ssize_t
+xdr_to_getspec_rsp (struct iovec inmsg, void *args);
+
 #endif /* !_GLUSTERFS3_H */
diff --git a/rpc/xdr/src/mount3udp.x b/rpc/xdr/src/mount3udp.x
deleted file mode 100644
index 888c53120..000000000
--- a/rpc/xdr/src/mount3udp.x
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-/* This is used by rpcgen to auto generate the rpc stubs.
- * mount3udp_svc.c is heavily modified though
- */
-
-const MNTUDPPATHLEN = 1024;
-
-typedef string mntudpdirpath<MNTPATHLEN>;
-
-program MOUNTUDP_PROGRAM {
-        version MOUNTUDP_V3 {
-                void MOUNTUDPPROC3_NULL(void) = 0;
-                mountres3 MOUNTUDPPROC3_MNT (mntudpdirpath) = 1;
-                mountstat3 MOUNTUDPPROC3_UMNT (mntudpdirpath) = 3;
-        } = 3;
-} = 100005;
diff --git a/rpc/xdr/src/nlm4-xdr.c b/rpc/xdr/src/nlm4-xdr.c
deleted file mode 100644
index caba05f58..000000000
--- a/rpc/xdr/src/nlm4-xdr.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "nlm4-xdr.h"
-
-bool_t
-xdr_netobj (XDR *xdrs, netobj *objp)
-{
-	 if (!xdr_bytes (xdrs, (char **)&objp->n_bytes, (u_int *) &objp->n_len, MAXNETOBJ_SZ))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_fsh_mode (XDR *xdrs, fsh_mode *objp)
-{
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_fsh_access (XDR *xdrs, fsh_access *objp)
-{
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_stats (XDR *xdrs, nlm4_stats *objp)
-{
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_stat (XDR *xdrs, nlm4_stat *objp)
-{
-	 if (!xdr_nlm4_stats (xdrs, &objp->stat))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_holder (XDR *xdrs, nlm4_holder *objp)
-{
-	 if (!xdr_bool (xdrs, &objp->exclusive))
-		 return FALSE;
-	 if (!xdr_uint32_t (xdrs, &objp->svid))
-		 return FALSE;
-	 if (!xdr_netobj (xdrs, &objp->oh))
-		 return FALSE;
-	 if (!xdr_uint64_t (xdrs, &objp->l_offset))
-		 return FALSE;
-	 if (!xdr_uint64_t (xdrs, &objp->l_len))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_lock (XDR *xdrs, nlm4_lock *objp)
-{
-	 if (!xdr_string (xdrs, &objp->caller_name, MAXNAMELEN))
-		 return FALSE;
-	 if (!xdr_netobj (xdrs, &objp->fh))
-		 return FALSE;
-	 if (!xdr_netobj (xdrs, &objp->oh))
-		 return FALSE;
-	 if (!xdr_uint32_t (xdrs, &objp->svid))
-		 return FALSE;
-	 if (!xdr_uint64_t (xdrs, &objp->l_offset))
-		 return FALSE;
-	 if (!xdr_uint64_t (xdrs, &objp->l_len))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_share (XDR *xdrs, nlm4_share *objp)
-{
-	 if (!xdr_string (xdrs, &objp->caller_name, MAXNAMELEN))
-		 return FALSE;
-	 if (!xdr_netobj (xdrs, &objp->fh))
-		 return FALSE;
-	 if (!xdr_netobj (xdrs, &objp->oh))
-		 return FALSE;
-	 if (!xdr_fsh_mode (xdrs, &objp->mode))
-		 return FALSE;
-	 if (!xdr_fsh_access (xdrs, &objp->access))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_testrply (XDR *xdrs, nlm4_testrply *objp)
-{
-	 if (!xdr_nlm4_stats (xdrs, &objp->stat))
-		 return FALSE;
-	switch (objp->stat) {
-	case nlm4_denied:
-		 if (!xdr_nlm4_holder (xdrs, &objp->nlm4_testrply_u.holder))
-			 return FALSE;
-		break;
-	default:
-		break;
-	}
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_testres (XDR *xdrs, nlm4_testres *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->cookie))
-		 return FALSE;
-	 if (!xdr_nlm4_testrply (xdrs, &objp->stat))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_testargs (XDR *xdrs, nlm4_testargs *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->cookie))
-		 return FALSE;
-	 if (!xdr_bool (xdrs, &objp->exclusive))
-		 return FALSE;
-	 if (!xdr_nlm4_lock (xdrs, &objp->alock))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_res (XDR *xdrs, nlm4_res *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->cookie))
-		 return FALSE;
-	 if (!xdr_nlm4_stat (xdrs, &objp->stat))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_lockargs (XDR *xdrs, nlm4_lockargs *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->cookie))
-		 return FALSE;
-	 if (!xdr_bool (xdrs, &objp->block))
-		 return FALSE;
-	 if (!xdr_bool (xdrs, &objp->exclusive))
-		 return FALSE;
-	 if (!xdr_nlm4_lock (xdrs, &objp->alock))
-		 return FALSE;
-	 if (!xdr_bool (xdrs, &objp->reclaim))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->state))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_cancargs (XDR *xdrs, nlm4_cancargs *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->cookie))
-		 return FALSE;
-	 if (!xdr_bool (xdrs, &objp->block))
-		 return FALSE;
-	 if (!xdr_bool (xdrs, &objp->exclusive))
-		 return FALSE;
-	 if (!xdr_nlm4_lock (xdrs, &objp->alock))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_unlockargs (XDR *xdrs, nlm4_unlockargs *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->cookie))
-		 return FALSE;
-	 if (!xdr_nlm4_lock (xdrs, &objp->alock))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_shareargs (XDR *xdrs, nlm4_shareargs *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->cookie))
-		 return FALSE;
-	 if (!xdr_nlm4_share (xdrs, &objp->share))
-		 return FALSE;
-	 if (!xdr_bool (xdrs, &objp->reclaim))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_shareres (XDR *xdrs, nlm4_shareres *objp)
-{
-	 if (!xdr_netobj (xdrs, &objp->cookie))
-		 return FALSE;
-	 if (!xdr_nlm4_stats (xdrs, &objp->stat))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->sequence))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nlm4_freeallargs (XDR *xdrs, nlm4_freeallargs *objp)
-{
-        if (!xdr_string (xdrs, &objp->name, LM_MAXSTRLEN))
-                return FALSE;
-        if (!xdr_uint32_t (xdrs, &objp->state))
-                return FALSE;
-        return TRUE;
-}
-
-
-/*
-bool_t
-xdr_nlm_sm_status (XDR *xdrs, nlm_sm_status *objp)
-{
-	 if (!xdr_string (xdrs, &objp->mon_name, LM_MAXSTRLEN))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->state))
-		 return FALSE;
-	 if (!xdr_opaque (xdrs, objp->priv, 16))
-		 return FALSE;
-	return TRUE;
-}
-*/
diff --git a/rpc/xdr/src/nlm4-xdr.h b/rpc/xdr/src/nlm4-xdr.h
deleted file mode 100644
index 4391a4790..000000000
--- a/rpc/xdr/src/nlm4-xdr.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NLM_H_RPCGEN
-#define _NLM_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#if defined(__NetBSD__)
-#define xdr_u_quad_t xdr_u_int64_t
-#define xdr_quad_t   xdr_int64_t
-#define xdr_uint32_t xdr_u_int32_t
-#define xdr_uint64_t xdr_u_int64_t
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAXNETOBJ_SZ 1024
-#define LM_MAXSTRLEN 1024
-#define MAXNAMELEN 1025
-
-#if defined(__NetBSD__)
-#define xdr_u_quad_t xdr_u_int64_t
-#define xdr_quad_t   xdr_int64_t
-#define xdr_uint32_t xdr_u_int32_t
-#define xdr_uint64_t xdr_u_int64_t
-#endif
-
-/*
- * The following enums are actually bit encoded for efficient
- * boolean algebra.... DON'T change them.....
- */
-
-enum fsh_mode {
-	fsm_DN = 0,
-	fsm_DR = 1,
-	fsm_DW = 2,
-	fsm_DRW = 3,
-};
-typedef enum fsh_mode fsh_mode;
-
-enum fsh_access {
-	fsa_NONE = 0,
-	fsa_R = 1,
-	fsa_W = 2,
-	fsa_RW = 3,
-};
-typedef enum fsh_access fsh_access;
-/* definitions for NLM version 4 */
-
-enum nlm4_stats {
-	nlm4_granted = 0,
-	nlm4_denied = 1,
-	nlm4_denied_nolock = 2,
-	nlm4_blocked = 3,
-	nlm4_denied_grace_period = 4,
-	nlm4_deadlck = 5,
-	nlm4_rofs = 6,
-	nlm4_stale_fh = 7,
-	nlm4_fbig = 8,
-	nlm4_failed = 9,
-};
-typedef enum nlm4_stats nlm4_stats;
-
-struct nlm4_stat {
-	nlm4_stats stat;
-};
-typedef struct nlm4_stat nlm4_stat;
-
-struct nlm4_holder {
-	bool_t exclusive;
-	u_int32_t svid;
-	netobj oh;
-	u_int64_t l_offset;
-	u_int64_t l_len;
-};
-typedef struct nlm4_holder nlm4_holder;
-
-struct nlm4_lock {
-	char *caller_name;
-	netobj fh;
-	netobj oh;
-	u_int32_t svid;
-	u_int64_t l_offset;
-	u_int64_t l_len;
-};
-typedef struct nlm4_lock nlm4_lock;
-
-struct nlm4_share {
-	char *caller_name;
-	netobj fh;
-	netobj oh;
-	fsh_mode mode;
-	fsh_access access;
-};
-typedef struct nlm4_share nlm4_share;
-
-struct nlm4_testrply {
-	nlm4_stats stat;
-	union {
-		struct nlm4_holder holder;
-	} nlm4_testrply_u;
-};
-typedef struct nlm4_testrply nlm4_testrply;
-
-struct nlm4_testres {
-	netobj cookie;
-	nlm4_testrply stat;
-};
-typedef struct nlm4_testres nlm4_testres;
-
-struct nlm4_testargs {
-	netobj cookie;
-	bool_t exclusive;
-	struct nlm4_lock alock;
-};
-typedef struct nlm4_testargs nlm4_testargs;
-
-struct nlm4_res {
-	netobj cookie;
-	nlm4_stat stat;
-};
-typedef struct nlm4_res nlm4_res;
-
-struct nlm4_lockargs {
-	netobj cookie;
-	bool_t block;
-	bool_t exclusive;
-	struct nlm4_lock alock;
-	bool_t reclaim;
-	int state;
-};
-typedef struct nlm4_lockargs nlm4_lockargs;
-
-struct nlm4_cancargs {
-	netobj cookie;
-	bool_t block;
-	bool_t exclusive;
-	struct nlm4_lock alock;
-};
-typedef struct nlm4_cancargs nlm4_cancargs;
-
-struct nlm4_unlockargs {
-	netobj cookie;
-	struct nlm4_lock alock;
-};
-typedef struct nlm4_unlockargs nlm4_unlockargs;
-
-struct nlm4_shareargs {
-	netobj cookie;
-	nlm4_share share;
-	bool_t reclaim;
-};
-typedef struct nlm4_shareargs nlm4_shareargs;
-
-struct nlm4_shareres {
-	netobj cookie;
-	nlm4_stats stat;
-	int sequence;
-};
-typedef struct nlm4_shareres nlm4_shareres;
-
-struct nlm4_freeallargs {
-        char *name;
-        u_int32_t state;
-};
-typedef struct nlm4_freeallargs nlm4_freeallargs;
-
-
-#define NLM4_NULL          0
-#define NLM4_TEST          1
-#define NLM4_LOCK          2
-#define NLM4_CANCEL        3
-#define NLM4_UNLOCK        4
-#define NLM4_GRANTED       5
-#define NLM4_TEST_MSG      6
-#define NLM4_LOCK_MSG      7
-#define NLM4_CANCEL_MSG    8
-#define NLM4_UNLOCK_MSG    9
-#define NLM4_GRANTED_MSG   10
-#define NLM4_TEST_RES      11
-#define NLM4_LOCK_RES      12
-#define NLM4_CANCEL_RES    13
-#define NLM4_UNLOCK_RES    14
-#define NLM4_GRANTED_RES   15
-#define NLM4_SM_NOTIFY     16
-#define NLM4_SEVENTEEN     17
-#define NLM4_EIGHTEEN      18
-#define NLM4_NINETEEN      19
-#define NLM4_SHARE         20
-#define NLM4_UNSHARE       21
-#define NLM4_NM_LOCK       22
-#define NLM4_FREE_ALL      23
-#define NLM4_PROC_COUNT    24
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_netobj (XDR *, netobj*);
-extern  bool_t xdr_fsh_mode (XDR *, fsh_mode*);
-extern  bool_t xdr_fsh_access (XDR *, fsh_access*);
-extern  bool_t xdr_nlm4_stats (XDR *, nlm4_stats*);
-extern  bool_t xdr_nlm4_stat (XDR *, nlm4_stat*);
-extern  bool_t xdr_nlm4_holder (XDR *, nlm4_holder*);
-extern  bool_t xdr_nlm4_lock (XDR *, nlm4_lock*);
-extern  bool_t xdr_nlm4_share (XDR *, nlm4_share*);
-extern  bool_t xdr_nlm4_testrply (XDR *, nlm4_testrply*);
-extern  bool_t xdr_nlm4_testres (XDR *, nlm4_testres*);
-extern  bool_t xdr_nlm4_testargs (XDR *, nlm4_testargs*);
-extern  bool_t xdr_nlm4_res (XDR *, nlm4_res*);
-extern  bool_t xdr_nlm4_lockargs (XDR *, nlm4_lockargs*);
-extern  bool_t xdr_nlm4_cancargs (XDR *, nlm4_cancargs*);
-extern  bool_t xdr_nlm4_unlockargs (XDR *, nlm4_unlockargs*);
-extern  bool_t xdr_nlm4_shareargs (XDR *, nlm4_shareargs*);
-extern  bool_t xdr_nlm4_shareres (XDR *, nlm4_shareres*);
-extern  bool_t xdr_nlm4_freeallargs (XDR *, nlm4_freeallargs*);
-
-#else /* K&R C */
-extern bool_t xdr_netobj ();
-extern bool_t xdr_fsh_mode ();
-extern bool_t xdr_fsh_access ();
-extern bool_t xdr_nlm4_stats ();
-extern bool_t xdr_nlm4_stat ();
-extern bool_t xdr_nlm4_holder ();
-extern bool_t xdr_nlm4_lock ();
-extern bool_t xdr_nlm4_share ();
-extern bool_t xdr_nlm4_testrply ();
-extern bool_t xdr_nlm4_testres ();
-extern bool_t xdr_nlm4_testargs ();
-extern bool_t xdr_nlm4_res ();
-extern bool_t xdr_nlm4_lockargs ();
-extern bool_t xdr_nlm4_cancargs ();
-extern bool_t xdr_nlm4_unlockargs ();
-extern bool_t xdr_nlm4_shareargs ();
-extern bool_t xdr_nlm4_shareres ();
-extern bool_t xdr_nlm4_freeallargs ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NLM_H_RPCGEN */
diff --git a/rpc/xdr/src/nlm4.x b/rpc/xdr/src/nlm4.x
deleted file mode 100644
index e22ac99f2..000000000
--- a/rpc/xdr/src/nlm4.x
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-/* .x file defined as according to the RFC */
-
-const MAXNETOBJ_SZ = 1024;
-const LM_MAXSTRLEN = 1024;
-const MAXNAMELEN = 1025;
-
-typedef opaque netobj<MAXNETOBJ_SZ>;
-
-#ifdef RPC_HDR
-%/*
-% * The following enums are actually bit encoded for efficient
-% * boolean algebra.... DON'T change them.....
-% */
-#endif
-enum	fsh_mode {
-	fsm_DN  = 0,	/* deny none */
-	fsm_DR  = 1,	/* deny read */
-	fsm_DW  = 2,	/* deny write */
-	fsm_DRW = 3	/* deny read/write */
-};
-
-enum	fsh_access {
-	fsa_NONE = 0,	/* for completeness */
-	fsa_R    = 1,	/* read only */
-	fsa_W    = 2,	/* write only */
-	fsa_RW   = 3	/* read/write */
-};
-
-#ifdef RPC_HDR
-%/* definitions for NLM version 4 */
-#endif
-enum nlm4_stats {
-	nlm4_granted			= 0,
-	nlm4_denied			= 1,
-	nlm4_denied_nolock		= 2,
-	nlm4_blocked			= 3,
-	nlm4_denied_grace_period	= 4,
-	nlm4_deadlck			= 5,
-	nlm4_rofs			= 6,
-	nlm4_stale_fh			= 7,
-	nlm4_fbig			= 8,
-	nlm4_failed			= 9
-};
-
-struct nlm4_stat {
-	nlm4_stats stat;
-};
-
-struct nlm4_holder {
-	bool exclusive;
-	u_int32_t svid;
-	netobj oh;
-	u_int64_t l_offset;
-	u_int64_t l_len;
-};
-
-struct nlm4_lock {
-	string caller_name<LM_MAXSTRLEN>;
-	netobj fh;
-	netobj oh;
-	u_int32_t svid;
-	u_int64_t l_offset;
-	u_int64_t l_len;
-};
-
-struct nlm4_share {
-	string caller_name<LM_MAXSTRLEN>;
-	netobj fh;
-	netobj oh;
-	fsh_mode mode;
-	fsh_access access;
-};
-
-union nlm4_testrply switch (nlm4_stats stat) {
-	case nlm_denied:
-		struct nlm4_holder holder;
-	default:
-		void;
-};
-
-struct nlm4_testres {
-	netobj cookie;
-	nlm4_testrply stat;
-};
-
-struct nlm4_testargs {
-	netobj cookie;
-	bool exclusive;
-	struct nlm4_lock alock;
-};
-
-struct nlm4_res {
-	netobj cookie;
-	nlm4_stat stat;
-};
-
-struct nlm4_lockargs {
-	netobj cookie;
-	bool block;
-	bool exclusive;
-	struct nlm4_lock alock;
-	bool reclaim;		/* used for recovering locks */
-	int state;		/* specify local status monitor state */
-};
-
-struct nlm4_cancargs {
-	netobj cookie;
-	bool block;
-	bool exclusive;
-	struct nlm4_lock alock;
-};
-
-struct nlm4_unlockargs {
-	netobj cookie;
-	struct nlm4_lock alock;
-};
-
-struct	nlm4_shareargs {
-	netobj	cookie;
-	nlm4_share	share;
-	bool	reclaim;
-};
-
-struct	nlm4_shareres {
-	netobj	cookie;
-	nlm4_stats	stat;
-	int	sequence;
-};
-
-struct  nlm4_freeallargs {
-        string       name<LM_MAXSTRLEN>;   /* client hostname */
-        uint32       state;                /* unused */
-};
-
-/*
- * argument for the procedure called by rpc.statd when a monitored host
- * status change.
- * XXX assumes LM_MAXSTRLEN == SM_MAXSTRLEN
- */
-struct nlm_sm_status {
-	string mon_name<LM_MAXSTRLEN>; /* name of host */
-	int state;			/* new state */
-	opaque priv[16];		/* private data */
-};
diff --git a/rpc/xdr/src/nlmcbk-xdr.c b/rpc/xdr/src/nlmcbk-xdr.c
deleted file mode 100644
index 3d75acc55..000000000
--- a/rpc/xdr/src/nlmcbk-xdr.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "nlmcbk-xdr.h"
-
-bool_t
-xdr_nlm_sm_status (XDR *xdrs, nlm_sm_status *objp)
-{
-	 if (!xdr_string (xdrs, &objp->mon_name, LM_MAXSTRLEN))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->state))
-		 return FALSE;
-	 if (!xdr_opaque (xdrs, objp->priv, 16))
-		 return FALSE;
-	return TRUE;
-}
diff --git a/rpc/xdr/src/nlmcbk-xdr.h b/rpc/xdr/src/nlmcbk-xdr.h
deleted file mode 100644
index ad8421857..000000000
--- a/rpc/xdr/src/nlmcbk-xdr.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NLMCBK_H_RPCGEN
-#define _NLMCBK_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LM_MAXSTRLEN 1024
-
-struct nlm_sm_status {
-	char *mon_name;
-	int state;
-	char priv[16];
-};
-typedef struct nlm_sm_status nlm_sm_status;
-
-#define NLMCBK_PROGRAM 100021
-#define NLMCBK_V1 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NLMCBK_SM_NOTIFY 16
-extern  void * nlmcbk_sm_notify_0(struct nlm_sm_status *, CLIENT *);
-extern  void * nlmcbk_sm_notify_0_svc(struct nlm_sm_status *, struct svc_req *);
-extern int nlmcbk_program_0_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define NLMCBK_SM_NOTIFY 16
-extern  void * nlmcbk_sm_notify_0();
-extern  void * nlmcbk_sm_notify_0_svc();
-extern int nlmcbk_program_0_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_nlm_sm_status (XDR *, nlm_sm_status*);
-
-#else /* K&R C */
-extern bool_t xdr_nlm_sm_status ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NLMCBK_H_RPCGEN */
diff --git a/rpc/xdr/src/nlmcbk.x b/rpc/xdr/src/nlmcbk.x
deleted file mode 100644
index 1d3746c9a..000000000
--- a/rpc/xdr/src/nlmcbk.x
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-const LM_MAXSTRLEN = 1024;
-
-struct nlm_sm_status {
-        string mon_name<LM_MAXSTRLEN>; /* name of host */
-        int state;                      /* new state */
-        opaque priv[16];                /* private data */
-};
-
-program NLMCBK_PROGRAM {
-	version NLMCBK_V0 {
-		void NLMCBK_SM_NOTIFY(struct nlm_sm_status) = 1;
-	} = 0;
-} = 1238477;
-
diff --git a/rpc/xdr/src/nsm-xdr.c b/rpc/xdr/src/nsm-xdr.c
deleted file mode 100644
index 58712737b..000000000
--- a/rpc/xdr/src/nsm-xdr.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "nsm-xdr.h"
-
-bool_t
-xdr_sm_name (XDR *xdrs, sm_name *objp)
-{
-	 if (!xdr_string (xdrs, &objp->mon_name, SM_MAXSTRLEN))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_res (XDR *xdrs, res *objp)
-{
-	 if (!xdr_enum (xdrs, (enum_t *) objp))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_sm_stat_res (XDR *xdrs, sm_stat_res *objp)
-{
-	 if (!xdr_res (xdrs, &objp->res_stat))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->state))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_sm_stat (XDR *xdrs, sm_stat *objp)
-{
-	 if (!xdr_int (xdrs, &objp->state))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_my_id (XDR *xdrs, my_id *objp)
-{
-	 if (!xdr_string (xdrs, &objp->my_name, SM_MAXSTRLEN))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->my_prog))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->my_vers))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->my_proc))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_mon_id (XDR *xdrs, mon_id *objp)
-{
-	 if (!xdr_string (xdrs, &objp->mon_name, SM_MAXSTRLEN))
-		 return FALSE;
-	 if (!xdr_my_id (xdrs, &objp->my_id))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_mon (XDR *xdrs, mon *objp)
-{
-	 if (!xdr_mon_id (xdrs, &objp->mon_id))
-		 return FALSE;
-	 if (!xdr_opaque (xdrs, objp->priv, 16))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_nsm_callback_status (XDR *xdrs, nsm_callback_status *objp)
-{
-	 if (!xdr_string (xdrs, &objp->mon_name, SM_MAXSTRLEN))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->state))
-		 return FALSE;
-	 if (!xdr_opaque (xdrs, objp->priv, 16))
-		 return FALSE;
-	return TRUE;
-}
diff --git a/rpc/xdr/src/nsm-xdr.h b/rpc/xdr/src/nsm-xdr.h
deleted file mode 100644
index 9de642c15..000000000
--- a/rpc/xdr/src/nsm-xdr.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NSM_H_RPCGEN
-#define _NSM_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SM_MAXSTRLEN 1024
-
-struct sm_name {
-	char *mon_name;
-};
-typedef struct sm_name sm_name;
-
-enum res {
-	STAT_SUCC = 0,
-	STAT_FAIL = 1,
-};
-typedef enum res res;
-
-struct sm_stat_res {
-	res res_stat;
-	int state;
-};
-typedef struct sm_stat_res sm_stat_res;
-
-struct sm_stat {
-	int state;
-};
-typedef struct sm_stat sm_stat;
-
-struct my_id {
-	char *my_name;
-	int my_prog;
-	int my_vers;
-	int my_proc;
-};
-typedef struct my_id my_id;
-
-struct mon_id {
-	char *mon_name;
-	struct my_id my_id;
-};
-typedef struct mon_id mon_id;
-
-struct mon {
-	struct mon_id mon_id;
-	char priv[16];
-};
-typedef struct mon mon;
-
-struct nsm_callback_status {
-	char *mon_name;
-	int state;
-	char priv[16];
-};
-typedef struct nsm_callback_status nsm_callback_status;
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_sm_name (XDR *, sm_name*);
-extern  bool_t xdr_res (XDR *, res*);
-extern  bool_t xdr_sm_stat_res (XDR *, sm_stat_res*);
-extern  bool_t xdr_sm_stat (XDR *, sm_stat*);
-extern  bool_t xdr_my_id (XDR *, my_id*);
-extern  bool_t xdr_mon_id (XDR *, mon_id*);
-extern  bool_t xdr_mon (XDR *, mon*);
-extern  bool_t xdr_nsm_callback_status (XDR *, nsm_callback_status*);
-
-#else /* K&R C */
-extern bool_t xdr_sm_name ();
-extern bool_t xdr_res ();
-extern bool_t xdr_sm_stat_res ();
-extern bool_t xdr_sm_stat ();
-extern bool_t xdr_my_id ();
-extern bool_t xdr_mon_id ();
-extern bool_t xdr_mon ();
-extern bool_t xdr_nsm_callback_status ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NSM_H_RPCGEN */
diff --git a/rpc/xdr/src/nsm.x b/rpc/xdr/src/nsm.x
deleted file mode 100644
index 8f97b1aaa..000000000
--- a/rpc/xdr/src/nsm.x
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This defines the maximum length of the string
- * identifying the caller.
- */
-const SM_MAXSTRLEN = 1024;
-
-struct sm_name {
-    string mon_name<SM_MAXSTRLEN>;
-};
-
-enum res {
-    STAT_SUCC = 0,   /*  NSM agrees to monitor.  */
-    STAT_FAIL = 1    /*  NSM cannot monitor.  */
-};
-
-struct sm_stat_res {
-    res    res_stat;
-    int    state;
-};
-
-struct sm_stat {
-    int    state;    /*  state number of NSM  */
-};
-
-struct my_id {
-    string my_name<SM_MAXSTRLEN>;  /*  hostname  */
-    int    my_prog;                /*  RPC program number  */
-    int    my_vers;                /*  program version number  */
-    int    my_proc;                /*  procedure number  */
-};
-
-struct mon_id {
-    string mon_name<SM_MAXSTRLEN>; /* name of the host to be monitored */
-    struct my_id my_id;
-};
-
-struct mon {
-    struct mon_id mon_id;
-    opaque    priv[16];        /*  private information  */
-};
-
-struct nsm_callback_status {
-    string mon_name<SM_MAXSTRLEN>;
-    int    state;
-    opaque priv[16];        /*  for private information  */
-};
-
diff --git a/rpc/xdr/src/portmap-xdr.c b/rpc/xdr/src/portmap-xdr.c
index 4766122e6..436e974a8 100644
--- a/rpc/xdr/src/portmap-xdr.c
+++ b/rpc/xdr/src/portmap-xdr.c
@@ -1,21 +1,22 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
-#include "xdr-common.h"
-#include "compat.h"
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
 
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
 
 /*
  * Please do not edit this file.
@@ -23,13 +24,11 @@
  */
 
 #include "portmap-xdr.h"
+#include "compat.h"
 
 bool_t
 xdr_pmap_port_by_brick_req (XDR *xdrs, pmap_port_by_brick_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_string (xdrs, &objp->brick, ~0))
 		 return FALSE;
 	return TRUE;
@@ -39,7 +38,6 @@ bool_t
 xdr_pmap_port_by_brick_rsp (XDR *xdrs, pmap_port_by_brick_rsp *objp)
 {
 	register int32_t *buf;
-        buf = NULL;
 
 
 	if (xdrs->x_op == XDR_ENCODE) {
@@ -94,9 +92,6 @@ xdr_pmap_port_by_brick_rsp (XDR *xdrs, pmap_port_by_brick_rsp *objp)
 bool_t
 xdr_pmap_brick_by_port_req (XDR *xdrs, pmap_brick_by_port_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_int (xdrs, &objp->port))
 		 return FALSE;
 	return TRUE;
@@ -106,7 +101,6 @@ bool_t
 xdr_pmap_brick_by_port_rsp (XDR *xdrs, pmap_brick_by_port_rsp *objp)
 {
 	register int32_t *buf;
-        buf = NULL;
 
 
 	if (xdrs->x_op == XDR_ENCODE) {
@@ -161,9 +155,6 @@ xdr_pmap_brick_by_port_rsp (XDR *xdrs, pmap_brick_by_port_rsp *objp)
 bool_t
 xdr_pmap_signup_req (XDR *xdrs, pmap_signup_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_string (xdrs, &objp->brick, ~0))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->port))
@@ -174,9 +165,6 @@ xdr_pmap_signup_req (XDR *xdrs, pmap_signup_req *objp)
 bool_t
 xdr_pmap_signup_rsp (XDR *xdrs, pmap_signup_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
@@ -187,9 +175,6 @@ xdr_pmap_signup_rsp (XDR *xdrs, pmap_signup_rsp *objp)
 bool_t
 xdr_pmap_signin_req (XDR *xdrs, pmap_signin_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_string (xdrs, &objp->brick, ~0))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->port))
@@ -200,9 +185,6 @@ xdr_pmap_signin_req (XDR *xdrs, pmap_signin_req *objp)
 bool_t
 xdr_pmap_signin_rsp (XDR *xdrs, pmap_signin_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
@@ -213,9 +195,6 @@ xdr_pmap_signin_rsp (XDR *xdrs, pmap_signin_rsp *objp)
 bool_t
 xdr_pmap_signout_req (XDR *xdrs, pmap_signout_req *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_string (xdrs, &objp->brick, ~0))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->port))
@@ -226,9 +205,6 @@ xdr_pmap_signout_req (XDR *xdrs, pmap_signout_req *objp)
 bool_t
 xdr_pmap_signout_rsp (XDR *xdrs, pmap_signout_rsp *objp)
 {
-	register int32_t *buf;
-        buf = NULL;
-
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
diff --git a/rpc/xdr/src/portmap-xdr.h b/rpc/xdr/src/portmap-xdr.h
index 8e4ff4f45..de8a5bc8d 100644
--- a/rpc/xdr/src/portmap-xdr.h
+++ b/rpc/xdr/src/portmap-xdr.h
@@ -1,31 +1,33 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
 
-#include "xdr-common.h"
-#include "compat.h"
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
 
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
 
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
  */
 
-#ifndef _PORTMAP_XDR_H_RPCGEN
-#define _PORTMAP_XDR_H_RPCGEN
+#ifndef _PORTMAP_H_RPCGEN
+#define _PORTMAP_H_RPCGEN
 
 #include <rpc/rpc.h>
+#include <rpc/types.h>
 
 
 #ifdef __cplusplus
@@ -127,4 +129,4 @@ extern bool_t xdr_pmap_signout_rsp ();
 }
 #endif
 
-#endif /* !_PORTMAP_XDR_H_RPCGEN */
+#endif /* !_PORTMAP_H_RPCGEN */
diff --git a/rpc/xdr/src/portmap.c b/rpc/xdr/src/portmap.c
new file mode 100644
index 000000000..f1c1b789e
--- /dev/null
+++ b/rpc/xdr/src/portmap.c
@@ -0,0 +1,189 @@
+/*
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "portmap.h"
+
+
+ssize_t
+xdr_to_pmap_port_by_brick_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_port_by_brick_req);
+}
+
+
+ssize_t
+xdr_to_pmap_port_by_brick_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_port_by_brick_rsp);
+}
+
+
+ssize_t
+xdr_from_pmap_port_by_brick_req (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_port_by_brick_req);
+}
+
+
+ssize_t
+xdr_from_pmap_port_by_brick_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_port_by_brick_rsp);
+}
+
+
+
+ssize_t
+xdr_to_pmap_brick_by_port_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_brick_by_port_req);
+}
+
+
+ssize_t
+xdr_to_pmap_brick_by_port_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_brick_by_port_rsp);
+}
+
+
+ssize_t
+xdr_from_pmap_brick_by_port_req (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_brick_by_port_req);
+}
+
+
+ssize_t
+xdr_from_pmap_brick_by_port_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_brick_by_port_rsp);
+}
+
+
+
+
+ssize_t
+xdr_to_pmap_signup_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_signup_req);
+}
+
+
+ssize_t
+xdr_to_pmap_signup_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_signup_rsp);
+}
+
+
+ssize_t
+xdr_from_pmap_signup_req (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_signup_req);
+}
+
+
+ssize_t
+xdr_from_pmap_signup_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_signup_rsp);
+}
+
+
+
+
+ssize_t
+xdr_to_pmap_signin_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_signin_req);
+}
+
+
+ssize_t
+xdr_to_pmap_signin_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_signin_rsp);
+}
+
+
+ssize_t
+xdr_from_pmap_signin_req (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_signin_req);
+}
+
+
+ssize_t
+xdr_from_pmap_signin_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_signin_rsp);
+}
+
+
+
+
+ssize_t
+xdr_to_pmap_signout_req (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_signout_req);
+}
+
+
+ssize_t
+xdr_to_pmap_signout_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_to_generic (inmsg, (void *)args,
+                               (xdrproc_t)xdr_pmap_signout_rsp);
+}
+
+
+ssize_t
+xdr_from_pmap_signout_req (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_signout_req);
+}
+
+
+ssize_t
+xdr_from_pmap_signout_rsp (struct iovec inmsg, void *args)
+{
+        return xdr_serialize_generic (inmsg, (void *)args,
+                                      (xdrproc_t)xdr_pmap_signout_rsp);
+}
+
diff --git a/rpc/xdr/src/portmap.h b/rpc/xdr/src/portmap.h
new file mode 100644
index 000000000..9fa237d20
--- /dev/null
+++ b/rpc/xdr/src/portmap.h
@@ -0,0 +1,95 @@
+/*
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef _PORTMAP_H
+#define _PORTMAP_H
+
+#include <sys/uio.h>
+
+#include "xdr-generic.h"
+#include "portmap-xdr.h"
+
+
+ssize_t
+xdr_to_pmap_port_by_brick_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_pmap_port_by_brick_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_from_pmap_port_by_brick_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_pmap_port_by_brick_rsp (struct iovec outmsg, void *args);
+
+
+ssize_t
+xdr_to_pmap_brick_by_port_req (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_to_pmap_brick_by_port_rsp (struct iovec inmsg, void *args);
+
+ssize_t
+xdr_from_pmap_brick_by_port_req (struct iovec outmsg, void *args);
+
+ssize_t
+xdr_from_pmap_brick_by_port_rsp (struct iovec outmsg, void *args);
+
+
+ssize_t
+xdr_from_pmap_signup_req (struct iovec msg, void *args);
+
+ssize_t
+xdr_from_pmap_signup_rsp (struct iovec msg, void *args);
+
+ssize_t
+xdr_to_pmap_signup_req (struct iovec msg, void *args);
+
+ssize_t
+xdr_to_pmap_signup_rsp (struct iovec msg, void *args);
+
+
+ssize_t
+xdr_from_pmap_signin_req (struct iovec msg, void *args);
+
+ssize_t
+xdr_from_pmap_signin_rsp (struct iovec msg, void *args);
+
+ssize_t
+xdr_to_pmap_signin_req (struct iovec msg, void *args);
+
+ssize_t
+xdr_to_pmap_signin_rsp (struct iovec msg, void *args);
+
+
+ssize_t
+xdr_from_pmap_signout_req (struct iovec msg, void *args);
+
+ssize_t
+xdr_from_pmap_signout_rsp (struct iovec msg, void *args);
+
+ssize_t
+xdr_to_pmap_signout_req (struct iovec msg, void *args);
+
+ssize_t
+xdr_to_pmap_signout_rsp (struct iovec msg, void *args);
+
+
+#endif /* !_PORTMAP_H */
diff --git a/rpc/xdr/src/rpc-common-xdr.c b/rpc/xdr/src/rpc-common-xdr.c
deleted file mode 100644
index 6cb48a923..000000000
--- a/rpc/xdr/src/rpc-common-xdr.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include "xdr-common.h"
-#include "compat.h"
-
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "rpc-common-xdr.h"
-
-bool_t
-xdr_auth_glusterfs_parms_v2 (XDR *xdrs, auth_glusterfs_parms_v2 *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
-		if (buf == NULL) {
-			 if (!xdr_int (xdrs, &objp->pid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->uid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->gid))
-				 return FALSE;
-
-		} else {
-		IXDR_PUT_LONG(buf, objp->pid);
-		IXDR_PUT_U_LONG(buf, objp->uid);
-		IXDR_PUT_U_LONG(buf, objp->gid);
-		}
-		 if (!xdr_array (xdrs, (char **)&objp->groups.groups_val, (u_int *) &objp->groups.groups_len, ~0,
-			sizeof (u_int), (xdrproc_t) xdr_u_int))
-			 return FALSE;
-		 if (!xdr_bytes (xdrs, (char **)&objp->lk_owner.lk_owner_val, (u_int *) &objp->lk_owner.lk_owner_len, ~0))
-			 return FALSE;
-		return TRUE;
-	} else if (xdrs->x_op == XDR_DECODE) {
-		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
-		if (buf == NULL) {
-			 if (!xdr_int (xdrs, &objp->pid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->uid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->gid))
-				 return FALSE;
-
-		} else {
-		objp->pid = IXDR_GET_LONG(buf);
-		objp->uid = IXDR_GET_U_LONG(buf);
-		objp->gid = IXDR_GET_U_LONG(buf);
-		}
-		 if (!xdr_array (xdrs, (char **)&objp->groups.groups_val, (u_int *) &objp->groups.groups_len, ~0,
-			sizeof (u_int), (xdrproc_t) xdr_u_int))
-			 return FALSE;
-		 if (!xdr_bytes (xdrs, (char **)&objp->lk_owner.lk_owner_val, (u_int *) &objp->lk_owner.lk_owner_len, ~0))
-			 return FALSE;
-	 return TRUE;
-	}
-
-	 if (!xdr_int (xdrs, &objp->pid))
-		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->uid))
-		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->gid))
-		 return FALSE;
-	 if (!xdr_array (xdrs, (char **)&objp->groups.groups_val, (u_int *) &objp->groups.groups_len, ~0,
-		sizeof (u_int), (xdrproc_t) xdr_u_int))
-		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->lk_owner.lk_owner_val, (u_int *) &objp->lk_owner.lk_owner_len, ~0))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_auth_glusterfs_parms (XDR *xdrs, auth_glusterfs_parms *objp)
-{
-	register int32_t *buf;
-        int i;
-        buf = NULL;
-
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		 if (!xdr_u_quad_t (xdrs, &objp->lk_owner))
-			 return FALSE;
-		buf = XDR_INLINE (xdrs, (4 +  16 )* BYTES_PER_XDR_UNIT);
-		if (buf == NULL) {
-			 if (!xdr_u_int (xdrs, &objp->pid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->uid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->gid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->ngrps))
-				 return FALSE;
-			 if (!xdr_vector (xdrs, (char *)objp->groups, 16,
-				sizeof (u_int), (xdrproc_t) xdr_u_int))
-				 return FALSE;
-		} else {
-			IXDR_PUT_U_LONG(buf, objp->pid);
-			IXDR_PUT_U_LONG(buf, objp->uid);
-			IXDR_PUT_U_LONG(buf, objp->gid);
-			IXDR_PUT_U_LONG(buf, objp->ngrps);
-			{
-				register u_int *genp;
-
-				for (i = 0, genp = objp->groups;
-					i < 16; ++i) {
-					IXDR_PUT_U_LONG(buf, *genp++);
-				}
-			}
-		}
-		return TRUE;
-	} else if (xdrs->x_op == XDR_DECODE) {
-		 if (!xdr_u_quad_t (xdrs, &objp->lk_owner))
-			 return FALSE;
-		buf = XDR_INLINE (xdrs, (4 +  16 )* BYTES_PER_XDR_UNIT);
-		if (buf == NULL) {
-			 if (!xdr_u_int (xdrs, &objp->pid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->uid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->gid))
-				 return FALSE;
-			 if (!xdr_u_int (xdrs, &objp->ngrps))
-				 return FALSE;
-			 if (!xdr_vector (xdrs, (char *)objp->groups, 16,
-				sizeof (u_int), (xdrproc_t) xdr_u_int))
-				 return FALSE;
-		} else {
-			objp->pid = IXDR_GET_U_LONG(buf);
-			objp->uid = IXDR_GET_U_LONG(buf);
-			objp->gid = IXDR_GET_U_LONG(buf);
-			objp->ngrps = IXDR_GET_U_LONG(buf);
-			{
-				register u_int *genp;
-
-				for (i = 0, genp = objp->groups;
-					i < 16; ++i) {
-					*genp++ = IXDR_GET_U_LONG(buf);
-				}
-			}
-		}
-	 return TRUE;
-	}
-
-	 if (!xdr_u_quad_t (xdrs, &objp->lk_owner))
-		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->pid))
-		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->uid))
-		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->gid))
-		 return FALSE;
-	 if (!xdr_u_int (xdrs, &objp->ngrps))
-		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->groups, 16,
-		sizeof (u_int), (xdrproc_t) xdr_u_int))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_dump_req (XDR *xdrs, gf_dump_req *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_prog_detail (XDR *xdrs, gf_prog_detail *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_string (xdrs, &objp->progname, ~0))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->prognum))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->progver))
-		 return FALSE;
-	 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (gf_prog_detail), (xdrproc_t) xdr_gf_prog_detail))
-		 return FALSE;
-	return TRUE;
-}
-
-bool_t
-xdr_gf_dump_rsp (XDR *xdrs, gf_dump_rsp *objp)
-{
-	register int32_t *buf;
-        buf = NULL;
-
-	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->op_ret))
-		 return FALSE;
-	 if (!xdr_int (xdrs, &objp->op_errno))
-		 return FALSE;
-	 if (!xdr_pointer (xdrs, (char **)&objp->prog, sizeof (gf_prog_detail), (xdrproc_t) xdr_gf_prog_detail))
-		 return FALSE;
-	return TRUE;
-}
diff --git a/rpc/xdr/src/rpc-common-xdr.h b/rpc/xdr/src/rpc-common-xdr.h
deleted file mode 100644
index c43eab315..000000000
--- a/rpc/xdr/src/rpc-common-xdr.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include "xdr-common.h"
-#include "compat.h"
-
-#if defined(__GNUC__)
-#if __GNUC__ >= 4
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#endif
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RPC_COMMON_XDR_H_RPCGEN
-#define _RPC_COMMON_XDR_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-struct auth_glusterfs_parms_v2 {
-	int pid;
-	u_int uid;
-	u_int gid;
-	struct {
-		u_int groups_len;
-		u_int *groups_val;
-	} groups;
-	struct {
-		u_int lk_owner_len;
-		char *lk_owner_val;
-	} lk_owner;
-};
-typedef struct auth_glusterfs_parms_v2 auth_glusterfs_parms_v2;
-
-struct auth_glusterfs_parms {
-	u_quad_t lk_owner;
-	u_int pid;
-	u_int uid;
-	u_int gid;
-	u_int ngrps;
-	u_int groups[16];
-};
-typedef struct auth_glusterfs_parms auth_glusterfs_parms;
-
-struct gf_dump_req {
-	u_quad_t gfs_id;
-};
-typedef struct gf_dump_req gf_dump_req;
-
-struct gf_prog_detail {
-	char *progname;
-	u_quad_t prognum;
-	u_quad_t progver;
-	struct gf_prog_detail *next;
-};
-typedef struct gf_prog_detail gf_prog_detail;
-
-struct gf_dump_rsp {
-	u_quad_t gfs_id;
-	int op_ret;
-	int op_errno;
-	struct gf_prog_detail *prog;
-};
-typedef struct gf_dump_rsp gf_dump_rsp;
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_auth_glusterfs_parms_v2 (XDR *, auth_glusterfs_parms_v2*);
-extern  bool_t xdr_auth_glusterfs_parms (XDR *, auth_glusterfs_parms*);
-extern  bool_t xdr_gf_dump_req (XDR *, gf_dump_req*);
-extern  bool_t xdr_gf_prog_detail (XDR *, gf_prog_detail*);
-extern  bool_t xdr_gf_dump_rsp (XDR *, gf_dump_rsp*);
-
-#else /* K&R C */
-extern bool_t xdr_auth_glusterfs_parms_v2 ();
-extern bool_t xdr_auth_glusterfs_parms ();
-extern bool_t xdr_gf_dump_req ();
-extern bool_t xdr_gf_prog_detail ();
-extern bool_t xdr_gf_dump_rsp ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RPC_COMMON_XDR_H_RPCGEN */
diff --git a/rpc/xdr/src/rpc-common-xdr.x b/rpc/xdr/src/rpc-common-xdr.x
deleted file mode 100644
index ca28f38b5..000000000
--- a/rpc/xdr/src/rpc-common-xdr.x
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This file has definition of few XDR structures which are
- * not captured in any section specific file */
-
-struct auth_glusterfs_parms_v2 {
-        int pid;
-        unsigned int uid;
-        unsigned int gid;
-        unsigned int groups<>;
-        opaque lk_owner<>;
-};
-
-struct auth_glusterfs_parms {
-        unsigned hyper lk_owner;
-        unsigned int pid;
-        unsigned int uid;
-	unsigned int gid;
-	unsigned int ngrps;
-	unsigned groups[16];
-};
-
-struct gf_dump_req {
-	unsigned hyper gfs_id;
-};
-
-
-struct gf_prog_detail {
-	string progname<>;
-	unsigned hyper prognum;
-	unsigned hyper progver;
-	struct gf_prog_detail *next;
-};
-
-
-struct gf_dump_rsp {
-        unsigned hyper gfs_id;
-        int op_ret;
-	int op_errno;
-	struct gf_prog_detail *prog;
-};
diff --git a/rpc/xdr/src/xdr-generic.c b/rpc/xdr/src/xdr-generic.c
index 58d1ee77e..36808d27e 100644
--- a/rpc/xdr/src/xdr-generic.c
+++ b/rpc/xdr/src/xdr-generic.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -87,39 +96,3 @@ xdr_to_generic_payload (struct iovec inmsg, void *args, xdrproc_t proc,
 ret:
         return ret;
 }
-
-ssize_t
-xdr_length_round_up (size_t len, size_t bufsize)
-{
-        int     roundup = 0;
-
-        roundup = len % XDR_BYTES_PER_UNIT;
-        if (roundup > 0)
-                roundup = XDR_BYTES_PER_UNIT - roundup;
-
-        if ((roundup > 0) && ((roundup + len) <= bufsize))
-                len += roundup;
-
-        return len;
-}
-
-int
-xdr_bytes_round_up (struct iovec *vec, size_t bufsize)
-{
-        vec->iov_len = xdr_length_round_up (vec->iov_len, bufsize);
-        return 0;
-}
-
-
-void
-xdr_vector_round_up (struct iovec *vec, int vcount, uint32_t count)
-{
-        uint32_t round_count = 0;
-
-        round_count = xdr_length_round_up (count, 1048576);
-        round_count -= count;
-        if (round_count == 0 || vcount <= 0)
-                return;
-
-        vec[vcount-1].iov_len += round_count;
-}
diff --git a/rpc/xdr/src/xdr-generic.h b/rpc/xdr/src/xdr-generic.h
index bb3759bbe..e0fe5d38b 100644
--- a/rpc/xdr/src/xdr-generic.h
+++ b/rpc/xdr/src/xdr-generic.h
@@ -1,13 +1,23 @@
 /*
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
+
 #ifndef _XDR_GENERIC_H
 #define _XDR_GENERIC_H
 
@@ -16,14 +26,11 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
-#include "compat.h"
-
 #define xdr_decoded_remaining_addr(xdr)        ((&xdr)->x_private)
 #define xdr_decoded_remaining_len(xdr)         ((&xdr)->x_handy)
 #define xdr_encoded_length(xdr) (((size_t)(&xdr)->x_private) - ((size_t)(&xdr)->x_base))
 #define xdr_decoded_length(xdr) (((size_t)(&xdr)->x_private) - ((size_t)(&xdr)->x_base))
 
-#define XDR_BYTES_PER_UNIT      4
 
 ssize_t
 xdr_serialize_generic (struct iovec outmsg, void *res, xdrproc_t proc);
@@ -35,14 +42,4 @@ ssize_t
 xdr_to_generic_payload (struct iovec inmsg, void *args, xdrproc_t proc,
                         struct iovec *pendingpayload);
 
-
-extern int
-xdr_bytes_round_up (struct iovec *vec, size_t bufsize);
-
-extern ssize_t
-xdr_length_round_up (size_t len, size_t bufsize);
-
-void
-xdr_vector_round_up (struct iovec *vec, int vcount, uint32_t count);
-
 #endif /* !_XDR_GENERIC_H */
diff --git a/run-tests.sh b/run-tests.sh
deleted file mode 100755
index 128404ed5..000000000
--- a/run-tests.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
-#
-
-function _init()
-{
-    regression_testsdir=$(dirname $0);
-
-    if [ ! -f ${regression_testsdir}/tests/include.rc ]; then
-        echo "Seems like GlusterFS quality tests are corrupted..aborting!!"
-        exit 1
-    fi
-}
-
-function main()
-{
-    if [ $# -lt 1 ]; then
-        echo "Running all the regression test cases"
-        prove -rf --timer ${regression_testsdir}/tests;
-    else
-        ## TODO
-        echo "Running single regression test.."
-        echo "WARNING: yet to be implemented.. exiting safely"
-        exit 0
-        #export DEBUG=1;
-        #echo "Automatically setting up DEBUG=1 for this test $1";
-    fi
-}
-
-_init "$@" && main "$@"
diff --git a/scheduler/Makefile.am b/scheduler/Makefile.am
new file mode 100644
index 000000000..618fa7dd8
--- /dev/null
+++ b/scheduler/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = alu random nufa rr switch
+
+CLEANFILES = 
diff --git a/xlators/performance/readdir-ahead/Makefile.am b/scheduler/alu/Makefile.am
index a985f42a8..d471a3f92 100644
--- a/xlators/performance/readdir-ahead/Makefile.am
+++ b/scheduler/alu/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = src
 
-CLEANFILES =
+CLEANFILES = 
diff --git a/scheduler/alu/src/Makefile.am b/scheduler/alu/src/Makefile.am
new file mode 100644
index 000000000..eb7d0db07
--- /dev/null
+++ b/scheduler/alu/src/Makefile.am
@@ -0,0 +1,14 @@
+sched_LTLIBRARIES = alu.la
+scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler
+
+alu_la_LDFLAGS = -module -avoidversion
+
+alu_la_SOURCES = alu.c
+alu_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+noinst_HEADERS = alu.h
+
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+
+CLEANFILES = 
diff --git a/scheduler/alu/src/alu-mem-types.h b/scheduler/alu/src/alu-mem-types.h
new file mode 100644
index 000000000..92702f286
--- /dev/null
+++ b/scheduler/alu/src/alu-mem-types.h
@@ -0,0 +1,35 @@
+/*
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __ALU_MEM_TYPES_H__
+#define __ALU_MEM_TYPES_H__
+
+#include "mem-types.h"
+
+enum gf_alu_mem_types_ {
+        gf_alu_mt_alu_threshold = gf_common_mt_end + 1,
+        gf_alu_mt_alu_sched,
+        gf_alu_mt_alu_limits,
+        gf_alu_mt_alu_sched_struct,
+        gf_alu_mt_alu_sched_node,
+        gf_alu_mt_end
+};
+#endif
+
diff --git a/scheduler/alu/src/alu.c b/scheduler/alu/src/alu.c
new file mode 100644
index 000000000..58bef60ae
--- /dev/null
+++ b/scheduler/alu/src/alu.c
@@ -0,0 +1,1019 @@
+/*
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+
+
+/* ALU code needs a complete re-write. This is one of the most important 
+ * part of GlusterFS and so needs more and more reviews and testing 
+ */
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/time.h>
+#include <stdint.h>
+#include "stack.h"
+#include "alu.h"
+#include "alu-mem-types.h"
+
+#define ALU_DISK_USAGE_ENTRY_THRESHOLD_DEFAULT         (1 * GF_UNIT_GB)
+#define ALU_DISK_USAGE_EXIT_THRESHOLD_DEFAULT          (512 * GF_UNIT_MB)
+
+#define ALU_WRITE_USAGE_ENTRY_THRESHOLD_DEFAULT        25
+#define ALU_WRITE_USAGE_EXIT_THRESHOLD_DEFAULT         5
+
+#define ALU_READ_USAGE_ENTRY_THRESHOLD_DEFAULT         25
+#define ALU_READ_USAGE_EXIT_THRESHOLD_DEFAULT          5
+
+#define ALU_OPEN_FILES_USAGE_ENTRY_THRESHOLD_DEFAULT   1000
+#define ALU_OPEN_FILES_USAGE_EXIT_THRESHOLD_DEFAULT    100
+
+#define ALU_LIMITS_TOTAL_DISK_SIZE_DEFAULT             100
+
+#define ALU_REFRESH_INTERVAL_DEFAULT                   5
+#define ALU_REFRESH_CREATE_COUNT_DEFAULT               5
+
+
+static int64_t 
+get_stats_disk_usage (struct xlator_stats *this)
+{
+	return this->disk_usage;
+}
+
+static int64_t 
+get_stats_write_usage (struct xlator_stats *this)
+{
+	return this->write_usage;
+}
+
+static int64_t 
+get_stats_read_usage (struct xlator_stats *this)
+{
+	return this->read_usage;
+}
+
+static int64_t 
+get_stats_disk_speed (struct xlator_stats *this)
+{
+	return this->disk_speed;
+}
+
+static int64_t 
+get_stats_file_usage (struct xlator_stats *this)
+{
+	/* Avoid warning "defined but not used" */
+	(void) &get_stats_file_usage;    
+
+	return this->nr_files;
+}
+
+static int64_t 
+get_stats_free_disk (struct xlator_stats *this)
+{
+	if (this->total_disk_size > 0)
+		return (this->free_disk * 100) / this->total_disk_size;
+	return 0;
+}
+
+static int64_t 
+get_max_diff_write_usage (struct xlator_stats *max, struct xlator_stats *min)
+{
+	return (max->write_usage - min->write_usage);
+}
+
+static int64_t 
+get_max_diff_read_usage (struct xlator_stats *max, struct xlator_stats *min)
+{
+	return (max->read_usage - min->read_usage);
+}
+
+static int64_t 
+get_max_diff_disk_usage (struct xlator_stats *max, struct xlator_stats *min)
+{
+	return (max->disk_usage - min->disk_usage);
+}
+
+static int64_t 
+get_max_diff_disk_speed (struct xlator_stats *max, struct xlator_stats *min)
+{
+	return (max->disk_speed - min->disk_speed);
+}
+
+static int64_t 
+get_max_diff_file_usage (struct xlator_stats *max, struct xlator_stats *min)
+{
+	return (max->nr_files - min->nr_files);
+}
+
+
+int 
+alu_parse_options (xlator_t *xl, struct alu_sched *alu_sched)
+{
+	data_t *order = dict_get (xl->options, "scheduler.alu.order");
+	if (!order) {
+		gf_log (xl->name, GF_LOG_ERROR,
+			"option 'scheduler.alu.order' not specified");
+		return -1;
+	}
+	struct alu_threshold *_threshold_fn;
+	struct alu_threshold *tmp_threshold;
+	data_t *entry_fn = NULL;
+	data_t *exit_fn = NULL;
+	char *tmp_str = NULL;
+	char *order_str = strtok_r (order->data, ":", &tmp_str);
+	/* Get the scheduling priority order, specified by the user. */
+	while (order_str) {
+		gf_log ("alu", GF_LOG_DEBUG,
+			"alu_init: order string: %s",
+			order_str);
+		if (strcmp (order_str, "disk-usage") == 0) {
+			/* Disk usage */
+			_threshold_fn = 
+				GF_CALLOC (1,
+                                           sizeof (struct alu_threshold),
+                                           gf_alu_mt_alu_threshold);
+			ERR_ABORT (_threshold_fn);
+			_threshold_fn->diff_value = get_max_diff_disk_usage;
+			_threshold_fn->sched_value = get_stats_disk_usage;
+			entry_fn = 
+				dict_get (xl->options, 
+					  "scheduler.alu.disk-usage.entry-threshold");
+			if (entry_fn) {
+				if (gf_string2bytesize (entry_fn->data, 
+							&alu_sched->entry_limit.disk_usage) != 0) {
+					gf_log (xl->name, GF_LOG_ERROR, 
+						"invalid number format \"%s\" "
+						"of \"option scheduler.alu."
+						"disk-usage.entry-threshold\"",
+						entry_fn->data);
+					return -1;
+				}
+			} else {
+				alu_sched->entry_limit.disk_usage = ALU_DISK_USAGE_ENTRY_THRESHOLD_DEFAULT;
+			}
+			_threshold_fn->entry_value = get_stats_disk_usage;
+			exit_fn = dict_get (xl->options, 
+					    "scheduler.alu.disk-usage.exit-threshold");
+			if (exit_fn) {
+				if (gf_string2bytesize (exit_fn->data, &alu_sched->exit_limit.disk_usage) != 0)	{
+					gf_log (xl->name, GF_LOG_ERROR, 
+						"invalid number format \"%s\" "
+						"of \"option scheduler.alu."
+						"disk-usage.exit-threshold\"", 
+						exit_fn->data);
+					return -1;
+				}
+			} else {
+				alu_sched->exit_limit.disk_usage = ALU_DISK_USAGE_EXIT_THRESHOLD_DEFAULT;
+			}
+			_threshold_fn->exit_value = get_stats_disk_usage;
+			tmp_threshold = alu_sched->threshold_fn;
+			if (!tmp_threshold) {
+				alu_sched->threshold_fn = _threshold_fn;
+			} else {
+				while (tmp_threshold->next) {
+					tmp_threshold = tmp_threshold->next;
+				}
+				tmp_threshold->next = _threshold_fn;
+			}
+			gf_log ("alu",
+				GF_LOG_DEBUG, "alu_init: = %"PRId64",%"PRId64"", 
+				alu_sched->entry_limit.disk_usage, 
+				alu_sched->exit_limit.disk_usage);
+			
+		} else if (strcmp (order_str, "write-usage") == 0) {
+			/* Handle "write-usage" */
+			
+			_threshold_fn = GF_CALLOC (1, sizeof (struct alu_threshold), gf_alu_mt_alu_threshold);
+			ERR_ABORT (_threshold_fn);
+			_threshold_fn->diff_value = get_max_diff_write_usage;
+			_threshold_fn->sched_value = get_stats_write_usage;
+			entry_fn = dict_get (xl->options, 
+					     "scheduler.alu.write-usage.entry-threshold");
+			if (entry_fn) {
+				if (gf_string2bytesize (entry_fn->data, 
+							&alu_sched->entry_limit.write_usage) != 0) {
+					gf_log (xl->name, GF_LOG_ERROR, 
+						"invalid number format \"%s\" "
+						"of option scheduler.alu."
+						"write-usage.entry-threshold", 
+						entry_fn->data);
+					return -1;
+				}
+			} else {
+				alu_sched->entry_limit.write_usage = ALU_WRITE_USAGE_ENTRY_THRESHOLD_DEFAULT;
+			}
+			_threshold_fn->entry_value = get_stats_write_usage;
+			exit_fn = dict_get (xl->options, 
+					    "scheduler.alu.write-usage.exit-threshold");
+			if (exit_fn) {
+				if (gf_string2bytesize (exit_fn->data, 
+							&alu_sched->exit_limit.write_usage) != 0) {
+					gf_log (xl->name, GF_LOG_ERROR, 
+						"invalid number format \"%s\""
+						" of \"option scheduler.alu."
+						"write-usage.exit-threshold\"",
+						exit_fn->data);
+					return -1;
+				}
+			} else {
+				alu_sched->exit_limit.write_usage = ALU_WRITE_USAGE_EXIT_THRESHOLD_DEFAULT;
+			}
+			_threshold_fn->exit_value = get_stats_write_usage;
+			tmp_threshold = alu_sched->threshold_fn;
+			if (!tmp_threshold) {
+				alu_sched->threshold_fn = _threshold_fn;
+			} else {
+				while (tmp_threshold->next) {
+					tmp_threshold = tmp_threshold->next;
+				}
+				tmp_threshold->next = _threshold_fn;
+			}
+			gf_log (xl->name, GF_LOG_DEBUG, 
+				"alu_init: = %"PRId64",%"PRId64"", 
+				alu_sched->entry_limit.write_usage, 
+				alu_sched->exit_limit.write_usage);
+			
+		} else if (strcmp (order_str, "read-usage") == 0) {
+			/* Read usage */
+			
+			_threshold_fn = GF_CALLOC (1, sizeof (struct alu_threshold), gf_alu_mt_alu_threshold);
+			ERR_ABORT (_threshold_fn);
+			_threshold_fn->diff_value = get_max_diff_read_usage;
+			_threshold_fn->sched_value = get_stats_read_usage;
+			entry_fn = dict_get (xl->options, 
+					     "scheduler.alu.read-usage.entry-threshold");
+			if (entry_fn) {
+				if (gf_string2bytesize (entry_fn->data, 
+							&alu_sched->entry_limit.read_usage) != 0) {
+					gf_log (xl->name, 
+						GF_LOG_ERROR, 
+						"invalid number format \"%s\" "
+						"of \"option scheduler.alu."
+						"read-usage.entry-threshold\"",
+						entry_fn->data);
+					return -1;
+				}
+			} else {
+				alu_sched->entry_limit.read_usage = ALU_READ_USAGE_ENTRY_THRESHOLD_DEFAULT;
+			}
+			_threshold_fn->entry_value = get_stats_read_usage;
+			exit_fn = dict_get (xl->options, 
+					    "scheduler.alu.read-usage.exit-threshold");
+			if (exit_fn)
+			{
+				if (gf_string2bytesize (exit_fn->data, 
+							&alu_sched->exit_limit.read_usage) != 0)
+				{
+					gf_log ("alu", GF_LOG_ERROR, 
+						"invalid number format \"%s\" "
+						"of \"option scheduler.alu."
+						"read-usage.exit-threshold\"", 
+						exit_fn->data);
+					return -1;
+				}
+			}
+			else
+			{
+				alu_sched->exit_limit.read_usage = ALU_READ_USAGE_EXIT_THRESHOLD_DEFAULT;
+			}
+			_threshold_fn->exit_value = get_stats_read_usage;
+			tmp_threshold = alu_sched->threshold_fn;
+			if (!tmp_threshold) {
+				alu_sched->threshold_fn = _threshold_fn;
+			}
+			else {
+				while (tmp_threshold->next) {
+					tmp_threshold = tmp_threshold->next;
+				}
+				tmp_threshold->next = _threshold_fn;
+			}
+			gf_log ("alu", GF_LOG_DEBUG, 
+				"alu_init: = %"PRId64",%"PRId64"", 
+				alu_sched->entry_limit.read_usage, 
+				alu_sched->exit_limit.read_usage);
+			
+		} else if (strcmp (order_str, "open-files-usage") == 0) {
+			/* Open files counter */
+			
+			_threshold_fn = GF_CALLOC (1, sizeof (struct alu_threshold), gf_alu_mt_alu_threshold);
+			ERR_ABORT (_threshold_fn);
+			_threshold_fn->diff_value = get_max_diff_file_usage;
+			_threshold_fn->sched_value = get_stats_file_usage;
+			entry_fn = dict_get (xl->options, 
+					     "scheduler.alu.open-files-usage.entry-threshold");
+			if (entry_fn) {
+				if (gf_string2uint64 (entry_fn->data, 
+						      &alu_sched->entry_limit.nr_files) != 0)
+				{
+					gf_log ("alu", GF_LOG_ERROR, 
+						"invalid number format \"%s\" "
+						"of \"option scheduler.alu."
+						"open-files-usage.entry-"
+						"threshold\"", entry_fn->data);
+					return -1;
+				}
+			}
+			else
+			{
+				alu_sched->entry_limit.nr_files = ALU_OPEN_FILES_USAGE_ENTRY_THRESHOLD_DEFAULT;
+			}
+			_threshold_fn->entry_value = get_stats_file_usage;
+			exit_fn = dict_get (xl->options, 
+					    "scheduler.alu.open-files-usage.exit-threshold");
+			if (exit_fn)
+			{
+				if (gf_string2uint64 (exit_fn->data, 
+						      &alu_sched->exit_limit.nr_files) != 0)
+				{
+					gf_log ("alu", GF_LOG_ERROR, 
+						"invalid number format \"%s\" "
+						"of \"option scheduler.alu."
+						"open-files-usage.exit-"
+						"threshold\"", exit_fn->data);
+					return -1;
+				}
+			}
+			else
+			{
+				alu_sched->exit_limit.nr_files = ALU_OPEN_FILES_USAGE_EXIT_THRESHOLD_DEFAULT;
+			}
+			_threshold_fn->exit_value = get_stats_file_usage;
+			tmp_threshold = alu_sched->threshold_fn;
+			if (!tmp_threshold) {
+				alu_sched->threshold_fn = _threshold_fn;
+			}
+			else {
+				while (tmp_threshold->next) {
+					tmp_threshold = tmp_threshold->next;
+				}
+				tmp_threshold->next = _threshold_fn;
+			}
+			gf_log ("alu", GF_LOG_DEBUG, 
+				"alu.c->alu_init: = %"PRIu64",%"PRIu64"", 
+				alu_sched->entry_limit.nr_files, 
+				alu_sched->exit_limit.nr_files);
+			
+		} else if (strcmp (order_str, "disk-speed-usage") == 0) {
+			/* Disk speed */
+			
+			_threshold_fn = GF_CALLOC (1, sizeof (struct alu_threshold), gf_alu_mt_alu_threshold);
+			ERR_ABORT (_threshold_fn);
+			_threshold_fn->diff_value = get_max_diff_disk_speed;
+			_threshold_fn->sched_value = get_stats_disk_speed;
+			entry_fn = dict_get (xl->options, 
+					     "scheduler.alu.disk-speed-usage.entry-threshold");
+			if (entry_fn) {
+				gf_log ("alu", GF_LOG_DEBUG,
+					"entry-threshold is given, "
+					"value is constant");
+			}
+			_threshold_fn->entry_value = NULL;
+			exit_fn = dict_get (xl->options, 
+					    "scheduler.alu.disk-speed-usage.exit-threshold");
+			if (exit_fn) {
+				gf_log ("alu", GF_LOG_DEBUG,
+					"exit-threshold is given, "
+					"value is constant");
+			}
+			_threshold_fn->exit_value = NULL;
+			tmp_threshold = alu_sched->threshold_fn;
+			if (!tmp_threshold) {
+				alu_sched->threshold_fn = _threshold_fn;
+			}
+			else {
+				while (tmp_threshold->next) {
+					tmp_threshold = tmp_threshold->next;
+				}
+				tmp_threshold->next = _threshold_fn;
+			}
+			
+		} else {
+			gf_log ("alu", GF_LOG_DEBUG,
+				"%s, unknown option provided to scheduler",
+				order_str);
+		}
+		order_str = strtok_r (NULL, ":", &tmp_str);
+	}
+	
+	return 0;
+}
+
+static int32_t
+alu_init (xlator_t *xl)
+{
+	struct alu_sched *alu_sched = NULL;
+	struct alu_limits *_limit_fn = NULL;
+	struct alu_limits *tmp_limits = NULL;
+	uint32_t min_free_disk = 0;
+	data_t *limits = NULL;
+  
+	alu_sched = GF_CALLOC (1, sizeof (struct alu_sched),
+                               gf_alu_mt_alu_sched);
+	ERR_ABORT (alu_sched);
+
+	{
+		alu_parse_options (xl, alu_sched);
+	}
+
+	/* Get the limits */
+	
+	limits = dict_get (xl->options, 
+			   "scheduler.limits.min-free-disk");
+	if (limits) {
+		_limit_fn = GF_CALLOC (1, sizeof (struct alu_limits),
+                                       gf_alu_mt_alu_limits);
+		ERR_ABORT (_limit_fn);
+		_limit_fn->min_value = get_stats_free_disk;
+		_limit_fn->cur_value = get_stats_free_disk;
+		tmp_limits = alu_sched->limits_fn ;
+		_limit_fn->next = tmp_limits;
+		alu_sched->limits_fn = _limit_fn;
+		
+		if (gf_string2percent (limits->data, 
+				       &min_free_disk) != 0) {
+			gf_log ("alu", GF_LOG_ERROR, 
+				"invalid number format \"%s\" "
+				"of \"option scheduler.limits."
+				"min-free-disk\"", limits->data);
+			return -1;
+		}
+		alu_sched->spec_limit.free_disk = min_free_disk;
+		
+		if (alu_sched->spec_limit.free_disk >= 100) {
+			gf_log ("alu", GF_LOG_ERROR,
+				"check the \"option scheduler."
+				"limits.min-free-disk\", it should "
+				"be percentage value");
+			return -1;
+		}
+		alu_sched->spec_limit.total_disk_size = ALU_LIMITS_TOTAL_DISK_SIZE_DEFAULT; /* Its in % */
+		gf_log ("alu", GF_LOG_DEBUG,
+			"alu.limit.min-disk-free = %"PRId64"", 
+			_limit_fn->cur_value (&(alu_sched->spec_limit)));
+	}
+	
+	limits = dict_get (xl->options, 
+			   "scheduler.limits.max-open-files");
+	if (limits) {
+		// Update alu_sched->priority properly
+		_limit_fn = GF_CALLOC (1, sizeof (struct alu_limits),
+                                       gf_alu_mt_alu_limits);
+		ERR_ABORT (_limit_fn);
+		_limit_fn->max_value = get_stats_file_usage;
+		_limit_fn->cur_value = get_stats_file_usage;
+		tmp_limits = alu_sched->limits_fn ;
+		_limit_fn->next = tmp_limits;
+		alu_sched->limits_fn = _limit_fn;
+		if (gf_string2uint64_base10 (limits->data, 
+					     &alu_sched->spec_limit.nr_files) != 0)
+		{
+			gf_log ("alu", GF_LOG_ERROR, 
+				"invalid number format '%s' of option "
+				"scheduler.limits.max-open-files", 
+				limits->data);
+			return -1;
+		}
+		
+		gf_log ("alu", GF_LOG_DEBUG,
+			"alu_init: limit.max-open-files = %"PRId64"",
+			_limit_fn->cur_value (&(alu_sched->spec_limit)));
+	}
+
+
+	/* Stats refresh options */
+	limits = dict_get (xl->options, 
+			   "scheduler.refresh-interval");
+	if (limits) {
+		if (gf_string2time (limits->data, 
+				    &alu_sched->refresh_interval) != 0)	{
+			gf_log ("alu", GF_LOG_ERROR, 
+				"invalid number format \"%s\" of "
+				"option scheduler.refresh-interval", 
+				limits->data);
+			return -1;
+		}
+	} else {
+		alu_sched->refresh_interval = ALU_REFRESH_INTERVAL_DEFAULT;
+	}
+	gettimeofday (&(alu_sched->last_stat_fetch), NULL);
+	
+	
+	limits = dict_get (xl->options, 
+			   "scheduler.alu.stat-refresh.num-file-create");
+	if (limits) {
+		if (gf_string2uint32 (limits->data, 
+				      &alu_sched->refresh_create_count) != 0)
+		{
+			gf_log ("alu", GF_LOG_ERROR, 
+				"invalid number format \"%s\" of \"option "
+				"alu.stat-refresh.num-file-create\"", 
+				limits->data);
+			return -1;
+		}
+	} else {
+		alu_sched->refresh_create_count = ALU_REFRESH_CREATE_COUNT_DEFAULT;
+	}
+
+	{
+		/* Build an array of child_nodes */
+		struct alu_sched_struct *sched_array = NULL;
+		xlator_list_t *trav_xl = xl->children;
+		data_t *data = NULL;
+		int32_t index = 0;
+		
+		while (trav_xl) {
+			index++;
+			trav_xl = trav_xl->next;
+		}
+		alu_sched->child_count = index;
+		sched_array = GF_CALLOC (index, sizeof (struct alu_sched_struct), gf_alu_mt_alu_sched_struct);
+		ERR_ABORT (sched_array);
+		trav_xl = xl->children;
+		index = 0;
+		while (trav_xl) {
+			sched_array[index].xl = trav_xl->xlator;
+			sched_array[index].eligible = 1;
+			index++;
+			trav_xl = trav_xl->next;
+		}
+		alu_sched->array = sched_array;
+
+		data = dict_get (xl->options, 
+				 "scheduler.read-only-subvolumes");
+		if (data) {
+			char *child = NULL;
+			char *tmp = NULL;
+			char *childs_data = gf_strdup (data->data);
+      
+			child = strtok_r (childs_data, ",", &tmp);
+			while (child) {
+				for (index = 1; index < alu_sched->child_count; index++) {
+					if (strcmp (alu_sched->array[index -1].xl->name, child) == 0) {
+						memcpy (&(alu_sched->array[index -1]), 
+							&(alu_sched->array[alu_sched->child_count -1]), 
+							sizeof (struct alu_sched_struct));
+						alu_sched->child_count--;
+						break;
+					}
+				}
+				child = strtok_r (NULL, ",", &tmp);
+			}
+		}
+	}
+
+	*((long *)xl->private) = (long)alu_sched;
+
+	/* Initialize all the alu_sched structure's elements */
+	{
+		alu_sched->sched_nodes_pending = 0;
+
+		alu_sched->min_limit.free_disk = 0x00FFFFFF;
+		alu_sched->min_limit.disk_usage = 0xFFFFFFFF;
+		alu_sched->min_limit.total_disk_size = 0xFFFFFFFF;
+		alu_sched->min_limit.disk_speed = 0xFFFFFFFF;
+		alu_sched->min_limit.write_usage = 0xFFFFFFFF;
+		alu_sched->min_limit.read_usage = 0xFFFFFFFF;
+		alu_sched->min_limit.nr_files = 0xFFFFFFFF;
+		alu_sched->min_limit.nr_clients = 0xFFFFFFFF;
+	}
+
+	pthread_mutex_init (&alu_sched->alu_mutex, NULL);
+	return 0;
+}
+
+static void
+alu_fini (xlator_t *xl)
+{
+	if (!xl)
+		return;
+	struct alu_sched *alu_sched = (struct alu_sched *)*((long *)xl->private);
+	struct alu_limits *limit = alu_sched->limits_fn;
+	struct alu_threshold *threshold = alu_sched->threshold_fn;
+	void *tmp = NULL;
+	pthread_mutex_destroy (&alu_sched->alu_mutex);
+	GF_FREE (alu_sched->array);
+	while (limit) {
+		tmp = limit;
+		limit = limit->next;
+		GF_FREE (tmp);
+	}
+	while (threshold) {
+		tmp = threshold;
+		threshold = threshold->next;
+		GF_FREE (tmp);
+	}
+	GF_FREE (alu_sched);
+}
+
+static int32_t 
+update_stat_array_cbk (call_frame_t *frame,
+		       void *cookie,
+		       xlator_t *xl,
+		       int32_t op_ret,
+		       int32_t op_errno,
+		       struct xlator_stats *trav_stats)
+{
+	struct alu_sched *alu_sched = (struct alu_sched *)*((long *)xl->private);
+	struct alu_limits *limits_fn = alu_sched->limits_fn;
+	int32_t idx = 0;
+  
+	pthread_mutex_lock (&alu_sched->alu_mutex);
+	for (idx = 0; idx < alu_sched->child_count; idx++) {
+		if (alu_sched->array[idx].xl == (xlator_t *)cookie)
+			break;
+	}
+	pthread_mutex_unlock (&alu_sched->alu_mutex);
+
+	if (op_ret == -1) {
+		alu_sched->array[idx].eligible = 0;
+	} else {
+		memcpy (&(alu_sched->array[idx].stats), trav_stats, sizeof (struct xlator_stats));
+    
+		/* Get stats from all the child node */
+		/* Here check the limits specified by the user to 
+		   consider the nodes to be used by scheduler */
+		alu_sched->array[idx].eligible = 1;
+		limits_fn = alu_sched->limits_fn;
+		while (limits_fn){
+			if (limits_fn->max_value && 
+			    (limits_fn->cur_value (trav_stats) > 
+			     limits_fn->max_value (&(alu_sched->spec_limit)))) {
+				alu_sched->array[idx].eligible = 0;
+			}
+			if (limits_fn->min_value && 
+			    (limits_fn->cur_value (trav_stats) < 
+			     limits_fn->min_value (&(alu_sched->spec_limit)))) {
+				alu_sched->array[idx].eligible = 0;
+			}
+			limits_fn = limits_fn->next;
+		}
+
+		/* Select minimum and maximum disk_usage */
+		if (trav_stats->disk_usage > alu_sched->max_limit.disk_usage) {
+			alu_sched->max_limit.disk_usage = trav_stats->disk_usage;
+		}
+		if (trav_stats->disk_usage < alu_sched->min_limit.disk_usage) {
+			alu_sched->min_limit.disk_usage = trav_stats->disk_usage;
+		}
+
+		/* Select minimum and maximum disk_speed */
+		if (trav_stats->disk_speed > alu_sched->max_limit.disk_speed) {
+			alu_sched->max_limit.disk_speed = trav_stats->disk_speed;
+		}
+		if (trav_stats->disk_speed < alu_sched->min_limit.disk_speed) {
+			alu_sched->min_limit.disk_speed = trav_stats->disk_speed;
+		}
+
+		/* Select minimum and maximum number of open files */
+		if (trav_stats->nr_files > alu_sched->max_limit.nr_files) {
+			alu_sched->max_limit.nr_files = trav_stats->nr_files;
+		}
+		if (trav_stats->nr_files < alu_sched->min_limit.nr_files) {
+			alu_sched->min_limit.nr_files = trav_stats->nr_files;
+		}
+
+		/* Select minimum and maximum write-usage */
+		if (trav_stats->write_usage > alu_sched->max_limit.write_usage) {
+			alu_sched->max_limit.write_usage = trav_stats->write_usage;
+		}
+		if (trav_stats->write_usage < alu_sched->min_limit.write_usage) {
+			alu_sched->min_limit.write_usage = trav_stats->write_usage;
+		}
+
+		/* Select minimum and maximum read-usage */
+		if (trav_stats->read_usage > alu_sched->max_limit.read_usage) {
+			alu_sched->max_limit.read_usage = trav_stats->read_usage;
+		}
+		if (trav_stats->read_usage < alu_sched->min_limit.read_usage) {
+			alu_sched->min_limit.read_usage = trav_stats->read_usage;
+		}
+
+		/* Select minimum and maximum free-disk */
+		if (trav_stats->free_disk > alu_sched->max_limit.free_disk) {
+			alu_sched->max_limit.free_disk = trav_stats->free_disk;
+		}
+		if (trav_stats->free_disk < alu_sched->min_limit.free_disk) {
+			alu_sched->min_limit.free_disk = trav_stats->free_disk;
+		}
+	}
+
+	STACK_DESTROY (frame->root);
+
+	return 0;
+}
+
+static void 
+update_stat_array (xlator_t *xl)
+{
+	/* This function schedules the file in one of the child nodes */
+	struct alu_sched *alu_sched = (struct alu_sched *)*((long *)xl->private);
+	int32_t idx = 0;
+	call_frame_t *frame = NULL;
+	call_pool_t *pool = xl->ctx->pool;
+
+	for (idx = 0 ; idx < alu_sched->child_count; idx++) {
+		frame = create_frame (xl, pool);
+
+		STACK_WIND_COOKIE (frame,
+				   update_stat_array_cbk, 
+				   alu_sched->array[idx].xl, //cookie
+				   alu_sched->array[idx].xl, 
+				   (alu_sched->array[idx].xl)->mops->stats,
+				   0); //flag
+	}
+	return;
+}
+
+static void 
+alu_update (xlator_t *xl)
+{
+	struct timeval tv;
+	struct alu_sched *alu_sched = (struct alu_sched *)*((long *)xl->private);
+
+	gettimeofday (&tv, NULL);
+	if (tv.tv_sec > (alu_sched->refresh_interval + alu_sched->last_stat_fetch.tv_sec)) {
+		/* Update the stats from all the server */
+		update_stat_array (xl);
+		alu_sched->last_stat_fetch.tv_sec = tv.tv_sec;
+	}
+}
+
+static xlator_t *
+alu_scheduler (xlator_t *xl, const void *path)
+{
+	/* This function schedules the file in one of the child nodes */
+	struct alu_sched *alu_sched = (struct alu_sched *)*((long *)xl->private);
+	int32_t sched_index = 0;
+	int32_t sched_index_orig = 0;
+	int32_t idx = 0;
+
+	alu_update (xl);
+
+	/* Now check each threshold one by one if some nodes are classified */
+	{
+		struct alu_threshold *trav_threshold = alu_sched->threshold_fn;
+		struct alu_threshold *tmp_threshold = alu_sched->sched_method;
+		struct alu_sched_node *tmp_sched_node;   
+
+		/* This pointer 'trav_threshold' contains function pointers according to spec file
+		   give by user, */
+		while (trav_threshold) {
+			/* This check is needed for seeing if already there are nodes in this criteria 
+			   to be scheduled */
+			if (!alu_sched->sched_nodes_pending) {
+				for (idx = 0; idx < alu_sched->child_count; idx++) {
+					if (!alu_sched->array[idx].eligible) {
+						continue;
+					}
+					if (trav_threshold->entry_value) {
+						if (trav_threshold->diff_value (&(alu_sched->max_limit),
+										&(alu_sched->array[idx].stats)) <
+						    trav_threshold->entry_value (&(alu_sched->entry_limit))) {
+							continue;
+						}
+					}
+					tmp_sched_node = GF_CALLOC (1, sizeof (struct alu_sched_node), gf_alu_mt_alu_sched_node);
+					ERR_ABORT (tmp_sched_node);
+					tmp_sched_node->index = idx;
+					if (!alu_sched->sched_node) {
+						alu_sched->sched_node = tmp_sched_node;
+					} else {
+						pthread_mutex_lock (&alu_sched->alu_mutex);
+						tmp_sched_node->next = alu_sched->sched_node;
+						alu_sched->sched_node = tmp_sched_node;
+						pthread_mutex_unlock (&alu_sched->alu_mutex);
+					}
+					alu_sched->sched_nodes_pending++;
+				}
+			} /* end of if (sched_nodes_pending) */
+
+			/* This loop is required to check the eligible nodes */
+			struct alu_sched_node *trav_sched_node;
+			while (alu_sched->sched_nodes_pending) {
+				trav_sched_node = alu_sched->sched_node;
+				sched_index = trav_sched_node->index;
+				if (alu_sched->array[sched_index].eligible)
+					break;
+				alu_sched->sched_node = trav_sched_node->next;
+				GF_FREE (trav_sched_node);
+				alu_sched->sched_nodes_pending--;
+			}
+			if (alu_sched->sched_nodes_pending) {
+				/* There are some node in this criteria to be scheduled, no need 
+				 * to sort and check other methods 
+				 */
+				if (tmp_threshold && tmp_threshold->exit_value) {
+					/* verify the exit value && whether node is eligible or not */
+					if (tmp_threshold->diff_value (&(alu_sched->max_limit),
+								       &(alu_sched->array[sched_index].stats)) >
+					    tmp_threshold->exit_value (&(alu_sched->exit_limit))) {
+						/* Free the allocated info for the node :) */
+						pthread_mutex_lock (&alu_sched->alu_mutex);
+						alu_sched->sched_node = trav_sched_node->next;
+						GF_FREE (trav_sched_node);
+						trav_sched_node = alu_sched->sched_node;
+						alu_sched->sched_nodes_pending--;
+						pthread_mutex_unlock (&alu_sched->alu_mutex);
+					}
+				} else {
+					/* if there is no exit value, then exit after scheduling once */
+					pthread_mutex_lock (&alu_sched->alu_mutex);
+					alu_sched->sched_node = trav_sched_node->next;
+					GF_FREE (trav_sched_node);
+					trav_sched_node = alu_sched->sched_node;
+					alu_sched->sched_nodes_pending--;
+					pthread_mutex_unlock (&alu_sched->alu_mutex);
+				}
+	
+				alu_sched->sched_method = tmp_threshold; /* this is the method used for selecting */
+
+				/* */
+				if (trav_sched_node) {
+					tmp_sched_node = trav_sched_node;
+					while (trav_sched_node->next) {
+						trav_sched_node = trav_sched_node->next;
+					}
+					if (tmp_sched_node->next) {
+						pthread_mutex_lock (&alu_sched->alu_mutex);
+						alu_sched->sched_node = tmp_sched_node->next;
+						tmp_sched_node->next = NULL;
+						trav_sched_node->next = tmp_sched_node;
+						pthread_mutex_unlock (&alu_sched->alu_mutex);
+					}
+				}
+				/* return the scheduled node */
+				return alu_sched->array[sched_index].xl;
+			} /* end of if (pending_nodes) */
+      
+			tmp_threshold = trav_threshold;
+			trav_threshold = trav_threshold->next;
+		}
+	}
+  
+	/* This is used only when there is everything seems ok, or no eligible nodes */
+	sched_index_orig = alu_sched->sched_index;
+	alu_sched->sched_method = NULL;
+	while (1) {
+		//lock
+		pthread_mutex_lock (&alu_sched->alu_mutex);
+		sched_index = alu_sched->sched_index++;
+		alu_sched->sched_index = alu_sched->sched_index % alu_sched->child_count;
+		pthread_mutex_unlock (&alu_sched->alu_mutex);
+		//unlock
+		if (alu_sched->array[sched_index].eligible)
+			break;
+		if (sched_index_orig == (sched_index + 1) % alu_sched->child_count) {
+			gf_log ("alu", GF_LOG_WARNING, "No node is eligible to schedule");
+			//lock
+			pthread_mutex_lock (&alu_sched->alu_mutex);
+			alu_sched->sched_index++;
+			alu_sched->sched_index = alu_sched->sched_index % alu_sched->child_count;
+			pthread_mutex_unlock (&alu_sched->alu_mutex);
+			//unlock
+			break;
+		}
+	}
+	return alu_sched->array[sched_index].xl;
+}
+
+/**
+ * notify
+ */
+void
+alu_notify (xlator_t *xl, int32_t event, void *data)
+{
+	struct alu_sched *alu_sched = NULL; 
+	int32_t idx = 0;
+  
+	alu_sched = (struct alu_sched *)*((long *)xl->private);
+	if (!alu_sched)
+		return;
+
+	for (idx = 0; idx < alu_sched->child_count; idx++) {
+		if (alu_sched->array[idx].xl == (xlator_t *)data)
+			break;
+	}
+
+	switch (event)
+	{
+	case GF_EVENT_CHILD_UP:
+	{
+		//alu_sched->array[idx].eligible = 1;
+	}
+	break;
+	case GF_EVENT_CHILD_DOWN:
+	{
+		alu_sched->array[idx].eligible = 0;
+	}
+	break;
+	default:
+	{
+		;
+	}
+	break;
+	}
+
+}
+
+int32_t
+alu_mem_acct_init (xlator_t *this)
+{
+        int     ret = -1;
+
+        if (!this)
+                return ret;
+
+        ret = xlator_mem_acct_init (this, gf_alu_mt_end + 1);
+        
+        if (ret != 0) {
+                gf_log (this->name, GF_LOG_ERROR, "Memory accounting init"
+                                "failed");
+                return ret;
+        }
+
+        return ret;
+}
+
+struct sched_ops sched = {
+	.init     = alu_init,
+	.fini     = alu_fini,
+	.update   = alu_update,
+	.schedule = alu_scheduler,
+	.notify   = alu_notify,
+        .mem_acct_init = alu_mem_acct_init,
+};
+
+struct volume_options options[] = {
+	{ .key   = { "scheduler.alu.order", "alu.order" },  
+	  .type  = GF_OPTION_TYPE_ANY 
+	},
+	{ .key   = { "scheduler.alu.disk-usage.entry-threshold", 
+		     "alu.disk-usage.entry-threshold" },  
+	  .type  = GF_OPTION_TYPE_SIZET
+	},
+	{ .key   = { "scheduler.alu.disk-usage.exit-threshold", 
+		     "alu.disk-usage.exit-threshold" },  
+	  .type  = GF_OPTION_TYPE_SIZET
+	},
+	{ .key   = { "scheduler.alu.write-usage.entry-threshold", 
+		     "alu.write-usage.entry-threshold" },  
+	  .type  = GF_OPTION_TYPE_SIZET
+	},
+	{ .key   = { "scheduler.alu.write-usage.exit-threshold", 
+		     "alu.write-usage.exit-threshold" },  
+	  .type  = GF_OPTION_TYPE_SIZET 
+	},
+	{ .key   = { "scheduler.alu.read-usage.entry-threshold", 
+		     "alu.read-usage.entry-threshold" },  
+	  .type  = GF_OPTION_TYPE_SIZET
+	},
+	{ .key   = { "scheduler.alu.read-usage.exit-threshold", 
+		     "alu.read-usage.exit-threshold" },  
+	  .type  = GF_OPTION_TYPE_SIZET 
+	},
+	{ .key   = { "scheduler.alu.open-files-usage.entry-threshold", 
+		     "alu.open-files-usage.entry-threshold" },  
+	  .type  = GF_OPTION_TYPE_INT
+	},
+	{ .key   = { "scheduler.alu.open-files-usage.exit-threshold", 
+		     "alu.open-files-usage.exit-threshold" },  
+	  .type  = GF_OPTION_TYPE_INT 
+	},
+	{ .key   = { "scheduler.read-only-subvolumes",
+		     "alu.read-only-subvolumes" },  
+	  .type  = GF_OPTION_TYPE_ANY 
+	},
+	{ .key   = { "scheduler.refresh-interval", 
+		     "alu.refresh-interval",
+		     "alu.stat-refresh.interval" },
+	  .type  = GF_OPTION_TYPE_TIME
+	},
+	{ .key   = { "scheduler.limits.min-free-disk", 
+		     "alu.limits.min-free-disk" },  
+	  .type  = GF_OPTION_TYPE_PERCENT
+	},
+	{ .key   = { "scheduler.alu.stat-refresh.num-file-create"
+		     "alu.stat-refresh.num-file-create"},  
+	  .type  = GF_OPTION_TYPE_INT
+	},
+	{ .key  =  {NULL}, }
+};
diff --git a/scheduler/alu/src/alu.h b/scheduler/alu/src/alu.h
new file mode 100644
index 000000000..c716ad8e5
--- /dev/null
+++ b/scheduler/alu/src/alu.h
@@ -0,0 +1,89 @@
+/*
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _ALU_H
+#define _ALU_H
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include "scheduler.h"
+
+struct alu_sched;
+
+struct alu_sched_struct {
+  xlator_t *xl;
+  struct xlator_stats stats;
+  unsigned char eligible;
+};
+
+// Write better name for these functions
+struct alu_limits {
+  struct alu_limits *next;
+  int64_t (*max_value) (struct xlator_stats *); /* Max limit, specified by the user */
+  int64_t (*min_value) (struct xlator_stats *); /* Min limit, specified by the user */
+  int64_t (*cur_value) (struct xlator_stats *); /* Current values of variables got from stats call */
+};
+
+struct alu_threshold {
+  struct alu_threshold *next;
+  int64_t (*diff_value) (struct xlator_stats *max, struct xlator_stats *min); /* Diff b/w max and min */
+  int64_t (*entry_value) (struct xlator_stats *); /* Limit specified user */
+  int64_t (*exit_value) (struct xlator_stats *); /* Exit point for the limit */
+  int64_t (*sched_value) (struct xlator_stats *); /* This will return the index of the child area */
+};
+
+struct alu_sched_node {
+  struct alu_sched_node *next;
+  int32_t index;
+};
+
+struct alu_sched {
+  struct alu_limits *limits_fn;
+  struct alu_threshold *threshold_fn;
+  struct alu_sched_struct *array;
+  struct alu_sched_node *sched_node;
+  struct alu_threshold *sched_method;
+  struct xlator_stats max_limit;
+  struct xlator_stats min_limit;
+  struct xlator_stats entry_limit;
+  struct xlator_stats exit_limit;
+  struct xlator_stats spec_limit;     /* User given limit */
+
+  pthread_mutex_t alu_mutex;
+  struct timeval last_stat_fetch;
+  uint32_t refresh_interval;      /* in seconds */
+  uint32_t refresh_create_count;  /* num-file-create */
+
+  int32_t sched_nodes_pending;
+
+  int32_t sched_index;  /* used for round robin scheduling in case of many nodes getting the criteria match. */
+  int32_t child_count;
+
+};
+
+struct _alu_local_t {
+  int32_t call_count;
+};
+
+typedef struct _alu_local_t alu_local_t;
+
+#endif /* _ALU_H */
diff --git a/xlators/features/glupy/Makefile.am b/scheduler/nufa/Makefile.am
index a985f42a8..d471a3f92 100644
--- a/xlators/features/glupy/Makefile.am
+++ b/scheduler/nufa/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = src
 
-CLEANFILES =
+CLEANFILES = 
diff --git a/scheduler/nufa/src/Makefile.am b/scheduler/nufa/src/Makefile.am
new file mode 100644
index 000000000..6eb3d39f1
--- /dev/null
+++ b/scheduler/nufa/src/Makefile.am
@@ -0,0 +1,12 @@
+sched_LTLIBRARIES = nufa.la
+scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler
+
+nufa_la_LDFLAGS = -module -avoidversion
+
+nufa_la_SOURCES = nufa.c
+nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+
+CLEANFILES = 
diff --git a/scheduler/nufa/src/nufa-mem-types.h b/scheduler/nufa/src/nufa-mem-types.h
new file mode 100644
index 000000000..945dafa7c
--- /dev/null
+++ b/scheduler/nufa/src/nufa-mem-types.h
@@ -0,0 +1,33 @@
+/*
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __NUFA_MEM_TYPES_H__
+#define __NUFA_MEM_TYPES_H__
+
+#include "mem-types.h"
+
+enum gf_locks_mem_types_ {
+        gf_nufa_mt_nufa_struct = gf_common_mt_end + 1,
+        gf_nufa_mt_nufa_sched_struct,
+        gf_nufa_mt_int32_t,
+        gf_nufa_mt_end
+};
+#endif
+
diff --git a/scheduler/nufa/src/nufa.c b/scheduler/nufa/src/nufa.c
new file mode 100644
index 000000000..1bf477bdc
--- /dev/null
+++ b/scheduler/nufa/src/nufa.c
@@ -0,0 +1,429 @@
+/*
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/time.h>
+
+#include "scheduler.h"
+#include "common-utils.h"
+#include "nufa-mem-types.h"
+
+struct nufa_sched_struct {
+	xlator_t *xl;
+	struct timeval last_stat_fetch;
+	int64_t free_disk;
+	int32_t refresh_interval;
+	unsigned char eligible;
+};
+
+struct nufa_struct {
+	struct nufa_sched_struct *array;
+	struct timeval last_stat_fetch;
+
+	int32_t *local_array; /* Used to keep the index of the local xlators */
+	int32_t local_xl_index; /* index in the above array */
+	int32_t local_xl_count; /* Count of the local subvolumes */
+
+	uint32_t refresh_interval;
+	uint32_t min_free_disk;
+  
+	gf_lock_t nufa_lock;
+	int32_t child_count;
+	int32_t sched_index;  
+};
+
+#define NUFA_LIMITS_MIN_FREE_DISK_DEFAULT    15
+#define NUFA_REFRESH_INTERVAL_DEFAULT        30
+
+static int32_t
+nufa_init (xlator_t *xl)
+{
+	int32_t index = 0;
+	data_t *local_name = NULL;
+	data_t *data = NULL;
+	xlator_list_t *trav_xl = xl->children;
+	struct nufa_struct *nufa_buf = NULL;
+
+	nufa_buf = GF_CALLOC (1, sizeof (struct nufa_struct),
+                              gf_nufa_mt_nufa_struct);
+	ERR_ABORT (nufa_buf);
+
+	data = dict_get (xl->options, "scheduler.limits.min-free-disk");
+	if (data) {
+		if (gf_string2percent (data->data, 
+				       &nufa_buf->min_free_disk) != 0) {
+			gf_log ("nufa", GF_LOG_ERROR, 
+				"invalid number format \"%s\" of "
+				"\"option scheduler.limits.min-free-disk\"", 
+				data->data);
+			return -1;
+		}
+		if (nufa_buf->min_free_disk >= 100) {
+			gf_log ("nufa", GF_LOG_ERROR,
+				"check \"option scheduler.limits.min-free-disk"
+				"\", it should be percentage value");
+			return -1;
+		}
+	} else {
+		gf_log ("nufa", GF_LOG_WARNING, 
+			"No option for limit min-free-disk given, "
+			"defaulting it to 15%%");
+		nufa_buf->min_free_disk = NUFA_LIMITS_MIN_FREE_DISK_DEFAULT;
+	}
+	data = dict_get (xl->options, "scheduler.refresh-interval");
+	if (data != NULL) {
+                if (gf_string2time (data->data, 
+				    &nufa_buf->refresh_interval) != 0) {
+                        gf_log ("nufa", GF_LOG_ERROR, 
+                                "invalid number format \"%s\" of "
+                                "\"option scheduler.refresh-interval\"", 
+                                data->data);
+                        return -1;
+                }
+        } else {
+		gf_log ("nufa", GF_LOG_WARNING, 
+			"No option for scheduler.refresh-interval given, "
+			"defaulting it to 30");
+		nufa_buf->refresh_interval = NUFA_REFRESH_INTERVAL_DEFAULT;
+	}
+  
+	/* Get the array built */
+	while (trav_xl) {
+		index++;
+		trav_xl = trav_xl->next;
+	}
+	nufa_buf->child_count = index;
+	nufa_buf->sched_index = 0;
+	nufa_buf->array = GF_CALLOC (index, sizeof (struct nufa_sched_struct),
+                                     gf_nufa_mt_nufa_sched_struct);
+	ERR_ABORT (nufa_buf->array);
+	nufa_buf->local_array = GF_CALLOC (index, sizeof (int32_t),
+                                           gf_nufa_mt_int32_t);
+	ERR_ABORT (nufa_buf->array);
+	trav_xl = xl->children;
+	
+	local_name = dict_get (xl->options, "scheduler.local-volume-name");
+	if (!local_name) {
+		/* Error */
+		gf_log ("nufa", GF_LOG_ERROR, 
+			"No 'local-volume-name' option given in volume file");
+		GF_FREE (nufa_buf->array);
+		GF_FREE (nufa_buf->local_array);
+		GF_FREE (nufa_buf);
+		return -1;
+	}
+
+	/* Get the array properly */
+	index = 0;
+	trav_xl = xl->children;
+	while (trav_xl) {
+		nufa_buf->array[index].xl = trav_xl->xlator;
+		nufa_buf->array[index].eligible = 1;
+		nufa_buf->array[index].free_disk = nufa_buf->min_free_disk;
+		nufa_buf->array[index].refresh_interval = 
+			nufa_buf->refresh_interval;
+
+		trav_xl = trav_xl->next;
+		index++;
+	}
+  
+	{ 
+		int32_t array_index = 0;
+		char *child = NULL;
+		char *tmp = NULL;
+		char *childs_data = gf_strdup (local_name->data);
+		
+		child = strtok_r (childs_data, ",", &tmp);
+		while (child) {
+			/* Check if the local_volume specified is proper 
+			   subvolume of unify */
+			trav_xl = xl->children;
+			index=0;
+			while (trav_xl) {
+				if (strcmp (child, trav_xl->xlator->name) == 0)
+					break;
+				trav_xl = trav_xl->next;
+				index++;
+			}
+
+			if (!trav_xl) {
+				/* entry for 'local-volume-name' is wrong, 
+				   not present in subvolumes */
+				gf_log ("nufa", GF_LOG_ERROR, 
+					"option 'scheduler.local-volume-name' "
+					"%s is wrong", child);
+				GF_FREE (nufa_buf->array);
+				GF_FREE (nufa_buf->local_array);
+				GF_FREE (nufa_buf);
+				return -1;
+			} else {
+				nufa_buf->local_array[array_index++] = index;
+				nufa_buf->local_xl_count++;
+			}
+			child = strtok_r (NULL, ",", &tmp);
+		}
+		GF_FREE (childs_data);
+	}
+
+	LOCK_INIT (&nufa_buf->nufa_lock);
+	*((long *)xl->private) = (long)nufa_buf; // put it at the proper place
+	return 0;
+}
+
+static void
+nufa_fini (xlator_t *xl)
+{
+	struct nufa_struct *nufa_buf = 
+		(struct nufa_struct *)*((long *)xl->private);
+
+	LOCK_DESTROY (&nufa_buf->nufa_lock);
+	GF_FREE (nufa_buf->local_array);
+	GF_FREE (nufa_buf->array);
+	GF_FREE (nufa_buf);
+}
+
+static int32_t 
+update_stat_array_cbk (call_frame_t *frame,
+		       void *cookie,
+		       xlator_t *xl,
+		       int32_t op_ret,
+		       int32_t op_errno,
+		       struct xlator_stats *trav_stats)
+{
+	struct nufa_struct *nufa_struct = NULL; 
+	int32_t idx = 0;
+	int32_t percent = 0;
+
+	nufa_struct = (struct nufa_struct *)*((long *)xl->private);
+	LOCK (&nufa_struct->nufa_lock);
+	for (idx = 0; idx < nufa_struct->child_count; idx++) {
+		if (nufa_struct->array[idx].xl->name == (char *)cookie)
+			break;
+	}
+	UNLOCK (&nufa_struct->nufa_lock);
+
+	if (op_ret == 0) {
+		percent = ((trav_stats->free_disk * 100) / 
+			   trav_stats->total_disk_size);
+		if (nufa_struct->array[idx].free_disk > percent) {
+			if (nufa_struct->array[idx].eligible)
+				gf_log ("nufa", GF_LOG_CRITICAL,
+					"node \"%s\" is _almost_ (%d %%) full",
+					nufa_struct->array[idx].xl->name, 
+					100 - percent);
+			nufa_struct->array[idx].eligible = 0;
+		} else {
+			nufa_struct->array[idx].eligible = 1;
+		}
+	} else {
+		nufa_struct->array[idx].eligible = 0;
+	}
+
+	STACK_DESTROY (frame->root);
+	return 0;
+}
+
+static void 
+update_stat_array (xlator_t *xl)
+{
+	/* This function schedules the file in one of the child nodes */
+	int32_t idx;
+	struct nufa_struct *nufa_buf = 
+		(struct nufa_struct *)*((long *)xl->private);
+	call_frame_t *frame = NULL;
+	call_pool_t *pool = xl->ctx->pool;
+
+	for (idx = 0; idx < nufa_buf->child_count; idx++) {
+		frame = create_frame (xl, pool);
+
+		STACK_WIND_COOKIE (frame,
+				   update_stat_array_cbk, 
+				   nufa_buf->array[idx].xl->name,
+				   nufa_buf->array[idx].xl, 
+				   (nufa_buf->array[idx].xl)->mops->stats,
+				   0); //flag
+	}
+
+	return;
+}
+
+static void 
+nufa_update (xlator_t *xl)
+{
+	struct nufa_struct *nufa_buf = 
+		(struct nufa_struct *)*((long *)xl->private);
+	struct timeval tv;
+	gettimeofday (&tv, NULL);
+	if (tv.tv_sec > (nufa_buf->refresh_interval 
+			 + nufa_buf->last_stat_fetch.tv_sec)) {
+		/* Update the stats from all the server */
+		update_stat_array (xl);
+		nufa_buf->last_stat_fetch.tv_sec = tv.tv_sec;
+	}
+}
+
+static xlator_t *
+nufa_schedule (xlator_t *xl, const void *path)
+{
+	struct nufa_struct *nufa_buf = 
+		(struct nufa_struct *)*((long *)xl->private);
+	int32_t nufa_orig = nufa_buf->local_xl_index;  
+	int32_t rr;
+  
+	nufa_update (xl);
+  
+	while (1) {
+		LOCK (&nufa_buf->nufa_lock);
+		rr = nufa_buf->local_xl_index++;
+		nufa_buf->local_xl_index %= nufa_buf->local_xl_count;
+		UNLOCK (&nufa_buf->nufa_lock);
+    
+		/* if 'eligible' or there are _no_ eligible nodes */
+		if (nufa_buf->array[nufa_buf->local_array[rr]].eligible) {
+			/* Return the local node */
+			return nufa_buf->array[nufa_buf->local_array[rr]].xl;
+		}
+		if ((rr + 1) % nufa_buf->local_xl_count == nufa_orig) {
+			gf_log ("nufa", GF_LOG_CRITICAL, 
+				"No free space available on any local "
+				"volumes, using RR scheduler");
+			LOCK (&nufa_buf->nufa_lock);
+			nufa_buf->local_xl_index++;
+			nufa_buf->local_xl_index %= nufa_buf->local_xl_count;
+			UNLOCK (&nufa_buf->nufa_lock);
+			break;
+		}
+	}
+
+	nufa_orig = nufa_buf->sched_index;  
+	while (1) {
+		LOCK (&nufa_buf->nufa_lock);
+		rr = nufa_buf->sched_index++;
+		nufa_buf->sched_index = (nufa_buf->sched_index % 
+					 nufa_buf->child_count);
+		UNLOCK (&nufa_buf->nufa_lock);
+    
+		/* if 'eligible' or there are _no_ eligible nodes */
+		if (nufa_buf->array[rr].eligible) {
+			break;
+		}
+		if ((rr + 1) % nufa_buf->child_count == nufa_orig) {
+			gf_log ("nufa", GF_LOG_CRITICAL, 
+				"No free space available on any server, "
+				"using RR scheduler.");
+			LOCK (&nufa_buf->nufa_lock);
+			nufa_buf->sched_index++;
+			nufa_buf->sched_index = (nufa_buf->sched_index % 
+						 nufa_buf->child_count);
+			UNLOCK (&nufa_buf->nufa_lock);
+			break;
+		}
+	}
+	return nufa_buf->array[rr].xl;
+}
+
+
+/**
+ * notify
+ */
+void
+nufa_notify (xlator_t *xl, int32_t event, void *data)
+{
+	struct nufa_struct *nufa_buf = 
+		(struct nufa_struct *)*((long *)xl->private);
+	int32_t idx = 0;
+  
+	if (!nufa_buf)
+		return;
+
+	for (idx = 0; idx < nufa_buf->child_count; idx++) {
+		if (strcmp (nufa_buf->array[idx].xl->name, 
+			    ((xlator_t *)data)->name) == 0)
+			break;
+	}
+
+	switch (event)
+	{
+	case GF_EVENT_CHILD_UP:
+	{
+		//nufa_buf->array[idx].eligible = 1;
+	}
+	break;
+	case GF_EVENT_CHILD_DOWN:
+	{
+		nufa_buf->array[idx].eligible = 0;
+	}
+	break;
+	default:
+	{
+		;
+	}
+	break;
+	}
+
+}
+
+int32_t
+nufa_mem_acct_init (xlator_t *this)
+{
+        int     ret = -1;
+
+        if (!this)
+                return ret;
+
+        ret = xlator_mem_acct_init (this, gf_nufa_mt_end + 1);
+        
+        if (ret != 0) {
+                gf_log (this->name, GF_LOG_ERROR, "Memory accounting init"
+                                "failed");
+                return ret;
+        }
+
+        return ret;
+}
+
+struct sched_ops sched = {
+	.init     = nufa_init,
+	.fini     = nufa_fini,
+	.update   = nufa_update,
+	.schedule = nufa_schedule,
+	.notify   = nufa_notify,
+        .mem_acct_init = nufa_mem_acct_init,
+};
+
+struct volume_options options[] = {
+	{ .key   = { "scheduler.refresh-interval", 
+		     "nufa.refresh-interval" },  
+	  .type  = GF_OPTION_TYPE_TIME
+	},
+	{ .key   = { "scheduler.limits.min-free-disk", 
+		     "nufa.limits.min-free-disk" },  
+	  .type  = GF_OPTION_TYPE_PERCENT
+	},
+	{ .key   = { "scheduler.local-volume-name",
+		     "nufa.local-volume-name" },
+	  .type  = GF_OPTION_TYPE_XLATOR
+	},	
+	{ .key = {NULL} }
+};
+
diff --git a/xlators/features/compress/Makefile.am b/scheduler/random/Makefile.am
index a985f42a8..d471a3f92 100644
--- a/xlators/features/compress/Makefile.am
+++ b/scheduler/random/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = src
 
-CLEANFILES =
+CLEANFILES = 
diff --git a/scheduler/random/src/Makefile.am b/scheduler/random/src/Makefile.am
new file mode 100644
index 000000000..572181336
--- /dev/null
+++ b/scheduler/random/src/Makefile.am
@@ -0,0 +1,14 @@
+sched_LTLIBRARIES = random.la
+scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler
+
+random_la_LDFLAGS = -module -avoidversion
+
+random_la_SOURCES = random.c
+random_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+noinst_HEADERS = random.h
+
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+
+CLEANFILES = 
diff --git a/scheduler/random/src/random-mem-types.h b/scheduler/random/src/random-mem-types.h
new file mode 100644
index 000000000..ff30d9244
--- /dev/null
+++ b/scheduler/random/src/random-mem-types.h
@@ -0,0 +1,32 @@
+/*
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __RANDOM_MEM_TYPES_H__
+#define __RANDOM_MEM_TYPES_H__
+
+#include "mem-types.h"
+
+enum gf_random_mem_types_ {
+        gf_random_mt_random_struct = gf_common_mt_end + 1,
+        gf_random_mt_random_sched_struct,
+        gf_random_mt_end
+};
+#endif
+
diff --git a/scheduler/random/src/random.c b/scheduler/random/src/random.c
new file mode 100644
index 000000000..03a284b66
--- /dev/null
+++ b/scheduler/random/src/random.c
@@ -0,0 +1,305 @@
+/*
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <sys/time.h>
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include "random.h"
+#include "random-mem-types.h"
+
+#define RANDOM_LIMITS_MIN_FREE_DISK_DEFAULT    15
+#define RANDOM_REFRESH_INTERVAL_DEFAULT        10
+
+
+static int32_t
+random_init (xlator_t *xl)
+{
+	struct random_struct *random_buf = NULL;
+	xlator_list_t *trav_xl = xl->children;
+	data_t *limit = NULL;
+	int32_t index = 0;
+
+	random_buf = GF_CALLOC (1, sizeof (struct random_struct),
+                                gf_random_mt_random_struct);
+	ERR_ABORT (random_buf);
+  
+	/* Set the seed for the 'random' function */
+	srandom ((uint32_t) time (NULL));
+  
+	limit = dict_get (xl->options, "scheduler.limits.min-free-disk");
+	if (limit) {
+		if (gf_string2percent (data_to_str (limit),
+				       &random_buf->min_free_disk) != 0) {
+			gf_log ("random", GF_LOG_ERROR, 
+				"invalid number format \"%s\" of \"option "
+				"scheduler.limits.min-free-disk\"", 
+				limit->data);
+			return -1;
+		}
+		if (random_buf->min_free_disk >= 100) {
+			gf_log ("random", GF_LOG_ERROR,
+				"check the \"option random.limits.min-free"
+				"-disk\", it should be percentage value");
+			return -1;
+		}
+      
+	} else {
+		gf_log ("random", GF_LOG_WARNING, 
+			"No option for limit min-free-disk given, "
+			"defaulting it to 5%%");
+		random_buf->min_free_disk = 
+			RANDOM_LIMITS_MIN_FREE_DISK_DEFAULT;
+	}
+  
+	limit = dict_get (xl->options, "scheduler.refresh-interval");
+	if (limit) {
+		if (gf_string2time (data_to_str (limit),
+				    &random_buf->refresh_interval) != 0) {
+			gf_log ("random", GF_LOG_ERROR, 
+				"invalid number format \"%s\" of "
+				"\"option random.refresh-interval\"", 
+				limit->data);
+			return -1;
+		}
+	} else {
+		random_buf->refresh_interval = RANDOM_REFRESH_INTERVAL_DEFAULT;
+	}
+  
+	while (trav_xl) {
+		index++;
+		trav_xl = trav_xl->next;
+	}
+	random_buf->child_count = index;
+	random_buf->array = GF_CALLOC (index,
+                                       sizeof (struct random_sched_struct),
+                                       gf_random_mt_random_sched_struct);
+	ERR_ABORT (random_buf->array);
+	trav_xl = xl->children;
+	index = 0;
+
+	while (trav_xl) {
+		random_buf->array[index].xl = trav_xl->xlator;
+		random_buf->array[index].eligible = 1;
+		trav_xl = trav_xl->next;
+		index++;
+	}
+	pthread_mutex_init (&random_buf->random_mutex, NULL);
+
+	// put it at the proper place  
+	*((long *)xl->private) = (long)random_buf; 
+	return 0;
+}
+
+static void
+random_fini (xlator_t *xl)
+{
+	struct random_struct *random_buf = NULL;
+
+	random_buf = (struct random_struct *)*((long *)xl->private);
+	pthread_mutex_destroy (&random_buf->random_mutex);
+	GF_FREE (random_buf->array);
+	GF_FREE (random_buf);
+}
+
+
+static int32_t 
+update_stat_array_cbk (call_frame_t *frame,
+		       void *cookie,
+		       xlator_t *xl,
+		       int32_t op_ret,
+		       int32_t op_errno,
+		       struct xlator_stats *trav_stats)
+{
+	int32_t idx = 0;
+	int32_t percent = 0;
+	struct random_struct *random_buf = NULL;
+	
+	random_buf = (struct random_struct *)*((long *)xl->private);
+
+	pthread_mutex_lock (&random_buf->random_mutex);
+	for (idx = 0; idx < random_buf->child_count; idx++) {
+		if (strcmp (random_buf->array[idx].xl->name, 
+			    (char *)cookie) == 0)
+			break;
+	}
+	pthread_mutex_unlock (&random_buf->random_mutex);
+
+	if (op_ret == 0) {
+		percent = ((trav_stats->free_disk *100) / 
+			   trav_stats->total_disk_size);
+		if (random_buf->min_free_disk > percent) {
+			random_buf->array[idx].eligible = 0;
+		} else {
+			random_buf->array[idx].eligible = 1;
+		}
+	} else {
+		random_buf->array[idx].eligible = 0;
+	}    
+
+	STACK_DESTROY (frame->root);
+	return 0;
+}
+
+static void 
+update_stat_array (xlator_t *xl)
+{
+	int32_t idx;
+	struct random_struct *random_buf = NULL;
+	call_frame_t *frame = NULL;
+	call_pool_t *pool = xl->ctx->pool;
+
+	random_buf = (struct random_struct *)*((long *)xl->private);
+	for (idx = 0; idx < random_buf->child_count; idx++) {
+		frame = create_frame (xl, pool);
+
+		STACK_WIND_COOKIE (frame,
+				   update_stat_array_cbk,
+				   random_buf->array[idx].xl->name,
+				   random_buf->array[idx].xl,
+				   (random_buf->array[idx].xl)->mops->stats,
+				   0);
+	}
+	return ;
+}
+
+static void 
+random_update (xlator_t *xl)
+{
+	struct timeval tv;
+	struct random_struct *random_buf = NULL;
+
+	random_buf = (struct random_struct *)*((long *)xl->private);
+
+	gettimeofday(&tv, NULL);
+	if (tv.tv_sec > (random_buf->refresh_interval + 
+			 random_buf->last_stat_entry.tv_sec)) {
+		update_stat_array (xl);
+		random_buf->last_stat_entry.tv_sec = tv.tv_sec;
+	}
+}
+
+static xlator_t *
+random_schedule (xlator_t *xl, const void *path)
+{
+	struct random_struct *random_buf = NULL;       
+	int32_t rand = 0;
+	int32_t try = 0;
+	
+	random_buf = (struct random_struct *)*((long *)xl->private);
+
+	rand = (int32_t) (1.0*random_buf->child_count * 
+			  (random() / (RAND_MAX + 1.0)));
+
+	random_update (xl);
+
+	while (!random_buf->array[rand].eligible) {
+		if (try++ > 100) {
+			/* there is a chance of this becoming a 
+			   infinite loop otherwise. */
+			break; 
+		}
+		rand = (int32_t) (1.0*random_buf->child_count * 
+				  (random() / (RAND_MAX + 1.0)));
+	}
+	return random_buf->array[rand].xl;
+}
+
+int32_t
+random_mem_acct_init (xlator_t *this)
+{
+        int     ret = -1;
+
+        if (!this)
+                return ret;
+
+        ret = xlator_mem_acct_init (this, gf_random_mt_end + 1);
+        
+        if (ret != 0) {
+                gf_log (this->name, GF_LOG_ERROR, "Memory accounting init"
+                        " failed");
+                return ret;
+        }
+
+        return ret;
+}
+
+/**
+ * notify
+ */
+void
+random_notify (xlator_t *xl, int32_t event, void *data)
+{
+	struct random_struct *random_buf = NULL;
+	int32_t idx = 0;
+  
+	random_buf = (struct random_struct *)*((long *)xl->private);
+	if (!random_buf)
+		return;
+
+	for (idx = 0; idx < random_buf->child_count; idx++) {
+		if (random_buf->array[idx].xl == (xlator_t *)data)
+			break;
+	}
+
+	switch (event)
+	{
+	case GF_EVENT_CHILD_UP:
+	{
+		//random_buf->array[idx].eligible = 1;
+	}
+	break;
+	case GF_EVENT_CHILD_DOWN:
+	{
+		random_buf->array[idx].eligible = 0;
+	}
+	break;
+	default:
+	{
+		;
+	}
+	break;
+	}
+
+}
+
+struct sched_ops sched = {
+	.init     = random_init,
+	.fini     = random_fini,
+	.update   = random_update,
+	.schedule = random_schedule,
+	.notify   = random_notify,
+        .mem_acct_init = random_mem_acct_init,
+};
+
+struct volume_options options[] = {
+	{ .key   = { "scheduler.refresh-interval", 
+		     "random.refresh-interval" },  
+	  .type  = GF_OPTION_TYPE_TIME
+	},
+	{ .key   = { "scheduler.limits.min-free-disk", 
+		     "random.limits.min-free-disk" },  
+	  .type  = GF_OPTION_TYPE_PERCENT
+	},
+	{ .key = {NULL} }
+};
diff --git a/scheduler/random/src/random.h b/scheduler/random/src/random.h
new file mode 100644
index 000000000..154b1bdfb
--- /dev/null
+++ b/scheduler/random/src/random.h
@@ -0,0 +1,46 @@
+/*
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _RANDOM_H
+#define _RANDOM_H
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+
+#include <sys/time.h>
+#include "scheduler.h"
+
+struct random_sched_struct {
+  xlator_t *xl;
+  unsigned char eligible;
+};
+
+struct random_struct {
+  int32_t child_count;
+  uint32_t refresh_interval;
+  uint32_t min_free_disk;
+  struct timeval last_stat_entry;
+  struct random_sched_struct *array;
+  pthread_mutex_t random_mutex;
+};
+
+#endif /* _RANDOM_H */
diff --git a/scheduler/rr/Makefile.am b/scheduler/rr/Makefile.am
new file mode 100644
index 000000000..d471a3f92
--- /dev/null
+++ b/scheduler/rr/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = src
+
+CLEANFILES = 
diff --git a/scheduler/rr/src/Makefile.am b/scheduler/rr/src/Makefile.am
new file mode 100644
index 000000000..7e911c0ed
--- /dev/null
+++ b/scheduler/rr/src/Makefile.am
@@ -0,0 +1,13 @@
+sched_LTLIBRARIES = rr.la
+scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler
+
+rr_la_LDFLAGS = -module -avoidversion
+
+rr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+rr_la_SOURCES = rr.c rr-options.c
+noinst_HEADERS = rr.h rr-options.h
+
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+
+CLEANFILES = 
diff --git a/scheduler/rr/src/rr-mem-types.h b/scheduler/rr/src/rr-mem-types.h
new file mode 100644
index 000000000..cb05323cd
--- /dev/null
+++ b/scheduler/rr/src/rr-mem-types.h
@@ -0,0 +1,32 @@
+/*
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __RR_MEM_TYPES_H__
+#define __RR_MEM_TYPES_H__
+
+#include "mem-types.h"
+
+enum gf_rr_mem_types_ {
+        gf_rr_mt_rr_t = gf_common_mt_end + 1,
+        gf_rr_mt_rr_subvolume_t,
+        gf_rr_mt_end
+};
+#endif
+
diff --git a/scheduler/rr/src/rr-options.c b/scheduler/rr/src/rr-options.c
new file mode 100644
index 000000000..505b1713e
--- /dev/null
+++ b/scheduler/rr/src/rr-options.c
@@ -0,0 +1,256 @@
+/*
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#include "scheduler.h"
+#include "rr-options.h"
+
+#define RR_LIMITS_MIN_FREE_DISK_OPTION_STRING  "scheduler.limits.min-free-disk"
+#define RR_LIMITS_MIN_FREE_DISK_VALUE_DEFAULT  15
+#define RR_LIMITS_MIN_FREE_DISK_VALUE_MIN      0
+#define RR_LIMITS_MIN_FREE_DISK_VALUE_MAX      100
+
+#define RR_REFRESH_INTERVAL_OPTION_STRING      "scheduler.refresh-interval"
+#define RR_REFRESH_INTERVAL_VALUE_DEFAULT      10
+
+#define RR_READ_ONLY_SUBVOLUMES_OPTION_STRING  "scheduler.read-only-subvolumes"
+
+#define LOG_ERROR(args...)      gf_log ("rr-options", GF_LOG_ERROR, ##args)
+#define LOG_WARNING(args...)    gf_log ("rr-options", GF_LOG_WARNING, ##args)
+
+static int 
+_rr_options_min_free_disk_validate (const char *value_string, uint32_t *n)
+{
+	uint32_t value = 0;
+  
+	if (value_string == NULL)
+	{
+		return -1;
+	}
+  
+	if (gf_string2percent (value_string, &value) != 0)
+	{
+		gf_log ("rr", 
+			GF_LOG_ERROR, 
+			"invalid number format [%s] of option [%s]", 
+			value_string, 
+			RR_LIMITS_MIN_FREE_DISK_OPTION_STRING);
+		return -1;
+	}
+  
+	if ((value <= RR_LIMITS_MIN_FREE_DISK_VALUE_MIN) || 
+	    (value >= RR_LIMITS_MIN_FREE_DISK_VALUE_MAX))
+	{
+		gf_log ("rr", 
+			GF_LOG_ERROR, 
+			"out of range [%d] of option [%s].  Allowed range is 0 to 100.", 
+			value, 
+			RR_LIMITS_MIN_FREE_DISK_OPTION_STRING);
+		return -1;
+	}
+  
+	*n = value;
+  
+	return 0;
+}
+
+static int 
+_rr_options_refresh_interval_validate (const char *value_string, uint32_t *n)
+{
+	uint32_t value = 0;
+  
+	if (value_string == NULL)
+	{
+		return -1;
+	}
+  
+	if (gf_string2time (value_string, &value) != 0)
+	{
+		gf_log ("rr", 
+			GF_LOG_ERROR, 
+			"invalid number format [%s] of option [%s]", 
+			value_string, 
+			RR_REFRESH_INTERVAL_OPTION_STRING);
+		return -1;
+	}
+  
+	*n = value;
+  
+	return 0;
+}
+
+static int 
+_rr_options_read_only_subvolumes_validate (const char *value_string, 
+					   char ***volume_list, 
+					   uint64_t *volume_count)
+{
+	char **vlist = NULL;
+	int vcount = 0;
+	int i = 0;
+  
+	if (value_string == NULL || volume_list == NULL || volume_count)
+	{
+		return -1;
+	}
+  
+	if (gf_strsplit (value_string, 
+			 ", ", 
+			 &vlist, 
+			 &vcount) != 0)
+	{
+		gf_log ("rr", 
+			GF_LOG_ERROR, 
+			"invalid subvolume list [%s] of option [%s]", 
+			value_string, 
+			RR_READ_ONLY_SUBVOLUMES_OPTION_STRING);
+		return -1;
+	}
+  
+	for (i = 0; i < vcount; i++)
+	{
+		if (gf_volume_name_validate (vlist[i]) != 0)
+		{
+			gf_log ("rr", 
+				GF_LOG_ERROR, 
+				"invalid subvolume name [%s] in [%s] of option [%s]", 
+				vlist[i], 
+				value_string, 
+				RR_READ_ONLY_SUBVOLUMES_OPTION_STRING);
+			goto free_exit;
+		}
+	}
+  
+	*volume_list = vlist;
+	*volume_count = vcount;
+  
+	return 0;
+  
+ free_exit:
+	for (i = 0; i < vcount; i++)
+	{
+		GF_FREE (vlist[i]);
+	}
+	GF_FREE (vlist);
+  
+	return -1;
+}
+
+int 
+rr_options_validate (dict_t *options, rr_options_t *rr_options)
+{
+	char *value_string = NULL;
+  
+	if (options == NULL || rr_options == NULL)
+	{
+		return -1;
+	}
+  
+	if (dict_get (options, RR_LIMITS_MIN_FREE_DISK_OPTION_STRING))
+		if (data_to_str (dict_get (options, RR_LIMITS_MIN_FREE_DISK_OPTION_STRING)))
+			value_string = data_to_str (dict_get (options, 
+							      RR_LIMITS_MIN_FREE_DISK_OPTION_STRING));
+	if (value_string != NULL)
+	{
+		if (_rr_options_min_free_disk_validate (value_string, 
+							&rr_options->min_free_disk) != 0)
+		{
+			return -1;
+		}
+      
+		gf_log ("rr", 
+			GF_LOG_WARNING, 
+			"using %s = %d", 
+			RR_LIMITS_MIN_FREE_DISK_OPTION_STRING, 
+			rr_options->min_free_disk);
+	}
+	else 
+	{
+		rr_options->min_free_disk = RR_LIMITS_MIN_FREE_DISK_VALUE_DEFAULT;
+      
+		gf_log ("rr", GF_LOG_DEBUG, 
+			"using %s = %d [default]", 
+			RR_LIMITS_MIN_FREE_DISK_OPTION_STRING, 
+			rr_options->min_free_disk);
+	}
+  
+	value_string = NULL;
+	if (dict_get (options, RR_REFRESH_INTERVAL_OPTION_STRING))
+		value_string = data_to_str (dict_get (options, 
+						      RR_REFRESH_INTERVAL_OPTION_STRING));
+	if (value_string != NULL)
+	{
+		if (_rr_options_refresh_interval_validate (value_string, 
+							   &rr_options->refresh_interval) != 0)
+		{
+			return -1;
+		}
+      
+		gf_log ("rr", 
+			GF_LOG_WARNING, 
+			"using %s = %d", 
+			RR_REFRESH_INTERVAL_OPTION_STRING, 
+			rr_options->refresh_interval);
+	}
+	else 
+	{
+		rr_options->refresh_interval = RR_REFRESH_INTERVAL_VALUE_DEFAULT;
+      
+		gf_log ("rr", GF_LOG_DEBUG, 
+			"using %s = %d [default]", 
+			RR_REFRESH_INTERVAL_OPTION_STRING, 
+			rr_options->refresh_interval);
+	}
+  
+	value_string = NULL;
+	if (dict_get (options, RR_READ_ONLY_SUBVOLUMES_OPTION_STRING))
+		value_string = data_to_str (dict_get (options, 
+						      RR_READ_ONLY_SUBVOLUMES_OPTION_STRING));
+	if (value_string != NULL)
+	{
+		if (_rr_options_read_only_subvolumes_validate (value_string, 
+							       &rr_options->read_only_subvolume_list, 
+							       &rr_options->read_only_subvolume_count) != 0)
+		{
+			return -1;
+		}
+      
+		gf_log ("rr", 
+			GF_LOG_WARNING, 
+			"using %s = [%s]", 
+			RR_READ_ONLY_SUBVOLUMES_OPTION_STRING, 
+			value_string);
+	}
+  
+	return 0;
+}
+
+struct volume_options options[] = {
+	{ .key   = { "scheduler.refresh-interval", 
+		     "rr.refresh-interval" },  
+	  .type  = GF_OPTION_TYPE_TIME
+	},
+	{ .key   = { "scheduler.limits.min-free-disk", 
+		     "rr.limits.min-free-disk" },  
+	  .type  = GF_OPTION_TYPE_PERCENT
+	},
+	{ .key   = { "scheduler.read-only-subvolumes", 
+		     "rr.read-only-subvolumes" },  
+	  .type  = GF_OPTION_TYPE_ANY
+	},
+	{ .key = {NULL} }
+};
diff --git a/scheduler/rr/src/rr-options.h b/scheduler/rr/src/rr-options.h
new file mode 100644
index 000000000..1b0a1ef3d
--- /dev/null
+++ b/scheduler/rr/src/rr-options.h
@@ -0,0 +1,34 @@
+/*
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _RR_OPTIONS_H
+#define _RR_OPTIONS_H
+
+struct rr_options
+{
+  uint32_t min_free_disk;
+  uint32_t refresh_interval;
+  char     **read_only_subvolume_list;
+  uint64_t read_only_subvolume_count;
+};
+typedef struct rr_options rr_options_t;
+
+int rr_options_validate (dict_t *options, rr_options_t *rr_options);
+
+#endif
diff --git a/scheduler/rr/src/rr.c b/scheduler/rr/src/rr.c
new file mode 100644
index 000000000..e7b556e67
--- /dev/null
+++ b/scheduler/rr/src/rr.c
@@ -0,0 +1,567 @@
+/*
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/time.h>
+#include <stdlib.h>
+
+#include <stdint.h>
+
+#include "scheduler.h"
+
+#include "rr-options.h"
+#include "rr.h"
+#include "rr-mem-types.h"
+
+#define RR_MIN_FREE_DISK_NOT_REACHED    0
+#define RR_MIN_FREE_DISK_REACHED        1
+
+#define RR_SUBVOLUME_OFFLINE    0
+#define RR_SUBVOLUME_ONLINE     1
+
+#define LOG_ERROR(args...)      gf_log ("rr", GF_LOG_ERROR, ##args)
+#define LOG_WARNING(args...)    gf_log ("rr", GF_LOG_WARNING, ##args)
+#define LOG_CRITICAL(args...)    gf_log ("rr", GF_LOG_CRITICAL, ##args)
+
+#define ROUND_ROBIN(index, count)    ((index + 1) % count)
+
+static int 
+_cleanup_rr (rr_t *rr)
+{
+	int i;
+  
+	if (rr == NULL)
+	{
+		return -1;
+	}
+  
+	if (rr->options.read_only_subvolume_list != NULL)
+	{
+		for (i = 0; i < rr->options.read_only_subvolume_count; i++)
+		{
+			GF_FREE (rr->options.read_only_subvolume_list[i]);
+		}
+		GF_FREE (rr->options.read_only_subvolume_list);
+	}
+  
+	GF_FREE (rr->subvolume_list);
+  
+	GF_FREE (rr);
+  
+	return 0;
+}
+
+int 
+rr_init (xlator_t *this_xl)
+{
+	rr_t *rr = NULL;
+	dict_t *options = NULL;
+	xlator_list_t *children = NULL;
+	uint64_t children_count = 0;
+	int i = 0;
+	int j = 0;
+  
+	if (this_xl == NULL)
+	{
+		return -1;
+	}
+  
+	if ((options = this_xl->options) == NULL)
+	{
+		return -1;
+	}
+  
+	if ((children = this_xl->children) == NULL)
+	{
+		return -1;
+	}
+  
+	if ((rr = GF_CALLOC (1, sizeof (rr_t), gf_rr_mt_rr_t)) == NULL)
+	{
+		return -1;
+	}
+  
+	if (rr_options_validate (options, &rr->options) != 0)
+	{
+		GF_FREE (rr);
+		return -1;
+	}
+  
+	for (i = 0; i < rr->options.read_only_subvolume_count; i++)
+	{
+		char found = 0;
+      
+		for (children = this_xl->children; 
+		     children != NULL; 
+		     children = children->next)
+		{
+			if (strcmp (rr->options.read_only_subvolume_list[i], 
+				    children->xlator->name) == 0)
+			{
+				found = 1;
+				break;
+			}
+		}
+      
+		if (!found)
+		{
+			LOG_ERROR ("read-only subvolume [%s] not found in volume list", 
+				   rr->options.read_only_subvolume_list[i]);
+			_cleanup_rr (rr);
+			return -1;
+		}
+	}
+  
+	for (children = this_xl->children; 
+	     children != NULL; 
+	     children = children->next)
+	{
+		children_count++;
+	}
+  
+	/* bala: excluding read_only_subvolumes */
+	if ((rr->subvolume_count = children_count - 
+	     rr->options.read_only_subvolume_count) == 0)
+	{
+		LOG_ERROR ("no writable volumes found for scheduling");
+		_cleanup_rr (rr);
+		return -1;
+	}
+  
+	if ((rr->subvolume_list = GF_CALLOC (rr->subvolume_count, 
+                                             sizeof (rr_subvolume_t),
+                                             gf_rr_mt_rr_subvolume_t)) == NULL)
+	{
+		_cleanup_rr (rr);
+		return -1;
+	}
+  
+	i = 0;
+	j = 0;
+	for (children = this_xl->children; 
+	     children != NULL; 
+	     children = children->next)
+	{
+		char found = 0;
+      
+		for (j = 0; j < rr->options.read_only_subvolume_count; j++)
+		{
+			if (strcmp (rr->options.read_only_subvolume_list[i], 
+				    children->xlator->name) == 0)
+			{
+				found = 1;
+				break;
+			}
+		}
+      
+		if (!found)
+		{
+			rr_subvolume_t *subvolume = NULL;
+	  
+			subvolume = &rr->subvolume_list[i];
+	  
+			subvolume->xl = children->xlator;
+			subvolume->free_disk_status = RR_MIN_FREE_DISK_NOT_REACHED;
+			subvolume->status = RR_SUBVOLUME_ONLINE;
+	  
+			i++;
+		}
+	}
+  
+	rr->schedule_index = UINT64_MAX;
+	rr->last_stat_fetched_time.tv_sec = 0;
+	rr->last_stat_fetched_time.tv_usec = 0;
+	pthread_mutex_init (&rr->mutex, NULL);
+  
+	*((long *)this_xl->private) = (long)rr;
+  
+	return 0;
+}
+
+void 
+rr_fini (xlator_t *this_xl)
+{
+	rr_t *rr = NULL;
+  
+	if (this_xl == NULL)
+	{
+		return;
+	}
+  
+	if ((rr = (rr_t *) *((long *)this_xl->private)) != NULL)
+	{
+		pthread_mutex_destroy (&rr->mutex);
+		_cleanup_rr (rr);
+		this_xl->private = NULL;
+	}
+  
+	return;
+}
+
+xlator_t *
+rr_schedule (xlator_t *this_xl, const void *path)
+{
+	rr_t *rr = NULL;
+	uint64_t next_schedule_index = 0;
+	int i = 0;
+  
+	if (this_xl == NULL || path == NULL)
+	{
+		return NULL;
+	}
+  
+	rr = (rr_t *) *((long *)this_xl->private);
+	next_schedule_index = ROUND_ROBIN (rr->schedule_index, 
+					   rr->subvolume_count);
+  
+	rr_update (this_xl);
+  
+	for (i = next_schedule_index; i < rr->subvolume_count; i++)
+	{
+		if (rr->subvolume_list[i].status == RR_SUBVOLUME_ONLINE && 
+		    rr->subvolume_list[i].status == RR_MIN_FREE_DISK_NOT_REACHED)
+		{
+			pthread_mutex_lock (&rr->mutex);
+			rr->schedule_index = i;
+			pthread_mutex_unlock (&rr->mutex);
+			return rr->subvolume_list[i].xl;
+		}
+	}
+  
+	for (i = 0; i < next_schedule_index; i++)
+	{
+		if (rr->subvolume_list[i].status == RR_SUBVOLUME_ONLINE && 
+		    rr->subvolume_list[i].status == RR_MIN_FREE_DISK_NOT_REACHED)
+		{
+			pthread_mutex_lock (&rr->mutex);
+			rr->schedule_index = i;
+			pthread_mutex_unlock (&rr->mutex);
+			return rr->subvolume_list[i].xl;
+		}
+	}
+  
+	for (i = next_schedule_index; i < rr->subvolume_count; i++)
+	{
+		if (rr->subvolume_list[i].status == RR_SUBVOLUME_ONLINE)
+		{
+			pthread_mutex_lock (&rr->mutex);
+			rr->schedule_index = i;
+			pthread_mutex_unlock (&rr->mutex);
+			return rr->subvolume_list[i].xl;
+		}
+	}
+  
+	for (i = 0; i < next_schedule_index; i++)
+	{
+		if (rr->subvolume_list[i].status == RR_SUBVOLUME_ONLINE)
+		{
+			pthread_mutex_lock (&rr->mutex);
+			rr->schedule_index = i;
+			pthread_mutex_unlock (&rr->mutex);
+			return rr->subvolume_list[i].xl;
+		}
+	}
+  
+	return NULL;
+}
+
+void
+rr_update (xlator_t *this_xl)
+{
+	rr_t *rr = NULL;
+	struct timeval ctime = {0, 0};
+	int i = 0;
+  
+	if (this_xl == NULL)
+	{
+		return ;
+	}
+  
+	if ((rr = (rr_t *) *((long *)this_xl->private)) == NULL)
+	{
+		return ;
+	}
+  
+	if (gettimeofday (&ctime, NULL) != 0)
+	{
+		return ;
+	}
+  
+	if (ctime.tv_sec > (rr->options.refresh_interval + 
+			    rr->last_stat_fetched_time.tv_sec))
+	{
+		pthread_mutex_lock (&rr->mutex);
+		rr->last_stat_fetched_time = ctime;
+		pthread_mutex_unlock (&rr->mutex);
+      
+		for (i = 0; i < rr->subvolume_count; i++)
+		{
+			xlator_t *subvolume_xl = NULL;
+			call_frame_t *frame = NULL;
+			call_pool_t *pool = NULL;
+	  
+			subvolume_xl = rr->subvolume_list[i].xl;
+	  
+			pool = this_xl->ctx->pool;
+	  
+			frame = create_frame (this_xl, pool);
+
+			STACK_WIND_COOKIE (frame,
+					   rr_update_cbk, 
+					   subvolume_xl->name, 
+					   subvolume_xl, 
+					   subvolume_xl->mops->stats, 
+					   0);
+		}
+	}
+  
+	return ;
+}
+
+int 
+rr_update_cbk (call_frame_t *frame, 
+	       void *cookie, 
+	       xlator_t *this_xl, 
+	       int32_t op_ret, 
+	       int32_t op_errno, 
+	       struct xlator_stats *stats)
+{
+	rr_t *rr = NULL;
+	rr_subvolume_t *subvolume = NULL;
+	uint8_t free_disk_percent = 0;
+	int i = 0;
+  
+	if (frame == NULL)
+	{
+		return -1;
+	}
+  
+	if (cookie == NULL || this_xl == NULL)
+	{
+		STACK_DESTROY (frame->root);
+		return -1;
+	}
+  
+	if (op_ret == 0 && stats == NULL)
+	{
+		LOG_CRITICAL ("fatal! op_ret is 0 and stats is NULL.  "
+			      "Please report this to <gluster-devel@nongnu.org>");
+		STACK_DESTROY (frame->root);
+		return -1;
+	}
+  
+	if ((rr = (rr_t *) *((long *)this_xl->private)) == NULL)
+	{
+		STACK_DESTROY (frame->root);
+		return -1;
+	}
+  
+	for (i = 0; i < rr->subvolume_count; i++)
+	{
+		if (rr->subvolume_list[i].xl->name == (char *) cookie)
+		{
+			subvolume = &rr->subvolume_list[i];
+			break;
+		}
+	}
+  
+	if (subvolume == NULL)
+	{
+		LOG_ERROR ("unknown cookie [%s]", (char *) cookie);
+		STACK_DESTROY (frame->root);
+		return -1;
+	}
+  
+	if (op_ret == 0)
+	{
+		free_disk_percent = (stats->free_disk * 100) / stats->total_disk_size;
+		if (free_disk_percent > rr->options.min_free_disk)
+		{
+			if (subvolume->free_disk_status != RR_MIN_FREE_DISK_NOT_REACHED)
+			{
+				pthread_mutex_lock (&rr->mutex);
+				subvolume->free_disk_status = RR_MIN_FREE_DISK_NOT_REACHED;
+				pthread_mutex_unlock (&rr->mutex);
+				LOG_WARNING ("subvolume [%s] is available with free space for scheduling", 
+					     subvolume->xl->name);
+			}
+		}
+		else
+		{
+			if (subvolume->free_disk_status != RR_MIN_FREE_DISK_REACHED)
+			{
+				pthread_mutex_lock (&rr->mutex);
+				subvolume->free_disk_status = RR_MIN_FREE_DISK_REACHED;
+				pthread_mutex_unlock (&rr->mutex);
+				LOG_WARNING ("subvolume [%s] reached minimum disk space requirement", 
+					     subvolume->xl->name);
+			}
+		}
+	}
+	else 
+	{
+		pthread_mutex_lock (&rr->mutex);
+		subvolume->status = RR_SUBVOLUME_OFFLINE;
+		pthread_mutex_unlock (&rr->mutex);
+		LOG_ERROR ("unable to get subvolume [%s] status information and "
+			   "scheduling is disabled", 
+			   subvolume->xl->name);
+	}
+  
+	STACK_DESTROY (frame->root);
+	return 0;
+}
+
+void
+rr_notify (xlator_t *this_xl, int32_t event, void *data)
+{
+	rr_t *rr = NULL;
+	rr_subvolume_t *subvolume = NULL;
+	xlator_t *subvolume_xl = NULL;
+	int i = 0, ret = 0;
+	call_frame_t *frame = NULL;
+	call_pool_t *pool = NULL;
+	dict_t *xattr = get_new_dict ();
+	int32_t version[1] = {1};
+
+	if (this_xl == NULL || data == NULL) {
+		return ;
+	}
+  
+	if ((rr = (rr_t *) *((long *)this_xl->private)) == NULL) {
+		return ;
+	}
+  
+	subvolume_xl = (xlator_t *) data;
+  
+	for (i = 0; i < rr->subvolume_count; i++) {
+		if (rr->subvolume_list[i].xl == subvolume_xl) {
+			subvolume = &rr->subvolume_list[i];
+			break;
+		}
+	}
+  
+	switch (event) {
+	case GF_EVENT_CHILD_UP:
+		/* Seeding, to be done only once */
+		if (rr->first_time && (i == rr->subvolume_count)) {
+			loc_t loc = {0,};
+			xlator_t *trav = NULL;
+
+			pool = this_xl->ctx->pool;
+			frame = create_frame (this_xl, pool);
+			ret = dict_set_bin (xattr, "trusted.glusterfs.scheduler.rr",
+					    version, sizeof (int32_t));
+			if (-1 == ret) {
+				gf_log (this_xl->name, GF_LOG_ERROR, "rr seed setting failed");
+			}
+			if (xattr)
+				dict_ref (xattr);
+			
+			loc.path = gf_strdup ("/");
+			for (trav = this_xl->parents->xlator; trav; trav = trav->parents->xlator) {
+				if (trav->itable) {
+					loc.inode = trav->itable->root;
+					break;
+				}
+			}
+			STACK_WIND (frame,
+				    rr_notify_cbk,
+				    (xlator_t *)data,
+				    ((xlator_t *)data)->fops->xattrop,
+				    &loc,
+				    GF_XATTROP_ADD_ARRAY,
+				    xattr);
+	  
+			if (xattr)
+				dict_unref (xattr);
+
+			rr->first_time = 0;
+		}
+		if (subvolume) {
+			pthread_mutex_lock (&rr->mutex);
+			subvolume->status = RR_SUBVOLUME_ONLINE;
+			pthread_mutex_unlock (&rr->mutex);
+		}
+		break;
+	case GF_EVENT_CHILD_DOWN:
+		if (subvolume) {
+			pthread_mutex_lock (&rr->mutex);
+			subvolume->status = RR_SUBVOLUME_OFFLINE;
+			pthread_mutex_unlock (&rr->mutex);
+		}
+		break;
+	}
+  
+	return ;
+}
+
+int 
+rr_notify_cbk (call_frame_t *frame, 
+	       void *cookie, 
+	       xlator_t *this_xl, 
+	       int32_t op_ret, 
+	       int32_t op_errno,
+	       dict_t *xattr)
+{
+	rr_t *rr = NULL;
+	int32_t *index = NULL;
+	int32_t ret = -1;
+	void *tmp_index_ptr = NULL;
+
+	if (frame == NULL) 
+	{
+		return -1;
+	}
+  
+	if ((this_xl == NULL) || (op_ret == -1))
+	{
+		STACK_DESTROY (frame->root);
+		return -1;
+	}
+  
+	if ((rr = (rr_t *) *((long *)this_xl->private)) == NULL)
+	{
+		STACK_DESTROY (frame->root);
+		return -1;
+	}
+  
+	ret = dict_get_bin (xattr, "trusted.glusterfs.scheduler.rr", &tmp_index_ptr);
+	index = tmp_index_ptr;
+	if (ret == 0)
+		rr->schedule_index = (index[0] % rr->subvolume_count);
+	else
+		rr->schedule_index = 0;
+
+	STACK_DESTROY (frame->root);
+	return 0;
+}
+
+struct sched_ops sched = {
+	.init     = rr_init,
+	.fini     = rr_fini,
+	.update   = rr_update,
+	.schedule = rr_schedule,
+	.notify   = rr_notify
+};
+
diff --git a/scheduler/rr/src/rr.h b/scheduler/rr/src/rr.h
new file mode 100644
index 000000000..3bd95929b
--- /dev/null
+++ b/scheduler/rr/src/rr.h
@@ -0,0 +1,70 @@
+/*
+   Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _RR_H
+#define _RR_H
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include "scheduler.h"
+#include <stdint.h>
+#include <sys/time.h>
+
+struct rr_subvolume
+{
+  xlator_t  *xl;
+  uint8_t   free_disk_status;
+  uint8_t   status;
+};
+typedef struct rr_subvolume rr_subvolume_t;
+
+struct rr
+{
+  rr_options_t    options;
+  rr_subvolume_t  *subvolume_list;
+  uint64_t        subvolume_count;
+  uint64_t        schedule_index;
+  struct timeval  last_stat_fetched_time;
+  pthread_mutex_t mutex;
+  char            first_time;
+};
+typedef struct rr rr_t;
+
+int rr_init (xlator_t *this_xl);
+void rr_fini (xlator_t *this_xl);
+xlator_t *rr_schedule (xlator_t *this_xl, const void *path);
+void rr_update (xlator_t *this_xl);
+int rr_update_cbk (call_frame_t *frame, 
+		   void *cookie, 
+		   xlator_t *this_xl, 
+		   int32_t op_ret, 
+		   int32_t op_errno, 
+		   struct xlator_stats *stats);
+void rr_notify (xlator_t *this_xl, int32_t event, void *data);
+int rr_notify_cbk (call_frame_t *frame, 
+		   void *cookie, 
+		   xlator_t *this_xl, 
+		   int32_t op_ret, 
+		   int32_t op_errno,
+		   dict_t *xattr);
+
+#endif /* _RR_H */
diff --git a/scheduler/switch/Makefile.am b/scheduler/switch/Makefile.am
new file mode 100644
index 000000000..d471a3f92
--- /dev/null
+++ b/scheduler/switch/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = src
+
+CLEANFILES = 
diff --git a/scheduler/switch/src/Makefile.am b/scheduler/switch/src/Makefile.am
new file mode 100644
index 000000000..dc7d16d40
--- /dev/null
+++ b/scheduler/switch/src/Makefile.am
@@ -0,0 +1,12 @@
+sched_LTLIBRARIES = switch.la
+scheddir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler
+
+switch_la_LDFLAGS = -module -avoidversion
+
+switch_la_SOURCES = switch.c
+switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
+
+CLEANFILES = 
diff --git a/scheduler/switch/src/switch-mem-types.h b/scheduler/switch/src/switch-mem-types.h
new file mode 100644
index 000000000..7039b035d
--- /dev/null
+++ b/scheduler/switch/src/switch-mem-types.h
@@ -0,0 +1,33 @@
+/*
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __SWITCH_MEM_TYPES_H__
+#define __SWITCH_MEM_TYPES_H__
+
+#include "mem-types.h"
+
+enum gf_switch_mem_types_ {
+        gf_switch_mt_switch_struct = gf_common_mt_end + 1,
+        gf_switch_mt_switch_sched_struct,
+        gf_switch_mt_switch_sched_array,
+        gf_switch_mt_end
+};
+#endif
+
diff --git a/scheduler/switch/src/switch.c b/scheduler/switch/src/switch.c
new file mode 100644
index 000000000..1362e5cc9
--- /dev/null
+++ b/scheduler/switch/src/switch.c
@@ -0,0 +1,451 @@
+/*
+  Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+#include <sys/time.h>
+#include <stdlib.h>
+#include <fnmatch.h>
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+#include "config.h"
+#endif
+
+#include "xlator.h"
+#include "scheduler.h"
+#include "switch-mem-types.h"
+
+struct switch_sched_array {
+	xlator_t *xl;
+	int32_t   eligible;
+	int32_t   considered;
+};
+
+/* Select one of this struct based on the path's pattern match */
+struct switch_sched_struct {
+	struct switch_sched_struct *next;
+	struct switch_sched_array  *array;
+	char                        path_pattern[256];
+	int32_t                     node_index; /* Index of the node in 
+						   this pattern. */
+	int32_t                     num_child;  /* Total num of child nodes 
+						   with this pattern. */
+};
+
+struct switch_struct {
+	struct switch_sched_struct *cond;
+	struct switch_sched_array  *array;
+	pthread_mutex_t             switch_mutex;
+	int32_t                     child_count;
+};
+
+/* This function should return child node as '*:subvolumes' is inserterd */
+static xlator_t *
+switch_get_matching_xl (const char *path, struct switch_sched_struct *cond)
+{
+	struct switch_sched_struct *trav      = cond;
+	char                       *pathname  = gf_strdup (path);
+	int                         index     = 0;
+
+	while (trav) {
+		if (fnmatch (trav->path_pattern, 
+			     pathname, FNM_NOESCAPE) == 0) {
+			GF_FREE (pathname);
+			trav->node_index %= trav->num_child;
+			index = (trav->node_index++) % trav->num_child;
+			return trav->array[index].xl;
+		}
+		trav = trav->next;
+	}
+	GF_FREE (pathname);
+	return NULL;
+}
+
+static int32_t
+gf_unify_valid_child (const char *child, 
+                      xlator_t *xl)
+{
+        xlator_list_t *children = NULL, *prev = NULL;
+        int32_t  ret = 0;
+
+        children = xl->children;
+        do {
+                if (!strcmp (child, children->xlator->name)) {
+                        ret = 1;
+                        break;
+                }
+                
+                prev = children;
+                children = prev->next;
+        } while (children);
+
+        return ret;
+}
+
+static int32_t
+switch_init (xlator_t *xl)
+{
+	int32_t index = 0;
+	data_t *data = NULL;
+	char *child = NULL;
+	char *tmp = NULL;
+	char *childs_data = NULL;
+	xlator_list_t *trav_xl = xl->children;
+	struct switch_struct *switch_buf = NULL;
+  
+	switch_buf = GF_CALLOC (1, sizeof (struct switch_struct),
+                                gf_switch_mt_switch_struct);
+	ERR_ABORT (switch_buf);
+
+	while (trav_xl) {
+		index++;
+		trav_xl = trav_xl->next;
+	}
+	switch_buf->child_count = index;
+	switch_buf->array = GF_CALLOC (index + 1,
+                                       sizeof (struct switch_sched_struct),
+                                       gf_switch_mt_switch_sched_struct);
+	ERR_ABORT (switch_buf->array);
+	trav_xl = xl->children;
+	index = 0;
+
+	while (trav_xl) {
+		switch_buf->array[index].xl = trav_xl->xlator;
+		switch_buf->array[index].eligible = 1;
+		trav_xl = trav_xl->next;
+		index++;
+	}
+
+	data = dict_get (xl->options, "scheduler.read-only-subvolumes");
+	if (data) {
+		childs_data = gf_strdup (data->data);
+		child = strtok_r (childs_data, ",", &tmp);
+		while (child) {
+			for (index = 1; 
+			     index < switch_buf->child_count; index++) {
+				if (strcmp (switch_buf->array[index - 1].xl->name, child) == 0) {
+					gf_log ("switch", GF_LOG_DEBUG, 
+						"Child '%s' is read-only", 
+						child);
+					memcpy (&(switch_buf->array[index-1]),
+						&(switch_buf->array[switch_buf->child_count - 1]), 
+						sizeof (struct switch_sched_array));
+					switch_buf->child_count--;
+					break;
+				}
+			}
+			child = strtok_r (NULL, ",", &tmp);
+		}
+		GF_FREE (childs_data);
+	}
+
+	data = dict_get (xl->options, "scheduler.local-volume-name");
+	if (data) {
+		/* Means, give preference to that node first */
+		gf_log ("switch", GF_LOG_DEBUG, 
+			"local volume defined as %s", data->data);
+
+		/* TODO: parse it properly, have an extra index to 
+		   specify that first */
+	}
+
+	/*  *jpg:child1,child2;*mpg:child3;*:child4,child5,child6 */
+	data = dict_get (xl->options, "scheduler.switch.case");
+	if (data) {
+		char *tmp_str = NULL; 
+		char *tmp_str1 = NULL;
+		char *dup_str = NULL;
+		char *switch_str = NULL;
+		char *pattern = NULL;
+		char *childs = NULL;
+		struct switch_sched_struct *switch_opt = NULL;
+		struct switch_sched_struct *trav = NULL;
+		/* Get the pattern for considering switch case. 
+		   "option block-size *avi:10MB" etc */
+		switch_str = strtok_r (data->data, ";", &tmp_str);
+		while (switch_str) {
+			dup_str = gf_strdup (switch_str);
+			switch_opt = 
+				GF_CALLOC (1, sizeof (struct switch_sched_struct), gf_switch_mt_switch_sched_struct);
+			ERR_ABORT (switch_opt);
+
+			/* Link it to the main structure */
+			if (switch_buf->cond) {
+				/* there are already few entries */
+				trav = switch_buf->cond;
+				while (trav->next)
+					trav = trav->next;
+				trav->next = switch_opt;
+			} else {
+				/* First entry */
+				switch_buf->cond = switch_opt;
+			}
+			pattern = strtok_r (dup_str, ":", &tmp_str1);
+			childs = strtok_r (NULL, ":", &tmp_str1);
+			if (strncmp (pattern, "*", 2) == 0) {
+				gf_log ("switch", GF_LOG_WARNING,
+					"'*' pattern will be taken by default "
+					"for all the unconfigured child nodes,"
+					" hence neglecting current option");
+				switch_str = strtok_r (NULL, ";", &tmp_str);
+				GF_FREE (dup_str);
+				continue;
+			}
+			memcpy (switch_opt->path_pattern, 
+				pattern, strlen (pattern));
+			if (childs) {
+				int32_t idx = 0;
+				char *tmp1 = NULL;
+				char *dup_childs = NULL;
+				/* TODO: get the list of child nodes for 
+				   the given pattern */
+				dup_childs = gf_strdup (childs);
+				child = strtok_r (dup_childs, ",", &tmp);
+				while (child) {
+                                        if (gf_unify_valid_child (child, xl)) {
+                                                idx++;
+                                                child = strtok_r (NULL, ",", &tmp);
+                                        } else {
+                                                gf_log ("switch", GF_LOG_ERROR,
+                                                        "%s is not a subvolume "
+                                                        "of %s. pattern can "
+                                                        "only be scheduled only"
+                                                        " to a subvolume of %s",
+                                                        child, xl->name,
+                                                        xl->name);
+                                                return -1;
+                                        }
+				}
+				GF_FREE (dup_childs);
+				child = strtok_r (childs, ",", &tmp1);
+				switch_opt->num_child = idx;
+				switch_opt->array = 
+					GF_CALLOC (1, idx * sizeof (struct switch_sched_array), gf_switch_mt_switch_sched_array);
+				ERR_ABORT (switch_opt->array);
+				idx = 0;
+				child = strtok_r (childs, ",", &tmp);
+				while (child) {
+					for (index = 1; 
+					     index < switch_buf->child_count; 
+					     index++) {
+						if (strcmp (switch_buf->array[index - 1].xl->name, 
+							    child) == 0) {
+							gf_log ("switch", 
+								GF_LOG_DEBUG,
+								"'%s' pattern will be scheduled to \"%s\"",
+								switch_opt->path_pattern, child);
+							/*
+							  if (switch_buf->array[index-1].considered) {
+							  gf_log ("switch", GF_LOG_DEBUG, 
+							  "ambiguity found, exiting");
+							  return -1;
+							  }
+							*/
+							switch_opt->array[idx].xl = switch_buf->array[index-1].xl;
+							switch_buf->array[index-1].considered = 1;
+							idx++;
+							break;
+						}
+					}
+					child = strtok_r (NULL, ",", &tmp1);
+				}
+			} else {
+				/* error */
+				gf_log ("switch", GF_LOG_ERROR, 
+					"Check \"scheduler.switch.case\" "
+					"option in unify volume. Exiting");
+				GF_FREE (switch_buf->array);
+				GF_FREE (switch_buf);
+				return -1;
+			}
+			GF_FREE (dup_str);
+			switch_str = strtok_r (NULL, ";", &tmp_str);
+		}
+	}
+	/* Now, all the pattern based considerations done, so for all the 
+	 * remaining pattern, '*' to all the remaining child nodes
+	 */
+	{
+		struct switch_sched_struct *switch_opt = NULL;
+		int32_t flag = 0;
+		int32_t index = 0;
+		for (index=0; index < switch_buf->child_count; index++) {
+			/* check for considered flag */
+			if (switch_buf->array[index].considered)
+				continue;
+			flag++;
+		}
+		if (!flag) {
+			gf_log ("switch", GF_LOG_ERROR,
+				"No nodes left for pattern '*'. Exiting.");
+			return -1;
+		}
+		switch_opt = GF_CALLOC (1, sizeof (struct switch_sched_struct), gf_switch_mt_switch_sched_struct);
+		ERR_ABORT (switch_opt);
+		if (switch_buf->cond) {
+			/* there are already few entries */
+			struct switch_sched_struct *trav = switch_buf->cond;
+			while (trav->next)
+				trav = trav->next;
+			trav->next = switch_opt;
+		} else {
+			/* First entry */
+			switch_buf->cond = switch_opt;
+		}
+		/* Add the '*' pattern to the array */
+		memcpy (switch_opt->path_pattern, "*", 2);
+		switch_opt->num_child = flag;
+		switch_opt->array = 
+			GF_CALLOC (1, flag * sizeof (struct switch_sched_array), gf_switch_mt_switch_sched_array);
+		ERR_ABORT (switch_opt->array);
+		flag = 0;
+		for (index=0; index < switch_buf->child_count; index++) {
+			/* check for considered flag */
+			if (switch_buf->array[index].considered)
+				continue;
+			gf_log ("switch", GF_LOG_DEBUG,
+				"'%s' pattern will be scheduled to \"%s\"",
+				switch_opt->path_pattern, 
+				switch_buf->array[index].xl->name);
+			switch_opt->array[flag].xl = 
+				switch_buf->array[index].xl;
+			switch_buf->array[index].considered = 1;
+			flag++;
+		}
+	}
+
+	pthread_mutex_init (&switch_buf->switch_mutex, NULL);
+
+	// put it at the proper place
+	*((long *)xl->private) = (long)switch_buf; 
+
+	return 0;
+}
+
+static void
+switch_fini (xlator_t *xl)
+{
+	/* TODO: free all the allocated entries */
+	struct switch_struct *switch_buf = NULL;
+	switch_buf = (struct switch_struct *)*((long *)xl->private);
+
+	pthread_mutex_destroy (&switch_buf->switch_mutex);
+	GF_FREE (switch_buf->array);
+	GF_FREE (switch_buf);
+}
+
+static xlator_t *
+switch_schedule (xlator_t *xl, const void *path)
+{
+	struct switch_struct *switch_buf = NULL;
+	switch_buf = (struct switch_struct *)*((long *)xl->private);
+
+	return switch_get_matching_xl (path, switch_buf->cond);
+}
+
+
+/**
+ * notify
+ */
+void
+switch_notify (xlator_t *xl, int32_t event, void *data)
+{
+	/* TODO: This should be checking in switch_sched_struct */
+#if 0
+	struct switch_struct *switch_buf = NULL;
+	int32_t idx = 0;
+
+	switch_buf = (struct switch_struct *)*((long *)xl->private);
+	if (!switch_buf)
+		return;
+
+	for (idx = 0; idx < switch_buf->child_count; idx++) {
+		if (switch_buf->array[idx].xl == (xlator_t *)data)
+			break;
+	}
+
+	switch (event)
+	{
+	case GF_EVENT_CHILD_UP:
+	{
+		switch_buf->array[idx].eligible = 1;
+	}
+	break;
+	case GF_EVENT_CHILD_DOWN:
+	{
+		switch_buf->array[idx].eligible = 0;
+	}
+	break;
+	default:
+	{
+		;
+	}
+	break;
+	}
+#endif
+}
+
+static void 
+switch_update (xlator_t *xl)
+{
+	return;
+}
+        
+int32_t
+switch_mem_acct_init (xlator_t *this)
+{
+        int     ret = -1;
+
+        if (!this)
+                return ret;
+
+        ret = xlator_mem_acct_init (this, gf_switch_mt_end + 1);
+        
+        if (ret != 0) {
+                gf_log (this->name, GF_LOG_ERROR, "Memory accounting init"
+                        " failed");
+                return ret;
+        }
+
+        return ret;
+}
+
+struct sched_ops sched = {
+	.init     = switch_init,
+	.fini     = switch_fini,
+	.update   = switch_update,
+	.schedule = switch_schedule,
+	.notify   = switch_notify,
+        .mem_acct_init = switch_mem_acct_init,
+};
+
+struct volume_options options[] = {
+	{ .key   = { "scheduler.read-only-subvolumes" ,
+		     "switch.read-only-subvolumes"},  
+	  .type  = GF_OPTION_TYPE_ANY
+	},
+	{ .key   = { "scheduler.local-volume-name",
+		     "switch.nufa.local-volume-name" },
+	  .type  = GF_OPTION_TYPE_XLATOR
+	},
+	{ .key   = { "scheduler.switch.case",
+		     "switch.case" },
+	  .type  = GF_OPTION_TYPE_ANY
+	},
+	{ .key = {NULL} }
+};
diff --git a/smoke.sh b/smoke.sh
new file mode 100755
index 000000000..8095da469
--- /dev/null
+++ b/smoke.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+set -e;
+
+M=/mnt;
+P=/build;
+H=$(hostname);
+T=600;
+V=patchy;
+
+
+function cleanup()
+{
+    killall -15 glusterfs glusterfsd glusterd glusterd 2>&1 || true;
+    killall -9 glusterfs glusterfsd glusterd glusterd 2>&1 || true;
+    umount -l $M 2>&1 || true;
+    rm -rf /etc/glusterd $P/export;
+}
+
+function start_fs()
+{
+    mkdir -p $P/export;
+    chmod 0755 $P/export;
+
+    glusterd;
+    gluster volume create $V replica 2 $H:$P/export/export{1,2,3,4};
+    gluster volume start $V;
+    glusterfs -s $H --volfile-id $V $M;
+#    mount -t glusterfs $H:/$V $M;
+}
+
+
+function run_tests()
+{
+    cd $M;
+
+    (sleep 1; dbench -s -t 60 10 >/dev/null) &
+
+    (sleep 1; /opt/qa/tools/posix_compliance.sh) &
+
+    wait %2
+    wait %3
+
+    rm -rf clients;
+
+    cd -;
+}
+
+
+function watchdog ()
+{
+    # insurance against hangs during the test
+
+    sleep $1;
+
+    echo "Kicking in watchdog after $1 secs";
+
+    cleanup;
+}
+
+
+function finish ()
+{
+    cleanup;
+    kill %1;
+}
+
+function main ()
+{
+    cleanup;
+
+    watchdog $T &
+
+    trap finish EXIT;
+
+    set -x;
+
+    start_fs;
+
+    run_tests;
+}
+
+main "$@";
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index 2b5ed8dcd..000000000
--- a/tests/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Regression tests framework for GlusterFS
-========================================
-
-## Prereq
-- Build and install the version of glusterfs with your changes. Make
-  sure the installed version is accessible from $PATH.
-
-## How-To
-- To mount glusterfs, NEVER use 'mount -t glusterfs', instead use
-  'glusterfs -s ' method. This is because with the patch build setup
-  doesnot install the /sbin/mount.glusterfs necessary, where as the
-  glusterfs binary will be accessible with $PATH, and will pick the
-  right version.
-- (optional) Set environment variables to specify location of
-  export directories and mount points. Unless you have special
-  requirements, the defaults should just work. The variables
-  themselves can be found at the top of tests/include.rc. All
-  of them can be overriden with environment variables.
-
-## Usage
-- Execute `/usr/share/glusterfs/run-tests.sh` as root.
-
-- If some test cases fail, report to GlusterFS community at
-  `gluster-devel@nongnu.org`.
-
-## Reminder
-- BE WARNED THAT THE TEST CASES DELETE /var/lib/glusterd/* !!!
-\ No newline at end of file
diff --git a/tests/afr.rc b/tests/afr.rc
deleted file mode 100644
index 60ea1b7f1..000000000
--- a/tests/afr.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-#count the number of entries marked for self-heal
-#in brick $1's index
-
-function count_sh_entries()
-{
-    val1=0
-    for g in `ls $1/.glusterfs/indices/xattrop`
-    do
-	val1=$(( val1 + 1 ))
-    done
-
-    echo $val1;
-}
diff --git a/tests/basic/bd.t b/tests/basic/bd.t
deleted file mode 100755
index eb6305414..000000000
--- a/tests/basic/bd.t
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-function execute()
-{
-        cmd=$1
-        shift
-        ${cmd} $@ >/dev/null 2>&1
-}
-
-function bd_cleanup()
-{
-        execute vgremove -f ${V0}
-        execute pvremove ${ld}
-        execute losetup -d ${ld}
-        execute rm ${BD_DISK}
-        cleanup
-}
-
-function check()
-{
-        if [ $? -ne 0 ]; then
-                echo prerequsite $@ failed
-                bd_cleanup
-                exit
-        fi
-}
-
-SIZE=256 #in MB
-
-bd_cleanup;
-
-## Configure environment needed for BD backend volumes
-## Create a file with configured size and
-## set it as a temporary loop device to create
-## physical volume & VG. These are basic things needed
-## for testing BD xlator if anyone of these steps fail,
-## test script exits
-function configure()
-{
-    GLDIR=`$CLI system:: getwd`
-    BD_DISK=${GLDIR}/bd_disk
-
-    execute truncate -s${SIZE}M ${BD_DISK}
-    check ${BD_DISK} creation
-
-    execute losetup -f
-    check losetup
-    ld=`losetup -f`
-
-    execute losetup ${ld} ${BD_DISK}
-    check losetup ${BD_DISK}
-    execute pvcreate -f ${ld}
-    check pvcreate ${ld}
-    execute vgcreate ${V0} ${ld}
-    check vgcreate ${V0}
-    execute lvcreate --thin ${V0}/pool --size 128M
-}
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-function volume_type()
-{
-        getfattr -n volume.type $M0/. --only-values --absolute-names -e text
-}
-
-TEST glusterd
-TEST pidof glusterd
-configure
-
-TEST $CLI volume create $V0 ${H0}:/$B0/$V0?${V0}
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status'
-
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
-EXPECT '1' volume_type
-
-## Create posix file
-TEST touch $M0/posix
-
-TEST touch $M0/lv
-gfid=`getfattr -n glusterfs.gfid.string $M0/lv --only-values --absolute-names`
-TEST setfattr -n user.glusterfs.bd -v "lv:4MB" $M0/lv
-# Check if LV is created
-TEST stat /dev/$V0/${gfid}
-
-## Create filesystem
-sleep 1
-TEST mkfs.ext4 -qF $M0/lv
-# Cloning
-TEST touch $M0/lv_clone
-gfid=`getfattr -n glusterfs.gfid.string $M0/lv_clone --only-values --absolute-names`
-TEST setfattr -n clone -v ${gfid} $M0/lv
-TEST stat /dev/$V0/${gfid}
-
-sleep 1
-## Check mounting
-TEST mount -o loop $M0/lv $M1
-umount $M1
-
-# Snapshot
-TEST touch $M0/lv_sn
-gfid=`getfattr -n glusterfs.gfid.string $M0/lv_sn --only-values --absolute-names`
-TEST setfattr -n snapshot -v ${gfid} $M0/lv
-TEST stat /dev/$V0/${gfid}
-
-# Merge
-sleep 1
-TEST setfattr -n merge -v "$M0/lv_sn" $M0/lv_sn
-TEST ! stat $M0/lv_sn
-TEST ! stat /dev/$V0/${gfid}
-
-
-rm $M0/* -f
-
-TEST umount $M0
-TEST $CLI volume stop ${V0}
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-TEST $CLI volume delete ${V0}
-
-bd_cleanup
diff --git a/tests/basic/cdc.t b/tests/basic/cdc.t
deleted file mode 100755
index 4cd915aa9..000000000
--- a/tests/basic/cdc.t
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-## Create a volume with one brick
-TEST $CLI volume create $V0 $H0:$B0/${V0}1;
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '1' brick_count $V0
-
-## Turn off performance translators
-## This is required for testing readv calls
-TEST $CLI volume set $V0 performance.io-cache off
-EXPECT 'off' volinfo_field $V0 'performance.io-cache'
-TEST $CLI volume set $V0 performance.quick-read off
-EXPECT 'off' volinfo_field $V0 'performance.quick-read'
-
-TEST $CLI volume set $V0 strict-write-ordering on
-EXPECT 'on' volinfo_field $V0 'performance.strict-write-ordering'
-
-## Turn on cdc xlator by setting features.compress to on
-TEST $CLI volume set $V0 compress on
-EXPECT 'on' volinfo_field $V0 'features.compress'
-EXPECT 'server' volinfo_field $V0 'compress.mode'
-
-## Make sure that user cannot change compress.mode
-## This would break the cdc xlator if allowed!
-TEST $CLI volume set $V0 compress.mode client
-EXPECT 'server' volinfo_field $V0 'compress.mode'
-
-## Turn on compress.debug option
-## This will dump compressed data onto disk as gzip file
-## This is used to check if compression actually happened
-TEST $CLI volume set $V0 compress.debug on
-EXPECT 'on' volinfo_field $V0 'compress.debug'
-
-## Start the volume
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-####################
-## Testing writev ##
-####################
-
-## Create a 1K file locally and find the md5sum
-TEST dd if=/dev/zero of=/tmp/cdc-orig count=1 bs=1K 2>/dev/null
-checksum[original-file]=`md5sum /tmp/cdc-orig | cut -d' ' -f1`
-
-## Copy the file to mountpoint and find its md5sum on brick
-TEST dd if=/tmp/cdc-orig of=$M0/cdc-server count=1 bs=1K 2>/dev/null
-checksum[brick-file]=`md5sum $B0/${V0}1/cdc-server | cut -d' ' -f1`
-
-## Uncompress the gzip dump file and find its md5sum
-EXPECT '/tmp/cdcdump.gz: application/x-gzip; charset=binary' file -i /tmp/cdcdump.gz
-TEST gunzip -f /tmp/cdcdump.gz
-checksum[dump-file-writev]=`md5sum /tmp/cdcdump | cut -d' ' -f1`
-
-## Check if all 3 checksums are same
-TEST test ${checksum[original-file]} = ${checksum[brick-file]}
-TEST test ${checksum[brick-file]} = ${checksum[dump-file-writev]}
-
-## Cleanup files
-TEST rm -f /tmp/cdcdump.gz
-
-###################
-## Testing readv ##
-###################
-
-## Copy file from mount point to client and find checksum
-TEST dd if=$M0/cdc-server of=/tmp/cdc-client count=1 bs=1K 2>/dev/null
-checksum[client-file]=`md5sum /tmp/cdc-client | cut -d' ' -f1`
-
-## Uncompress the gzip dump file and find its md5sum
-EXPECT '/tmp/cdcdump.gz: application/x-gzip; charset=binary' file -i /tmp/cdcdump.gz
-TEST gunzip -f /tmp/cdcdump.gz
-checksum[dump-file-readv]=`md5sum /tmp/cdcdump | cut -d' ' -f1`
-
-## Check if all 3 checksums are same
-TEST test ${checksum[brick-file]} = ${checksum[client-file]}
-TEST test ${checksum[client-file]} = ${checksum[dump-file-readv]}
-
-## Cleanup files and unmount
-TEST rm -f /tmp/cdc* $M0/cdc*
-TEST umount $M0
-
-## Stop the volume
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-## Turn on compress.min-size and set it to 100 bytes
-## Compression should not take place if file size
-## is less than 100 bytes
-TEST $CLI volume set $V0 compress.min-size 100
-EXPECT '100' volinfo_field $V0 'compress.min-size'
-
-## Start the volume
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-## Create a file of size 99 bytes on mountpoint
-## This is should not be compressed
-TEST dd if=/dev/zero of=$M0/cdc-small count=1 bs=99 2>/dev/null
-TEST ! test -e /tmp/cdcdump.gz
-
-## Cleanup files and unmount
-TEST rm -f /tmp/cdc* $M0/cdc*
-TEST umount $M0
-
-## Reset the compress options
-TEST $CLI volume reset $V0 compress.debug
-TEST $CLI volume reset $V0 compress.min-size
-TEST $CLI volume reset $V0 compress.mode
-TEST $CLI volume reset $V0 features.compress
-
-## Stop the volume
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-## Delete the volume
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/basic/file-snapshot.t b/tests/basic/file-snapshot.t
deleted file mode 100755
index 36908192b..000000000
--- a/tests/basic/file-snapshot.t
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/$V0;
-
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-TEST $CLI volume set $V0 features.file-snapshot on;
-
-TEST $CLI volume set $V0 performance.quick-read off;
-TEST $CLI volume set $V0 performance.io-cache off;
-TEST glusterfs -s $H0 --volfile-id $V0 $M0 --attribute-timeout=0;
-
-TEST touch $M0/big-file;
-
-TEST setfattr -n trusted.glusterfs.block-format -v qcow2:10GB $M0/big-file;
-
-TEST ls -al $M0 # test readdirplus
-TEST [ `stat -c '%s' $M0/big-file` = 10737418240 ]
-
-echo 'ABCDEFGHIJ' > $M0/data-file1
-TEST dd if=$M0/data-file1 of=$M0/big-file conv=notrunc;
-TEST setfattr -n trusted.glusterfs.block-snapshot-create -v image1 $M0/big-file;
-
-echo '1234567890' > $M0/data-file2
-TEST dd if=$M0/data-file2 of=$M0/big-file conv=notrunc;
-TEST setfattr -n trusted.glusterfs.block-snapshot-create -v image2 $M0/big-file;
-
-TEST setfattr -n trusted.glusterfs.block-snapshot-goto -v image1 $M0/big-file;
-TEST dd if=$M0/big-file of=$M0/out-file1 bs=11 count=1;
-
-TEST setfattr -n trusted.glusterfs.block-snapshot-goto -v image2 $M0/big-file;
-TEST dd if=$M0/big-file of=$M0/out-file2 bs=11 count=1;
-
-TEST cmp $M0/data-file1 $M0/out-file1;
-TEST cmp $M0/data-file2 $M0/out-file2;
-
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/basic/mount.t b/tests/basic/mount.t
deleted file mode 100755
index 90e522c5e..000000000
--- a/tests/basic/mount.t
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-## Start and create a volume
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-
-## Make volume tightly consistent for metdata
-TEST $CLI volume set $V0 performance.stat-prefetch off;
-
-## Mount FUSE with caching disabled (read-write)
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-## Check consistent "rw" option
-TEST 'mount -t fuse.glusterfs | grep -E "^$H0:$V0 .+ \(rw,"';
-TEST 'grep -E "^$H0:$V0 .+ ,?rw," /proc/mounts';
-
-## Mount FUSE with caching disabled (read-only)
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --read-only -s $H0 --volfile-id $V0 $M1;
-
-## Check consistent "ro" option
-TEST 'mount -t fuse.glusterfs | grep -E "^$H0:$V0 .+ \(ro,"';
-TEST 'grep -E "^$H0:$V0 .+ ,?ro,.+" /proc/mounts';
-
-## Wait for volume to register with rpc.mountd
-sleep 5;
-
-## Mount NFS
-TEST mount -t nfs -o nolock,soft,intr $H0:/$V0 $N0;
-
-
-## Test for consistent views between NFS and FUSE mounts
-## write access to $M1 should fail
-TEST ! stat $M0/newfile;
-TEST ! touch $M1/newfile;
-TEST touch $M0/newfile;
-TEST stat $M1/newfile;
-TEST stat $N0/newfile;
-TEST ! rm $M1/newfile;
-TEST rm $N0/newfile;
-TEST ! stat $M0/newfile;
-TEST ! stat $M1/newfile;
-
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/basic/nufa.t b/tests/basic/nufa.t
deleted file mode 100644
index 0d4c229a0..000000000
--- a/tests/basic/nufa.t
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '8' brick_count $V0
-
-TEST $CLI volume set $V0 nufa on;
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Mount FUSE with caching disabled (read-only)
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --read-only -s $H0 --volfile-id $V0 $M1;
-
-## Wait for volume to register with rpc.mountd
-sleep 5;
-
-## Mount NFS
-TEST mount -t nfs -o nolock,soft,intr $H0:/$V0 $N0;
-
-cleanup;
diff --git a/tests/basic/posixonly.t b/tests/basic/posixonly.t
deleted file mode 100755
index b9de317a4..000000000
--- a/tests/basic/posixonly.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST mkdir -p $B0/posixonly
-cat > $B0/posixonly.vol <<EOF
-volume poisxonly
-  type storage/posix
-  option directory $B0/posixonly
-end-volume
-EOF
-
-TEST glusterfs -f $B0/posixonly.vol $M0;
-
-TEST touch $M0/filename;
-TEST stat $M0/filename;
-TEST mkdir $M0/dirname;
-TEST stat $M0/dirname;
-TEST touch $M0/dirname/filename;
-TEST stat $M0/dirname/filename;
-TEST ln $M0/dirname/filename $M0/dirname/linkname;
-TEST chown 100:100 $M0/dirname/filename;
-TEST chown 100:100 $M0/dirname;
-TEST rm -rf $M0/filename $M0/dirname;
-
-TEST umount $M0;
-
-cleanup;
diff --git a/tests/basic/pump.t b/tests/basic/pump.t
deleted file mode 100644
index 3faf06f05..000000000
--- a/tests/basic/pump.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}0
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-cd $M0
-for i in {1..3}
-do
-        for j in {1..10}
-        do
-                dd if=/dev/urandom of=file$j bs=128K count=10 2>/dev/null 1>/dev/null
-        done
-        mkdir dir$i && cd dir$i
-done
-cd
-TEST umount $M0
-TEST $CLI volume replace-brick $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 start
-EXPECT_WITHIN 60 "Y" gd_is_replace_brick_completed $H0 $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume replace-brick $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 commit
-TEST $CLI volume stop $V0
-TEST diff -r --exclude=.glusterfs $B0/${V0}0 $B0/${V0}1
-
-files=""
-
-cd $B0/${V0}0
-for f in `find . -path ./.glusterfs -prune  -o -print`;
-do
-        if [ -d $f ]; then continue; fi
-        cmp $f $B0/${V0}1/$f
-        if [ $? -ne 0 ]; then
-                files="$files $f"
-        fi
-done
-
-EXPECT "" echo $files
-
-cleanup
diff --git a/tests/basic/quota.t b/tests/basic/quota.t
deleted file mode 100755
index ef015a30d..000000000
--- a/tests/basic/quota.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-function limit_on()
-{
-        local QUOTA_PATH=$1;
-        $CLI volume quota $V0 list | grep "$QUOTA_PATH" | awk '{print $2}'
-}
-
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '8' brick_count $V0
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## ------------------------------
-## Verify quota commands
-## ------------------------------
-TEST $CLI volume quota $V0 enable
-
-TEST $CLI volume quota $V0 limit-usage /test_dir 100MB
-
-TEST $CLI volume quota $V0 limit-usage /test_dir/in_test_dir 150MB
-
-EXPECT "150MB" limit_on "/test_dir/in_test_dir";
-
-TEST $CLI volume quota $V0 remove /test_dir/in_test_dir
-
-EXPECT "100MB" limit_on "/test_dir";
-
-TEST $CLI volume quota $V0 disable
-## ------------------------------
-
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/basic/rpm.t b/tests/basic/rpm.t
deleted file mode 100755
index a577726a8..000000000
--- a/tests/basic/rpm.t
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-#
-# This test will run mock and rebuild the srpm for the latest two EPEL version.
-# By default, the results and the chroots are deleted.
-#
-# When debugging is needed, make sure to set DEBUG=1 in the environment or this
-# script. When debugging is enabled, the resulting log files and chroots are
-# kept. With debugging enabled, this test will fail the regression test, and
-# all output is saved to rpmbuild-mock.log. Tests are run in parallel, so the
-# logfile may be difficult to read.
-#
-# chroots are configured in /etc/mock/*.cfg, with site-defaults.cfg as main
-# configuration file. The default for chroots is /var/lib/mock, but this
-# depends on the 'basedir' configuration option set in the mentioned files.
-#
-
-. $(dirname $0)/../include.rc
-
-# enable some extra debugging
-if [ -n "${DEBUG}" -a "${DEBUG}" != "0" ]
-then
-	exec &> rpmbuild-mock.log
-	set -x
-        MOCK_CLEANUP='--no-cleanup-after'
-else
-        MOCK_CLEANUP='--cleanup-after'
-fi
-
-# detect the branch we're based off
-if [ -n "${BRANCH}" ] ; then
-        # $BRANCH is set in the environment (by Jenkins or other)
-        GIT_PARENT="origin/${BRANCH}"
-else
-        # get a reference to the latest clean tree
-        GIT_PARENT=$(git describe --abbrev=0)
-fi
-
-# Filter out everything and what remains needs to be built
-BUILD_FILES=$(git diff --name-status ${GIT_PARENT} | grep -Ev '^M.*\.(c|h|py)' | awk {'print $2'})
-SELFTEST=$(grep -e 'tests/basic/rpm.t' <<< "${BUILD_FILES}")
-BUILD_FILES=$(grep -Ev '^tests/' <<< "${BUILD_FILES}")
-if [ -z "${BUILD_FILES}" -a -z "${SELFTEST}" ]
-then
-        # nothing affecting packaging changed, no need to retest rpmbuild
-        SKIP_TESTS
-        cleanup
-        exit 0
-fi
-
-# checkout the sources to a new directory to execute ./configure and all
-REPO=${PWD}
-COMMIT=$(git describe)
-mkdir rpmbuild-mock.d
-pushd rpmbuild-mock.d 2>/dev/null
-git clone -q -s file://${REPO} .
-git checkout -q -b rpm-test ${COMMIT}
-
-# build the glusterfs-*.tar.gz
-[ -e configure ] || ./autogen.sh 2>&1 > /dev/null
-TEST ./configure --enable-fusermount
-TEST make dist
-
-# build the glusterfs src.rpm
-ls extras
-TEST make -C extras/LinuxRPM testsrpm
-
-# build for the last two Fedora EPEL releases (x86_64 only)
-for MOCK_CONF in $(ls -x1 /etc/mock/*.cfg | egrep -e 'epel-[0-9]+-x86_64.cfg$' | tail -n2)
-do
-	EPEL_RELEASE=$(basename ${MOCK_CONF} .cfg)
-	# expand the mock command line
-	MOCK_CMD="/usr/bin/mock ${MOCK_CLEANUP} \
-		-r ${EPEL_RELEASE} --rebuild ${PWD}/*.src.rpm"
-
-	# write the mock command to a file, so that its easier to execute
-	cat << EOF > mock-${EPEL_RELEASE}.sh
-#!/bin/sh
-${MOCK_CMD}
-EOF
-	chmod +x mock-${EPEL_RELEASE}.sh
-
-	# root can not run 'mock', it needs to drop priviledges
-	if (groups | grep -q mock)
-	then
-		# the current user is in group 'mock'
-		${PWD}/mock-${EPEL_RELEASE}.sh &
-	else
-		# "su" might not work, using sudo instead
-		sudo -u mock -E ${PWD}/mock-${EPEL_RELEASE}.sh &
-	fi
-	sleep 5
-done
-
-# TAP and Prove aren't smart about loops
-TESTS_EXPECTED_IN_LOOP=2
-for mockjob in $(jobs -p)
-do
-	TEST_IN_LOOP wait ${mockjob}
-done
-
-# we could build for the last two Fedora releases too, but that is not
-# possible on EPEL-5/6 installations, Fedora 17 and newer have unmet
-# dependencies on the build-server :-/
-
-popd 2>/dev/null
-# only remove rpmbuild-mock.d if we're not debugging
-[ "${DEBUG}" = "0" ] && rm -rf rpmbuild-mock.d
-
-cleanup
diff --git a/tests/basic/self-heald.t b/tests/basic/self-heald.t
deleted file mode 100644
index 4468c881b..000000000
--- a/tests/basic/self-heald.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1,2,3,4,5}
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST $CLI volume set $V0 cluster.eager-lock off
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST kill_brick $V0 $H0 $B0/${V0}0
-TEST kill_brick $V0 $H0 $B0/${V0}2
-TEST kill_brick $V0 $H0 $B0/${V0}4
-cd $M0
-HEAL_FILES=0
-for i in {1..10}
-do
-        dd if=/dev/urandom of=f bs=1M count=10 2>/dev/null
-        HEAL_FILES=$(($HEAL_FILES+1))
-        mkdir a; cd a;
-        HEAL_FILES=$(($HEAL_FILES+3)) #As many times as distribute subvols
-done
-HEAL_FILES=$(($HEAL_FILES + 3)) #Count the brick root dir
-
-cd ~
-EXPECT "$HEAL_FILES" afr_get_pending_heal_count $V0
-TEST ! $CLI volume heal $V0
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST ! $CLI volume heal $V0 info
-TEST ! $CLI volume heal $V0
-TEST $CLI volume start $V0 force
-TEST $CLI volume set $V0 cluster.self-heal-daemon on
-EXPECT_WITHIN 20 "Y" glustershd_up_status
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_shd $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_shd $V0 2
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_shd $V0 4
-TEST $CLI volume heal $V0
-sleep 5 #Until the heal-statistics command implementation
-#check that this heals the contents partially
-TEST [ $HEAL_FILES -gt $(afr_get_pending_heal_count $V0) ]
-
-TEST $CLI volume heal $V0 full
-EXPECT_WITHIN 30 "0" afr_get_pending_heal_count $V0
-cleanup
diff --git a/tests/basic/volume-status.t b/tests/basic/volume-status.t
deleted file mode 100644
index f4196ac30..000000000
--- a/tests/basic/volume-status.t
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-TEST $CLI volume start $V0;
-
-sleep 2
-
-## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-
-## Mount NFS
-TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $N0;
-
-TEST $CLI volume status all
-TEST $CLI volume status $V0
-
-EXPECT_WITHIN 10 'Y' nfs_up_status
-EXPECT_WITHIN 10 'Y' glustershd_up_status
-function test_nfs_cmds () {
-    local ret=0
-    declare -a nfs_cmds=("clients" "mem" "inode" "callpool")
-    for cmd in ${nfs_cmds[@]}; do
-        $CLI volume status $V0 nfs $cmd
-        (( ret += $? ))
-    done
-    return $ret
-}
-
-function test_shd_cmds () {
-    local ret=0
-    declare -a shd_cmds=("mem" "inode" "callpool")
-    for cmd in ${shd_cmds[@]}; do
-        $CLI volume status $V0 shd $cmd
-        (( ret += $? ))
-    done
-    return $ret
-}
-
-function test_brick_cmds () {
-    local ret=0
-    declare -a cmds=("detail" "clients" "mem" "inode" "fd" "callpool")
-    for cmd in ${cmds[@]}; do
-        for i in {1..2}; do
-            $CLI volume status $V0 $H0:$B0/${V0}$i $cmd
-            (( ret += $? ))
-        done
-    done
-    return $ret
-}
-
-TEST test_shd_cmds;
-TEST test_nfs_cmds;
-TEST test_brick_cmds;
-
-cleanup;
-
diff --git a/tests/basic/volume.t b/tests/basic/volume.t
deleted file mode 100755
index 2f9096055..000000000
--- a/tests/basic/volume.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '8' brick_count $V0
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}{9,10,11,12};
-EXPECT '12' brick_count $V0
-
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}{1,2,3,4};
-EXPECT '8' brick_count $V0
-
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/859927/repl.t b/tests/bugs/859927/repl.t
deleted file mode 100755
index 73c86e7be..000000000
--- a/tests/bugs/859927/repl.t
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-cleanup;
-
-TEST glusterd;
-TEST pidof glusterd
-
-#Tests for data-self-heal-algorithm option
-function create_setup_for_self_heal {
-        file=$1
-        kill_brick $V0 $H0 $B0/${V0}1
-        dd of=$file if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
-        $CLI volume start $V0 force
-}
-
-function test_write {
-        dd of=$M0/a if=/dev/urandom bs=1k count=1 2>&1 > /dev/null
-}
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume set $V0 performance.stat-prefetch off
-TEST $CLI volume set $V0 client-log-level DEBUG
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0;
-
-touch $M0/a
-
-TEST $CLI volume set $V0 cluster.data-self-heal-algorithm full
-EXPECT full volume_option $V0 cluster.data-self-heal-algorithm
-create_setup_for_self_heal $M0/a
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-ls -l $file 2>&1 > /dev/null
-TEST cmp $B0/${V0}1/a $B0/${V0}2/a
-
-TEST $CLI volume set $V0 cluster.data-self-heal-algorithm diff
-EXPECT diff volume_option $V0 cluster.data-self-heal-algorithm
-create_setup_for_self_heal $M0/a
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-ls -l $file 2>&1 > /dev/null
-TEST cmp $B0/${V0}1/a $B0/${V0}2/a
-
-TEST $CLI volume reset $V0 cluster.data-self-heal-algorithm
-create_setup_for_self_heal $M0/a
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-ls -l $file 2>&1 > /dev/null
-TEST cmp $B0/${V0}1/a $B0/${V0}2/a
-
-TEST ! $CLI volume set $V0 cluster.data-self-heal-algorithm ""
-
-#Tests for quorum-type option
-TEST ! $CLI volume set $V0 cluster.quorum-type ""
-TEST $CLI volume set $V0 cluster.quorum-type fixed
-EXPECT fixed volume_option $V0 cluster.quorum-type
-TEST $CLI volume set $V0 cluster.quorum-count 2
-kill_brick $V0 $H0 $B0/${V0}1
-TEST ! test_write
-TEST $CLI volume set $V0 cluster.quorum-type auto
-EXPECT auto volume_option $V0 cluster.quorum-type
-TEST ! test_write
-TEST $CLI volume set $V0 cluster.quorum-type none
-EXPECT none volume_option $V0 cluster.quorum-type
-TEST test_write
-TEST $CLI volume reset $V0 cluster.quorum-type
-TEST test_write
-cleanup;
diff --git a/tests/bugs/886998/strict-readdir.t b/tests/bugs/886998/strict-readdir.t
deleted file mode 100644
index 0de953e8a..000000000
--- a/tests/bugs/886998/strict-readdir.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-function num_files_in_dir {
-        d=$1
-        ls $d | sort | uniq | wc -l
-}
-
-#Basic sanity tests for readdir functionality
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/r2d2_0 $H0:$B0/r2d2_1 $H0:$B0/r2d2_2 $H0:$B0/r2d2_3
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-server=$H0 --volfile-id=/$V0 $M0
-
-TEST touch $M0/{1..100}
-EXPECT "100" num_files_in_dir $M0
-
-TEST kill_brick $V0 $H0 $B0/r2d2_0
-TEST kill_brick $V0 $H0 $B0/r2d2_2
-EXPECT "100" num_files_in_dir $M0
-
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 2
-
-TEST kill_brick $V0 $H0 $B0/r2d2_1
-TEST kill_brick $V0 $H0 $B0/r2d2_3
-EXPECT "100" num_files_in_dir $M0
-
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 3
-
-TEST $CLI volume set $V0 cluster.strict-readdir on
-EXPECT "on" volinfo_field $V0 cluster.strict-readdir
-TEST kill_brick $V0 $H0 $B0/r2d2_0
-TEST kill_brick $V0 $H0 $B0/r2d2_2
-EXPECT "100" num_files_in_dir $M0
-
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 2
-
-TEST kill_brick $V0 $H0 $B0/r2d2_1
-TEST kill_brick $V0 $H0 $B0/r2d2_3
-EXPECT "100" num_files_in_dir $M0
-cleanup;
diff --git a/tests/bugs/949327.t b/tests/bugs/949327.t
deleted file mode 100644
index 7b0c5c51a..000000000
--- a/tests/bugs/949327.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-function tmp_file_count()
-{
-echo $(ls -lh /tmp/tmp.* |  wc -l)
-}
-
-
-old_count=$(tmp_file_count);
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume start $V0
-new_count=$(tmp_file_count);
-
-TEST [ "$old_count" -eq "$new_count" ]
-
-cleanup
diff --git a/tests/bugs/bug-000000.t b/tests/bugs/bug-000000.t
deleted file mode 100755
index 7f3d15c9d..000000000
--- a/tests/bugs/bug-000000.t
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-
-cleanup;
diff --git a/tests/bugs/bug-1002207.t b/tests/bugs/bug-1002207.t
deleted file mode 100644
index 50b8c7d31..000000000
--- a/tests/bugs/bug-1002207.t
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-dd if=/dev/zero of=$M0/file$i.data bs=1024 count=1024 1>/dev/null 2>&1
-
-function xattr_query_check()
-{
-    local path=$1
-    local xa_name=$2
-
-    local ret=`getfattr -m . -n $xa_name $path 2>&1 | grep -o "$xa_name: No such attribute" | wc -l`
-    echo $ret
-}
-
-function set_xattr()
-{
-    local path=$1
-    local xa_name=$2
-    local xa_val=$3
-
-    setfattr -n $xa_name -v $xa_val $path
-    echo $?
-}
-
-EXPECT 0 set_xattr $M0/file$i.data "trusted.name" "testofafairlylongxattrstringthatbutnotlongenoughtofailmemoryallocation"
-
-EXPECT 0 xattr_query_check $M0/file$i.data "trusted.name"
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
diff --git a/tests/bugs/bug-1002556.t b/tests/bugs/bug-1002556.t
deleted file mode 100755
index a57f455d4..000000000
--- a/tests/bugs/bug-1002556.t
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume start $V0
-EXPECT '1 x 2 = 2' volinfo_field $V0 'Number of Bricks';
-
-TEST $CLI volume add-brick $V0 replica 3 $H0:$B0/${V0}2
-EXPECT '1 x 3 = 3' volinfo_field $V0 'Number of Bricks';
-
-TEST $CLI volume remove-brick $V0 replica 2 $H0:$B0/${V0}1 force
-EXPECT '1 x 2 = 2' volinfo_field $V0 'Number of Bricks';
-
-TEST killall glusterd
-TEST glusterd
-
-EXPECT '1 x 2 = 2' volinfo_field $V0 'Number of Bricks';
-cleanup
diff --git a/tests/bugs/bug-1004218.t b/tests/bugs/bug-1004218.t
deleted file mode 100644
index 17eb3c65b..000000000
--- a/tests/bugs/bug-1004218.t
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Test if only a single xml document is generated by 'status all'
-# when a volume is not started
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create ${V0}1 $H0:$B0/${V0}1{1,2}
-TEST $CLI volume create ${V0}2 $H0:$B0/${V0}2{1,2}
-
-TEST $CLI volume start ${V0}1
-
-function test_status_all ()
-{
-        $CLI volume status all --xml | xmllint -format -
-}
-
-TEST test_status_all
-
-TEST $CLI volume stop ${V0}1
-
-cleanup
diff --git a/tests/bugs/bug-1004744.t b/tests/bugs/bug-1004744.t
deleted file mode 100644
index 0290119ef..000000000
--- a/tests/bugs/bug-1004744.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-#Test case: After a rebalance fix-layout, check if the rebalance status command
-#displays the appropriate message at the CLI.
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-#Basic checks
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info
-
-#Create a 2x1 distributed volume
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-TEST $CLI volume start $V0
-
-# Mount FUSE and create file/directory
-TEST glusterfs -s $H0 --volfile-id $V0 $M0
-for i in `seq 1 10`;
-do
-       mkdir $M0/dir_$i
-       echo file>$M0/dir_$i/file_$i
-       for j in `seq 1 100`;
-       do
-                mkdir $M0/dir_$i/dir_$j
-                echo file>$M0/dir_$i/dir_$j/file_$j
-       done
-done
-
-#add 2 bricks
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}{3,4};
-
-#perform rebalance fix-layout
-TEST $CLI volume rebalance $V0 fix-layout start
-
-EXPECT_WITHIN 1 "fix-layout in progress" rebalance_status_field $V0;
-
-EXPECT_WITHIN 20 "fix-layout completed" rebalance_status_field $V0;
-
-TEST umount $M0
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-1015990-rep.t b/tests/bugs/bug-1015990-rep.t
deleted file mode 100755
index f59bb2f75..000000000
--- a/tests/bugs/bug-1015990-rep.t
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-
-
-
-TEST kill_brick $V0 $H0 $B0/$V0"1"
-sleep 5
-TEST kill_brick $V0 $H0 $B0/$V0"3"
-sleep 5
-
-for  i in  {1..100}; do echo "STRING" > $M0/File$i; done
-
-brick_2_sh_entries=$(count_sh_entries $B0/$V0"2")
-brick_4_sh_entries=$(count_sh_entries $B0/$V0"4")
-
-
-command_output=$(gluster volume heal $V0 statistics heal-count replica $H0:$B0/$V0"1")
-
-
-substring="Number of entries:"
-count=0
-while read -r line;
-do
-        if [[ "$line" == *$substring* ]]
-                then
-                        value=$(echo $line | cut -f 2 -d :)
-                        count=$(($count + $value))
-        fi
-
-done <<< "$command_output"
-
-brick_2_entries_count=$(($count-$value))
-
-EXPECT "0" echo $brick_2_entries_count
-
-brick_2_entries_count=$count
-
-
-xattrop_count_brick_2=$(count_sh_entries $B0/$V0"2")
-##Remove the count of the xattrop-gfid entry count as it does not contribute
-##to the number of files to be healed
-
-sub_val=1
-xattrop_count_brick_2=$(($xattrop_count_brick_2-$sub_val))
-
-ret=0
-if [ "$xattrop_count_brick_2" -eq "$brick_2_entries_count" ]
-        then
-                ret=$(($ret + $sub_val))
-fi
-
-EXPECT "1" echo $ret
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0
-
-cleanup;
diff --git a/tests/bugs/bug-1015990.t b/tests/bugs/bug-1015990.t
deleted file mode 100755
index 165af5168..000000000
--- a/tests/bugs/bug-1015990.t
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-
-
-
-TEST kill_brick $V0 $H0 $B0/$V0"1"
-sleep 5
-TEST kill_brick $V0 $H0 $B0/$V0"3"
-sleep 5
-
-for  i in  {1..100}; do echo "STRING" > $M0/File$i; done
-
-brick_2_sh_entries=$(count_sh_entries $B0/$V0"2")
-brick_4_sh_entries=$(count_sh_entries $B0/$V0"4")
-
-
-command_output=$(gluster volume heal $V0 statistics heal-count)
-
-
-substring="Number of entries:"
-count=0
-while read -r line;
-do
-        if [[ "$line" == *$substring* ]]
-                then
-                        value=$(echo $line | cut -f 2 -d :)
-                        count=$(($count + $value))
-        fi
-
-done <<< "$command_output"
-
-brick_2_entries_count=$(($count-$value))
-brick_4_entries_count=$value
-
-
-xattrop_count_brick_2=$(count_sh_entries $B0/$V0"2")
-##Remove the count of the xattrop-gfid entry count as it does not contribute
-##to the number of files to be healed
-
-sub_val=1
-xattrop_count_brick_2=$(($xattrop_count_brick_2-$sub_val))
-
-xattrop_count_brick_4=$(count_sh_entries $B0/$V0"4")
-##Remove xattrop-gfid entry count
-
-xattrop_count_brick_4=$(($xattrop_count_brick_4-$sub_val))
-
-
-ret=0
-if [ "$xattrop_count_brick_2" -eq "$brick_2_entries_count" ]
-        then
-                ret=$(($ret + $sub_val))
-fi
-
-EXPECT "1" echo $ret
-
-
-ret=0
-if [ "$xattrop_count_brick_4" -eq "$brick_4_entries_count" ]
-        then
-                ret=$(($ret + $sub_val))
-fi
-
-EXPECT "1" echo $ret
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0
-
-cleanup;
-
diff --git a/tests/bugs/bug-1022055.t b/tests/bugs/bug-1022055.t
deleted file mode 100755
index c2f4218bb..000000000
--- a/tests/bugs/bug-1022055.t
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
-
-function check_peers {
-        $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-
-cleanup;
-
-TEST launch_cluster 2;
-
-TEST $CLI_1 peer probe $H2;
-
-EXPECT_WITHIN 20 1 check_peers;
-
-TEST $CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0;
-
-TEST $CLI_1 volume start $V0;
-
-TEST $CLI_1 volume log rotate $V0;
-
-TEST $CLI_1 volume status;
-
-cleanup;
diff --git a/tests/bugs/bug-1022905.t b/tests/bugs/bug-1022905.t
deleted file mode 100644
index aef3395dd..000000000
--- a/tests/bugs/bug-1022905.t
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-## Create a volume
-TEST glusterd;
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1};
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Volume start
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Enable a protected and a resettable/unprotected option
-TEST $CLI volume quota $V0 enable
-TEST $CLI volume set $V0 diagnostics.client-log-level DEBUG
-
-## Reset cmd resets only unprotected option(s), succeeds.
-TEST $CLI volume reset $V0;
-
-## Reset should fail
-TEST ! $CLI volume reset $V0;
-
-## Set an unprotected option
-TEST $CLI volume set $V0 diagnostics.client-log-level DEBUG
-
-## Now 1 protected and 1 unprotected options are set
-## Reset force should succeed
-TEST $CLI volume reset $V0 force;
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/bugs/bug-1030208.t b/tests/bugs/bug-1030208.t
deleted file mode 100644
index 866999692..000000000
--- a/tests/bugs/bug-1030208.t
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-#Test case: Hardlink test
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-#Basic checks
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info
-
-#Create a distributed volume
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1..2};
-TEST $CLI volume start $V0
-
-# Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0
-
-#Create a file and perform fop on a DIR
-TEST touch $M0/foo
-TEST ls $M0/
-
-#Create hardlink
-TEST ln $M0/foo $M0/bar
-
-
-TEST umount $M0
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-762989.t b/tests/bugs/bug-762989.t
deleted file mode 100755
index 1794693cc..000000000
--- a/tests/bugs/bug-762989.t
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-## reserve port 1023
-older_ports=$(cat /proc/sys/net/ipv4/ip_local_reserved_ports);
-echo "1023" > /proc/sys/net/ipv4/ip_local_reserved_ports;
-
-## Start and create a volume
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-TEST $CLI volume start $V0;
-
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 \
-$M0;
-
-## Wait for volume to register with rpc.mountd
-sleep 6;
-## check if port 1023 (which has been reserved) is used by the gluster processes
-op=$(netstat -ntp | grep gluster | grep -w 1023);
-EXPECT "" echo $op;
-
-#set the reserved ports to the older values
-echo $older_ports > /proc/sys/net/ipv4/ip_local_reserved_ports
-
-cleanup;
diff --git a/tests/bugs/bug-764638.t b/tests/bugs/bug-764638.t
deleted file mode 100644
index 816546524..000000000
--- a/tests/bugs/bug-764638.t
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI pool list;
-TEST $CLI pool list --xml;
-
-cleanup;
diff --git a/tests/bugs/bug-765230.t b/tests/bugs/bug-765230.t
deleted file mode 100755
index 2012be5ad..000000000
--- a/tests/bugs/bug-765230.t
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting quota-timeout as 20
-TEST ! $CLI volume set $V0 features.quota-timeout 20
-EXPECT '' volinfo_field $V0 'features.quota-timeout';
-
-## Enabling features.quota-deem-statfs
-TEST ! $CLI volume set $V0 features.quota-deem-statfs on
-EXPECT '' volinfo_field $V0 'features.quota-deem-statfs'
-
-## Enabling quota
-TEST $CLI volume quota $V0 enable
-EXPECT 'on' volinfo_field $V0 'features.quota'
-
-## Setting quota-timeout as 20
-TEST $CLI volume set $V0 features.quota-timeout 20
-EXPECT '20' volinfo_field $V0 'features.quota-timeout';
-
-## Enabling features.quota-deem-statfs
-TEST $CLI volume set $V0 features.quota-deem-statfs on
-EXPECT 'on' volinfo_field $V0 'features.quota-deem-statfs'
-
-## Disabling quota
-TEST $CLI volume quota $V0 disable
-EXPECT 'off' volinfo_field $V0 'features.quota'
-
-## Setting quota-timeout as 30
-TEST ! $CLI volume set $V0 features.quota-timeout 30
-EXPECT '20' volinfo_field $V0 'features.quota-timeout';
-
-## Disabling features.quota-deem-statfs
-TEST ! $CLI volume set $V0 features.quota-deem-statfs off
-EXPECT 'on' volinfo_field $V0 'features.quota-deem-statfs'
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-765380.t b/tests/bugs/bug-765380.t
deleted file mode 100644
index a9784b93d..000000000
--- a/tests/bugs/bug-765380.t
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-REPLICA=2
-
-TEST $CLI volume create $V0 replica $REPLICA $H0:$B0/${V0}00 $H0:$B0/${V0}01 $H0:$B0/${V0}10 $H0:$B0/${V0}11
-TEST $CLI volume start $V0
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-function count_hostname_or_uuid_from_pathinfo()
-{
-    pathinfo=`getfattr -m . -n trusted.glusterfs.pathinfo $M0/f00f`
-    echo $pathinfo | grep -o $1 | wc -l
-}
-
-touch $M0/f00f
-
-EXPECT $REPLICA count_hostname_or_uuid_from_pathinfo $H0
-
-# turn on node-uuid-pathinfo option
-TEST $CLI volume set $V0 node-uuid-pathinfo on
-
-# do not expext hostname as part of the pathinfo string
-EXPECT 0 count_hostname_or_uuid_from_pathinfo $H0
-
-uuid=`grep UUID /var/lib/glusterd/glusterd.info | cut -f2 -d=`
-
-# ... but expect the uuid $REPLICA times
-EXPECT $REPLICA count_hostname_or_uuid_from_pathinfo $uuid
-
-cleanup;
diff --git a/tests/bugs/bug-765473.t b/tests/bugs/bug-765473.t
deleted file mode 100755
index 5fc0ec9d7..000000000
--- a/tests/bugs/bug-765473.t
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-
-cleanup;
-
-function clients_connected()
-{
-    volname=$1
-    gluster volume status $volname clients | grep -i 'Clients connected' | sed -e 's/[^0-9]*\(.*\)/\1/g'
-}
-        
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1}
-TEST $CLI volume start $V0;
-
-TEST glusterfs --direct-io-mode=yes --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-TEST fd=`fd_available`
-TEST fd_open $fd 'w' "$M0/testfile"
-TEST fd_write $fd "content"
-TEST $CLI volume stop $V0
-# write some content which will result in marking fd bad
-fd_write $fd "more content"
-TEST $CLI volume start $V0
-EXPECT_WITHIN 30 2 clients_connected $V0
-TEST ! fd_write $fd "still more content"
-
-cleanup
diff --git a/tests/bugs/bug-765564.t b/tests/bugs/bug-765564.t
deleted file mode 100644
index 0b8b8cd4f..000000000
--- a/tests/bugs/bug-765564.t
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-TEST glusterd
-TEST pidof glusterd
-
-## Start and create a volume
-mkdir -p ${B0}/${V0}-0
-mkdir -p ${B0}/${V0}-1
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}-{0,1}
-
-TEST $CLI volume set $V0 performance.io-cache off;
-TEST $CLI volume set $V0 performance.write-behind off;
-TEST $CLI volume set $V0 performance.stat-prefetch off
-
-TEST $CLI volume start $V0;
-
-## Mount native
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-
-#returns success if 'olddir' is absent
-#'olddir' must be absent in both replicas
-function rm_succeeded () {
-    local dir1=$1
-    [[ -d $H0:$B0/${V0}-0/$dir1 || -d $H0:$B0/${V0}-1/$dir1 ]] && return 0
-    return 1
-}
-
-# returns successes if 'newdir' is present
-#'newdir' must be present in both replicas
-function mv_succeeded () {
-    local dir1=$1
-    [[ -d $H0:$B0/${V0}-0/$dir1 && -d $H0:$B0/${V0}-1/$dir1 ]] && return 1
-    return 0
-}
-
-# returns zero on success
-# Only one of rm and mv can succeed. This is captured by the XOR below
-
-function chk_backend_consistency(){
-    local dir1=$1
-    local dir2=$2
-    local rm_status=rm_succeeded $dir1
-    local mv_status=mv_succeeded $dir2
-    [[ ( $rm_status && ! $mv_status ) || ( ! $rm_status && $mv_status ) ]] && return 0
-    return 1
-}
-
-#concurrent removal/rename of dirs
-function rm_mv_correctness () {
-    ret=0
-    for i in {1..100}; do
-        mkdir $M0/"dir"$i
-        rmdir $M0/"dir"$i &
-        mv $M0/"dir"$i $M0/"adir"$i &
-        wait
-        tmp_ret=$(chk_backend_consistency "dir"$i "adir"$i)
-        (( ret += tmp_ret ))
-        rm -rf $M0/"dir"$i
-        rm -rf $M0/"adir"$i
-    done
-    return $ret
-}
-
-TEST touch $M0/a;
-TEST mv $M0/a $M0/b;
-
-#test rename fop when one of the bricks is down
-kill_brick ${V0} ${H0} ${B0}/${V0}-1;
-TEST touch $M0/h;
-TEST mv $M0/h $M0/1;
-
-TEST $CLI volume start $V0 force;
-
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1;
-find $M0 | xargs stat 2>/dev/null 1>/dev/null;
-
-TEST rm_mv_correctness;
-TEST umount $M0;
-cleanup;
-
diff --git a/tests/bugs/bug-767095.t b/tests/bugs/bug-767095.t
deleted file mode 100755
index a8842bd54..000000000
--- a/tests/bugs/bug-767095.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-dump_dir='/tmp/gerrit_glusterfs'
-TEST mkdir -p $dump_dir;
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-TEST $CLI volume set $V0 error-gen posix;
-TEST $CLI volume set $V0 server.statedump-path $dump_dir;
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-TEST PID=`gluster volume status $V0 | grep patchy1 | awk {'print $5'}`;
-TEST kill -USR1 $PID;
-sleep 2;
-for file_name in $(ls $dump_dir)
-do
-    TEST grep "error-gen.priv" $dump_dir/$file_name;
-done
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-TEST rm -rf $dump_dir;
-
-cleanup;
diff --git a/tests/bugs/bug-767585-gfid.t b/tests/bugs/bug-767585-gfid.t
deleted file mode 100755
index 49cf7423f..000000000
--- a/tests/bugs/bug-767585-gfid.t
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#Test cases to perform gfid-self-heal
-#file 'a' should be assigned a fresh gfid
-#file 'b' should be healed with gfid1 from brick1
-#file 'c' should be healed with gfid2 from brick2
-
-gfid1="0x8428b7193a764bf8be8046fb860b8993"
-gfid2="0x85ad91afa2f74694bf52c3326d048209"
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --direct-io-mode=enable
-touch $B0/${V0}0/a $B0/${V0}1/a
-touch $B0/${V0}0/b $B0/${V0}1/b
-touch $B0/${V0}0/c $B0/${V0}1/c
-
-TEST setfattr -n trusted.gfid -v $gfid1 $B0/${V0}0/b
-TEST setfattr -n trusted.gfid -v $gfid2 $B0/${V0}1/c
-
-sleep 2
-
-cd $M0
-TEST ls -l a
-TEST ls -l b
-TEST ls -l c
-
-TEST gf_get_gfid_xattr $B0/${V0}0/a
-TEST gf_get_gfid_xattr $B0/${V0}1/a
-
-EXPECT "$gfid1" gf_get_gfid_xattr $B0/${V0}0/b
-EXPECT "$gfid1" gf_get_gfid_xattr $B0/${V0}1/b
-
-EXPECT "$gfid2" gf_get_gfid_xattr $B0/${V0}0/c
-EXPECT "$gfid2" gf_get_gfid_xattr $B0/${V0}1/c
-
-cleanup;
diff --git a/tests/bugs/bug-770655.t b/tests/bugs/bug-770655.t
deleted file mode 100755
index 945e323bb..000000000
--- a/tests/bugs/bug-770655.t
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a distribute-replicate volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Distributed-Replicate' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST ! $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a replicate volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 8 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Replicate' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST ! $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a distribute volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Distribute' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST ! $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a stripe volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 8 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Stripe' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '10MB' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a distributed stripe volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 4 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Distributed-Stripe' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '10MB' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a distributed stripe replicate volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 2 replica 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Distributed-Striped-Replicate' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting stripe-block-size as 10MB
-TEST $CLI volume set $V0 stripe-block-size 10MB
-EXPECT '10MB' volinfo_field $V0 'cluster.stripe-block-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-782095.t b/tests/bugs/bug-782095.t
deleted file mode 100755
index a0cea14ee..000000000
--- a/tests/bugs/bug-782095.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting performance cache min size as 2MB
-TEST $CLI volume set $V0 performance.cache-min-file-size 2MB
-EXPECT '2MB' volinfo_field $V0 'performance.cache-min-file-size';
-
-## Setting performance cache max size as 20MB
-TEST $CLI volume set $V0 performance.cache-max-file-size 20MB
-EXPECT '20MB' volinfo_field $V0 'performance.cache-max-file-size';
-
-## Trying to set performance cache min size as 25MB
-TEST ! $CLI volume set $V0 performance.cache-min-file-size 25MB
-EXPECT '2MB' volinfo_field $V0 'performance.cache-min-file-size';
-
-## Able to set performance cache min size as long as its lesser than max size
-TEST $CLI volume set $V0 performance.cache-min-file-size 15MB
-EXPECT '15MB' volinfo_field $V0 'performance.cache-min-file-size';
-
-## Trying it out with only cache-max-file-size in CLI as 10MB
-TEST ! $CLI volume set $V0 cache-max-file-size 10MB
-EXPECT '20MB' volinfo_field $V0 'performance.cache-max-file-size';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-797171.t b/tests/bugs/bug-797171.t
deleted file mode 100755
index a1b28d9ff..000000000
--- a/tests/bugs/bug-797171.t
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/brick1;
-TEST $CLI volume set $V0 debug.trace marker;
-TEST $CLI volume set $V0 debug.log-history on
-
-TEST $CLI volume start $V0;
-
-sleep 1;
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 \
-$M0;
-
-sleep 5;
-
-touch $M0/{1..22};
-rm -f $M0/*;
-
-pid_file=$(ls /var/lib/glusterd/vols/$V0/run);
-brick_pid=$(cat /var/lib/glusterd/vols/$V0/run/$pid_file);
-
-mkdir $statedumpdir/statedump_tmp/;
-echo "path=$statedumpdir/statedump_tmp" > $statedumpdir/glusterdump.options;
-echo "all=yes" >> $statedumpdir/glusterdump.options;
-
-TEST $CLI volume statedump $V0 history;
-
-file_name=$(ls $statedumpdir/statedump_tmp);
-TEST grep "xlator.debug.trace.history" $statedumpdir/statedump_tmp/$file_name;
-
-TEST umount $M0
-
-rm -rf $statedumpdir/statedump_tmp;
-rm -f $statedumpdir/glusterdump.options;
-
-cleanup;
diff --git a/tests/bugs/bug-802417.t b/tests/bugs/bug-802417.t
deleted file mode 100755
index 314141f6b..000000000
--- a/tests/bugs/bug-802417.t
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-function write_file()
-{
-	path="$1"; shift
-	echo "$*" > "$path"
-}
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-## Start and create a volume
-mkdir -p ${B0}/${V0}-0
-mkdir -p ${B0}/${V0}-1
-mkdir -p ${B0}/${V0}-2
-TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}-{0,1,2}
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Make sure io-cache and write-behind don't interfere.
-TEST $CLI volume set $V0 performance.io-cache off;
-TEST $CLI volume set $V0 performance.write-behind off;
-TEST $CLI volume set $V0 performance.stat-prefetch off
-
-## Make sure automatic self-heal doesn't perturb our results.
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume set $V0 cluster.data-self-heal on
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Mount native
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-
-## Create a file with some recognizably stale data.
-TEST write_file $M0/a_file "old_data"
-
-## Kill two of the bricks and write some newer data.
-TEST kill_brick ${V0} ${H0} ${B0}/${V0}-1
-TEST kill_brick ${V0} ${H0} ${B0}/${V0}-2
-TEST write_file $M0/a_file "new_data"
-
-## Bring all the bricks up and kill one so we do a partial self-heal.
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 2
-TEST kill_brick ${V0} ${H0} ${B0}/${V0}-2
-TEST ls -l ${M0}/a_file
-
-
-obs_path_0=${B0}/${V0}-0/a_file
-obs_path_1=${B0}/${V0}-1/a_file
-obs_path_2=${B0}/${V0}-2/a_file
-
-tgt_xattr_0="trusted.afr.${V0}-client-0"
-tgt_xattr_1="trusted.afr.${V0}-client-1"
-tgt_xattr_2="trusted.afr.${V0}-client-2"
-
-actual=$(afr_get_changelog_xattr $obs_path_0 $tgt_xattr_0)
-EXPECT "0x000000000000000000000000" echo $actual
-
-actual=$(afr_get_changelog_xattr $obs_path_0 $tgt_xattr_1)
-EXPECT "0x000000000000000000000000" echo $actual
-
-actual=$(afr_get_changelog_xattr $obs_path_0 $tgt_xattr_2)
-EXPECT "0x000000020000000000000000" echo $actual
-
-actual=$(afr_get_changelog_xattr $obs_path_1 $tgt_xattr_0)
-EXPECT "0x000000000000000000000000" echo $actual
-
-actual=$(afr_get_changelog_xattr $obs_path_1 $tgt_xattr_1)
-EXPECT "0x000000000000000000000000" echo $actual
-
-actual=$(afr_get_changelog_xattr $obs_path_1 $tgt_xattr_2)
-EXPECT "0x000000020000000000000000" echo $actual
-
-actual=$(afr_get_changelog_xattr $obs_path_2 $tgt_xattr_0)
-EXPECT "0x000000000000000000000000" echo $actual
-
-actual=$(afr_get_changelog_xattr $obs_path_2 $tgt_xattr_1)
-EXPECT "0x000000000000000000000000" echo $actual
-
-actual=$(afr_get_changelog_xattr $obs_path_2 $tgt_xattr_2)
-EXPECT "0x000000000000000000000000" echo $actual
-
-if [ "$EXIT_EARLY" = "1" ]; then
-	exit 0;
-fi
-
-## Finish up
-TEST umount $M0;
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-808400-dist.t b/tests/bugs/bug-808400-dist.t
deleted file mode 100755
index 6a29eb626..000000000
--- a/tests/bugs/bug-808400-dist.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/brick1 $H0:$B0/brick2;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-MOUNTDIR=$M0;
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR;
-
-build_tester $(dirname $0)/bug-808400-flock.c
-build_tester $(dirname $0)/bug-808400-fcntl.c
-
-TEST $(dirname $0)/bug-808400-flock $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind off\'
-TEST $(dirname $0)/bug-808400-fcntl $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind on\'
-
-TEST rm -rf $MOUNTDIR/*
-TEST rm -rf $(dirname $0)/bug-808400-flock $(dirname $0)/bug-808400-fcntl $(dirname $0)/glusterfs.log
-
-TEST   umount $MOUNTDIR -l
-
-cleanup;
-\ No newline at end of file
diff --git a/tests/bugs/bug-808400-fcntl.c b/tests/bugs/bug-808400-fcntl.c
deleted file mode 100644
index 4deef34a5..000000000
--- a/tests/bugs/bug-808400-fcntl.c
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-
-int
-run_child (char *filename)
-{
-        int          fd   = -1, ret = -1;
-        struct flock lock = {0, };
-        int          ppid = 0;
-
-        fd = open (filename, O_RDWR);
-        if (fd < 0) {
-                fprintf (stderr, "open failed (%s)\n", strerror (errno));
-                goto out;
-        }
-
-        ppid = getppid ();
-
-        lock.l_type = F_WRLCK;
-        lock.l_whence = SEEK_SET;
-        lock.l_start = 0;
-        lock.l_len = 0;
-
-        ret = fcntl (fd, F_GETLK, &lock);
-        if (ret < 0) {
-                fprintf (stderr, "GETLK failed (%s)\n", strerror (errno));
-                goto out;
-        }
-
-        if ((lock.l_type == F_UNLCK) ||
-            (ppid != lock.l_pid)) {
-                fprintf (stderr, "no locks present, though parent has held "
-                         "one\n");
-                ret = -1;
-                goto out;
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-main (int argc, char *argv[])
-{
-        int          fd       = -1, ret = -1, status = 0;
-        char        *filename = NULL, *cmd = NULL;
-        struct stat  stbuf    = {0, };
-        struct flock lock     = {0, };
-
-        if (argc != 3) {
-                fprintf (stderr, "Usage: %s <filename> "
-                         "<gluster-cmd-to-trigger-graph-switch>\n", argv[0]);
-                goto out;
-        }
-
-        filename = argv[1];
-        cmd = argv[2];
-
-        fd = open (filename, O_RDWR | O_CREAT, 0);
-        if (fd < 0) {
-                fprintf (stderr, "open (%s) failed (%s)\n", filename,
-                         strerror (errno));
-                goto out;
-        }
-
-        lock.l_type = F_WRLCK;
-        lock.l_whence = SEEK_SET;
-        lock.l_start = 0;
-        lock.l_len = 0;
-
-        ret = fcntl (fd, F_SETLK, &lock);
-        if (ret < 0) {
-                fprintf (stderr, "fcntl failed (%s)\n", strerror (errno));
-                goto out;
-        }
-
-        system (cmd);
-
-        /* wait till graph switch completes */
-        ret = fstat64 (fd, &stbuf);
-        if (ret < 0) {
-                fprintf (stderr, "fstat64 failure (%s)\n", strerror (errno));
-                goto out;
-        }
-
-        sleep (10);
-
-        /* By now old-graph would be disconnected and locks should be cleaned
-         * up if they are not migrated. Check that by trying to acquire a lock
-         * on a new fd opened by another process on same file.
-         */
-        ret = fork ();
-        if (ret == 0) {
-                ret = run_child (filename);
-        } else {
-                wait (&status);
-                if (WIFEXITED(status)) {
-                        ret = WEXITSTATUS(status);
-                } else {
-                        ret = 0;
-                }
-        }
-
-out:
-        return ret;
-}
diff --git a/tests/bugs/bug-808400-flock.c b/tests/bugs/bug-808400-flock.c
deleted file mode 100644
index 4770c81dc..000000000
--- a/tests/bugs/bug-808400-flock.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-
-int
-run_child (char *filename)
-{
-        int fd = -1, ret = -1;
-
-        fd = open (filename, O_RDWR);
-        if (fd < 0) {
-                fprintf (stderr, "open failed (%s)\n", strerror (errno));
-                goto out;
-        }
-
-        ret = flock (fd, LOCK_EX | LOCK_NB);
-        if ((ret == 0) || (errno != EWOULDBLOCK)) {
-                fprintf (stderr, "no locks present, though parent has held "
-                         "one\n");
-                ret = -1;
-                goto out;
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-main (int argc, char *argv[])
-{
-        int          fd       = -1, ret = -1, status = 0;
-        char        *filename = NULL, *cmd = NULL;
-        struct stat  stbuf    = {0, };
-
-        if (argc != 3) {
-                fprintf (stderr, "Usage: %s <filename> "
-                         "<gluster-cmd-to-trigger-graph-switch>\n", argv[0]);
-                goto out;
-        }
-
-        filename = argv[1];
-        cmd = argv[2];
-
-        fd = open (filename, O_RDWR | O_CREAT, 0);
-        if (fd < 0) {
-                fprintf (stderr, "open (%s) failed (%s)\n", filename,
-                         strerror (errno));
-                goto out;
-        }
-
-        ret = flock (fd, LOCK_EX);
-        if (ret < 0) {
-                fprintf (stderr, "flock failed (%s)\n", strerror (errno));
-                goto out;
-        }
-
-        system (cmd);
-
-        /* wait till graph switch completes */
-        ret = fstat64 (fd, &stbuf);
-        if (ret < 0) {
-                fprintf (stderr, "fstat64 failure (%s)\n", strerror (errno));
-                goto out;
-        }
-
-        sleep (10);
-
-        /* By now old-graph would be disconnected and locks should be cleaned
-         * up if they are not migrated. Check that by trying to acquire a lock
-         * on a new fd opened by another process on same file
-         */
-        ret = fork ();
-        if (ret == 0) {
-                ret = run_child (filename);
-        } else {
-                wait (&status);
-                if (WIFEXITED(status)) {
-                        ret = WEXITSTATUS(status);
-                } else {
-                        ret = 0;
-                }
-        }
-
-out:
-        return ret;
-}
diff --git a/tests/bugs/bug-808400-repl.t b/tests/bugs/bug-808400-repl.t
deleted file mode 100755
index 69cd9379b..000000000
--- a/tests/bugs/bug-808400-repl.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-TEST $CLI volume create $V0 replica 2 $H0:$B0/brick1 $H0:$B0/brick2;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-MOUNTDIR=$M0;
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR;
-
-build_tester $(dirname $0)/bug-808400-flock.c
-build_tester $(dirname $0)/bug-808400-fcntl.c
-
-TEST $(dirname $0)/bug-808400-flock $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind off\'
-TEST $(dirname $0)/bug-808400-fcntl $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind on\'
-
-TEST rm -rf $MOUNTDIR/*
-TEST rm -rf $(dirname $0)/bug-808400-flock $(dirname $0)/bug-808400-fcntl $(dirname $0)/glusterfs.log
-
-TEST   umount $MOUNTDIR -l
-
-cleanup;
-\ No newline at end of file
diff --git a/tests/bugs/bug-808400-stripe.t b/tests/bugs/bug-808400-stripe.t
deleted file mode 100755
index 3ab6f738e..000000000
--- a/tests/bugs/bug-808400-stripe.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 stripe 2 $H0:$B0/brick1 $H0:$B0/brick2;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-MOUNTDIR=$M0;
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR;
-
-build_tester $(dirname $0)/bug-808400-flock.c
-build_tester $(dirname $0)/bug-808400-fcntl.c
-
-TEST $(dirname $0)/bug-808400-flock $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind off\'
-TEST $(dirname $0)/bug-808400-fcntl $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind on\'
-
-TEST rm -rf $MOUNTDIR/*
-TEST rm -rf $(dirname $0)/bug-808400-flock $(dirname $0)/bug-808400-fcntl $(dirname $0)/glusterfs.log
-
-TEST   umount $MOUNTDIR -l
-
-cleanup;
-\ No newline at end of file
diff --git a/tests/bugs/bug-808400.t b/tests/bugs/bug-808400.t
deleted file mode 100755
index 49d88afd6..000000000
--- a/tests/bugs/bug-808400.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-#mount on a random dir
-TEST MOUNTDIR="/tmp/$RANDOM"
-TEST mkdir $MOUNTDIR
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR;
-
-build_tester $(dirname $0)/bug-808400-flock.c
-build_tester $(dirname $0)/bug-808400-fcntl.c
-
-TEST $(dirname $0)/bug-808400-flock $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind off\'
-TEST $(dirname $0)/bug-808400-fcntl $MOUNTDIR/testfile \'gluster volume set $V0 performance.write-behind on\'
-
-TEST rm -rf $MOUNTDIR/*
-TEST rm -rf $(dirname $0)/bug-808400-flock $(dirname $0)/bug-808400-fcntl $(dirname $0)/glusterfs.log
-
-TEST   umount $MOUNTDIR -l
-TEST   rm -rf $MOUNTDIR
-
-cleanup;
-\ No newline at end of file
diff --git a/tests/bugs/bug-811493.t b/tests/bugs/bug-811493.t
deleted file mode 100755
index 13e99af57..000000000
--- a/tests/bugs/bug-811493.t
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI system uuid reset;
-
-uuid1=$(grep UUID /var/lib/glusterd/glusterd.info | cut -f 2 -d "=");
-
-TEST $CLI system uuid reset;
-uuid2=$(grep UUID /var/lib/glusterd/glusterd.info | cut -f 2 -d "=");
-
-TEST [ $uuid1 != $uuid2 ]
-
-cleanup
diff --git a/tests/bugs/bug-821056.t b/tests/bugs/bug-821056.t
deleted file mode 100644
index 5e81541ac..000000000
--- a/tests/bugs/bug-821056.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume set $V0 eager-lock off
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume set $V0 performance.quick-read off
-TEST $CLI volume set $V0 performance.open-behind off
-TEST $CLI volume set $V0 performance.io-cache off
-TEST $CLI volume set $V0 performance.write-behind on
-TEST $CLI volume set $V0 performance.stat-prefetch off
-TEST $CLI volume set $V0 performance.read-ahead off
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=enable
-touch $M0/a
-
-#Open file with fd as 5
-exec 5>$M0/a
-realpath=$(gf_get_gfid_backend_file_path $B0/${V0}0 "a")
-
-kill_brick $V0 $H0 $B0/${V0}0
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-
-EXPECT "Y" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 "$realpath"
-
-kill_brick $V0 $H0 $B0/${V0}0
-TEST gf_rm_file_and_gfid_link $B0/${V0}0 "a"
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-ls -l $M0/a 2>&1 > /dev/null #Make sure the file is re-created
-EXPECT "N" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 "$realpath"
-EXPECT "N" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 $B0/${V0}0/a
-
-for i in {1..1024}; do
-        echo "open sesame" >&5
-done
-
-EXPECT_WITHIN 20 "Y" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 $B0/${V0}0/a
-#close the fd
-exec 5>&-
-
-#Check that anon-fd based file is not leaking.
-EXPECT_WITHIN 20 "N" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 "$realpath"
-cleanup;
diff --git a/tests/bugs/bug-822830.t b/tests/bugs/bug-822830.t
deleted file mode 100755
index 000d99f03..000000000
--- a/tests/bugs/bug-822830.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting nfs.rpc-auth-reject as 192.*..*
-TEST ! $CLI volume set $V0 nfs.rpc-auth-reject 192.*..*
-EXPECT '' volinfo_field $V0 'nfs.rpc-auth-reject';
-
-# Setting nfs.rpc-auth-allow as a.a.
-TEST ! $CLI volume set $V0 nfs.rpc-auth-allow a.a.
-EXPECT '' volinfo_field $V0 'nfs.rpc-auth-allow';
-
-# Setting nfs.rpc-auth-allow as a.a
-TEST $CLI volume set $V0 nfs.rpc-auth-allow a.a
-EXPECT 'a.a' volinfo_field $V0 'nfs.rpc-auth-allow';
-
-## Setting nfs.rpc-auth-reject as 192.*.*
-TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.*.*
-EXPECT '192.*.*' volinfo_field $V0 'nfs.rpc-auth-reject';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-823081.t b/tests/bugs/bug-823081.t
deleted file mode 100755
index 760d9e2b6..000000000
--- a/tests/bugs/bug-823081.t
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-V1=patchy2
-
-TEST glusterd
-TEST pidof glusterd
-
-logdir=`gluster --print-logdir`
-function set_tail ()
-{
-        vol=$1;
-        tail_success="volume create $vol $H0:$B0/${vol}1 $H0:$B0/${vol}2 : SUCCESS"
-        tail_failure="volume create $vol $H0:$B0/${vol}1 $H0:$B0/${vol}2 : FAILED : Volume $vol already exists"
-        tail_success_force="volume create $vol $H0:$B0/${vol}1 $H0:$B0/${vol}2 force : SUCCESS"
-        tail_failure_force="volume create $vol $H0:$B0/${vol}1 $H0:$B0/${vol}2 force : FAILED : Volume $vol already exists"
-}
-
-set_tail $V0;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-`
-TEST [[ \"$tail\" == \"$tail_success\" ]]
-
-TEST ! $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-`
-TEST [[ \"$tail\" == \"$tail_failure\" ]]
-
-set_tail $V1;
-TEST gluster volume create $V1 $H0:$B0/${V1}{1,2} force;
-tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-`
-TEST [[ \"$tail\" == \"$tail_success_force\" ]]
-
-TEST ! gluster volume create $V1 $H0:$B0/${V1}{1,2} force;
-tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-`
-TEST [[ \"$tail\" == \"$tail_failure_force\" ]]
-
-cleanup;
diff --git a/tests/bugs/bug-824753-file-locker.c b/tests/bugs/bug-824753-file-locker.c
deleted file mode 100644
index 903e23e0a..000000000
--- a/tests/bugs/bug-824753-file-locker.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-
-int main (int argc, char *argv[])
-{
-    int              fd            = -1;
-    int              ret           = -1;
-    char             command[2048] = "";
-    char             filepath[255]     = "";
-    struct flock fl;
-
-    fl.l_type = F_WRLCK;
-    fl.l_whence = SEEK_SET;
-    fl.l_start = 7;
-    fl.l_len = 1;
-    fl.l_pid = getpid();
-
-    snprintf(filepath, 255, "%s/%s", argv[4], argv[5]);
-
-    fd = open(filepath, O_RDWR);
-
-    if (fd == -1)
-        return -1;
-
-    if (fcntl(fd, F_SETLKW, &fl) == -1) {
-        return -1;
-    }
-
-    snprintf(command, sizeof(command),
-             "gluster volume clear-locks %s /%s kind all posix 0,7-1 |"
-             " grep %s | awk -F'..: ' '{print $1}' | grep %s:%s/%s",
-             argv[1], argv[5], argv[2], argv[2], argv[3], argv[1]);
-
-    ret = system (command);
-    close(fd);
-
-    if (ret)
-            return -1;
-    else
-            return 0;
-}
diff --git a/tests/bugs/bug-824753.t b/tests/bugs/bug-824753.t
deleted file mode 100755
index 38f6bf696..000000000
--- a/tests/bugs/bug-824753.t
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-TEST glusterfs -s $H0 --volfile-id=$V0 $M0
-touch $M0/file1;
-
-TEST gcc -g $(dirname $0)/bug-824753-file-locker.c -o $(dirname $0)/file-locker
-
-TEST $(dirname $0)/file-locker $V0 $H0 $B0 $M0 file1
-
-## Finish up
-TEST rm -f $(dirname $0)/file-locker
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-830665.t b/tests/bugs/bug-830665.t
deleted file mode 100755
index 0073ff1d9..000000000
--- a/tests/bugs/bug-830665.t
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-function recreate {
-	rm -rf $1 && mkdir -p $1
-}
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-## Start and create a volume
-recreate ${B0}/${V0}-0
-recreate ${B0}/${V0}-1
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}-{0,1}
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Make sure stat-prefetch doesn't prevent self-heal checks.
-TEST $CLI volume set $V0 performance.stat-prefetch off;
-
-## Make sure automatic self-heal doesn't perturb our results.
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-
-## Wait for volume to register with rpc.mountd
-sleep 5;
-
-## Mount NFS
-TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $N0;
-
-## Create some files and directories
-echo "test_data" > $N0/a_file;
-mkdir $N0/a_dir;
-echo "more_test_data" > $N0/a_dir/another_file;
-
-## Unmount and stop the volume.
-TEST umount $N0;
-TEST $CLI volume stop $V0;
-
-# Recreate the brick. Note that because of http://review.gluster.org/#change,4202
-# we need to preserve and restore the volume ID or else the brick (and thus the
-# entire not-very-HA-any-more volume) won't start. When that bug is fixed, we can
-# remove the [gs]etxattr calls.
-volid=$(getfattr -e hex -n trusted.glusterfs.volume-id $B0/${V0}-0 2> /dev/null \
-	| grep = | cut -d= -f2)
-rm -rf $B0/${V0}-0;
-mkdir $B0/${V0}-0;
-setfattr -n trusted.glusterfs.volume-id -v $volid $B0/${V0}-0
-
-## Restart and remount. Note that we use actimeo=0 so that the stat calls
-## we need for self-heal don't get blocked by the NFS client.
-TEST $CLI volume start $V0;
-sleep 5
-TEST mount -t nfs -o vers=3,nolock,soft,intr,actimeo=0 $H0:/$V0 $N0;
-
-## The Linux NFS client has a really charming habit of caching stuff right
-## after mount, even though we set actimeo=0 above. Life would be much easier
-## if NFS developers cared as much about correctness as they do about shaving
-## a few seconds off of benchmarks.
-ls -l $N0 &> /dev/null;
-sleep 5;
-
-## Force entry self-heal.
-find $N0 | xargs stat > /dev/null;
-#ls -lR $N0 > /dev/null;
-
-## Do NOT check through the NFS mount here. That will force a new self-heal
-## check, but we want to test whether self-heal already happened.
-
-## Make sure everything's in order on the recreated brick.
-EXPECT 'test_data' cat $B0/${V0}-0/a_file;
-EXPECT 'more_test_data' cat $B0/${V0}-0/a_dir/another_file;
-
-if [ "$EXIT_EARLY" = "1" ]; then
-	exit 0;
-fi
-
-## Finish up
-TEST umount $N0;
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-834465.c b/tests/bugs/bug-834465.c
deleted file mode 100644
index 61d3deac0..000000000
--- a/tests/bugs/bug-834465.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int
-main (int argc, char *argv[])
-{
-        int          fd       = -1;
-        char        *filename = NULL;
-        struct flock lock     = {0, };
-        int          i        = 0;
-        int          ret      = -1;
-
-        if (argc != 2) {
-                fprintf (stderr, "Usage: %s <filename> ", argv[0]);
-                goto out;
-        }
-
-        filename = argv[1];
-
-        fd = open (filename, O_RDWR | O_CREAT, 0);
-        if (fd < 0) {
-                fprintf (stderr, "open (%s) failed (%s)\n", filename,
-                         strerror (errno));
-                goto out;
-        }
-
-        lock.l_type = F_WRLCK;
-        lock.l_whence = SEEK_SET;
-        lock.l_start = 1;
-        lock.l_len = 1;
-
-        while (i < 100) {
-                lock.l_type = F_WRLCK;
-                ret = fcntl (fd, F_SETLK, &lock);
-                if (ret < 0) {
-                        fprintf (stderr, "fcntl setlk failed (%s)\n",
-                                        strerror (errno));
-                        goto out;
-                }
-
-                lock.l_type = F_UNLCK;
-                ret = fcntl (fd, F_SETLK, &lock);
-                if (ret < 0) {
-                        fprintf (stderr, "fcntl setlk failed (%s)\n",
-                                        strerror (errno));
-                        goto out;
-                }
-
-                i++;
-        }
-
-        ret = 0;
-
-out:
-        return ret;
-}
diff --git a/tests/bugs/bug-834465.t b/tests/bugs/bug-834465.t
deleted file mode 100755
index af7f4bd12..000000000
--- a/tests/bugs/bug-834465.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/brick1 $H0:$B0/brick2;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-MOUNTDIR=$M0;
-TEST glusterfs --mem-accounting --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR;
-
-sdump1=$(generate_mount_statedump $V0);
-nalloc1=0
-grep -A2 "fuse - usage-type 85" $sdump1
-if [ $? -eq '0' ]
-then
-        nalloc1=`grep -A2 "fuse - usage-type 85" $sdump1 | grep num_allocs | cut -d '=' -f2`
-fi
-
-build_tester $(dirname $0)/bug-834465.c
-
-TEST $(dirname $0)/bug-834465 $M0/testfile
-
-sdump2=$(generate_mount_statedump $V0);
-nalloc2=`grep -A2 "fuse - usage-type 85" $sdump2 | grep num_allocs | cut -d '=' -f2`
-
-TEST [ $nalloc1 -eq $nalloc2 ];
-
-TEST rm -rf $MOUNTDIR/*
-TEST rm -rf $(dirname $0)/bug-834465
-cleanup_mount_statedump $V0
-
-TEST   umount $MOUNTDIR -l
-
-cleanup;
diff --git a/tests/bugs/bug-839595.t b/tests/bugs/bug-839595.t
deleted file mode 100644
index 979827fa7..000000000
--- a/tests/bugs/bug-839595.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}1
-TEST $CLI volume set $V0 cluster.server-quorum-type server
-EXPECT "server" volume_option $V0 cluster.server-quorum-type
-TEST $CLI volume set $V0 cluster.server-quorum-type none
-EXPECT "none" volume_option $V0 cluster.server-quorum-type
-TEST $CLI volume reset $V0 cluster.server-quorum-type
-TEST ! $CLI volume set $V0 cluster.server-quorum-type abc
-TEST ! $CLI volume set all cluster.server-quorum-type none
-TEST ! $CLI volume set $V0 cluster.server-quorum-ratio 100
-
-TEST ! $CLI volume set all cluster.server-quorum-ratio abc
-TEST ! $CLI volume set all cluster.server-quorum-ratio -1
-TEST ! $CLI volume set all cluster.server-quorum-ratio 100.0000005
-TEST $CLI volume set all cluster.server-quorum-ratio 0
-EXPECT "0" volume_option $V0 cluster.server-quorum-ratio
-TEST $CLI volume set all cluster.server-quorum-ratio 100
-EXPECT "100" volume_option $V0 cluster.server-quorum-ratio
-TEST $CLI volume set all cluster.server-quorum-ratio 0.0000005
-EXPECT "0.0000005" volume_option $V0 cluster.server-quorum-ratio
-TEST $CLI volume set all cluster.server-quorum-ratio 100%
-EXPECT "100%" volume_option $V0 cluster.server-quorum-ratio
-cleanup;
diff --git a/tests/bugs/bug-844688.t b/tests/bugs/bug-844688.t
deleted file mode 100755
index 154d35e48..000000000
--- a/tests/bugs/bug-844688.t
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0
-TEST $CLI volume start $V0
-
-sleep 5
-
-TEST glusterfs -s $H0 --volfile-id $V0 $M0
-
-mount_pid=$(get_mount_process_pid $V0);
-# enable dumping of call stack creation and frame creation times in statedump
-kill -USR2 $mount_pid;
-
-TEST touch $M0/touchfile;
-(dd if=/dev/urandom of=$M0/file bs=5K 2>/dev/null 1>/dev/null)&
-back_pid=$!;
-statedump_file=$(generate_mount_statedump $V0);
-grep "callstack-creation-time" $statedump_file 2>/dev/null 1>/dev/null;
-TEST [ $? -eq 0 ];
-grep "frame-creation-time" $statedump_file 2>/dev/null 1>/dev/null;
-TEST [ $? -eq 0 ];
-
-kill -SIGTERM $back_pid;
-wait >/dev/null 2>&1;
-
-TEST rm -f $M0/touchfile $M0/file;
-TEST umount $M0;
-
-rm -f $statedumpdir/glusterdump.$mount_pid.*;
-cleanup
diff --git a/tests/bugs/bug-845213.t b/tests/bugs/bug-845213.t
deleted file mode 100644
index e79b37109..000000000
--- a/tests/bugs/bug-845213.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-## Create and start a volume with aio enabled
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-TEST $CLI volume set $V0 remote-dio enable;
-TEST $CLI volume set $V0 network.remote-dio disable;
-
-cleanup;
-
diff --git a/tests/bugs/bug-846240.t b/tests/bugs/bug-846240.t
deleted file mode 100644
index 12e4949ef..000000000
--- a/tests/bugs/bug-846240.t
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-TEST $CLI volume create $V0 $H0:$B0/brick1 $H0:$B0/brick2;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-MOUNTDIR=$M0;
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR;
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M1;
-
-TEST touch $M0/testfile;
-
-# open the file with the fd as 4
-TEST fd=`fd_available`;
-TEST fd_open $fd 'w' "$M0/testfile";
-
-# remove the file from the other mount point. If unlink is sent from
-# $M0 itself, then the file will be actually opened by open-behind which
-# we dont want for this testcase
-TEST rm -f $M1/testfile;
-
-# below command opens the file and writes to the file.
-# upon open, open-behind unwinds the open call with success.
-# now when write comes, open-behind actually opens the file
-# and then sends write on the fd. But before sending open itself,
-# the file would have been removed from the mount $M1. open() gets error
-# and the write call which is put into a stub (open had to be sent first)
-# should unwind with the error received in the open call.
-echo "data" >> $M0/testfile 2>/dev/null 1>/dev/null;
-TEST [ $? -ne 0 ]
-
-TEST fd_close $fd;
-
-TEST rm -rf $MOUNTDIR/*
-
-TEST   umount $MOUNTDIR -l
-
-cleanup;
diff --git a/tests/bugs/bug-847622.t b/tests/bugs/bug-847622.t
deleted file mode 100755
index 138499527..000000000
--- a/tests/bugs/bug-847622.t
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0
-TEST $CLI volume start $V0
-
-sleep 5
-
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0
-cd $N0
-
-# simple getfacl setfacl commands
-TEST touch testfile
-TEST setfacl -m u:14:r testfile
-TEST getfacl testfile
-
-cd
-TEST umount $N0
-cleanup
-
diff --git a/tests/bugs/bug-847624.t b/tests/bugs/bug-847624.t
deleted file mode 100755
index f4e9942e9..000000000
--- a/tests/bugs/bug-847624.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-cleanup
-
-#1
-TEST glusterd
-TEST pidof glusterd
-#3
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume set $V0 nfs.drc on
-TEST $CLI volume start $V0
-sleep 5
-TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $N0
-cd $N0
-#7
-TEST dbench -t 10 10
-TEST rm -rf $N0/*
-cd
-TEST umount $N0
-#10
-TEST $CLI volume set $V0 nfs.drc-size 10000
-cleanup
diff --git a/tests/bugs/bug-848251.t b/tests/bugs/bug-848251.t
deleted file mode 100644
index dda393272..000000000
--- a/tests/bugs/bug-848251.t
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/brick1;
-
-TEST $CLI volume start $V0;
-
-#enable quota
-TEST $CLI volume quota $V0 enable;
-
-#mount on a random dir
-TEST MOUNTDIR="/tmp/$RANDOM"
-TEST mkdir $MOUNTDIR
-TEST glusterfs -s $H0 --volfile-id=$V0 $MOUNTDIR
-
-function set_quota(){
-        mkdir "$MOUNTDIR/$name"
-        $CLI volume quota $V0 limit-usage /$name 50KB
-}
-
-function quota_list(){
-        $CLI volume quota $V0 list | grep -- /$name | awk '{print $3}'
-}
-
-TEST   name=":d1"
-#file name containing ':' in the start
-TEST   set_quota
-EXPECT "0Bytes" quota_list
-
-TEST   name=":d1/d:1"
-#file name containing ':' in between
-TEST   set_quota
-EXPECT "0Bytes" quota_list
-
-TEST   name=":d1/d:1/d1:"
-#file name containing ':' in the end
-TEST   set_quota
-EXPECT "0Bytes" quota_list
-
-TEST   umount $MOUNTDIR
-TEST   rm -rf $MOUNTDIR
-
-cleanup;
diff --git a/tests/bugs/bug-852147.t b/tests/bugs/bug-852147.t
deleted file mode 100755
index 0e7923086..000000000
--- a/tests/bugs/bug-852147.t
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-logdir=`gluster --print-logdir`"/bricks"
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-TEST glusterfs -s $H0 --volfile-id=$V0 $M0
-touch $M0/file1;
-
-TEST $CLI volume set $V0 performance.cache-max-file-size 20MB
-TEST $CLI volume set $V0 performance.cache-min-file-size 10MB
-
-EXPECT "20MB" volinfo_field $V0 'performance.cache-max-file-size';
-EXPECT "10MB" volinfo_field $V0 'performance.cache-min-file-size';
-
-#Performing volume reset and verifying.
-TEST $CLI volume reset $V0
-EXPECT "" volinfo_field $V0 'performance.cache-max-file-size';
-EXPECT "" volinfo_field $V0 'performance.cache-min-file-size';
-
-#Verifying vlolume-profile start, info and stop
-EXPECT "Starting volume profile on $V0 has been successful " $CLI volume profile $V0 start
-
-function vol_prof_info()
-{
-    $CLI volume profile $V0 info | grep Brick | wc -l
-}
-EXPECT "8" vol_prof_info
-
-EXPECT "Stopping volume profile on $V0 has been successful " $CLI volume profile $V0 stop
-
-function log-file-name()
-{
-    logfilename=$B0"/"$V0"1.log"
-    echo ${logfilename:1} | tr / -
-}
-
-function file-size()
-{
-    ls -lrt $1 | awk '{print $5}'
-}
-
-#Finding the current log file's size
-log_file=$logdir"/"`log-file-name`
-log_file_size=`file-size $log_file`
-
-#Removing the old backup log files
-ren_file=$log_file".*"
-rm -rf $ren_file
-
-#Initiating log rotate
-TEST $CLI volume log rotate $V0
-
-#Capturing new log file's size
-new_file_size=`file-size $log_file`
-
-#Verifying the size of the new log file and the creation of the backup log file
-TEST ! [ $new_file_size -eq $log_file_size ]
-TEST ls -lrt $ren_file
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-853258.t b/tests/bugs/bug-853258.t
deleted file mode 100755
index faa9d4465..000000000
--- a/tests/bugs/bug-853258.t
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-mkdir -p $H0:$B0/${V0}0
-mkdir -p $H0:$B0/${V0}1
-mkdir -p $H0:$B0/${V0}2
-mkdir -p $H0:$B0/${V0}3
-
-# Create and start a volume.
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
-TEST $CLI volume start $V0
-EXPECT_WITHIN 15 'Started' volinfo_field $V0 'Status';
-
-# Force assignment of initial ranges.
-TEST $CLI volume rebalance $V0 fix-layout start
-EXPECT_WITHIN 15 "fix-layout completed" rebalance_status_field $V0
-
-# Get the original values.
-xattrs=""
-for i in $(seq 0 2); do
-	xattrs="$xattrs $(dht_get_layout $B0/${V0}$i)"
-done
-
-# Expand the volume and force assignment of new ranges.
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}3
-# Force assignment of initial ranges.
-TEST $CLI volume rebalance $V0 fix-layout start
-EXPECT_WITHIN 15 "fix-layout completed" rebalance_status_field $V0
-
-for i in $(seq 0 3); do
-	xattrs="$xattrs $(dht_get_layout $B0/${V0}$i)"
-done
-
-overlap=$(python2 $(dirname $0)/overlap.py $xattrs)
-# 2863311531 = 0xaaaaaaab = 2/3 overlap
-TEST [ "$overlap" -ge 2863311531 ]
-
-cleanup
diff --git a/tests/bugs/bug-853680.t b/tests/bugs/bug-853680.t
deleted file mode 100755
index 72d53ae6c..000000000
--- a/tests/bugs/bug-853680.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# Bug 853680
-#
-# Test that io-threads least-rate-limit throttling functions as expected. Set
-# a limit, perform a few operations with a least-priority mount and verify
-# said operations take a minimum amount of time according to the limit.
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}1
-TEST $CLI volume start $V0
-
-#Accept min val
-TEST $CLI volume set $V0 performance.least-rate-limit 0
-#Accept some value in between
-TEST $CLI volume set $V0 performance.least-rate-limit 1035
-#Accept max val INT_MAX
-TEST $CLI volume set $V0 performance.least-rate-limit 2147483647
-
-#Reject other values
-TEST ! $CLI volume set $V0 performance.least-rate-limit 2147483648
-TEST ! $CLI volume set $V0 performace.least-rate-limit -8
-TEST ! $CLI volume set $V0 performance.least-rate-limit abc
-TEST ! $CLI volume set $V0 performance.least-rate-limit 0.0
-TEST ! $CLI volume set $V0 performance.least-rate-limit -10.0
-TEST ! $CLI volume set $V0 performance.least-rate-limit 1%
-
-# set rate limit to 1 operation/sec
-TEST $CLI volume set $V0 performance.least-rate-limit 1
-
-# use client-pid=-1 for least priority mount
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --client-pid=-1
-
-# create a few files and verify this takes more than a few seconds
-date1=`date +%s`
-TEST touch $M0/file{0..2}
-date2=`date +%s`
-
-optime=$(($date2 - $date1))
-TEST [ $optime -ge 3 ]
-
-TEST umount $M0
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/bugs/bug-853690.t b/tests/bugs/bug-853690.t
deleted file mode 100755
index 77a581f54..000000000
--- a/tests/bugs/bug-853690.t
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-#
-# Bug 853690 - Test that short writes do not lead to corruption.
-#
-# Mismanagement of short writes in AFR leads to corruption and immediately
-# detectable split-brain. Write a file to a replica volume using error-gen
-# to cause short writes on one replica.
-#
-# Short writes are also possible during heal. If ignored, the files are marked
-# consistent and silently differ. After reading the file, cause a lookup, wait
-# for self-heal and verify that the afr xattrs do not match.
-#
-########
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST mkdir -p $B0/test{1,2}
-
-# Our graph is a two brick replica with 100% frequency of short writes on one
-# side of the replica. This guarantees a single write fop leads to an out-of-sync
-# situation.
-cat > $B0/test.vol <<EOF
-volume test-posix-0
-    type storage/posix
-    option directory $B0/test1
-end-volume
-
-volume test-error-0
-    type debug/error-gen
-    option failure 100
-    option enable writev
-    option error-no GF_ERROR_SHORT_WRITE
-    subvolumes test-posix-0
-end-volume
-
-volume test-locks-0
-    type features/locks
-    subvolumes test-error-0
-end-volume
-
-volume test-posix-1
-    type storage/posix
-    option directory $B0/test2
-end-volume
-
-volume test-locks-1
-    type features/locks
-    subvolumes test-posix-1
-end-volume
-
-volume test-replicate-0
-    type cluster/replicate
-    option background-self-heal-count 0
-    subvolumes test-locks-0 test-locks-1
-end-volume
-EOF
-
-TEST glusterd
-
-TEST glusterfs --volfile=$B0/test.vol --attribute-timeout=0 --entry-timeout=0 $M0
-
-# Send a single write, guaranteed to be short on one replica, and attempt to
-# read the data back. Failure to detect the short write results in different
-# file sizes and immediate split-brain (EIO).
-TEST dd if=/dev/zero of=$M0/file bs=128k count=1
-TEST dd if=$M0/file of=/dev/null bs=128k count=1
-
-########
-#
-# Test self-heal with short writes...
-#
-########
-
-# Cause a lookup and wait a few seconds for posterity. This self-heal also fails
-# due to a short write.
-TEST ls $M0/file
-
-# Verify the attributes on the healthy replica do not reflect consistency with
-# the other replica.
-TEST "getfattr -n trusted.afr.test-locks-0 $B0/test2/file --only-values > $B0/out1 2> /dev/null"
-TEST "getfattr -n trusted.afr.test-locks-1 $B0/test2/file --only-values > $B0/out2 2> /dev/null"
-TEST ! cmp $B0/out1 $B0/out2
-
-TEST rm -f $B0/out1 $B0/out2
-TEST rm -f $M0/file
-TEST umount $M0
-
-rm -f $B0/test.vol
-rm -rf $B0/test1 $B0/test2
-
-cleanup;
-
diff --git a/tests/bugs/bug-856455.t b/tests/bugs/bug-856455.t
deleted file mode 100644
index becb20222..000000000
--- a/tests/bugs/bug-856455.t
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-BRICK_COUNT=3
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
-TEST $CLI volume start $V0
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-function query_pathinfo()
-{
-    local path=$1;
-    local retval;
-
-    local pathinfo=`getfattr -m . -n trusted.glusterfs.pathinfo $path`;
-    retval=`echo $pathinfo | grep -o 'POSIX' | wc -l`;
-    echo $retval
-}
-
-touch $M0/f00f;
-mkdir $M0/f00d;
-
-# verify pathinfo for a file and directory
-EXPECT 1 query_pathinfo $M0/f00f;
-EXPECT $BRICK_COUNT query_pathinfo $M0/f00d;
-
-# Kill a brick process and then query for pathinfo
-# for directories pathinfo should list backend patch from available (up) subvolumes
-
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}1.pid`;
-
-EXPECT `expr $BRICK_COUNT - 1` query_pathinfo $M0/f00d;
-
-cleanup;
diff --git a/tests/bugs/bug-857330/common.rc b/tests/bugs/bug-857330/common.rc
deleted file mode 100644
index e5a7cd79a..000000000
--- a/tests/bugs/bug-857330/common.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-. $(dirname $0)/../../include.rc
-
-UUID_REGEX='[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}'
-
-TASK_ID=""
-COMMAND=""
-PATTERN=""
-
-function check-and-store-task-id()
-{
-        TASK_ID=""
-
-        local task_id=$($CLI $COMMAND | grep $PATTERN | grep -o -E "$UUID_REGEX")
-
-        if [ -z "$task_id" ] && [ "${task_id+asdf}" = "asdf" ]; then
-                return 1
-        fi
-
-        TASK_ID=$task_id
-        return 0;
-}
-
-function get-task-id()
-{
-        $CLI $COMMAND | grep $PATTERN | grep -o -E "$UUID_REGEX" | tail -n1
-
-}
-
-function check-and-store-task-id-xml()
-{
-        TASK_ID=""
-
-        local task_id=$($CLI $COMMAND --xml | xmllint --format - | grep $PATTERN | grep -o -E "$UUID_REGEX")
-
-        if [ -z "$task_id" ] && [ "${task_id+asdf}" = "asdf" ]; then
-                return 1
-        fi
-
-        TASK_ID=$task_id
-        return 0;
-}
-
-function get-task-id-xml()
-{
-        $CLI $COMMAND --xml | xmllint --format - | grep $PATTERN | grep -o -E "$UUID_REGEX"
-}
-
-function get-task-status()
-{
-        $CLI $COMMAND | grep -o $PATTERN
-        if [ ${PIPESTATUS[0]} -ne 0 ]; then
-                return 1
-        fi
-        return 0
-}
diff --git a/tests/bugs/bug-857330/normal.t b/tests/bugs/bug-857330/normal.t
deleted file mode 100755
index 24dfe52c4..000000000
--- a/tests/bugs/bug-857330/normal.t
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/common.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}1;
-TEST $CLI volume info $V0;
-TEST $CLI volume start $V0;
-
-TEST glusterfs -s $H0 --volfile-id=$V0 $M0;
-
-TEST python2 $(dirname $0)/../../utils/create-files.py --multi -b 10 -d 10  -n 10 $M0;
-
-TEST umount $M0;
-
-###############
-## Rebalance ##
-###############
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}2;
-
-COMMAND="volume rebalance $V0 start"
-PATTERN="ID:"
-TEST check-and-store-task-id
-
-COMMAND="volume status $V0"
-PATTERN="ID"
-EXPECT $TASK_ID get-task-id
-
-COMMAND="volume rebalance $V0 status"
-PATTERN="completed"
-EXPECT_WITHIN 300 $PATTERN get-task-status
-
-###################
-## Replace-brick ##
-###################
-REP_BRICK_PAIR="$H0:$B0/${V0}2 $H0:$B0/${V0}3"
-
-COMMAND="volume replace-brick $V0 $REP_BRICK_PAIR start"
-PATTERN="ID:"
-TEST check-and-store-task-id
-
-COMMAND="volume status $V0"
-PATTERN="ID"
-EXPECT $TASK_ID get-task-id
-
-COMMAND="volume replace-brick $V0 $REP_BRICK_PAIR status"
-PATTERN="complete"
-EXPECT_WITHIN 300 $PATTERN get-task-status
-
-TEST $CLI volume replace-brick $V0 $REP_BRICK_PAIR commit;
-
-##################
-## Remove-brick ##
-##################
-COMMAND="volume remove-brick $V0 $H0:$B0/${V0}3 start"
-PATTERN="ID:"
-TEST check-and-store-task-id
-
-COMMAND="volume status $V0"
-PATTERN="ID"
-EXPECT $TASK_ID get-task-id
-
-COMMAND="volume remove-brick $V0 $H0:$B0/${V0}3 status"
-PATTERN="completed"
-EXPECT_WITHIN 300 $PATTERN get-task-status
-
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}3 commit
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-857330/xml.t b/tests/bugs/bug-857330/xml.t
deleted file mode 100755
index 688f46619..000000000
--- a/tests/bugs/bug-857330/xml.t
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/common.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}1;
-TEST $CLI volume info $V0;
-TEST $CLI volume start $V0;
-
-TEST glusterfs -s $H0 --volfile-id=$V0 $M0;
-
-TEST python2 $(dirname $0)/../../utils/create-files.py --multi -b 10 -d 10  -n 10 $M0;
-
-TEST umount $M0;
-
-
-###############
-## Rebalance ##
-###############
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}2;
-
-COMMAND="volume rebalance $V0 start"
-PATTERN="task-id"
-TEST check-and-store-task-id-xml
-
-COMMAND="volume status $V0"
-PATTERN="id"
-EXPECT $TASK_ID get-task-id-xml
-
-COMMAND="volume rebalance $V0 status"
-PATTERN="task-id"
-EXPECT $TASK_ID get-task-id-xml
-
-## TODO: Add tests for rebalance stop
-
-COMMAND="volume rebalance $V0 status"
-PATTERN="completed"
-EXPECT_WITHIN 300 $PATTERN get-task-status
-
-###################
-## Replace-brick ##
-###################
-REP_BRICK_PAIR="$H0:$B0/${V0}2 $H0:$B0/${V0}3"
-
-COMMAND="volume replace-brick $V0 $REP_BRICK_PAIR start"
-PATTERN="task-id"
-TEST check-and-store-task-id-xml
-
-COMMAND="volume status $V0"
-PATTERN="id"
-EXPECT $TASK_ID get-task-id-xml
-
-COMMAND="volume replace-brick $V0 $REP_BRICK_PAIR status"
-PATTERN="task-id"
-EXPECT $TASK_ID get-task-id-xml
-
-## TODO: Add more tests for replace-brick pause|abort
-
-COMMAND="volume replace-brick $V0 $REP_BRICK_PAIR status"
-PATTERN="complete"
-EXPECT_WITHIN 300 $PATTERN get-task-status
-
-COMMAND="volume replace-brick $V0 $REP_BRICK_PAIR commit"
-PATTERN="task-id"
-EXPECT $TASK_ID get-task-id-xml
-
-##################
-## Remove-brick ##
-##################
-COMMAND="volume remove-brick $V0 $H0:$B0/${V0}3 start"
-PATTERN="task-id"
-TEST check-and-store-task-id-xml
-
-COMMAND="volume status $V0"
-PATTERN="id"
-EXPECT $TASK_ID get-task-id-xml
-
-COMMAND="volume remove-brick $V0 $H0:$B0/${V0}3 status"
-PATTERN="task-id"
-EXPECT $TASK_ID get-task-id-xml
-
-COMMAND="volume remove-brick $V0 $H0:$B0/${V0}3 status"
-PATTERN="completed"
-EXPECT_WITHIN 300 $PATTERN get-task-status
-
-## TODO: Add tests for remove-brick stop
-
-COMMAND="volume remove-brick $V0 $H0:$B0/${V0}3 commit"
-PATTERN="task-id"
-EXPECT $TASK_ID get-task-id-xml
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-858215.t b/tests/bugs/bug-858215.t
deleted file mode 100755
index aee7d5fcb..000000000
--- a/tests/bugs/bug-858215.t
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-## Wait for volume to register with rpc.mountd
-sleep 5;
-
-## Test for checking whether the fops have been saved in the event-history
-TEST ! stat $M0/newfile;
-TEST touch $M0/newfile;
-TEST stat $M0/newfile;
-TEST rm $M0/newfile;
-
-nfs_pid=$(cat /var/lib/glusterd/nfs/run/nfs.pid);
-glustershd_pid=$(cat /var/lib/glusterd/glustershd/run/glustershd.pid);
-
-pids=$(pidof glusterfs);
-for i in $pids
-do
-        if [ $i -ne $nfs_pid ] && [ $i -ne $glustershd_pid ]; then
-                mount_pid=$i;
-                break;
-        fi
-done
-
-dump_dir='/tmp/gerrit_glusterfs'
-cat >$statedumpdir/glusterdump.options <<EOF
-all=yes
-path=$dump_dir
-EOF
-
-TEST mkdir -p $dump_dir;
-TEST kill -USR1 $mount_pid;
-sleep 2;
-for file_name in $(ls $dump_dir)
-do
-    TEST grep "xlator.mount.fuse.history" $dump_dir/$file_name;
-done
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-TEST rm -rf $dump_dir;
-TEST rm $statedumpdir/glusterdump.options;
-
-cleanup;
diff --git a/tests/bugs/bug-858242.c b/tests/bugs/bug-858242.c
deleted file mode 100644
index 00a3a2d5f..000000000
--- a/tests/bugs/bug-858242.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-int
-main (int argc, char *argv[])
-{
-        char        *filename = NULL, *volname = NULL, *cmd = NULL;
-        char  buffer[1024]    = {0, };
-        int          fd       = -1;
-        int          ret      = -1;
-        struct stat  statbuf  = {0, };
-
-        if (argc != 3) {
-                fprintf (stderr, "usage: %s <file-name> <volname>\n", argv[0]);
-                goto out;
-        }
-
-        filename = argv[1];
-        volname = argv[2];
-
-        fd = open (filename, O_RDWR | O_CREAT, 0);
-        if (fd < 0) {
-                fprintf (stderr, "open (%s) failed (%s)\n", filename,
-                         strerror (errno));
-                goto out;
-        }
-
-        ret = write (fd, "test-content", 12);
-        if (ret < 0) {
-                fprintf (stderr, "write failed (%s)", strerror (errno));
-                goto out;
-        }
-
-        ret = fsync (fd);
-        if (ret < 0) {
-                fprintf (stderr, "fsync failed (%s)", strerror (errno));
-                goto out;
-        }
-
-        ret = fstat64 (fd, &statbuf);
-        if (ret < 0) {
-                fprintf (stderr, "fstat64 failed (%s)", strerror (errno));
-                goto out;
-        }
-
-        ret = asprintf (&cmd, "gluster --mode=script volume stop %s force",
-                        volname);
-        if (ret < 0) {
-                fprintf (stderr, "cannot construct cli command string (%s)",
-                         strerror (errno));
-                goto out;
-        }
-
-        ret = system (cmd);
-        if (ret < 0) {
-                fprintf (stderr, "stopping volume (%s) failed", volname);
-                goto out;
-        }
-
-        ret = read (fd, buffer, 1024);
-        if (ret >= 0) {
-                fprintf (stderr, "read should've returned error, "
-                         "but is successful\n");
-                ret = -1;
-                goto out;
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
diff --git a/tests/bugs/bug-858242.t b/tests/bugs/bug-858242.t
deleted file mode 100755
index e93c2d244..000000000
--- a/tests/bugs/bug-858242.t
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-TEST $CLI volume set $V0 performance.quick-read off
-
-#mount on a random dir
-TEST glusterfs --entry-timeout=3600 --attribute-timeout=3600 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=yes
-
-build_tester $(dirname $0)/bug-858242.c
-
-TEST $(dirname $0)/bug-858242 $M0/testfile $V0
-
-TEST rm -rf $(dirname $0)/858242
-cleanup;
-
diff --git a/tests/bugs/bug-858488-min-free-disk.t b/tests/bugs/bug-858488-min-free-disk.t
deleted file mode 100644
index ae5ac3bde..000000000
--- a/tests/bugs/bug-858488-min-free-disk.t
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-function pidgrep()
-{
-    ps ax | grep "$1" | grep -v grep | awk '{print $1}' | head -1
-}
-
-## Start glusterd
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-## Lets create partitions for bricks
-TEST truncate -s 100M $B0/brick1
-TEST truncate -s 200M $B0/brick2
-TEST LO1=`losetup --find --show $B0/brick1`
-TEST mkfs.xfs $LO1
-TEST LO2=`losetup --find --show $B0/brick2`
-TEST mkfs.xfs $LO2
-TEST mkdir -p $B0/${V0}1 $B0/${V0}2
-TEST mount -t xfs $LO1 $B0/${V0}1
-TEST mount -t xfs $LO2 $B0/${V0}2
-
-
-## Lets create volume
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-TEST glusterfs -s $H0 --volfile-id=$V0 --acl $M0
-MOUNT_PID=`ps ax |grep "glusterfs -s $H0 --volfile-id=$V0 --acl $M0" | awk '{print $1}' | head -1`
-## Real test starts here
-## ----------------------------------------------------------------------------
-
-MINFREEDISKVALUE=90
-
-## Set min free disk to MINFREEDISKVALUE percent
-TEST $CLI volume set $V0 cluster.min-free-disk $MINFREEDISKVALUE
-
-## We need to have file name to brick map based on hash.
-## We will use this info in test case 0.
-i=1
-CONTINUE=2
-BRICK1FILE=0
-BRICK2FILE=0
-while [[ $CONTINUE -ne 0 ]]
-do
-        dd if=/dev/zero of=$M0/file$i.data bs=1024 count=1024 1>/dev/null 2>&1
-
-        if  [[ -e  $B0/${V0}1/file$i.data &&  $BRICK1FILE = "0" ]]
-        then
-                BRICK1FILE=file$i.data
-                CONTINUE=$CONTINUE-1
-        fi
-
-        if [[ -e  $B0/${V0}2/file$i.data &&  $BRICK2FILE = "0" ]]
-        then
-                BRICK2FILE=file$i.data
-                CONTINUE=$CONTINUE-1
-        fi
-
-        rm $M0/file$i.data
-        let i++
-done
-
-
-## Bring free space on one of the bricks to less than minfree value by
-## creating one big file.
-dd if=/dev/zero of=$M0/fillonebrick.data bs=1024 count=25600 1>/dev/null 2>&1
-
-#Lets find out where it was created
-if [ -f $B0/${V0}1/fillonebrick.data ]
-then
-        FILETOCREATE=$BRICK1FILE
-        OTHERBRICK=$B0/${V0}2
-else
-        FILETOCREATE=$BRICK2FILE
-        OTHERBRICK=$B0/${V0}1
-fi
-
-##--------------------------------TEST CASE 0-----------------------------------
-## If we try to create a file which should go into full brick as per hash, it
-## should go into the other brick instead.
-
-## Before that let us create files just to make gluster refresh the stat
-## Using touch so it should not change the disk usage stats
-for k in {1..20};
-do
-        touch $M0/dummyfile$k
-done
-
-dd if=/dev/zero of=$M0/$FILETOCREATE bs=1024 count=2048 1>/dev/null 2>&1
-TEST [ -e $OTHERBRICK/$FILETOCREATE ]
-
-## Done testing, lets clean up
-EXPECT "$MOUNT_PID" pidgrep $MOUNT_PID
-TEST rm -rf $M0/*
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-$CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-859927.t b/tests/bugs/bug-859927.t
deleted file mode 100755
index ed74d3eb8..000000000
--- a/tests/bugs/bug-859927.t
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-cleanup;
-
-glusterd;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-TEST ! $CLI volume set $V0 statedump-path ""
-TEST ! $CLI volume set $V0 statedump-path "     "
-TEST   $CLI volume set $V0 statedump-path "/home/"
-EXPECT "/home/" volume_option $V0 server.statedump-path
-
-TEST ! $CLI volume set $V0 background-self-heal-count ""
-TEST ! $CLI volume set $V0 background-self-heal-count "      "
-TEST   $CLI volume set $V0 background-self-heal-count 10
-EXPECT "10" volume_option $V0 cluster.background-self-heal-count
-
-TEST ! $CLI volume set $V0 cache-size ""
-TEST ! $CLI volume set $V0 cache-size "    "
-TEST   $CLI volume set $V0 cache-size 512MB
-EXPECT "512MB" volume_option $V0 performance.cache-size
-
-TEST ! $CLI volume set $V0 self-heal-daemon ""
-TEST ! $CLI volume set $V0 self-heal-daemon "    "
-TEST   $CLI volume set $V0 self-heal-daemon on
-EXPECT "on" volume_option $V0 cluster.self-heal-daemon
-
-TEST ! $CLI volume set $V0 read-subvolume ""
-TEST ! $CLI volume set $V0 read-subvolume "    "
-TEST   $CLI volume set $V0 read-subvolume $V0-client-0
-EXPECT "$V0-client-0" volume_option  $V0 cluster.read-subvolume
-
-TEST ! $CLI volume set $V0 data-self-heal-algorithm ""
-TEST ! $CLI volume set $V0 data-self-heal-algorithm "     "
-TEST ! $CLI volume set $V0 data-self-heal-algorithm on
-TEST   $CLI volume set $V0 data-self-heal-algorithm full
-EXPECT "full" volume_option $V0 cluster.data-self-heal-algorithm
-
-TEST ! $CLI volume set $V0 min-free-inodes ""
-TEST ! $CLI volume set $V0 min-free-inodes "     "
-TEST   $CLI volume set $V0 min-free-inodes 60%
-EXPECT "60%" volume_option $V0 cluster.min-free-inodes
-
-TEST ! $CLI volume set $V0 min-free-disk ""
-TEST ! $CLI volume set $V0 min-free-disk "     "
-TEST   $CLI volume set $V0 min-free-disk 60%
-EXPECT "60%" volume_option $V0 cluster.min-free-disk
-
-TEST   $CLI volume set $V0 min-free-disk 120
-EXPECT "120" volume_option $V0 cluster.min-free-disk
-
-TEST ! $CLI volume set $V0 frame-timeout ""
-TEST ! $CLI volume set $V0 frame-timeout "      "
-TEST   $CLI volume set $V0 frame-timeout 0
-EXPECT "0" volume_option $V0 network.frame-timeout
-
-TEST ! $CLI volume set $V0 auth.allow ""
-TEST ! $CLI volume set $V0 auth.allow "       "
-TEST   $CLI volume set $V0 auth.allow 192.168.122.1
-EXPECT "192.168.122.1" volume_option $V0 auth.allow
-
-TEST ! $CLI volume set $V0 stripe-block-size ""
-TEST ! $CLI volume set $V0 stripe-block-size "      "
-TEST   $CLI volume set $V0 stripe-block-size 512MB
-EXPECT "512MB" volume_option $V0 cluster.stripe-block-size
-
-cleanup;
diff --git a/tests/bugs/bug-860297.t b/tests/bugs/bug-860297.t
deleted file mode 100644
index 2a3ca7a7a..000000000
--- a/tests/bugs/bug-860297.t
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-. $(dirname $0)/../include.rc
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info
-TEST $CLI volume create $V0 $H0:$B0/brick1
-setfattr -x trusted.glusterfs.volume-id $B0/brick1
-## If Extended attribute trusted.glusterfs.volume-id is not present
-## then volume should not be able to start
-TEST ! $CLI volume start $V0;
-cleanup;
diff --git a/tests/bugs/bug-860663.t b/tests/bugs/bug-860663.t
deleted file mode 100644
index 05dea5fbc..000000000
--- a/tests/bugs/bug-860663.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-function file_count()
-{
-        val=1
-
-        if [ "$1" == "$2" ]
-        then
-                val=0
-        fi
-        echo $val
-}
-
-BRICK_COUNT=3
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
-TEST $CLI volume start $V0
-
-## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-sleep 5;
-
-TEST touch $M0/files{1..10000};
-
-ORIG_FILE_COUNT=`ls -l $M0 | wc -l`;
-
-# Kill a brick process
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}1.pid`;
-
-TEST $CLI volume rebalance $V0 fix-layout start
-
-sleep 30;
-
-TEST ! touch $M0/files{1..10000};
-
-TEST $CLI volume start $V0 force
-
-sleep 5;
-
-NEW_FILE_COUNT=`ls -l $M0 | wc -l`;
-
-EXPECT "0" file_count $ORIG_FILE_COUNT $NEW_FILE_COUNT
-
-cleanup;
diff --git a/tests/bugs/bug-861015-index.t b/tests/bugs/bug-861015-index.t
deleted file mode 100644
index 4b148e6cc..000000000
--- a/tests/bugs/bug-861015-index.t
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1,2,3,4,5}
-TEST $CLI volume set $V0 ensure-durability off
-TEST $CLI volume start $V0
-EXPECT_WITHIN 20 "Y" glustershd_up_status
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST kill_brick $V0 $H0 $B0/${V0}0
-TEST kill_brick $V0 $H0 $B0/${V0}2
-TEST kill_brick $V0 $H0 $B0/${V0}4
-cd $M0
-HEAL_FILES=0
-for i in {1..10}
-do
-        echo "abc" > $i
-        HEAL_FILES=$(($HEAL_FILES+1))
-done
-HEAL_FILES=$(($HEAL_FILES+3)) #count brick root distribute-subvol num of times
-
-cd ~
-EXPECT "$HEAL_FILES" afr_get_pending_heal_count $V0
-TEST rm -f $M0/*
-TEST umount $M0
-TEST $CLI volume heal $V0 info
-#Only root dir should be present now in the indices
-EXPECT "1" afr_get_num_indices_in_brick $B0/${V0}1
-EXPECT "1" afr_get_num_indices_in_brick $B0/${V0}3
-EXPECT "1" afr_get_num_indices_in_brick $B0/${V0}5
-cleanup
diff --git a/tests/bugs/bug-861015-log.t b/tests/bugs/bug-861015-log.t
deleted file mode 100644
index 032032470..000000000
--- a/tests/bugs/bug-861015-log.t
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-log_wd=$(gluster --print-logdir)
-TEST glusterd
-TEST pidof glusterd
-rm -f $log_wd/glustershd.log
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST kill_brick $V0 $H0 $B0/${V0}0
-cd $M0
-for i in {1..10}
-do
-        dd if=/dev/urandom of=f bs=1M count=10 2>/dev/null
-done
-
-cd ~
-TEST $CLI volume heal $V0 info
-function count_inode_link_failures {
-        logfile=$1
-        grep "inode link failed on the inode" $logfile | wc -l
-}
-EXPECT "0" count_inode_link_failures $log_wd/glustershd.log
-cleanup
diff --git a/tests/bugs/bug-861542.t b/tests/bugs/bug-861542.t
deleted file mode 100755
index 5fd08f12d..000000000
--- a/tests/bugs/bug-861542.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-# Distributed volume with a single brick was chosen solely for the ease of
-#implementing the test case (to be precise, for the ease of extracting the port number).
-TEST $CLI volume create $V0 $H0:$B0/brick0;
-
-TEST $CLI volume start $V0;
-
-function port_field()
-{
-    local vol=$1;
-    local opt=$2;
-    if [ $opt -eq '0' ]; then
-        $CLI volume status $vol | grep "brick0" | awk '{print $3}';
-    else
-        $CLI volume status $vol detail | grep "^Port " | awk '{print $3}';
-    fi
-}
-
-function xml_port_field()
-{
-    local vol=$1;
-    local opt=$2;
-        $CLI --xml volume status $vol $opt | tr -d '\n' |\
-#Find the first occurrence of the string between <port> and </port>
-        sed -r 's/<port>/&\n/;s/<\/port>/\n&/;s/^.*\n(.*)\n.*$/\1/'| \
-        grep -v xml | tr -d '\n';
-}
-
-TEST $CLI volume status $V0;
-TEST $CLI volume status $V0 detail;
-TEST $CLI --xml volume status $V0;
-TEST $CLI --xml volume status $V0 detail;
-
-# Kill the brick process. After this, port number for the killed (in this case brick) process must be "N/A".
-kill `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-brick0.pid`
-
-EXPECT "N/A" port_field $V0 '0'; # volume status
-EXPECT "N/A" port_field $V0 '1'; # volume status detail
-
-EXPECT "N/A" xml_port_field $V0 '';
-EXPECT "N/A" xml_port_field $V0 'detail';
-
-cleanup;
diff --git a/tests/bugs/bug-862834.t b/tests/bugs/bug-862834.t
deleted file mode 100755
index 33aaea1a8..000000000
--- a/tests/bugs/bug-862834.t
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-V1="patchy2"
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-
-function check_brick()
-{
-        vol=$1;
-        num=$2
-        $CLI volume info $V0 | grep "Brick$num" | awk '{print $2}';
-}
-
-function volinfo_field()
-{
-        local vol=$1;
-        local field=$2;
-
-        $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-function brick_count()
-{
-        local vol=$1;
-
-        $CLI volume info $vol | egrep "^Brick[0-9]+: " | wc -l;
-}
-
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '2' brick_count $V0
-
-
-EXPECT "$H0:$B0/${V0}1" check_brick $V0 '1';
-EXPECT "$H0:$B0/${V0}2" check_brick $V0 '2';
-
-TEST ! $CLI volume create $V1 $H0:$B0/${V1}0 $H0:$B0/${V0}1;
-
-cleanup;
diff --git a/tests/bugs/bug-862967.t b/tests/bugs/bug-862967.t
deleted file mode 100644
index 00fa88440..000000000
--- a/tests/bugs/bug-862967.t
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-function uid_gid_compare()
-{
-        val=1
-
-        if [ "$1" == "$3" ]
-        then
-                if [ "$2" == "$4" ]
-                        then
-                                val=0
-                fi
-        fi
-        echo "$val"
-}
-
-BRICK_COUNT=3
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
-TEST $CLI volume set $V0 stat-prefetch off
-TEST $CLI volume start $V0
-
-## Mount FUSE
-TEST glusterfs --attribute-timeout=0 --entry-timeout=0 --gid-timeout=-1 -s $H0 --volfile-id $V0 $M0;
-
-# change dir permissions
-mkdir $M0/dir;
-chown 1:1 $M0/dir;
-
-# Kill a brick process
-
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}1.pid`;
-# change dir ownership
-NEW_UID=36;
-NEW_GID=36;
-chown $NEW_UID:$NEW_GID $M0/dir;
-
-# bring the brick back up
-TEST $CLI volume start $V0 force
-
-sleep 10;
-
-ls -l $M0/dir;
-
-# check if uid/gid is healed on backend brick which was taken down
-BACKEND_UID=`stat --printf=%u $B0/${V0}1/dir`;
-BACKEND_GID=`stat --printf=%g $B0/${V0}1/dir`;
-
-
-EXPECT "0" uid_gid_compare $NEW_UID $NEW_GID $BACKEND_UID $BACKEND_GID
-
-cleanup;
diff --git a/tests/bugs/bug-863068.t b/tests/bugs/bug-863068.t
deleted file mode 100644
index 931aad623..000000000
--- a/tests/bugs/bug-863068.t
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-## This function get the No. of entries for
-## gluster volume heal volnmae info healed command for brick1 and brick2
-## and compare the initial value (Before volume heal full) and final value
-## (After gluster volume heal vol full) and compare.
-
-function getdiff()
-{
-	val=10
-	if [ "$1" == "$3" ]
-	then
-		if [ "$2" == "$4" ]
-			then
-				val=0
-		else
-				val=20
-		fi
-      fi
-
-      echo $val
-}
-
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-TEST $CLI volume create $V0 replica 2  $H0:$B0/brick1 $H0:$B0/brick2;
-TEST $CLI volume start $V0;
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
-B0_hiphenated=`echo $B0 | tr '/' '-'`
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0$B0_hiphenated-brick1.pid` ;
-
-mkdir $M0/{a,b,c};
-echo "GLUSTERFS" >> $M0/a/file;
-
-TEST $CLI volume start $V0 force;
-sleep 5
-TEST $CLI volume heal $V0 full;
-sleep 5
-
-##First Brick Initial(Before full type self heal) value
-FBI=`gluster volume heal $V0 info healed | grep entries | awk '{print $4}' | head -n 1`
-
-##Second Brick Initial Value
-SBI=`gluster volume heal $V0 info healed | grep entries | awk '{print $4}' | tail -n 1`
-TEST $CLI volume heal $V0 full;
-
-sleep 5
-
-##First Brick Final value
-##Number of entries from output of <gluster volume heal volname info healed>
-
-FBF=`gluster volume heal $V0 info healed | grep entries | awk '{print $4}' | head -n 1`
-
-##Second Brick Final Value
-SBF=`gluster volume heal $V0 info healed | grep entries | awk '{print $4}' | tail -n 1`
-
-##get the difference of values
-EXPECT "0"  getdiff $FBI $SBI $FBF $SBF;
-
-## Tests after this comment checks for the background self heal
-
-TEST mkdir $M0/d
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0$B0_hiphenated-brick1.pid` ;
-TEST $CLI volume set $V0 self-heal-daemon off
-dd if=/dev/random of=$M0/d/file1 bs=100M count=1 2>/dev/null;
-TEST $CLI volume start $V0 force
-sleep 3
-TEST ls -l $M0/d
-
-cleanup;
diff --git a/tests/bugs/bug-864222.t b/tests/bugs/bug-864222.t
deleted file mode 100755
index 6e02ab60b..000000000
--- a/tests/bugs/bug-864222.t
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick0
-TEST $CLI volume start $V0
-
-sleep 5
-
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0
-cd $N0
-
-TEST ls
-
-TEST $CLI volume set $V0 nfs.enable-ino32 on
-# Main test. This should pass.
-TEST ls
-
-cd
-TEST umount $N0
-cleanup
-
diff --git a/tests/bugs/bug-865825.t b/tests/bugs/bug-865825.t
deleted file mode 100755
index 6bb1c2348..000000000
--- a/tests/bugs/bug-865825.t
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-## Start and create a volume
-mkdir -p ${B0}/${V0}-0
-mkdir -p ${B0}/${V0}-1
-mkdir -p ${B0}/${V0}-2
-TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}-{0,1,2}
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Make sure io-cache and write-behind don't interfere.
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST $CLI volume set $V0 performance.io-cache off;
-TEST $CLI volume set $V0 performance.write-behind off;
-TEST $CLI volume set $V0 performance.stat-prefetch off
-
-## Make sure automatic self-heal doesn't perturb our results.
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Mount native
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-
-## Create a file with some recognizable contents.
-echo "test_data" > $M0/a_file;
-
-## Unmount.
-TEST umount $M0;
-
-## Mess with the flags as though brick-0 accuses brick-2 while brick-1 is
-## missing its brick-2 changelog altogether.
-value=0x000000010000000000000000
-setfattr -n trusted.afr.${V0}-client-2 -v $value $B0/${V0}-0/a_file
-setfattr -x trusted.afr.${V0}-client-2 $B0/${V0}-1/a_file
-echo "wrong_data" > $B0/${V0}-2/a_file
-
-## Remount and force a self-heal.
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-stat ${M0}/a_file > /dev/null
-
-## Make sure brick 2 now has the correct contents.
-EXPECT "test_data" cat $B0/${V0}-2/a_file
-
-if [ "$EXIT_EARLY" = "1" ]; then
-	exit 0;
-fi
-
-## Finish up
-TEST umount $M0;
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-866459.t b/tests/bugs/bug-866459.t
deleted file mode 100644
index d66f70c69..000000000
--- a/tests/bugs/bug-866459.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-## Start and create a volume
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-## Create and start a volume with aio enabled
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
-TEST $CLI volume set $V0 linux-aio on
-TEST $CLI volume set $V0 background-self-heal-count 0
-TEST $CLI volume set $V0 performance.stat-prefetch off;
-TEST $CLI volume start $V0
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-dd of=$M0/a if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
-B0_hiphenated=`echo $B0 | tr '/' '-'`
-## Bring a brick down
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0$B0_hiphenated-${V0}1.pid`
-EXPECT '1' echo `pgrep glusterfsd | wc -l`
-## Rewrite the file
-dd of=$M0/a if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
-TEST $CLI volume start $V0 force
-## Wait for the brick to give CHILD_UP in client protocol
-sleep 5
-md5offile2=`md5sum $B0/${V0}2/a | awk '{print $1}'`
-
-##trigger self-heal
-ls -l $M0/a
-
-EXPECT "$md5offile2" echo `md5sum $B0/${V0}1/a | awk '{print $1}'`
-
-## Finish up
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-867252.t b/tests/bugs/bug-867252.t
deleted file mode 100644
index 8309ed9b9..000000000
--- a/tests/bugs/bug-867252.t
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}1;
-
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-
-function brick_count()
-{
-    local vol=$1;
-
-    $CLI volume info $vol | egrep "^Brick[0-9]+: " | wc -l;
-}
-
-
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '1' brick_count $V0
-
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}2;
-EXPECT '2' brick_count $V0
-
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}2;
-EXPECT '1' brick_count $V0
-
-cleanup;
diff --git a/tests/bugs/bug-867253.t b/tests/bugs/bug-867253.t
deleted file mode 100644
index ae4e243af..000000000
--- a/tests/bugs/bug-867253.t
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-function file_count()
-{
-        val=1
-
-        if [ "$1" == "0" ]
-        then
-                if [ "$2" == "0" ]
-                then
-                        val=0
-                fi
-        fi
-        echo $val
-}
-
-BRICK_COUNT=2
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume start $V0
-
-sleep 5;
-## Mount nfs, with nocache option
-TEST mount -o vers=3,nolock,noac -t nfs $H0:/$V0 $M0;
-
-touch $M0/files{1..1000};
-
-# Kill a brick process
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}0.pid`;
-
-echo 3 >/proc/sys/vm/drop_caches;
-
-ls -l $M0 >/dev/null;
-
-NEW_FILE_COUNT=`echo $?`;
-
-TEST $CLI volume start $V0 force
-
-# Kill a brick process
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}1.pid`;
-
-echo 3 >/proc/sys/vm/drop_caches;
-
-ls -l $M0 >/dev/null;
-
-NEW_FILE_COUNT1=`echo $?`;
-
-EXPECT "0" file_count $NEW_FILE_COUNT $NEW_FILE_COUNT1
-
-TEST umount -l $M0
-
-cleanup
diff --git a/tests/bugs/bug-869724.t b/tests/bugs/bug-869724.t
deleted file mode 100644
index eec5d344c..000000000
--- a/tests/bugs/bug-869724.t
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-## Start and create a volume
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}1;
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-
-## Make volume tightly consistent for metdata
-TEST $CLI volume set $V0 performance.stat-prefetch off;
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-touch $M0/test;
-build_tester $(dirname $0)/getlk_owner.c
-
-TEST $(dirname $0)/getlk_owner $M0/test;
-
-rm -f $(dirname $0)/getlk_owner
-cleanup;
-
diff --git a/tests/bugs/bug-872923.t b/tests/bugs/bug-872923.t
deleted file mode 100755
index 6757846dc..000000000
--- a/tests/bugs/bug-872923.t
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info
-TEST $CLI volume create $V0 replica 2 $H0:$B0/brick0 $H0:$B0/brick1
-TEST $CLI volume start $V0
-sleep 5
-
-mount -t nfs -o vers=3,nolock `hostname`:/$V0 $N0
-
-cd $N0
-mkdir test_hardlink_self_heal;
-cd test_hardlink_self_heal;
-
-for i in `seq 1 5`;
-do
-    mkdir dir.$i;
-    for j in `seq 1 10`;
-    do
-        dd if=/dev/zero of=dir.$i/file.$j bs=1k count=$j > /dev/null 2>&1;
-    done;
-done;
-
-cd ..
-kill  `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-brick0.pid`
-sleep 2
-
-
-cd test_hardlink_self_heal;
-
-RET=0
-for i in `seq 1 5`;
-do
-    for j in `seq 1 10`;
-    do
-        ln dir.$i/file.$j dir.$i/link_file.$j > /dev/null 2>&1;
-        RET=$?
-        if [ $RET -ne 0 ]; then
-           break;
-        fi
-    done ;
-    if [ $RET -ne 0 ]; then
-        break;
-    fi
-done;
-
-cd
-umount $N0
-
-EXPECT "0" echo $RET;
-
-cleanup;
diff --git a/tests/bugs/bug-873367.t b/tests/bugs/bug-873367.t
deleted file mode 100755
index cfbbc98d0..000000000
--- a/tests/bugs/bug-873367.t
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-SSL_BASE=/etc/ssl
-SSL_KEY=$SSL_BASE/glusterfs.key
-SSL_CERT=$SSL_BASE/glusterfs.pem
-SSL_CA=$SSL_BASE/glusterfs.ca
-
-cleanup;
-rm -f $SSL_BASE/glusterfs.*
-mkdir -p $B0/1
-mkdir -p $M0
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST openssl genrsa -out $SSL_KEY 1024
-TEST openssl req -new -x509 -key $SSL_KEY -subj /CN=Anyone -out $SSL_CERT
-ln $SSL_CERT $SSL_CA
-
-TEST $CLI volume create $V0 $H0:$B0/1
-TEST $CLI volume set $V0 server.ssl on
-TEST $CLI volume set $V0 client.ssl on
-TEST $CLI volume start $V0
-
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-echo some_data > $M0/data_file
-TEST umount $M0
-
-# If the bug is not fixed, the next mount will fail.
-
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-EXPECT some_data cat $M0/data_file
-
-TEST umount $M0
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/bugs/bug-873549.t b/tests/bugs/bug-873549.t
deleted file mode 100644
index 5b541de6c..000000000
--- a/tests/bugs/bug-873549.t
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd -LDEBUG;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-
-TEST $CLI volume set $V0 performance.cache-size 512MB
-TEST $CLI volume start $V0
-TEST $CLI volume statedump $V0 all
-
-cleanup;
diff --git a/tests/bugs/bug-873962-spb.t b/tests/bugs/bug-873962-spb.t
deleted file mode 100644
index 62a8318ed..000000000
--- a/tests/bugs/bug-873962-spb.t
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume set $V0 performance.quick-read off
-TEST $CLI volume set $V0 performance.io-cache off
-TEST $CLI volume set $V0 performance.write-behind off
-TEST $CLI volume set $V0 performance.stat-prefetch off
-TEST $CLI volume set $V0 performance.read-ahead off
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=enable
-touch $M0/a
-
-exec 5<$M0/a
-
-kill_brick $V0 $H0 $B0/${V0}0
-echo "hi" > $M0/a
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-
-kill_brick $V0 $H0 $B0/${V0}1
-echo "bye" > $M0/a
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1
-
-TEST ! cat $M0/a #To mark split-brain
-
-TEST ! read -u 5 line
-exec 5<&-
-
-cleanup;
diff --git a/tests/bugs/bug-873962.t b/tests/bugs/bug-873962.t
deleted file mode 100755
index b245cc3da..000000000
--- a/tests/bugs/bug-873962.t
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-
-#AFR TEST-IDENTIFIER SPLIT-BRAIN
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-B0_hiphenated=`echo $B0 | tr '/' '-'`
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2}
-
-# If we allow self-heal to happen in the background, we'll get spurious
-# failures - especially at the point labeled "FAIL HERE" but
-# occasionally elsewhere.  This behavior is very timing-dependent.  It
-# doesn't show up in Jenkins, but it does on JD's and KP's machines, and
-# it got sharply worse because of an unrelated fsync change (6ae6f3d)
-# which changed timing.  Putting anything at the FAIL HERE marker tends
-# to make it go away most of the time on affected machines, even if the
-# "anything" is unrelated.
-#
-# What's going on is that the I/O on the first mountpoint is allowed to
-# complete even though self-heal is still in progress and the state on
-# disk does not reflect its result.  In fact, the state changes during
-# self-heal create the appearance of split brain when the second I/O
-# comes in, so that fails even though we haven't actually been in split
-# brain since the manual xattr operations.  By disallowing background
-# self-heal, we ensure that the second I/O can't happen before self-heal
-# is complete, because it has to follow the first I/O which now has to
-# follow self-heal.
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-
-#Make sure self-heal is not triggered when the bricks are re-started
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume set $V0 performance.stat-prefetch off
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=enable
-TEST touch $M0/a
-TEST touch $M0/b
-TEST touch $M0/c
-TEST touch $M0/d
-echo "1" > $M0/b
-echo "1" > $M0/d
-TEST kill_brick $V0 $H0 $B0/${V0}2
-echo "1" > $M0/a
-echo "1" > $M0/c
-TEST setfattr -n trusted.mdata -v abc $M0/b
-TEST setfattr -n trusted.mdata -v abc $M0/d
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1
-TEST kill_brick $V0 $H0 $B0/${V0}1
-echo "2" > $M0/a
-echo "2" > $M0/c
-TEST setfattr -n trusted.mdata -v def $M0/b
-TEST setfattr -n trusted.mdata -v def $M0/d
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1
-
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M1 --direct-io-mode=enable
-#Files are in split-brain, so open should fail
-TEST ! cat $M0/a;
-TEST ! cat $M1/a;
-TEST ! cat $M0/b;
-TEST ! cat $M1/b;
-
-#Reset split-brain status
-TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/a;
-TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/b;
-
-#The operations should do self-heal and give correct output
-EXPECT "2" cat $M0/a;
-# FAIL HERE - see comment about cluster.self-heal-background-count above.
-EXPECT "2" cat $M1/a;
-EXPECT "def" getfattr -n trusted.mdata --only-values $M0/b 2>/dev/null
-EXPECT "def" getfattr -n trusted.mdata --only-values $M1/b 2>/dev/null
-
-TEST umount $M0
-TEST umount $M1
-
-TEST $CLI volume set $V0 cluster.data-self-heal off
-TEST $CLI volume set $V0 cluster.metadata-self-heal off
-
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=enable
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M1 --direct-io-mode=enable
-
-#Files are in split-brain, so open should fail
-TEST ! cat $M0/c
-TEST ! cat $M1/c
-TEST ! cat $M0/d
-TEST ! cat $M1/d
-
-TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/c
-TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/d
-
-#The operations should NOT do self-heal but give correct output
-EXPECT "2" cat $M0/c
-EXPECT "2" cat $M1/c
-EXPECT "1" cat $M0/d
-EXPECT "1" cat $M1/d
-
-#Check that the self-heal is not triggered.
-EXPECT "1" cat $B0/${V0}1/c
-EXPECT "abc" getfattr -n trusted.mdata --only-values $B0/${V0}1/d 2>/dev/null
-cleanup;
diff --git a/tests/bugs/bug-874498.t b/tests/bugs/bug-874498.t
deleted file mode 100644
index 0b5991011..000000000
--- a/tests/bugs/bug-874498.t
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../afr.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-TEST $CLI volume create $V0 replica 2  $H0:$B0/brick1 $H0:$B0/brick2;
-TEST $CLI volume start $V0;
-
-
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
-B0_hiphenated=`echo $B0 | tr '/' '-'`
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0$B0_hiphenated-brick1.pid` ;
-
-echo "GLUSTER FILE SYSTEM" > $M0/FILE1
-echo "GLUSTER FILE SYSTEM" > $M0/FILE2
-
-FILEN=$B0"/brick2"
-XATTROP=$FILEN/.glusterfs/indices/xattrop
-
-function get_gfid()
-{
-path_of_file=$1
-
-gfid_value=`getfattr -d -m . $path_of_file -e hex 2>/dev/null |  grep trusted.gfid | cut --complement -c -15 | sed 's/\([a-f0-9]\{8\}\)\([a-f0-9]\{4\}\)\([a-f0-9]\{4\}\)\([a-f0-9]\{4\}\)/\1-\2-\3-\4-/'`
-
-echo $gfid_value
-}
-
-GFID_ROOT=`get_gfid $B0/brick2`
-GFID_FILE1=`get_gfid $B0/brick2/FILE1`
-GFID_FILE2=`get_gfid $B0/brick2/FILE2`
-
-
-count=0
-for i in `ls $XATTROP`
-do
- if [ "$i" == "$GFID_ROOT" ] || [ "$i" == "$GFID_FILE1" ] || [ "$i" == "$GFID_FILE2" ]
-        then
- count=$(( count + 1 ))
- fi
-done
-
-EXPECT "3" echo $count
-
-
-TEST $CLI volume start $V0 force
-sleep 5
-TEST $CLI volume heal $V0
-
-
-##Expected number of entries are 0 in the .glusterfs/indices/xattrop directory
-EXPECT_WITHIN 60 '0' count_sh_entries $FILEN;
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-877293.t b/tests/bugs/bug-877293.t
deleted file mode 100755
index 774c2a0cc..000000000
--- a/tests/bugs/bug-877293.t
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-TEST glusterd
-TEST pidof glusterd
-
-## Start and create a replicated volume
-mkdir -p ${B0}/${V0}-0
-mkdir -p ${B0}/${V0}-1
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}-{0,1}
-
-TEST $CLI volume set $V0 indexing on
-
-TEST $CLI volume start $V0;
-
-## Mount native
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-
-## Mount client-pid=-1
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 --client-pid=-1 $M1
-
-TEST touch $M0
-
-vol_uuid=`getfattr -n trusted.glusterfs.volume-mark -ehex $M1 | sed -n 's/^trusted.glusterfs.volume-mark=0x//p' | cut -b5-36 | sed 's/\([a-f0-9]\{8\}\)\([a-f0-9]\{4\}\)\([a-f0-9]\{4\}\)\([a-f0-9]\{4\}\)/\1-\2-\3-\4-/'`
-xtime=trusted.glusterfs.$vol_uuid.xtime
-
-TEST "getfattr -n $xtime $M1 | grep -q ${xtime}="
-
-TEST kill_brick $V0 $H0 $B0/${V0}-0
-
-TEST "getfattr -n $xtime $M1 | grep -q ${xtime}="
-
-TEST umount $M0
-TEST umount $M1
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup
diff --git a/tests/bugs/bug-877885.t b/tests/bugs/bug-877885.t
deleted file mode 100755
index 0d4620b00..000000000
--- a/tests/bugs/bug-877885.t
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/brick0 $H0:$B0/brick1
-TEST $CLI volume start $V0
-
-sleep 5
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 \
-$M0;
-
-TEST touch $M0/file
-TEST mkdir $M0/dir
-
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0
-cd $N0
-
-rm -rf * &
-
-TEST mount -t nfs -o retry=0,nolock,vers=3 $H0:/$V0 $N1;
-
-cd;
-
-kill %1;
-
-TEST umount $N0
-TEST umount $N1;
-
-cleanup
diff --git a/tests/bugs/bug-877992.t b/tests/bugs/bug-877992.t
deleted file mode 100755
index 932ecc77b..000000000
--- a/tests/bugs/bug-877992.t
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-
-## Start and create a volume
-TEST glusterd -LDEBUG
-TEST pidof glusterd
-
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-
-function hooks_prep ()
-{
-    local event=$1
-    touch /tmp/pre.out /tmp/post.out
-    touch /var/lib/glusterd/hooks/1/"$event"/pre/Spre.sh
-    touch /var/lib/glusterd/hooks/1/"$event"/post/Spost.sh
-
-    printf "#! /bin/bash\necho "$event"Pre > /tmp/pre.out\n" > /var/lib/glusterd/hooks/1/"$event"/pre/Spre.sh
-    printf "#! /bin/bash\necho "$event"Post > /tmp/post.out\n" > /var/lib/glusterd/hooks/1/"$event"/post/Spost.sh
-    chmod a+x /var/lib/glusterd/hooks/1/"$event"/pre/Spre.sh
-    chmod a+x /var/lib/glusterd/hooks/1/"$event"/post/Spost.sh
-}
-
-function hooks_cleanup ()
-{
-    local event=$1
-    rm /tmp/pre.out /tmp/post.out
-    rm /var/lib/glusterd/hooks/1/"$event"/pre/Spre.sh
-    rm /var/lib/glusterd/hooks/1/"$event"/post/Spost.sh
-}
-
-## Verify volume is created and its hooks script ran
-hooks_prep 'create'
-TEST $CLI volume create $V0 $H0:$B0/${V0}1;
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'createPre' cat /tmp/pre.out;
-EXPECT 'createPost' cat /tmp/post.out;
-hooks_cleanup 'create'
-
-
-## Start volume and verify that its hooks script ran
-hooks_prep 'start'
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-EXPECT 'startPre' cat /tmp/pre.out;
-EXPECT 'startPost' cat /tmp/post.out;
-hooks_cleanup 'start'
-
-cleanup;
diff --git a/tests/bugs/bug-878004.t b/tests/bugs/bug-878004.t
deleted file mode 100644
index 5bee4c62f..000000000
--- a/tests/bugs/bug-878004.t
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}1 $H0:$B0/${V0}2 $H0:$B0/${V0}3;
-
-function brick_count()
-{
-    local vol=$1;
-
-    $CLI volume info $vol | egrep "^Brick[0-9]+: " | wc -l;
-}
-
-
-TEST $CLI volume start $V0
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}2;
-EXPECT '2' brick_count $V0
-
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}3;
-EXPECT '1' brick_count $V0
-
-cleanup;
-
diff --git a/tests/bugs/bug-879490.t b/tests/bugs/bug-879490.t
deleted file mode 100755
index 5b9ae7bb9..000000000
--- a/tests/bugs/bug-879490.t
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-function peer_probe()
-{
-    $CLI peer probe a.b.c.d --xml | xmllint --format - | grep "<opErrstr>"
-}
-
-EXPECT "  <opErrstr>Probe returned with unknown errno 107</opErrstr>" peer_probe
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-879494.t b/tests/bugs/bug-879494.t
deleted file mode 100755
index 5caca7922..000000000
--- a/tests/bugs/bug-879494.t
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-function peer_probe()
-{
-    $CLI peer detach a.b.c.d --xml | xmllint --format - | grep "<opErrstr>"
-}
-
-EXPECT "  <opErrstr>a.b.c.d is not part of cluster</opErrstr>" peer_probe
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-880898.t b/tests/bugs/bug-880898.t
deleted file mode 100644
index a069d4a8a..000000000
--- a/tests/bugs/bug-880898.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/brick1 $H0:$B0/brick2
-TEST $CLI volume start $V0
-pkill glusterfs
-uuid=""
-for line in $(cat /var/lib/glusterd/glusterd.info)
-do
-	if [[ $line == UUID* ]]
-	then
-		uuid=`echo $line | sed -r 's/^.{5}//'`
-	fi
-done
-
-gluster volume heal $V0 info | grep "Status: self-heal-daemon is not running on $uuid";
-EXPECT "0" echo $?
-
-cleanup;
diff --git a/tests/bugs/bug-882278.t b/tests/bugs/bug-882278.t
deleted file mode 100755
index 7933e1863..000000000
--- a/tests/bugs/bug-882278.t
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-cleanup
-
-# Is there a good reason to require --fqdn elsewhere?  It's worse than useless
-# here.
-H0=$(hostname -s)
-
-function recreate {
-	# The rm is necessary so we don't get fooled by leftovers from old runs.
-	rm -rf $1 && mkdir -p $1
-}
-
-function count_lines {
-	grep "$1" $2/* | wc -l
-}
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-## Start and create a volume
-TEST recreate ${B0}/${V0}-0
-TEST recreate ${B0}/${V0}-1
-TEST $CLI volume create $V0 $H0:$B0/${V0}-{0,1}
-TEST $CLI volume set $V0 cluster.nufa on
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Mount native
-special_option="--xlator-option ${V0}-dht.local-volume-name=${V0}-client-1"
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $special_option $M0
-
-## Create a bunch of test files.
-for i in $(seq 0 99); do
-	echo hello > $(printf $M0/file%02d $i)
-done
-
-## Make sure the files went to the right place.  There might be link files in
-## the other brick, but they won't have any contents.
-EXPECT "0" count_lines hello ${B0}/${V0}-0
-EXPECT "100" count_lines hello ${B0}/${V0}-1
-
-if [ "$EXIT_EARLY" = "1" ]; then
-	exit 0;
-fi
-
-## Finish up
-TEST umount $M0;
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-884328.t b/tests/bugs/bug-884328.t
deleted file mode 100644
index ee5509bbc..000000000
--- a/tests/bugs/bug-884328.t
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST check_option_help_presence "cluster.quorum-type"
-TEST check_option_help_presence "cluster.quorum-count"
-cleanup;
diff --git a/tests/bugs/bug-884452.t b/tests/bugs/bug-884452.t
deleted file mode 100644
index d07651e46..000000000
--- a/tests/bugs/bug-884452.t
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume start $V0
-
-TEST glusterfs -s $H0 --volfile-id $V0 $M0
-TEST touch $M0/{1..10000}
-
-RUN_LS_LOOP_FILE="$M0/run-ls-loop"
-function ls-loop
-{
-  while [ -f $RUN_LS_LOOP_FILE ]; do
-    ls -lR $M0 1>/dev/null 2>&1
-  done;
-}
-
-touch $RUN_LS_LOOP_FILE
-ls-loop &
-
-function vol-status-loop
-{
-  for i in {1..1000}; do
-    $CLI volume status $V0 clients >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-      return 1
-    fi
-  done;
-
-  return 0
-}
-
-TEST vol-status-loop
-
-rm -f $RUN_LS_LOOP_FILE
-wait
-
-TEST umount $M0
-
-cleanup;
diff --git a/tests/bugs/bug-884455.t b/tests/bugs/bug-884455.t
deleted file mode 100755
index 3b3a2241e..000000000
--- a/tests/bugs/bug-884455.t
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
-
-cleanup;
-
-function layout_compare()
-{
-        res=0
-
-        if [ "$1" == "$2" ]
-        then
-                res=1
-        fi
-        if [ "$1" == "$3" ]
-        then
-                res=1
-        fi
-        if [ "$2" == "$3" ]
-        then
-                res=1
-        fi
-
-        echo $res
-}
-
-function get_layout()
-{
-        layout1=`getfattr -n trusted.glusterfs.dht -e hex $1 2>&1|grep dht |cut -d = -f2`
-        layout2=`getfattr -n trusted.glusterfs.dht -e hex $2 2>&1|grep dht |cut -d = -f2`
-        layout3=`getfattr -n trusted.glusterfs.dht -e hex $3 2>&1|grep dht |cut -d = -f2`
-
-        ret=$(layout_compare $layout1 $layout2 $layout3)
-
-        if [ $ret -ne 0 ]
-        then
-                echo 1
-        else
-                echo 0
-        fi
-
-}
-
-BRICK_COUNT=3
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-## set subvols-per-dir option
-TEST $CLI volume set $V0 subvols-per-directory 2
-TEST $CLI volume start $V0
-
-## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-
-TEST mkdir $M0/dir{1..10} 2>/dev/null;
-
-## Add-brick n run rebalance to force re-write of layout
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}2
-sleep 5;
-
-## trigger dir self heal on client
-TEST ls -l $M0 2>/dev/null;
-
-TEST $CLI volume rebalance $V0 start force
-
-EXPECT_WITHIN 30 "0" rebalance_completed
-
-## check for layout overlaps.
-EXPECT "0" get_layout $B0/${V0}0 $B0/${V0}1 $B0/${V0}2
-EXPECT "0" get_layout $B0/${V0}0/dir1 $B0/${V0}1/dir1 $B0/${V0}2/dir1
-EXPECT "0" get_layout $B0/${V0}0/dir2 $B0/${V0}1/dir2 $B0/${V0}2/dir2
-EXPECT "0" get_layout $B0/${V0}0/dir3 $B0/${V0}1/dir3 $B0/${V0}2/dir3
-EXPECT "0" get_layout $B0/${V0}0/dir4 $B0/${V0}1/dir4 $B0/${V0}2/dir4
-EXPECT "0" get_layout $B0/${V0}0/dir5 $B0/${V0}1/dir5 $B0/${V0}2/dir5
-EXPECT "0" get_layout $B0/${V0}0/dir6 $B0/${V0}1/dir6 $B0/${V0}2/dir6
-EXPECT "0" get_layout $B0/${V0}0/dir7 $B0/${V0}1/dir7 $B0/${V0}2/dir7
-EXPECT "0" get_layout $B0/${V0}0/dir8 $B0/${V0}1/dir8 $B0/${V0}2/dir8
-EXPECT "0" get_layout $B0/${V0}0/dir9 $B0/${V0}1/dir9 $B0/${V0}2/dir9
-EXPECT "0" get_layout $B0/${V0}0/dir10 $B0/${V0}1/dir10 $B0/${V0}2/dir10
-
-cleanup;
diff --git a/tests/bugs/bug-884597.t b/tests/bugs/bug-884597.t
deleted file mode 100755
index 8eb1f330b..000000000
--- a/tests/bugs/bug-884597.t
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
-
-cleanup;
-BRICK_COUNT=3
-function uid_gid_compare()
-{
-        val=1
-
-        if [ "$1" == "$3" ]
-        then
-                if [ "$2" == "$4" ]
-                        then
-                                val=0
-                fi
-        fi
-        echo "$val"
-}
-
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
-TEST $CLI volume start $V0
-
-## Mount FUSE
-TEST glusterfs --attribute-timeout=0 --entry-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-i=1
-NEW_UID=36
-NEW_GID=36
-
-TEST touch $M0/$i
-
-chown $NEW_UID:$NEW_GID $M0/$i
-## rename till file gets a linkfile
-
-while [ $i -ne 0 ]
-do
-        TEST mv $M0/$i $M0/$(( $i+1 ))
-        let i++
-        file_has_linkfile $i
-        has_link=$?
-        if [ $has_link -eq 2 ]
-        then
-                break;
-        fi
-done
-
-get_hashed_brick $i
-cached=$?
-
-# check if uid/gid on linkfile is created with correct uid/gid
-BACKEND_UID=`stat --printf=%u $B0/${V0}$cached/$i`;
-BACKEND_GID=`stat --printf=%g $B0/${V0}$cached/$i`;
-
-EXPECT "0" uid_gid_compare $NEW_UID $NEW_GID $BACKEND_UID $BACKEND_GID
-
-# remove linkfile from backend, and trigger a lookup heal. uid/gid should match
-rm -rf $B0/${V0}$cached/$i
-
-# without a unmount, we are not able to trigger a lookup based heal
-
-TEST umount $M0
-
-## Mount FUSE
-TEST glusterfs --attribute-timeout=0 --entry-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-lookup=`ls -l $M0/$i 2>/dev/null`
-
-# check if uid/gid on linkfile is created with correct uid/gid
-BACKEND_UID=`stat --printf=%u $B0/${V0}$cached/$i`;
-BACKEND_GID=`stat --printf=%g $B0/${V0}$cached/$i`;
-
-EXPECT "0" uid_gid_compare $NEW_UID $NEW_GID $BACKEND_UID $BACKEND_GID
-# create hardlinks. Make sure a linkfile gets created
-
-i=1
-NEW_UID=36
-NEW_GID=36
-
-TEST touch $M0/file
-chown $NEW_UID:$NEW_GID $M0/file;
-
-## ln till file gets a linkfile
-
-while [ $i -ne 0 ]
-do
-        TEST ln $M0/file $M0/link$i
-
-        file_has_linkfile link$i
-        has_link=$?
-        if [ $has_link -eq 2 ]
-        then
-                break;
-        fi
-        let i++
-done
-
-get_hashed_brick link$i
-cached=$?
-
-# check if uid/gid on linkfile is created with correct uid/gid
-BACKEND_UID=`stat --printf=%u $B0/${V0}$cached/link$i`;
-BACKEND_GID=`stat --printf=%g $B0/${V0}$cached/link$i`;
-
-EXPECT "0" uid_gid_compare $NEW_UID $NEW_GID $BACKEND_UID $BACKEND_GID
-
-## UID/GID creation as different user
-i=1
-NEW_UID=36
-NEW_GID=36
-
-TEST touch $M0/user_file1
-TEST chown $NEW_UID:$NEW_GID $M0/user_file1;
-
-## Give permission on volume, so that different users can perform rename
-
-TEST chmod 0777 $M0
-
-## Add a user known as ABC and perform renames
-TEST `useradd -M ABC 2>/dev/null`
-
-TEST cd $M0
-## rename as different user till file gets a linkfile
-
-while [ $i -ne 0 ]
-do
-        su -c "mv $M0/user_file$i $M0/user_file$(( $i+1 ))" ABC
-        let i++
-        file_has_linkfile user_file$i
-        has_link=$?
-        if [ $has_link -eq 2 ]
-        then
-                break;
-        fi
-done
-
-## del user ABC
-TEST userdel ABC
-
-get_hashed_brick user_file$i
-cached=$?
-
-# check if uid/gid on linkfile is created with correct uid/gid
-BACKEND_UID=`stat --printf=%u $B0/${V0}$cached/user_file$i`;
-BACKEND_GID=`stat --printf=%g $B0/${V0}$cached/user_file$i`;
-
-EXPECT "0" uid_gid_compare $NEW_UID $NEW_GID $BACKEND_UID $BACKEND_GID
-cleanup;
diff --git a/tests/bugs/bug-886998.t b/tests/bugs/bug-886998.t
deleted file mode 100644
index 7a905a113..000000000
--- a/tests/bugs/bug-886998.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-# This tests that the replicate trash directory(.landfill) has following
-# properties.
-# Note: This is to have backward compatibility with 3.3 glusterfs
-#       In the latest releases this dir is present inside .glusterfs of brick.
-# 1) lookup of trash dir fails
-# 2) readdir does not show this directory
-# 3) Self-heal does not do any self-heal of these directories.
-gfid1="0xc2e75dde97f346e7842d1076a8e699f8"
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --direct-io-mode=enable
-
-TEST mkdir $B0/${V0}1/.landfill
-TEST setfattr -n trusted.gfid -v $gfid1 $B0/${V0}1/.landfill
-TEST mkdir $B0/${V0}0/.landfill
-TEST setfattr -n trusted.gfid -v $gfid1 $B0/${V0}0/.landfill
-
-TEST ! stat $M0/.landfill
-EXPECT "" echo $(ls -a $M0 | grep ".landfill")
-
-TEST rmdir $B0/${V0}0/.landfill
-#Force a conservative merge and it should not create .landfill
-TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000000000000000000000 $B0/${V0}0/
-TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000001 $B0/${V0}0/
-
-TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000000000000000000001 $B0/${V0}1/
-TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/
-
-EXPECT "" echo $(ls -a $M0 | grep ".landfill")
-TEST ! stat $B0/${V0}0/.landfill
-TEST stat $B0/${V0}1/.landfill
-
-#TEST that the dir is not deleted even when xattrs suggest to delete
-TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000000000000000000000 $B0/${V0}0/
-TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000001 $B0/${V0}0/
-
-TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000000000000000000000 $B0/${V0}1/
-TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/
-
-EXPECT "" echo $(ls -a $M0 | grep ".landfill")
-TEST ! stat $B0/${V0}0/.landfill
-TEST stat $B0/${V0}1/.landfill
-cleanup;
diff --git a/tests/bugs/bug-887098-gmount-crash.t b/tests/bugs/bug-887098-gmount-crash.t
deleted file mode 100644
index 1998b4062..000000000
--- a/tests/bugs/bug-887098-gmount-crash.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-function pidgrep()
-{
-    ps ax | grep "$1" | grep -v grep | awk '{print $1}' | head -1
-}
-
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-TEST glusterfs -s $H0 --volfile-id=$V0 --acl $M0
-MOUNT_PID=`ps ax |grep "glusterfs -s $H0 --volfile-id=$V0 --acl $M0" | grep -v grep | awk '{print $1}' | head -1`
-
-for i in {1..25};
-do
-    mkdir $M0/tmp_$i && cat /etc/hosts > $M0/tmp_$i/file
-    cp -RPp $M0/tmp_$i $M0/newtmp_$i && cat /etc/hosts > $M0/newtmp_$i/newfile
-done
-
-EXPECT "$MOUNT_PID" pidgrep $MOUNT_PID
-TEST rm -rf $M0/*
-umount $M0
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-887145.t b/tests/bugs/bug-887145.t
deleted file mode 100755
index e2013e50b..000000000
--- a/tests/bugs/bug-887145.t
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
-TEST $CLI volume set $V0 performance.open-behind off;
-TEST $CLI volume start $V0
-
-sleep 2;
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-EXPECT_WITHIN 20 "1" is_nfs_export_available;
-
-
-useradd tmp_user 2>/dev/null 1>/dev/null;
-mkdir $M0/dir;
-mkdir $M0/other;
-cp /etc/passwd $M0/;
-cp $M0/passwd $M0/file;
-chmod 600 $M0/file;
-
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0;
-
-chown -R nfsnobody:nfsnobody $M0/dir;
-chown -R tmp_user:tmp_user $M0/other;
-
-TEST $CLI volume set $V0 server.root-squash on;
-
-sleep 2;
-
-EXPECT_WITHIN 20 "1" is_nfs_export_available;
-
-# create files and directories in the root of the glusterfs and nfs mount
-# which is owned by root and hence the right behavior is getting EACCESS
-# as the fops are executed as nfsnobody.
-touch $M0/foo 2>/dev/null;
-TEST [ $? -ne 0 ]
-touch $N0/foo 2>/dev/null;
-TEST [ $? -ne 0 ]
-mkdir $M0/new 2>/dev/null;
-TEST [ $? -ne 0 ]
-mkdir $N0/new 2>/dev/null;
-TEST [ $? -ne 0 ]
-cp $M0/file $M0/tmp_file 2>/dev/null;
-TEST [ $? -ne 0 ]
-cp $N0/file $N0/tmp_file 2>/dev/null;
-TEST [ $? -ne 0 ]
-cat $M0/file 2>/dev/null;
-TEST [ $? -ne 0 ]
-# here read should be allowed because eventhough file "passwd" is owned
-# by root, the permissions if the file allow other users to read it.
-cat $M0/passwd 1>/dev/null;
-TEST [ $? -eq 0 ]
-cat $N0/passwd 1>/dev/null;
-TEST [ $? -eq 0 ]
-
-# create files and directories should succeed as the fops are being executed
-# inside the directory owned by nfsnobody
-TEST touch $M0/dir/file;
-TEST touch $N0/dir/foo;
-TEST mkdir $M0/dir/new;
-TEST mkdir $N0/dir/other;
-TEST rm -f $M0/dir/file $M0/dir/foo;
-TEST rmdir $N0/dir/*;
-
-# create files and directories here should fail as other directory is owned
-# by tmp_user.
-touch $M0/other/foo 2>/dev/null;
-TEST [ $? -ne 0 ]
-touch $N0/other/foo 2>/dev/null;
-TEST [ $? -ne 0 ]
-mkdir $M0/other/new 2>/dev/null;
-TEST [ $? -ne 0 ]
-mkdir $N0/other/new 2>/dev/null;
-TEST [ $? -ne 0 ]
-
-userdel tmp_user;
-rm -rf /home/tmp_user;
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-888174.t b/tests/bugs/bug-888174.t
deleted file mode 100644
index 4ea34645b..000000000
--- a/tests/bugs/bug-888174.t
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#This tests if flush, fsync wakes up the delayed post-op or not.
-#If it is not woken up, INODELK from the next command waits
-#for post-op-delay secs. There would be pending changelog even after the command
-#completes.
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/r2_0 $H0:$B0/r2_1
-
-TEST $CLI volume set $V0 cluster.eager-lock on
-
-TEST $CLI volume set $V0 performance.flush-behind off
-EXPECT "off" volume_option $V0 performance.flush-behind
-
-TEST $CLI volume set $V0 cluster.post-op-delay-secs 3
-EXPECT "3" volume_option $V0 cluster.post-op-delay-secs
-
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0
-
-#Check that INODELK MAX latency is not in the order of seconds
-TEST gluster volume profile $V0 start
-for i in {1..5}
-do
-        echo hi > $M0/a
-done
-#Test if the MAX INODELK fop latency is of the order of seconds.
-inodelk_max_latency=$($CLI volume profile $V0 info | grep INODELK | awk 'BEGIN {max = 0} {if ($6 > max) max=$6;} END {print max}' | cut -d. -f 1 | egrep "[0-9]{7,}")
-
-TEST [ -z $inodelk_max_latency ]
-
-TEST dd of=$M0/a if=/dev/urandom bs=1M count=10 conv=fsync
-#Check for no trace of pending changelog. Flush should make sure of it.
-EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_0/a trusted.afr.$V0-client-0
-EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_0/a trusted.afr.$V0-client-1
-EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_1/a trusted.afr.$V0-client-0
-EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_1/a trusted.afr.$V0-client-1
-
-dd of=$M0/a if=/dev/urandom bs=1M count=1024 2>/dev/null &
-p=$!
-#trigger graph switches, tests for fsync not leaving any pending flags
-TEST $CLI volume set $V0 performance.quick-read off
-TEST $CLI volume set $V0 performance.io-cache off
-TEST $CLI volume set $V0 performance.stat-prefetch off
-TEST $CLI volume set $V0 performance.read-ahead off
-
-kill -SIGTERM $p
-#wait for dd to exit
-wait  > /dev/null 2>&1
-
-#Goal is to check if there is permanent FOOL changelog
-sleep 5
-EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_0/a trusted.afr.$V0-client-0
-EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_0/a trusted.afr.$V0-client-1
-EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_1/a trusted.afr.$V0-client-0
-EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/r2_1/a trusted.afr.$V0-client-1
-
-cleanup;
diff --git a/tests/bugs/bug-888752.t b/tests/bugs/bug-888752.t
deleted file mode 100644
index 56d3f9ffb..000000000
--- a/tests/bugs/bug-888752.t
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
-
-# Check if xml output is generated correctly for volume status for a single brick
-# present on another peer and no async tasks are running.
-
-function get_peer_count {
-        $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-cleanup
-
-TEST launch_cluster 2;
-TEST $CLI_1 peer probe $H2;
-EXPECT_WITHIN 5 1 get_peer_count
-TEST $CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0
-TEST $CLI_1 volume start $V0
-
-TEST $CLI_1 volume status $V0 $H2:$B2/$V0 --xml
-
-TEST $CLI_1 volume stop $V0
-
-cleanup
diff --git a/tests/bugs/bug-889630.t b/tests/bugs/bug-889630.t
deleted file mode 100755
index b04eb3407..000000000
--- a/tests/bugs/bug-889630.t
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
-
-function check_peers {
-        $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-
-function volume_count {
-        local cli=$1;
-        if [ $cli -eq '1' ] ; then
-                $CLI_1 volume info | grep 'Volume Name' | wc -l;
-        else
-                $CLI_2 volume info | grep 'Volume Name' | wc -l;
-        fi
-}
-
-cleanup;
-
-TEST launch_cluster 2;
-TEST $CLI_1 peer probe $H2;
-
-EXPECT_WITHIN 20 1 check_peers
-
-TEST $CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0
-TEST $CLI_1 volume start $V0
-
-b="B1";
-
-#Create an extra file in the originator's volume store
-touch ${!b}/glusterd/vols/$V0/run/file
-
-TEST $CLI_1 volume stop $V0
-#Test for self-commit failure
-TEST $CLI_1 volume delete $V0
-
-#Check whether delete succeeded on both the nodes
-EXPECT "0" volume_count '1'
-EXPECT "0" volume_count '2'
-
-#Check whether the volume name can be reused after deletion
-TEST $CLI_1 volume create $V0 $H1:$B1/${V0}1 $H2:$B2/${V0}1
-TEST $CLI_1 volume start $V0
-
-#Create an extra file in the peer's volume store
-touch ${!b}/glusterd/vols/$V0/run/file
-
-TEST $CLI_1 volume stop $V0
-#Test for commit failure on the other node
-TEST $CLI_2 volume delete $V0
-
-EXPECT "0" volume_count '1';
-EXPECT "0" volume_count '2';
-
-cleanup;
diff --git a/tests/bugs/bug-889996.t b/tests/bugs/bug-889996.t
deleted file mode 100644
index 6b07d8918..000000000
--- a/tests/bugs/bug-889996.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-
-rm -rf $B0/${V0}1;
-
-TEST ! $CLI volume start $V0;
-EXPECT 0 online_brick_count;
-
-cleanup;
diff --git a/tests/bugs/bug-892730.t b/tests/bugs/bug-892730.t
deleted file mode 100755
index 0a677069e..000000000
--- a/tests/bugs/bug-892730.t
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-#
-# Bug 892730 - Verify that afr handles EIO errors from the brick properly.
-#
-# The associated bug describes a problem where EIO errors returned from the
-# local filesystem of a brick that is part of a replica volume are exposed to
-# the user. This test simulates such failures and verifies that the volume
-# operates as expected.
-#
-########
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST mkdir -p $B0/test{1,2}
-
-# The graph is a two brick replica with error-gen enabled on the second brick
-# and configured to return EIO lookup errors 100% of the time. This simulates
-# a brick with a crashed or shut down local filesystem. Note that the order in
-# which errors occur is a factor in reproducing the original bug (error-gen
-# must be enabled in the second brick for this test to be effective).
-
-cat > $B0/test.vol <<EOF
-volume test-posix-0
-    type storage/posix
-    option directory $B0/test1
-end-volume
-
-volume test-locks-0
-    type features/locks
-    subvolumes test-posix-0
-end-volume
-
-volume test-posix-1
-    type storage/posix
-    option directory $B0/test2
-end-volume
-
-volume test-error-1
-    type debug/error-gen
-    option failure 100
-    option enable lookup
-    option error-no EIO
-    subvolumes test-posix-1
-end-volume
-
-volume test-locks-1
-    type features/locks
-    subvolumes test-error-1
-end-volume
-
-volume test-replicate-0
-    type cluster/replicate
-    option background-self-heal-count 0
-    subvolumes test-locks-0 test-locks-1
-end-volume
-EOF
-
-TEST glusterd
-
-TEST glusterfs --volfile=$B0/test.vol --attribute-timeout=0 --entry-timeout=0 $M0
-
-# We should be able to create and remove a file without interference from the
-# "broken" brick.
-
-TEST touch $M0/file
-TEST rm $M0/file
-
-TEST umount $M0
-
-rm -f $B0/test.vol
-rm -rf $B0/test1 $B0/test2
-
-cleanup;
-
diff --git a/tests/bugs/bug-893338.t b/tests/bugs/bug-893338.t
deleted file mode 100644
index cc39f28e3..000000000
--- a/tests/bugs/bug-893338.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 stripe 2 $H0:$B0/${V0}{1,2,3,4};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-
-TEST glusterfs -s $H0 --volfile-id=$V0 $M0
-
-## Test for symlink success
-TEST touch $M0/reg_file
-TEST ln -s $M0/reg_file $M0/symlink
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-893378.t b/tests/bugs/bug-893378.t
deleted file mode 100755
index fd8b9a7ce..000000000
--- a/tests/bugs/bug-893378.t
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-cleanup;
-BRICK_COUNT=3
-
-function file_has_linkfile()
-{
-        i=0
-        j=0
-        while [ $i -lt $BRICK_COUNT ]
-        do
-                stat=`stat $B0/${V0}$i/$1 2>/dev/null`
-                if [ $? -eq 0 ]
-                then
-                        let j++
-                        let "BRICK${j}=$i"
-
-                fi
-                let i++
-        done
-        return $j
-}
-
-function get_cached_brick()
-{
-        i=1
-        while [ $i -lt 3 ]
-        do
-                test=`getfattr -n trusted.glusterfs.dht.linkto -e text $B0/${V0}$BRICK$i 2>&1`
-                if [ $? -eq 1 ]
-                then
-                        cached=$BRICK"$i"
-                        i=$(( $i+3 ))
-                fi
-                let i++
-        done
-
-        return $cached
-}
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
-TEST $CLI volume start $V0
-
-## Mount FUSE
-TEST glusterfs --attribute-timeout=0 --entry-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-## create a linkfile on subvolume 0
-TEST touch $M0/1
-TEST mv $M0/1 $M0/2
-
-file_has_linkfile 2
-has_link=$?
-if [ $has_link -eq 2 ]
-then
-        get_cached_brick
-        CACHED=$?
-        # Kill a brick process
-        kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}$CACHED.pid`;
-fi
-
-## trigger a lookup
-ls -l $M0/2 2>/dev/null
-
-## fail dd if file exists.
-
-dd if=/dev/zero of=$M0/2 bs=1 count=1 conv=excl 2>/dev/null
-EXPECT "1" echo $?
-
-cleanup;
diff --git a/tests/bugs/bug-895235.t b/tests/bugs/bug-895235.t
deleted file mode 100644
index 0764b50d4..000000000
--- a/tests/bugs/bug-895235.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume set $V0 ensure-durability off
-TEST $CLI volume set $V0 performance.write-behind off
-TEST $CLI volume set $V0 cluster.eager-lock off
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=enable
-
-TEST gluster volume profile $V0 start
-TEST dd of=$M0/a if=/dev/zero bs=1M count=1 oflag=append
-finodelk_max_latency=$($CLI volume profile $V0 info | grep FINODELK | awk 'BEGIN {max = 0} {if ($6 > max) max=$6;} END {print max}' | cut -d. -f 1 | egrep "[0-9]{7,}")
-
-TEST [ -z $finodelk_max_latency ]
-
-cleanup;
diff --git a/tests/bugs/bug-896431.t b/tests/bugs/bug-896431.t
deleted file mode 100755
index f968e59c1..000000000
--- a/tests/bugs/bug-896431.t
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting cluster.subvols-per-directory as -5
-TEST ! $CLI volume set $V0 cluster.subvols-per-directory -5
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST ! $CLI volume set $V0 subvols-per-directory -5
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Setting cluster.subvols-per-directory as 0
-TEST ! $CLI volume set $V0 cluster.subvols-per-directory 0
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST ! $CLI volume set $V0 subvols-per-directory 0
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Setting cluster.subvols-per-directory as 4 (the total number of bricks)
-TEST ! $CLI volume set $V0 cluster.subvols-per-directory 4
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST ! $CLI volume set $V0 subvols-per-directory 4
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Setting cluster.subvols-per-directory as 2 (the total number of subvolumes)
-TEST $CLI volume set $V0 cluster.subvols-per-directory 2
-EXPECT '2' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Setting cluster.subvols-per-directory as 1
-TEST $CLI volume set $V0 subvols-per-directory 1
-EXPECT '1' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a pure replicate volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 8 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Replicate' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting cluster.subvols-per-directory as 8 for a replicate volume
-TEST ! $CLI volume set $V0 cluster.subvols-per-directory 8
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST ! $CLI volume set $V0 subvols-per-directory 8
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Setting cluster.subvols-per-directory as 1 for a replicate volume
-TEST $CLI volume set $V0 cluster.subvols-per-directory 1
-EXPECT '1' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST $CLI volume set $V0 subvols-per-directory 1
-EXPECT '1' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
-
-## Start and create a pure stripe volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 stripe 8 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT 'Stripe' volinfo_field $V0 'Type';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting cluster.subvols-per-directory as 8 for a stripe volume
-TEST ! $CLI volume set $V0 cluster.subvols-per-directory 8
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST ! $CLI volume set $V0 subvols-per-directory 8
-EXPECT '' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Setting cluster.subvols-per-directory as 1 for a stripe volume
-TEST $CLI volume set $V0 cluster.subvols-per-directory 1
-EXPECT '1' volinfo_field $V0 'cluster.subvols-per-directory';
-TEST $CLI volume set $V0 subvols-per-directory 1
-EXPECT '1' volinfo_field $V0 'cluster.subvols-per-directory';
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-902610.t b/tests/bugs/bug-902610.t
deleted file mode 100755
index 00ba03adf..000000000
--- a/tests/bugs/bug-902610.t
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-## Layout-spread set to 3, but subvols up are 2. So layout should split 50-50
-function get_layout()
-{
-        layout1=`getfattr -n trusted.glusterfs.dht -e hex $1 2>&1|grep dht |cut -d = -f2`
-        layout2=`getfattr -n trusted.glusterfs.dht -e hex $2 2>&1|grep dht |cut -d = -f2`
-
-        if [ $layout1 == "0x0000000100000000000000007ffffffe" ]
-        then
-                if [ $layout2 == "0x00000001000000007fffffffffffffff" ]
-		then
-			return 0
-		else
-			return 1
-		fi
-        fi
-
-	if [ $layout2 == "0x0000000100000000000000007ffffffe" ]
-        then
-                if [ $layout1 == "0x00000001000000007fffffffffffffff" ]
-		then
-			return 0
-		else
-			return 1
-		fi
-        fi
-	return 1
-}
-
-BRICK_COUNT=4
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2 $H0:$B0/${V0}3
-## set subvols-per-dir option
-TEST $CLI volume set $V0 subvols-per-directory 3
-TEST $CLI volume start $V0
-
-## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0 --entry-timeout=0 --attribute-timeout=0;
-
-TEST ls -l $M0
-
-## kill 2 bricks to bring down available subvol < spread count
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}2.pid`;
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-${V0}3.pid`;
-
-mkdir $M0/dir1 2>/dev/null
-
-get_layout $B0/${V0}0/dir1 $B0/${V0}1/dir1
-EXPECT "0" echo $?
-
-cleanup;
diff --git a/tests/bugs/bug-903336.t b/tests/bugs/bug-903336.t
deleted file mode 100644
index c1f91312a..000000000
--- a/tests/bugs/bug-903336.t
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST setfattr -n trusted.io-stats-dump -v /tmp $M0
-cleanup
diff --git a/tests/bugs/bug-904065.t b/tests/bugs/bug-904065.t
deleted file mode 100755
index 505854d9b..000000000
--- a/tests/bugs/bug-904065.t
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-#
-# This test does not use 'showmount' from the nfs-utils package, it would
-# require setting up a portmapper (either rpcbind or portmap, depending on the
-# Linux distribution used for testing). The persistancy of the rmtab should not
-# affect the current showmount outputs, so existing regression tests should be
-# sufficient.
-#
-
-# count the lines of a file, return 0 if the file does not exist
-function count_lines()
-{
-        if [ -e "$1" ]
-        then
-                wc -l < $1
-        else
-                echo 0
-        fi
-}
-
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-
-cleanup
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/brick1
-EXPECT 'Created' volinfo_field $V0 'Status'
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status'
-
-# glusterfs/nfs needs some time to start up in the background
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-# before mounting the rmtab should be empty
-EXPECT '0' count_lines /var/lib/glusterd/nfs/rmtab
-
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0
-# the output would looks similar to:
-#
-#   hostname-0=172.31.122.104
-#   mountpoint-0=/ufo
-#
-EXPECT '2' count_lines /var/lib/glusterd/nfs/rmtab
-
-# duplicate mounts should not be recorded (client could have crashed)
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N1
-EXPECT '2' count_lines /var/lib/glusterd/nfs/rmtab
-
-# removing a mount should (even if there are two) should remove the entry
-TEST umount $N1
-EXPECT '0' count_lines /var/lib/glusterd/nfs/rmtab
-
-# unmounting the other mount should work flawlessly
-TEST umount $N0
-EXPECT '0' count_lines /var/lib/glusterd/nfs/rmtab
-
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $M0
-
-# we'll create a fake rmtab here, similar to how an other storage server would do
-# using an invalid IP address to prevent (unlikely) collisions on the test-machine
-cat << EOF > $M0/rmtab
-hostname-0=127.0.0.256
-mountpoint-0=/ufo
-EOF
-EXPECT '2' count_lines $M0/rmtab
-
-# reconfigure merges the rmtab with the one on the volume
-TEST gluster volume set $V0 nfs.mount-rmtab $M0/rmtab
-
-# glusterfs/nfs needs some time to restart
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-# a new mount should be added to the rmtab, not overwrite exiting ones
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0
-EXPECT '4' count_lines $M0/rmtab
-
-TEST umount $N0
-EXPECT '2' count_lines $M0/rmtab
-
-# TODO: nfs/reconfigure() is never called and is therefor disabled. When the
-# NFS-server supports reloading and does not get restarted anymore, we should
-# add a test that includes the merging of entries in the old rmtab with the new
-# rmtab.
-
-cleanup
diff --git a/tests/bugs/bug-904300.t b/tests/bugs/bug-904300.t
deleted file mode 100755
index 4276ee229..000000000
--- a/tests/bugs/bug-904300.t
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-
-cleanup;
-
-# 1-8
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/$V0;
-TEST $CLI volume start $V0
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $N0
-TEST mkdir $N0/dir1
-TEST umount $N0
-
-#
-# Case 1: Allow "dir1" to be mounted only from 127.0.0.1
-# 9-12
-TEST $CLI volume set $V0 export-dir \""/dir1(127.0.0.1)"\"
-EXPECT_WITHIN 20 2 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0/dir1 $N0
-TEST umount $N0
-
-#
-# Case 2: Allow "dir1" to be mounted only from 8.8.8.8. This is
-#         a negative test case therefore the mount should fail.
-# 13-16
-TEST $CLI volume set $V0 export-dir \""/dir1(8.8.8.8)"\"
-EXPECT_WITHIN 20 2 is_nfs_export_available
-
-TEST ! mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0/dir1 $N0
-TEST ! umount $N0
-
-
-# Case 3: Variation of test case1. Here we are checking with hostname
-#         instead of ip address.
-# 17-20
-TEST $CLI volume set $V0 export-dir \""/dir1($H0)"\"
-EXPECT_WITHIN 20 2 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0/dir1 $N0
-TEST umount $N0
-
-# Case 4: Variation of test case1. Here we are checking with IP range
-# 21-24
-TEST $CLI volume set $V0 export-dir \""/dir1(127.0.0.0/24)"\"
-EXPECT_WITHIN 20 2 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0/dir1 $N0
-TEST umount $N0
-
-## Finish up
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-905307.t b/tests/bugs/bug-905307.t
deleted file mode 100644
index d81d81c9f..000000000
--- a/tests/bugs/bug-905307.t
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-#test functionality of post-op-delay-secs
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-
-#Strings should not be accepted.
-TEST ! $CLI volume set $V0 cluster.post-op-delay-secs abc
-
-#-ve ints should not be accepted.
-TEST ! $CLI volume set $V0 cluster.post-op-delay-secs -1
-
-#INT_MAX+1 should not be accepted.
-TEST ! $CLI volume set $V0 cluster.post-op-delay-secs 2147483648
-
-#floats should not be accepted.
-TEST ! $CLI volume set $V0 cluster.post-op-delay-secs 1.25
-
-#min val 0 should be accepted
-TEST $CLI volume set $V0 cluster.post-op-delay-secs 0
-EXPECT "0" volume_option $V0 cluster.post-op-delay-secs
-
-#max val 2147483647 should be accepted
-TEST $CLI volume set $V0 cluster.post-op-delay-secs 2147483647
-EXPECT "2147483647" volume_option $V0 cluster.post-op-delay-secs
-
-#some middle val in range 2147 should be accepted
-TEST $CLI volume set $V0 cluster.post-op-delay-secs 2147
-EXPECT "2147" volume_option $V0 cluster.post-op-delay-secs
-cleanup;
diff --git a/tests/bugs/bug-905864.c b/tests/bugs/bug-905864.c
deleted file mode 100644
index ed09b6e2b..000000000
--- a/tests/bugs/bug-905864.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pthread.h>
-
-
-pthread_t   th[5] = {0};
-void
-flock_init (struct flock *f, short int type, off_t start, off_t len)
-{
-    f->l_type = type;
-    f->l_start = start;
-    f->l_len = len;
-}
-
-int
-flock_range_in_steps (int fd, int is_set, short l_type,
-                      int start, int end, int step)
-{
-        int         ret = 0;
-        int         i = 0;
-        struct      flock f = {0,};
-
-        for (i = start; i+step < end; i += step) {
-                flock_init (&f, l_type, i, step);
-                ret = fcntl (fd, (is_set)? F_SETLKW:F_GETLK, &f);
-                if (ret) {
-                        perror ("fcntl");
-                        goto out;
-                }
-        }
-out:
-        return ret;
-}
-
-void *
-random_locker (void *arg)
-{
-        int         fd = *(int *)arg;
-        int         i = 0;
-        int         is_set = 0;
-
-        /* use thread id to choose GETLK or SETLK operation*/
-        is_set = pthread_self () % 2;
-        (void)flock_range_in_steps (fd, is_set, F_WRLCK, 0, 400, 1);
-
-        return NULL;
-}
-
-
-int main (int argc, char **argv)
-{
-        int         fd = -1;
-        int         ret = 1;
-        int         i = 0;
-        char        *fname = NULL;
-
-        if (argc < 2)
-                goto out;
-
-        fname = argv[1];
-        fd = open (fname, O_RDWR);
-        if (fd == -1) {
-                perror ("open");
-                goto out;
-        }
-
-        ret = flock_range_in_steps (fd, 1, F_WRLCK, 0, 2000, 2);
-        for (i = 0; i < 5; i++) {
-                pthread_create (&th[i], NULL, random_locker, (void *) &fd);
-        }
-        ret = flock_range_in_steps (fd, 1, F_WRLCK, 0, 2000, 2);
-        for (i = 0; i < 5; i++) {
-                pthread_join (th[i], NULL);
-        }
-out:
-        if (fd != -1)
-                close (fd);
-
-        return ret;
-}
diff --git a/tests/bugs/bug-905864.t b/tests/bugs/bug-905864.t
deleted file mode 100644
index 44bb469f2..000000000
--- a/tests/bugs/bug-905864.t
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4};
-TEST $CLI volume start $V0;
-
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M1;
-
-TEST touch $M0/file1;
-
-#following C program tries open up race(s) if any, in F_GETLK/F_SETLKW codepaths
-#of locks xlator
-gcc -lpthread -g3 $(dirname $0)/bug-905864.c -o $(dirname $0)/bug-905864
-$(dirname $0)/bug-905864 $M0/file1 &
-$(dirname $0)/bug-905864 $M1/file1;
-wait
-rm -f $(dirname $0)/bug-905864
-
-EXPECT $(brick_count $V0) online_brick_count
-
-cleanup
-
diff --git a/tests/bugs/bug-906646.t b/tests/bugs/bug-906646.t
deleted file mode 100644
index 0e6a3bcb6..000000000
--- a/tests/bugs/bug-906646.t
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-REPLICA=2
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica $REPLICA $H0:$B0/${V0}-00 $H0:$B0/${V0}-01 $H0:$B0/${V0}-10 $H0:$B0/${V0}-11
-TEST $CLI volume start $V0
-
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-function xattr_query_check()
-{
-    local path=$1
-    local xa_name=$2
-
-    local ret=`getfattr -m . -n $xa_name $path 2>&1 | grep -o "$xa_name: No such attribute" | wc -l`
-    echo $ret
-}
-
-function set_xattr()
-{
-    local path=$1
-    local xa_name=$2
-    local xa_val=$3
-
-    setfattr -n $xa_name -v $xa_val $path
-    echo $?
-}
-
-function remove_xattr()
-{
-    local path=$1
-    local xa_name=$2
-
-    setfattr -x $xa_name $path
-    echo $?
-}
-
-f=f00f
-pth=$M0/$f
-
-touch $pth
-
-# fetch backend paths
-backend_paths=`get_backend_paths $pth`
-
-# convert it into and array
-backend_paths_array=($backend_paths)
-
-# setxattr xattr for this file
-EXPECT 0 set_xattr $pth "trusted.name" "test"
-
-# confirm the set on backend
-EXPECT 0 xattr_query_check ${backend_paths_array[0]} "trusted.name"
-EXPECT 0 xattr_query_check ${backend_paths_array[1]} "trusted.name"
-
-brick_path=`echo ${backend_paths_array[0]} | sed -n 's/\(.*\)\/'$f'/\1/p'`
-brick_id=`$CLI volume info $V0 | grep "Brick[[:digit:]]" | grep -n $brick_path  | cut -f1 -d:`
-
-# Kill a brick process
-TEST kill_brick $V0 $H0 $brick_path
-
-# remove the xattr from the mount point
-EXPECT 0 remove_xattr $pth "trusted.name"
-
-# we killed ${backend_paths[0]} - so expect the xattr to be there
-# on the backend there
-EXPECT 0 xattr_query_check ${backend_paths_array[0]} "trusted.name"
-EXPECT 1 xattr_query_check ${backend_paths_array[1]} "trusted.name"
-
-# restart the brick process
-TEST $CLI volume start $V0 force
-
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 `expr $brick_id - 1`
-
-stat $pth
-
-# check backends - xattr should not be present anywhere
-EXPECT 1 xattr_query_check ${backend_paths_array[0]} "trusted.name"
-EXPECT 1 xattr_query_check ${backend_paths_array[1]} "trusted.name"
-
-cleanup;
diff --git a/tests/bugs/bug-907072.t b/tests/bugs/bug-907072.t
deleted file mode 100755
index 49b477767..000000000
--- a/tests/bugs/bug-907072.t
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
-
-cleanup;
-
-TEST glusterd;
-TEST pidof glusterd;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1,2,3};
-TEST $CLI volume start $V0;
-
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-
-TEST mkdir $M0/test;
-
-OLD_LAYOUT0=`get_layout $B0/${V0}0/test`;
-OLD_LAYOUT1=`get_layout $B0/${V0}1/test`;
-OLD_LAYOUT2=`get_layout $B0/${V0}2/test`;
-OLD_LAYOUT3=`get_layout $B0/${V0}3/test`;
-
-TEST killall glusterfsd;
-
-# Delete directory on one brick
-TEST rm -rf $B0/${V}1/test;
-
-# And only layout xattr on another brick
-TEST setfattr -x trusted.glusterfs.dht $B0/${V0}2/test;
-
-TEST $CLI volume start $V0 force;
-
-TEST umount $M0;
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-TEST stat $M0/test;
-
-NEW_LAYOUT0=`get_layout $B0/${V0}0/test`;
-NEW_LAYOUT1=`get_layout $B0/${V0}1/test`;
-NEW_LAYOUT2=`get_layout $B0/${V0}2/test`;
-NEW_LAYOUT3=`get_layout $B0/${V0}3/test`;
-
-EXPECT $OLD_LAYOUT0 echo $NEW_LAYOUT0;
-EXPECT $OLD_LAYOUT1 echo $NEW_LAYOUT1;
-EXPECT $OLD_LAYOUT2 echo $NEW_LAYOUT2;
-EXPECT $OLD_LAYOUT3 echo $NEW_LAYOUT3;
diff --git a/tests/bugs/bug-908146.t b/tests/bugs/bug-908146.t
deleted file mode 100755
index 87b456e6e..000000000
--- a/tests/bugs/bug-908146.t
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-function get_fd_count {
-        local vol=$1
-        local host=$2
-        local brick=$3
-        local fname=$4
-        local gfid_str=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $brick/$fname))
-        local statedump=$(generate_brick_statedump $vol $host $brick)
-        local count=$(grep "gfid=$gfid_str" $statedump -A2 | grep fd-count | cut -f2 -d'=' | tail -1)
-        rm -f $statedump
-        echo $count
-}
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}0
-TEST $CLI volume set $V0 performance.open-behind off
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --direct-io-mode=enable
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M1 --attribute-timeout=0 --entry-timeout=0 --direct-io-mode=enable
-
-TEST touch $M0/a
-
-exec 4>"$M0/a"
-exec 5>"$M1/a"
-EXPECT "2" get_fd_count $V0 $H0 $B0/${V0}0 a
-
-exec 4>&-
-EXPECT "1" get_fd_count $V0 $H0 $B0/${V0}0 a
-
-exec 5>&-
-EXPECT "0" get_fd_count $V0 $H0 $B0/${V0}0 a
-
-cleanup
diff --git a/tests/bugs/bug-912297.t b/tests/bugs/bug-912297.t
deleted file mode 100755
index f5a5babf5..000000000
--- a/tests/bugs/bug-912297.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-## Setting owner-uid as -12
-TEST ! $CLI volume set $V0 owner-uid -12
-EXPECT '' volinfo_field $V0 'storage.owner-uid'
-
-## Setting owner-gid as -5
-TEST ! $CLI volume set $V0 owner-gid -5
-EXPECT '' volinfo_field $V0 'storage.owner-gid'
-
-## Setting owner-uid as 36
-TEST $CLI volume set $V0 owner-uid 36
-EXPECT '36' volinfo_field $V0 'storage.owner-uid'
-
-## Setting owner-gid as 36
-TEST $CLI volume set $V0 owner-gid 36
-EXPECT '36' volinfo_field $V0 'storage.owner-gid'
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-912564.t b/tests/bugs/bug-912564.t
deleted file mode 100755
index b24268fbc..000000000
--- a/tests/bugs/bug-912564.t
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-# Test that the rsync and "extra" regexes cause rename-in-place without
-# creating linkfiles, when they're supposed to.  Without the regex we'd have a
-# 1/4 chance of each file being assigned to the right place, so with 16 files
-# we have a 1/2^32 chance of getting the correct result by accident.
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-function count_linkfiles {
-	local i
-	local count=0
-	for i in $(seq $2 $3); do
-		x=$(find $1$i -perm -1000 | wc -l)
-		# Divide by two because of the .glusterfs links.
-		count=$((count+x/2))
-	done
-	echo $count
-}
-
-# This function only exists to get around quoting difficulties in TEST.
-function set_regex {
-	$CLI volume set $1 cluster.extra-hash-regex '^foo(.+)bar$'
-}
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-mkdir -p $H0:$B0/${V0}0
-mkdir -p $H0:$B0/${V0}1
-mkdir -p $H0:$B0/${V0}2
-mkdir -p $H0:$B0/${V0}3
-
-# Create and start a volume.
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 \
-			    $H0:$B0/${V0}2 $H0:$B0/${V0}3
-TEST $CLI volume start $V0
-EXPECT_WITHIN 15 'Started' volinfo_field $V0 'Status';
-
-# Mount it.
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-
-# Make sure the rsync regex works, by verifying that no linkfiles are
-# created.
-rm -f $M0/file*
-for i in $(seq 0 15); do
-	fn=$(printf file%x $i)
-	tmp_fn=$(printf .%s.%d $fn $RANDOM)
-	echo testing > $M0/$tmp_fn
-	mv $M0/$tmp_fn $M0/$fn
-done
-lf=$(count_linkfiles $B0/$V0 0 3)
-TEST [ "$lf" -eq "0" ]
-
-# Make sure that linkfiles *are* created for normal files.
-rm -f $M0/file*
-for i in $(seq 0 15); do
-	fn=$(printf file%x $i)
-	tmp_fn=$(printf foo%sbar $fn)
-	echo testing > $M0/$tmp_fn
-	mv $M0/$tmp_fn $M0/$fn
-done
-lf=$(count_linkfiles $B0/$V0 0 3)
-TEST [ "$lf" -ne "0" ]
-
-# Make sure that setting an extra regex suppresses the linkfiles.
-TEST set_regex $V0
-rm -f $M0/file*
-for i in $(seq 0 15); do
-	fn=$(printf file%x $i)
-	tmp_fn=$(printf foo%sbar $fn)
-	echo testing > $M0/$tmp_fn
-	mv $M0/$tmp_fn $M0/$fn
-done
-lf=$(count_linkfiles $B0/$V0 0 3)
-TEST [ "$lf" -eq "0" ]
-
-# Re-test the rsync regex, to make sure the extra one didn't break it.
-rm -f $M0/file*
-for i in $(seq 0 15); do
-	fn=$(printf file%x $i)
-	tmp_fn=$(printf .%s.%d $fn $RANDOM)
-	echo testing > $M0/$tmp_fn
-	mv $M0/$tmp_fn $M0/$fn
-done
-lf=$(count_linkfiles $B0/$V0 0 3)
-TEST [ "$lf" -eq "0" ]
-
-cleanup
diff --git a/tests/bugs/bug-913051.t b/tests/bugs/bug-913051.t
deleted file mode 100644
index 69e90cf66..000000000
--- a/tests/bugs/bug-913051.t
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-
-cleanup;
-
-#Test that afr opens the file on the bricks that were offline at the time of
-# open after the brick comes online. This tests for writev, readv triggering
-# open-fd-fix in afr.
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume set $V0 performance.quick-read off
-TEST $CLI volume set $V0 performance.open-behind off
-TEST $CLI volume set $V0 performance.io-cache off
-TEST $CLI volume set $V0 performance.write-behind off
-TEST $CLI volume set $V0 performance.stat-prefetch off
-TEST $CLI volume set $V0 performance.read-ahead off
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=enable
-TEST kill_brick $V0 $H0 $B0/${V0}0
-
-TEST mkdir $M0/dir
-TEST touch $M0/dir/a
-TEST touch $M0/dir/b
-echo abc > $M0/dir/b
-
-TEST wfd=`fd_available`
-TEST fd_open $wfd "w" $M0/dir/a
-TEST rfd=`fd_available`
-TEST fd_open $rfd "r" $M0/dir/b
-
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-
-#check that the files are not opned on brick-0
-realpatha=$(gf_get_gfid_backend_file_path $B0/${V0}0 "dir/a")
-EXPECT "N" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 "$realpatha"
-EXPECT "N" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 $B0/${V0}0/dir/a
-
-realpathb=$(gf_get_gfid_backend_file_path $B0/${V0}0 "dir/b")
-EXPECT "N" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 "$realpathb"
-EXPECT "N" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 $B0/${V0}0/dir/b
-
-#attempt self-heal so that the files are created on brick-0
-
-TEST ls -l $M0/dir/a
-TEST ls -l $M0/dir/b
-
-#trigger writev for attempting open-fd-fix in afr
-TEST fd_write $wfd "open sesame"
-
-#trigger readv for attempting open-fd-fix in afr
-TEST fd_cat $rfd
-
-EXPECT_WITHIN 20 "Y" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 $B0/${V0}0/dir/a
-EXPECT_WITHIN 20 "Y" gf_check_file_opened_in_brick $V0 $H0 $B0/${V0}0 $B0/${V0}0/dir/b
-
-TEST fd_close $wfd
-TEST fd_close $rfd
-cleanup;
diff --git a/tests/bugs/bug-913487.t b/tests/bugs/bug-913487.t
deleted file mode 100644
index 2095903d9..000000000
--- a/tests/bugs/bug-913487.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd;
-TEST pidof glusterd;
-
-TEST ! $CLI volume set $V0 performance.open-behind off;
-
-TEST pidof glusterd;
-
-cleanup;
diff --git a/tests/bugs/bug-913544.t b/tests/bugs/bug-913544.t
deleted file mode 100644
index 790bc0898..000000000
--- a/tests/bugs/bug-913544.t
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-#simulate a split-brain of a file and do truncate. This should not crash the mount point
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume set $V0 stat-prefetch off
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-cd $M0
-TEST touch a
-#simulate no-changelog data split-brain
-echo "abc" > $B0/${V0}1/a
-echo "abcd" > $B0/${V0}0/a
-TEST ! truncate -s 0 a
-TEST ls
-cd
-
-cleanup
diff --git a/tests/bugs/bug-913555.t b/tests/bugs/bug-913555.t
deleted file mode 100755
index f58d7bd6d..000000000
--- a/tests/bugs/bug-913555.t
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# Test that a volume becomes unwritable when the cluster loses quorum.
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../cluster.rc
-
-
-function check_fs {
-	df $1 &> /dev/null
-	echo $?
-}
-
-function check_peers {
-	$CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-
-function glusterfsd_count {
-    pidof glusterfsd | wc -w;
-}
-
-cleanup;
-
-TEST launch_cluster 3; # start 3-node virtual cluster
-TEST $CLI_1 peer probe $H2; # peer probe server 2 from server 1 cli
-TEST $CLI_1 peer probe $H3; # peer probe server 3 from server 1 cli
-
-EXPECT_WITHIN 20 2 check_peers
-
-TEST $CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0 $H3:$B3/$V0
-TEST $CLI_1 volume set $V0 cluster.server-quorum-type server
-TEST $CLI_1 volume start $V0
-TEST glusterfs --volfile-server=$H1 --volfile-id=$V0 $M0
-
-# Kill one pseudo-node, make sure the others survive and volume stays up.
-TEST kill_node 3;
-EXPECT_WITHIN 20 1 check_peers;
-EXPECT 0 check_fs $M0;
-EXPECT 2 glusterfsd_count;
-
-# Kill another pseudo-node, make sure the last one dies and volume goes down.
-TEST kill_node 2;
-EXPECT_WITHIN 20 0 check_peers
-EXPECT 1 check_fs $M0;
-EXPECT 0 glusterfsd_count; # the two glusterfsds of the other two glusterds
-                           # must be dead
-
-TEST $glusterd_2;
-TEST $glusterd_3;
-EXPECT_WITHIN 20 3 glusterfsd_count; # restore quorum, all ok
-EXPECT_WITHIN 5 0 check_fs $M0;
-
-cleanup
diff --git a/tests/bugs/bug-915280.t b/tests/bugs/bug-915280.t
deleted file mode 100755
index a1f92f201..000000000
--- a/tests/bugs/bug-915280.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-TEST $CLI volume create $V0 $H0:$B0/brick1 $H0:$B0/brick2;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-sleep 3
-
-MOUNTDIR=$N0;
-TEST mount -t nfs -o vers=3,nolock,soft,timeo=30,retrans=1 $H0:/$V0 $N0
-TEST touch $N0/testfile
-
-TEST $CLI volume set $V0 debug.error-gen client
-TEST $CLI volume set $V0 debug.error-fops stat
-TEST $CLI volume set $V0 debug.error-failure 100
-
-sleep 1
-
-pid_file=$(read_nfs_pidfile);
-
-getfacl $N0/testfile 2>/dev/null
-
-nfs_pid=$(get_nfs_pid);
-if [ ! $nfs_pid ]
-then
-  nfs_pid=0;
-fi
-
-TEST [ $nfs_pid -eq $pid_file ]
-
-TEST   umount $MOUNTDIR -l
-
-cleanup;
diff --git a/tests/bugs/bug-915554.t b/tests/bugs/bug-915554.t
deleted file mode 100755
index beb669f8c..000000000
--- a/tests/bugs/bug-915554.t
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-#
-# Bug <915554>
-#
-# This test checks for a condition where a rebalance migrates a file and does
-# not preserve the original file size. This can occur due to hole preservation
-# logic in the file migration code. If a file size is aligned to a disk sector
-# boundary (512b) and the tail portion of the file is zero-filled, the file
-# may end up truncated to the end of the last data region in the file.
-#
-###
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-BRICK_COUNT=3
-# create, start and mount a two brick DHT volume
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
-TEST $CLI volume start $V0
-
-TEST glusterfs --attribute-timeout=0 --entry-timeout=0 --gid-timeout=-1 -s $H0 --volfile-id $V0 $M0;
-
-i=1
-# Write some data to a file and extend such that the file is sparse to a sector
-# aligned boundary.
-echo test > $M0/$i
-TEST truncate --size=1m $M0/$i
-
-# cache the original size
-SIZE1=`stat -c %s $M0/$i`
-
-# rename till file gets a linkfile
-
-while [ $i -ne 0 ]
-do
-        test=`mv $M0/$i $M0/$(( $i+1 )) 2>/dev/null`
-        if [ $? -ne 0 ]
-        then
-                echo "rename failed"
-                break
-        fi
-        let i++
-        file_has_linkfile $i
-        has_link=$?
-        if [ $has_link -eq 2 ]
-        then
-                break;
-        fi
-done
-
-# start a rebalance (force option to overide checks) to trigger migration of
-# file
-
-TEST $CLI volume rebalance $V0 start force
-
-# check if rebalance has completed for upto 15 secs
-
-EXPECT_WITHIN 30 "0" rebalance_completed
-
-# validate the file size after the migration
-SIZE2=`stat -c %s $M0/$i`
-
-TEST [ $SIZE1 -eq $SIZE2 ]
-
-TEST rm -f $M0/$i
-TEST umount $M0
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/bugs/bug-916226.t b/tests/bugs/bug-916226.t
deleted file mode 100644
index 2abfa1fc6..000000000
--- a/tests/bugs/bug-916226.t
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2 $H0:$B0/${V0}3
-TEST $CLI volume set $V0 cluster.eager-lock on
-TEST $CLI volume start $V0
-
-## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-
-TEST mkdir $M0/dir{1..10};
-TEST touch $M0/dir{1..10}/files{1..10};
-
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}4 $H0:/$B0/${V0}5
-
-TEST $CLI volume rebalance $V0 start force
-EXPECT_WITHIN 60 "completed" rebalance_status_field $V0
-
-cleanup;
diff --git a/tests/bugs/bug-916549.t b/tests/bugs/bug-916549.t
deleted file mode 100755
index d6a45b827..000000000
--- a/tests/bugs/bug-916549.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd;
-TEST $CLI volume create $V0 $H0:$B0/${V0}1;
-TEST $CLI volume start $V0;
-
-pid_file=$(ls /var/lib/glusterd/vols/$V0/run);
-brick_pid=$(cat /var/lib/glusterd/vols/$V0/run/$pid_file);
-
-
-kill -SIGKILL $brick_pid;
-TEST $CLI volume start $V0 force;
-TEST process_leak_count $(pidof glusterd);
-
-cleanup;
diff --git a/tests/bugs/bug-918437-sh-mtime.t b/tests/bugs/bug-918437-sh-mtime.t
deleted file mode 100644
index 080956f51..000000000
--- a/tests/bugs/bug-918437-sh-mtime.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-function get_mtime {
-        local f=$1
-        stat $f | grep Modify | awk '{print $2 $3}' | cut -f1 -d'.'
-}
-cleanup;
-
-## Tests if mtime is correct after self-heal.
-TEST glusterd
-TEST pidof glusterd
-TEST mkdir -p $B0/gfs0/brick0{1,2}
-TEST $CLI volume create $V0 replica 2 transport tcp $H0:$B0/gfs0/brick01 $H0:$B0/gfs0/brick02
-TEST $CLI volume set $V0 nfs.disable on
-TEST $CLI volume set $V0 performance.stat-prefetch off
-TEST $CLI volume set $V0 cluster.background-self-heal-count 0
-TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --direct-io-mode=enable
-# file 'a' is healed from brick02 to brick01 where as file 'b' is healed from
-# brick01 to brick02
-
-TEST cp -p /etc/passwd $M0/a
-TEST cp -p /etc/passwd $M0/b
-
-#Store mtimes before self-heals
-TEST modify_atstamp=$(get_mtime $B0/gfs0/brick02/a)
-TEST modify_btstamp=$(get_mtime $B0/gfs0/brick02/b)
-
-TEST $CLI volume stop $V0
-TEST gf_rm_file_and_gfid_link $B0/gfs0/brick01 a
-TEST gf_rm_file_and_gfid_link $B0/gfs0/brick02 b
-
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1
-
-find $M0 | xargs stat 1>/dev/null
-
-TEST modify_atstamp1=$(get_mtime $B0/gfs0/brick01/a)
-TEST modify_atstamp2=$(get_mtime $B0/gfs0/brick02/a)
-EXPECT $modify_atstamp echo $modify_atstamp1
-EXPECT $modify_atstamp echo $modify_atstamp2
-
-TEST modify_btstamp1=$(get_mtime $B0/gfs0/brick01/b)
-TEST modify_btstamp2=$(get_mtime $B0/gfs0/brick02/b)
-EXPECT $modify_btstamp echo $modify_btstamp1
-EXPECT $modify_btstamp echo $modify_btstamp2
-cleanup;
diff --git a/tests/bugs/bug-921072.t b/tests/bugs/bug-921072.t
deleted file mode 100755
index e101d5b46..000000000
--- a/tests/bugs/bug-921072.t
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../nfs.rc
-
-cleanup;
-
-#1
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume start $V0
-EXPECT_WITHIN 20 1 is_nfs_export_available
-TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $N0
-TEST umount $N0
-
-# based on ip addresses (1-4)
-# case 1: allow only localhost ip
-TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-TEST umount $N0
-
-# case 2: allow only non-localhost ip
-TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1
-EXPECT_WITHIN 20 1 is_nfs_export_available
-#11
-TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-TEST $CLI volume reset --mode=script $V0
-# case 3: reject only localhost ip
-TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-
-# case 4: reject only non-localhost ip
-TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.168.1.1
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-TEST umount $N0
-
-
-
-# NEED TO CHECK BOTH IP AND NAME BASED AUTH.
-# CASES WITH NFS.ADDR-NAMELOOKUP ON (5-12)
-TEST $CLI volume reset --mode=script $V0
-TEST $CLI volume set $V0 nfs.addr-namelookup on
-EXPECT_WITHIN 20 1 is_nfs_export_available
-#20
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-TEST umount $N0
-
-# case 5: allow only localhost
-TEST $CLI volume set $V0 nfs.rpc-auth-allow localhost
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-TEST umount $N0
-
-# case 6: allow only somehost
-TEST $CLI volume set $V0 nfs.rpc-auth-allow somehost
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-
-# case 7: reject only localhost
-TEST $CLI volume reset --mode=script $V0
-TEST $CLI volume set $V0 nfs.addr-namelookup on
-TEST $CLI volume set $V0 nfs.rpc-auth-reject localhost
-EXPECT_WITHIN 20 1 is_nfs_export_available
-#30
-TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-
-# case 8: reject only somehost
-TEST $CLI volume set $V0 nfs.rpc-auth-reject somehost
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-TEST umount $N0
-
-# based on ip addresses: repeat of cases 1-4
-# case 9: allow only localhost ip
-TEST $CLI volume reset --mode=script $V0
-TEST $CLI volume set $V0 nfs.addr-namelookup on
-TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-TEST umount $N0
-
-# case 10: allow a non-localhost ip
-TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1
-EXPECT_WITHIN 20 1 is_nfs_export_available
-#40
-TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-
-# case 11: reject only localhost ip
-TEST $CLI volume reset --mode=script $V0
-TEST $CLI volume set $V0 nfs.addr-namelookup on
-TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-
-# case 12: reject only non-localhost ip
-TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.168.1.1
-EXPECT_WITHIN 20 1 is_nfs_export_available
-
-TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0
-TEST umount $N0
-
-TEST $CLI volume stop --mode=script $V0
-#49
-TEST $CLI volume delete --mode=script $V0
-cleanup
diff --git a/tests/bugs/bug-921231.t b/tests/bugs/bug-921231.t
deleted file mode 100644
index db9cf3b6f..000000000
--- a/tests/bugs/bug-921231.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-# This test writes to same file with 2 fds and tests that eager-lock is not
-# causing extra delay because of post-op-delay-secs
-cleanup;
-
-function write_to_file {
-        dd of=$M0/1 if=/dev/zero bs=1M count=128 oflag=append 2>&1 >/dev/null
-}
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume set $V0 eager-lock on
-TEST $CLI volume set $V0 post-op-delay-secs 3
-TEST $CLI volume set $V0 client-log-level DEBUG
-TEST $CLI volume start $V0
-TEST $CLI volume profile $V0 start
-TEST $CLI volume set $V0 ensure-durability off
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-write_to_file &
-write_to_file &
-wait
-#Test if the MAX [F]INODELK fop latency is of the order of seconds.
-inodelk_max_latency=$($CLI volume profile $V0 info | grep INODELK | awk 'BEGIN {max = 0} {if ($6 > max) max=$6;} END {print max}' | cut -d. -f 1 | egrep "[0-9]{7,}")
-TEST [ -z $inodelk_max_latency ]
-
-cleanup;
diff --git a/tests/bugs/bug-921408.t b/tests/bugs/bug-921408.t
deleted file mode 100755
index ef2b4fb21..000000000
--- a/tests/bugs/bug-921408.t
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fileio.rc
-. $(dirname $0)/../dht.rc
-
-cleanup;
-wait_check_status ()
-{
-        n=0
-        while [ $n -lt $1 ]
-        do
-                ret=$(rebalance_completed)
-                if [ $ret == "0" ]
-                then
-                        return 0;
-                else
-                        sleep 1
-                        n=`expr $n + 1`;
-                fi
-       done
-       return 1;
-}
-
-addbr_rebal_till_layout_change()
-{
-        val=1
-        l=$1
-        i=1
-        while [ $i -lt 5 ]
-        do
-                $CLI volume add-brick $V0 $H0:$B0/${V0}$l &>/dev/null
-                $CLI volume rebalance $V0 fix-layout start &>/dev/null
-                wait_check_status 15
-                if [ $? -eq 1 ]
-                then
-                        break
-                fi
-                NEW_LAYOUT=`get_layout $B0/${V0}0`
-                if [ $OLD_LAYOUT == $NEW_LAYOUT ]
-                then
-                        i=`expr $i + 1`;
-                        l=`expr $l + 1`;
-                else
-                        val=0
-                        break
-                fi
-        done
-        return $val
-}
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0
-TEST $CLI volume set $V0 subvols-per-directory 1
-TEST $CLI volume start $V0
-
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-
-TEST mkdir $M0/test
-TEST touch $M0/test/test
-
-fd=`fd_available`
-TEST fd_open $fd "rw" $M0/test/test
-
-OLD_LAYOUT=`get_layout $B0/${V0}0`
-
-addbr_rebal_till_layout_change 1
-
-TEST [ $? -eq 0 ]
-
-for i in $(seq 1 1000)
-do
-	ls -l $M0/ >/dev/null
-	ret=$?
-	if [ $ret != 0 ]
-	then
-		break
-	fi
-done
-
-TEST [ $ret == 0 ];
-TEST fd_close $fd;
-
-TEST umount $M0
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup
diff --git a/tests/bugs/bug-924075.t b/tests/bugs/bug-924075.t
deleted file mode 100755
index f4e03e33a..000000000
--- a/tests/bugs/bug-924075.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-#FIXME: there is another patch which moves the following function into
-#include.rc
-function process_leak_count ()
-{
-    local pid=$1;
-    return $(ls -lh /proc/$pid/fd | grep "(deleted)" | wc -l)
-}
-
-TEST glusterd;
-TEST $CLI volume create $V0 $H0:$B0/${V0}1;
-TEST $CLI volume start $V0;
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-mount_pid=$(get_mount_process_pid $V0);
-TEST process_leak_count $mount_pid;
-
-cleanup;
diff --git a/tests/bugs/bug-924265.t b/tests/bugs/bug-924265.t
deleted file mode 100755
index 13491356d..000000000
--- a/tests/bugs/bug-924265.t
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Test that setting cluster.dht-xattr-name works, and that DHT consistently
-# uses the specified name instead of the default.
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-# We only care about the exit code, so keep it quiet.
-function silent_getfattr {
-	getfattr $* &> /dev/null
-}
-
-cleanup
-
-TEST glusterd
-TEST pidof glusterd
-
-mkdir -p $H0:$B0/${V0}0
-
-# Create a volume and set the option.
-TEST $CLI volume create $V0 $H0:$B0/${V0}0
-TEST $CLI volume set $V0 cluster.dht-xattr-name trusted.foo.bar
-
-# Start and mount the volume.
-TEST $CLI volume start $V0
-EXPECT_WITHIN 15 'Started' volinfo_field $V0 'Status';
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
-
-# Create a directory and make sure it has the right xattr.
-mkdir $M0/test
-TEST ! silent_getfattr -n trusted.glusterfs.dht $B0/${V0}0/test
-TEST silent_getfattr -n trusted.foo.bar $B0/${V0}0/test
-
-cleanup
diff --git a/tests/bugs/bug-927616.t b/tests/bugs/bug-927616.t
deleted file mode 100755
index 22b20aff2..000000000
--- a/tests/bugs/bug-927616.t
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
-TEST $CLI volume set $V0 performance.open-behind off;
-TEST $CLI volume start $V0
-
-sleep 1;
-## Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
-
-sleep 1;
-
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0;
-
-TEST mkdir $M0/dir;
-
-mkdir $M0/other;
-cp /etc/passwd $M0/;
-cp $M0/passwd $M0/file;
-chmod 600 $M0/file;
-
-chown -R nfsnobody:nfsnobody $M0/dir;
-
-TEST $CLI volume set $V0 server.root-squash on;
-
-sleep 1;
-
-# tests should fail.
-touch $M0/foo 2>/dev/null;
-TEST [ $? -ne 0 ]
-touch $N0/foo 2>/dev/null;
-TEST [ $? -ne 0 ]
-mkdir $M0/new 2>/dev/null;
-TEST [ $? -ne 0 ]
-mkdir $N0/new 2>/dev/null;
-TEST [ $? -ne 0 ]
-
-TEST $CLI volume set $V0 server.root-squash off;
-
-sleep 1;
-
-# tests should pass.
-touch $M0/foo 2>/dev/null;
-TEST [ $? -eq 0 ]
-touch $N0/bar 2>/dev/null;
-TEST [ $? -eq 0 ]
-mkdir $M0/new 2>/dev/null;
-TEST [ $? -eq 0 ]
-mkdir $N0/old 2>/dev/null;
-TEST [ $? -eq 0 ]
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-948686.t b/tests/bugs/bug-948686.t
deleted file mode 100644
index db9c198a9..000000000
--- a/tests/bugs/bug-948686.t
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../cluster.rc
-
-function check_peers {
-    $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-cleanup;
-#setup cluster and test volume
-TEST launch_cluster 3; # start 3-node virtual cluster
-TEST $CLI_1 peer probe $H2; # peer probe server 2 from server 1 cli
-TEST $CLI_1 peer probe $H3; # peer probe server 3 from server 1 cli
-
-EXPECT_WITHIN 20 2 check_peers;
-
-TEST $CLI_1 volume create $V0 replica 2 $H1:$B1/$V0 $H1:$B1/${V0}_1 $H2:$B2/$V0 $H3:$B3/$V0
-TEST $CLI_1 volume start $V0
-TEST glusterfs --volfile-server=$H1 --volfile-id=$V0 $M0
-
-#kill a node
-TEST kill_node 3
-
-#modify volume config to see change in volume-sync
-TEST $CLI_1 volume set $V0 write-behind off
-#add some files to the volume to see effect of volume-heal cmd
-TEST touch $M0/{1..100};
-TEST $CLI_1 volume stop $V0;
-TEST $glusterd_3;
-sleep 3;
-TEST $CLI_3 volume start $V0;
-TEST $CLI_2 volume stop $V0;
-TEST $CLI_2 volume delete $V0;
-
-cleanup;
-
-TEST glusterd;
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume start $V0
-pkill glusterd;
-pkill glusterfsd;
-TEST glusterd
-TEST $CLI volume status $V0
-
-cleanup;
diff --git a/tests/bugs/bug-948729/bug-948729-force.t b/tests/bugs/bug-948729/bug-948729-force.t
deleted file mode 100644
index d14e94061..000000000
--- a/tests/bugs/bug-948729/bug-948729-force.t
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../cluster.rc
-
-function check_peers {
-        $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-
-cleanup;
-uuid1=`uuidgen`;
-uuid2=`uuidgen`;
-uuid3=`uuidgen`;
-
-V1=patchy1
-V2=patchy2
-
-TEST launch_cluster 2;
-
-TEST $CLI_1 peer probe $H2;
-
-EXPECT_WITHIN 20 1 check_peers;
-
-B3=/d/backends/3
-B4=/d/backends/4
-B5=/d/backends/5
-B6=/d/backends/6
-
-mkdir -p $B3 $B4 $B5 $B6
-
-TEST truncate -s 16M $B1/brick1
-TEST truncate -s 16M $B2/brick2
-TEST truncate -s 16M $B3/brick3
-TEST truncate -s 16M $B4/brick4
-TEST truncate -s 16M $B5/brick5
-TEST truncate -s 16M $B6/brick6
-
-TEST LD1=`losetup --find --show $B1/brick1`
-TEST mkfs.xfs $LD1
-TEST LD2=`losetup --find --show $B2/brick2`
-TEST mkfs.xfs $LD2
-TEST LD3=`losetup --find --show $B3/brick3`
-TEST mkfs.xfs $LD3
-TEST LD4=`losetup --find --show $B4/brick4`
-TEST mkfs.xfs $LD4
-TEST LD5=`losetup --find --show $B5/brick5`
-TEST mkfs.xfs $LD5
-TEST LD6=`losetup --find --show $B6/brick6`
-TEST mkfs.xfs $LD6
-
-mkdir -p $B1/$V0 $B2/$V0 $B3/$V0 $B4/$V0 $B5/$V0 $B6/$V0
-
-TEST mount -t xfs $LD1 $B1/$V0
-TEST mount -t xfs $LD2 $B2/$V0
-TEST mount -t xfs $LD3 $B3/$V0
-TEST mount -t xfs $LD4 $B4/$V0
-TEST mount -t xfs $LD5 $B5/$V0
-TEST mount -t xfs $LD6 $B6/$V0
-
-#Case 0: Parent directory of the brick is absent
-TEST ! $CLI1 volume create $V0 $H1:$B1/$V0/nonexistent/b1 $H2:$B2/$V0/nonexistent/b2 force
-
-#Case 1: File system root is being used as brick directory
-TEST   $CLI1 volume create $V0 $H1:$B5/$V0 $H2:$B6/$V0 force
-
-#Case 2: Brick directory contains only one component
-TEST   $CLI1 volume create $V1 $H1:/$uuid1 $H2:/$uuid2 force
-
-#Case 3: Sub-directories of the backend FS being used as brick directory
-TEST   $CLI1 volume create $V2 $H1:$B1/$V0/brick1 $H2:$B2/$V0/brick2 force
-
-#add-brick tests
-TEST ! $CLI1 volume add-brick $V0 $H1:$B3/$V0/nonexistent/brick3 force
-TEST   $CLI1 volume add-brick $V0 $H1:$B3/$V0 force
-TEST   $CLI1 volume add-brick $V1 $H1:/$uuid3 force
-TEST   $CLI1 volume add-brick $V2 $H1:$B4/$V0/brick3 force
-
-#####replace-brick tests
-#FIX-ME: replace-brick does not work with the newly introduced cluster test
-#####framework
-
-rmdir /$uuid1 /$uuid2 /$uuid3;
-
-cleanup;
diff --git a/tests/bugs/bug-948729/bug-948729-mode-script.t b/tests/bugs/bug-948729/bug-948729-mode-script.t
deleted file mode 100644
index 541ca897d..000000000
--- a/tests/bugs/bug-948729/bug-948729-mode-script.t
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../cluster.rc
-
-function check_peers {
-        $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-
-cleanup;
-
-uuid1=`uuidgen`;
-uuid2=`uuidgen`;
-uuid3=`uuidgen`;
-
-V1=patchy1
-V2=patchy2
-V3=patchy3
-
-TEST launch_cluster 2;
-
-TEST $CLI_1 peer probe $H2;
-
-EXPECT_WITHIN 20 1 check_peers;
-
-B3=/d/backends/3
-B4=/d/backends/4
-B5=/d/backends/5
-B6=/d/backends/6
-mkdir -p $B3 $B4 $B5 $B6
-
-TEST truncate -s 16M $B1/brick1
-TEST truncate -s 16M $B2/brick2
-TEST truncate -s 16M $B3/brick3
-TEST truncate -s 16M $B4/brick4
-TEST truncate -s 16M $B5/brick5
-TEST truncate -s 16M $B6/brick6
-
-TEST LD1=`losetup --find --show $B1/brick1`
-TEST mkfs.xfs $LD1
-TEST LD2=`losetup --find --show $B2/brick2`
-TEST mkfs.xfs $LD2
-TEST LD3=`losetup --find --show $B3/brick3`
-TEST mkfs.xfs $LD3
-TEST LD4=`losetup --find --show $B4/brick4`
-TEST mkfs.xfs $LD4
-TEST LD5=`losetup --find --show $B5/brick5`
-TEST mkfs.xfs $LD5
-TEST LD6=`losetup --find --show $B6/brick6`
-TEST mkfs.xfs $LD6
-
-mkdir -p $B1/$V0 $B2/$V0 $B3/$V0 $B4/$V0 $B5/$V0 $B6/$V0
-
-TEST mount -t xfs $LD1 $B1/$V0
-TEST mount -t xfs $LD2 $B2/$V0
-TEST mount -t xfs $LD3 $B3/$V0
-TEST mount -t xfs $LD4 $B4/$V0
-TEST mount -t xfs $LD5 $B5/$V0
-TEST mount -t xfs $LD6 $B6/$V0
-
-#Case 0: Parent directory of the brick is absent
-TEST ! $CLI_1 volume create $V0 $H1:$B1/$V0/nonexistent/b1 $H2:$B2/$V0/nonexistent/b2
-
-#Case 1: File system root being used as brick directory
-TEST   $CLI_1 volume create $V0 $H1:$B5/$V0 $H2:$B6/$V0
-
-#Case 2: Brick directory contains only one component
-TEST   $CLI_1 volume create $V1 $H1:/$uuid1 $H2:/$uuid2
-
-#Case 3: Sub-directories of the backend FS being used as brick directory
-TEST   $CLI_1 volume create $V2 $H1:$B1/$V0/brick1 $H2:$B2/$V0/brick2
-
-#add-brick tests
-TEST ! $CLI_1 volume add-brick $V0 $H1:$B3/$V0/nonexistent/brick3
-TEST   $CLI_1 volume add-brick $V0 $H1:$B3/$V0
-TEST   $CLI_1 volume add-brick $V1 $H1:/$uuid3
-TEST   $CLI_1 volume add-brick $V2 $H1:$B4/$V0/brick3
-
-#####replace-brick tests
-#FIX-ME : replace-brick does not currently work in the newly introduced
-#####cluster test framework
-
-rmdir /$uuid1 /$uuid2 /$uuid3
-
-cleanup;
diff --git a/tests/bugs/bug-948729/bug-948729.t b/tests/bugs/bug-948729/bug-948729.t
deleted file mode 100644
index f94db1ea0..000000000
--- a/tests/bugs/bug-948729/bug-948729.t
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../cluster.rc
-
-function check_peers {
-        $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-
-cleanup;
-
-uuid1=`uuidgen`;
-uuid2=`uuidgen`;
-uuid3=`uuidgen`;
-
-TEST launch_cluster 2;
-
-TEST $CLI_1 peer probe $H2;
-
-EXPECT_WITHIN 20 1 check_peers;
-
-B3=/d/backends/3
-
-mkdir -p $B3
-
-TEST truncate -s 16M $B1/brick1
-TEST truncate -s 16M $B2/brick2
-TEST truncate -s 16M $B3/brick3
-
-TEST LD1=`losetup --find --show $B1/brick1`
-TEST mkfs.xfs $LD1
-TEST LD2=`losetup --find --show $B2/brick2`
-TEST mkfs.xfs $LD2
-TEST LD3=`losetup --find --show $B3/brick3`
-TEST mkfs.xfs $LD3
-
-mkdir -p $B1/$V0 $B2/$V0 $B3/$V0
-
-TEST mount -t xfs $LD1 $B1/$V0
-TEST mount -t xfs $LD2 $B2/$V0
-TEST mount -t xfs $LD3 $B3/$V0
-
-#Tests without --mode=script option
-cli1=$(echo $CLI1 | sed 's/ --mode=script//')
-#Case 0: Parent directory of the brick is absent
-TEST ! $cli1 volume create $V0 $H1:$B1/$V0/nonexistent/b1 $H2:$B2/$V0/nonexistent/b2
-
-#Case 1: File system root being used as brick directory
-TEST ! $cli1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0
-
-#Case 2: Brick directory contains only one component
-TEST ! $cli1 volume create $V0 $H1:/$uuid1 $H2:/$uuid2
-
-#Case 3: Sub-directories of the backend FS being used as brick directory
-TEST   $cli1 volume create $V0 $H1:$B1/$V0/brick1 $H2:$B2/$V0/brick2
-
-#add-brick tests
-TEST ! $cli1 volume add-brick $V0 $H1:$B3/$V0/nonexistent/b3
-TEST ! $cli1 volume add-brick $V0 $H1:$B3/$V0
-TEST ! $cli1 volume add-brick $V0 $H1:/$uuid3
-TEST   $cli1 volume add-brick $V0 $H1:$B3/$V0/brick3
-
-#####replace-brick tests
-#FIX-ME: Replace-brick does not work currently in the newly introduced cluster
-#####test framework.
-
-cleanup;
diff --git a/tests/bugs/bug-949242.t b/tests/bugs/bug-949242.t
deleted file mode 100644
index 717084673..000000000
--- a/tests/bugs/bug-949242.t
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# Bug 949242 - Test basic fallocate functionality.
-#
-# Run several commands to verify basic fallocate functionality. We verify that
-# fallocate creates and allocates blocks to a file. We also verify that the keep
-# size option does not modify the file size.
-###
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fallocate.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4}
-TEST $CLI volume start $V0
-
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-
-# check for fallocate support before continuing the test
-require_fallocate -l 1m -n $M0/file && rm -f $M0/file
-
-# fallocate a file and verify blocks are allocated
-TEST fallocate -l 1m $M0/file
-blksz=`stat --printf=%b $M0/file`
-nblks=`stat --printf=%B $M0/file`
-TEST [ $(($blksz * $nblks)) -eq 1048576 ]
-
-TEST unlink $M0/file
-
-# truncate a file to a fixed size, fallocate and verify that the size does not
-# change
-TEST truncate --size=1m $M0/file
-TEST fallocate -l 2m -n $M0/file
-blksz=`stat --printf=%b $M0/file`
-nblks=`stat --printf=%B $M0/file`
-sz=`stat --printf=%s $M0/file`
-TEST [ $sz -eq 1048576 ]
-# Note that gluster currently incorporates a hack to limit the number of blocks
-# reported as allocated to the file by the file size. We have allocated beyond the
-# file size here. Just check for non-zero allocation to avoid setting a land mine
-# for if/when that behavior might change.
-TEST [ ! $(($blksz * $nblks)) -eq 0 ]
-
-TEST unlink $M0/file
-
-TEST umount $M0
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/bugs/bug-949298.t b/tests/bugs/bug-949298.t
deleted file mode 100644
index 1394127ec..000000000
--- a/tests/bugs/bug-949298.t
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI --xml volume info $V0
-
-cleanup;
diff --git a/tests/bugs/bug-949930.t b/tests/bugs/bug-949930.t
deleted file mode 100644
index 4a738befa..000000000
--- a/tests/bugs/bug-949930.t
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-V1=patchy2
-
-cleanup;
-
-TEST glusterd;
-TEST pidof glusterd;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-TEST $CLI volume start $V0;
-
-TEST $CLI volume create $V1 $H0:$B0/${V1}{1,2};
-TEST $CLI volume start $V1;
-
-TEST ! $CLI volume set $V0 performance.nfs.read-ahead blah
-EXPECT '' volume_option $V0 performance.nfs.read-ahead
-
-TEST $CLI volume set $V0 performance.nfs.read-ahead on
-EXPECT "on" volume_option $V0 performance.nfs.read-ahead
-
-EXPECT '' volume_option $V1 performance.nfs.read-ahead
-
-cleanup;
-
diff --git a/tests/bugs/bug-955588.t b/tests/bugs/bug-955588.t
deleted file mode 100755
index 3f0361167..000000000
--- a/tests/bugs/bug-955588.t
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-function get_brick_host_uuid()
-{
-    local vol=$1;
-    local uuid_regex='[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}'
-    local host_uuid_list=$($CLI volume info $vol --xml | grep "brick.uuid" | grep -o -E "$uuid_regex");
-
-    echo $host_uuid_list | awk '{print $1}'
-}
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-
-uuid=`grep UUID /var/lib/glusterd/glusterd.info | cut -f2 -d=`
-EXPECT $uuid get_brick_host_uuid $V0
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-957877.t b/tests/bugs/bug-957877.t
deleted file mode 100644
index 23aefea25..000000000
--- a/tests/bugs/bug-957877.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../afr.rc
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume start $V0;
-
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
-kill_brick $V0 $H0 $B0/${V0}0
-TEST touch $M0/f1
-TEST setfattr -n "user.foo" -v "test" $M0/f1
-
-BRICK=$B0"/${V0}1"
-
-TEST $CLI volume start $V0 force
-sleep 5
-TEST $CLI volume heal $V0
-
-# Wait for self-heal to complete
-EXPECT_WITHIN 30 '0' count_sh_entries $BRICK;
-
-TEST getfattr -n "user.foo" $B0/${V0}0/f1;
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-958691.t b/tests/bugs/bug-958691.t
deleted file mode 100644
index a5ac406c9..000000000
--- a/tests/bugs/bug-958691.t
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1}
-TEST $CLI volume start $V0;
-
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
-sleep 1;
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0;
-
-sleep 2;
-
-# Tests for the fuse mount
-TEST mkdir $M0/dir;
-TEST chmod 1777 $M0/dir;
-TEST touch $M0/dir/file{1,2};
-
-TEST $CLI volume set $V0 server.root-squash enable;
-
-mv $M0/dir/file1 $M0/dir/file11 2>/dev/null;
-TEST [ $? -ne 0 ];
-
-TEST $CLI volume set $V0 server.root-squash disable;
-TEST rm -rf $M0/dir;
-
-sleep 1;
-
-# tests for nfs mount
-TEST mkdir $N0/dir;
-TEST chmod 1777 $N0/dir;
-TEST touch $N0/dir/file{1,2};
-
-TEST $CLI volume set $V0 server.root-squash enable;
-
-mv $N0/dir/file1 $N0/dir/file11 2>/dev/null;
-TEST [ $? -ne 0 ];
-
-TEST $CLI volume set $V0 server.root-squash disable;
-TEST rm -rf $N0/dir;
-TEST umount $N0;
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-958790.t b/tests/bugs/bug-958790.t
deleted file mode 100644
index 6cc799c25..000000000
--- a/tests/bugs/bug-958790.t
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-touch /var/lib/glusterd/groups/test
-echo "read-ahead=off" > /var/lib/glusterd/groups/test
-echo "open-behind=off" >> /var/lib/glusterd/groups/test
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-TEST $CLI volume set $V0 group test
-EXPECT "off" volume_option $V0 performance.read-ahead
-EXPECT "off" volume_option $V0 performance.open-behind
-
-cleanup;
diff --git a/tests/bugs/bug-961307.t b/tests/bugs/bug-961307.t
deleted file mode 100644
index 96e93a56f..000000000
--- a/tests/bugs/bug-961307.t
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-REPLICA=2
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica $REPLICA $H0:$B0/${V0}-00 $H0:$B0/${V0}-01 $H0:$B0/${V0}-10 $H0:$B0/${V0}-11
-TEST $CLI volume start $V0
-
-var1=$(gluster volume remove-brick $H0:$B0/${V0}-00 $H0:$B0/${V0}-01 start 2>&1)
-var2="volume remove-brick start: failed: Volume $H0:$B0/${V0}-00 does not exist"
-
-
-function compare_string()
-{
-        val="-1"
-        if [ "$1" == "$2" ]; then
-                val="0"
-        else
-                val="1"
-        fi
-        echo $val
-}
-
-EXPECT 0 compare_string "$var1" "$var2"
-cleanup;
diff --git a/tests/bugs/bug-961615.t b/tests/bugs/bug-961615.t
deleted file mode 100644
index d183e6c52..000000000
--- a/tests/bugs/bug-961615.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#This test tests that an extra fd_unref does not happen in rebalance
-#migration completion check code path in dht
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
-TEST $CLI volume set $V0 performance.quick-read off
-TEST $CLI volume set $V0 performance.io-cache off
-TEST $CLI volume set $V0 performance.write-behind off
-TEST $CLI volume set $V0 performance.stat-prefetch off
-TEST $CLI volume set $V0 performance.read-ahead off
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST touch $M0/1
-#This rename creates a link file for 10 in the other volume.
-TEST mv $M0/1 $M0/10
-#Lets keep writing to the file which will trigger rebalance completion check
-dd if=/dev/zero of=$M0/10 bs=1k &
-bg_pid=$!
-#Now rebalance force will migrate file '10'
-TEST $CLI volume rebalance $V0 start force
-EXPECT_WITHIN 60 "completed" rebalance_status_field $V0
-#If the bug exists mount would have crashed by now
-TEST ls $M0
-kill -9 $bg_pid > /dev/null 2>&1
-wait > /dev/null 2>&1
-cleanup
diff --git a/tests/bugs/bug-961669.t b/tests/bugs/bug-961669.t
deleted file mode 100644
index 751a63df2..000000000
--- a/tests/bugs/bug-961669.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-#Test case: Fail remove-brick 'start' variant when reducing the replica count of a volume.
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-#Basic checks
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info
-
-#Create a 3x3 dist-rep volume
-TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{0,1,2,3,4,5,6,7,8};
-TEST $CLI volume start $V0
-
-# Mount FUSE and create file/directory
-TEST glusterfs -s $H0 --volfile-id $V0 $M0
-TEST touch $M0/zerobytefile.txt
-TEST mkdir $M0/test_dir
-TEST dd if=/dev/zero of=$M0/file bs=1024 count=1024
-
-function remove_brick_start {
-        $CLI volume remove-brick $V0 replica 2 $H0:$B0/${V0}{1,4,7} start 2>&1|grep -oE 'success|failed'
-}
-
-function remove_brick {
-        $CLI volume remove-brick $V0 replica 2 $H0:$B0/${V0}{1,4,7} 2>&1|grep -oE 'success|failed'
-}
-
-#remove-brick start variant
-#Actual message displayed at cli is:
-#"volume remove-brick start: failed: Rebalancing not needed when reducing replica count. Try without the 'start' option"
-EXPECT "failed" remove_brick_start;
-
-#remove-brick commit-force
-#Actual message displayed at cli is:
-#"volume remove-brick commit force: success"
-EXPECT "success" remove_brick
-
-TEST umount $M0
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-963541.t b/tests/bugs/bug-963541.t
deleted file mode 100755
index 950c7db54..000000000
--- a/tests/bugs/bug-963541.t
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1..3};
-TEST $CLI volume start $V0;
-
-# Start a remove-brick and try to start a rebalance/remove-brick without committing
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}1 start
-
-TEST ! $CLI volume rebalance $V0 start
-TEST ! $CLI volume remove-brick $V0 $H0:$B0/${V0}2 start
-
-#Try to start rebalance/remove-brick again after commit
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}1 commit
-
-gluster volume status
-
-TEST $CLI volume rebalance $V0 start
-TEST $CLI volume rebalance $V0 stop
-
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}2 start
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}2 stop
-
-TEST $CLI volume stop $V0
-
-cleanup;
-
diff --git a/tests/bugs/bug-963678.t b/tests/bugs/bug-963678.t
deleted file mode 100644
index 14d566579..000000000
--- a/tests/bugs/bug-963678.t
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-#
-# Bug 963678 - Test discard functionality
-#
-# Test that basic discard (hole punch) functionality works via the fallocate
-# command line tool. Hole punch deallocates a region of a file, creating a hole
-# and a zero-filled data region. We verify that hole punch works, frees blocks
-# and that subsequent reads do not read stale data (caches are invalidated).
-#
-# NOTE: fuse fallocate is known to be broken with regard to cache invalidation
-# 	up to 3.9.0 kernels. Therefore, FOPEN_KEEP_CACHE is not used in this
-#	test (opens will invalidate the fuse cache).
-###
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../fallocate.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2}
-TEST $CLI volume start $V0
-
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-
-# check for fallocate and hole punch support
-require_fallocate -l 1m $M0/file
-require_fallocate -p -l 512k $M0/file && rm -f $M0/file
-
-# allocate some blocks, punch a hole and verify block allocation
-TEST fallocate -l 1m $M0/file
-blksz=`stat --printf=%B $M0/file`
-nblks=`stat --printf=%b $M0/file`
-TEST [ $(($blksz * $nblks)) -ge 1048576 ]
-TEST fallocate -p -o 512k -l 128k $M0/file
-
-nblks=`stat --printf=%b $M0/file`
-# allow some room for xattr blocks
-TEST [ $(($blksz * $nblks)) -lt $((917504 + 16384)) ]
-TEST unlink $M0/file
-
-# write some data, punch a hole and verify the file content changes
-TEST dd if=/dev/urandom of=$M0/file bs=1M count=1
-TEST cp $M0/file $M0/file.copy.pre
-TEST fallocate -p -o 512k -l 128k $M0/file
-TEST cp $M0/file $M0/file.copy.post
-TEST ! cmp $M0/file.copy.pre $M0/file.copy.post
-TEST unlink $M0/file
-
-TEST umount $M0
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/bugs/bug-964059.t b/tests/bugs/bug-964059.t
deleted file mode 100755
index df07f95ee..000000000
--- a/tests/bugs/bug-964059.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../cluster.rc
-
-function check_peers {
-        $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l
-}
-
-function volume_count {
-        local cli=$1;
-        if [ $cli -eq '1' ] ; then
-                $CLI_1 volume info | grep 'Volume Name' | wc -l;
-        else
-                $CLI_2 volume info | grep 'Volume Name' | wc -l;
-        fi
-}
-
-cleanup;
-
-TEST launch_cluster 2;
-TEST $CLI_1 peer probe $H2;
-
-EXPECT_WITHIN 20 1 check_peers
-
-TEST $CLI_1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0
-TEST $CLI_1 volume start $V0
-TEST $CLI_1 volume remove-brick $V0 $H2:$B2/$V0 start
-TEST $CLI_1 volume status
-cleanup;
diff --git a/tests/bugs/bug-966018.t b/tests/bugs/bug-966018.t
deleted file mode 100644
index 2a4697241..000000000
--- a/tests/bugs/bug-966018.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#This tests if eager-lock blocks metadata operations on nfs/fuse mounts.
-#If it is not woken up, INODELK from the next command waits
-#for post-op-delay secs.
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/r2_0 $H0:$B0/r2_1
-TEST $CLI volume set $V0 ensure-durability off
-TEST $CLI volume set $V0 cluster.eager-lock on
-TEST $CLI volume set $V0 cluster.post-op-delay-secs 3
-
-TEST $CLI volume start $V0
-TEST $CLI volume profile $V0 start
-sleep 5
-TEST mount -t nfs -o vers=3,nolock $H0:/$V0 $N0;
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0
-echo 1 > $N0/1 && chmod +x $N0/1
-echo 1 > $M0/1 && chmod +x $M0/1
-
-#Check that INODELK MAX latency is not in the order of seconds
-#Test if the MAX INODELK fop latency is of the order of seconds.
-inodelk_max_latency=$($CLI volume profile $V0 info | grep INODELK | awk 'BEGIN {max = 0} {if ($6 > max) max=$6;} END {print max}' | cut -d. -f 1 | egrep "[0-9]{7,}")
-
-TEST [ -z $inodelk_max_latency ]
-TEST umount $N0
-
-cleanup;
diff --git a/tests/bugs/bug-969193.t b/tests/bugs/bug-969193.t
deleted file mode 100755
index e78a2980e..000000000
--- a/tests/bugs/bug-969193.t
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Test that "system getspec" works without op_version problems.
-
-. $(dirname $0)/../include.rc
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info
-TEST $CLI volume create $V0 $H0:$B0/brick1
-TEST $CLI system getspec $V0
-cleanup;
diff --git a/tests/bugs/bug-970070.t b/tests/bugs/bug-970070.t
deleted file mode 100755
index da28b1ed7..000000000
--- a/tests/bugs/bug-970070.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# TEST the nfs.acl option
-. $(dirname $0)/../include.rc
-
-cleanup
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume start $V0
-sleep 5
-TEST $CLI volume set $V0 nfs.acl off
-TEST $CLI volume set $V0 nfs.acl on
-cleanup
diff --git a/tests/bugs/bug-973073.t b/tests/bugs/bug-973073.t
deleted file mode 100755
index 83e2839c6..000000000
--- a/tests/bugs/bug-973073.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../dht.rc
-
-## Steps followed are one descibed in bugzilla
-
-cleanup;
-
-function get_layout()
-{
-        layout1=`getfattr -n trusted.glusterfs.dht -e hex $1 2>&1`
-
-        if [ $? -ne 0 ]
-        then
-                echo 1
-        else
-                echo 0
-        fi
-
-}
-
-BRICK_COUNT=3
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 $H0:$B0/${V0}2
-TEST $CLI volume start $V0
-
-## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}2 start
-
-## remove-brick status == rebalance_status
-EXPECT_WITHIN 30 "0" rebalance_completed
-
-TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}2 stop
-
-TEST $CLI volume rebalance $V0 fix-layout start
-
-EXPECT_WITHIN 30 "0" rebalance_completed
-
-TEST mkdir $M0/dir 2>/dev/null;
-
-EXPECT "0" get_layout $B0/${V0}2/dir
-cleanup;
diff --git a/tests/bugs/bug-974007.t b/tests/bugs/bug-974007.t
deleted file mode 100644
index c8c1c862b..000000000
--- a/tests/bugs/bug-974007.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-#Test case: Create a distributed replicate volume, and remove multiple
-#replica pairs in a single remove-brick command.
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-#Basic checks
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info
-
-#Create a 3X2 distributed-replicate volume
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1..6};
-TEST $CLI volume start $V0
-
-# Mount FUSE and create files
-TEST glusterfs -s $H0 --volfile-id $V0 $M0
-TEST touch $M0/file{1..10}
-
-# Remove bricks from two sub-volumes to make it a 1x2 vol.
-# Bricks in question are given in a random order but from the same subvols.
-function remove_brick_start_status {
-        $CLI volume remove-brick $V0 \
-        $H0:$B0/${V0}6  $H0:$B0/${V0}1 \
-        $H0:$B0/${V0}2  $H0:$B0/${V0}5 start 2>&1 |grep -oE "success|failed"
-}
-EXPECT "success"  remove_brick_start_status;
-
-# Wait for rebalance to complete
-EXPECT_WITHIN 10 "completed" remove_brick_status_completed_field "$V0" "$H0:$B0/${V0}6 $H0:$B0/${V0}1 $H0:$B0/${V0}2 $H0:$B0/${V0}5"
-
-# Check commit status
-function remove_brick_commit_status {
-        $CLI volume remove-brick $V0 \
-         $H0:$B0/${V0}6  $H0:$B0/${V0}1 \
-         $H0:$B0/${V0}2  $H0:$B0/${V0}5 commit 2>&1 |grep -oE "success|failed"
-}
-EXPECT "success" remove_brick_commit_status;
-
-# Check the volume type
-EXPECT "Replicate" echo `$CLI volume info |grep Type |awk '{print $2}'`
-
-TEST umount $M0
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-974972.t b/tests/bugs/bug-974972.t
deleted file mode 100755
index 15deac090..000000000
--- a/tests/bugs/bug-974972.t
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#This script checks that nfs mount does not fail lookup on files with split-brain
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume set $V0 self-heal-daemon off
-TEST $CLI volume start $V0
-sleep 5
-TEST mount -t nfs -o vers=3 $H0:/$V0 $N0
-TEST touch $N0/1
-TEST kill_brick ${V0} ${H0} ${B0}/${V0}1
-echo abc > $N0/1
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "Y" nfs_up_status
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_nfs $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_nfs $V0 1
-
-TEST kill_brick ${V0} ${H0} ${B0}/${V0}0
-echo def > $N0/1
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "Y" nfs_up_status
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_nfs $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_nfs $V0 1
-
-#Lookup should not fail
-TEST ls $N0/1
-TEST ! cat $N0/1
-
-TEST umount $N0
-cleanup
diff --git a/tests/bugs/bug-976800.t b/tests/bugs/bug-976800.t
deleted file mode 100644
index 2aee8cc11..000000000
--- a/tests/bugs/bug-976800.t
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-# This test checks if there are any open fds on the brick
-# even after the file is closed on the mount. This particular
-# test tests dd with "fsync" to check afr's fsync codepath
-cleanup;
-
-function is_fd_open {
-        local v=$1
-        local h=$2
-        local b=$3
-        local bpid=$(get_brick_pid $v $h $b)
-        ls -l /proc/$bpid/fd | grep -w "\-> $b/1"
-}
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume set $V0 ensure-durability off
-TEST $CLI volume set $V0 eager-lock off
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST dd of=$M0/1 if=/dev/zero bs=1k count=1 conv=fsync
-TEST ! is_fd_open $V0 $H0 $B0/${V0}0
-cleanup;
diff --git a/tests/bugs/bug-977246.t b/tests/bugs/bug-977246.t
deleted file mode 100644
index e07ee1919..000000000
--- a/tests/bugs/bug-977246.t
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/bash
-
-# This test checks if address validation, correctly catches hostnames
-# with consective dots, such as 'example..org', as invalid
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}1
-TEST $CLI volume info $V0
-TEST $CLI volume start $V0
-
-TEST ! $CLI volume set $V0 auth.allow example..org
-
-TEST $CLI volume stop $V0
-
-cleanup;
diff --git a/tests/bugs/bug-977797.t b/tests/bugs/bug-977797.t
deleted file mode 100755
index 08cdbe8f1..000000000
--- a/tests/bugs/bug-977797.t
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-## Start and create a volume
-TEST glusterd;
-TEST pidof glusterd;
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
-
-## Verify volume is is created
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-## Start volume and verify
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-TEST $CLI volume set $V0 self-heal-daemon off
-TEST $CLI volume set $V0 open-behind off
-TEST $CLI volume set $V0 quick-read off
-TEST $CLI volume set $V0 read-ahead off
-TEST $CLI volume set $V0 write-behind off
-TEST $CLI volume set $V0 io-cache off
-TEST $CLI volume set $V0 background-self-heal-count 0
-
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-
-
-TEST mkdir -p $M0/a
-TEST `echo "GLUSTERFS" > $M0/a/file`
-
-TEST kill_brick $V0 $H0 $B0/$V0"1"
-
-TEST chown root $M0/a
-TEST chown root $M0/a/file
-TEST `echo "GLUSTER-FILE-SYSTEM" > $M0/a/file`
-TEST mkdir $M0/a/b
-
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0;
-
-
-
-TEST kill_brick $V0 $H0 $B0/$V0"2"
-
-TEST chmod 757 $M0/a
-TEST chmod 757 $M0/a/file
-
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1;
-
-TEST ls   -l $M0/a/file
-
-b1c0dir=$(afr_get_specific_changelog_xattr $B0/$V0"1"/a \
-          trusted.afr.$V0-client-0 "entry")
-b1c1dir=$(afr_get_specific_changelog_xattr $B0/$V0"1"/a \
-          trusted.afr.$V0-client-1 "entry")
-b2c0dir=$(afr_get_specific_changelog_xattr \
-          $B0/$V0"2"/a trusted.afr.$V0-client-0 "entry")
-b2c1dir=$(afr_get_specific_changelog_xattr \
-          $B0/$V0"2"/a trusted.afr.$V0-client-1 "entry")
-
-
-b1c0f=$(afr_get_specific_changelog_xattr $B0/$V0"1"/a/file \
-        trusted.afr.$V0-client-0 "data")
-b1c1f=$(afr_get_specific_changelog_xattr $B0/$V0"1"/a/file \
-        trusted.afr.$V0-client-1 "data")
-b2c0f=$(afr_get_specific_changelog_xattr $B0/$V0"2"/a/file \
-        trusted.afr.$V0-client-0 "data")
-b2c1f=$(afr_get_specific_changelog_xattr $B0/$V0"2"/a/file \
-        trusted.afr.$V0-client-1 "data")
-
-EXPECT "00000000" echo $b1c0f
-EXPECT "00000000" echo $b1c1f
-EXPECT "00000000" echo $b2c0f
-EXPECT "00000000" echo $b2c1f
-
-EXPECT "00000000" echo $b1c0dir
-EXPECT "00000000" echo $b1c1dir
-EXPECT "00000000" echo $b2c0dir
-EXPECT "00000000" echo $b2c1dir
-
-contains() {
-    string="$1"
-    substring="$2"
-    var="-1"
-    if test "${string#*$substring}" != "$string"
-    then
-        var="0"    # $substring is in $string
-    else
-        var="1"    # $substring is not in $string
-    fi
-    echo $var
-}
-
-var1=$(cat $M0/a/file 2>&1)
-var2="Input/output error"
-
-
-EXPECT "0" contains "$var1" "$var2"
-
-## Finish up
-TEST $CLI volume stop $V0;
-EXPECT 'Stopped' volinfo_field $V0 'Status';
-
-TEST $CLI volume delete $V0;
-TEST ! $CLI volume info $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-978794.t b/tests/bugs/bug-978794.t
deleted file mode 100644
index d22d3cde3..000000000
--- a/tests/bugs/bug-978794.t
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-
-
-# This test opens 100 fds and triggers graph switches to check if fsync
-# as part of graph-switch causes crash or not.
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
-TEST touch $M0/{1..100}
-for i in {1..100}; do fd[$i]=`fd_available`; fd_open ${fd[$i]} 'w' $M0/$i; done
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}{2,3}
-TEST $CLI volume rebalance $V0 start force
-EXPECT_WITHIN 120 "completed" rebalance_status_field $V0
-TEST cat $M0/{1..100}
-for i in {1..100}; do fd_write ${fd[$i]} 'abc'; done
-TEST $CLI volume add-brick $V0 $H0:$B0/${V0}{4,5}
-TEST $CLI volume rebalance $V0 start force
-EXPECT_WITHIN 120 "completed" rebalance_status_field $V0
-for i in {1..100}; do fd_write ${fd[$i]} 'abc'; done
-TEST cat $M0/{1..100}
-cleanup
diff --git a/tests/bugs/bug-979365.t b/tests/bugs/bug-979365.t
deleted file mode 100755
index e94dc9aa8..000000000
--- a/tests/bugs/bug-979365.t
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#This script checks that ensure-durability option enables/disables afr
-#sending fsyncs
-cleanup;
-
-function num_fsyncs {
-        $CLI volume profile $V0 info | grep -w FSYNC | wc -l
-}
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume set $V0 ensure-durability on
-TEST $CLI volume set $V0 eager-lock off
-TEST $CLI volume start $V0
-TEST $CLI volume profile $V0 start
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
-TEST kill_brick $V0 $H0 $B0/${V0}0
-TEST dd of=$M0/a if=/dev/zero bs=1M count=10
-#fsyncs take a while to complete.
-sleep 5
-
-# There can be zero or more fsyncs, depending on the order
-# in which the writes reached the server, in turn deciding
-# whether they were treated as "appending" writes or not.
-
-TEST [[ $(num_fsyncs) -ge 0 ]]
-#Stop the volume to erase the profile info of old operations
-TEST $CLI volume profile $V0 stop
-TEST $CLI volume stop $V0
-umount $M0
-#Disable ensure-durability now to disable fsyncs in afr.
-TEST $CLI volume set $V0 ensure-durability off
-TEST $CLI volume start $V0
-TEST kill_brick $V0 $H0 $B0/${V0}0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
-TEST $CLI volume profile $V0 start
-TEST dd of=$M0/a if=/dev/zero bs=1M count=10
-#fsyncs take a while to complete.
-sleep 5
-TEST [[ $(num_fsyncs) -eq 0 ]]
-
-cleanup
diff --git a/tests/bugs/bug-982174.t b/tests/bugs/bug-982174.t
deleted file mode 100644
index 460af7511..000000000
--- a/tests/bugs/bug-982174.t
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# Test to check
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#Check if incorrect log-level keywords does not crash the CLI
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/brick1 $H0:$B0/brick2
-TEST $CLI volume start $V0
-
-function set_log_level_status {
-        local level=$1
-        $CLI volume set $V0 diagnostics.client-log-level $level 2>&1 |grep -oE 'success|failed'
-}
-
-
-LOG_LEVEL="trace"
-EXPECT "failed" set_log_level_status $LOG_LEVEL
-
-
-LOG_LEVEL="error-gen"
-EXPECT "failed" set_log_level_status $LOG_LEVEL
-
-
-LOG_LEVEL="TRACE"
-EXPECT "success" set_log_level_status $LOG_LEVEL
-
-EXPECT "$LOG_LEVEL" echo `$CLI volume info | grep diagnostics | awk '{print $2}'`
-
-TEST $CLI volume stop $V0;
-TEST $CLI volume delete $V0;
-
-cleanup;
diff --git a/tests/bugs/bug-983477.t b/tests/bugs/bug-983477.t
deleted file mode 100755
index c19fa96c8..000000000
--- a/tests/bugs/bug-983477.t
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#This script checks if use-readdirp option works as accepted in mount options
-
-function get_use_readdirp_value {
-        local vol=$1
-        local statedump=$(generate_mount_statedump $vol)
-        local val=$(grep "use_readdirp=" $statedump | cut -f2 -d'=' | tail -1)
-        rm -f $statedump
-        echo $val
-}
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}
-TEST $CLI volume start $V0
-#If readdirp is enabled statedump should reflect it
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --use-readdirp=yes
-TEST cd $M0
-EXPECT_WITHIN 20 "1" get_use_readdirp_value $V0
-TEST cd -
-TEST umount $M0
-
-#If readdirp is enabled statedump should reflect it
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --use-readdirp=no
-TEST cd $M0
-EXPECT_WITHIN 20 "0" get_use_readdirp_value $V0
-TEST cd -
-TEST umount $M0
-
-#Since args are optional on this argument just specifying "--use-readdirp" should also turn it `on` not `off`
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --use-readdirp
-TEST cd $M0
-EXPECT_WITHIN 20 "1" get_use_readdirp_value $V0
-TEST cd -
-TEST umount $M0
-
-#By default it is enabled.
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST cd $M0
-EXPECT_WITHIN 20 "1" get_use_readdirp_value $V0
-TEST cd -
-TEST umount $M0
-
-#Invalid values for use-readdirp should not be accepted
-TEST ! glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --use-readdirp=please-fail
-
-cleanup
diff --git a/tests/bugs/bug-985074.t b/tests/bugs/bug-985074.t
deleted file mode 100644
index 80052129e..000000000
--- a/tests/bugs/bug-985074.t
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-#
-# Bug 985074 - Verify stale inode/dentry mappings are cleaned out.
-#
-# This test verifies that an inode/dentry mapping for a file removed via a
-# separate mount point is cleaned up appropriately. We create a file and hard
-# link from client 1. Next we remove the link via client 2. Finally, from client
-# 1 we attempt to rename the original filename to the name of the just removed
-# hard link.
-#
-# If the inode is not unlinked properly, the removed directory entry can resolve
-# to an inode (on the client that never saw the rm) that ends up passed down
-# through the lookup call. If md-cache holds valid metadata on the inode (due to
-# a large timeout value or recent lookup on the valid name), it is tricked into
-# returning a successful lookup that should have returned ENOENT. This manifests
-# as an error from the mv command in the following test sequence because file
-# and file.link resolve to the same file:
-#
-# # mv /mnt/glusterfs/0/file /mnt/glusterfs/0/file.link
-# mv: `/mnt/glusterfs/0/file' and `/mnt/glusterfs/0/file.link' are the same file
-#
-###
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume start $V0
-TEST $CLI volume set $V0 md-cache-timeout 3
-
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --entry-timeout=0 --attribute-timeout=0
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M1 --entry-timeout=0 --attribute-timeout=0
-
-TEST touch $M0/file
-TEST ln $M0/file $M0/file.link
-TEST ls -ali $M0 $M1
-TEST rm -f $M1/file.link
-TEST ls -ali $M0 $M1
-# expire the md-cache timeout
-sleep 3
-TEST mv $M0/file $M0/file.link
-TEST stat $M0/file.link
-TEST ! stat $M0/file
-
-TEST umount $M1
-TEST umount $M0
-
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/bugs/bug-986429.t b/tests/bugs/bug-986429.t
deleted file mode 100644
index 6e43f72b7..000000000
--- a/tests/bugs/bug-986429.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-## This tests failover achieved by providing multiple
-## servers from the trusted pool for fetching volume
-## specification
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s non-existent -s $H0 --volfile-id=/$V0 $M0
-
-cleanup;
diff --git a/tests/bugs/bug-986905.t b/tests/bugs/bug-986905.t
deleted file mode 100755
index 0fac40fb4..000000000
--- a/tests/bugs/bug-986905.t
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-#This script checks if hardlinks that are created while a brick is down are
-#healed properly.
-
-cleanup;
-function get_inum {
-        ls -i $1 | awk '{print $1}'
-}
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1}
-TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
-TEST kill_brick $V0 $H0 $B0/${V0}0
-TEST touch $M0/a
-TEST ln $M0/a $M0/link_a
-TEST $CLI volume start $V0 force
-EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
-TEST ls -l $M0
-inum=$(get_inum $B0/${V0}0/a)
-EXPECT "$inum" get_inum $B0/${V0}0/link_a
-cleanup
diff --git a/tests/bugs/bug-991622.t b/tests/bugs/bug-991622.t
deleted file mode 100644
index 5c3243465..000000000
--- a/tests/bugs/bug-991622.t
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../fileio.rc
-
-#This tests that no fd leaks are observed in unlink/rename in open-behind
-function leaked_fds {
-        ls -l /proc/$(get_brick_pid $V0 $H0 $B0/$V0)/fd | grep deleted
-}
-
-cleanup;
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume set $V0 open-behind on
-TEST $CLI volume start $V0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0 --direct-io-mode=enable
-
-TEST fd1=`fd_available`
-TEST fd_open $fd1 'w' "$M0/testfile1"
-TEST fd_write $fd1 "content"
-
-TEST fd2=`fd_available`
-TEST fd_open $fd2 'w' "$M0/testfile2"
-TEST fd_write $fd2 "content"
-
-TEST touch $M0/a
-TEST rm $M0/testfile1
-TEST mv $M0/a $M0/testfile2
-TEST fd_close $fd1
-TEST fd_close $fd2
-TEST ! leaked_fds
-cleanup;
diff --git a/tests/bugs/getlk_owner.c b/tests/bugs/getlk_owner.c
deleted file mode 100644
index 619c2e32d..000000000
--- a/tests/bugs/getlk_owner.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-
-#define GETLK_OWNER_CHECK(f, cp, label)                     \
-    do {                                                    \
-        switch (f.l_type) {                                 \
-            case F_RDLCK:                                   \
-            case F_WRLCK:                                   \
-                ret = 1;                                    \
-                goto label;                                 \
-            case F_UNLCK:                                   \
-                if (!are_flocks_sane (&f, &cp)) {           \
-                    ret = 1;                                \
-                    goto label;                             \
-                }                                           \
-                break;                                      \
-        }                                                   \
-    } while (0)
-
-void
-flock_init (struct flock *f, short int type, off_t start, off_t len)
-{
-    f->l_type = type;
-    f->l_start = start;
-    f->l_len = len;
-}
-
-int
-flock_cp (struct flock *dst, struct flock *src)
-{
-    memcpy ((void *) dst, (void *) src, sizeof (struct flock));
-}
-
-int
-are_flocks_sane (struct flock *src, struct flock *cpy)
-{
-    return ((src->l_whence == cpy->l_whence) &&
-            (src->l_start == cpy->l_start) &&
-            (src->l_len == cpy->l_len));
-}
-
-/*
- * Test description:
- * SETLK (0,3), F_WRLCK
- * SETLK (3,3), F_WRLCK
- *
- * the following GETLK requests must return flock struct unmodified
- * except for l_type to F_UNLCK
- * GETLK (3,3), F_WRLCK
- * GETLK (3,3), F_RDLCK
- *
- * */
-
-int main (int argc, char **argv)
-{
-    int fd = -1;
-    int ret = 1;
-    char *fname = NULL;
-    struct flock f = {0,};
-    struct flock cp = {0,};
-
-    if (argc < 2)
-        goto out;
-
-    fname = argv[1];
-    fd = open (fname, O_RDWR);
-    if (fd == -1) {
-        perror ("open");
-        goto out;
-    }
-
-    flock_init (&f, F_WRLCK, 0, 3);
-    flock_cp (&cp, &f);
-    ret = fcntl (fd, F_SETLK, &f);
-    if (ret) {
-        perror ("fcntl");
-        goto out;
-    }
-    if (!are_flocks_sane (&f, &cp)) {
-        ret = 1;
-        goto out;
-    }
-
-    flock_init (&f, F_WRLCK, 3, 3);
-    flock_cp (&cp, &f);
-    ret = fcntl (fd, F_SETLK, &f);
-    if (ret) {
-        perror ("fcntl");
-        goto out;
-    }
-    if (!are_flocks_sane (&f, &cp)) {
-        ret = 1;
-        goto out;
-    }
-
-    flock_init (&f, F_WRLCK, 3, 3);
-    flock_cp (&cp, &f);
-    ret = fcntl (fd, F_GETLK, &f);
-    if (ret) {
-        perror ("fcntl");
-        return 1;
-    }
-    GETLK_OWNER_CHECK (f, cp, out);
-
-    flock_init (&f, F_RDLCK, 3, 3);
-    flock_cp (&cp, &f);
-    ret = fcntl (fd, F_GETLK, &f);
-    if (ret) {
-        perror ("fcntl");
-        return 1;
-    }
-    GETLK_OWNER_CHECK (f, cp, out);
-
-out:
-    if (fd != -1)
-        close (fd);
-    return ret;
-}
diff --git a/tests/bugs/overlap.py b/tests/bugs/overlap.py
deleted file mode 100755
index 15f2da473..000000000
--- a/tests/bugs/overlap.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python
-
-import sys
-
-def calculate_one (ov, nv):
-    old_start = int(ov[18:26],16)
-    old_end = int(ov[26:34],16)
-    new_start = int(nv[18:26],16)
-    new_end = int(nv[26:34],16)
-    if (new_end < old_start) or (new_start > old_end):
-        #print '%s, %s -> ZERO' % (ov, nv)
-        return 0
-    all_start = max(old_start,new_start)
-    all_end = min(old_end,new_end)
-    #print '%s, %s -> %08x' % (ov, nv, all_end - all_start + 1)
-    return all_end - all_start + 1
-
-def calculate_all (values):
-    total = 0
-    nv_index = len(values) / 2
-    for old_val in values[:nv_index]:
-        new_val = values[nv_index]
-        nv_index += 1
-        total += calculate_one(old_val,new_val)
-    return total
-
-"""
-test1_vals = [
-    '0x0000000000000000000000003fffffff',   # first quarter
-    '0x0000000000000000400000007fffffff',   # second quarter
-    '0x000000000000000080000000ffffffff',   # second half
-    '0x00000000000000000000000055555554',   # first third
-    '0x000000000000000055555555aaaaaaa9',   # second third
-    '0x0000000000000000aaaaaaaaffffffff',   # last third
-]
-
-test2_vals = [
-    '0x0000000000000000000000003fffffff',   # first quarter
-    '0x0000000000000000400000007fffffff',   # second quarter
-    '0x000000000000000080000000ffffffff',   # second half
-    '0x00000000000000000000000055555554',   # first third
-    # Next two are (incorrectly) swapped.
-    '0x0000000000000000aaaaaaaaffffffff',   # last third
-    '0x000000000000000055555555aaaaaaa9',   # second third
-]
-
-print '%08x' % calculate_one(test1_vals[0],test1_vals[3])
-print '%08x' % calculate_one(test1_vals[1],test1_vals[4])
-print '%08x' % calculate_one(test1_vals[2],test1_vals[5])
-print '= %08x' % calculate_all(test1_vals)
-print '%08x' % calculate_one(test2_vals[0],test2_vals[3])
-print '%08x' % calculate_one(test2_vals[1],test2_vals[4])
-print '%08x' % calculate_one(test2_vals[2],test2_vals[5])
-print '= %08x' % calculate_all(test2_vals)
-"""
-
-if __name__ == '__main__':
-    # Return decimal so bash can reason about it.
-    print '%d' % calculate_all(sys.argv[1:])
diff --git a/tests/cluster.rc b/tests/cluster.rc
deleted file mode 100755
index 1e42426f6..000000000
--- a/tests/cluster.rc
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-
-CLUSTER_PFX="127.1.1"; # ".x" for each glusterd
-CLUSTER_COUNT=1; # Just initial definition
-
-function launch_cluster() {
-    local count=$1;
-
-    CLUSTER_COUNT=$count;
-
-    define_backends $count;
-    define_hosts $count;
-    define_glusterds $count;
-    define_clis $count;
-
-    start_glusterds;
-}
-
-
-function define_backends() {
-    local b;
-
-    for i in `seq 1 $count`; do
-	eval "B$i=$B0/$i";
-    done
-
-    for i in `seq 1 $count`; do
-	b="B$i";
-	mkdir -pv ${!b}/glusterd;
-    done
-}
-
-
-function define_glusterds() {
-    local count=$1;
-    local h;
-    local b;
-    local wopt;
-    local bopt;
-    local popt;
-
-    for i in `seq 1 $count`; do
-	b="B$i";
-	h="H$i";
-	wopt="management.working-directory=${!b}/glusterd";
-	bopt="management.transport.socket.bind-address=${!h}";
-	popt="--pid-file=${!b}/glusterd.pid";
-        sopt="management.glusterd-sockfile=${!b}/glusterd/gd.sock"
-        lopt="--log-file=${!b}/glusterd.log"
-	eval "glusterd_$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'";
-	eval "glusterd$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'";
-    done
-}
-
-
-function start_glusterds() {
-    local g;
-
-    for i in `seq 1 $CLUSTER_COUNT`; do
-	g="glusterd_$i";
-	${!g};
-    done
-}
-
-
-function kill_glusterd() {
-    local index=$1;
-    local b;
-    local pidfile;
-
-    b="B$index";
-    pidfile="${!b}/glusterd.pid";
-
-    kill `cat $pidfile`;
-}
-
-
-function kill_node() {
-    local index=$1;
-    local h;
-
-    h="H$index";
-
-    kill -9 $(ps -ef | grep gluster | grep ${!h} | awk '{print $2}');
-}
-
-
-function define_hosts() {
-    local count=$1;
-
-    for i in `seq 1 $count`; do
-	eval "H_$i=${CLUSTER_PFX}.$i"
-	eval "H$i=${CLUSTER_PFX}.$i";
-    done
-}
-
-
-function define_clis() {
-    local count=$1;
-    local h;
-
-    for i in `seq 1 $count`; do
-	b="B$i";
-	eval "CLI_$i='$CLI --glusterd-sock=${!b}/glusterd/gd.sock'";
-	eval "CLI$i='$CLI --glusterd-sock=${!b}/glusterd/gd.sock'";
-    done
-}
-
diff --git a/tests/dht.rc b/tests/dht.rc
deleted file mode 100644
index 663ea5431..000000000
--- a/tests/dht.rc
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-function get_layout()
-{
-        getfattr -n trusted.glusterfs.dht -e hex $1 2>&1|grep dht |cut -d = -f2
-
-}
-
-## populates $BRICK1 and $BRICK2 with hashed/cached subvolume. These will be
-## used by get_cached_brick and get_hashed_brick
-
-function file_has_linkfile()
-{
-        k=0
-        l=0
-        while [ $k -lt $BRICK_COUNT ]
-        do
-                stat=`stat $B0/${V0}$k/$1 2>/dev/null`
-                if [ $? -eq 0 ]
-                then
-                        let l++
-                        let "BRICK${l}=$k"
-
-                fi
-                let k++
-        done
-        return $l
-}
-
-function get_cached_brick()
-{
-        i=1
-        brick=$BRICK1
-        while [ $i -lt 3 ]
-        do
-                test=`getfattr -n trusted.glusterfs.dht.linkto -e text $B0/${V0}$brick/$1 2>&1`
-                if [ $? -eq 1 ]
-                then
-                        cached=$brick
-                        i=$(( $i+3 ))
-                fi
-                brick=$BRICK1
-                let i++
-        done
-
-        return $cached
-}
-
-function get_hashed_brick()
-{
-        j=1
-        brick=$BRICK1
-        while [ $j -lt 3 ]
-        do
-                test=`getfattr -n trusted.glusterfs.dht.linkto -e text $B0/${V0}$brick/$1 2>&1`
-                if [ $? -eq 0 ]
-                then
-                        hashed=$brick
-                        j=$(( $j+3 ))
-                fi
-                brick=$BRICK2
-                let j++
-        done
-
-        return $hashed
-}
-
-
-function rebalance_completed()
-{
-       val=1
-       test=`gluster volume rebalance $V0 status |grep localhost|grep -v "in progress" 2>&1`
-       if [ $? -eq 0 ]
-       then
-                val=0
-       fi
-
-       echo $val
-}
diff --git a/tests/fallocate.rc b/tests/fallocate.rc
deleted file mode 100644
index 3756bb949..000000000
--- a/tests/fallocate.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Helper to verify a given fallocate command is supported and skip a test
-# otherwise. Older versions of the fallocate utility might not support all modes
-# (i.e., discard) and older versions of fuse might not support the associated
-# fallocate requests.
-
-function require_fallocate()
-{
-	output=`fallocate $* 2>&1`
-	ret=$?
-	if [ ! $ret -eq 0 ] && ([[ $output == *unsupported* ]] ||
-				[[ $output == *invalid* ]] ||
-				[[ $output == *"not supported"* ]])
-	then
-		SKIP_TESTS
-		exit
-	fi
-}
diff --git a/tests/features/glupy.t b/tests/features/glupy.t
deleted file mode 100755
index 49bf11df5..000000000
--- a/tests/features/glupy.t
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST mkdir -p $B0/glupytest
-cat > $B0/glupytest.vol <<EOF
-volume vol-posix
-    type storage/posix
-    option directory $B0/glupytest
-end-volume
-
-volume vol-glupy
-    type features/glupy
-    option module-name helloworld
-    subvolumes vol-posix
-end-volume
-EOF
-
-TEST glusterfs -f $B0/glupytest.vol $M0;
-
-TEST touch $M0/filename;
-EXPECT "filename" ls $M0
-TEST rm -f $M0/filename;
-
-TEST umount -l $M0;
-
-cleanup;
diff --git a/tests/features/readdir-ahead.t b/tests/features/readdir-ahead.t
deleted file mode 100755
index c7ee637f0..000000000
--- a/tests/features/readdir-ahead.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Test basic readdir-ahead functionality. Verify that readdir-ahead can be
-# enabled, create a set of files and run some ls tests.
-#
-###
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-
-TEST $CLI volume create $V0 $H0:$B0/$V0
-TEST $CLI volume start $V0
-
-TEST $CLI volume set $V0 readdir-ahead on
-
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0
-
-TEST mkdir $M0/test
-for i in $(seq 0 99)
-do
-	touch $M0/test/$i
-done
-
-count=`ls -1 $M0/test | wc -l`
-TEST [ $count -eq 100 ]
-
-count=`ls -1 $M0/test | wc -l`
-TEST [ $count -eq 100 ]
-
-TEST rm -rf $M0/test/*
-
-count=`ls -1 $M0/test | wc -l`
-TEST [ $count -eq 0 ]
-
-TEST rmdir $M0/test
-
-TEST umount -l $M0;
-TEST $CLI volume stop $V0
-TEST $CLI volume delete $V0
-
-cleanup;
diff --git a/tests/fileio.rc b/tests/fileio.rc
deleted file mode 100644
index 58871b3b9..000000000
--- a/tests/fileio.rc
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-function fd_available() {
-         for i in {1..65536}; do
-	     if [ ! -e /proc/$$/fd/$i ]; then
-		 echo $i;
-		 return 0;
-	     fi
-	 done
-
-	 return 1;
-}
-
-function fd_open() {
-	 local fd=$1;
-	 local mode=$2
-	 local path=$3;
-
-	 case $mode in
-	     r)
-		 eval "exec $fd<$path";;
-	     w)
-		 eval "exec $fd>$path";;
-	     rw)
-		 eval "exec $fd<>$path";;
-	     *)
-		 false;;
-	 esac
-}
-
-
-function fd_cat() {
-	 local fd=$1;
-
-	 eval "cat <&$fd";
-}
-
-
-function fd_write() {
-	 local fd=$1;
-	 shift;
-	 local msg="$@";
-
-	 eval "echo $@ >&$fd";
-}
-
-
-function fd_close() {
-	 local fd=$1;
-
-	 eval "exec $fd>&-";
-}
-
-
-function fd_based_example() {
-    TEST fd=`fd_available`;
-    TEST fd_open $fd "rw" $M0/filename;
-    TEST fd_cat $fd; # print existing stuff
-    TEST fd_write $fd "new stuff"; # append
-    TEST fd_close $fd;
-}
diff --git a/tests/include.rc b/tests/include.rc
deleted file mode 100644
index bb541eaa1..000000000
--- a/tests/include.rc
+++ /dev/null
@@ -1,245 +0,0 @@
-M0=${M0:=/mnt/glusterfs/0};   # 0th mount point for FUSE
-M1=${M1:=/mnt/glusterfs/1};   # 1st mount point for FUSE
-N0=${N0:=/mnt/nfs/0};         # 0th mount point for NFS
-N1=${N1:=/mnt/nfs/1};         # 1st mount point for NFS
-V0=${V0:=patchy};             # volume name to use in tests
-B0=${B0:=/d/backends};        # top level of brick directories
-H0=${H0:=`hostname --fqdn`};  # hostname
-DEBUG=${DEBUG:=0}             # turn on debugging?
-statedumpdir=`gluster --print-statedumpdir`; # Default directory for statedump
-
-CLI="gluster --mode=script";
-
-mkdir -p $B0;
-mkdir -p $M0 $M1;
-mkdir -p $N0 $N1;
-
-testcnt=`egrep '^[[:space:]]*(EXPECT|TEST|EXPECT_WITHIN|EXPECT_KEYWORD)[[:space:]]' $0 | wc -l`
-expect_tests=`egrep '^[[:space:]]*TESTS_EXPECTED_IN_LOOP[[:space:]]*' $0`
-
-x_ifs=$IFS
-IFS=$'\n'
-for line in $expect_tests; do
-	expect_tests=`echo $line | cut -f 2 -d =`
-	testcnt=`expr $testcnt + $expect_tests`
-done
-IFS=$x_ifs
-
-echo 1..$testcnt
-
-t=1
-
-function dbg()
-{
-	[ "x$DEBUG" = "x0" ] || echo "$*" >&2;
-}
-
-
-function test_header()
-{
-	dbg "=========================";
-	dbg "TEST $t (line $TESTLINE): $*";
-}
-
-
-function test_footer()
-{
-	RET=$?
-        local err=$1
-
-	if [ $RET -eq 0 ]; then
-	     	echo "ok $t";
-	else
-                echo "not ok $t $err";
-		if [ "$EXIT_EARLY" = "1" ]; then
-			exit $RET
-		fi
-	fi
-
-	dbg "RESULT $t: $RET";
-
-	t=`expr $t + 1`;
-}
-
-function test_expect_footer()
-{
-        local e=$1
-        local a=$2
-        local err=""
-
-        if [ "x${e}" != "x${a}" ]; then
-                err="Got \"$a\" instead of \"$e\""
-        fi
-        [[ "x${e}" == "x${a}" ]];
-        test_footer "$err";
-}
-
-function _EXPECT()
-{
-	TESTLINE=$1;
-	shift;
-        local a=""
-
-	test_header "$@";
-
-	e="$1";
-	shift;
-	a=$("$@" | tail -1)
-
-	test_expect_footer "$e" "$a";
-}
-
-function _EXPECT_KEYWORD()
-{
-	TESTLINE=$1;
-	shift;
-
-	test_header "$@";
-
-	e="$1";
-	shift;
-	"$@" | tail -1 | grep -q "$e"
-
-	test_footer;
-}
-
-
-function _TEST()
-{
-	TESTLINE=$1;
-	shift;
-        local redirect=""
-
-	test_header "$@";
-
-        if [ "$1" = "!" ]; then
-                redirect="2>&1"
-        fi
-
-	eval "$@" >/dev/null $redirect
-
-	test_footer;
-}
-
-function _EXPECT_WITHIN()
-{
-        TESTLINE=$1
-        shift;
-
-        local timeout=$1
-        shift;
-
-        test_header "$@"
-
-        e=$1;
-        shift;
-
-        local endtime=$(( ${timeout}+`date +%s` ))
-
-        local success=0
-        while [ `date +%s` -lt $endtime ]; do
-                ("$@") | tail -1 | egrep -q "^${e}\$"
-
-                local pipestatus=(${PIPESTATUS[@]})
-
-                ## Check command success
-                if [ ${pipestatus[0]} -ne 0 ]; then
-                        break;
-                fi
-
-                ## Check match success
-                if [ ${pipestatus[2]} -eq 0 ]; then
-                        success=1;
-                        break;
-                fi
-                sleep 1;
-        done
-
-        if [ $success -eq 1 ]; then
-                true;
-        else
-                false;
-        fi
-
-        test_footer;
-}
-
-
-function SKIP_TESTS()
-{
-        dbg "Skipping tests $t-$testcnt";
-        while [ $t -le $testcnt ]; do
-                true ; test_footer;
-        done
-}
-
-
-function _TEST_IN_LOOP()
-{
-	testcnt=`expr $testcnt + 1`;
-	_TEST $@
-}
-
-
-function cleanup()
-{
-	killall -15 glusterfs glusterfsd glusterd 2>/dev/null || true;
-	killall -9 glusterfs glusterfsd glusterd 2>/dev/null || true;
-
-        MOUNTPOINTS=`mount | grep "$B0/" | awk '{print $3}'`
-        for m in $MOUNTPOINTS;
-        do
-                umount $m
-        done
-
-
-        LOOPDEVICES=`losetup -a | grep "$B0/" | awk '{print $1}' | tr -d :`
-        for l in $LOOPDEVICES;
-        do
-                losetup -d $l
-        done
-
-
-	rm -rf /var/lib/glusterd/* $B0/* /etc/glusterd/*;
-
-	umount -l $M0 2>/dev/null || true;
-	umount -l $M1 2>/dev/null || true;
-	umount -l $N0 2>/dev/null || true;
-	umount -l $N1 2>/dev/null || true;
-}
-
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-function cleanup_tester ()
-{
-    local exe=$1
-    rm -f $exe
-}
-
-function build_tester ()
-{
-    local cfile=$1
-    local fname=$(basename "$cfile")
-    local ext="${fname##*.}"
-    local execname="${fname%.*}"
-    gcc -g -o $(dirname $cfile)/$execname $cfile
-}
-
-function process_leak_count ()
-{
-    local pid=$1;
-    return $(ls -lh /proc/$pid/fd | grep "(deleted)"| wc -l)
-}
-
-alias EXPECT='_EXPECT $LINENO'
-alias TEST='_TEST $LINENO'
-alias EXPECT_WITHIN='_EXPECT_WITHIN $LINENO'
-alias EXPECT_KEYWORD='_EXPECT_KEYWORD $LINENO'
-alias TEST_IN_LOOP='_TEST_IN_LOOP $LINENO'
-shopt -s expand_aliases
diff --git a/tests/nfs.rc b/tests/nfs.rc
deleted file mode 100644
index f3abee842..000000000
--- a/tests/nfs.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-
-# Due to portmap registration NFS takes some time to
-# export all volumes. Therefore tests should start only
-# after exports are visible by showmount command. This
-# routine will check if showmount shows the exports or not
-#
-function is_nfs_export_available ()
-{
-        vol=$1
-
-        if [ "$vol" == "" ]; then
-                vol=$V0
-        fi
-
-        exp=$(showmount -e 2> /dev/null | grep $vol | wc -l)
-        echo "$exp"
-}
-
-
diff --git a/tests/performance/open-behind.t b/tests/performance/open-behind.t
deleted file mode 100755
index 032154a20..000000000
--- a/tests/performance/open-behind.t
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-
-TEST $CLI volume start $V0;
-
-## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-
-TEST glusterfs -s $H0 --volfile-id $V0 $M1;
-
-D0="hello-this-is-a-test-message0";
-F0="test-file0";
-
-function write_to()
-{
-    local file="$1";
-    local data="$2";
-
-    echo "$data" > "$file";
-}
-
-
-TEST write_to "$M0/$F0" "$D0";
-EXPECT "$D0" cat $M1/$F0;
-
-# open-behind delays open and uses anonymous fds for fops like
-# fstat and readv. So after creating the file, if volume is restarted
-# then later when the file is read, because of the use of anonymous fds
-# volume top open will show number of files opened as 0.
-TEST $CLI volume stop $V0;
-sleep 1;
-TEST $CLI volume start $V0;
-
-sleep 2;
-cat $M1/$F0 >/dev/null;
-
-string=$(gluster volume top $V0 open | grep -w "$F0");
-
-EXPECT "" echo $string;
-
-TEST $CLI volume set $V0 performance.open-behind off;
-
-D1="hello-this-is-a-test-message1";
-F1="test-file1";
-
-TEST write_to "$M0/$F1" "$D1";
-EXPECT "$D1" cat $M1/$F1;
-
-EXPECT "$D0" cat $M1/$F0;
-
-gluster volume top $V0 open | grep -w "$F0" >/dev/null 2>&1
-TEST [ $? -eq 0 ];
-
-cleanup;
diff --git a/tests/performance/quick-read.t b/tests/performance/quick-read.t
deleted file mode 100644
index 082998e43..000000000
--- a/tests/performance/quick-read.t
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
-
-TEST $CLI volume start $V0;
-
-## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-
-TEST glusterfs -s $H0 --volfile-id $V0 $M1;
-
-D0="hello-this-is-a-test-message0";
-F0="test-file0";
-
-function write_to()
-{
-    local file="$1";
-    local data="$2";
-
-    echo "$data" > "$file";
-}
-
-
-TEST write_to "$M0/$F0" "$D0";
-EXPECT "$D0" cat $M1/$F0;
-EXPECT "$D0" cat $M0/$F0;
-EXPECT "$D0" cat $M1/$F0;
-EXPECT "$D0" cat $M0/$F0;
-
-sleep 1;
-
-EXPECT "$D0" cat $M1/$F0;
-EXPECT "$D0" cat $M0/$F0;
-EXPECT "$D0" cat $M1/$F0;
-EXPECT "$D0" cat $M0/$F0;
-
-TEST $CLI volume set $V0 performance.quick-read off;
-
-D1="hello-this-is-a-test-message1";
-F1="test-file1";
-
-TEST write_to "$M0/$F1" "$D1";
-EXPECT "$D1" cat $M0/$F1;
-
-EXPECT "$D0" cat $M1/$F0;
-
-cleanup;
diff --git a/tests/utils/create-files.py b/tests/utils/create-files.py
deleted file mode 100755
index 0d937eff9..000000000
--- a/tests/utils/create-files.py
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/python
-
-# This script was developed by Vijaykumar Koppad (vkoppad@redhat.com)
-# The latest version of this script can found at
-# http://github.com/vijaykumar-koppad/crefi
-
-from __future__ import with_statement
-import sys
-import os
-import re
-import random
-from optparse import OptionParser
-import time
-import string
-import errno
-
-def os_rd(src, size):
-    fd = os.open(src,os.O_RDONLY)
-    data = os.read(fd, size)
-    os.close(fd)
-    return data
-
-def os_wr(dest, data):
-    fd = os.open(dest,os.O_WRONLY|os.O_CREAT|os.O_EXCL, 0644)
-    os.write(fd, data)
-    os.close(fd)
-    return
-
-def create_sparse_file(fil):
-    if option.size:
-        option.random = False
-        size = option.size
-    else:
-        size = random.randint(option.min, option.max)
-    data = os_rd("/dev/zero", size)
-    os_wr(fil, data)
-    return
-
-def create_binary_file(fil):
-    if option.size:
-        option.random = False
-        size = option.size
-    else:
-        size = random.randint(option.min, option.max)
-    data = os_rd("/dev/urandom", size)
-    os_wr(fil, data)
-    return
-
-def create_txt_file(fil):
-    if option.size:
-        option.random = False
-        size = option.size
-    else:
-        size = random.randint(option.min, option.max)
-    if size < 500*1024:
-        data = os_rd("/etc/services", size)
-        os_wr(fil, data)
-    else:
-        data = os_rd("/etc/services", 500*1024)
-        file_size = 0
-        fd = os.open(fil,os.O_WRONLY|os.O_CREAT|os.O_EXCL, 0644)
-        while file_size < size:
-            os.write(fd, data)
-            file_size += 500*1024
-        os.close(fd)
-    return
-
-def get_filename():
-    size = option.flen
-    char = string.uppercase+string.digits
-    st = ''.join(random.choice(char) for i in range(size))
-    ti = str((hex(int(str(time.time()).split('.')[0])))[2:])
-    return ti+"~~"+st
-
-def text_files(files, file_count):
-    for k in range(files):
-        if not file_count%option.inter:
-            print file_count
-        fil = get_filename()
-        create_txt_file(fil)
-        file_count += 1
-    return file_count
-
-def sparse_files(files, file_count):
-    for k in range(files):
-        if not file_count%option.inter:
-            print file_count
-        fil = get_filename()
-        create_sparse_file(fil)
-        file_count += 1
-    return file_count
-
-def binary_files(files, file_count):
-    for k in range(files):
-        if not file_count%option.inter:
-            print file_count
-        fil = get_filename()
-        create_binary_file(fil)
-        file_count += 1
-    return file_count
-
-def human2bytes(size):
-    size_short = {
-        1024 : ['K','KB','KiB','k','kB','kiB'],
-        1024*1024 : ['M','MB','MiB'],
-        1024*1024*1024 : ['G','GB','GiB']
-}
-    num = re.search('(\d+)',size).group()
-    ext = size[len(num):]
-    num = int(num)
-    if ext == '':
-        return num
-    for value, keys in size_short.items():
-        if ext in keys:
-            size = num*value
-            return size
-
-def multipledir(mnt_pnt,brdth,depth,files):
-    files_count = 1
-    for i in range(brdth):
-        breadth = mnt_pnt+"/"+str(i)
-        try:
-           os.makedirs(breadth)
-        except OSError as ex:
-            if not ex.errno is errno.EEXIST:
-                raise
-        os.chdir(breadth)
-        dir_depth = breadth
-        print breadth
-        for j in range(depth):
-            dir_depth = dir_depth+"/"+str(j)
-            try:
-                os.makedirs(dir_depth)
-            except OSError as ex:
-                if not ex.errno is errno.EEXIST:
-                    raise
-            os.chdir(dir_depth)
-            if option.file_type == "text":
-                files_count = text_files(files, files_count)
-            elif option.file_type == "sparse":
-                files_count = sparse_files(files, files_count)
-            elif option.file_type == "binary":
-                files_count = binary_files(files, files_count)
-            else:
-                print "Not a valid file type"
-                sys.exit(1)
-
-def singledir(mnt_pnt, files):
-    files_count = 1
-    os.chdir(mnt_pnt)
-    if option.file_type == "text":
-        files_count = text_files(files, files_count)
-    elif option.file_type == "sparse":
-        files_count = sparse_files(files, files_count)
-    elif option.file_type == "binary":
-        files_count = binary_files(files, files_count)
-    else:
-        print "Not a valid file type"
-        sys.exit(1)
-
-if __name__ == '__main__':
-    usage = "usage: %prog [option] <MNT_PT>"
-    parser = OptionParser(usage=usage)
-    parser.add_option("-n", dest="files",type="int" ,default=100,
-                      help="number of files in each level [default: %default]")
-    parser.add_option("--size", action = "store",type="string",
-                      help="size of the files to be used")
-    parser.add_option("--random",  action="store_true", default=True,
-                      help="random size of the file between --min and --max "
-                      "[default: %default]")
-    parser.add_option("--max", action = "store",type="string", default="500K",
-                      help="maximum size of the files, if random is True "
-                      "[default: %default]")
-    parser.add_option("--min", action = "store",type="string", default="10K",
-                      help="minimum size of the files, if random is True "
-                      "[default: %default]" )
-    parser.add_option("--single", action="store_true", dest="dir",default=True,
-                      help="create files in single directory [default: %default]" )
-    parser.add_option("--multi", action="store_false", dest="dir",
-                      help="create files in multiple directories")
-    parser.add_option("-b", dest="brdth",type="int",default=5,
-                      help="number of directories in one level(works with --multi)[default: %default]")
-    parser.add_option("-d", dest="depth",type="int",default=5,
-                      help="number of levels of directories(works with --multi)[default: %default]")
-    parser.add_option("-l", dest="flen",type="int" ,default=10,
-                      help="number of bytes for filename "
-                      "[default: %default]")
-    parser.add_option("-t","--type", action="store", type="string" , dest="file_type",default="text",
-                      help="type of the file to be created (text, sparse, binary) [default: %default]" )
-    parser.add_option("-I", dest="inter", type="int", default=100,
-                      help="print number files created of interval [defailt: %dafault]")
-    (option,args) = parser.parse_args()
-    if not args:
-        print "usage: <script> [option] <MNT_PT>"
-        print ""
-        sys.exit(1)
-    args[0] = os.path.abspath(args[0])
-    if option.size:
-        option.size = human2bytes(option.size)
-    else:
-        option.max = human2bytes(option.max)
-        option.min = human2bytes(option.min)
-    if option.dir:
-        singledir(args[0], option.files)
-    else:
-        multipledir(args[0], option.brdth, option.depth, option.files)
-    print "creation of files completed.\n"
diff --git a/tests/volume.rc b/tests/volume.rc
deleted file mode 100644
index 987122420..000000000
--- a/tests/volume.rc
+++ /dev/null
@@ -1,274 +0,0 @@
-function volinfo_field()
-{
-    local vol=$1;
-    local field=$2;
-
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
-}
-
-
-function brick_count()
-{
-    local vol=$1;
-
-    $CLI volume info $vol | egrep "^Brick[0-9]+: " | wc -l;
-}
-
-function online_brick_count ()
-{
-    pidof glusterfsd | wc -w
-}
-
-function volume_option()
-{
-        local vol=$1
-        local key=$2
-        $CLI volume info $vol | egrep "^$key: " | cut -f2 -d' ';
-}
-
-function rebalance_status_field {
-        #The rebalance status can be upto 3 words, (ex:'fix-layout in progress'), hence the awk-print $7 thru $9.
-        #But if the status is less than 3 words, it also prints the next field i.e the run_time_in_secs.(ex:'completed 3.00').
-        #So we trim the numbers out with  `tr`. Finally remove the trailing white spaces with sed. What we get is one of the
-        #strings in the 'cli_vol_task_status_str' char array of cli-rpc-ops.c
-
-        $CLI volume rebalance $1 status | awk '{print $7,$8,$9}' |sed -n 3p |tr -d '[^0-9+\.]'|sed 's/ *$//g'
-}
-
-function remove_brick_status_completed_field {
-        local vol=$1
-        local brick_list=$2
-        $CLI volume remove-brick $vol $brick_list status | awk '{print $7}' | sed -n 3p
-}
-
-function get_mount_process_pid {
-        local vol=$1
-        ps aux | grep glusterfs | grep -E "volfile-id[ =]/?$vol " | awk '{print $2}' | head -1
-}
-
-function get_nfs_pid ()
-{
-        ps aux | grep "volfile-id\ gluster\/nfs" | awk '{print $2}' | head -1
-}
-
-function read_nfs_pidfile ()
-{
-        echo `cat /var/lib/glusterd/nfs/run/nfs.pid`
-}
-
-function cleanup_statedump {
-       pid=$1
-       rm -f $statedumpdir/*$pid.dump.*
-       #.vimrc friendly comment */
-}
-
-function generate_statedump {
-        local fpath=""
-        pid=$1
-        #remove old stale statedumps
-        cleanup_statedump $pid
-        kill -USR1 $pid
-        #Wait till the statedump is generated
-        sleep 1
-        fname=$(ls $statedumpdir | grep -E "\.$pid\.dump\.")
-        echo $statedumpdir/$fname
-}
-
-function generate_mount_statedump {
-        local vol=$1
-        generate_statedump $(get_mount_process_pid $vol)
-}
-
-function cleanup_mount_statedump {
-        local vol=$1
-        cleanup_statedump $(get_mount_process_pid $vol)
-}
-
-function _afr_child_up_status {
-        local vol=$1
-        #brick_id is (brick-num in volume info - 1)
-        local brick_id=$2
-        local gen_state_dump=$3
-        local fpath=$($gen_state_dump $vol)
-        up=$(grep -B1 trusted.afr.$vol-client-$brick_id $fpath | head -1 | cut -f2 -d'=')
-        rm -f $fpath
-        echo "$up"
-}
-
-function afr_child_up_status {
-        local vol=$1
-        #brick_id is (brick-num in volume info - 1)
-        local brick_id=$2
-        _afr_child_up_status $vol $brick_id generate_mount_statedump
-}
-
-function get_shd_process_pid {
-        local vol=$1
-        ps aux | grep glusterfs | grep -E "glustershd/run/glustershd.pid" | awk '{print $2}' | head -1
-}
-
-function generate_shd_statedump {
-        local vol=$1
-        generate_statedump $(get_shd_process_pid $vol)
-}
-
-function generate_nfs_statedump {
-        local vol=$1
-        generate_statedump $(get_nfs_pid $vol)
-}
-
-function generate_brick_statedump {
-        local vol=$1
-        local host=$2
-        local brick=$3
-        generate_statedump $(get_brick_pid $vol $host $brick)
-}
-
-function afr_child_up_status_in_shd {
-        local vol=$1
-        #brick_id is (brick-num in volume info - 1)
-        local brick_id=$2
-        _afr_child_up_status $vol $brick_id generate_shd_statedump
-}
-
-function afr_child_up_status_in_nfs {
-        local vol=$1
-        #brick_id is (brick-num in volume info - 1)
-        local brick_id=$2
-        _afr_child_up_status $vol $brick_id generate_nfs_statedump
-}
-
-function nfs_up_status {
-        gluster volume status | grep "NFS Server" | awk '{print $6}'
-}
-
-function glustershd_up_status {
-        gluster volume status | grep "Self-heal Daemon" | awk '{print $6}'
-}
-
-function get_brick_pid {
-        local vol=$1
-        local host=$2
-        local brick=$3
-        local brick_hiphenated=$(echo $brick | tr '/' '-')
-        echo `cat /var/lib/glusterd/vols/$vol/run/${host}${brick_hiphenated}.pid`
-}
-
-function kill_brick {
-        local vol=$1
-        local host=$2
-        local brick=$3
-        kill -9 $(get_brick_pid $vol $host $brick)
-}
-
-function check_option_help_presence {
-        local option=$1
-        $CLI volume set help | grep "^Option:" | grep -w $option
-}
-
-function afr_get_changelog_xattr {
-        local file=$1
-        local xkey=$2
-        getfattr -n $xkey -e hex $file 2>/dev/null | grep "client-" | cut -f2 -d'='
-}
-
-function afr_get_pending_heal_count {
-        local vol=$1
-        gluster volume heal $vol info | grep "Number of entries" | awk '{ sum+=$4} END {print sum}'
-}
-
-function afr_get_index_path {
-        local brick_path=$1
-        echo "$brick_path/.glusterfs/indices/xattrop"
-}
-
-function afr_get_num_indices_in_brick {
-        local brick_path=$1
-        echo $(ls $(afr_get_index_path $brick_path) | grep -v xattrop | wc -l)
-}
-
-function gf_get_gfid_xattr {
-        file=$1
-        getfattr -n trusted.gfid -e hex $file 2>/dev/null | grep "trusted.gfid" | cut -f2 -d'='
-}
-
-function gf_gfid_xattr_to_str {
-        xval=$1
-        echo "${xval:2:8}-${xval:10:4}-${xval:14:4}-${xval:18:4}-${xval:22:12}"
-}
-
-function gf_check_file_opened_in_brick {
-        vol=$1
-        host=$2
-        brick=$3
-        realpath=$4
-        ls -l /proc/$(get_brick_pid $vol $host $brick)/fd | grep "${realpath}$" 2>&1 > /dev/null
-        if [ $? -eq 0 ]; then
-                echo "Y"
-        else
-                echo "N"
-        fi
-}
-
-function gf_get_gfid_backend_file_path {
-        brickpath=$1
-        filepath_in_brick=$2
-        gfid=$(gf_get_gfid_xattr "$brickpath/$filepath_in_brick")
-        gfidstr=$(gf_gfid_xattr_to_str $gfid)
-        echo "$brickpath/.glusterfs/${gfidstr:0:2}/${gfidstr:2:2}/$gfidstr"
-}
-
-function gf_rm_file_and_gfid_link {
-        brickpath=$1
-        filepath_in_brick=$2
-        rm -f $(gf_get_gfid_backend_file_path $brickpath $filepath_in_brick)
-        rm -f "$brickpath/$filepath_in_brick"
-}
-
-
-function gd_is_replace_brick_completed {
-        local host=$1
-        local vol=$2
-        local src_brick=$3
-        local dst_brick=$4
-        $CLI volume replace-brick $vol $src_brick $dst_brick status | grep -i "Migration complete"
-        if [ $? -eq 0 ]; then
-                echo "Y"
-        else
-                echo "N"
-        fi
-}
-
-function dht_get_layout {
-	local my_xa=trusted.glusterfs.dht
-	getfattr -d -e hex -n $my_xa $1 2> /dev/null | grep "$my_xa=" | cut -d= -f2
-}
-
-function afr_get_specific_changelog_xattr ()
-{
-        local path=$1
-        local key=$2
-        local type=$3
-        local specific_changelog=""
-
-        changelog_xattr=$(afr_get_changelog_xattr "$path" "$key")
-        if [ "$type" == "data" ]; then
-                specific_changelog=${changelog_xattr:2:8}
-        elif [ "$type" == "metadata" ]; then
-                specific_changelog=${changelog_xattr:10:8}
-        elif [ "$type" == "entry" ]; then
-                specific_changelog=${changelog_xattr:18:8}
-        else
-                specific_changlog="error"
-        fi
-
-        echo $specific_changelog
-}
-##
- # query pathinfo xattr and extract POSIX pathname(s)
- ##
-function get_backend_paths {
-       local path=$1
-
-       getfattr -m . -n trusted.glusterfs.pathinfo $path | tr ' ' '\n' | sed -n 's/<POSIX.*:.*:\(.*\)>.*/\1/p'
-}
diff --git a/xlators/Makefile.am b/xlators/Makefile.am
index f60fa85ce..b1643d26c 100644
--- a/xlators/Makefile.am
+++ b/xlators/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = cluster storage protocol performance debug features encryption mount nfs mgmt system \
-          playground
+SUBDIRS = cluster storage protocol performance debug features encryption mount nfs mgmt system
 
 CLEANFILES =
diff --git a/xlators/bindings/python/src/Makefile.am b/xlators/bindings/python/src/Makefile.am
index 90370d861..c0b9141c6 100644
--- a/xlators/bindings/python/src/Makefile.am
+++ b/xlators/bindings/python/src/Makefile.am
@@ -9,7 +9,7 @@ pythondir = $(xlatordir)/python
 
 python_so_SOURCES = python.c
 
-AM_CFLAGS = -fPIC $(GF_CPPFLAGS) -Wall \
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall \
 	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \
 	$(PYTHON_CPPLAGS) -DGLUSTER_PYTHON_PATH=\"$(pythondir)\"
 
diff --git a/xlators/bindings/python/src/gluster.py b/xlators/bindings/python/src/gluster.py
index 337c983ec..ee0eb1310 100644
--- a/xlators/bindings/python/src/gluster.py
+++ b/xlators/bindings/python/src/gluster.py
@@ -1,12 +1,19 @@
-
-#  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-#  This file is part of GlusterFS.
+#   Copyright (c) 2007 Chris AtLee <chris@atlee.ca>
+#   This file is part of GlusterFS.
 #
-#  This file is licensed to you under your choice of the GNU Lesser
-#  General Public License, version 3 or any later version (LGPLv3 or
-#  later), or the GNU General Public License, version 2 (GPLv2), in all
-#  cases as published by the Free Software Foundation.
-
+#   GlusterFS 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 3 of the License,
+#   or (at your option) any later version.
+#
+#   GlusterFS 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, see
+#   <http://www.gnu.org/licenses/>.
 from ctypes import *
 from glustertypes import *
 from glusterstack import *
diff --git a/xlators/bindings/python/src/glusterstack.py b/xlators/bindings/python/src/glusterstack.py
index 0c071ae98..ba24c8165 100644
--- a/xlators/bindings/python/src/glusterstack.py
+++ b/xlators/bindings/python/src/glusterstack.py
@@ -1,12 +1,19 @@
-
-#  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-#  This file is part of GlusterFS.
+#   Copyright (c) 2007 Chris AtLee <chris@atlee.ca>
+#   This file is part of GlusterFS.
 #
-#  This file is licensed to you under your choice of the GNU Lesser
-#  General Public License, version 3 or any later version (LGPLv3 or
-#  later), or the GNU General Public License, version 2 (GPLv2), in all
-#  cases as published by the Free Software Foundation.
-
+#   GlusterFS 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 3 of the License,
+#   or (at your option) any later version.
+#
+#   GlusterFS 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, see
+#   <http://www.gnu.org/licenses/>.
 from ctypes import *
 from glustertypes import *
 
diff --git a/xlators/bindings/python/src/glustertypes.py b/xlators/bindings/python/src/glustertypes.py
index 98437d22e..e9069d07c 100644
--- a/xlators/bindings/python/src/glustertypes.py
+++ b/xlators/bindings/python/src/glustertypes.py
@@ -1,12 +1,19 @@
-
-#  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-#  This file is part of GlusterFS.
+#   Copyright (c) 2007 Chris AtLee <chris@atlee.ca>
+#   This file is part of GlusterFS.
 #
-#  This file is licensed to you under your choice of the GNU Lesser
-#  General Public License, version 3 or any later version (LGPLv3 or
-#  later), or the GNU General Public License, version 2 (GPLv2), in all
-#  cases as published by the Free Software Foundation.
-
+#   GlusterFS 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 3 of the License,
+#   or (at your option) any later version.
+#
+#   GlusterFS 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, see
+#   <http://www.gnu.org/licenses/>.
 from ctypes import *
 import collections
 
diff --git a/xlators/bindings/python/src/python.c b/xlators/bindings/python/src/python.c
index 9b96790de..3310a2115 100644
--- a/xlators/bindings/python/src/python.c
+++ b/xlators/bindings/python/src/python.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2007-2010 Chris AtLee <chris@atlee.ca>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
+
 #include <Python.h>
 
 #ifndef _CONFIG_H
@@ -35,7 +45,7 @@ python_writev (call_frame_t *frame,
               xlator_t *this,
               fd_t *fd,
               struct iovec *vector,
-              int32_t count,
+              int32_t count, 
               off_t offset)
 {
   python_private_t *priv = (python_private_t *)this->private;
@@ -138,7 +148,7 @@ init (xlator_t *this)
   Py_InitializeEx(0);
 
   if (!this->children) {
-    gf_log ("python", GF_LOG_ERROR,
+    gf_log ("python", GF_LOG_ERROR, 
             "FATAL: python should have exactly one child");
     return -1;
   }
@@ -156,7 +166,7 @@ init (xlator_t *this)
   }
 
   priv->pInterp = Py_NewInterpreter();
-
+    
   // Adjust python's path
   PyObject *syspath = PySys_GetObject("path");
   PyObject *path = PyString_FromString(GLUSTER_PYTHON_PATH);
@@ -178,7 +188,7 @@ init (xlator_t *this)
   priv->pVectorType = PyObject_GetAttrString(priv->pGlusterModule, "iovec");
 
   gf_log("python", GF_LOG_DEBUG, "Loading script...%s", priv->scriptname);
-
+  
   priv->pScriptModule = AnonModule_FromFile(priv->scriptname);
   if (!priv->pScriptModule || PyErr_Occurred())
   {
@@ -207,7 +217,7 @@ init (xlator_t *this)
   return 0;
 }
 
-void
+void 
 fini (xlator_t *this)
 {
   python_private_t *priv = (python_private_t*)(this->private);
diff --git a/xlators/bindings/python/src/testxlator.py b/xlators/bindings/python/src/testxlator.py
index 59a991dca..507455c85 100644
--- a/xlators/bindings/python/src/testxlator.py
+++ b/xlators/bindings/python/src/testxlator.py
@@ -1,12 +1,19 @@
-"""
-  Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-"""
+#   Copyright (c) 2007 Chris AtLee <chris@atlee.ca>
+#   This file is part of GlusterFS.
+#
+#   GlusterFS 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 3 of the License,
+#   or (at your option) any later version.
+#
+#   GlusterFS 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, see
+#   <http://www.gnu.org/licenses/>.
 
 """
 This is a test translator written in python.
diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
index 35d18a6c0..e192b599b 100644
--- a/xlators/cluster/afr/src/Makefile.am
+++ b/xlators/cluster/afr/src/Makefile.am
@@ -1,31 +1,21 @@
 xlator_LTLIBRARIES = afr.la pump.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
 
-afr_common_source = afr-dir-read.c afr-dir-write.c afr-inode-read.c \
-	afr-inode-write.c afr-open.c afr-transaction.c afr-self-heal-data.c \
-	afr-self-heal-common.c afr-self-heal-metadata.c afr-self-heal-entry.c \
-	afr-self-heal-algorithm.c afr-lk-common.c afr-self-heald.c \
-	$(top_builddir)/xlators/lib/src/libxlator.c
+afr_common_source = afr-dir-read.c afr-dir-write.c afr-inode-read.c afr-inode-write.c afr-open.c afr-transaction.c afr-self-heal-data.c afr-self-heal-common.c afr-self-heal-metadata.c afr-self-heal-entry.c afr-self-heal-algorithm.c afr-lk-common.c $(top_builddir)/xlators/lib/src/libxlator.c
 
-afr_la_LDFLAGS = -module -avoid-version
+afr_la_LDFLAGS = -module -avoidversion
 afr_la_SOURCES = $(afr_common_source) afr.c
 afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-pump_la_LDFLAGS = -module -avoid-version
+pump_la_LDFLAGS = -module -avoidversion
 pump_la_SOURCES =  $(afr_common_source) pump.c
 pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-noinst_HEADERS = afr.h afr-transaction.h afr-inode-write.h afr-inode-read.h \
-	afr-dir-read.h afr-dir-write.h afr-self-heal.h afr-self-heal-common.h \
-	afr-self-heal-algorithm.h pump.h afr-mem-types.h afr-common.c \
-	afr-self-heald.h $(top_builddir)/xlators/lib/src/libxlator.h \
-	$(top_builddir)/glusterfsd/src/glusterfsd.h
+noinst_HEADERS = afr.h afr-transaction.h afr-inode-write.h afr-inode-read.h afr-dir-read.h afr-dir-write.h afr-self-heal.h afr-self-heal-common.h afr-self-heal-algorithm.h pump.h afr-mem-types.h afr-common.c $(top_builddir)/xlators/lib/src/libxlator.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) \
-	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src \
-	-I$(top_srcdir)/rpc/rpc-lib/src
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
+	    -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/contrib/md5 -shared -nostartfiles $(GF_CFLAGS) \
+	    -I$(top_srcdir)/xlators/lib/src
 
 CLEANFILES =
 
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index af01f2ef2..80e5c043e 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <libgen.h>
@@ -35,7 +44,6 @@
 #include "compat.h"
 #include "byte-order.h"
 #include "statedump.h"
-#include "inode.h"
 
 #include "fd.h"
 
@@ -46,15 +54,72 @@
 #include "afr-transaction.h"
 #include "afr-self-heal.h"
 #include "afr-self-heal-common.h"
-#include "afr-self-heald.h"
 #include "pump.h"
 
-#define AFR_ICTX_OPENDIR_DONE_MASK     0x0000000100000000ULL
+#define AFR_ICTX_OPENDIR_DONE_MASK     0x0000000200000000ULL
+#define AFR_ICTX_SPLIT_BRAIN_MASK      0x0000000100000000ULL
 #define AFR_ICTX_READ_CHILD_MASK       0x00000000FFFFFFFFULL
-#define AFR_STATISTICS_HISTORY_SIZE    50
+
 int
 afr_lookup_done_success_action (call_frame_t *frame, xlator_t *this,
                                 gf_boolean_t fail_conflict);
+gf_boolean_t
+afr_is_child_present (int32_t *success_children, int32_t child_count,
+                      int32_t child)
+{
+        gf_boolean_t             success_child = _gf_false;
+        int                      i = 0;
+
+        GF_ASSERT (child < child_count);
+
+        for (i = 0; i < child_count; i++) {
+                if (success_children[i] == -1)
+                        break;
+                if (child == success_children[i]) {
+                        success_child = _gf_true;
+                        break;
+                }
+        }
+        return success_child;
+}
+
+gf_boolean_t
+afr_is_source_child (int32_t *sources, int32_t child_count, int32_t child)
+{
+        gf_boolean_t             source_xattrs = _gf_false;
+
+        GF_ASSERT (child < child_count);
+
+        if ((child >= 0) && (child < child_count) &&
+             sources[child]) {
+                source_xattrs = _gf_true;
+        }
+        return source_xattrs;
+}
+
+gf_boolean_t
+afr_is_read_child (int32_t *success_children, int32_t *sources,
+                   int32_t child_count, int32_t child)
+{
+        gf_boolean_t             success_child = _gf_false;
+        gf_boolean_t             source        = _gf_false;
+
+        GF_ASSERT (success_children);
+        GF_ASSERT (child_count > 0);
+
+        success_child = afr_is_child_present (success_children, child_count,
+                                              child);
+        if (!success_child)
+                goto out;
+        if (NULL == sources) {
+                source = _gf_true;
+                goto out;
+        }
+        source = afr_is_source_child (sources, child_count, child);
+out:
+        return (success_child && source);
+}
+
 void
 afr_children_copy (int32_t *dst, int32_t *src, unsigned int child_count)
 {
@@ -82,25 +147,17 @@ afr_xattr_req_prepare (xlator_t *this, dict_t *xattr_req, const char *path)
                                 path, priv->pending_key[i]);
                 /* 3 = data+metadata+entry */
         }
-        ret = dict_set_int32 (xattr_req, GF_GFIDLESS_LOOKUP, 1);
-        if (ret) {
-                gf_log (this->name, GF_LOG_DEBUG, "%s: failed to set gfidless "
-                        "lookup", path);
-        }
 }
 
-int
+void
 afr_lookup_xattr_req_prepare (afr_local_t *local, xlator_t *this,
                               dict_t *xattr_req, loc_t *loc, void **gfid_req)
 {
-        int     ret = -ENOMEM;
+        int     ret = 0;
 
         GF_ASSERT (gfid_req);
-
         *gfid_req = NULL;
         local->xattr_req = dict_new ();
-        if (!local->xattr_req)
-                goto out;
         if (xattr_req)
                 dict_copy (xattr_req, local->xattr_req);
 
@@ -118,13 +175,6 @@ afr_lookup_xattr_req_prepare (afr_local_t *local, xlator_t *this,
                         loc->path, GLUSTERFS_ENTRYLK_COUNT);
         }
 
-        ret = dict_set_uint32 (local->xattr_req, GLUSTERFS_PARENT_ENTRYLK, 0);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: Unable to set dict value for %s",
-                        loc->path, GLUSTERFS_PARENT_ENTRYLK);
-        }
-
         ret = dict_get_ptr (local->xattr_req, "gfid-req", gfid_req);
         if (ret) {
                 gf_log (this->name, GF_LOG_DEBUG,
@@ -134,23 +184,23 @@ afr_lookup_xattr_req_prepare (afr_local_t *local, xlator_t *this,
                 if (loc->parent != NULL)
                         dict_del (local->xattr_req, "gfid-req");
         }
-        ret = 0;
-out:
-        return ret;
 }
 
 void
 afr_lookup_save_gfid (uuid_t dst, void* new, const loc_t *loc)
 {
-        inode_t  *inode = NULL;
+        inode_t         *inode = NULL;
 
+        GF_ASSERT (loc);
         inode = loc->inode;
-        if (inode && !uuid_is_null (inode->gfid))
+        if (inode && !uuid_is_null (inode->gfid)) {
                 uuid_copy (dst, inode->gfid);
-        else if (!uuid_is_null (loc->gfid))
+        } else if (!uuid_is_null (loc->gfid)) {
                 uuid_copy (dst, loc->gfid);
-        else if (new && !uuid_is_null (new))
-                uuid_copy (dst, new);
+        } else {
+                if (new && !uuid_is_null (new))
+                        uuid_copy (dst, new);
+        }
 }
 
 int
@@ -178,7 +228,7 @@ afr_errno_count (int32_t *children, int *child_errno,
 int32_t
 afr_set_dict_gfid (dict_t *dict, uuid_t gfid)
 {
-        int ret       = 0;
+        int     ret   = 0;
         uuid_t *pgfid = NULL;
 
         GF_ASSERT (gfid);
@@ -186,566 +236,202 @@ afr_set_dict_gfid (dict_t *dict, uuid_t gfid)
         pgfid = GF_CALLOC (1, sizeof (uuid_t), gf_common_mt_char);
         if (!pgfid) {
                 ret = -1;
+                gf_log (THIS->name, GF_LOG_ERROR, "Out of memory");
                 goto out;
         }
-
         uuid_copy (*pgfid, gfid);
 
-        ret = dict_set_dynptr (dict, "gfid-req", pgfid, sizeof (uuid_t));
-        if (ret)
-                gf_log (THIS->name, GF_LOG_ERROR, "gfid set failed");
-
-out:
-        if (ret && pgfid)
-                GF_FREE (pgfid);
-
-        return ret;
-}
-
-void
-afr_inode_ctx_destroy (afr_inode_ctx_t *ctx)
-{
-        if (!ctx)
-                return;
-        GF_FREE (ctx->fresh_children);
-        GF_FREE (ctx);
-}
-
-afr_inode_ctx_t*
-__afr_inode_ctx_get (inode_t *inode, xlator_t *this)
-{
-        int             ret      = 0;
-        uint64_t        ctx_addr = 0;
-        afr_inode_ctx_t *ctx     = NULL;
-        afr_private_t   *priv    = NULL;
-
-        priv = this->private;
-        ret = __inode_ctx_get (inode, this, &ctx_addr);
-        if (ret < 0)
-                ctx_addr = 0;
-        if (ctx_addr != 0) {
-                ctx = (afr_inode_ctx_t*) (long) ctx_addr;
-                goto out;
-        }
-        ctx = GF_CALLOC (1, sizeof (*ctx),
-                         gf_afr_mt_inode_ctx_t);
-        if (!ctx)
-                goto fail;
-        ctx->fresh_children = GF_CALLOC (priv->child_count,
-                                         sizeof (*ctx->fresh_children),
-                                         gf_afr_mt_int32_t);
-        if (!ctx->fresh_children)
-                goto fail;
-        ret = __inode_ctx_put (inode, this, (uint64_t)ctx);
+        ret = dict_set_dynptr (dict, "gfid-req", pgfid, 16);
         if (ret) {
-                gf_log_callingfn (this->name, GF_LOG_ERROR, "failed to "
-                                  "set the inode ctx (%s)",
-                                  uuid_utoa (inode->gfid));
-                goto fail;
+                GF_FREE (pgfid);
+                gf_log (THIS->name, GF_LOG_DEBUG, "gfid set failed");
         }
 
 out:
-        return ctx;
-
-fail:
-        afr_inode_ctx_destroy (ctx);
-        return NULL;
+        return ret;
 }
 
-afr_inode_ctx_t*
-afr_inode_ctx_get (inode_t *inode, xlator_t *this)
+uint64_t
+afr_is_split_brain (xlator_t *this, inode_t *inode)
 {
-        afr_inode_ctx_t *ctx = NULL;
+        int ret = 0;
 
-        LOCK (&inode->lock);
-        {
-                ctx = __afr_inode_ctx_get (inode, this);
-        }
-        UNLOCK (&inode->lock);
-        return ctx;
-}
+        uint64_t ctx         = 0;
+        uint64_t split_brain = 0;
 
-void
-afr_inode_get_ctx_params (xlator_t *this, inode_t *inode,
-                          afr_inode_params_t *params)
-{
-        GF_ASSERT (inode);
-        GF_ASSERT (params);
+        VALIDATE_OR_GOTO (inode, out);
 
-        afr_inode_ctx_t *ctx = NULL;
-        afr_private_t   *priv = NULL;
-        int             i = 0;
-        int32_t         read_child = -1;
-        int32_t         *fresh_children = NULL;
-
-        priv = this->private;
         LOCK (&inode->lock);
         {
-                ctx = __afr_inode_ctx_get (inode, this);
-                if (!ctx)
+                ret = __inode_ctx_get (inode, this, &ctx);
+
+                if (ret < 0)
                         goto unlock;
-                switch (params->op) {
-                case AFR_INODE_GET_READ_CTX:
-                        fresh_children = params->u.read_ctx.children;
-                        read_child = (int32_t)(ctx->masks &
-                                               AFR_ICTX_READ_CHILD_MASK);
-                        params->u.read_ctx.read_child = read_child;
-                        if (!fresh_children)
-                                goto unlock;
-                        for (i = 0; i < priv->child_count; i++)
-                                fresh_children[i] = ctx->fresh_children[i];
-                        break;
-                case AFR_INODE_GET_OPENDIR_DONE:
-                        params->u.value = _gf_false;
-                        if (ctx->masks & AFR_ICTX_OPENDIR_DONE_MASK)
-                                params->u.value = _gf_true;
-                        break;
-                default:
-                        GF_ASSERT (0);
-                        break;
-                }
+
+                split_brain = ctx & AFR_ICTX_SPLIT_BRAIN_MASK;
         }
 unlock:
         UNLOCK (&inode->lock);
-}
-
-gf_boolean_t
-afr_is_split_brain (xlator_t *this, inode_t *inode)
-{
-        afr_inode_ctx_t *ctx = NULL;
-        gf_boolean_t    spb  = _gf_false;
 
-        ctx = afr_inode_ctx_get (inode, this);
-        if (!ctx)
-                goto out;
-        if ((ctx->mdata_spb == SPB) || (ctx->data_spb == SPB))
-                spb = _gf_true;
 out:
-        return spb;
+        return split_brain;
 }
 
-gf_boolean_t
-afr_is_opendir_done (xlator_t *this, inode_t *inode)
-{
-        afr_inode_params_t params = {0};
-
-        params.op = AFR_INODE_GET_OPENDIR_DONE;
-        afr_inode_get_ctx_params (this, inode, &params);
-        return params.u.value;
-}
-
-int32_t
-afr_inode_get_read_ctx (xlator_t *this, inode_t *inode, int32_t *fresh_children)
-{
-        afr_inode_params_t      params = {0};
-
-        params.op = AFR_INODE_GET_READ_CTX;
-        params.u.read_ctx.children = fresh_children;
-        afr_inode_get_ctx_params (this, inode, &params);
-        return params.u.read_ctx.read_child;
-}
 
 void
-afr_inode_ctx_set_read_child (afr_inode_ctx_t *ctx, int32_t read_child)
+afr_set_split_brain (xlator_t *this, inode_t *inode, gf_boolean_t set)
 {
-        uint64_t        remaining_mask = 0;
-        uint64_t        mask         = 0;
+        uint64_t ctx = 0;
+        int      ret = 0;
 
-        remaining_mask = (~AFR_ICTX_READ_CHILD_MASK & ctx->masks);
-        mask = (AFR_ICTX_READ_CHILD_MASK & read_child);
-        ctx->masks = remaining_mask | mask;
-}
+        VALIDATE_OR_GOTO (inode, out);
 
-void
-afr_inode_ctx_set_read_ctx (afr_inode_ctx_t *ctx, int32_t read_child,
-                            int32_t *fresh_children, int32_t child_count)
-{
-        int             i            = 0;
+        LOCK (&inode->lock);
+        {
+                ret = __inode_ctx_get (inode, this, &ctx);
 
-        afr_inode_ctx_set_read_child (ctx, read_child);
-        for (i = 0; i < child_count; i++) {
-                if (fresh_children)
-                        ctx->fresh_children[i] = fresh_children[i];
-                else
-                        ctx->fresh_children[i] = -1;
-        }
-}
+                if (ret < 0) {
+                        ctx = 0;
+                }
 
-void
-afr_inode_ctx_rm_stale_children (afr_inode_ctx_t *ctx, int32_t *stale_children,
-                                 int32_t child_count)
-{
-        int             i            = 0;
-        int32_t         read_child   = -1;
+                if (set) {
+                        ctx = (~AFR_ICTX_SPLIT_BRAIN_MASK & ctx)
+                                | (0xFFFFFFFFFFFFFFFFULL & AFR_ICTX_SPLIT_BRAIN_MASK);
+                } else {
+                        ctx = (~AFR_ICTX_SPLIT_BRAIN_MASK & ctx);
+                }
 
-        GF_ASSERT (stale_children);
-        for (i = 0; i < child_count; i++) {
-                if (stale_children[i] == -1)
-                        break;
-                afr_children_rm_child (ctx->fresh_children,
-                                       stale_children[i], child_count);
+                ret = __inode_ctx_put (inode, this, ctx);
+                if (ret) {
+                        gf_log_callingfn (this->name, GF_LOG_INFO,
+                                          "failed to set the inode ctx (%s)",
+                                          uuid_utoa (inode->gfid));
+                }
         }
-        read_child = (int32_t)(ctx->masks & AFR_ICTX_READ_CHILD_MASK);
-        if (!afr_is_child_present (ctx->fresh_children, child_count,
-                                   read_child))
-                afr_inode_ctx_set_read_child (ctx, ctx->fresh_children[0]);
+        UNLOCK (&inode->lock);
+out:
+        return;
 }
 
-void
-afr_inode_ctx_set_opendir_done (afr_inode_ctx_t *ctx)
-{
-        uint64_t        remaining_mask = 0;
-        uint64_t        mask = 0;
-
-        remaining_mask = (~AFR_ICTX_OPENDIR_DONE_MASK & ctx->masks);
-        mask = (0xFFFFFFFFFFFFFFFFULL & AFR_ICTX_OPENDIR_DONE_MASK);
-        ctx->masks = remaining_mask | mask;
-}
 
-void
-afr_inode_set_ctx_params (xlator_t *this, inode_t *inode,
-                          afr_inode_params_t *params)
+uint64_t
+afr_is_opendir_done (xlator_t *this, inode_t *inode)
 {
-        GF_ASSERT (inode);
-        GF_ASSERT (params);
+        int      ret          = 0;
+        uint64_t ctx          = 0;
+        uint64_t opendir_done = 0;
 
-        afr_inode_ctx_t *ctx            = NULL;
-        afr_private_t   *priv           = NULL;
-        int32_t         read_child      = -1;
-        int32_t         *fresh_children = NULL;
-        int32_t         *stale_children = NULL;
+        VALIDATE_OR_GOTO (inode, out);
 
-        priv = this->private;
         LOCK (&inode->lock);
         {
-                ctx = __afr_inode_ctx_get (inode, this);
-                if (!ctx)
+                ret = __inode_ctx_get (inode, this, &ctx);
+
+                if (ret < 0)
                         goto unlock;
-                switch (params->op) {
-                case AFR_INODE_SET_READ_CTX:
-                        read_child = params->u.read_ctx.read_child;
-                        fresh_children = params->u.read_ctx.children;
-                        afr_inode_ctx_set_read_ctx (ctx, read_child,
-                                                    fresh_children,
-                                                    priv->child_count);
-                        break;
-                case AFR_INODE_RM_STALE_CHILDREN:
-                        stale_children = params->u.read_ctx.children;
-                        afr_inode_ctx_rm_stale_children (ctx,
-                                                         stale_children,
-                                                         priv->child_count);
-                        break;
-                case AFR_INODE_SET_OPENDIR_DONE:
-                        afr_inode_ctx_set_opendir_done (ctx);
-                        break;
-                default:
-                        GF_ASSERT (0);
-                        break;
-                }
+
+                opendir_done = ctx & AFR_ICTX_OPENDIR_DONE_MASK;
         }
 unlock:
         UNLOCK (&inode->lock);
-}
-
-void
-afr_set_split_brain (xlator_t *this, inode_t *inode, afr_spb_state_t mdata_spb,
-                     afr_spb_state_t data_spb)
-{
-        afr_inode_ctx_t *ctx = NULL;
 
-        ctx = afr_inode_ctx_get (inode, this);
-        if (mdata_spb != DONT_KNOW)
-                ctx->mdata_spb = mdata_spb;
-        if (data_spb != DONT_KNOW)
-                ctx->data_spb = data_spb;
-}
-
-void
-afr_set_opendir_done (xlator_t *this, inode_t *inode)
-{
-        afr_inode_params_t params = {0};
-
-        params.op = AFR_INODE_SET_OPENDIR_DONE;
-        afr_inode_set_ctx_params (this, inode, &params);
+out:
+        return opendir_done;
 }
 
-void
-afr_inode_set_read_ctx (xlator_t *this, inode_t *inode, int32_t read_child,
-                        int32_t *fresh_children)
-{
-        afr_inode_params_t params = {0};
-        afr_private_t      *priv  = NULL;
-
-        priv = this->private;
-        GF_ASSERT (read_child >= 0);
-        GF_ASSERT (fresh_children);
-        GF_ASSERT (afr_is_child_present (fresh_children, priv->child_count,
-                                         read_child));
-
-        params.op = AFR_INODE_SET_READ_CTX;
-        params.u.read_ctx.read_child     = read_child;
-        params.u.read_ctx.children = fresh_children;
-        afr_inode_set_ctx_params (this, inode, &params);
-}
 
 void
-afr_inode_rm_stale_children (xlator_t *this, inode_t *inode,
-                             int32_t *stale_children)
-{
-        afr_inode_params_t params = {0};
-
-        GF_ASSERT (stale_children);
-
-        params.op = AFR_INODE_RM_STALE_CHILDREN;
-        params.u.read_ctx.children = stale_children;
-        afr_inode_set_ctx_params (this, inode, &params);
-}
-
-gf_boolean_t
-afr_is_source_child (int32_t *sources, int32_t child_count, int32_t child)
+afr_set_opendir_done (xlator_t *this, inode_t *inode)
 {
-        gf_boolean_t             source_xattrs = _gf_false;
-
-        GF_ASSERT (child < child_count);
-
-        if ((child >= 0) && (child < child_count) &&
-             sources[child]) {
-                source_xattrs = _gf_true;
-        }
-        return source_xattrs;
-}
+        uint64_t ctx = 0;
+        int      ret = 0;
 
-gf_boolean_t
-afr_is_child_present (int32_t *success_children, int32_t child_count,
-                      int32_t child)
-{
-        gf_boolean_t             success_child = _gf_false;
-        int                      i = 0;
+        VALIDATE_OR_GOTO (inode, out);
 
-        GF_ASSERT (child < child_count);
+        LOCK (&inode->lock);
+        {
+                ret = __inode_ctx_get (inode, this, &ctx);
 
-        for (i = 0; i < child_count; i++) {
-                if (success_children[i] == -1)
-                        break;
-                if (child == success_children[i]) {
-                        success_child = _gf_true;
-                        break;
+                if (ret < 0) {
+                        ctx = 0;
                 }
-        }
-        return success_child;
-}
 
-gf_boolean_t
-afr_is_read_child (int32_t *success_children, int32_t *sources,
-                   int32_t child_count, int32_t child)
-{
-        gf_boolean_t             success_child = _gf_false;
-        gf_boolean_t             source        = _gf_false;
+                ctx = (~AFR_ICTX_OPENDIR_DONE_MASK & ctx)
+                        | (0xFFFFFFFFFFFFFFFFULL & AFR_ICTX_OPENDIR_DONE_MASK);
 
-        if (child < 0) {
-                return _gf_false;
-        }
-
-        GF_ASSERT (success_children);
-        GF_ASSERT (child_count > 0);
-
-        success_child = afr_is_child_present (success_children, child_count,
-                                              child);
-        if (!success_child)
-                goto out;
-        if (NULL == sources) {
-                source = _gf_true;
-                goto out;
+                ret = __inode_ctx_put (inode, this, ctx);
+                if (ret) {
+                        gf_log_callingfn (this->name, GF_LOG_INFO,
+                                          "failed to set the inode ctx (%s)",
+                                          uuid_utoa (inode->gfid));
+                }
         }
-        source = afr_is_source_child (sources, child_count, child);
+        UNLOCK (&inode->lock);
 out:
-        return (success_child && source);
+        return;
 }
 
-int32_t
-afr_hash_child (int32_t *success_children, int32_t child_count,
-                unsigned int hmode, uuid_t gfid)
-{
-        uuid_t  gfid_copy = {0,};
-        pid_t pid;
-
-        if (!hmode) {
-                return -1;
-        }
-
-        if (gfid) {
-               uuid_copy(gfid_copy,gfid);
-        }
-        if (hmode > 1) {
-                /*
-                 * Why getpid?  Because it's one of the cheapest calls
-                 * available - faster than gethostname etc. - and returns a
-                 * constant-length value that's sure to be shorter than a UUID.
-                 * It's still very unlikely to be the same across clients, so
-                 * it still provides good mixing.  We're not trying for
-                 * perfection here.  All we need is a low probability that
-                 * multiple clients won't converge on the same subvolume.
-                 */
-                pid = getpid();
-                memcpy (gfid_copy, &pid, sizeof(pid));
-        }
-
-        return SuperFastHash((char *)gfid_copy,
-                             sizeof(gfid_copy)) % child_count;
-}
 
-/* If sources is NULL the xattrs are assumed to be of source for all
- * success_children.
- */
-int
-afr_select_read_child_from_policy (int32_t *success_children,
-                                   int32_t child_count, int32_t prev_read_child,
-                                   int32_t config_read_child, int32_t *sources,
-                                   unsigned int hmode, uuid_t gfid)
+uint64_t
+afr_read_child (xlator_t *this, inode_t *inode)
 {
-        int32_t                  read_child   = -1;
-        int                      i            = 0;
+        int ret = 0;
 
-        GF_ASSERT (success_children);
+        uint64_t ctx         = 0;
+        uint64_t read_child  = 0;
 
-        read_child = config_read_child;
-        if (afr_is_read_child (success_children, sources, child_count,
-                               read_child))
-                goto out;
+        VALIDATE_OR_GOTO (inode, out);
 
-        read_child = prev_read_child;
-        if (afr_is_read_child (success_children, sources, child_count,
-                               read_child))
-                goto out;
+        LOCK (&inode->lock);
+        {
+                ret = __inode_ctx_get (inode, this, &ctx);
 
-        read_child = afr_hash_child (success_children, child_count,
-                                     hmode, gfid);
-        if (afr_is_read_child (success_children, sources, child_count,
-                               read_child)) {
-                goto out;
-        }
+                if (ret < 0)
+                        goto unlock;
 
-        for (i = 0; i < child_count; i++) {
-                read_child = success_children[i];
-                if (read_child < 0)
-                        break;
-                if (afr_is_read_child (success_children, sources, child_count,
-                                       read_child))
-                        goto out;
+                read_child = ctx & AFR_ICTX_READ_CHILD_MASK;
         }
-        read_child = -1;
+unlock:
+        UNLOCK (&inode->lock);
 
 out:
         return read_child;
 }
 
-/* This function should be used when all the success_children are sources
- */
-void
-afr_set_read_ctx_from_policy (xlator_t *this, inode_t *inode,
-                              int32_t *fresh_children, int32_t prev_read_child,
-                              int32_t config_read_child, uuid_t gfid)
-{
-        int                      read_child = -1;
-        afr_private_t            *priv = NULL;
-
-        priv = this->private;
-        read_child = afr_select_read_child_from_policy (fresh_children,
-                                                        priv->child_count,
-                                                        prev_read_child,
-                                                        config_read_child,
-                                                        NULL,
-                                                        priv->hash_mode, gfid);
-        if (read_child >= 0)
-                afr_inode_set_read_ctx (this, inode, read_child,
-                                        fresh_children);
-}
 
-/* afr_next_call_child ()
- * This is a common function used by all the read-type fops
- * This function should not be called with the inode's read_children array.
- * The fop's handler should make a copy of the inode's read_children,
- * preferred read_child into the local vars, because while this function is
- * in execution there is a chance for inode's read_ctx to change.
- */
-int32_t
-afr_next_call_child (int32_t *fresh_children, unsigned char *child_up,
-                     size_t child_count, int32_t *last_index,
-                     int32_t read_child)
+void
+afr_set_read_child (xlator_t *this, inode_t *inode, int32_t read_child)
 {
-        int             next_index      = 0;
-        int32_t         next_call_child = -1;
-
-        GF_ASSERT (last_index);
+        uint64_t ctx = 0;
+        int      ret = 0;
 
-        next_index = *last_index;
-retry:
-        next_index++;
-        if ((next_index >= child_count) ||
-           (fresh_children[next_index] == -1))
-                goto out;
-        if ((fresh_children[next_index] == read_child) ||
-           (!child_up[fresh_children[next_index]]))
-                goto retry;
-        *last_index = next_index;
-        next_call_child = fresh_children[next_index];
-out:
-        return next_call_child;
-}
+        VALIDATE_OR_GOTO (inode, out);
 
- /* This function should not be called with the inode's read_children array.
- * The fop's handler should make a copy of the inode's read_children,
- * preferred read_child into the local vars, because while this function is
- * in execution there is a chance for inode's read_ctx to change.
- */
-int32_t
-afr_get_call_child (xlator_t *this, unsigned char *child_up, int32_t read_child,
-                    int32_t *fresh_children,
-                    int32_t *call_child, int32_t *last_index)
-{
-        int             ret   = 0;
-        afr_private_t   *priv = NULL;
-        int             i     = 0;
-
-        GF_ASSERT (child_up);
-        GF_ASSERT (call_child);
-        GF_ASSERT (last_index);
-        GF_ASSERT (fresh_children);
-
-        if (read_child < 0) {
-                ret = -EIO;
-                goto out;
-        }
-        priv = this->private;
-        *call_child = -1;
-        *last_index = -1;
+        LOCK (&inode->lock);
+        {
+                ret = __inode_ctx_get (inode, this, &ctx);
 
-        if (child_up[read_child]) {
-                *call_child = read_child;
-        } else {
-                for (i = 0; i < priv->child_count; i++) {
-                        if (fresh_children[i] == -1)
-                                break;
-                        if (child_up[fresh_children[i]]) {
-                                *call_child = fresh_children[i];
-                                ret = 0;
-                                break;
-                        }
+                if (ret < 0) {
+                        ctx = 0;
                 }
 
-                if (*call_child == -1) {
-                        ret = -ENOTCONN;
-                        goto out;
-                }
+                ctx = (~AFR_ICTX_READ_CHILD_MASK & ctx)
+                        | (AFR_ICTX_READ_CHILD_MASK & read_child);
 
-                *last_index = i;
+                ret = __inode_ctx_put (inode, this, ctx);
+                if (ret) {
+                        gf_log_callingfn (this->name, GF_LOG_INFO,
+                                          "failed to set the inode ctx (%s)",
+                                          uuid_utoa (inode->gfid));
+                }
         }
+        UNLOCK (&inode->lock);
+
 out:
-        gf_log (this->name, GF_LOG_DEBUG, "Returning %d, call_child: %d, "
-                "last_index: %d", ret, *call_child, *last_index);
-        return ret;
+        return;
 }
 
+
 void
 afr_reset_xattr (dict_t **xattr, unsigned int child_count)
 {
@@ -764,106 +450,120 @@ out:
 }
 
 void
-afr_xattr_array_destroy (dict_t **xattr, unsigned int child_count)
-{
-        afr_reset_xattr (xattr, child_count);
-        GF_FREE (xattr);
-}
-
-void
 afr_local_sh_cleanup (afr_local_t *local, xlator_t *this)
 {
         afr_self_heal_t *sh = NULL;
         afr_private_t   *priv = NULL;
+        int              i = 0;
+
 
         sh = &local->self_heal;
         priv = this->private;
 
-        if (sh->data_sh_info && strcmp (sh->data_sh_info, ""))
-                GF_FREE (sh->data_sh_info);
-
-        if (sh->metadata_sh_info && strcmp (sh->metadata_sh_info, ""))
-                GF_FREE (sh->metadata_sh_info);
-
-        GF_FREE (sh->buf);
+        if (sh->buf)
+                GF_FREE (sh->buf);
 
-        GF_FREE (sh->parentbufs);
+        if (sh->parentbufs)
+                GF_FREE (sh->parentbufs);
 
         if (sh->inode)
                 inode_unref (sh->inode);
 
-        afr_xattr_array_destroy (sh->xattr, priv->child_count);
+        if (sh->xattr) {
+                afr_reset_xattr (sh->xattr, priv->child_count);
+                GF_FREE (sh->xattr);
+        }
 
-        GF_FREE (sh->child_errno);
+        if (sh->child_errno)
+                GF_FREE (sh->child_errno);
 
-        afr_matrix_cleanup (sh->pending_matrix, priv->child_count);
-        afr_matrix_cleanup (sh->delta_matrix, priv->child_count);
+        if (sh->pending_matrix) {
+                for (i = 0; i < priv->child_count; i++) {
+                        GF_FREE (sh->pending_matrix[i]);
+                }
+                GF_FREE (sh->pending_matrix);
+        }
 
-        GF_FREE (sh->sources);
+        if (sh->delta_matrix) {
+                for (i = 0; i < priv->child_count; i++) {
+                        GF_FREE (sh->delta_matrix[i]);
+                }
+                GF_FREE (sh->delta_matrix);
+        }
 
-        GF_FREE (sh->success);
+        if (sh->sources)
+                GF_FREE (sh->sources);
 
-        GF_FREE (sh->locked_nodes);
+        if (sh->success)
+                GF_FREE (sh->success);
 
-        if (sh->healing_fd) {
+        if (sh->locked_nodes)
+                GF_FREE (sh->locked_nodes);
+
+        if (sh->healing_fd && !sh->healing_fd_opened) {
                 fd_unref (sh->healing_fd);
                 sh->healing_fd = NULL;
         }
 
-        GF_FREE ((char *)sh->linkname);
-
-        GF_FREE (sh->success_children);
+        if (sh->linkname)
+                GF_FREE ((char *)sh->linkname);
+        if (sh->child_success)
+                GF_FREE (sh->child_success);
 
-        GF_FREE (sh->fresh_children);
-
-        GF_FREE (sh->fresh_parent_dirs);
+        if (sh->fresh_children)
+                GF_FREE (sh->fresh_children);
+        if (sh->fresh_parent_dirs)
+                GF_FREE (sh->fresh_parent_dirs);
 
         loc_wipe (&sh->parent_loc);
         loc_wipe (&sh->lookup_loc);
 
-        GF_FREE (sh->checksum);
-
-        GF_FREE (sh->write_needed);
-        if (sh->healing_fd)
-                fd_unref (sh->healing_fd);
 }
 
 
 void
 afr_local_transaction_cleanup (afr_local_t *local, xlator_t *this)
 {
-        afr_private_t *priv    = NULL;
-        int           i        = 0;
+        int             i = 0;
+        afr_private_t * priv = NULL;
 
         priv = this->private;
 
-        afr_matrix_cleanup (local->pending, priv->child_count);
-        afr_matrix_cleanup (local->transaction.txn_changelog,
-                            priv->child_count);
+        for (i = 0; i < priv->child_count; i++) {
+                if (local->pending && local->pending[i])
+                        GF_FREE (local->pending[i]);
+        }
 
-        GF_FREE (local->internal_lock.locked_nodes);
+        GF_FREE (local->pending);
 
-        for (i = 0; local->internal_lock.inodelk[i].domain; i++) {
-                GF_FREE (local->internal_lock.inodelk[i].locked_nodes);
-        }
+        if (local->internal_lock.locked_nodes)
+                GF_FREE (local->internal_lock.locked_nodes);
+
+        if (local->internal_lock.inode_locked_nodes)
+                GF_FREE (local->internal_lock.inode_locked_nodes);
 
-        GF_FREE (local->internal_lock.lower_locked_nodes);
+        if (local->internal_lock.entry_locked_nodes)
+                GF_FREE (local->internal_lock.entry_locked_nodes);
 
-        afr_entry_lockee_cleanup (&local->internal_lock);
+        if (local->internal_lock.lower_locked_nodes)
+                GF_FREE (local->internal_lock.lower_locked_nodes);
 
-        GF_FREE (local->transaction.pre_op);
-        GF_FREE (local->transaction.eager_lock);
+
+        GF_FREE (local->transaction.child_errno);
+        GF_FREE (local->child_errno);
 
         GF_FREE (local->transaction.basename);
         GF_FREE (local->transaction.new_basename);
 
         loc_wipe (&local->transaction.parent_loc);
         loc_wipe (&local->transaction.new_parent_loc);
-
-        GF_FREE (local->transaction.postop_piggybacked);
 }
 
 
+/**
+ * afr_local_cleanup - cleanup everything in frame->local
+ */
+
 void
 afr_local_cleanup (afr_local_t *local, xlator_t *this)
 {
@@ -887,17 +587,8 @@ afr_local_cleanup (afr_local_t *local, xlator_t *this)
         if (local->xattr_req)
                 dict_unref (local->xattr_req);
 
-        if (local->dict)
-                dict_unref (local->dict);
-
-	GF_FREE(local->replies);
-
         GF_FREE (local->child_up);
 
-        GF_FREE (local->child_errno);
-
-        GF_FREE (local->fresh_children);
-
         { /* lookup */
                 if (local->cont.lookup.xattrs) {
                         afr_reset_xattr (local->cont.lookup.xattrs,
@@ -914,23 +605,27 @@ afr_local_cleanup (afr_local_t *local, xlator_t *this)
                         inode_unref (local->cont.lookup.inode);
                 }
 
-                GF_FREE (local->cont.lookup.postparents);
+                if (local->cont.lookup.postparents)
+                        GF_FREE (local->cont.lookup.postparents);
 
-                GF_FREE (local->cont.lookup.bufs);
+                if (local->cont.lookup.bufs)
+                        GF_FREE (local->cont.lookup.bufs);
 
-                GF_FREE (local->cont.lookup.success_children);
+                if (local->cont.lookup.child_success)
+                        GF_FREE (local->cont.lookup.child_success);
 
-                GF_FREE (local->cont.lookup.sources);
-                afr_matrix_cleanup (local->cont.lookup.pending_matrix,
-                                    priv->child_count);
+                if (local->cont.lookup.sources)
+                        GF_FREE (local->cont.lookup.sources);
         }
 
         { /* getxattr */
-                GF_FREE (local->cont.getxattr.name);
+                if (local->cont.getxattr.name)
+                        GF_FREE (local->cont.getxattr.name);
         }
 
         { /* lk */
-                GF_FREE (local->cont.lk.locked_nodes);
+                if (local->cont.lk.locked_nodes)
+                        GF_FREE (local->cont.lk.locked_nodes);
         }
 
         { /* create */
@@ -964,40 +659,18 @@ afr_local_cleanup (afr_local_t *local, xlator_t *this)
                         dict_unref (local->cont.setxattr.dict);
         }
 
-        { /* fsetxattr */
-                if (local->cont.fsetxattr.dict)
-                        dict_unref (local->cont.fsetxattr.dict);
-        }
-
         { /* removexattr */
                 GF_FREE (local->cont.removexattr.name);
         }
-        { /* xattrop */
-                if (local->cont.xattrop.xattr)
-                        dict_unref (local->cont.xattrop.xattr);
-        }
-        { /* fxattrop */
-                if (local->cont.fxattrop.xattr)
-                        dict_unref (local->cont.fxattrop.xattr);
-        }
+
         { /* symlink */
                 GF_FREE (local->cont.symlink.linkpath);
         }
 
         { /* opendir */
-                GF_FREE (local->cont.opendir.checksum);
+                if (local->cont.opendir.checksum)
+                        GF_FREE (local->cont.opendir.checksum);
         }
-
-        { /* readdirp */
-                if (local->cont.readdir.dict)
-                        dict_unref (local->cont.readdir.dict);
-        }
-
-        if (local->xdata_req)
-                dict_unref (local->xdata_req);
-
-        if (local->xdata_rsp)
-                dict_unref (local->xdata_rsp);
 }
 
 
@@ -1018,41 +691,23 @@ afr_frame_return (call_frame_t *frame)
         return call_count;
 }
 
+
+/**
+ * up_children_count - return the number of children that are up
+ */
+
 int
-afr_set_elem_count_get (unsigned char *elems, int child_count)
+afr_up_children_count (int child_count, unsigned char *child_up)
 {
         int i   = 0;
         int ret = 0;
 
         for (i = 0; i < child_count; i++)
-                if (elems[i])
+                if (child_up[i])
                         ret++;
         return ret;
 }
 
-/**
- * up_children_count - return the number of children that are up
- */
-
-unsigned int
-afr_up_children_count (unsigned char *child_up, unsigned int child_count)
-{
-        return afr_set_elem_count_get (child_up, child_count);
-}
-
-unsigned int
-afr_locked_children_count (unsigned char *children, unsigned int child_count)
-{
-        return afr_set_elem_count_get (children, child_count);
-}
-
-unsigned int
-afr_pre_op_done_children_count (unsigned char *pre_op,
-                                unsigned int child_count)
-{
-        return afr_set_elem_count_get (pre_op, child_count);
-}
-
 gf_boolean_t
 afr_is_fresh_lookup (loc_t *loc, xlator_t *this)
 {
@@ -1080,150 +735,68 @@ afr_update_loc_gfids (loc_t *loc, struct iatt *buf, struct iatt *postparent)
                 uuid_copy (loc->pargfid, postparent->ia_gfid);
 }
 
-/*
- * Quota size xattrs are not maintained by afr. There is a
- * possibility that they differ even when both the directory changelog xattrs
- * suggest everything is fine. So if there is at least one 'source' check among
- * the sources which has the maximum quota size. Otherwise check among all the
- * available ones for maximum quota size. This way if there is a source and
- * stale copies it always votes for the 'source'.
- * */
-
-static void
-afr_handle_quota_size (afr_local_t *local, xlator_t *this,
-                       dict_t *rsp_dict)
+ino64_t
+afr_itransform (ino64_t ino, int child_count, int child_index)
 {
-        int32_t       *sources       = NULL;
-        dict_t        *xattr         = NULL;
-        data_t        *max_data      = NULL;
-        int64_t       max_quota_size = -1;
-        data_t        *data          = NULL;
-        int64_t       *size          = NULL;
-        int64_t       quota_size     = -1;
-        afr_private_t *priv          = NULL;
-        int           i              = 0;
-        int           ret            = -1;
-        gf_boolean_t  source_present = _gf_false;
+        ino64_t scaled_ino = -1;
 
-        priv    = this->private;
-        sources = local->cont.lookup.sources;
-
-        if (rsp_dict == NULL) {
-                gf_log_callingfn (this->name, GF_LOG_ERROR, "%s: Invalid "
-                                  "response dictionary", local->loc.path);
-                return;
+        if (ino == ((uint64_t) -1)) {
+                scaled_ino = ((uint64_t) -1);
+                goto out;
         }
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (sources[i]) {
-                        source_present = _gf_true;
-                        break;
-                }
-        }
+        scaled_ino = (ino * child_count) + child_index;
 
-        for (i = 0; i < priv->child_count; i++) {
-                /*
-                 * If there is at least one source lets check
-                 * for maximum quota sizes among sources, otherwise take the
-                 * maximum of the ones present to be on the safer side.
-                 */
-                if (source_present && !sources[i])
-                        continue;
+out:
+        return scaled_ino;
+}
 
-                xattr = local->cont.lookup.xattrs[i];
-                if (!xattr)
-                        continue;
 
-                data = dict_get (xattr, QUOTA_SIZE_KEY);
-                if (!data)
-                        continue;
+int
+afr_deitransform_orig (ino64_t ino, int child_count)
+{
+        int index = -1;
 
-                size = (int64_t*)data->data;
-                quota_size = ntoh64(*size);
-                gf_log (this->name, GF_LOG_DEBUG, "%s: %d, size: %"PRId64,
-                        local->loc.path, i, quota_size);
-                if (quota_size > max_quota_size) {
-                        if (max_data)
-                                data_unref (max_data);
+        index = ino % child_count;
 
-                        max_quota_size = quota_size;
-                        max_data = data_ref (data);
-                }
-        }
+        return index;
+}
 
-        if (max_data) {
-                ret = dict_set (rsp_dict, QUOTA_SIZE_KEY, max_data);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "%s: Failed to set "
-                                "quota size", local->loc.path);
-                }
 
-                data_unref (max_data);
-        }
+int
+afr_deitransform (ino64_t ino, int child_count)
+{
+        return 0;
 }
 
-int
+
+void
 afr_lookup_build_response_params (afr_local_t *local, xlator_t *this)
 {
+        int32_t         read_child = -1;
         struct iatt     *buf = NULL;
         struct iatt     *postparent = NULL;
         dict_t          **xattr = NULL;
-        int32_t         *success_children = NULL;
-        int32_t         *sources = NULL;
-        afr_private_t   *priv = NULL;
-        int32_t         read_child = -1;
-        int             ret = 0;
-        int             i = 0;
 
         GF_ASSERT (local);
 
         buf = &local->cont.lookup.buf;
         postparent = &local->cont.lookup.postparent;
         xattr = &local->cont.lookup.xattr;
-        priv = this->private;
-
-        read_child = afr_inode_get_read_ctx (this, local->cont.lookup.inode,
-                                             local->fresh_children);
-        if (read_child < 0) {
-                ret = -1;
-                goto out;
-        }
-        success_children = local->cont.lookup.success_children;
-        sources = local->cont.lookup.sources;
-        memset (sources, 0, sizeof (*sources) * priv->child_count);
-        afr_children_intersection_get (local->fresh_children, success_children,
-                                       sources, priv->child_count);
-        if (!sources[read_child]) {
-                read_child = -1;
-                for (i = 0; i < priv->child_count; i++) {
-                        if (sources[i]) {
-                                read_child = i;
-                                break;
-                        }
-                }
-        }
-        if (read_child < 0) {
-                ret = -1;
-                goto out;
-        }
 
+        read_child = afr_read_child (this, local->cont.lookup.inode);
         gf_log (this->name, GF_LOG_DEBUG, "Building lookup response from %d",
                 read_child);
+        //honor the xattr set by data-self-heal
         if (!*xattr)
                 *xattr = dict_ref (local->cont.lookup.xattrs[read_child]);
-
         *buf = local->cont.lookup.bufs[read_child];
         *postparent = local->cont.lookup.postparents[read_child];
 
-        if (dict_get (local->xattr_req, QUOTA_SIZE_KEY))
-                afr_handle_quota_size (local, this, *xattr);
-
         if (IA_INVAL == local->cont.lookup.inode->ia_type) {
                 /* fix for RT #602 */
                 local->cont.lookup.inode->ia_type = buf->ia_type;
         }
-out:
-        return ret;
 }
 
 static void
@@ -1233,7 +806,6 @@ afr_lookup_update_lk_counts (afr_local_t *local, xlator_t *this,
         uint32_t inodelk_count = 0;
         uint32_t entrylk_count = 0;
         int      ret           = -1;
-        uint32_t parent_entrylk = 0;
 
         GF_ASSERT (local);
         GF_ASSERT (this);
@@ -1249,94 +821,34 @@ afr_lookup_update_lk_counts (afr_local_t *local, xlator_t *this,
                                &entrylk_count);
         if (ret == 0)
                 local->entrylk_count += entrylk_count;
-        ret = dict_get_uint32 (xattr, GLUSTERFS_PARENT_ENTRYLK,
-                               &parent_entrylk);
-        if (!ret)
-                local->cont.lookup.parent_entrylk += parent_entrylk;
 }
 
-/*
- * It's important to maintain a commutative property on do_*_self_heal and
- * found*; once set, they must not be cleared by a subsequent iteration or
- * call, so that they represent a logical OR of all iterations and calls
- * regardless of child/key order.  That allows the caller to call us multiple
- * times without having to use a separate variable as a "reduce" accumulator.
- */
 static void
-afr_lookup_set_self_heal_params_by_xattr (afr_local_t *local, xlator_t *this,
-                                          dict_t *xattr)
+afr_lookup_detect_self_heal_by_xattr (afr_local_t *local, xlator_t *this,
+                                      dict_t *xattr)
 {
-        afr_private_t *priv        = NULL;
-        int            i           = 0;
-        int            ret         = -1;
-        void          *pending_raw = NULL;
-        int32_t       *pending     = NULL;
-
         GF_ASSERT (local);
         GF_ASSERT (this);
         GF_ASSERT (xattr);
 
-        priv = this->private;
-
-        for (i = 0; i < priv->child_count; i++) {
-                ret = dict_get_ptr (xattr, priv->pending_key[i],
-                                    &pending_raw);
-                if (ret != 0) {
-                        continue;
-                }
-                pending = pending_raw;
-
-                if (pending[AFR_METADATA_TRANSACTION]) {
-                        gf_log(this->name, GF_LOG_DEBUG,
-                               "metadata self-heal is pending for %s.",
-                               local->loc.path);
-                        local->self_heal.do_metadata_self_heal = _gf_true;
-                }
-
-                if (pending[AFR_ENTRY_TRANSACTION]) {
-                        gf_log(this->name, GF_LOG_DEBUG,
-                               "entry self-heal is pending for %s.",
-                               local->loc.path);
-                        local->self_heal.do_entry_self_heal = _gf_true;
-                }
-
-                if (pending[AFR_DATA_TRANSACTION]) {
-                        gf_log(this->name, GF_LOG_DEBUG,
-                               "data self-heal is pending for %s.",
-                               local->loc.path);
-                        local->self_heal.do_data_self_heal = _gf_true;
-                }
+        if (afr_sh_has_metadata_pending (xattr, this)) {
+                local->self_heal.need_metadata_self_heal = _gf_true;
+                gf_log(this->name, GF_LOG_DEBUG,
+                       "metadata self-heal is pending for %s.",
+                       local->loc.path);
         }
-}
-
-void
-afr_lookup_check_set_metadata_split_brain (afr_local_t *local, xlator_t *this)
-{
-        int32_t                  *sources = NULL;
-        afr_private_t            *priv = NULL;
-        int32_t                  subvol_status = 0;
-        int32_t                  *success_children   = NULL;
-        dict_t                   **xattrs = NULL;
-        struct iatt              *bufs = NULL;
-        int32_t                  **pending_matrix = NULL;
 
-        priv = this->private;
+        if (afr_sh_has_entry_pending (xattr, this)) {
+                local->self_heal.need_entry_self_heal = _gf_true;
+                gf_log(this->name, GF_LOG_DEBUG,
+                       "entry self-heal is pending for %s.", local->loc.path);
+        }
 
-        sources = GF_CALLOC (priv->child_count, sizeof (*sources),
-                             gf_afr_mt_int32_t);
-        if (NULL == sources)
-                goto out;
-        success_children = local->cont.lookup.success_children;
-        xattrs = local->cont.lookup.xattrs;
-        bufs = local->cont.lookup.bufs;
-        pending_matrix = local->cont.lookup.pending_matrix;
-        afr_build_sources (this, xattrs, bufs, pending_matrix,
-                           sources, success_children, AFR_METADATA_TRANSACTION,
-                           &subvol_status, _gf_false);
-        if (subvol_status & SPLIT_BRAIN)
-                local->cont.lookup.possible_spb = _gf_true;
-out:
-        GF_FREE (sources);
+        if (afr_sh_has_data_pending (xattr, this)) {
+                local->self_heal.need_data_self_heal = _gf_true;
+                gf_log(this->name, GF_LOG_DEBUG,
+                       "data self-heal is pending for %s.", local->loc.path);
+        }
 }
 
 static void
@@ -1345,49 +857,47 @@ afr_detect_self_heal_by_iatt (afr_local_t *local, xlator_t *this,
 {
         if (PERMISSION_DIFFERS (buf, lookup_buf)) {
                 /* mismatching permissions */
-                gf_log (this->name, GF_LOG_DEBUG,
+                gf_log (this->name, GF_LOG_INFO,
                         "permissions differ for %s ", local->loc.path);
-                local->self_heal.do_metadata_self_heal = _gf_true;
+                local->self_heal.need_metadata_self_heal = _gf_true;
         }
 
         if (OWNERSHIP_DIFFERS (buf, lookup_buf)) {
                 /* mismatching permissions */
-                local->self_heal.do_metadata_self_heal = _gf_true;
-                gf_log (this->name, GF_LOG_DEBUG,
+                local->self_heal.need_metadata_self_heal = _gf_true;
+                gf_log (this->name, GF_LOG_INFO,
                         "ownership differs for %s ", local->loc.path);
         }
 
         if (SIZE_DIFFERS (buf, lookup_buf)
             && IA_ISREG (buf->ia_type)) {
-                gf_log (this->name, GF_LOG_DEBUG,
+                gf_log (this->name, GF_LOG_INFO,
                         "size differs for %s ", local->loc.path);
-                local->self_heal.do_data_self_heal = _gf_true;
+                local->self_heal.need_data_self_heal = _gf_true;
         }
 
         if (uuid_compare (buf->ia_gfid, lookup_buf->ia_gfid)) {
                 /* mismatching gfid */
-                gf_log (this->name, GF_LOG_DEBUG,
+                gf_log (this->name, GF_LOG_WARNING,
                         "%s: gfid different on subvolume", local->loc.path);
         }
 }
 
-static void
-afr_detect_self_heal_by_split_brain_status (afr_local_t *local, xlator_t *this)
+int
+afr_is_valid_read_child (int *sources, int32_t child_count, int32_t read_child)
 {
-        gf_boolean_t split_brain = _gf_false;
-        afr_self_heal_t *sh = NULL;
+        int valid = 0;
 
-        sh = &local->self_heal;
+        if (!sources)
+                goto out;
 
-        split_brain = afr_is_split_brain (this, local->cont.lookup.inode);
-        split_brain = split_brain || local->cont.lookup.possible_spb;
-        if ((local->success_count > 0) && split_brain &&
-            IA_ISREG (local->cont.lookup.inode->ia_type)) {
-                sh->force_confirm_spb = _gf_true;
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "split brain detected during lookup of %s.",
-                        local->loc.path);
-        }
+        if ((read_child < 0) ||
+            (read_child >= child_count))
+                goto out;
+
+        valid = sources[read_child];
+out:
+        return valid;
 }
 
 static void
@@ -1397,16 +907,30 @@ afr_detect_self_heal_by_lookup_status (afr_local_t *local, xlator_t *this)
         GF_ASSERT (this);
 
         if ((local->success_count > 0) && (local->enoent_count > 0)) {
-                local->self_heal.do_metadata_self_heal = _gf_true;
-                local->self_heal.do_data_self_heal     = _gf_true;
-                local->self_heal.do_entry_self_heal    = _gf_true;
-                local->self_heal.do_gfid_self_heal    = _gf_true;
-                local->self_heal.do_missing_entry_self_heal    = _gf_true;
-                gf_log(this->name, GF_LOG_DEBUG,
+                local->self_heal.need_metadata_self_heal = _gf_true;
+                local->self_heal.need_data_self_heal     = _gf_true;
+                local->self_heal.need_entry_self_heal    = _gf_true;
+                local->self_heal.need_gfid_self_heal    = _gf_true;
+                local->self_heal.need_missing_entry_self_heal    = _gf_true;
+                gf_log(this->name, GF_LOG_INFO,
                        "entries are missing in lookup of %s.",
                        local->loc.path);
+                //If all self-heals are needed no need to check for other rules
+                goto out;
         }
 
+        if ((local->success_count > 0) &&
+            afr_is_split_brain (this, local->cont.lookup.inode) &&
+            IA_ISREG (local->cont.lookup.inode->ia_type)) {
+                local->self_heal.need_data_self_heal = _gf_true;
+                local->self_heal.need_gfid_self_heal    = _gf_true;
+                local->self_heal.need_missing_entry_self_heal    = _gf_true;
+                gf_log (this->name, GF_LOG_WARNING,
+                        "split brain detected during lookup of %s.",
+                        local->loc.path);
+        }
+
+out:
         return;
 }
 
@@ -1416,14 +940,11 @@ afr_can_self_heal_proceed (afr_self_heal_t *sh, afr_private_t *priv)
         GF_ASSERT (sh);
         GF_ASSERT (priv);
 
-        if (sh->force_confirm_spb)
-                return _gf_true;
-        return (sh->do_gfid_self_heal
-                || sh->do_missing_entry_self_heal
-                || (afr_data_self_heal_enabled (priv->data_self_heal) &&
-                    sh->do_data_self_heal)
-                || (priv->metadata_self_heal && sh->do_metadata_self_heal)
-                || (priv->entry_self_heal && sh->do_entry_self_heal));
+        return (sh->need_gfid_self_heal
+                || sh->need_missing_entry_self_heal
+                || (priv->data_self_heal && sh->need_data_self_heal)
+                || (priv->metadata_self_heal && sh->need_metadata_self_heal)
+                || (priv->entry_self_heal && sh->need_entry_self_heal));
 }
 
 afr_transaction_type
@@ -1450,14 +971,14 @@ afr_lookup_select_read_child (afr_local_t *local, xlator_t *this,
         int                     ret            = -1;
         dict_t                  **xattrs       = NULL;
         int32_t                 *success_children = NULL;
+        struct iatt             *bufs          = NULL;
         afr_transaction_type    type           = AFR_METADATA_TRANSACTION;
-        uuid_t                  *gfid          = NULL;
 
         GF_ASSERT (local);
         GF_ASSERT (this);
-        GF_ASSERT (local->success_count > 0);
 
-        success_children = local->cont.lookup.success_children;
+        bufs = local->cont.lookup.bufs;
+        success_children = local->cont.lookup.child_success;
         /*We can take the success_children[0] only because we already
          *handle the conflicting children other wise, we could select the
          *read_child based on wrong file type
@@ -1465,9 +986,8 @@ afr_lookup_select_read_child (afr_local_t *local, xlator_t *this,
         ia_type = local->cont.lookup.bufs[success_children[0]].ia_type;
         type = afr_transaction_type_get (ia_type);
         xattrs = local->cont.lookup.xattrs;
-        gfid = &local->cont.lookup.buf.ia_gfid;
         source = afr_lookup_select_read_child_by_txn_type (this, local, xattrs,
-                                                           type, *gfid);
+                                                           type);
         if (source < 0) {
                 gf_log (this->name, GF_LOG_DEBUG, "failed to select source "
                         "for %s", local->loc.path);
@@ -1483,45 +1003,39 @@ out:
 }
 
 static inline gf_boolean_t
-afr_is_transaction_running (afr_local_t *local)
+afr_is_self_heal_running (afr_local_t *local)
 {
-        GF_ASSERT (local->fop == GF_FOP_LOOKUP);
+        GF_ASSERT (local);
         return ((local->inodelk_count > 0) || (local->entrylk_count > 0));
 }
 
-void
-afr_launch_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode,
-                      gf_boolean_t background, ia_type_t ia_type, char *reason,
-                      void (*gfid_sh_success_cbk) (call_frame_t *sh_frame,
-                                                   xlator_t *this),
+static void
+afr_launch_self_heal (call_frame_t *frame, xlator_t *this,
+                      gf_boolean_t is_background, ia_type_t ia_type,
+                      inode_t *inode,
+                      void (*gfid_sh_success_cbk) (call_frame_t*, xlator_t*),
                       int (*unwind) (call_frame_t *frame, xlator_t *this,
-                                     int32_t op_ret, int32_t op_errno,
-                                     int32_t sh_failed))
+                                     int32_t op_ret, int32_t op_errno))
 {
         afr_local_t             *local = NULL;
         char                    sh_type_str[256] = {0,};
-        char                    *bg = "";
 
         GF_ASSERT (frame);
         GF_ASSERT (this);
-        GF_ASSERT (inode);
-        GF_ASSERT (ia_type != IA_INVAL);
 
         local = frame->local;
-        local->self_heal.background = background;
+        local->self_heal.background = is_background;
         local->self_heal.type       = ia_type;
         local->self_heal.unwind     = unwind;
-        local->self_heal.gfid_sh_success_cbk     = gfid_sh_success_cbk;
+        local->self_heal.gfid_sh_success_cbk = gfid_sh_success_cbk;
 
         afr_self_heal_type_str_get (&local->self_heal,
                                     sh_type_str,
                                     sizeof (sh_type_str));
 
-        if (background)
-                bg = "background";
-        gf_log (this->name, GF_LOG_DEBUG,
-                "%s %s self-heal triggered. path: %s, reason: %s", bg,
-                sh_type_str, local->loc.path, reason);
+        gf_log (this->name, GF_LOG_INFO,
+                "background %s self-heal triggered. path: %s",
+                sh_type_str, local->loc.path);
 
         afr_self_heal (frame, this, inode);
 }
@@ -1559,7 +1073,7 @@ afr_lookup_gfid_missing_count (afr_local_t *local, xlator_t *this)
 
         priv = this->private;
         bufs = local->cont.lookup.bufs;
-        success_children = local->cont.lookup.success_children;
+        success_children = local->cont.lookup.child_success;
 
         miss_count =  afr_gfid_missing_count (this->name, success_children,
                                               bufs, priv->child_count,
@@ -1577,6 +1091,7 @@ afr_conflicting_iattrs (struct iatt *bufs, int32_t *success_children,
         struct iatt     *child1        = NULL;
         struct iatt     *child2        = NULL;
         uuid_t          *gfid          = NULL;
+        char            gfid_str[64]   = {0};
 
         for (i = 0; i < child_count; i++) {
                 if (success_children[i] == -1)
@@ -1590,7 +1105,7 @@ afr_conflicting_iattrs (struct iatt *bufs, int32_t *success_children,
 
                 child2 = &bufs[success_children[i-1]];
                 if (FILETYPE_DIFFERS (child1, child2)) {
-                        gf_log (xlator_name, GF_LOG_DEBUG, "%s: filetype "
+                        gf_log (xlator_name, GF_LOG_WARNING, "%s: filetype "
                                 "differs on subvolumes (%d, %d)", path,
                                 success_children[i-1], success_children[i]);
                         conflicting = _gf_true;
@@ -1599,10 +1114,13 @@ afr_conflicting_iattrs (struct iatt *bufs, int32_t *success_children,
                 if (!gfid || uuid_is_null (child1->ia_gfid))
                         continue;
                 if (uuid_compare (*gfid, child1->ia_gfid)) {
-                       gf_log (xlator_name, GF_LOG_DEBUG, "%s: gfid differs"
-                               " on subvolume %d", path, success_children[i]);
-                       conflicting = _gf_true;
-                       goto out;
+                        uuid_utoa_r (*gfid, gfid_str);
+                        gf_log (xlator_name, GF_LOG_WARNING, "%s: gfid differs"
+                                " on subvolume %d (%s, %s)", path,
+                                success_children[i], gfid_str,
+                                uuid_utoa (child1->ia_gfid));
+                        conflicting = _gf_true;
+                        goto out;
                 }
         }
 out:
@@ -1647,33 +1165,14 @@ afr_lookup_conflicting_entries (afr_local_t *local, xlator_t *this)
 
         priv = this->private;
         conflict =  afr_conflicting_iattrs (local->cont.lookup.bufs,
-                                            local->cont.lookup.success_children,
+                                            local->cont.lookup.child_success,
                                             priv->child_count, local->loc.path,
                                             this->name);
         return conflict;
 }
 
-gf_boolean_t
-afr_open_only_data_self_heal (char *data_self_heal)
-{
-        return !strcmp (data_self_heal, "open");
-}
-
-gf_boolean_t
-afr_data_self_heal_enabled (char *data_self_heal)
-{
-        gf_boolean_t    enabled = _gf_false;
-
-        if (gf_string2boolean (data_self_heal, &enabled) == -1) {
-                enabled = !strcmp (data_self_heal, "open");
-                GF_ASSERT (enabled);
-        }
-
-        return enabled;
-}
-
 static void
-afr_lookup_set_self_heal_params (afr_local_t *local, xlator_t *this)
+afr_lookup_set_self_heal_data (afr_local_t *local, xlator_t *this)
 {
         int                     i = 0;
         struct iatt             *bufs = NULL;
@@ -1681,60 +1180,49 @@ afr_lookup_set_self_heal_params (afr_local_t *local, xlator_t *this)
         afr_private_t           *priv = NULL;
         int32_t                 child1 = -1;
         int32_t                 child2 = -1;
-        afr_self_heal_t         *sh = NULL;
 
         priv  = this->private;
-        sh = &local->self_heal;
-
         afr_detect_self_heal_by_lookup_status (local, this);
 
         if (afr_lookup_gfid_missing_count (local, this))
-                local->self_heal.do_gfid_self_heal    = _gf_true;
+                local->self_heal.need_gfid_self_heal    = _gf_true;
 
         if (_gf_true == afr_lookup_conflicting_entries (local, this))
-                local->self_heal.do_missing_entry_self_heal    = _gf_true;
+                local->self_heal.need_missing_entry_self_heal    = _gf_true;
         else
                 afr_update_gfid_from_iatts (local->self_heal.sh_gfid_req,
                                             local->cont.lookup.bufs,
-                                            local->cont.lookup.success_children,
+                                            local->cont.lookup.child_success,
                                             priv->child_count);
 
         bufs = local->cont.lookup.bufs;
         for (i = 1; i < local->success_count; i++) {
-                child1 = local->cont.lookup.success_children[i-1];
-                child2 = local->cont.lookup.success_children[i];
+                child1 = local->cont.lookup.child_success[i-1];
+                child2 = local->cont.lookup.child_success[i];;
                 afr_detect_self_heal_by_iatt (local, this,
                                               &bufs[child1], &bufs[child2]);
         }
 
         xattr = local->cont.lookup.xattrs;
         for (i = 0; i < local->success_count; i++) {
-                child1 = local->cont.lookup.success_children[i];
-                afr_lookup_set_self_heal_params_by_xattr (local, this,
-                                                          xattr[child1]);
-        }
-        if (afr_open_only_data_self_heal (priv->data_self_heal))
-                sh->do_data_self_heal = _gf_false;
-        if (sh->do_metadata_self_heal)
-                afr_lookup_check_set_metadata_split_brain (local, this);
-        afr_detect_self_heal_by_split_brain_status (local, this);
+                child1 = local->cont.lookup.child_success[i];;
+                afr_lookup_detect_self_heal_by_xattr (local, this,
+                                                      xattr[child1]);
+        }
 }
 
 int
 afr_self_heal_lookup_unwind (call_frame_t *frame, xlator_t *this,
-                             int32_t op_ret, int32_t op_errno,
-                             int32_t sh_failed)
+                             int32_t op_ret, int32_t op_errno)
 {
         afr_local_t *local = NULL;
-        int         ret    = -1;
-        dict_t      *xattr = NULL;
 
         local = frame->local;
 
         if (op_ret == -1) {
                 local->op_ret = -1;
-		local->op_errno = afr_most_important_error(local->op_errno,
-							   op_errno, _gf_true);
+                if (afr_error_more_important (local->op_errno, op_errno))
+                        local->op_errno = op_errno;
 
                 goto out;
         } else {
@@ -1742,29 +1230,11 @@ afr_self_heal_lookup_unwind (call_frame_t *frame, xlator_t *this,
         }
 
         afr_lookup_done_success_action (frame, this, _gf_true);
-        xattr = local->cont.lookup.xattr;
-        if (xattr) {
-                ret = dict_set_int32 (xattr, "sh-failed", sh_failed);
-                if (ret)
-                        gf_log (this->name, GF_LOG_ERROR, "%s: Failed to set "
-                                "sh-failed to %d", local->loc.path, sh_failed);
-
-                if (local->self_heal.actual_sh_started == _gf_true &&
-                    sh_failed == 0) {
-                        ret = dict_set_int32 (xattr, "actual-sh-done", 1);
-                        if (ret)
-                                gf_log(this->name, GF_LOG_ERROR, "%s: Failed to"
-                                       " set actual-sh-done to %d",
-                                       local->loc.path,
-                                       local->self_heal.actual_sh_started);
-                }
-        }
 out:
         AFR_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno,
                           local->cont.lookup.inode, &local->cont.lookup.buf,
                           local->cont.lookup.xattr,
                           &local->cont.lookup.postparent);
-
         return 0;
 }
 
@@ -1802,44 +1272,41 @@ afr_post_gfid_sh_success (call_frame_t *sh_frame, xlator_t *this)
                 if (sh->xattr[i])
                         local->cont.lookup.xattrs[i] = dict_ref (sh->xattr[i]);
         }
-
-        afr_reset_children (local->cont.lookup.success_children,
+        afr_reset_children (local->cont.lookup.child_success,
                             priv->child_count);
-        afr_children_copy (local->cont.lookup.success_children,
+        afr_children_copy (local->cont.lookup.child_success,
                            sh->fresh_children, priv->child_count);
 }
 
 static void
-afr_lookup_perform_self_heal (call_frame_t *frame, xlator_t *this,
-                              gf_boolean_t *sh_launched)
+afr_lookup_perform_self_heal_if_needed (call_frame_t *frame, xlator_t *this,
+                                        gf_boolean_t *sh_launched)
 {
-        unsigned int         up_count = 0;
+        size_t              up_count = 0;
         afr_private_t       *priv    = NULL;
         afr_local_t         *local   = NULL;
-        char                *reason  = NULL;
 
         GF_ASSERT (sh_launched);
         *sh_launched = _gf_false;
         priv         = this->private;
         local        = frame->local;
 
-        up_count  = afr_up_children_count (local->child_up, priv->child_count);
+        up_count  = afr_up_children_count (priv->child_count, local->child_up);
         if (up_count == 1) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "Only 1 child up - do not attempt to detect self heal");
                 goto out;
         }
 
-        afr_lookup_set_self_heal_params (local, this);
+        afr_lookup_set_self_heal_data (local, this);
         if (afr_can_self_heal_proceed (&local->self_heal, priv)) {
-                if  (afr_is_transaction_running (local) &&
-                     (!local->allow_sh_for_running_transaction))
+                if  (afr_is_self_heal_running (local))
                         goto out;
 
-                reason = "lookup detected pending operations";
-                afr_launch_self_heal (frame, this, local->cont.lookup.inode,
-                                      _gf_true, local->cont.lookup.buf.ia_type,
-                                      reason, afr_post_gfid_sh_success,
+                afr_launch_self_heal (frame, this, _gf_true,
+                                      local->cont.lookup.buf.ia_type,
+                                      local->cont.lookup.inode,
+                                      afr_post_gfid_sh_success,
                                       afr_self_heal_lookup_unwind);
                 *sh_launched = _gf_true;
         }
@@ -1847,42 +1314,13 @@ out:
         return;
 }
 
-void
-afr_get_fresh_children (int32_t *success_children, int32_t *sources,
-                        int32_t *fresh_children, unsigned int child_count)
-{
-        unsigned int i = 0;
-        unsigned int j = 0;
-
-        GF_ASSERT (success_children);
-        GF_ASSERT (sources);
-        GF_ASSERT (fresh_children);
-
-        afr_reset_children (fresh_children, child_count);
-        for (i = 0; i < child_count; i++) {
-                if (success_children[i] == -1)
-                        break;
-                if (afr_is_read_child (success_children, sources, child_count,
-                                       success_children[i])) {
-                        fresh_children[j] = success_children[i];
-                        j++;
-                }
-        }
-}
-
 static int
-afr_lookup_set_read_ctx (afr_local_t *local, xlator_t *this, int32_t read_child)
+afr_lookup_set_read_child (afr_local_t *local, xlator_t *this, int32_t read_child)
 {
-        afr_private_t           *priv = NULL;
-
         GF_ASSERT (read_child >= 0);
 
-        priv = this->private;
-        afr_get_fresh_children (local->cont.lookup.success_children,
-                                local->cont.lookup.sources,
-                                local->fresh_children, priv->child_count);
-        afr_inode_set_read_ctx (this, local->cont.lookup.inode, read_child,
-                                local->fresh_children);
+        afr_set_read_child (this, local->cont.lookup.inode, read_child);
+        local->cont.lookup.read_child = read_child;
 
         return 0;
 }
@@ -1894,175 +1332,53 @@ afr_lookup_done_success_action (call_frame_t *frame, xlator_t *this,
         int32_t             read_child = -1;
         int32_t             ret        = -1;
         afr_local_t         *local     = NULL;
-        gf_boolean_t        fresh_lookup = _gf_false;
+        afr_private_t       *priv      = NULL;
 
         local   = frame->local;
-        fresh_lookup = local->cont.lookup.fresh_lookup;
+        priv    = this->private;
 
         if (local->loc.parent == NULL)
                 fail_conflict = _gf_true;
 
-        if (afr_lookup_conflicting_entries (local, this)) {
-                if (fail_conflict == _gf_false)
+        if (afr_conflicting_iattrs (local->cont.lookup.bufs,
+                                    local->cont.lookup.child_success,
+                                    priv->child_count, local->loc.path,
+                                     this->name)) {
+                if (fail_conflict == _gf_false) {
                         ret = 0;
+                } else {
+                        local->op_ret = -1;
+                        local->op_errno = EIO;
+                }
                 goto out;
         }
 
         ret = afr_lookup_select_read_child (local, this, &read_child);
-        if (!afr_is_transaction_running (local) || fresh_lookup) {
-                if (read_child < 0)
-                        goto out;
-
-                ret = afr_lookup_set_read_ctx (local, this, read_child);
-                if (ret)
-                        goto out;
-        }
-
-        ret = afr_lookup_build_response_params (local, this);
-        if (ret)
+        if (ret) {
+                local->op_ret = -1;
+                local->op_errno = EIO;
                 goto out;
-        afr_update_loc_gfids (&local->loc,
-                              &local->cont.lookup.buf,
-                              &local->cont.lookup.postparent);
+        }
 
-        ret = 0;
-out:
+        ret = afr_lookup_set_read_child (local, this, read_child);
         if (ret) {
                 local->op_ret = -1;
                 local->op_errno = EIO;
+                goto out;
         }
-        return ret;
-}
-
-int
-afr_lookup_get_latest_subvol (afr_local_t *local, xlator_t *this)
-{
-        afr_private_t *priv = NULL;
-        int32_t       *success_children = NULL;
-        struct iatt   *bufs = NULL;
-        int           i = 0;
-        int           child = 0;
-        int           lsubvol = -1;
 
-        priv = this->private;
-        success_children = local->cont.lookup.success_children;
-        bufs = local->cont.lookup.bufs;
-        for (i = 0; i < priv->child_count; i++) {
-                child = success_children[i];
-                if (child == -1)
-                        break;
-                if (uuid_is_null (bufs[child].ia_gfid))
-                        continue;
-                if (lsubvol < 0) {
-                        lsubvol = child;
-                } else if (bufs[lsubvol].ia_ctime < bufs[child].ia_ctime) {
-                        lsubvol = child;
-                } else if ((bufs[lsubvol].ia_ctime == bufs[child].ia_ctime) &&
-                  (bufs[lsubvol].ia_ctime_nsec < bufs[child].ia_ctime_nsec)) {
-                        lsubvol = child;
-                }
+        afr_lookup_build_response_params (local, this);
+        if (afr_is_fresh_lookup (&local->loc, this)) {
+                afr_update_loc_gfids (&local->loc,
+                                      &local->cont.lookup.buf,
+                                      &local->cont.lookup.postparent);
         }
-        return lsubvol;
-}
-
-void
-afr_lookup_mark_other_entries_stale (afr_local_t *local, xlator_t *this,
-                                     int subvol)
-{
-        afr_private_t *priv = NULL;
-        int32_t       *success_children = NULL;
-        struct iatt   *bufs = NULL;
-        int           i = 0;
-        int           child = 0;
 
-        priv = this->private;
-        success_children = local->cont.lookup.success_children;
-        bufs = local->cont.lookup.bufs;
-        memcpy (local->fresh_children, success_children,
-                sizeof (*success_children) * priv->child_count);
-        for (i = 0; i < priv->child_count; i++) {
-                child = local->fresh_children[i];
-                if (child == -1)
-                        break;
-                if (child == subvol)
-                        continue;
-                if (uuid_is_null (bufs[child].ia_gfid) &&
-                    (bufs[child].ia_type == bufs[subvol].ia_type))
-                        continue;
-                afr_children_rm_child (success_children, child,
-                                       priv->child_count);
-                local->success_count--;
-        }
-        afr_reset_children (local->fresh_children, priv->child_count);
-}
-
-void
-afr_succeed_lookup_on_latest_iatt (afr_local_t *local, xlator_t *this)
-{
-        int    lsubvol = 0;
-
-        if (!afr_lookup_conflicting_entries (local, this))
-                goto out;
-
-        lsubvol = afr_lookup_get_latest_subvol (local, this);
-        if (lsubvol < 0)
-                goto out;
-        afr_lookup_mark_other_entries_stale (local, this, lsubvol);
+        ret = 0;
 out:
-        return;
-}
-
-gf_boolean_t
-afr_is_entry_possibly_under_creation (afr_local_t *local, xlator_t *this)
-{
-        /*
-         * We need to perform this test in lookup done and treat on going
-         * create/DELETE as ENOENT.
-         * Reason:
-        Multiple clients A, B and C are attempting 'mkdir -p /mnt/a/b/c'
-
-        1 Client A is in the middle of mkdir(/a). It has acquired lock.
-          It has performed mkdir(/a) on one subvol, and second one is still
-          in progress
-        2 Client B performs a lookup, sees directory /a on one,
-          ENOENT on the other, succeeds lookup.
-        3 Client B performs lookup on /a/b on both subvols, both return ENOENT
-          (one subvol because /a/b does not exist, another because /a
-          itself does not exist)
-        4 Client B proceeds to mkdir /a/b. It obtains entrylk on inode=/a with
-          basename=b on one subvol, but fails on other subvol as /a is yet to
-          be created by Client A.
-        5 Client A finishes mkdir of /a on other subvol
-        6 Client C also attempts to create /a/b, lookup returns ENOENT on
-          both subvols.
-        7 Client C tries to obtain entrylk on on inode=/a with basename=b,
-          obtains on one subvol (where B had failed), and waits for B to unlock
-          on other subvol.
-        8 Client B finishes mkdir() on one subvol with GFID-1 and completes
-          transaction and unlocks
-        9 Client C gets the lock on the second subvol, At this stage second
-          subvol already has /a/b created from Client B, but Client C does not
-          check that in the middle of mkdir transaction
-        10 Client C attempts mkdir /a/b on both subvols. It succeeds on
-           ONLY ONE (where Client B could not get lock because of
-           missing parent /a dir) with GFID-2, and gets EEXIST from ONE subvol.
-        This way we have /a/b in GFID mismatch. One subvol got GFID-1 because
-        Client B performed transaction on only one subvol (because entrylk()
-        could not be obtained on second subvol because of missing parent dir --
-        caused by premature/speculative succeeding of lookup() on /a when locks
-        are detected). Other subvol gets GFID-2 from Client C because while
-        it was waiting for entrylk() on both subvols, Client B was in the
-        middle of creating mkdir() on only one subvol, and Client C does not
-        "expect" this when it is between lock() and pre-op()/op() phase of the
-        transaction.
-         */
-	if (local->cont.lookup.parent_entrylk && local->enoent_count)
-		return _gf_true;
-
-	return _gf_false;
+        return ret;
 }
 
-
 static void
 afr_lookup_done (call_frame_t *frame, xlator_t *this)
 {
@@ -2079,21 +1395,11 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this)
         priv  = this->private;
         local = frame->local;
 
-	if (afr_is_entry_possibly_under_creation (local, this)) {
-		local->op_ret = -1;
-		local->op_errno = ENOENT;
-		goto unwind;
-	}
-
         if (local->op_ret < 0)
                 goto unwind;
-
-        if (local->cont.lookup.parent_entrylk && local->success_count > 1)
-                afr_succeed_lookup_on_latest_iatt (local, this);
-
         gfid_miss_count = afr_lookup_gfid_missing_count (local, this);
-        up_children_count = afr_up_children_count (local->child_up,
-                                                   priv->child_count);
+        up_children_count = afr_up_children_count (priv->child_count,
+                                                   local->child_up);
         enotconn_count = priv->child_count - up_children_count;
         if ((gfid_miss_count == local->success_count) &&
             (enotconn_count > 0)) {
@@ -2121,7 +1427,7 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this)
                 goto unwind;
         uuid_copy (local->self_heal.sh_gfid_req, local->cont.lookup.gfid_req);
 
-        afr_lookup_perform_self_heal (frame, this, &sh_launched);
+        afr_lookup_perform_self_heal_if_needed (frame, this, &sh_launched);
         if (sh_launched) {
                 unwind = 0;
                 goto unwind;
@@ -2129,12 +1435,12 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this)
 
  unwind:
          if (unwind) {
-                 AFR_STACK_UNWIND (lookup, frame, local->op_ret,
-                                   local->op_errno, local->cont.lookup.inode,
-                                   &local->cont.lookup.buf,
-                                   local->cont.lookup.xattr,
-                                   &local->cont.lookup.postparent);
-        }
+                AFR_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno,
+                                  local->cont.lookup.inode,
+                                  &local->cont.lookup.buf,
+                                  local->cont.lookup.xattr,
+                                  &local->cont.lookup.postparent);
+         }
 }
 
 /*
@@ -2142,20 +1448,24 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this)
  * others in that they must be given higher priority while
  * returning to the user.
  *
- * The hierarchy is ESTALE > EIO > ENOENT > others
+ * The hierarchy is ESTALE > ENOENT > others
+ *
  */
-int32_t
-afr_most_important_error(int32_t old_errno, int32_t new_errno,
-			 gf_boolean_t eio)
+
+gf_boolean_t
+afr_error_more_important (int32_t old_errno, int32_t new_errno)
 {
-	if (old_errno == ESTALE || new_errno == ESTALE)
-		return ESTALE;
-	if (eio && (old_errno == EIO || new_errno == EIO))
-		return EIO;
-	if (old_errno == ENOENT || new_errno == ENOENT)
-		return ENOENT;
-
-	return new_errno;
+        gf_boolean_t ret = _gf_true;
+
+        /* Nothing should ever overwrite ESTALE */
+        if (old_errno == ESTALE)
+                ret = _gf_false;
+
+        /* Nothing should overwrite ENOENT, except ESTALE */
+        else if ((old_errno == ENOENT) && (new_errno != ESTALE))
+                ret = _gf_false;
+
+        return ret;
 }
 
 int32_t
@@ -2174,9 +1484,8 @@ afr_resultant_errno_get (int32_t *children,
                 } else {
                         child = i;
                 }
-		op_errno = afr_most_important_error(op_errno,
-						    child_errno[child],
-						    _gf_false);
+                if (afr_error_more_important (op_errno, child_errno[child]))
+                                op_errno = child_errno[child];
         }
         return op_errno;
 }
@@ -2188,9 +1497,8 @@ afr_lookup_handle_error (afr_local_t *local, int32_t op_ret,  int32_t op_errno)
         if (op_errno == ENOENT)
                 local->enoent_count++;
 
-	local->op_errno = afr_most_important_error(local->op_errno, op_errno,
-						   _gf_false);
-
+        if (afr_error_more_important (local->op_errno, op_errno))
+                local->op_errno = op_errno;
         if (local->op_errno == ESTALE) {
                 local->op_ret = -1;
         }
@@ -2203,7 +1511,7 @@ afr_set_root_inode_on_first_lookup (afr_local_t *local, xlator_t *this,
         afr_private_t           *priv = NULL;
         GF_ASSERT (inode);
 
-        if (!__is_root_gfid (inode->gfid))
+        if (inode->ino != 1)
                 goto out;
         if (!afr_is_fresh_lookup (&local->loc, this))
                 goto out;
@@ -2236,79 +1544,12 @@ afr_lookup_handle_first_success (afr_local_t *local, xlator_t *this,
         afr_set_root_inode_on_first_lookup (local, this, inode);
 }
 
-static int32_t
-afr_discovery_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, dict_t *dict,
-                   dict_t *xdata)
-{
-        int              ret            = 0;
-        char            *pathinfo       = NULL;
-        gf_boolean_t     is_local        = _gf_false;
-        afr_private_t   *priv           = NULL;
-        int32_t          child_index    = -1;
-
-        if (op_ret != 0) {
-                goto out;
-        }
-
-        ret = dict_get_str (dict, GF_XATTR_PATHINFO_KEY, &pathinfo);
-        if (ret != 0) {
-                goto out;
-        }
-
-        ret = afr_local_pathinfo (pathinfo, &is_local);
-        if (ret) {
-                goto out;
-        }
-
-        priv = this->private;
-        /*
-         * Note that one local subvolume will override another here.  The only
-         * way to avoid that would be to retain extra information about whether
-         * the previous read_child is local, and it's just not worth it.  Even
-         * the slowest local subvolume is far preferable to a remote one.
-         */
-        if (is_local) {
-                child_index = (int32_t)(long)cookie;
-                gf_log (this->name, GF_LOG_INFO,
-                        "selecting local read_child %s",
-                        priv->children[child_index]->name);
-                priv->read_child = child_index;
-        }
-
-out:
-        STACK_DESTROY(frame->root);
-        return 0;
-}
-
-static void
-afr_attempt_local_discovery (xlator_t *this, int32_t child_index)
-{
-        call_frame_t    *newframe = NULL;
-        loc_t            tmploc = {0,};
-        afr_private_t   *priv = this->private;
-
-        newframe = create_frame(this,this->ctx->pool);
-        if (!newframe) {
-                return;
-        }
-
-        tmploc.gfid[sizeof(tmploc.gfid)-1] = 1;
-        STACK_WIND_COOKIE (newframe, afr_discovery_cbk,
-                           (void *)(long)child_index,
-                           priv->children[child_index],
-                           priv->children[child_index]->fops->getxattr,
-                           &tmploc, GF_XATTR_PATHINFO_KEY, NULL);
-}
-
 static void
 afr_lookup_handle_success (afr_local_t *local, xlator_t *this, int32_t child_index,
                            int32_t op_ret, int32_t op_errno, inode_t *inode,
                            struct iatt *buf, dict_t *xattr,
                            struct iatt *postparent)
 {
-        afr_private_t   *priv   = this->private;
-
         if (local->success_count == 0) {
                 if (local->op_errno != ESTALE) {
                         local->op_ret = op_ret;
@@ -2321,12 +1562,7 @@ afr_lookup_handle_success (afr_local_t *local, xlator_t *this, int32_t child_ind
 
         afr_lookup_cache_args (local, child_index, xattr,
                                buf, postparent);
-
-        if (local->do_discovery && (priv->read_child == (-1))) {
-                afr_attempt_local_discovery(this,child_index);
-        }
-
-        local->cont.lookup.success_children[local->success_count] = child_index;
+        local->cont.lookup.child_success[local->success_count] = child_index;
         local->success_count++;
 }
 
@@ -2370,10 +1606,10 @@ int
 afr_lookup_cont_init (afr_local_t *local, unsigned int child_count)
 {
         int               ret            = -ENOMEM;
+        int32_t           *child_success = NULL;
         struct iatt       *iatts         = NULL;
-        int32_t           *success_children = NULL;
-        int32_t           *sources       = NULL;
-        int32_t           **pending_matrix = NULL;
+        int               i              = 0;
+        int32_t           *sources         = NULL;
 
         GF_ASSERT (local);
         local->cont.lookup.xattrs = GF_CALLOC (child_count,
@@ -2392,25 +1628,20 @@ afr_lookup_cont_init (afr_local_t *local, unsigned int child_count)
                 goto out;
         local->cont.lookup.bufs = iatts;
 
-        success_children = afr_children_create (child_count);
-        if (NULL == success_children)
+        child_success = GF_CALLOC (child_count, sizeof (*child_success),
+                                   gf_afr_mt_char);
+        if (NULL == child_success)
                 goto out;
-        local->cont.lookup.success_children = success_children;
+        for (i = 0; i < child_count; i++)
+                child_success[i] = -1;
 
-        local->fresh_children = afr_children_create (child_count);
-        if (NULL == local->fresh_children)
-                goto out;
+        local->cont.lookup.child_success = child_success;
 
         sources = GF_CALLOC (sizeof (*sources), child_count, gf_afr_mt_int32_t);
         if (NULL == sources)
                 goto out;
-        local->cont.lookup.sources = sources;
-
-        pending_matrix = afr_matrix_create (child_count, child_count);
-        if (NULL == pending_matrix)
-                goto out;
-        local->cont.lookup.pending_matrix = pending_matrix;
 
+        local->cont.lookup.sources = sources;
         ret = 0;
 out:
         return ret;
@@ -2428,55 +1659,41 @@ afr_lookup (call_frame_t *frame, xlator_t *this,
         int               call_count     = 0;
         uint64_t          ctx            = 0;
         int32_t           op_errno       = 0;
-        int               allow_sh       = 0;
+
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (local, out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
         local->op_ret = -1;
 
         frame->local = local;
-        local->fop = GF_FOP_LOOKUP;
 
-        loc_copy (&local->loc, loc);
-        ret = loc_path (&local->loc, NULL);
-        if (ret < 0) {
-                op_errno = EINVAL;
+        if (!strcmp (loc->path, "/" GF_REPLICATE_TRASH_DIR)) {
+                op_errno = ENOENT;
                 goto out;
         }
 
-        if (local->loc.path &&
-            (strcmp (local->loc.path, "/" GF_REPLICATE_TRASH_DIR) == 0)) {
-                op_errno = EPERM;
-                ret = -1;
-                goto out;
-        }
+        loc_copy (&local->loc, loc);
 
-        ret = inode_ctx_get (local->loc.inode, this, &ctx);
+        ret = inode_ctx_get (loc->inode, this, &ctx);
         if (ret == 0) {
                 /* lookup is a revalidate */
 
-                local->read_child_index = afr_inode_get_read_ctx (this,
-                                                               local->loc.inode,
-                                                               NULL);
+                local->read_child_index          = afr_read_child (this,
+                                                                   loc->inode);
         } else {
                 LOCK (&priv->read_child_lock);
                 {
-                        if (priv->hash_mode) {
-                                local->read_child_index = -1;
-                        }
-                        else {
-                                local->read_child_index =
-                                        (++priv->read_child_rr) %
-                                        (priv->child_count);
-                        }
+                        local->read_child_index = (++priv->read_child_rr)
+                                % (priv->child_count);
                 }
                 UNLOCK (&priv->read_child_lock);
-                local->cont.lookup.fresh_lookup = _gf_true;
         }
 
-        local->child_up = memdup (priv->child_up,
-                                  sizeof (*local->child_up) * priv->child_count);
+        if (loc->parent)
+                local->cont.lookup.parent_ino = loc->parent->ino;
+
+        local->child_up = memdup (priv->child_up, priv->child_count);
         if (NULL == local->child_up) {
                 op_errno = ENOMEM;
                 goto out;
@@ -2488,8 +1705,8 @@ afr_lookup (call_frame_t *frame, xlator_t *this,
                 goto out;
         }
 
-        local->call_count = afr_up_children_count (local->child_up,
-                                                   priv->child_count);
+        local->call_count = afr_up_children_count (priv->child_count,
+                                                   local->child_up);
         call_count = local->call_count;
         if (local->call_count == 0) {
                 ret      = -1;
@@ -2500,33 +1717,18 @@ afr_lookup (call_frame_t *frame, xlator_t *this,
         /* By default assume ENOTCONN. On success it will be set to 0. */
         local->op_errno = ENOTCONN;
 
-        ret = dict_get_int32 (xattr_req, "allow-sh-for-running-transaction",
-                              &allow_sh);
-        dict_del (xattr_req, "allow-sh-for-running-transaction");
-        local->allow_sh_for_running_transaction = allow_sh;
-
-        ret = afr_lookup_xattr_req_prepare (local, this, xattr_req, &local->loc,
-                                            &gfid_req);
-        if (ret) {
-                local->op_errno = -ret;
-                goto out;
-        }
-        afr_lookup_save_gfid (local->cont.lookup.gfid_req, gfid_req,
-                              &local->loc);
+        afr_lookup_xattr_req_prepare (local, this, xattr_req, loc, &gfid_req);
+        local->call_count = afr_up_children_count (priv->child_count,
+                                                   local->child_up);
+        afr_lookup_save_gfid (local->cont.lookup.gfid_req, gfid_req, loc);
         local->fop = GF_FOP_LOOKUP;
-        if (priv->choose_local && !priv->did_discovery) {
-                if (gfid_req && __is_root_gfid(gfid_req)) {
-                        local->do_discovery = _gf_true;
-                        priv->did_discovery = _gf_true;
-                }
-        }
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_lookup_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->lookup,
-                                           &local->loc, local->xattr_req);
+                                           loc, local->xattr_req);
                         if (!--call_count)
                                 break;
                 }
@@ -2534,7 +1736,7 @@ afr_lookup (call_frame_t *frame, xlator_t *this,
 
         ret = 0;
 out:
-        if (ret)
+        if (ret == -1)
                 AFR_STACK_UNWIND (lookup, frame, -1, op_errno,
                                   NULL, NULL, NULL, NULL);
 
@@ -2545,7 +1747,7 @@ out:
 /* {{{ open */
 
 int
-__afr_fd_ctx_set (xlator_t *this, fd_t *fd)
+afr_fd_ctx_set (xlator_t *this, fd_t *fd)
 {
         afr_private_t * priv   = NULL;
         int             ret    = -1;
@@ -2557,167 +1759,203 @@ __afr_fd_ctx_set (xlator_t *this, fd_t *fd)
 
         priv = this->private;
 
-        ret = __fd_ctx_get (fd, this, &ctx);
+        LOCK (&fd->lock);
+        {
+                ret = __fd_ctx_get (fd, this, &ctx);
 
-        if (ret == 0)
-                goto out;
+                if (ret == 0)
+                        goto unlock;
 
-        fd_ctx = GF_CALLOC (1, sizeof (afr_fd_ctx_t),
-                            gf_afr_mt_afr_fd_ctx_t);
-        if (!fd_ctx) {
-                ret = -ENOMEM;
-                goto out;
-        }
+                fd_ctx = GF_CALLOC (1, sizeof (afr_fd_ctx_t),
+                                    gf_afr_mt_afr_fd_ctx_t);
+                if (!fd_ctx) {
+                        ret = -ENOMEM;
+                        goto unlock;
+                }
 
-        fd_ctx->pre_op_done = GF_CALLOC (sizeof (*fd_ctx->pre_op_done),
-                                         priv->child_count,
-                                         gf_afr_mt_char);
-        if (!fd_ctx->pre_op_done) {
-                ret = -ENOMEM;
-                goto out;
-        }
+                fd_ctx->pre_op_done = GF_CALLOC (sizeof (*fd_ctx->pre_op_done),
+                                                 priv->child_count,
+                                                 gf_afr_mt_char);
+                if (!fd_ctx->pre_op_done) {
+                        ret = -ENOMEM;
+                        goto unlock;
+                }
 
-        fd_ctx->pre_op_piggyback = GF_CALLOC (sizeof (*fd_ctx->pre_op_piggyback),
-                                              priv->child_count,
-                                              gf_afr_mt_char);
-        if (!fd_ctx->pre_op_piggyback) {
-                ret = -ENOMEM;
-                goto out;
-        }
+                fd_ctx->pre_op_piggyback = GF_CALLOC (sizeof (*fd_ctx->pre_op_piggyback),
+                                                      priv->child_count,
+                                                      gf_afr_mt_char);
+                if (!fd_ctx->pre_op_piggyback) {
+                        ret = -ENOMEM;
+                        goto unlock;
+                }
 
-        fd_ctx->opened_on = GF_CALLOC (sizeof (*fd_ctx->opened_on),
-                                       priv->child_count,
-                                       gf_afr_mt_int32_t);
-        if (!fd_ctx->opened_on) {
-                ret = -ENOMEM;
-                goto out;
-        }
+                fd_ctx->opened_on = GF_CALLOC (sizeof (*fd_ctx->opened_on),
+                                               priv->child_count,
+                                               gf_afr_mt_char);
+                if (!fd_ctx->opened_on) {
+                        ret = -ENOMEM;
+                        goto unlock;
+                }
 
-        fd_ctx->lock_piggyback = GF_CALLOC (sizeof (*fd_ctx->lock_piggyback),
-                                            priv->child_count,
-                                            gf_afr_mt_char);
-        if (!fd_ctx->lock_piggyback) {
-                ret = -ENOMEM;
-                goto out;
-        }
+                fd_ctx->up_count   = priv->up_count;
+                fd_ctx->down_count = priv->down_count;
 
-        fd_ctx->lock_acquired = GF_CALLOC (sizeof (*fd_ctx->lock_acquired),
-                                           priv->child_count,
-                                           gf_afr_mt_char);
-        if (!fd_ctx->lock_acquired) {
-                ret = -ENOMEM;
-                goto out;
-        }
+                fd_ctx->locked_on = GF_CALLOC (sizeof (*fd_ctx->locked_on),
+                                               priv->child_count,
+                                               gf_afr_mt_char);
+                if (!fd_ctx->locked_on) {
+                        ret = -ENOMEM;
+                        goto unlock;
+                }
 
-        fd_ctx->up_count   = priv->up_count;
-        fd_ctx->down_count = priv->down_count;
+                ret = __fd_ctx_set (fd, this, (uint64_t)(long) fd_ctx);
+                if (ret)
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "failed to set fd ctx (%p)", fd);
 
-        fd_ctx->locked_on = GF_CALLOC (sizeof (*fd_ctx->locked_on),
-                                       priv->child_count,
-                                       gf_afr_mt_char);
-        if (!fd_ctx->locked_on) {
-                ret = -ENOMEM;
-                goto out;
+                INIT_LIST_HEAD (&fd_ctx->entries);
         }
-
-	pthread_mutex_init (&fd_ctx->delay_lock, NULL);
-        INIT_LIST_HEAD (&fd_ctx->entries);
-        fd_ctx->call_child = -1;
-
-        INIT_LIST_HEAD (&fd_ctx->eager_locked);
-
-        ret = __fd_ctx_set (fd, this, (uint64_t)(long) fd_ctx);
-        if (ret)
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "failed to set fd ctx (%p)", fd);
+unlock:
+        UNLOCK (&fd->lock);
 out:
         return ret;
 }
 
+/* {{{ flush */
 
 int
-afr_fd_ctx_set (xlator_t *this, fd_t *fd)
+afr_flush_unwind (call_frame_t *frame, xlator_t *this)
 {
-        int ret = -1;
+        afr_local_t *   local = NULL;
+        call_frame_t   *main_frame = NULL;
 
-        LOCK (&fd->lock);
+        local = frame->local;
+
+        LOCK (&frame->lock);
         {
-                ret = __afr_fd_ctx_set (this, fd);
+                if (local->transaction.main_frame)
+                        main_frame = local->transaction.main_frame;
+                local->transaction.main_frame = NULL;
         }
-        UNLOCK (&fd->lock);
+        UNLOCK (&frame->lock);
 
-        return ret;
+        if (main_frame) {
+                AFR_STACK_UNWIND (flush, main_frame,
+                                  local->op_ret, local->op_errno);
+        }
+
+        return 0;
 }
 
-/* {{{ flush */
 
 int
-afr_flush_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-              int32_t op_ret, int32_t op_errno, dict_t *xdata)
+afr_flush_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                    int32_t op_ret, int32_t op_errno)
 {
         afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
         int call_count  = -1;
+        int child_index = (long) cookie;
+        int need_unwind = 0;
 
         local = frame->local;
+        priv  = this->private;
 
         LOCK (&frame->lock);
         {
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
                 if (op_ret != -1) {
                         if (local->success_count == 0) {
                                 local->op_ret = op_ret;
                         }
                         local->success_count++;
+
+                        if (local->success_count == priv->wait_count) {
+                                need_unwind = 1;
+                        }
                 }
 
                 local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
-	call_count = afr_frame_return (frame);
+        if (need_unwind)
+                afr_flush_unwind (frame, this);
+
+        call_count = afr_frame_return (frame);
 
-	if (call_count == 0)
-		AFR_STACK_UNWIND(flush, frame, local->op_ret,
-				 local->op_errno, NULL);
+        if (call_count == 0) {
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
 
-static int
-afr_flush_wrapper (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
+
+int
+afr_flush_wind (call_frame_t *frame, xlator_t *this)
 {
-        int           i      = 0;
-        afr_local_t   *local = NULL;
-        afr_private_t *priv  = NULL;
-        int call_count       = -1;
+        afr_local_t *local = NULL;
+        afr_private_t *priv = NULL;
+        int i = 0;
+        int call_count = -1;
 
-        priv = this->private;
         local = frame->local;
-        call_count = local->call_count;
+        priv = this->private;
+
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
+
+        if (call_count == 0) {
+                local->transaction.resume (frame, this);
+                return 0;
+        }
+
+        local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
-                        STACK_WIND_COOKIE (frame, afr_flush_cbk,
+                        STACK_WIND_COOKIE (frame, afr_flush_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->flush,
-                                           local->fd, NULL);
+                                           local->fd);
+
                         if (!--call_count)
                                 break;
-
                 }
         }
 
         return 0;
 }
 
+
 int
-afr_flush (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
+afr_flush_done (call_frame_t *frame, xlator_t *this)
 {
-        afr_private_t *priv  = NULL;
-        afr_local_t   *local = NULL;
-        call_stub_t   *stub = NULL;
-        int            ret        = -1;
-        int            op_errno   = 0;
+        afr_local_t *local = NULL;
+
+        local = frame->local;
+
+        local->transaction.unwind (frame, this);
+
+        AFR_STACK_DESTROY (frame);
+
+        return 0;
+}
+
+
+int
+afr_flush (call_frame_t *frame, xlator_t *this, fd_t *fd)
+{
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret        = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
+        int call_count = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -2725,27 +1963,47 @@ afr_flush (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
 
         priv = this->private;
 
-	AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-	local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
+
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
+                goto out;
+        }
 
-	ret = afr_local_init(local, priv, &op_errno);
-	if (ret < 0)
-		goto out;
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
-	local->fd = fd_ref(fd);
-        stub = fop_flush_stub (frame, afr_flush_wrapper, fd, xdata);
-        if (!stub) {
-                ret = -1;
+        transaction_frame = copy_frame (frame);
+        if (!transaction_frame) {
                 op_errno = ENOMEM;
                 goto out;
         }
 
-        afr_delayed_changelog_wake_resume (this, fd, stub);
-	ret = 0;
+        transaction_frame->local = local;
 
+        local->op = GF_FOP_FLUSH;
+
+        local->transaction.fop    = afr_flush_wind;
+        local->transaction.done   = afr_flush_done;
+        local->transaction.unwind = afr_flush_unwind;
+
+        local->fd                 = fd_ref (fd);
+
+        local->transaction.main_frame = frame;
+        local->transaction.start  = 0;
+        local->transaction.len    = 0;
+
+        afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
+
+
+        op_ret = 0;
 out:
-	if (ret < 0)
-		AFR_STACK_UNWIND(flush, frame, -1, op_errno, NULL);
+        if (op_ret == -1) {
+                if (transaction_frame)
+                        AFR_STACK_DESTROY (transaction_frame);
+
+                AFR_STACK_UNWIND (flush, frame, op_ret, op_errno);
+        }
 
         return 0;
 }
@@ -2767,18 +2025,17 @@ afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd)
         fd_ctx = (afr_fd_ctx_t *)(long) ctx;
 
         if (fd_ctx) {
-                GF_FREE (fd_ctx->pre_op_done);
+                if (fd_ctx->pre_op_done)
+                        GF_FREE (fd_ctx->pre_op_done);
 
-                GF_FREE (fd_ctx->opened_on);
+                if (fd_ctx->opened_on)
+                        GF_FREE (fd_ctx->opened_on);
 
-                GF_FREE (fd_ctx->locked_on);
+                if (fd_ctx->locked_on)
+                        GF_FREE (fd_ctx->locked_on);
 
-                GF_FREE (fd_ctx->pre_op_piggyback);
-                GF_FREE (fd_ctx->lock_piggyback);
-
-                GF_FREE (fd_ctx->lock_acquired);
-
-		pthread_mutex_destroy (&fd_ctx->delay_lock);
+                if (fd_ctx->pre_op_piggyback)
+                        GF_FREE (fd_ctx->pre_op_piggyback);
 
                 GF_FREE (fd_ctx);
         }
@@ -2816,29 +2073,18 @@ afr_release (xlator_t *this, fd_t *fd)
 /* {{{ fsync */
 
 int
-afr_fsync_unwind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                      struct iatt *postbuf, dict_t *xdata)
-{
-        AFR_STACK_UNWIND (fsync, frame, op_ret, op_errno, prebuf, postbuf,
-                          xdata);
-        return 0;
-}
-
-int
 afr_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-               struct iatt *postbuf, dict_t *xdata)
+               struct iatt *postbuf)
 {
         afr_local_t *local = NULL;
         int call_count = -1;
         int child_index = (long) cookie;
         int read_child  = 0;
-	call_stub_t *stub = NULL;
 
         local = frame->local;
 
-        read_child = afr_inode_get_read_ctx (this, local->fd->inode, NULL);
+        read_child = afr_read_child (this, local->fd->inode);
 
         LOCK (&frame->lock);
         {
@@ -2850,13 +2096,13 @@ afr_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->op_ret = 0;
 
                         if (local->success_count == 0) {
-                                local->cont.inode_wfop.prebuf  = *prebuf;
-                                local->cont.inode_wfop.postbuf = *postbuf;
+                                local->cont.fsync.prebuf  = *prebuf;
+                                local->cont.fsync.postbuf = *postbuf;
                         }
 
                         if (child_index == read_child) {
-                                local->cont.inode_wfop.prebuf  = *prebuf;
-                                local->cont.inode_wfop.postbuf = *postbuf;
+                                local->cont.fsync.prebuf  = *prebuf;
+                                local->cont.fsync.postbuf = *postbuf;
                         }
 
                         local->success_count++;
@@ -2869,32 +2115,9 @@ afr_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         call_count = afr_frame_return (frame);
 
         if (call_count == 0) {
-		/* Make a stub out of the frame, and register it
-		   with the waking up post-op. When the call-stub resumes,
-		   we are guaranteed that there was no post-op pending
-		   (i.e changelogs were unset in the server). This is an
-		   essential "guarantee", that fsync() returns only after
-		   completely finishing EVERYTHING, including the delayed
-		   post-op. This guarantee is expected by FUSE graph switching
-		   for example.
-		*/
-		stub = fop_fsync_cbk_stub (frame, afr_fsync_unwind_cbk,
-                                           local->op_ret, local->op_errno,
-                                           &local->cont.inode_wfop.prebuf,
-                                           &local->cont.inode_wfop.postbuf,
-                                           xdata);
-		if (!stub) {
-			AFR_STACK_UNWIND (fsync, frame, -1, ENOMEM, 0, 0, 0);
-			return 0;
-		}
-
-		/* If no new unstable writes happened between the
-		   time we cleared the unstable write witness flag in afr_fsync
-		   and now, calling afr_delayed_changelog_wake_up() should
-		   wake up and skip over the fsync phase and go straight to
-		   afr_changelog_post_op_now()
-		*/
-		afr_delayed_changelog_wake_resume (this, local->fd, stub);
+                AFR_STACK_UNWIND (fsync, frame, local->op_ret, local->op_errno,
+                                  &local->cont.fsync.prebuf,
+                                  &local->cont.fsync.postbuf);
         }
 
         return 0;
@@ -2903,13 +2126,14 @@ afr_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 afr_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd,
-           int32_t datasync, dict_t *xdata)
+           int32_t datasync)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local = NULL;
         int ret = -1;
         int i = 0;
         int32_t call_count = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -2918,20 +2142,19 @@ afr_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         call_count = local->call_count;
+        frame->local = local;
 
         local->fd             = fd_ref (fd);
-
-	if (afr_fd_has_witnessed_unstable_write (this, fd)) {
-		/* don't care. we only wanted to CLEAR the bit */
-	}
+        local->cont.fsync.ino = fd->inode->ino;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
@@ -2939,16 +2162,17 @@ afr_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->fsync,
-                                           fd, datasync, xdata);
+                                           fd, datasync);
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (fsync, frame, -1, op_errno, NULL, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (fsync, frame, op_ret, op_errno, NULL, NULL);
+        }
         return 0;
 }
 
@@ -2958,8 +2182,7 @@ out:
 
 int32_t
 afr_fsyncdir_cbk (call_frame_t *frame, void *cookie,
-                  xlator_t *this, int32_t op_ret, int32_t op_errno,
-                  dict_t *xdata)
+                  xlator_t *this, int32_t op_ret, int32_t op_errno)
 {
         afr_local_t *local = NULL;
         int call_count = -1;
@@ -2979,7 +2202,7 @@ afr_fsyncdir_cbk (call_frame_t *frame, void *cookie,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (fsyncdir, frame, local->op_ret,
-                                  local->op_errno, xdata);
+                                  local->op_errno);
 
         return 0;
 }
@@ -2987,13 +2210,14 @@ afr_fsyncdir_cbk (call_frame_t *frame, void *cookie,
 
 int32_t
 afr_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd,
-              int32_t datasync, dict_t *xdata)
+              int32_t datasync)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local = NULL;
         int ret = -1;
         int i = 0;
         int32_t call_count = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -3002,30 +2226,33 @@ afr_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         call_count = local->call_count;
+        frame->local = local;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND (frame, afr_fsyncdir_cbk,
                                     priv->children[i],
                                     priv->children[i]->fops->fsyncdir,
-                                    fd, datasync, xdata);
+                                    fd, datasync);
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (fsyncdir, frame, -1, op_errno, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (fsyncdir, frame, op_ret, op_errno);
+        }
         return 0;
 }
 
@@ -3036,7 +2263,7 @@ out:
 int32_t
 afr_xattrop_cbk (call_frame_t *frame, void *cookie,
                  xlator_t *this, int32_t op_ret, int32_t op_errno,
-                 dict_t *xattr, dict_t *xdata)
+                 dict_t *xattr)
 {
         afr_local_t *local = NULL;
         int call_count = -1;
@@ -3045,11 +2272,8 @@ afr_xattrop_cbk (call_frame_t *frame, void *cookie,
 
         LOCK (&frame->lock);
         {
-                if (op_ret == 0) {
-                        if (!local->cont.xattrop.xattr)
-                                local->cont.xattrop.xattr = dict_ref (xattr);
+                if (op_ret == 0)
                         local->op_ret = 0;
-                }
 
                 local->op_errno = op_errno;
         }
@@ -3059,7 +2283,7 @@ afr_xattrop_cbk (call_frame_t *frame, void *cookie,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (xattrop, frame, local->op_ret, local->op_errno,
-                local->cont.xattrop.xattr, xdata);
+                                  xattr);
 
         return 0;
 }
@@ -3067,13 +2291,14 @@ afr_xattrop_cbk (call_frame_t *frame, void *cookie,
 
 int32_t
 afr_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc,
-             gf_xattrop_flags_t optype, dict_t *xattr, dict_t *xdata)
+             gf_xattrop_flags_t optype, dict_t *xattr)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local  = NULL;
         int ret = -1;
         int i = 0;
         int32_t call_count = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -3082,30 +2307,33 @@ afr_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         call_count = local->call_count;
+        frame->local = local;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND (frame, afr_xattrop_cbk,
                                     priv->children[i],
                                     priv->children[i]->fops->xattrop,
-                                    loc, optype, xattr, xdata);
+                                    loc, optype, xattr);
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (xattrop, frame, -1, op_errno, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (xattrop, frame, op_ret, op_errno, NULL);
+        }
         return 0;
 }
 
@@ -3116,7 +2344,7 @@ out:
 int32_t
 afr_fxattrop_cbk (call_frame_t *frame, void *cookie,
                   xlator_t *this, int32_t op_ret, int32_t op_errno,
-                  dict_t *xattr, dict_t *xdata)
+                  dict_t *xattr)
 {
         afr_local_t *local = NULL;
 
@@ -3126,12 +2354,8 @@ afr_fxattrop_cbk (call_frame_t *frame, void *cookie,
 
         LOCK (&frame->lock);
         {
-                if (op_ret == 0) {
-                        if (!local->cont.fxattrop.xattr)
-                                local->cont.fxattrop.xattr = dict_ref (xattr);
-
+                if (op_ret == 0)
                         local->op_ret = 0;
-                }
 
                 local->op_errno = op_errno;
         }
@@ -3141,7 +2365,7 @@ afr_fxattrop_cbk (call_frame_t *frame, void *cookie,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (fxattrop, frame, local->op_ret, local->op_errno,
-                                  local->cont.fxattrop.xattr, xdata);
+                                  xattr);
 
         return 0;
 }
@@ -3149,13 +2373,14 @@ afr_fxattrop_cbk (call_frame_t *frame, void *cookie,
 
 int32_t
 afr_fxattrop (call_frame_t *frame, xlator_t *this, fd_t *fd,
-              gf_xattrop_flags_t optype, dict_t *xattr, dict_t *xdata)
+              gf_xattrop_flags_t optype, dict_t *xattr)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local  = NULL;
         int ret = -1;
         int i = 0;
         int32_t call_count = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -3164,30 +2389,33 @@ afr_fxattrop (call_frame_t *frame, xlator_t *this, fd_t *fd,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         call_count = local->call_count;
+        frame->local = local;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND (frame, afr_fxattrop_cbk,
                                     priv->children[i],
                                     priv->children[i]->fops->fxattrop,
-                                    fd, optype, xattr, xdata);
+                                    fd, optype, xattr);
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (fxattrop, frame, -1, op_errno, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (fxattrop, frame, op_ret, op_errno, NULL);
+        }
         return 0;
 }
 
@@ -3196,7 +2424,7 @@ out:
 
 int32_t
 afr_inodelk_cbk (call_frame_t *frame, void *cookie,
-                 xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                 xlator_t *this, int32_t op_ret, int32_t op_errno)
 
 {
         afr_local_t *local = NULL;
@@ -3217,7 +2445,7 @@ afr_inodelk_cbk (call_frame_t *frame, void *cookie,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (inodelk, frame, local->op_ret,
-                                  local->op_errno, xdata);
+                                  local->op_errno);
 
         return 0;
 }
@@ -3225,14 +2453,14 @@ afr_inodelk_cbk (call_frame_t *frame, void *cookie,
 
 int32_t
 afr_inodelk (call_frame_t *frame, xlator_t *this,
-             const char *volume, loc_t *loc, int32_t cmd,
-             struct gf_flock *flock, dict_t *xdata)
+             const char *volume, loc_t *loc, int32_t cmd, struct gf_flock *flock)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local  = NULL;
         int ret = -1;
         int i = 0;
         int32_t call_count = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -3241,39 +2469,41 @@ afr_inodelk (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         call_count = local->call_count;
+        frame->local = local;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND (frame, afr_inodelk_cbk,
                                     priv->children[i],
                                     priv->children[i]->fops->inodelk,
-                                    volume, loc, cmd, flock, xdata);
+                                    volume, loc, cmd, flock);
 
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (inodelk, frame, -1, op_errno, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (inodelk, frame, op_ret, op_errno);
+        }
         return 0;
 }
 
 
 int32_t
 afr_finodelk_cbk (call_frame_t *frame, void *cookie,
-                  xlator_t *this, int32_t op_ret, int32_t op_errno,
-                  dict_t *xdata)
+                  xlator_t *this, int32_t op_ret, int32_t op_errno)
 
 {
         afr_local_t *local = NULL;
@@ -3294,7 +2524,7 @@ afr_finodelk_cbk (call_frame_t *frame, void *cookie,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (finodelk, frame, local->op_ret,
-                                  local->op_errno, xdata);
+                                  local->op_errno);
 
         return 0;
 }
@@ -3302,14 +2532,14 @@ afr_finodelk_cbk (call_frame_t *frame, void *cookie,
 
 int32_t
 afr_finodelk (call_frame_t *frame, xlator_t *this,
-              const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *flock,
-              dict_t *xdata)
+              const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *flock)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local  = NULL;
         int ret = -1;
         int i = 0;
         int32_t call_count = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -3318,38 +2548,42 @@ afr_finodelk (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         call_count = local->call_count;
+        frame->local = local;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND (frame, afr_finodelk_cbk,
                                     priv->children[i],
                                     priv->children[i]->fops->finodelk,
-                                    volume, fd, cmd, flock, xdata);
+                                    volume, fd, cmd, flock);
 
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (finodelk, frame, -1, op_errno, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (finodelk, frame, op_ret, op_errno);
+        }
         return 0;
 }
 
 
 int32_t
-afr_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                 int32_t op_ret, int32_t op_errno, dict_t *xdata)
+afr_entrylk_cbk (call_frame_t *frame, void *cookie,
+                 xlator_t *this, int32_t op_ret, int32_t op_errno)
+
 {
         afr_local_t *local = NULL;
         int call_count = -1;
@@ -3369,7 +2603,7 @@ afr_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (entrylk, frame, local->op_ret,
-                                  local->op_errno, xdata);
+                                  local->op_errno);
 
         return 0;
 }
@@ -3378,14 +2612,14 @@ afr_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int32_t
 afr_entrylk (call_frame_t *frame, xlator_t *this,
              const char *volume, loc_t *loc,
-             const char *basename, entrylk_cmd cmd, entrylk_type type,
-             dict_t *xdata)
+             const char *basename, entrylk_cmd cmd, entrylk_type type)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local  = NULL;
         int ret = -1;
         int i = 0;
         int32_t call_count = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -3394,31 +2628,34 @@ afr_entrylk (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         call_count = local->call_count;
+        frame->local = local;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND (frame, afr_entrylk_cbk,
                                     priv->children[i],
                                     priv->children[i]->fops->entrylk,
-                                    volume, loc, basename, cmd, type, xdata);
+                                    volume, loc, basename, cmd, type);
 
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (entrylk, frame, -1, op_errno, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (entrylk, frame, op_ret, op_errno);
+        }
         return 0;
 }
 
@@ -3426,7 +2663,7 @@ out:
 
 int32_t
 afr_fentrylk_cbk (call_frame_t *frame, void *cookie,
-                  xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                  xlator_t *this, int32_t op_ret, int32_t op_errno)
 
 {
         afr_local_t *local = NULL;
@@ -3447,7 +2684,7 @@ afr_fentrylk_cbk (call_frame_t *frame, void *cookie,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (fentrylk, frame, local->op_ret,
-                                  local->op_errno, xdata);
+                                  local->op_errno);
 
         return 0;
 }
@@ -3456,14 +2693,14 @@ afr_fentrylk_cbk (call_frame_t *frame, void *cookie,
 int32_t
 afr_fentrylk (call_frame_t *frame, xlator_t *this,
               const char *volume, fd_t *fd,
-              const char *basename, entrylk_cmd cmd,
-              entrylk_type type, dict_t *xdata)
+              const char *basename, entrylk_cmd cmd, entrylk_type type)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local  = NULL;
         int ret = -1;
         int i = 0;
         int32_t call_count = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -3472,38 +2709,41 @@ afr_fentrylk (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         call_count = local->call_count;
+        frame->local = local;
 
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND (frame, afr_fentrylk_cbk,
                                     priv->children[i],
                                     priv->children[i]->fops->fentrylk,
-                                    volume, fd, basename, cmd, type, xdata);
+                                    volume, fd, basename, cmd, type);
 
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (fentrylk, frame, -1, op_errno, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (fentrylk, frame, op_ret, op_errno);
+        }
         return 0;
 }
 
 int32_t
 afr_statfs_cbk (call_frame_t *frame, void *cookie,
                 xlator_t *this, int32_t op_ret, int32_t op_errno,
-                struct statvfs *statvfs, dict_t *xdata)
+                struct statvfs *statvfs)
 {
         afr_local_t *local = NULL;
         int call_count = 0;
@@ -3534,7 +2774,7 @@ afr_statfs_cbk (call_frame_t *frame, void *cookie,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (statfs, frame, local->op_ret, local->op_errno,
-                                  &local->cont.statfs.buf, xdata);
+                                  &local->cont.statfs.buf);
 
         return 0;
 }
@@ -3542,7 +2782,7 @@ afr_statfs_cbk (call_frame_t *frame, void *cookie,
 
 int32_t
 afr_statfs (call_frame_t *frame, xlator_t *this,
-            loc_t *loc, dict_t *xdata)
+            loc_t *loc)
 {
         afr_private_t *  priv        = NULL;
         int              child_count = 0;
@@ -3550,6 +2790,7 @@ afr_statfs (call_frame_t *frame, xlator_t *this,
         int              i           = 0;
         int              ret = -1;
         int              call_count = 0;
+        int32_t          op_ret      = -1;
         int32_t          op_errno    = 0;
 
         VALIDATE_OR_GOTO (this, out);
@@ -3559,13 +2800,15 @@ afr_statfs (call_frame_t *frame, xlator_t *this,
         priv = this->private;
         child_count = priv->child_count;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
+        frame->local = local;
         call_count = local->call_count;
 
         for (i = 0; i < child_count; i++) {
@@ -3573,24 +2816,24 @@ afr_statfs (call_frame_t *frame, xlator_t *this,
                         STACK_WIND (frame, afr_statfs_cbk,
                                     priv->children[i],
                                     priv->children[i]->fops->statfs,
-                                    loc, xdata);
+                                    loc);
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (statfs, frame, -1, op_errno, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (statfs, frame, op_ret, op_errno, NULL);
+        }
         return 0;
 }
 
 
 int32_t
 afr_lk_unlock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, struct gf_flock *lock,
-                   dict_t *xdata)
+                   int32_t op_ret, int32_t op_errno, struct gf_flock *lock)
 {
         afr_local_t * local = NULL;
         int call_count = -1;
@@ -3600,7 +2843,7 @@ afr_lk_unlock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         if (call_count == 0)
                 AFR_STACK_UNWIND (lk, frame, local->op_ret, local->op_errno,
-                                  lock, xdata);
+                                  lock);
 
         return 0;
 }
@@ -3622,7 +2865,7 @@ afr_lk_unlock (call_frame_t *frame, xlator_t *this)
 
         if (call_count == 0) {
                 AFR_STACK_UNWIND (lk, frame, local->op_ret, local->op_errno,
-                                  &local->cont.lk.ret_flock, NULL);
+                                  &local->cont.lk.ret_flock);
                 return 0;
         }
 
@@ -3636,7 +2879,7 @@ afr_lk_unlock (call_frame_t *frame, xlator_t *this)
                                     priv->children[i],
                                     priv->children[i]->fops->lk,
                                     local->fd, F_SETLK,
-                                    &local->cont.lk.user_flock, NULL);
+                                    &local->cont.lk.user_flock);
 
                         if (!--call_count)
                                 break;
@@ -3649,7 +2892,7 @@ afr_lk_unlock (call_frame_t *frame, xlator_t *this)
 
 int32_t
 afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-            int32_t op_ret, int32_t op_errno, struct gf_flock *lock, dict_t *xdata)
+            int32_t op_ret, int32_t op_errno, struct gf_flock *lock)
 {
         afr_local_t *local = NULL;
         afr_private_t *priv = NULL;
@@ -3684,12 +2927,12 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                    priv->children[child_index],
                                    priv->children[child_index]->fops->lk,
                                    local->fd, local->cont.lk.cmd,
-                                   &local->cont.lk.user_flock, xdata);
+                                   &local->cont.lk.user_flock);
         } else if (local->op_ret == -1) {
                 /* all nodes have gone down */
 
                 AFR_STACK_UNWIND (lk, frame, -1, ENOTCONN,
-                                  &local->cont.lk.ret_flock, NULL);
+                                  &local->cont.lk.ret_flock);
         } else {
                 /* locking has succeeded on all nodes that are up */
 
@@ -3707,7 +2950,7 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
                 */
                 AFR_STACK_UNWIND (lk, frame, local->op_ret, local->op_errno,
-                                  &local->cont.lk.ret_flock, NULL);
+                                  &local->cont.lk.ret_flock);
         }
 
         return 0;
@@ -3716,13 +2959,13 @@ afr_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 afr_lk (call_frame_t *frame, xlator_t *this,
-        fd_t *fd, int32_t cmd, struct gf_flock *flock, dict_t *xdata)
+        fd_t *fd, int32_t cmd, struct gf_flock *flock)
 {
         afr_private_t *priv = NULL;
         afr_local_t *local = NULL;
         int i = 0;
+        int32_t op_ret   = -1;
         int32_t op_errno = 0;
-        int     ret      = -1;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -3730,12 +2973,10 @@ afr_lk (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
+        AFR_LOCAL_INIT (local, priv);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        frame->local  = local;
 
         local->cont.lk.locked_nodes = GF_CALLOC (priv->child_count,
                                                  sizeof (*local->cont.lk.locked_nodes),
@@ -3754,30 +2995,13 @@ afr_lk (call_frame_t *frame, xlator_t *this,
         STACK_WIND_COOKIE (frame, afr_lk_cbk, (void *) (long) 0,
                            priv->children[i],
                            priv->children[i]->fops->lk,
-                           fd, cmd, flock, xdata);
-
-        ret = 0;
-out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (lk, frame, -1, op_errno, NULL, NULL);
-        return 0;
-}
+                           fd, cmd, flock);
 
-int
-afr_forget (xlator_t *this, inode_t *inode)
-{
-        uint64_t        ctx_addr = 0;
-        afr_inode_ctx_t *ctx     = NULL;
-
-        inode_ctx_get (inode, this, &ctx_addr);
-
-        if (!ctx_addr)
-                goto out;
-
-        ctx = (afr_inode_ctx_t *)(long)ctx_addr;
-        GF_FREE (ctx->fresh_children);
-        GF_FREE (ctx);
+        op_ret = 0;
 out:
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (lk, frame, op_ret, op_errno, NULL);
+        }
         return 0;
 }
 
@@ -3796,23 +3020,41 @@ afr_priv_dump (xlator_t *this)
         GF_ASSERT (priv);
         snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name);
         gf_proc_dump_add_section(key_prefix);
-        gf_proc_dump_write("child_count", "%u", priv->child_count);
-        gf_proc_dump_write("read_child_rr", "%u", priv->read_child_rr);
+        gf_proc_dump_build_key(key, key_prefix, "child_count");
+        gf_proc_dump_write(key, "%u", priv->child_count);
+        gf_proc_dump_build_key(key, key_prefix, "read_child_rr");
+        gf_proc_dump_write(key, "%u", priv->read_child_rr);
         for (i = 0; i < priv->child_count; i++) {
-                sprintf (key, "child_up[%d]", i);
+                gf_proc_dump_build_key(key, key_prefix, "child_up[%d]", i);
                 gf_proc_dump_write(key, "%d", priv->child_up[i]);
-                sprintf (key, "pending_key[%d]", i);
+                gf_proc_dump_build_key(key, key_prefix,
+                                       "pending_key[%d]", i);
                 gf_proc_dump_write(key, "%s", priv->pending_key[i]);
         }
-        gf_proc_dump_write("data_self_heal", "%s", priv->data_self_heal);
-        gf_proc_dump_write("metadata_self_heal", "%d", priv->metadata_self_heal);
-        gf_proc_dump_write("entry_self_heal", "%d", priv->entry_self_heal);
-        gf_proc_dump_write("data_change_log", "%d", priv->data_change_log);
-        gf_proc_dump_write("metadata_change_log", "%d", priv->metadata_change_log);
-        gf_proc_dump_write("entry-change_log", "%d", priv->entry_change_log);
-        gf_proc_dump_write("read_child", "%d", priv->read_child);
-        gf_proc_dump_write("favorite_child", "%d", priv->favorite_child);
-        gf_proc_dump_write("wait_count", "%u", priv->wait_count);
+        gf_proc_dump_build_key(key, key_prefix, "data_self_heal");
+        gf_proc_dump_write(key, "%d", priv->data_self_heal);
+        gf_proc_dump_build_key(key, key_prefix, "metadata_self_heal");
+        gf_proc_dump_write(key, "%d", priv->metadata_self_heal);
+        gf_proc_dump_build_key(key, key_prefix, "entry_self_heal");
+        gf_proc_dump_write(key, "%d", priv->entry_self_heal);
+        gf_proc_dump_build_key(key, key_prefix, "data_change_log");
+        gf_proc_dump_write(key, "%d", priv->data_change_log);
+        gf_proc_dump_build_key(key, key_prefix, "metadata_change_log");
+        gf_proc_dump_write(key, "%d", priv->metadata_change_log);
+        gf_proc_dump_build_key(key, key_prefix, "entry_change_log");
+        gf_proc_dump_write(key, "%d", priv->entry_change_log);
+        gf_proc_dump_build_key(key, key_prefix, "read_child");
+        gf_proc_dump_write(key, "%d", priv->read_child);
+        gf_proc_dump_build_key(key, key_prefix, "favorite_child");
+        gf_proc_dump_write(key, "%u", priv->favorite_child);
+        gf_proc_dump_build_key(key, key_prefix, "data_lock_server_count");
+        gf_proc_dump_write(key, "%u", priv->data_lock_server_count);
+        gf_proc_dump_build_key(key, key_prefix, "metadata_lock_server_count");
+        gf_proc_dump_write(key, "%u", priv->metadata_lock_server_count);
+        gf_proc_dump_build_key(key, key_prefix, "entry_lock_server_count");
+        gf_proc_dump_write(key, "%u", priv->entry_lock_server_count);
+        gf_proc_dump_build_key(key, key_prefix, "wait_count");
+        gf_proc_dump_write(key, "%u", priv->wait_count);
 
         return 0;
 }
@@ -3842,35 +3084,24 @@ find_child_index (xlator_t *this, xlator_t *child)
 
 int32_t
 afr_notify (xlator_t *this, int32_t event,
-            void *data, void *data2)
+            void *data, ...)
 {
         afr_private_t   *priv               = NULL;
         int             i                   = -1;
         int             up_children         = 0;
         int             down_children       = 0;
         int             propagate           = 0;
+
         int             had_heard_from_all  = 0;
         int             have_heard_from_all = 0;
         int             idx                 = -1;
         int             ret                 = -1;
-        int             call_psh            = 0;
-        int             up_child            = AFR_ALL_CHILDREN;
-        dict_t          *input              = NULL;
-        dict_t          *output             = NULL;
 
         priv = this->private;
 
         if (!priv)
                 return 0;
 
-        /*
-         * We need to reset this in case children come up in "staggered"
-         * fashion, so that we discover a late-arriving local subvolume.  Note
-         * that we could end up issuing N lookups to the first subvolume, and
-         * O(N^2) overall, but N is small for AFR so it shouldn't be an issue.
-         */
-        priv->did_discovery = _gf_false;
-
         had_heard_from_all = 1;
         for (i = 0; i < priv->child_count; i++) {
                 if (!priv->last_event[i]) {
@@ -3881,7 +3112,7 @@ afr_notify (xlator_t *this, int32_t event,
         /* parent xlators dont need to know about every child_up, child_down
          * because of afr ha. If all subvolumes go down, child_down has
          * to be triggered. In that state when 1 subvolume comes up child_up
-         * needs to be triggered. dht optimizes revalidate lookup by sending
+         * needs to be triggered. dht optimises revalidate lookup by sending
          * it only to one of its subvolumes. When child up/down happens
          * for afr's subvolumes dht should be notified by child_modified. The
          * subsequent revalidate lookup happens on all the dht's subvolumes
@@ -3898,19 +3129,9 @@ afr_notify (xlator_t *this, int32_t event,
         case GF_EVENT_CHILD_UP:
                 LOCK (&priv->lock);
                 {
-                        /*
-                         * This only really counts if the child was never up
-                         * (value = -1) or had been down (value = 0).  See
-                         * comment at GF_EVENT_CHILD_DOWN for a more detailed
-                         * explanation.
-                         */
-                        if (priv->child_up[idx] != 1) {
-                                priv->up_count++;
-                        }
                         priv->child_up[idx] = 1;
+                        priv->up_count++;
 
-                        call_psh = 1;
-                        up_child = idx;
                         for (i = 0; i < priv->child_count; i++)
                                 if (priv->child_up[i] == 1)
                                         up_children++;
@@ -3931,22 +3152,8 @@ afr_notify (xlator_t *this, int32_t event,
         case GF_EVENT_CHILD_DOWN:
                 LOCK (&priv->lock);
                 {
-                        /*
-                         * If a brick is down when we start, we'll get a
-                         * CHILD_DOWN to indicate its initial state.  There
-                         * was never a CHILD_UP in this case, so if we
-                         * increment "down_count" the difference between than
-                         * and "up_count" will no longer be the number of
-                         * children that are currently up.  This has serious
-                         * implications e.g. for quorum enforcement, so we
-                         * don't increment these values unless the event
-                         * represents an actual state transition between "up"
-                         * (value = 1) and anything else.
-                         */
-                        if (priv->child_up[idx] == 1) {
-                                priv->down_count++;
-                        }
                         priv->child_up[idx] = 0;
+                        priv->down_count++;
 
                         for (i = 0; i < priv->child_count; i++)
                                 if (priv->child_up[i] == 0)
@@ -3971,16 +3178,7 @@ afr_notify (xlator_t *this, int32_t event,
                         priv->last_event[idx] = event;
                 }
                 UNLOCK (&priv->lock);
-
                 break;
-
-        case GF_EVENT_TRANSLATOR_OP:
-                input = data;
-                output = data2;
-                ret = afr_xl_op (this, input, output);
-                goto out;
-                break;
-
         default:
                 propagate = 1;
                 break;
@@ -4007,8 +3205,6 @@ afr_notify (xlator_t *this, int32_t event,
 
                 LOCK (&priv->lock);
                 {
-                        up_children = afr_up_children_count (priv->child_up,
-                                                             priv->child_count);
                         for (i = 0; i < priv->child_count; i++) {
                                 if (priv->last_event[i] == GF_EVENT_CHILD_UP) {
                                         event = GF_EVENT_CHILD_UP;
@@ -4028,227 +3224,10 @@ afr_notify (xlator_t *this, int32_t event,
         ret = 0;
         if (propagate)
                 ret = default_notify (this, event, data);
-        if (call_psh && priv->shd.iamshd)
-                afr_proactive_self_heal ((void*) (long) up_child);
 
 out:
         return ret;
 }
-
-int
-afr_first_up_child (unsigned char *child_up, size_t child_count)
-{
-        int         ret      = -1;
-        int         i        = 0;
-
-        GF_ASSERT (child_up);
-
-        for (i = 0; i < child_count; i++) {
-                if (child_up[i]) {
-                        ret = i;
-                        break;
-                }
-        }
-
-        return ret;
-}
-
-int
-afr_local_init (afr_local_t *local, afr_private_t *priv, int32_t *op_errno)
-{
-        int     ret = -1;
-
-        local->op_ret = -1;
-        local->op_errno = EUCLEAN;
-
-        local->child_up = GF_CALLOC (priv->child_count,
-                                     sizeof (*local->child_up),
-                                     gf_afr_mt_char);
-        if (!local->child_up) {
-                if (op_errno)
-                        *op_errno = ENOMEM;
-                goto out;
-        }
-
-        memcpy (local->child_up, priv->child_up,
-                sizeof (*local->child_up) * priv->child_count);
-        local->call_count = afr_up_children_count (local->child_up,
-                                                   priv->child_count);
-        if (local->call_count == 0) {
-                gf_log (THIS->name, GF_LOG_INFO, "no subvolumes up");
-                if (op_errno)
-                        *op_errno = ENOTCONN;
-                goto out;
-        }
-
-        local->child_errno = GF_CALLOC (priv->child_count,
-                                        sizeof (*local->child_errno),
-                                        gf_afr_mt_int32_t);
-        if (!local->child_errno) {
-                if (op_errno)
-                        *op_errno = ENOMEM;
-                goto out;
-        }
-
-        local->transaction.postop_piggybacked = GF_CALLOC (priv->child_count,
-							   sizeof (int),
-							   gf_afr_mt_int32_t);
-        if (!local->transaction.postop_piggybacked) {
-                if (op_errno)
-                        *op_errno = ENOMEM;
-                goto out;
-        }
-
-	local->append_write = _gf_false;
-
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-afr_internal_lock_init (afr_internal_lock_t *lk, size_t child_count,
-                        transaction_lk_type_t lk_type)
-{
-        int             ret = -ENOMEM;
-
-        lk->locked_nodes = GF_CALLOC (sizeof (*lk->locked_nodes),
-                                      child_count, gf_afr_mt_char);
-        if (NULL == lk->locked_nodes)
-                goto out;
-
-        lk->lower_locked_nodes = GF_CALLOC (sizeof (*lk->lower_locked_nodes),
-                                            child_count, gf_afr_mt_char);
-        if (NULL == lk->lower_locked_nodes)
-                goto out;
-
-        lk->lock_op_ret   = -1;
-        lk->lock_op_errno = EUCLEAN;
-        lk->transaction_lk_type = lk_type;
-
-        ret = 0;
-out:
-        return ret;
-}
-
-void
-afr_matrix_cleanup (int32_t **matrix, unsigned int m)
-{
-        int             i         = 0;
-
-        if (!matrix)
-                goto out;
-        for (i = 0; i < m; i++) {
-                GF_FREE (matrix[i]);
-        }
-
-        GF_FREE (matrix);
-out:
-        return;
-}
-
-int32_t**
-afr_matrix_create (unsigned int m, unsigned int n)
-{
-        int32_t         **matrix = NULL;
-        int             i       = 0;
-
-        matrix = GF_CALLOC (sizeof (*matrix), m, gf_afr_mt_int32_t);
-        if (!matrix)
-                goto out;
-
-        for (i = 0; i < m; i++) {
-                matrix[i] = GF_CALLOC (sizeof (*matrix[i]), n,
-                                       gf_afr_mt_int32_t);
-                if (!matrix[i])
-                        goto out;
-        }
-        return matrix;
-out:
-        afr_matrix_cleanup (matrix, m);
-        return NULL;
-}
-
-int
-afr_inodelk_init (afr_inodelk_t *lk, char *dom, size_t child_count)
-{
-        int             ret = -ENOMEM;
-
-        lk->domain = dom;
-        lk->locked_nodes = GF_CALLOC (sizeof (*lk->locked_nodes),
-                                      child_count, gf_afr_mt_char);
-        if (NULL == lk->locked_nodes)
-                goto out;
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-afr_transaction_local_init (afr_local_t *local, xlator_t *this)
-{
-        int            child_up_count = 0;
-        int            ret = -ENOMEM;
-        afr_private_t *priv = NULL;
-
-        priv = this->private;
-        ret = afr_internal_lock_init (&local->internal_lock, priv->child_count,
-                                      AFR_TRANSACTION_LK);
-        if (ret < 0)
-                goto out;
-
-        if ((local->transaction.type == AFR_DATA_TRANSACTION) ||
-            (local->transaction.type == AFR_METADATA_TRANSACTION)) {
-                ret = afr_inodelk_init (&local->internal_lock.inodelk[0],
-                                        this->name, priv->child_count);
-                if (ret < 0)
-                        goto out;
-        }
-
-        ret = -ENOMEM;
-        child_up_count = afr_up_children_count (local->child_up,
-                                                priv->child_count);
-        if (priv->optimistic_change_log && child_up_count == priv->child_count)
-                local->optimistic_change_log = 1;
-
-        local->first_up_child = afr_first_up_child (local->child_up,
-                                                    priv->child_count);
-
-        local->transaction.eager_lock =
-                GF_CALLOC (sizeof (*local->transaction.eager_lock),
-                           priv->child_count,
-                           gf_afr_mt_int32_t);
-
-        if (!local->transaction.eager_lock)
-                goto out;
-
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children)
-                goto out;
-
-        local->transaction.pre_op = GF_CALLOC (sizeof (*local->transaction.pre_op),
-                                               priv->child_count,
-                                               gf_afr_mt_char);
-        if (!local->transaction.pre_op)
-                goto out;
-
-        local->pending = afr_matrix_create (priv->child_count,
-                                            AFR_NUM_CHANGE_LOGS);
-        if (!local->pending)
-                goto out;
-
-        local->transaction.txn_changelog = afr_matrix_create (priv->child_count,
-                                                           AFR_NUM_CHANGE_LOGS);
-        if (!local->transaction.txn_changelog)
-                goto out;
-
-	INIT_LIST_HEAD (&local->transaction.eager_locked);
-
-        ret = 0;
-out:
-        return ret;
-}
-
 void
 afr_reset_children (int32_t *fresh_children, int32_t child_count)
 {
@@ -4258,13 +3237,11 @@ afr_reset_children (int32_t *fresh_children, int32_t child_count)
 }
 
 int32_t*
-afr_children_create (int32_t child_count)
+afr_children_create (unsigned int child_count)
 {
         int32_t           *children = NULL;
         int               i               = 0;
 
-        GF_ASSERT (child_count > 0);
-
         children = GF_CALLOC (child_count, sizeof (*children),
                               gf_afr_mt_int32_t);
         if (NULL == children)
@@ -4276,54 +3253,34 @@ out:
 }
 
 void
-afr_children_add_child (int32_t *children, int32_t child,
-                        int32_t child_count)
+afr_fresh_children_add_child (int32_t *fresh_children, int32_t child,
+                              int32_t child_count)
 {
         gf_boolean_t child_found = _gf_false;
         int          i               = 0;
 
         for (i = 0; i < child_count; i++) {
-                if (children[i] == -1)
+                if (fresh_children[i] == -1)
                         break;
-                if (children[i] == child) {
+                if (fresh_children[i] == child) {
                         child_found = _gf_true;
                         break;
                 }
         }
-
         if (!child_found) {
                 GF_ASSERT (i < child_count);
-                children[i] = child;
-        }
-}
-
-void
-afr_children_rm_child (int32_t *children, int32_t child, int32_t child_count)
-{
-        int          i = 0;
-
-        GF_ASSERT ((child >= 0) && (child < child_count));
-        for (i = 0; i < child_count; i++) {
-                if (children[i] == -1)
-                        break;
-                if (children[i] == child) {
-                        if (i != (child_count - 1))
-                                memmove (children + i, children + i + 1,
-                                         sizeof (*children)*(child_count - i - 1));
-                        children[child_count - 1] = -1;
-                        break;
-                }
+                fresh_children[i] = child;
         }
 }
 
 int
-afr_get_children_count (int32_t *children, unsigned int child_count)
+afr_get_children_count (int32_t *fresh_children, unsigned int child_count)
 {
         int count = 0;
         int i = 0;
 
         for (i = 0; i < child_count; i++) {
-                if (children[i] == -1)
+                if (fresh_children[i] == -1)
                         break;
                 count++;
         }
@@ -4331,261 +3288,24 @@ afr_get_children_count (int32_t *children, unsigned int child_count)
 }
 
 void
-afr_set_low_priority (call_frame_t *frame)
-{
-        frame->root->pid = LOW_PRIO_PROC_PID;
-}
-
-int
-afr_child_fd_ctx_set (xlator_t *this, fd_t *fd, int32_t child,
-                      int flags)
-{
-        int             ret = 0;
-        uint64_t        ctx = 0;
-        afr_fd_ctx_t    *fd_ctx      = NULL;
-
-        GF_ASSERT (fd && fd->inode);
-        ret = afr_fd_ctx_set (this, fd);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "could not set fd ctx for fd=%p", fd);
-                goto out;
-        }
-
-        ret = fd_ctx_get (fd, this, &ctx);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "could not get fd ctx for fd=%p", fd);
-                goto out;
-        }
-
-        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
-        fd_ctx->opened_on[child] = AFR_FD_OPENED;
-        if (!IA_ISDIR (fd->inode->ia_type)) {
-                fd_ctx->flags            = flags;
-        }
-        ret = 0;
-out:
-        return ret;
-}
-
-gf_boolean_t
-afr_have_quorum (char *logname, afr_private_t *priv)
-{
-        unsigned int        quorum = 0;
-
-        GF_VALIDATE_OR_GOTO(logname,priv,out);
-
-        quorum = priv->quorum_count;
-        if (quorum != AFR_QUORUM_AUTO) {
-                return (priv->up_count >= (priv->down_count + quorum));
-        }
-
-        quorum = priv->child_count / 2 + 1;
-        if (priv->up_count >= (priv->down_count + quorum)) {
-                return _gf_true;
-        }
-
-        /*
-         * Special case for even numbers of nodes: if we have exactly half
-         * and that includes the first ("senior-most") node, then that counts
-         * as quorum even if it wouldn't otherwise.  This supports e.g. N=2
-         * while preserving the critical property that there can only be one
-         * such group.
-         */
-        if ((priv->child_count % 2) == 0) {
-                quorum = priv->child_count / 2;
-                if (priv->up_count >= (priv->down_count + quorum)) {
-                        if (priv->child_up[0]) {
-                                return _gf_true;
-                        }
-                }
-        }
-
-out:
-        return _gf_false;
-}
-
-void
-afr_priv_destroy (afr_private_t *priv)
-{
-        int            i           = 0;
-
-        if (!priv)
-                goto out;
-        inode_unref (priv->root_inode);
-        GF_FREE (priv->shd.pos);
-        GF_FREE (priv->shd.pending);
-        GF_FREE (priv->shd.inprogress);
-//        for (i = 0; i < priv->child_count; i++)
-//                if (priv->shd.timer && priv->shd.timer[i])
-//                        gf_timer_call_cancel (this->ctx, priv->shd.timer[i]);
-        GF_FREE (priv->shd.timer);
-
-        if (priv->shd.healed)
-                eh_destroy (priv->shd.healed);
-
-        if (priv->shd.heal_failed)
-                eh_destroy (priv->shd.heal_failed);
-
-        if (priv->shd.split_brain)
-                eh_destroy (priv->shd.split_brain);
-
-        for (i = 0; i < priv->child_count; i++)
-        {
-                if (priv->shd.statistics[i])
-                        eh_destroy (priv->shd.statistics[i]);
-        }
-
-        GF_FREE (priv->shd.statistics);
-
-        GF_FREE (priv->shd.crawl_events);
-
-        GF_FREE (priv->last_event);
-        if (priv->pending_key) {
-                for (i = 0; i < priv->child_count; i++)
-                        GF_FREE (priv->pending_key[i]);
-        }
-        GF_FREE (priv->pending_key);
-        GF_FREE (priv->children);
-        GF_FREE (priv->child_up);
-        LOCK_DESTROY (&priv->lock);
-        LOCK_DESTROY (&priv->read_child_lock);
-        pthread_mutex_destroy (&priv->mutex);
-        GF_FREE (priv);
-out:
-        return;
-}
-
-int
-xlator_subvolume_count (xlator_t *this)
-{
-        int i = 0;
-        xlator_list_t *list = NULL;
-
-        for (list = this->children; list; list = list->next)
-                i++;
-        return i;
-}
-
-inline gf_boolean_t
-afr_is_errno_set (int *child_errno, int child)
+afr_get_fresh_children (int32_t *success_children, int32_t *sources,
+                        int32_t *fresh_children, unsigned int child_count)
 {
-        return child_errno[child];
-}
+        unsigned int i = 0;
+        unsigned int j = 0;
 
-inline gf_boolean_t
-afr_is_errno_unset (int *child_errno, int child)
-{
-        return !afr_is_errno_set (child_errno, child);
-}
+        GF_ASSERT (success_children);
+        GF_ASSERT (sources);
+        GF_ASSERT (fresh_children);
 
-void
-afr_prepare_new_entry_pending_matrix (int32_t **pending,
-                                      gf_boolean_t (*is_pending) (int *, int),
-                                      int *ctx, struct iatt *buf,
-                                      unsigned int child_count)
-{
-        int midx = 0;
-        int idx  = 0;
-        int i    = 0;
-
-        midx = afr_index_for_transaction_type (AFR_METADATA_TRANSACTION);
-        if (IA_ISDIR (buf->ia_type))
-                idx = afr_index_for_transaction_type (AFR_ENTRY_TRANSACTION);
-        else if (IA_ISREG (buf->ia_type))
-                idx = afr_index_for_transaction_type (AFR_DATA_TRANSACTION);
-        else
-                idx = -1;
+        afr_reset_children (fresh_children, child_count);
         for (i = 0; i < child_count; i++) {
-                if (is_pending (ctx, i)) {
-                        pending[i][midx] = hton32 (1);
-                        if (idx == -1)
-                                continue;
-                        pending[i][idx] = hton32 (1);
-                }
-        }
-}
-
-gf_boolean_t
-afr_is_fd_fixable (fd_t *fd)
-{
-        if (!fd || !fd->inode)
-                return _gf_false;
-        else if (fd_is_anonymous (fd))
-                return _gf_false;
-        else if (uuid_is_null (fd->inode->gfid))
-                return _gf_false;
-
-        return _gf_true;
-}
-
-void
-afr_handle_open_fd_count (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local = NULL;
-        inode_t         *inode = NULL;
-        afr_inode_ctx_t *ctx   = NULL;
-
-        local = frame->local;
-
-        if (local->fd)
-                inode = local->fd->inode;
-        else
-                inode = local->loc.inode;
-
-        if (!inode)
-                return;
-
-        LOCK (&inode->lock);
-        {
-                ctx = __afr_inode_ctx_get (inode, this);
-                ctx->open_fd_count = local->open_fd_count;
-        }
-        UNLOCK (&inode->lock);
-}
-
-int
-afr_initialise_statistics (xlator_t *this)
-{
-        afr_private_t       *priv = NULL;
-        int                 ret = -1;
-        int                 i = 0;
-        int                 child_count = 0;
-        eh_t                *stats_per_brick = NULL;
-        shd_crawl_event_t   ***shd_crawl_events = NULL;
-        priv = this->private;
-
-        priv->shd.statistics = GF_CALLOC (sizeof(eh_t *), priv->child_count,
-                                          gf_common_mt_eh_t);
-        if (!priv->shd.statistics) {
-                ret = -1;
-                goto out;
-        }
-        child_count = priv->child_count;
-        for (i=0; i < child_count ; i++) {
-                stats_per_brick = eh_new (AFR_STATISTICS_HISTORY_SIZE,
-                                          _gf_false,
-                                          _destroy_crawl_event_data);
-                if (!stats_per_brick) {
-                        ret = -1;
-                        goto out;
+                if (success_children[i] == -1)
+                        break;
+                if (afr_is_read_child (success_children, sources, child_count,
+                                       success_children[i])) {
+                        fresh_children[j] = success_children[i];
+                        j++;
                 }
-                priv->shd.statistics[i] = stats_per_brick;
-
         }
-
-        shd_crawl_events = (shd_crawl_event_t***)(&priv->shd.crawl_events);
-        *shd_crawl_events  = GF_CALLOC (sizeof(shd_crawl_event_t*),
-                                        priv->child_count,
-                                        gf_afr_mt_shd_crawl_event_t);
-
-        if (!priv->shd.crawl_events) {
-                ret = -1;
-                goto out;
-        }
-        ret = 0;
-out:
-        return ret;
-
 }
diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c
index 689dd84e6..7010f74f5 100644
--- a/xlators/cluster/afr/src/afr-dir-read.c
+++ b/xlators/cluster/afr/src/afr-dir-read.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -40,9 +49,10 @@
 #include "afr-self-heal.h"
 #include "afr-self-heal-common.h"
 
+
 int
 afr_examine_dir_sh_unwind (call_frame_t *frame, xlator_t *this, int32_t op_ret,
-                           int32_t op_errno, int32_t sh_failed)
+                           int32_t op_errno)
 {
         afr_local_t *local  = NULL;
 
@@ -51,7 +61,7 @@ afr_examine_dir_sh_unwind (call_frame_t *frame, xlator_t *this, int32_t op_ret,
         afr_set_opendir_done (this, local->fd->inode);
 
         AFR_STACK_UNWIND (opendir, frame, local->op_ret,
-                          local->op_errno, local->fd, NULL);
+                          local->op_errno, local->fd);
 
         return 0;
 }
@@ -90,24 +100,22 @@ __checksums_differ (uint32_t *checksum, int child_count,
 int32_t
 afr_examine_dir_readdir_cbk (call_frame_t *frame, void *cookie,
                              xlator_t *this, int32_t op_ret, int32_t op_errno,
-                             gf_dirent_t *entries, dict_t *xdata)
+                             gf_dirent_t *entries)
 {
         afr_private_t *   priv        = NULL;
         afr_local_t *     local       = NULL;
         afr_self_heal_t * sh          = NULL;
         gf_dirent_t *     entry       = NULL;
         gf_dirent_t *     tmp         = NULL;
-        char              *reason     = NULL;
         int               child_index = 0;
         uint32_t          entry_cksum = 0;
         int               call_count  = 0;
         off_t             last_offset = 0;
-        inode_t           *inode      = NULL;
+        char              sh_type_str[256] = {0,};
 
         priv  = this->private;
         local = frame->local;
         sh    = &local->self_heal;
-        inode = local->fd->inode;
 
         child_index = (long) cookie;
 
@@ -128,7 +136,7 @@ afr_examine_dir_readdir_cbk (call_frame_t *frame, void *cookie,
         }
 
         list_for_each_entry_safe (entry, tmp, &entries->list, list) {
-                entry_cksum = gf_rsync_weak_checksum ((unsigned char *)entry->d_name,
+                entry_cksum = gf_rsync_weak_checksum (entry->d_name,
                                                       strlen (entry->d_name));
                 local->cont.opendir.checksum[child_index] ^= entry_cksum;
         }
@@ -143,7 +151,7 @@ afr_examine_dir_readdir_cbk (call_frame_t *frame, void *cookie,
                            (void *) (long) child_index,
                            priv->children[child_index],
                            priv->children[child_index]->fops->readdir,
-                           local->fd, 131072, last_offset, NULL);
+                           local->fd, 131072, last_offset);
 
         return 0;
 
@@ -155,18 +163,27 @@ out:
                                         priv->child_count,
                                         local->child_up)) {
 
-                        sh->do_entry_self_heal  = _gf_true;
+                        sh->need_entry_self_heal  = _gf_true;
                         sh->forced_merge          = _gf_true;
-
-                        reason = "checksums of directory differ";
-                        afr_launch_self_heal (frame, this, inode, _gf_false,
-                                              inode->ia_type, reason, NULL,
-                                              afr_examine_dir_sh_unwind);
+                        sh->type                  = local->fd->inode->ia_type;
+                        sh->background            = _gf_false;
+                        sh->unwind                = afr_examine_dir_sh_unwind;
+
+                        afr_self_heal_type_str_get(&local->self_heal,
+                                                   sh_type_str,
+                                                   sizeof(sh_type_str));
+                        gf_log (this->name, GF_LOG_INFO,
+                                "%s self-heal triggered. path: %s, "
+                                "reason: checksums of directory differ,"
+                                " forced merge option set",
+                                sh_type_str, local->loc.path);
+
+                        afr_self_heal (frame, this, local->fd->inode);
                 } else {
-                        afr_set_opendir_done (this, inode);
+                        afr_set_opendir_done (this, local->fd->inode);
 
                         AFR_STACK_UNWIND (opendir, frame, local->op_ret,
-                                          local->op_errno, local->fd, NULL);
+                                          local->op_errno, local->fd);
                 }
         }
 
@@ -189,7 +206,7 @@ afr_examine_dir (call_frame_t *frame, xlator_t *this)
                                                   sizeof (*local->cont.opendir.checksum),
                                                   gf_afr_mt_int32_t);
 
-        call_count = afr_up_children_count (local->child_up, priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         local->call_count = call_count;
 
@@ -199,7 +216,7 @@ afr_examine_dir (call_frame_t *frame, xlator_t *this)
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->readdir,
-                                           local->fd, 131072, 0, NULL);
+                                           local->fd, 131072, 0);
 
                         if (!--call_count)
                                 break;
@@ -213,37 +230,27 @@ afr_examine_dir (call_frame_t *frame, xlator_t *this)
 int32_t
 afr_opendir_cbk (call_frame_t *frame, void *cookie,
                  xlator_t *this, int32_t op_ret, int32_t op_errno,
-                 fd_t *fd, dict_t *xdata)
+                 fd_t *fd)
 {
         afr_private_t *priv              = NULL;
         afr_local_t   *local             = NULL;
         int32_t        up_children_count = 0;
         int            ret               = -1;
         int            call_count        = -1;
-        int32_t        child_index       = 0;
 
         priv  = this->private;
         local = frame->local;
-        child_index = (long) cookie;
 
-        up_children_count = afr_up_children_count (local->child_up,
-                                                   priv->child_count);
+        up_children_count = afr_up_children_count (priv->child_count,
+                                                   local->child_up);
 
         LOCK (&frame->lock);
         {
-                if (op_ret >= 0) {
+                if (op_ret >= 0)
                         local->op_ret = op_ret;
-                        ret = afr_child_fd_ctx_set (this, fd, child_index, 0);
-                        if (ret) {
-                                local->op_ret = -1;
-                                local->op_errno = -ret;
-                                goto unlock;
-                        }
-                }
 
                 local->op_errno = op_errno;
         }
-unlock:
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
@@ -252,8 +259,17 @@ unlock:
                 if (local->op_ret != 0)
                         goto out;
 
+                ret = afr_fd_ctx_set (this, local->fd);
+                if (ret) {
+                        local->op_ret = -1;
+                        local->op_errno = -1;
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "failed to set fd ctx for fd %p",
+                                local->fd);
+                        goto out;
+                }
                 if (!afr_is_opendir_done (this, local->fd->inode) &&
-                    up_children_count > 1 && priv->entry_self_heal) {
+                    up_children_count > 1) {
 
                         /*
                          * This is the first opendir on this inode. We need
@@ -262,7 +278,7 @@ unlock:
                          * to regular entry self-heal because the readdir
                          * call is sent only to the first subvolume, and
                          * thus files that exist only there will never be healed
-                         * otherwise (assuming changelog shows no anomalies).
+                         * otherwise (assuming changelog shows no anamolies).
                          */
 
                         gf_log (this->name, GF_LOG_TRACE,
@@ -281,7 +297,7 @@ unlock:
 
 out:
         AFR_STACK_UNWIND (opendir, frame, local->op_ret,
-                          local->op_errno, local->fd, NULL);
+                          local->op_errno, local->fd);
 
         return 0;
 }
@@ -297,6 +313,7 @@ afr_opendir (call_frame_t *frame, xlator_t *this,
         int             i           = 0;
         int             ret         = -1;
         int             call_count  = -1;
+        int32_t         op_ret      = -1;
         int32_t         op_errno    = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -307,36 +324,37 @@ afr_opendir (call_frame_t *frame, xlator_t *this,
 
         child_count = priv->child_count;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ALLOC_OR_GOTO (local, afr_local_t, out);
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
         loc_copy (&local->loc, loc);
 
+        frame->local = local;
         local->fd    = fd_ref (fd);
 
         call_count = local->call_count;
 
         for (i = 0; i < child_count; i++) {
                 if (local->child_up[i]) {
-                        STACK_WIND_COOKIE (frame, afr_opendir_cbk,
-                                           (void*) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->opendir,
-                                           loc, fd, NULL);
+                        STACK_WIND (frame, afr_opendir_cbk,
+                                    priv->children[i],
+                                    priv->children[i]->fops->opendir,
+                                    loc, fd);
 
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (opendir, frame, -1, op_errno, fd, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (opendir, frame, op_ret, op_errno, fd);
+        }
 
         return 0;
 }
@@ -358,11 +376,30 @@ struct entry_name {
         struct list_head list;
 };
 
+
+static gf_boolean_t
+remembered_name (const char *name, struct list_head *entries)
+{
+        struct entry_name *e   = NULL;
+        gf_boolean_t       ret = _gf_false;
+
+        list_for_each_entry (e, entries, list) {
+                if (!strcmp (name, e->name)) {
+                        ret = _gf_true;
+                        goto out;
+                }
+        }
+
+out:
+        return ret;
+}
+
+
 static void
-afr_forget_entries (fd_t *fd)
+afr_remember_entries (gf_dirent_t *entries, fd_t *fd)
 {
-        struct entry_name *entry  = NULL;
-        struct entry_name *tmp    = NULL;
+        struct entry_name *n      = NULL;
+        gf_dirent_t       *entry  = NULL;
         int                ret    = 0;
         uint64_t           ctx    = 0;
         afr_fd_ctx_t      *fd_ctx = NULL;
@@ -376,77 +413,243 @@ afr_forget_entries (fd_t *fd)
 
         fd_ctx = (afr_fd_ctx_t *)(long) ctx;
 
-        list_for_each_entry_safe (entry, tmp, &fd_ctx->entries, list) {
-                GF_FREE (entry->name);
-                list_del (&entry->list);
-                GF_FREE (entry);
+        list_for_each_entry (entry, &entries->list, list) {
+                n = GF_CALLOC (1, sizeof (*n), gf_afr_mt_entry_name);
+                n->name = gf_strdup (entry->d_name);
+                INIT_LIST_HEAD (&n->list);
+
+                list_add (&n->list, &fd_ctx->entries);
         }
 }
 
-static void
-afr_readdir_filter_trash_dir (gf_dirent_t *entries, fd_t *fd)
+
+static off_t
+afr_filter_entries (gf_dirent_t *entries, fd_t *fd)
 {
-        gf_dirent_t *   entry       = NULL;
-        gf_dirent_t *   tmp         = NULL;
+        gf_dirent_t  *entry  = NULL;
+        gf_dirent_t  *tmp    = NULL;
+        int           ret    = 0;
+        uint64_t      ctx    = 0;
+        afr_fd_ctx_t *fd_ctx = NULL;
+        off_t         offset = 0;
+
+        ret = fd_ctx_get (fd, THIS, &ctx);
+        if (ret < 0) {
+                gf_log (THIS->name, GF_LOG_INFO,
+                        "could not get fd ctx for fd=%p", fd);
+                return -1;
+        }
+
+        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
 
         list_for_each_entry_safe (entry, tmp, &entries->list, list) {
-                if (__is_root_gfid (fd->inode->gfid) &&
-                    !strcmp (entry->d_name, GF_REPLICATE_TRASH_DIR)) {
-                        list_del_init (&entry->list);
+                offset = entry->d_off;
+
+                if (remembered_name (entry->d_name, &fd_ctx->entries)) {
+                        list_del (&entry->list);
                         GF_FREE (entry);
                 }
         }
+
+        return offset;
+}
+
+
+static void
+afr_forget_entries (fd_t *fd)
+{
+        struct entry_name *entry  = NULL;
+        struct entry_name *tmp    = NULL;
+        int                ret    = 0;
+        uint64_t           ctx    = 0;
+        afr_fd_ctx_t      *fd_ctx = NULL;
+
+        ret = fd_ctx_get (fd, THIS, &ctx);
+        if (ret < 0) {
+                gf_log (THIS->name, GF_LOG_INFO,
+                        "could not get fd ctx for fd=%p", fd);
+                return;
+        }
+
+        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+        list_for_each_entry_safe (entry, tmp, &fd_ctx->entries, list) {
+                GF_FREE (entry->name);
+                list_del (&entry->list);
+                GF_FREE (entry);
+        }
 }
 
+
 int32_t
 afr_readdir_cbk (call_frame_t *frame, void *cookie,
                  xlator_t *this, int32_t op_ret, int32_t op_errno,
-                 gf_dirent_t *entries, dict_t *xdata)
+                 gf_dirent_t *entries)
 {
-        afr_local_t     *local = NULL;
+        afr_private_t * priv        = NULL;
+        afr_local_t *   local       = NULL;
+        gf_dirent_t *   entry       = NULL;
+        gf_dirent_t *   tmp         = NULL;
+        int             child_index = -1;
+
+        priv     = this->private;
+        local = frame->local;
+        child_index = (long) cookie;
 
         if (op_ret == -1)
                 goto out;
 
-        local = frame->local;
-        afr_readdir_filter_trash_dir (entries, local->fd);
+        list_for_each_entry_safe (entry, tmp, &entries->list, list) {
+                entry->d_ino = afr_itransform (entry->d_ino,
+                                               priv->child_count,
+                                               child_index);
+
+                if ((local->fd->inode == local->fd->inode->table->root)
+                    && !strcmp (entry->d_name, GF_REPLICATE_TRASH_DIR)) {
+                        list_del_init (&entry->list);
+                        GF_FREE (entry);
+                }
+        }
 
 out:
-        AFR_STACK_UNWIND (readdir, frame, op_ret, op_errno, entries, NULL);
+        AFR_STACK_UNWIND (readdir, frame, op_ret, op_errno, entries);
+
         return 0;
 }
 
 
 int32_t
 afr_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, gf_dirent_t *entries,
-                  dict_t *xdata)
+                  int32_t op_ret, int32_t op_errno, gf_dirent_t *entries)
 {
-        afr_local_t     *local = NULL;
+        afr_private_t *  priv        = NULL;
+        afr_local_t *    local       = NULL;
+        xlator_t **      children    = NULL;
+        int              call_child  = 0;
+        int              first_call_child  = 0;
+        int              ret         = 0;
+        gf_dirent_t *    entry       = NULL;
+        gf_dirent_t *    tmp         = NULL;
+        uint64_t         ctx         = 0;
+        afr_fd_ctx_t    *fd_ctx      = NULL;
+        off_t            offset      = 0;
 
-        if (op_ret == -1)
-                goto out;
+        priv     = this->private;
+        children = priv->children;
 
         local = frame->local;
-        afr_readdir_filter_trash_dir (entries, local->fd);
+
+        first_call_child = (long) cookie;
+        if (local->cont.readdir.last_tried == -1) {
+                call_child = (long) cookie;
+        } else {
+                call_child = local->cont.readdir.last_tried;
+        }
+
+        if (priv->strict_readdir) {
+                ret = fd_ctx_get (local->fd, this, &ctx);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_INFO,
+                                "could not get fd ctx for fd=%p", local->fd);
+                        op_ret   = -1;
+                        op_errno = -ret;
+                        goto out;
+                }
+
+                fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                if (child_went_down (op_ret, op_errno)) {
+                        if ((call_child + 1) % priv->child_count
+                                       == first_call_child) {
+                                gf_log (this->name, GF_LOG_INFO,
+                                        "all options tried going out");
+                                goto out;
+                        }
+
+                        call_child = (call_child + 1) % priv->child_count;
+                        local->cont.readdir.last_tried = call_child;
+
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "starting readdir afresh on child %d, offset %"PRId64,
+                                call_child, (uint64_t) 0);
+
+                        fd_ctx->failed_over = _gf_true;
+
+                        STACK_WIND_COOKIE (frame, afr_readdirp_cbk,
+                                           (void *) (long) first_call_child,
+                                           children[call_child],
+                                           children[call_child]->fops->readdirp, local->fd,
+                                           local->cont.readdir.size, 0);
+                        return 0;
+                }
+        }
+
+        if (op_ret != -1) {
+                list_for_each_entry_safe (entry, tmp, &entries->list, list) {
+                        if ((local->fd->inode == local->fd->inode->table->root)
+                            && !strcmp (entry->d_name, GF_REPLICATE_TRASH_DIR)) {
+                                list_del_init (&entry->list);
+                                GF_FREE (entry);
+                        }
+                }
+        }
+
+        if (priv->strict_readdir) {
+                if (fd_ctx->failed_over) {
+                        if (list_empty (&entries->list)) {
+                                gf_log (this->name, GF_LOG_DEBUG,
+                                        "no entries found");
+                                goto out;
+                        }
+
+                        offset = afr_filter_entries (entries, local->fd);
+
+                        afr_remember_entries (entries, local->fd);
+
+                        if (list_empty (&entries->list)) {
+                                /* All the entries we got were duplicate. We
+                                   shouldn't send an empty list now, because
+                                   that'll make the application stop reading. So
+                                   try to get more entries */
+
+                                gf_log (this->name, GF_LOG_TRACE,
+                                        "trying to fetch non-duplicate entries "
+                                        "from offset %"PRId64", child %s",
+                                        offset, children[call_child]->name);
+
+                                STACK_WIND_COOKIE (frame, afr_readdirp_cbk,
+                                                   (void *) (long) first_call_child,
+                                                   children[call_child],
+                                                   children[call_child]->fops->readdirp,
+                                                   local->fd, local->cont.readdir.size, offset);
+                                return 0;
+                        }
+                } else {
+                        afr_remember_entries (entries, local->fd);
+                }
+        }
 
 out:
-        AFR_STACK_UNWIND (readdirp, frame, op_ret, op_errno, entries, NULL);
+        AFR_STACK_UNWIND (readdirp, frame, op_ret, op_errno, entries);
+
         return 0;
 }
 
+
 int32_t
 afr_do_readdir (call_frame_t *frame, xlator_t *this,
-                fd_t *fd, size_t size, off_t offset, int whichop, dict_t *dict)
+                fd_t *fd, size_t size, off_t offset, int whichop)
 {
-        afr_private_t *priv      = NULL;
-        xlator_t      **children = NULL;
-        int           call_child = 0;
-        afr_local_t   *local     = NULL;
-        afr_fd_ctx_t  *fd_ctx    = NULL;
-        int           ret        = -1;
-        int32_t       op_errno   = 0;
-        uint64_t      read_child = 0;
+        afr_private_t *  priv       = NULL;
+        xlator_t **      children   = NULL;
+        int              call_child = 0;
+        afr_local_t     *local      = NULL;
+        uint64_t         ctx        = 0;
+        afr_fd_ctx_t    *fd_ctx     = NULL;
+        int              ret        = -1;
+        int32_t          op_ret     = -1;
+        int32_t          op_errno   = 0;
+        int32_t          read_child = -1;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -455,82 +658,94 @@ afr_do_readdir (call_frame_t *frame, xlator_t *this,
         priv     = this->private;
         children = priv->children;
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
-
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children) {
-                op_errno = ENOMEM;
-                goto out;
-        }
-
-        read_child = afr_inode_get_read_ctx (this, fd->inode,
-                                             local->fresh_children);
-        ret = afr_get_call_child (this, local->child_up, read_child,
-                                  local->fresh_children,
-                                  &call_child,
-                                  &local->cont.readdir.last_index);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
+        ret = AFR_LOCAL_INIT (local, priv);
         if (ret < 0) {
                 op_errno = -ret;
                 goto out;
         }
 
-        fd_ctx  = afr_fd_ctx_get (fd, this);
-        if (!fd_ctx) {
-                op_errno = EBADF;
-                goto out;
-        }
+        frame->local = local;
 
-        if ((offset == 0) || (fd_ctx->call_child == -1)) {
-                fd_ctx->call_child = call_child;
-        } else if ((priv->readdir_failover == _gf_false) &&
-                   (call_child != fd_ctx->call_child)) {
-                op_errno = EBADF;
-                goto out;
+        read_child = afr_read_child (this, fd->inode);
+
+        if ((read_child >= 0) && (priv->child_up[read_child])) {
+                call_child = read_child;
+                local->cont.readdir.last_tried = -1;
+        } else {
+                call_child = afr_first_up_child (priv);
+                if (call_child == -1) {
+                        op_errno = ENOTCONN;
+                        gf_log (this->name, GF_LOG_INFO,
+                                "no child is up");
+                        goto out;
+                }
+                local->cont.readdir.last_tried = call_child;
         }
 
         local->fd                  = fd_ref (fd);
         local->cont.readdir.size   = size;
-        local->cont.readdir.dict   = (dict)? dict_ref (dict) : NULL;
+
+        if (priv->strict_readdir) {
+                ret = fd_ctx_get (fd, this, &ctx);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_INFO,
+                                "could not get fd ctx for fd=%p", fd);
+                        op_errno = -ret;
+                        goto out;
+                }
+
+                fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                if (fd_ctx->last_tried != call_child) {
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "first up child has changed from %d to %d, "
+                                "restarting readdir from offset 0",
+                                fd_ctx->last_tried, call_child);
+
+                        fd_ctx->failed_over = _gf_true;
+                        offset = 0;
+                }
+
+                fd_ctx->last_tried = call_child;
+        }
 
         if (whichop == GF_FOP_READDIR)
                 STACK_WIND_COOKIE (frame, afr_readdir_cbk,
                                    (void *) (long) call_child,
                                    children[call_child],
                                    children[call_child]->fops->readdir, fd,
-                                   size, offset, dict);
+                                   size, offset);
         else
                 STACK_WIND_COOKIE (frame, afr_readdirp_cbk,
                                    (void *) (long) call_child,
                                    children[call_child],
                                    children[call_child]->fops->readdirp, fd,
-                                   size, offset, dict);
+                                   size, offset);
 
-        return 0;
+        op_ret = 0;
 out:
-        AFR_STACK_UNWIND (readdir, frame, -1, op_errno, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (readdir, frame, op_ret, op_errno, NULL);
+        }
         return 0;
 }
 
 
 int32_t
 afr_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
-             off_t offset, dict_t *xdata)
+             off_t offset)
 {
-        afr_do_readdir (frame, this, fd, size, offset, GF_FOP_READDIR, xdata);
+        afr_do_readdir (frame, this, fd, size, offset, GF_FOP_READDIR);
         return 0;
 }
 
 
 int32_t
 afr_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
-              off_t offset, dict_t *dict)
+              off_t offset)
 {
-        afr_do_readdir (frame, this, fd, size, offset, GF_FOP_READDIRP, dict);
+        afr_do_readdir (frame, this, fd, size, offset, GF_FOP_READDIRP);
         return 0;
 }
 
diff --git a/xlators/cluster/afr/src/afr-dir-read.h b/xlators/cluster/afr/src/afr-dir-read.h
index 09456d159..ae853c9d8 100644
--- a/xlators/cluster/afr/src/afr-dir-read.h
+++ b/xlators/cluster/afr/src/afr-dir-read.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __DIR_READ_H__
@@ -14,23 +23,28 @@
 
 int32_t
 afr_opendir (call_frame_t *frame, xlator_t *this,
-	     loc_t *loc, fd_t *fd, dict_t *xdata);
+	     loc_t *loc, fd_t *fd);
 
 int32_t
 afr_releasedir (xlator_t *this, fd_t *fd);
 
 int32_t
 afr_readdir (call_frame_t *frame, xlator_t *this,
-	     fd_t *fd, size_t size, off_t offset, dict_t *xdata);
+	     fd_t *fd, size_t size, off_t offset);
 
 
 int32_t
 afr_readdirp (call_frame_t *frame, xlator_t *this,
-              fd_t *fd, size_t size, off_t offset, dict_t *dict);
+	     fd_t *fd, size_t size, off_t offset);
+
+int32_t
+afr_getdents (call_frame_t *frame, xlator_t *this,
+	      fd_t *fd, size_t size, off_t offset, int32_t flag);
+
 
 int32_t
 afr_checksum (call_frame_t *frame, xlator_t *this,
-	      loc_t *loc, int32_t flags, dict_t *xdata);
+	      loc_t *loc, int32_t flags);
 
 
 #endif /* __DIR_READ_H__ */
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c
index 1943b719b..61aadb920 100644
--- a/xlators/cluster/afr/src/afr-dir-write.c
+++ b/xlators/cluster/afr/src/afr-dir-write.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -38,222 +47,33 @@
 #include "afr.h"
 #include "afr-transaction.h"
 
-int
-afr_build_parent_loc (loc_t *parent, loc_t *child, int32_t *op_errno)
-{
-        int     ret = -1;
-        char    *child_path = NULL;
-
-        if (!child->parent) {
-                if (op_errno)
-                        *op_errno = EINVAL;
-                goto out;
-        }
-
-        child_path = gf_strdup (child->path);
-        if (!child_path) {
-                if (op_errno)
-                        *op_errno = ENOMEM;
-                goto out;
-        }
-        parent->path = gf_strdup( dirname (child_path) );
-	if (!parent->path) {
-                if (op_errno)
-                        *op_errno = ENOMEM;
-                goto out;
-        }
-        parent->inode  = inode_ref (child->parent);
-        uuid_copy (parent->gfid, child->pargfid);
-
-        ret = 0;
-out:
-	GF_FREE(child_path);
-
-        return ret;
-}
-
-void
-__dir_entry_fop_common_cbk (call_frame_t *frame, int child_index,
-                            xlator_t *this, int32_t op_ret,
-                            int32_t op_errno, inode_t *inode,
-                            struct iatt *buf, struct iatt *preparent,
-                            struct iatt *postparent, struct iatt *prenewparent,
-                            struct iatt *postnewparent)
-{
-        afr_local_t     *local          = NULL;
-
-        local = frame->local;
-
-        if (afr_fop_failed (op_ret, op_errno))
-                afr_transaction_fop_failed (frame, this, child_index);
-
-        if (op_ret > -1) {
-                local->op_ret = op_ret;
-
-                if ((local->success_count == 0) ||
-                    (child_index == local->read_child_index)) {
-                        local->cont.dir_fop.preparent      = *preparent;
-                        local->cont.dir_fop.postparent     = *postparent;
-                        if (buf)
-                                local->cont.dir_fop.buf            = *buf;
-                        if (prenewparent)
-                             local->cont.dir_fop.prenewparent  = *prenewparent;
-                        if (postnewparent)
-                             local->cont.dir_fop.postnewparent = *postnewparent;
-                }
-
-                local->cont.dir_fop.inode = inode;
-
-                local->fresh_children[local->success_count] = child_index;
-                local->success_count++;
-                local->child_errno[child_index] = 0;
-        } else {
-                local->child_errno[child_index] = op_errno;
-        }
-
-        local->op_errno = op_errno;
-}
-
-int
-afr_mark_new_entry_changelog_cbk (call_frame_t *frame, void *cookie,
-                                  xlator_t *this,
-                                  int32_t op_ret, int32_t op_errno,
-                                  dict_t *xattr, dict_t *xdata)
-{
-        int     call_count = 0;
-
-        call_count = afr_frame_return (frame);
-        if (call_count == 0) {
-                AFR_STACK_DESTROY (frame);
-        }
-        return 0;
-}
 
 void
-afr_mark_new_entry_changelog (call_frame_t *frame, xlator_t *this)
-{
-        call_frame_t  *new_frame  = NULL;
-        afr_local_t   *local      = NULL;
-        afr_local_t   *new_local  = NULL;
-        afr_private_t *priv       = NULL;
-        dict_t        **xattr     = NULL;
-        int32_t       **changelog = NULL;
-        int           i           = 0;
-        GF_UNUSED int op_errno    = 0;
-
-        local = frame->local;
-        priv = this->private;
-
-        new_frame = copy_frame (frame);
-        if (!new_frame) {
-                goto out;
-        }
-
-        AFR_LOCAL_ALLOC_OR_GOTO (new_frame->local, out);
-        new_local = new_frame->local;
-        changelog = afr_matrix_create (priv->child_count, AFR_NUM_CHANGE_LOGS);
-        if (!changelog)
-                goto out;
-
-        xattr = GF_CALLOC (priv->child_count, sizeof (*xattr),
-                           gf_afr_mt_dict_t);
-        if (!xattr)
-                goto out;
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->child_errno[i])
-                        continue;
-                xattr[i] = dict_new ();
-                if (!xattr[i])
-                        goto out;
-        }
-
-        afr_prepare_new_entry_pending_matrix (changelog,
-                                              afr_is_errno_set,
-                                              local->child_errno,
-                                              &local->cont.dir_fop.buf,
-                                              priv->child_count);
-
-        new_local->pending = changelog;
-        uuid_copy (new_local->loc.gfid, local->cont.dir_fop.buf.ia_gfid);
-        new_local->loc.inode = inode_ref (local->cont.dir_fop.inode);
-        new_local->call_count = local->success_count;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->child_errno[i])
-                        continue;
-
-                afr_set_pending_dict (priv, xattr[i], changelog, i, LOCAL_LAST);
-                STACK_WIND_COOKIE (new_frame, afr_mark_new_entry_changelog_cbk,
-                                   (void *) (long) i, priv->children[i],
-                                   priv->children[i]->fops->xattrop,
-                                   &new_local->loc, GF_XATTROP_ADD_ARRAY,
-                                   xattr[i], NULL);
-        }
-        new_frame = NULL;
-out:
-        if (new_frame)
-                AFR_STACK_DESTROY (new_frame);
-        afr_xattr_array_destroy (xattr, priv->child_count);
-        return;
-}
-
-gf_boolean_t
-afr_is_new_entry_changelog_needed (glusterfs_fop_t fop)
+afr_build_parent_loc (loc_t *parent, loc_t *child)
 {
-        glusterfs_fop_t fops[]   = {GF_FOP_CREATE, GF_FOP_MKNOD, GF_FOP_NULL};
-        int             i        = 0;
+        char *tmp = NULL;
 
-        for (i = 0; fops[i] != GF_FOP_NULL; i++) {
-                if (fop == fops[i])
-                        return _gf_true;
+        if (!child->parent) {
+                //this should never be called with root as the child
+                GF_ASSERT (0);
+                loc_copy (parent, child);
+                return;
         }
-        return _gf_false;
-}
-
-void
-afr_dir_fop_mark_entry_pending_changelog (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t   *local      = NULL;
-        afr_private_t *priv       = NULL;
 
-        local = frame->local;
-        priv  = this->private;
-
-        if (local->op_ret < 0)
-                goto out;
-
-        if (local->success_count == priv->child_count)
-                goto out;
-
-        if (!afr_is_new_entry_changelog_needed (local->op))
-                goto out;
-
-        afr_mark_new_entry_changelog (frame, this);
-
-out:
-        return;
-}
+        tmp = gf_strdup (child->path);
+        parent->path   = gf_strdup (dirname (tmp));
+        GF_FREE (tmp);
 
-void
-afr_dir_fop_done (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local          = NULL;
-        afr_private_t   *priv           = NULL;
+        parent->name   = strrchr (parent->path, '/');
+        if (parent->name)
+                parent->name++;
 
-        local = frame->local;
-        priv  = this->private;
+        parent->inode  = inode_ref (child->parent);
+        parent->parent = inode_parent (parent->inode, 0, NULL);
+        parent->ino    = parent->inode->ino;
 
-        if (local->cont.dir_fop.inode == NULL)
-                goto done;
-        afr_set_read_ctx_from_policy (this, local->cont.dir_fop.inode,
-                                      local->fresh_children,
-                                      local->read_child_index,
-                                      priv->read_child,
-                                      local->cont.dir_fop.buf.ia_gfid);
-done:
-        local->transaction.unwind (frame, this);
-        afr_dir_fop_mark_entry_pending_changelog (frame, this);
-        local->transaction.resume (frame, this);
+        if (!uuid_is_null (child->pargfid))
+                uuid_copy (parent->gfid, child->pargfid);
 }
 
 /* {{{ create */
@@ -263,6 +83,7 @@ afr_create_unwind (call_frame_t *frame, xlator_t *this)
 {
         call_frame_t *main_frame = NULL;
         afr_local_t  *local = NULL;
+        struct iatt  *unwind_buf = NULL;
 
         local = frame->local;
 
@@ -276,14 +97,18 @@ afr_create_unwind (call_frame_t *frame, xlator_t *this)
         UNLOCK (&frame->lock);
 
         if (main_frame) {
+                if (local->cont.create.read_child_buf.ia_ino) {
+                        unwind_buf = &local->cont.create.read_child_buf;
+                } else {
+                        unwind_buf = &local->cont.create.buf;
+                }
+
                 AFR_STACK_UNWIND (create, main_frame,
                                   local->op_ret, local->op_errno,
                                   local->cont.create.fd,
-                                  local->cont.dir_fop.inode,
-                                  &local->cont.dir_fop.buf,
-                                  &local->cont.dir_fop.preparent,
-                                  &local->cont.dir_fop.postparent,
-                                  local->xdata_rsp);
+                                  local->cont.create.inode,
+                                  unwind_buf, &local->cont.create.preparent,
+                                  &local->cont.create.postparent);
         }
 
         return 0;
@@ -294,24 +119,31 @@ int
 afr_create_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno,
                      fd_t *fd, inode_t *inode, struct iatt *buf,
-                     struct iatt *preparent, struct iatt *postparent,
-                     dict_t *xdata)
+                     struct iatt *preparent, struct iatt *postparent)
 {
-        afr_local_t     *local = NULL;
-        uint64_t        ctx = 0;
-        afr_fd_ctx_t    *fd_ctx = NULL;
-        int             ret = 0;
-        int             call_count = -1;
-        int             child_index = -1;
+        afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
+        uint64_t      ctx = 0;
+        afr_fd_ctx_t *fd_ctx = NULL;
+        int ret = 0;
+        int call_count = -1;
+        int child_index = -1;
 
         local = frame->local;
+        priv  = this->private;
 
         child_index = (long) cookie;
 
         LOCK (&frame->lock);
         {
-                if (op_ret > -1) {
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
+                if (op_ret != -1) {
+                        local->op_ret = op_ret;
+
                         ret = afr_fd_ctx_set (this, fd);
+
                         if (ret < 0) {
                                 gf_log (this->name, GF_LOG_ERROR,
                                         "could not set ctx on fd=%p", fd);
@@ -322,6 +154,7 @@ afr_create_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         }
 
                         ret = fd_ctx_get (fd, this, &ctx);
+
                         if (ret < 0) {
                                 gf_log (this->name, GF_LOG_ERROR,
                                         "could not get fd ctx for fd=%p", fd);
@@ -332,17 +165,33 @@ afr_create_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
                         fd_ctx = (afr_fd_ctx_t *)(long) ctx;
 
-                        fd_ctx->opened_on[child_index] = AFR_FD_OPENED;
+                        fd_ctx->opened_on[child_index] = 1;
                         fd_ctx->flags                  = local->cont.create.flags;
 
                         if (local->success_count == 0) {
-				if (xdata)
-					local->xdata_rsp = dict_ref(xdata);
-			}
+                                local->cont.create.buf        = *buf;
+
+                                if (priv->read_child >= 0) {
+                                        afr_set_read_child (this, inode,
+                                                            priv->read_child);
+                                } else {
+                                        afr_set_read_child (this, inode,
+                                                            local->read_child_index);
+                                }
+                        }
+
+                        if (child_index == local->read_child_index) {
+                                local->cont.create.read_child_buf = *buf;
+                                local->cont.create.preparent      = *preparent;
+                                local->cont.create.postparent     = *postparent;
+                        }
+
+                        local->cont.create.inode = inode;
+
+                        local->success_count++;
                 }
-                __dir_entry_fop_common_cbk (frame, child_index, this,
-                                            op_ret, op_errno, inode, buf,
-                                            preparent, postparent, NULL, NULL);
+
+                local->op_errno = op_errno;
         }
 
 unlock:
@@ -350,8 +199,11 @@ unlock:
 
         call_count = afr_frame_return (frame);
 
-        if (call_count == 0)
-                afr_dir_fop_done (frame, this);
+        if (call_count == 0) {
+                local->transaction.unwind (frame, this);
+
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
@@ -368,8 +220,7 @@ afr_create_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -379,7 +230,7 @@ afr_create_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_create_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
@@ -387,9 +238,8 @@ afr_create_wind (call_frame_t *frame, xlator_t *this)
                                            &local->loc,
                                            local->cont.create.flags,
                                            local->cont.create.mode,
-                                           local->umask,
                                            local->cont.create.fd,
-                                           local->xdata_req);
+                                           local->cont.create.params);
                         if (!--call_count)
                                 break;
                 }
@@ -417,14 +267,14 @@ afr_create_done (call_frame_t *frame, xlator_t *this)
 int
 afr_create (call_frame_t *frame, xlator_t *this,
             loc_t *loc, int32_t flags, mode_t mode,
-            mode_t umask, fd_t *fd, dict_t *params)
+            fd_t *fd, dict_t *params)
 {
-        afr_private_t           *priv                   = NULL;
-        afr_local_t             *local                  = NULL;
-        afr_internal_lock_t     *int_lock               = NULL;
-        call_frame_t            *transaction_frame      = NULL;
-        int                     ret                     = -1;
-        int                     op_errno                = 0;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -432,20 +282,20 @@ afr_create (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(create,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
 
         loc_copy (&local->loc, loc);
 
@@ -456,49 +306,33 @@ afr_create (call_frame_t *frame, xlator_t *this,
         }
         UNLOCK (&priv->read_child_lock);
 
-        local->op                = GF_FOP_CREATE;
         local->cont.create.flags = flags;
         local->cont.create.mode  = mode;
         local->cont.create.fd    = fd_ref (fd);
-        local->umask  = umask;
         if (params)
-                local->xdata_req = dict_ref (params);
+                local->cont.create.params = dict_ref (params);
+
+        if (loc->parent)
+                local->cont.create.parent_ino = loc->parent->ino;
 
         local->transaction.fop    = afr_create_wind;
         local->transaction.done   = afr_create_done;
         local->transaction.unwind = afr_create_unwind;
 
-        ret = afr_build_parent_loc (&local->transaction.parent_loc, loc,
-                                    &op_errno);
-        if (ret)
-                goto out;
+        afr_build_parent_loc (&local->transaction.parent_loc, loc);
 
         local->transaction.main_frame = frame;
         local->transaction.basename = AFR_BASENAME (loc->path);
-        int_lock = &local->internal_lock;
-
-        int_lock->lockee_count = 0;
-        ret = afr_init_entry_lockee (&int_lock->lockee[0], local,
-                                     &local->transaction.parent_loc,
-                                     local->transaction.basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
 
-        int_lock->lockee_count++;
-        ret = afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (create, frame, -1, op_errno,
-                                  NULL, NULL, NULL, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (create, frame, op_ret, op_errno,
+                                  NULL, NULL, NULL, NULL, NULL);
         }
 
         return 0;
@@ -513,6 +347,7 @@ afr_mknod_unwind (call_frame_t *frame, xlator_t *this)
 {
         call_frame_t *main_frame = NULL;
         afr_local_t  *local = NULL;
+        struct iatt *unwind_buf = NULL;
 
         local = frame->local;
 
@@ -526,13 +361,17 @@ afr_mknod_unwind (call_frame_t *frame, xlator_t *this)
         UNLOCK (&frame->lock);
 
         if (main_frame) {
+                if (local->cont.mknod.read_child_buf.ia_ino) {
+                        unwind_buf = &local->cont.mknod.read_child_buf;
+                } else {
+                        unwind_buf = &local->cont.mknod.buf;
+                }
+
                 AFR_STACK_UNWIND (mknod, main_frame,
                                   local->op_ret, local->op_errno,
-                                  local->cont.dir_fop.inode,
-                                  &local->cont.dir_fop.buf,
-                                  &local->cont.dir_fop.preparent,
-                                  &local->cont.dir_fop.postparent,
-                                  NULL);
+                                  local->cont.mknod.inode,
+                                  unwind_buf, &local->cont.mknod.preparent,
+                                  &local->cont.mknod.postparent);
         }
 
         return 0;
@@ -543,25 +382,60 @@ int
 afr_mknod_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, inode_t *inode,
                     struct iatt *buf, struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata)
+                    struct iatt *postparent)
 {
-        int             call_count      = -1;
-        int             child_index     = -1;
+        afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
+        int call_count = -1;
+        int child_index = -1;
+
+        local = frame->local;
+        priv = this->private;
 
         child_index = (long) cookie;
 
         LOCK (&frame->lock);
         {
-                __dir_entry_fop_common_cbk (frame, child_index, this,
-                                            op_ret, op_errno, inode, buf,
-                                            preparent, postparent, NULL, NULL);
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
+                if (op_ret != -1) {
+                        local->op_ret = op_ret;
+
+                        if (local->success_count == 0){
+                                local->cont.mknod.buf   = *buf;
+
+                                if (priv->read_child >= 0) {
+                                        afr_set_read_child (this, inode,
+                                                            priv->read_child);
+                                } else {
+                                        afr_set_read_child (this, inode,
+                                                            local->read_child_index);
+                                }
+                        }
+
+                        if (child_index == local->read_child_index) {
+                                local->cont.mknod.read_child_buf = *buf;
+                                local->cont.mknod.preparent      = *preparent;
+                                local->cont.mknod.postparent     = *postparent;
+                        }
+
+                        local->cont.mknod.inode = inode;
+
+                        local->success_count++;
+                }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
 
-        if (call_count == 0)
-                afr_dir_fop_done (frame, this);
+        if (call_count == 0) {
+                local->transaction.unwind (frame, this);
+
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
@@ -578,8 +452,7 @@ afr_mknod_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv  = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -589,14 +462,13 @@ afr_mknod_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_mknod_wind_cbk, (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->mknod,
                                            &local->loc, local->cont.mknod.mode,
                                            local->cont.mknod.dev,
-                                           local->umask,
-                                           local->xdata_req);
+                                           local->cont.mknod.params);
                         if (!--call_count)
                                 break;
                 }
@@ -621,15 +493,15 @@ afr_mknod_done (call_frame_t *frame, xlator_t *this)
 
 
 int
-afr_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
-           dev_t dev, mode_t umask, dict_t *params)
+afr_mknod (call_frame_t *frame, xlator_t *this,
+           loc_t *loc, mode_t mode, dev_t dev, dict_t *params)
 {
-        afr_private_t           *priv                   = NULL;
-        afr_local_t             *local                  = NULL;
-        afr_internal_lock_t     *int_lock               = NULL;
-        call_frame_t            *transaction_frame      = NULL;
-        int                     ret                     = -1;
-        int                     op_errno                = 0;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -637,20 +509,20 @@ afr_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
 
         priv = this->private;
 
-        QUORUM_CHECK(mknod,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
 
         loc_copy (&local->loc, loc);
 
@@ -661,48 +533,32 @@ afr_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
         }
         UNLOCK (&priv->read_child_lock);
 
-        local->op               = GF_FOP_MKNOD;
         local->cont.mknod.mode  = mode;
         local->cont.mknod.dev   = dev;
-        local->umask = umask;
         if (params)
-                local->xdata_req = dict_ref (params);
+                local->cont.mknod.params = dict_ref (params);
+
+        if (loc->parent)
+                local->cont.mknod.parent_ino = loc->parent->ino;
 
         local->transaction.fop    = afr_mknod_wind;
         local->transaction.done   = afr_mknod_done;
         local->transaction.unwind = afr_mknod_unwind;
 
-        ret = afr_build_parent_loc (&local->transaction.parent_loc, loc,
-                                    &op_errno);
-        if (ret)
-                goto out;
+        afr_build_parent_loc (&local->transaction.parent_loc, loc);
 
         local->transaction.main_frame = frame;
         local->transaction.basename = AFR_BASENAME (loc->path);
-        int_lock = &local->internal_lock;
-
-        int_lock->lockee_count = 0;
-        ret = afr_init_entry_lockee (&int_lock->lockee[0], local,
-                                     &local->transaction.parent_loc,
-                                     local->transaction.basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
 
-        int_lock->lockee_count++;
-        ret = afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (mknod, frame, -1, op_errno,
-                                  NULL, NULL, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (mknod, frame, op_ret, op_errno,
+                                  NULL, NULL, NULL, NULL);
         }
 
         return 0;
@@ -718,6 +574,7 @@ afr_mkdir_unwind (call_frame_t *frame, xlator_t *this)
 {
         call_frame_t *main_frame = NULL;
         afr_local_t  *local = NULL;
+        struct iatt *unwind_buf = NULL;
 
         local = frame->local;
 
@@ -731,13 +588,17 @@ afr_mkdir_unwind (call_frame_t *frame, xlator_t *this)
         UNLOCK (&frame->lock);
 
         if (main_frame) {
+                if (local->cont.mkdir.read_child_buf.ia_ino) {
+                        unwind_buf = &local->cont.mkdir.read_child_buf;
+                } else {
+                        unwind_buf = &local->cont.mkdir.buf;
+                }
+
                 AFR_STACK_UNWIND (mkdir, main_frame,
                                   local->op_ret, local->op_errno,
-                                  local->cont.dir_fop.inode,
-                                  &local->cont.dir_fop.buf,
-                                  &local->cont.dir_fop.preparent,
-                                  &local->cont.dir_fop.postparent,
-                                  NULL);
+                                  local->cont.mkdir.inode,
+                                  unwind_buf, &local->cont.mkdir.preparent,
+                                  &local->cont.mkdir.postparent);
         }
 
         return 0;
@@ -748,25 +609,60 @@ int
 afr_mkdir_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, inode_t *inode,
                     struct iatt *buf, struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata)
+                    struct iatt *postparent)
 {
-        int             call_count      = -1;
-        int             child_index     = -1;
+        afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
+        int call_count = -1;
+        int child_index = -1;
+
+        local = frame->local;
+        priv = this->private;
 
         child_index = (long) cookie;
 
         LOCK (&frame->lock);
         {
-                __dir_entry_fop_common_cbk (frame, child_index, this,
-                                            op_ret, op_errno, inode, buf,
-                                            preparent, postparent, NULL, NULL);
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
+                if (op_ret != -1) {
+                        local->op_ret           = op_ret;
+
+                        if (local->success_count == 0) {
+                                local->cont.mkdir.buf   = *buf;
+
+                                if (priv->read_child >= 0) {
+                                        afr_set_read_child (this, inode,
+                                                            priv->read_child);
+                                } else {
+                                        afr_set_read_child (this, inode,
+                                                            local->read_child_index);
+                                }
+                        }
+
+                        if (child_index == local->read_child_index) {
+                                local->cont.mkdir.read_child_buf = *buf;
+                                local->cont.mkdir.preparent      = *preparent;
+                                local->cont.mkdir.postparent     = *postparent;
+                        }
+
+                        local->cont.mkdir.inode = inode;
+
+                        local->success_count++;
+                }
+
+                local->op_errno         = op_errno;
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
 
-        if (call_count == 0)
-                afr_dir_fop_done (frame, this);
+        if (call_count == 0) {
+                local->transaction.unwind (frame, this);
+
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
@@ -783,8 +679,7 @@ afr_mkdir_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv  = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -794,14 +689,13 @@ afr_mkdir_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_mkdir_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->mkdir,
                                            &local->loc, local->cont.mkdir.mode,
-                                           local->umask,
-                                           local->xdata_req);
+                                           local->cont.mkdir.params);
                         if (!--call_count)
                                 break;
                 }
@@ -825,16 +719,17 @@ afr_mkdir_done (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
+
 int
 afr_mkdir (call_frame_t *frame, xlator_t *this,
-           loc_t *loc, mode_t mode, mode_t umask, dict_t *params)
+           loc_t *loc, mode_t mode, dict_t *params)
 {
-        afr_private_t           *priv                   = NULL;
-        afr_local_t             *local                  = NULL;
-        afr_internal_lock_t     *int_lock               = NULL;
-        call_frame_t            *transaction_frame      = NULL;
-        int                     ret                     = -1;
-        int                     op_errno                = 0;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -842,20 +737,20 @@ afr_mkdir (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(mkdir,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
 
         loc_copy (&local->loc, loc);
 
@@ -867,47 +762,31 @@ afr_mkdir (call_frame_t *frame, xlator_t *this,
         UNLOCK (&priv->read_child_lock);
 
         local->cont.mkdir.mode  = mode;
-        local->umask = umask;
         if (params)
-                local->xdata_req = dict_ref (params);
+                local->cont.mkdir.params = dict_ref (params);
+
+        if (loc->parent)
+                local->cont.mkdir.parent_ino = loc->parent->ino;
 
-        local->op = GF_FOP_MKDIR;
         local->transaction.fop    = afr_mkdir_wind;
         local->transaction.done   = afr_mkdir_done;
         local->transaction.unwind = afr_mkdir_unwind;
 
-        ret = afr_build_parent_loc (&local->transaction.parent_loc, loc,
-                                    &op_errno);
-        if (ret)
-                goto out;
+        afr_build_parent_loc (&local->transaction.parent_loc, loc);
 
         local->transaction.main_frame = frame;
         local->transaction.basename = AFR_BASENAME (loc->path);
-        int_lock = &local->internal_lock;
-
-        int_lock->lockee_count = 0;
-        ret = afr_init_entry_lockee (&int_lock->lockee[0], local,
-                                     &local->transaction.parent_loc,
-                                     local->transaction.basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
 
-        int_lock->lockee_count++;
-        ret = afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
 
-                AFR_STACK_UNWIND (mkdir, frame, -1, op_errno,
-                                  NULL, NULL, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (mkdir, frame, op_ret, op_errno,
+                                  NULL, NULL, NULL, NULL);
         }
 
         return 0;
@@ -923,6 +802,7 @@ afr_link_unwind (call_frame_t *frame, xlator_t *this)
 {
         call_frame_t *main_frame = NULL;
         afr_local_t  *local = NULL;
+        struct iatt *unwind_buf = NULL;
 
         local = frame->local;
 
@@ -936,13 +816,17 @@ afr_link_unwind (call_frame_t *frame, xlator_t *this)
         UNLOCK (&frame->lock);
 
         if (main_frame) {
+                if (local->cont.link.read_child_buf.ia_ino) {
+                        unwind_buf = &local->cont.link.read_child_buf;
+                } else {
+                        unwind_buf = &local->cont.link.buf;
+                }
+
                 AFR_STACK_UNWIND (link, main_frame,
                                   local->op_ret, local->op_errno,
-                                  local->cont.dir_fop.inode,
-                                  &local->cont.dir_fop.buf,
-                                  &local->cont.dir_fop.preparent,
-                                  &local->cont.dir_fop.postparent,
-                                  NULL);
+                                  local->cont.link.inode,
+                                  unwind_buf, &local->cont.link.preparent,
+                                  &local->cont.link.postparent);
         }
 
         return 0;
@@ -953,25 +837,60 @@ int
 afr_link_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, inode_t *inode,
                    struct iatt *buf, struct iatt *preparent,
-                   struct iatt *postparent, dict_t *xdata)
+                   struct iatt *postparent)
 {
-        int             call_count      = -1;
-        int             child_index     = -1;
+        afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
+        int call_count = -1;
+        int child_index = -1;
+
+        local = frame->local;
+        priv = this->private;
 
         child_index = (long) cookie;
 
         LOCK (&frame->lock);
         {
-                __dir_entry_fop_common_cbk (frame, child_index, this,
-                                            op_ret, op_errno, inode, buf,
-                                            preparent, postparent, NULL, NULL);
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
+                if (op_ret != -1) {
+                        local->op_ret   = op_ret;
+
+                        if (local->success_count == 0) {
+                                local->cont.link.buf        = *buf;
+
+                                if (priv->read_child >= 0) {
+                                        afr_set_read_child (this, inode,
+                                                            priv->read_child);
+                                } else {
+                                        afr_set_read_child (this, inode,
+                                                            local->read_child_index);
+                                }
+                        }
+
+                        if (child_index == local->read_child_index) {
+                                local->cont.link.read_child_buf = *buf;
+                                local->cont.link.preparent      = *preparent;
+                                local->cont.link.postparent     = *postparent;
+                        }
+
+                        local->cont.link.inode    = inode;
+
+                        local->success_count++;
+                }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
 
-        if (call_count == 0)
-                afr_dir_fop_done (frame, this);
+        if (call_count == 0) {
+                local->transaction.unwind (frame, this);
+
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
@@ -988,8 +907,7 @@ afr_link_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv  = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -999,13 +917,12 @@ afr_link_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
-                        STACK_WIND_COOKIE (frame, afr_link_wind_cbk,
-                                           (void *) (long) i,
+                if (local->child_up[i]) {
+                        STACK_WIND_COOKIE (frame, afr_link_wind_cbk, (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->link,
                                            &local->loc,
-                                           &local->newloc, local->xdata_req);
+                                           &local->newloc);
 
                         if (!--call_count)
                                 break;
@@ -1031,14 +948,14 @@ afr_link_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_link (call_frame_t *frame, xlator_t *this,
-          loc_t *oldloc, loc_t *newloc, dict_t *xdata)
+          loc_t *oldloc, loc_t *newloc)
 {
-        afr_private_t           *priv                   = NULL;
-        afr_local_t             *local                  = NULL;
-        afr_internal_lock_t     *int_lock               = NULL;
-        call_frame_t            *transaction_frame      = NULL;
-        int                     ret                     = -1;
-        int                     op_errno                = 0;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -1046,25 +963,23 @@ afr_link (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(link,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
 
         loc_copy (&local->loc,    oldloc);
         loc_copy (&local->newloc, newloc);
-        if (xdata)
-                local->xdata_req = dict_ref (xdata);
 
         LOCK (&priv->read_child_lock);
         {
@@ -1073,41 +988,30 @@ afr_link (call_frame_t *frame, xlator_t *this,
         }
         UNLOCK (&priv->read_child_lock);
 
-        local->op = GF_FOP_LINK;
+        local->cont.link.ino = oldloc->inode->ino;
+
+        if (oldloc->parent)
+                local->cont.link.parent_ino = newloc->parent->ino;
+
         local->transaction.fop    = afr_link_wind;
         local->transaction.done   = afr_link_done;
         local->transaction.unwind = afr_link_unwind;
 
-        ret = afr_build_parent_loc (&local->transaction.parent_loc, newloc,
-                                    &op_errno);
-        if (ret)
-                goto out;
+        afr_build_parent_loc (&local->transaction.parent_loc, oldloc);
 
         local->transaction.main_frame   = frame;
-        local->transaction.basename     = AFR_BASENAME (newloc->path);
-        int_lock = &local->internal_lock;
-
-        int_lock->lockee_count = 0;
-        ret = afr_init_entry_lockee (&int_lock->lockee[0], local,
-                                     &local->transaction.parent_loc,
-                                     local->transaction.basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
+        local->transaction.basename     = AFR_BASENAME (oldloc->path);
+        local->transaction.new_basename = AFR_BASENAME (newloc->path);
 
-        int_lock->lockee_count++;
-        ret = afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
-        ret = 0;
+        afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
+
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (link, frame, -1, op_errno,
-                                  NULL, NULL, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (link, frame, op_ret, op_errno,
+                                  NULL, NULL, NULL, NULL);
         }
 
         return 0;
@@ -1123,6 +1027,7 @@ afr_symlink_unwind (call_frame_t *frame, xlator_t *this)
 {
         call_frame_t *main_frame = NULL;
         afr_local_t  *local = NULL;
+        struct iatt *unwind_buf = NULL;
 
         local = frame->local;
 
@@ -1136,13 +1041,17 @@ afr_symlink_unwind (call_frame_t *frame, xlator_t *this)
         UNLOCK (&frame->lock);
 
         if (main_frame) {
+                if (local->cont.symlink.read_child_buf.ia_ino) {
+                        unwind_buf = &local->cont.symlink.read_child_buf;
+                } else {
+                        unwind_buf = &local->cont.symlink.buf;
+                }
+
                 AFR_STACK_UNWIND (symlink, main_frame,
                                   local->op_ret, local->op_errno,
-                                  local->cont.dir_fop.inode,
-                                  &local->cont.dir_fop.buf,
-                                  &local->cont.dir_fop.preparent,
-                                  &local->cont.dir_fop.postparent,
-                                  NULL);
+                                  local->cont.symlink.inode,
+                                  unwind_buf, &local->cont.symlink.preparent,
+                                  &local->cont.symlink.postparent);
         }
 
         return 0;
@@ -1153,25 +1062,60 @@ int
 afr_symlink_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno, inode_t *inode,
                       struct iatt *buf, struct iatt *preparent,
-                      struct iatt *postparent, dict_t *xdata)
+                      struct iatt *postparent)
 {
-        int             call_count      = -1;
-        int             child_index     = -1;
+        afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
+        int call_count = -1;
+        int child_index = -1;
+
+        local = frame->local;
+        priv = this->private;
 
         child_index = (long) cookie;
 
         LOCK (&frame->lock);
         {
-                __dir_entry_fop_common_cbk (frame, child_index, this,
-                                            op_ret, op_errno, inode, buf,
-                                            preparent, postparent, NULL, NULL);
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
+                if (op_ret != -1) {
+                        local->op_ret   = op_ret;
+
+                        if (local->success_count == 0) {
+                                local->cont.symlink.buf        = *buf;
+
+                                if (priv->read_child >= 0) {
+                                        afr_set_read_child (this, inode,
+                                                            priv->read_child);
+                                } else {
+                                        afr_set_read_child (this, inode,
+                                                            local->read_child_index);
+                                }
+                        }
+
+                        if (child_index == local->read_child_index) {
+                                local->cont.symlink.read_child_buf = *buf;
+                                local->cont.symlink.preparent      = *preparent;
+                                local->cont.symlink.postparent     = *postparent;
+                        }
+
+                        local->cont.symlink.inode    = inode;
+
+                        local->success_count++;
+                }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
 
-        if (call_count == 0)
-                afr_dir_fop_done (frame, this);
+        if (call_count == 0) {
+                local->transaction.unwind (frame, this);
+
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
@@ -1188,8 +1132,7 @@ afr_symlink_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -1199,15 +1142,14 @@ afr_symlink_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_symlink_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->symlink,
                                            local->cont.symlink.linkpath,
                                            &local->loc,
-                                           local->umask,
-                                           local->xdata_req);
+                                           local->cont.symlink.params);
 
                         if (!--call_count)
                                 break;
@@ -1234,14 +1176,14 @@ afr_symlink_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_symlink (call_frame_t *frame, xlator_t *this,
-             const char *linkpath, loc_t *loc, mode_t umask, dict_t *params)
+             const char *linkpath, loc_t *loc, dict_t *params)
 {
-        afr_private_t           *priv                   = NULL;
-        afr_local_t             *local                  = NULL;
-        afr_internal_lock_t     *int_lock               = NULL;
-        call_frame_t            *transaction_frame      = NULL;
-        int                     ret                     = -1;
-        int                     op_errno                = 0;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -1249,20 +1191,20 @@ afr_symlink (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(symlink,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
 
         loc_copy (&local->loc, loc);
 
@@ -1274,46 +1216,30 @@ afr_symlink (call_frame_t *frame, xlator_t *this,
         UNLOCK (&priv->read_child_lock);
 
         local->cont.symlink.linkpath = gf_strdup (linkpath);
-        local->umask = umask;
         if (params)
-                local->xdata_req = dict_ref (params);
+                local->cont.symlink.params = dict_ref (params);
+
+        if (loc->parent)
+                local->cont.symlink.parent_ino = loc->parent->ino;
 
-        local->op = GF_FOP_SYMLINK;
         local->transaction.fop    = afr_symlink_wind;
         local->transaction.done   = afr_symlink_done;
         local->transaction.unwind = afr_symlink_unwind;
 
-        ret = afr_build_parent_loc (&local->transaction.parent_loc, loc,
-                                    &op_errno);
-        if (ret)
-                goto out;
+        afr_build_parent_loc (&local->transaction.parent_loc, loc);
 
         local->transaction.main_frame   = frame;
         local->transaction.basename     = AFR_BASENAME (loc->path);
-        int_lock = &local->internal_lock;
-
-        int_lock->lockee_count = 0;
-        ret = afr_init_entry_lockee (&int_lock->lockee[0], local,
-                                     &local->transaction.parent_loc,
-                                     local->transaction.basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
 
-        int_lock->lockee_count++;
-        ret = afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret  < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (symlink, frame, -1, op_errno,
-                                  NULL, NULL, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (symlink, frame, op_ret, op_errno,
+                                  NULL, NULL, NULL, NULL);
         }
 
         return 0;
@@ -1328,6 +1254,7 @@ afr_rename_unwind (call_frame_t *frame, xlator_t *this)
 {
         call_frame_t *main_frame = NULL;
         afr_local_t  *local = NULL;
+        struct iatt *unwind_buf = NULL;
 
         local = frame->local;
 
@@ -1341,14 +1268,19 @@ afr_rename_unwind (call_frame_t *frame, xlator_t *this)
         UNLOCK (&frame->lock);
 
         if (main_frame) {
+                if (local->cont.rename.read_child_buf.ia_ino) {
+                        unwind_buf = &local->cont.rename.read_child_buf;
+                } else {
+                        unwind_buf = &local->cont.rename.buf;
+                }
+
                 AFR_STACK_UNWIND (rename, main_frame,
                                   local->op_ret, local->op_errno,
-                                  &local->cont.dir_fop.buf,
-                                  &local->cont.dir_fop.preparent,
-                                  &local->cont.dir_fop.postparent,
-                                  &local->cont.dir_fop.prenewparent,
-                                  &local->cont.dir_fop.postnewparent,
-                                  NULL);
+                                  unwind_buf,
+                                  &local->cont.rename.preoldparent,
+                                  &local->cont.rename.postoldparent,
+                                  &local->cont.rename.prenewparent,
+                                  &local->cont.rename.postnewparent);
         }
 
         return 0;
@@ -1359,8 +1291,7 @@ int
 afr_rename_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, struct iatt *buf,
                      struct iatt *preoldparent, struct iatt *postoldparent,
-                     struct iatt *prenewparent, struct iatt *postnewparent,
-                     dict_t *xdata)
+                     struct iatt *prenewparent, struct iatt *postnewparent)
 {
         afr_local_t *   local = NULL;
         int call_count = -1;
@@ -1374,22 +1305,38 @@ afr_rename_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         {
                 if (afr_fop_failed (op_ret, op_errno) && op_errno != ENOTEMPTY)
                         afr_transaction_fop_failed (frame, this, child_index);
-                local->op_errno = op_errno;
-                local->child_errno[child_index] = op_errno;
 
-                if (op_ret > -1)
-                        __dir_entry_fop_common_cbk (frame, child_index, this,
-                                                   op_ret, op_errno, NULL, buf,
-                                                   preoldparent, postoldparent,
-                                                   prenewparent, postnewparent);
+                if (op_ret != -1) {
+                        if (local->success_count == 0) {
+                                local->op_ret = op_ret;
+
+                                if (buf) {
+                                        local->cont.rename.buf = *buf;
+                                }
+
+                                local->success_count++;
+                        }
+
+                        if (child_index == local->read_child_index) {
+                                local->cont.rename.read_child_buf = *buf;
 
+                                local->cont.rename.preoldparent  = *preoldparent;
+                                local->cont.rename.postoldparent = *postoldparent;
+                                local->cont.rename.prenewparent  = *prenewparent;
+                                local->cont.rename.postnewparent = *postnewparent;
+                        }
+                }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
 
-        if (call_count == 0)
-                afr_dir_fop_done (frame, this);
+        if (call_count == 0) {
+                local->transaction.unwind (frame, this);
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
@@ -1406,8 +1353,7 @@ afr_rename_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -1417,13 +1363,13 @@ afr_rename_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_rename_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->rename,
                                            &local->loc,
-                                           &local->newloc, NULL);
+                                           &local->newloc);
                         if (!--call_count)
                                 break;
                 }
@@ -1448,15 +1394,14 @@ afr_rename_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_rename (call_frame_t *frame, xlator_t *this,
-            loc_t *oldloc, loc_t *newloc, dict_t *xdata)
+            loc_t *oldloc, loc_t *newloc)
 {
-        afr_private_t           *priv                   = NULL;
-        afr_local_t             *local                  = NULL;
-        afr_internal_lock_t     *int_lock               = NULL;
-        call_frame_t            *transaction_frame      = NULL;
-        int                     ret                     = -1;
-        int                     op_errno                = 0;
-        int                     nlockee                 = 0;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -1464,90 +1409,54 @@ afr_rename (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(rename,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
 
         loc_copy (&local->loc,    oldloc);
         loc_copy (&local->newloc, newloc);
 
-        local->read_child_index = afr_inode_get_read_ctx (this, oldloc->inode, NULL);
+        local->read_child_index = afr_read_child (this, oldloc->inode);
+
+        local->cont.rename.ino = oldloc->inode->ino;
+
+        if (oldloc->parent)
+                local->cont.rename.oldparent_ino = oldloc->parent->ino;
+        if (newloc->parent)
+                local->cont.rename.newparent_ino = newloc->parent->ino;
 
-        local->op = GF_FOP_RENAME;
         local->transaction.fop    = afr_rename_wind;
         local->transaction.done   = afr_rename_done;
         local->transaction.unwind = afr_rename_unwind;
 
-        ret = afr_build_parent_loc (&local->transaction.parent_loc, oldloc,
-                                    &op_errno);
-        if (ret)
-                goto out;
-        ret = afr_build_parent_loc (&local->transaction.new_parent_loc, newloc,
-                                    &op_errno);
-        if (ret)
-                goto out;
+        afr_build_parent_loc (&local->transaction.parent_loc, oldloc);
+        afr_build_parent_loc (&local->transaction.new_parent_loc, newloc);
 
         local->transaction.main_frame   = frame;
         local->transaction.basename     = AFR_BASENAME (oldloc->path);
         local->transaction.new_basename = AFR_BASENAME (newloc->path);
-        int_lock = &local->internal_lock;
-
-        int_lock->lockee_count = nlockee = 0;
-        ret = afr_init_entry_lockee (&int_lock->lockee[nlockee], local,
-                                     &local->transaction.new_parent_loc,
-                                     local->transaction.new_basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
 
-        nlockee++;
-        ret = afr_init_entry_lockee (&int_lock->lockee[nlockee], local,
-                                     &local->transaction.parent_loc,
-                                     local->transaction.basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
-
-        nlockee++;
-        if (local->newloc.inode && IA_ISDIR (local->newloc.inode->ia_type)) {
-                ret = afr_init_entry_lockee (&int_lock->lockee[nlockee], local,
-                                             &local->newloc,
-                                             NULL,
-                                             priv->child_count);
-                if (ret)
-                        goto out;
-
-                nlockee++;
-        }
-        qsort (int_lock->lockee, nlockee, sizeof (*int_lock->lockee),
-               afr_entry_lockee_cmp);
-        int_lock->lockee_count = nlockee;
+        afr_transaction (transaction_frame, this, AFR_ENTRY_RENAME_TRANSACTION);
 
-        ret = afr_transaction (transaction_frame, this, AFR_ENTRY_RENAME_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
-
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
 
-                AFR_STACK_UNWIND (rename, frame, -1, op_errno,
-                                  NULL, NULL, NULL, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (rename, frame, op_ret, op_errno,
+                                  NULL, NULL, NULL, NULL, NULL);
         }
 
         return 0;
@@ -1577,9 +1486,8 @@ afr_unlink_unwind (call_frame_t *frame, xlator_t *this)
         if (main_frame) {
                 AFR_STACK_UNWIND (unlink, main_frame,
                                   local->op_ret, local->op_errno,
-                                  &local->cont.dir_fop.preparent,
-                                  &local->cont.dir_fop.postparent,
-                                  NULL);
+                                  &local->cont.unlink.preparent,
+                                  &local->cont.unlink.postparent);
         }
 
         return 0;
@@ -1589,28 +1497,51 @@ afr_unlink_unwind (call_frame_t *frame, xlator_t *this)
 int
 afr_unlink_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, struct iatt *preparent,
-                     struct iatt *postparent, dict_t *xdata)
+                     struct iatt *postparent)
 {
         afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
         int call_count  = -1;
         int child_index = (long) cookie;
 
         local = frame->local;
+        priv  = this->private;
 
         LOCK (&frame->lock);
         {
                 if (child_index == local->read_child_index) {
                         local->read_child_returned = _gf_true;
                 }
-                __dir_entry_fop_common_cbk (frame, child_index, this,
-                                            op_ret, op_errno, NULL, NULL,
-                                            preparent, postparent, NULL, NULL);
+
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
+                if (op_ret != -1) {
+                        if (local->success_count == 0) {
+                                local->op_ret   = op_ret;
+                                local->cont.unlink.preparent  = *preparent;
+                                local->cont.unlink.postparent = *postparent;
+                        }
+
+                        if (child_index == local->read_child_index) {
+                                local->cont.unlink.preparent  = *preparent;
+                                local->cont.unlink.postparent = *postparent;
+                        }
+
+                        local->success_count++;
+                }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
-        if (call_count == 0)
-                afr_dir_fop_done (frame, this);
+
+        if (call_count == 0) {
+                local->transaction.unwind (frame, this);
+
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
@@ -1627,8 +1558,7 @@ afr_unlink_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv  = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -1638,13 +1568,12 @@ afr_unlink_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_unlink_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->unlink,
-                                           &local->loc, local->xflag,
-                                           local->xdata_req);
+                                           &local->loc);
 
                         if (!--call_count)
                                 break;
@@ -1670,14 +1599,14 @@ afr_unlink_done (call_frame_t *frame, xlator_t *this)
 
 int32_t
 afr_unlink (call_frame_t *frame, xlator_t *this,
-            loc_t *loc, int xflag, dict_t *xdata)
+            loc_t *loc)
 {
-        afr_private_t           *priv                   = NULL;
-        afr_local_t             *local                  = NULL;
-        afr_internal_lock_t     *int_lock               = NULL;
-        call_frame_t            *transaction_frame      = NULL;
-        int                     ret                     = -1;
-        int                     op_errno                = 0;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -1685,62 +1614,44 @@ afr_unlink (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(unlink,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
 
         loc_copy (&local->loc, loc);
-        local->xflag = xflag;
-        if (xdata)
-                local->xdata_req = dict_ref (xdata);
 
-        local->op = GF_FOP_UNLINK;
+        if (loc->parent)
+                local->cont.unlink.parent_ino = loc->parent->ino;
+
         local->transaction.fop    = afr_unlink_wind;
         local->transaction.done   = afr_unlink_done;
         local->transaction.unwind = afr_unlink_unwind;
 
-        ret = afr_build_parent_loc (&local->transaction.parent_loc, loc,
-                                    &op_errno);
-        if (ret)
-                goto out;
+        afr_build_parent_loc (&local->transaction.parent_loc, loc);
 
         local->transaction.main_frame = frame;
         local->transaction.basename = AFR_BASENAME (loc->path);
-        int_lock = &local->internal_lock;
-
-        int_lock->lockee_count = 0;
-        ret = afr_init_entry_lockee (&int_lock->lockee[0], local,
-                                     &local->transaction.parent_loc,
-                                     local->transaction.basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
 
-        int_lock->lockee_count++;
-        ret = afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (unlink, frame, -1, op_errno,
-                                  NULL, NULL, NULL);
+                AFR_STACK_UNWIND (unlink, frame, op_ret, op_errno,
+                                  NULL, NULL);
         }
 
         return 0;
@@ -1772,9 +1683,8 @@ afr_rmdir_unwind (call_frame_t *frame, xlator_t *this)
         if (main_frame) {
                 AFR_STACK_UNWIND (rmdir, main_frame,
                                   local->op_ret, local->op_errno,
-                                  &local->cont.dir_fop.preparent,
-                                  &local->cont.dir_fop.postparent,
-                                  NULL);
+                                  &local->cont.rmdir.preparent,
+                                  &local->cont.rmdir.postparent);
         }
 
         return 0;
@@ -1784,36 +1694,52 @@ afr_rmdir_unwind (call_frame_t *frame, xlator_t *this)
 int
 afr_rmdir_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, struct iatt *preparent,
-                    struct iatt *postparent, dict_t *xdata)
+                    struct iatt *postparent)
 {
         afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
         int call_count  = -1;
         int child_index = (long) cookie;
         int read_child  = 0;
 
         local = frame->local;
+        priv = this->private;
 
         LOCK (&frame->lock);
         {
                 if (child_index == read_child) {
                         local->read_child_returned = _gf_true;
                 }
+
                 if (afr_fop_failed (op_ret, op_errno) && (op_errno != ENOTEMPTY))
                         afr_transaction_fop_failed (frame, this, child_index);
-                local->op_errno = op_errno;
-                local->child_errno[child_index] = op_errno;
-                if (op_ret > -1)
-                        __dir_entry_fop_common_cbk (frame, child_index, this,
-                                                   op_ret, op_errno, NULL, NULL,
-                                                   preparent, postparent, NULL,
-                                                   NULL);
 
+                if (op_ret != -1) {
+                        if (local->success_count == 0) {
+                                local->op_ret = op_ret;
+                                local->cont.rmdir.preparent  = *preparent;
+                                local->cont.rmdir.postparent = *postparent;
+
+                        }
+
+                        if (child_index == read_child) {
+                                local->cont.rmdir.preparent  = *preparent;
+                                local->cont.rmdir.postparent = *postparent;
+                        }
+
+                        local->success_count++;
+                }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
-        if (call_count == 0)
-                afr_dir_fop_done (frame, this);
+
+        if (call_count == 0) {
+                local->transaction.unwind (frame, this);
+                local->transaction.resume (frame, this);
+        }
 
         return 0;
 }
@@ -1830,8 +1756,7 @@ afr_rmdir_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv  = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -1841,13 +1766,12 @@ afr_rmdir_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_rmdir_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->rmdir,
-                                           &local->loc, local->cont.rmdir.flags,
-                                           NULL);
+                                           &local->loc, local->cont.rmdir.flags);
 
                         if (!--call_count)
                                 break;
@@ -1873,15 +1797,14 @@ afr_rmdir_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_rmdir (call_frame_t *frame, xlator_t *this,
-           loc_t *loc, int flags, dict_t *xdata)
+           loc_t *loc, int flags)
 {
-        afr_private_t           *priv                   = NULL;
-        afr_local_t             *local                  = NULL;
-        afr_internal_lock_t     *int_lock               = NULL;
-        call_frame_t            *transaction_frame      = NULL;
-        int                     ret                     = -1;
-        int                     op_errno                = 0;
-        int                     nlockee                 = 0;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+        call_frame_t  * transaction_frame = NULL;
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -1889,71 +1812,45 @@ afr_rmdir (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(rmdir,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
 
         local->cont.rmdir.flags = flags;
         loc_copy (&local->loc, loc);
 
-        local->op = GF_FOP_RMDIR;
+        if (loc->parent)
+                local->cont.rmdir.parent_ino = loc->parent->ino;
+
         local->transaction.fop    = afr_rmdir_wind;
         local->transaction.done   = afr_rmdir_done;
         local->transaction.unwind = afr_rmdir_unwind;
 
-        ret = afr_build_parent_loc (&local->transaction.parent_loc, loc,
-                                    &op_errno);
-        if (ret)
-                goto out;
+        afr_build_parent_loc (&local->transaction.parent_loc, loc);
 
         local->transaction.main_frame = frame;
         local->transaction.basename = AFR_BASENAME (loc->path);
-        int_lock = &local->internal_lock;
-
-        int_lock->lockee_count = nlockee = 0;
-        ret = afr_init_entry_lockee (&int_lock->lockee[nlockee], local,
-                                     &local->transaction.parent_loc,
-                                     local->transaction.basename,
-                                     priv->child_count);
-        if (ret)
-                goto out;
-
-        nlockee++;
-        ret = afr_init_entry_lockee (&int_lock->lockee[nlockee], local,
-                                     &local->loc,
-                                     NULL,
-                                     priv->child_count);
-        if (ret)
-                goto out;
 
-        nlockee++;
-        qsort (int_lock->lockee, nlockee, sizeof (*int_lock->lockee),
-               afr_entry_lockee_cmp);
-        int_lock->lockee_count = nlockee;
+        afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
 
-        ret = afr_transaction (transaction_frame, this, AFR_ENTRY_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
-
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (rmdir, frame, -1, op_errno, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (rmdir, frame, op_ret, op_errno,
+                                  NULL, NULL);
         }
 
         return 0;
diff --git a/xlators/cluster/afr/src/afr-dir-write.h b/xlators/cluster/afr/src/afr-dir-write.h
index 02f0a3682..0290c6350 100644
--- a/xlators/cluster/afr/src/afr-dir-write.h
+++ b/xlators/cluster/afr/src/afr-dir-write.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __DIR_WRITE_H__
@@ -14,34 +23,38 @@
 int32_t
 afr_create (call_frame_t *frame, xlator_t *this,
             loc_t *loc, int32_t flags, mode_t mode,
-            mode_t umask, fd_t *fd, dict_t *xdata);
+            fd_t *fd, dict_t *params);
 
 int32_t
 afr_mknod (call_frame_t *frame, xlator_t *this,
-	   loc_t *loc, mode_t mode, dev_t dev, mode_t umask, dict_t *xdata);
+	   loc_t *loc, mode_t mode, dev_t dev, dict_t *params);
 
 int32_t
 afr_mkdir (call_frame_t *frame, xlator_t *this,
-	   loc_t *loc, mode_t mode, mode_t umask, dict_t *xdata);
+	   loc_t *loc, mode_t mode, dict_t *params);
 
 int32_t
 afr_unlink (call_frame_t *frame, xlator_t *this,
-	    loc_t *loc, int xflag, dict_t *xdata);
+	    loc_t *loc);
 
 int32_t
 afr_rmdir (call_frame_t *frame, xlator_t *this,
-	   loc_t *loc, int flags, dict_t *xdata);
+	   loc_t *loc, int flags);
 
 int32_t
 afr_link (call_frame_t *frame, xlator_t *this,
-	  loc_t *oldloc, loc_t *newloc, dict_t *xdata);
+	  loc_t *oldloc, loc_t *newloc);
 
 int32_t
 afr_rename (call_frame_t *frame, xlator_t *this,
-	    loc_t *oldloc, loc_t *newloc, dict_t *xdata);
+	    loc_t *oldloc, loc_t *newloc);
 
 int
 afr_symlink (call_frame_t *frame, xlator_t *this,
-	     const char *linkpath, loc_t *oldloc, mode_t umask, dict_t *params);
+	     const char *linkpath, loc_t *oldloc, dict_t *params);
+
+int32_t
+afr_setdents (call_frame_t *frame, xlator_t *this,
+	      fd_t *fd, int32_t flags, dir_entry_t *entries, int32_t count);
 
 #endif /* __DIR_WRITE_H__ */
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c
index e06e3b2f2..cbba82246 100644
--- a/xlators/cluster/afr/src/afr-inode-read.c
+++ b/xlators/cluster/afr/src/afr-inode-read.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -35,6 +44,9 @@
 #include "compat-errno.h"
 #include "compat.h"
 
+#include "afr.h"
+
+
 /**
  * Common algorithm for inode read calls:
  *
@@ -49,16 +61,15 @@
 
 int32_t
 afr_access_cbk (call_frame_t *frame, void *cookie,
-                xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                xlator_t *this, int32_t op_ret, int32_t op_errno)
 {
-        afr_private_t * priv            = NULL;
-        afr_local_t *   local           = NULL;
-        xlator_t **     children        = NULL;
-        int             unwind          = 1;
-        int32_t         *last_index     = NULL;
-        int32_t         next_call_child = -1;
-        int32_t         read_child      = -1;
-        int32_t         *fresh_children  = NULL;
+        afr_private_t * priv       = NULL;
+        afr_local_t *   local      = NULL;
+        xlator_t **     children   = NULL;
+        int             unwind     = 1;
+        int             last_tried = -1;
+        int             this_try   = -1;
+        int             read_child = -1;
 
         priv     = this->private;
         children = priv->children;
@@ -68,28 +79,33 @@ afr_access_cbk (call_frame_t *frame, void *cookie,
         read_child = (long) cookie;
 
         if (op_ret == -1) {
-                last_index = &local->cont.access.last_index;
-                fresh_children = local->fresh_children;
-                next_call_child = afr_next_call_child (fresh_children,
-                                                       local->child_up,
-                                                       priv->child_count,
-                                                       last_index, read_child);
-                if (next_call_child < 0)
+        retry:
+                last_tried = local->cont.access.last_tried;
+
+                if (all_tried (last_tried, priv->child_count)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "%s: all subvolumes tried, going out",
+                                local->loc.path);
                         goto out;
+                }
+                this_try    = ++local->cont.access.last_tried;
+
+                if (this_try == read_child) {
+                        goto retry;
+                }
 
                 unwind = 0;
 
                 STACK_WIND_COOKIE (frame, afr_access_cbk,
                                    (void *) (long) read_child,
-                                   children[next_call_child],
-                                   children[next_call_child]->fops->access,
-                                   &local->loc, local->cont.access.mask,
-                                   NULL);
+                                   children[this_try],
+                                   children[this_try]->fops->access,
+                                   &local->loc, local->cont.access.mask);
         }
 
 out:
         if (unwind) {
-                AFR_STACK_UNWIND (access, frame, op_ret, op_errno, xdata);
+                AFR_STACK_UNWIND (access, frame, op_ret, op_errno);
         }
 
         return 0;
@@ -97,16 +113,15 @@ out:
 
 
 int32_t
-afr_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask,
-            dict_t *xdata)
+afr_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask)
 {
-        afr_private_t   *priv      = NULL;
-        xlator_t        **children = NULL;
-        int             call_child = 0;
-        afr_local_t     *local     = NULL;
-        int32_t         op_errno   = 0;
-        int32_t         read_child = -1;
-        int             ret        = -1;
+        afr_private_t *  priv       = NULL;
+        xlator_t **      children   = NULL;
+        int              call_child = 0;
+        afr_local_t     *local      = NULL;
+        int32_t          read_child = -1;
+        int32_t          op_ret     = -1;
+        int32_t          op_errno   = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -117,31 +132,27 @@ afr_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask,
 
         children = priv->children;
 
-        AFR_SBRAIN_CHECK_LOC (loc, out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        frame->local = local;
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        read_child = afr_read_child (this, loc->inode);
 
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children) {
-                op_errno = ENOMEM;
-                goto out;
-        }
+        if ((read_child >= 0) && (priv->child_up[read_child])) {
+                call_child = read_child;
 
+                local->cont.access.last_tried = -1;
 
-        read_child = afr_inode_get_read_ctx (this, loc->inode,
-                                             local->fresh_children);
-        ret = afr_get_call_child (this, local->child_up, read_child,
-                                     local->fresh_children,
-                                     &call_child,
-                                     &local->cont.access.last_index);
-        if (ret < 0) {
-                op_errno = -ret;
-                goto out;
+        } else {
+                call_child = afr_first_up_child (priv);
+                if (call_child == -1) {
+                        op_errno = ENOTCONN;
+                        gf_log (this->name, GF_LOG_INFO,
+                                "%s: no child is up", loc->path);
+                        goto out;
+                }
+
+                local->cont.access.last_tried = call_child;
         }
 
         loc_copy (&local->loc, loc);
@@ -149,14 +160,14 @@ afr_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask,
 
         STACK_WIND_COOKIE (frame, afr_access_cbk,
                            (void *) (long) call_child,
-                           children[call_child],
-                           children[call_child]->fops->access,
-                           loc, mask, xdata);
+                           children[call_child], children[call_child]->fops->access,
+                           loc, mask);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (access, frame, -1, op_errno, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (access, frame, op_ret, op_errno);
+        }
         return 0;
 }
 
@@ -168,16 +179,15 @@ out:
 int32_t
 afr_stat_cbk (call_frame_t *frame, void *cookie,
               xlator_t *this, int32_t op_ret, int32_t op_errno,
-              struct iatt *buf, dict_t *xdata)
+              struct iatt *buf)
 {
-        afr_private_t * priv            = NULL;
-        afr_local_t *   local           = NULL;
-        xlator_t **     children        = NULL;
-        int             unwind          = 1;
-        int32_t         *last_index     = NULL;
-        int32_t         next_call_child = -1;
-        int32_t         read_child      = -1;
-        int32_t         *fresh_children  = NULL;
+        afr_private_t * priv       = NULL;
+        afr_local_t *   local      = NULL;
+        xlator_t **     children   = NULL;
+        int             unwind     = 1;
+        int             last_tried = -1;
+        int             this_try   = -1;
+        int             read_child = -1;
 
         priv     = this->private;
         children = priv->children;
@@ -187,27 +197,33 @@ afr_stat_cbk (call_frame_t *frame, void *cookie,
         local = frame->local;
 
         if (op_ret == -1) {
-                last_index = &local->cont.stat.last_index;
-                fresh_children = local->fresh_children;
-                next_call_child = afr_next_call_child (fresh_children,
-                                                       local->child_up,
-                                                       priv->child_count,
-                                                       last_index, read_child);
-                if (next_call_child < 0)
+        retry:
+                last_tried = local->cont.stat.last_tried;
+
+                if (all_tried (last_tried, priv->child_count)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "%s: all subvolumes tried, going out",
+                                local->loc.path);
                         goto out;
+                }
+                this_try = ++local->cont.stat.last_tried;
+
+                if (this_try == read_child) {
+                        goto retry;
+                }
 
                 unwind = 0;
 
                 STACK_WIND_COOKIE (frame, afr_stat_cbk,
                                    (void *) (long) read_child,
-                                   children[next_call_child],
-                                   children[next_call_child]->fops->stat,
-                                   &local->loc, NULL);
+                                   children[this_try],
+                                   children[this_try]->fops->stat,
+                                   &local->loc);
         }
 
 out:
         if (unwind) {
-                AFR_STACK_UNWIND (stat, frame, op_ret, op_errno, buf, xdata);
+                AFR_STACK_UNWIND (stat, frame, op_ret, op_errno, buf);
         }
 
         return 0;
@@ -215,15 +231,15 @@ out:
 
 
 int32_t
-afr_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
+afr_stat (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
-        afr_private_t   *priv      = NULL;
-        afr_local_t     *local     = NULL;
-        xlator_t        **children = NULL;
+        afr_private_t * priv       = NULL;
+        afr_local_t   * local      = NULL;
+        xlator_t **     children   = NULL;
+        int32_t         read_child = -1;
         int             call_child = 0;
+        int32_t         op_ret     = -1;
         int32_t         op_errno   = 0;
-        int32_t         read_child = -1;
-        int             ret        = -1;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -234,42 +250,43 @@ afr_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
 
         children = priv->children;
 
-        AFR_SBRAIN_CHECK_LOC (loc, out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        frame->local = local;
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        read_child = afr_read_child (this, loc->inode);
 
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children) {
-                op_errno = ENOMEM;
-                goto out;
-        }
+        if ((read_child >= 0) && (priv->child_up[read_child])) {
+                call_child = read_child;
+
+                local->cont.stat.last_tried = -1;
 
-        read_child = afr_inode_get_read_ctx (this, loc->inode,
-                                             local->fresh_children);
-        ret = afr_get_call_child (this, local->child_up, read_child,
-                                     local->fresh_children,
-                                     &call_child,
-                                     &local->cont.stat.last_index);
-        if (ret < 0) {
-                op_errno = -ret;
-                goto out;
+        } else {
+                call_child = afr_first_up_child (priv);
+                if (call_child == -1) {
+                        op_errno = ENOTCONN;
+                        gf_log (this->name, GF_LOG_INFO,
+                                "%s: no child is up", loc->path);
+                        goto out;
+                }
+
+                local->cont.stat.last_tried = call_child;
         }
+
         loc_copy (&local->loc, loc);
 
+        local->cont.stat.ino = loc->inode->ino;
+
         STACK_WIND_COOKIE (frame, afr_stat_cbk, (void *) (long) call_child,
                            children[call_child],
                            children[call_child]->fops->stat,
-                           loc, xdata);
+                           loc);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (stat, frame, -1, op_errno, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (stat, frame, op_ret, op_errno, NULL);
+        }
 
         return 0;
 }
@@ -281,17 +298,15 @@ out:
 
 int32_t
 afr_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-               int32_t op_ret, int32_t op_errno, struct iatt *buf,
-               dict_t *xdata)
+               int32_t op_ret, int32_t op_errno, struct iatt *buf)
 {
-        afr_private_t   *priv           = NULL;
-        afr_local_t     *local          = NULL;
-        xlator_t        **children      = NULL;
-        int             unwind          = 1;
-        int32_t         *last_index     = NULL;
-        int32_t         next_call_child = -1;
-        int32_t         read_child      = -1;
-        int32_t         *fresh_children  = NULL;
+        afr_private_t * priv       = NULL;
+        afr_local_t *   local      = NULL;
+        xlator_t **     children   = NULL;
+        int             unwind     = 1;
+        int             last_tried = -1;
+        int             this_try   = -1;
+        int             read_child = -1;
 
         priv     = this->private;
         children = priv->children;
@@ -301,27 +316,33 @@ afr_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         read_child = (long) cookie;
 
         if (op_ret == -1) {
-                last_index = &local->cont.fstat.last_index;
-                fresh_children = local->fresh_children;
-                next_call_child = afr_next_call_child (fresh_children,
-                                                       local->child_up,
-                                                       priv->child_count,
-                                                       last_index, read_child);
-                if (next_call_child < 0)
+        retry:
+                last_tried = local->cont.fstat.last_tried;
+
+                if (all_tried (last_tried, priv->child_count)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "%p: all subvolumes tried, going out",
+                                local->fd);
                         goto out;
+                }
+                this_try   = ++local->cont.fstat.last_tried;
+
+                if (this_try == read_child) {
+                        goto retry;
+                }
 
                 unwind = 0;
 
                 STACK_WIND_COOKIE (frame, afr_fstat_cbk,
                                    (void *) (long) read_child,
-                                   children[next_call_child],
-                                   children[next_call_child]->fops->fstat,
-                                   local->fd, NULL);
+                                   children[this_try],
+                                   children[this_try]->fops->fstat,
+                                   local->fd);
         }
 
 out:
         if (unwind) {
-                AFR_STACK_UNWIND (fstat, frame, op_ret, op_errno, buf, xdata);
+                AFR_STACK_UNWIND (fstat, frame, op_ret, op_errno, buf);
         }
 
         return 0;
@@ -330,15 +351,15 @@ out:
 
 int32_t
 afr_fstat (call_frame_t *frame, xlator_t *this,
-           fd_t *fd, dict_t *xdata)
+           fd_t *fd)
 {
-        afr_private_t   *priv      = NULL;
-        afr_local_t     *local     = NULL;
-        xlator_t        **children = NULL;
+        afr_private_t * priv       = NULL;
+        afr_local_t   * local      = NULL;
+        xlator_t **     children   = NULL;
         int             call_child = 0;
+        int32_t         read_child = -1;
+        int32_t         op_ret     = -1;
         int32_t         op_errno   = 0;
-        int32_t         read_child = 0;
-        int             ret        = -1;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -350,50 +371,44 @@ afr_fstat (call_frame_t *frame, xlator_t *this,
 
         children = priv->children;
 
-        VALIDATE_OR_GOTO (fd->inode, out);
-
-        AFR_SBRAIN_CHECK_FD (fd, out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        frame->local = local;
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        VALIDATE_OR_GOTO (fd->inode, out);
 
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children) {
-                op_errno = ENOMEM;
-                goto out;
-        }
+        read_child = afr_read_child (this, fd->inode);
 
-        read_child = afr_inode_get_read_ctx (this, fd->inode,
-                                             local->fresh_children);
+        if ((read_child >= 0) && (priv->child_up[read_child])) {
+                call_child = read_child;
 
+                local->cont.fstat.last_tried = -1;
+        } else {
+                call_child = afr_first_up_child (priv);
 
+                if (call_child == -1) {
+                        op_errno = ENOTCONN;
+                        gf_log (this->name, GF_LOG_INFO,
+                                "%p: no child is up", fd);
+                        goto out;
+                }
 
-        ret = afr_get_call_child (this, local->child_up, read_child,
-                                     local->fresh_children,
-                                     &call_child,
-                                     &local->cont.fstat.last_index);
-        if (ret < 0) {
-                op_errno = -ret;
-                goto out;
+                local->cont.fstat.last_tried = call_child;
         }
 
+        local->cont.fstat.ino = fd->inode->ino;
         local->fd = fd_ref (fd);
 
-        afr_open_fd_fix (fd, this);
-
         STACK_WIND_COOKIE (frame, afr_fstat_cbk, (void *) (long) call_child,
                            children[call_child],
                            children[call_child]->fops->fstat,
-                           fd, xdata);
+                           fd);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (fstat, frame, -1, op_errno, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (fstat, frame, op_ret, op_errno, NULL);
+        }
 
         return 0;
 }
@@ -405,16 +420,15 @@ out:
 int32_t
 afr_readlink_cbk (call_frame_t *frame, void *cookie,
                   xlator_t *this, int32_t op_ret, int32_t op_errno,
-                  const char *buf, struct iatt *sbuf, dict_t *xdata)
+                  const char *buf, struct iatt *sbuf)
 {
-        afr_private_t * priv                  = NULL;
-        afr_local_t *   local                 = NULL;
-        xlator_t **     children              = NULL;
-        int             unwind                = 1;
-        int32_t         *last_index           = NULL;
-        int32_t         next_call_child       = -1;
-        int32_t         read_child            = -1;
-        int32_t         *fresh_children        = NULL;
+        afr_private_t * priv       = NULL;
+        afr_local_t *   local      = NULL;
+        xlator_t **     children   = NULL;
+        int             unwind     = 1;
+        int             last_tried = -1;
+        int             this_try   = -1;
+        int             read_child = -1;
 
         priv     = this->private;
         children = priv->children;
@@ -424,28 +438,33 @@ afr_readlink_cbk (call_frame_t *frame, void *cookie,
         read_child = (long) cookie;
 
         if (op_ret == -1) {
-                last_index = &local->cont.readlink.last_index;
-                fresh_children = local->fresh_children;
-                next_call_child = afr_next_call_child (fresh_children,
-                                                       local->child_up,
-                                                       priv->child_count,
-                                                       last_index, read_child);
-                if (next_call_child < 0)
+        retry:
+                last_tried = local->cont.readlink.last_tried;
+
+                if (all_tried (last_tried, priv->child_count)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "%s: all subvolumes tried, going out",
+                                local->loc.path);
                         goto out;
+                }
+                this_try = ++local->cont.readlink.last_tried;
+
+                if (this_try == read_child) {
+                        goto retry;
+                }
 
                 unwind = 0;
                 STACK_WIND_COOKIE (frame, afr_readlink_cbk,
                                    (void *) (long) read_child,
-                                   children[next_call_child],
-                                   children[next_call_child]->fops->readlink,
+                                   children[this_try],
+                                   children[this_try]->fops->readlink,
                                    &local->loc,
-                                   local->cont.readlink.size, NULL);
+                                   local->cont.readlink.size);
         }
 
 out:
         if (unwind) {
-                AFR_STACK_UNWIND (readlink, frame, op_ret, op_errno, buf, sbuf,
-                                  xdata);
+                AFR_STACK_UNWIND (readlink, frame, op_ret, op_errno, buf, sbuf);
         }
 
         return 0;
@@ -454,15 +473,15 @@ out:
 
 int32_t
 afr_readlink (call_frame_t *frame, xlator_t *this,
-              loc_t *loc, size_t size, dict_t *xdata)
+              loc_t *loc, size_t size)
 {
-        afr_private_t   *priv      = NULL;
-        xlator_t        **children = NULL;
-        int             call_child = 0;
-        afr_local_t     *local     = NULL;
-        int32_t         op_errno   = 0;
-        int32_t         read_child = -1;
-        int             ret        = -1;
+        afr_private_t *  priv       = NULL;
+        xlator_t **      children   = NULL;
+        int              call_child = 0;
+        afr_local_t     *local      = NULL;
+        int32_t          read_child = -1;
+        int32_t          op_ret     = -1;
+        int32_t          op_errno   = 0;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -473,45 +492,45 @@ afr_readlink (call_frame_t *frame, xlator_t *this,
 
         children = priv->children;
 
-        AFR_SBRAIN_CHECK_LOC (loc, out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        frame->local = local;
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        read_child = afr_read_child (this, loc->inode);
 
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children) {
-                op_errno = ENOMEM;
-                goto out;
-        }
-        read_child = afr_inode_get_read_ctx (this, loc->inode,
-                                             local->fresh_children);
-        ret = afr_get_call_child (this, local->child_up, read_child,
-                                     local->fresh_children,
-                                     &call_child,
-                                     &local->cont.readlink.last_index);
-        if (ret < 0) {
-                op_errno = -ret;
-                goto out;
+        if ((read_child >= 0) && (priv->child_up[read_child])) {
+                call_child = read_child;
+
+                local->cont.readlink.last_tried = -1;
+
+        } else {
+                call_child = afr_first_up_child (priv);
+
+                if (call_child == -1) {
+                        op_errno = ENOTCONN;
+                        gf_log (this->name, GF_LOG_INFO,
+                                "%s: no child is up", loc->path);
+                        goto out;
+                }
+
+                local->cont.readlink.last_tried = call_child;
         }
 
         loc_copy (&local->loc, loc);
 
         local->cont.readlink.size       = size;
+        local->cont.readlink.ino        = loc->inode->ino;
 
         STACK_WIND_COOKIE (frame, afr_readlink_cbk,
                            (void *) (long) call_child,
-                           children[call_child],
-                           children[call_child]->fops->readlink,
-                           loc, size, xdata);
+                           children[call_child], children[call_child]->fops->readlink,
+                           loc, size);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (readlink, frame, -1, op_errno, NULL, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (readlink, frame, op_ret, op_errno, NULL, NULL);
+        }
         return 0;
 }
 
@@ -526,7 +545,7 @@ struct _xattr_key {
 };
 
 
-int
+void
 __gather_xattr_keys (dict_t *dict, char *key, data_t *value,
                      void *data)
 {
@@ -538,14 +557,13 @@ __gather_xattr_keys (dict_t *dict, char *key, data_t *value,
 
                 xkey = GF_CALLOC (1, sizeof (*xkey), gf_afr_mt_xattr_key);
                 if (!xkey)
-                        return -1;
+                        return;
 
                 xkey->key = key;
                 INIT_LIST_HEAD (&xkey->list);
 
                 list_add_tail (&xkey->list, list);
         }
-        return 0;
 }
 
 
@@ -575,16 +593,15 @@ __filter_xattrs (dict_t *dict)
 int32_t
 afr_getxattr_cbk (call_frame_t *frame, void *cookie,
                   xlator_t *this, int32_t op_ret, int32_t op_errno,
-                  dict_t *dict, dict_t *xdata)
+                  dict_t *dict)
 {
-        afr_private_t * priv            = NULL;
-        afr_local_t *   local           = NULL;
-        xlator_t **     children        = NULL;
-        int             unwind          = 1;
-        int32_t         *last_index     = NULL;
-        int32_t         next_call_child = -1;
-        int32_t         read_child      = -1;
-        int32_t         *fresh_children  = NULL;
+        afr_private_t * priv       = NULL;
+        afr_local_t *   local      = NULL;
+        xlator_t **     children   = NULL;
+        int             unwind     = 1;
+        int             last_tried = -1;
+        int             this_try   = -1;
+        int             read_child = -1;
 
         priv     = this->private;
         children = priv->children;
@@ -594,23 +611,28 @@ afr_getxattr_cbk (call_frame_t *frame, void *cookie,
         read_child = (long) cookie;
 
         if (op_ret == -1) {
-                last_index = &local->cont.getxattr.last_index;
-                fresh_children = local->fresh_children;
-                next_call_child = afr_next_call_child (fresh_children,
-                                                       local->child_up,
-                                                       priv->child_count,
-                                                       last_index, read_child);
-                if (next_call_child < 0)
+        retry:
+                last_tried = local->cont.getxattr.last_tried;
+
+                if (all_tried (last_tried, priv->child_count)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "%s: all subvolumes tried, going out",
+                                local->loc.path);
                         goto out;
+                }
+                this_try = ++local->cont.getxattr.last_tried;
+
+                if (this_try == read_child) {
+                        goto retry;
+                }
 
                 unwind = 0;
                 STACK_WIND_COOKIE (frame, afr_getxattr_cbk,
                                    (void *) (long) read_child,
-                                   children[next_call_child],
-                                   children[next_call_child]->fops->getxattr,
+                                   children[this_try],
+                                   children[this_try]->fops->getxattr,
                                    &local->loc,
-                                   local->cont.getxattr.name,
-                                   NULL);
+                                   local->cont.getxattr.name);
         }
 
 out:
@@ -618,621 +640,40 @@ out:
                 if (op_ret >= 0 && dict)
                         __filter_xattrs (dict);
 
-                AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict, xdata);
+                AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict);
         }
 
         return 0;
 }
 
 int32_t
-afr_getxattr_unwind (call_frame_t *frame, int op_ret, int op_errno,
-                     dict_t *dict, dict_t *xdata)
+afr_getxattr_unwind (call_frame_t *frame,
+                     int op_ret, int op_errno, dict_t *dict)
 
 {
-        AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict, xdata);
-        return 0;
-}
-
-int32_t
-afr_fgetxattr_clrlk_cbk (call_frame_t *frame, void *cookie,
-                         xlator_t *this, int32_t op_ret, int32_t op_errno,
-                         dict_t *dict, dict_t *xdata)
-{
-        afr_local_t     *local                  = NULL;
-        afr_private_t   *priv                   = NULL;
-        xlator_t        **children              = NULL;
-        dict_t          *xattr                  = NULL;
-        char            *tmp_report             = NULL;
-        char            lk_summary[1024]        = {0,};
-        int             serz_len                = 0;
-        int32_t         callcnt                 = 0;
-        long int        cky                     = 0;
-        int             ret                     = 0;
-
-        priv     = this->private;
-        children = priv->children;
-
-        local = frame->local;
-        cky = (long) cookie;
-
-        LOCK (&frame->lock);
-        {
-                callcnt = --local->call_count;
-                if (op_ret == -1)
-                        local->child_errno[cky] = op_errno;
-
-                if (!local->dict)
-                        local->dict = dict_new ();
-                if (local->dict) {
-                        ret = dict_get_str (dict, local->cont.getxattr.name,
-                                            &tmp_report);
-                        if (ret)
-                                goto unlock;
-                        ret = dict_set_dynstr (local->dict,
-                                               children[cky]->name,
-                                               gf_strdup (tmp_report));
-                        if (ret)
-                                goto unlock;
-                }
-        }
-unlock:
-        UNLOCK (&frame->lock);
-
-        if (!callcnt) {
-                xattr = dict_new ();
-                if (!xattr) {
-                        op_ret = -1;
-                        op_errno = ENOMEM;
-                        goto unwind;
-                }
-                ret = dict_serialize_value_with_delim (local->dict,
-                                                       lk_summary,
-                                                       &serz_len, '\n');
-                if (ret) {
-                        op_ret = -1;
-                        op_errno = ENOMEM;
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "Error serializing dictionary");
-                        goto unwind;
-                }
-                if (serz_len == -1)
-                        snprintf (lk_summary, sizeof (lk_summary),
-                                  "No locks cleared.");
-                ret = dict_set_dynstr (xattr, local->cont.getxattr.name,
-                                       gf_strdup (lk_summary));
-                if (ret) {
-                        op_ret = -1;
-                        op_errno = ENOMEM;
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "Error setting dictionary");
-                        goto unwind;
-                }
-
-        unwind:
-                // Updating child_errno with more recent 'events'
-                local->child_errno[cky] = op_errno;
-                op_errno = afr_resultant_errno_get (NULL, local->child_errno,
-                                                    priv->child_count);
-                AFR_STACK_UNWIND (fgetxattr, frame, op_ret, op_errno, xattr,
-                                  xdata);
-
-                if (xattr)
-                        dict_unref (xattr);
-        }
-
-        return ret;
-}
-
-int32_t
-afr_getxattr_clrlk_cbk (call_frame_t *frame, void *cookie,
-                        xlator_t *this, int32_t op_ret, int32_t op_errno,
-                        dict_t *dict, dict_t *xdata)
-{
-        afr_local_t     *local                  = NULL;
-        afr_private_t   *priv                   = NULL;
-        xlator_t        **children              = NULL;
-        dict_t          *xattr                  = NULL;
-        char            *tmp_report             = NULL;
-        char            lk_summary[1024]        = {0,};
-        int             serz_len                = 0;
-        int32_t         callcnt                 = 0;
-        long int        cky                     = 0;
-        int             ret                     = 0;
-
-        priv     = this->private;
-        children = priv->children;
-
-        local = frame->local;
-        cky = (long) cookie;
-
-        LOCK (&frame->lock);
-        {
-                callcnt = --local->call_count;
-                if (op_ret == -1)
-                        local->child_errno[cky] = op_errno;
-
-                if (!local->dict)
-                        local->dict = dict_new ();
-                if (local->dict) {
-                        ret = dict_get_str (dict, local->cont.getxattr.name,
-                                            &tmp_report);
-                        if (ret)
-                                goto unlock;
-                        ret = dict_set_dynstr (local->dict,
-                                               children[cky]->name,
-                                               gf_strdup (tmp_report));
-                        if (ret)
-                                goto unlock;
-                }
-        }
-unlock:
-        UNLOCK (&frame->lock);
-
-        if (!callcnt) {
-                xattr = dict_new ();
-                if (!xattr) {
-                        op_ret = -1;
-                        op_errno = ENOMEM;
-                        goto unwind;
-                }
-                ret = dict_serialize_value_with_delim (local->dict,
-                                                       lk_summary,
-                                                       &serz_len, '\n');
-                if (ret) {
-                        op_ret = -1;
-                        op_errno = ENOMEM;
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "Error serializing dictionary");
-                        goto unwind;
-                }
-                if (serz_len == -1)
-                        snprintf (lk_summary, sizeof (lk_summary),
-                                  "No locks cleared.");
-                ret = dict_set_dynstr (xattr, local->cont.getxattr.name,
-                                       gf_strdup (lk_summary));
-                if (ret) {
-                        op_ret = -1;
-                        op_errno = ENOMEM;
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "Error setting dictionary");
-                        goto unwind;
-                }
-
-        unwind:
-                // Updating child_errno with more recent 'events'
-                local->child_errno[cky] = op_errno;
-                op_errno = afr_resultant_errno_get (NULL, local->child_errno,
-                                                    priv->child_count);
-                AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, xattr, xdata);
-
-                if (xattr)
-                        dict_unref (xattr);
-        }
-
-        return ret;
-}
-
-/**
- * node-uuid cbk uses next child querying mechanism
- */
-int32_t
-afr_getxattr_node_uuid_cbk (call_frame_t *frame, void *cookie,
-                            xlator_t *this, int32_t op_ret, int32_t op_errno,
-                            dict_t *dict, dict_t *xdata)
-{
-        afr_private_t  *priv            = NULL;
-        afr_local_t    *local           = NULL;
-        xlator_t      **children        = NULL;
-        int             unwind          = 1;
-        int             curr_call_child = 0;
-
-        priv = this->private;
-        children = priv->children;
-
-        local = frame->local;
-
-        if (op_ret == -1) { /** query the _next_ child */
-
-                /**
-                 * _current_ becomes _next_
-                 * If done with all childs and yet no success; give up !
-                 */
-                curr_call_child = (int) ((long)cookie);
-                if (++curr_call_child == priv->child_count)
-                        goto unwind;
-
-                gf_log (this->name, GF_LOG_WARNING,
-                        "op_ret (-1): Re-querying afr-child (%d/%d)",
-                        curr_call_child, priv->child_count);
-
-                unwind = 0;
-                STACK_WIND_COOKIE (frame, afr_getxattr_node_uuid_cbk,
-                                   (void *) (long) curr_call_child,
-                                   children[curr_call_child],
-                                   children[curr_call_child]->fops->getxattr,
-                                   &local->loc,
-                                   local->cont.getxattr.name,
-                                   NULL);
-        }
-
- unwind:
-        if (unwind)
-                AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict,
-                                  NULL);
-
-        return 0;
-}
-
-int32_t
-afr_getxattr_lockinfo_cbk (call_frame_t *frame, void *cookie,
-                           xlator_t *this, int32_t op_ret, int32_t op_errno,
-                           dict_t *dict, dict_t *xdata)
-{
-        int          call_cnt     = 0, len = 0;
-        char        *lockinfo_buf = NULL;
-        dict_t      *lockinfo     = NULL, *newdict = NULL;
-        afr_local_t *local        = NULL;
-
-        LOCK (&frame->lock);
-        {
-                local = frame->local;
-
-                call_cnt = --local->call_count;
-
-                if ((op_ret < 0) || (!dict && !xdata)) {
-                        goto unlock;
-                }
-
-                if (xdata) {
-                        if (!local->xdata_rsp) {
-                                local->xdata_rsp = dict_new ();
-                                if (!local->xdata_rsp) {
-                                        local->op_ret = -1;
-                                        local->op_errno = ENOMEM;
-                                        goto unlock;
-                                }
-                        }
-                }
-
-                if (!dict) {
-                        goto unlock;
-                }
-
-                op_ret = dict_get_ptr_and_len (dict, GF_XATTR_LOCKINFO_KEY,
-                                               (void **)&lockinfo_buf, &len);
-
-                if (!lockinfo_buf) {
-                        goto unlock;
-                }
-
-                if (!local->dict) {
-                        local->dict = dict_new ();
-                        if (!local->dict) {
-                                local->op_ret = -1;
-                                local->op_errno = ENOMEM;
-                                goto unlock;
-                        }
-                }
-        }
-unlock:
-        UNLOCK (&frame->lock);
-
-        if (lockinfo_buf != NULL) {
-                lockinfo = dict_new ();
-                if (lockinfo == NULL) {
-                        local->op_ret = -1;
-                        local->op_errno = ENOMEM;
-                } else {
-                        op_ret = dict_unserialize (lockinfo_buf, len,
-                                                   &lockinfo);
-
-                        if (lockinfo && local->dict) {
-                                dict_copy (lockinfo, local->dict);
-                        }
-                }
-        }
-
-        if (xdata && local->xdata_rsp) {
-                dict_copy (xdata, local->xdata_rsp);
-        }
-
-        if (!call_cnt) {
-                newdict = dict_new ();
-                if (!newdict) {
-                        local->op_ret = -1;
-                        local->op_errno = ENOMEM;
-                        goto unwind;
-                }
-
-                len = dict_serialized_length (local->dict);
-                if (len == 0) {
-                        goto unwind;
-                }
-
-                lockinfo_buf = GF_CALLOC (1, len, gf_common_mt_char);
-                if (!lockinfo_buf) {
-                        local->op_ret = -1;
-                        local->op_errno = ENOMEM;
-                        goto unwind;
-                }
-
-                op_ret = dict_serialize (local->dict, lockinfo_buf);
-                if (op_ret < 0) {
-                        local->op_ret = -1;
-                        local->op_errno = -op_ret;
-                }
-
-                op_ret = dict_set_dynptr (newdict, GF_XATTR_LOCKINFO_KEY,
-                                          (void *)lockinfo_buf, len);
-                if (op_ret < 0) {
-                        local->op_ret = -1;
-                        local->op_errno = -op_ret;
-                        goto unwind;
-                }
-
-        unwind:
-                AFR_STACK_UNWIND (getxattr, frame, op_ret,
-                                  op_errno, newdict,
-                                  local->xdata_rsp);
-        }
-
-        dict_unref (lockinfo);
-
-        return 0;
-}
-
-int32_t
-afr_fgetxattr_lockinfo_cbk (call_frame_t *frame, void *cookie,
-                            xlator_t *this, int32_t op_ret, int32_t op_errno,
-                            dict_t *dict, dict_t *xdata)
-{
-        int          call_cnt     = 0, len = 0;
-        char        *lockinfo_buf = NULL;
-        dict_t      *lockinfo     = NULL, *newdict = NULL;
-        afr_local_t *local        = NULL;
-
-        LOCK (&frame->lock);
-        {
-                local = frame->local;
-
-                call_cnt = --local->call_count;
-
-                if ((op_ret < 0) || (!dict && !xdata)) {
-                        goto unlock;
-                }
-
-                if (xdata) {
-                        if (!local->xdata_rsp) {
-                                local->xdata_rsp = dict_new ();
-                                if (!local->xdata_rsp) {
-                                        local->op_ret = -1;
-                                        local->op_errno = ENOMEM;
-                                        goto unlock;
-                                }
-                        }
-                }
-
-                if (!dict) {
-                        goto unlock;
-                }
-
-                op_ret = dict_get_ptr_and_len (dict, GF_XATTR_LOCKINFO_KEY,
-                                               (void **)&lockinfo_buf, &len);
-
-                if (!lockinfo_buf) {
-                        goto unlock;
-                }
-
-                if (!local->dict) {
-                        local->dict = dict_new ();
-                        if (!local->dict) {
-                                local->op_ret = -1;
-                                local->op_errno = ENOMEM;
-                                goto unlock;
-                        }
-                }
-        }
-unlock:
-        UNLOCK (&frame->lock);
-
-        if (lockinfo_buf != NULL) {
-                lockinfo = dict_new ();
-                if (lockinfo == NULL) {
-                        local->op_ret = -1;
-                        local->op_errno = ENOMEM;
-                } else {
-                        op_ret = dict_unserialize (lockinfo_buf, len,
-                                                   &lockinfo);
-
-                        if (lockinfo && local->dict) {
-                                dict_copy (lockinfo, local->dict);
-                        }
-                }
-        }
-
-        if (xdata && local->xdata_rsp) {
-                dict_copy (xdata, local->xdata_rsp);
-        }
-
-        if (!call_cnt) {
-                newdict = dict_new ();
-                if (!newdict) {
-                        local->op_ret = -1;
-                        local->op_errno = ENOMEM;
-                        goto unwind;
-                }
-
-                len = dict_serialized_length (local->dict);
-                if (len <= 0) {
-                        goto unwind;
-                }
-
-                lockinfo_buf = GF_CALLOC (1, len, gf_common_mt_char);
-                if (!lockinfo_buf) {
-                        local->op_ret = -1;
-                        local->op_errno = ENOMEM;
-                        goto unwind;
-                }
-
-                op_ret = dict_serialize (local->dict, lockinfo_buf);
-                if (op_ret < 0) {
-                        local->op_ret = -1;
-                        local->op_errno = -op_ret;
-                }
-
-                op_ret = dict_set_dynptr (newdict, GF_XATTR_LOCKINFO_KEY,
-                                          (void *)lockinfo_buf, len);
-                if (op_ret < 0) {
-                        local->op_ret = -1;
-                        local->op_errno = -op_ret;
-                        goto unwind;
-                }
-
-        unwind:
-                AFR_STACK_UNWIND (fgetxattr, frame, op_ret,
-                                  op_errno, newdict,
-                                  local->xdata_rsp);
-        }
-
-        dict_unref (lockinfo);
-
+        AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict);
         return 0;
 }
 
 int32_t
-afr_fgetxattr_pathinfo_cbk (call_frame_t *frame, void *cookie,
-                            xlator_t *this, int32_t op_ret, int32_t op_errno,
-                            dict_t *dict, dict_t *xdata)
-{
-        afr_local_t *local          = NULL;
-        int32_t      callcnt        = 0;
-        int          ret            = 0;
-        char        *xattr          = NULL;
-        char        *xattr_serz     = NULL;
-        char        xattr_cky[1024] = {0,};
-        dict_t      *nxattr         = NULL;
-        long         cky            = 0;
-        int32_t      padding        = 0;
-        int32_t      tlen           = 0;
-
-        if (!frame || !frame->local || !this) {
-                gf_log ("", GF_LOG_ERROR, "possible NULL deref");
-                goto out;
-        }
-
-        local = frame->local;
-        cky = (long) cookie;
-
-        LOCK (&frame->lock);
-        {
-                callcnt = --local->call_count;
-
-                if (!dict || (op_ret < 0))
-                        goto out;
-
-                if (!local->dict)
-                        local->dict = dict_new ();
-
-                if (local->dict) {
-                        ret = dict_get_str (dict,
-                                            local->cont.getxattr.name,
-                                            &xattr);
-                        if (ret)
-                                goto out;
-
-                        xattr = gf_strdup (xattr);
-
-                        (void)snprintf (xattr_cky, 1024, "%s-%ld",
-                                        local->cont.getxattr.name, cky);
-                        ret = dict_set_dynstr (local->dict,
-                                               xattr_cky, xattr);
-                        if (ret) {
-                                gf_log (this->name, GF_LOG_ERROR,
-                                        "Cannot set xattr cookie key");
-                                goto out;
-                        }
-
-                        local->cont.getxattr.xattr_len
-                                += strlen (xattr) + 1;
-                }
-        }
-out:
-        UNLOCK (&frame->lock);
-
-        if (!callcnt) {
-                if (!local->cont.getxattr.xattr_len)
-                        goto unwind;
-
-                nxattr = dict_new ();
-                if (!nxattr)
-                        goto unwind;
-
-                /* extra bytes for decorations (brackets and <>'s) */
-                padding += strlen (this->name)
-                        + strlen (AFR_PATHINFO_HEADER) + 4;
-                local->cont.getxattr.xattr_len += (padding + 2);
-
-                xattr_serz = GF_CALLOC (local->cont.getxattr.xattr_len,
-                                        sizeof (char), gf_common_mt_char);
-
-                if (!xattr_serz)
-                        goto unwind;
-
-                /* the xlator info */
-                (void) sprintf (xattr_serz, "(<"AFR_PATHINFO_HEADER"%s> ",
-                                this->name);
-
-                /* actual series of pathinfo */
-                ret = dict_serialize_value_with_delim (local->dict,
-                                                       xattr_serz
-                                                       + strlen (xattr_serz),
-                                                       &tlen, ' ');
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "Error serializing"
-                                " dictionary");
-                        goto unwind;
-                }
-
-                /* closing part */
-                *(xattr_serz + padding + tlen) = ')';
-                *(xattr_serz + padding + tlen + 1) = '\0';
-
-                ret = dict_set_dynstr (nxattr, local->cont.getxattr.name,
-                                       xattr_serz);
-                if (ret)
-                        gf_log (this->name, GF_LOG_ERROR, "Cannot set pathinfo"
-                                " key in dict");
-
-        unwind:
-                AFR_STACK_UNWIND (fgetxattr, frame, op_ret, op_errno, nxattr,
-                                  xdata);
-
-                if (nxattr)
-                        dict_unref (nxattr);
-        }
-
-        return ret;
-}
-
-int32_t
 afr_getxattr_pathinfo_cbk (call_frame_t *frame, void *cookie,
                            xlator_t *this, int32_t op_ret, int32_t op_errno,
-                           dict_t *dict, dict_t *xdata)
+                           dict_t *dict)
 {
-        afr_local_t *local          = NULL;
-        int32_t      callcnt        = 0;
-        int          ret            = 0;
-        char        *xattr          = NULL;
-        char        *xattr_serz     = NULL;
-        char        xattr_cky[1024] = {0,};
-        dict_t      *nxattr         = NULL;
-        long         cky            = 0;
-        int32_t      padding        = 0;
-        int32_t      tlen           = 0;
+        afr_local_t *local             = NULL;
+        int32_t      callcnt           = 0;
+        int          ret               = 0;
+        char        *pathinfo          = NULL;
+        char        *pathinfo_serz     = NULL;
+        char        pathinfo_cky[1024] = {0,};
+        dict_t      *xattr             = NULL;
+        long         cky               = 0;
+        int32_t      padding           = 0;
+        int32_t      tlen              = 0;
 
         if (!frame || !frame->local || !this) {
-                gf_log ("", GF_LOG_ERROR, "possible NULL deref");
-                goto out;
+                gf_log (this->name, GF_LOG_ERROR, "possible NULL deref");
+                goto unlock;
         }
 
         local = frame->local;
@@ -1243,228 +684,97 @@ afr_getxattr_pathinfo_cbk (call_frame_t *frame, void *cookie,
                         callcnt = --local->call_count;
 
                         if (!dict || (op_ret < 0))
-                                goto out;
+                                goto unlock;
 
                         if (!local->dict)
                                 local->dict = dict_new ();
 
                         if (local->dict) {
-                                ret = dict_get_str (dict,
-                                                    local->cont.getxattr.name,
-                                                    &xattr);
+                                ret = dict_get_str (dict, GF_XATTR_PATHINFO_KEY, &pathinfo);
                                 if (ret)
-                                        goto out;
+                                        goto unlock;
 
-                                xattr = gf_strdup (xattr);
+                                pathinfo = gf_strdup (pathinfo);
 
-                                (void)snprintf (xattr_cky, 1024, "%s-%ld",
-                                                local->cont.getxattr.name, cky);
-                                ret = dict_set_dynstr (local->dict,
-                                                       xattr_cky, xattr);
+                                snprintf (pathinfo_cky, 1024, "%s-%ld", GF_XATTR_PATHINFO_KEY, cky);
+                                ret = dict_set_dynstr (local->dict, pathinfo_cky, pathinfo);
                                 if (ret) {
-                                        gf_log (this->name, GF_LOG_ERROR,
-                                                "Cannot set xattr cookie key");
-                                        goto out;
+                                        gf_log (this->name, GF_LOG_ERROR, "Cannot set pathinfo cookie key");
+                                        goto unlock;
                                 }
 
-                                local->cont.getxattr.xattr_len += strlen (xattr) + 1;
+                                local->cont.getxattr.pathinfo_len += strlen (pathinfo) + 1;
                         }
                 }
- out:
-        UNLOCK (&frame->lock);
+ unlock:
+        if (frame)
+                UNLOCK (&frame->lock);
 
         if (!callcnt) {
-                if (!local->cont.getxattr.xattr_len)
+                if (!local->cont.getxattr.pathinfo_len)
                         goto unwind;
 
-                nxattr = dict_new ();
-                if (!nxattr)
+                xattr = dict_new ();
+                if (!xattr)
                         goto unwind;
 
                 /* extra bytes for decorations (brackets and <>'s) */
-                padding += strlen (this->name) + strlen (AFR_PATHINFO_HEADER) + 4;
-                local->cont.getxattr.xattr_len += (padding + 2);
+                padding = strlen (this->name) + strlen (AFR_PATHINFO_HEADER) + 4;
+                local->cont.getxattr.pathinfo_len += (padding + 2);
 
-                xattr_serz = GF_CALLOC (local->cont.getxattr.xattr_len,
-                                        sizeof (char), gf_common_mt_char);
+                pathinfo_serz = GF_CALLOC (local->cont.getxattr.pathinfo_len, sizeof (char),
+                                           gf_common_mt_char);
 
-                if (!xattr_serz)
+                if (!pathinfo_serz)
                         goto unwind;
 
                 /* the xlator info */
-                (void) sprintf (xattr_serz, "(<"AFR_PATHINFO_HEADER"%s> ",
-                                this->name);
+                sprintf (pathinfo_serz, "(<"AFR_PATHINFO_HEADER"%s> ", this->name);
 
                 /* actual series of pathinfo */
-                ret = dict_serialize_value_with_delim (local->dict,
-                                                       xattr_serz + strlen (xattr_serz),
+                ret = dict_serialize_value_with_delim (local->dict, pathinfo_serz + strlen (pathinfo_serz),
                                                        &tlen, ' ');
                 if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "Error serializing"
-                                " dictionary");
+                        gf_log (this->name, GF_LOG_ERROR, "Error serializing dictionary");
                         goto unwind;
                 }
 
                 /* closing part */
-                *(xattr_serz + padding + tlen) = ')';
-                *(xattr_serz + padding + tlen + 1) = '\0';
+                *(pathinfo_serz + padding + tlen) = ')';
+                *(pathinfo_serz + padding + tlen + 1) = '\0';
 
-                ret = dict_set_dynstr (nxattr, local->cont.getxattr.name,
-                                       xattr_serz);
+                ret = dict_set_dynstr (xattr, GF_XATTR_PATHINFO_KEY, pathinfo_serz);
                 if (ret)
-                        gf_log (this->name, GF_LOG_ERROR, "Cannot set pathinfo"
-                                " key in dict");
+                        gf_log (this->name, GF_LOG_ERROR, "Cannot set pathinfo key in dict");
 
         unwind:
-                AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, nxattr,
-                                  xdata);
-
-                if (nxattr)
-                        dict_unref (nxattr);
-        }
-
-        return ret;
-}
-
-static int
-afr_aggregate_stime_xattr (dict_t *this, char *key, data_t *value, void *data)
-{
-        int ret = 0;
-
-        if (fnmatch (GF_XATTR_STIME_PATTERN, key, FNM_NOESCAPE) == 0)
-                ret = gf_get_min_stime (THIS, data, key, value);
-
-        return ret;
-}
-
-int32_t
-afr_common_getxattr_stime_cbk (call_frame_t *frame, void *cookie,
-                               xlator_t *this, int32_t op_ret, int32_t op_errno,
-                               dict_t *dict, dict_t *xdata)
-{
-        afr_local_t *local          = NULL;
-        int32_t      callcnt        = 0;
-
-        if (!frame || !frame->local || !this) {
-                gf_log ("", GF_LOG_ERROR, "possible NULL deref");
-                goto out;
-        }
-
-        local = frame->local;
-
-        LOCK (&frame->lock);
-        {
-                callcnt = --local->call_count;
-
-                if (!dict || (op_ret < 0)) {
-                        local->op_errno = op_errno;
-                        goto cleanup;
-                }
-
-                if (!local->dict)
-                        local->dict = dict_copy_with_ref (dict, NULL);
-                else
-                        dict_foreach (dict, afr_aggregate_stime_xattr,
-                                      local->dict);
-                local->op_ret = 0;
-        }
-
-cleanup:
-        UNLOCK (&frame->lock);
-
-        if (!callcnt) {
-                AFR_STACK_UNWIND (getxattr, frame, local->op_ret,
-                                  local->op_errno, local->dict, xdata);
-        }
-
-out:
-        return 0;
-}
+                AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, xattr);
 
+                if (local->dict)
+                        dict_unref (local->dict);
 
-static gf_boolean_t
-afr_is_special_xattr (const char *name, fop_getxattr_cbk_t *cbk,
-                      gf_boolean_t is_fgetxattr)
-{
-        gf_boolean_t    is_spl = _gf_true;
-
-        GF_ASSERT (cbk);
-        if (!cbk) {
-                is_spl = _gf_false;
-                goto out;
-        }
-
-        if (!strcmp (name, GF_XATTR_PATHINFO_KEY)) {
-                if (is_fgetxattr) {
-                        *cbk = afr_fgetxattr_pathinfo_cbk;
-                } else {
-                        *cbk = afr_getxattr_pathinfo_cbk;
-                }
-        } else if (!strncmp (name, GF_XATTR_CLRLK_CMD,
-                             strlen (GF_XATTR_CLRLK_CMD))) {
-                if (is_fgetxattr) {
-                        *cbk = afr_fgetxattr_clrlk_cbk;
-                } else {
-                        *cbk = afr_getxattr_clrlk_cbk;
-                }
-        } else if (!strncmp (name, GF_XATTR_LOCKINFO_KEY,
-                             strlen (GF_XATTR_LOCKINFO_KEY))) {
-                if (is_fgetxattr) {
-                        *cbk = afr_fgetxattr_lockinfo_cbk;
-                } else {
-                        *cbk = afr_getxattr_lockinfo_cbk;
-                }
-        } else if (fnmatch (GF_XATTR_STIME_PATTERN, name, FNM_NOESCAPE) == 0) {
-                *cbk = afr_common_getxattr_stime_cbk;
-        } else {
-                is_spl = _gf_false;
+                if (xattr)
+                        dict_unref (xattr);
         }
 
-out:
-        return is_spl;
-}
-
-static void
-afr_getxattr_frm_all_children (xlator_t *this, call_frame_t *frame,
-                               const char *name, loc_t *loc,
-                               fop_getxattr_cbk_t cbk)
-{
-        afr_private_t   *priv           = NULL;
-        afr_local_t     *local          = NULL;
-        xlator_t        **children      = NULL;
-        int             i               = 0;
-
-        priv     = this->private;
-        children = priv->children;
-
-        local = frame->local;
-        local->call_count = priv->child_count;
-
-        for (i = 0; i < priv->child_count; i++) {
-                STACK_WIND_COOKIE (frame, cbk,
-                                   (void *) (long) i,
-                                   children[i], children[i]->fops->getxattr,
-                                   loc, name, NULL);
-        }
-        return;
+        return ret;
 }
 
 int32_t
 afr_getxattr (call_frame_t *frame, xlator_t *this,
-              loc_t *loc, const char *name, dict_t *xdata)
+              loc_t *loc, const char *name)
 {
-        afr_private_t           *priv         = NULL;
-        xlator_t                **children    = NULL;
-        int                     call_child    = 0;
-        afr_local_t             *local        = NULL;
-        xlator_list_t           *trav         = NULL;
-        xlator_t                **sub_volumes = NULL;
-        int                     i             = 0;
-        int32_t                 op_errno      = 0;
-        int32_t                 read_child    = -1;
-        int                     ret           = -1;
-        fop_getxattr_cbk_t      cbk           = NULL;
-        int                     afr_xtime_gauge[MCNT_MAX] = {0,};
+        afr_private_t *   priv        = NULL;
+        xlator_t **       children    = NULL;
+        int               call_child  = 0;
+        afr_local_t     * local       = NULL;
+        xlator_list_t   * trav        = NULL;
+        xlator_t       ** sub_volumes = NULL;
+        int               read_child  = -1;
+        int               i           = 0;
+        int32_t           op_ret      = -1;
+        int32_t           op_errno    = 0;
+
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -1475,108 +785,42 @@ afr_getxattr (call_frame_t *frame, xlator_t *this,
 
         children = priv->children;
 
-        AFR_SBRAIN_CHECK_LOC (loc, out);
-
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
+        frame->local = local;
 
         loc_copy (&local->loc, loc);
-        if (!name)
-                goto no_name;
-
-        local->cont.getxattr.name = gf_strdup (name);
-
-        if (!strncmp (name, AFR_XATTR_PREFIX,
-                      strlen (AFR_XATTR_PREFIX))) {
-                gf_log (this->name, GF_LOG_INFO,
-                        "%s: no data present for key %s",
-                        loc->path, name);
-                op_errno = ENODATA;
-                goto out;
-        }
-        if ((strcmp (GF_XATTR_MARKER_KEY, name) == 0)
-            && (GF_CLIENT_PID_GSYNCD == frame->root->pid)) {
-
-                local->marker.call_count = priv->child_count;
-
-                sub_volumes = alloca ( priv->child_count * sizeof (xlator_t *));
-                for (i = 0, trav = this->children; trav ;
-                     trav = trav->next, i++) {
-
-                        *(sub_volumes + i)  = trav->xlator;
-                }
+        if (name)
+                local->cont.getxattr.name = gf_strdup (name);
 
-                if (cluster_getmarkerattr (frame, this, loc, name,
-                                           local, afr_getxattr_unwind,
-                                           sub_volumes,
-                                           priv->child_count,
-                                           MARKER_UUID_TYPE,
-                                           marker_uuid_default_gauge,
-                                           priv->vol_uuid)) {
 
+        if (name) {
+                if (!strncmp (name, AFR_XATTR_PREFIX,
+                              strlen (AFR_XATTR_PREFIX))) {
                         gf_log (this->name, GF_LOG_INFO,
-                                "%s: failed to get marker attr (%s)",
+                                "%s: no data present for key %s",
                                 loc->path, name);
-                        op_errno = EINVAL;
+                        op_errno = ENODATA;
                         goto out;
                 }
+                if ((strcmp (GF_XATTR_MARKER_KEY, name) == 0)
+                    && (-1 == frame->root->pid)) {
 
-                return 0;
-        }
-
-        /*
-         * if we are doing getxattr with pathinfo as the key then we
-         * collect information from all childs
-         */
-        if (afr_is_special_xattr (name, &cbk, 0)) {
-                afr_getxattr_frm_all_children (this, frame, name,
-                                               loc, cbk);
-                return 0;
-        }
-
-        if (XATTR_IS_NODE_UUID (name)) {
-                i = 0;
-                STACK_WIND_COOKIE (frame, afr_getxattr_node_uuid_cbk,
-                                   (void *) (long) i,
-                                   children[i],
-                                   children[i]->fops->getxattr,
-                                   loc, name, xdata);
-                return 0;
-        }
-
-        if (*priv->vol_uuid) {
-                if ((match_uuid_local (name, priv->vol_uuid) == 0)
-                    && (GF_CLIENT_PID_GSYNCD == frame->root->pid)) {
                         local->marker.call_count = priv->child_count;
 
-                        sub_volumes = alloca ( priv->child_count
-                                               * sizeof (xlator_t *));
+                        sub_volumes = alloca ( priv->child_count * sizeof (xlator_t *));
                         for (i = 0, trav = this->children; trav ;
                              trav = trav->next, i++) {
 
                                 *(sub_volumes + i)  = trav->xlator;
-
                         }
 
-                        /* don't err out on getting ENOTCONN (brick down)
-                         * from a subset of the bricks
-                         */
-                        memcpy (afr_xtime_gauge, marker_xtime_default_gauge,
-                                sizeof (afr_xtime_gauge));
-                        afr_xtime_gauge[MCNT_NOTFOUND] = 0;
-                        afr_xtime_gauge[MCNT_ENOTCONN] = 0;
-                        if (cluster_getmarkerattr (frame, this, loc,
-                                                   name, local,
-                                                   afr_getxattr_unwind,
+                        if (cluster_getmarkerattr (frame, this, loc, name,
+                                                   local, afr_getxattr_unwind,
                                                    sub_volumes,
                                                    priv->child_count,
-                                                   MARKER_XTIME_TYPE,
-                                                   afr_xtime_gauge,
+                                                   MARKER_UUID_TYPE,
                                                    priv->vol_uuid)) {
+
                                 gf_log (this->name, GF_LOG_INFO,
                                         "%s: failed to get marker attr (%s)",
                                         loc->path, name);
@@ -1586,208 +830,87 @@ afr_getxattr (call_frame_t *frame, xlator_t *this,
 
                         return 0;
                 }
-        }
-
-no_name:
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children) {
-                op_errno = ENOMEM;
-                goto out;
-        }
-
-        read_child = afr_inode_get_read_ctx (this, loc->inode,
-                                             local->fresh_children);
-        ret = afr_get_call_child (this, local->child_up, read_child,
-                                     local->fresh_children,
-                                     &call_child,
-                                     &local->cont.getxattr.last_index);
-        if (ret < 0) {
-                op_errno = -ret;
-                goto out;
-        }
-
-        STACK_WIND_COOKIE (frame, afr_getxattr_cbk,
-                           (void *) (long) call_child,
-                           children[call_child],
-                           children[call_child]->fops->getxattr,
-                           loc, name, xdata);
-
-        ret = 0;
-out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (getxattr, frame, -1, op_errno, NULL, NULL);
-        return 0;
-}
-
-/* {{{ fgetxattr */
-
-
-int32_t
-afr_fgetxattr_cbk (call_frame_t *frame, void *cookie,
-                   xlator_t *this, int32_t op_ret, int32_t op_errno,
-                   dict_t *dict, dict_t *xdata)
-{
-        afr_private_t * priv            = NULL;
-        afr_local_t *   local           = NULL;
-        xlator_t **     children        = NULL;
-        int             unwind          = 1;
-        int32_t         *last_index     = NULL;
-        int32_t         next_call_child = -1;
-        int32_t         read_child      = -1;
-        int32_t         *fresh_children  = NULL;
-
-        priv     = this->private;
-        children = priv->children;
 
-        local = frame->local;
-
-        read_child = (long) cookie;
-
-        if (op_ret == -1) {
-                last_index = &local->cont.getxattr.last_index;
-                fresh_children = local->fresh_children;
-                next_call_child = afr_next_call_child (fresh_children,
-                                                       local->child_up,
-                                                       priv->child_count,
-                                                       last_index, read_child);
-                if (next_call_child < 0)
-                        goto out;
-
-                unwind = 0;
-                STACK_WIND_COOKIE (frame, afr_fgetxattr_cbk,
-                                   (void *) (long) read_child,
-                                   children[next_call_child],
-                                   children[next_call_child]->fops->fgetxattr,
-                                   local->fd,
-                                   local->cont.getxattr.name,
-                                   NULL);
-        }
-
-out:
-        if (unwind) {
-                if (op_ret >= 0 && dict)
-                        __filter_xattrs (dict);
+                /*
+                 * if we are doing getxattr with pathinfo as the key then we
+                 * collect information from all childs
+                 */
+                if (strncmp (name, GF_XATTR_PATHINFO_KEY,
+                             strlen (GF_XATTR_PATHINFO_KEY)) == 0) {
+
+                        local->call_count = priv->child_count;
+                        for (i = 0; i < priv->child_count; i++) {
+                                STACK_WIND_COOKIE (frame, afr_getxattr_pathinfo_cbk,
+                                                   (void *) (long) i,
+                                                   children[i], children[i]->fops->getxattr,
+                                                   loc, name);
+                        }
 
-                AFR_STACK_UNWIND (fgetxattr, frame, op_ret, op_errno, dict,
-                                  xdata);
-        }
+                        return 0;
+                }
 
-        return 0;
-}
+                if (*priv->vol_uuid) {
+                        if ((match_uuid_local (name, priv->vol_uuid) == 0)
+                            && (-1 == frame->root->pid)) {
 
-int32_t
-afr_fgetxattr_unwind (call_frame_t *frame,
-                      int op_ret, int op_errno, dict_t *dict, dict_t *xdata)
+                                local->marker.call_count = priv->child_count;
 
-{
-        AFR_STACK_UNWIND (fgetxattr, frame, op_ret, op_errno, dict, xdata);
-        return 0;
-}
+                                sub_volumes = alloca ( priv->child_count * sizeof (xlator_t *));
+                                for (i = 0, trav = this->children; trav ;
+                                     trav = trav->next, i++) {
 
-static void
-afr_fgetxattr_frm_all_children (xlator_t *this, call_frame_t *frame,
-                                const char *name, fd_t *fd,
-                                fop_fgetxattr_cbk_t cbk)
-{
-        afr_private_t   *priv           = NULL;
-        afr_local_t     *local          = NULL;
-        xlator_t        **children      = NULL;
-        int             i               = 0;
+                                        *(sub_volumes + i)  = trav->xlator;
 
-        priv     = this->private;
-        children = priv->children;
+                                }
 
-        local = frame->local;
-        local->call_count = priv->child_count;
+                                if (cluster_getmarkerattr (frame, this, loc,
+                                                           name, local,
+                                                           afr_getxattr_unwind,
+                                                           sub_volumes,
+                                                           priv->child_count,
+                                                           MARKER_XTIME_TYPE,
+                                                           priv->vol_uuid)) {
+                                        gf_log (this->name, GF_LOG_INFO,
+                                                "%s: failed to get marker attr (%s)",
+                                                loc->path, name);
+                                        op_errno = EINVAL;
+                                        goto out;
+                                }
 
-        for (i = 0; i < priv->child_count; i++) {
-                STACK_WIND_COOKIE (frame, cbk,
-                                   (void *) (long) i,
-                                   children[i], children[i]->fops->fgetxattr,
-                                   fd, name, NULL);
+                                return 0;
+                        }
+                }
         }
 
-        return;
-}
+        read_child = afr_read_child (this, loc->inode);
 
-int32_t
-afr_fgetxattr (call_frame_t *frame, xlator_t *this,
-               fd_t *fd, const char *name, dict_t *xdata)
-{
-        afr_private_t        *priv       = NULL;
-        xlator_t            **children   = NULL;
-        int                   call_child = 0;
-        afr_local_t          *local      = NULL;
-        int32_t               op_ret     = -1;
-        int32_t               op_errno   = 0;
-        int32_t               read_child = -1;
-        fop_fgetxattr_cbk_t   cbk        = NULL;
+        if ((read_child >= 0) && (priv->child_up[read_child])) {
+                call_child = read_child;
 
-        VALIDATE_OR_GOTO (frame, out);
-        VALIDATE_OR_GOTO (this, out);
-        VALIDATE_OR_GOTO (this->private, out);
-
-        priv     = this->private;
-        VALIDATE_OR_GOTO (priv->children, out);
-
-        children = priv->children;
-
-        AFR_SBRAIN_CHECK_FD (fd, out);
-
-        AFR_LOCAL_ALLOC_OR_GOTO (local, out);
-        frame->local = local;
-
-        op_ret = afr_local_init (local, priv, &op_errno);
-        if (op_ret < 0) {
-                op_errno = -op_ret;
-                goto out;
-        }
-
-        local->fd = fd_ref (fd);
-        if (name)
-                local->cont.getxattr.name = gf_strdup (name);
-
-        /* pathinfo gets handled only in getxattr(), but we need to handle
-         * lockinfo.
-         * If we are doing fgetxattr with lockinfo as the key then we
-         * collect information from all children.
-         */
-        if (afr_is_special_xattr (name, &cbk, 1)) {
-                afr_fgetxattr_frm_all_children (this, frame, name,
-                                                fd, cbk);
-                return 0;
-        }
+                local->cont.getxattr.last_tried = -1;
+        } else {
+                call_child = afr_first_up_child (priv);
 
+                if (call_child == -1) {
+                        op_errno = ENOTCONN;
+                        gf_log (this->name, GF_LOG_INFO,
+                                "%s: no child is up", loc->path);
+                        goto out;
+                }
 
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children) {
-                op_errno = ENOMEM;
-                goto out;
+                local->cont.getxattr.last_tried = call_child;
         }
 
-        read_child = afr_inode_get_read_ctx (this, fd->inode,
-                                             local->fresh_children);
-        op_ret = afr_get_call_child (this, local->child_up, read_child,
-                                     local->fresh_children,
-                                     &call_child,
-                                     &local->cont.getxattr.last_index);
-        if (op_ret < 0) {
-                op_errno = -op_ret;
-                op_ret = -1;
-                goto out;
-        }
 
-        STACK_WIND_COOKIE (frame, afr_fgetxattr_cbk,
+        STACK_WIND_COOKIE (frame, afr_getxattr_cbk,
                            (void *) (long) call_child,
-                           children[call_child],
-                           children[call_child]->fops->fgetxattr,
-                           fd, name, xdata);
+                           children[call_child], children[call_child]->fops->getxattr,
+                           loc, name);
 
         op_ret = 0;
 out:
         if (op_ret == -1) {
-                AFR_STACK_UNWIND (fgetxattr, frame, op_ret, op_errno, NULL,
-                                  NULL);
+                AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, NULL);
         }
         return 0;
 }
@@ -1813,16 +936,15 @@ int32_t
 afr_readv_cbk (call_frame_t *frame, void *cookie,
                xlator_t *this, int32_t op_ret, int32_t op_errno,
                struct iovec *vector, int32_t count, struct iatt *buf,
-               struct iobref *iobref, dict_t *xdata)
+               struct iobref *iobref)
 {
-        afr_private_t * priv            = NULL;
-        afr_local_t *   local           = NULL;
-        xlator_t **     children        = NULL;
-        int             unwind          = 1;
-        int32_t         *last_index     = NULL;
-        int32_t         next_call_child = -1;
-        int32_t         *fresh_children  = NULL;
-        int32_t         read_child      = -1;
+        afr_private_t * priv       = NULL;
+        afr_local_t *   local      = NULL;
+        xlator_t **     children   = NULL;
+        int             unwind     = 1;
+        int             last_tried = -1;
+        int             this_try   = -1;
+        int             read_child = -1;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -1838,31 +960,39 @@ afr_readv_cbk (call_frame_t *frame, void *cookie,
         read_child = (long) cookie;
 
         if (op_ret == -1) {
-                last_index = &local->cont.readv.last_index;
-                fresh_children = local->fresh_children;
-                next_call_child = afr_next_call_child (fresh_children,
-                                                       local->child_up,
-                                                       priv->child_count,
-                                                       last_index, read_child);
-                if (next_call_child < 0)
+        retry:
+                last_tried = local->cont.readv.last_tried;
+
+                if (all_tried (last_tried, priv->child_count)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "%p: all subvolumes tried, going out",
+                                local->fd);
                         goto out;
+                }
+                this_try = ++local->cont.readv.last_tried;
+
+                if (this_try == read_child) {
+                        /*
+                          skip the read child since if we are here
+                          we must have already tried that child
+                        */
+                        goto retry;
+                }
 
                 unwind = 0;
 
                 STACK_WIND_COOKIE (frame, afr_readv_cbk,
                                    (void *) (long) read_child,
-                                   children[next_call_child],
-                                   children[next_call_child]->fops->readv,
+                                   children[this_try],
+                                   children[this_try]->fops->readv,
                                    local->fd, local->cont.readv.size,
-                                   local->cont.readv.offset,
-                                   local->cont.readv.flags,
-                                   NULL);
+                                   local->cont.readv.offset);
         }
 
 out:
         if (unwind) {
                 AFR_STACK_UNWIND (readv, frame, op_ret, op_errno,
-                                  vector, count, buf, iobref, xdata);
+                                  vector, count, buf, iobref);
         }
 
         return 0;
@@ -1871,15 +1001,15 @@ out:
 
 int32_t
 afr_readv (call_frame_t *frame, xlator_t *this,
-           fd_t *fd, size_t size, off_t offset, uint32_t flags, dict_t *xdata)
+           fd_t *fd, size_t size, off_t offset)
 {
         afr_private_t * priv       = NULL;
         afr_local_t   * local      = NULL;
         xlator_t **     children   = NULL;
+        int32_t         read_child = -1;
         int             call_child = 0;
+        int32_t         op_ret     = -1;
         int32_t         op_errno   = 0;
-        int32_t         read_child = -1;
-        int             ret        = -1;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -1889,50 +1019,50 @@ afr_readv (call_frame_t *frame, xlator_t *this,
         priv     = this->private;
         children = priv->children;
 
-        AFR_SBRAIN_CHECK_FD (fd, out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        frame->local = local;
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        read_child = afr_read_child (this, fd->inode);
 
-        local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children) {
-                op_errno = ENOMEM;
-                goto out;
-        }
+        if ((read_child >= 0) && (priv->child_up[read_child])) {
+                call_child = read_child;
+
+                /*
+                  if read fails from the read child, we try
+                  all children starting with the first one
+                */
+                local->cont.readv.last_tried = -1;
 
-        read_child = afr_inode_get_read_ctx (this, fd->inode, local->fresh_children);
-        ret = afr_get_call_child (this, local->child_up, read_child,
-                                     local->fresh_children,
-                                     &call_child,
-                                     &local->cont.readv.last_index);
-        if (ret < 0) {
-                op_errno = -ret;
-                goto out;
+        } else {
+                call_child = afr_first_up_child (priv);
+                if (call_child == -1) {
+                        op_errno = ENOTCONN;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "%p: no child is up", fd);
+                        goto out;
+                }
+
+                local->cont.readv.last_tried = call_child;
         }
 
         local->fd                    = fd_ref (fd);
 
+        local->cont.readv.ino        = fd->inode->ino;
         local->cont.readv.size       = size;
         local->cont.readv.offset     = offset;
-        local->cont.readv.flags      = flags;
-
-        afr_open_fd_fix (fd, this);
 
         STACK_WIND_COOKIE (frame, afr_readv_cbk,
                            (void *) (long) call_child,
                            children[call_child],
                            children[call_child]->fops->readv,
-                           fd, size, offset, flags, xdata);
+                           fd, size, offset);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
-                AFR_STACK_UNWIND (readv, frame, -1, op_errno, NULL, 0, NULL,
-                                  NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (readv, frame, op_ret, op_errno, NULL, 0, NULL,
+                                  NULL);
         }
         return 0;
 }
diff --git a/xlators/cluster/afr/src/afr-inode-read.h b/xlators/cluster/afr/src/afr-inode-read.h
index e4091a793..5479cfbd5 100644
--- a/xlators/cluster/afr/src/afr-inode-read.h
+++ b/xlators/cluster/afr/src/afr-inode-read.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __INODE_READ_H__
@@ -13,30 +22,26 @@
 
 int32_t
 afr_access (call_frame_t *frame, xlator_t *this,
-	    loc_t *loc, int32_t mask, dict_t *xdata);
+	    loc_t *loc, int32_t mask);
 
 int32_t
 afr_stat (call_frame_t *frame, xlator_t *this,
-	  loc_t *loc, dict_t *xdata);
+	  loc_t *loc);
 
 int32_t
 afr_fstat (call_frame_t *frame, xlator_t *this,
-	   fd_t *fd, dict_t *xdata);
+	   fd_t *fd);
 
 int32_t
 afr_readlink (call_frame_t *frame, xlator_t *this,
-	      loc_t *loc, size_t size, dict_t *xdata);
+	      loc_t *loc, size_t size);
 
 int32_t
 afr_readv (call_frame_t *frame, xlator_t *this,
-	   fd_t *fd, size_t size, off_t offset, uint32_t flags, dict_t *xdata);
+	   fd_t *fd, size_t size, off_t offset);
 
 int32_t
 afr_getxattr (call_frame_t *frame, xlator_t *this,
-	      loc_t *loc, const char *name, dict_t *xdata);
-
-int32_t
-afr_fgetxattr (call_frame_t *frame, xlator_t *this,
-               fd_t *fd, const char *name, dict_t *xdata);
+	      loc_t *loc, const char *name);
 
 #endif /* __INODE_READ_H__ */
diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c
index c1ec69a55..57cbc6bb0 100644
--- a/xlators/cluster/afr/src/afr-inode-write.c
+++ b/xlators/cluster/afr/src/afr-inode-write.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -37,155 +46,48 @@
 
 #include "afr.h"
 #include "afr-transaction.h"
-#include "afr-self-heal-common.h"
-
-void
-__inode_write_fop_cbk (call_frame_t *frame, int child_index, int read_child,
-                       xlator_t *this, int32_t *op_ret, int32_t *op_errno,
-                       struct iatt *prebuf, struct iatt *postbuf, dict_t *xdata)
-{
-        afr_local_t     *local = NULL;
-
-        local = frame->local;
-
-        if (afr_fop_failed (*op_ret, *op_errno)) {
-                local->child_errno[child_index] = *op_errno;
-
-                switch (local->op) {
-                case GF_FOP_TRUNCATE:
-                case GF_FOP_FTRUNCATE:
-                        if (*op_errno != EFBIG)
-                                afr_transaction_fop_failed (frame, this,
-                                                            child_index);
-                break;
-                default:
-                        afr_transaction_fop_failed (frame, this, child_index);
-                break;
-                }
-                local->op_errno = *op_errno;
-                goto out;
-        }
-
-        if ((local->success_count == 0) || (read_child == child_index)) {
-                local->op_ret              = *op_ret;
-                if (prebuf)
-                        local->cont.inode_wfop.prebuf  = *prebuf;
-                if (postbuf)
-                        local->cont.inode_wfop.postbuf = *postbuf;
-        }
-
-        local->success_count++;
-out:
-        return;
-}
 
 /* {{{ writev */
 
-void
-afr_writev_copy_outvars (call_frame_t *src_frame, call_frame_t *dst_frame)
-{
-        afr_local_t *src_local = NULL;
-        afr_local_t *dst_local = NULL;
-
-        src_local = src_frame->local;
-        dst_local = dst_frame->local;
-
-        dst_local->op_ret = src_local->op_ret;
-        dst_local->op_errno = src_local->op_errno;
-        dst_local->cont.inode_wfop.prebuf = src_local->cont.inode_wfop.prebuf;
-        dst_local->cont.inode_wfop.postbuf = src_local->cont.inode_wfop.postbuf;
-}
-
-void
+int
 afr_writev_unwind (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t *   local = NULL;
-        local = frame->local;
-
-        AFR_STACK_UNWIND (writev, frame,
-                          local->op_ret, local->op_errno,
-                          &local->cont.inode_wfop.prebuf,
-                          &local->cont.inode_wfop.postbuf,
-                          NULL);
-}
-
-call_frame_t*
-afr_transaction_detach_fop_frame (call_frame_t *frame)
-{
-        afr_local_t *   local = NULL;
-        call_frame_t   *fop_frame = NULL;
+        call_frame_t   *main_frame = NULL;
 
         local = frame->local;
 
         LOCK (&frame->lock);
         {
-                fop_frame = local->transaction.main_frame;
+                if (local->transaction.main_frame)
+                        main_frame = local->transaction.main_frame;
                 local->transaction.main_frame = NULL;
         }
         UNLOCK (&frame->lock);
 
-        return fop_frame;
-}
-
-int
-afr_transaction_writev_unwind (call_frame_t *frame, xlator_t *this)
-{
-        call_frame_t *fop_frame = NULL;
-
-        fop_frame = afr_transaction_detach_fop_frame (frame);
-
-        if (fop_frame) {
-                afr_writev_copy_outvars (frame, fop_frame);
-                afr_writev_unwind (fop_frame, this);
+        if (main_frame) {
+                AFR_STACK_UNWIND (writev, main_frame,
+                                  local->op_ret, local->op_errno,
+                                  &local->cont.writev.prebuf,
+                                  &local->cont.writev.postbuf);
         }
         return 0;
 }
 
-static void
-afr_writev_handle_short_writes (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t   *local = NULL;
-        afr_private_t *priv  = NULL;
-        int           i      = 0;
-
-        local = frame->local;
-        priv = this->private;
-        /*
-         * We already have the best case result of the writev calls staged
-         * as the return value. Any writev that returns some value less
-         * than the best case is now out of sync, so mark the fop as
-         * failed. Note that fops that have returned with errors have
-         * already been marked as failed.
-         */
-        for (i = 0; i < priv->child_count; i++) {
-                if ((!local->replies[i].valid) ||
-                    (local->replies[i].op_ret == -1))
-                        continue;
-
-                if (local->replies[i].op_ret < local->op_ret)
-                        afr_transaction_fop_failed(frame, this, i);
-        }
-}
 
 int
 afr_writev_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                     struct iatt *postbuf, dict_t *xdata)
+                     struct iatt *postbuf)
 {
         afr_local_t *   local = NULL;
-        afr_private_t  *priv  = NULL;
-        call_frame_t    *fop_frame = NULL;
         int child_index = (long) cookie;
         int call_count  = -1;
         int read_child  = 0;
-        int      ret = 0;
-        uint32_t open_fd_count = 0;
-        uint32_t write_is_append = 0;
 
         local = frame->local;
-        priv  = this->private;
 
-        read_child = afr_inode_get_read_ctx (this, local->fd->inode, NULL);
+        read_child = afr_read_child (this, local->fd->inode);
 
         LOCK (&frame->lock);
         {
@@ -193,85 +95,37 @@ afr_writev_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->read_child_returned = _gf_true;
                 }
 
-                __inode_write_fop_cbk (frame, child_index, read_child, this,
-                                       &op_ret, &op_errno, prebuf, postbuf,
-                                       xdata);
-
-		local->replies[child_index].valid = 1;
-		local->replies[child_index].op_ret = op_ret;
-		local->replies[child_index].op_errno = op_errno;
-
-
-		/* stage the best case return value for unwind */
-                if ((local->success_count == 0) || (op_ret > local->op_ret)) {
-                        local->op_ret              = op_ret;
-			local->op_errno		   = op_errno;
-		}
-
-		if (op_ret != -1) {
-                        if (xdata) {
-                                ret = dict_get_uint32 (xdata,
-                                                       GLUSTERFS_OPEN_FD_COUNT,
-                                                       &open_fd_count);
-                                if ((ret == 0) &&
-                                    (open_fd_count > local->open_fd_count)) {
-                                        local->open_fd_count = open_fd_count;
-                                        local->update_open_fd_count = _gf_true;
-                                }
-
-				write_is_append = 0;
-                                ret = dict_get_uint32 (xdata,
-                                                       GLUSTERFS_WRITE_IS_APPEND,
-                                                       &write_is_append);
-                                if (ret || !write_is_append)
-					local->append_write = _gf_false;
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
+                if (op_ret != -1) {
+                        if (local->success_count == 0) {
+                                local->op_ret              = op_ret;
+                                local->cont.writev.prebuf  = *prebuf;
+                                local->cont.writev.postbuf = *postbuf;
                         }
 
-		}
+                        if (child_index == read_child) {
+                                local->cont.writev.prebuf  = *prebuf;
+                                local->cont.writev.postbuf = *postbuf;
+                        }
+                }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
 
         if (call_count == 0) {
+                local->transaction.unwind (frame, this);
 
-                if (local->update_open_fd_count)
-                        afr_handle_open_fd_count (frame, this);
-
-                if (!local->stable_write && !local->append_write)
-			/* An appended write removes the necessity to
-			   fsync() the file. This is because self-heal
-			   has the logic to check for larger file when
-			   the xattrs are not reliably pointing at
-			   a stale file.
-			*/
-                        afr_fd_report_unstable_write (this, local->fd);
-
-                afr_writev_handle_short_writes (frame, this);
-                if (afr_any_fops_failed (local, priv)) {
-                        //Don't unwind until post-op is complete
-                        local->transaction.resume (frame, this);
-                } else {
-                /*
-                 * Generally inode-write fops do transaction.unwind then
-                 * transaction.resume, but writev needs to make sure that
-                 * delayed post-op frame is placed in fdctx before unwind
-                 * happens. This prevents the race of flush doing the
-                 * changelog wakeup first in fuse thread and then this
-                 * writev placing its delayed post-op frame in fdctx.
-                 * This helps flush make sure all the delayed post-ops are
-                 * completed.
-                 */
-
-                        fop_frame = afr_transaction_detach_fop_frame (frame);
-                        afr_writev_copy_outvars (frame, fop_frame);
-                        local->transaction.resume (frame, this);
-                        afr_writev_unwind (fop_frame, this);
-                }
+                local->transaction.resume (frame, this);
         }
         return 0;
 }
 
+
 int
 afr_writev_wind (call_frame_t *frame, xlator_t *this)
 {
@@ -279,14 +133,11 @@ afr_writev_wind (call_frame_t *frame, xlator_t *this)
         afr_private_t *priv = NULL;
         int i = 0;
         int call_count = -1;
-        dict_t *xdata = NULL;
-        GF_UNUSED int     ret = 0;
 
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -294,31 +145,9 @@ afr_writev_wind (call_frame_t *frame, xlator_t *this)
         }
 
         local->call_count = call_count;
-	local->replies = GF_CALLOC(priv->child_count, sizeof(*local->replies),
-				   gf_afr_mt_reply_t);
-	if (!local->replies) {
-		local->op_ret = -1;
-		local->op_errno = ENOMEM;
-		local->transaction.unwind(frame, this);
-		local->transaction.resume(frame, this);
-		return 0;
-	}
-
-        xdata = dict_new ();
-        if (xdata) {
-                ret = dict_set_uint32 (xdata, GLUSTERFS_OPEN_FD_COUNT,
-                                       sizeof (uint32_t));
-		ret = dict_set_uint32 (xdata, GLUSTERFS_WRITE_IS_APPEND,
-				       0);
-		/* Set append_write to be true speculatively. If on any
-		   server it turns not be true, we unset it in the
-		   callback.
-		*/
-		local->append_write = _gf_true;
-        }
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_writev_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
@@ -327,18 +156,13 @@ afr_writev_wind (call_frame_t *frame, xlator_t *this)
                                            local->cont.writev.vector,
                                            local->cont.writev.count,
                                            local->cont.writev.offset,
-                                           local->cont.writev.flags,
-                                           local->cont.writev.iobref,
-                                           xdata);
+                                           local->cont.writev.iobref);
 
                         if (!--call_count)
                                 break;
                 }
         }
 
-        if (xdata)
-                dict_unref (xdata);
-
         return 0;
 }
 
@@ -364,10 +188,10 @@ afr_writev_done (call_frame_t *frame, xlator_t *this)
 int
 afr_do_writev (call_frame_t *frame, xlator_t *this)
 {
-        call_frame_t    *transaction_frame = NULL;
-        afr_local_t     *local             = NULL;
-        int             op_ret   = -1;
-        int             op_errno = 0;
+        call_frame_t * transaction_frame = NULL;
+        afr_local_t *  local             = NULL;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         local = frame->local;
 
@@ -378,7 +202,7 @@ afr_do_writev (call_frame_t *frame, xlator_t *this)
         }
 
         transaction_frame->local = local;
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
+        frame->local = NULL;
 
         local->op = GF_FOP_WRITE;
 
@@ -386,17 +210,10 @@ afr_do_writev (call_frame_t *frame, xlator_t *this)
 
         local->transaction.fop    = afr_writev_wind;
         local->transaction.done   = afr_writev_done;
-        local->transaction.unwind = afr_transaction_writev_unwind;
+        local->transaction.unwind = afr_writev_unwind;
 
         local->transaction.main_frame = frame;
         if (local->fd->flags & O_APPEND) {
-               /*
-                * Backend vfs ignores the 'offset' for append mode fd so
-                * locking just the region provided for the writev does not
-                * give consistency gurantee. The actual write may happen at a
-                * completely different range than the one provided by the
-                * offset, len in the fop. So lock the entire file.
-                */
                 local->transaction.start   = 0;
                 local->transaction.len     = 0;
         } else {
@@ -405,137 +222,32 @@ afr_do_writev (call_frame_t *frame, xlator_t *this)
                                                          local->cont.writev.count);
         }
 
-        op_ret = afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
-        if (op_ret < 0) {
-            op_errno = -op_ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
 
         op_ret = 0;
 out:
-        if (op_ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (writev, frame, op_ret, op_errno, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (writev, frame, op_ret, op_errno, NULL, NULL);
         }
 
         return 0;
 }
 
-static void
-afr_trigger_open_fd_self_heal (fd_t *fd, xlator_t *this)
-{
-        call_frame_t    *frame   = NULL;
-        afr_local_t     *local   = NULL;
-        afr_self_heal_t *sh      = NULL;
-        char            *reason  = NULL;
-        int32_t         op_errno = 0;
-        int             ret      = 0;
-
-        if (!fd || !fd->inode || uuid_is_null (fd->inode->gfid)) {
-                gf_log_callingfn (this->name, GF_LOG_ERROR, "Invalid args: "
-                                  "fd: %p, inode: %p", fd,
-                                  fd ? fd->inode : NULL);
-                goto out;
-        }
-
-        frame = create_frame (this, this->ctx->pool);
-        if (!frame)
-                goto out;
-
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-        ret = afr_local_init (local, this->private, &op_errno);
-        if (ret < 0)
-                goto out;
-
-        local->loc.inode = inode_ref (fd->inode);
-        ret = loc_path (&local->loc, NULL);
-        if (ret < 0)
-                goto out;
-
-        sh    = &local->self_heal;
-        sh->do_metadata_self_heal = _gf_true;
-        if (fd->inode->ia_type == IA_IFREG)
-                sh->do_data_self_heal = _gf_true;
-        else if (fd->inode->ia_type == IA_IFDIR)
-                sh->do_entry_self_heal = _gf_true;
-
-        reason = "subvolume came online";
-        afr_launch_self_heal (frame, this, fd->inode, _gf_true,
-                              fd->inode->ia_type, reason, NULL, NULL);
-        return;
-out:
-        AFR_STACK_DESTROY (frame);
-}
-
-void
-afr_open_fd_fix (fd_t *fd, xlator_t *this)
-{
-        int           ret             = 0;
-        int           i               = 0;
-        afr_fd_ctx_t  *fd_ctx         = NULL;
-        gf_boolean_t  need_self_heal  = _gf_false;
-        int           *need_open      = NULL;
-        size_t        need_open_count = 0;
-        afr_private_t *priv           = NULL;
-
-        priv  = this->private;
-
-        if (!afr_is_fd_fixable (fd))
-                goto out;
-
-        fd_ctx = afr_fd_ctx_get (fd, this);
-        if (!fd_ctx)
-                goto out;
-
-        LOCK (&fd->lock);
-        {
-                if (fd_ctx->up_count < priv->up_count) {
-                        need_self_heal = _gf_true;
-                        fd_ctx->up_count   = priv->up_count;
-                        fd_ctx->down_count = priv->down_count;
-                }
-
-                need_open = alloca (priv->child_count * sizeof (*need_open));
-                for (i = 0; i < priv->child_count; i++) {
-                        need_open[i] = 0;
-                        if (fd_ctx->opened_on[i] != AFR_FD_NOT_OPENED)
-                                continue;
-
-                        if (!priv->child_up[i])
-                                continue;
-
-                        fd_ctx->opened_on[i] = AFR_FD_OPENING;
-
-                        need_open[i] = 1;
-                        need_open_count++;
-                }
-        }
-        UNLOCK (&fd->lock);
-        if (ret)
-                goto out;
-
-        if (need_self_heal)
-                afr_trigger_open_fd_self_heal (fd, this);
-
-        if (!need_open_count)
-                goto out;
-
-        afr_fix_open (this, fd, need_open_count, need_open);
-out:
-        return;
-}
 
 int
 afr_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
             struct iovec *vector, int32_t count, off_t offset,
-            uint32_t flags, struct iobref *iobref, dict_t *xdata)
+            struct iobref *iobref)
 {
         afr_private_t * priv  = NULL;
         afr_local_t   * local = NULL;
         int ret = -1;
+        int op_ret   = -1;
         int op_errno = 0;
+        uint64_t ctx = 0;
+        afr_fd_ctx_t *fd_ctx = NULL;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -543,41 +255,43 @@ afr_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
 
         priv = this->private;
 
-        if (afr_is_split_brain (this, fd->inode)) {
-                op_errno = EIO;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
+
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
         }
 
-        QUORUM_CHECK(writev,out);
-
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        frame->local = local;
 
         local->cont.writev.vector     = iov_dup (vector, count);
         local->cont.writev.count      = count;
         local->cont.writev.offset     = offset;
-        local->cont.writev.flags      = flags;
+        local->cont.writev.ino        = fd->inode->ino;
         local->cont.writev.iobref     = iobref_ref (iobref);
 
         local->fd                = fd_ref (fd);
 
-	/* detect here, but set it in writev_wind_cbk *after* the unstable
-	   write is performed
-	*/
-	local->stable_write = !!((fd->flags|flags)&(O_SYNC|O_DSYNC));
+        ret = fd_ctx_get (fd, this, &ctx);
+        if (ret < 0) {
+                goto out;
+        }
 
-        afr_open_fd_fix (fd, this);
+        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
 
-        afr_do_writev (frame, this);
+        if (fd_ctx->up_count < priv->up_count) {
+                local->openfd_flush_cbk = afr_do_writev;
+                afr_openfd_flush (frame, this, fd);
+        } else {
+                afr_do_writev (frame, this);
+        }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (writev, frame, -1, op_errno, NULL, NULL, NULL);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (writev, frame, op_ret, op_errno, NULL, NULL);
+        }
 
         return 0;
 }
@@ -606,9 +320,8 @@ afr_truncate_unwind (call_frame_t *frame, xlator_t *this)
         if (main_frame) {
                 AFR_STACK_UNWIND (truncate, main_frame, local->op_ret,
                                   local->op_errno,
-                                  &local->cont.inode_wfop.prebuf,
-                                  &local->cont.inode_wfop.postbuf,
-                                  NULL);
+                                  &local->cont.truncate.prebuf,
+                                  &local->cont.truncate.postbuf);
         }
 
         return 0;
@@ -618,16 +331,19 @@ afr_truncate_unwind (call_frame_t *frame, xlator_t *this)
 int
 afr_truncate_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                       struct iatt *postbuf, dict_t *xdata)
+                       struct iatt *postbuf)
 {
         afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
         int child_index = (long) cookie;
         int read_child  = 0;
         int call_count  = -1;
+        int need_unwind = 0;
 
         local = frame->local;
+        priv  = this->private;
 
-        read_child = afr_inode_get_read_ctx (this, local->loc.inode, NULL);
+        read_child = afr_read_child (this, local->loc.inode);
 
         LOCK (&frame->lock);
         {
@@ -635,22 +351,38 @@ afr_truncate_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->read_child_returned = _gf_true;
                 }
 
+                if (afr_fop_failed (op_ret, op_errno) && op_errno != EFBIG)
+                        afr_transaction_fop_failed (frame, this, child_index);
+
                 if (op_ret != -1) {
-			if (prebuf->ia_size != postbuf->ia_size)
-				local->stable_write = _gf_false;
+                        if (local->success_count == 0) {
+                                local->op_ret = op_ret;
+                                local->cont.truncate.prebuf  = *prebuf;
+                                local->cont.truncate.postbuf = *postbuf;
+                        }
+
+                        if (child_index == read_child) {
+                                local->cont.truncate.prebuf  = *prebuf;
+                                local->cont.truncate.postbuf = *postbuf;
+                        }
+
+                        local->success_count++;
+
+                        if ((local->success_count >= priv->wait_count)
+                            && local->read_child_returned) {
+                                need_unwind = 1;
+                        }
                 }
-                __inode_write_fop_cbk (frame, child_index, read_child, this,
-                                       &op_ret, &op_errno, prebuf, postbuf,
-                                       xdata);
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
+        if (need_unwind)
+                local->transaction.unwind (frame, this);
+
         call_count = afr_frame_return (frame);
 
         if (call_count == 0) {
-		if (local->stable_write && afr_txn_nothing_failed (frame, this))
-			local->transaction.unwind (frame, this);
-
                 local->transaction.resume (frame, this);
         }
 
@@ -669,8 +401,7 @@ afr_truncate_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -678,17 +409,15 @@ afr_truncate_wind (call_frame_t *frame, xlator_t *this)
         }
 
         local->call_count = call_count;
-	local->stable_write = _gf_true;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_truncate_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->truncate,
                                            &local->loc,
-                                           local->cont.truncate.offset,
-                                           NULL);
+                                           local->cont.truncate.offset);
 
                         if (!--call_count)
                                 break;
@@ -716,12 +445,13 @@ afr_truncate_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_truncate (call_frame_t *frame, xlator_t *this,
-              loc_t *loc, off_t offset, dict_t *xdata)
+              loc_t *loc, off_t offset)
 {
         afr_private_t * priv  = NULL;
         afr_local_t   * local = NULL;
         call_frame_t   *transaction_frame = NULL;
         int ret = -1;
+        int op_ret   = -1;
         int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -730,22 +460,25 @@ afr_truncate (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(truncate,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
+
+        local->op_ret = -1;
 
         local->cont.truncate.offset  = offset;
+        local->cont.truncate.ino     = loc->inode->ino;
 
         local->transaction.fop    = afr_truncate_wind;
         local->transaction.done   = afr_truncate_done;
@@ -757,18 +490,14 @@ afr_truncate (call_frame_t *frame, xlator_t *this,
         local->transaction.start   = offset;
         local->transaction.len     = 0;
 
-        ret = afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (truncate, frame, -1, op_errno, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (truncate, frame, op_ret, op_errno, NULL, NULL);
         }
 
         return 0;
@@ -799,9 +528,8 @@ afr_ftruncate_unwind (call_frame_t *frame, xlator_t *this)
         if (main_frame) {
                 AFR_STACK_UNWIND (ftruncate, main_frame, local->op_ret,
                                   local->op_errno,
-                                  &local->cont.inode_wfop.prebuf,
-                                  &local->cont.inode_wfop.postbuf,
-                                  NULL);
+                                  &local->cont.ftruncate.prebuf,
+                                  &local->cont.ftruncate.postbuf);
         }
         return 0;
 }
@@ -810,16 +538,19 @@ afr_ftruncate_unwind (call_frame_t *frame, xlator_t *this)
 int
 afr_ftruncate_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                        struct iatt *postbuf, dict_t *xdata)
+                        struct iatt *postbuf)
 {
         afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
         int child_index = (long) cookie;
         int call_count  = -1;
+        int need_unwind = 0;
         int read_child  = 0;
 
         local = frame->local;
+        priv  = this->private;
 
-        read_child = afr_inode_get_read_ctx (this, local->fd->inode, NULL);
+        read_child = afr_read_child (this, local->fd->inode);
 
         LOCK (&frame->lock);
         {
@@ -827,22 +558,38 @@ afr_ftruncate_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->read_child_returned = _gf_true;
                 }
 
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
                 if (op_ret != -1) {
-			if (prebuf->ia_size != postbuf->ia_size)
-				local->stable_write = _gf_false;
+                        if (local->success_count == 0) {
+                                local->op_ret = op_ret;
+                                local->cont.ftruncate.prebuf  = *prebuf;
+                                local->cont.ftruncate.postbuf = *postbuf;
+                        }
+
+                        if (child_index == read_child) {
+                                local->cont.ftruncate.prebuf  = *prebuf;
+                                local->cont.ftruncate.postbuf = *postbuf;
+                        }
+
+                        local->success_count++;
+
+                        if ((local->success_count >= priv->wait_count)
+                            && local->read_child_returned) {
+                                need_unwind = 1;
+                        }
                 }
-                __inode_write_fop_cbk (frame, child_index, read_child, this,
-                                       &op_ret, &op_errno, prebuf, postbuf,
-                                       xdata);
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
+        if (need_unwind)
+                local->transaction.unwind (frame, this);
+
         call_count = afr_frame_return (frame);
 
         if (call_count == 0) {
-		if (local->stable_write && afr_txn_nothing_failed (frame, this))
-			local->transaction.unwind (frame, this);
-
                 local->transaction.resume (frame, this);
         }
 
@@ -861,8 +608,7 @@ afr_ftruncate_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -870,17 +616,14 @@ afr_ftruncate_wind (call_frame_t *frame, xlator_t *this)
         }
 
         local->call_count = call_count;
-	local->stable_write = _gf_true;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_ftruncate_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->ftruncate,
-                                           local->fd,
-                                           local->cont.ftruncate.offset,
-                                           NULL);
+                                           local->fd, local->cont.ftruncate.offset);
 
                         if (!--call_count)
                                 break;
@@ -935,19 +678,14 @@ afr_do_ftruncate (call_frame_t *frame, xlator_t *this)
         local->transaction.start   = local->cont.ftruncate.offset;
         local->transaction.len     = 0;
 
-        op_ret = afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
-        if (op_ret < 0) {
-            op_errno = -op_ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
 
         op_ret = 0;
 out:
-        if (op_ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (ftruncate, frame, op_ret, op_errno, NULL,
-                                  NULL, NULL);
+                AFR_STACK_UNWIND (ftruncate, frame, op_ret, op_errno, NULL, NULL);
         }
 
         return 0;
@@ -956,13 +694,16 @@ out:
 
 int
 afr_ftruncate (call_frame_t *frame, xlator_t *this,
-               fd_t *fd, off_t offset, dict_t *xdata)
+               fd_t *fd, off_t offset)
 {
         afr_private_t * priv  = NULL;
         afr_local_t   * local = NULL;
         call_frame_t   *transaction_frame = NULL;
         int ret = -1;
+        int op_ret   = -1;
         int op_errno = 0;
+        uint64_t ctx = 0;
+        afr_fd_ctx_t *fd_ctx = NULL;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -970,33 +711,41 @@ afr_ftruncate (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        if (afr_is_split_brain (this, fd->inode)) {
-                op_errno = EIO;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
+
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
         }
-        QUORUM_CHECK(ftruncate,out);
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        frame->local = local;
 
         local->cont.ftruncate.offset  = offset;
+        local->cont.ftruncate.ino     = fd->inode->ino;
 
         local->fd = fd_ref (fd);
 
-        afr_open_fd_fix (fd, this);
+        ret = fd_ctx_get (fd, this, &ctx);
+        if (ret < 0) {
+                goto out;
+        }
 
-        afr_do_ftruncate (frame, this);
+        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
 
-        ret = 0;
+        if (fd_ctx->up_count < priv->up_count) {
+                local->openfd_flush_cbk = afr_do_ftruncate;
+                afr_openfd_flush (frame, this, fd);
+        } else {
+                afr_do_ftruncate (frame, this);
+        }
+
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (ftruncate, frame, -1, op_errno, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (ftruncate, frame, op_ret, op_errno, NULL, NULL);
         }
 
         return 0;
@@ -1025,9 +774,8 @@ afr_setattr_unwind (call_frame_t *frame, xlator_t *this)
         if (main_frame) {
                 AFR_STACK_UNWIND (setattr, main_frame, local->op_ret,
                                   local->op_errno,
-                                  &local->cont.inode_wfop.prebuf,
-                                  &local->cont.inode_wfop.postbuf,
-                                  NULL);
+                                  &local->cont.setattr.preop_buf,
+                                  &local->cont.setattr.postop_buf);
         }
 
         return 0;
@@ -1037,7 +785,7 @@ afr_setattr_unwind (call_frame_t *frame, xlator_t *this)
 int
 afr_setattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno,
-                      struct iatt *preop, struct iatt *postop, dict_t *xdata)
+                      struct iatt *preop, struct iatt *postop)
 {
         afr_local_t *   local = NULL;
         afr_private_t * priv  = NULL;
@@ -1049,7 +797,7 @@ afr_setattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         local = frame->local;
         priv  = this->private;
 
-        read_child = afr_inode_get_read_ctx (this, local->loc.inode, NULL);
+        read_child = afr_read_child (this, local->loc.inode);
 
         LOCK (&frame->lock);
         {
@@ -1057,14 +805,29 @@ afr_setattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->read_child_returned = _gf_true;
                 }
 
-                __inode_write_fop_cbk (frame, child_index, read_child, this,
-                                       &op_ret, &op_errno, preop, postop,
-                                       xdata);
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
+
+                if (op_ret != -1) {
+                        if (local->success_count == 0) {
+                                local->op_ret = op_ret;
+                                local->cont.setattr.preop_buf  = *preop;
+                                local->cont.setattr.postop_buf = *postop;
+                        }
+
+                        if (child_index == read_child) {
+                                local->cont.setattr.preop_buf  = *preop;
+                                local->cont.setattr.postop_buf = *postop;
+                        }
+
+                        local->success_count++;
 
-                if ((local->success_count >= priv->wait_count)
-                    && local->read_child_returned) {
-                        need_unwind = 1;
+                        if ((local->success_count >= priv->wait_count)
+                            && local->read_child_returned) {
+                                need_unwind = 1;
+                        }
                 }
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
@@ -1092,8 +855,7 @@ afr_setattr_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -1103,15 +865,14 @@ afr_setattr_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_setattr_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->setattr,
                                            &local->loc,
                                            &local->cont.setattr.in_buf,
-                                           local->cont.setattr.valid,
-                                           NULL);
+                                           local->cont.setattr.valid);
 
                         if (!--call_count)
                                 break;
@@ -1139,12 +900,13 @@ afr_setattr_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_setattr (call_frame_t *frame, xlator_t *this,
-             loc_t *loc, struct iatt *buf, int32_t valid, dict_t *xdata)
+             loc_t *loc, struct iatt *buf, int32_t valid)
 {
         afr_private_t * priv  = NULL;
         afr_local_t   * local = NULL;
         call_frame_t   *transaction_frame = NULL;
         int ret = -1;
+        int op_ret   = -1;
         int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -1153,20 +915,24 @@ afr_setattr (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        QUORUM_CHECK(setattr,out);
-
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
+
+        transaction_frame->local = local;
+
+        local->op_ret = -1;
+
+        local->cont.setattr.ino     = loc->inode->ino;
 
         local->cont.setattr.in_buf = *buf;
         local->cont.setattr.valid  = valid;
@@ -1181,18 +947,14 @@ afr_setattr (call_frame_t *frame, xlator_t *this,
         local->transaction.start   = LLONG_MAX - 1;
         local->transaction.len     = 0;
 
-        ret = afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (setattr, frame, -1, op_errno, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (setattr, frame, op_ret, op_errno, NULL, NULL);
         }
 
         return 0;
@@ -1219,9 +981,8 @@ afr_fsetattr_unwind (call_frame_t *frame, xlator_t *this)
         if (main_frame) {
                 AFR_STACK_UNWIND (fsetattr, main_frame, local->op_ret,
                                   local->op_errno,
-                                  &local->cont.inode_wfop.prebuf,
-                                  &local->cont.inode_wfop.postbuf,
-                                  NULL);
+                                  &local->cont.fsetattr.preop_buf,
+                                  &local->cont.fsetattr.postop_buf);
         }
 
         return 0;
@@ -1231,7 +992,7 @@ afr_fsetattr_unwind (call_frame_t *frame, xlator_t *this)
 int
 afr_fsetattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int32_t op_ret, int32_t op_errno,
-                       struct iatt *preop, struct iatt *postop, dict_t *xdata)
+                       struct iatt *preop, struct iatt *postop)
 {
         afr_local_t *   local = NULL;
         afr_private_t * priv  = NULL;
@@ -1243,7 +1004,7 @@ afr_fsetattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         local = frame->local;
         priv  = this->private;
 
-        read_child = afr_inode_get_read_ctx (this, local->fd->inode, NULL);
+        read_child = afr_read_child (this, local->fd->inode);
 
         LOCK (&frame->lock);
         {
@@ -1251,14 +1012,29 @@ afr_fsetattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->read_child_returned = _gf_true;
                 }
 
-                __inode_write_fop_cbk (frame, child_index, read_child, this,
-                                       &op_ret, &op_errno, preop, postop,
-                                       xdata);
+                if (afr_fop_failed (op_ret, op_errno))
+                        afr_transaction_fop_failed (frame, this, child_index);
 
-                if ((local->success_count >= priv->wait_count)
-                    && local->read_child_returned) {
-                        need_unwind = 1;
+                if (op_ret != -1) {
+                        if (local->success_count == 0) {
+                                local->op_ret = op_ret;
+                                local->cont.fsetattr.preop_buf  = *preop;
+                                local->cont.fsetattr.postop_buf = *postop;
+                        }
+
+                        if (child_index == read_child) {
+                                local->cont.fsetattr.preop_buf  = *preop;
+                                local->cont.fsetattr.postop_buf = *postop;
+                        }
+
+                        local->success_count++;
+
+                        if ((local->success_count >= priv->wait_count)
+                            && local->read_child_returned) {
+                                need_unwind = 1;
+                        }
                 }
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
@@ -1286,8 +1062,7 @@ afr_fsetattr_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -1297,15 +1072,14 @@ afr_fsetattr_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_fsetattr_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->fsetattr,
                                            local->fd,
                                            &local->cont.fsetattr.in_buf,
-                                           local->cont.fsetattr.valid,
-                                           NULL);
+                                           local->cont.fsetattr.valid);
 
                         if (!--call_count)
                                 break;
@@ -1330,14 +1104,16 @@ afr_fsetattr_done (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
+
 int
 afr_fsetattr (call_frame_t *frame, xlator_t *this,
-              fd_t *fd, struct iatt *buf, int32_t valid, dict_t *xdata)
+              fd_t *fd, struct iatt *buf, int32_t valid)
 {
         afr_private_t * priv  = NULL;
         afr_local_t   * local = NULL;
         call_frame_t   *transaction_frame = NULL;
         int ret = -1;
+        int op_ret   = -1;
         int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
@@ -1346,25 +1122,24 @@ afr_fsetattr (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
-        if (afr_is_split_brain (this, fd->inode)) {
-                op_errno = EIO;
+        transaction_frame = copy_frame (frame);
+        if (!transaction_frame) {
                 goto out;
         }
 
-        QUORUM_CHECK(fsetattr,out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        transaction_frame = copy_frame (frame);
-        if (!transaction_frame) {
-                op_errno = ENOMEM;
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        transaction_frame->local = local;
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        local->op_ret = -1;
+
+        local->cont.fsetattr.ino     = fd->inode->ino;
 
         local->cont.fsetattr.in_buf = *buf;
         local->cont.fsetattr.valid  = valid;
@@ -1375,24 +1150,18 @@ afr_fsetattr (call_frame_t *frame, xlator_t *this,
 
         local->fd                 = fd_ref (fd);
 
-        afr_open_fd_fix (fd, this);
-
         local->transaction.main_frame = frame;
         local->transaction.start   = LLONG_MAX - 1;
         local->transaction.len     = 0;
 
-        ret = afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (fsetattr, frame, -1, op_errno, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (fsetattr, frame, op_ret, op_errno, NULL, NULL);
         }
 
         return 0;
@@ -1420,34 +1189,38 @@ afr_setxattr_unwind (call_frame_t *frame, xlator_t *this)
 
         if (main_frame) {
                 AFR_STACK_UNWIND (setxattr, main_frame,
-                                  local->op_ret, local->op_errno,
-                                  NULL);
-        }
+                                  local->op_ret, local->op_errno)
+                        }
         return 0;
 }
 
 
 int
 afr_setxattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                       int32_t op_ret, int32_t op_errno)
 {
-        afr_local_t   *local      = NULL;
-        afr_private_t *priv       = NULL;
-        int           call_count  = -1;
-        int           need_unwind = 0;
-        int           child_index = (long) cookie;
+        afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
+        int call_count  = -1;
+        int need_unwind = 0;
 
         local = frame->local;
         priv = this->private;
 
         LOCK (&frame->lock);
         {
-                __inode_write_fop_cbk (frame, child_index, -1, this,
-                                       &op_ret, &op_errno, NULL, NULL,
-                                       xdata);
-                if (local->success_count == priv->child_count) {
-                        need_unwind = 1;
+                if (op_ret != -1) {
+                        if (local->success_count == 0) {
+                                local->op_ret = op_ret;
+                        }
+                        local->success_count++;
+
+                        if (local->success_count == priv->child_count) {
+                                need_unwind = 1;
+                        }
                 }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
@@ -1467,16 +1240,15 @@ afr_setxattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int
 afr_setxattr_wind (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t      *local         = NULL;
-        afr_private_t    *priv          = NULL;
-        int               call_count    = -1;
-        int               i             = 0;
+        afr_local_t *local = NULL;
+        afr_private_t *priv = NULL;
+        int call_count = -1;
+        int i = 0;
 
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -1486,15 +1258,14 @@ afr_setxattr_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_setxattr_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->setxattr,
                                            &local->loc,
                                            local->cont.setxattr.dict,
-                                           local->cont.setxattr.flags,
-                                           NULL);
+                                           local->cont.setxattr.flags);
 
                         if (!--call_count)
                                 break;
@@ -1508,7 +1279,7 @@ afr_setxattr_wind (call_frame_t *frame, xlator_t *this)
 int
 afr_setxattr_done (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t   *local    = frame->local;
+        afr_local_t * local = frame->local;
 
         local->transaction.unwind (frame, this);
 
@@ -1519,40 +1290,37 @@ afr_setxattr_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_setxattr (call_frame_t *frame, xlator_t *this,
-              loc_t *loc, dict_t *dict, int32_t flags, dict_t *xdata)
+              loc_t *loc, dict_t *dict, int32_t flags)
 {
-        afr_private_t  *priv              = NULL;
-        afr_local_t    *local             = NULL;
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
         call_frame_t   *transaction_frame = NULL;
-        int             ret               = -1;
-        int             op_errno          = EINVAL;
-
-        VALIDATE_OR_GOTO (this, out);
-
-        GF_IF_INTERNAL_XATTR_GOTO ("trusted.afr.*", dict,
-                                   op_errno, out);
-
-        GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.afr.*", dict,
-                                   op_errno, out);
+        int ret = -1;
+        int op_ret   = -1;
+        int op_errno = 0;
 
         VALIDATE_OR_GOTO (frame, out);
+        VALIDATE_OR_GOTO (this, out);
         VALIDATE_OR_GOTO (this->private, out);
 
         priv = this->private;
 
-        QUORUM_CHECK(setxattr,out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
+
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
+                goto out;
+        }
+
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
-                op_errno = ENOMEM;
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
+        transaction_frame->local = local;
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+        local->op_ret = -1;
 
         local->cont.setxattr.dict  = dict_ref (dict);
         local->cont.setxattr.flags = flags;
@@ -1567,211 +1335,14 @@ afr_setxattr (call_frame_t *frame, xlator_t *this,
         local->transaction.start   = LLONG_MAX - 1;
         local->transaction.len     = 0;
 
-        ret = afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret < 0) {
-                if (transaction_frame)
-                        AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (setxattr, frame, -1, op_errno, NULL);
-        }
-
-        return 0;
-}
-
-/* {{{ fsetxattr */
-
-
-int
-afr_fsetxattr_unwind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t    *local         = NULL;
-        call_frame_t   *main_frame    = NULL;
-
-        local = frame->local;
-
-        LOCK (&frame->lock);
-        {
-                if (local->transaction.main_frame)
-                        main_frame = local->transaction.main_frame;
-                local->transaction.main_frame = NULL;
-        }
-        UNLOCK (&frame->lock);
-
-        if (main_frame) {
-                AFR_STACK_UNWIND (fsetxattr, main_frame,
-                                  local->op_ret, local->op_errno,
-                                  NULL);
-        }
-        return 0;
-}
-
-
-int
-afr_fsetxattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int32_t op_ret, int32_t op_errno, dict_t *xdata)
-{
-        afr_local_t   *local      = NULL;
-        afr_private_t *priv       = NULL;
-        int           call_count  = -1;
-        int           need_unwind = 0;
-        int           child_index = (long) cookie;
-
-        local = frame->local;
-        priv = this->private;
-
-        LOCK (&frame->lock);
-        {
-
-                __inode_write_fop_cbk (frame, child_index, -1, this,
-                                       &op_ret, &op_errno, NULL, NULL,
-                                       xdata);
-                if (local->success_count == priv->child_count) {
-                        need_unwind = 1;
-                }
-        }
-        UNLOCK (&frame->lock);
-
-        if (need_unwind)
-                local->transaction.unwind (frame, this);
-
-        call_count = afr_frame_return (frame);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-        }
-
-        return 0;
-}
-
-
-int
-afr_fsetxattr_wind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t        *local       = NULL;
-        afr_private_t      *priv        = NULL;
-        int                 call_count  = -1;
-        int                 i           = 0;
-
-        local = frame->local;
-        priv = this->private;
-
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-                return 0;
-        }
-
-        local->call_count = call_count;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
-                        STACK_WIND_COOKIE (frame, afr_fsetxattr_wind_cbk,
-                                           (void *) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->fsetxattr,
-                                           local->fd,
-                                           local->cont.fsetxattr.dict,
-                                           local->cont.fsetxattr.flags,
-                                           NULL);
-
-                        if (!--call_count)
-                                break;
-                }
-        }
-
-        return 0;
-}
-
-
-int
-afr_fsetxattr_done (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t   *local   = frame->local;
-
-        local->transaction.unwind (frame, this);
-
-        AFR_STACK_DESTROY (frame);
-
-        return 0;
-}
-
-int
-afr_fsetxattr (call_frame_t *frame, xlator_t *this,
-               fd_t *fd, dict_t *dict, int32_t flags, dict_t *xdata)
-{
-        afr_private_t    *priv              = NULL;
-        afr_local_t      *local             = NULL;
-        call_frame_t     *transaction_frame = NULL;
-        int               ret               = -1;
-        int               op_errno          = EINVAL;
-
-        VALIDATE_OR_GOTO (frame, out);
-        VALIDATE_OR_GOTO (this, out);
-        VALIDATE_OR_GOTO (this->private, out);
-
-        GF_IF_INTERNAL_XATTR_GOTO ("trusted.afr.*", dict,
-                                   op_errno, out);
-
-        GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.afr.*", dict,
-                                   op_errno, out);
-
-        priv = this->private;
-
-        if (afr_is_split_brain (this, fd->inode)) {
-                op_errno = EIO;
-                goto out;
-        }
-
-        QUORUM_CHECK(fsetxattr,out);
-
-        AFR_LOCAL_ALLOC_OR_GOTO (local, out);
+        afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
-
-        transaction_frame = copy_frame (frame);
-        if (!transaction_frame) {
-                goto out;
-        }
-
-        transaction_frame->local = local;
-
-        local->op_ret = -1;
-
-        local->cont.fsetxattr.dict  = dict_ref (dict);
-        local->cont.fsetxattr.flags = flags;
-
-        local->transaction.fop    = afr_fsetxattr_wind;
-        local->transaction.done   = afr_fsetxattr_done;
-        local->transaction.unwind = afr_fsetxattr_unwind;
-
-        local->fd                 = fd_ref (fd);
-
-        local->transaction.main_frame = frame;
-        local->transaction.start  = LLONG_MAX - 1;
-        local->transaction.len    = 0;
-
-        ret = afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
-
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (fsetxattr, frame, -1, op_errno, NULL);
+                AFR_STACK_UNWIND (setxattr, frame, op_ret, op_errno);
         }
 
         return 0;
@@ -1779,7 +1350,6 @@ out:
 
 /* }}} */
 
-
 /* {{{ removexattr */
 
 
@@ -1801,34 +1371,38 @@ afr_removexattr_unwind (call_frame_t *frame, xlator_t *this)
 
         if (main_frame) {
                 AFR_STACK_UNWIND (removexattr, main_frame,
-                                  local->op_ret, local->op_errno,
-                                  NULL);
-        }
+                                  local->op_ret, local->op_errno)
+                        }
         return 0;
 }
 
 
 int
 afr_removexattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                          int32_t op_ret, int32_t op_errno)
 {
-        afr_local_t   *local      = NULL;
-        afr_private_t *priv       = NULL;
-        int           call_count  = -1;
-        int           need_unwind = 0;
-        int           child_index = (long) cookie;
+        afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
+        int call_count  = -1;
+        int need_unwind = 0;
 
         local = frame->local;
         priv = this->private;
 
         LOCK (&frame->lock);
         {
-                __inode_write_fop_cbk (frame, child_index, -1, this,
-                                       &op_ret, &op_errno, NULL, NULL,
-                                       xdata);
-                if (local->success_count == priv->wait_count) {
-                        need_unwind = 1;
+                if (op_ret != -1) {
+                        if (local->success_count == 0) {
+                                local->op_ret = op_ret;
+                        }
+                        local->success_count++;
+
+                        if (local->success_count == priv->wait_count) {
+                                need_unwind = 1;
+                        }
                 }
+
+                local->op_errno = op_errno;
         }
         UNLOCK (&frame->lock);
 
@@ -1856,8 +1430,7 @@ afr_removexattr_wind (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv = this->private;
 
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
 
         if (call_count == 0) {
                 local->transaction.resume (frame, this);
@@ -1867,14 +1440,13 @@ afr_removexattr_wind (call_frame_t *frame, xlator_t *this)
         local->call_count = call_count;
 
         for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
+                if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_removexattr_wind_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->removexattr,
                                            &local->loc,
-                                           local->cont.removexattr.name,
-                                           NULL);
+                                           local->cont.removexattr.name);
 
                         if (!--call_count)
                                 break;
@@ -1900,192 +1472,7 @@ afr_removexattr_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_removexattr (call_frame_t *frame, xlator_t *this,
-                 loc_t *loc, const char *name, dict_t *xdata)
-{
-        afr_private_t   *priv              = NULL;
-        afr_local_t     *local             = NULL;
-        call_frame_t    *transaction_frame = NULL;
-        int              ret               = -1;
-        int              op_errno          = 0;
-
-        VALIDATE_OR_GOTO (this, out);
-
-        GF_IF_NATIVE_XATTR_GOTO ("trusted.afr.*",
-                                 name, op_errno, out);
-
-        GF_IF_NATIVE_XATTR_GOTO ("trusted.glusterfs.afr.*",
-                                 name, op_errno, out);
-
-        VALIDATE_OR_GOTO (frame, out);
-        VALIDATE_OR_GOTO (this->private, out);
-        VALIDATE_OR_GOTO (loc, out);
-
-        priv = this->private;
-
-        QUORUM_CHECK(removexattr,out);
-
-        transaction_frame = copy_frame (frame);
-        if (!transaction_frame) {
-                op_errno = ENOMEM;
-                goto out;
-        }
-
-        AFR_LOCAL_ALLOC_OR_GOTO (transaction_frame->local, out);
-        local = transaction_frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
-
-        local->cont.removexattr.name = gf_strdup (name);
-
-        local->transaction.fop    = afr_removexattr_wind;
-        local->transaction.done   = afr_removexattr_done;
-        local->transaction.unwind = afr_removexattr_unwind;
-
-        loc_copy (&local->loc, loc);
-
-        local->transaction.main_frame = frame;
-        local->transaction.start   = LLONG_MAX - 1;
-        local->transaction.len     = 0;
-
-        ret = afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
-        if (ret < 0) {
-            op_errno = -ret;
-            goto out;
-        }
-
-        ret = 0;
-out:
-        if (ret < 0) {
-                if (transaction_frame)
-                        AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (removexattr, frame, -1, op_errno, NULL);
-        }
-
-        return 0;
-}
-
-/* ffremovexattr */
-int
-afr_fremovexattr_unwind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *   local = NULL;
-        call_frame_t   *main_frame = NULL;
-
-        local = frame->local;
-
-        LOCK (&frame->lock);
-        {
-                if (local->transaction.main_frame)
-                        main_frame = local->transaction.main_frame;
-                local->transaction.main_frame = NULL;
-        }
-        UNLOCK (&frame->lock);
-
-        if (main_frame) {
-                AFR_STACK_UNWIND (fremovexattr, main_frame,
-                                  local->op_ret, local->op_errno,
-                                  NULL);
-        }
-        return 0;
-}
-
-
-int
-afr_fremovexattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno, dict_t *xdata)
-{
-        afr_local_t *   local       = NULL;
-        afr_private_t * priv        = NULL;
-        int             call_count  = -1;
-        int             need_unwind = 0;
-        int             child_index = (long) cookie;
-
-        local = frame->local;
-        priv = this->private;
-
-        LOCK (&frame->lock);
-        {
-                __inode_write_fop_cbk (frame, child_index, -1, this,
-                                       &op_ret, &op_errno, NULL, NULL,
-                                       xdata);
-
-                if (local->success_count == priv->wait_count) {
-                        need_unwind = 1;
-                }
-        }
-        UNLOCK (&frame->lock);
-
-        if (need_unwind)
-                local->transaction.unwind (frame, this);
-
-        call_count = afr_frame_return (frame);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-        }
-
-        return 0;
-}
-
-
-int32_t
-afr_fremovexattr_wind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *local = NULL;
-        afr_private_t *priv = NULL;
-        int call_count = -1;
-        int i = 0;
-
-        local = frame->local;
-        priv = this->private;
-
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-                return 0;
-        }
-
-        local->call_count = call_count;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
-                        STACK_WIND_COOKIE (frame, afr_fremovexattr_wind_cbk,
-                                           (void *) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->fremovexattr,
-                                           local->fd,
-                                           local->cont.removexattr.name,
-                                           NULL);
-
-                        if (!--call_count)
-                                break;
-                }
-        }
-
-        return 0;
-}
-
-
-int
-afr_fremovexattr_done (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t * local = frame->local;
-
-        local->transaction.unwind (frame, this);
-
-        AFR_STACK_DESTROY (frame);
-
-        return 0;
-}
-
-
-int
-afr_fremovexattr (call_frame_t *frame, xlator_t *this,
-                  fd_t *fd, const char *name, dict_t *xdata)
+                 loc_t *loc, const char *name)
 {
         afr_private_t * priv  = NULL;
         afr_local_t   * local = NULL;
@@ -2094,33 +1481,21 @@ afr_fremovexattr (call_frame_t *frame, xlator_t *this,
         int op_ret   = -1;
         int op_errno = 0;
 
-        VALIDATE_OR_GOTO (this, out);
-
-        GF_IF_NATIVE_XATTR_GOTO ("trusted.afr.*",
-                                 name, op_errno, out);
-
-        GF_IF_NATIVE_XATTR_GOTO ("trusted.glusterfs.afr.*",
-                                 name, op_errno, out);
-
         VALIDATE_OR_GOTO (frame, out);
+        VALIDATE_OR_GOTO (this, out);
         VALIDATE_OR_GOTO (this->private, out);
+        VALIDATE_OR_GOTO (loc, out);
 
         priv = this->private;
-        if (afr_is_split_brain (this, fd->inode)) {
-                op_errno = EIO;
-                goto out;
-        }
-
-        QUORUM_CHECK(fremovexattr, out);
 
         transaction_frame = copy_frame (frame);
         if (!transaction_frame) {
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (local, out);
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
+        ret = AFR_LOCAL_INIT (local, priv);
         if (ret < 0) {
                 op_errno = -ret;
                 goto out;
@@ -2132,730 +1507,25 @@ afr_fremovexattr (call_frame_t *frame, xlator_t *this,
 
         local->cont.removexattr.name = gf_strdup (name);
 
-        local->transaction.fop    = afr_fremovexattr_wind;
-        local->transaction.done   = afr_fremovexattr_done;
-        local->transaction.unwind = afr_fremovexattr_unwind;
+        local->transaction.fop    = afr_removexattr_wind;
+        local->transaction.done   = afr_removexattr_done;
+        local->transaction.unwind = afr_removexattr_unwind;
 
-        local->fd = fd_ref (fd);
+        loc_copy (&local->loc, loc);
 
         local->transaction.main_frame = frame;
         local->transaction.start   = LLONG_MAX - 1;
         local->transaction.len     = 0;
 
-        op_ret = afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
-        if (op_ret < 0) {
-            op_errno = -op_ret;
-            goto out;
-        }
-
-        op_ret = 0;
-out:
-        if (op_ret < 0) {
-                if (transaction_frame)
-                        AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (fremovexattr, frame, op_ret, op_errno, NULL);
-        }
-
-        return 0;
-}
-
-static int
-afr_fallocate_unwind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *   local = NULL;
-        call_frame_t   *main_frame = NULL;
-
-        local = frame->local;
-
-        LOCK (&frame->lock);
-        {
-                if (local->transaction.main_frame)
-                        main_frame = local->transaction.main_frame;
-                local->transaction.main_frame = NULL;
-        }
-        UNLOCK (&frame->lock);
-
-        if (main_frame) {
-                AFR_STACK_UNWIND (fallocate, main_frame, local->op_ret,
-                                  local->op_errno,
-                                  &local->cont.inode_wfop.prebuf,
-                                  &local->cont.inode_wfop.postbuf,
-                                  NULL);
-        }
-        return 0;
-}
-
-static int
-afr_fallocate_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                        struct iatt *postbuf, dict_t *xdata)
-{
-        afr_local_t *   local = NULL;
-        afr_private_t * priv  = NULL;
-        int child_index = (long) cookie;
-        int call_count  = -1;
-        int need_unwind = 0;
-        int read_child  = 0;
-
-        local = frame->local;
-        priv  = this->private;
-
-        read_child = afr_inode_get_read_ctx (this, local->fd->inode, NULL);
-
-        LOCK (&frame->lock);
-        {
-                if (child_index == read_child) {
-                        local->read_child_returned = _gf_true;
-                }
-
-                __inode_write_fop_cbk (frame, child_index, read_child, this,
-                                       &op_ret, &op_errno, prebuf, postbuf,
-                                       xdata);
-
-                if ((local->success_count >= priv->wait_count)
-                    && local->read_child_returned) {
-                        need_unwind = 1;
-                }
-        }
-        UNLOCK (&frame->lock);
-
-        if (need_unwind)
-                local->transaction.unwind (frame, this);
-
-        call_count = afr_frame_return (frame);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-        }
-
-        return 0;
-}
-
-static int
-afr_fallocate_wind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *local = NULL;
-        afr_private_t *priv = NULL;
-        int call_count = -1;
-        int i = 0;
-
-        local = frame->local;
-        priv = this->private;
-
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-                return 0;
-        }
-
-        local->call_count = call_count;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
-                        STACK_WIND_COOKIE (frame, afr_fallocate_wind_cbk,
-                                           (void *) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->fallocate,
-                                           local->fd,
-                                           local->cont.fallocate.mode,
-                                           local->cont.fallocate.offset,
-                                           local->cont.fallocate.len,
-                                           NULL);
-
-                        if (!--call_count)
-                                break;
-                }
-        }
-
-        return 0;
-}
-
-static int
-afr_fallocate_done (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *local = NULL;
-
-        local = frame->local;
-
-        local->transaction.unwind (frame, this);
-
-        AFR_STACK_DESTROY (frame);
-
-        return 0;
-}
-
-static int
-afr_do_fallocate (call_frame_t *frame, xlator_t *this)
-{
-        call_frame_t * transaction_frame = NULL;
-        afr_local_t *  local             = NULL;
-        int op_ret   = -1;
-        int op_errno = 0;
-
-        local = frame->local;
-
-        transaction_frame = copy_frame (frame);
-        if (!transaction_frame) {
-                goto out;
-        }
-
-        transaction_frame->local = local;
-        frame->local = NULL;
-
-        local->op = GF_FOP_FALLOCATE;
-
-        local->transaction.fop    = afr_fallocate_wind;
-        local->transaction.done   = afr_fallocate_done;
-        local->transaction.unwind = afr_fallocate_unwind;
-
-        local->transaction.main_frame = frame;
-
-        local->transaction.start   = local->cont.fallocate.offset;
-        local->transaction.len     = 0;
-
-        /* fallocate can modify the file size */
-        op_ret = afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
-        if (op_ret < 0) {
-            op_errno = -op_ret;
-            goto out;
-        }
-
-        op_ret = 0;
-out:
-        if (op_ret < 0) {
-                if (transaction_frame)
-                        AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (fallocate, frame, op_ret, op_errno, NULL,
-                                  NULL, NULL);
-        }
-
-        return 0;
-}
-
-int
-afr_fallocate (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t mode,
-               off_t offset, size_t len, dict_t *xdata)
-{
-        afr_private_t * priv  = NULL;
-        afr_local_t   * local = NULL;
-        call_frame_t   *transaction_frame = NULL;
-        int ret = -1;
-        int op_errno = 0;
-
-        VALIDATE_OR_GOTO (frame, out);
-        VALIDATE_OR_GOTO (this, out);
-        VALIDATE_OR_GOTO (this->private, out);
-
-        priv = this->private;
-
-        if (afr_is_split_brain (this, fd->inode)) {
-                op_errno = EIO;
-                goto out;
-        }
-        QUORUM_CHECK(fallocate,out);
-
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
-
-        local->cont.fallocate.mode = mode;
-        local->cont.fallocate.offset  = offset;
-        local->cont.fallocate.len = len;
-
-        local->fd = fd_ref (fd);
-
-        afr_open_fd_fix (fd, this);
-
-        afr_do_fallocate (frame, this);
-
-        ret = 0;
-out:
-        if (ret < 0) {
-                if (transaction_frame)
-                        AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (fallocate, frame, -1, op_errno, NULL, NULL, NULL);
-        }
-
-        return 0;
-}
-
-/* }}} */
-
-/* {{{ discard */
-
-static int
-afr_discard_unwind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *   local = NULL;
-        call_frame_t   *main_frame = NULL;
-
-        local = frame->local;
-
-        LOCK (&frame->lock);
-        {
-                if (local->transaction.main_frame)
-                        main_frame = local->transaction.main_frame;
-                local->transaction.main_frame = NULL;
-        }
-        UNLOCK (&frame->lock);
-
-        if (main_frame) {
-                AFR_STACK_UNWIND (discard, main_frame, local->op_ret,
-                                  local->op_errno,
-                                  &local->cont.inode_wfop.prebuf,
-                                  &local->cont.inode_wfop.postbuf,
-                                  NULL);
-        }
-        return 0;
-}
-
-static int
-afr_discard_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                      struct iatt *postbuf, dict_t *xdata)
-{
-        afr_local_t *   local = NULL;
-        afr_private_t * priv  = NULL;
-        int child_index = (long) cookie;
-        int call_count  = -1;
-        int need_unwind = 0;
-        int read_child  = 0;
-
-        local = frame->local;
-        priv  = this->private;
-
-        read_child = afr_inode_get_read_ctx (this, local->fd->inode, NULL);
-
-        LOCK (&frame->lock);
-        {
-                if (child_index == read_child) {
-                        local->read_child_returned = _gf_true;
-                }
-
-                __inode_write_fop_cbk (frame, child_index, read_child, this,
-                                       &op_ret, &op_errno, prebuf, postbuf,
-                                       xdata);
-
-                if ((local->success_count >= priv->wait_count)
-                    && local->read_child_returned) {
-                        need_unwind = 1;
-                }
-        }
-        UNLOCK (&frame->lock);
-
-        if (need_unwind)
-                local->transaction.unwind (frame, this);
-
-        call_count = afr_frame_return (frame);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-        }
-
-        return 0;
-}
-
-static int
-afr_discard_wind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *local = NULL;
-        afr_private_t *priv = NULL;
-        int call_count = -1;
-        int i = 0;
-
-        local = frame->local;
-        priv = this->private;
-
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-                return 0;
-        }
-
-        local->call_count = call_count;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
-                        STACK_WIND_COOKIE (frame, afr_discard_wind_cbk,
-                                           (void *) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->discard,
-                                           local->fd,
-                                           local->cont.discard.offset,
-                                           local->cont.discard.len,
-                                           NULL);
-
-                        if (!--call_count)
-                                break;
-                }
-        }
-
-        return 0;
-}
-
-static int
-afr_discard_done (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *local = NULL;
-
-        local = frame->local;
-
-        local->transaction.unwind (frame, this);
-
-        AFR_STACK_DESTROY (frame);
-
-        return 0;
-}
-
-static int
-afr_do_discard (call_frame_t *frame, xlator_t *this)
-{
-        call_frame_t * transaction_frame = NULL;
-        afr_local_t *  local             = NULL;
-        int op_ret   = -1;
-        int op_errno = 0;
-
-        local = frame->local;
-
-        transaction_frame = copy_frame (frame);
-        if (!transaction_frame) {
-                goto out;
-        }
-
-        transaction_frame->local = local;
-        frame->local = NULL;
-
-        local->op = GF_FOP_DISCARD;
-
-        local->transaction.fop    = afr_discard_wind;
-        local->transaction.done   = afr_discard_done;
-        local->transaction.unwind = afr_discard_unwind;
-
-        local->transaction.main_frame = frame;
-
-        local->transaction.start   = local->cont.discard.offset;
-        local->transaction.len     = 0;
-
-        op_ret = afr_transaction (transaction_frame, this, AFR_DATA_TRANSACTION);
-        if (op_ret < 0) {
-            op_errno = -op_ret;
-            goto out;
-        }
+        afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
 
         op_ret = 0;
 out:
-        if (op_ret < 0) {
-                if (transaction_frame)
-                        AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (discard, frame, op_ret, op_errno, NULL,
-                                  NULL, NULL);
-        }
-
-        return 0;
-}
-
-int
-afr_discard (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
-             size_t len, dict_t *xdata)
-{
-        afr_private_t * priv  = NULL;
-        afr_local_t   * local = NULL;
-        call_frame_t   *transaction_frame = NULL;
-        int ret = -1;
-        int op_errno = 0;
-
-        VALIDATE_OR_GOTO (frame, out);
-        VALIDATE_OR_GOTO (this, out);
-        VALIDATE_OR_GOTO (this->private, out);
-
-        priv = this->private;
-
-        if (afr_is_split_brain (this, fd->inode)) {
-                op_errno = EIO;
-                goto out;
-        }
-        QUORUM_CHECK(discard, out);
-
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
-
-        local->cont.discard.offset  = offset;
-        local->cont.discard.len = len;
-
-        local->fd = fd_ref (fd);
-
-        afr_open_fd_fix (fd, this);
-
-        afr_do_discard(frame, this);
-
-        ret = 0;
-out:
-        if (ret < 0) {
+        if (op_ret == -1) {
                 if (transaction_frame)
                         AFR_STACK_DESTROY (transaction_frame);
-                AFR_STACK_UNWIND (discard, frame, -1, op_errno, NULL, NULL, NULL);
+                AFR_STACK_UNWIND (removexattr, frame, op_ret, op_errno);
         }
 
         return 0;
 }
-
-
-/* {{{ zerofill */
-
-static int
-afr_zerofill_unwind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local            = NULL;
-        call_frame_t    *main_frame       = NULL;
-
-        local = frame->local;
-
-        LOCK (&frame->lock);
-        {
-                if (local->transaction.main_frame) {
-                        main_frame = local->transaction.main_frame;
-                }
-                local->transaction.main_frame = NULL;
-        }
-        UNLOCK (&frame->lock);
-
-        if (main_frame) {
-                AFR_STACK_UNWIND (zerofill, main_frame, local->op_ret,
-                                  local->op_errno,
-                                  &local->cont.zerofill.prebuf,
-                                  &local->cont.zerofill.postbuf,
-                                  NULL);
-        }
-        return 0;
-}
-
-static int
-afr_zerofill_wind_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                     struct iatt *postbuf, dict_t *xdata)
-{
-        afr_local_t       *local             = NULL;
-        afr_private_t     *priv              = NULL;
-        int                child_index       = (long) cookie;
-        int                call_count        = -1;
-        int                need_unwind       = 0;
-        int                read_child        = 0;
-
-        local = frame->local;
-        priv  = this->private;
-
-        read_child = afr_inode_get_read_ctx (this, local->fd->inode, NULL);
-
-        LOCK (&frame->lock);
-        {
-                if (child_index == read_child) {
-                        local->read_child_returned = _gf_true;
-                }
-
-                if (afr_fop_failed (op_ret, op_errno)) {
-                        afr_transaction_fop_failed (frame, this, child_index);
-                }
-
-                if (op_ret != -1) {
-                        if (local->success_count == 0) {
-                                local->op_ret = op_ret;
-                                local->cont.zerofill.prebuf  = *prebuf;
-                                local->cont.zerofill.postbuf = *postbuf;
-                        }
-
-                        if (child_index == read_child) {
-                                local->cont.zerofill.prebuf  = *prebuf;
-                                local->cont.zerofill.postbuf = *postbuf;
-                        }
-
-                        local->success_count++;
-
-                        if ((local->success_count >= priv->wait_count)
-                            && local->read_child_returned) {
-                                need_unwind = 1;
-                        }
-                }
-                local->op_errno = op_errno;
-        }
-        UNLOCK (&frame->lock);
-
-        if (need_unwind) {
-                local->transaction.unwind (frame, this);
-        }
-        call_count = afr_frame_return (frame);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-        }
-
-        return 0;
-}
-
-static int
-afr_zerofill_wind (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t    *local         = NULL;
-        afr_private_t  *priv          = NULL;
-        int             call_count    = -1;
-        int             i             = 0;
-
-        local = frame->local;
-        priv = this->private;
-
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
-
-        if (call_count == 0) {
-                local->transaction.resume (frame, this);
-                return 0;
-        }
-
-        local->call_count = call_count;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i]) {
-                        STACK_WIND_COOKIE (frame, afr_zerofill_wind_cbk,
-                                           (void *) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->zerofill,
-                                           local->fd,
-                                           local->cont.zerofill.offset,
-                                           local->cont.zerofill.len,
-                                           NULL);
-
-                        if (!--call_count)
-                                break;
-                }
-        }
-
-        return 0;
-}
-
-static int
-afr_zerofill_done (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *local = NULL;
-
-        local = frame->local;
-
-        local->transaction.unwind (frame, this);
-
-        AFR_STACK_DESTROY (frame);
-
-        return 0;
-}
-
-static int
-afr_do_zerofill(call_frame_t *frame, xlator_t *this)
-{
-        call_frame_t  *transaction_frame = NULL;
-        afr_local_t   *local             = NULL;
-        int            op_ret            = -1;
-        int            op_errno          = 0;
-
-        local = frame->local;
-
-        transaction_frame = copy_frame (frame);
-        if (!transaction_frame) {
-                goto out;
-        }
-
-        transaction_frame->local = local;
-        frame->local = NULL;
-
-        local->op = GF_FOP_ZEROFILL;
-
-        local->transaction.fop    = afr_zerofill_wind;
-        local->transaction.done   = afr_zerofill_done;
-        local->transaction.unwind = afr_zerofill_unwind;
-
-        local->transaction.main_frame = frame;
-
-        local->transaction.start   = local->cont.zerofill.offset;
-        local->transaction.len     = 0;
-
-        op_ret = afr_transaction (transaction_frame, this,
-                                  AFR_DATA_TRANSACTION);
-        if (op_ret < 0) {
-                op_errno = -op_ret;
-                goto out;
-        }
-
-        op_ret = 0;
-out:
-        if (op_ret < 0) {
-                if (transaction_frame) {
-                        AFR_STACK_DESTROY (transaction_frame);
-                }
-                AFR_STACK_UNWIND (zerofill, frame, op_ret, op_errno, NULL,
-                                  NULL, NULL);
-        }
-
-        return 0;
-}
-
-int
-afr_zerofill (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
-              size_t len, dict_t *xdata)
-{
-        afr_private_t   *priv               = NULL;
-        afr_local_t     *local              = NULL;
-        call_frame_t    *transaction_frame  = NULL;
-        int              ret                = -1;
-        int              op_errno           = 0;
-
-        VALIDATE_OR_GOTO (frame, out);
-        VALIDATE_OR_GOTO (this, out);
-        VALIDATE_OR_GOTO (this->private, out);
-
-        priv = this->private;
-
-        if (afr_is_split_brain (this, fd->inode)) {
-                op_errno = EIO;
-                goto out;
-        }
-        QUORUM_CHECK(zerofill, out);
-
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0) {
-                goto out;
-        }
-        local->cont.zerofill.offset  = offset;
-        local->cont.zerofill.len = len;
-
-        local->fd = fd_ref (fd);
-
-        afr_open_fd_fix (fd, this);
-
-        afr_do_zerofill(frame, this);
-
-        ret = 0;
-out:
-        if (ret < 0) {
-                if (transaction_frame) {
-                        AFR_STACK_DESTROY (transaction_frame);
-                }
-                AFR_STACK_UNWIND (zerofill, frame, -1, op_errno, NULL,
-                                  NULL, NULL);
-        }
-
-        return 0;
-}
-
-/* }}} */
-
-
diff --git a/xlators/cluster/afr/src/afr-inode-write.h b/xlators/cluster/afr/src/afr-inode-write.h
index 8e93ca44a..f9aa7bd36 100644
--- a/xlators/cluster/afr/src/afr-inode-write.h
+++ b/xlators/cluster/afr/src/afr-inode-write.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __INODE_WRITE_H__
@@ -13,70 +22,51 @@
 
 int32_t
 afr_chmod (call_frame_t *frame, xlator_t *this,
-	   loc_t *loc, mode_t mode, dict_t *xdata);
+	   loc_t *loc, mode_t mode);
 
 int32_t
 afr_chown (call_frame_t *frame, xlator_t *this,
-	   loc_t *loc, uid_t uid, gid_t gid, dict_t *xdata);
+	   loc_t *loc, uid_t uid, gid_t gid);
 
 int
 afr_fchown (call_frame_t *frame, xlator_t *this,
-	    fd_t *fd, uid_t uid, gid_t gid, dict_t *xdata);
+	    fd_t *fd, uid_t uid, gid_t gid);
 
 int32_t
 afr_fchmod (call_frame_t *frame, xlator_t *this,
-	    fd_t *fd, mode_t mode, dict_t *xdata);
+	    fd_t *fd, mode_t mode);
 
 int32_t
-afr_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
+afr_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, 
 	    struct iovec *vector, int32_t count, off_t offset,
-            uint32_t flags, struct iobref *iobref, dict_t *xdata);
+            struct iobref *iobref);
 
 int32_t
 afr_truncate (call_frame_t *frame, xlator_t *this,
-	      loc_t *loc, off_t offset, dict_t *xdata);
+	      loc_t *loc, off_t offset);
 
 int32_t
 afr_ftruncate (call_frame_t *frame, xlator_t *this,
-	       fd_t *fd, off_t offset, dict_t *xdata);
+	       fd_t *fd, off_t offset);
 
 int32_t
 afr_utimens (call_frame_t *frame, xlator_t *this,
-	     loc_t *loc, struct timespec tv[2], dict_t *xdata);
+	     loc_t *loc, struct timespec tv[2]);
 
 int
 afr_setattr (call_frame_t *frame, xlator_t *this,
-             loc_t *loc, struct iatt *buf, int32_t valid, dict_t *xdata);
+             loc_t *loc, struct iatt *buf, int32_t valid);
 
 int
 afr_fsetattr (call_frame_t *frame, xlator_t *this,
-              fd_t *fd, struct iatt *buf, int32_t valid, dict_t *xdata);
+              fd_t *fd, struct iatt *buf, int32_t valid);
 
 int32_t
 afr_setxattr (call_frame_t *frame, xlator_t *this,
-              loc_t *loc, dict_t *dict, int32_t flags, dict_t *xdata);
-
-int32_t
-afr_fsetxattr (call_frame_t *frame, xlator_t *this,
-               fd_t *fd, dict_t *dict, int32_t flags, dict_t *xdata);
+	      loc_t *loc, dict_t *dict, int32_t flags);
 
 int32_t
 afr_removexattr (call_frame_t *frame, xlator_t *this,
-		 loc_t *loc, const char *name, dict_t *xdata);
-
-int32_t
-afr_fremovexattr (call_frame_t *frame, xlator_t *this,
-                  fd_t *fd, const char *name, dict_t *xdata);
+		 loc_t *loc, const char *name);
 
-int
-afr_discard (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
-             size_t len, dict_t *xdata);
-
-int
-afr_fallocate (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t mode,
-               off_t offset, size_t len, dict_t *xdata);
-
-int
-afr_zerofill(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
-             size_t len, dict_t *xdata);
 #endif /* __INODE_WRITE_H__ */
diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c
index 060d78f35..c059a6b9e 100644
--- a/xlators/cluster/afr/src/afr-lk-common.c
+++ b/xlators/cluster/afr/src/afr-lk-common.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include "dict.h"
@@ -22,69 +31,8 @@
 #define LOCKED_YES      0x1        /* for DATA, METADATA, ENTRY and higher_path */
 #define LOCKED_LOWER    0x2        /* for lower path */
 
-#define AFR_TRACE_INODELK_IN(frame, this, params ...)           \
-        do {                                                    \
-                afr_private_t *_priv = this->private;           \
-                if (!_priv->inodelk_trace)                      \
-                        break;                                  \
-                afr_trace_inodelk_in (frame, this, params);     \
-        } while (0);
-
-#define AFR_TRACE_INODELK_OUT(frame, this, params ...)          \
-        do {                                                    \
-                afr_private_t *_priv = this->private;           \
-                if (!_priv->inodelk_trace)                      \
-                        break;                                  \
-                afr_trace_inodelk_out (frame, this, params);    \
-        } while (0);
-
-#define AFR_TRACE_ENTRYLK_IN(frame, this, params ...)           \
-        do {                                                    \
-                afr_private_t *_priv = this->private;           \
-                if (!_priv->entrylk_trace)                      \
-                        break;                                  \
-                afr_trace_entrylk_in (frame, this, params);     \
-        } while (0);
-
-#define AFR_TRACE_ENTRYLK_OUT(frame, this, params ...)          \
-        do {                                                    \
-                afr_private_t *_priv = this->private;           \
-                if (!_priv->entrylk_trace)                      \
-                        break;                                  \
-                afr_trace_entrylk_out (frame, this, params);    \
-        } while (0);
-
 int
-afr_entry_lockee_cmp (const void *l1, const void *l2)
-{
-        const afr_entry_lockee_t       *r1 = l1;
-        const afr_entry_lockee_t       *r2 = l2;
-        int                            ret = 0;
-        uuid_t                         gfid1 = {0};
-        uuid_t                         gfid2 = {0};
-
-        loc_gfid ((loc_t*)&r1->loc, gfid1);
-        loc_gfid ((loc_t*)&r2->loc, gfid2);
-        ret = uuid_compare (gfid1, gfid2);
-        /*Entrylks with NULL basename are the 'smallest'*/
-        if (ret == 0) {
-                if (!r1->basename)
-                        return -1;
-                if (!r2->basename)
-                        return 1;
-                ret = strcmp (r1->basename, r2->basename);
-        }
-
-        if (ret <= 0)
-                return -1;
-        else
-                return 1;
-}
-
-int afr_lock_blocking (call_frame_t *frame, xlator_t *this, int child_index);
-
-static int
-afr_copy_locked_nodes (call_frame_t *frame, xlator_t *this);
+afr_lock_blocking (call_frame_t *frame, xlator_t *this, int child_index);
 
 static uint64_t afr_lock_number = 1;
 
@@ -109,13 +57,14 @@ afr_set_lock_number (call_frame_t *frame, xlator_t *this)
 }
 
 void
-afr_set_lk_owner (call_frame_t *frame, xlator_t *this, void *lk_owner)
+afr_set_lk_owner (call_frame_t *frame, xlator_t *this)
 {
-        gf_log (this->name, GF_LOG_TRACE,
-                "Setting lk-owner=%llu",
-                (unsigned long long) (unsigned long)lk_owner);
-
-        set_lk_owner_from_ptr (&frame->root->lk_owner, lk_owner);
+        if (!frame->root->lk_owner) {
+                gf_log (this->name, GF_LOG_TRACE,
+                        "Setting lk-owner=%llu",
+                        (unsigned long long) (unsigned long)frame->root);
+                frame->root->lk_owner = (uint64_t) (unsigned long)frame->root;
+        }
 }
 
 static int
@@ -141,7 +90,8 @@ is_afr_lock_selfheal (afr_local_t *local)
 }
 
 int32_t
-internal_lock_count (call_frame_t *frame, xlator_t *this)
+internal_lock_count (call_frame_t *frame, xlator_t *this,
+                     afr_fd_ctx_t *fd_ctx)
 {
         afr_local_t   *local = NULL;
         afr_private_t *priv  = NULL;
@@ -151,9 +101,17 @@ internal_lock_count (call_frame_t *frame, xlator_t *this)
         local = frame->local;
         priv  = this->private;
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->child_up[i])
-                        ++call_count;
+        if (fd_ctx) {
+                GF_ASSERT (local->fd);
+                for (i = 0; i < priv->child_count; i++) {
+                        if (local->child_up[i] && fd_ctx->opened_on[i])
+                                ++call_count;
+                }
+        } else {
+                for (i = 0; i < priv->child_count; i++) {
+                        if (local->child_up[i])
+                                ++call_count;
+                }
         }
 
         return call_count;
@@ -161,7 +119,7 @@ internal_lock_count (call_frame_t *frame, xlator_t *this)
 
 static void
 afr_print_inodelk (char *str, int size, int cmd,
-                   struct gf_flock *flock, gf_lkowner_t *owner)
+                   struct gf_flock *flock, uint64_t owner)
 {
         char *cmd_str = NULL;
         char *type_str = NULL;
@@ -209,11 +167,11 @@ afr_print_inodelk (char *str, int size, int cmd,
         }
 
         snprintf (str, size, "lock=INODELK, cmd=%s, type=%s, "
-                  "start=%llu, len=%llu, pid=%llu, lk-owner=%s",
+                  "start=%llu, len=%llu, pid=%llu, lk-owner=%llu",
                   cmd_str, type_str, (unsigned long long) flock->l_start,
                   (unsigned long long) flock->l_len,
                   (unsigned long long) flock->l_pid,
-                  lkowner_utoa (owner));
+                  (unsigned long long) owner);
 
 }
 
@@ -229,11 +187,11 @@ afr_print_lockee (char *str, int size, loc_t *loc, fd_t *fd,
 
 void
 afr_print_entrylk (char *str, int size, const char *basename,
-                   gf_lkowner_t *owner)
+                   uint64_t owner)
 {
-        snprintf (str, size, "Basename=%s, lk-owner=%s",
+        snprintf (str, size, "Basename=%s, lk-owner=%llu",
                   basename ? basename : "<nul>",
-                  lkowner_utoa (owner));
+                  (unsigned long long)owner);
 }
 
 static void
@@ -287,20 +245,27 @@ afr_set_lock_call_type (afr_lock_call_type_t lock_call_type,
 }
 
 static void
-afr_trace_inodelk_out (call_frame_t *frame, xlator_t *this,
-                       afr_lock_call_type_t lock_call_type,
+afr_trace_inodelk_out (call_frame_t *frame, afr_lock_call_type_t lock_call_type,
                        afr_lock_op_type_t lk_op_type, struct gf_flock *flock,
                        int op_ret, int op_errno, int32_t child_index)
 {
+        xlator_t            *this     = NULL;
         afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
+        afr_private_t       *priv     = NULL;
 
         char lockee[256];
         char lock_call_type_str[256];
         char verdict[16];
 
+        this     = THIS;
         local    = frame->local;
         int_lock = &local->internal_lock;
+        priv     = this->private;
+
+        if (!priv->inodelk_trace) {
+                return;
+        }
 
         afr_print_lockee (lockee, 256, &local->loc, local->fd, child_index);
 
@@ -309,31 +274,39 @@ afr_trace_inodelk_out (call_frame_t *frame, xlator_t *this,
         afr_print_verdict (op_ret, op_errno, verdict);
 
         gf_log (this->name, GF_LOG_INFO,
-                "[%s %s] [%s] lk-owner=%s Lockee={%s} Number={%llu}",
+                "[%s %s] [%s] Lockee={%s} Number={%llu}",
                 lock_call_type_str,
                 lk_op_type == AFR_LOCK_OP ? "LOCK REPLY" : "UNLOCK REPLY",
-                verdict, lkowner_utoa (&frame->root->lk_owner), lockee,
+                verdict,
+                lockee,
                 (unsigned long long) int_lock->lock_number);
 
 }
 
 static void
-afr_trace_inodelk_in (call_frame_t *frame, xlator_t *this,
-                      afr_lock_call_type_t lock_call_type,
+afr_trace_inodelk_in (call_frame_t *frame, afr_lock_call_type_t lock_call_type,
                       afr_lock_op_type_t lk_op_type, struct gf_flock *flock,
                       int32_t cmd, int32_t child_index)
 {
+        xlator_t            *this     = NULL;
         afr_local_t         *local    = NULL;
         afr_internal_lock_t *int_lock = NULL;
+        afr_private_t       *priv     = NULL;
 
         char lock[256];
         char lockee[256];
         char lock_call_type_str[256];
 
+        this     = THIS;
         local    = frame->local;
         int_lock = &local->internal_lock;
+        priv     = this->private;
+
+        if (!priv->inodelk_trace) {
+                return;
+        }
 
-        afr_print_inodelk (lock, 256, cmd, flock, &frame->root->lk_owner);
+        afr_print_inodelk (lock, 256, cmd, flock, frame->root->lk_owner);
         afr_print_lockee (lockee, 256, &local->loc, local->fd, child_index);
 
         afr_set_lock_call_type (lock_call_type, lock_call_type_str, int_lock);
@@ -348,21 +321,20 @@ afr_trace_inodelk_in (call_frame_t *frame, xlator_t *this,
 }
 
 static void
-afr_trace_entrylk_in (call_frame_t *frame, xlator_t *this,
-                      afr_lock_call_type_t lock_call_type,
+afr_trace_entrylk_in (call_frame_t *frame, afr_lock_call_type_t lock_call_type,
                       afr_lock_op_type_t lk_op_type, const char *basename,
-                      int32_t cookie)
+                      int32_t child_index)
 {
+        xlator_t            *this     = NULL;
         afr_local_t         *local    = NULL;
         afr_internal_lock_t *int_lock = NULL;
         afr_private_t       *priv     = NULL;
-        int                 child_index = 0;
-        int                 lockee_no = 0;
 
         char lock[256];
         char lockee[256];
         char lock_call_type_str[256];
 
+        this     = THIS;
         local    = frame->local;
         int_lock = &local->internal_lock;
         priv     = this->private;
@@ -370,41 +342,36 @@ afr_trace_entrylk_in (call_frame_t *frame, xlator_t *this,
         if (!priv->entrylk_trace) {
                 return;
         }
-        lockee_no = cookie / priv->child_count;
-        child_index = cookie % priv->child_count;
 
-        afr_print_entrylk (lock, 256, basename, &frame->root->lk_owner);
-        afr_print_lockee (lockee, 256, &int_lock->lockee[lockee_no].loc, local->fd,
-                          child_index);
+        afr_print_entrylk (lock, 256, basename, frame->root->lk_owner);
+        afr_print_lockee (lockee, 256, &local->loc, local->fd, child_index);
 
         afr_set_lock_call_type (lock_call_type, lock_call_type_str, int_lock);
 
         gf_log (this->name, GF_LOG_INFO,
-                "[%s %s] Lock={%s} Lockee={%s} Number={%llu}, Cookie={%d}",
+                "[%s %s] Lock={%s} Lockee={%s} Number={%llu}",
                 lock_call_type_str,
                 lk_op_type == AFR_LOCK_OP ? "LOCK REQUEST" : "UNLOCK REQUEST",
                 lock, lockee,
-                (unsigned long long) int_lock->lock_number,
-                cookie);
+                (unsigned long long) int_lock->lock_number);
 }
 
 static void
-afr_trace_entrylk_out (call_frame_t *frame, xlator_t *this,
-                       afr_lock_call_type_t lock_call_type,
-                       afr_lock_op_type_t lk_op_type, const char *basename,
-                       int op_ret, int op_errno, int32_t cookie)
+afr_trace_entrylk_out (call_frame_t *frame, afr_lock_call_type_t lock_call_type,
+                       afr_lock_op_type_t lk_op_type, const char *basename, int op_ret,
+                       int op_errno, int32_t child_index)
 {
+        xlator_t            *this     = NULL;
         afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
         afr_private_t       *priv     = NULL;
-        int                 lockee_no = 0;
-        int                 child_index = 0;
 
         char lock[256];
         char lockee[256];
         char lock_call_type_str[256];
         char verdict[16];
 
+        this     = THIS;
         local    = frame->local;
         int_lock = &local->internal_lock;
         priv     = this->private;
@@ -412,25 +379,20 @@ afr_trace_entrylk_out (call_frame_t *frame, xlator_t *this,
         if (!priv->entrylk_trace) {
                 return;
         }
-        lockee_no = cookie / priv->child_count;
-        child_index = cookie % priv->child_count;
 
-        afr_print_entrylk (lock, 256, basename, &frame->root->lk_owner);
-        afr_print_lockee (lockee, 256, &int_lock->lockee[lockee_no].loc, local->fd,
-                          child_index);
+        afr_print_lockee (lockee, 256, &local->loc, local->fd, child_index);
 
         afr_set_lock_call_type (lock_call_type, lock_call_type_str, int_lock);
 
         afr_print_verdict (op_ret, op_errno, verdict);
 
         gf_log (this->name, GF_LOG_INFO,
-                "[%s %s] [%s] Lock={%s} Lockee={%s} Number={%llu} Cookie={%d}",
+                "[%s %s] [%s] Lock={%s} Lockee={%s} Number={%llu}",
                 lock_call_type_str,
                 lk_op_type == AFR_LOCK_OP ? "LOCK REPLY" : "UNLOCK REPLY",
                 verdict,
                 lock, lockee,
-                (unsigned long long) int_lock->lock_number,
-                cookie);
+                (unsigned long long) int_lock->lock_number);
 
 }
 
@@ -483,47 +445,6 @@ is_afr_lock_transaction (afr_local_t *local)
         return ret;
 }
 
-int
-afr_init_entry_lockee (afr_entry_lockee_t *lockee, afr_local_t *local,
-                       loc_t *loc, char *basename, int child_count)
-{
-        int     ret     = -1;
-
-        loc_copy (&lockee->loc, loc);
-        lockee->basename        = (basename)? gf_strdup (basename): NULL;
-        if (basename && !lockee->basename)
-                goto out;
-
-        lockee->locked_count    = 0;
-        lockee->locked_nodes    = GF_CALLOC (child_count,
-                                             sizeof (*lockee->locked_nodes),
-                                             gf_afr_mt_afr_node_character);
-
-        if (!lockee->locked_nodes)
-                goto out;
-
-        ret = 0;
-out:
-        return ret;
-
-}
-
-void
-afr_entry_lockee_cleanup (afr_internal_lock_t *int_lock)
-{
-        int     i   = 0;
-
-        for (i = 0; i < int_lock->lockee_count; i++) {
-                loc_wipe (&int_lock->lockee[i].loc);
-                if (int_lock->lockee[i].basename)
-                        GF_FREE (int_lock->lockee[i].basename);
-                if (int_lock->lockee[i].locked_nodes)
-                       GF_FREE (int_lock->lockee[i].locked_nodes);
-        }
-
-        return;
-}
-
 static int
 initialize_entrylk_variables (call_frame_t *frame, xlator_t *this)
 {
@@ -541,13 +462,8 @@ initialize_entrylk_variables (call_frame_t *frame, xlator_t *this)
         int_lock->lock_op_ret        = -1;
         int_lock->lock_op_errno      = 0;
 
-        for (i = 0; i < AFR_LOCKEE_COUNT_MAX; i++) {
-                if (!int_lock->lockee[i].locked_nodes)
-                        break;
-                int_lock->lockee[i].locked_count = 0;
-                memset (int_lock->lockee[i].locked_nodes, 0,
-                        sizeof (*int_lock->lockee[i].locked_nodes) *
-                        priv->child_count);
+        for (i = 0; i < priv->child_count; i++) {
+                int_lock->entry_locked_nodes[i] = 0;
         }
 
         return 0;
@@ -559,23 +475,19 @@ initialize_inodelk_variables (call_frame_t *frame, xlator_t *this)
         afr_local_t         *local    = NULL;
         afr_internal_lock_t *int_lock = NULL;
         afr_private_t       *priv     = NULL;
-        afr_inodelk_t       *inodelk  = NULL;
+        int i = 0;
 
         priv     = this->private;
         local    = frame->local;
         int_lock = &local->internal_lock;
 
-        inodelk = afr_get_inodelk (int_lock, int_lock->domain);
-
-        inodelk->lock_count    = 0;
-        int_lock->lk_attempted_count = 0;
-        int_lock->lock_op_ret   = -1;
-        int_lock->lock_op_errno = 0;
+        int_lock->inodelk_lock_count = 0;
+        int_lock->lock_op_ret        = -1;
+        int_lock->lock_op_errno      = 0;
 
-        memset (inodelk->locked_nodes, 0,
-                sizeof (*inodelk->locked_nodes) * priv->child_count);
-        memset (int_lock->locked_nodes, 0,
-                sizeof (*int_lock->locked_nodes) * priv->child_count);
+        for (i = 0; i < priv->child_count; i++) {
+                int_lock->inode_locked_nodes[i] = 0;
+        }
 
         return 0;
 }
@@ -585,7 +497,7 @@ lower_path (loc_t *l1, const char *b1, loc_t *l2, const char *b2)
 {
         int ret = 0;
 
-        ret = uuid_compare (l1->inode->gfid, l2->inode->gfid);
+        ret = strcmp (l1->path, l2->path);
 
         if (ret == 0)
                 ret = strcmp (b1, b2);
@@ -597,18 +509,6 @@ lower_path (loc_t *l1, const char *b1, loc_t *l2, const char *b2)
 }
 
 int
-afr_lockee_locked_nodes_count (afr_internal_lock_t *int_lock)
-{
-        int call_count  = 0;
-        int i           = 0;
-
-        for (i = 0; i < int_lock->lockee_count; i++)
-                call_count += int_lock->lockee[i].locked_count;
-
-        return call_count;
-}
-
-int
 afr_locked_nodes_count (unsigned char *locked_nodes, int child_count)
 
 {
@@ -626,7 +526,7 @@ afr_locked_nodes_count (unsigned char *locked_nodes, int child_count)
 /* FIXME: What if UNLOCK fails */
 static int32_t
 afr_unlock_common_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                       int32_t op_ret, int32_t op_errno)
 {
         afr_local_t         *local    = NULL;
         afr_internal_lock_t *int_lock = NULL;
@@ -652,37 +552,23 @@ afr_unlock_common_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 static int32_t
 afr_unlock_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                        int32_t op_ret, int32_t op_errno)
 {
-        afr_local_t         *local = NULL;
-        afr_internal_lock_t *int_lock = NULL;
-        afr_inodelk_t       *inodelk = NULL;
-        int32_t             child_index = (long)cookie;
-        afr_private_t       *priv = NULL;
+        afr_local_t *local = NULL;
 
         local = frame->local;
-        int_lock = &local->internal_lock;
 
-        AFR_TRACE_INODELK_OUT (frame, this, AFR_INODELK_TRANSACTION,
+        afr_trace_inodelk_out (frame, AFR_INODELK_TRANSACTION,
                                AFR_UNLOCK_OP, NULL, op_ret,
-                               op_errno, child_index);
-
-        priv = this->private;
+                               op_errno, (long) cookie);
 
         if (op_ret < 0 && op_errno != ENOTCONN && op_errno != EBADFD) {
-                gf_log (this->name, GF_LOG_INFO, "%s: unlock failed on subvolume %s "
-                        "with lock owner %s", local->loc.path,
-                        priv->children[child_index]->name,
-                        lkowner_utoa (&frame->root->lk_owner));
+                gf_log (this->name, GF_LOG_ERROR,
+                        "%s: unlock failed %s",
+                        local->loc.path, strerror (op_errno));
         }
 
-
-        inodelk = afr_get_inodelk (int_lock, int_lock->domain);
-        inodelk->locked_nodes[child_index] &= LOCKED_NO;
-        if (local->transaction.eager_lock)
-                local->transaction.eager_lock[child_index] = 0;
-
-        afr_unlock_common_cbk (frame, cookie, this, op_ret, op_errno, xdata);
+        afr_unlock_common_cbk (frame, cookie, this, op_ret, op_errno);
 
         return 0;
 
@@ -692,30 +578,21 @@ static int
 afr_unlock_inodelk (call_frame_t *frame, xlator_t *this)
 {
         afr_internal_lock_t *int_lock = NULL;
-        afr_inodelk_t       *inodelk  = NULL;
         afr_local_t         *local    = NULL;
         afr_private_t       *priv     = NULL;
         struct gf_flock flock = {0,};
-        struct gf_flock full_flock = {0,};
-        struct gf_flock *flock_use = NULL;
         int call_count = 0;
         int i = 0;
-        int piggyback = 0;
-        afr_fd_ctx_t        *fd_ctx      = NULL;
-
 
         local    = frame->local;
         int_lock = &local->internal_lock;
         priv     = this->private;
 
-        inodelk = afr_get_inodelk (int_lock, int_lock->domain);
-
-        flock.l_start = inodelk->flock.l_start;
-        flock.l_len   = inodelk->flock.l_len;
+        flock.l_start = int_lock->lk_flock.l_start;
+        flock.l_len   = int_lock->lk_flock.l_len;
         flock.l_type  = F_UNLCK;
 
-        full_flock.l_type = F_UNLCK;
-        call_count = afr_locked_nodes_count (inodelk->locked_nodes,
+        call_count = afr_locked_nodes_count (int_lock->inode_locked_nodes,
                                              priv->child_count);
 
         int_lock->lk_call_count = call_count;
@@ -727,107 +604,55 @@ afr_unlock_inodelk (call_frame_t *frame, xlator_t *this)
                 goto out;
         }
 
-        if (local->fd)
-                fd_ctx = afr_fd_ctx_get (local->fd, this);
-
         for (i = 0; i < priv->child_count; i++) {
-                if ((inodelk->locked_nodes[i] & LOCKED_YES) != LOCKED_YES)
-                        continue;
-
-                if (local->fd) {
-                        flock_use = &flock;
-                        if (!local->transaction.eager_lock[i]) {
-                                goto wind;
-                        }
-
-                        piggyback = 0;
-
-                        LOCK (&local->fd->lock);
-                        {
-                                if (fd_ctx->lock_piggyback[i]) {
-                                        fd_ctx->lock_piggyback[i]--;
-                                        piggyback = 1;
-                                } else {
-                                        fd_ctx->lock_acquired[i]--;
-                                }
-                        }
-                        UNLOCK (&local->fd->lock);
+                if (int_lock->inode_locked_nodes[i] & LOCKED_YES) {
+                        if (local->fd) {
+                                afr_trace_inodelk_in (frame, AFR_INODELK_TRANSACTION,
+                                                      AFR_UNLOCK_OP, &flock, F_SETLK, i);
+
+                                STACK_WIND_COOKIE (frame, afr_unlock_inodelk_cbk,
+                                                   (void *) (long)i,
+                                                   priv->children[i],
+                                                   priv->children[i]->fops->finodelk,
+                                                   this->name, local->fd,
+                                                   F_SETLK, &flock);
 
-                        if (piggyback) {
-                                afr_unlock_inodelk_cbk (frame, (void *) (long) i,
-                                                        this, 1, 0, NULL);
                                 if (!--call_count)
                                         break;
-                                continue;
-                        }
 
-                        flock_use = &full_flock;
-                wind:
-                        AFR_TRACE_INODELK_IN (frame, this,
-                                              AFR_INODELK_TRANSACTION,
-                                              AFR_UNLOCK_OP, flock_use, F_SETLK,
-                                              i);
-
-                        STACK_WIND_COOKIE (frame, afr_unlock_inodelk_cbk,
-                                           (void *) (long)i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->finodelk,
-                                           int_lock->domain, local->fd,
-                                           F_SETLK, flock_use, NULL);
+                        } else {
+                                afr_trace_inodelk_in (frame, AFR_INODELK_TRANSACTION,
+                                                      AFR_UNLOCK_OP, &flock, F_SETLK, i);
 
-                        if (!--call_count)
-                                break;
+                                STACK_WIND_COOKIE (frame, afr_unlock_inodelk_cbk,
+                                                   (void *) (long)i,
+                                                   priv->children[i],
+                                                   priv->children[i]->fops->inodelk,
+                                                   this->name, &local->loc,
+                                                   F_SETLK, &flock);
 
-                } else {
-                        AFR_TRACE_INODELK_IN (frame, this,
-                                              AFR_INODELK_TRANSACTION,
-                                              AFR_UNLOCK_OP, &flock, F_SETLK, i);
+                                if (!--call_count)
+                                        break;
 
-                        STACK_WIND_COOKIE (frame, afr_unlock_inodelk_cbk,
-                                           (void *) (long)i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->inodelk,
-                                           int_lock->domain, &local->loc,
-                                           F_SETLK, &flock, NULL);
+                        }
 
-                        if (!--call_count)
-                                break;
                 }
+
         }
+
 out:
         return 0;
 }
 
 static int32_t
 afr_unlock_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                        int32_t op_ret, int32_t op_errno)
 {
-        afr_local_t         *local = NULL;
-        afr_private_t       *priv  = NULL;
-        afr_internal_lock_t *int_lock = NULL;
-        int32_t             child_index = 0;
-        int                 lockee_no   = 0;
-
-        priv = this->private;
-        lockee_no = (int)((long) cookie) / priv->child_count;
-        child_index = (int) ((long) cookie) % priv->child_count;
-
-        local = frame->local;
-        int_lock = &local->internal_lock;
-
-        AFR_TRACE_ENTRYLK_OUT (frame, this, AFR_ENTRYLK_TRANSACTION,
-                               AFR_UNLOCK_OP,
-                               int_lock->lockee[lockee_no].basename, op_ret,
-                               op_errno, (int) ((long)cookie));
-
-        if (op_ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: unlock failed on %d, reason: %s",
-                        local->loc.path, child_index, strerror (op_errno));
-        }
+        afr_trace_entrylk_out (frame, AFR_ENTRYLK_TRANSACTION,
+                               AFR_UNLOCK_OP, NULL, op_ret,
+                               op_errno, (long) cookie);
 
-        int_lock->lockee[lockee_no].locked_nodes[child_index] &= LOCKED_NO;
-        afr_unlock_common_cbk (frame, cookie, this, op_ret, op_errno, NULL);
+        afr_unlock_common_cbk (frame, cookie, this, op_ret, op_errno);
 
         return 0;
 }
@@ -835,22 +660,24 @@ afr_unlock_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 static int
 afr_unlock_entrylk (call_frame_t *frame, xlator_t *this)
 {
-        afr_internal_lock_t     *int_lock       = NULL;
-        afr_local_t             *local          = NULL;
-        afr_private_t           *priv           = NULL;
-        int                     call_count      = 0;
-        int                     index           = 0;
-        int                     lockee_no       = 0;
-        int                     copies          = 0;
-        int                     i               = -1;
+        afr_internal_lock_t *int_lock = NULL;
+        afr_local_t         *local    = NULL;
+        afr_private_t       *priv     = NULL;
+        const char          *basename = NULL;
+        loc_t               *loc      = NULL;
+        int call_count = 0;
+        int i = -1;
 
         local    = frame->local;
         int_lock = &local->internal_lock;
         priv     = this->private;
-        copies   = priv->child_count;
 
-        call_count = afr_lockee_locked_nodes_count (int_lock);
+        basename = int_lock->lk_basename;
+        if (int_lock->lk_loc)
+                loc = int_lock->lk_loc;
 
+        call_count = afr_locked_nodes_count (int_lock->entry_locked_nodes,
+                                             priv->child_count);
         int_lock->lk_call_count = call_count;
 
         if (!call_count){
@@ -860,23 +687,18 @@ afr_unlock_entrylk (call_frame_t *frame, xlator_t *this)
                 goto out;
         }
 
-        for (i = 0; i < int_lock->lockee_count * priv->child_count; i++) {
-                lockee_no = i / copies;
-                index     = i % copies;
-                if (int_lock->lockee[lockee_no].locked_nodes[index] & LOCKED_YES) {
-                        AFR_TRACE_ENTRYLK_IN (frame, this, AFR_ENTRYLK_NB_TRANSACTION,
-                                              AFR_UNLOCK_OP,
-                                              int_lock->lockee[lockee_no].basename,
-                                              i);
+        for (i = 0; i < priv->child_count; i++) {
+                if (int_lock->entry_locked_nodes[i] & LOCKED_YES) {
+                        afr_trace_entrylk_in (frame, AFR_ENTRYLK_NB_TRANSACTION,
+                                              AFR_UNLOCK_OP, basename, i);
 
                         STACK_WIND_COOKIE (frame, afr_unlock_entrylk_cbk,
                                            (void *) (long) i,
-                                           priv->children[index],
-                                           priv->children[index]->fops->entrylk,
-                                           int_lock->domain,
-                                           &int_lock->lockee[lockee_no].loc,
-                                           int_lock->lockee[lockee_no].basename,
-                                           ENTRYLK_UNLOCK, ENTRYLK_WRLCK, NULL);
+                                           priv->children[i],
+                                           priv->children[i]->fops->entrylk,
+                                           this->name,
+                                           loc, basename,
+                                           ENTRYLK_UNLOCK, ENTRYLK_WRLCK);
 
                         if (!--call_count)
                                 break;
@@ -890,21 +712,17 @@ out:
 
 static int32_t
 afr_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-              int32_t op_ret, int32_t op_errno, dict_t *xdata)
+              int32_t op_ret, int32_t op_errno)
 {
-        afr_internal_lock_t     *int_lock       = NULL;
-        afr_local_t             *local          = NULL;
-        afr_private_t           *priv           = NULL;
-        int                     cky             = (long) cookie;
-        int                     child_index     = 0;
-        int                     lockee_no       = 0;
+        afr_internal_lock_t *int_lock = NULL;
+        afr_local_t         *local    = NULL;
+        afr_private_t       *priv     = NULL;
+        int done = 0;
+        int child_index = (long) cookie;
 
-        priv     = this->private;
         local    = frame->local;
         int_lock = &local->internal_lock;
-
-        child_index = ((int)cky) % priv->child_count;
-        lockee_no   = ((int)cky) / priv->child_count;
+        priv     = this->private;
 
         LOCK (&frame->lock);
         {
@@ -916,13 +734,13 @@ afr_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         "please load features/locks xlator on server");
                                 local->op_ret = op_ret;
                                 int_lock->lock_op_ret = op_ret;
+                                done = 1;
                         }
 
+                        local->child_up[child_index] = 0;
                         local->op_errno              = op_errno;
                         int_lock->lock_op_errno      = op_errno;
                 }
-
-		int_lock->lk_attempted_count++;
         }
         UNLOCK (&frame->lock);
 
@@ -931,17 +749,11 @@ afr_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 afr_unlock (frame, this);
         } else {
                 if (op_ret == 0) {
-                        if (local->transaction.type == AFR_ENTRY_TRANSACTION ||
-                            local->transaction.type == AFR_ENTRY_RENAME_TRANSACTION) {
-                                int_lock->lockee[lockee_no].locked_nodes[child_index] |= LOCKED_YES;
-                                int_lock->lockee[lockee_no].locked_count++;
-                                int_lock->entrylk_lock_count++;
-                        } else {
-                                int_lock->locked_nodes[child_index] |= LOCKED_YES;
-                                int_lock->lock_count++;
-                        }
+                        int_lock->locked_nodes[child_index]
+                                |= LOCKED_YES;
+                        int_lock->lock_count++;
                 }
-                afr_lock_blocking (frame, this, cky + 1);
+                afr_lock_blocking (frame, this, child_index + 1);
         }
 
         return 0;
@@ -949,26 +761,104 @@ afr_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 static int32_t
 afr_blocking_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                          int32_t op_ret, int32_t op_errno)
 {
-        AFR_TRACE_INODELK_OUT (frame, this, AFR_INODELK_TRANSACTION,
+        afr_trace_inodelk_out (frame, AFR_INODELK_TRANSACTION,
                                AFR_LOCK_OP, NULL, op_ret,
                                op_errno, (long) cookie);
 
-        afr_lock_cbk (frame, cookie, this, op_ret, op_errno, xdata);
+        afr_lock_cbk (frame, cookie, this, op_ret, op_errno);
         return 0;
 
 }
 
 static int32_t
+afr_lock_lower_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                    int32_t op_ret, int32_t op_errno)
+{
+        afr_internal_lock_t *int_lock    = NULL;
+        afr_private_t       *priv        = NULL;
+        afr_local_t         *local       = NULL;
+        loc_t               *lower       = NULL;
+        loc_t               *higher      = NULL;
+        const char          *lower_name  = NULL;
+        const char          *higher_name = NULL;
+        int child_index = (long) cookie;
+
+        priv     = this->private;
+        local    = frame->local;
+        int_lock = &local->internal_lock;
+
+        LOCK (&frame->lock);
+        {
+                if (op_ret == -1) {
+                        if (op_errno == ENOSYS) {
+                                /* return ENOTSUP */
+
+                                gf_log (this->name, GF_LOG_ERROR,
+                                        "subvolume does not support locking. "
+                                        "please load features/locks xlator on server");
+
+                                local->op_ret   = op_ret;
+                        }
+
+                        local->child_up[child_index] = 0;
+                        local->op_errno = op_errno;
+                }
+        }
+        UNLOCK (&frame->lock);
+
+        if (op_ret != 0) {
+                afr_unlock (frame, this);
+                goto out;
+        } else {
+                int_lock->lower_locked_nodes[child_index] |= LOCKED_LOWER;
+                int_lock->lock_count++;
+        }
+
+        /* The lower path has been locked. Now lock the higher path */
+
+        lower = lower_path (&local->transaction.parent_loc,
+                            local->transaction.basename,
+                            &local->transaction.new_parent_loc,
+                            local->transaction.new_basename);
+
+        lower_name = (lower == &local->transaction.parent_loc ?
+                      local->transaction.basename :
+                      local->transaction.new_basename);
+
+        higher = (lower == &local->transaction.parent_loc ?
+                  &local->transaction.new_parent_loc :
+                  &local->transaction.parent_loc);
+
+        higher_name = (higher == &local->transaction.parent_loc ?
+                       local->transaction.basename :
+                       local->transaction.new_basename);
+
+        afr_trace_entrylk_in (frame, AFR_ENTRYLK_TRANSACTION,
+                              AFR_LOCK_OP, higher_name, child_index);
+
+
+        STACK_WIND_COOKIE (frame, afr_lock_cbk,
+                           (void *) (long) child_index,
+                           priv->children[child_index],
+                           priv->children[child_index]->fops->entrylk,
+                           this->name, higher, higher_name,
+                           ENTRYLK_LOCK, ENTRYLK_WRLCK);
+
+out:
+        return 0;
+}
+
+static int32_t
 afr_blocking_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                          int32_t op_ret, int32_t op_errno)
 {
-        AFR_TRACE_ENTRYLK_OUT (frame, this, AFR_ENTRYLK_TRANSACTION,
+        afr_trace_entrylk_out (frame, AFR_ENTRYLK_TRANSACTION,
                                AFR_LOCK_OP, NULL, op_ret,
                                op_errno, (long)cookie);
 
-        afr_lock_cbk (frame, cookie, this, op_ret, op_errno, xdata);
+        afr_lock_cbk (frame, cookie, this, op_ret, op_errno);
         return 0;
 }
 
@@ -976,7 +866,6 @@ static int
 afr_copy_locked_nodes (call_frame_t *frame, xlator_t *this)
 {
         afr_internal_lock_t *int_lock = NULL;
-        afr_inodelk_t       *inodelk  = NULL;
         afr_local_t         *local    = NULL;
         afr_private_t       *priv     = NULL;
 
@@ -987,16 +876,18 @@ afr_copy_locked_nodes (call_frame_t *frame, xlator_t *this)
         switch (local->transaction.type) {
         case AFR_DATA_TRANSACTION:
         case AFR_METADATA_TRANSACTION:
-                inodelk = afr_get_inodelk (int_lock, int_lock->domain);
-                memcpy (inodelk->locked_nodes, int_lock->locked_nodes,
-                        sizeof (*inodelk->locked_nodes) * priv->child_count);
-                inodelk->lock_count = int_lock->lock_count;
+                memcpy (int_lock->inode_locked_nodes,
+                        int_lock->locked_nodes,
+                        priv->child_count);
+                int_lock->inodelk_lock_count = int_lock->lock_count;
                 break;
 
         case AFR_ENTRY_RENAME_TRANSACTION:
         case AFR_ENTRY_TRANSACTION:
-                /*entrylk_count is being used in both non-blocking and blocking
-                 * modes */
+                memcpy (int_lock->entry_locked_nodes,
+                        int_lock->locked_nodes,
+                        priv->child_count);
+                int_lock->entrylk_lock_count = int_lock->lock_count;
                 break;
         }
 
@@ -1004,67 +895,28 @@ afr_copy_locked_nodes (call_frame_t *frame, xlator_t *this)
 
 }
 
-static inline gf_boolean_t
-afr_is_entrylk (afr_internal_lock_t *int_lock,
-                afr_transaction_type trans_type)
-{
-        gf_boolean_t is_entrylk = _gf_false;
-
-        if ((int_lock->transaction_lk_type == AFR_SELFHEAL_LK) &&
-            int_lock->selfheal_lk_type == AFR_ENTRY_SELF_HEAL_LK) {
-
-                is_entrylk = _gf_true;
-
-        } else if ((int_lock->transaction_lk_type == AFR_TRANSACTION_LK) &&
-                 (trans_type == AFR_ENTRY_TRANSACTION ||
-                  trans_type == AFR_ENTRY_RENAME_TRANSACTION)) {
-
-                is_entrylk = _gf_true;
-
-        } else {
-                is_entrylk = _gf_false;
-        }
-
-        return is_entrylk;
-}
-
-static gf_boolean_t
-_is_lock_wind_needed (afr_local_t *local, int child_index)
-{
-        if (!local->child_up[child_index])
-                return _gf_false;
-
-        return _gf_true;
-}
-
 int
-afr_lock_blocking (call_frame_t *frame, xlator_t *this, int cookie)
+afr_lock_blocking (call_frame_t *frame, xlator_t *this, int child_index)
 {
         afr_internal_lock_t *int_lock    = NULL;
-        afr_inodelk_t       *inodelk     = NULL;
         afr_local_t         *local       = NULL;
         afr_private_t       *priv        = NULL;
+        afr_fd_ctx_t        *fd_ctx      = NULL;
+        loc_t               *lower       = NULL;
+        loc_t               *higher      = NULL;
+        const char          *lower_name  = NULL;
+        const char          *higher_name = NULL;
         struct gf_flock flock = {0,};
         uint64_t ctx = 0;
         int ret = 0;
-        int child_index = 0;
-        int lockee_no   = 0;
-        gf_boolean_t is_entrylk = _gf_false;
-
-        local         = frame->local;
-        int_lock      = &local->internal_lock;
-        priv          = this->private;
-        child_index   = cookie % priv->child_count;
-        lockee_no     = cookie / priv->child_count;
-        is_entrylk    = afr_is_entrylk (int_lock, local->transaction.type);
 
+        local    = frame->local;
+        int_lock = &local->internal_lock;
+        priv     = this->private;
 
-        if (!is_entrylk) {
-                inodelk = afr_get_inodelk (int_lock, int_lock->domain);
-                flock.l_start = inodelk->flock.l_start;
-                flock.l_len   = inodelk->flock.l_len;
-                flock.l_type  = inodelk->flock.l_type;
-        }
+        flock.l_start = int_lock->lk_flock.l_start;
+        flock.l_len   = int_lock->lk_flock.l_len;
+        flock.l_type  = int_lock->lk_flock.l_type;
 
         if (local->fd) {
                 ret = fd_ctx_get (local->fd, this, &ctx);
@@ -1083,26 +935,46 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int cookie)
 
                         return 0;
                 }
+
+                fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                /* skip over children that or down
+                   or don't have the fd open */
+
+                while ((child_index < priv->child_count)
+                       && (!local->child_up[child_index]
+                           || !fd_ctx->opened_on[child_index]))
+
+                        child_index++;
+        } else {
+                /* skip over children that are down */
+                while ((child_index < priv->child_count)
+                       && !local->child_up[child_index])
+                        child_index++;
         }
 
-        if (int_lock->lk_expected_count == int_lock->lk_attempted_count) {
-                if ((is_entrylk && int_lock->entrylk_lock_count == 0) ||
-                    (!is_entrylk && int_lock->lock_count == 0)) {
-                        gf_log (this->name, GF_LOG_INFO,
-                                "unable to lock on even one child");
+        if ((child_index == priv->child_count) &&
+            int_lock->lock_count == 0) {
 
-                        local->op_ret           = -1;
-                        int_lock->lock_op_ret   = -1;
+                gf_log (this->name, GF_LOG_INFO,
+                        "unable to lock on even one child");
 
-                        afr_copy_locked_nodes (frame, this);
+                local->op_ret           = -1;
+                int_lock->lock_op_ret   = -1;
 
-                        afr_unlock(frame, this);
+                afr_copy_locked_nodes (frame, this);
+
+                afr_unlock(frame, this);
+
+                return 0;
 
-                        return 0;
-                }
         }
 
-        if (int_lock->lk_expected_count == int_lock->lk_attempted_count) {
+        if ((child_index == priv->child_count)
+            || (int_lock->lock_count ==
+                afr_up_children_count (priv->child_count,
+                                       local->child_up))) {
+
                 /* we're done locking */
 
                 gf_log (this->name, GF_LOG_DEBUG,
@@ -1115,18 +987,12 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int cookie)
                 return 0;
         }
 
-        if (!_is_lock_wind_needed (local, child_index)) {
-                afr_lock_blocking (frame, this, cookie + 1);
-                return 0;
-        }
-
         switch (local->transaction.type) {
         case AFR_DATA_TRANSACTION:
         case AFR_METADATA_TRANSACTION:
 
                 if (local->fd) {
-                        AFR_TRACE_INODELK_IN (frame, this,
-                                              AFR_INODELK_TRANSACTION,
+                        afr_trace_inodelk_in (frame, AFR_INODELK_TRANSACTION,
                                               AFR_LOCK_OP, &flock, F_SETLKW,
                                               child_index);
 
@@ -1134,12 +1000,11 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int cookie)
                                            (void *) (long) child_index,
                                            priv->children[child_index],
                                            priv->children[child_index]->fops->finodelk,
-                                           int_lock->domain, local->fd,
-                                           F_SETLKW, &flock, NULL);
+                                           this->name, local->fd,
+                                           F_SETLKW, &flock);
 
                 } else {
-                        AFR_TRACE_INODELK_IN (frame, this,
-                                              AFR_INODELK_TRANSACTION,
+                        afr_trace_inodelk_in (frame, AFR_INODELK_TRANSACTION,
                                               AFR_LOCK_OP, &flock, F_SETLKW,
                                               child_index);
 
@@ -1147,50 +1012,79 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int cookie)
                                            (void *) (long) child_index,
                                            priv->children[child_index],
                                            priv->children[child_index]->fops->inodelk,
-                                           int_lock->domain, &local->loc,
-                                           F_SETLKW, &flock, NULL);
+                                           this->name, &local->loc,
+                                           F_SETLKW, &flock);
                 }
 
                 break;
 
         case AFR_ENTRY_RENAME_TRANSACTION:
-        case AFR_ENTRY_TRANSACTION:
-                /*Accounting for child_index increments on 'down'
-                 *and 'fd-less' children */
+        {
+                lower = lower_path (&local->transaction.parent_loc,
+                                    local->transaction.basename,
+                                    &local->transaction.new_parent_loc,
+                                    local->transaction.new_basename);
+
+                lower_name = (lower == &local->transaction.parent_loc ?
+                              local->transaction.basename :
+                              local->transaction.new_basename);
+
+                higher = (lower == &local->transaction.parent_loc ?
+                          &local->transaction.new_parent_loc :
+                          &local->transaction.parent_loc);
+
+                higher_name = (higher == &local->transaction.parent_loc ?
+                               local->transaction.basename :
+                               local->transaction.new_basename);
 
+                afr_trace_entrylk_in (frame, AFR_ENTRYLK_TRANSACTION,
+                                      AFR_LOCK_OP, lower_name, child_index);
+
+
+                STACK_WIND_COOKIE (frame, afr_lock_lower_cbk,
+                                   (void *) (long) child_index,
+                                   priv->children[child_index],
+                                   priv->children[child_index]->fops->entrylk,
+                                   this->name, lower, lower_name,
+                                   ENTRYLK_LOCK, ENTRYLK_WRLCK);
+
+                break;
+        }
+
+        case AFR_ENTRY_TRANSACTION:
                 if (local->fd) {
-                        AFR_TRACE_ENTRYLK_IN (frame, this, AFR_ENTRYLK_TRANSACTION,
-                                              AFR_LOCK_OP,
-                                              int_lock->lockee[lockee_no].basename,
-                                              cookie);
+                        afr_trace_entrylk_in (frame, AFR_ENTRYLK_TRANSACTION,
+                                              AFR_LOCK_OP, local->transaction.basename,
+                                              child_index);
 
                         STACK_WIND_COOKIE (frame, afr_blocking_entrylk_cbk,
-                                           (void *) (long) cookie,
+                                           (void *) (long) child_index,
                                            priv->children[child_index],
                                            priv->children[child_index]->fops->fentrylk,
-                                           int_lock->domain, local->fd,
-                                           int_lock->lockee[lockee_no].basename,
-                                           ENTRYLK_LOCK, ENTRYLK_WRLCK, NULL);
+                                           this->name, local->fd,
+                                           local->transaction.basename,
+                                           ENTRYLK_LOCK, ENTRYLK_WRLCK);
                 } else {
-                        AFR_TRACE_ENTRYLK_IN (frame, this,
-                                              AFR_ENTRYLK_TRANSACTION,
+                        afr_trace_entrylk_in (frame, AFR_ENTRYLK_TRANSACTION,
                                               AFR_LOCK_OP, local->transaction.basename,
                                               child_index);
 
                         STACK_WIND_COOKIE (frame, afr_blocking_entrylk_cbk,
-                                           (void *) (long) cookie,
+                                           (void *) (long) child_index,
                                            priv->children[child_index],
                                            priv->children[child_index]->fops->entrylk,
-                                           int_lock->domain,
-                                           &int_lock->lockee[lockee_no].loc,
-                                           int_lock->lockee[lockee_no].basename,
-                                           ENTRYLK_LOCK, ENTRYLK_WRLCK, NULL);
+                                           this->name,
+                                           &local->transaction.parent_loc,
+                                           local->transaction.basename,
+                                           ENTRYLK_LOCK, ENTRYLK_WRLCK);
                 }
 
                 break;
         }
 
         return 0;
+
+
 }
 
 int32_t
@@ -1199,7 +1093,6 @@ afr_blocking_lock (call_frame_t *frame, xlator_t *this)
         afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
         afr_private_t       *priv     = NULL;
-        int                  up_count = 0;
 
         priv     = this->private;
         local    = frame->local;
@@ -1213,11 +1106,6 @@ afr_blocking_lock (call_frame_t *frame, xlator_t *this)
 
         case AFR_ENTRY_RENAME_TRANSACTION:
         case AFR_ENTRY_TRANSACTION:
-                up_count = afr_up_children_count (local->child_up,
-                                                  priv->child_count);
-                int_lock->lk_call_count = int_lock->lk_expected_count
-                                        = (int_lock->lockee_count *
-                                           up_count);
                 initialize_entrylk_variables (frame, this);
                 break;
         }
@@ -1229,68 +1117,59 @@ afr_blocking_lock (call_frame_t *frame, xlator_t *this)
 
 static int32_t
 afr_nonblocking_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                             int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                             int32_t op_ret, int32_t op_errno)
 {
         afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
+        afr_private_t       *priv     = NULL;
         int call_count          = 0;
         int child_index         = (long) cookie;
-        int copies              = 0;
-        int index               = 0;
-        int lockee_no           = 0;
-        afr_private_t       *priv = NULL;
-
-        priv = this->private;
-
-        copies = priv->child_count;
-        index = child_index % copies;
-        lockee_no = child_index / copies;
 
         local    = frame->local;
         int_lock = &local->internal_lock;
+        priv     = this->private;
 
-        AFR_TRACE_ENTRYLK_OUT (frame, this, AFR_ENTRYLK_TRANSACTION,
-                               AFR_LOCK_OP,
-                               int_lock->lockee[lockee_no].basename, op_ret,
+        afr_trace_entrylk_out (frame, AFR_ENTRYLK_TRANSACTION,
+                               AFR_LOCK_OP, NULL, op_ret,
                                op_errno, (long) cookie);
 
-	LOCK (&frame->lock);
-	{
-		if (op_ret < 0 ) {
-			if (op_errno == ENOSYS) {
-                        /* return ENOTSUP */
-				gf_log (this->name, GF_LOG_ERROR,
-					"subvolume does not support locking. "
-					"please load features/locks xlator on server");
-				local->op_ret         = op_ret;
-				int_lock->lock_op_ret = op_ret;
-
-				int_lock->lock_op_errno      = op_errno;
-				local->op_errno              = op_errno;
-			}
-		} else if (op_ret == 0) {
-			int_lock->lockee[lockee_no].locked_nodes[index] |= \
-				LOCKED_YES;
-			int_lock->lockee[lockee_no].locked_count++;
-			int_lock->entrylk_lock_count++;
-		}
-
+        LOCK (&frame->lock);
+        {
                 call_count = --int_lock->lk_call_count;
         }
         UNLOCK (&frame->lock);
 
+        if (op_ret < 0 ) {
+                if (op_errno == ENOSYS) {
+                        /* return ENOTSUP */
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "subvolume does not support locking. "
+                                "please load features/locks xlator on server");
+                        local->op_ret         = op_ret;
+                        int_lock->lock_op_ret = op_ret;
+
+                        local->child_up[child_index] = 0;
+                        int_lock->lock_op_errno      = op_errno;
+                        local->op_errno              = op_errno;
+                }
+        } else if (op_ret == 0) {
+                int_lock->entry_locked_nodes[child_index]
+                        |= LOCKED_YES;
+                int_lock->entrylk_lock_count++;
+        }
+
         if (call_count == 0) {
                 gf_log (this->name, GF_LOG_TRACE,
                         "Last locking reply received");
-                /* all locks successful. Proceed to call FOP */
+                /* all locks successfull. Proceed to call FOP */
                 if (int_lock->entrylk_lock_count ==
-                                int_lock->lk_expected_count) {
+                    afr_up_children_count (priv->child_count, local->child_up)) {
                         gf_log (this->name, GF_LOG_TRACE,
                                 "All servers locked. Calling the cbk");
                         int_lock->lock_op_ret = 0;
                         int_lock->lock_cbk (frame, this);
                 }
-                /* Not all locks were successful. Unlock and try locking
+                /* Not all locks were successfull. Unlock and try locking
                    again, this time with serially blocking locks */
                 else {
                         gf_log (this->name, GF_LOG_TRACE,
@@ -1307,26 +1186,31 @@ afr_nonblocking_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int
 afr_nonblocking_entrylk (call_frame_t *frame, xlator_t *this)
 {
-        afr_internal_lock_t *int_lock   = NULL;
-        afr_local_t         *local      = NULL;
-        afr_private_t       *priv       = NULL;
-        afr_fd_ctx_t        *fd_ctx     = NULL;
-        int                 copies      = 0;
-        int                 index       = 0;
-        int                 lockee_no   = 0;
-        int32_t             call_count  = 0;
+        afr_internal_lock_t *int_lock = NULL;
+        afr_local_t         *local    = NULL;
+        afr_private_t       *priv     = NULL;
+        afr_fd_ctx_t        *fd_ctx   = NULL;
+        const char          *basename = NULL;
+        loc_t               *loc      = NULL;
+        int32_t call_count = 0;
         int i = 0;
+        uint64_t  ctx = 0;
+        int ret = 0;
 
         local    = frame->local;
         int_lock = &local->internal_lock;
         priv     = this->private;
 
-        copies = priv->child_count;
         initialize_entrylk_variables (frame, this);
 
+        basename = int_lock->lk_basename;
+        if (int_lock->lk_loc)
+                loc = int_lock->lk_loc;
+
         if (local->fd) {
-                fd_ctx = afr_fd_ctx_get (local->fd, this);
-                if (!fd_ctx) {
+                ret = fd_ctx_get (local->fd, this, &ctx);
+
+                if (ret < 0) {
                         gf_log (this->name, GF_LOG_INFO,
                                 "unable to get fd ctx for fd=%p",
                                 local->fd);
@@ -1336,13 +1220,13 @@ afr_nonblocking_entrylk (call_frame_t *frame, xlator_t *this)
                         local->op_errno         = EINVAL;
                         int_lock->lock_op_errno = EINVAL;
 
-			afr_unlock (frame, this);
                         return -1;
                 }
 
-                call_count = int_lock->lockee_count * internal_lock_count (frame, this);
+                fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                call_count = internal_lock_count (frame, this, fd_ctx);
                 int_lock->lk_call_count = call_count;
-                int_lock->lk_expected_count = call_count;
 
                 if (!call_count) {
                         gf_log (this->name, GF_LOG_INFO,
@@ -1353,52 +1237,41 @@ afr_nonblocking_entrylk (call_frame_t *frame, xlator_t *this)
 
                 /* Send non-blocking entrylk calls only on up children
                    and where the fd has been opened */
-                for (i = 0; i < int_lock->lockee_count*priv->child_count; i++) {
-                        index = i%copies;
-                        lockee_no = i/copies;
-                        if (local->child_up[index]) {
-                                AFR_TRACE_ENTRYLK_IN (frame, this, AFR_ENTRYLK_NB_TRANSACTION,
-                                                      AFR_LOCK_OP,
-                                                      int_lock->lockee[lockee_no].basename,
-                                                      i);
+                for (i = 0; i < priv->child_count; i++) {
+                        if (local->child_up[i] && fd_ctx->opened_on[i]) {
+                                afr_trace_entrylk_in (frame, AFR_ENTRYLK_NB_TRANSACTION,
+                                                      AFR_LOCK_OP, basename, i);
 
                                 STACK_WIND_COOKIE (frame, afr_nonblocking_entrylk_cbk,
                                                    (void *) (long) i,
-                                                   priv->children[index],
-                                                   priv->children[index]->fops->fentrylk,
+                                                   priv->children[i],
+                                                   priv->children[i]->fops->fentrylk,
                                                    this->name, local->fd,
-                                                   int_lock->lockee[lockee_no].basename,
-                                                   ENTRYLK_LOCK_NB, ENTRYLK_WRLCK,
-                                                   NULL);
-                                if (!--call_count)
-                                        break;
+                                                   basename,
+                                                   ENTRYLK_LOCK_NB, ENTRYLK_WRLCK);
                         }
                 }
         } else {
-                call_count = int_lock->lockee_count * internal_lock_count (frame, this);
+                GF_ASSERT (loc);
+
+                call_count = internal_lock_count (frame, this, NULL);
                 int_lock->lk_call_count = call_count;
-                int_lock->lk_expected_count = call_count;
 
-                for (i = 0; i < int_lock->lockee_count*priv->child_count; i++) {
-                        index = i%copies;
-                        lockee_no = i/copies;
-                        if (local->child_up[index]) {
-                                AFR_TRACE_ENTRYLK_IN (frame, this, AFR_ENTRYLK_NB_TRANSACTION,
-                                                      AFR_LOCK_OP,
-                                                      int_lock->lockee[lockee_no].basename,
-                                                      i);
+                for (i = 0; i < priv->child_count; i++) {
+                        if (local->child_up[i]) {
+                                afr_trace_entrylk_in (frame, AFR_ENTRYLK_NB_TRANSACTION,
+                                                      AFR_LOCK_OP, basename, i);
 
                                 STACK_WIND_COOKIE (frame, afr_nonblocking_entrylk_cbk,
                                                    (void *) (long) i,
-                                                   priv->children[index],
-                                                   priv->children[index]->fops->entrylk,
-                                                   this->name, &int_lock->lockee[lockee_no].loc,
-                                                   int_lock->lockee[lockee_no].basename,
-                                                   ENTRYLK_LOCK_NB, ENTRYLK_WRLCK,
-                                                   NULL);
+                                                   priv->children[i],
+                                                   priv->children[i]->fops->entrylk,
+                                                   this->name, loc, basename,
+                                                   ENTRYLK_LOCK_NB, ENTRYLK_WRLCK);
 
                                 if (!--call_count)
                                         break;
+
                         }
                 }
         }
@@ -1408,75 +1281,58 @@ out:
 
 int32_t
 afr_nonblocking_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                             int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                             int32_t op_ret, int32_t op_errno)
 {
         afr_internal_lock_t *int_lock = NULL;
-        afr_inodelk_t       *inodelk  = NULL;
         afr_local_t         *local    = NULL;
+        afr_private_t       *priv     = NULL;
         int call_count  = 0;
         int child_index = (long) cookie;
-        afr_fd_ctx_t        *fd_ctx = NULL;
-
 
         local    = frame->local;
         int_lock = &local->internal_lock;
-        inodelk = afr_get_inodelk (int_lock, int_lock->domain);
+        priv     = this->private;
 
-        AFR_TRACE_INODELK_OUT (frame, this, AFR_INODELK_NB_TRANSACTION,
+        afr_trace_inodelk_out (frame, AFR_INODELK_NB_TRANSACTION,
                                AFR_LOCK_OP, NULL, op_ret,
                                op_errno, (long) cookie);
 
-	if (local->fd)
-		fd_ctx = afr_fd_ctx_get (local->fd, this);
-
         LOCK (&frame->lock);
         {
-		if (op_ret < 0) {
-			if (op_errno == ENOSYS) {
-				/* return ENOTSUP */
-				gf_log (this->name, GF_LOG_ERROR,
-					"subvolume does not support locking. "
-					"please load features/locks xlator on "
-					"server");
-				local->op_ret                = op_ret;
-				int_lock->lock_op_ret        = op_ret;
-				int_lock->lock_op_errno      = op_errno;
-				local->op_errno              = op_errno;
-			}
-			if (local->transaction.eager_lock)
-				local->transaction.eager_lock[child_index] = 0;
-		} else {
-			inodelk->locked_nodes[child_index] |= LOCKED_YES;
-			inodelk->lock_count++;
-
-			if (local->transaction.eager_lock &&
-			    local->transaction.eager_lock[child_index] &&
-			    local->fd) {
-				/* piggybacked */
-				if (op_ret == 1) {
-					/* piggybacked */
-				} else if (op_ret == 0) {
-					/* lock acquired from server */
-                                        fd_ctx->lock_acquired[child_index]++;
-				}
-			}
-		}
-
                 call_count = --int_lock->lk_call_count;
         }
         UNLOCK (&frame->lock);
 
+        if (op_ret < 0 ) {
+                if (op_errno == ENOSYS) {
+                        /* return ENOTSUP */
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "subvolume does not support locking. "
+                                "please load features/locks xlator on server");
+                        local->op_ret                = op_ret;
+                        int_lock->lock_op_ret        = op_ret;
+                        local->child_up[child_index] = 0;
+                        int_lock->lock_op_errno      = op_errno;
+                        local->op_errno              = op_errno;
+                }
+        } else if (op_ret == 0) {
+                int_lock->inode_locked_nodes[child_index]
+                        |= LOCKED_YES;
+                int_lock->inodelk_lock_count++;
+        }
+
         if (call_count == 0) {
                 gf_log (this->name, GF_LOG_TRACE,
                         "Last inode locking reply received");
-                /* all locks successful. Proceed to call FOP */
-                if (inodelk->lock_count == int_lock->lk_expected_count) {
+                /* all locks successfull. Proceed to call FOP */
+                if (int_lock->inodelk_lock_count ==
+                    afr_up_children_count (priv->child_count, local->child_up)) {
                         gf_log (this->name, GF_LOG_TRACE,
                                 "All servers locked. Calling the cbk");
                         int_lock->lock_op_ret = 0;
                         int_lock->lock_cbk (frame, this);
                 }
-                /* Not all locks were successful. Unlock and try locking
+                /* Not all locks were successfull. Unlock and try locking
                    again, this time with serially blocking locks */
                 else {
                         gf_log (this->name, GF_LOG_TRACE,
@@ -1494,35 +1350,29 @@ int
 afr_nonblocking_inodelk (call_frame_t *frame, xlator_t *this)
 {
         afr_internal_lock_t *int_lock = NULL;
-        afr_inodelk_t       *inodelk  = NULL;
         afr_local_t         *local    = NULL;
         afr_private_t       *priv     = NULL;
         afr_fd_ctx_t        *fd_ctx   = NULL;
-        int32_t             call_count = 0;
-        int                 i          = 0;
-        int                 ret        = 0;
-        struct              gf_flock flock = {0,};
-        struct              gf_flock full_flock = {0,};
-        struct              gf_flock *flock_use = NULL;
-        int                 piggyback = 0;
+        int32_t  call_count = 0;
+        uint64_t ctx        = 0;
+        int      i          = 0;
+        int      ret        = 0;
+        struct gf_flock flock = {0,};
 
         local    = frame->local;
         int_lock = &local->internal_lock;
         priv     = this->private;
 
-        inodelk = afr_get_inodelk (int_lock, int_lock->domain);
-
-        flock.l_start = inodelk->flock.l_start;
-        flock.l_len   = inodelk->flock.l_len;
-        flock.l_type  = inodelk->flock.l_type;
-
-        full_flock.l_type = inodelk->flock.l_type;
+        flock.l_start = int_lock->lk_flock.l_start;
+        flock.l_len   = int_lock->lk_flock.l_len;
+        flock.l_type  = int_lock->lk_flock.l_type;
 
         initialize_inodelk_variables (frame, this);
 
         if (local->fd) {
-                fd_ctx = afr_fd_ctx_get (local->fd, this);
-                if (!fd_ctx) {
+                ret = fd_ctx_get (local->fd, this, &ctx);
+
+                if (ret < 0) {
                         gf_log (this->name, GF_LOG_INFO,
                                 "unable to get fd ctx for fd=%p",
                                 local->fd);
@@ -1532,14 +1382,14 @@ afr_nonblocking_inodelk (call_frame_t *frame, xlator_t *this)
                         local->op_errno         = EINVAL;
                         int_lock->lock_op_errno = EINVAL;
 
-			afr_unlock (frame, this);
                         ret = -1;
                         goto out;
                 }
 
-                call_count = internal_lock_count (frame, this);
+                fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                call_count = internal_lock_count (frame, this, fd_ctx);
                 int_lock->lk_call_count = call_count;
-                int_lock->lk_expected_count = call_count;
 
                 if (!call_count) {
                         gf_log (this->name, GF_LOG_INFO,
@@ -1551,77 +1401,258 @@ afr_nonblocking_inodelk (call_frame_t *frame, xlator_t *this)
                 /* Send non-blocking inodelk calls only on up children
                    and where the fd has been opened */
                 for (i = 0; i < priv->child_count; i++) {
-                        if (!local->child_up[i])
-                                continue;
+                        if (local->child_up[i] && fd_ctx->opened_on[i]) {
+                                afr_trace_inodelk_in (frame, AFR_INODELK_NB_TRANSACTION,
+                                                      AFR_LOCK_OP, &flock, F_SETLK, i);
+
+                                STACK_WIND_COOKIE (frame, afr_nonblocking_inodelk_cbk,
+                                                   (void *) (long) i,
+                                                   priv->children[i],
+                                                   priv->children[i]->fops->finodelk,
+                                                   this->name, local->fd,
+                                                   F_SETLK, &flock);
+
+                                if (!--call_count)
+                                        break;
 
-                        flock_use = &flock;
-                        if (!local->transaction.eager_lock_on) {
-                                goto wind;
                         }
 
-                        piggyback = 0;
-                        local->transaction.eager_lock[i] = 1;
+                }
+        } else {
+                call_count = internal_lock_count (frame, this, NULL);
+                int_lock->lk_call_count = call_count;
 
-			afr_set_delayed_post_op (frame, this);
+                for (i = 0; i < priv->child_count; i++) {
+                        if (local->child_up[i]) {
+                                afr_trace_inodelk_in (frame, AFR_INODELK_NB_TRANSACTION,
+                                                      AFR_LOCK_OP, &flock, F_SETLK, i);
 
-                        LOCK (&local->fd->lock);
-                        {
-                                if (fd_ctx->lock_acquired[i]) {
-                                        fd_ctx->lock_piggyback[i]++;
-                                        piggyback = 1;
-                                }
-                        }
-                        UNLOCK (&local->fd->lock);
+                                STACK_WIND_COOKIE (frame, afr_nonblocking_inodelk_cbk,
+                                                   (void *) (long) i,
+                                                   priv->children[i],
+                                                   priv->children[i]->fops->inodelk,
+                                                   this->name, &local->loc,
+                                                   F_SETLK, &flock);
 
-                        if (piggyback) {
-                                /* (op_ret == 1) => indicate piggybacked lock */
-                                afr_nonblocking_inodelk_cbk (frame, (void *) (long) i,
-                                                             this, 1, 0, NULL);
                                 if (!--call_count)
                                         break;
-                                continue;
+
                         }
-                        flock_use = &full_flock;
-                wind:
-                        AFR_TRACE_INODELK_IN (frame, this,
-                                              AFR_INODELK_NB_TRANSACTION,
-                                              AFR_LOCK_OP, flock_use, F_SETLK, i);
+                }
+        }
 
-                        STACK_WIND_COOKIE (frame, afr_nonblocking_inodelk_cbk,
-                                           (void *) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->finodelk,
-                                           int_lock->domain, local->fd,
-                                           F_SETLK, flock_use, NULL);
+out:
+        return ret;
+}
 
-                        if (!--call_count)
-                                break;
-                }
-        } else {
-                call_count = internal_lock_count (frame, this);
-                int_lock->lk_call_count = call_count;
-                int_lock->lk_expected_count = call_count;
+static int
+__is_lower_locked (call_frame_t *frame, xlator_t *this)
+{
+        afr_internal_lock_t *int_lock = NULL;
+        afr_private_t       *priv     = NULL;
+        afr_local_t         *local    = NULL;
+        int count = 0;
+        int i     = 0;
 
-                for (i = 0; i < priv->child_count; i++) {
-                        if (!local->child_up[i])
-                                continue;
-                        AFR_TRACE_INODELK_IN (frame, this,
-                                              AFR_INODELK_NB_TRANSACTION,
-                                              AFR_LOCK_OP, &flock, F_SETLK, i);
+        local    = frame->local;
+        int_lock = &local->internal_lock;
+        priv     = this->private;
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (int_lock->lower_locked_nodes[i] & LOCKED_LOWER)
+                        count++;
+        }
+
+        return count;
+
+}
+
+static int
+__is_higher_locked (call_frame_t *frame, xlator_t *this)
+{
+        afr_internal_lock_t *int_lock = NULL;
+        afr_private_t       *priv     = NULL;
+        afr_local_t         *local    = NULL;
+        int count = 0;
+        int i = 0;
+
+        local    = frame->local;
+        int_lock = &local->internal_lock;
+        priv     = this->private;
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (int_lock->locked_nodes[i] & LOCKED_YES)
+                        count++;
+        }
+
+        return count;
+
+}
+
+static int
+afr_unlock_lower_entrylk (call_frame_t *frame, xlator_t *this)
+{
+        afr_internal_lock_t *int_lock = NULL;
+        afr_local_t         *local    = NULL;
+        afr_private_t       *priv     = NULL;
+        const char          *basename = NULL;
+        loc_t               *loc      = NULL;
+        int call_count = 0;
+        int i = -1;
+
+        local = frame->local;
+        int_lock = &local->internal_lock;
+        priv  = this->private;
+
+        basename = int_lock->lk_basename;
+        if (int_lock->lk_loc)
+                loc = int_lock->lk_loc;
+
+        call_count = __is_lower_locked (frame, this);
+        int_lock->lk_call_count = call_count;
+
+        if (!call_count){
+                gf_log (this->name, GF_LOG_TRACE,
+                        "No internal locks unlocked");
+                int_lock->lock_cbk (frame, this);
+                goto out;
+        }
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (int_lock->lower_locked_nodes[i] & LOCKED_LOWER) {
+                        afr_trace_entrylk_in (frame, AFR_ENTRYLK_NB_TRANSACTION,
+                                              AFR_UNLOCK_OP, basename, i);
 
-                        STACK_WIND_COOKIE (frame, afr_nonblocking_inodelk_cbk,
+                        STACK_WIND_COOKIE (frame, afr_unlock_entrylk_cbk,
                                            (void *) (long) i,
                                            priv->children[i],
-                                           priv->children[i]->fops->inodelk,
-                                           int_lock->domain, &local->loc,
-                                           F_SETLK, &flock, NULL);
+                                           priv->children[i]->fops->entrylk,
+                                           this->name,
+                                           loc, basename,
+                                           ENTRYLK_UNLOCK, ENTRYLK_WRLCK);
 
                         if (!--call_count)
                                 break;
+
                 }
         }
+
 out:
-        return ret;
+        return 0;
+
+}
+
+
+static int
+afr_post_unlock_higher_cbk (call_frame_t *frame, xlator_t *this)
+{
+        afr_local_t *local = NULL;
+
+        local = frame->local;
+
+        local->transaction.done (frame, this);
+        return 0;
+}
+
+static int
+afr_post_unlock_lower_cbk (call_frame_t *frame, xlator_t *this)
+{
+        afr_internal_lock_t *int_lock    = NULL;
+        afr_local_t         *local       = NULL;
+        loc_t               *lower       = NULL;
+        loc_t               *higher      = NULL;
+        const char          *lower_name  = NULL;
+        const char          *higher_name = NULL;
+
+        local    = frame->local;
+        int_lock = &local->internal_lock;
+
+        lower = lower_path (&local->transaction.parent_loc,
+                            local->transaction.basename,
+                            &local->transaction.new_parent_loc,
+                            local->transaction.new_basename);
+
+        lower_name = (lower == &local->transaction.parent_loc ?
+                      local->transaction.basename :
+                      local->transaction.new_basename);
+
+        higher = (lower == &local->transaction.parent_loc ?
+                  &local->transaction.new_parent_loc :
+                  &local->transaction.parent_loc);
+
+        higher_name = (higher == &local->transaction.parent_loc ?
+                       local->transaction.basename :
+                       local->transaction.new_basename);
+
+        if (__is_higher_locked (frame, this)) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "unlocking higher");
+                int_lock->lk_basename = higher_name;
+                int_lock->lk_loc      = higher;
+                int_lock->lock_cbk    = afr_post_unlock_higher_cbk;
+
+                afr_unlock_entrylk (frame, this);
+        } else
+                local->transaction.done (frame, this);
+
+        return 0;
+}
+
+static int
+afr_rename_unlock (call_frame_t *frame, xlator_t *this)
+{
+        afr_internal_lock_t *int_lock    = NULL;
+        afr_local_t         *local       = NULL;
+        loc_t               *lower       = NULL;
+        loc_t               *higher      = NULL;
+        const char          *lower_name  = NULL;
+        const char          *higher_name = NULL;
+
+        local    = frame->local;
+        int_lock = &local->internal_lock;
+
+        lower = lower_path (&local->transaction.parent_loc,
+                            local->transaction.basename,
+                            &local->transaction.new_parent_loc,
+                            local->transaction.new_basename);
+
+        lower_name = (lower == &local->transaction.parent_loc ?
+                      local->transaction.basename :
+                      local->transaction.new_basename);
+
+        higher = (lower == &local->transaction.parent_loc ?
+                  &local->transaction.new_parent_loc :
+                  &local->transaction.parent_loc);
+
+        higher_name = (higher == &local->transaction.parent_loc ?
+                       local->transaction.basename :
+                       local->transaction.new_basename);
+
+
+        if (__is_lower_locked (frame, this)) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "unlocking lower");
+                int_lock->lk_basename = lower_name;
+                int_lock->lk_loc      = lower;
+                int_lock->lock_cbk    = afr_post_unlock_lower_cbk;
+
+                afr_unlock_lower_entrylk (frame, this);
+        } else
+                afr_post_unlock_lower_cbk (frame, this);
+
+        return 0;
+}
+
+static int
+afr_rename_transaction (call_frame_t *frame, xlator_t *this)
+{
+        afr_local_t *local = NULL;
+
+        local = frame->local;
+
+        return (local->transaction.type ==
+                AFR_ENTRY_RENAME_TRANSACTION);
+
 }
 
 int32_t
@@ -1635,8 +1666,10 @@ afr_unlock (call_frame_t *frame, xlator_t *this)
                 if (is_afr_lock_transaction (local))
                         afr_unlock_inodelk (frame, this);
                 else
-                        afr_unlock_entrylk (frame, this);
-
+                        if (!afr_rename_transaction (frame, this))
+                                afr_unlock_entrylk (frame, this);
+                        else
+                                afr_rename_unlock (frame, this);
         } else {
                 if (is_afr_lock_selfheal (local))
                         afr_unlock_inodelk (frame, this);
@@ -1805,12 +1838,10 @@ out:
 
 int32_t
 afr_get_locks_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, struct gf_flock *lock,
-                      dict_t *xdata);
+                      int32_t op_ret, int32_t op_errno, struct gf_flock *lock);
 int32_t
 afr_recover_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, struct gf_flock *lock,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno, struct gf_flock *lock)
 {
         afr_local_t   *local = NULL;
         afr_private_t *priv  = NULL;
@@ -1834,7 +1865,7 @@ afr_recover_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                            (void *) (long) source_child,
                            priv->children[source_child],
                            priv->children[source_child]->fops->lk,
-                           local->fd, F_GETLK_FD, &flock, NULL);
+                           local->fd, F_GETLK_FD, &flock);
 
         return 0;
 
@@ -1862,7 +1893,7 @@ afr_recover_lock (call_frame_t *frame, xlator_t *this,
                            (void *) (long) lock_recovery_child,
                            priv->children[lock_recovery_child],
                            priv->children[lock_recovery_child]->fops->lk,
-                           local->fd, F_SETLK, flock, NULL);
+                           local->fd, F_SETLK, flock);
 
         return 0;
 }
@@ -1880,8 +1911,7 @@ is_afr_lock_eol (struct gf_flock *lock)
 
 int32_t
 afr_get_locks_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, struct gf_flock *lock,
-                      dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno, struct gf_flock *lock)
 {
         if (op_ret) {
                 gf_log (this->name, GF_LOG_INFO,
@@ -1941,7 +1971,7 @@ afr_lock_recovery (call_frame_t *frame, xlator_t *this)
                            (void *) (long) source_child,
                            priv->children[source_child],
                            priv->children[source_child]->fops->lk,
-                           local->fd, F_GETLK_FD, &flock, NULL);
+                           local->fd, F_GETLK_FD, &flock);
 
 out:
         return ret;
@@ -1961,7 +1991,7 @@ afr_mark_fd_opened (xlator_t *this, fd_t *fd, int32_t child_index)
 
         fdctx = (afr_fd_ctx_t *) (long) tmp;
 
-        fdctx->opened_on[child_index] = AFR_FD_OPENED;
+        fdctx->opened_on[child_index] = 1;
 
 out:
         return ret;
@@ -1969,8 +1999,7 @@ out:
 
 int32_t
 afr_lock_recovery_preopen_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                               int32_t op_ret, int32_t op_errno, fd_t *fd,
-                               dict_t *xdata)
+                               int32_t op_ret, int32_t op_errno, fd_t *fd)
 {
         int32_t child_index = (long )cookie;
         int ret = 0;
@@ -2022,12 +2051,7 @@ afr_lock_recovery_preopen (call_frame_t *frame, xlator_t *this)
         GF_ASSERT (local && local->fd);
 
         ret = fd_ctx_get (local->fd, this, &tmp);
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to get the context of fd",
-                        uuid_utoa (local->fd->inode->gfid));
         fdctx = (afr_fd_ctx_t *) (long) tmp;
-        /* TODO: instead we should return from the function */
         GF_ASSERT (fdctx);
 
         child_index = local->lock_recovery_child;
@@ -2042,7 +2066,8 @@ afr_lock_recovery_preopen (call_frame_t *frame, xlator_t *this)
                            (void *)(long) child_index,
                            priv->children[child_index],
                            priv->children[child_index]->fops->open,
-                           &loc, fdctx->flags, local->fd, NULL);
+                           &loc, fdctx->flags, local->fd,
+                           fdctx->wbflags);
 
         return 0;
 }
@@ -2060,7 +2085,7 @@ is_fd_opened (fd_t *fd, int32_t child_index)
 
         fdctx = (afr_fd_ctx_t *) (long) tmp;
 
-        if (fdctx->opened_on[child_index] == AFR_FD_OPENED)
+        if (fdctx->opened_on[child_index])
                 ret = 1;
 
 out:
@@ -2070,14 +2095,13 @@ out:
 int
 afr_attempt_lock_recovery (xlator_t *this, int32_t child_index)
 {
-        call_frame_t    *frame      = NULL;
-        afr_private_t   *priv       = NULL;
-        afr_local_t     *local      = NULL;
-        afr_locked_fd_t *locked_fd  = NULL;
+        call_frame_t    *frame     = NULL;
+        afr_private_t   *priv      = NULL;
+        afr_local_t     *local     = NULL;
+        afr_locked_fd_t *locked_fd = NULL;
         afr_locked_fd_t  *tmp       = NULL;
-        int              ret        = -1;
+        int              ret       = 0;
         struct list_head locks_list = {0,};
-        int32_t          op_errno   = 0;
 
 
         priv = this->private;
@@ -2091,10 +2115,15 @@ afr_attempt_lock_recovery (xlator_t *this, int32_t child_index)
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0) {
+        local = GF_CALLOC (1, sizeof (*local),
+                           gf_afr_mt_afr_local_t);
+        if (!local) {
+                ret = -1;
+                goto out;
+        }
+
+        AFR_LOCAL_INIT (local, priv);
+        if (!local) {
                 ret = -1;
                 goto out;
         }
@@ -2132,43 +2161,5 @@ afr_attempt_lock_recovery (xlator_t *this, int32_t child_index)
         }
 
 out:
-        if ((ret < 0) && frame)
-                AFR_STACK_DESTROY (frame);
-        return ret;
-}
-
-int
-afr_lk_transfer_datalock (call_frame_t *dst, call_frame_t *src, char *dom,
-                          unsigned int child_count)
-{
-        afr_local_t         *dst_local   = NULL;
-        afr_local_t         *src_local   = NULL;
-        afr_internal_lock_t *dst_lock    = NULL;
-        afr_internal_lock_t *src_lock    = NULL;
-        afr_inodelk_t       *dst_inodelk = NULL;
-        afr_inodelk_t       *src_inodelk = NULL;
-        int                 ret = -1;
-
-        src_local = src->local;
-        src_lock  = &src_local->internal_lock;
-        src_inodelk = afr_get_inodelk (src_lock, dom);
-        dst_local = dst->local;
-        dst_lock  = &dst_local->internal_lock;
-        dst_inodelk = afr_get_inodelk (dst_lock, dom);
-        if (!dst_inodelk || !src_inodelk)
-                goto out;
-        if (src_inodelk->locked_nodes) {
-                memcpy (dst_inodelk->locked_nodes, src_inodelk->locked_nodes,
-                        sizeof (*dst_inodelk->locked_nodes) * child_count);
-                memset (src_inodelk->locked_nodes, 0,
-                        sizeof (*src_inodelk->locked_nodes) * child_count);
-        }
-
-        dst_lock->transaction_lk_type = src_lock->transaction_lk_type;
-        dst_lock->selfheal_lk_type    = src_lock->selfheal_lk_type;
-        dst_inodelk->lock_count = src_inodelk->lock_count;
-        src_inodelk->lock_count = 0;
-        ret = 0;
-out:
         return ret;
 }
diff --git a/xlators/cluster/afr/src/afr-mem-types.h b/xlators/cluster/afr/src/afr-mem-types.h
index 73594f265..35a73646c 100644
--- a/xlators/cluster/afr/src/afr-mem-types.h
+++ b/xlators/cluster/afr/src/afr-mem-types.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 
@@ -17,6 +26,7 @@
 enum gf_afr_mem_types_ {
         gf_afr_mt_iovec  = gf_common_mt_end + 1,
         gf_afr_mt_afr_fd_ctx_t,
+        gf_afr_mt_afr_local_t,
         gf_afr_mt_afr_private_t,
         gf_afr_mt_int32_t,
         gf_afr_mt_char,
@@ -32,19 +42,6 @@ enum gf_afr_mem_types_ {
         gf_afr_mt_entry_name,
         gf_afr_mt_pump_priv,
         gf_afr_mt_locked_fd,
-        gf_afr_mt_inode_ctx_t,
-        gf_afr_fd_paused_call_t,
-        gf_afr_mt_crawl_data_t,
-        gf_afr_mt_brick_pos_t,
-        gf_afr_mt_shd_bool_t,
-        gf_afr_mt_shd_timer_t,
-        gf_afr_mt_shd_event_t,
-        gf_afr_mt_time_t,
-        gf_afr_mt_pos_data_t,
-        gf_afr_mt_reply_t,
-        gf_afr_mt_stats_t,
-        gf_afr_mt_shd_crawl_event_t,
-        gf_afr_mt_uint64_t,
         gf_afr_mt_end
 };
 #endif
diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c
index 643a5d692..241d4539c 100644
--- a/xlators/cluster/afr/src/afr-open.c
+++ b/xlators/cluster/afr/src/afr-open.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <libgen.h>
@@ -46,84 +55,16 @@
 #include "afr-self-heal.h"
 #include "afr-self-heal-common.h"
 
-int
-afr_stale_child_up (afr_local_t *local, xlator_t *this)
-{
-        int             i = 0;
-        afr_private_t   *priv = NULL;
-        int             up = -1;
-
-        priv = this->private;
-
-        if (!local->fresh_children)
-                local->fresh_children = afr_children_create (priv->child_count);
-        if (!local->fresh_children)
-                goto out;
-
-        afr_inode_get_read_ctx (this, local->fd->inode, local->fresh_children);
-        if (priv->child_count == afr_get_children_count (local->fresh_children,
-                                                         priv->child_count))
-                goto out;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (!local->child_up[i])
-                        continue;
-                if (afr_is_child_present (local->fresh_children,
-                                          priv->child_count, i))
-                        continue;
-                up = i;
-                break;
-        }
-out:
-        return up;
-}
-
-void
-afr_perform_data_self_heal (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh = NULL;
-        inode_t         *inode = NULL;
-        int             st_child = -1;
-        char            reason[64] = {0};
-
-        local = frame->local;
-        sh = &local->self_heal;
-        inode = local->fd->inode;
-
-        if (!IA_ISREG (inode->ia_type))
-                goto out;
-
-        st_child = afr_stale_child_up (local, this);
-        if (st_child < 0)
-                goto out;
-
-        sh->do_data_self_heal          = _gf_true;
-        sh->do_metadata_self_heal      = _gf_true;
-        sh->do_gfid_self_heal          = _gf_true;
-        sh->do_missing_entry_self_heal = _gf_true;
-
-        snprintf (reason, sizeof (reason), "stale subvolume %d detected",
-                  st_child);
-        afr_launch_self_heal (frame, this, inode, _gf_true, inode->ia_type,
-                              reason, NULL, NULL);
-out:
-        return;
-}
 
 int
 afr_open_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                        struct iatt *postbuf, dict_t *xdata)
+                        struct iatt *postbuf)
 {
         afr_local_t * local = frame->local;
-        afr_private_t *priv = NULL;
 
-        priv = this->private;
-        if (afr_open_only_data_self_heal (priv->data_self_heal))
-                afr_perform_data_self_heal (frame, this);
         AFR_STACK_UNWIND (open, frame, local->op_ret, local->op_errno,
-                          local->fd, xdata);
+                          local->fd);
         return 0;
 }
 
@@ -131,15 +72,15 @@ afr_open_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int
 afr_open_cbk (call_frame_t *frame, void *cookie,
               xlator_t *this, int32_t op_ret, int32_t op_errno,
-              fd_t *fd, dict_t *xdata)
+              fd_t *fd)
 {
         afr_local_t *  local       = NULL;
+        uint64_t       ctx         = 0;
+        afr_fd_ctx_t  *fd_ctx      = NULL;
         int            ret         = 0;
         int            call_count  = -1;
         int            child_index = (long) cookie;
-        afr_private_t *priv        = NULL;
 
-        priv = this->private;
         local = frame->local;
 
         LOCK (&frame->lock);
@@ -152,13 +93,32 @@ afr_open_cbk (call_frame_t *frame, void *cookie,
                         local->op_ret = op_ret;
                         local->success_count++;
 
-                        ret = afr_child_fd_ctx_set (this, fd, child_index,
-                                                    local->cont.open.flags);
-                        if (ret) {
-                                local->op_ret = -1;
+                        ret = afr_fd_ctx_set (this, fd);
+
+                        if (ret < 0) {
+                                gf_log (this->name, GF_LOG_ERROR,
+                                        "could not set fd ctx for fd=%p", fd);
+
+                                local->op_ret   = -1;
+                                local->op_errno = -ret;
+                                goto unlock;
+                        }
+
+                        ret = fd_ctx_get (fd, this, &ctx);
+
+                        if (ret < 0) {
+                                gf_log (this->name, GF_LOG_ERROR,
+                                        "could not get fd ctx for fd=%p", fd);
+                                local->op_ret   = -1;
                                 local->op_errno = -ret;
                                 goto unlock;
                         }
+
+                        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                        fd_ctx->opened_on[child_index] = 1;
+                        fd_ctx->flags                  = local->cont.open.flags;
+                        fd_ctx->wbflags                = local->cont.open.wbflags;
                 }
         }
 unlock:
@@ -171,30 +131,29 @@ unlock:
                     && (local->op_ret >= 0)) {
                         STACK_WIND (frame, afr_open_ftruncate_cbk,
                                     this, this->fops->ftruncate,
-                                    fd, 0, NULL);
+                                    fd, 0);
                 } else {
-                        if (afr_open_only_data_self_heal (priv->data_self_heal))
-                                afr_perform_data_self_heal (frame, this);
                         AFR_STACK_UNWIND (open, frame, local->op_ret,
-                                          local->op_errno, local->fd, xdata);
+                                          local->op_errno, local->fd);
                 }
         }
 
         return 0;
 }
 
+
 int
 afr_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
-          fd_t *fd, dict_t *xdata)
+          fd_t *fd, int32_t wbflags)
 {
         afr_private_t * priv       = NULL;
         afr_local_t *   local      = NULL;
         int             i          = 0;
         int             ret        = -1;
         int32_t         call_count = 0;
+        int32_t         op_ret     = -1;
         int32_t         op_errno   = 0;
         int32_t         wind_flags = flags & (~O_TRUNC);
-        //We can't let truncation to happen outside transaction.
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (this, out);
@@ -203,10 +162,6 @@ afr_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
 
         priv = this->private;
 
-        if (flags & (O_CREAT|O_TRUNC)) {
-                QUORUM_CHECK(open,out);
-        }
-
         if (afr_is_split_brain (this, loc->inode)) {
                 /* self-heal failed */
                 gf_log (this->name, GF_LOG_WARNING,
@@ -215,17 +170,21 @@ afr_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-        local = frame->local;
+        ALLOC_OR_GOTO (local, afr_local_t, out);
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
+        ret = AFR_LOCAL_INIT (local, priv);
+        if (ret < 0) {
+                op_errno = -ret;
                 goto out;
+        }
 
+        frame->local = local;
         call_count   = local->call_count;
+
         loc_copy (&local->loc, loc);
 
         local->cont.open.flags   = flags;
+        local->cont.open.wbflags = wbflags;
 
         local->fd = fd_ref (fd);
 
@@ -234,149 +193,456 @@ afr_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
                         STACK_WIND_COOKIE (frame, afr_open_cbk, (void *) (long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->open,
-                                           loc, wind_flags, fd, xdata);
+                                           loc, wind_flags, fd, wbflags);
 
                         if (!--call_count)
                                 break;
                 }
         }
 
-        ret = 0;
+        op_ret = 0;
 out:
-        if (ret < 0)
-                AFR_STACK_UNWIND (open, frame, -1, op_errno, fd, xdata);
+        if (op_ret == -1) {
+                AFR_STACK_UNWIND (open, frame, op_ret, op_errno, fd);
+        }
 
         return 0;
 }
 
+
 int
-afr_openfd_fix_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                         int32_t op_ret, int32_t op_errno, fd_t *fd,
-                         dict_t *xdata)
+afr_openfd_sh_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                        int32_t op_ret, int32_t op_errno, fd_t *fd)
 {
-        afr_local_t   *local      = NULL;
-        afr_private_t *priv       = NULL;
-        afr_fd_ctx_t  *fd_ctx     = NULL;
-        int           call_count  = 0;
-        int           child_index = (long) cookie;
+        afr_internal_lock_t *int_lock    = NULL;
+        afr_local_t         *local       = NULL;
+        afr_private_t       *priv        = NULL;
+        afr_fd_ctx_t        *fd_ctx      = NULL;
+        uint64_t             ctx         = 0;
+        int                  ret         = 0;
+        int                  call_count  = 0;
+        int                  child_index = (long) cookie;
 
         priv     = this->private;
         local    = frame->local;
+        int_lock = &local->internal_lock;
+
+        LOCK (&frame->lock);
+        {
+                if (op_ret >= 0) {
+                        ret = fd_ctx_get (fd, this, &ctx);
+
+                        if (ret < 0) {
+                                gf_log (this->name, GF_LOG_WARNING,
+                                        "failed to get fd context, %p", fd);
+                                goto out;
+                        }
+
+                        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                        fd_ctx->opened_on[child_index] = 1;
+
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "fd for %s opened successfully on subvolume %s",
+                                local->loc.path, priv->children[child_index]->name);
+                }
+        }
+out:
+        UNLOCK (&frame->lock);
+
+        call_count = afr_frame_return (frame);
+
+        if (call_count == 0) {
+                int_lock->lock_cbk = local->transaction.done;
+                local->transaction.resume (frame, this);
+        }
+
+        return 0;
+}
+
+
+static int
+__unopened_count (int child_count, unsigned int *opened_on, unsigned char *child_up)
+{
+        int i = 0;
+        int count = 0;
 
-        if (op_ret >= 0) {
-                gf_log (this->name, GF_LOG_DEBUG, "fd for %s opened "
-                        "successfully on subvolume %s", local->loc.path,
-                        priv->children[child_index]->name);
-        } else {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to open %s "
-                        "on subvolume %s", local->loc.path,
-                        priv->children[child_index]->name);
+        for (i = 0; i < child_count; i++) {
+                if (!opened_on[i] && child_up[i])
+                        count++;
         }
 
-        fd_ctx = afr_fd_ctx_get (local->fd, this);
-        if (!fd_ctx) {
+        return count;
+}
+
+
+int
+afr_openfd_sh_unwind (call_frame_t *frame, xlator_t *this, int32_t op_ret,
+                      int32_t op_errno)
+{
+        afr_local_t   *local      = NULL;
+        afr_private_t *priv       = NULL;
+        uint64_t       ctx        = 0;
+        afr_fd_ctx_t  *fd_ctx     = NULL;
+        int            abandon    = 0;
+        int            ret        = 0;
+        int            i          = 0;
+        int            call_count = 0;
+
+        priv  = this->private;
+        local = frame->local;
+
+        /*
+         * Some subvolumes might have come up on which we never
+         * opened this fd in the first place. Re-open fd's on those
+         * subvolumes now.
+         */
+
+        ret = fd_ctx_get (local->fd, this, &ctx);
+        if (ret < 0) {
                 gf_log (this->name, GF_LOG_WARNING,
-                        "failed to get fd context, %p", local->fd);
+                        "failed to get fd context %p (%s)",
+                        local->fd, local->loc.path);
+                abandon = 1;
                 goto out;
         }
 
+        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
         LOCK (&local->fd->lock);
         {
-                if (op_ret >= 0) {
-                        fd_ctx->opened_on[child_index] = AFR_FD_OPENED;
-                } else {
-                        fd_ctx->opened_on[child_index] = AFR_FD_NOT_OPENED;
+                call_count = __unopened_count (priv->child_count,
+                                               fd_ctx->opened_on,
+                                               local->child_up);
+                for (i = 0; i < priv->child_count; i++) {
+                        fd_ctx->pre_op_done[i] = 0;
+                        fd_ctx->pre_op_piggyback[i] = 0;
                 }
         }
         UNLOCK (&local->fd->lock);
+
+        if (call_count == 0) {
+                abandon = 1;
+                goto out;
+        }
+
+        local->call_count = call_count;
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (!fd_ctx->opened_on[i] && local->child_up[i]) {
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "opening fd for %s on subvolume %s",
+                                local->loc.path, priv->children[i]->name);
+
+                        STACK_WIND_COOKIE (frame, afr_openfd_sh_open_cbk,
+                                           (void *)(long) i,
+                                           priv->children[i],
+                                           priv->children[i]->fops->open,
+                                           &local->loc, fd_ctx->flags, local->fd,
+                                           fd_ctx->wbflags);
+
+                        if (!--call_count)
+                                break;
+                }
+        }
+
 out:
-        call_count = afr_frame_return (frame);
-        if (call_count == 0)
-                AFR_STACK_DESTROY (frame);
+        if (abandon)
+                local->transaction.resume (frame, this);
 
         return 0;
 }
 
-void
-afr_fix_open (xlator_t *this, fd_t *fd, size_t need_open_count, int *need_open)
+
+static int
+afr_prepare_loc (call_frame_t *frame, fd_t *fd)
 {
-        afr_private_t *priv    = NULL;
-        int           i        = 0;
-        call_frame_t  *frame   = NULL;
-        afr_local_t   *local   = NULL;
-        int           ret      = -1;
-        int32_t       op_errno = 0;
-        afr_fd_ctx_t  *fd_ctx  = NULL;
+        afr_local_t    *local = NULL;
+        char           *name = NULL;
+        char           *path = NULL;
+        int             ret = 0;
+
+        if ((!fd) || (!fd->inode))
+                return -1;
+
+        local = frame->local;
+        ret = inode_path (fd->inode, NULL, (char **)&path);
+        if (ret <= 0) {
+                gf_log (frame->this->name, GF_LOG_DEBUG,
+                        "Unable to get path for gfid: %s",
+                        uuid_utoa (fd->inode->gfid));
+                return -1;
+        }
+
+        if (local->loc.path) {
+                if (strcmp (path, local->loc.path))
+                        gf_log (frame->this->name, GF_LOG_DEBUG,
+                                "overwriting old loc->path %s with %s",
+                                local->loc.path, path);
+                GF_FREE ((char *)local->loc.path);
+        }
+        local->loc.path = path;
+
+        name = strrchr (local->loc.path, '/');
+        if (name)
+                name++;
+        local->loc.name = name;
+
+        if (local->loc.inode) {
+                inode_unref (local->loc.inode);
+        }
+        local->loc.inode = inode_ref (fd->inode);
+
+        if (local->loc.parent) {
+                inode_unref (local->loc.parent);
+        }
+
+        local->loc.parent = inode_parent (local->loc.inode, 0, NULL);
+
+        return 0;
+}
+
+
+int
+afr_openfd_sh (call_frame_t *frame, xlator_t *this)
+{
+        afr_local_t     *local  = NULL;
+        afr_self_heal_t *sh = NULL;
+        char            sh_type_str[256] = {0,};
+
+        local = frame->local;
+        sh    = &local->self_heal;
+
+        GF_ASSERT (local->loc.path);
+        /* forcibly trigger missing-entries self-heal */
+
+        sh->need_missing_entry_self_heal = _gf_true;
+        sh->need_gfid_self_heal = _gf_true;
+        sh->data_lock_held      = _gf_true;
+        sh->need_data_self_heal = _gf_true;
+        sh->type                = local->fd->inode->ia_type;
+        sh->background          = _gf_false;
+        sh->unwind              = afr_openfd_sh_unwind;
+
+        afr_self_heal_type_str_get(&local->self_heal,
+                                   sh_type_str,
+                                   sizeof(sh_type_str));
+        gf_log (this->name, GF_LOG_INFO, "%s self-heal triggered. "
+                "path: %s, reason: Replicate up down flush, data lock is held",
+                sh_type_str, local->loc.path);
+
+        afr_self_heal (frame, this, local->fd->inode);
+
+        return 0;
+}
+
+
+int
+afr_openfd_flush_done (call_frame_t *frame, xlator_t *this)
+{
+        afr_private_t *priv = NULL;
+        afr_local_t *local  = NULL;
+
+        uint64_t       ctx;
+        afr_fd_ctx_t * fd_ctx = NULL;
+
+        int _ret = -1;
 
         priv  = this->private;
+        local = frame->local;
 
-        if (!afr_is_fd_fixable (fd) || !need_open || !need_open_count)
-                goto out;
+        LOCK (&local->fd->lock);
+        {
+                _ret = __fd_ctx_get (local->fd, this, &ctx);
+                if (_ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "failed to get fd context %p (%s)",
+                                local->fd, local->loc.path);
+                        goto out;
+                }
 
-        fd_ctx = afr_fd_ctx_get (fd, this);
-        if (!fd_ctx) {
-                ret = -1;
-                goto out;
+                fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                fd_ctx->down_count = priv->down_count;
+                fd_ctx->up_count   = priv->up_count;
         }
+out:
+        UNLOCK (&local->fd->lock);
 
-        frame = create_frame (this, this->ctx->pool);
-        if (!frame) {
-                ret = -1;
-                goto out;
+        afr_local_transaction_cleanup (local, this);
+
+        gf_log (this->name, GF_LOG_TRACE,
+                "The up/down flush is over");
+
+        fd_unref (local->fd);
+        local->openfd_flush_cbk (frame, this);
+
+        return 0;
+}
+
+
+
+int
+afr_openfd_xaction (call_frame_t *frame, xlator_t *this, fd_t *fd)
+{
+        afr_local_t   * local = NULL;
+
+        VALIDATE_OR_GOTO (frame, out);
+        VALIDATE_OR_GOTO (this, out);
+        VALIDATE_OR_GOTO (this->private, out);
+
+        local = frame->local;
+
+        local->op = GF_FOP_FLUSH;
+
+        local->transaction.fop    = afr_openfd_sh;
+        local->transaction.done   = afr_openfd_flush_done;
+
+        local->transaction.start  = 0;
+        local->transaction.len    = 0;
+
+        gf_log (this->name, GF_LOG_TRACE,
+                "doing up/down flush on fd=%p", fd);
+
+        afr_transaction (frame, this, AFR_DATA_TRANSACTION);
+
+out:
+        return 0;
+}
+
+
+
+int
+afr_openfd_xaction_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                             int32_t op_ret, int32_t op_errno, fd_t *fd)
+{
+        afr_internal_lock_t *int_lock    = NULL;
+        afr_local_t         *local       = NULL;
+        afr_private_t       *priv        = NULL;
+        int                  ret         = 0;
+        uint64_t             ctx         = 0;
+        afr_fd_ctx_t        *fd_ctx      = NULL;
+        int                  call_count  = 0;
+        int                  child_index = (long) cookie;
+
+        priv     = this->private;
+        local    = frame->local;
+        int_lock = &local->internal_lock;
+
+        LOCK (&frame->lock);
+        {
+                if (op_ret >= 0) {
+                        ret = fd_ctx_get (fd, this, &ctx);
+
+                        if (ret < 0) {
+                                gf_log (this->name, GF_LOG_WARNING,
+                                        "failed to get fd context %p (%s)",
+                                        fd, local->loc.path);
+                                goto out;
+                        }
+
+                        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                        fd_ctx->opened_on[child_index] = 1;
+
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "fd for %s opened successfully on subvolume %s",
+                                local->loc.path, priv->children[child_index]->name);
+                }
+        }
+out:
+        UNLOCK (&frame->lock);
+
+        call_count = afr_frame_return (frame);
+
+        if (call_count == 0) {
+                afr_openfd_xaction (frame, this, local->fd);
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
+        return 0;
+}
+
+
+int
+afr_openfd_flush (call_frame_t *frame, xlator_t *this, fd_t *fd)
+{
+        afr_local_t   *local      = NULL;
+        afr_private_t *priv       = NULL;
+        uint64_t       ctx        = 0;
+        afr_fd_ctx_t  *fd_ctx     = NULL;
+        int            no_open    = 0;
+        int            ret        = 0;
+        int            i          = 0;
+        int            call_count = 0;
+
+        priv  = this->private;
         local = frame->local;
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
 
-        local->loc.inode = inode_ref (fd->inode);
-        ret = loc_path (&local->loc, NULL);
-        if (ret < 0)
+        /*
+         * If the file is already deleted while the fd is open, no need to
+         * perform the openfd flush, call the flush_cbk and get out.
+         */
+        ret = afr_prepare_loc (frame, fd);
+        if (ret < 0) {
+                local->openfd_flush_cbk (frame, this);
                 goto out;
+        }
+
+        /*
+         * Some subvolumes might have come up on which we never
+         * opened this fd in the first place. Re-open fd's on those
+         * subvolumes now.
+         */
 
         local->fd = fd_ref (fd);
-        local->call_count = need_open_count;
 
-        gf_log (this->name, GF_LOG_DEBUG, "need open count: %zd",
-                need_open_count);
+        ret = fd_ctx_get (fd, this, &ctx);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_WARNING,
+                        "failed to get fd context %p (%s)",
+                        fd, local->loc.path);
+                no_open = 1;
+                goto out;
+        }
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (!need_open[i])
-                        continue;
+        fd_ctx = (afr_fd_ctx_t *)(long) ctx;
 
-                if (IA_IFDIR == fd->inode->ia_type) {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "opening fd for dir %s on subvolume %s",
-                                local->loc.path, priv->children[i]->name);
+        LOCK (&local->fd->lock);
+        {
+                call_count = __unopened_count (priv->child_count,
+                                               fd_ctx->opened_on,
+                                               local->child_up);
+        }
+        UNLOCK (&local->fd->lock);
 
-                        STACK_WIND_COOKIE (frame, afr_openfd_fix_open_cbk,
-                                           (void*) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->opendir,
-                                           &local->loc, local->fd,
-                                           NULL);
-                } else {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "opening fd for file %s on subvolume %s",
+        if (call_count == 0) {
+                no_open = 1;
+                goto out;
+        }
+
+        local->call_count = call_count;
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (!fd_ctx->opened_on[i] && local->child_up[i]) {
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "opening fd for %s on subvolume %s",
                                 local->loc.path, priv->children[i]->name);
 
-                        STACK_WIND_COOKIE (frame, afr_openfd_fix_open_cbk,
+                        STACK_WIND_COOKIE (frame, afr_openfd_xaction_open_cbk,
                                            (void *)(long) i,
                                            priv->children[i],
                                            priv->children[i]->fops->open,
-                                           &local->loc,
-                                           fd_ctx->flags & (~O_TRUNC),
-                                           local->fd, NULL);
-                }
+                                           &local->loc, fd_ctx->flags, fd,
+                                           fd_ctx->wbflags);
 
+                        if (!--call_count)
+                                break;
+                }
         }
-        op_errno = 0;
-        ret = 0;
+
 out:
-        if (op_errno)
-                ret = -1; //For handling ALLOC_OR_GOTO
-        if (ret && frame)
-                AFR_STACK_DESTROY (frame);
+        if (no_open)
+                afr_openfd_xaction (frame, this, fd);
+
+        return 0;
 }
diff --git a/xlators/cluster/afr/src/afr-self-heal-algorithm.c b/xlators/cluster/afr/src/afr-self-heal-algorithm.c
index 83846f152..857b9f499 100644
--- a/xlators/cluster/afr/src/afr-self-heal-algorithm.c
+++ b/xlators/cluster/afr/src/afr-self-heal-algorithm.c
@@ -1,15 +1,23 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
-#include <openssl/md5.h>
 #include "glusterfs.h"
 #include "afr.h"
 #include "xlator.h"
@@ -25,6 +33,7 @@
 #include "compat-errno.h"
 #include "compat.h"
 #include "byte-order.h"
+#include "md5.h"
 
 #include "afr-transaction.h"
 #include "afr-self-heal.h"
@@ -35,289 +44,303 @@
   This file contains the various self-heal algorithms
 */
 
-static int
-sh_loop_driver (call_frame_t *sh_frame, xlator_t *this,
-                gf_boolean_t is_first_call, call_frame_t *old_loop_frame);
-static int
-sh_loop_return (call_frame_t *sh_frame, xlator_t *this, call_frame_t *loop_frame,
-                int32_t op_ret, int32_t op_errno);
-static int
-sh_destroy_frame (call_frame_t *frame, xlator_t *this)
-{
-        if (!frame)
-                goto out;
 
-        AFR_STACK_DESTROY (frame);
-out:
-        return 0;
-}
+/*
+  The "full" algorithm. Copies the entire file from
+  source to sinks.
+*/
+
 
 static void
-sh_private_cleanup (call_frame_t *frame, xlator_t *this)
+sh_full_private_cleanup (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t             *local   = NULL;
-        afr_self_heal_t         *sh      = NULL;
-        afr_sh_algo_private_t   *sh_priv = NULL;
+        afr_local_t *               local   = NULL;
+        afr_self_heal_t *           sh      = NULL;
+        afr_sh_algo_full_private_t *sh_priv = NULL;
 
         local = frame->local;
         sh    = &local->self_heal;
 
         sh_priv = sh->private;
-        GF_FREE (sh_priv);
-}
 
-static int
-sh_number_of_writes_needed (unsigned char *write_needed, int child_count)
-{
-        int writes = 0;
-        int i      = 0;
-
-        for (i = 0; i < child_count; i++) {
-                if (write_needed[i])
-                        writes++;
-        }
-
-        return writes;
+        if (sh_priv)
+                GF_FREE (sh_priv);
 }
 
 
 static int
-sh_loop_driver_done (call_frame_t *sh_frame, xlator_t *this,
-                     call_frame_t *last_loop_frame)
+sh_full_loop_driver (call_frame_t *frame, xlator_t *this, gf_boolean_t is_first_call);
+
+static int
+sh_full_loop_driver_done (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t             *local        = NULL;
-        afr_self_heal_t         *sh           = NULL;
-        afr_sh_algo_private_t   *sh_priv      = NULL;
-        int32_t                 total_blocks = 0;
-        int32_t                 diff_blocks  = 0;
+        afr_private_t * priv = NULL;
+        afr_local_t * local  = NULL;
+        afr_self_heal_t *sh  = NULL;
+        afr_sh_algo_full_private_t *sh_priv = NULL;
 
-        local        = sh_frame->local;
-        sh           = &local->self_heal;
-        sh_priv      = sh->private;
-        if (sh_priv) {
-                total_blocks = sh_priv->total_blocks;
-                diff_blocks  = sh_priv->diff_blocks;
-        }
+        priv    = this->private;
+        local   = frame->local;
+        sh      = &local->self_heal;
+        sh_priv = sh->private;
 
-        sh_private_cleanup (sh_frame, this);
-        if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
-                GF_ASSERT (!last_loop_frame);
-                //loop_finish should have happened and the old_loop should be NULL
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "self-heal aborting on %s",
+        sh_full_private_cleanup (frame, this);
+        if (sh->op_failed) {
+                gf_log (this->name, GF_LOG_INFO,
+                        "full self-heal aborting on %s",
                         local->loc.path);
 
-                local->self_heal.algo_abort_cbk (sh_frame, this);
+                local->self_heal.algo_abort_cbk (frame, this);
         } else {
-                GF_ASSERT (last_loop_frame);
-                if (diff_blocks == total_blocks) {
-                        gf_log (this->name, GF_LOG_DEBUG, "full self-heal "
-                                "completed on %s",local->loc.path);
-                } else {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "diff self-heal on %s: completed. "
-                                "(%d blocks of %d were different (%.2f%%))",
-                                local->loc.path, diff_blocks, total_blocks,
-                                ((diff_blocks * 1.0)/total_blocks) * 100);
-                }
+                gf_log (this->name, GF_LOG_TRACE,
+                        "full self-heal completed on %s",
+                        local->loc.path);
 
-                sh->old_loop_frame = last_loop_frame;
-                local->self_heal.algo_completion_cbk (sh_frame, this);
+                local->self_heal.algo_completion_cbk (frame, this);
         }
-
         return 0;
 }
 
-int
-sh_loop_finish (call_frame_t *loop_frame, xlator_t *this)
+static int
+sh_full_loop_return (call_frame_t *rw_frame, xlator_t *this, off_t offset)
 {
-        afr_local_t             *loop_local = NULL;
-        afr_self_heal_t         *loop_sh = NULL;
+        afr_local_t *               rw_local = NULL;
+        afr_self_heal_t *           rw_sh    = NULL;
+        call_frame_t               *sh_frame = NULL;
+        afr_local_t *               sh_local = NULL;
+        afr_self_heal_t            *sh       = NULL;
+        afr_sh_algo_full_private_t *sh_priv  = NULL;
 
-        if (!loop_frame)
-                goto out;
+        rw_local = rw_frame->local;
+        rw_sh    = &rw_local->self_heal;
 
-        loop_local = loop_frame->local;
-        if (loop_local) {
-                loop_sh = &loop_local->self_heal;
-        }
+        sh_frame = rw_sh->sh_frame;
+        sh_local = sh_frame->local;
+        sh       = &sh_local->self_heal;
+        sh_priv  = sh->private;
+
+        AFR_STACK_DESTROY (rw_frame);
+
+        sh_full_loop_driver (sh_frame, this, _gf_false);
 
-        if (loop_sh && loop_sh->data_lock_held) {
-                afr_sh_data_unlock (loop_frame, this, this->name,
-                                    sh_destroy_frame);
-        } else {
-                sh_destroy_frame (loop_frame, this);
-        }
-out:
         return 0;
 }
 
+
 static int
-sh_loop_lock_success (call_frame_t *loop_frame, xlator_t *this)
+sh_full_write_cbk (call_frame_t *rw_frame, void *cookie, xlator_t *this,
+                   int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
+                   struct iatt *postbuf)
 {
-        afr_local_t                 *loop_local = NULL;
-        afr_self_heal_t             *loop_sh    = NULL;
+        afr_private_t *  priv        = NULL;
+        afr_local_t *    rw_local    = NULL;
+        afr_self_heal_t *rw_sh       = NULL;
+        call_frame_t    *sh_frame    = NULL;
+        afr_local_t *    sh_local    = NULL;
+        afr_self_heal_t *sh          = NULL;
+        int              child_index = (long) cookie;
+        int              call_count  = 0;
 
-        loop_local = loop_frame->local;
-        loop_sh = &loop_local->self_heal;
+        priv = this->private;
 
-        sh_loop_finish (loop_sh->old_loop_frame, this);
-        loop_sh->old_loop_frame = NULL;
+        rw_local = rw_frame->local;
+        rw_sh    = &rw_local->self_heal;
+
+        sh_frame = rw_sh->sh_frame;
+        sh_local = sh_frame->local;
+        sh       = &sh_local->self_heal;
+
+        gf_log (this->name, GF_LOG_TRACE,
+                "wrote %d bytes of data from %s to child %d, offset %"PRId64"",
+                op_ret, sh_local->loc.path, child_index,
+                rw_sh->offset - op_ret);
+
+        LOCK (&sh_frame->lock);
+        {
+                if (op_ret == -1) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "write to %s failed on subvolume %s (%s)",
+                                sh_local->loc.path,
+                                priv->children[child_index]->name,
+                                strerror (op_errno));
+
+                        sh->op_failed = 1;
+                }
+        }
+        UNLOCK (&sh_frame->lock);
+
+        call_count = afr_frame_return (rw_frame);
+
+        if (call_count == 0) {
+                sh_full_loop_return (rw_frame, this, rw_sh->offset - op_ret);
+        }
 
-        gf_log (this->name, GF_LOG_DEBUG, "Acquired lock for range %"PRIu64
-                " %"PRIu64, loop_sh->offset, loop_sh->block_size);
-        loop_sh->data_lock_held = _gf_true;
-        loop_sh->sh_data_algo_start (loop_frame, this);
         return 0;
 }
 
+
 static int
-sh_loop_lock_failure (call_frame_t *loop_frame, xlator_t *this)
+sh_full_read_cbk (call_frame_t *rw_frame, void *cookie,
+                  xlator_t *this, int32_t op_ret, int32_t op_errno,
+                  struct iovec *vector, int32_t count, struct iatt *buf,
+                  struct iobref *iobref)
 {
-        call_frame_t                *sh_frame = NULL;
-        afr_local_t                 *loop_local = NULL;
-        afr_self_heal_t             *loop_sh    = NULL;
-
-        loop_local = loop_frame->local;
-        loop_sh = &loop_local->self_heal;
-        sh_frame = loop_sh->sh_frame;
-
-        gf_log (this->name, GF_LOG_ERROR, "failed lock for range %"PRIu64
-                " %"PRIu64, loop_sh->offset, loop_sh->block_size);
-        sh_loop_finish (loop_sh->old_loop_frame, this);
-        loop_sh->old_loop_frame = NULL;
-        sh_loop_return (sh_frame, this, loop_frame, -1, ENOTCONN);
+        afr_private_t *  priv       = NULL;
+        afr_local_t *    rw_local   = NULL;
+        afr_self_heal_t *rw_sh      = NULL;
+        call_frame_t    *sh_frame   = NULL;
+        afr_local_t *    sh_local   = NULL;
+        afr_self_heal_t *sh         = NULL;
+        int              i          = 0;
+        int              call_count = 0;
+        off_t            offset     = (long) cookie;
+
+        priv = this->private;
+        rw_local = rw_frame->local;
+        rw_sh    = &rw_local->self_heal;
+
+        sh_frame = rw_sh->sh_frame;
+        sh_local = sh_frame->local;
+        sh       = &sh_local->self_heal;
+
+        call_count = sh->active_sinks;
+
+        rw_local->call_count = call_count;
+
+        gf_log (this->name, GF_LOG_TRACE,
+                "read %d bytes of data from %s, offset %"PRId64"",
+                op_ret, sh_local->loc.path, offset);
+
+        if (op_ret <= 0) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "read from %s failed on subvolume %s (%s)",
+                        sh_local->loc.path,
+                        priv->children[sh->source]->name,
+                        strerror (op_errno));
+                sh->op_failed = 1;
+                sh_full_loop_return (rw_frame, this, offset);
+                return 0;
+        }
+
+        rw_sh->offset += op_ret;
+
+        if (sh->file_has_holes) {
+                if (iov_0filled (vector, count) == 0) {
+                        /* the iter function depends on the
+                           sh->offset already being updated
+                           above
+                        */
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "block has all 0 filled");
+                        sh_full_loop_return (rw_frame, this, offset);
+                        goto out;
+                }
+        }
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->sources[i] || !sh_local->child_up[i])
+                        continue;
+
+                /* this is a sink, so write to it */
+
+                STACK_WIND_COOKIE (rw_frame, sh_full_write_cbk,
+                                   (void *) (long) i,
+                                   priv->children[i],
+                                   priv->children[i]->fops->writev,
+                                   sh->healing_fd, vector, count, offset,
+                                   iobref);
+
+                if (!--call_count)
+                        break;
+        }
+
+out:
         return 0;
 }
 
+
 static int
-sh_loop_frame_create (call_frame_t *sh_frame, xlator_t *this,
-                      call_frame_t *old_loop_frame, call_frame_t **loop_frame)
+sh_full_read_write (call_frame_t *frame, xlator_t *this, off_t offset)
 {
-        call_frame_t                *new_loop_frame = NULL;
-        afr_local_t                 *local          = NULL;
-        afr_self_heal_t             *sh             = NULL;
-        afr_local_t                 *new_loop_local = NULL;
-        afr_self_heal_t             *new_loop_sh    = NULL;
-        afr_private_t               *priv           = NULL;
-
-        GF_ASSERT (sh_frame);
-        GF_ASSERT (loop_frame);
-
-        *loop_frame = NULL;
-        local   = sh_frame->local;
-        sh      = &local->self_heal;
-        priv    = this->private;
+        afr_private_t *  priv     = NULL;
+        afr_local_t *    local    = NULL;
+        afr_local_t *    rw_local = NULL;
+        afr_self_heal_t *rw_sh    = NULL;
+        afr_self_heal_t *sh       = NULL;
+        call_frame_t    *rw_frame = NULL;
+        int32_t          op_errno = 0;
 
-        new_loop_frame = copy_frame (sh_frame);
-        if (!new_loop_frame)
-                goto out;
-        //We want the frame to have same lk_owner as sh_frame
-        //so that locks translator allows conflicting locks
-        new_loop_local = afr_self_heal_local_init (local, this);
-        if (!new_loop_local)
-                goto out;
-        new_loop_frame->local = new_loop_local;
+        priv  = this->private;
+        local = frame->local;
+        sh    = &local->self_heal;
 
-        new_loop_sh = &new_loop_local->self_heal;
-        new_loop_sh->sources = memdup (sh->sources,
-                                       priv->child_count * sizeof (*sh->sources));
-        if (!new_loop_sh->sources)
-                goto out;
-        new_loop_sh->write_needed = GF_CALLOC (priv->child_count,
-                                               sizeof (*new_loop_sh->write_needed),
-                                               gf_afr_mt_char);
-        if (!new_loop_sh->write_needed)
-                goto out;
-        new_loop_sh->checksum = GF_CALLOC (priv->child_count, MD5_DIGEST_LENGTH,
-                                           gf_afr_mt_uint8_t);
-        if (!new_loop_sh->checksum)
+        rw_frame = copy_frame (frame);
+        if (!rw_frame)
                 goto out;
-        new_loop_sh->inode      = inode_ref (sh->inode);
-        new_loop_sh->sh_data_algo_start = sh->sh_data_algo_start;
-        new_loop_sh->source = sh->source;
-        new_loop_sh->active_sinks = sh->active_sinks;
-        new_loop_sh->healing_fd = fd_ref (sh->healing_fd);
-        new_loop_sh->file_has_holes = sh->file_has_holes;
-        new_loop_sh->old_loop_frame = old_loop_frame;
-        new_loop_sh->sh_frame = sh_frame;
-        *loop_frame = new_loop_frame;
-        return 0;
-out:
-        sh_destroy_frame (new_loop_frame, this);
-        return -ENOMEM;
-}
 
-static int
-sh_loop_start (call_frame_t *sh_frame, xlator_t *this, off_t offset,
-               call_frame_t *old_loop_frame)
-{
-        call_frame_t                *new_loop_frame = NULL;
-        afr_local_t                 *local          = NULL;
-        afr_self_heal_t             *sh             = NULL;
-        afr_local_t                 *new_loop_local = NULL;
-        afr_self_heal_t             *new_loop_sh    = NULL;
-        int                         ret             = 0;
+        ALLOC_OR_GOTO (rw_local, afr_local_t, out);
 
-        GF_ASSERT (sh_frame);
+        rw_frame->local = rw_local;
+        rw_sh           = &rw_local->self_heal;
 
-        local   = sh_frame->local;
-        sh      = &local->self_heal;
+        rw_sh->offset       = offset;
+        rw_sh->sh_frame     = frame;
 
-        ret = sh_loop_frame_create (sh_frame, this, old_loop_frame,
-                                    &new_loop_frame);
-        if (ret)
-                goto out;
-        new_loop_local = new_loop_frame->local;
-        new_loop_sh = &new_loop_local->self_heal;
-        new_loop_sh->offset = offset;
-        new_loop_sh->block_size = sh->block_size;
-        afr_sh_data_lock (new_loop_frame, this, offset, new_loop_sh->block_size,
-                          _gf_true, this->name, sh_loop_lock_success, sh_loop_lock_failure);
+        STACK_WIND_COOKIE (rw_frame, sh_full_read_cbk,
+                           (void *) (long) offset,
+                           priv->children[sh->source],
+                           priv->children[sh->source]->fops->readv,
+                           sh->healing_fd, sh->block_size,
+                           offset);
         return 0;
+
 out:
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-        if (old_loop_frame)
-                sh_loop_finish (old_loop_frame, this);
-        sh_loop_return (sh_frame, this, new_loop_frame, -1, ENOMEM);
+        sh->op_failed = 1;
+
+        sh_full_loop_driver (frame, this, _gf_false);
+
         return 0;
 }
 
+
 static int
-sh_loop_driver (call_frame_t *sh_frame, xlator_t *this,
-                gf_boolean_t is_first_call, call_frame_t *old_loop_frame)
+sh_full_loop_driver (call_frame_t *frame, xlator_t *this, gf_boolean_t is_first_call)
 {
+        afr_private_t *             priv           = NULL;
         afr_local_t *               local          = NULL;
-        afr_self_heal_t *           sh             = NULL;
-        afr_sh_algo_private_t       *sh_priv        = NULL;
+        afr_self_heal_t            *sh             = NULL;
+        afr_sh_algo_full_private_t *sh_priv        = NULL;
         gf_boolean_t                is_driver_done = _gf_false;
         blksize_t                   block_size     = 0;
-        int                         loop           = 0;
         off_t                       offset         = 0;
-        afr_private_t               *priv          = NULL;
+        int                         loop           = 0;
 
         priv    = this->private;
-        local   = sh_frame->local;
+        local   = frame->local;
         sh      = &local->self_heal;
         sh_priv = sh->private;
 
         LOCK (&sh_priv->lock);
         {
-                if (!is_first_call)
+                if (_gf_false == is_first_call)
                         sh_priv->loops_running--;
-                offset = sh_priv->offset;
-                block_size = sh->block_size;
-                while ((!sh->eof_reached) &&
-                       (!is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) &&
-                     (sh_priv->loops_running < priv->data_self_heal_window_size)
+                offset           = sh_priv->offset;
+                block_size       = sh->block_size;
+                while ((sh->op_failed == 0) &&
+                       (sh_priv->loops_running < priv->data_self_heal_window_size)
                        && (sh_priv->offset < sh->file_size)) {
 
                         loop++;
-                        sh_priv->offset += block_size;
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "spawning a loop for offset %"PRId64,
+                                sh_priv->offset);
+
+                        sh_priv->offset += sh->block_size;
                         sh_priv->loops_running++;
 
-                        if (!is_first_call)
+                        if (_gf_false == is_first_call)
                                 break;
+
                 }
                 if (0 == sh_priv->loops_running) {
                         is_driver_done = _gf_true;
@@ -325,242 +348,349 @@ sh_loop_driver (call_frame_t *sh_frame, xlator_t *this,
         }
         UNLOCK (&sh_priv->lock);
 
-        if (0 == loop) {
-                //loop finish does unlock, but the erasing of the pending
-                //xattrs needs to happen before that so do not finish the loop
-                if (is_driver_done &&
-                    !is_self_heal_failed (sh, AFR_CHECK_SPECIFIC))
-                        goto driver_done;
-                if (old_loop_frame) {
-                        sh_loop_finish (old_loop_frame, this);
-                        old_loop_frame = NULL;
-                }
-        }
-
-        //If we have more loops to form we should finish previous loop after
-        //the next loop lock
         while (loop--) {
-                if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
+                if (sh->op_failed) {
                         // op failed in other loop, stop spawning more loops
-                        if (old_loop_frame) {
-                                sh_loop_finish (old_loop_frame, this);
-                                old_loop_frame = NULL;
-                        }
-                        sh_loop_driver (sh_frame, this, _gf_false, NULL);
+                        sh_full_loop_driver (frame, this, _gf_false);
                 } else {
-                        gf_log (this->name, GF_LOG_TRACE, "spawning a loop "
-                                "for offset %"PRId64, offset);
-
-                        sh_loop_start (sh_frame, this, offset, old_loop_frame);
-                        old_loop_frame = NULL;
+                        sh_full_read_write (frame, this, offset);
                         offset += block_size;
                 }
         }
 
-driver_done:
         if (is_driver_done) {
-                sh_loop_driver_done (sh_frame, this, old_loop_frame);
+                sh_full_loop_driver_done (frame, this);
+        }
+
+        return 0;
+}
+
+
+int
+afr_sh_algo_full (call_frame_t *frame, xlator_t *this)
+{
+        afr_local_t *               local   = NULL;
+        afr_self_heal_t *           sh      = NULL;
+        afr_sh_algo_full_private_t *sh_priv = NULL;
+
+        local = frame->local;
+        sh    = &local->self_heal;
+
+        sh_priv = GF_CALLOC (1, sizeof (*sh_priv),
+                             gf_afr_mt_afr_private_t);
+        if (!sh_priv)
+                goto out;
+
+        LOCK_INIT (&sh_priv->lock);
+
+        sh->private = sh_priv;
+
+        local->call_count = 0;
+
+        sh_full_loop_driver (frame, this, _gf_true);
+out:
+        return 0;
+}
+
+
+/*
+ * The "diff" algorithm. Copies only those blocks whose checksums
+ * don't match with those of source.
+ */
+
+
+static void
+sh_diff_private_cleanup (call_frame_t *frame, xlator_t *this)
+{
+        afr_private_t *             priv    = NULL;
+        afr_local_t *               local   = NULL;
+        afr_self_heal_t *           sh      = NULL;
+        afr_sh_algo_diff_private_t *sh_priv = NULL;
+        int                         i       = 0;
+
+        priv  = this->private;
+        local = frame->local;
+        sh    = &local->self_heal;
+
+        sh_priv = sh->private;
+
+        for (i = 0; i < priv->data_self_heal_window_size; i++) {
+                if (sh_priv->loops[i]) {
+                        if (sh_priv->loops[i]->write_needed)
+                                GF_FREE (sh_priv->loops[i]->write_needed);
+
+                        if (sh_priv->loops[i]->checksum)
+                                GF_FREE (sh_priv->loops[i]->checksum);
+
+                        GF_FREE (sh_priv->loops[i]);
+                }
+        }
+
+        if (sh_priv) {
+                if (sh_priv->loops)
+                        GF_FREE (sh_priv->loops);
+
+                GF_FREE (sh_priv);
+        }
+
+
+}
+
+
+static uint32_t
+__make_cookie (int loop_index, int child_index)
+{
+        uint32_t ret = ((loop_index << 16) | child_index);
+        return ret;
+}
+
+
+static int
+__loop_index (uint32_t cookie)
+{
+        return ((cookie & 0xFFFF0000) >> 16);
+}
+
+
+static int
+__child_index (uint32_t cookie)
+{
+        return (cookie & 0x0000FFFF);
+}
+
+
+static void
+sh_diff_loop_state_reset (struct sh_diff_loop_state *loop_state, int child_count)
+{
+        loop_state->active = _gf_false;
+//        loop_state->offset = 0;
+
+        memset (loop_state->write_needed,
+                0, sizeof (*loop_state->write_needed) * child_count);
+
+        memset (loop_state->checksum,
+                0, MD5_DIGEST_LEN * child_count);
+}
+
+
+static int
+sh_diff_number_of_writes_needed (unsigned char *write_needed, int child_count)
+{
+        int writes = 0;
+        int i      = 0;
+
+        for (i = 0; i < child_count; i++) {
+                if (write_needed[i])
+                        writes++;
         }
+
+        return writes;
+}
+
+
+static int
+sh_diff_loop_driver_done (call_frame_t *frame, xlator_t *this)
+{
+        afr_private_t *             priv         = NULL;
+        afr_local_t *               local        = NULL;
+        afr_self_heal_t *           sh           = NULL;
+        afr_sh_algo_diff_private_t *sh_priv      = NULL;
+        int32_t                     total_blocks = 0;
+        int32_t                     diff_blocks  = 0;
+
+        priv         = this->private;
+        local        = frame->local;
+        sh           = &local->self_heal;
+        sh_priv      = sh->private;
+        total_blocks = sh_priv->total_blocks;
+        diff_blocks  = sh_priv->diff_blocks;
+
+        sh_diff_private_cleanup (frame, this);
+        if (sh->op_failed) {
+                gf_log (this->name, GF_LOG_INFO,
+                        "diff self-heal aborting on %s",
+                        local->loc.path);
+
+                local->self_heal.algo_abort_cbk (frame, this);
+        } else {
+                gf_log (this->name, GF_LOG_INFO,
+                        "diff self-heal on %s: completed. "
+                        "(%d blocks of %d were different (%.2f%%))",
+                        local->loc.path, diff_blocks, total_blocks,
+                        ((diff_blocks * 1.0)/total_blocks) * 100);
+
+                local->self_heal.algo_completion_cbk (frame, this);
+        }
+
         return 0;
 }
 
 static int
-sh_loop_return (call_frame_t *sh_frame, xlator_t *this, call_frame_t *loop_frame,
-                int32_t op_ret, int32_t op_errno)
+sh_diff_loop_driver (call_frame_t *frame, xlator_t *this,
+                     gf_boolean_t is_first_call,
+                     struct sh_diff_loop_state *loop_state);
+
+static int
+sh_diff_loop_return (call_frame_t *rw_frame, xlator_t *this,
+                     struct sh_diff_loop_state *loop_state)
 {
-        afr_local_t *               loop_local = NULL;
-        afr_self_heal_t *           loop_sh    = NULL;
+        afr_private_t *             priv     = NULL;
+        afr_local_t *               rw_local = NULL;
+        afr_self_heal_t *           rw_sh    = NULL;
+        call_frame_t               *sh_frame = NULL;
         afr_local_t *               sh_local = NULL;
         afr_self_heal_t            *sh       = NULL;
+        afr_sh_algo_diff_private_t *sh_priv  = NULL;
+
+        priv  = this->private;
 
+        rw_local = rw_frame->local;
+        rw_sh    = &rw_local->self_heal;
+
+        sh_frame = rw_sh->sh_frame;
         sh_local = sh_frame->local;
         sh       = &sh_local->self_heal;
+        sh_priv  = sh->private;
 
-        if (loop_frame) {
-                loop_local = loop_frame->local;
-                if (loop_local)
-                        loop_sh    = &loop_local->self_heal;
-                if (loop_sh)
-                        gf_log (this->name, GF_LOG_TRACE, "loop for offset "
-                                "%"PRId64" returned", loop_sh->offset);
-        }
+        gf_log (this->name, GF_LOG_TRACE,
+                "loop for offset %"PRId64" returned", loop_state->offset);
 
-        if (op_ret == -1) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                afr_sh_set_error (sh, op_errno);
-                if (loop_frame) {
-                        sh_loop_finish (loop_frame, this);
-                        loop_frame = NULL;
-                }
-        }
+        AFR_STACK_DESTROY (rw_frame);
 
-        sh_loop_driver (sh_frame, this, _gf_false, loop_frame);
+        sh_diff_loop_driver (sh_frame, this, _gf_false, loop_state);
 
         return 0;
 }
 
+
 static int
-sh_loop_write_cbk (call_frame_t *loop_frame, void *cookie, xlator_t *this,
+sh_diff_write_cbk (call_frame_t *rw_frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, struct iatt *buf,
-                   struct iatt *postbuf, dict_t *xdata)
+                   struct iatt *postbuf)
 {
         afr_private_t *             priv        = NULL;
-        afr_local_t *               loop_local    = NULL;
-        afr_self_heal_t *           loop_sh       = NULL;
+        afr_local_t *               rw_local    = NULL;
+        afr_self_heal_t *           rw_sh       = NULL;
         call_frame_t               *sh_frame    = NULL;
         afr_local_t *               sh_local    = NULL;
         afr_self_heal_t            *sh          = NULL;
+        afr_sh_algo_diff_private_t *sh_priv     = NULL;
+        struct sh_diff_loop_state  *loop_state  = NULL;
         int                         call_count  = 0;
         int                         child_index = 0;
+        int                         loop_index  = 0;
 
         priv     = this->private;
-        loop_local = loop_frame->local;
-        loop_sh    = &loop_local->self_heal;
+        rw_local = rw_frame->local;
+        rw_sh    = &rw_local->self_heal;
 
-        sh_frame = loop_sh->sh_frame;
+        sh_frame = rw_sh->sh_frame;
         sh_local = sh_frame->local;
         sh       = &sh_local->self_heal;
+        sh_priv  = sh->private;
 
-        child_index =  (long) cookie;
+        child_index = __child_index ((uint32_t) (long) cookie);
+        loop_index  = __loop_index ((uint32_t) (long) cookie);
+        loop_state  = sh_priv->loops[loop_index];
 
         gf_log (this->name, GF_LOG_TRACE,
                 "wrote %d bytes of data from %s to child %d, offset %"PRId64"",
-                op_ret, sh_local->loc.path, child_index, loop_sh->offset);
+                op_ret, sh_local->loc.path, child_index,
+                loop_state->offset);
 
-        if (op_ret == -1) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "write to %s failed on subvolume %s (%s)",
-                        sh_local->loc.path,
-                        priv->children[child_index]->name,
-                        strerror (op_errno));
-
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                afr_sh_set_error (loop_sh, op_errno);
-        } else if (op_ret < loop_local->cont.writev.vector->iov_len) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "incomplete write to %s on subvolume %s "
-                        "(expected %lu, returned %d)", sh_local->loc.path,
-                        priv->children[child_index]->name,
-                        loop_local->cont.writev.vector->iov_len, op_ret);
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+        LOCK (&sh_frame->lock);
+        {
+                if (op_ret == -1) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "write to %s failed on subvolume %s (%s)",
+                                sh_local->loc.path,
+                                priv->children[child_index]->name,
+                                strerror (op_errno));
+
+                        sh->op_failed = 1;
+                }
         }
+        UNLOCK (&sh_frame->lock);
 
-        call_count = afr_frame_return (loop_frame);
+        call_count = afr_frame_return (rw_frame);
 
         if (call_count == 0) {
-		iobref_unref(loop_local->cont.writev.iobref);
-
-                sh_loop_return (sh_frame, this, loop_frame,
-                                loop_sh->op_ret, loop_sh->op_errno);
+                sh_diff_loop_return (rw_frame, this, loop_state);
         }
 
         return 0;
 }
 
-static void
-sh_prune_writes_needed (call_frame_t *sh_frame, call_frame_t *loop_frame,
-                        afr_private_t *priv)
-{
-        afr_local_t     *sh_local     = NULL;
-        afr_self_heal_t *sh           = NULL;
-        afr_local_t     *loop_local   = NULL;
-        afr_self_heal_t *loop_sh      = NULL;
-        int             i             = 0;
-
-        sh_local   = sh_frame->local;
-        sh         = &sh_local->self_heal;
-
-        if (!strcmp (sh->algo->name, "diff"))
-                return;
-
-        loop_local = loop_frame->local;
-        loop_sh    = &loop_local->self_heal;
-
-        /* full self-heal guarantees there exists atleast 1 file with size 0
-         * That means for other files we can preserve holes that come after
-         * its size before 'trim'
-         */
-        for (i = 0; i < priv->child_count; i++) {
-                if (loop_sh->write_needed[i] &&
-                    ((loop_sh->offset + 1) > sh->buf[i].ia_size))
-                        loop_sh->write_needed[i] = 0;
-        }
-}
 
 static int
-sh_loop_read_cbk (call_frame_t *loop_frame, void *cookie,
+sh_diff_read_cbk (call_frame_t *rw_frame, void *cookie,
                   xlator_t *this, int32_t op_ret, int32_t op_errno,
                   struct iovec *vector, int32_t count, struct iatt *buf,
-                  struct iobref *iobref, dict_t *xdata)
+                  struct iobref *iobref)
 {
         afr_private_t *               priv       = NULL;
-        afr_local_t *                 loop_local   = NULL;
-        afr_self_heal_t *             loop_sh      = NULL;
+        afr_local_t *                 rw_local   = NULL;
+        afr_self_heal_t *             rw_sh      = NULL;
+        afr_sh_algo_diff_private_t *  sh_priv    = NULL;
         call_frame_t                 *sh_frame   = NULL;
+        afr_local_t *                 sh_local   = NULL;
+        afr_self_heal_t              *sh         = NULL;
+        int                           loop_index = 0;
+        struct sh_diff_loop_state    *loop_state = NULL;
+        uint32_t                      wcookie    = 0;
         int                           i          = 0;
         int                           call_count = 0;
-        afr_local_t *                 sh_local   = NULL;
-        afr_self_heal_t *             sh      = NULL;
 
-        priv       = this->private;
-        loop_local = loop_frame->local;
-        loop_sh    = &loop_local->self_heal;
+        priv     = this->private;
+        rw_local = rw_frame->local;
+        rw_sh    = &rw_local->self_heal;
 
-        sh_frame = loop_sh->sh_frame;
+        sh_frame = rw_sh->sh_frame;
         sh_local = sh_frame->local;
         sh       = &sh_local->self_heal;
+        sh_priv  = sh->private;
+
+        loop_index = __loop_index ((uint32_t) (long) cookie);
+        loop_state = sh_priv->loops[loop_index];
+
+        call_count = sh_diff_number_of_writes_needed (loop_state->write_needed,
+                                                      priv->child_count);
+
+        rw_local->call_count = call_count;
 
         gf_log (this->name, GF_LOG_TRACE,
                 "read %d bytes of data from %s, offset %"PRId64"",
-                op_ret, loop_local->loc.path, loop_sh->offset);
+                op_ret, sh_local->loc.path, loop_state->offset);
 
-        if (op_ret <= 0) {
-                if (op_ret < 0) {
-                        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                        gf_log (this->name, GF_LOG_ERROR, "read failed on %d "
-                                "for %s reason :%s", sh->source,
-                                sh_local->loc.path, strerror (errno));
-                } else {
-                        sh->eof_reached = _gf_true;
-                        gf_log (this->name, GF_LOG_DEBUG, "Eof reached for %s",
-                                sh_local->loc.path);
-                }
-                sh_loop_return (sh_frame, this, loop_frame, op_ret, op_errno);
-                goto out;
-        }
-
-        if (loop_sh->file_has_holes && iov_0filled (vector, count) == 0)
-                sh_prune_writes_needed (sh_frame, loop_frame, priv);
+        if ((op_ret <= 0) ||
+            (call_count == 0)) {
+                sh_diff_loop_return (rw_frame, this, loop_state);
 
-        call_count = sh_number_of_writes_needed (loop_sh->write_needed,
-                                                 priv->child_count);
-        if (call_count == 0) {
-                sh_loop_return (sh_frame, this, loop_frame, 0, 0);
-                goto out;
+                return 0;
         }
 
-        loop_local->call_count = call_count;
-
-	/*
-	 * We only really need the request size at the moment, but the buffer
-	 * is required if we want to issue a retry in the event of a short write.
-	 * Therefore, we duplicate the vector and ref the iobref here...
-	 */
-	loop_local->cont.writev.vector = iov_dup(vector, count);
-	loop_local->cont.writev.iobref = iobref_ref(iobref);
+        if (sh->file_has_holes) {
+                if (iov_0filled (vector, count) == 0) {
+                        gf_log (this->name, GF_LOG_DEBUG, "0 filled block");
+                        sh_diff_loop_return (rw_frame, this, loop_state);
+                        goto out;
+                }
+        }
 
         for (i = 0; i < priv->child_count; i++) {
-                if (!loop_sh->write_needed[i])
-                        continue;
-                STACK_WIND_COOKIE (loop_frame, sh_loop_write_cbk,
-                                   (void *) (long) i,
-                                   priv->children[i],
-                                   priv->children[i]->fops->writev,
-                                   loop_sh->healing_fd, vector, count,
-                                   loop_sh->offset, 0, iobref, NULL);
+                if (loop_state->write_needed[i]) {
+                        wcookie = __make_cookie (loop_index, i);
 
-                if (!--call_count)
-                        break;
+                        STACK_WIND_COOKIE (rw_frame, sh_diff_write_cbk,
+                                           (void *) (long) wcookie,
+                                           priv->children[i],
+                                           priv->children[i]->fops->writev,
+                                           sh->healing_fd, vector, count,
+                                           loop_state->offset, iobref);
+
+                        if (!--call_count)
+                                break;
+                }
         }
 
 out:
@@ -569,79 +699,101 @@ out:
 
 
 static int
-sh_loop_read (call_frame_t *loop_frame, xlator_t *this)
+sh_diff_read (call_frame_t *rw_frame, xlator_t *this,
+              int loop_index)
 {
-        afr_private_t           *priv       = NULL;
-        afr_local_t             *loop_local   = NULL;
-        afr_self_heal_t         *loop_sh      = NULL;
+        afr_private_t *               priv       = NULL;
+        afr_local_t *                 rw_local   = NULL;
+        afr_self_heal_t *             rw_sh      = NULL;
+        afr_sh_algo_diff_private_t *  sh_priv    = NULL;
+        struct sh_diff_loop_state    *loop_state = NULL;
+        call_frame_t                 *sh_frame   = NULL;
+        afr_local_t *                 sh_local   = NULL;
+        afr_self_heal_t              *sh         = NULL;
+        uint32_t                      cookie     = 0;
 
         priv     = this->private;
-        loop_local = loop_frame->local;
-        loop_sh    = &loop_local->self_heal;
+        rw_local = rw_frame->local;
+        rw_sh    = &rw_local->self_heal;
 
-        STACK_WIND_COOKIE (loop_frame, sh_loop_read_cbk,
-                           (void *) (long) loop_sh->source,
-                           priv->children[loop_sh->source],
-                           priv->children[loop_sh->source]->fops->readv,
-                           loop_sh->healing_fd, loop_sh->block_size,
-                           loop_sh->offset, 0, NULL);
+        sh_frame = rw_sh->sh_frame;
+        sh_local = sh_frame->local;
+        sh       = &sh_local->self_heal;
+        sh_priv  = sh->private;
+
+        loop_state = sh_priv->loops[loop_index];
+
+        cookie = __make_cookie (loop_index, sh->source);
+
+        STACK_WIND_COOKIE (rw_frame, sh_diff_read_cbk,
+                           (void *) (long) cookie,
+                           priv->children[sh->source],
+                           priv->children[sh->source]->fops->readv,
+                           sh->healing_fd, sh_priv->block_size,
+                           loop_state->offset);
 
         return 0;
 }
 
 
 static int
-sh_diff_checksum_cbk (call_frame_t *loop_frame, void *cookie, xlator_t *this,
+sh_diff_checksum_cbk (call_frame_t *rw_frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno,
-                      uint32_t weak_checksum, uint8_t *strong_checksum,
-                      dict_t *xdata)
+                      uint32_t weak_checksum, uint8_t *strong_checksum)
 {
-        afr_private_t                 *priv         = NULL;
-        afr_local_t                   *loop_local   = NULL;
-        afr_self_heal_t               *loop_sh      = NULL;
-        call_frame_t                  *sh_frame     = NULL;
-        afr_local_t                   *sh_local     = NULL;
-        afr_self_heal_t               *sh           = NULL;
-        afr_sh_algo_private_t         *sh_priv      = NULL;
+        afr_private_t *               priv         = NULL;
+        afr_local_t *                 rw_local     = NULL;
+        afr_self_heal_t              *rw_sh        = NULL;
+        call_frame_t                 *sh_frame     = NULL;
+        afr_local_t *                 sh_local     = NULL;
+        afr_self_heal_t              *sh           = NULL;
+        afr_sh_algo_diff_private_t *  sh_priv      = NULL;
+        int                           loop_index   = 0;
         int                           child_index  = 0;
+        struct sh_diff_loop_state    *loop_state   = NULL;
         int                           call_count   = 0;
         int                           i            = 0;
         int                           write_needed = 0;
 
         priv  = this->private;
 
-        loop_local = loop_frame->local;
-        loop_sh    = &loop_local->self_heal;
+        rw_local = rw_frame->local;
+        rw_sh    = &rw_local->self_heal;
 
-        sh_frame = loop_sh->sh_frame;
+        sh_frame = rw_sh->sh_frame;
         sh_local = sh_frame->local;
         sh       = &sh_local->self_heal;
 
         sh_priv = sh->private;
 
-        child_index = (long) cookie;
+        child_index = __child_index ((uint32_t) (long) cookie);
+        loop_index  = __loop_index ((uint32_t) (long) cookie);
+
+        loop_state  = sh_priv->loops[loop_index];
 
         if (op_ret < 0) {
                 gf_log (this->name, GF_LOG_ERROR,
                         "checksum on %s failed on subvolume %s (%s)",
                         sh_local->loc.path, priv->children[child_index]->name,
                         strerror (op_errno));
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+
+                sh->op_failed = 1;
         } else {
-                memcpy (loop_sh->checksum + child_index * MD5_DIGEST_LENGTH,
-                        strong_checksum, MD5_DIGEST_LENGTH);
+                memcpy (loop_state->checksum + child_index * MD5_DIGEST_LEN,
+                        strong_checksum,
+                        MD5_DIGEST_LEN);
         }
 
-        call_count = afr_frame_return (loop_frame);
+        call_count = afr_frame_return (rw_frame);
 
         if (call_count == 0) {
                 for (i = 0; i < priv->child_count; i++) {
                         if (sh->sources[i] || !sh_local->child_up[i])
                                 continue;
 
-                        if (memcmp (loop_sh->checksum + (i * MD5_DIGEST_LENGTH),
-                                    loop_sh->checksum + (sh->source * MD5_DIGEST_LENGTH),
-                                    MD5_DIGEST_LENGTH)) {
+                        if (memcmp (loop_state->checksum + (i * MD5_DIGEST_LEN),
+                                    loop_state->checksum + (sh->source * MD5_DIGEST_LEN),
+                                    MD5_DIGEST_LEN)) {
                                 /*
                                   Checksums differ, so this block
                                   must be written to this sink
@@ -650,9 +802,9 @@ sh_diff_checksum_cbk (call_frame_t *loop_frame, void *cookie, xlator_t *this,
                                 gf_log (this->name, GF_LOG_DEBUG,
                                         "checksum on subvolume %s at offset %"
                                         PRId64" differs from that on source",
-                                        priv->children[i]->name, loop_sh->offset);
+                                        priv->children[i]->name, loop_state->offset);
 
-                                write_needed = loop_sh->write_needed[i] = 1;
+                                write_needed = loop_state->write_needed[i] = 1;
                         }
                 }
 
@@ -664,172 +816,273 @@ sh_diff_checksum_cbk (call_frame_t *loop_frame, void *cookie, xlator_t *this,
                 }
                 UNLOCK (&sh_priv->lock);
 
-                if (write_needed &&
-                    !is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
-                        sh_loop_read (loop_frame, this);
+                if (write_needed && !sh->op_failed) {
+                        sh_diff_read (rw_frame, this, loop_index);
                 } else {
-                        sh_loop_return (sh_frame, this, loop_frame,
-                                        op_ret, op_errno);
+                        sh->offset += sh_priv->block_size;
+
+                        sh_diff_loop_return (rw_frame, this, loop_state);
                 }
         }
 
         return 0;
 }
 
+
 static int
-sh_diff_checksum (call_frame_t *loop_frame, xlator_t *this)
+sh_diff_find_unused_loop (afr_sh_algo_diff_private_t *sh_priv, int max)
 {
-        afr_private_t           *priv         = NULL;
-        afr_local_t             *loop_local   = NULL;
-        afr_self_heal_t         *loop_sh      = NULL;
-        int                     call_count    = 0;
-        int                     i             = 0;
+        int i = 0;
 
-        priv         = this->private;
-        loop_local   = loop_frame->local;
-        loop_sh      = &loop_local->self_heal;
+        LOCK (&sh_priv->lock);
+        {
+                for (i = 0; i < max; i++) {
+                        if (sh_priv->loops[i]->active == _gf_false) {
+                                sh_priv->loops[i]->active = _gf_true;
+                                break;
+                        }
+                }
+        }
+        UNLOCK (&sh_priv->lock);
+
+        if (i == max) {
+                gf_log ("[sh-diff]", GF_LOG_ERROR,
+                        "no free loops found! This shouldn't happen. Please"
+                        " report this to gluster-devel@nongnu.org");
+        }
+
+        return i;
+}
+
+
+static int
+sh_diff_checksum (call_frame_t *frame, xlator_t *this, off_t offset)
+{
+        afr_private_t *               priv       = NULL;
+        afr_local_t *                 local      = NULL;
+        afr_local_t *                 rw_local   = NULL;
+        afr_self_heal_t *             sh         = NULL;
+        afr_self_heal_t *             rw_sh      = NULL;
+        afr_sh_algo_diff_private_t *  sh_priv    = NULL;
+        call_frame_t                 *rw_frame   = NULL;
+        uint32_t                      cookie     = 0;
+        int                           loop_index = 0;
+        struct sh_diff_loop_state    *loop_state = NULL;
+        int32_t                       op_errno   = 0;
+        int                           call_count = 0;
+        int                           i          = 0;
+
+        priv    = this->private;
+        local   = frame->local;
+        sh      = &local->self_heal;
+
+        sh_priv = sh->private;
+
+        rw_frame = copy_frame (frame);
+        if (!rw_frame)
+                goto out;
+
+        ALLOC_OR_GOTO (rw_local, afr_local_t, out);
+
+        rw_frame->local = rw_local;
+        rw_sh           = &rw_local->self_heal;
+
+        rw_sh->offset       = sh->offset;
+        rw_sh->sh_frame     = frame;
+
+        call_count = sh->active_sinks + 1;  /* sinks and source */
+
+        rw_local->call_count = call_count;
 
-        call_count = loop_sh->active_sinks + 1;  /* sinks and source */
+        loop_index = sh_diff_find_unused_loop (sh_priv, priv->data_self_heal_window_size);
 
-        loop_local->call_count = call_count;
+        loop_state = sh_priv->loops[loop_index];
+        loop_state->offset       = offset;
 
-        STACK_WIND_COOKIE (loop_frame, sh_diff_checksum_cbk,
-                           (void *) (long) loop_sh->source,
-                           priv->children[loop_sh->source],
-                           priv->children[loop_sh->source]->fops->rchecksum,
-                           loop_sh->healing_fd,
-                           loop_sh->offset, loop_sh->block_size, NULL);
+        /* we need to send both the loop index and child index,
+           so squeeze them both into a 32-bit number */
+
+        cookie = __make_cookie (loop_index, sh->source);
+
+        STACK_WIND_COOKIE (rw_frame, sh_diff_checksum_cbk,
+                           (void *) (long) cookie,
+                           priv->children[sh->source],
+                           priv->children[sh->source]->fops->rchecksum,
+                           sh->healing_fd,
+                           offset, sh_priv->block_size);
 
         for (i = 0; i < priv->child_count; i++) {
-                if (loop_sh->sources[i] || !loop_local->child_up[i])
+                if (sh->sources[i] || !local->child_up[i])
                         continue;
 
-                STACK_WIND_COOKIE (loop_frame, sh_diff_checksum_cbk,
-                                   (void *) (long) i,
+                cookie = __make_cookie (loop_index, i);
+
+                STACK_WIND_COOKIE (rw_frame, sh_diff_checksum_cbk,
+                                   (void *) (long) cookie,
                                    priv->children[i],
                                    priv->children[i]->fops->rchecksum,
-                                   loop_sh->healing_fd,
-                                   loop_sh->offset, loop_sh->block_size, NULL);
+                                   sh->healing_fd,
+                                   offset, sh_priv->block_size);
 
                 if (!--call_count)
                         break;
         }
 
         return 0;
+
+out:
+        sh->op_failed = 1;
+
+        sh_diff_loop_driver (frame, this, _gf_false, loop_state);
+
+        return 0;
 }
 
+
 static int
-sh_full_read_write_to_sinks (call_frame_t *loop_frame, xlator_t *this)
+sh_diff_loop_driver (call_frame_t *frame, xlator_t *this,
+                     gf_boolean_t is_first_call,
+                     struct sh_diff_loop_state *loop_state)
 {
-        afr_private_t           *priv         = NULL;
-        afr_local_t             *loop_local   = NULL;
-        afr_self_heal_t         *loop_sh      = NULL;
-        int                     i             = 0;
+        afr_private_t *             priv           = NULL;
+        afr_local_t *               local          = NULL;
+        afr_self_heal_t *           sh             = NULL;
+        afr_sh_algo_diff_private_t *sh_priv        = NULL;
+        gf_boolean_t                is_driver_done = _gf_false;
+        blksize_t                   block_size     = 0;
+        int                         loop           = 0;
+        off_t                       offset         = 0;
+        char                        sh_type_str[256] = {0,};
 
-        priv         = this->private;
-        loop_local   = loop_frame->local;
-        loop_sh      = &loop_local->self_heal;
+        priv    = this->private;
+        local   = frame->local;
+        sh      = &local->self_heal;
+        sh_priv = sh->private;
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (loop_sh->sources[i] || !loop_local->child_up[i])
-                        continue;
-                loop_sh->write_needed[i] = 1;
+        afr_self_heal_type_str_get(sh, sh_type_str, sizeof(sh_type_str));
+
+        LOCK (&sh_priv->lock);
+        {
+                if (loop_state)
+                        sh_diff_loop_state_reset (loop_state, priv->child_count);
+                if (_gf_false == is_first_call)
+                        sh_priv->loops_running--;
+                offset = sh_priv->offset;
+                block_size = sh_priv->block_size;
+                while ((0 == sh->op_failed) &&
+                       (sh_priv->loops_running < priv->data_self_heal_window_size)
+                       && (sh_priv->offset < sh->file_size)) {
+
+                        loop++;
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "spawning a loop for offset %"PRId64,
+                                sh_priv->offset);
+
+                        sh_priv->offset += sh_priv->block_size;
+                        sh_priv->loops_running++;
+
+                        if (_gf_false == is_first_call)
+                                break;
+
+                }
+                if (0 == sh_priv->loops_running) {
+                        is_driver_done = _gf_true;
+                }
+        }
+        UNLOCK (&sh_priv->lock);
+
+        while (loop--) {
+                if (sh->op_failed) {
+                        // op failed in other loop, stop spawning more loops
+                        sh_diff_loop_driver (frame, this, _gf_false, NULL);
+                } else {
+                        sh_diff_checksum (frame, this, offset);
+                        offset += block_size;
+                }
+        }
+
+        if (is_driver_done) {
+                sh_diff_loop_driver_done (frame, this);
         }
-        sh_loop_read (loop_frame, this);
         return 0;
 }
 
-afr_sh_algo_private_t*
-afr_sh_priv_init ()
+
+int
+afr_sh_algo_diff (call_frame_t *frame, xlator_t *this)
 {
-        afr_sh_algo_private_t   *sh_priv = NULL;
+        afr_private_t *             priv    = NULL;
+        afr_local_t *               local   = NULL;
+        afr_self_heal_t *           sh      = NULL;
+        afr_sh_algo_diff_private_t *sh_priv = NULL;
+        int                         i       = 0;
+
+        priv  = this->private;
+        local = frame->local;
+        sh    = &local->self_heal;
 
         sh_priv = GF_CALLOC (1, sizeof (*sh_priv),
                              gf_afr_mt_afr_private_t);
         if (!sh_priv)
-                goto out;
+                goto err;
 
-        LOCK_INIT (&sh_priv->lock);
-out:
-        return sh_priv;
-}
-
-int
-afr_sh_transfer_lock (call_frame_t *dst, call_frame_t *src, char *dom,
-                      unsigned int child_count)
-{
-        afr_local_t             *dst_local   = NULL;
-        afr_self_heal_t         *dst_sh      = NULL;
-        afr_local_t             *src_local   = NULL;
-        afr_self_heal_t         *src_sh      = NULL;
-        int                     ret          = -1;
-
-        dst_local = dst->local;
-        dst_sh = &dst_local->self_heal;
-        src_local = src->local;
-        src_sh = &src_local->self_heal;
-        GF_ASSERT (src_sh->data_lock_held);
-        GF_ASSERT (!dst_sh->data_lock_held);
-        ret = afr_lk_transfer_datalock (dst, src, dom, child_count);
-        if (ret)
-                return ret;
-        src_sh->data_lock_held = _gf_false;
-        dst_sh->data_lock_held = _gf_true;
-        return 0;
-}
+        sh_priv->block_size = this->ctx->page_size;
 
-int
-afr_sh_start_loops (call_frame_t *sh_frame, xlator_t *this,
-                    afr_sh_algo_fn sh_data_algo_start)
-{
-        call_frame_t            *first_loop_frame = NULL;
-        afr_local_t             *local   = NULL;
-        afr_self_heal_t         *sh      = NULL;
-        int                     ret      = 0;
-        afr_private_t           *priv    = NULL;
+        sh->private = sh_priv;
 
-        local = sh_frame->local;
-        sh    = &local->self_heal;
-        priv  = this->private;
+        LOCK_INIT (&sh_priv->lock);
 
-        sh->sh_data_algo_start = sh_data_algo_start;
         local->call_count = 0;
-        ret = sh_loop_frame_create (sh_frame, this, NULL, &first_loop_frame);
-        if (ret)
-                goto out;
-        ret = afr_sh_transfer_lock (first_loop_frame, sh_frame, this->name,
-                                    priv->child_count);
-        if (ret)
-                goto out;
-        sh->private = afr_sh_priv_init ();
-        if (!sh->private) {
-                ret = -1;
-                goto out;
-        }
-        sh_loop_driver (sh_frame, this, _gf_true, first_loop_frame);
-        ret = 0;
-out:
-        if (ret) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                sh_loop_driver_done (sh_frame, this, NULL);
+
+        sh_priv->loops = GF_CALLOC (priv->data_self_heal_window_size,
+                                    sizeof (*sh_priv->loops),
+                                    gf_afr_mt_sh_diff_loop_state);
+        if (!sh_priv->loops)
+                goto err;
+
+        for (i = 0; i < priv->data_self_heal_window_size; i++) {
+                sh_priv->loops[i]               = GF_CALLOC (1, sizeof (*sh_priv->loops[i]),
+                                                             gf_afr_mt_sh_diff_loop_state);
+                if (!sh_priv->loops[i])
+                        goto err;
+
+                sh_priv->loops[i]->checksum     = GF_CALLOC (priv->child_count,
+                                                             MD5_DIGEST_LEN, gf_afr_mt_uint8_t);
+                if (!sh_priv->loops[i]->checksum)
+                        goto err;
+
+                sh_priv->loops[i]->write_needed = GF_CALLOC (priv->child_count,
+                                                             sizeof (*sh_priv->loops[i]->write_needed),
+                                                             gf_afr_mt_char);
+                if (!sh_priv->loops[i]->write_needed)
+                        goto err;
+
         }
-        return 0;
-}
 
-int
-afr_sh_algo_diff (call_frame_t *sh_frame, xlator_t *this)
-{
-        afr_sh_start_loops (sh_frame, this, sh_diff_checksum);
+        sh_diff_loop_driver (frame, this, _gf_true, NULL);
+
         return 0;
-}
+err:
+        if (sh_priv) {
+                if (sh_priv->loops) {
+                        for (i = 0; i < priv->data_self_heal_window_size; i++) {
+                                if (sh_priv->loops[i]->write_needed)
+                                        GF_FREE (sh_priv->loops[i]->write_needed);
+                                if (sh_priv->loops[i]->checksum)
+                                        GF_FREE (sh_priv->loops[i]->checksum);
+                                if (sh_priv->loops[i])
+                                        GF_FREE (sh_priv->loops[i]);
+                        }
 
-int
-afr_sh_algo_full (call_frame_t *sh_frame, xlator_t *this)
-{
-        afr_sh_start_loops (sh_frame, this, sh_full_read_write_to_sinks);
+                        GF_FREE (sh_priv->loops);
+                }
+
+                GF_FREE (sh_priv);
+        }
         return 0;
 }
 
+
 struct afr_sh_algorithm afr_self_heal_algorithms[] = {
         {.name = "full",  .fn = afr_sh_algo_full},
         {.name = "diff",  .fn = afr_sh_algo_diff},
diff --git a/xlators/cluster/afr/src/afr-self-heal-algorithm.h b/xlators/cluster/afr/src/afr-self-heal-algorithm.h
index 6b20789b1..2790dbc6a 100644
--- a/xlators/cluster/afr/src/afr-self-heal-algorithm.h
+++ b/xlators/cluster/afr/src/afr-self-heal-algorithm.h
@@ -1,16 +1,26 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
+   Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __AFR_SELF_HEAL_ALGORITHM_H__
 #define __AFR_SELF_HEAL_ALGORITHM_H__
 
+
 typedef int (*afr_sh_algo_fn) (call_frame_t *frame,
                                xlator_t *this);
 
@@ -20,13 +30,31 @@ struct afr_sh_algorithm {
 };
 
 extern struct afr_sh_algorithm afr_self_heal_algorithms[3];
+
 typedef struct {
         gf_lock_t lock;
         unsigned int loops_running;
         off_t offset;
+} afr_sh_algo_full_private_t;
+
+struct sh_diff_loop_state {
+        off_t   offset;
+        unsigned char *write_needed;
+        uint8_t *checksum;
+        gf_boolean_t active;
+};
+
+typedef struct {
+        size_t block_size;
+
+        gf_lock_t lock;
+        unsigned int loops_running;
+        off_t offset;
 
         int32_t total_blocks;
         int32_t diff_blocks;
-} afr_sh_algo_private_t;
+
+        struct sh_diff_loop_state **loops;
+} afr_sh_algo_diff_private_t;
 
 #endif /* __AFR_SELF_HEAL_ALGORITHM_H__ */
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
index ef92b4205..377c72a88 100644
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include "glusterfs.h"
@@ -18,52 +27,6 @@
 #include "afr-self-heal.h"
 #include "pump.h"
 
-#define ADD_FMT_STRING(msg, off, sh_str, status, print_log)                 \
-        do {                                                                \
-                if (AFR_SELF_HEAL_NOT_ATTEMPTED != status) {                \
-                        off += snprintf (msg + off, sizeof (msg) - off,     \
-                                         " "sh_str" self heal %s,",         \
-                                         get_sh_completion_status (status));\
-                        print_log = 1;                                      \
-                }                                                           \
-        } while (0)
-
-#define ADD_FMT_STRING_SYNC(msg, off, sh_str, status, print_log)            \
-        do {                                                                \
-                if (AFR_SELF_HEAL_SYNC_BEGIN == status ||                   \
-                    AFR_SELF_HEAL_FAILED == status)  {                      \
-                        off += snprintf (msg + off, sizeof (msg) - off,     \
-                                         " "sh_str" self heal %s,",         \
-                                         get_sh_completion_status (status));\
-                        print_log = 1;                                      \
-                }                                                           \
-        } while (0)
-
-
-void
-afr_sh_reset (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh = NULL;
-        afr_private_t   *priv = NULL;
-
-        local = frame->local;
-        sh = &local->self_heal;
-        priv = this->private;
-
-        memset (sh->child_errno, 0,
-                sizeof (*sh->child_errno) * priv->child_count);
-        memset (sh->buf, 0, sizeof (*sh->buf) * priv->child_count);
-        memset (sh->parentbufs, 0,
-                sizeof (*sh->parentbufs) * priv->child_count);
-        memset (sh->success, 0, sizeof (*sh->success) * priv->child_count);
-        memset (sh->locked_nodes, 0,
-                sizeof (*sh->locked_nodes) * priv->child_count);
-        sh->active_sinks = 0;
-
-        afr_reset_xattr (sh->xattr, priv->child_count);
-}
-
 //Intersection[child]=1 if child is part of intersection
 void
 afr_children_intersection_get (int32_t *set1, int32_t *set2,
@@ -94,28 +57,20 @@ afr_sh_select_source (int sources[], int child_count)
         return -1;
 }
 
-void
-afr_sh_mark_source_sinks (call_frame_t *frame, xlator_t *this)
-{
-        int              i = 0;
-        afr_local_t     *local      = NULL;
-        afr_self_heal_t *sh = NULL;
-        afr_private_t   *priv = NULL;
-        int              active_sinks = 0;
 
-        local = frame->local;
-        sh = &local->self_heal;
-        priv = this->private;
+/**
+ * sink_count - return number of sinks in sources array
+ */
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (sh->sources[i] == 0 && local->child_up[i] == 1) {
-                        active_sinks++;
-                        sh->success[i] = 1;
-                } else if (sh->sources[i] == 1 && local->child_up[i] == 1) {
-                        sh->success[i] = 1;
-                }
-        }
-        sh->active_sinks = active_sinks;
+int
+afr_sh_sink_count (int sources[], int child_count)
+{
+        int i = 0;
+        int sinks = 0;
+        for (i = 0; i < child_count; i++)
+                if (!sources[i])
+                        sinks++;
+        return sinks;
 }
 
 int
@@ -134,8 +89,8 @@ void
 afr_sh_set_error (afr_self_heal_t *sh, int32_t op_errno)
 {
         sh->op_ret = -1;
-	sh->op_errno = afr_most_important_error(sh->op_errno, op_errno,
-						_gf_false);
+        if (afr_error_more_important (sh->op_errno, op_errno))
+                sh->op_errno = op_errno;
 }
 
 void
@@ -157,85 +112,13 @@ afr_sh_print_pending_matrix (int32_t *pending_matrix[], xlator_t *this)
                         ptr += sprintf (ptr, "%d ", pending_matrix[i][j]);
                 }
                 sprintf (ptr, "]");
-                gf_log (this->name, GF_LOG_DEBUG, "pending_matrix: %s", buf);
+                gf_log (this->name, GF_LOG_TRACE,
+                        "pending_matrix: %s", buf);
         }
 
         GF_FREE (buf);
 }
 
-char*
-afr_get_pending_matrix_str (int32_t *pending_matrix[], xlator_t *this)
-{
-        afr_private_t *  priv = this->private;
-        char            *buf  = NULL;
-        char            *ptr  = NULL;
-        int              i    = 0;
-        int              j    = 0;
-        int             child_count = priv->child_count;
-        char            *matrix_begin = "[ [ ";
-        char            *matrix_end = "] ]";
-        char            *seperator = "] [ ";
-        int             pending_entry_strlen = 12; //Including space after entry
-        int             matrix_begin_strlen = 0;
-        int             matrix_end_strlen = 0;
-        int             seperator_strlen = 0;
-        int             string_length = 0;
-        char            *msg = "- Pending matrix:  ";
-
-        /*
-         *  for a list of lists of [ [ a b ] [ c d ] ]
-         * */
-
-        matrix_begin_strlen = strlen (matrix_begin);
-        matrix_end_strlen = strlen (matrix_end);
-        seperator_strlen = strlen (seperator);
-        string_length = matrix_begin_strlen + matrix_end_strlen
-                        + (child_count -1) * seperator_strlen
-                        + (child_count * child_count * pending_entry_strlen);
-
-        buf = GF_CALLOC (1, 1 + strlen (msg) + string_length , gf_afr_mt_char);
-        if (!buf)
-                goto out;
-
-        ptr = buf;
-        ptr += sprintf (ptr, "%s", msg);
-        ptr += sprintf (ptr, "%s", matrix_begin);
-        for (i = 0; i < priv->child_count; i++) {
-                for (j = 0; j < priv->child_count; j++) {
-                        ptr += sprintf (ptr, "%d ", pending_matrix[i][j]);
-                }
-                if (i < priv->child_count -1)
-                        ptr += sprintf (ptr, "%s", seperator);
-        }
-
-        ptr += sprintf (ptr, "%s", matrix_end);
-
-out:
-        return buf;
-}
-
-void
-afr_sh_print_split_brain_log (int32_t *pending_matrix[], xlator_t *this,
-                              const char *loc)
-{
-        char *buf      = NULL;
-        char *free_ptr = NULL;
-
-        buf = afr_get_pending_matrix_str (pending_matrix, this);
-        if (buf)
-                free_ptr = buf;
-        else
-                buf = "";
-
-
-        gf_log (this->name, GF_LOG_ERROR, "Unable to self-heal contents of '%s'"
-                " (possible split-brain). Please delete the file from all but "
-                "the preferred subvolume.%s", loc, buf);
-        GF_FREE (free_ptr);
-        return;
-}
-
-
 void
 afr_init_pending_matrix (int32_t **pending_matrix, size_t child_count)
 {
@@ -274,7 +157,6 @@ afr_mark_ignorant_subvols_as_pending (int32_t **pending_matrix,
 
 int
 afr_build_pending_matrix (char **pending_key, int32_t **pending_matrix,
-                          unsigned char *ignorant_subvols,
                           dict_t *xattr[], afr_transaction_type type,
                           size_t child_count)
 {
@@ -285,6 +167,12 @@ afr_build_pending_matrix (char **pending_key, int32_t **pending_matrix,
         int            i                = 0;
         int            j                = 0;
         int            k                = 0;
+        unsigned char *ignorant_subvols = NULL;
+
+        ignorant_subvols = GF_CALLOC (sizeof (*ignorant_subvols), child_count,
+                                      gf_afr_mt_char);
+        if (NULL == ignorant_subvols)
+                goto out;
 
         afr_init_pending_matrix (pending_matrix, child_count);
 
@@ -302,8 +190,7 @@ afr_build_pending_matrix (char **pending_key, int32_t **pending_matrix,
                                  * subvolume.
                                  */
 
-                                if (ignorant_subvols)
-                                        ignorant_subvols[i] = 1;
+                                ignorant_subvols[i] = 1;
                                 continue;
                         }
 
@@ -314,14 +201,19 @@ afr_build_pending_matrix (char **pending_key, int32_t **pending_matrix,
                 }
         }
 
+        afr_mark_ignorant_subvols_as_pending (pending_matrix,
+                                              ignorant_subvols,
+                                              child_count);
+        GF_FREE (ignorant_subvols);
+out:
         return ret;
 }
 
 typedef enum {
-        AFR_NODE_INVALID,
         AFR_NODE_INNOCENT,
         AFR_NODE_FOOL,
         AFR_NODE_WISE,
+        AFR_NODE_INVALID = -1,
 } afr_node_type;
 
 typedef struct {
@@ -401,7 +293,7 @@ afr_sh_wise_nodes_exist (afr_node_character *characters, int child_count)
  * It is 1 if no other wise node accuses it.
  * Only wise nodes with wisdom 1 are sources.
  *
- * If no nodes with wisdom 1 exist, a split-brain has occurred.
+ * If no nodes with wisdom 1 exist, a split-brain has occured.
  */
 
 static void
@@ -501,8 +393,6 @@ afr_find_biggest_witness_among_fools (int32_t *witnesses,
 {
         int i               = 0;
         int biggest_witness = -1;
-        int biggest_witness_idx = -1;
-        int biggest_witness_cnt = -1;
 
         GF_ASSERT (witnesses);
         GF_ASSERT (characters);
@@ -512,21 +402,10 @@ afr_find_biggest_witness_among_fools (int32_t *witnesses,
                 if (characters[i].type != AFR_NODE_FOOL)
                         continue;
 
-                if (biggest_witness < witnesses[i]) {
+                if (biggest_witness < witnesses[i])
                         biggest_witness = witnesses[i];
-			biggest_witness_idx = i;
-			biggest_witness_cnt = 1;
-			continue;
-		}
-
-		if (biggest_witness == witnesses[i])
-			biggest_witness_cnt++;
         }
-
-	if (biggest_witness_cnt != 1)
-		return -1;
-
-        return biggest_witness_idx;
+        return biggest_witness;
 }
 
 int
@@ -554,84 +433,10 @@ afr_mark_fool_as_source_by_witness (int32_t *sources, int32_t *witnesses,
         return nsources;
 }
 
-
-int
-afr_mark_fool_as_source_by_idx (int32_t *sources, int child_count, int idx)
-{
-	if (idx >= 0 && idx < child_count) {
-		sources[idx] = 1;
-		return 1;
-	}
-	return 0;
-}
-
-
-static int
-afr_find_largest_file_size (struct iatt *bufs, int32_t *success_children,
-			    int child_count)
-{
-	int idx = -1;
-	int i = -1;
-	int child = -1;
-	uint64_t max_size = 0;
-        uint64_t min_size = 0;
-        int      num_children = 0;
-
-	for (i = 0; i < child_count; i++) {
-		if (success_children[i] == -1)
-			break;
-
-		child = success_children[i];
-		if (bufs[child].ia_size > max_size) {
-			max_size = bufs[child].ia_size;
-			idx = child;
-		}
-
-                if ((num_children == 0) || (bufs[child].ia_size < min_size)) {
-                        min_size = bufs[child].ia_size;
-                }
-
-                num_children++;
-	}
-
-        /* If sizes are same for all of them, finding sources will have to
-         * happen with pending changelog. So return -1
-         */
-        if ((num_children > 1) && (min_size == max_size))
-                return -1;
-	return idx;
-}
-
-
-static int
-afr_find_newest_file (struct iatt *bufs, int32_t *success_children,
-		      int child_count)
-{
-	int idx = -1;
-	int i = -1;
-	int child = -1;
-	uint64_t max_ctime = 0;
-
-	for (i = 0; i < child_count; i++) {
-		if (success_children[i] == -1)
-			break;
-
-		child = success_children[i];
-		if (bufs[child].ia_ctime > max_ctime) {
-			max_ctime = bufs[child].ia_ctime;
-			idx = child;
-		}
-	}
-
-	return idx;
-}
-
-
 static int
 afr_mark_biggest_of_fools_as_source (int32_t *sources, int32_t **pending_matrix,
                                      afr_node_character *characters,
-				     int32_t *success_children,
-                                     int child_count, struct iatt *bufs)
+                                     int child_count)
 {
         int32_t       biggest_witness = 0;
         int           nsources        = 0;
@@ -639,11 +444,6 @@ afr_mark_biggest_of_fools_as_source (int32_t *sources, int32_t **pending_matrix,
 
         GF_ASSERT (child_count > 0);
 
-	biggest_witness = afr_find_largest_file_size (bufs, success_children,
-						      child_count);
-	if (biggest_witness != -1)
-		goto found;
-
         witnesses = GF_CALLOC (child_count, sizeof (*witnesses),
                                gf_afr_mt_int32_t);
         if (NULL == witnesses) {
@@ -656,34 +456,34 @@ afr_mark_biggest_of_fools_as_source (int32_t *sources, int32_t **pending_matrix,
         biggest_witness = afr_find_biggest_witness_among_fools (witnesses,
                                                                 characters,
                                                                 child_count);
-	if (biggest_witness != -1)
-		goto found;
-
-	biggest_witness = afr_find_newest_file (bufs, success_children,
-						child_count);
-
-found:
-	nsources = afr_mark_fool_as_source_by_idx (sources, child_count,
-						   biggest_witness);
+        nsources = afr_mark_fool_as_source_by_witness (sources, witnesses,
+                                                       characters, child_count,
+                                                       biggest_witness);
 out:
-        GF_FREE (witnesses);
+        if (witnesses)
+                GF_FREE (witnesses);
         return nsources;
 }
 
 int
 afr_mark_child_as_source_by_uid (int32_t *sources, struct iatt *bufs,
-                                 int32_t *success_children,
-                                 unsigned int child_count, uint32_t uid)
+                                 int32_t *valid_children, int child_count,
+                                 uint32_t uid)
 {
         int     i        = 0;
         int     nsources = 0;
         int     child    = 0;
 
+        GF_ASSERT (bufs);
+        GF_ASSERT (valid_children);
+        GF_ASSERT (sources);
+        GF_ASSERT (child_count > 0);
+
         for (i = 0; i < child_count; i++) {
-                if (-1 == success_children[i])
-                        break;
+                if (-1 == valid_children[i])
+                        continue;
 
-                child = success_children[i];
+                child = valid_children[i];
                 if (uid == bufs[child].ia_uid) {
                         sources[child] = 1;
                         nsources++;
@@ -693,17 +493,21 @@ afr_mark_child_as_source_by_uid (int32_t *sources, struct iatt *bufs,
 }
 
 int
-afr_get_child_with_lowest_uid (struct iatt *bufs, int32_t *success_children,
-                               unsigned int child_count)
+afr_get_child_with_lowest_uid (struct iatt *bufs, int32_t *valid_children,
+                               int child_count)
 {
         int     i        = 0;
         int     smallest = -1;
         int     child    = 0;
 
+        GF_ASSERT (bufs);
+        GF_ASSERT (valid_children);
+        GF_ASSERT (child_count > 0);
+
         for (i = 0; i < child_count; i++) {
-                if (-1 == success_children[i])
-                        break;
-                child = success_children[i];
+                if (-1 == valid_children[i])
+                        continue;
+                child = valid_children[i];
                 if ((smallest == -1) ||
                     (bufs[child].ia_uid < bufs[smallest].ia_uid)) {
                         smallest = child;
@@ -713,97 +517,25 @@ afr_get_child_with_lowest_uid (struct iatt *bufs, int32_t *success_children,
 }
 
 static int
-afr_sh_mark_lowest_uid_as_source (struct iatt *bufs, int32_t *success_children,
+afr_sh_mark_lowest_uid_as_source (struct iatt *bufs, int32_t *valid_children,
                                   int child_count, int32_t *sources)
 {
         int   nsources              = 0;
         int   smallest              = 0;
 
-        smallest = afr_get_child_with_lowest_uid (bufs, success_children,
+        smallest = afr_get_child_with_lowest_uid (bufs, valid_children,
                                                   child_count);
         if (smallest < 0) {
                 nsources = -1;
                 goto out;
         }
         nsources = afr_mark_child_as_source_by_uid (sources, bufs,
-                                                    success_children, child_count,
+                                                    valid_children, child_count,
                                                     bufs[smallest].ia_uid);
 out:
         return nsources;
 }
 
-int
-afr_get_no_xattr_dir_read_child (xlator_t *this, int32_t *success_children,
-                                 struct iatt *bufs)
-{
-        afr_private_t *priv = NULL;
-        int            i = 0;
-        int            child = -1;
-        int            read_child = -1;
-
-        priv = this->private;
-        for (i = 0; i < priv->child_count; i++) {
-                child = success_children[i];
-                if (child < 0)
-                        break;
-                if (read_child < 0)
-                        read_child = child;
-                else if (bufs[read_child].ia_size < bufs[child].ia_size)
-                        read_child = child;
-        }
-        return read_child;
-}
-
-int
-afr_sh_mark_zero_size_file_as_sink (struct iatt *bufs, int32_t *success_children,
-                                    int child_count, int32_t *sources)
-{
-        int             nsources = 0;
-        int             i = 0;
-        int             child = 0;
-        gf_boolean_t    sink_exists = _gf_false;
-        gf_boolean_t    source_exists = _gf_false;
-        int             source = -1;
-
-        for (i = 0; i < child_count; i++) {
-                child = success_children[i];
-                if (child < 0)
-                        break;
-                if (!bufs[child].ia_size) {
-                        sink_exists = _gf_true;
-                        continue;
-                }
-                if (!source_exists) {
-                        source_exists = _gf_true;
-                        source = child;
-                        continue;
-                }
-                if (bufs[source].ia_size != bufs[child].ia_size) {
-                        nsources = -1;
-                        goto out;
-                }
-        }
-        if (!source_exists && !sink_exists) {
-                nsources = -1;
-                goto out;
-        }
-
-        if (!source_exists || !sink_exists)
-                goto out;
-
-        for (i = 0; i < child_count; i++) {
-                child = success_children[i];
-                if (child < 0)
-                        break;
-                if (bufs[child].ia_size) {
-                        sources[child] = 1;
-                        nsources++;
-                }
-        }
-out:
-        return nsources;
-}
-
 char *
 afr_get_character_str (afr_node_type type)
 {
@@ -828,10 +560,12 @@ afr_get_character_str (afr_node_type type)
 
 afr_node_type
 afr_find_child_character_type (int32_t *pending_row, int32_t child,
-                               unsigned int child_count)
+                               int32_t child_count, const char *xlator_name)
 {
         afr_node_type type = AFR_NODE_INVALID;
 
+        GF_ASSERT (pending_row);
+        GF_ASSERT (child_count > 0);
         GF_ASSERT ((child >= 0) && (child < child_count));
 
         if (afr_sh_is_innocent (pending_row, child_count))
@@ -840,6 +574,11 @@ afr_find_child_character_type (int32_t *pending_row, int32_t child,
                 type = AFR_NODE_FOOL;
         else if (afr_sh_is_wise (pending_row, child, child_count))
                 type = AFR_NODE_WISE;
+        else
+                GF_ASSERT (0);
+
+        gf_log (xlator_name, GF_LOG_DEBUG, "child %d character %s",
+                child, afr_get_character_str (type));
         return type;
 }
 
@@ -847,78 +586,46 @@ int
 afr_build_sources (xlator_t *this, dict_t **xattr, struct iatt *bufs,
                    int32_t **pending_matrix, int32_t *sources,
                    int32_t *success_children, afr_transaction_type type,
-                   int32_t *subvol_status, gf_boolean_t ignore_ignorant)
+                   afr_source_flags_t *flags)
 {
         afr_private_t           *priv = NULL;
         afr_self_heal_type      sh_type    = AFR_SELF_HEAL_INVALID;
         int                     nsources   = -1;
-        unsigned char           *ignorant_subvols = NULL;
-        unsigned int            child_count = 0;
 
         priv = this->private;
-        child_count = priv->child_count;
 
         if (afr_get_children_count (success_children, priv->child_count) == 0)
                 goto out;
 
-        if (!ignore_ignorant) {
-                ignorant_subvols = GF_CALLOC (sizeof (*ignorant_subvols),
-                                              child_count, gf_afr_mt_char);
-                if (NULL == ignorant_subvols)
-                        goto out;
-        }
-
         afr_build_pending_matrix (priv->pending_key, pending_matrix,
-                                  ignorant_subvols, xattr, type,
-                                  priv->child_count);
+                                  xattr, type, priv->child_count);
 
-        if (!ignore_ignorant)
-                afr_mark_ignorant_subvols_as_pending (pending_matrix,
-                                                      ignorant_subvols,
-                                                      priv->child_count);
         sh_type = afr_self_heal_type_for_transaction (type);
         if (AFR_SELF_HEAL_INVALID == sh_type)
                 goto out;
 
         afr_sh_print_pending_matrix (pending_matrix, this);
 
-        nsources = afr_mark_sources (this, sources, pending_matrix, bufs,
-                                     sh_type, success_children, subvol_status);
+        nsources = afr_mark_sources (sources, pending_matrix, bufs,
+                                     priv->child_count, sh_type,
+                                     success_children, this->name, flags);
 out:
-        GF_FREE (ignorant_subvols);
         return nsources;
 }
 
 void
-afr_find_character_types (afr_node_character *characters,
-                          int32_t **pending_matrix, int32_t *success_children,
-                          unsigned int child_count)
-{
-        afr_node_type type  = AFR_NODE_INVALID;
-        int           child = 0;
-        int           i     = 0;
-
-        for (i = 0; i < child_count; i++) {
-                child = success_children[i];
-                if (child == -1)
-                        break;
-                type = afr_find_child_character_type (pending_matrix[child],
-                                                      child, child_count);
-                characters[child].type = type;
-        }
-}
-
-void
-afr_mark_success_children_sources (int32_t *sources, int32_t *success_children,
-                                   unsigned int child_count)
+afr_mark_valid_children_sources (int32_t *sources, int32_t *valid_children,
+                                 unsigned int child_count)
 {
         int i = 0;
+        memset (sources, 0, sizeof (*sources) * child_count);
         for (i = 0; i < child_count; i++) {
-                if (success_children[i] == -1)
+                if (valid_children[i] == -1)
                         break;
-                sources[success_children[i]] = 1;
+                sources[valid_children[i]] = 1;
         }
 }
+
 /**
  * mark_sources: Mark all 'source' nodes and return number of source
  * nodes found
@@ -939,23 +646,23 @@ afr_mark_success_children_sources (int32_t *sources, int32_t *success_children,
  * a split-brain. If one wise node refers to the other but the other doesn't
  * refer back, the referrer is a source.
  *
- * All fools are sinks, unless there are no 'wise' nodes. In that case,
- * one of the fools is made a source.
+ * All fools are sinks, unless there are no 'wise' nodes. if 'allfools' is NULL,
+ * biggest fool(s) is/are marked as source.
  */
 
 int
-afr_mark_sources (xlator_t *this, int32_t *sources, int32_t **pending_matrix,
-                  struct iatt *bufs, afr_self_heal_type type,
-                  int32_t *success_children, int32_t *subvol_status)
+afr_mark_sources (int32_t *sources, int32_t **pending_matrix, struct iatt *bufs,
+                  int32_t child_count, afr_self_heal_type type,
+                  int32_t *valid_children, const char *xlator_name,
+                  afr_source_flags_t *flags)
 {
         /* stores the 'characters' (innocent, fool, wise) of the nodes */
+
         afr_node_character *characters =  NULL;
-        int                nsources    = -1;
-        unsigned int       child_count = 0;
-        afr_private_t      *priv       = NULL;
+        int            i              = 0;
+        int            nsources       = -1;
+        xlator_t      *this           = NULL;
 
-        priv = this->private;
-        child_count = priv->child_count;
         characters = GF_CALLOC (sizeof (afr_node_character),
                                 child_count, gf_afr_mt_afr_node_character);
         if (!characters)
@@ -964,29 +671,28 @@ afr_mark_sources (xlator_t *this, int32_t *sources, int32_t **pending_matrix,
         this = THIS;
 
         /* start clean */
-        memset (sources, 0, sizeof (*sources) * child_count);
+        for (i = 0; i < child_count; i++) {
+                sources[i] = 0;
+        }
+
         nsources = 0;
-        afr_find_character_types (characters, pending_matrix, success_children,
-                                  child_count);
-        if (afr_sh_all_nodes_innocent (characters, child_count)) {
-                switch (type) {
-                case AFR_SELF_HEAL_METADATA:
-                        nsources = afr_sh_mark_lowest_uid_as_source (bufs,
-                                                             success_children,
-                                                             child_count,
-                                                             sources);
-                        break;
-                case AFR_SELF_HEAL_DATA:
-                        nsources = afr_sh_mark_zero_size_file_as_sink (bufs,
-                                                             success_children,
+        for (i = 0; i < child_count; i++) {
+                characters[i].type =
+                        afr_find_child_character_type (pending_matrix[i], i,
+                                                       child_count,
+                                                       xlator_name);
+                if (AFR_NODE_INVALID == characters[i].type)
+                        gf_log (xlator_name, GF_LOG_WARNING,
+                                "child %d had invalid xattrs", i);
+        }
+
+        if ((type == AFR_SELF_HEAL_METADATA)
+            && afr_sh_all_nodes_innocent (characters, child_count)) {
+
+                nsources = afr_sh_mark_lowest_uid_as_source (bufs,
+                                                             valid_children,
                                                              child_count,
                                                              sources);
-                        if ((nsources < 0) && subvol_status)
-                                *subvol_status |= SPLIT_BRAIN;
-                        break;
-                default:
-                        break;
-                }
                 goto out;
         }
 
@@ -994,29 +700,36 @@ afr_mark_sources (xlator_t *this, int32_t *sources, int32_t **pending_matrix,
                 afr_sh_compute_wisdom (pending_matrix, characters, child_count);
 
                 if (afr_sh_wise_nodes_conflict (characters, child_count)) {
-                        if (subvol_status)
-                                *subvol_status |= SPLIT_BRAIN;
+                        /* split-brain */
+                        gf_log (this->name, GF_LOG_INFO,
+                                "split-brain possible, no source detected");
+                        if (flags)
+                                *flags |= AFR_SPLIT_BRAIN;
                         nsources = -1;
+
                 } else {
                         nsources = afr_sh_mark_wisest_as_sources (sources,
                                                                   characters,
                                                                   child_count);
                 }
         } else {
-                if (subvol_status)
-                        *subvol_status |= ALL_FOOLS;
+                if (flags) {
+                        *flags |= AFR_ALL_FOOLS;
+                        nsources = -1;
+                        goto out;
+                }
                 nsources = afr_mark_biggest_of_fools_as_source (sources,
                                                                 pending_matrix,
                                                                 characters,
-								success_children,
-                                                                child_count, bufs);
+                                                                child_count);
         }
 
 out:
         if (nsources == 0)
-                afr_mark_success_children_sources (sources, success_children,
-                                                   child_count);
-        GF_FREE (characters);
+                afr_mark_valid_children_sources (sources, valid_children,
+                                                 child_count);
+        if (characters)
+                GF_FREE (characters);
 
         gf_log (this->name, GF_LOG_DEBUG, "Number of sources: %d", nsources);
         return nsources;
@@ -1024,111 +737,84 @@ out:
 
 void
 afr_sh_pending_to_delta (afr_private_t *priv, dict_t **xattr,
-                         int32_t *delta_matrix[], unsigned char success[],
+                         int32_t *delta_matrix[], int success[],
                          int child_count, afr_transaction_type type)
 {
-        int     tgt     = 0;
-        int     src     = 0;
-        int     value   = 0;
-
-        afr_build_pending_matrix (priv->pending_key, delta_matrix, NULL,
-                                  xattr, type, priv->child_count);
+        /* Indexable by result of afr_index_for_transaction_type(): 0 -- 2. */
+        int32_t  pending[3]  = {0,};
+        void    *pending_raw = NULL;
+        int      ret         = 0;
+        int      i           = 0;
+        int      j           = 0;
+        int      k           = 0;
 
-        /*
-         * The algorithm here has two parts.  First, for each subvol indexed
-         * as tgt, we try to figure out what count everyone should have for it.
-         * If the self-heal succeeded, that's easy; the value is zero.
-         * Otherwise, the value is the maximum of the succeeding nodes' counts.
-         * Once we know the value, we loop through (possibly for a second time)
-         * setting each count to the difference so that when we're done all
-         * succeeding nodes will have the same count for tgt.
-         */
-        for (tgt = 0; tgt < priv->child_count; ++tgt) {
-                value = 0;
-                if (!success[tgt]) {
-                        /* Find the maximum. */
-                        for (src = 0; src < priv->child_count; ++src) {
-                                if (!success[src]) {
-                                        continue;
-                                }
-                                if (delta_matrix[src][tgt] > value) {
-                                        value = delta_matrix[src][tgt];
-                                }
-                        }
+        /* start clean */
+        for (i = 0; i < child_count; i++) {
+                for (j = 0; j < child_count; j++) {
+                        delta_matrix[i][j] = 0;
                 }
-                /* Force everyone who succeeded to the chosen value. */
-                for (src = 0; src < priv->child_count; ++src) {
-                        if (success[src]) {
-                                delta_matrix[src][tgt] = value
-                                                       - delta_matrix[src][tgt];
-                        }
-                        else {
-                                delta_matrix[src][tgt] = 0;
+        }
+
+        for (i = 0; i < child_count; i++) {
+                if (pending_raw)
+                        pending_raw = NULL;
+
+                for (j = 0; j < child_count; j++) {
+                        ret = dict_get_ptr (xattr[i], priv->pending_key[j],
+                                            &pending_raw);
+                        if (ret < 0)
+                                gf_log (THIS->name, GF_LOG_DEBUG,
+                                        "Unable to get dict value.");
+                        if (!success[j])
+                                continue;
+
+                        k = afr_index_for_transaction_type (type);
+
+                        if (pending_raw != NULL) {
+                                memcpy (pending, pending_raw, sizeof(pending));
+                                delta_matrix[i][j] = -(ntoh32 (pending[k]));
+                        } else {
+                                delta_matrix[i][j]  = 0;
                         }
+
                 }
         }
 }
 
 
 int
-afr_sh_delta_to_xattr (xlator_t *this,
+afr_sh_delta_to_xattr (afr_private_t *priv,
                        int32_t *delta_matrix[], dict_t *xattr[],
                        int child_count, afr_transaction_type type)
 {
-        int              i       = 0;
-        int              j       = 0;
-        int              k       = 0;
-        int              ret     = 0;
-        int32_t         *pending = NULL;
-        int32_t         *local_pending = NULL;
-        afr_private_t   *priv = NULL;
+        int      i       = 0;
+        int      j       = 0;
+        int      k       = 0;
+        int      ret     = 0;
+        int32_t *pending = NULL;
 
-        priv = this->private;
         for (i = 0; i < child_count; i++) {
                 if (!xattr[i])
                         continue;
 
-                local_pending = NULL;
                 for (j = 0; j < child_count; j++) {
                         pending = GF_CALLOC (sizeof (int32_t), 3,
                                              gf_afr_mt_int32_t);
 
-                        if (!pending) {
-                                gf_log (this->name, GF_LOG_ERROR,
-                                        "failed to allocate pending entry "
-                                        "for %s[%d] on %s",
-                                        priv->pending_key[j], type,
-                                        priv->children[i]->name);
+                        if (!pending)
                                 continue;
-                        }
                         /* 3 = data+metadata+entry */
 
                         k = afr_index_for_transaction_type (type);
 
                         pending[k] = hton32 (delta_matrix[i][j]);
 
-                        if (j == i) {
-                                local_pending = pending;
-                                continue;
-                        }
                         ret = dict_set_bin (xattr[i], priv->pending_key[j],
                                             pending,
-                                        AFR_NUM_CHANGE_LOGS * sizeof (int32_t));
-                        if (ret < 0) {
-                                gf_log (this->name, GF_LOG_WARNING,
-                                        "Unable to set dict value.");
-                                GF_FREE (pending);
-                        }
-                }
-                if (local_pending) {
-                        ret = dict_set_bin (xattr[i], priv->pending_key[i],
-                                            local_pending,
-                                        AFR_NUM_CHANGE_LOGS * sizeof (int32_t));
-                        if (ret < 0) {
-                                gf_log (this->name, GF_LOG_WARNING,
+                                            3 * sizeof (int32_t));
+                        if (ret < 0)
+                                gf_log (THIS->name, GF_LOG_WARNING,
                                         "Unable to set dict value.");
-                                GF_FREE (local_pending);
-                        }
                 }
         }
         return 0;
@@ -1136,23 +822,146 @@ afr_sh_delta_to_xattr (xlator_t *this,
 
 
 int
+afr_sh_has_metadata_pending (dict_t *xattr, xlator_t *this)
+{
+        /* Indexable by result of afr_index_for_transaction_type(): 0 -- 2. */
+        int32_t        pending[3]  = {0,};
+        void          *pending_raw = NULL;
+        afr_private_t *priv        = NULL;
+        int            ret         = -1;
+        int            i           = 0;
+        int            j           = 0;
+
+        priv = this->private;
+
+        for (i = 0; i < priv->child_count; i++) {
+                ret = dict_get_ptr (xattr, priv->pending_key[i],
+                                    &pending_raw);
+
+                if (ret != 0)
+                        return 0;
+
+                memcpy (pending, pending_raw, sizeof(pending));
+                j = afr_index_for_transaction_type (AFR_METADATA_TRANSACTION);
+
+                if (pending[j])
+                        return 1;
+        }
+
+        return 0;
+}
+
+
+int
+afr_sh_has_data_pending (dict_t *xattr, xlator_t *this)
+{
+        /* Indexable by result of afr_index_for_transaction_type(): 0 -- 2. */
+        int32_t        pending[3]  = {0,};
+        void          *pending_raw = NULL;
+        afr_private_t *priv        = NULL;
+        int            ret         = -1;
+        int            i           = 0;
+        int            j           = 0;
+
+        priv = this->private;
+
+        for (i = 0; i < priv->child_count; i++) {
+                ret = dict_get_ptr (xattr, priv->pending_key[i],
+                                    &pending_raw);
+
+                if (ret != 0)
+                        return 0;
+
+                memcpy (pending, pending_raw, sizeof(pending));
+                j = afr_index_for_transaction_type (AFR_DATA_TRANSACTION);
+
+                if (pending[j])
+                        return 1;
+        }
+
+        return 0;
+}
+
+
+int
+afr_sh_has_entry_pending (dict_t *xattr, xlator_t *this)
+{
+        /* Indexable by result of afr_index_for_transaction_type(): 0 -- 2. */
+        int32_t        pending[3]  = {0,};
+        void          *pending_raw = NULL;
+        afr_private_t *priv        = NULL;
+        int            ret         = -1;
+        int            i           = 0;
+        int            j           = 0;
+
+        priv = this->private;
+
+        for (i = 0; i < priv->child_count; i++) {
+                ret = dict_get_ptr (xattr, priv->pending_key[i],
+                                    &pending_raw);
+
+                if (ret != 0)
+                        return 0;
+
+                memcpy (pending, pending_raw, sizeof(pending));
+                j = afr_index_for_transaction_type (AFR_ENTRY_TRANSACTION);
+
+                if (pending[j])
+                        return 1;
+        }
+
+        return 0;
+}
+
+
+/**
+ * is_matrix_zero - return true if pending matrix is all zeroes
+ */
+
+int
+afr_sh_is_matrix_zero (int32_t *pending_matrix[], int child_count)
+{
+        int i = 0;
+        int j = 0;
+
+        for (i = 0; i < child_count; i++)
+                for (j = 0; j < child_count; j++)
+                        if (pending_matrix[i][j])
+                                return 0;
+        return 1;
+}
+
+
+int
 afr_sh_missing_entries_done (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        afr_private_t   *priv = NULL;
+        int              i = 0;
 
         local = frame->local;
         sh = &local->self_heal;
+        priv = this->private;
 
-        afr_sh_reset (frame, this);
+//      memset (sh->child_errno, 0, sizeof (int) * priv->child_count);
+        memset (sh->buf, 0, sizeof (struct iatt) * priv->child_count);
 
-        if (local->unhealable) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "split brain found, aborting selfheal of %s",
-                        local->loc.path);
+        for (i = 0; i < priv->child_count; i++) {
+                sh->locked_nodes[i] = 0;
         }
 
-        if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->xattr[i])
+                        dict_unref (sh->xattr[i]);
+                sh->xattr[i] = NULL;
+        }
+
+        if (local->govinda_gOvinda || sh->op_failed) {
+                gf_log (this->name, GF_LOG_INFO,
+                        "split brain found, aborting selfheal of %s",
+                        local->loc.path);
+                sh->op_failed = 1;
                 sh->completion_cbk (frame, this);
         } else {
                 gf_log (this->name, GF_LOG_TRACE,
@@ -1196,8 +1005,8 @@ afr_sh_common_create (afr_self_heal_t *sh, unsigned int child_count)
                                      gf_afr_mt_int);
         if (!sh->child_errno)
                 goto out;
-        sh->success_children = afr_children_create (child_count);
-        if (!sh->success_children)
+        sh->child_success = afr_children_create (child_count);
+        if (!sh->child_success)
                 goto out;
         sh->fresh_children = afr_children_create (child_count);
         if (!sh->fresh_children)
@@ -1233,14 +1042,15 @@ afr_sh_common_lookup_resp_handler (call_frame_t *frame, void *cookie,
         {
                 if (op_ret == 0) {
                         sh->buf[child_index] = *buf;
+                        sh->parentbuf        = *postparent;
                         sh->parentbufs[child_index] = *postparent;
-                        sh->success_children[sh->success_count] = child_index;
+                        sh->child_success[sh->success_count] = child_index;
                         sh->success_count++;
                         sh->xattr[child_index] = dict_ref (xattr);
                 } else {
-                        gf_log (this->name, GF_LOG_DEBUG, "path %s on subvolume"
-                                " %s => -1 (%s)", loc->path,
-                                priv->children[child_index]->name,
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "path %s on subvolume %s => -1 (%s)",
+                                loc->path, priv->children[child_index]->name,
                                 strerror (op_errno));
                         local->self_heal.child_errno[child_index] = op_errno;
                 }
@@ -1269,10 +1079,12 @@ afr_valid_ia_type (ia_type_t ia_type)
 
 int
 afr_impunge_frame_create (call_frame_t *frame, xlator_t *this,
-                          int active_source, call_frame_t **impunge_frame)
+                          int active_source, int ret_child, mode_t entry_mode,
+                          call_frame_t **impunge_frame)
 {
         afr_local_t     *local         = NULL;
         afr_local_t     *impunge_local = NULL;
+        afr_self_heal_t *sh            = NULL;
         afr_self_heal_t *impunge_sh    = NULL;
         int32_t         op_errno       = 0;
         afr_private_t   *priv          = NULL;
@@ -1286,24 +1098,22 @@ afr_impunge_frame_create (call_frame_t *frame, xlator_t *this,
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (impunge_local, out);
+        ALLOC_OR_GOTO (impunge_local, afr_local_t, out);
 
         local = frame->local;
+        sh = &local->self_heal;
         new_frame->local = impunge_local;
         impunge_sh = &impunge_local->self_heal;
         impunge_sh->sh_frame = frame;
         impunge_sh->active_source = active_source;
+        impunge_sh->impunge_ret_child = ret_child;
+        impunge_sh->impunging_entry_mode = entry_mode;
         impunge_local->child_up  = memdup (local->child_up,
                                            sizeof (*local->child_up) *
                                            priv->child_count);
         if (!impunge_local->child_up)
                 goto out;
 
-        impunge_local->pending = afr_matrix_create (priv->child_count,
-                                                    AFR_NUM_CHANGE_LOGS);
-        if (!impunge_local->pending)
-                goto out;
-
         ret = afr_sh_common_create (impunge_sh, priv->child_count);
         if (ret) {
                 op_errno = -ret;
@@ -1318,89 +1128,54 @@ out:
 }
 
 void
-afr_sh_missing_entry_call_impunge_recreate (call_frame_t *frame, xlator_t *this,
-                                            struct iatt *buf,
-                                            struct iatt *postparent,
-                                            afr_impunge_done_cbk_t impunge_done)
+afr_sh_call_entry_impunge_recreate (call_frame_t *frame, xlator_t *this,
+                                    int child_index, struct iatt *buf,
+                                    struct iatt *postparent,
+                                    afr_impunge_done_cbk_t impunge_done)
 {
         call_frame_t    *impunge_frame = NULL;
         afr_local_t     *local = NULL;
         afr_local_t     *impunge_local = NULL;
         afr_self_heal_t *sh = NULL;
-        afr_self_heal_t *impunge_sh = NULL;
         int             ret = 0;
-        unsigned int    enoent_count = 0;
-        afr_private_t   *priv = NULL;
-        int             i = 0;
-        int32_t         op_errno = 0;
+        mode_t          mode = 0;
 
         local = frame->local;
         sh    = &local->self_heal;
-        priv  = this->private;
-
-        enoent_count = afr_errno_count (NULL, sh->child_errno,
-                                        priv->child_count, ENOENT);
-        if (!enoent_count) {
-                gf_log (this->name, GF_LOG_INFO,
-                        "no missing files - %s. proceeding to metadata check",
-                        local->loc.path);
-                goto out;
-        }
-        sh->impunge_done = impunge_done;
-        ret = afr_impunge_frame_create (frame, this, sh->source, &impunge_frame);
+        mode = st_mode_from_ia (buf->ia_prot, buf->ia_type);
+        ret = afr_impunge_frame_create (frame, this, sh->source, child_index,
+                                        mode, &impunge_frame);
         if (ret)
                 goto out;
         impunge_local = impunge_frame->local;
-        impunge_sh    = &impunge_local->self_heal;
         loc_copy (&impunge_local->loc, &local->loc);
-        ret = afr_build_parent_loc (&impunge_sh->parent_loc,
-                                    &impunge_local->loc, &op_errno);
-        if (ret) {
-                ret = -op_errno;
-                goto out;
-        }
-        impunge_local->call_count = enoent_count;
-        impunge_sh->entrybuf = sh->buf[sh->source];
-        impunge_sh->parentbuf = sh->parentbufs[sh->source];
-        for (i = 0; i < priv->child_count; i++) {
-                if (!impunge_local->child_up[i]) {
-                        impunge_sh->child_errno[i] = ENOTCONN;
-                        continue;
-                }
-                if (sh->child_errno[i] != ENOENT) {
-                        impunge_sh->child_errno[i] = EEXIST;
-                        continue;
-                }
-        }
-        for (i = 0; i < priv->child_count; i++) {
-                if (sh->child_errno[i] != ENOENT)
-                        continue;
-                afr_sh_entry_impunge_create (impunge_frame, this, i);
-                enoent_count--;
-        }
-        GF_ASSERT (!enoent_count);
+        sh->impunge_done = impunge_done;
+        impunge_local->call_count = 1;
+        afr_sh_entry_impunge_create (impunge_frame, this, child_index, buf,
+                                     postparent);
         return;
 out:
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "impunge of %s failed, "
-                        "reason: %s", local->loc.path, strerror (-ret));
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-        }
-        afr_sh_missing_entries_finish (frame, this);
+        gf_log (this->name, GF_LOG_ERROR, "impunge of %s failed, reason: %s",
+                local->loc.path, strerror (-ret));
+        impunge_done (frame, this, child_index, -1, -ret);
 }
 
 int
-afr_sh_create_entry_cbk (call_frame_t *frame, xlator_t *this,
+afr_sh_create_entry_cbk (call_frame_t *frame, xlator_t *this, int child,
                          int32_t op_ret, int32_t op_errno)
 {
+        int             call_count = 0;
         afr_local_t     *local = NULL;
-        afr_self_heal_t *sh = NULL;
 
         local = frame->local;
-        sh = &local->self_heal;
-        if (op_ret < 0)
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-        afr_sh_missing_entries_finish (frame, this);
+
+        if (op_ret == -1)
+                gf_log (this->name, GF_LOG_ERROR,
+                        "create entry %s failed, on child %d reason, %s",
+                        local->loc.path, child, strerror (op_errno));
+        call_count = afr_frame_return (frame);
+        if (call_count == 0)
+                afr_sh_missing_entries_finish (frame, this);
         return 0;
 }
 
@@ -1410,11 +1185,26 @@ sh_missing_entries_create (call_frame_t *frame, xlator_t *this)
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
         int              type = 0;
+        afr_private_t   *priv = NULL;
+        int             enoent_count = 0;
+        int             i = 0;
         struct iatt     *buf = NULL;
         struct iatt     *postparent = NULL;
 
         local = frame->local;
         sh = &local->self_heal;
+        priv = this->private;
+
+        enoent_count = afr_errno_count (NULL, sh->child_errno,
+                                        priv->child_count, ENOENT);
+        if (enoent_count == 0) {
+                gf_log (this->name, GF_LOG_INFO,
+                        "no missing files - %s. proceeding to metadata check",
+                        local->loc.path);
+                /* proceed to next step - metadata self-heal */
+                afr_sh_missing_entries_finish (frame, this);
+                return 0;
+        }
 
         buf = &sh->buf[sh->source];
         postparent = &sh->parentbufs[sh->source];
@@ -1423,14 +1213,22 @@ sh_missing_entries_create (call_frame_t *frame, xlator_t *this)
         if (!afr_valid_ia_type (type)) {
                 gf_log (this->name, GF_LOG_ERROR,
                         "%s: unknown file type: 0%o", local->loc.path, type);
-                afr_set_local_for_unhealable (local);
+                local->govinda_gOvinda = 1;
                 afr_sh_missing_entries_finish (frame, this);
                 goto out;
         }
 
-        afr_sh_missing_entry_call_impunge_recreate (frame, this,
+        local->call_count = enoent_count;
+        for (i = 0; i < priv->child_count; i++) {
+                //If !child_up errno will be zero
+                if (sh->child_errno[i] != ENOENT)
+                        continue;
+                afr_sh_call_entry_impunge_recreate (frame, this, i,
                                                     buf, postparent,
                                                     afr_sh_create_entry_cbk);
+                enoent_count--;
+        }
+        GF_ASSERT (enoent_count == 0);
 out:
         return 0;
 }
@@ -1445,10 +1243,6 @@ afr_sh_missing_entries_lookup_done (call_frame_t *frame, xlator_t *this,
         ia_type_t       ia_type = IA_INVAL;
         int32_t         nsources = 0;
         loc_t           *loc = NULL;
-        int32_t         subvol_status = 0;
-        afr_transaction_type txn_type = AFR_DATA_TRANSACTION;
-        gf_boolean_t    split_brain = _gf_false;
-        int             read_child = -1;
 
         local = frame->local;
         sh = &local->self_heal;
@@ -1456,50 +1250,27 @@ afr_sh_missing_entries_lookup_done (call_frame_t *frame, xlator_t *this,
         loc = &local->loc;
 
         if (op_ret < 0) {
-                if (op_errno == EIO) {
-                        afr_set_local_for_unhealable (local);
-                }
+                if (op_errno == EIO)
+                        local->govinda_gOvinda = 1;
                 // EIO can happen if finding the fresh parent dir failed
                 goto out;
         }
 
         //now No chance for the ia_type to conflict
-        ia_type = sh->buf[sh->success_children[0]].ia_type;
-        txn_type = afr_transaction_type_get (ia_type);
+        ia_type = sh->buf[sh->child_success[0]].ia_type;
         nsources = afr_build_sources (this, sh->xattr, sh->buf,
                                       sh->pending_matrix, sh->sources,
-                                      sh->success_children, txn_type,
-                                      &subvol_status, _gf_false);
+                                      sh->child_success,
+                                      afr_transaction_type_get (ia_type), NULL);
         if (nsources < 0) {
                 gf_log (this->name, GF_LOG_INFO, "No sources for dir of %s,"
                         " in missing entry self-heal, continuing with the rest"
                         " of the self-heals", local->loc.path);
-                if (subvol_status & SPLIT_BRAIN) {
-                        split_brain = _gf_true;
-                        switch (txn_type) {
-                        case AFR_DATA_TRANSACTION:
-                                nsources = 1;
-                                sh->sources[sh->success_children[0]] = 1;
-                                break;
-                        case AFR_ENTRY_TRANSACTION:
-                                read_child = afr_get_no_xattr_dir_read_child
-                                                          (this,
-                                                           sh->success_children,
-                                                           sh->buf);
-                                sh->sources[read_child] = 1;
-                                nsources = 1;
-                                break;
-                        default:
-                                op_errno = EIO;
-                                goto out;
-                        }
-                } else {
-                        op_errno = EIO;
-                        goto out;
-                }
+                op_errno = EIO;
+                goto out;
         }
 
-        afr_get_fresh_children (sh->success_children, sh->sources,
+        afr_get_fresh_children (sh->child_success, sh->sources,
                                 sh->fresh_children, priv->child_count);
         sh->source = sh->fresh_children[0];
         if (sh->source == -1) {
@@ -1510,17 +1281,12 @@ afr_sh_missing_entries_lookup_done (call_frame_t *frame, xlator_t *this,
 
         if (sh->gfid_sh_success_cbk)
                 sh->gfid_sh_success_cbk (frame, this);
-        sh->type = sh->buf[sh->source].ia_type;
         if (uuid_is_null (loc->inode->gfid))
                 uuid_copy (loc->gfid, sh->buf[sh->source].ia_gfid);
-        if (split_brain) {
-                afr_sh_missing_entries_finish (frame, this);
-        } else {
-                sh_missing_entries_create (frame, this);
-        }
+        sh_missing_entries_create (frame, this);
         return;
 out:
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+        sh->op_failed = 1;
         afr_sh_set_error (sh, op_errno);
         afr_sh_missing_entries_finish (frame, this);
         return;
@@ -1538,8 +1304,8 @@ afr_sh_common_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         afr_private_t           *priv  = NULL;
 
         local = frame->local;
-        sh    = &local->self_heal;
-        priv  = this->private;
+        sh = &local->self_heal;
+        priv = this->private;
 
         afr_sh_common_lookup_resp_handler (frame, cookie, this, op_ret,
                                            op_errno, inode, buf, xattr,
@@ -1559,7 +1325,7 @@ afr_sh_common_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         }
 
         if ((sh->lookup_flags & AFR_LOOKUP_FAIL_CONFLICTS) &&
-            (afr_conflicting_iattrs (sh->buf, sh->success_children,
+            (afr_conflicting_iattrs (sh->buf, sh->child_success,
                                      priv->child_count,
                                      sh->lookup_loc.path, this->name))) {
                 op_errno = EIO;
@@ -1569,7 +1335,7 @@ afr_sh_common_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         }
 
         if ((sh->lookup_flags & AFR_LOOKUP_FAIL_MISSING_GFIDS) &&
-            (afr_gfid_missing_count (this->name, sh->success_children,
+            (afr_gfid_missing_count (this->name, sh->child_success,
                                      sh->buf, priv->child_count,
                                      sh->lookup_loc.path))) {
                 op_errno = ENODATA;
@@ -1604,7 +1370,7 @@ afr_sh_remove_entry_cbk (call_frame_t *frame, xlator_t *this, int child,
                 LOCK (&frame->lock);
                 {
                         afr_sh_set_error (sh, EIO);
-                        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+                        sh->op_failed = 1;
                 }
                 UNLOCK (&frame->lock);
         }
@@ -1617,7 +1383,6 @@ afr_sh_remove_entry_cbk (call_frame_t *frame, xlator_t *this, int child,
 void
 afr_sh_call_entry_expunge_remove (call_frame_t *frame, xlator_t *this,
                                   int child_index, struct iatt *buf,
-                                  struct iatt *parentbuf,
                                   afr_expunge_done_cbk_t expunge_done)
 {
         call_frame_t    *expunge_frame = NULL;
@@ -1626,14 +1391,13 @@ afr_sh_call_entry_expunge_remove (call_frame_t *frame, xlator_t *this,
         afr_self_heal_t *sh = NULL;
         afr_self_heal_t *expunge_sh = NULL;
         int32_t         op_errno = 0;
-        int             ret = 0;
 
         expunge_frame = copy_frame (frame);
         if (!expunge_frame) {
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (expunge_local, out);
+        ALLOC_OR_GOTO (expunge_local, afr_local_t, out);
 
         local = frame->local;
         sh = &local->self_heal;
@@ -1641,15 +1405,8 @@ afr_sh_call_entry_expunge_remove (call_frame_t *frame, xlator_t *this,
         expunge_sh = &expunge_local->self_heal;
         expunge_sh->sh_frame = frame;
         loc_copy (&expunge_local->loc, &local->loc);
-        ret = afr_build_parent_loc (&expunge_sh->parent_loc,
-                                    &expunge_local->loc, &op_errno);
-        if (ret) {
-                ret = -op_errno;
-                goto out;
-        }
         sh->expunge_done = expunge_done;
-        afr_sh_entry_expunge_remove (expunge_frame, this, child_index, buf,
-                                     parentbuf);
+        afr_sh_entry_expunge_remove (expunge_frame, this, child_index, buf);
         return;
 out:
         gf_log (this->name, GF_LOG_ERROR, "Expunge of %s failed, reason: %s",
@@ -1686,7 +1443,7 @@ afr_sh_purge_stale_entries_done (call_frame_t *frame, xlator_t *this)
         sh       = &local->self_heal;
         priv     = this->private;
 
-        if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
+        if (sh->op_failed) {
                 afr_sh_missing_entries_finish (frame, this);
         } else {
                 if (afr_gfid_missing_count (this->name, sh->fresh_children,
@@ -1696,16 +1453,15 @@ afr_sh_purge_stale_entries_done (call_frame_t *frame, xlator_t *this)
                                               afr_sh_missing_entries_lookup_done,
                                               sh->sh_gfid_req,
                                               AFR_LOOKUP_FAIL_CONFLICTS|
-                                              AFR_LOOKUP_FAIL_MISSING_GFIDS,
-                                              NULL);
+                                              AFR_LOOKUP_FAIL_MISSING_GFIDS);
                 } else {
                         //No need to set gfid so goto missing entries lookup done
                         //Behave as if you have done the lookup
                         afr_sh_remove_stale_lookup_info (sh,
-                                                         sh->success_children,
+                                                         sh->child_success,
                                                          sh->fresh_children,
                                                          priv->child_count);
-                        afr_children_copy (sh->success_children,
+                        afr_children_copy (sh->child_success,
                                            sh->fresh_children,
                                            priv->child_count);
                         afr_sh_missing_entries_lookup_done (frame, this, 0, 0);
@@ -1778,11 +1534,8 @@ afr_sh_purge_entry_common (call_frame_t *frame, xlator_t *this,
         for (i = 0; i < priv->child_count; i++) {
                 if (!purge_condition (local, priv, i))
                         continue;
-                gf_log (this->name, GF_LOG_INFO, "purging the stale entry %s "
-                        "on %s", local->loc.path, priv->children[i]->name);
                 afr_sh_call_entry_expunge_remove (frame, this,
                                                   (long) i, &sh->buf[i],
-                                                  &sh->parentbufs[i],
                                                   afr_sh_remove_entry_cbk);
         }
 out:
@@ -1832,8 +1585,8 @@ afr_sh_purge_stale_entry (call_frame_t *frame, xlator_t *this)
                                    sh->entrybuf.ia_gfid)))
                         continue;
 
-                afr_children_add_child (sh->fresh_children, i,
-                                        priv->child_count);
+                afr_fresh_children_add_child (sh->fresh_children,
+                                              i, priv->child_count);
 
         }
         afr_sh_purge_entry_common (frame, this,
@@ -1867,10 +1620,10 @@ void
 afr_get_children_of_fresh_parent_dirs (afr_self_heal_t *sh,
                                        unsigned int child_count)
 {
-        afr_children_intersection_get (sh->success_children,
+        afr_children_intersection_get (sh->child_success,
                                        sh->fresh_parent_dirs,
                                        sh->sources, child_count);
-        afr_get_fresh_children (sh->success_children, sh->sources,
+        afr_get_fresh_children (sh->child_success, sh->sources,
                                 sh->fresh_children, child_count);
         memset (sh->sources, 0, sizeof (*sh->sources) * child_count);
 }
@@ -1899,8 +1652,10 @@ afr_sh_children_lookup_done (call_frame_t *frame, xlator_t *this,
                                                sh->child_errno,
                                                priv->child_count, ENOENT);
         if (fresh_child_enoents == fresh_parent_count) {
+                gf_log (this->name, GF_LOG_INFO, "Deleting stale file %s",
+                        local->loc.path);
                 afr_sh_set_error (sh, ENOENT);
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+                sh->op_failed = 1;
                 afr_sh_purge_entry (frame, this);
         } else if (!afr_conflicting_iattrs (sh->buf, sh->fresh_children,
                                             priv->child_count, local->loc.path,
@@ -1914,14 +1669,14 @@ afr_sh_children_lookup_done (call_frame_t *frame, xlator_t *this,
                 afr_sh_purge_stale_entry (frame, this);
         } else {
                 op_errno = EIO;
-                afr_set_local_for_unhealable (local);
+                local->govinda_gOvinda = 1;
                 goto fail;
         }
 
         return;
 
 fail:
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+        sh->op_failed = 1;
         afr_sh_set_error (sh, op_errno);
         afr_sh_missing_entries_finish (frame, this);
         return;
@@ -1931,69 +1686,74 @@ static void
 afr_sh_find_fresh_parents (call_frame_t *frame, xlator_t *this,
                            int32_t op_ret, int32_t op_errno)
 {
-        afr_self_heal_t *sh  = NULL;
-        afr_private_t   *priv = NULL;
-        afr_local_t     *local = NULL;
-        int             enoent_count = 0;
-        int             nsources = 0;
-        int             source  = -1;
-        int32_t         subvol_status = 0;
+        afr_self_heal_t    *sh  = NULL;
+        afr_private_t      *priv = NULL;
+        afr_local_t        *local = NULL;
+        int                enoent_count = 0;
+        int                nsources = 0;
+        int                source  = -1;
+        afr_source_flags_t flags = 0;
 
         local = frame->local;
         sh = &local->self_heal;
         priv = this->private;
 
+        /* If We can't find a fresh parent directory here,
+         * we wont know which subvol is correct without finding a parent dir
+         * upwards which has correct xattrs, for that we may have to
+         * do lookups till root, we dont wanna do that,
+         * instead make sure that if there are conflicting gfid
+         * parent dirs, self-heal thus lookup is failed with EIO.
+         * if there are missing entries we dont know whether to delete or
+         * create so fail with EIO,
+         * If there are conflicting xattr fail with EIO.
+         */
         if (op_ret < 0)
                 goto out;
         enoent_count = afr_errno_count (NULL, sh->child_errno,
                                         priv->child_count, ENOENT);
         if (enoent_count > 0) {
-                gf_log (this->name, GF_LOG_INFO, "Parent dir missing for %s,"
-                        " in missing entry self-heal, aborting missing-entry "
-                        "self-heal",
+                gf_log (this->name, GF_LOG_ERROR, "Parent dir missing for %s,"
+                        " in missing entry self-heal, aborting self-heal",
                         local->loc.path);
-                afr_sh_missing_entries_finish (frame, this);
-                return;
+                goto out;
         }
 
         nsources = afr_build_sources (this, sh->xattr, sh->buf,
                                       sh->pending_matrix, sh->sources,
-                                      sh->success_children,
-                                      AFR_ENTRY_TRANSACTION, &subvol_status,
-                                      _gf_true);
-        if ((subvol_status & ALL_FOOLS) ||
-            (subvol_status & SPLIT_BRAIN)) {
-                gf_log (this->name, GF_LOG_INFO, "%s: Performing conservative "
-                        "merge", sh->parent_loc.path);
-                afr_mark_success_children_sources (sh->sources,
-                                                   sh->success_children,
-                                                   priv->child_count);
-        } else if (nsources < 0) {
-                gf_log (this->name, GF_LOG_ERROR, "No sources for dir "
-                        "of %s, in missing entry self-heal, aborting "
-                        "self-heal", local->loc.path);
-                op_errno = EIO;
+                                      sh->child_success,
+                                      AFR_ENTRY_TRANSACTION, &flags);
+        if ((nsources < 0) && !flags) {
+                gf_log (this->name, GF_LOG_ERROR, "No sources for dir of %s,"
+                        " in missing entry self-heal, aborting self-heal",
+                        local->loc.path);
                 goto out;
         }
 
+        //if allfools/split-brain give the behavior of missing entry creation
+        if (flags) {
+                gf_log (this->name, GF_LOG_DEBUG, "%s: All subvols pending so "
+                        "do missing entry creation", local->loc.path);
+                afr_mark_valid_children_sources (sh->sources, sh->child_success,
+                                                 priv->child_count);
+        }
+
         source = afr_sh_select_source (sh->sources, priv->child_count);
         if (source == -1) {
                 GF_ASSERT (0);
                 gf_log (this->name, GF_LOG_DEBUG, "No active sources found.");
-                op_errno = EIO;
                 goto out;
         }
-        afr_get_fresh_children (sh->success_children, sh->sources,
+        afr_get_fresh_children (sh->child_success, sh->sources,
                                 sh->fresh_parent_dirs, priv->child_count);
         afr_sh_common_lookup (frame, this, &local->loc,
-                              afr_sh_children_lookup_done, NULL, 0,
-                              NULL);
+                              afr_sh_children_lookup_done, NULL, 0);
         return;
 
 out:
-        afr_sh_set_error (sh, op_errno);
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-	afr_sh_missing_entries_finish (frame, this);
+        afr_sh_set_error (sh, EIO);
+        sh->op_failed = 1;
+        afr_sh_missing_entries_finish (frame, this);
         return;
 }
 
@@ -2009,7 +1769,7 @@ afr_sh_common_reset (afr_self_heal_t *sh, unsigned int child_count)
         }
         memset (&sh->parentbuf, 0, sizeof (sh->parentbuf));
         sh->success_count = 0;
-        afr_reset_children (sh->success_children, child_count);
+        afr_reset_children (sh->child_success, child_count);
         afr_reset_children (sh->fresh_children, child_count);
         afr_reset_xattr (sh->xattr, child_count);
         loc_wipe (&sh->lookup_loc);
@@ -2021,7 +1781,7 @@ afr_sh_common_reset (afr_self_heal_t *sh, unsigned int child_count)
 int
 afr_sh_common_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
                       afr_lookup_done_cbk_t lookup_done , uuid_t gfid,
-                      int32_t flags, dict_t *xdata)
+                      int32_t flags)
 {
         afr_local_t    *local = NULL;
         int             i = 0;
@@ -2034,7 +1794,8 @@ afr_sh_common_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
         priv  = this->private;
         sh    = &local->self_heal;
 
-        call_count = afr_up_children_count (local->child_up, priv->child_count);
+        call_count = afr_up_children_count (priv->child_count,
+                                            local->child_up);
 
         local->call_count = call_count;
 
@@ -2059,7 +1820,7 @@ afr_sh_common_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
                 if (local->child_up[i]) {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "looking up %s on subvolume %s",
-                                loc->path, priv->children[i]->name);
+                                local->loc.path, priv->children[i]->name);
 
                         STACK_WIND_COOKIE (frame,
                                            afr_sh_common_lookup_cbk,
@@ -2082,8 +1843,7 @@ afr_sh_common_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
 
 
 int
-afr_sh_post_nb_entrylk_missing_entry_sh_cbk (call_frame_t *frame,
-                                             xlator_t *this)
+afr_sh_post_nb_entrylk_conflicting_sh_cbk (call_frame_t *frame, xlator_t *this)
 {
         afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
@@ -2096,7 +1856,7 @@ afr_sh_post_nb_entrylk_missing_entry_sh_cbk (call_frame_t *frame,
         if (int_lock->lock_op_ret < 0) {
                 gf_log (this->name, GF_LOG_INFO,
                         "Non blocking entrylks failed.");
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+                sh->op_failed = -1;
                 afr_sh_missing_entries_done (frame, this);
         } else {
 
@@ -2104,8 +1864,34 @@ afr_sh_post_nb_entrylk_missing_entry_sh_cbk (call_frame_t *frame,
                         "Non blocking entrylks done. Proceeding to FOP");
                 afr_sh_common_lookup (frame, this, &sh->parent_loc,
                                       afr_sh_find_fresh_parents,
-                                      NULL, AFR_LOOKUP_FAIL_CONFLICTS,
-                                      NULL);
+                                      NULL, AFR_LOOKUP_FAIL_CONFLICTS);
+        }
+
+        return 0;
+}
+
+int
+afr_sh_post_nb_entrylk_gfid_sh_cbk (call_frame_t *frame, xlator_t *this)
+{
+        afr_internal_lock_t *int_lock = NULL;
+        afr_local_t         *local    = NULL;
+        afr_self_heal_t     *sh       = NULL;
+
+        local    = frame->local;
+        sh       = &local->self_heal;
+        int_lock = &local->internal_lock;
+
+        if (int_lock->lock_op_ret < 0) {
+                gf_log (this->name, GF_LOG_INFO,
+                        "Non blocking entrylks failed.");
+                afr_sh_missing_entries_done (frame, this);
+        } else {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Non blocking entrylks done. Proceeding to FOP");
+                afr_sh_common_lookup (frame, this, &local->loc,
+                                      afr_sh_missing_entries_lookup_done,
+                                      sh->sh_gfid_req, AFR_LOOKUP_FAIL_CONFLICTS|
+                                      AFR_LOOKUP_FAIL_MISSING_GFIDS);
         }
 
         return 0;
@@ -2117,11 +1903,11 @@ afr_sh_entrylk (call_frame_t *frame, xlator_t *this, loc_t *loc,
 {
         afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
-        afr_private_t       *priv     = NULL;
+        afr_self_heal_t     *sh       = NULL;
 
-        priv     = this->private;
         local    = frame->local;
         int_lock = &local->internal_lock;
+        sh       = &local->self_heal;
 
         int_lock->transaction_lk_type = AFR_SELFHEAL_LK;
         int_lock->selfheal_lk_type    = AFR_ENTRY_SELF_HEAL_LK;
@@ -2131,12 +1917,7 @@ afr_sh_entrylk (call_frame_t *frame, xlator_t *this, loc_t *loc,
         int_lock->lk_basename = base_name;
         int_lock->lk_loc      = loc;
         int_lock->lock_cbk    = lock_cbk;
-        int_lock->domain      = this->name;
 
-        int_lock->lockee_count = 0;
-        afr_init_entry_lockee (&int_lock->lockee[0], local, loc,
-                               base_name, priv->child_count);
-        int_lock->lockee_count++;
         afr_nonblocking_entrylk (frame, this);
 
         return 0;
@@ -2146,65 +1927,57 @@ static int
 afr_self_heal_parent_entrylk (call_frame_t *frame, xlator_t *this,
                               afr_lock_cbk_t lock_cbk)
 {
+        afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
         afr_self_heal_t     *sh       = NULL;
-        afr_internal_lock_t *int_lock = NULL;
-        int                 ret       = -1;
-        int32_t             op_errno  = 0;
+        afr_private_t       *priv     = NULL;
 
         local    = frame->local;
+        int_lock = &local->internal_lock;
         sh       = &local->self_heal;
+        priv     = this->private;
 
         gf_log (this->name, GF_LOG_TRACE,
                 "attempting to recreate missing entries for path=%s",
                 local->loc.path);
 
-        ret = afr_build_parent_loc (&sh->parent_loc, &local->loc, &op_errno);
-        if (ret)
-                goto out;
+        GF_ASSERT (local->loc.parent);
+        afr_build_parent_loc (&sh->parent_loc, &local->loc);
 
         afr_sh_entrylk (frame, this, &sh->parent_loc, NULL,
                         lock_cbk);
         return 0;
-out:
-        int_lock = &local->internal_lock;
-        int_lock->lock_op_ret = -1;
-        lock_cbk (frame, this);
-        return 0;
 }
 
 static int
-afr_self_heal_missing_entries (call_frame_t *frame, xlator_t *this)
+afr_self_heal_conflicting_entries (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh = NULL;
-
-        local = frame->local;
-        sh = &local->self_heal;
-
-        sh->sh_type_in_action  = AFR_SELF_HEAL_GFID_OR_MISSING_ENTRY;
-
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_STARTED);
+        afr_self_heal_parent_entrylk (frame, this,
+                                      afr_sh_post_nb_entrylk_conflicting_sh_cbk);
+        return 0;
+}
 
+static int
+afr_self_heal_gfids (call_frame_t *frame, xlator_t *this)
+{
         afr_self_heal_parent_entrylk (frame, this,
-                                      afr_sh_post_nb_entrylk_missing_entry_sh_cbk);
+                                      afr_sh_post_nb_entrylk_gfid_sh_cbk);
         return 0;
 }
 
-afr_local_t*
-afr_self_heal_local_init (afr_local_t *l, xlator_t *this)
+afr_local_t *afr_local_copy (afr_local_t *l, xlator_t *this)
 {
-        afr_private_t   *priv  = NULL;
-        afr_local_t     *lc    = NULL;
-        afr_self_heal_t *sh    = NULL;
-        afr_self_heal_t *shc   = NULL;
-        int             ret    = 0;
+        afr_private_t *priv = NULL;
+        afr_local_t   *lc     = NULL;
+        afr_self_heal_t *sh = NULL;
+        afr_self_heal_t *shc = NULL;
 
         priv = this->private;
 
         sh = &l->self_heal;
 
-        lc = mem_get0 (this->local_pool);
+        lc = GF_CALLOC (1, sizeof (afr_local_t),
+                        gf_afr_mt_afr_local_t);
         if (!lc)
                 goto out;
 
@@ -2212,32 +1985,26 @@ afr_self_heal_local_init (afr_local_t *l, xlator_t *this)
 
         shc->unwind = sh->unwind;
         shc->gfid_sh_success_cbk = sh->gfid_sh_success_cbk;
-        shc->do_missing_entry_self_heal = sh->do_missing_entry_self_heal;
-        shc->do_gfid_self_heal = sh->do_gfid_self_heal;
-        shc->do_data_self_heal = sh->do_data_self_heal;
-        shc->do_metadata_self_heal = sh->do_metadata_self_heal;
-        shc->do_entry_self_heal = sh->do_entry_self_heal;
-        shc->force_confirm_spb = sh->force_confirm_spb;
+        shc->need_missing_entry_self_heal = sh->need_missing_entry_self_heal;
+        shc->need_gfid_self_heal = sh->need_gfid_self_heal;
+        shc->need_data_self_heal = sh->need_data_self_heal;
+        shc->need_metadata_self_heal = sh->need_metadata_self_heal;
+        shc->need_entry_self_heal = sh->need_entry_self_heal;
         shc->forced_merge = sh->forced_merge;
+        shc->healing_fd_opened = sh->healing_fd_opened;
+        shc->data_lock_held = sh->data_lock_held;
+        if (sh->healing_fd && !sh->healing_fd_opened)
+                shc->healing_fd = fd_ref (sh->healing_fd);
+        else
+                shc->healing_fd = sh->healing_fd;
         shc->background = sh->background;
         shc->type = sh->type;
-        shc->data_sh_info = "";
-        shc->metadata_sh_info =  "";
 
         uuid_copy (shc->sh_gfid_req, sh->sh_gfid_req);
-        if (l->loc.path) {
-                ret = loc_copy (&lc->loc, &l->loc);
-                if (ret < 0)
-                        goto out;
-        }
-
-        lc->child_up  = memdup (l->child_up,
-                                sizeof (*lc->child_up) * priv->child_count);
-        if (!lc->child_up) {
-                ret = -1;
-                goto out;
-        }
+        if (l->loc.path)
+                loc_copy (&lc->loc, &l->loc);
 
+        lc->child_up  = memdup (l->child_up, priv->child_count);
         if (l->xattr_req)
                 lc->xattr_req = dict_ref (l->xattr_req);
 
@@ -2245,25 +2012,40 @@ afr_self_heal_local_init (afr_local_t *l, xlator_t *this)
                 lc->cont.lookup.inode = inode_ref (l->cont.lookup.inode);
         if (l->cont.lookup.xattr)
                 lc->cont.lookup.xattr = dict_ref (l->cont.lookup.xattr);
+        if (l->internal_lock.inode_locked_nodes)
+                lc->internal_lock.inode_locked_nodes =
+                        memdup (l->internal_lock.inode_locked_nodes,
+                                priv->child_count);
+        else
+                lc->internal_lock.inode_locked_nodes =
+                        GF_CALLOC (sizeof (*l->internal_lock.inode_locked_nodes),
+                                   priv->child_count,
+                                   gf_afr_mt_char);
+        if (l->internal_lock.entry_locked_nodes)
+                lc->internal_lock.entry_locked_nodes =
+                        memdup (l->internal_lock.entry_locked_nodes,
+                                priv->child_count);
+        else
+                lc->internal_lock.entry_locked_nodes =
+                        GF_CALLOC (sizeof (*l->internal_lock.entry_locked_nodes),
+                                   priv->child_count,
+                                   gf_afr_mt_char);
+        if (l->internal_lock.locked_nodes)
+                lc->internal_lock.locked_nodes =
+                        memdup (l->internal_lock.locked_nodes,
+                                priv->child_count);
+        else
+                lc->internal_lock.locked_nodes =
+                        GF_CALLOC (sizeof (*l->internal_lock.locked_nodes),
+                                   priv->child_count,
+                                   gf_afr_mt_char);
 
-        lc->internal_lock.locked_nodes =
-                             GF_CALLOC (sizeof (*l->internal_lock.locked_nodes),
-                                        priv->child_count, gf_afr_mt_char);
-        if (!lc->internal_lock.locked_nodes) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = afr_inodelk_init (&lc->internal_lock.inodelk[0],
-                                this->name, priv->child_count);
-        if (ret)
-                goto out;
+        lc->internal_lock.inodelk_lock_count =
+                l->internal_lock.inodelk_lock_count;
+        lc->internal_lock.entrylk_lock_count =
+                l->internal_lock.entrylk_lock_count;
 
 out:
-        if (ret) {
-                afr_local_cleanup (lc, this);
-                lc = NULL;
-        }
         return lc;
 }
 
@@ -2273,39 +2055,32 @@ afr_self_heal_completion_cbk (call_frame_t *bgsh_frame, xlator_t *this)
         afr_private_t *   priv  = NULL;
         afr_local_t *     local = NULL;
         afr_self_heal_t * sh    = NULL;
-        afr_local_t *     orig_frame_local = NULL;
-        afr_self_heal_t * orig_frame_sh = NULL;
         char              sh_type_str[256] = {0,};
-        gf_loglevel_t     loglevel = 0;
+        gf_boolean_t      split_brain = _gf_false;
 
         priv  = this->private;
         local = bgsh_frame->local;
         sh    = &local->self_heal;
 
-        if (local->unhealable) {
-                afr_set_split_brain (this, sh->inode, SPB, SPB);
-        }
+        if (local->govinda_gOvinda)
+                split_brain = _gf_true;
+
+        afr_set_split_brain (this, sh->inode, split_brain);
 
         afr_self_heal_type_str_get (sh, sh_type_str,
                                     sizeof(sh_type_str));
-        if (is_self_heal_failed (sh, AFR_CHECK_ALL) && !priv->shd.iamshd) {
-                loglevel = GF_LOG_ERROR;
-        } else if (!is_self_heal_failed (sh, AFR_CHECK_ALL)) {
-                loglevel = GF_LOG_INFO;
+        if (sh->op_failed) {
+                gf_log (this->name, GF_LOG_ERROR, "background %s self-heal "
+                        "failed on %s", sh_type_str, local->loc.path);
         } else {
-                loglevel = GF_LOG_DEBUG;
+                gf_log (this->name, GF_LOG_INFO, "background %s self-heal "
+                        "completed on %s", sh_type_str, local->loc.path);
         }
 
-        afr_log_self_heal_completion_status (local, loglevel);
-
         FRAME_SU_UNDO (bgsh_frame, afr_local_t);
 
-        if (!sh->unwound && sh->unwind) {
-                orig_frame_local = sh->orig_frame->local;
-                orig_frame_sh = &orig_frame_local->self_heal;
-                orig_frame_sh->actual_sh_started = _gf_true;
-                sh->unwind (sh->orig_frame, this, sh->op_ret, sh->op_errno,
-                            is_self_heal_failed (sh, AFR_CHECK_ALL));
+        if (!sh->unwound) {
+                sh->unwind (sh->orig_frame, this, sh->op_ret, sh->op_errno);
         }
 
         if (sh->background) {
@@ -2327,6 +2102,7 @@ afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode)
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
         afr_private_t   *priv = NULL;
+        int              i = 0;
         int32_t          op_errno = 0;
         int              ret = 0;
         afr_self_heal_t *orig_sh = NULL;
@@ -2343,25 +2119,25 @@ afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode)
         gf_log (this->name, GF_LOG_TRACE,
                 "performing self heal on %s (metadata=%d data=%d entry=%d)",
                 local->loc.path,
-                local->self_heal.do_metadata_self_heal,
-                local->self_heal.do_data_self_heal,
-                local->self_heal.do_entry_self_heal);
+                local->self_heal.need_metadata_self_heal,
+                local->self_heal.need_data_self_heal,
+                local->self_heal.need_entry_self_heal);
 
-        op_errno        = ENOMEM;
+        op_errno = ENOMEM;
         sh_frame        = copy_frame (frame);
+        sh_frame->root->pid = SELF_HEAL_PID;
         if (!sh_frame)
                 goto out;
-        afr_set_lk_owner (sh_frame, this, sh_frame->root);
-        afr_set_low_priority (sh_frame);
+        afr_set_lk_owner (sh_frame, this);
 
-        sh_local        = afr_self_heal_local_init (local, this);
+        sh_local        = afr_local_copy (local, this);
         if (!sh_local)
                 goto out;
         sh_frame->local = sh_local;
         sh              = &sh_local->self_heal;
 
-        sh->inode       = inode_ref (inode);
         sh->orig_frame  = frame;
+        sh->inode = inode_ref (inode);
 
         sh->completion_cbk = afr_self_heal_completion_cbk;
 
@@ -2379,16 +2155,30 @@ afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode)
         if (!sh->locked_nodes)
                 goto out;
 
-        sh->pending_matrix = afr_matrix_create (priv->child_count,
-                                                priv->child_count);
+        sh->pending_matrix = GF_CALLOC (sizeof (int32_t *), priv->child_count,
+                                        gf_afr_mt_int32_t);
         if (!sh->pending_matrix)
                 goto out;
 
-        sh->delta_matrix = afr_matrix_create (priv->child_count,
-                                              priv->child_count);
+        for (i = 0; i < priv->child_count; i++) {
+                sh->pending_matrix[i] = GF_CALLOC (sizeof (int32_t),
+                                                   priv->child_count,
+                                                   gf_afr_mt_int32_t);
+                if (!sh->pending_matrix[i])
+                        goto out;
+        }
+
+        sh->delta_matrix = GF_CALLOC (sizeof (int32_t *), priv->child_count,
+                                      gf_afr_mt_int32_t);
         if (!sh->delta_matrix)
                 goto out;
-
+        for (i = 0; i < priv->child_count; i++) {
+                sh->delta_matrix[i] = GF_CALLOC (sizeof (int32_t),
+                                                 priv->child_count,
+                                                 gf_afr_mt_int32_t);
+                if (!sh->delta_matrix)
+                        goto out;
+        }
         sh->fresh_parent_dirs = afr_children_create (priv->child_count);
         if (!sh->fresh_parent_dirs)
                 goto out;
@@ -2414,16 +2204,12 @@ afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode)
                 UNLOCK (&priv->lock);
         }
 
-        if (!local->loc.parent) {
-                sh->do_missing_entry_self_heal = _gf_false;
-                sh->do_gfid_self_heal = _gf_false;
-        }
-
-        sh->sh_type_in_action = AFR_SELF_HEAL_INVALID;
-
         FRAME_SU_DO (sh_frame, afr_local_t);
-        if (sh->do_missing_entry_self_heal || sh->do_gfid_self_heal) {
-                afr_self_heal_missing_entries (sh_frame, this);
+        if (sh->need_missing_entry_self_heal) {
+                afr_self_heal_conflicting_entries (sh_frame, this);
+        } else if (sh->need_gfid_self_heal) {
+                GF_ASSERT (!uuid_is_null (sh->sh_gfid_req));
+                afr_self_heal_gfids (sh_frame, this);
         } else {
                 loc = &sh_local->loc;
                 if (uuid_is_null (loc->inode->gfid) && uuid_is_null (loc->gfid)) {
@@ -2442,9 +2228,7 @@ afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode)
 
 out:
         if (op_errno) {
-                orig_sh->unwind (frame, this, -1, op_errno, 1);
-                if (sh_frame)
-                        AFR_STACK_DESTROY (sh_frame);
+                orig_sh->unwind (frame, this, -1, op_errno);
         }
         return 0;
 }
@@ -2456,24 +2240,24 @@ afr_self_heal_type_str_get (afr_self_heal_t *self_heal_p, char *str,
         GF_ASSERT (str && (size > strlen (" missing-entry gfid "
                                           "meta-data data entry")));
 
-        if (self_heal_p->do_metadata_self_heal) {
+        if (self_heal_p->need_metadata_self_heal) {
                 snprintf (str, size, " meta-data");
         }
 
-        if (self_heal_p->do_data_self_heal) {
+        if (self_heal_p->need_data_self_heal) {
                 snprintf (str + strlen(str), size - strlen(str), " data");
         }
 
-        if (self_heal_p->do_entry_self_heal) {
+        if (self_heal_p->need_entry_self_heal) {
                 snprintf (str + strlen(str), size - strlen(str), " entry");
         }
 
-        if (self_heal_p->do_missing_entry_self_heal) {
+        if (self_heal_p->need_missing_entry_self_heal) {
                 snprintf (str + strlen(str), size - strlen(str),
                          " missing-entry");
         }
 
-        if (self_heal_p->do_gfid_self_heal) {
+        if (self_heal_p->need_gfid_self_heal) {
                 snprintf (str + strlen(str), size - strlen(str), " gfid");
         }
 }
@@ -2501,21 +2285,13 @@ afr_self_heal_type_for_transaction (afr_transaction_type type)
 }
 
 int
-afr_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent, char *name)
+afr_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent, char *name, uuid_t gfid)
 {
         int   ret = -1;
-        uuid_t pargfid = {0};
-
-        if (!child)
-                goto out;
-
-        if (!uuid_is_null (parent->inode->gfid))
-                uuid_copy (pargfid, parent->inode->gfid);
-        else if (!uuid_is_null (parent->gfid))
-                uuid_copy (pargfid, parent->gfid);
 
-        if (uuid_is_null (pargfid))
+        if (!child) {
                 goto out;
+        }
 
         if (strcmp (parent->path, "/") == 0)
                 ret = gf_asprintf ((char **)&child->path, "/%s", name);
@@ -2528,285 +2304,27 @@ afr_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent, char *name)
                         "asprintf failed while setting child path");
         }
 
+        if (!child->path) {
+                goto out;
+        }
+
         child->name = strrchr (child->path, '/');
         if (child->name)
                 child->name++;
 
         child->parent = inode_ref (parent->inode);
         child->inode = inode_new (parent->inode->table);
-        uuid_copy (child->pargfid, pargfid);
 
         if (!child->inode) {
                 ret = -1;
                 goto out;
         }
+        uuid_copy (child->gfid, gfid);
 
         ret = 0;
 out:
-        if ((ret == -1) && child)
+        if (ret == -1)
                 loc_wipe (child);
 
         return ret;
 }
-
-int
-afr_sh_erase_pending (call_frame_t *frame, xlator_t *this,
-                      afr_transaction_type type, afr_fxattrop_cbk_t cbk,
-                      int (*finish)(call_frame_t *frame, xlator_t *this))
-{
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh = NULL;
-        afr_private_t   *priv = NULL;
-        int              call_count = 0;
-        int              i = 0;
-        dict_t          **erase_xattr = NULL;
-        int             ret = -1;
-
-        local = frame->local;
-        sh = &local->self_heal;
-        priv = this->private;
-
-        afr_sh_pending_to_delta (priv, sh->xattr, sh->delta_matrix,
-                                 sh->success, priv->child_count, type);
-
-        erase_xattr = GF_CALLOC (sizeof (*erase_xattr), priv->child_count,
-                                 gf_afr_mt_dict_t);
-        if (!erase_xattr)
-                goto out;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (sh->xattr[i]) {
-                        call_count++;
-                        erase_xattr[i] = dict_new ();
-                        if (!erase_xattr[i])
-                                goto out;
-                }
-        }
-
-        afr_sh_delta_to_xattr (this, sh->delta_matrix, erase_xattr,
-                               priv->child_count, type);
-
-        gf_log (this->name, GF_LOG_DEBUG, "Delta matrix for: %s",
-                lkowner_utoa (&frame->root->lk_owner));
-        afr_sh_print_pending_matrix (sh->delta_matrix, this);
-        local->call_count = call_count;
-        if (call_count == 0) {
-                ret = 0;
-                finish (frame, this);
-                goto out;
-        }
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (!erase_xattr[i])
-                        continue;
-
-                if (sh->healing_fd) {//true for ENTRY, reg file DATA transaction
-                        STACK_WIND_COOKIE (frame, cbk, (void *) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->fxattrop,
-                                           sh->healing_fd,
-                                           GF_XATTROP_ADD_ARRAY, erase_xattr[i],
-                                           NULL);
-                } else {
-                        STACK_WIND_COOKIE (frame, cbk, (void *) (long) i,
-                                           priv->children[i],
-                                           priv->children[i]->fops->xattrop,
-                                           &local->loc,
-                                           GF_XATTROP_ADD_ARRAY, erase_xattr[i],
-                                           NULL);
-                }
-        }
-
-        ret = 0;
-out:
-        if (erase_xattr) {
-                for (i = 0; i < priv->child_count; i++) {
-                        if (erase_xattr[i]) {
-                                dict_unref (erase_xattr[i]);
-                        }
-                }
-        }
-
-        GF_FREE (erase_xattr);
-
-        if (ret < 0) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                finish (frame, this);
-        }
-
-        return 0;
-}
-
-void
-afr_set_self_heal_status(afr_self_heal_t *sh, afr_self_heal_status status)
-{
-        xlator_t                *this = NULL;
-        afr_sh_status_for_all_type *sh_status = &(sh->afr_all_sh_status);
-        afr_self_heal_type  sh_type_in_action = sh->sh_type_in_action;
-        this = THIS;
-
-        if (!sh) {
-                gf_log_callingfn (this->name, GF_LOG_ERROR, "Null self heal"
-                                  "Structure");
-                goto out;
-        }
-
-        switch (sh_type_in_action) {
-                case AFR_SELF_HEAL_GFID_OR_MISSING_ENTRY:
-                       sh_status->gfid_or_missing_entry_self_heal = status;
-                        break;
-                case AFR_SELF_HEAL_METADATA:
-                        sh_status->metadata_self_heal = status;
-                        break;
-                case AFR_SELF_HEAL_DATA:
-                        sh_status->data_self_heal = status;
-                        break;
-                case AFR_SELF_HEAL_ENTRY:
-                        sh_status->entry_self_heal = status;
-                        break;
-                case AFR_SELF_HEAL_INVALID:
-                        gf_log_callingfn (this->name, GF_LOG_ERROR, "Invalid"
-                                          "self heal type in action");
-                        break;
-        }
-out:
-        return;
-}
-
-void
-afr_set_local_for_unhealable (afr_local_t *local)
-{
-        afr_self_heal_t  *sh = NULL;
-
-        sh = &local->self_heal;
-
-        local->unhealable = 1;
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-}
-
-int
-is_self_heal_failed (afr_self_heal_t *sh, afr_sh_fail_check_type type)
-{
-        afr_sh_status_for_all_type      sh_status = sh->afr_all_sh_status;
-        afr_self_heal_type   sh_type_in_action =  AFR_SELF_HEAL_INVALID;
-        afr_self_heal_status    status = AFR_SELF_HEAL_FAILED;
-        xlator_t                *this = NULL;
-        int                     sh_failed = 0;
-
-        this = THIS;
-
-        if (!sh) {
-                gf_log_callingfn (this->name, GF_LOG_ERROR, "Null self heal "
-                                  "structure");
-                sh_failed = 1;
-                goto out;
-        }
-
-        if (type == AFR_CHECK_ALL) {
-                if ((sh_status.gfid_or_missing_entry_self_heal == AFR_SELF_HEAL_FAILED)
-                    || (sh_status.metadata_self_heal == AFR_SELF_HEAL_FAILED)
-                    || (sh_status.data_self_heal == AFR_SELF_HEAL_FAILED)
-                    || (sh_status.entry_self_heal == AFR_SELF_HEAL_FAILED))
-                sh_failed = 1;
-        } else if (type == AFR_CHECK_SPECIFIC) {
-                sh_type_in_action = sh->sh_type_in_action;
-                switch (sh_type_in_action) {
-                        case AFR_SELF_HEAL_GFID_OR_MISSING_ENTRY:
-                             status = sh_status.gfid_or_missing_entry_self_heal;
-                                break;
-                        case AFR_SELF_HEAL_METADATA:
-                                status = sh_status.metadata_self_heal;
-                                break;
-                        case AFR_SELF_HEAL_ENTRY:
-                                status = sh_status.entry_self_heal;
-                                break;
-                        case AFR_SELF_HEAL_DATA:
-                                status = sh_status.data_self_heal;
-                                break;
-                        case AFR_SELF_HEAL_INVALID:
-                                status = AFR_SELF_HEAL_NOT_ATTEMPTED;
-                                break;
-                }
-                if (status == AFR_SELF_HEAL_FAILED)
-                        sh_failed = 1;
-
-        }
-
-out:
-        return sh_failed;
-}
-
-char *
-get_sh_completion_status (afr_self_heal_status status)
-{
-
-        char *not_attempted       = " is not attempted";
-        char *failed              = " failed";
-        char *started             = " is started";
-        char *sync_begin          = " is successfully completed";
-        char *result              = " has unknown status";
-
-        switch (status)
-        {
-                case AFR_SELF_HEAL_NOT_ATTEMPTED:
-                        result = not_attempted;
-                        break;
-                case AFR_SELF_HEAL_FAILED:
-                        result = failed;
-                        break;
-                case AFR_SELF_HEAL_STARTED:
-                        result = started;
-                        break;
-                case AFR_SELF_HEAL_SYNC_BEGIN:
-                        result = sync_begin;
-                        break;
-        }
-
-        return result;
-
-}
-
-void
-afr_log_self_heal_completion_status (afr_local_t *local, gf_loglevel_t loglvl)
-{
-
-        char sh_log[4096]              = {0};
-        afr_self_heal_t *sh            = &local->self_heal;
-        afr_sh_status_for_all_type   all_status = sh->afr_all_sh_status;
-        xlator_t      *this            = NULL;
-        size_t        off              = 0;
-        int           data_sh          = 0;
-        int           metadata_sh      = 0;
-        int           print_log        = 0;
-
-        this = THIS;
-
-        ADD_FMT_STRING (sh_log, off, "gfid or missing entry",
-                        all_status.gfid_or_missing_entry_self_heal, print_log);
-        ADD_FMT_STRING_SYNC (sh_log, off, "metadata",
-                             all_status.metadata_self_heal, print_log);
-        if (sh->background) {
-                ADD_FMT_STRING_SYNC (sh_log, off, "backgroung data",
-                                all_status.data_self_heal, print_log);
-        } else {
-                ADD_FMT_STRING_SYNC (sh_log, off, "foreground data",
-                                all_status.data_self_heal, print_log);
-        }
-        ADD_FMT_STRING_SYNC (sh_log, off, "entry", all_status.entry_self_heal,
-                             print_log);
-
-        if (AFR_SELF_HEAL_SYNC_BEGIN == all_status.data_self_heal &&
-	    strcmp (sh->data_sh_info, "") && sh->data_sh_info )
-                data_sh = 1;
-        if (AFR_SELF_HEAL_SYNC_BEGIN == all_status.metadata_self_heal &&
-	    strcmp (sh->metadata_sh_info, "") && sh->metadata_sh_info)
-                metadata_sh = 1;
-
-        if (!print_log)
-                return;
-
-        gf_log (this->name, loglvl, "%s %s %s on %s", sh_log,
-                ((data_sh == 1) ? sh->data_sh_info : ""),
-                ((metadata_sh == 1) ? sh->metadata_sh_info : ""),
-                local->loc.path);
-}
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.h b/xlators/cluster/afr/src/afr-self-heal-common.h
index 473264776..b313c17e9 100644
--- a/xlators/cluster/afr/src/afr-self-heal-common.h
+++ b/xlators/cluster/afr/src/afr-self-heal-common.h
@@ -1,58 +1,80 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __AFR_SELF_HEAL_COMMON_H__
 #define __AFR_SELF_HEAL_COMMON_H__
 
 #define FILE_HAS_HOLES(buf) (((buf)->ia_size) > ((buf)->ia_blocks * 512))
-#define AFR_SH_MIN_PARTICIPANTS 2
+
+typedef enum {
+        AFR_SELF_HEAL_ENTRY,
+        AFR_SELF_HEAL_METADATA,
+        AFR_SELF_HEAL_DATA,
+        AFR_SELF_HEAL_INVALID = -1,
+} afr_self_heal_type;
 
 typedef enum {
         AFR_LOOKUP_FAIL_CONFLICTS = 1,
         AFR_LOOKUP_FAIL_MISSING_GFIDS = 2,
 } afr_lookup_flags_t;
 
+typedef enum {
+        AFR_SPLIT_BRAIN = 1,
+        AFR_ALL_FOOLS =2
+} afr_source_flags_t;
+
 int
 afr_sh_select_source (int sources[], int child_count);
 
 int
+afr_sh_sink_count (int sources[], int child_count);
+
+int
 afr_sh_source_count (int sources[], int child_count);
 
 void
 afr_sh_print_pending_matrix (int32_t *pending_matrix[], xlator_t *this);
 
-void
-afr_sh_print_split_brain_log (int32_t *pending_matrix[], xlator_t *this,
-                              const char *loc);
-
 int
 afr_build_pending_matrix (char **pending_key, int32_t **pending_matrix,
-                          unsigned char *ignorant_subvols,
                           dict_t *xattr[], afr_transaction_type type,
                           size_t child_count);
 
 void
 afr_sh_pending_to_delta (afr_private_t *priv, dict_t **xattr,
-                         int32_t *delta_matrix[], unsigned char success[],
+                         int32_t *delta_matrix[], int success[],
                          int child_count, afr_transaction_type type);
 
 int
-afr_mark_sources (xlator_t *this, int32_t *sources, int32_t **pending_matrix,
-                  struct iatt *bufs, afr_self_heal_type type,
-                  int32_t *success_children, int32_t *subvol_status);
+afr_mark_sources (int32_t *sources, int32_t **pending_matrix, struct iatt *bufs,
+                  int32_t child_count, afr_self_heal_type type,
+                  int32_t *valid_children, const char *xlator_name,
+                  afr_source_flags_t *flags);
 
 int
-afr_sh_delta_to_xattr (xlator_t *this,
+afr_sh_delta_to_xattr (afr_private_t *priv,
                        int32_t *delta_matrix[], dict_t *xattr[],
 		       int child_count, afr_transaction_type type);
 
+int
+afr_sh_is_matrix_zero (int32_t *pending_matrix[], int child_count);
+
 void
 afr_self_heal_type_str_get (afr_self_heal_t *self_heal_p, char *str,
                             size_t size);
@@ -61,84 +83,39 @@ afr_self_heal_type
 afr_self_heal_type_for_transaction (afr_transaction_type type);
 
 int
-afr_build_sources (xlator_t *this, dict_t **xattr, struct iatt *bufs,
+afr_build_sources (xlator_t *xlator, dict_t **xattr, struct iatt *bufs,
                    int32_t **pending_matrix, int32_t *sources,
                    int32_t *success_children, afr_transaction_type type,
-                   int32_t *subvol_status, gf_boolean_t ignore_ignorant);
+                   afr_source_flags_t *flags);
 void
 afr_sh_common_reset (afr_self_heal_t *sh, unsigned int child_count);
-
-void
-afr_sh_common_lookup_resp_handler (call_frame_t *frame, void *cookie,
-                                   xlator_t *this,
-                                   int32_t op_ret, int32_t op_errno,
-                                   inode_t *inode, struct iatt *buf,
-                                   dict_t *xattr, struct iatt *postparent,
-                                   loc_t *loc);
-
 int
 afr_sh_common_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
                       afr_lookup_done_cbk_t lookup_cbk, uuid_t uuid,
-                      int32_t flags, dict_t *xdata);
+                      int32_t flags);
 int
 afr_sh_entry_expunge_remove (call_frame_t *expunge_frame, xlator_t *this,
-                             int active_src, struct iatt *buf,
-                             struct iatt *parentbuf);
+                             int active_src, struct iatt *buf);
 int
 afr_sh_entrylk (call_frame_t *frame, xlator_t *this, loc_t *loc,
                 char *base_name, afr_lock_cbk_t lock_cbk);
 int
 afr_sh_entry_impunge_create (call_frame_t *impunge_frame, xlator_t *this,
-                             int child_index);
-int
-afr_sh_data_unlock (call_frame_t *frame, xlator_t *this, char *dom,
-                    afr_lock_cbk_t lock_cbk);
+                             int child_index, struct iatt *buf,
+                             struct iatt *postparent);
 afr_local_t *
-afr_self_heal_local_init (afr_local_t *l, xlator_t *this);
-int
-afr_sh_data_lock (call_frame_t *frame, xlator_t *this,
-                  off_t start, off_t len, gf_boolean_t block, char *dom,
-                  afr_lock_cbk_t success_handler,
-                  afr_lock_cbk_t failure_handler);
+afr_local_copy (afr_local_t *l, xlator_t *this);
 void
 afr_sh_set_error (afr_self_heal_t *sh, int32_t op_errno);
-void
-afr_sh_mark_source_sinks (call_frame_t *frame, xlator_t *this);
 typedef int
 (*afr_fxattrop_cbk_t) (call_frame_t *frame, void *cookie,
                        xlator_t *this, int32_t op_ret, int32_t op_errno,
-                       dict_t *xattr, dict_t *xdata);
+                       dict_t *xattr);
 int
-afr_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent, char *name);
+afr_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent, char *name,
+                     uuid_t gfid);
 int
 afr_impunge_frame_create (call_frame_t *frame, xlator_t *this,
-                          int active_source, call_frame_t **impunge_frame);
-void
-afr_sh_reset (call_frame_t *frame, xlator_t *this);
-
-void
-afr_children_intersection_get (int32_t *set1, int32_t *set2,
-                               int *intersection, unsigned int child_count);
-int
-afr_get_no_xattr_dir_read_child (xlator_t *this, int32_t *success_children,
-                                 struct iatt *bufs);
-int
-afr_sh_erase_pending (call_frame_t *frame, xlator_t *this,
-                      afr_transaction_type type, afr_fxattrop_cbk_t cbk,
-                      int (*finish)(call_frame_t *frame, xlator_t *this));
-
-void
-afr_set_local_for_unhealable (afr_local_t *local);
-
-int
-is_self_heal_failed (afr_self_heal_t *sh, afr_sh_fail_check_type type);
-
-void
-afr_set_self_heal_status (afr_self_heal_t *sh, afr_self_heal_status status);
-
-void
-afr_log_self_heal_completion_status (afr_local_t *local, gf_loglevel_t  logl);
-
-char*
-afr_get_pending_matrix_str (int32_t *pending_matrix[], xlator_t *this);
+                          int active_source, int ret_child, mode_t entry_mode,
+                          call_frame_t **impunge_frame);
 #endif /* __AFR_SELF_HEAL_COMMON_H__ */
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index 9de26ee56..a2bc3bb58 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <libgen.h>
@@ -40,35 +49,31 @@
 #include "afr-self-heal-common.h"
 #include "afr-self-heal-algorithm.h"
 
-int
-afr_sh_data_fail (call_frame_t *frame, xlator_t *this);
-
-static inline gf_boolean_t
-afr_sh_data_proceed (unsigned int success_count)
-{
-        return (success_count >= AFR_SH_MIN_PARTICIPANTS);
-}
-
-extern int
-sh_loop_finish (call_frame_t *loop_frame, xlator_t *this);
-
-int
-afr_post_sh_big_lock_success (call_frame_t *frame, xlator_t *this);
-
-int
-afr_post_sh_big_lock_failure (call_frame_t *frame, xlator_t *this);
-
-int
-afr_sh_data_finish (call_frame_t *frame, xlator_t *this);
 
 int
 afr_sh_data_done (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        afr_private_t   *priv = NULL;
 
         local = frame->local;
         sh = &local->self_heal;
+        priv = this->private;
+
+        /*
+          TODO: cleanup sh->*
+        */
+
+        if (sh->healing_fd && !sh->healing_fd_opened) {
+                /* unref only if we created the fd ourselves */
+
+                fd_unref (sh->healing_fd);
+                sh->healing_fd = NULL;
+        }
+
+        /* for (i = 0; i < priv->child_count; i++) */
+        /*        sh->locked_nodes[i] = 0; */
 
         sh->completion_cbk (frame, this);
 
@@ -78,7 +83,7 @@ afr_sh_data_done (call_frame_t *frame, xlator_t *this)
 
 int
 afr_sh_data_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                       int32_t op_ret, int32_t op_errno)
 {
         afr_local_t   *local       = NULL;
         afr_private_t *priv        = NULL;
@@ -91,8 +96,8 @@ afr_sh_data_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         LOCK (&frame->lock);
         {
                 if (op_ret == -1) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "flush failed on %s on subvolume %s: %s",
+                        gf_log (this->name, GF_LOG_INFO,
+                                "flush or setattr failed on %s on subvolume %s: %s",
                                 local->loc.path, priv->children[child_index]->name,
                                 strerror (op_errno));
                 }
@@ -108,6 +113,18 @@ afr_sh_data_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         return 0;
 }
 
+
+int
+afr_sh_data_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                         int32_t op_ret, int32_t op_errno, struct iatt *statpre,
+                         struct iatt *statpost)
+{
+        afr_sh_data_flush_cbk (frame, cookie, this, op_ret, op_errno);
+
+        return 0;
+}
+
+
 int
 afr_sh_data_close (call_frame_t *frame, xlator_t *this)
 {
@@ -116,29 +133,66 @@ afr_sh_data_close (call_frame_t *frame, xlator_t *this)
         afr_self_heal_t *sh         = NULL;
         int              i          = 0;
         int              call_count = 0;
+        int              source     = 0;
+        int32_t          valid      = 0;
+        struct iatt      stbuf      = {0,};
 
         local = frame->local;
         sh    = &local->self_heal;
         priv  = this->private;
 
-        if (!sh->healing_fd) {
-                //This happens when file is non-reg
+        source = sh->source;
+
+        valid |= (GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME);
+
+        stbuf.ia_atime = sh->buf[source].ia_atime;
+        stbuf.ia_atime_nsec = sh->buf[source].ia_atime_nsec;
+        stbuf.ia_mtime = sh->buf[source].ia_mtime;
+        stbuf.ia_mtime_nsec = sh->buf[source].ia_mtime_nsec;
+
+        if (sh->healing_fd_opened) {
+                /* not our job to close the fd */
+
                 afr_sh_data_done (frame, this);
                 return 0;
         }
-        call_count        = afr_set_elem_count_get (sh->success,
-                                                    priv->child_count);
-        local->call_count = call_count;
 
-        if (call_count == 0) {
+        if (!sh->healing_fd) {
                 afr_sh_data_done (frame, this);
                 return 0;
         }
 
+        call_count        = (sh->active_sinks + 1) * 2;
+        local->call_count = call_count;
+
+        /* closed source */
+        gf_log (this->name, GF_LOG_TRACE,
+                "closing fd of %s on %s",
+                local->loc.path, priv->children[sh->source]->name);
+
+        STACK_WIND_COOKIE (frame, afr_sh_data_flush_cbk,
+                           (void *) (long) sh->source,
+                           priv->children[sh->source],
+                           priv->children[sh->source]->fops->flush,
+                           sh->healing_fd);
+        call_count--;
+
+        STACK_WIND_COOKIE (frame, afr_sh_data_setattr_cbk,
+                           (void *) (long) sh->source,
+                           priv->children[sh->source],
+                           priv->children[sh->source]->fops->setattr,
+                           &local->loc, &stbuf, valid);
+
+        call_count--;
+
+        if (call_count == 0)
+                return 0;
+
         for (i = 0; i < priv->child_count; i++) {
-                if (!sh->success[i])
+                if (sh->sources[i] || !local->child_up[i])
                         continue;
-                gf_log (this->name, GF_LOG_DEBUG,
+
+                gf_log (this->name, GF_LOG_TRACE,
                         "closing fd of %s on %s",
                         local->loc.path, priv->children[i]->name);
 
@@ -146,7 +200,15 @@ afr_sh_data_close (call_frame_t *frame, xlator_t *this)
                                    (void *) (long) i,
                                    priv->children[i],
                                    priv->children[i]->fops->flush,
-                                   sh->healing_fd, NULL);
+                                   sh->healing_fd);
+
+                call_count--;
+
+                STACK_WIND_COOKIE (frame, afr_sh_data_setattr_cbk,
+                                   (void *) (long) i,
+                                   priv->children[i],
+                                   priv->children[i]->fops->setattr,
+                                   &local->loc, &stbuf, valid);
 
                 if (!--call_count)
                         break;
@@ -155,46 +217,28 @@ afr_sh_data_close (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
-int
-afr_sh_dom_unlock (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh    = NULL;
-        afr_private_t   *priv  = NULL;
-
-        local = frame->local;
-        sh    = &local->self_heal;
-        priv  = this->private;
-
-        if (sh->sh_dom_lock_held)
-                afr_sh_data_unlock (frame, this, priv->sh_domain,
-                                    afr_sh_data_close);
-        else
-                afr_sh_data_close (frame, this);
-        return 0;
-}
 
 int
-afr_sh_data_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                         int32_t op_ret, int32_t op_errno, struct iatt *statpre,
-                         struct iatt *statpost, dict_t *xdata)
+afr_sh_data_unlck_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                       int32_t op_ret, int32_t op_errno)
 {
-
-        afr_local_t   *local       = NULL;
-        afr_private_t *priv        = NULL;
-        int            call_count  = 0;
-        int            child_index = (long) cookie;
+        afr_local_t * local = NULL;
+        int           call_count = 0;
+        int           child_index = (long) cookie;
 
         local = frame->local;
-        priv = this->private;
 
         LOCK (&frame->lock);
         {
                 if (op_ret == -1) {
                         gf_log (this->name, GF_LOG_INFO,
-                                "setattr failed on %s on subvolume %s: %s",
-                                local->loc.path, priv->children[child_index]->name,
+                                "locking inode of %s on child %d failed: %s",
+                                local->loc.path, child_index,
                                 strerror (op_errno));
+                } else {
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "inode of %s on child %d locked",
+                                local->loc.path, child_index);
                 }
         }
         UNLOCK (&frame->lock);
@@ -202,145 +246,38 @@ afr_sh_data_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         call_count = afr_frame_return (frame);
 
         if (call_count == 0) {
-                afr_sh_data_finish (frame, this);
-        }
-
-        return 0;
-}
-
-int
-afr_sh_data_setattr (call_frame_t *frame, xlator_t *this, struct iatt* stbuf)
-{
-        afr_local_t     *local      = NULL;
-        afr_private_t   *priv       = NULL;
-        afr_self_heal_t *sh         = NULL;
-        int              i          = 0;
-        int              call_count = 0;
-        int32_t          valid      = 0;
-
-        local = frame->local;
-        sh    = &local->self_heal;
-        priv  = this->private;
-
-        valid = (GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME);
-
-        call_count        = afr_set_elem_count_get (sh->success,
-                                                    priv->child_count);
-        local->call_count = call_count;
-
-        if (call_count == 0) {
-                GF_ASSERT (0);
-                afr_sh_data_finish (frame, this);
-                return 0;
-        }
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (!sh->success[i])
-                        continue;
-
-                STACK_WIND_COOKIE (frame, afr_sh_data_setattr_cbk,
-                                   (void *) (long) i,
-                                   priv->children[i],
-                                   priv->children[i]->fops->setattr,
-                                   &local->loc, stbuf, valid, NULL);
-
-                if (!--call_count)
-                        break;
-        }
-
-        return 0;
-}
-
-int
-afr_sh_data_setattr_fstat_cbk (call_frame_t *frame, void *cookie,
-                               xlator_t *this, int32_t op_ret, int32_t op_errno,
-                               struct iatt *buf, dict_t *xdata)
-{
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh = NULL;
-        int child_index = (long) cookie;
-
-        local = frame->local;
-        sh = &local->self_heal;
-
-        GF_ASSERT (sh->source == child_index);
-        if (op_ret != -1) {
-                sh->buf[child_index] = *buf;
-                afr_sh_data_setattr (frame, this, buf);
-        } else {
-                gf_log (this->name, GF_LOG_ERROR, "%s: Failed to set "
-                        "time-stamps after self-heal", local->loc.path);
-                afr_sh_data_fail (frame, this);
+                afr_sh_data_close (frame, this);
         }
 
         return 0;
 }
 
-/*
- * If there are any writes after the self-heal is triggered then the
- * stbuf stored in local->self_heal.buf[] will be invalid so we do one more
- * stat on the source and then set the [am]times
- */
-int
-afr_sh_set_timestamps (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local      = NULL;
-        afr_private_t   *priv       = NULL;
-        afr_self_heal_t *sh         = NULL;
-
-        local = frame->local;
-        sh    = &local->self_heal;
-        priv  = this->private;
-
-        STACK_WIND_COOKIE (frame, afr_sh_data_setattr_fstat_cbk,
-                           (void *) (long) sh->source,
-                           priv->children[sh->source],
-                           priv->children[sh->source]->fops->fstat,
-                           sh->healing_fd, NULL);
-        return 0;
-}
 
-//Fun fact, lock_cbk is being used for both lock & unlock
 int
-afr_sh_data_unlock (call_frame_t *frame, xlator_t *this, char *dom,
-                    afr_lock_cbk_t lock_cbk)
+afr_sh_data_unlock (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t         *local    = NULL;
         afr_internal_lock_t *int_lock = NULL;
         afr_self_heal_t     *sh       = NULL;
-        afr_private_t       *priv     = NULL;
-        int                 ret       = 0;
 
         local    = frame->local;
         int_lock = &local->internal_lock;
         sh       = &local->self_heal;
-        priv     = this->private;
 
-        if (strcmp (dom, this->name) == 0) {
-                sh->data_lock_held = _gf_false;
-        } else if (strcmp (dom, priv->sh_domain) == 0) {
-                sh->sh_dom_lock_held = _gf_false;
-        } else {
-                ret = -1;
-                goto out;
-        }
-        int_lock->lock_cbk = lock_cbk;
-        int_lock->domain = dom;
+        GF_ASSERT (!sh->data_lock_held);
+
+        int_lock->lock_cbk = afr_sh_data_close;
         afr_unlock (frame, this);
 
-out:
-        if (ret) {
-                int_lock->lock_op_ret = -1;
-                int_lock->lock_cbk (frame, this);
-        }
         return 0;
 }
 
+
 int
 afr_sh_data_finish (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh    = NULL;
+        afr_local_t   *local = NULL;
+        afr_self_heal_t *sh = NULL;
 
         local = frame->local;
         sh = &local->self_heal;
@@ -348,168 +285,177 @@ afr_sh_data_finish (call_frame_t *frame, xlator_t *this)
         gf_log (this->name, GF_LOG_DEBUG,
                 "finishing data selfheal of %s", local->loc.path);
 
-        if (sh->data_lock_held)
-                afr_sh_data_unlock (frame, this, this->name, afr_sh_dom_unlock);
+        if (!sh->data_lock_held)
+                afr_sh_data_unlock (frame, this);
         else
-                afr_sh_dom_unlock (frame, this);
+                afr_sh_data_close (frame, this);
 
         return 0;
 }
 
+
 int
-afr_sh_data_fail (call_frame_t *frame, xlator_t *this)
+afr_sh_data_erase_pending_cbk (call_frame_t *frame, void *cookie,
+                               xlator_t *this, int32_t op_ret,
+                               int32_t op_errno, dict_t *xattr)
 {
-        afr_local_t   *local = NULL;
-        afr_self_heal_t *sh = NULL;
+        int             call_count = 0;
 
-        local = frame->local;
-        sh = &local->self_heal;
+        call_count = afr_frame_return (frame);
 
-        gf_log (this->name, GF_LOG_DEBUG,
-                "finishing failed data selfheal of %s", local->loc.path);
+        if (call_count == 0)
+                afr_sh_data_finish (frame, this);
 
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-        afr_sh_data_finish (frame, this);
         return 0;
 }
 
+
 int
-afr_sh_data_erase_pending_cbk (call_frame_t *frame, void *cookie,
-                               xlator_t *this, int32_t op_ret,
-                               int32_t op_errno, dict_t *xattr, dict_t *xdata)
+afr_sh_data_erase_pending (call_frame_t *frame, xlator_t *this)
 {
-        int             call_count = 0;
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
         afr_private_t   *priv = NULL;
-        int32_t         child_index = (long) cookie;
+        int              call_count = 0;
+        int              i = 0;
+        dict_t          **erase_xattr = NULL;
 
-        priv  = this->private;
         local = frame->local;
-        sh    = &local->self_heal;
-        if (op_ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR, "Erasing of pending change "
-                        "log failed on %s for subvol %s, reason: %s",
-                        local->loc.path, priv->children[child_index]->name,
-                        strerror (op_errno));
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-        }
+        sh = &local->self_heal;
+        priv = this->private;
 
-        call_count = afr_frame_return (frame);
+        afr_sh_pending_to_delta (priv, sh->xattr, sh->delta_matrix, sh->success,
+                                 priv->child_count, AFR_DATA_TRANSACTION);
 
-        if (call_count == 0) {
-                if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
-                        if (sh->old_loop_frame)
-                                sh_loop_finish (sh->old_loop_frame, this);
-                        sh->old_loop_frame = NULL;
-                        afr_sh_data_fail (frame, this);
-                        goto out;
+        erase_xattr = GF_CALLOC (sizeof (*erase_xattr), priv->child_count,
+                                 gf_afr_mt_dict_t);
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->xattr[i]) {
+                        call_count++;
+
+                        erase_xattr[i] = get_new_dict();
+                        dict_ref (erase_xattr[i]);
                 }
-                if (!IA_ISREG (sh->type)) {
-                        afr_sh_data_finish (frame, this);
-                        goto out;
+        }
+
+        afr_sh_delta_to_xattr (priv, sh->delta_matrix, erase_xattr,
+                               priv->child_count, AFR_DATA_TRANSACTION);
+
+        local->call_count = call_count;
+        for (i = 0; i < priv->child_count; i++) {
+                if (!erase_xattr[i])
+                        continue;
+
+                gf_log (this->name, GF_LOG_TRACE,
+                        "erasing pending flags from %s on %s",
+                        local->loc.path, priv->children[i]->name);
+
+                STACK_WIND_COOKIE (frame, afr_sh_data_erase_pending_cbk,
+                                   (void *) (long) i,
+                                   priv->children[i],
+                                   priv->children[i]->fops->fxattrop,
+                                   sh->healing_fd,
+                                   GF_XATTROP_ADD_ARRAY, erase_xattr[i]);
+                if (!--call_count)
+                        break;
+        }
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (erase_xattr[i]) {
+                        dict_unref (erase_xattr[i]);
                 }
-                GF_ASSERT (sh->old_loop_frame);
-                afr_sh_data_lock (frame, this, 0, 0, _gf_true, this->name,
-                                  afr_post_sh_big_lock_success,
-                                  afr_post_sh_big_lock_failure);
         }
-out:
-        return 0;
-}
+        GF_FREE (erase_xattr);
 
-int
-afr_sh_data_erase_pending (call_frame_t *frame, xlator_t *this)
-{
-        afr_sh_erase_pending (frame, this, AFR_DATA_TRANSACTION,
-                              afr_sh_data_erase_pending_cbk,
-                              afr_sh_data_finish);
         return 0;
 }
 
+
 int
-afr_sh_data_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int op_ret, int op_errno, struct iatt *pre,
-                       struct iatt *post, dict_t *xdata)
+afr_sh_data_trim_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                      int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
+                      struct iatt *postbuf)
 {
-        afr_local_t     *local      = NULL;
-        afr_private_t   *priv       = NULL;
-        afr_self_heal_t *sh         = NULL;
-        int             call_count  = 0;
-        int             child_index = (long) cookie;
+        afr_private_t * priv = NULL;
+        afr_local_t * local  = NULL;
+        int              call_count = 0;
+        int              child_index = 0;
 
-        local = frame->local;
         priv = this->private;
-        sh   = &local->self_heal;
-
-        if (op_ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR, "%s: Failed to fsync on "
-                        "%s - %s", local->loc.path,
-                        priv->children[child_index]->name, strerror (op_errno));
-                LOCK (&frame->lock);
-                {
-                        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                }
-                UNLOCK (&frame->lock);
-                if (sh->old_loop_frame)
-                        sh_loop_finish (sh->old_loop_frame, this);
-                sh->old_loop_frame = NULL;
+        local = frame->local;
+
+        child_index = (long) cookie;
+
+        LOCK (&frame->lock);
+        {
+                if (op_ret == -1)
+                        gf_log (this->name, GF_LOG_INFO,
+                                "ftruncate of %s on subvolume %s failed (%s)",
+                                local->loc.path,
+                                priv->children[child_index]->name,
+                                strerror (op_errno));
+                else
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "ftruncate of %s on subvolume %s completed",
+                                local->loc.path,
+                                priv->children[child_index]->name);
         }
+        UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
+
         if (call_count == 0) {
-                if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC))
-                        afr_sh_data_fail (frame, this);
-                else
-                        afr_sh_data_erase_pending (frame, this);
+                afr_sh_data_erase_pending (frame, this);
         }
+
         return 0;
 }
 
-/*
- * Before erasing xattrs, make sure the data is written to disk
- */
+
 int
-afr_sh_data_fsync (call_frame_t *frame, xlator_t *this)
+afr_sh_data_trim_sinks (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t     *local     = NULL;
-        afr_private_t   *priv      = NULL;
-        afr_self_heal_t *sh        = NULL;
-        int             i          = 0;
-        int             call_count = 0;
+        afr_private_t * priv = NULL;
+        afr_local_t * local  = NULL;
+        afr_self_heal_t *sh  = NULL;
+        int             *sources = NULL;
+        int              call_count = 0;
+        int              i = 0;
+
 
-        local = frame->local;
         priv = this->private;
-        sh   = &local->self_heal;
+        local = frame->local;
+        sh = &local->self_heal;
 
-        call_count        = sh->active_sinks;
-        if (call_count == 0) {
-                afr_sh_data_erase_pending (frame, this);
-                return 0;
-        }
+        sources = sh->sources;
+        call_count = sh->active_sinks;
 
         local->call_count = call_count;
+
         for (i = 0; i < priv->child_count; i++) {
-                if (!sh->success[i] || sh->sources[i])
+                if (sources[i] || !local->child_up[i])
                         continue;
 
-                STACK_WIND_COOKIE (frame, afr_sh_data_fsync_cbk,
-                                   (void *) (long) i, priv->children[i],
-                                   priv->children[i]->fops->fsync,
-                                   sh->healing_fd, 1, NULL);
+                STACK_WIND_COOKIE (frame, afr_sh_data_trim_cbk,
+                                   (void *) (long) i,
+                                   priv->children[i],
+                                   priv->children[i]->fops->ftruncate,
+                                   sh->healing_fd, sh->file_size);
+
+                if (!--call_count)
+                        break;
         }
 
         return 0;
 }
 
+
 static struct afr_sh_algorithm *
 sh_algo_from_name (xlator_t *this, char *name)
 {
         int i = 0;
 
-        if (name == NULL)
-                goto out;
-
         while (afr_self_heal_algorithms[i].name) {
                 if (!strcmp (name, afr_self_heal_algorithms[i].name)) {
                         return &afr_self_heal_algorithms[i];
@@ -518,22 +464,17 @@ sh_algo_from_name (xlator_t *this, char *name)
                 i++;
         }
 
-out:
         return NULL;
 }
 
 
 static int
-sh_zero_byte_files_exist (afr_local_t *local, int child_count)
+sh_zero_byte_files_exist (afr_self_heal_t *sh, int child_count)
 {
-        int             i = 0;
-        int             ret = 0;
-        afr_self_heal_t *sh = NULL;
+        int i;
+        int ret = 0;
 
-        sh = &local->self_heal;
         for (i = 0; i < child_count; i++) {
-                if (!local->child_up[i] || sh->child_errno[i])
-                        continue;
                 if (sh->buf[i].ia_size == 0) {
                         ret = 1;
                         break;
@@ -560,7 +501,8 @@ afr_sh_data_pick_algo (call_frame_t *frame, xlator_t *this)
         if (algo == NULL) {
                 /* option not set, so fall back on heuristics */
 
-                if (sh_zero_byte_files_exist (local, priv->child_count)
+                if ((local->enoent_count != 0)
+                    || sh_zero_byte_files_exist (sh, priv->child_count)
                     || (sh->file_size <= (priv->data_self_heal_window_size *
                                           this->ctx->page_size))) {
 
@@ -593,542 +535,340 @@ afr_sh_data_sync_prepare (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        afr_private_t   *priv = NULL;
+        int              active_sinks = 0;
+        int              source = 0;
+        int              i = 0;
         struct afr_sh_algorithm *sh_algo = NULL;
 
         local = frame->local;
         sh = &local->self_heal;
+        priv = this->private;
 
-        sh->algo_completion_cbk = afr_sh_data_fsync;
-        sh->algo_abort_cbk      = afr_sh_data_fail;
-
-        sh_algo = afr_sh_data_pick_algo (frame, this);
-
-        sh->algo = sh_algo;
-        sh_algo->fn (frame, this);
-
-        return 0;
-}
+        source = sh->source;
 
-int
-afr_sh_data_trim_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                      struct iatt *postbuf, dict_t *xdata)
-{
-        int              call_count = 0;
-        int              child_index = 0;
-        afr_private_t    *priv = NULL;
-        afr_local_t      *local  = NULL;
-        afr_self_heal_t  *sh = NULL;
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->sources[i] == 0 && local->child_up[i] == 1) {
+                        active_sinks++;
+                        sh->success[i] = 1;
+                }
+        }
+        sh->success[source] = 1;
 
-        priv  = this->private;
-        local = frame->local;
-        sh    = &local->self_heal;
+        if (active_sinks == 0) {
+                gf_log (this->name, GF_LOG_INFO,
+                        "no active sinks for performing self-heal on file %s",
+                        local->loc.path);
+                afr_sh_data_finish (frame, this);
+                return 0;
+        }
+        sh->active_sinks = active_sinks;
 
-        child_index = (long) cookie;
+        gf_log (this->name, GF_LOG_DEBUG,
+                "self-healing file %s from subvolume %s to %d other",
+                local->loc.path, priv->children[source]->name, active_sinks);
 
-        LOCK (&frame->lock);
-        {
-                if (op_ret == -1) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "ftruncate of %s on subvolume %s failed (%s)",
-                                local->loc.path,
-                                priv->children[child_index]->name,
-                                strerror (op_errno));
-                        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                } else {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "ftruncate of %s on subvolume %s completed",
-                                local->loc.path,
-                                priv->children[child_index]->name);
-                }
-        }
-        UNLOCK (&frame->lock);
+        sh->algo_completion_cbk = afr_sh_data_trim_sinks;
+        sh->algo_abort_cbk      = afr_sh_data_finish;
 
-        call_count = afr_frame_return (frame);
+        sh_algo = afr_sh_data_pick_algo (frame, this);
 
-        if (call_count == 0) {
-                if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC))
-                        afr_sh_data_fail (frame, this);
-                else
-                        afr_sh_data_sync_prepare (frame, this);
-        }
+        sh_algo->fn (frame, this);
 
         return 0;
 }
 
 
 int
-afr_sh_data_trim_sinks (call_frame_t *frame, xlator_t *this)
+afr_sh_data_fix (call_frame_t *frame, xlator_t *this)
 {
-        afr_private_t * priv = NULL;
-        afr_local_t * local  = NULL;
-        afr_self_heal_t *sh  = NULL;
-        int             *sources = NULL;
-        int              call_count = 0;
+        afr_local_t     *local      = NULL;
+        afr_local_t *    orig_local = NULL;
+        afr_self_heal_t *sh = NULL;
+        afr_private_t   *priv = NULL;
+        int              nsources = 0;
+        int              source = 0;
         int              i = 0;
 
-
-        priv = this->private;
         local = frame->local;
         sh = &local->self_heal;
+        priv = this->private;
 
-        sources = sh->sources;
-        call_count = sh->active_sinks;
+        afr_build_pending_matrix (priv->pending_key, sh->pending_matrix,
+                                  sh->xattr, AFR_DATA_TRANSACTION,
+                                  priv->child_count);
 
-        local->call_count = call_count;
+        afr_sh_print_pending_matrix (sh->pending_matrix, this);
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (sources[i] || !local->child_up[i])
-                        continue;
+        nsources = afr_mark_sources (sh->sources, sh->pending_matrix, sh->buf,
+                                     priv->child_count, AFR_SELF_HEAL_DATA,
+                                     sh->child_success, this->name, NULL);
 
-                STACK_WIND_COOKIE (frame, afr_sh_data_trim_cbk,
-                                   (void *) (long) i,
-                                   priv->children[i],
-                                   priv->children[i]->fops->ftruncate,
-                                   sh->healing_fd, sh->file_size,
-                                   NULL);
+        if (nsources == 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "No self-heal needed for %s",
+                        local->loc.path);
 
-                if (!--call_count)
-                        break;
+                afr_sh_data_finish (frame, this);
+                return 0;
         }
 
-        return 0;
-}
-
-int
-afr_sh_inode_set_read_ctx (afr_self_heal_t *sh, xlator_t *this)
-{
-        afr_private_t   *priv = NULL;
-        int             ret = 0;
-        int             i = 0;
+        if ((nsources == -1)
+            && (priv->favorite_child != -1)
+            && (sh->child_errno[priv->favorite_child] == 0)) {
 
-        priv = this->private;
-        sh->source = afr_sh_select_source (sh->sources, priv->child_count);
-        if (sh->source < 0) {
-                ret = -1;
-                goto out;
-        }
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Picking favorite child %s as authentic source to "
+                        "resolve conflicting data of %s",
+                        priv->children[priv->favorite_child]->name,
+                        local->loc.path);
 
-        /* detect changes not visible through pending flags -- JIC */
-        for (i = 0; i < priv->child_count; i++) {
-                if (i == sh->source || sh->child_errno[i])
-                        continue;
+                sh->sources[priv->favorite_child] = 1;
 
-                if (SIZE_DIFFERS (&sh->buf[i], &sh->buf[sh->source]))
-                        sh->sources[i] = 0;
+                nsources = afr_sh_source_count (sh->sources,
+                                                priv->child_count);
         }
 
-        afr_reset_children (sh->fresh_children, priv->child_count);
-        afr_get_fresh_children (sh->success_children, sh->sources,
-                                sh->fresh_children, priv->child_count);
-        afr_inode_set_read_ctx (this, sh->inode, sh->source,
-                                sh->fresh_children);
-out:
-        return ret;
-}
-
-char*
-afr_get_sizes_str (afr_local_t *local, struct iatt *bufs, xlator_t *this)
-{
-        afr_private_t *priv = NULL;
-        int           i     = 0;
-        char          num[1024] = {0};
-        size_t        len = 0;
-        char          *sizes_str = NULL;
-        size_t        off = 0;
-        char          *fmt_str = "%llu bytes on %s, ";
-        char          *child_down =  " %s,";
-        char          *child_unknown = " %s,";
-        int           down_child_present = 0;
-        int           down_count = 0;
-        int           unknown_count = 0;
-        int           unknown_child_present = 0;
-        char          *down_subvol_1 = " down subvolume is ";
-        char          *unknown_subvol_1 = " unknown subvolume is ";
-        char          *down_subvol_2 = " down subvolumes are ";
-        char          *unknown_subvol_2 = " unknown subvolumes are ";
-
-        priv = this->private;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->child_up[i] == 1) {
-                        len += snprintf (num, sizeof (num), fmt_str,
-                                         (unsigned long long) bufs[i].ia_size,
-                                         priv->children[i]->name);
-                } else if (local->child_up[i] == 0) {
-                        len += snprintf (num, sizeof (num), child_down,
-                                         priv->children[i]->name);
-                        if (!down_child_present)
-                                down_child_present = 1;
-                        down_count ++;
-                } else if (local->child_up[i] == -1) {
-                        len += snprintf (num, sizeof (num), child_unknown,
-                                         priv->children[i]->name);
-                        if (!unknown_child_present)
-                                unknown_child_present = 1;
-                        unknown_count++;
-                }
+        if (nsources == -1) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Unable to self-heal contents of '%s' (possible "
+                        "split-brain). Please delete the file from all but "
+                        "the preferred subvolume.", local->loc.path);
 
-        }
+                local->govinda_gOvinda = 1;
 
-        if (down_child_present) {
-                if (down_count > 1)
-                        len += snprintf (num, sizeof (num), "%s",
-                                         down_subvol_2);
-                else
-                        len += snprintf (num, sizeof (num), "%s",
-                                        down_subvol_1);
-        }
-        if (unknown_child_present) {
-                if (unknown_count > 1)
-                        len += snprintf (num, sizeof (num), "%s",
-                                         unknown_subvol_2);
-                else
-                        len += snprintf (num, sizeof (num), "%s",
-                                         unknown_subvol_1);
+                afr_sh_data_finish (frame, this);
+                return 0;
         }
 
-        len++;//for '\0'
+        source = afr_sh_select_source (sh->sources, priv->child_count);
 
-        sizes_str = GF_CALLOC (len, sizeof (char), gf_common_mt_char);
-
-        if (!sizes_str)
-                return NULL;
+        if (source == -1) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "No active sources found.");
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->child_up[i] == 1) {
-                        off += snprintf (sizes_str + off, len - off, fmt_str,
-                                         (unsigned long long) bufs[i].ia_size,
-                                         priv->children[i]->name);
-                }
+                afr_sh_data_finish (frame, this);
+                return 0;
         }
 
-        if (down_child_present) {
-                if (down_count > 1) {
-                        off += snprintf (sizes_str + off, len - off, "%s",
-                                         down_subvol_2);
-                } else {
-                        off += snprintf (sizes_str + off, len - off, "%s",
-                                         down_subvol_1);
-                }
-        }
+        sh->source     = source;
+        sh->block_size = 65536; /* TODO: make it configurable or use macro */
+        sh->file_size  = sh->buf[source].ia_size;
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->child_up[i] == 0) {
-                        off += snprintf (sizes_str + off, len - off, child_down,
-                                         priv->children[i]->name);
-                }
-        }
+        if (FILE_HAS_HOLES (&sh->buf[source]))
+                sh->file_has_holes = 1;
 
-        if (unknown_child_present) {
-                if (unknown_count > 1) {
-                        off += snprintf (sizes_str + off, len - off, "%s",
-                                        unknown_subvol_2);
-                } else {
-                        off += snprintf (sizes_str + off, len - off, "%s",
-                                         unknown_subvol_1);
-                }
-        }
+        orig_local = sh->orig_frame->local;
+        orig_local->cont.lookup.buf.ia_size = sh->buf[source].ia_size;
 
+        /* detect changes not visible through pending flags -- JIC */
         for (i = 0; i < priv->child_count; i++) {
-                if (local->child_up[i] == -1) {
-                        off += snprintf (sizes_str + off, len - off,
-                                         child_unknown,
-                                         priv->children[i]->name);
-
-                }
-        }
-
-        return sizes_str;
-}
-
-char*
-afr_get_sinks_str (xlator_t *this, afr_local_t *local, afr_self_heal_t *sh)
-{
-        afr_private_t   *priv = NULL;
-        int             i = 0;
-        char            num[1024] = {0};
-        size_t          len = 0;
-        char            *sinks_str = NULL;
-        char            *temp_str = " to sinks ";
-        char            *str_format = " %s,";
-        char            off = 0;
-
-        priv = this->private;
+                if (i == source || sh->child_errno[i])
+                        continue;
 
-        len += snprintf (num, sizeof (num), "%s", temp_str);
-        for (i = 0; i < priv->child_count; i++) {
-                if ((sh->sources[i] == 0) && (local->child_up[i] == 1)) {
-                        len += snprintf (num, sizeof (num), str_format,
-                                         priv->children[i]->name);
-                }
+                if (SIZE_DIFFERS (&sh->buf[i], &sh->buf[source]))
+                        sh->sources[i] = 0;
         }
 
-        len ++;
-
-        sinks_str = GF_CALLOC (len, sizeof (char), gf_common_mt_char);
+        afr_set_read_child (this, local->loc.inode, sh->source);
 
-        if (!sinks_str)
-                return NULL;
+        /*
+          quick-read might have read the file, so send xattr from
+          the source subvolume (http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=815)
+        */
 
-        off += snprintf (sinks_str + off, len - off, "%s", temp_str);
+        dict_unref (orig_local->cont.lookup.xattr);
+        orig_local->cont.lookup.xattr = NULL;
+        if (orig_local->cont.lookup.xattrs)
+                orig_local->cont.lookup.xattr = dict_ref (orig_local->cont.lookup.xattrs[sh->source]);
 
-        for (i = 0; i < priv->child_count; i++) {
-                if ((sh->sources[i] == 0) && (local->child_up[i] == 1)) {
-                        off += snprintf (sinks_str + off, len - off,
-                                         str_format,
-                                         priv->children[i]->name);
-                }
+        if (sh->background) {
+                sh->unwind (sh->orig_frame, this, sh->op_ret, sh->op_errno);
+                sh->unwound = _gf_true;
         }
 
-        return sinks_str;
+        afr_sh_data_sync_prepare (frame, this);
 
+        return 0;
 }
 
-
-void
-afr_set_data_sh_info_str (afr_local_t *local, afr_self_heal_t *sh, xlator_t *this)
+gf_boolean_t
+afr_is_fresh_read_child (int32_t *sources, int32_t child_count,
+                         int32_t read_child)
 {
-        char            *pending_matrix_str = NULL;
-        char            *sizes_str = NULL;
-        char            *sinks_str = NULL;
-        afr_private_t   *priv = NULL;
-
-        priv = this->private;
-
-        pending_matrix_str = afr_get_pending_matrix_str (sh->pending_matrix,
-                                                         this);
-        if (!pending_matrix_str)
-                pending_matrix_str = "";
-
-        sizes_str = afr_get_sizes_str (local, sh->buf, this);
-        if (!sizes_str)
-                sizes_str = "";
-
-        sinks_str = afr_get_sinks_str (this, local, sh);
-        if (!sinks_str)
-                sinks_str = "";
+        gf_boolean_t             is_fresh_child = _gf_false;
 
-        gf_asprintf (&sh->data_sh_info, " data self heal from %s %s with "
-                     "%s data %s", priv->children[sh->source]->name, sinks_str,
-                     sizes_str, pending_matrix_str);
+        GF_ASSERT (read_child < child_count);
 
-        if (pending_matrix_str && strcmp (pending_matrix_str, ""))
-                GF_FREE (pending_matrix_str);
-
-        if (sizes_str && strcmp (sizes_str, ""))
-                GF_FREE (sizes_str);
+        if ((read_child >= 0) && (read_child < child_count) &&
+             sources[read_child]) {
+                is_fresh_child = _gf_true;
+        }
+        return is_fresh_child;
 }
 
-void
-afr_sh_data_fix (call_frame_t *frame, xlator_t *this)
+static int
+afr_select_read_child_from_policy (int32_t *sources, int32_t child_count,
+                                   int32_t prev_read_child,
+                                   int32_t config_read_child,
+                                   int32_t *valid_children)
 {
-        int              source = 0;
-        afr_local_t     *local      = NULL;
-        afr_self_heal_t *sh = NULL;
-        afr_private_t   *priv = NULL;
-
-        local = frame->local;
-        sh = &local->self_heal;
-        priv = this->private;
+        int32_t                  read_child = -1;
+        int                      i          = 0;
 
-        source     = sh->source;
-        sh->block_size = this->ctx->page_size;
-        sh->file_size  = sh->buf[source].ia_size;
+        GF_ASSERT (sources);
 
-        if (FILE_HAS_HOLES (&sh->buf[source]))
-                sh->file_has_holes = 1;
+        read_child = prev_read_child;
+        if (_gf_true == afr_is_fresh_read_child (sources, child_count,
+                                                 read_child))
+                goto out;
 
-        if (sh->background && sh->unwind && !sh->unwound) {
-                sh->unwind (sh->orig_frame, this, sh->op_ret, sh->op_errno,
-                            is_self_heal_failed (sh, AFR_CHECK_SPECIFIC));
-                sh->unwound = _gf_true;
-        }
+        read_child = config_read_child;
+        if (_gf_true == afr_is_fresh_read_child (sources, child_count,
+                                                 read_child))
+                goto out;
 
-        afr_sh_mark_source_sinks (frame, this);
-        if (sh->active_sinks == 0) {
-                gf_log (this->name, GF_LOG_INFO,
-                        "no active sinks for performing self-heal on file %s",
-                        local->loc.path);
-                afr_sh_data_finish (frame, this);
-                return;
+        for (i = 0; i < child_count; i++) {
+                read_child = valid_children[i];
+                if (read_child < 0)
+                        break;
+                if (_gf_true == afr_is_fresh_read_child (sources, child_count,
+                                                         read_child))
+                        goto out;
         }
+        read_child = -1;
 
-        gf_log (this->name, GF_LOG_DEBUG,
-                "self-healing file %s from subvolume %s to %d other",
-                local->loc.path, priv->children[sh->source]->name,
-                sh->active_sinks);
-
-        sh->actual_sh_started = _gf_true;
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_SYNC_BEGIN);
-        afr_sh_data_trim_sinks (frame, this);
+out:
+        return read_child;
 }
 
-int
-afr_sh_data_fxattrop_fstat_done (call_frame_t *frame, xlator_t *this)
+static void
+afr_destroy_pending_matrix (int32_t **pending_matrix, int32_t child_count)
 {
-        afr_local_t     *local      = NULL;
-        afr_self_heal_t *sh = NULL;
-        afr_private_t   *priv = NULL;
-        int              nsources = 0;
-        int              ret = 0;
-        int             *old_sources = NULL;
-        int             tstamp_source = 0;
         int             i = 0;
-
-        local = frame->local;
-        sh = &local->self_heal;
-        priv = this->private;
-
-        gf_log (this->name, GF_LOG_DEBUG, "Pending matrix for: %s",
-                lkowner_utoa (&frame->root->lk_owner));
-        if (sh->sync_done) {
-                //store sources before sync so that mtime can be set using the
-                //iatt buf from one of them.
-                old_sources = alloca (priv->child_count*sizeof (*old_sources));
-                memcpy (old_sources, sh->sources,
-                        priv->child_count * sizeof (*old_sources));
-        }
-
-        nsources = afr_build_sources (this, sh->xattr, sh->buf, sh->pending_matrix,
-                                      sh->sources, sh->success_children,
-                                      AFR_DATA_TRANSACTION, NULL, _gf_true);
-        if ((nsources == -1)
-            && (priv->favorite_child != -1)
-            && (sh->child_errno[priv->favorite_child] == 0)) {
-
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "Picking favorite child %s as authentic source to "
-                        "resolve conflicting data of %s",
-                        priv->children[priv->favorite_child]->name,
-                        local->loc.path);
-
-                sh->sources[priv->favorite_child] = 1;
-
-                nsources = afr_sh_source_count (sh->sources,
-                                                priv->child_count);
-        }
-
-        if (nsources == -1) {
-                afr_sh_print_split_brain_log (sh->pending_matrix, this,
-                                              local->loc.path);
-                afr_set_split_brain (this, sh->inode, DONT_KNOW, SPB);
-
-                afr_sh_data_fail (frame, this);
-                return 0;
+        GF_ASSERT (child_count > 0);
+        if (pending_matrix) {
+                for (i = 0; i < child_count; i++) {
+                        if (pending_matrix[i])
+                                GF_FREE (pending_matrix[i]);
+                }
+                GF_FREE (pending_matrix);
         }
+}
 
-        afr_set_split_brain (this, sh->inode, DONT_KNOW, NO_SPB);
-
-        ret = afr_sh_inode_set_read_ctx (sh, this);
-        if (ret) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "No active sources found.");
-
-                afr_sh_data_fail (frame, this);
-                return 0;
-        }
+static int32_t**
+afr_create_pending_matrix (int32_t child_count)
+{
+        gf_boolean_t            cleanup = _gf_false;
+        int32_t                 **pending_matrix = NULL;
+        int                     i = 0;
 
-        if (sh->sync_done) {
-                /* Perform setattr from one of the old_sources if possible
-                 * Because only they have the correct mtime, the new sources
-                 * (i.e. old sinks) have mtime from last writev in sync.
-                 */
-                tstamp_source = sh->source;
-                for (i = 0; i < priv->child_count; i++) {
-                        if (old_sources[i] && sh->sources[i])
-                                tstamp_source = i;
-                }
-                afr_sh_data_setattr (frame, this, &sh->buf[tstamp_source]);
-        } else {
-                afr_set_data_sh_info_str (local, sh, this);
-                if (nsources == 0) {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "No self-heal needed for %s",
-                                local->loc.path);
+        GF_ASSERT (child_count > 0);
 
-                        afr_sh_data_finish (frame, this);
-                        return 0;
+        pending_matrix = GF_CALLOC (sizeof (*pending_matrix), child_count,
+                                    gf_afr_mt_int32_t);
+        if (NULL == pending_matrix)
+                goto out;
+        for (i = 0; i < child_count; i++) {
+                pending_matrix[i] = GF_CALLOC (sizeof (**pending_matrix),
+                                               child_count,
+                                               gf_afr_mt_int32_t);
+                if (NULL == pending_matrix[i]) {
+                        cleanup = _gf_true;
+                        goto out;
                 }
-
-                if (sh->do_data_self_heal &&
-                    afr_data_self_heal_enabled (priv->data_self_heal))
-                        afr_sh_data_fix (frame, this);
-                else
-                        afr_sh_data_finish (frame, this);
         }
-        return 0;
+out:
+        if (_gf_true == cleanup) {
+                afr_destroy_pending_matrix (pending_matrix, child_count);
+                pending_matrix = NULL;
+        }
+        return pending_matrix;
 }
 
 int
 afr_lookup_select_read_child_by_txn_type (xlator_t *this, afr_local_t *local,
                                           dict_t **xattr,
-                                          afr_transaction_type txn_type,
-                                          uuid_t gfid)
+                                          afr_transaction_type txn_type)
 {
         afr_private_t            *priv      = NULL;
         int                      read_child = -1;
+        int                      ret        = -1;
         int32_t                  **pending_matrix = NULL;
         int32_t                  *sources         = NULL;
-        int32_t                  *success_children   = NULL;
+        int32_t                  *valid_children  = NULL;
         struct iatt              *bufs            = NULL;
         int32_t                  nsources         = 0;
         int32_t                  prev_read_child  = -1;
         int32_t                  config_read_child = -1;
-        int32_t                  subvol_status = 0;
+        afr_self_heal_t          *sh = NULL;
+        afr_self_heal_type       sh_type = AFR_SELF_HEAL_INVALID;
 
         priv = this->private;
         bufs = local->cont.lookup.bufs;
-        success_children = local->cont.lookup.success_children;
+        valid_children = local->cont.lookup.child_success;
+        sh = &local->self_heal;
+
+        pending_matrix = afr_create_pending_matrix (priv->child_count);
+        if (NULL == pending_matrix)
+                goto out;
 
-        pending_matrix = local->cont.lookup.pending_matrix;
         sources = local->cont.lookup.sources;
         memset (sources, 0, sizeof (*sources) * priv->child_count);
+        afr_build_pending_matrix (priv->pending_key, pending_matrix,
+                                  xattr, txn_type, priv->child_count);
 
-        nsources = afr_build_sources (this, xattr, bufs, pending_matrix,
-                                      sources, success_children, txn_type,
-                                      &subvol_status, _gf_false);
-        if (subvol_status & SPLIT_BRAIN) {
-                gf_log (this->name, GF_LOG_DEBUG, "%s: Possible split-brain",
-                        local->loc.path);
-                switch (txn_type) {
-                case AFR_DATA_TRANSACTION:
-                        local->cont.lookup.possible_spb = _gf_true;
-                        nsources = 1;
-                        sources[success_children[0]] = 1;
-                        break;
-                case AFR_ENTRY_TRANSACTION:
-                        read_child = afr_get_no_xattr_dir_read_child (this,
-                                                             success_children,
-                                                             bufs);
-                        sources[read_child] = 1;
-                        nsources = 1;
-                        break;
-                default:
-                        break;
-                }
-        }
-        if (nsources < 0)
+        sh_type = afr_self_heal_type_for_transaction (txn_type);
+        if (AFR_SELF_HEAL_INVALID == sh_type)
+                goto out;
+
+        nsources = afr_mark_sources (sources, pending_matrix, bufs,
+                                     priv->child_count, sh_type,
+                                     valid_children, this->name, NULL);
+        if (nsources < 0) {
+                ret = -1;
                 goto out;
+        }
 
         prev_read_child = local->read_child_index;
         config_read_child = priv->read_child;
-        read_child = afr_select_read_child_from_policy (success_children,
+        read_child = afr_select_read_child_from_policy (sources,
                                                         priv->child_count,
                                                         prev_read_child,
                                                         config_read_child,
-                                                        sources,
-                                                        priv->hash_mode, gfid);
+                                                        valid_children);
+        ret = 0;
 out:
-        gf_log (this->name, GF_LOG_DEBUG, "returning read_child: %d",
-                read_child);
+        afr_destroy_pending_matrix (pending_matrix, priv->child_count);
+        gf_log (this->name, GF_LOG_DEBUG, "returning read_child: %d", read_child);
         return read_child;
 }
 
 int
+afr_sh_data_special_file_fix (call_frame_t *frame, xlator_t *this)
+{
+        afr_private_t   *priv = NULL;
+        afr_self_heal_t *sh = NULL;
+        afr_local_t     *local = NULL;
+        int             i = 0;
+
+        local = frame->local;
+        sh = &local->self_heal;
+        priv = this->private;
+
+        for (i = 0; i < priv->child_count; i++)
+                if (1 == local->child_up[i])
+                        sh->success[i] = 1;
+
+        afr_sh_data_erase_pending (frame, this);
+
+        return 0;
+}
+
+int
 afr_sh_data_fstat_cbk (call_frame_t *frame, void *cookie,
                        xlator_t *this, int32_t op_ret, int32_t op_errno,
-                       struct iatt *buf, dict_t *xdata)
+                       struct iatt *buf)
 {
         afr_private_t   *priv  = NULL;
         afr_local_t     *local = NULL;
@@ -1149,14 +889,8 @@ afr_sh_data_fstat_cbk (call_frame_t *frame, void *cookie,
                                 priv->children[child_index]->name);
 
                         sh->buf[child_index] = *buf;
-                        sh->success_children[sh->success_count] = child_index;
+                        sh->child_success[sh->success_count] = child_index;
                         sh->success_count++;
-                } else {
-                        gf_log (this->name, GF_LOG_ERROR, "%s: fstat failed "
-                                "on %s, reason %s", local->loc.path,
-                                priv->children[child_index]->name,
-                                strerror (op_errno));
-                        sh->child_errno[child_index] = op_errno;
                 }
         }
         UNLOCK (&frame->lock);
@@ -1167,17 +901,12 @@ afr_sh_data_fstat_cbk (call_frame_t *frame, void *cookie,
                 /* Previous versions of glusterfs might have set
                  * the pending data xattrs which need to be erased
                  */
-                if (!afr_sh_data_proceed (sh->success_count)) {
-                        gf_log (this->name, GF_LOG_ERROR, "inspecting metadata "
-                                "succeeded on < %d children, aborting "
-                                "self-heal for %s", AFR_SH_MIN_PARTICIPANTS,
-                                local->loc.path);
-                        afr_sh_data_fail (frame, this);
-                        goto out;
-                }
-                afr_sh_data_fxattrop_fstat_done (frame, this);
+                if (IA_ISREG (buf->ia_type))
+                        afr_sh_data_fix (frame, this);
+                else
+                        afr_sh_data_special_file_fix (frame, this);
         }
-out:
+
         return 0;
 }
 
@@ -1188,52 +917,47 @@ afr_sh_data_fstat (call_frame_t *frame, xlator_t *this)
         afr_self_heal_t *sh    = NULL;
         afr_local_t     *local = NULL;
         afr_private_t   *priv  = NULL;
-        int             call_count = 0;
-        int             i = 0;
-        int             child = 0;
-        int32_t         *fstat_children = NULL;
+        int call_count = 0;
+        int i = 0;
 
         priv  = this->private;
         local = frame->local;
         sh    = &local->self_heal;
 
-        fstat_children = memdup (sh->success_children,
-                                 sizeof (*fstat_children) * priv->child_count);
-        if (!fstat_children) {
-                afr_sh_data_fail (frame, this);
-                goto out;
-        }
-        call_count = sh->success_count;
+        call_count = afr_up_children_count (priv->child_count,
+                                            local->child_up);
+
         local->call_count = call_count;
 
-        memset (sh->buf, 0, sizeof (*sh->buf) * priv->child_count);
-        afr_reset_children (sh->success_children, priv->child_count);
+        for (i = 0; i < priv->child_count; i++)
+                sh->child_success[i] = -1;
         sh->success_count = 0;
         for (i = 0; i < priv->child_count; i++) {
-                child = fstat_children[i];
-                if (child == -1)
-                        break;
-                STACK_WIND_COOKIE (frame, afr_sh_data_fstat_cbk,
-                                   (void *) (long) child,
-                                   priv->children[child],
-                                   priv->children[child]->fops->fstat,
-                                   sh->healing_fd, NULL);
-                --call_count;
+                if (local->child_up[i]) {
+                        STACK_WIND_COOKIE (frame, afr_sh_data_fstat_cbk,
+                                           (void *) (long) i,
+                                           priv->children[i],
+                                           priv->children[i]->fops->fstat,
+                                           sh->healing_fd);
+
+                        if (!--call_count)
+                                break;
+                }
         }
-        GF_ASSERT (!call_count);
-out:
-        GF_FREE (fstat_children);
+
         return 0;
 }
 
-void
-afr_sh_common_fxattrop_resp_handler (call_frame_t *frame, void *cookie,
-                                     xlator_t *this, int32_t op_ret,
-                                     int32_t op_errno, dict_t *xattr)
+
+int
+afr_sh_data_fxattrop_cbk (call_frame_t *frame, void *cookie,
+                          xlator_t *this, int32_t op_ret, int32_t op_errno,
+                          dict_t *xattr)
 {
         afr_private_t   *priv  = NULL;
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        int call_count  = -1;
         int child_index = (long) cookie;
 
         local = frame->local;
@@ -1249,46 +973,16 @@ afr_sh_common_fxattrop_resp_handler (call_frame_t *frame, void *cookie,
                                 priv->children[child_index]->name);
 
                         sh->xattr[child_index] = dict_ref (xattr);
-                        sh->success_children[sh->success_count] = child_index;
-                        sh->success_count++;
-                } else {
-                        gf_log (this->name, GF_LOG_ERROR, "fxattrop of %s "
-                                "failed on %s, reason %s", local->loc.path,
-                                priv->children[child_index]->name,
-                                strerror (op_errno));
-                        sh->child_errno[child_index] = op_errno;
                 }
         }
         UNLOCK (&frame->lock);
-}
-
-int
-afr_sh_data_fxattrop_cbk (call_frame_t *frame, void *cookie,
-                          xlator_t *this, int32_t op_ret, int32_t op_errno,
-                          dict_t *xattr, dict_t *xdata)
-{
-        int             call_count  = -1;
-        afr_local_t     *local  = NULL;
-        afr_self_heal_t *sh     = NULL;
-
-        local = frame->local;
-        sh    = &local->self_heal;
-
-        afr_sh_common_fxattrop_resp_handler (frame, cookie, this, op_ret,
-                                             op_errno, xattr);
 
         call_count = afr_frame_return (frame);
+
         if (call_count == 0) {
-                if (!afr_sh_data_proceed (sh->success_count)) {
-                        gf_log (this->name, GF_LOG_ERROR, "%s, inspecting "
-                                "change log succeeded on < %d children",
-                                local->loc.path, AFR_SH_MIN_PARTICIPANTS);
-                        afr_sh_data_fail (frame, this);
-                        goto out;
-                }
                 afr_sh_data_fstat (frame, this);
         }
-out:
+
         return 0;
 }
 
@@ -1299,61 +993,42 @@ afr_sh_data_fxattrop (call_frame_t *frame, xlator_t *this)
         afr_self_heal_t *sh    = NULL;
         afr_local_t     *local = NULL;
         afr_private_t   *priv  = NULL;
-        dict_t          **xattr_req;
+        dict_t          *xattr_req = NULL;
         int32_t         *zero_pending = NULL;
         int call_count = 0;
         int i = 0;
         int ret = 0;
-	int j;
 
         priv  = this->private;
         local = frame->local;
         sh    = &local->self_heal;
 
-        call_count = afr_up_children_count (local->child_up,
-                                            priv->child_count);
+        call_count = afr_up_children_count (priv->child_count,
+                                            local->child_up);
 
         local->call_count = call_count;
 
-	xattr_req = GF_CALLOC(priv->child_count, sizeof(struct dict_t *),
-			      gf_afr_mt_dict_t);
-	if (!xattr_req)
-		goto out;
-
-	for (i = 0; i < priv->child_count; i++) {
-		xattr_req[i] = dict_new();
-		if (!xattr_req[i]) {
-			ret = -1;
-			goto out;
-		}
-	}
-
-	for (i = 0; i < priv->child_count; i++) {
-		for (j = 0; j < priv->child_count; j++) {
-			zero_pending = GF_CALLOC (3, sizeof (*zero_pending),
-						  gf_afr_mt_int32_t);
-			if (!zero_pending) {
-				ret = -1;
-				goto out;
-			}
-			ret = dict_set_dynptr (xattr_req[i], priv->pending_key[j],
-					       zero_pending,
-					       3 * sizeof (*zero_pending));
-			if (ret < 0) {
-				gf_log (this->name, GF_LOG_WARNING,
-					"Unable to set dict value");
-				goto out;
-			} else {
-				zero_pending = NULL;
-			}
-		}
-	}
-
-        afr_reset_xattr (sh->xattr, priv->child_count);
-        afr_reset_children (sh->success_children, priv->child_count);
-        memset (sh->child_errno, 0,
-                sizeof (*sh->child_errno) * priv->child_count);
-        sh->success_count = 0;
+        xattr_req = dict_new();
+        if (!xattr_req) {
+                gf_log (this->name, GF_LOG_ERROR, "Out of memory");
+                goto out;
+        }
+
+        for (i = 0; i < priv->child_count; i++) {
+                zero_pending = GF_CALLOC (3, sizeof (int32_t), gf_common_mt_int32_t);
+                if (!zero_pending) {
+                        gf_log (this->name, GF_LOG_ERROR, "Out of memory");
+                        goto out;
+                }
+                ret = dict_set_dynptr (xattr_req, priv->pending_key[i],
+                                           zero_pending, 3 * sizeof (int32_t));
+                if (ret < 0) {
+                        GF_FREE (zero_pending);
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Unable to set dict value");
+                }
+        }
+
         for (i = 0; i < priv->child_count; i++) {
                 if (local->child_up[i]) {
                         STACK_WIND_COOKIE (frame, afr_sh_data_fxattrop_cbk,
@@ -1361,87 +1036,28 @@ afr_sh_data_fxattrop (call_frame_t *frame, xlator_t *this)
                                            priv->children[i],
                                            priv->children[i]->fops->fxattrop,
                                            sh->healing_fd, GF_XATTROP_ADD_ARRAY,
-                                           xattr_req[i], NULL);
+                                           xattr_req);
 
                         if (!--call_count)
                                 break;
                 }
         }
 
-out:
-	if (xattr_req) {
-		for (i = 0; i < priv->child_count; i++)
-			if (xattr_req[i])
-				dict_unref(xattr_req[i]);
-		GF_FREE(xattr_req);
-	}
-
-        if (ret) {
-                GF_FREE (zero_pending);
-                afr_sh_data_fail (frame, this);
-        }
-
+        dict_unref (xattr_req);
         return 0;
-}
-
-int
-afr_sh_data_big_lock_success (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t   *local = NULL;
-        afr_self_heal_t *sh = NULL;
 
-        local = frame->local;
-        sh = &local->self_heal;
+out:
+        if (xattr_req)
+                dict_unref (xattr_req);
+        sh->op_failed = 1;
+        afr_sh_data_done (frame, this);
 
-        sh->data_lock_held = _gf_true;
-        afr_sh_data_fxattrop (frame, this);
         return 0;
 }
 
-int
-afr_sh_dom_lock_success (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t   *local = NULL;
-        afr_self_heal_t *sh = NULL;
-
-        local = frame->local;
-        sh = &local->self_heal;
-
-        sh->sh_dom_lock_held = _gf_true;
-        afr_sh_data_lock (frame, this, 0, 0, _gf_true, this->name,
-                          afr_sh_data_big_lock_success,
-                          afr_sh_data_fail);
-        return 0;
-}
 
 int
-afr_sh_data_post_blocking_inodelk_cbk (call_frame_t *frame, xlator_t *this)
-{
-        afr_internal_lock_t *int_lock = NULL;
-        afr_local_t         *local    = NULL;
-        afr_self_heal_t     *sh       = NULL;
-
-        local    = frame->local;
-        int_lock = &local->internal_lock;
-        sh       = &local->self_heal;
-
-        if (int_lock->lock_op_ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR, "Blocking data inodelks "
-                        "failed for %s. by %s",
-                        local->loc.path, lkowner_utoa (&frame->root->lk_owner));
-
-                sh->data_lock_failure_handler (frame, this);
-        } else {
-
-                gf_log (this->name, GF_LOG_DEBUG, "Blocking data inodelks "
-                        "done for %s by %s. Proceding to self-heal",
-                        local->loc.path, lkowner_utoa (&frame->root->lk_owner));
-
-                sh->data_lock_success_handler (frame, this);
-        }
-
-        return 0;
-}
+afr_sh_data_lock_rec (call_frame_t *frame, xlator_t *this);
 
 int
 afr_sh_data_post_nonblocking_inodelk_cbk (call_frame_t *frame, xlator_t *this)
@@ -1455,113 +1071,74 @@ afr_sh_data_post_nonblocking_inodelk_cbk (call_frame_t *frame, xlator_t *this)
         sh       = &local->self_heal;
 
         if (int_lock->lock_op_ret < 0) {
-                gf_log (this->name, GF_LOG_DEBUG, "Non Blocking data inodelks "
-                        "failed for %s. by %s",
-                        local->loc.path, lkowner_utoa (&frame->root->lk_owner));
-
-		if (!sh->data_lock_block) {
-			sh->data_lock_failure_handler(frame, this);
-		} else {
-			int_lock->lock_cbk =
-				afr_sh_data_post_blocking_inodelk_cbk;
-			afr_blocking_lock (frame, this);
-		}
+                gf_log (this->name, GF_LOG_ERROR, "Non Blocking data inodelks "
+                        "failed for %s.", local->loc.path);
+                sh->op_failed = 1;
+                afr_sh_data_done (frame, this);
         } else {
 
                 gf_log (this->name, GF_LOG_DEBUG, "Non Blocking data inodelks "
-                        "done for %s by %s. Proceeding to self-heal",
-                        local->loc.path, lkowner_utoa (&frame->root->lk_owner));
-                sh->data_lock_success_handler (frame, this);
+                        "done for %s. Proceeding to FOP", local->loc.path);
+                afr_sh_data_fxattrop (frame, this);
         }
 
         return 0;
 }
 
 int
-afr_sh_data_lock_rec (call_frame_t *frame, xlator_t *this, char *dom,
-                      off_t start, off_t len)
+afr_sh_data_lock_rec (call_frame_t *frame, xlator_t *this)
 {
         afr_internal_lock_t *int_lock = NULL;
-        afr_inodelk_t       *inodelk  = NULL;
         afr_local_t         *local    = NULL;
+        afr_self_heal_t     *sh       = NULL;
 
         local    = frame->local;
         int_lock = &local->internal_lock;
+        sh       = &local->self_heal;
 
         int_lock->transaction_lk_type = AFR_SELFHEAL_LK;
         int_lock->selfheal_lk_type    = AFR_DATA_SELF_HEAL_LK;
 
         afr_set_lock_number (frame, this);
 
+        int_lock->lk_flock.l_start = 0;
+        int_lock->lk_flock.l_len   = 0;
+        int_lock->lk_flock.l_type  = F_WRLCK;
         int_lock->lock_cbk         = afr_sh_data_post_nonblocking_inodelk_cbk;
 
-        int_lock->domain = dom;
-        inodelk = afr_get_inodelk (int_lock, int_lock->domain);
-        inodelk->flock.l_start = start;
-        inodelk->flock.l_len   = len;
-        inodelk->flock.l_type  = F_WRLCK;
-
         afr_nonblocking_inodelk (frame, this);
 
         return 0;
 }
 
-int
-afr_post_sh_big_lock_success (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local     = NULL;
-        afr_self_heal_t *sh        = NULL;
-
-        local = frame->local;
-        sh = &local->self_heal;
-
-        GF_ASSERT (sh->old_loop_frame);
-        sh_loop_finish (sh->old_loop_frame, this);
-        sh->old_loop_frame = NULL;
-        sh->data_lock_held = _gf_true;
-        sh->sync_done = _gf_true;
-        afr_sh_data_fxattrop (frame, this);
-        return 0;
-}
-
-int
-afr_post_sh_big_lock_failure (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local     = NULL;
-        afr_self_heal_t *sh        = NULL;
-
-        local = frame->local;
-        sh = &local->self_heal;
-
-        GF_ASSERT (sh->old_loop_frame);
-        sh_loop_finish (sh->old_loop_frame, this);
-        sh->old_loop_frame = NULL;
-        afr_sh_set_timestamps (frame, this);
-        return 0;
-}
-
 
 int
-afr_sh_data_lock (call_frame_t *frame, xlator_t *this,
-                  off_t start, off_t len, gf_boolean_t block,
-                  char *dom, afr_lock_cbk_t success_handler,
-                  afr_lock_cbk_t failure_handler)
+afr_sh_data_lock (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t *   local = NULL;
+        afr_private_t * priv  = NULL;
         afr_self_heal_t * sh  = NULL;
 
+
         local = frame->local;
         sh    = &local->self_heal;
+        priv  = this->private;
+
+        if (sh->data_lock_held) {
+                /* caller has held the lock already,
+                   so skip locking */
+
+                afr_sh_data_fxattrop (frame, this);
+                return 0;
+        }
 
-        sh->data_lock_success_handler = success_handler;
-        sh->data_lock_failure_handler = failure_handler;
-	sh->data_lock_block = block;
-        return afr_sh_data_lock_rec (frame, this, dom, start, len);
+        return afr_sh_data_lock_rec (frame, this);
 }
 
+
 int
 afr_sh_data_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int32_t op_ret, int32_t op_errno, fd_t *fd, dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno, fd_t *fd)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
@@ -1587,21 +1164,21 @@ afr_sh_data_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 local->loc.path,
                                 priv->children[child_index]->name,
                                 strerror (op_errno));
-                        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                } else {
-                        gf_log (this->name, GF_LOG_TRACE,
-                                "open of %s succeeded on child %s",
-                                local->loc.path,
-                                priv->children[child_index]->name);
+                        sh->op_failed = 1;
                 }
+
+                gf_log (this->name, GF_LOG_TRACE,
+                        "open of %s succeeded on child %s",
+                        local->loc.path,
+                        priv->children[child_index]->name);
         }
         UNLOCK (&frame->lock);
 
         call_count = afr_frame_return (frame);
 
         if (call_count == 0) {
-                if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
-                        afr_sh_data_fail (frame, this);
+                if (sh->op_failed) {
+                        afr_sh_data_finish (frame, this);
                         return 0;
                 }
 
@@ -1609,8 +1186,7 @@ afr_sh_data_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         "fd for %s opened, commencing sync",
                         local->loc.path);
 
-                afr_sh_data_lock (frame, this, 0, 0, _gf_true, priv->sh_domain,
-                                  afr_sh_dom_lock_success, afr_sh_data_fail);
+                afr_sh_data_lock (frame, this);
         }
 
         return 0;
@@ -1631,7 +1207,14 @@ afr_sh_data_open (call_frame_t *frame, xlator_t *this)
         sh = &local->self_heal;
         priv = this->private;
 
-        call_count = afr_up_children_count (local->child_up, priv->child_count);
+        if (sh->healing_fd_opened) {
+                /* caller has opened the fd for us already, so skip open */
+
+                afr_sh_data_lock (frame, this);
+                return 0;
+        }
+
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
         local->call_count = call_count;
 
         fd = fd_create (local->loc.inode, frame->root->pid);
@@ -1647,7 +1230,7 @@ afr_sh_data_open (call_frame_t *frame, xlator_t *this)
                                    priv->children[i],
                                    priv->children[i]->fops->open,
                                    &local->loc,
-                                   O_RDWR|O_LARGEFILE, fd, NULL);
+                                   O_RDWR|O_LARGEFILE, fd, 0);
 
                 if (!--call_count)
                         break;
@@ -1656,93 +1239,19 @@ afr_sh_data_open (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
-void
-afr_sh_non_reg_fix (call_frame_t *frame, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno)
-{
-        afr_private_t   *priv = NULL;
-        afr_self_heal_t *sh = NULL;
-        afr_local_t     *local = NULL;
-        int             i = 0;
-
-        if (op_ret < 0) {
-                afr_sh_data_fail (frame, this);
-                return;
-        }
-
-        local = frame->local;
-        sh = &local->self_heal;
-        priv = this->private;
-
-        for (i = 0; i < priv->child_count ; i++) {
-                if (1 == local->child_up[i])
-                        sh->success[i] = 1;
-        }
-
-        afr_sh_erase_pending (frame, this, AFR_DATA_TRANSACTION,
-                              afr_sh_data_erase_pending_cbk,
-                              afr_sh_data_finish);
-}
 
 int
-afr_sh_non_reg_lock_success (call_frame_t *frame, xlator_t *this)
+afr_self_heal_data (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t   *local = NULL;
         afr_self_heal_t *sh = NULL;
+        afr_private_t *priv = this->private;
 
         local = frame->local;
         sh = &local->self_heal;
-        sh->data_lock_held = _gf_true;
-        afr_sh_common_lookup (frame, this, &local->loc,
-                              afr_sh_non_reg_fix, NULL,
-                              AFR_LOOKUP_FAIL_CONFLICTS |
-                              AFR_LOOKUP_FAIL_MISSING_GFIDS,
-                              NULL);
-        return 0;
-}
-
-gf_boolean_t
-afr_can_start_data_self_heal (afr_self_heal_t *sh, afr_private_t *priv)
-{
-        if (sh->force_confirm_spb)
-                return _gf_true;
-        if (sh->do_data_self_heal &&
-            afr_data_self_heal_enabled (priv->data_self_heal))
-                return _gf_true;
-        return _gf_false;
-}
-
-int
-afr_self_heal_data (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh    = NULL;
-        afr_private_t   *priv  = this->private;
-        int             ret    = -1;
-
-        local = frame->local;
-        sh = &local->self_heal;
-
-        sh->sh_type_in_action = AFR_SELF_HEAL_DATA;
 
-        if (afr_can_start_data_self_heal (sh, priv)) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_STARTED);
-                ret = afr_inodelk_init (&local->internal_lock.inodelk[1],
-                                        priv->sh_domain, priv->child_count);
-                if (ret < 0) {
-                        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-                        afr_sh_data_done (frame, this);
-                        return 0;
-                }
-
-                if (IA_ISREG (sh->type)) {
-                        afr_sh_data_open (frame, this);
-                } else {
-                        afr_sh_data_lock (frame, this, 0, 0, _gf_true,
-                                          this->name,
-                                          afr_sh_non_reg_lock_success,
-                                          afr_sh_data_fail);
-                }
+        if (sh->need_data_self_heal && priv->data_self_heal) {
+                afr_sh_data_open (frame, this);
         } else {
                 gf_log (this->name, GF_LOG_TRACE,
                         "not doing data self heal on %s",
diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c
index 53491a1d7..161b870f5 100644
--- a/xlators/cluster/afr/src/afr-self-heal-entry.c
+++ b/xlators/cluster/afr/src/afr-self-heal-entry.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <libgen.h>
@@ -50,16 +59,27 @@
         } while (0);
 
 int
-afr_sh_entry_impunge_create_file (call_frame_t *impunge_frame, xlator_t *this,
-                                  int child_index);
-int
 afr_sh_entry_done (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        afr_private_t   *priv = NULL;
 
         local = frame->local;
         sh = &local->self_heal;
+        priv = this->private;
+
+        /*
+          TODO: cleanup sh->*
+        */
+
+        if (sh->healing_fd)
+                fd_unref (sh->healing_fd);
+        sh->healing_fd = NULL;
+
+        /* for (i = 0; i < priv->child_count; i++) { */
+        /*        sh->locked_nodes[i] = 0; */
+        /* } */
 
         sh->completion_cbk (frame, this);
 
@@ -102,7 +122,7 @@ afr_sh_entry_finish (call_frame_t *frame, xlator_t *this)
 int
 afr_sh_entry_erase_pending_cbk (call_frame_t *frame, void *cookie,
                                 xlator_t *this, int32_t op_ret,
-                                int32_t op_errno, dict_t *xattr, dict_t *xdata)
+                                int32_t op_errno, dict_t *xattr)
 {
         long                 i          = 0;
         int                  call_count = 0;
@@ -111,16 +131,12 @@ afr_sh_entry_erase_pending_cbk (call_frame_t *frame, void *cookie,
         afr_local_t         *orig_local = NULL;
         call_frame_t        *orig_frame = NULL;
         afr_private_t       *priv       = NULL;
-        int32_t             read_child  = -1;
 
         local = frame->local;
         priv  = this->private;
-        sh = &local->self_heal;
-        i = (long)cookie;
-
 
-        afr_children_add_child (sh->fresh_children, i, priv->child_count);
         if (op_ret == -1) {
+                i = (long)cookie;
                 gf_log (this->name, GF_LOG_INFO,
                         "%s: failed to erase pending xattrs on %s (%s)",
                         local->loc.path, priv->children[i]->name,
@@ -130,14 +146,8 @@ afr_sh_entry_erase_pending_cbk (call_frame_t *frame, void *cookie,
         call_count = afr_frame_return (frame);
 
         if (call_count == 0) {
-                if (sh->source == -1) {
-                        //this happens if the forced merge option is set
-                        read_child = sh->fresh_children[0];
-                } else {
-                        read_child = sh->source;
-                }
-                afr_inode_set_read_ctx (this, sh->inode, read_child,
-                                        sh->fresh_children);
+                sh = &local->self_heal;
+
                 orig_frame = sh->orig_frame;
                 orig_local = orig_frame->local;
 
@@ -157,20 +167,72 @@ afr_sh_entry_erase_pending (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        afr_private_t   *priv = NULL;
+        int              call_count = 0;
+        int              i = 0;
+        dict_t          **erase_xattr = NULL;
+        int              need_unwind = 0;
 
         local = frame->local;
         sh = &local->self_heal;
+        priv = this->private;
 
         if (sh->entries_skipped) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+                need_unwind = 1;
+                sh->op_failed = _gf_true;
                 goto out;
         }
-        afr_sh_erase_pending (frame, this, AFR_ENTRY_TRANSACTION,
-                              afr_sh_entry_erase_pending_cbk,
-                              afr_sh_entry_finish);
-        return 0;
+        afr_sh_pending_to_delta (priv, sh->xattr, sh->delta_matrix, sh->success,
+                                 priv->child_count, AFR_ENTRY_TRANSACTION);
+
+        erase_xattr = GF_CALLOC (sizeof (*erase_xattr), priv->child_count,
+                                 gf_afr_mt_dict_t);
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->xattr[i]) {
+                        call_count++;
+
+                        erase_xattr[i] = get_new_dict();
+                        dict_ref (erase_xattr[i]);
+                }
+        }
+
+        if (call_count == 0)
+                need_unwind = 1;
+
+        afr_sh_delta_to_xattr (priv, sh->delta_matrix, erase_xattr,
+                               priv->child_count, AFR_ENTRY_TRANSACTION);
+
+        local->call_count = call_count;
+        for (i = 0; i < priv->child_count; i++) {
+                if (!erase_xattr[i])
+                        continue;
+
+                gf_log (this->name, GF_LOG_TRACE,
+                        "erasing pending flags from %s on %s",
+                        local->loc.path, priv->children[i]->name);
+
+                STACK_WIND_COOKIE (frame, afr_sh_entry_erase_pending_cbk,
+                                   (void *) (long) i,
+                                   priv->children[i],
+                                   priv->children[i]->fops->xattrop,
+                                   &local->loc,
+                                   GF_XATTROP_ADD_ARRAY, erase_xattr[i]);
+                if (!--call_count)
+                        break;
+        }
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (erase_xattr[i]) {
+                        dict_unref (erase_xattr[i]);
+                }
+        }
+        GF_FREE (erase_xattr);
+
 out:
-        afr_sh_entry_finish (frame, this);
+        if (need_unwind)
+                afr_sh_entry_finish (frame, this);
+
         return 0;
 }
 
@@ -255,7 +317,8 @@ int
 afr_sh_entry_impunge_all (call_frame_t *frame, xlator_t *this);
 
 int
-afr_sh_entry_impunge_subvol (call_frame_t *frame, xlator_t *this);
+afr_sh_entry_impunge_subvol (call_frame_t *frame, xlator_t *this,
+                             int active_src);
 
 int
 afr_sh_entry_expunge_all (call_frame_t *frame, xlator_t *this);
@@ -283,8 +346,7 @@ int
 afr_sh_entry_expunge_parent_setattr_cbk (call_frame_t *expunge_frame,
                                          void *cookie, xlator_t *this,
                                          int32_t op_ret, int32_t op_errno,
-                                         struct iatt *preop, struct iatt *postop,
-                                         dict_t *xdata)
+                                         struct iatt *preop, struct iatt *postop)
 {
         afr_private_t   *priv          = NULL;
         afr_local_t     *expunge_local = NULL;
@@ -320,17 +382,19 @@ afr_sh_entry_expunge_remove_cbk (call_frame_t *expunge_frame, void *cookie,
                                  xlator_t *this,
                                  int32_t op_ret, int32_t op_errno,
                                  struct iatt *preparent,
-                                 struct iatt *postparent, dict_t *xdata)
+                                 struct iatt *postparent)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *expunge_local = NULL;
         afr_self_heal_t *expunge_sh = NULL;
         int              active_src = 0;
+        call_frame_t    *frame = NULL;
         int32_t          valid = 0;
 
         priv = this->private;
         expunge_local = expunge_frame->local;
         expunge_sh = &expunge_local->self_heal;
+        frame = expunge_sh->sh_frame;
 
         active_src = (long) cookie;
 
@@ -348,6 +412,7 @@ afr_sh_entry_expunge_remove_cbk (call_frame_t *expunge_frame, void *cookie,
         }
 
         valid = GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME;
+        afr_build_parent_loc (&expunge_sh->parent_loc, &expunge_local->loc);
 
         STACK_WIND_COOKIE (expunge_frame, afr_sh_entry_expunge_parent_setattr_cbk,
                            (void *) (long) active_src,
@@ -355,7 +420,7 @@ afr_sh_entry_expunge_remove_cbk (call_frame_t *expunge_frame, void *cookie,
                            priv->children[active_src]->fops->setattr,
                            &expunge_sh->parent_loc,
                            &expunge_sh->parentbuf,
-                           valid, NULL);
+                           valid);
 
         return 0;
 }
@@ -379,7 +444,7 @@ afr_sh_entry_expunge_unlink (call_frame_t *expunge_frame, xlator_t *this,
                            (void *) (long) active_src,
                            priv->children[active_src],
                            priv->children[active_src]->fops->unlink,
-                           &expunge_local->loc, 0, NULL);
+                           &expunge_local->loc);
 
         return 0;
 }
@@ -404,7 +469,7 @@ afr_sh_entry_expunge_rmdir (call_frame_t *expunge_frame, xlator_t *this,
                            (void *) (long) active_src,
                            priv->children[active_src],
                            priv->children[active_src]->fops->rmdir,
-                           &expunge_local->loc, 1, NULL);
+                           &expunge_local->loc, 1);
 
         return 0;
 }
@@ -412,8 +477,7 @@ afr_sh_entry_expunge_rmdir (call_frame_t *expunge_frame, xlator_t *this,
 
 int
 afr_sh_entry_expunge_remove (call_frame_t *expunge_frame, xlator_t *this,
-                             int active_src, struct iatt *buf,
-                             struct iatt *parentbuf)
+                             int active_src, struct iatt *buf)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *expunge_local = NULL;
@@ -422,7 +486,6 @@ afr_sh_entry_expunge_remove (call_frame_t *expunge_frame, xlator_t *this,
         int              type = 0;
         afr_self_heal_t *sh            = NULL;
         afr_local_t     *local         = NULL;
-        loc_t           *loc           = NULL;
 
         priv = this->private;
         expunge_local = expunge_frame->local;
@@ -430,11 +493,8 @@ afr_sh_entry_expunge_remove (call_frame_t *expunge_frame, xlator_t *this,
         frame = expunge_sh->sh_frame;
         local         = frame->local;
         sh            = &local->self_heal;
-        loc           = &expunge_local->loc;
 
         type = buf->ia_type;
-        if (loc->parent && uuid_is_null (loc->parent->gfid))
-                uuid_copy (loc->pargfid, parentbuf->ia_gfid);
 
         switch (type) {
         case IA_IFSOCK:
@@ -498,8 +558,7 @@ afr_sh_entry_expunge_lookup_cbk (call_frame_t *expunge_frame, void *cookie,
                 goto out;
         }
 
-        afr_sh_entry_expunge_remove (expunge_frame, this, active_src, buf,
-                                     postparent);
+        afr_sh_entry_expunge_remove (expunge_frame, this, active_src, buf);
 
         return 0;
 out:
@@ -528,7 +587,7 @@ afr_sh_entry_expunge_purge (call_frame_t *expunge_frame, xlator_t *this,
                            (void *) (long) active_src,
                            priv->children[active_src],
                            priv->children[active_src]->fops->lookup,
-                           &expunge_local->loc, NULL);
+                           &expunge_local->loc, 0);
 
         return 0;
 }
@@ -580,8 +639,7 @@ afr_sh_entry_expunge_entry_cbk (call_frame_t *expunge_frame, void *cookie,
 
         if (need_expunge) {
                 gf_log (this->name, GF_LOG_INFO,
-                        "Entry %s is missing on %s and deleting from "
-                        "replica's other bricks",
+                        "missing entry %s on %s",
                         expunge_local->loc.path,
                         priv->children[source]->name);
 
@@ -613,19 +671,6 @@ out:
         return 0;
 }
 
-static gf_boolean_t
-can_skip_entry_self_heal (char *name, loc_t *parent_loc)
-{
-        if (strcmp (name, ".") == 0) {
-                return _gf_true;
-        } else if (strcmp (name, "..") == 0) {
-                return _gf_true;
-        } else if (loc_is_root (parent_loc) &&
-                   (strcmp (name, GF_REPLICATE_TRASH_DIR) == 0)) {
-                return _gf_true;
-        }
-        return _gf_false;
-}
 
 int
 afr_sh_entry_expunge_entry (call_frame_t *frame, xlator_t *this,
@@ -653,13 +698,21 @@ afr_sh_entry_expunge_entry (call_frame_t *frame, xlator_t *this,
         sh->expunge_done = afr_sh_entry_expunge_entry_done;
 
         name = entry->d_name;
-        if (can_skip_entry_self_heal (name, &local->loc)) {
+
+        if ((strcmp (name, ".") == 0)
+            || (strcmp (name, "..") == 0)
+            || ((strcmp (local->loc.path, "/") == 0)
+                && (strcmp (name, GF_REPLICATE_TRASH_DIR) == 0))) {
+
+                gf_log (this->name, GF_LOG_TRACE,
+                        "skipping inspection of %s under %s",
+                        name, local->loc.path);
                 op_ret = 0;
                 goto out;
         }
 
         gf_log (this->name, GF_LOG_TRACE,
-                "inspecting existence of %s under %s",
+                "inspecting existance of %s under %s",
                 name, local->loc.path);
 
         expunge_frame = copy_frame (frame);
@@ -668,17 +721,16 @@ afr_sh_entry_expunge_entry (call_frame_t *frame, xlator_t *this,
                 goto out;
         }
 
-        AFR_LOCAL_ALLOC_OR_GOTO (expunge_local, out);
+        ALLOC_OR_GOTO (expunge_local, afr_local_t, out);
 
         expunge_frame->local = expunge_local;
         expunge_sh = &expunge_local->self_heal;
         expunge_sh->sh_frame = frame;
         expunge_sh->active_source = active_src;
         expunge_sh->entrybuf = entry->d_stat;
-        loc_copy (&expunge_sh->parent_loc, &local->loc);
 
         ret = afr_build_child_loc (this, &expunge_local->loc, &local->loc,
-                                   name);
+                                   name, entry->d_stat.ia_gfid);
         if (ret != 0) {
                 op_errno = EINVAL;
                 goto out;
@@ -693,7 +745,7 @@ afr_sh_entry_expunge_entry (call_frame_t *frame, xlator_t *this,
                            (void *) (long) source,
                            priv->children[source],
                            priv->children[source]->fops->lookup,
-                           &expunge_local->loc, NULL);
+                           &expunge_local->loc, 0);
 
         ret = 0;
 out:
@@ -708,7 +760,7 @@ int
 afr_sh_entry_expunge_readdir_cbk (call_frame_t *frame, void *cookie,
                                   xlator_t *this,
                                   int32_t op_ret, int32_t op_errno,
-                                  gf_dirent_t *entries, dict_t *xdata)
+                                  gf_dirent_t *entries)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *local  = NULL;
@@ -776,7 +828,7 @@ afr_sh_entry_expunge_subvol (call_frame_t *frame, xlator_t *this,
         STACK_WIND (frame, afr_sh_entry_expunge_readdir_cbk,
                     priv->children[active_src],
                     priv->children[active_src]->fops->readdirp,
-                    sh->healing_fd, sh->block_size, sh->offset, NULL);
+                    sh->healing_fd, sh->block_size, sh->offset);
 
         return 0;
 }
@@ -806,7 +858,7 @@ afr_sh_entry_expunge_all (call_frame_t *frame, xlator_t *this)
         active_src = next_active_sink (frame, this, sh->active_source);
         sh->active_source = active_src;
 
-        if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
+        if (sh->op_failed) {
                 goto out;
         }
 
@@ -831,20 +883,27 @@ out:
 
 int
 afr_sh_entry_impunge_entry_done (call_frame_t *frame, xlator_t *this,
-                                 int32_t op_ret, int32_t op_errno)
+                                 int active_src, int32_t op_ret,
+                                 int32_t op_errno)
 {
         int              call_count = 0;
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh = NULL;
+        afr_local_t      *local = NULL;
+        afr_self_heal_t  *sh = NULL;
 
         local = frame->local;
         sh = &local->self_heal;
-        if (op_ret < 0)
-                sh->entries_skipped = _gf_true;
         call_count = afr_frame_return (frame);
-        if (call_count == 0)
-                afr_sh_entry_impunge_subvol (frame, this);
+        if (op_ret == -1)
+                sh->op_failed = 1;
 
+        if (call_count == 0) {
+                if (sh->op_failed) {
+                        afr_sh_entry_finish (frame, this);
+                        goto out;
+                }
+                afr_sh_entry_impunge_subvol (frame, this, active_src);
+        }
+out:
         return 0;
 }
 
@@ -857,32 +916,38 @@ afr_sh_entry_call_impunge_done (call_frame_t *impunge_frame, xlator_t *this,
         afr_self_heal_t *sh = NULL;
         afr_self_heal_t *impunge_sh = NULL;
         call_frame_t    *frame = NULL;
+        int32_t          impunge_ret_child = 0;
+        afr_private_t   *priv = NULL;
 
+        priv = this->private;
         AFR_INIT_SH_FRAME_VALS (impunge_frame, impunge_local, impunge_sh,
                                 frame, local, sh);
 
+        impunge_ret_child = impunge_sh->impunge_ret_child;
         AFR_STACK_DESTROY (impunge_frame);
-        sh->impunge_done (frame, this, op_ret, op_errno);
+        sh->impunge_done (frame, this, impunge_ret_child, op_ret,
+                          op_errno);
 }
 
 int
 afr_sh_entry_impunge_setattr_cbk (call_frame_t *impunge_frame, void *cookie,
                                   xlator_t *this,
                                   int32_t op_ret, int32_t op_errno,
-                                  struct iatt *preop, struct iatt *postop,
-                                  dict_t *xdata)
+                                  struct iatt *preop, struct iatt *postop)
 {
         int              call_count = 0;
         afr_private_t   *priv = NULL;
         afr_local_t     *impunge_local = NULL;
+        afr_self_heal_t *impunge_sh = NULL;
         int              child_index = 0;
 
         priv = this->private;
         impunge_local = impunge_frame->local;
+        impunge_sh = &impunge_local->self_heal;
         child_index = (long) cookie;
 
         if (op_ret == 0) {
-                gf_log (this->name, GF_LOG_DEBUG,
+                gf_log (this->name, GF_LOG_TRACE,
                         "setattr done for %s on %s",
                         impunge_local->loc.path,
                         priv->children[child_index]->name);
@@ -894,117 +959,36 @@ afr_sh_entry_impunge_setattr_cbk (call_frame_t *impunge_frame, void *cookie,
                         strerror (op_errno));
         }
 
-        call_count = afr_frame_return (impunge_frame);
-        if (call_count == 0) {
-                afr_sh_entry_call_impunge_done (impunge_frame, this,
-                                                0, op_errno);
-        }
-
-        return 0;
-}
-
-int
-afr_sh_entry_impunge_parent_setattr_cbk (call_frame_t *setattr_frame,
-                                         void *cookie, xlator_t *this,
-                                         int32_t op_ret, int32_t op_errno,
-                                         struct iatt *preop, struct iatt *postop,
-                                         dict_t *xdata)
-{
-        int             call_count = 0;
-        afr_local_t     *setattr_local = NULL;
-
-        setattr_local = setattr_frame->local;
-        if (op_ret != 0) {
-                gf_log (this->name, GF_LOG_INFO,
-                        "setattr on parent directory (%s) failed: %s",
-                        setattr_local->loc.path, strerror (op_errno));
+        LOCK (&impunge_frame->lock);
+        {
+                call_count = --impunge_local->call_count;
         }
+        UNLOCK (&impunge_frame->lock);
 
-        call_count = afr_frame_return (setattr_frame);
         if (call_count == 0)
-                AFR_STACK_DESTROY (setattr_frame);
-        return 0;
-}
-
-int
-afr_sh_entry_impunge_setattr (call_frame_t *impunge_frame, xlator_t *this)
-{
-        afr_private_t   *priv = NULL;
-        afr_local_t     *impunge_local = NULL;
-        afr_local_t     *setattr_local = NULL;
-        afr_self_heal_t *impunge_sh = NULL;
-        call_frame_t    *setattr_frame = NULL;
-        int32_t          valid = 0;
-        int32_t          op_errno = 0;
-        int              child_index = 0;
-        int              call_count = 0;
-        int              i = 0;
-
-        priv          = this->private;
-        impunge_local = impunge_frame->local;
-        impunge_sh    = &impunge_local->self_heal;
-
-        gf_log (this->name, GF_LOG_DEBUG,
-                "setting ownership of %s on %s to %d/%d",
-                impunge_local->loc.path,
-                priv->children[child_index]->name,
-                impunge_sh->entrybuf.ia_uid,
-                impunge_sh->entrybuf.ia_gid);
+                afr_sh_entry_call_impunge_done (impunge_frame, this,
+                                                op_ret, op_errno);
 
-        setattr_frame = copy_frame (impunge_frame);
-        if (!setattr_frame) {
-                op_errno = ENOMEM;
-                goto out;
-        }
-        AFR_LOCAL_ALLOC_OR_GOTO (setattr_frame->local, out);
-        setattr_local = setattr_frame->local;
-        call_count = afr_errno_count (NULL, impunge_sh->child_errno,
-                                      priv->child_count, 0);
-        loc_copy (&setattr_local->loc, &impunge_sh->parent_loc);
-        impunge_local->call_count = call_count;
-        setattr_local->call_count = call_count;
-        for (i = 0; i < priv->child_count; i++) {
-                if (impunge_sh->child_errno[i])
-                        continue;
-                valid         = GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME;
-                STACK_WIND_COOKIE (setattr_frame,
-                                   afr_sh_entry_impunge_parent_setattr_cbk,
-                                   (void *) (long) i, priv->children[i],
-                                   priv->children[i]->fops->setattr,
-                                   &setattr_local->loc,
-                                   &impunge_sh->parentbuf, valid, NULL);
-
-                valid = GF_SET_ATTR_UID   | GF_SET_ATTR_GID |
-                        GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME;
-                STACK_WIND_COOKIE (impunge_frame,
-                                   afr_sh_entry_impunge_setattr_cbk,
-                                   (void *) (long) i, priv->children[i],
-                                   priv->children[i]->fops->setattr,
-                                   &impunge_local->loc,
-                                   &impunge_sh->entrybuf, valid, NULL);
-                call_count--;
-        }
-        GF_ASSERT (!call_count);
-        return 0;
-out:
-        if (setattr_frame)
-                AFR_STACK_DESTROY (setattr_frame);
-        afr_sh_entry_call_impunge_done (impunge_frame, this, 0, op_errno);
         return 0;
 }
 
+
 int
 afr_sh_entry_impunge_xattrop_cbk (call_frame_t *impunge_frame, void *cookie,
                                   xlator_t *this,
                                   int32_t op_ret, int32_t op_errno,
-                                  dict_t *xattr, dict_t *xdata)
+                                  dict_t *xattr)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *impunge_local = NULL;
+        afr_self_heal_t *impunge_sh = NULL;
         int              child_index = 0;
+        struct iatt      stbuf = {0};
+        int32_t          valid = 0;
 
         priv          = this->private;
         impunge_local = impunge_frame->local;
+        impunge_sh    = &impunge_local->self_heal;
 
         child_index = (long) cookie;
 
@@ -1014,59 +998,55 @@ afr_sh_entry_impunge_xattrop_cbk (call_frame_t *impunge_frame, void *cookie,
                         impunge_local->loc.path,
                         priv->children[child_index]->name,
                         strerror (op_errno));
-                goto out;
         }
 
-        afr_sh_entry_impunge_setattr (impunge_frame, this);
-        return 0;
-out:
-        afr_sh_entry_call_impunge_done (impunge_frame, this,
-                                        -1, op_errno);
+        gf_log (this->name, GF_LOG_TRACE,
+                "setting ownership of %s on %s to %d/%d",
+                impunge_local->loc.path,
+                priv->children[child_index]->name,
+                impunge_local->cont.lookup.buf.ia_uid,
+                impunge_local->cont.lookup.buf.ia_gid);
+
+        stbuf.ia_atime = impunge_local->cont.lookup.buf.ia_atime;
+        stbuf.ia_atime_nsec = impunge_local->cont.lookup.buf.ia_atime_nsec;
+        stbuf.ia_mtime = impunge_local->cont.lookup.buf.ia_mtime;
+        stbuf.ia_mtime_nsec = impunge_local->cont.lookup.buf.ia_mtime_nsec;
+
+        stbuf.ia_uid = impunge_local->cont.lookup.buf.ia_uid;
+        stbuf.ia_gid = impunge_local->cont.lookup.buf.ia_gid;
+
+        valid = GF_SET_ATTR_UID   | GF_SET_ATTR_GID |
+                GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME;
+
+        STACK_WIND_COOKIE (impunge_frame, afr_sh_entry_impunge_setattr_cbk,
+                           (void *) (long) child_index,
+                           priv->children[child_index],
+                           priv->children[child_index]->fops->setattr,
+                           &impunge_local->loc,
+                           &stbuf, valid);
         return 0;
 }
 
+
 int
-afr_sh_entry_impunge_perform_xattrop (call_frame_t *impunge_frame,
-                                      xlator_t *this)
+afr_sh_entry_impunge_parent_setattr_cbk (call_frame_t *setattr_frame,
+                                         void *cookie, xlator_t *this,
+                                         int32_t op_ret, int32_t op_errno,
+                                         struct iatt *preop, struct iatt *postop)
 {
-        int              active_src       = 0;
-        dict_t          *xattr            = NULL;
-        afr_private_t   *priv             = NULL;
-        afr_local_t     *impunge_local    = NULL;
-        afr_self_heal_t *impunge_sh       = NULL;
-        int32_t         op_errno          = 0;
+        loc_t *parent_loc = cookie;
 
-        priv = this->private;
-        impunge_local = impunge_frame->local;
-        impunge_sh = &impunge_local->self_heal;
-        active_src = impunge_sh->active_source;
-
-        afr_prepare_new_entry_pending_matrix (impunge_local->pending,
-                                              afr_is_errno_unset,
-                                              impunge_sh->child_errno,
-                                              &impunge_sh->entrybuf,
-                                              priv->child_count);
-        xattr = dict_new ();
-        if (!xattr) {
-                op_errno = ENOMEM;
-                goto out;
+        if (op_ret != 0) {
+                gf_log (this->name, GF_LOG_INFO,
+                        "setattr on parent directory (%s) failed: %s",
+                        parent_loc->path, strerror (op_errno));
         }
 
-        afr_set_pending_dict (priv, xattr, impunge_local->pending, active_src,
-                              LOCAL_LAST);
+        loc_wipe (parent_loc);
 
-        STACK_WIND_COOKIE (impunge_frame, afr_sh_entry_impunge_xattrop_cbk,
-                           (void *) (long) active_src,
-                           priv->children[active_src],
-                           priv->children[active_src]->fops->xattrop,
-                           &impunge_local->loc, GF_XATTROP_ADD_ARRAY, xattr, NULL);
+        GF_FREE (parent_loc);
 
-        if (xattr)
-                dict_unref (xattr);
-        return 0;
-out:
-        afr_sh_entry_call_impunge_done (impunge_frame, this,
-                                        -1, op_errno);
+        AFR_STACK_DESTROY (setattr_frame);
         return 0;
 }
 
@@ -1076,166 +1056,125 @@ afr_sh_entry_impunge_newfile_cbk (call_frame_t *impunge_frame, void *cookie,
                                   int32_t op_ret, int32_t op_errno,
                                   inode_t *inode, struct iatt *stbuf,
                                   struct iatt *preparent,
-                                  struct iatt *postparent, dict_t *xdata)
+                                  struct iatt *postparent)
 {
         int              call_count       = 0;
         afr_private_t   *priv             = NULL;
         afr_local_t     *impunge_local    = NULL;
         afr_self_heal_t *impunge_sh       = NULL;
+        int              active_src       = 0;
         int              child_index      = 0;
+        int32_t         *pending_array    = NULL;
+        dict_t          *xattr            = NULL;
+        int              ret              = 0;
+        int              idx              = 0;
+        call_frame_t    *setattr_frame    = NULL;
+        int32_t          valid            = 0;
+        loc_t           *parent_loc       = NULL;
+        struct iatt      parentbuf        = {0,};
 
         priv = this->private;
         impunge_local = impunge_frame->local;
         impunge_sh = &impunge_local->self_heal;
+        active_src = impunge_sh->active_source;
 
         child_index = (long) cookie;
 
         if (op_ret == -1) {
-                impunge_sh->child_errno[child_index] = op_errno;
                 gf_log (this->name, GF_LOG_ERROR,
                         "creation of %s on %s failed (%s)",
                         impunge_local->loc.path,
                         priv->children[child_index]->name,
                         strerror (op_errno));
-        } else {
-                impunge_sh->child_errno[child_index] = 0;
+                goto out;
         }
 
-        call_count = afr_frame_return (impunge_frame);
-        if (call_count == 0) {
-                if (!afr_errno_count (NULL, impunge_sh->child_errno,
-                                      priv->child_count, 0)) {
-                        // new_file creation failed every where
-                        afr_sh_entry_call_impunge_done (impunge_frame, this,
-                                                        -1, op_errno);
-                        goto out;
-                }
-                afr_sh_entry_impunge_perform_xattrop (impunge_frame, this);
-        }
-out:
-        return 0;
-}
+        inode->ia_type = stbuf->ia_type;
 
-int
-afr_sh_entry_impunge_hardlink_cbk (call_frame_t *impunge_frame, void *cookie,
-                                   xlator_t *this, int32_t op_ret,
-                                   int32_t op_errno, inode_t *inode,
-                                   struct iatt *buf, struct iatt *preparent,
-                                   struct iatt *postparent, dict_t *xdata)
-{
-        int              call_count        = 0;
-        afr_local_t     *impunge_local = NULL;
-        afr_self_heal_t *impunge_sh  = NULL;
-
-        impunge_local = impunge_frame->local;
-        impunge_sh = &impunge_local->self_heal;
-
-        if (IA_IFLNK == impunge_sh->entrybuf.ia_type) {
-                //For symlinks impunge is attempted un-conditionally
-                //So the file can already exist.
-                if ((op_ret < 0) && (op_errno == EEXIST))
-                        op_ret = 0;
+        xattr = dict_new ();
+        if (!xattr) {
+                gf_log (this->name, GF_LOG_ERROR, "Out of memory");
+                goto out;
         }
 
-        call_count = afr_frame_return (impunge_frame);
-        if (call_count == 0)
-                afr_sh_entry_call_impunge_done (impunge_frame, this,
-                                                op_ret, op_errno);
+        pending_array = (int32_t*) GF_CALLOC (3, sizeof (int32_t),
+                                        gf_common_mt_int32_t);
 
-        return 0;
-}
+        if (!pending_array) {
+                gf_log (this->name, GF_LOG_ERROR, "Out of memory");
+                goto out;
+        }
+        /* Pending data xattrs shouldn't be set for special files
+         */
+        idx = afr_index_for_transaction_type (AFR_METADATA_TRANSACTION);
+        pending_array[idx] = hton32 (1);
+        if (IA_ISDIR (stbuf->ia_type))
+                idx = afr_index_for_transaction_type (AFR_ENTRY_TRANSACTION);
+        else if (IA_ISREG (stbuf->ia_type))
+                idx = afr_index_for_transaction_type (AFR_DATA_TRANSACTION);
+        else
+                goto cont;
+        pending_array[idx] = hton32 (1);
 
-int
-afr_sh_entry_impunge_hardlink (call_frame_t *impunge_frame, xlator_t *this,
-                               int child_index)
-{
-        afr_private_t   *priv          = NULL;
-        afr_local_t     *impunge_local = NULL;
-        afr_self_heal_t *impunge_sh  = NULL;
-        loc_t           *loc           = NULL;
-        struct iatt     *buf           = NULL;
-        loc_t            oldloc        = {0};
+cont:
+        ret = dict_set_dynptr (xattr, priv->pending_key[child_index],
+                                   pending_array, 3 * sizeof (int32_t));
+        if (ret < 0) {
+                GF_FREE (pending_array);
+                pending_array = NULL;
+                gf_log (this->name, GF_LOG_WARNING,
+                        "Unable to set dict value.");
+        }
 
-        priv = this->private;
-        impunge_local = impunge_frame->local;
-        impunge_sh = &impunge_local->self_heal;
-        loc = &impunge_local->loc;
-        buf = &impunge_sh->entrybuf;
+        valid         = GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME;
+        parentbuf     = impunge_sh->parentbuf;
+        setattr_frame = copy_frame (impunge_frame);
 
-        oldloc.inode = inode_ref (loc->inode);
-        uuid_copy (oldloc.gfid, buf->ia_gfid);
-        gf_log (this->name, GF_LOG_DEBUG, "linking missing file %s on %s",
-                loc->path, priv->children[child_index]->name);
+        parent_loc = GF_CALLOC (1, sizeof (*parent_loc),
+                                gf_afr_mt_loc_t);
+        if (!parent_loc) {
+                gf_log (this->name, GF_LOG_ERROR, "Out of memory");
+                goto out;
+        }
+        afr_build_parent_loc (parent_loc, &impunge_local->loc);
 
-        STACK_WIND_COOKIE (impunge_frame, afr_sh_entry_impunge_hardlink_cbk,
+        STACK_WIND_COOKIE (impunge_frame, afr_sh_entry_impunge_xattrop_cbk,
                            (void *) (long) child_index,
+                           priv->children[active_src],
+                           priv->children[active_src]->fops->xattrop,
+                           &impunge_local->loc, GF_XATTROP_ADD_ARRAY, xattr);
+
+        STACK_WIND_COOKIE (setattr_frame, afr_sh_entry_impunge_parent_setattr_cbk,
+                           (void *) (long) parent_loc,
                            priv->children[child_index],
-                           priv->children[child_index]->fops->link,
-                           &oldloc, loc, NULL);
-        loc_wipe (&oldloc);
+                           priv->children[child_index]->fops->setattr,
+                           parent_loc, &parentbuf, valid);
 
-        return 0;
-}
+        dict_unref (xattr);
 
-int
-afr_sh_nameless_lookup_cbk (call_frame_t *impunge_frame, void *cookie,
-                            xlator_t *this,
-                            int32_t op_ret, int32_t op_errno, inode_t *inode,
-                            struct iatt *buf, dict_t *xattr,
-                            struct iatt *postparent)
-{
-        if (op_ret < 0) {
-                 afr_sh_entry_impunge_create_file (impunge_frame, this,
-                                                   (long)cookie);
-        } else {
-                afr_sh_entry_impunge_hardlink (impunge_frame, this,
-                                               (long)cookie);
-        }
         return 0;
-}
 
-int
-afr_sh_entry_impunge_check_hardlink (call_frame_t *impunge_frame,
-                                     xlator_t *this,
-                                     int child_index, struct iatt *stbuf)
-{
-        afr_private_t   *priv          = NULL;
-        call_frame_t    *frame             = NULL;
-        afr_local_t     *impunge_local     = NULL;
-        afr_local_t     *local             = NULL;
-        afr_self_heal_t *impunge_sh        = NULL;
-        afr_self_heal_t *sh                = NULL;
-        loc_t           *loc           = NULL;
-        dict_t          *xattr_req     = NULL;
-        loc_t            oldloc        = {0};
-        int              ret           = -1;
+out:
+        if (xattr)
+                dict_unref (xattr);
 
-        priv = this->private;
-        AFR_INIT_SH_FRAME_VALS (impunge_frame, impunge_local, impunge_sh,
-                                frame, local, sh);
-        loc = &impunge_local->loc;
+        if (pending_array)
+                GF_FREE (pending_array);
 
-        xattr_req = dict_new ();
-        if (!xattr_req)
-                goto out;
-        oldloc.inode = inode_ref (loc->inode);
-        uuid_copy (oldloc.gfid, stbuf->ia_gfid);
+        LOCK (&impunge_frame->lock);
+        {
+                call_count = --impunge_local->call_count;
+        }
+        UNLOCK (&impunge_frame->lock);
+
+        if (call_count == 0)
+                afr_sh_entry_call_impunge_done (impunge_frame, this,
+                                                -1, op_errno);
 
-        STACK_WIND_COOKIE (impunge_frame, afr_sh_nameless_lookup_cbk,
-                           (void *) (long) child_index,
-                           priv->children[child_index],
-                           priv->children[child_index]->fops->lookup,
-                           &oldloc, xattr_req);
-        ret = 0;
-out:
-        if (xattr_req)
-                dict_unref (xattr_req);
-        loc_wipe (&oldloc);
-        if (ret)
-                sh->impunge_done (frame, this, -1, ENOMEM);
         return 0;
 }
 
+
 int
 afr_sh_entry_impunge_mknod (call_frame_t *impunge_frame, xlator_t *this,
                             int child_index, struct iatt *stbuf)
@@ -1263,35 +1202,6 @@ afr_sh_entry_impunge_mknod (call_frame_t *impunge_frame, xlator_t *this,
                 gf_log (this->name, GF_LOG_INFO, "%s: gfid set failed",
                         impunge_local->loc.path);
 
-        /*
-         * Reason for adding GLUSTERFS_INTERNAL_FOP_KEY :
-         *
-         * Problem:
-         * While a brick is down in a replica pair, lets say the user creates
-         * one file(file-A) and a hard link to that file(h-file-A). After the
-         * brick comes back up, entry self-heal is attempted on parent dir of
-         * these two files. As part of readdir in self-heal it reads both the
-         * entries file-A and h-file-A for both of them it does name less lookup
-         * to check if there are any hardlinks already present in the
-         * destination brick. It finds that there are no hard links already
-         * present for files file-A, h-file-A. Self-heal does mknods for both
-         * file-A and h-file-A. This leads to file-A and h-file-A not being
-         * hardlinks anymore.
-         *
-         * Fix: (More like shrinking of race-window, the race itself is still
-         * present in posix-mknod).
-         * If mknod comes with the presence of GLUSTERFS_INTERNAL_FOP_KEY then
-         * posix_mknod checks if there are already any gfid-links and does
-         * link() instead of mknod. There still can be a race where two
-         * posix_mknods same gfid see that
-         * gfid-link file is not present and proceeds with mknods and result in
-         * two different files with same gfid.
-         */
-        ret = dict_set_str (dict, GLUSTERFS_INTERNAL_FOP_KEY, "yes");
-        if (ret)
-                gf_log (this->name, GF_LOG_INFO, "%s: %s set failed",
-                        impunge_local->loc.path, GLUSTERFS_INTERNAL_FOP_KEY);
-
         STACK_WIND_COOKIE (impunge_frame, afr_sh_entry_impunge_newfile_cbk,
                            (void *) (long) child_index,
                            priv->children[child_index],
@@ -1299,7 +1209,7 @@ afr_sh_entry_impunge_mknod (call_frame_t *impunge_frame, xlator_t *this,
                            &impunge_local->loc,
                            st_mode_from_ia (stbuf->ia_prot, stbuf->ia_type),
                            makedev (ia_major (stbuf->ia_rdev),
-                                    ia_minor (stbuf->ia_rdev)), 0, dict);
+                                    ia_minor (stbuf->ia_rdev)), dict);
 
         if (dict)
                 dict_unref (dict);
@@ -1346,7 +1256,7 @@ afr_sh_entry_impunge_mkdir (call_frame_t *impunge_frame, xlator_t *this,
                            priv->children[child_index]->fops->mkdir,
                            &impunge_local->loc,
                            st_mode_from_ia (stbuf->ia_prot, stbuf->ia_type),
-                           0, dict);
+                           dict);
 
         if (dict)
                 dict_unref (dict);
@@ -1364,11 +1274,13 @@ afr_sh_entry_impunge_symlink (call_frame_t *impunge_frame, xlator_t *this,
         dict_t          *dict          = NULL;
         struct iatt     *buf           = NULL;
         int              ret           = 0;
+        afr_self_heal_t *impunge_sh    = NULL;
 
         priv = this->private;
         impunge_local = impunge_frame->local;
+        impunge_sh    = &impunge_local->self_heal;
 
-        buf = &impunge_local->cont.dir_fop.buf;
+        buf = &impunge_local->cont.symlink.buf;
 
         dict = dict_new ();
         if (!dict) {
@@ -1393,7 +1305,7 @@ afr_sh_entry_impunge_symlink (call_frame_t *impunge_frame, xlator_t *this,
                            (void *) (long) child_index,
                            priv->children[child_index],
                            priv->children[child_index]->fops->symlink,
-                           linkname, &impunge_local->loc, 0, dict);
+                           linkname, &impunge_local->loc, dict);
 
         if (dict)
                 dict_unref (dict);
@@ -1407,7 +1319,7 @@ afr_sh_entry_impunge_symlink_unlink_cbk (call_frame_t *impunge_frame,
                                          void *cookie, xlator_t *this,
                                          int32_t op_ret, int32_t op_errno,
                                          struct iatt *preparent,
-                                         struct iatt *postparent, dict_t *xdata)
+                                         struct iatt *postparent)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *impunge_local = NULL;
@@ -1468,7 +1380,7 @@ afr_sh_entry_impunge_symlink_unlink (call_frame_t *impunge_frame, xlator_t *this
                            (void *) (long) child_index,
                            priv->children[child_index],
                            priv->children[child_index]->fops->unlink,
-                           &impunge_local->loc, 0, NULL);
+                           &impunge_local->loc);
 
         return 0;
 }
@@ -1478,7 +1390,7 @@ int
 afr_sh_entry_impunge_readlink_sink_cbk (call_frame_t *impunge_frame, void *cookie,
                                         xlator_t *this,
                                         int32_t op_ret, int32_t op_errno,
-                                        const char *linkname, struct iatt *sbuf, dict_t *xdata)
+                                        const char *linkname, struct iatt *sbuf)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *impunge_local = NULL;
@@ -1560,7 +1472,7 @@ afr_sh_entry_impunge_readlink_sink (call_frame_t *impunge_frame, xlator_t *this,
                            (void *) (long) child_index,
                            priv->children[child_index],
                            priv->children[child_index]->fops->readlink,
-                           &impunge_local->loc, 4096, NULL);
+                           &impunge_local->loc, 4096);
 
         return 0;
 }
@@ -1570,7 +1482,7 @@ int
 afr_sh_entry_impunge_readlink_cbk (call_frame_t *impunge_frame, void *cookie,
                                    xlator_t *this,
                                    int32_t op_ret, int32_t op_errno,
-                                   const char *linkname, struct iatt *sbuf, dict_t *xdata)
+                                   const char *linkname, struct iatt *sbuf)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *impunge_local = NULL;
@@ -1628,84 +1540,36 @@ afr_sh_entry_impunge_readlink (call_frame_t *impunge_frame, xlator_t *this,
         impunge_local = impunge_frame->local;
         impunge_sh = &impunge_local->self_heal;
         active_src = impunge_sh->active_source;
-        impunge_local->cont.dir_fop.buf = *stbuf;
+        impunge_local->cont.symlink.buf = *stbuf;
 
         STACK_WIND_COOKIE (impunge_frame, afr_sh_entry_impunge_readlink_cbk,
                            (void *) (long) child_index,
                            priv->children[active_src],
                            priv->children[active_src]->fops->readlink,
-                           &impunge_local->loc, 4096, NULL);
+                           &impunge_local->loc, 4096);
 
         return 0;
 }
 
 int
 afr_sh_entry_impunge_create (call_frame_t *impunge_frame, xlator_t *this,
-                             int child_index)
+                             int child_index, struct iatt *buf,
+                             struct iatt *postparent)
 {
-        call_frame_t    *frame             = NULL;
-        afr_local_t     *impunge_local     = NULL;
-        afr_local_t     *local             = NULL;
-        afr_self_heal_t *impunge_sh        = NULL;
-        afr_self_heal_t *sh                = NULL;
+        afr_local_t     *impunge_local = NULL;
+        afr_self_heal_t *impunge_sh = NULL;
         afr_private_t   *priv = NULL;
         ia_type_t       type = IA_INVAL;
+        int             ret = 0;
         int             active_src = 0;
-        struct iatt     *buf = NULL;
 
-        AFR_INIT_SH_FRAME_VALS (impunge_frame, impunge_local, impunge_sh,
-                                frame, local, sh);
+        impunge_local = impunge_frame->local;
+        impunge_sh = &impunge_local->self_heal;
+        impunge_sh->parentbuf = *postparent;
         active_src = impunge_sh->active_source;
-        afr_update_loc_gfids (&impunge_local->loc, &impunge_sh->entrybuf,
-                              &impunge_sh->parentbuf);
-
-        buf = &impunge_sh->entrybuf;
-        type = buf->ia_type;
-
-        switch (type) {
-        case IA_IFSOCK:
-        case IA_IFREG:
-        case IA_IFBLK:
-        case IA_IFCHR:
-        case IA_IFIFO:
-        case IA_IFLNK:
-                afr_sh_entry_impunge_check_hardlink (impunge_frame, this,
-                                                     child_index, buf);
-                break;
-        case IA_IFDIR:
-                afr_sh_entry_impunge_mkdir (impunge_frame, this,
-                                            child_index, buf);
-                break;
-        default:
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s has unknown file type on %s: 0%o",
-                        impunge_local->loc.path,
-                        priv->children[active_src]->name, type);
-                sh->impunge_done (frame, this, -1, EINVAL);
-                break;
-        }
+        impunge_local->cont.lookup.buf = *buf;
+        afr_update_loc_gfids (&impunge_local->loc, buf, postparent);
 
-        return 0;
-}
-
-int
-afr_sh_entry_impunge_create_file (call_frame_t *impunge_frame, xlator_t *this,
-                                  int child_index)
-{
-        call_frame_t    *frame             = NULL;
-        afr_local_t     *impunge_local     = NULL;
-        afr_local_t     *local             = NULL;
-        afr_self_heal_t *impunge_sh        = NULL;
-        afr_self_heal_t *sh                = NULL;
-        afr_private_t   *priv = NULL;
-        ia_type_t       type = IA_INVAL;
-        int             active_src = 0;
-        struct iatt     *buf = NULL;
-
-        AFR_INIT_SH_FRAME_VALS (impunge_frame, impunge_local, impunge_sh,
-                                frame, local, sh);
-        active_src = impunge_sh->active_source;
-        buf = &impunge_sh->entrybuf;
         type = buf->ia_type;
 
         switch (type) {
@@ -1721,30 +1585,41 @@ afr_sh_entry_impunge_create_file (call_frame_t *impunge_frame, xlator_t *this,
                 afr_sh_entry_impunge_readlink (impunge_frame, this,
                                                child_index, buf);
                 break;
+        case IA_IFDIR:
+                afr_sh_entry_impunge_mkdir (impunge_frame, this,
+                                            child_index, buf);
+                break;
         default:
                 gf_log (this->name, GF_LOG_ERROR,
                         "%s has unknown file type on %s: 0%o",
                         impunge_local->loc.path,
                         priv->children[active_src]->name, type);
-                sh->impunge_done (frame, this, -1, EINVAL);
+                ret = -1;
                 break;
         }
 
-        return 0;
+        return ret;
 }
 
 gf_boolean_t
-afr_sh_need_recreate (afr_self_heal_t *impunge_sh, unsigned int child,
-                      unsigned int child_count)
+afr_sh_need_recreate (afr_self_heal_t *impunge_sh, int *sources,
+                      unsigned int child, unsigned int child_count)
 {
+        int32_t         *success_children = NULL;
         gf_boolean_t    recreate = _gf_false;
 
+        GF_ASSERT (impunge_sh->impunging_entry_mode);
         GF_ASSERT (impunge_sh->child_errno);
+        GF_ASSERT (sources);
 
-        if (child == impunge_sh->active_source)
+        success_children = impunge_sh->child_success;
+        if (child == impunge_sh->active_source) {
+                GF_ASSERT (afr_is_child_present (success_children,
+                                                 child_count, child));
                 goto out;
+        }
 
-        if (IA_IFLNK == impunge_sh->entrybuf.ia_type) {
+        if (IA_ISLNK (impunge_sh->impunging_entry_mode)) {
                 recreate = _gf_true;
                 goto out;
         }
@@ -1763,7 +1638,7 @@ afr_sh_recreate_count (afr_self_heal_t *impunge_sh, int *sources,
         int             i = 0;
 
         for (i = 0; i < child_count; i++) {
-                if (afr_sh_need_recreate (impunge_sh, i, child_count))
+                if (afr_sh_need_recreate (impunge_sh, sources, i, child_count))
                         count++;
         }
 
@@ -1780,6 +1655,8 @@ afr_sh_entry_call_impunge_recreate (call_frame_t *impunge_frame,
         call_frame_t    *frame = NULL;
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        struct iatt     *buf = NULL;
+        struct iatt     *postparent = NULL;
         unsigned int     recreate_count = 0;
         int              i = 0;
         int              active_src = 0;
@@ -1787,34 +1664,24 @@ afr_sh_entry_call_impunge_recreate (call_frame_t *impunge_frame,
         priv          = this->private;
         AFR_INIT_SH_FRAME_VALS (impunge_frame, impunge_local, impunge_sh,
                                 frame, local, sh);
-        active_src = impunge_sh->active_source;
-        impunge_sh->entrybuf = impunge_sh->buf[active_src];
-        impunge_sh->parentbuf = impunge_sh->parentbufs[active_src];
+        active_src    = impunge_sh->active_source;
+        buf           = &impunge_sh->buf[active_src];
+        postparent    = &impunge_sh->parentbufs[active_src];
+
         recreate_count = afr_sh_recreate_count (impunge_sh, sh->sources,
                                                 priv->child_count);
-        if (!recreate_count) {
-                afr_sh_entry_call_impunge_done (impunge_frame, this, 0, 0);
-                goto out;
-        }
+        GF_ASSERT (recreate_count);
         impunge_local->call_count = recreate_count;
         for (i = 0; i < priv->child_count; i++) {
-                if (!impunge_local->child_up[i]) {
-                        impunge_sh->child_errno[i] = ENOTCONN;
-                        continue;
+                if (afr_sh_need_recreate (impunge_sh, sh->sources, i,
+                                          priv->child_count)) {
+                        (void)afr_sh_entry_impunge_create (impunge_frame, this,
+                                                           i, buf,
+                                                           postparent);
+                        recreate_count--;
                 }
-                if (!afr_sh_need_recreate (impunge_sh, i, priv->child_count)) {
-                        impunge_sh->child_errno[i] = EEXIST;
-                        continue;
-                }
-        }
-        for (i = 0; i < priv->child_count; i++) {
-                if (!afr_sh_need_recreate (impunge_sh, i, priv->child_count))
-                        continue;
-                (void)afr_sh_entry_impunge_create (impunge_frame, this, i);
-                recreate_count--;
         }
         GF_ASSERT (!recreate_count);
-out:
         return 0;
 }
 
@@ -1826,12 +1693,13 @@ afr_sh_entry_common_lookup_done (call_frame_t *impunge_frame, xlator_t *this,
         afr_local_t     *impunge_local = NULL;
         afr_self_heal_t *impunge_sh = NULL;
         call_frame_t    *frame = NULL;
+        int              active_src = 0;
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        unsigned int     recreate_count = 0;
         unsigned int     gfid_miss_count = 0;
         unsigned int     children_up_count = 0;
         uuid_t           gfid = {0};
-        int              active_src = 0;
 
         priv          = this->private;
         AFR_INIT_SH_FRAME_VALS (impunge_frame, impunge_local, impunge_sh,
@@ -1847,11 +1715,11 @@ afr_sh_entry_common_lookup_done (call_frame_t *impunge_frame, xlator_t *this,
         }
 
         gfid_miss_count = afr_gfid_missing_count (this->name,
-                                                  impunge_sh->success_children,
+                                                  impunge_sh->child_success,
                                                   impunge_sh->buf, priv->child_count,
                                                   impunge_local->loc.path);
-        children_up_count = afr_up_children_count (impunge_local->child_up,
-                                                   priv->child_count);
+        children_up_count = afr_up_children_count (priv->child_count,
+                                                   impunge_local->child_up);
         if ((gfid_miss_count == children_up_count) &&
             (children_up_count < priv->child_count)) {
                 op_ret = -1;
@@ -1864,7 +1732,7 @@ afr_sh_entry_common_lookup_done (call_frame_t *impunge_frame, xlator_t *this,
 
         if (gfid_miss_count) {
                 afr_update_gfid_from_iatts (gfid, impunge_sh->buf,
-                                            impunge_sh->success_children,
+                                            impunge_sh->child_success,
                                             priv->child_count);
                 if (uuid_is_null (gfid)) {
                         sh->entries_skipped = _gf_true;
@@ -1876,9 +1744,15 @@ afr_sh_entry_common_lookup_done (call_frame_t *impunge_frame, xlator_t *this,
                 afr_sh_common_lookup (impunge_frame, this, &impunge_local->loc,
                                       afr_sh_entry_common_lookup_done, gfid,
                                       AFR_LOOKUP_FAIL_CONFLICTS |
-                                      AFR_LOOKUP_FAIL_MISSING_GFIDS,
-                                      NULL);
+                                      AFR_LOOKUP_FAIL_MISSING_GFIDS);
         } else {
+                recreate_count = afr_sh_recreate_count (impunge_sh, sh->sources,
+                                                        priv->child_count);
+                if (!recreate_count) {
+                        op_ret = 0;
+                        op_errno = 0;
+                        goto done;
+                }
                 afr_sh_entry_call_impunge_recreate (impunge_frame, this);
         }
         return;
@@ -1892,43 +1766,52 @@ int
 afr_sh_entry_impunge_entry (call_frame_t *frame, xlator_t *this,
                             gf_dirent_t *entry)
 {
+        afr_private_t   *priv = NULL;
         afr_local_t     *local  = NULL;
         afr_self_heal_t *sh  = NULL;
-        afr_self_heal_t *impunge_sh  = NULL;
         int              ret = -1;
         call_frame_t    *impunge_frame = NULL;
         afr_local_t     *impunge_local = NULL;
         int              active_src = 0;
         int              op_errno = 0;
         int              op_ret = -1;
+        mode_t           entry_mode = 0;
 
+        priv = this->private;
         local = frame->local;
         sh = &local->self_heal;
 
         active_src = sh->active_source;
         sh->impunge_done = afr_sh_entry_impunge_entry_done;
 
-        if (can_skip_entry_self_heal (entry->d_name, &local->loc)) {
+        if ((strcmp (entry->d_name, ".") == 0)
+            || (strcmp (entry->d_name, "..") == 0)
+            || ((strcmp (local->loc.path, "/") == 0)
+                && (strcmp (entry->d_name, GF_REPLICATE_TRASH_DIR) == 0))) {
+
+                gf_log (this->name, GF_LOG_TRACE,
+                        "skipping inspection of %s under %s",
+                        entry->d_name, local->loc.path);
                 op_ret = 0;
                 goto out;
         }
 
         gf_log (this->name, GF_LOG_TRACE,
-                "inspecting existence of %s under %s",
+                "inspecting existance of %s under %s",
                 entry->d_name, local->loc.path);
 
-        ret = afr_impunge_frame_create (frame, this, active_src,
-                                        &impunge_frame);
+        entry_mode = st_mode_from_ia (entry->d_stat.ia_prot,
+                                      entry->d_stat.ia_type);
+        ret = afr_impunge_frame_create (frame, this, active_src, active_src,
+                                        entry_mode, &impunge_frame);
         if (ret) {
                 op_errno = -ret;
                 goto out;
         }
 
         impunge_local = impunge_frame->local;
-        impunge_sh = &impunge_local->self_heal;
         ret = afr_build_child_loc (this, &impunge_local->loc, &local->loc,
-                                   entry->d_name);
-        loc_copy (&impunge_sh->parent_loc, &local->loc);
+                                   entry->d_name, entry->d_stat.ia_gfid);
         if (ret != 0) {
                 op_errno = ENOMEM;
                 goto out;
@@ -1936,14 +1819,14 @@ afr_sh_entry_impunge_entry (call_frame_t *frame, xlator_t *this,
 
         afr_sh_common_lookup (impunge_frame, this, &impunge_local->loc,
                               afr_sh_entry_common_lookup_done, NULL,
-                              AFR_LOOKUP_FAIL_CONFLICTS, NULL);
+                              AFR_LOOKUP_FAIL_CONFLICTS);
 
         op_ret = 0;
 out:
         if (ret) {
                 if (impunge_frame)
                         AFR_STACK_DESTROY (impunge_frame);
-                sh->impunge_done (frame, this, op_ret, op_errno);
+                sh->impunge_done (frame, this, active_src, op_ret, op_errno);
         }
 
         return 0;
@@ -1954,7 +1837,7 @@ int
 afr_sh_entry_impunge_readdir_cbk (call_frame_t *frame, void *cookie,
                                   xlator_t *this,
                                   int32_t op_ret, int32_t op_errno,
-                                  gf_dirent_t *entries, dict_t *xdata)
+                                  gf_dirent_t *entries)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *local  = NULL;
@@ -1977,7 +1860,6 @@ afr_sh_entry_impunge_readdir_cbk (call_frame_t *frame, void *cookie,
                                 local->loc.path,
                                 priv->children[active_src]->name,
                                 strerror (op_errno));
-                        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
                 } else {
                         gf_log (this->name, GF_LOG_TRACE,
                                 "readdir of %s on subvolume %s complete",
@@ -1994,7 +1876,7 @@ afr_sh_entry_impunge_readdir_cbk (call_frame_t *frame, void *cookie,
                 entry_count++;
         }
 
-        gf_log (this->name, GF_LOG_DEBUG,
+        gf_log (this->name, GF_LOG_TRACE,
                 "readdir'ed %d entries from %s",
                 entry_count, priv->children[active_src]->name);
 
@@ -2010,24 +1892,21 @@ afr_sh_entry_impunge_readdir_cbk (call_frame_t *frame, void *cookie,
 
 
 int
-afr_sh_entry_impunge_subvol (call_frame_t *frame, xlator_t *this)
+afr_sh_entry_impunge_subvol (call_frame_t *frame, xlator_t *this,
+                             int active_src)
 {
         afr_private_t   *priv = NULL;
         afr_local_t     *local  = NULL;
         afr_self_heal_t *sh  = NULL;
-        int32_t         active_src = 0;
 
         priv = this->private;
         local = frame->local;
         sh = &local->self_heal;
-        active_src = sh->active_source;
-        gf_log (this->name, GF_LOG_DEBUG, "%s: readdir from offset %zd",
-                local->loc.path, sh->offset);
 
         STACK_WIND (frame, afr_sh_entry_impunge_readdir_cbk,
                     priv->children[active_src],
                     priv->children[active_src]->fops->readdirp,
-                    sh->healing_fd, sh->block_size, sh->offset, NULL);
+                    sh->healing_fd, sh->block_size, sh->offset);
 
         return 0;
 }
@@ -2050,7 +1929,7 @@ afr_sh_entry_impunge_all (call_frame_t *frame, xlator_t *this)
         active_src = next_active_source (frame, this, sh->active_source);
         sh->active_source = active_src;
 
-        if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
+        if (sh->op_failed) {
                 afr_sh_entry_finish (frame, this);
                 return 0;
         }
@@ -2065,7 +1944,7 @@ afr_sh_entry_impunge_all (call_frame_t *frame, xlator_t *this)
                 "impunging entries of %s on %s to other sinks",
                 local->loc.path, priv->children[active_src]->name);
 
-        afr_sh_entry_impunge_subvol (frame, this);
+        afr_sh_entry_impunge_subvol (frame, this, active_src);
 
         return 0;
 }
@@ -2073,7 +1952,7 @@ afr_sh_entry_impunge_all (call_frame_t *frame, xlator_t *this)
 
 int
 afr_sh_entry_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno, fd_t *fd, dict_t *xdata)
+                          int32_t op_ret, int32_t op_errno, fd_t *fd)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
@@ -2099,7 +1978,7 @@ afr_sh_entry_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 local->loc.path,
                                 priv->children[child_index]->name,
                                 strerror (op_errno));
-                        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+                        sh->op_failed = 1;
                 }
         }
         UNLOCK (&frame->lock);
@@ -2107,7 +1986,7 @@ afr_sh_entry_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         call_count = afr_frame_return (frame);
 
         if (call_count == 0) {
-                if (is_self_heal_failed (sh, AFR_CHECK_SPECIFIC)) {
+                if (sh->op_failed) {
                         afr_sh_entry_finish (frame, this);
                         return 0;
                 }
@@ -2145,7 +2024,7 @@ afr_sh_entry_open (call_frame_t *frame, xlator_t *this)
         source  = local->self_heal.source;
         sources = local->self_heal.sources;
 
-        sh->block_size = priv->sh_readdir_size;
+        sh->block_size = 65536; //131072
         sh->offset = 0;
 
         call_count = sh->active_sinks;
@@ -2167,7 +2046,7 @@ afr_sh_entry_open (call_frame_t *frame, xlator_t *this)
                                    (void *) (long) source,
                                    priv->children[source],
                                    priv->children[source]->fops->opendir,
-                                   &local->loc, fd, NULL);
+                                   &local->loc, fd);
                 call_count--;
         }
 
@@ -2184,7 +2063,7 @@ afr_sh_entry_open (call_frame_t *frame, xlator_t *this)
                                    (void *) (long) i,
                                    priv->children[i],
                                    priv->children[i]->fops->opendir,
-                                   &local->loc, fd, NULL);
+                                   &local->loc, fd);
 
                 if (!--call_count)
                         break;
@@ -2200,26 +2079,33 @@ afr_sh_entry_sync_prepare (call_frame_t *frame, xlator_t *this)
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
         afr_private_t   *priv = NULL;
+        int              active_sinks = 0;
         int              source = 0;
+        int              i = 0;
 
         local = frame->local;
         sh = &local->self_heal;
         priv = this->private;
 
         source = sh->source;
-
-        afr_sh_mark_source_sinks (frame, this);
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->sources[i] == 0 && local->child_up[i] == 1) {
+                        active_sinks++;
+                        sh->success[i] = 1;
+                }
+        }
         if (source != -1)
                 sh->success[source] = 1;
 
-        if (sh->active_sinks == 0) {
+        sh->active_sinks = active_sinks;
+        if (active_sinks == 0) {
                 gf_log (this->name, GF_LOG_TRACE,
                         "no active sinks for self-heal on dir %s",
                         local->loc.path);
                 afr_sh_entry_finish (frame, this);
                 return 0;
         }
-        if (source == -1 && sh->active_sinks < 2) {
+        if (source == -1 && active_sinks < 2) {
                 gf_log (this->name, GF_LOG_TRACE,
                         "cannot sync with 0 sources and 1 sink on dir %s",
                         local->loc.path);
@@ -2232,15 +2118,13 @@ afr_sh_entry_sync_prepare (call_frame_t *frame, xlator_t *this)
                         "self-healing directory %s from subvolume %s to "
                         "%d other",
                         local->loc.path, priv->children[source]->name,
-                        sh->active_sinks);
+                        active_sinks);
         else
                 gf_log (this->name, GF_LOG_DEBUG,
                         "no active sources for %s found. "
                         "merging all entries as a conservative decision",
                         local->loc.path);
 
-        sh->actual_sh_started = _gf_true;
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_SYNC_BEGIN);
         afr_sh_entry_open (frame, this);
 
         return 0;
@@ -2251,19 +2135,19 @@ void
 afr_sh_entry_fix (call_frame_t *frame, xlator_t *this,
                   int32_t op_ret, int32_t op_errno)
 {
-        afr_local_t     *local = NULL;
-        afr_self_heal_t *sh = NULL;
-        afr_private_t   *priv = NULL;
-        int              source = 0;
-        int              nsources = 0;
-        int32_t          subvol_status = 0;
+        afr_local_t        *local = NULL;
+        afr_self_heal_t    *sh = NULL;
+        afr_private_t      *priv = NULL;
+        afr_source_flags_t flags = 0;
+
+        int nsources = 0;
 
         local = frame->local;
         sh = &local->self_heal;
         priv = this->private;
 
         if (op_ret < 0) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+                sh->op_failed = 1;
                 afr_sh_set_error (sh, op_errno);
                 afr_sh_entry_finish (frame, this);
                 goto out;
@@ -2274,37 +2158,26 @@ afr_sh_entry_fix (call_frame_t *frame, xlator_t *this,
                 goto heal;
         }
 
-        nsources = afr_build_sources (this, sh->xattr, sh->buf,
-                                      sh->pending_matrix, sh->sources,
-                                      sh->success_children,
-                                      AFR_ENTRY_TRANSACTION, &subvol_status,
-                                      _gf_true);
-        if ((subvol_status & ALL_FOOLS) ||
-            (subvol_status & SPLIT_BRAIN)) {
-                gf_log (this->name, GF_LOG_INFO, "%s: Performing conservative "
-                        "merge", local->loc.path);
-                source = -1;
-                memset (sh->sources, 0,
-                        sizeof (*sh->sources) * priv->child_count);
-        } else if (nsources == 0) {
+        afr_build_pending_matrix (priv->pending_key, sh->pending_matrix,
+                                  sh->xattr, AFR_ENTRY_TRANSACTION,
+                                  priv->child_count);
+
+        afr_sh_print_pending_matrix (sh->pending_matrix, this);
+
+        nsources = afr_mark_sources (sh->sources, sh->pending_matrix, sh->buf,
+                                     priv->child_count, AFR_SELF_HEAL_ENTRY,
+                                     sh->child_success, this->name, &flags);
+
+        if (nsources == 0) {
                 gf_log (this->name, GF_LOG_TRACE,
                         "No self-heal needed for %s",
                         local->loc.path);
 
                 afr_sh_entry_finish (frame, this);
                 return;
-        } else {
-                source = afr_sh_select_source (sh->sources, priv->child_count);
         }
 
-        sh->source = source;
-
-        afr_reset_children (sh->fresh_children, priv->child_count);
-        afr_get_fresh_children (sh->success_children, sh->sources,
-                                sh->fresh_children, priv->child_count);
-        if (sh->source >= 0)
-                afr_inode_set_read_ctx (this, sh->inode, sh->source,
-                                        sh->fresh_children);
+        sh->source = afr_sh_select_source (sh->sources, priv->child_count);
 
 heal:
         afr_sh_entry_sync_prepare (frame, this);
@@ -2326,7 +2199,7 @@ afr_sh_post_nonblocking_entry_cbk (call_frame_t *frame, xlator_t *this)
         if (int_lock->lock_op_ret < 0) {
                 gf_log (this->name, GF_LOG_ERROR, "Non Blocking entrylks "
                         "failed for %s.", local->loc.path);
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+                sh->op_failed = 1;
                 afr_sh_entry_done (frame, this);
         } else {
 
@@ -2335,8 +2208,7 @@ afr_sh_post_nonblocking_entry_cbk (call_frame_t *frame, xlator_t *this)
                 afr_sh_common_lookup (frame, this, &local->loc,
                                       afr_sh_entry_fix, NULL,
                                       AFR_LOOKUP_FAIL_CONFLICTS |
-                                      AFR_LOOKUP_FAIL_MISSING_GFIDS,
-                                      NULL);
+                                      AFR_LOOKUP_FAIL_MISSING_GFIDS);
         }
 
         return 0;
@@ -2345,18 +2217,14 @@ afr_sh_post_nonblocking_entry_cbk (call_frame_t *frame, xlator_t *this)
 int
 afr_self_heal_entry (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t     *local = NULL;
+        afr_local_t   *local = NULL;
         afr_private_t   *priv = NULL;
-        afr_self_heal_t *sh = NULL;
+
 
         priv = this->private;
         local = frame->local;
-        sh = &local->self_heal;
-
-        sh->sh_type_in_action = AFR_SELF_HEAL_ENTRY;
 
-        if (local->self_heal.do_entry_self_heal && priv->entry_self_heal) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_STARTED);
+        if (local->self_heal.need_entry_self_heal && priv->entry_self_heal) {
                 afr_sh_entrylk (frame, this, &local->loc, NULL,
                                 afr_sh_post_nonblocking_entry_cbk);
         } else {
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index fd5da6cfd..9b920eb15 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <libgen.h>
@@ -45,17 +54,41 @@ afr_sh_metadata_done (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
+        afr_private_t   *priv = NULL;
+        int              i = 0;
 
         local = frame->local;
         sh = &local->self_heal;
+        priv = this->private;
 
-        afr_sh_reset (frame, this);
-        if (IA_ISDIR (sh->type)) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "proceeding to entry check on %s",
+//      memset (sh->child_errno, 0, sizeof (int) * priv->child_count);
+        memset (sh->buf, 0, sizeof (struct iatt) * priv->child_count);
+        memset (sh->success, 0, sizeof (int) * priv->child_count);
+
+/*         for (i = 0; i < priv->child_count; i++) { */
+/*                 sh->locked_nodes[i] = 1; */
+/*         } */
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->xattr[i])
+                        dict_unref (sh->xattr[i]);
+                sh->xattr[i] = NULL;
+        }
+
+        if (local->govinda_gOvinda) {
+                gf_log (this->name, GF_LOG_INFO,
+                        "split-brain detected, aborting selfheal of %s",
                         local->loc.path);
-                afr_self_heal_entry (frame, this);
+                sh->op_failed = 1;
+                sh->completion_cbk (frame, this);
         } else {
+                if (IA_ISDIR (sh->type)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "proceeding to entry check on %s",
+                                local->loc.path);
+                        afr_self_heal_entry (frame, this);
+                        return 0;
+                }
                 gf_log (this->name, GF_LOG_DEBUG,
                         "proceeding to data check on %s",
                         local->loc.path);
@@ -65,6 +98,21 @@ afr_sh_metadata_done (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
+
+int
+afr_sh_metadata_unlck_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                           int32_t op_ret, int32_t op_errno)
+{
+        int               call_count = 0;
+
+        call_count = afr_frame_return (frame);
+
+        if (call_count == 0)
+                afr_sh_metadata_done (frame, this);
+
+        return 0;
+}
+
 int
 afr_sh_inode_unlock (call_frame_t *frame, xlator_t *this)
 {
@@ -88,68 +136,104 @@ afr_sh_metadata_finish (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
+
 int
-afr_sh_metadata_fail (call_frame_t *frame, xlator_t *this)
+afr_sh_metadata_erase_pending_cbk (call_frame_t *frame, void *cookie,
+                                   xlator_t *this, int32_t op_ret,
+                                   int32_t op_errno, dict_t *xattr)
 {
-        afr_local_t         *local    = NULL;
-        afr_self_heal_t     *sh       = NULL;
+        afr_local_t     *local = NULL;
+        int             call_count = 0;
 
-        local    = frame->local;
-        sh       = &local->self_heal;
+        local = frame->local;
+
+        call_count = afr_frame_return (frame);
+
+        if (call_count == 0)
+                afr_sh_metadata_finish (frame, this);
 
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
-        afr_sh_metadata_finish (frame, this);
         return 0;
 }
 
+
 int
-afr_sh_metadata_erase_pending_cbk (call_frame_t *frame, void *cookie,
-                                   xlator_t *this, int32_t op_ret,
-                                   int32_t op_errno, dict_t *xattr, dict_t *xdata)
+afr_sh_metadata_erase_pending (call_frame_t *frame, xlator_t *this)
 {
-        afr_local_t     *local     = NULL;
-        int             call_count = 0;
-        long            i          = 0;
-        afr_self_heal_t *sh        = NULL;
-        afr_private_t   *priv      = NULL;
+        afr_local_t     *local = NULL;
+        afr_self_heal_t *sh = NULL;
+        afr_private_t   *priv = NULL;
+        int              call_count = 0;
+        int              i = 0;
+        dict_t          **erase_xattr = NULL;
+
 
         local = frame->local;
-        priv  = this->private;
         sh = &local->self_heal;
-        i = (long)cookie;
+        priv = this->private;
+
+        afr_sh_pending_to_delta (priv, sh->xattr, sh->delta_matrix,
+                                 sh->success, priv->child_count,
+                                 AFR_METADATA_TRANSACTION);
+
+        erase_xattr = GF_CALLOC (sizeof (*erase_xattr), priv->child_count,
+                                 gf_afr_mt_dict_t);
+        if (!erase_xattr)
+                return -ENOMEM;
 
-        if ((!IA_ISREG (sh->buf[sh->source].ia_type)) &&
-            (!IA_ISDIR (sh->buf[sh->source].ia_type))) {
-                afr_children_add_child (sh->fresh_children, i,
-                                        priv->child_count);
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->xattr[i]) {
+                        call_count++;
+
+                        erase_xattr[i] = get_new_dict();
+                        dict_ref (erase_xattr[i]);
+                }
         }
-        call_count = afr_frame_return (frame);
+
+        afr_sh_delta_to_xattr (priv, sh->delta_matrix, erase_xattr,
+                               priv->child_count, AFR_METADATA_TRANSACTION);
+
+        local->call_count = call_count;
 
         if (call_count == 0) {
-                if ((!IA_ISREG (sh->buf[sh->source].ia_type)) &&
-                    (!IA_ISDIR (sh->buf[sh->source].ia_type))) {
-                        afr_inode_set_read_ctx (this, sh->inode, sh->source,
-                                                sh->fresh_children);
-                }
+                gf_log (this->name, GF_LOG_INFO,
+                        "metadata of %s not healed on any subvolume",
+                        local->loc.path);
+
                 afr_sh_metadata_finish (frame, this);
         }
 
-        return 0;
-}
+        for (i = 0; i < priv->child_count; i++) {
+                if (!erase_xattr[i])
+                        continue;
 
-int
-afr_sh_metadata_erase_pending (call_frame_t *frame, xlator_t *this)
-{
-         afr_sh_erase_pending (frame, this, AFR_METADATA_TRANSACTION,
-                               afr_sh_metadata_erase_pending_cbk,
-                               afr_sh_metadata_finish);
-         return 0;
+                gf_log (this->name, GF_LOG_TRACE,
+                        "erasing pending flags from %s on %s",
+                        local->loc.path, priv->children[i]->name);
+
+                STACK_WIND_COOKIE (frame, afr_sh_metadata_erase_pending_cbk,
+                                   (void *) (long) i,
+                                   priv->children[i],
+                                   priv->children[i]->fops->xattrop,
+                                   &local->loc,
+                                   GF_XATTROP_ADD_ARRAY, erase_xattr[i]);
+                if (!--call_count)
+                        break;
+        }
+
+        for (i = 0; i < priv->child_count; i++) {
+                if (erase_xattr[i]) {
+                        dict_unref (erase_xattr[i]);
+                }
+        }
+        GF_FREE (erase_xattr);
+
+        return 0;
 }
 
 
 int
 afr_sh_metadata_sync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                          int32_t op_ret, int32_t op_errno)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
@@ -180,13 +264,8 @@ afr_sh_metadata_sync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         call_count = afr_frame_return (frame);
 
-        if (call_count == 0) {
-                if (local->xattr_req) {
-                        dict_unref (local->xattr_req);
-                        local->xattr_req = NULL;
-                }
+        if (call_count == 0)
                 afr_sh_metadata_erase_pending (frame, this);
-        }
 
         return 0;
 }
@@ -195,9 +274,9 @@ afr_sh_metadata_sync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 int
 afr_sh_metadata_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                              int32_t op_ret, int32_t op_errno,
-                             struct iatt *preop, struct iatt *postop, dict_t *xdata)
+                             struct iatt *preop, struct iatt *postop)
 {
-        afr_sh_metadata_sync_cbk (frame, cookie, this, op_ret, op_errno, xdata);
+        afr_sh_metadata_sync_cbk (frame, cookie, this, op_ret, op_errno);
 
         return 0;
 }
@@ -205,93 +284,13 @@ afr_sh_metadata_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 afr_sh_metadata_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                           int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                           int32_t op_ret, int32_t op_errno)
 {
-        afr_sh_metadata_sync_cbk (frame, cookie, this, op_ret, op_errno, xdata);
+        afr_sh_metadata_sync_cbk (frame, cookie, this, op_ret, op_errno);
 
         return 0;
 }
 
-int
-afr_sh_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int32_t op_ret, int32_t op_errno,
-                        dict_t *xdata)
-{
-        int            i     = 0;
-        afr_private_t *priv  = NULL;
-        afr_local_t   *local = NULL;
-
-        priv = this->private;
-        local = frame->local;
-
-        if (op_ret < 0) {
-                afr_sh_metadata_sync_cbk (frame, cookie,
-                                          this, -1, op_errno, xdata);
-                goto out;
-        }
-
-        i = (long) cookie;
-
-        STACK_WIND_COOKIE (frame, afr_sh_metadata_xattr_cbk,
-                           (void *) (long) i,
-                           priv->children[i],
-                           priv->children[i]->fops->setxattr,
-                           &local->loc, local->xattr_req, 0, NULL);
-
- out:
-        return 0;
-}
-
-inline void
-afr_prune_special_keys (dict_t *xattr_dict)
-{
-        dict_del (xattr_dict, GF_SELINUX_XATTR_KEY);
-}
-
-inline void
-afr_prune_pending_keys (dict_t *xattr_dict, afr_private_t *priv)
-{
-        int i = 0;
-
-        for (; i < priv->child_count; i++) {
-                dict_del (xattr_dict, priv->pending_key[i]);
-        }
-}
-
-int
-afr_sh_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int32_t op_ret, int32_t op_errno, dict_t *xattr,
-                     dict_t *xdata)
-{
-        int            i     = 0;
-        afr_private_t *priv  = NULL;
-        afr_local_t   *local = NULL;
-
-        priv = this->private;
-        local = frame->local;
-
-        if (op_ret < 0) {
-                afr_sh_metadata_sync_cbk (frame, cookie,
-                                          this, -1, op_errno, xdata);
-                goto out;
-        }
-
-        afr_prune_pending_keys (xattr, priv);
-
-        afr_prune_special_keys (xattr);
-
-        i = (long) cookie;
-
-        /* send removexattr in bulk via xdata */
-        STACK_WIND_COOKIE (frame, afr_sh_removexattr_cbk,
-                           cookie,
-                           priv->children[i],
-                           priv->children[i]->fops->removexattr,
-                           &local->loc, "", xattr);
-
- out:
-        return 0;
-}
 
 int
 afr_sh_metadata_sync (call_frame_t *frame, xlator_t *this, dict_t *xattr)
@@ -317,10 +316,9 @@ afr_sh_metadata_sync (call_frame_t *frame, xlator_t *this, dict_t *xattr)
         /*
          * 2 calls per sink - setattr, setxattr
          */
-        if (xattr) {
+        if (xattr)
                 call_count = active_sinks * 2;
-                local->xattr_req = dict_ref (xattr);
-        } else
+        else
                 call_count = active_sinks;
 
         local->call_count = call_count;
@@ -356,18 +354,18 @@ afr_sh_metadata_sync (call_frame_t *frame, xlator_t *this, dict_t *xattr)
                                    (void *) (long) i,
                                    priv->children[i],
                                    priv->children[i]->fops->setattr,
-                                   &local->loc, &stbuf, valid, NULL);
+                                   &local->loc, &stbuf, valid);
 
                 call_count--;
 
                 if (!xattr)
                         continue;
 
-                STACK_WIND_COOKIE (frame, afr_sh_getxattr_cbk,
+                STACK_WIND_COOKIE (frame, afr_sh_metadata_xattr_cbk,
                                    (void *) (long) i,
                                    priv->children[i],
-                                   priv->children[i]->fops->getxattr,
-                                   &local->loc, NULL, NULL);
+                                   priv->children[i]->fops->setxattr,
+                                   &local->loc, xattr, 0);
                 call_count--;
         }
 
@@ -376,15 +374,17 @@ afr_sh_metadata_sync (call_frame_t *frame, xlator_t *this, dict_t *xattr)
 
 
 int
-afr_sh_metadata_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                              int32_t op_ret, int32_t op_errno, dict_t *xattr,
-                              dict_t *xdata)
+afr_sh_metadata_getxattr_cbk (call_frame_t *frame, void *cookie,
+                              xlator_t *this,
+                              int32_t op_ret, int32_t op_errno, dict_t *xattr)
 {
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
         afr_private_t   *priv = NULL;
         int              source = 0;
 
+        int i;
+
         local = frame->local;
         sh = &local->self_heal;
         priv = this->private;
@@ -399,147 +399,16 @@ afr_sh_metadata_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
                 afr_sh_metadata_sync (frame, this, NULL);
         } else {
-                afr_prune_pending_keys (xattr, priv);
+                for (i = 0; i < priv->child_count; i++) {
+                        dict_del (xattr, priv->pending_key[i]);
+                }
+
                 afr_sh_metadata_sync (frame, this, xattr);
         }
 
         return 0;
 }
 
-static void
-afr_set_metadata_sh_info_str (afr_local_t *local, afr_self_heal_t *sh,
-                              xlator_t *this)
-{
-        afr_private_t    *priv = NULL;
-        int              i = 0;
-        char             num[1024] = {0};
-        size_t           len = 0;
-        char             *string = NULL;
-        size_t           off = 0;
-        char             *source_child =  " from source %s to";
-        char             *format = " %s, ";
-        char             *string_msg = " metadata self heal";
-        char             *pending_matrix_str = NULL;
-        int              down_child_present = 0;
-        int              unknown_child_present = 0;
-        char             *down_subvol_1 = " down subvolume is ";
-        char             *unknown_subvol_1 = " unknown subvolume is";
-        char             *down_subvol_2 = " down subvolumes are ";
-        char             *unknown_subvol_2 = " unknown subvolumes are ";
-        int              down_count = 0;
-        int              unknown_count = 0;
-
-        priv = this->private;
-
-        pending_matrix_str = afr_get_pending_matrix_str (sh->pending_matrix,
-                                                         this);
-
-        if (!pending_matrix_str)
-                pending_matrix_str = "";
-
-        len += snprintf (num, sizeof (num), "%s", string_msg);
-
-        for (i = 0; i < priv->child_count; i++) {
-                if ((sh->source == i) && (local->child_up[i] == 1)) {
-                        len += snprintf (num, sizeof (num), source_child,
-                                         priv->children[i]->name);
-                } else if ((local->child_up[i] == 1) && (sh->sources[i] == 0)) {
-                        len += snprintf (num, sizeof (num), format,
-                                         priv->children[i]->name);
-                } else if (local->child_up[i] == 0) {
-                        len += snprintf (num, sizeof (num), format,
-                                         priv->children[i]->name);
-                        if (!down_child_present)
-                                down_child_present = 1;
-                        down_count++;
-                } else if (local->child_up[i] == -1) {
-                        len += snprintf (num, sizeof (num), format,
-                                         priv->children[i]->name);
-                        if (!unknown_child_present)
-                                unknown_child_present = 1;
-                        unknown_count++;
-                }
-        }
-
-        if (down_child_present) {
-                if (down_count > 1) {
-                        len += snprintf (num, sizeof (num), "%s",
-                                         down_subvol_2);
-                } else {
-                        len += snprintf (num, sizeof (num), "%s",
-                                         down_subvol_1);
-                }
-        }
-        if (unknown_child_present) {
-                if (unknown_count > 1) {
-                        len += snprintf (num, sizeof (num), "%s",
-                                         unknown_subvol_2);
-                } else {
-                        len += snprintf (num, sizeof (num), "%s",
-                                         unknown_subvol_1);
-                }
-        }
-
-        len ++;
-
-        string = GF_CALLOC (len, sizeof (char), gf_common_mt_char);
-        if (!string)
-                return;
-
-        off += snprintf (string + off, len - off, "%s", string_msg);
-        for (i=0; i < priv->child_count; i++) {
-                if ((sh->source == i) && (local->child_up[i] == 1))
-                        off += snprintf (string + off, len - off, source_child,
-                                         priv->children[i]->name);
-        }
-
-        for (i = 0; i < priv->child_count; i++) {
-                if ((local->child_up[i] == 1)&& (sh->sources[i] == 0))
-                        off += snprintf (string + off, len - off, format,
-                                         priv->children[i]->name);
-        }
-
-        if (down_child_present) {
-                if (down_count > 1) {
-                        off += snprintf (string + off, len - off, "%s",
-                                         down_subvol_2);
-                } else {
-                        off += snprintf (string + off, len - off, "%s",
-                                         down_subvol_1);
-                }
-        }
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->child_up[i] == 0)
-                        off += snprintf (string + off, len - off, format,
-                                         priv->children[i]->name);
-        }
-
-        if (unknown_child_present) {
-                if (unknown_count > 1) {
-                        off += snprintf (string + off, len - off, "%s",
-                                 unknown_subvol_2);
-                } else {
-                        off += snprintf (string + off, len - off, "%s",
-                                         unknown_subvol_1);
-                }
-        }
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->child_up[i] == -1)
-                        off += snprintf (string + off, len - off, format,
-                                         priv->children[i]->name);
-        }
-
-        gf_asprintf (&sh->metadata_sh_info, "%s metadata %s,", string,
-                     pending_matrix_str);
-
-        if (pending_matrix_str && strcmp (pending_matrix_str, ""))
-                GF_FREE (pending_matrix_str);
-
-        if (string && strcmp (string, ""))
-                GF_FREE (string);
-}
 
 int
 afr_sh_metadata_sync_prepare (call_frame_t *frame, xlator_t *this)
@@ -547,7 +416,9 @@ afr_sh_metadata_sync_prepare (call_frame_t *frame, xlator_t *this)
         afr_local_t     *local = NULL;
         afr_self_heal_t *sh = NULL;
         afr_private_t   *priv = NULL;
+        int              active_sinks = 0;
         int              source = 0;
+        int              i = 0;
 
         local = frame->local;
         sh = &local->self_heal;
@@ -555,27 +426,31 @@ afr_sh_metadata_sync_prepare (call_frame_t *frame, xlator_t *this)
 
         source = sh->source;
 
-        afr_sh_mark_source_sinks (frame, this);
-        if (sh->active_sinks == 0) {
+        for (i = 0; i < priv->child_count; i++) {
+                if (sh->sources[i] == 0 && local->child_up[i] == 1) {
+                        active_sinks++;
+                        sh->success[i] = 1;
+                }
+        }
+        sh->success[source] = 1;
+
+        if (active_sinks == 0) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "no active sinks for performing self-heal on file %s",
                         local->loc.path);
                 afr_sh_metadata_finish (frame, this);
                 return 0;
         }
+        sh->active_sinks = active_sinks;
 
         gf_log (this->name, GF_LOG_TRACE,
                 "syncing metadata of %s from subvolume %s to %d active sinks",
-                local->loc.path, priv->children[source]->name,
-                sh->active_sinks);
+                local->loc.path, priv->children[source]->name, active_sinks);
 
-        sh->actual_sh_started = _gf_true;
-        afr_set_self_heal_status (sh, AFR_SELF_HEAL_SYNC_BEGIN);
-        afr_set_metadata_sh_info_str (local, sh, this);
         STACK_WIND (frame, afr_sh_metadata_getxattr_cbk,
                     priv->children[source],
                     priv->children[source]->fops->getxattr,
-                    &local->loc, NULL, NULL);
+                    &local->loc, NULL);
 
         return 0;
 }
@@ -597,15 +472,24 @@ afr_sh_metadata_fix (call_frame_t *frame, xlator_t *this,
         priv = this->private;
 
         if (op_ret < 0) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
+                sh->op_failed = 1;
                 afr_sh_set_error (sh, op_errno);
                 afr_sh_metadata_finish (frame, this);
                 goto out;
         }
         nsources = afr_build_sources (this, sh->xattr, sh->buf,
                                       sh->pending_matrix, sh->sources,
-                                      sh->success_children,
-                                      AFR_METADATA_TRANSACTION, NULL, _gf_false);
+                                      sh->child_success,
+                                      AFR_METADATA_TRANSACTION, NULL);
+        if (nsources == 0) {
+                gf_log (this->name, GF_LOG_TRACE,
+                        "No self-heal needed for %s",
+                        local->loc.path);
+
+                afr_sh_metadata_finish (frame, this);
+                goto out;
+        }
+
         if ((nsources == -1)
             && (priv->favorite_child != -1)
             && (sh->child_errno[priv->favorite_child] == 0)) {
@@ -622,18 +506,12 @@ afr_sh_metadata_fix (call_frame_t *frame, xlator_t *this,
         }
 
         if (nsources == -1) {
-                afr_sh_print_split_brain_log (sh->pending_matrix, this,
-                                              local->loc.path);
-                afr_set_split_brain (this, sh->inode, SPB, DONT_KNOW);
-                afr_sh_metadata_fail (frame, this);
-                goto out;
-        }
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Unable to self-heal permissions/ownership of '%s' "
+                        "(possible split-brain). Please fix the file on "
+                        "all backend volumes", local->loc.path);
 
-        afr_set_split_brain (this, sh->inode, NO_SPB, DONT_KNOW);
-        if (nsources == 0) {
-                gf_log (this->name, GF_LOG_TRACE,
-                        "No self-heal needed for %s",
-                        local->loc.path);
+                local->govinda_gOvinda = 1;
 
                 afr_sh_metadata_finish (frame, this);
                 goto out;
@@ -663,19 +541,7 @@ afr_sh_metadata_fix (call_frame_t *frame, xlator_t *this,
                         sh->sources[i] = 0;
         }
 
-        if ((!IA_ISREG (sh->buf[source].ia_type)) &&
-            (!IA_ISDIR (sh->buf[source].ia_type))) {
-                afr_reset_children (sh->fresh_children, priv->child_count);
-                afr_get_fresh_children (sh->success_children, sh->sources,
-                                        sh->fresh_children, priv->child_count);
-                afr_inode_set_read_ctx (this, sh->inode, sh->source,
-                                        sh->fresh_children);
-        }
-
-        if (sh->do_metadata_self_heal && priv->metadata_self_heal)
-                afr_sh_metadata_sync_prepare (frame, this);
-        else
-                afr_sh_metadata_finish (frame, this);
+        afr_sh_metadata_sync_prepare (frame, this);
 out:
         return;
 }
@@ -691,9 +557,9 @@ afr_sh_metadata_post_nonblocking_inodelk_cbk (call_frame_t *frame,
         int_lock = &local->internal_lock;
 
         if (int_lock->lock_op_ret < 0) {
-                gf_log (this->name, GF_LOG_DEBUG, "Non Blocking metadata "
+                gf_log (this->name, GF_LOG_ERROR, "Non Blocking metadata "
                         "inodelks failed for %s.", local->loc.path);
-                gf_log (this->name, GF_LOG_DEBUG, "Metadata self-heal "
+                gf_log (this->name, GF_LOG_ERROR, "Metadata self-heal "
                         "failed for %s.", local->loc.path);
                 afr_sh_metadata_done (frame, this);
         } else {
@@ -704,8 +570,7 @@ afr_sh_metadata_post_nonblocking_inodelk_cbk (call_frame_t *frame,
                 afr_sh_common_lookup (frame, this, &local->loc,
                                       afr_sh_metadata_fix, NULL,
                                       AFR_LOOKUP_FAIL_CONFLICTS |
-                                      AFR_LOOKUP_FAIL_MISSING_GFIDS,
-                                      NULL);
+                                      AFR_LOOKUP_FAIL_MISSING_GFIDS);
         }
 
         return 0;
@@ -715,22 +580,19 @@ int
 afr_sh_metadata_lock (call_frame_t *frame, xlator_t *this)
 {
         afr_internal_lock_t *int_lock = NULL;
-        afr_inodelk_t       *inodelk  = NULL;
         afr_local_t         *local    = NULL;
 
         local    = frame->local;
         int_lock = &local->internal_lock;
 
-        int_lock->domain           = this->name;
-        inodelk = afr_get_inodelk (int_lock, int_lock->domain);
         int_lock->transaction_lk_type = AFR_SELFHEAL_LK;
         int_lock->selfheal_lk_type    = AFR_METADATA_SELF_HEAL_LK;
 
         afr_set_lock_number (frame, this);
 
-        inodelk->flock.l_start = LLONG_MAX - 1;
-        inodelk->flock.l_len   = 0;
-        inodelk->flock.l_type  = F_WRLCK;
+        int_lock->lk_flock.l_start = 0;
+        int_lock->lk_flock.l_len   = 0;
+        int_lock->lk_flock.l_type  = F_WRLCK;
         int_lock->lock_cbk         = afr_sh_metadata_post_nonblocking_inodelk_cbk;
 
         afr_nonblocking_inodelk (frame, this);
@@ -738,29 +600,17 @@ afr_sh_metadata_lock (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
-gf_boolean_t
-afr_can_start_metadata_self_heal (afr_self_heal_t *sh, afr_private_t *priv)
-{
-        if (sh->force_confirm_spb)
-                return _gf_true;
-        if (sh->do_metadata_self_heal && priv->metadata_self_heal)
-                return _gf_true;
-        return _gf_false;
-}
 
 int
 afr_self_heal_metadata (call_frame_t *frame, xlator_t *this)
 {
         afr_local_t   *local = NULL;
         afr_private_t *priv = this->private;
-        afr_self_heal_t *sh = &local->self_heal;
+
 
         local = frame->local;
-        sh = &local->self_heal;
-        sh->sh_type_in_action = AFR_SELF_HEAL_METADATA;
 
-        if (afr_can_start_metadata_self_heal (sh, priv)) {
-                afr_set_self_heal_status (sh, AFR_SELF_HEAL_STARTED);
+        if (local->self_heal.need_metadata_self_heal && priv->metadata_self_heal) {
                 afr_sh_metadata_lock (frame, this);
         } else {
                 afr_sh_metadata_done (frame, this);
diff --git a/xlators/cluster/afr/src/afr-self-heal.h b/xlators/cluster/afr/src/afr-self-heal.h
index 7c9bc8111..5b211499a 100644
--- a/xlators/cluster/afr/src/afr-self-heal.h
+++ b/xlators/cluster/afr/src/afr-self-heal.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __AFR_SELF_HEAL_H__
@@ -21,6 +30,13 @@
 #define SIZE_GREATER(buf1,buf2) ((buf1)->ia_size > (buf2)->ia_size)
 
 int
+afr_sh_has_metadata_pending (dict_t *xattr, xlator_t *this);
+int
+afr_sh_has_entry_pending (dict_t *xattr, xlator_t *this);
+int
+afr_sh_has_data_pending (dict_t *xattr, xlator_t *this);
+
+int
 afr_self_heal_entry (call_frame_t *frame, xlator_t *this);
 
 int
@@ -29,15 +45,18 @@ afr_self_heal_data (call_frame_t *frame, xlator_t *this);
 int
 afr_self_heal_metadata (call_frame_t *frame, xlator_t *this);
 
-int
-afr_self_heal_get_source (xlator_t *this, afr_local_t *local, dict_t **xattr);
+void
+afr_self_heal_find_sources (xlator_t *this, afr_local_t *local, dict_t **xattr,
+                            afr_transaction_type transaction_type);
 
 int
 afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode);
 
+gf_boolean_t
+afr_is_fresh_read_child (int32_t *sources, int32_t child_count,
+                         int32_t read_child);
 int
 afr_lookup_select_read_child_by_txn_type (xlator_t *this, afr_local_t *local,
                                           dict_t **xattr,
-                                          afr_transaction_type txn_type,
-                                          uuid_t gfid);
+                                          afr_transaction_type txn_type);
 #endif /* __AFR_SELF_HEAL_H__ */
diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c
deleted file mode 100644
index 1b48a1bca..000000000
--- a/xlators/cluster/afr/src/afr-self-heald.c
+++ /dev/null
@@ -1,1787 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-#include "afr.h"
-#include "syncop.h"
-#include "afr-self-heald.h"
-#include "afr-self-heal-common.h"
-#include "protocol-common.h"
-#include "event-history.h"
-
-typedef enum {
-        STOP_CRAWL_ON_SINGLE_SUBVOL = 1
-} afr_crawl_flags_t;
-
-typedef enum {
-        HEAL = 1,
-        INFO,
-        STATISTICS_TO_BE_HEALED,
-} shd_crawl_op;
-
-typedef struct shd_dump {
-        dict_t   *dict;
-        xlator_t *this;
-        int      child;
-} shd_dump_t;
-
-typedef struct shd_event_ {
-        int     child;
-        char    *path;
-} shd_event_t;
-
-typedef struct shd_pos_ {
-        int     child;
-        xlator_t *this;
-        afr_child_pos_t pos;
-} shd_pos_t;
-
-typedef int
-(*afr_crawl_done_cbk_t)  (int ret, call_frame_t *sync_frame, void *crawl_data);
-
-void
-afr_start_crawl (xlator_t *this, int idx, afr_crawl_type_t crawl,
-                 process_entry_cbk_t process_entry, void *op_data,
-                 gf_boolean_t exclusive, int crawl_flags,
-                 afr_crawl_done_cbk_t crawl_done);
-
-static int
-_crawl_directory (fd_t *fd, loc_t *loc, afr_crawl_data_t *crawl_data);
-
-/* For calling straight through (e.g. already in a synctask). */
-int
-afr_find_child_position (xlator_t *this, int child, afr_child_pos_t *pos);
-
-/* For deferring through a new synctask. */
-int
-afr_syncop_find_child_position (void *data);
-
-static int
-_loc_assign_gfid_path (loc_t *loc)
-{
-        int  ret = -1;
-        char gfid_path[64] = {0};
-
-        if (loc->inode && !uuid_is_null (loc->inode->gfid)) {
-                ret = inode_path (loc->inode, NULL, (char**)&loc->path);
-        } else if (!uuid_is_null (loc->gfid)) {
-                snprintf (gfid_path, sizeof (gfid_path), "<gfid:%s>",
-                          uuid_utoa (loc->gfid));
-                loc->path = gf_strdup (gfid_path);
-                if (loc->path)
-                        ret = 0;
-        }
-        return ret;
-}
-
-void
-_destroy_crawl_event_data (void *data)
-{
-        shd_crawl_event_t        *crawl_event = NULL;
-
-        if (!data)
-                goto out;
-
-        crawl_event = (shd_crawl_event_t *)data;
-        GF_FREE (crawl_event->start_time_str);
-        GF_FREE (crawl_event->end_time_str);
-
-out:
-        return;
-}
-
-void
-_destroy_shd_event_data (void *data)
-{
-        shd_event_t             *event = NULL;
-        if (!data)
-                goto out;
-        event = (shd_event_t*)data;
-        GF_FREE (event->path);
-out:
-        return;
-}
-void
-shd_cleanup_event (void *event)
-{
-        shd_event_t *shd_event = event;
-
-        if (!shd_event)
-                goto out;
-        GF_FREE (shd_event->path);
-        GF_FREE (shd_event);
-out:
-        return;
-}
-
-int
-afr_get_local_child (afr_self_heald_t *shd, unsigned int child_count)
-{
-        int i = 0;
-        int ret = -1;
-        for (i = 0; i < child_count; i++) {
-                if (shd->pos[i] == AFR_POS_LOCAL) {
-                        ret = i;
-                        break;
-                }
-        }
-        return ret;
-}
-
-static int
-_build_index_loc (xlator_t *this, loc_t *loc, char *name, loc_t *parent)
-{
-        int             ret = 0;
-
-        uuid_copy (loc->pargfid, parent->inode->gfid);
-        loc->path = "";
-        loc->name = name;
-        loc->parent = inode_ref (parent->inode);
-        if (!loc->parent) {
-                loc->path = NULL;
-                loc_wipe (loc);
-                ret = -1;
-        }
-        return ret;
-}
-
-int
-_add_crawl_stats_to_dict (xlator_t *this, dict_t *output, int child,
-                          shd_crawl_event_t *shd_event, struct timeval *tv)
-{
-        int             ret = 0;
-        uint64_t        count = 0;
-        char            key[256] = {0};
-        int             xl_id = 0;
-        uint64_t        healed_count = 0;
-        uint64_t        split_brain_count = 0;
-        uint64_t        heal_failed_count = 0;
-        char            *start_time_str = NULL;
-        char            *end_time_str = NULL;
-        char            *crawl_type = NULL;
-        int             progress = -1;
-
-        healed_count = shd_event->healed_count;
-        split_brain_count = shd_event->split_brain_count;
-        heal_failed_count = shd_event->heal_failed_count;
-        start_time_str = shd_event->start_time_str;
-        end_time_str = shd_event->end_time_str;
-        crawl_type = shd_event->crawl_type;
-
-        if (!start_time_str) {
-                ret = -1;
-                goto out;
-        }
-
-
-        ret = dict_get_int32 (output, this->name, &xl_id);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "xl does not have id");
-                goto out;
-        }
-
-        snprintf (key, sizeof (key), "statistics-%d-%d-count", xl_id, child);
-        ret = dict_get_uint64 (output, key, &count);
-
-        snprintf (key, sizeof (key), "statistics_healed_cnt-%d-%d-%"PRIu64,
-                  xl_id, child, count);
-        ret = dict_set_uint64(output, key, healed_count);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not add statistics_"
-                        "healed_count to outout");
-                goto out;
-         }
-        snprintf (key, sizeof (key), "statistics_sb_cnt-%d-%d-%"PRIu64,
-                  xl_id, child, count);
-        ret = dict_set_uint64 (output, key, split_brain_count);
-         if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not add statistics_"
-                        "split_brain_count to outout");
-                goto out;
-        }
-        snprintf (key, sizeof (key), "statistics_crawl_type-%d-%d-%"PRIu64,
-                  xl_id, child, count);
-        ret = dict_set_dynstr (output, key, gf_strdup (crawl_type));
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not add statistics_"
-                        "crawl_type to output");
-                goto out;
-        }
-        snprintf (key, sizeof (key), "statistics_heal_failed_cnt-%d-%d-%"PRIu64,
-                  xl_id, child, count);
-        ret = dict_set_uint64 (output, key, heal_failed_count);
-         if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not add statistics_"
-                        "healed_failed_count to outout");
-                goto out;
-        }
-        snprintf (key, sizeof (key), "statistics_strt_time-%d-%d-%"PRIu64,
-                  xl_id, child, count);
-        ret = dict_set_dynstr (output, key, gf_strdup(start_time_str));
-
-         if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not add statistics_"
-                        "crawl_start_time to outout");
-                goto out;
-        }
-
-        snprintf (key, sizeof (key), "statistics_end_time-%d-%d-%"PRIu64,
-                  xl_id, child, count);
-
-        if (!end_time_str)
-                end_time_str = "Could not determine the end time";
-        ret = dict_set_dynstr (output, key, gf_strdup(end_time_str));
-         if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not add statistics_"
-                        "crawl_end_time to outout");
-                goto out;
-        }
-        snprintf (key, sizeof (key), "statistics_inprogress-%d-%d-%"PRIu64,
-                  xl_id, child, count);
-
-        if (shd_event->crawl_inprogress == _gf_true)
-                progress = 1;
-        else
-                progress = 0;
-
-        ret = dict_set_int32 (output, key, progress);
-         if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not add statistics_"
-                        "inprogress to outout");
-                goto out;
-        }
-
-         snprintf (key, sizeof (key), "statistics-%d-%d-count",xl_id, child);
-         ret = dict_set_uint64 (output, key, count + 1);
-         if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not increment the "
-                        "counter.");
-                goto out;
-         }
-out:
-        return ret;
-}
-
-int
-_add_path_to_dict (xlator_t *this, dict_t *output, int child, char *path,
-                   struct timeval *tv, gf_boolean_t dyn)
-{
-        //subkey not used for now
-        int             ret = -1;
-        uint64_t        count = 0;
-        char            key[256] = {0};
-        int             xl_id = 0;
-
-        ret = dict_get_int32 (output, this->name, &xl_id);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "xl does not have id");
-                goto out;
-        }
-
-        snprintf (key, sizeof (key), "%d-%d-count", xl_id, child);
-        ret = dict_get_uint64 (output, key, &count);
-
-        snprintf (key, sizeof (key), "%d-%d-%"PRIu64, xl_id, child, count);
-        if (dyn)
-                ret = dict_set_dynstr (output, key, path);
-        else
-                ret = dict_set_str (output, key, path);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "%s: Could not add to output",
-                        path);
-                goto out;
-        }
-
-        if (!tv)
-                goto inc_count;
-        snprintf (key, sizeof (key), "%d-%d-%"PRIu64"-time", xl_id,
-                  child, count);
-        ret = dict_set_uint32 (output, key, tv->tv_sec);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "%s: Could not set time",
-                        path);
-                goto out;
-        }
-
-inc_count:
-        snprintf (key, sizeof (key), "%d-%d-count", xl_id, child);
-        ret = dict_set_uint64 (output, key, count + 1);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Could not increment count");
-                goto out;
-        }
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-_get_path_from_gfid_loc (xlator_t *this, xlator_t *readdir_xl, loc_t *child,
-                         char **fpath, gf_boolean_t *missing)
-{
-        dict_t          *xattr = NULL;
-        char            *path = NULL;
-        int             ret = -1;
-
-        ret = syncop_getxattr (readdir_xl, child, &xattr, GFID_TO_PATH_KEY);
-        if (ret < 0) {
-                if ((errno == ENOENT) && missing)
-                        *missing = _gf_true;
-                goto out;
-        }
-        ret = dict_get_str (xattr, GFID_TO_PATH_KEY, &path);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to get path for "
-                        "gfid %s", uuid_utoa (child->gfid));
-                goto out;
-        }
-        path = gf_strdup (path);
-        if (!path) {
-                ret = -1;
-                goto out;
-        }
-        ret = 0;
-out:
-        if (!ret)
-                *fpath = path;
-        if (xattr)
-                dict_unref (xattr);
-        return ret;
-}
-
-int
-_add_event_to_dict (circular_buffer_t *cb, void *data)
-{
-        int               ret = 0;
-        shd_dump_t        *dump_data = NULL;
-        shd_event_t       *shd_event = NULL;
-
-        dump_data = data;
-        shd_event = cb->data;
-        if (shd_event->child != dump_data->child)
-                goto out;
-        ret = _add_path_to_dict (dump_data->this, dump_data->dict,
-                                 dump_data->child, shd_event->path, &cb->tv,
-                                 _gf_false);
-out:
-        return ret;
-}
-
-int
-_add_crawl_event_statistics_to_dict (circular_buffer_t *cb, void *data)
-{
-        int               ret = 0;
-        shd_dump_t        *dump_data = NULL;
-        shd_crawl_event_t *shd_event = NULL;
-
-        dump_data = data;
-        shd_event = cb->data;
-        ret = _add_crawl_stats_to_dict (dump_data->this, dump_data->dict,
-                                        dump_data->child, shd_event, &cb->tv);
-        return ret;
-}
-
-int
-_add_eh_to_dict (xlator_t *this, eh_t *eh, dict_t *dict, int child)
-{
-        shd_dump_t dump_data = {0};
-
-        dump_data.this = this;
-        dump_data.dict = dict;
-        dump_data.child = child;
-        eh_dump (eh, &dump_data, _add_event_to_dict);
-        return 0;
-}
-
-
-int
-_add_statistics_to_dict (xlator_t *this, dict_t *dict, int child)
-{
-        shd_dump_t              dump_data = {0};
-        afr_private_t           *priv  = NULL;
-        afr_self_heald_t        *shd = NULL;
-
-        priv = this->private;
-        shd = &priv->shd;
-
-        dump_data.this = this;
-        dump_data.dict = dict;
-        dump_data.child = child;
-        eh_dump (shd->statistics[child], &dump_data,
-                 _add_crawl_event_statistics_to_dict);
-        return 0;
-
-}
-
-void
-_remove_stale_index (xlator_t *this, xlator_t *readdir_xl,
-                     loc_t *parent, char *fname)
-{
-        int              ret = 0;
-        loc_t            index_loc = {0};
-
-        ret = _build_index_loc (this, &index_loc, fname, parent);
-        if (ret)
-                goto out;
-        gf_log (this->name, GF_LOG_DEBUG, "Removing stale index "
-                "for %s on %s", index_loc.name, readdir_xl->name);
-        ret = syncop_unlink (readdir_xl, &index_loc);
-        if(ret && (errno != ENOENT)) {
-                gf_log(this->name, GF_LOG_ERROR, "%s: Failed to remove index "
-                       "on %s - %s",index_loc.name, readdir_xl->name,
-                       strerror (errno));
-        }
-        index_loc.path = NULL;
-        loc_wipe (&index_loc);
-out:
-        return;
-}
-
-int
-_count_hard_links_under_base_indices_dir (xlator_t *this,
-                                           afr_crawl_data_t *crawl_data,
-                                           gf_dirent_t *entry, loc_t *childloc,
-                                           loc_t *parentloc, struct iatt *iattr)
-{
-        xlator_t                *readdir_xl = crawl_data->readdir_xl;
-        struct iatt             parent = {0};
-        int                     ret = 0;
-        dict_t                  *output = NULL;
-        int                     xl_id =  0;
-        char                    key[256] = {0};
-        int                     child  = -1;
-        uint64_t                     hardlinks = 0;
-
-        output = crawl_data->op_data;
-        child = crawl_data->child;
-
-        ret = syncop_lookup (readdir_xl, childloc, NULL, iattr, NULL, &parent);
-        if (ret)
-                goto out;
-
-        ret = dict_get_int32 (output, this->name, &xl_id);
-        if (ret)
-                goto out;
-
-        snprintf (key, sizeof (key), "%d-%d-hardlinks", xl_id, child);
-        ret =  dict_get_uint64 (output, key, &hardlinks);
-
-        /*Removing the count of base_entry under indices/base_indicies and
-         * entry under indices/xattrop */
-        hardlinks = hardlinks + iattr->ia_nlink - 2;
-        ret = dict_set_uint64 (output, key, hardlinks);
-        if (ret)
-                goto out;
-
-out:
-        return ret;
-}
-
-int
-_add_summary_to_dict (xlator_t *this, afr_crawl_data_t *crawl_data,
-                      gf_dirent_t *entry,
-                      loc_t *childloc, loc_t *parentloc, struct iatt *iattr)
-{
-        dict_t          *output = NULL;
-        xlator_t        *readdir_xl = NULL;
-        int             ret = -1;
-        char            *path = NULL;
-        gf_boolean_t    missing = _gf_false;
-        char            gfid_str[64] = {0};
-
-        if (uuid_is_null (childloc->gfid))
-                goto out;
-
-        output = crawl_data->op_data;
-        readdir_xl = crawl_data->readdir_xl;
-
-        ret = _get_path_from_gfid_loc (this, readdir_xl, childloc, &path,
-                                       &missing);
-        if (ret == 0) {
-                ret = _add_path_to_dict (this, output, crawl_data->child, path,
-                                         NULL, _gf_true);
-        } else if (missing) {
-                _remove_stale_index (this, readdir_xl, parentloc,
-                                     uuid_utoa_r (childloc->gfid, gfid_str));
-        }
-
-out:
-        if (ret && path)
-                GF_FREE (path);
-        return ret;
-}
-
-void
-_crawl_post_sh_action (xlator_t *this, loc_t *parent, loc_t *child,
-                       int32_t op_ret, int32_t op_errno, dict_t *xattr_rsp,
-                       afr_crawl_data_t *crawl_data)
-{
-        int                ret = 0;
-        afr_private_t      *priv = NULL;
-        afr_self_heald_t   *shd = NULL;
-        eh_t               *eh = NULL;
-        char               *path = NULL;
-        char               gfid_str[64] = {0};
-        shd_event_t        *event = NULL;
-        int32_t            sh_failed = 0;
-        gf_boolean_t       split_brain = 0;
-        int32_t            actual_sh_done = 0;
-        shd_crawl_event_t  **shd_crawl_event = NULL;
-
-        priv = this->private;
-        shd  = &priv->shd;
-        if (crawl_data->crawl == INDEX) {
-                if ((op_ret < 0) && (op_errno == ENOENT)) {
-                        _remove_stale_index (this, crawl_data->readdir_xl,
-                                             parent, uuid_utoa_r (child->gfid,
-                                                                  gfid_str));
-                        goto out;
-                }
-                ret = _get_path_from_gfid_loc (this, crawl_data->readdir_xl,
-                                               child, &path, NULL);
-                if (ret)
-                        goto out;
-        } else {
-                path = gf_strdup (child->path);
-                if (!path) {
-                        ret = -1;
-                        goto out;
-                }
-        }
-
-        if (xattr_rsp) {
-                ret = dict_get_int32 (xattr_rsp, "sh-failed", &sh_failed);
-                ret = dict_get_int32 (xattr_rsp, "actual-sh-done", &actual_sh_done);
-        }
-
-        shd_crawl_event = (shd_crawl_event_t**)(shd->crawl_events);
-
-        split_brain = afr_is_split_brain (this, child->inode);
-        if ((op_ret < 0 && op_errno == EIO) || split_brain) {
-                eh = shd->split_brain;
-                shd_crawl_event[crawl_data->child]->split_brain_count += 1;
-        } else if ((op_ret < 0) || sh_failed) {
-                eh = shd->heal_failed;
-                shd_crawl_event[crawl_data->child]->heal_failed_count += 1;
-        } else if (actual_sh_done == 1) {
-                eh = shd->healed;
-                shd_crawl_event[crawl_data->child]->healed_count += 1;
-        }
-        ret = -1;
-
-        if (eh != NULL) {
-                event = GF_CALLOC (1, sizeof (*event), gf_afr_mt_shd_event_t);
-                if (!event)
-                        goto out;
-                event->child = crawl_data->child;
-                event->path = path;
-
-                ret = eh_save_history (eh, event);
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_ERROR, "%s:Failed to save "
-                                "to event history, (%d, %s)", path, op_ret,
-                                strerror (op_errno));
-
-                        goto out;
-                }
-        } else {
-                gf_log (this->name, GF_LOG_DEBUG, "%s:Self heal already done ",
-                        path);
-
-        }
-        ret = 0;
-out:
-        if (ret && path)
-                GF_FREE (path);
-        return;
-}
-
-int
-_link_inode_update_loc (xlator_t *this, loc_t *loc, struct iatt *iattr)
-{
-        inode_t       *link_inode = NULL;
-        int           ret = -1;
-
-        link_inode = inode_link (loc->inode, NULL, NULL, iattr);
-        if (link_inode == NULL) {
-                gf_log (this->name, GF_LOG_ERROR, "inode link failed "
-                        "on the inode (%s)", uuid_utoa (iattr->ia_gfid));
-                goto out;
-        }
-        inode_unref (loc->inode);
-        loc->inode = link_inode;
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-_self_heal_entry (xlator_t *this, afr_crawl_data_t *crawl_data, gf_dirent_t *entry,
-                  loc_t *child, loc_t *parent, struct iatt *iattr)
-{
-        struct iatt      parentbuf = {0};
-        int              ret = 0;
-        dict_t           *xattr_rsp = NULL;
-        dict_t           *xattr_req = NULL;
-
-        xattr_req = dict_new ();
-        if (!xattr_req) {
-                errno = ENOMEM;
-                ret = -1;
-                goto out;
-        }
-
-        ret = dict_set_int32 (xattr_req, "allow-sh-for-running-transaction", 1);
-
-        gf_log (this->name, GF_LOG_DEBUG, "lookup %s", child->path);
-
-        ret = syncop_lookup (this, child, xattr_req,
-                             iattr, &xattr_rsp, &parentbuf);
-        _crawl_post_sh_action (this, parent, child, ret, errno, xattr_rsp,
-                               crawl_data);
-        if (xattr_rsp)
-                dict_unref (xattr_rsp);
-        if (ret == 0)
-                ret = _link_inode_update_loc (this, child, iattr);
-
-out:
-        if (xattr_req)
-                dict_unref(xattr_req);
-        return ret;
-}
-
-static int
-afr_crawl_done  (int ret, call_frame_t *sync_frame, void *data)
-{
-        GF_FREE (data);
-        STACK_DESTROY (sync_frame->root);
-        return 0;
-}
-
-void
-_do_self_heal_on_subvol (xlator_t *this, int child, afr_crawl_type_t crawl)
-{
-        afr_start_crawl (this, child, crawl, _self_heal_entry,
-                         NULL, _gf_true, STOP_CRAWL_ON_SINGLE_SUBVOL,
-                         afr_crawl_done);
-}
-
-gf_boolean_t
-_crawl_proceed (xlator_t *this, int child, int crawl_flags, char **reason)
-{
-        afr_private_t           *priv = NULL;
-        afr_self_heald_t        *shd = NULL;
-        gf_boolean_t            proceed = _gf_false;
-        char                    *msg = NULL;
-
-        priv = this->private;
-        shd  = &priv->shd;
-        if (!shd->enabled) {
-                msg = "Self-heal daemon is not enabled";
-                gf_log (this->name, GF_LOG_DEBUG, "%s", msg);
-                goto out;
-        }
-        if (!priv->child_up[child]) {
-                gf_log (this->name, GF_LOG_DEBUG, "Stopping crawl for %s , "
-                        "subvol went down", priv->children[child]->name);
-                msg = "Brick is Not connected";
-                goto out;
-        }
-
-        if (crawl_flags & STOP_CRAWL_ON_SINGLE_SUBVOL) {
-                if (afr_up_children_count (priv->child_up,
-                                           priv->child_count) < 2) {
-                        gf_log (this->name, GF_LOG_DEBUG, "Stopping crawl as "
-                                "< 2 children are up");
-                        msg = "< 2 bricks in replica are running";
-                        goto out;
-                }
-        }
-        proceed = _gf_true;
-out:
-        if (reason)
-                *reason = msg;
-        return proceed;
-}
-
-int
-_do_crawl_op_on_local_subvols (xlator_t *this, afr_crawl_type_t crawl,
-                               shd_crawl_op op, dict_t *output)
-{
-        afr_private_t       *priv = NULL;
-        char                *status = NULL;
-        char                *subkey = NULL;
-        char                key[256] = {0};
-        shd_pos_t           pos_data = {0};
-        int                 op_ret = -1;
-        int                 xl_id = -1;
-        int                 i = 0;
-        int                 ret = 0;
-        int                 crawl_flags = 0;
-
-        priv = this->private;
-        if (op == HEAL)
-                crawl_flags |= STOP_CRAWL_ON_SINGLE_SUBVOL;
-
-        if (output) {
-                ret = dict_get_int32 (output, this->name, &xl_id);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "Invalid input, "
-                                "translator-id is not available");
-                        goto out;
-                }
-        }
-        pos_data.this = this;
-        subkey = "status";
-        for (i = 0; i < priv->child_count; i++) {
-                if (_crawl_proceed (this, i, crawl_flags, &status)) {
-                        pos_data.child = i;
-                        /*
-                         * We're already in a synctask in this case, so we
-                         * don't need to defer through a second (and in fact
-                         * that can cause deadlock).  Just call straight
-                         * through instead.
-                         */
-                        ret = afr_find_child_position(pos_data.this,
-                                                      pos_data.child,
-                                                      &pos_data.pos);
-                        if (ret) {
-                                status = "Not able to find brick location";
-                        } else if (pos_data.pos == AFR_POS_REMOTE) {
-                                status = "brick is remote";
-                        } else {
-                                op_ret = 0;
-                                if (op == HEAL) {
-                                        status = "Started self-heal";
-                                        _do_self_heal_on_subvol (this, i,
-                                                                 crawl);
-                                } else if (output && (op == INFO)) {
-                                        status = "";
-                                        afr_start_crawl (this, i, INDEX,
-                                                         _add_summary_to_dict,
-                                                         output, _gf_false, 0,
-                                                         NULL);
-                                } else if (output &&
-                                           (op == STATISTICS_TO_BE_HEALED)) {
-                                            status = "";
-                                            afr_start_crawl (this, i,
-                                                             INDEX_TO_BE_HEALED,
-                                       _count_hard_links_under_base_indices_dir,
-                                                             output, _gf_false,
-                                                             0, NULL);
-                                }
-                        }
-                        if (output) {
-                                snprintf (key, sizeof (key), "%d-%d-%s", xl_id,
-                                          i, subkey);
-                                ret = dict_set_str (output, key, status);
-                        }
-                        if (!op_ret && (crawl == FULL))
-                                break;
-                }
-                if (output) {
-                        snprintf (key, sizeof (key), "%d-%d-%s", xl_id, i,
-                                  subkey);
-                        ret = dict_set_str (output, key, status);
-                }
-        }
-out:
-        return op_ret;
-}
-
-int
-_do_self_heal_on_local_subvols (xlator_t *this, afr_crawl_type_t crawl,
-                                dict_t *output)
-{
-        return _do_crawl_op_on_local_subvols (this, crawl, HEAL, output);
-}
-
-int
-_get_index_summary_on_local_subvols (xlator_t *this, dict_t *output)
-{
-        return _do_crawl_op_on_local_subvols (this, INDEX, INFO, output);
-}
-
-void
-afr_fill_completed_crawl_statistics_to_dict (xlator_t *this, dict_t *dict)
-{
-        afr_private_t           *priv  = NULL;
-        afr_self_heald_t        *shd = NULL;
-        int                     i = 0;
-        priv = this->private;
-        shd= &priv->shd;
-        for (i = 0; i < priv->child_count; i++) {
-                if (shd->pos[i] != AFR_POS_LOCAL)
-                        continue;
-                _add_statistics_to_dict (this, dict, i);
-        }
-
-        return ;
-}
-
-static void
-reset_crawl_event (shd_crawl_event_t *crawl_event)
-{
-    crawl_event->healed_count = 0;
-    crawl_event->split_brain_count = 0;
-    crawl_event->heal_failed_count = 0;
-    GF_FREE (crawl_event->start_time_str);
-    crawl_event->start_time_str = NULL;
-    crawl_event->end_time_str = NULL;
-    crawl_event->crawl_type = NULL;
-    crawl_event->crawl_inprogress = _gf_false;
-    return;
-}
-
-static void
-afr_copy_crawl_event_struct (shd_crawl_event_t *src, shd_crawl_event_t *dst)
-{
-        dst->healed_count = src->healed_count;
-        dst->split_brain_count = src->split_brain_count;
-        dst->heal_failed_count = src->heal_failed_count;
-        dst->start_time_str = gf_strdup (src->start_time_str);
-        dst->end_time_str = "Crawl is already in progress";
-        dst->crawl_type = src->crawl_type;
-        dst->crawl_inprogress = _gf_true;
-        return;
-}
-
-static int
-afr_fill_crawl_statistics_of_running_crawl(xlator_t *this, dict_t *dict)
-{
-        shd_crawl_event_t       *evnt = NULL;
-        int                     ret = 0;
-        afr_private_t           *priv = NULL;
-        afr_self_heald_t        *shd = NULL;
-        int                     i = 0;
-        priv = this->private;
-        shd = &priv->shd;
-
-        evnt = GF_CALLOC (1, sizeof (shd_crawl_event_t),
-                          gf_afr_mt_shd_crawl_event_t);
-        if (!evnt) {
-                ret = -1;
-                goto out;
-        }
-        LOCK (&priv->lock);
-        {
-                for (i = 0; i < priv->child_count; i++) {
-                        if (shd->pos[i] != AFR_POS_LOCAL)
-                                continue;
-
-                        reset_crawl_event (evnt);
-
-                        if (!shd->crawl_events[i]) {
-                                continue;
-                        }
-
-                        afr_copy_crawl_event_struct (shd->crawl_events[i],
-                                                     evnt);
-                        _add_crawl_stats_to_dict (this, dict, i, evnt, NULL);
-
-                }
-        }
-        UNLOCK (&priv->lock);
-        reset_crawl_event (evnt);
-        GF_FREE (evnt);
-
-out:
-        return ret;
-}
-
-static int
-_add_local_subvols_crawl_statistics_to_dict (xlator_t *this, dict_t *dict)
-{
-        int ret = 0;
-        afr_fill_completed_crawl_statistics_to_dict (this, dict);
-        ret = afr_fill_crawl_statistics_of_running_crawl (this, dict);
-        return ret;
-}
-int
-_add_local_subvols_eh_to_dict (xlator_t *this, eh_t *eh, dict_t *dict)
-{
-        afr_private_t           *priv = NULL;
-        afr_self_heald_t        *shd = NULL;
-        int                     i = 0;
-
-        priv = this->private;
-        shd = &priv->shd;
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (shd->pos[i] != AFR_POS_LOCAL)
-                        continue;
-                _add_eh_to_dict (this, eh, dict, i);
-        }
-        return 0;
-}
-
-int
-afr_xl_op (xlator_t *this, dict_t *input, dict_t *output)
-{
-        gf_xl_afr_op_t   op = GF_AFR_OP_INVALID;
-        int              ret = 0;
-        afr_private_t    *priv = NULL;
-        afr_self_heald_t *shd = NULL;
-        int              xl_id = 0;
-
-        priv = this->private;
-        shd = &priv->shd;
-
-        ret = dict_get_int32 (input, "xl-op", (int32_t*)&op);
-        if (ret)
-                goto out;
-        ret = dict_get_int32 (input, this->name, &xl_id);
-        if (ret)
-                goto out;
-        ret = dict_set_int32 (output, this->name, xl_id);
-        if (ret)
-                goto out;
-        switch (op) {
-        case GF_AFR_OP_HEAL_INDEX:
-                ret = _do_self_heal_on_local_subvols (this, INDEX, output);
-                break;
-        case GF_AFR_OP_HEAL_FULL:
-                ret = _do_self_heal_on_local_subvols (this, FULL, output);
-                break;
-        case GF_AFR_OP_INDEX_SUMMARY:
-                (void)_get_index_summary_on_local_subvols (this, output);
-                ret = 0;
-                break;
-        case GF_AFR_OP_HEALED_FILES:
-                ret = _add_local_subvols_eh_to_dict (this, shd->healed, output);
-                break;
-        case GF_AFR_OP_HEAL_FAILED_FILES:
-                ret = _add_local_subvols_eh_to_dict (this, shd->heal_failed,
-                                                   output);
-                break;
-        case GF_AFR_OP_SPLIT_BRAIN_FILES:
-                ret = _add_local_subvols_eh_to_dict (this, shd->split_brain,
-                                                   output);
-                break;
-        case GF_AFR_OP_STATISTICS:
-                ret = _add_local_subvols_crawl_statistics_to_dict (this, output);
-                break;
-        case GF_AFR_OP_STATISTICS_HEAL_COUNT:
-        case GF_AFR_OP_STATISTICS_HEAL_COUNT_PER_REPLICA:
-                ret = _do_crawl_op_on_local_subvols (this, INDEX_TO_BE_HEALED,
-                                                     STATISTICS_TO_BE_HEALED,
-                                                     output);
-                break;
-        default:
-                gf_log (this->name, GF_LOG_ERROR, "Unknown set op %d", op);
-                break;
-        }
-out:
-        dict_del (output, this->name);
-        return ret;
-}
-
-void
-afr_poll_self_heal (void *data)
-{
-        afr_private_t    *priv = NULL;
-        afr_self_heald_t *shd = NULL;
-        struct timespec  timeout = {0};
-        xlator_t         *this = NULL;
-        long             child = (long)data;
-        gf_timer_t       *old_timer = NULL;
-        gf_timer_t       *new_timer = NULL;
-        shd_pos_t        pos_data = {0};
-        int              ret = 0;
-
-        this = THIS;
-        priv = this->private;
-        shd = &priv->shd;
-
-        if (shd->pos[child] == AFR_POS_UNKNOWN) {
-                pos_data.this = this;
-                pos_data.child = child;
-                ret = synctask_new (this->ctx->env,
-                                    afr_syncop_find_child_position,
-                                    NULL, NULL, &pos_data);
-                if (!ret)
-                        shd->pos[child] = pos_data.pos;
-        }
-        if (shd->enabled && (shd->pos[child] == AFR_POS_LOCAL))
-                _do_self_heal_on_subvol (this, child, INDEX);
-        timeout.tv_sec = shd->timeout;
-        timeout.tv_nsec = 0;
-        //notify and previous timer should be synchronized.
-        LOCK (&priv->lock);
-        {
-                old_timer = shd->timer[child];
-                if (shd->pos[child] == AFR_POS_REMOTE)
-                        goto unlock;
-                shd->timer[child] = gf_timer_call_after (this->ctx, timeout,
-                                                         afr_poll_self_heal,
-                                                         data);
-                new_timer = shd->timer[child];
-        }
-unlock:
-        UNLOCK (&priv->lock);
-
-        if (old_timer)
-                gf_timer_call_cancel (this->ctx, old_timer);
-        if (!new_timer && (shd->pos[child] != AFR_POS_REMOTE)) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "Could not create self-heal polling timer for %s",
-                        priv->children[child]->name);
-        }
-        return;
-}
-
-static int
-afr_handle_child_up  (int ret, call_frame_t *sync_frame, void *data)
-{
-        afr_self_heald_t *shd = NULL;
-        shd_pos_t        *pos_data = data;
-        afr_private_t    *priv = NULL;
-
-        if (ret)
-                goto out;
-
-        priv = pos_data->this->private;
-        shd = &priv->shd;
-        shd->pos[pos_data->child] = pos_data->pos;
-        if (pos_data->pos != AFR_POS_REMOTE)
-                afr_poll_self_heal ((void*)(long)pos_data->child);
-        _do_self_heal_on_local_subvols (THIS, INDEX, NULL);
-out:
-        GF_FREE (data);
-        return 0;
-}
-
-void
-afr_proactive_self_heal (void *data)
-{
-        xlator_t         *this = NULL;
-        long             child = (long)data;
-        shd_pos_t        *pos_data = NULL;
-        int              ret = 0;
-
-        this = THIS;
-
-        //Position of brick could have changed and it could be local now.
-        //Compute the position again
-        pos_data = GF_CALLOC (1, sizeof (*pos_data), gf_afr_mt_pos_data_t);
-        if (!pos_data)
-                goto out;
-        pos_data->this = this;
-        pos_data->child = child;
-        ret = synctask_new (this->ctx->env, afr_syncop_find_child_position,
-                            afr_handle_child_up, NULL, pos_data);
-        if (ret)
-                goto out;
-out:
-        return;
-}
-
-static int
-get_pathinfo_host (char *pathinfo, char *hostname, size_t size)
-{
-        char    *start = NULL;
-        char    *end = NULL;
-        int     ret  = -1;
-        int     i    = 0;
-
-        if (!pathinfo)
-                goto out;
-
-        start = strchr (pathinfo, ':');
-        if (!start)
-                goto out;
-        end = strrchr (pathinfo, ':');
-        if (start == end)
-                goto out;
-
-        memset (hostname, 0, size);
-        i = 0;
-        while (++start != end)
-                hostname[i++] = *start;
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-afr_local_pathinfo (char *pathinfo, gf_boolean_t *local)
-{
-        int             ret   = 0;
-        char            pathinfohost[1024] = {0};
-        char            localhost[1024] = {0};
-        xlator_t        *this = THIS;
-
-        *local = _gf_false;
-        ret = get_pathinfo_host (pathinfo, pathinfohost, sizeof (pathinfohost));
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Invalid pathinfo: %s",
-                        pathinfo);
-                goto out;
-        }
-
-        ret = gethostname (localhost, sizeof (localhost));
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "gethostname() failed, "
-                        "reason: %s", strerror (errno));
-                goto out;
-        }
-
-        if (!strcmp (localhost, pathinfohost))
-                *local = _gf_true;
-out:
-        return ret;
-}
-
-int
-afr_crawl_build_start_loc (xlator_t *this, afr_crawl_data_t *crawl_data,
-                           loc_t *dirloc)
-{
-        afr_private_t *priv = NULL;
-        dict_t        *xattr = NULL;
-        void          *index_gfid = NULL;
-        void          *base_indices_holder_vgfid = NULL;
-        loc_t         rootloc = {0};
-        struct iatt   iattr = {0};
-        struct iatt   parent = {0};
-        int           ret = 0;
-        xlator_t      *readdir_xl = crawl_data->readdir_xl;
-
-        priv = this->private;
-        if (crawl_data->crawl == FULL) {
-                afr_build_root_loc (this, dirloc);
-        } else if (crawl_data->crawl == INDEX) {
-                afr_build_root_loc (this, &rootloc);
-                ret = syncop_getxattr (readdir_xl, &rootloc, &xattr,
-                                       GF_XATTROP_INDEX_GFID);
-                if (ret < 0)
-                        goto out;
-                ret = dict_get_ptr (xattr, GF_XATTROP_INDEX_GFID, &index_gfid);
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_ERROR, "failed to get index "
-                                "dir gfid on %s", readdir_xl->name);
-                        goto out;
-                }
-                if (!index_gfid) {
-                        gf_log (this->name, GF_LOG_ERROR, "index gfid empty "
-                                "on %s", readdir_xl->name);
-                        ret = -1;
-                        goto out;
-                }
-                uuid_copy (dirloc->gfid, index_gfid);
-                dirloc->path = "";
-                dirloc->inode = inode_new (priv->root_inode->table);
-                ret = syncop_lookup (readdir_xl, dirloc, NULL,
-                                     &iattr, NULL, &parent);
-                if (ret < 0) {
-                        if (errno != ENOENT) {
-                                gf_log (this->name, GF_LOG_ERROR, "lookup "
-                                        "failed on index dir on %s - (%s)",
-                                        readdir_xl->name, strerror (errno));
-                        }
-                        goto out;
-                }
-                ret = _link_inode_update_loc (this, dirloc, &iattr);
-                if (ret)
-                        goto out;
-        } else if (crawl_data->crawl == INDEX_TO_BE_HEALED) {
-                afr_build_root_loc (this, &rootloc);
-                ret = syncop_getxattr (readdir_xl, &rootloc, &xattr,
-                                       GF_BASE_INDICES_HOLDER_GFID);
-                if (ret < 0)
-                        goto out;
-                ret = dict_get_ptr (xattr, GF_BASE_INDICES_HOLDER_GFID,
-                                    &base_indices_holder_vgfid);
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_ERROR, "index gfid empty "
-                                "on %s", readdir_xl->name);
-                        ret = -1;
-                        goto out;
-                }
-                if (!base_indices_holder_vgfid) {
-                        gf_log (this->name, GF_LOG_ERROR, "Base indices holder"
-                                "virtual gfid is null on %s", readdir_xl->name);
-                        ret = -1;
-                        goto out;
-                }
-                uuid_copy (dirloc->gfid,  base_indices_holder_vgfid);
-                dirloc->path = "";
-                dirloc->inode = inode_new (priv->root_inode->table);
-                ret = syncop_lookup (readdir_xl, dirloc, NULL, &iattr, NULL,
-                                     &parent);
-                if (ret < 0) {
-                        if (errno != ENOENT) {
-                                gf_log (this->name, GF_LOG_ERROR, "lookup "
-                                        "failed for base_indices_holder dir"
-                                        " on %s - (%s)", readdir_xl->name,
-                                        strerror (errno));
-
-                        } else {
-                                gf_log (this->name, GF_LOG_ERROR, "base_indices"
-                                        "_holder is not yet created.");
-                        }
-                        goto out;
-                }
-                ret = _link_inode_update_loc (this, dirloc, &iattr);
-                if (ret)
-                        goto out;
-        }
-        ret = 0;
-out:
-        if (xattr)
-                dict_unref (xattr);
-        loc_wipe (&rootloc);
-        return ret;
-}
-
-int
-afr_crawl_opendir (xlator_t *this, afr_crawl_data_t *crawl_data, fd_t **dirfd,
-                   loc_t *dirloc)
-{
-        fd_t          *fd   = NULL;
-        int           ret = 0;
-
-        if (crawl_data->crawl == FULL) {
-                fd = fd_create (dirloc->inode, crawl_data->pid);
-                if (!fd) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "Failed to create fd for %s", dirloc->path);
-                        ret = -1;
-                        goto out;
-                }
-
-                ret = syncop_opendir (crawl_data->readdir_xl, dirloc, fd);
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "opendir failed on %s", dirloc->path);
-                        goto out;
-                }
-        } else {
-                fd = fd_anonymous (dirloc->inode);
-        }
-        ret = 0;
-out:
-        if (!ret)
-                *dirfd = fd;
-        return ret;
-}
-
-xlator_t*
-afr_crawl_readdir_xl_get (xlator_t *this, afr_crawl_data_t *crawl_data)
-{
-        afr_private_t *priv = this->private;
-
-        if (crawl_data->crawl == FULL) {
-                return this;
-        } else {
-                return priv->children[crawl_data->child];
-        }
-        return NULL;
-}
-
-int
-afr_crawl_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent,
-                           gf_dirent_t *entry, afr_crawl_data_t *crawl_data)
-{
-        int           ret = -1;
-        afr_private_t *priv = NULL;
-
-        priv = this->private;
-        if (crawl_data->crawl == FULL) {
-                ret = afr_build_child_loc (this, child, parent, entry->d_name);
-        } else if (crawl_data->crawl == INDEX_TO_BE_HEALED) {
-                ret = _build_index_loc (this, child, entry->d_name, parent);
-                if (ret)
-                        goto out;
-                child->inode = inode_new (priv->root_inode->table);
-                if (!child->inode) {
-                        ret = -1;
-                        goto out;
-                }
-                child->path = NULL;
-        } else {
-                child->inode = inode_new (priv->root_inode->table);
-                if (!child->inode)
-                        goto out;
-                uuid_parse (entry->d_name, child->gfid);
-                ret = _loc_assign_gfid_path (child);
-        }
-out:
-        return ret;
-}
-
-static int
-_process_entries (xlator_t *this, loc_t *parentloc, gf_dirent_t *entries,
-                  off_t *offset, afr_crawl_data_t *crawl_data)
-{
-        gf_dirent_t      *entry = NULL;
-        gf_dirent_t      *tmp = NULL;
-        int              ret = 0;
-        loc_t            entry_loc = {0};
-        fd_t             *fd = NULL;
-        struct iatt      iattr = {0};
-
-        list_for_each_entry_safe (entry, tmp, &entries->list, list) {
-                if (!_crawl_proceed (this, crawl_data->child,
-                                     crawl_data->crawl_flags, NULL)) {
-                        ret = -1;
-                        goto out;
-                }
-                *offset = entry->d_off;
-                if (IS_ENTRY_CWD (entry->d_name) ||
-                    IS_ENTRY_PARENT (entry->d_name))
-                        continue;
-                if ((crawl_data->crawl == FULL) &&
-                     uuid_is_null (entry->d_stat.ia_gfid)) {
-                        gf_log (this->name, GF_LOG_WARNING, "%s/%s: No "
-                                "gfid present skipping",
-                                parentloc->path, entry->d_name);
-                        continue;
-                }
-
-                loc_wipe (&entry_loc);
-                ret = afr_crawl_build_child_loc (this, &entry_loc, parentloc,
-                                                 entry, crawl_data);
-                if (ret)
-                        goto out;
-
-                ret = crawl_data->process_entry (this, crawl_data, entry,
-                                                 &entry_loc, parentloc, &iattr);
-
-                if (crawl_data->crawl == INDEX_TO_BE_HEALED && ret) {
-                       goto out;
-                } else if (ret) {
-                        continue;
-                }
-
-                if ((crawl_data->crawl == INDEX) ||
-                    (crawl_data->crawl == INDEX_TO_BE_HEALED))
-                        continue;
-
-                if (!IA_ISDIR (iattr.ia_type))
-                        continue;
-                fd = NULL;
-                ret = afr_crawl_opendir (this, crawl_data, &fd, &entry_loc);
-                if (ret)
-                        continue;
-                ret = _crawl_directory (fd, &entry_loc, crawl_data);
-                if (fd)
-                        fd_unref (fd);
-        }
-        ret = 0;
-out:
-        if ((crawl_data->crawl == INDEX_TO_BE_HEALED)  && ret) {
-                gf_log (this->name, GF_LOG_ERROR,"Failed to get the hardlink "
-                        "count");
-        }
-        loc_wipe (&entry_loc);
-        return ret;
-}
-
-static int
-_crawl_directory (fd_t *fd, loc_t *loc, afr_crawl_data_t *crawl_data)
-{
-        xlator_t        *this = NULL;
-        off_t           offset   = 0;
-        gf_dirent_t     entries;
-        int             ret = 0;
-        gf_boolean_t    free_entries = _gf_false;
-        xlator_t        *readdir_xl = crawl_data->readdir_xl;
-
-        INIT_LIST_HEAD (&entries.list);
-        this = THIS;
-
-        GF_ASSERT (loc->inode);
-
-        if (crawl_data->crawl == FULL)
-                gf_log (this->name, GF_LOG_DEBUG, "crawling %s", loc->path);
-        else
-                gf_log (this->name, GF_LOG_DEBUG, "crawling INDEX %s",
-                        uuid_utoa (loc->gfid));
-
-        while (1) {
-                if (crawl_data->crawl == FULL)
-                        ret = syncop_readdirp (readdir_xl, fd, 131072, offset,
-                                               NULL, &entries);
-                else
-                        ret = syncop_readdir (readdir_xl, fd, 131072, offset,
-                                              &entries);
-                if (ret <= 0)
-                        break;
-                ret = 0;
-                free_entries = _gf_true;
-
-                if (!_crawl_proceed (this, crawl_data->child,
-                                     crawl_data->crawl_flags, NULL)) {
-                        ret = -1;
-                        goto out;
-                }
-                if (list_empty (&entries.list))
-                        goto out;
-
-                ret = _process_entries (this, loc, &entries, &offset,
-                                        crawl_data);
-                if ((ret < 0) && (crawl_data->crawl == INDEX_TO_BE_HEALED)) {
-                        goto out;
-                }
-                gf_dirent_free (&entries);
-                free_entries = _gf_false;
-        }
-        ret = 0;
-out:
-        if (free_entries)
-                gf_dirent_free (&entries);
-        return ret;
-}
-
-static char*
-position_str_get (afr_child_pos_t pos)
-{
-        switch (pos) {
-        case AFR_POS_UNKNOWN:
-                return "unknown";
-        case AFR_POS_LOCAL:
-                return "local";
-        case AFR_POS_REMOTE:
-                return "remote";
-        }
-        return NULL;
-}
-
-int
-afr_find_child_position (xlator_t *this, int child, afr_child_pos_t *pos)
-{
-        afr_private_t    *priv = NULL;
-        afr_self_heald_t *shd  = NULL;
-        dict_t           *xattr_rsp = NULL;
-        loc_t            loc = {0};
-        int              ret = 0;
-        char             *node_uuid = NULL;
-
-        priv = this->private;
-        shd  = &priv->shd;
-
-        afr_build_root_loc (this, &loc);
-
-        ret = syncop_getxattr (priv->children[child], &loc, &xattr_rsp,
-                               GF_XATTR_NODE_UUID_KEY);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR, "getxattr failed on %s - "
-                        "(%s)", priv->children[child]->name, strerror (errno));
-                goto out;
-        }
-
-        ret = dict_get_str (xattr_rsp, GF_XATTR_NODE_UUID_KEY, &node_uuid);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "node-uuid key not found on "
-                        "child %s", priv->children[child]->name);
-                goto out;
-        }
-
-        if (!strcmp (node_uuid, shd->node_uuid))
-                *pos = AFR_POS_LOCAL;
-        else
-                *pos = AFR_POS_REMOTE;
-
-        gf_log (this->name, GF_LOG_DEBUG, "child %s is %s",
-                priv->children[child]->name, position_str_get (*pos));
-out:
-        if (ret)
-                *pos = AFR_POS_UNKNOWN;
-        loc_wipe (&loc);
-        return ret;
-}
-
-int
-afr_syncop_find_child_position (void *data)
-{
-        shd_pos_t *pos_data = data;
-        int       ret = 0;
-
-        ret = afr_find_child_position (pos_data->this, pos_data->child,
-                                       &pos_data->pos);
-        return ret;
-}
-
-static int
-afr_dir_crawl (void *data)
-{
-        xlator_t            *this = NULL;
-        int                 ret = -1;
-        xlator_t            *readdir_xl = NULL;
-        fd_t                *fd = NULL;
-        loc_t               dirloc = {0};
-        afr_crawl_data_t    *crawl_data = data;
-
-        this = THIS;
-
-        if (!_crawl_proceed (this, crawl_data->child, crawl_data->crawl_flags,
-                             NULL))
-                goto out;
-
-        readdir_xl = afr_crawl_readdir_xl_get (this, crawl_data);
-        if (!readdir_xl)
-                goto out;
-        crawl_data->readdir_xl = readdir_xl;
-
-        ret = afr_crawl_build_start_loc (this, crawl_data, &dirloc);
-        if (ret)
-                goto out;
-
-        ret = afr_crawl_opendir (this, crawl_data, &fd, &dirloc);
-        if (ret) {
-                if (crawl_data->crawl == INDEX_TO_BE_HEALED) {
-                        gf_log (this->name, GF_LOG_ERROR, "Failed to open base_"
-                                "indices_holder");
-                }
-                goto out;
-        }
-
-        ret = _crawl_directory (fd, &dirloc, crawl_data);
-        if (ret)
-                gf_log (this->name, GF_LOG_ERROR, "Crawl failed on %s",
-                        readdir_xl->name);
-        else
-                gf_log (this->name, GF_LOG_DEBUG, "Crawl completed "
-                        "on %s", readdir_xl->name);
-        if (crawl_data->crawl == INDEX)
-                dirloc.path = NULL;
-out:
-        if (fd)
-                fd_unref (fd);
-        if ((crawl_data->crawl == INDEX) ||
-            (crawl_data->crawl == INDEX_TO_BE_HEALED ))
-                dirloc.path = NULL;
-        loc_wipe (&dirloc);
-        return ret;
-}
-
-char *
-get_crawl_type_in_string (afr_crawl_type_t crawl)
-{
-        char    *index = "INDEX";
-        char    *full  = "FULL";
-        char    *crawl_type = NULL;
-
-        if (crawl == INDEX){
-                crawl_type = index;
-        } else if (crawl == FULL) {
-                crawl_type = full;
-        }
-
-        return  crawl_type;
-}
-
-static int
-afr_allocate_crawl_event (xlator_t *this, int child, afr_crawl_type_t crawl)
-{
-        afr_private_t           *priv = NULL;
-        afr_self_heald_t        *shd = NULL;
-        int                     ret = 0;
-        shd_crawl_event_t       *crawl_event = NULL;
-        time_t                  get_time = 0;
-
-        priv = this->private;
-        shd = &priv->shd;
-
-        crawl_event = GF_CALLOC (sizeof (shd_crawl_event_t), 1,
-                                 gf_afr_mt_shd_crawl_event_t);
-        if (!crawl_event) {
-                ret = -1;
-                goto out;
-        }
-
-        get_time =  time(NULL);
-        if (get_time == ((time_t)-1)) {
-                 ret = -1;
-                goto out;
-        }
-
-        crawl_event->start_time_str = gf_strdup (ctime(&get_time));
-
-        crawl_event->crawl_type = get_crawl_type_in_string (crawl);
-        if (!crawl_event->crawl_type) {
-                ret = -1;
-                goto out;
-        }
-        LOCK (&priv->lock);
-        {
-                shd->crawl_events[child] = crawl_event;
-        }
-        UNLOCK (&priv->lock);
-        ret = 0;
-out:
-        return ret;
-
-}
-
-static int
-afr_put_crawl_event_in_eh (xlator_t *this, int child)
-{
-        afr_private_t           *priv = NULL;
-        afr_self_heald_t        *shd = NULL;
-        int                     ret = 0;
-        time_t                  get_time = 0;
-        shd_crawl_event_t       **crawl_event = NULL;
-
-        priv = this->private;
-        shd = &priv->shd;
-
-        get_time = time(NULL);
-        if (get_time == ((time_t)-1)) {
-                ret = -1;
-                goto out;
-        }
-        crawl_event = (shd_crawl_event_t**)shd->crawl_events;
-        LOCK (&priv->lock);
-        {
-                crawl_event[child]->end_time_str = gf_strdup (ctime(&get_time));
-                ret = eh_save_history (shd->statistics[child],
-                                       crawl_event[child]);
-                crawl_event[child] = NULL;
-        }
-        UNLOCK (&priv->lock);
-out:
-        return ret;
-}
-
-static int
-afr_dir_exclusive_crawl (void *data)
-{
-        afr_private_t    *priv = NULL;
-        afr_self_heald_t *shd = NULL;
-        gf_boolean_t     crawl = _gf_false;
-        int              ret = 0;
-        int              child = -1;
-        xlator_t         *this = NULL;
-        afr_crawl_data_t *crawl_data = data;
-
-        this = THIS;
-        priv = this->private;
-        shd = &priv->shd;
-        child = crawl_data->child;
-
-        LOCK (&priv->lock);
-        {
-                if (shd->inprogress[child]) {
-                        if (shd->pending[child] != FULL)
-                                shd->pending[child] = crawl_data->crawl;
-                } else {
-                        shd->inprogress[child] = _gf_true;
-                        crawl = _gf_true;
-                }
-        }
-        UNLOCK (&priv->lock);
-
-        if (!crawl) {
-                gf_log (this->name, GF_LOG_INFO, "Another crawl is in progress "
-                        "for %s", priv->children[child]->name);
-                goto out;
-        }
-
-        do {
-                ret = afr_allocate_crawl_event (this, child, crawl_data->crawl);
-                if (ret)
-                        goto out;
-                afr_dir_crawl (data);
-
-                ret = afr_put_crawl_event_in_eh (this, child);
-                if (ret < 0)
-                        goto out;
-
-                LOCK (&priv->lock);
-                {
-                        if (shd->pending[child] != NONE) {
-                                crawl_data->crawl = shd->pending[child];
-                                shd->pending[child] = NONE;
-                        } else {
-                                shd->inprogress[child] = _gf_false;
-                                crawl = _gf_false;
-                        }
-                }
-                UNLOCK (&priv->lock);
-        } while (crawl);
-out:
-        return ret;
-}
-
-void
-afr_start_crawl (xlator_t *this, int idx, afr_crawl_type_t crawl,
-                 process_entry_cbk_t process_entry, void *op_data,
-                 gf_boolean_t exclusive, int crawl_flags,
-                 afr_crawl_done_cbk_t crawl_done)
-{
-        afr_private_t              *priv = NULL;
-        call_frame_t               *frame = NULL;
-        afr_crawl_data_t           *crawl_data = NULL;
-        int                        ret = 0;
-        int (*crawler) (void*) = NULL;
-
-        priv = this->private;
-
-        frame = create_frame (this, this->ctx->pool);
-        if (!frame)
-                goto out;
-
-        afr_set_lk_owner (frame, this, frame->root);
-        afr_set_low_priority (frame);
-        crawl_data = GF_CALLOC (1, sizeof (*crawl_data),
-                                gf_afr_mt_crawl_data_t);
-        if (!crawl_data)
-                goto out;
-        crawl_data->process_entry = process_entry;
-        crawl_data->child = idx;
-        crawl_data->pid = frame->root->pid;
-        crawl_data->crawl = crawl;
-        crawl_data->op_data = op_data;
-        crawl_data->crawl_flags = crawl_flags;
-        gf_log (this->name, GF_LOG_DEBUG, "starting crawl %d for %s",
-                crawl_data->crawl, priv->children[idx]->name);
-
-        if (exclusive)
-                crawler = afr_dir_exclusive_crawl;
-        else
-                crawler = afr_dir_crawl;
-        ret = synctask_new (this->ctx->env, crawler,
-                            crawl_done, frame, crawl_data);
-        if (ret)
-                gf_log (this->name, GF_LOG_ERROR, "afr crawl failed for child"
-                        " %d with ret %d", idx, ret);
-out:
-        return;
-}
-
-void
-afr_build_root_loc (xlator_t *this, loc_t *loc)
-{
-        afr_private_t   *priv = NULL;
-
-        priv = this->private;
-        loc->path = gf_strdup ("/");
-        loc->name = "";
-        loc->inode = inode_ref (priv->root_inode);
-        uuid_copy (loc->gfid, loc->inode->gfid);
-}
-
-int
-afr_set_root_gfid (dict_t *dict)
-{
-        uuid_t gfid;
-        int ret = 0;
-
-        memset (gfid, 0, 16);
-        gfid[15] = 1;
-
-        ret = afr_set_dict_gfid (dict, gfid);
-
-        return ret;
-}
diff --git a/xlators/cluster/afr/src/afr-self-heald.h b/xlators/cluster/afr/src/afr-self-heald.h
deleted file mode 100644
index e0c083754..000000000
--- a/xlators/cluster/afr/src/afr-self-heald.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef __AFR_SELF_HEALD_H__
-#define __AFR_SELF_HEALD_H__
-#include "xlator.h"
-
-#define IS_ROOT_PATH(path) (!strcmp (path, "/"))
-#define IS_ENTRY_CWD(entry) (!strcmp (entry, "."))
-#define IS_ENTRY_PARENT(entry) (!strcmp (entry, ".."))
-#define AFR_ALL_CHILDREN -1
-
-typedef struct afr_crawl_data_ {
-        int                 child;
-        pid_t               pid;
-        afr_crawl_type_t    crawl;
-        xlator_t            *readdir_xl;
-        void                *op_data;
-        int                 crawl_flags;
-        int (*process_entry) (xlator_t *this, struct afr_crawl_data_ *crawl_data,
-                              gf_dirent_t *entry, loc_t *child, loc_t *parent,
-                              struct iatt *iattr);
-} afr_crawl_data_t;
-
-typedef struct crawl_event_stats_ {
-        uint64_t healed_count;
-        uint64_t split_brain_count;
-        uint64_t heal_failed_count;
-        char     *start_time_str;
-        char     *end_time_str;
-        char     *crawl_type;
-        gf_boolean_t crawl_inprogress;
-} shd_crawl_event_t;
-
-void _destroy_crawl_event_data (void *data);
-void _destroy_shd_event_data (void *data);
-
-typedef int (*process_entry_cbk_t) (xlator_t *this, afr_crawl_data_t *crawl_data,
-                              gf_dirent_t *entry, loc_t *child, loc_t *parent,
-                              struct iatt *iattr);
-
-void afr_build_root_loc (xlator_t *this, loc_t *loc);
-
-int afr_set_root_gfid (dict_t *dict);
-
-void
-afr_proactive_self_heal (void *data);
-
-int
-afr_xl_op (xlator_t *this, dict_t *input, dict_t *output);
-
-/*
- * In addition to its self-heal use, this is used to find a local default
- * read_child.
- */
-int
-afr_local_pathinfo (char *pathinfo, gf_boolean_t *local);
-#endif /* __AFR_SELF_HEALD_H__ */
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c
index 20306e469..ac329958d 100644
--- a/xlators/cluster/afr/src/afr-transaction.c
+++ b/xlators/cluster/afr/src/afr-transaction.c
@@ -1,17 +1,25 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include "dict.h"
 #include "byte-order.h"
 #include "common-utils.h"
-#include "timer.h"
 
 #include "afr.h"
 #include "afr-transaction.h"
@@ -24,75 +32,48 @@
                                       of RENAME */
 #define LOCKED_LOWER    0x2        /* for lower_path of RENAME */
 
+
 afr_fd_ctx_t *
-__afr_fd_ctx_get (fd_t *fd, xlator_t *this)
+afr_fd_ctx_get (fd_t *fd, xlator_t *this)
 {
         uint64_t       ctx = 0;
-        int            ret = 0;
         afr_fd_ctx_t  *fd_ctx = NULL;
-        int            i = 0;
-        afr_private_t *priv = NULL;
-
-        priv = this->private;
-
-        ret = __fd_ctx_get (fd, this, &ctx);
-
-        if (ret < 0 && fd_is_anonymous (fd)) {
-                ret = __afr_fd_ctx_set (this, fd);
-                if (ret < 0)
-                        goto out;
+        int            ret = 0;
 
-                ret = __fd_ctx_get (fd, this, &ctx);
-                if (ret < 0)
-                        goto out;
+        ret = fd_ctx_get (fd, this, &ctx);
 
-                fd_ctx = (afr_fd_ctx_t *)(long) ctx;
-                for (i = 0; i < priv->child_count; i++)
-                        fd_ctx->opened_on[i] = AFR_FD_OPENED;
-        }
+        if (ret < 0)
+                goto out;
 
         fd_ctx = (afr_fd_ctx_t *)(long) ctx;
-out:
-        return fd_ctx;
-}
-
-
-afr_fd_ctx_t *
-afr_fd_ctx_get (fd_t *fd, xlator_t *this)
-{
-        afr_fd_ctx_t  *fd_ctx = NULL;
-
-        LOCK(&fd->lock);
-        {
-                fd_ctx = __afr_fd_ctx_get (fd, this);
-        }
-        UNLOCK(&fd->lock);
 
+out:
         return fd_ctx;
 }
 
 
 static void
-afr_save_lk_owner (call_frame_t *frame)
+afr_pid_save (call_frame_t *frame)
 {
         afr_local_t * local = NULL;
 
         local = frame->local;
 
-        local->saved_lk_owner = frame->root->lk_owner;
+        local->saved_pid = frame->root->pid;
 }
 
 
 static void
-afr_restore_lk_owner (call_frame_t *frame)
+afr_pid_restore (call_frame_t *frame)
 {
         afr_local_t * local = NULL;
 
         local = frame->local;
 
-        frame->root->lk_owner = local->saved_lk_owner;
+        frame->root->pid = local->saved_pid;
 }
 
+
 static void
 __mark_all_pending (int32_t *pending[], int child_count,
                     afr_transaction_type type)
@@ -145,23 +126,51 @@ out:
         return;
 }
 
+
+static void
+__mark_pre_op_undone_on_fd (call_frame_t *frame, xlator_t *this, int child_index)
+{
+        afr_local_t   *local = NULL;
+        afr_fd_ctx_t  *fd_ctx = NULL;
+
+        local = frame->local;
+
+        if (!local->fd)
+                return;
+
+        fd_ctx = afr_fd_ctx_get (local->fd, this);
+
+        if (!fd_ctx)
+                goto out;
+
+        LOCK (&local->fd->lock);
+        {
+                if (local->transaction.type == AFR_DATA_TRANSACTION)
+                        fd_ctx->pre_op_done[child_index]--;
+        }
+        UNLOCK (&local->fd->lock);
+out:
+        return;
+}
+
+
 static void
-__mark_non_participant_children (int32_t *pending[], int child_count,
-                                 unsigned char *participants,
-                                 afr_transaction_type type)
+__mark_down_children (int32_t *pending[], int child_count,
+                      unsigned char *child_up, afr_transaction_type type)
 {
         int i = 0;
         int j = 0;
 
-        j = afr_index_for_transaction_type (type);
         for (i = 0; i < child_count; i++) {
-                if (!participants[i])
+                j = afr_index_for_transaction_type (type);
+
+                if (!child_up[i])
                         pending[i][j] = 0;
         }
 }
 
 
-void
+static void
 __mark_all_success (int32_t *pending[], int child_count,
                     afr_transaction_type type)
 {
@@ -174,54 +183,6 @@ __mark_all_success (int32_t *pending[], int child_count,
         }
 }
 
-void
-_set_all_child_errno (int *child_errno, unsigned int child_count)
-{
-        int     i = 0;
-
-        for (i = 0; i < child_count; i++)
-                if (child_errno[i] == 0)
-                        child_errno[i] = ENOTCONN;
-}
-
-void
-afr_transaction_perform_fop (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t     *local = NULL;
-        afr_private_t   *priv = NULL;
-        fd_t            *fd   = NULL;
-
-        local = frame->local;
-        priv  = this->private;
-        fd    = local->fd;
-
-        __mark_all_success (local->pending, priv->child_count,
-                            local->transaction.type);
-
-        _set_all_child_errno (local->child_errno, priv->child_count);
-
-        /*  Perform fops with the lk-owner from top xlator.
-         *  Eg: lk-owner of posix-lk and flush should be same,
-         *  flush cant clear the  posix-lks without that lk-owner.
-         */
-        afr_save_lk_owner (frame);
-        frame->root->lk_owner =
-                local->transaction.main_frame->root->lk_owner;
-
-
-        /* The wake up needs to happen independent of
-           what type of fop arrives here. If it was
-           a write, then it has already inherited the
-           lock and changelog. If it was not a write,
-           then the presumption of the optimization (of
-           optimizing for successive write operations)
-           fails.
-        */
-        if (fd)
-                afr_delayed_changelog_wake_up (this, fd);
-        local->transaction.fop (frame, this);
-}
-
 
 static int
 __changelog_enabled (afr_private_t *priv, afr_transaction_type type)
@@ -254,7 +215,39 @@ __changelog_enabled (afr_private_t *priv, afr_transaction_type type)
 
 
 static int
-__fop_changelog_needed (call_frame_t *frame, xlator_t *this)
+__changelog_needed_pre_op (call_frame_t *frame, xlator_t *this)
+{
+        afr_private_t * priv  = NULL;
+        afr_local_t   * local = NULL;
+
+        int op_ret   = 0;
+
+        priv  = this->private;
+        local = frame->local;
+
+        if (__changelog_enabled (priv, local->transaction.type)) {
+                switch (local->op) {
+
+                case GF_FOP_WRITE:
+                case GF_FOP_FTRUNCATE:
+                        op_ret = 1;
+                        break;
+
+                case GF_FOP_FLUSH:
+                        op_ret = 0;
+                        break;
+
+                default:
+                        op_ret = 1;
+                }
+        }
+
+        return op_ret;
+}
+
+
+static int
+__changelog_needed_post_op (call_frame_t *frame, xlator_t *this)
 {
         afr_private_t * priv  = NULL;
         afr_local_t   * local = NULL;
@@ -285,42 +278,64 @@ __fop_changelog_needed (call_frame_t *frame, xlator_t *this)
         return op_ret;
 }
 
-int
-afr_set_pending_dict (afr_private_t *priv, dict_t *xattr, int32_t **pending,
-                      int child, afr_xattrop_type_t op)
+
+static int
+afr_set_pending_dict (afr_private_t *priv, dict_t *xattr, int32_t **pending)
 {
         int i = 0;
         int ret = 0;
 
-        if (op == LOCAL_FIRST) {
-                ret = dict_set_static_bin (xattr, priv->pending_key[child],
-                                           pending[child],
-                                   AFR_NUM_CHANGE_LOGS * sizeof (int32_t));
-                if (ret)
-                        goto out;
-        }
         for (i = 0; i < priv->child_count; i++) {
-                if (i == child)
-                        continue;
                 ret = dict_set_static_bin (xattr, priv->pending_key[i],
-                                           pending[i],
-                                   AFR_NUM_CHANGE_LOGS * sizeof (int32_t));
+                                           pending[i], 3 * sizeof (int32_t));
                 /* 3 = data+metadata+entry */
 
                 if (ret < 0)
                         goto out;
         }
-        if (op == LOCAL_LAST) {
-                ret = dict_set_static_bin (xattr, priv->pending_key[child],
-                                           pending[child],
-                                   AFR_NUM_CHANGE_LOGS * sizeof (int32_t));
-                if (ret)
+
+out:
+        return ret;
+}
+
+
+static int
+afr_set_piggyback_dict (afr_private_t *priv, dict_t *xattr, int32_t **pending,
+                        afr_transaction_type type)
+{
+        int i = 0;
+        int ret = 0;
+        int *arr = NULL;
+        int index = 0;
+        size_t pending_xattr_size = 3 * sizeof (int32_t);
+        /* 3 = data+metadata+entry */
+
+        index = afr_index_for_transaction_type (type);
+
+        for (i = 0; i < priv->child_count; i++) {
+                arr = GF_CALLOC (1, pending_xattr_size,
+                                 gf_afr_mt_char);
+                if (!arr) {
+                        ret = -1;
+                        goto out;
+                }
+
+                memcpy (arr, pending[i], pending_xattr_size);
+
+                arr[index] = hton32 (ntoh32 (arr[index]) + 1);
+
+                ret = dict_set_bin (xattr, priv->pending_key[i],
+                                    arr, pending_xattr_size);
+
+                if (ret < 0)
                         goto out;
         }
+
 out:
         return ret;
 }
 
+
 int
 afr_lock_server_count (afr_private_t *priv, afr_transaction_type type)
 {
@@ -348,18 +363,27 @@ afr_lock_server_count (afr_private_t *priv, afr_transaction_type type)
 
 int32_t
 afr_changelog_post_op_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                           int32_t op_ret, int32_t op_errno, dict_t *xattr,
-                           dict_t *xdata)
+                           int32_t op_ret, int32_t op_errno, dict_t *xattr)
 {
         afr_internal_lock_t *int_lock = NULL;
         afr_private_t       *priv     = NULL;
         afr_local_t         *local    = NULL;
+        int                  child_index = 0;
         int                  call_count = -1;
 
         priv     = this->private;
         local    = frame->local;
         int_lock = &local->internal_lock;
 
+        child_index = (long) cookie;
+
+        if (op_ret == 1) {
+        }
+
+        if (op_ret == 0) {
+                __mark_pre_op_undone_on_fd (frame, this, child_index);
+        }
+
         LOCK (&frame->lock);
         {
                 call_count = --local->call_count;
@@ -367,11 +391,6 @@ afr_changelog_post_op_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         UNLOCK (&frame->lock);
 
         if (call_count == 0) {
-                if (local->transaction.resume_stub) {
-			call_resume (local->transaction.resume_stub);
-                        local->transaction.resume_stub = NULL;
-                }
-
                 if (afr_lock_server_count (priv, local->transaction.type) == 0) {
                         local->transaction.done (frame, this);
                 } else {
@@ -385,266 +404,55 @@ afr_changelog_post_op_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 
 void
-afr_transaction_rm_stale_children (call_frame_t *frame, xlator_t *this,
-                                   inode_t *inode, afr_transaction_type type)
+afr_update_read_child (call_frame_t *frame, xlator_t *this, inode_t *inode,
+                       afr_transaction_type type)
 {
-        int             i = -1;
-        int             count = 0;
-        int             read_child = -1;
+        int           curr_read_child = -1;
+        int           new_read_child = -1;
         afr_private_t   *priv = NULL;
-        afr_local_t     *local = NULL;
-        int             **pending = NULL;
-        int             idx = 0;
-        int32_t         *stale_children = NULL;
-        int32_t         *fresh_children = NULL;
-        gf_boolean_t    rm_stale_children = _gf_false;
+        afr_local_t  *local = NULL;
+        int         **pending = NULL;
+        int           idx = 0;
 
         idx = afr_index_for_transaction_type (type);
 
         priv = this->private;
         local = frame->local;
+        curr_read_child = afr_read_child (this, inode);
         pending = local->pending;
 
-        if (local->op_ret < 0)
-                goto out;
-        fresh_children = local->fresh_children;
-        read_child = afr_inode_get_read_ctx (this, inode, fresh_children);
-        if (read_child < 0) {
-                gf_log (this->name, GF_LOG_DEBUG, "Possible split-brain "
-                        "for %s", uuid_utoa (inode->gfid));
-                goto out;
-        }
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (!afr_is_child_present (fresh_children,
-                                           priv->child_count, i))
-                        continue;
-                if (pending[i][idx])
-                        continue;
-                /* child is down or op failed on it */
-                if (!stale_children)
-                        stale_children = afr_children_create (priv->child_count);
-                if (!stale_children)
-                        goto out;
-
-                rm_stale_children = _gf_true;
-                stale_children[count++] = i;
-                gf_log (this->name, GF_LOG_DEBUG, "Removing stale child "
-                        "%d for %s", i, uuid_utoa (inode->gfid));
-        }
-
-        if (!rm_stale_children)
-                goto out;
-
-        afr_inode_rm_stale_children (this, inode, stale_children);
-out:
-        GF_FREE (stale_children);
-        return;
-}
-
-afr_inodelk_t*
-afr_get_inodelk (afr_internal_lock_t *int_lock, char *dom)
-{
-        afr_inodelk_t *inodelk = NULL;
-        int           i = 0;
-
-        for (i = 0; int_lock->inodelk[i].domain; i++) {
-                inodelk = &int_lock->inodelk[i];
-                if (strcmp (dom, inodelk->domain) == 0)
-                        return inodelk;
-        }
-        return NULL;
-}
-
-unsigned char*
-afr_locked_nodes_get (afr_transaction_type type, afr_internal_lock_t *int_lock)
-{
-        unsigned char *locked_nodes = NULL;
-        afr_inodelk_t *inodelk = NULL;
-        switch (type) {
-        case AFR_DATA_TRANSACTION:
-        case AFR_METADATA_TRANSACTION:
-                inodelk = afr_get_inodelk (int_lock, int_lock->domain);
-                locked_nodes = inodelk->locked_nodes;
-        break;
-
-        case AFR_ENTRY_TRANSACTION:
-        case AFR_ENTRY_RENAME_TRANSACTION:
-                /*Because same set of subvols participate in all lockee
-                 * entities*/
-                locked_nodes = int_lock->lockee[0].locked_nodes;
-        break;
-        }
-        return locked_nodes;
-}
-
-int
-afr_changelog_pre_op_call_count (afr_transaction_type type,
-                                 afr_internal_lock_t *int_lock,
-                                 unsigned int child_count)
-{
-        int           call_count = 0;
-        unsigned char *locked_nodes = NULL;
-
-        locked_nodes = afr_locked_nodes_get (type, int_lock);
-        GF_ASSERT (locked_nodes);
-
-        call_count = afr_locked_children_count (locked_nodes, child_count);
-        if (type == AFR_ENTRY_RENAME_TRANSACTION)
-                call_count *= 2;
-
-        return call_count;
-}
-
-int
-afr_changelog_post_op_call_count (afr_transaction_type type,
-                                  unsigned char *pre_op,
-                                  unsigned int child_count)
-{
-        int           call_count = 0;
-
-        call_count = afr_pre_op_done_children_count (pre_op, child_count);
-        if (type == AFR_ENTRY_RENAME_TRANSACTION)
-                call_count *= 2;
-
-        return call_count;
-}
-
-void
-afr_compute_txn_changelog (afr_local_t *local, afr_private_t *priv)
-{
-        int             i = 0;
-        int             index = 0;
-        int32_t         postop = 0;
-        int32_t         preop = 1;
-        int32_t         **txn_changelog = NULL;
-
-        txn_changelog = local->transaction.txn_changelog;
-        index = afr_index_for_transaction_type (local->transaction.type);
-        for (i = 0; i < priv->child_count; i++) {
-                postop = ntoh32 (local->pending[i][index]);
-                txn_changelog[i][index] = hton32 (postop + preop);
-        }
-}
-
-afr_xattrop_type_t
-afr_get_postop_xattrop_type (int32_t **pending, int optimized, int child,
-                             afr_transaction_type type)
-{
-        int                     index = 0;
-        afr_xattrop_type_t      op = LOCAL_LAST;
-
-        index = afr_index_for_transaction_type (type);
-        if (optimized && !pending[child][index])
-                op = LOCAL_FIRST;
-        return op;
-}
-
-void
-afr_set_postop_dict (afr_local_t *local, xlator_t *this, dict_t *xattr,
-                     int optimized, int child)
-{
-        int32_t                 **txn_changelog = NULL;
-        int32_t                 **changelog = NULL;
-        afr_private_t           *priv = NULL;
-        int                     ret = 0;
-        afr_xattrop_type_t      op = LOCAL_LAST;
-
-        priv = this->private;
-        txn_changelog = local->transaction.txn_changelog;
-        op = afr_get_postop_xattrop_type (local->pending, optimized, child,
-                                          local->transaction.type);
-        if (optimized)
-                changelog = txn_changelog;
-        else
-                changelog = local->pending;
-        ret = afr_set_pending_dict (priv, xattr, changelog, child, op);
-        if (ret < 0)
-                gf_log (this->name, GF_LOG_INFO,
-                        "failed to set pending entry");
-}
+        if (pending[curr_read_child][idx] != 0)
+                return;
 
+        /* need to set new read_child */
+        for (new_read_child = 0; new_read_child < priv->child_count;
+             new_read_child++) {
 
-gf_boolean_t
-afr_txn_nothing_failed (call_frame_t *frame, xlator_t *this)
-{
-        afr_private_t *priv = NULL;
-        afr_local_t *local = NULL;
-        int index = -1;
-        int i = 0;
-
-        local = frame->local;
-        priv = this->private;
+                if (!priv->child_up[new_read_child])
+                        /* child is down */
+                        continue;
 
-        index = afr_index_for_transaction_type (local->transaction.type);
+                if (pending[new_read_child][idx] == 0)
+                        /* op just failed */
+                        continue;
 
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->pending[i][index] == 0)
-                        return _gf_false;
+                break;
         }
 
-        return _gf_true;
-}
-
-static void
-afr_dir_fop_handle_all_fop_failures (call_frame_t *frame)
-{
-        xlator_t        *this = NULL;
-        afr_local_t     *local = NULL;
-        afr_private_t   *priv = NULL;
-
-        this = frame->this;
-        local = frame->local;
-        priv = this->private;
-
-        if ((local->transaction.type != AFR_ENTRY_TRANSACTION) &&
-            (local->transaction.type != AFR_ENTRY_RENAME_TRANSACTION))
+        if (new_read_child == priv->child_count)
+                /* all children uneligible. leave as-is */
                 return;
 
-        if (local->op_ret >= 0)
-                goto out;
-
-        __mark_all_success (local->pending, priv->child_count,
-                            local->transaction.type);
-out:
-        return;
+        afr_set_read_child (this, inode, new_read_child);
 }
 
-static void
-afr_data_handle_quota_errors (call_frame_t *frame, xlator_t *this)
-{
-        int     i = 0;
-        afr_private_t *priv = NULL;
-        afr_local_t   *local = NULL;
-        gf_boolean_t  all_quota_failures = _gf_false;
-
-        local = frame->local;
-        priv  = this->private;
-        if (local->transaction.type != AFR_DATA_TRANSACTION)
-                return;
-        /*
-         * Idea is to not leave the file in FOOL-FOOL scenario in case on
-         * all the bricks data transaction failed with EDQUOT to avoid
-         * increasing un-necessary load of self-heals in the system.
-         */
-        all_quota_failures = _gf_true;
-        for (i = 0; i < priv->child_count; i++) {
-                if (local->transaction.pre_op[i] &&
-                    (local->child_errno[i] != EDQUOT)) {
-                        all_quota_failures = _gf_false;
-                        break;
-                }
-        }
-        if (all_quota_failures)
-                __mark_all_success (local->pending, priv->child_count,
-                                    local->transaction.type);
-}
 
 int
-afr_changelog_post_op_now (call_frame_t *frame, xlator_t *this)
+afr_changelog_post_op (call_frame_t *frame, xlator_t *this)
 {
         afr_private_t * priv = this->private;
         afr_internal_lock_t *int_lock = NULL;
+        int ret        = 0;
         int i          = 0;
         int call_count = 0;
 
@@ -652,32 +460,32 @@ afr_changelog_post_op_now (call_frame_t *frame, xlator_t *this)
         afr_fd_ctx_t  *fdctx = NULL;
         dict_t        **xattr = NULL;
         int            piggyback = 0;
+        int            index = 0;
         int            nothing_failed = 1;
 
         local    = frame->local;
         int_lock = &local->internal_lock;
 
-        __mark_non_participant_children (local->pending, priv->child_count,
-                                         local->transaction.pre_op,
-                                         local->transaction.type);
-
-        afr_data_handle_quota_errors (frame, this);
-        afr_dir_fop_handle_all_fop_failures (frame);
+        __mark_down_children (local->pending, priv->child_count,
+                              local->child_up, local->transaction.type);
 
         if (local->fd)
-                afr_transaction_rm_stale_children (frame, this,
-                                                   local->fd->inode,
-                                                   local->transaction.type);
+                afr_update_read_child (frame, this, local->fd->inode,
+                                       local->transaction.type);
 
         xattr = alloca (priv->child_count * sizeof (*xattr));
         memset (xattr, 0, (priv->child_count * sizeof (*xattr)));
         for (i = 0; i < priv->child_count; i++) {
-                xattr[i] = dict_new ();
+                xattr[i] = get_new_dict ();
+                dict_ref (xattr[i]);
+        }
+
+        call_count = afr_up_children_count (priv->child_count, local->child_up);
+
+        if (local->transaction.type == AFR_ENTRY_RENAME_TRANSACTION) {
+                call_count *= 2;
         }
 
-        call_count = afr_changelog_post_op_call_count (local->transaction.type,
-                                                       local->transaction.pre_op,
-                                                       priv->child_count);
         local->call_count = call_count;
 
         if (local->fd)
@@ -685,52 +493,75 @@ afr_changelog_post_op_now (call_frame_t *frame, xlator_t *this)
 
         if (call_count == 0) {
                 /* no child is up */
+                for (i = 0; i < priv->child_count; i++) {
+                        dict_unref (xattr[i]);
+                }
+
                 int_lock->lock_cbk = local->transaction.done;
                 afr_unlock (frame, this);
-                goto out;
+                return 0;
         }
 
-        nothing_failed = afr_txn_nothing_failed (frame, this);
+        /* check if something has failed, to handle piggybacking */
+        nothing_failed = 1;
+        index = afr_index_for_transaction_type (local->transaction.type);
+        for (i = 0; i < priv->child_count; i++) {
+                if (local->pending[i][index] == 0) {
+                        nothing_failed = 0;
+                        break;
+                }
+        }
 
-        afr_compute_txn_changelog (local , priv);
+        index = afr_index_for_transaction_type (local->transaction.type);
+        if (local->optimistic_change_log &&
+            local->transaction.type != AFR_DATA_TRANSACTION) {
+                /* if nothing_failed, then local->pending[..] == {0 .. 0} */
+                for (i = 0; i < priv->child_count; i++)
+                        local->pending[i][index]++;
+        }
 
         for (i = 0; i < priv->child_count; i++) {
-                if (!local->transaction.pre_op[i])
+                if (!local->child_up[i])
                         continue;
 
-                if (local->transaction.type != AFR_DATA_TRANSACTION)
-                        afr_set_postop_dict (local, this, xattr[i],
-                                             local->optimistic_change_log, i);
+                ret = afr_set_pending_dict (priv, xattr[i],
+                                            local->pending);
+
+                if (ret < 0)
+                        gf_log (this->name, GF_LOG_INFO,
+                                "failed to set pending entry");
+
+
                 switch (local->transaction.type) {
                 case AFR_DATA_TRANSACTION:
                 {
                         if (!fdctx) {
-                                afr_set_postop_dict (local, this, xattr[i],
-                                                     0, i);
                                 STACK_WIND (frame, afr_changelog_post_op_cbk,
                                             priv->children[i],
                                             priv->children[i]->fops->xattrop,
                                             &local->loc,
-                                            GF_XATTROP_ADD_ARRAY, xattr[i],
-                                            NULL);
+                                            GF_XATTROP_ADD_ARRAY, xattr[i]);
                                 break;
                         }
 
-                        /* local->transaction.postop_piggybacked[] was
-                           precomputed in is_piggyback_postop() when called from
-                           afr_changelog_post_op_safe()
-                        */
-
-                        piggyback = 0;
-                        if (local->transaction.postop_piggybacked[i])
-                                piggyback = 1;
+                        LOCK (&local->fd->lock);
+                        {
+                                piggyback = 0;
+                                if (fdctx->pre_op_piggyback[i]) {
+                                        fdctx->pre_op_piggyback[i]--;
+                                        piggyback = 1;
+                                }
+                        }
+                        UNLOCK (&local->fd->lock);
 
-                        afr_set_postop_dict (local, this, xattr[i],
-                                             piggyback, i);
+                        if (piggyback && !nothing_failed)
+                                ret = afr_set_piggyback_dict (priv, xattr[i],
+                                                              local->pending,
+                                                              local->transaction.type);
 
                         if (nothing_failed && piggyback) {
                                 afr_changelog_post_op_cbk (frame, (void *)(long)i,
-                                                           this, 1, 0, xattr[i], NULL);
+                                                           this, 1, 0, xattr[i]);
                         } else {
                                 STACK_WIND_COOKIE (frame,
                                                    afr_changelog_post_op_cbk,
@@ -738,17 +569,15 @@ afr_changelog_post_op_now (call_frame_t *frame, xlator_t *this)
                                                    priv->children[i],
                                                    priv->children[i]->fops->fxattrop,
                                                    local->fd,
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                         }
                 }
                 break;
                 case AFR_METADATA_TRANSACTION:
                 {
-                        if (nothing_failed && local->optimistic_change_log) {
+                        if (nothing_failed) {
                                 afr_changelog_post_op_cbk (frame, (void *)(long)i,
-                                                           this, 1, 0, xattr[i],
-                                                           NULL);
+                                                           this, 1, 0, xattr[i]);
                                 break;
                         }
 
@@ -757,32 +586,28 @@ afr_changelog_post_op_now (call_frame_t *frame, xlator_t *this)
                                             priv->children[i],
                                             priv->children[i]->fops->fxattrop,
                                             local->fd,
-                                            GF_XATTROP_ADD_ARRAY, xattr[i],
-                                            NULL);
+                                            GF_XATTROP_ADD_ARRAY, xattr[i]);
                         else
                                 STACK_WIND (frame, afr_changelog_post_op_cbk,
                                             priv->children[i],
                                             priv->children[i]->fops->xattrop,
                                             &local->loc,
-                                            GF_XATTROP_ADD_ARRAY, xattr[i],
-                                            NULL);
+                                            GF_XATTROP_ADD_ARRAY, xattr[i]);
                 }
                 break;
 
                 case AFR_ENTRY_RENAME_TRANSACTION:
                 {
-                        if (nothing_failed && local->optimistic_change_log) {
+                        if (nothing_failed) {
                                 afr_changelog_post_op_cbk (frame, (void *)(long)i,
-                                                           this, 1, 0, xattr[i],
-                                                           NULL);
+                                                           this, 1, 0, xattr[i]);
                         } else {
                                 STACK_WIND_COOKIE (frame, afr_changelog_post_op_cbk,
                                                    (void *) (long) i,
                                                    priv->children[i],
                                                    priv->children[i]->fops->xattrop,
                                                    &local->transaction.new_parent_loc,
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                         }
                         call_count--;
                 }
@@ -795,17 +620,20 @@ afr_changelog_post_op_now (call_frame_t *frame, xlator_t *this)
                   value
                 */
 
-                afr_set_postop_dict (local, this, xattr[i],
-                                     local->optimistic_change_log, i);
+                ret = afr_set_pending_dict (priv, xattr[i],
+                                            local->pending);
+
+                if (ret < 0)
+                        gf_log (this->name, GF_LOG_INFO,
+                                "failed to set pending entry");
 
                 /* fall through */
 
                 case AFR_ENTRY_TRANSACTION:
                 {
-                        if (nothing_failed && local->optimistic_change_log) {
+                        if (nothing_failed) {
                                 afr_changelog_post_op_cbk (frame, (void *)(long)i,
-                                                           this, 1, 0, xattr[i],
-                                                           NULL);
+                                                           this, 1, 0, xattr[i]);
                                 break;
                         }
 
@@ -814,15 +642,13 @@ afr_changelog_post_op_now (call_frame_t *frame, xlator_t *this)
                                             priv->children[i],
                                             priv->children[i]->fops->fxattrop,
                                             local->fd,
-                                            GF_XATTROP_ADD_ARRAY, xattr[i],
-                                            NULL);
+                                            GF_XATTROP_ADD_ARRAY, xattr[i]);
                         else
                                 STACK_WIND (frame, afr_changelog_post_op_cbk,
                                             priv->children[i],
                                             priv->children[i]->fops->xattrop,
                                             &local->transaction.parent_loc,
-                                            GF_XATTROP_ADD_ARRAY, xattr[i],
-                                            NULL);
+                                            GF_XATTROP_ADD_ARRAY, xattr[i]);
                 }
                 break;
                 }
@@ -831,7 +657,6 @@ afr_changelog_post_op_now (call_frame_t *frame, xlator_t *this)
                         break;
         }
 
-out:
         for (i = 0; i < priv->child_count; i++) {
                 dict_unref (xattr[i]);
         }
@@ -842,27 +667,30 @@ out:
 
 int32_t
 afr_changelog_pre_op_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t op_ret, int32_t op_errno, dict_t *xattr,
-                          dict_t *xdata)
+                          int32_t op_ret, int32_t op_errno, dict_t *xattr)
 {
         afr_local_t *   local = NULL;
         afr_private_t * priv  = this->private;
+        loc_t       *   loc   = NULL;
         int call_count  = -1;
         int child_index = (long) cookie;
 
         local = frame->local;
+        loc   = &local->loc;
 
         LOCK (&frame->lock);
         {
-                switch (op_ret) {
-                case 0:
-                        __mark_pre_op_done_on_fd (frame, this, child_index);
-                        //fallthrough we need to mark the pre_op
-                case 1:
-                        local->transaction.pre_op[child_index] = 1;
+                if (op_ret == 1) {
                         /* special op_ret for piggyback */
-                        break;
-                case -1:
+                }
+
+                if (op_ret == 0) {
+                        __mark_pre_op_done_on_fd (frame, this, child_index);
+                }
+
+                if (op_ret == -1) {
+                        local->child_up[child_index] = 0;
+
                         if (op_errno == ENOTSUP) {
                                 gf_log (this->name, GF_LOG_ERROR,
                                         "xattrop not supported by %s",
@@ -876,7 +704,6 @@ afr_changelog_pre_op_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         strerror (op_errno));
                         }
                         local->op_errno = op_errno;
-                        break;
                 }
 
                 call_count = --local->call_count;
@@ -888,13 +715,19 @@ afr_changelog_pre_op_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     (local->op_errno == ENOTSUP)) {
                         local->transaction.resume (frame, this);
                 } else {
-                        afr_transaction_perform_fop (frame, this);
+                        __mark_all_success (local->pending, priv->child_count,
+                                            local->transaction.type);
+
+                        afr_pid_restore (frame);
+
+                        local->transaction.fop (frame, this);
                 }
         }
 
         return 0;
 }
 
+
 int
 afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
 {
@@ -906,27 +739,34 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
         afr_fd_ctx_t *fdctx = NULL;
         afr_local_t *local = NULL;
         int          piggyback = 0;
-        afr_internal_lock_t *int_lock = NULL;
-        unsigned char       *locked_nodes = NULL;
 
         local = frame->local;
-        int_lock = &local->internal_lock;
 
         xattr = alloca (priv->child_count * sizeof (*xattr));
         memset (xattr, 0, (priv->child_count * sizeof (*xattr)));
 
         for (i = 0; i < priv->child_count; i++) {
-                xattr[i] = dict_new ();
+                xattr[i] = get_new_dict ();
+                dict_ref (xattr[i]);
+        }
+
+        call_count = afr_up_children_count (priv->child_count,
+                                            local->child_up);
+
+        if (local->transaction.type == AFR_ENTRY_RENAME_TRANSACTION) {
+                call_count *= 2;
         }
 
-        call_count = afr_changelog_pre_op_call_count (local->transaction.type,
-                                                      int_lock,
-                                                      priv->child_count);
         if (call_count == 0) {
+                /* no child is up */
+                for (i = 0; i < priv->child_count; i++) {
+                        dict_unref (xattr[i]);
+                }
+
                 local->internal_lock.lock_cbk =
                         local->transaction.done;
                 afr_unlock (frame, this);
-                goto out;
+                return 0;
         }
 
         local->call_count = call_count;
@@ -937,12 +777,11 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
         if (local->fd)
                 fdctx = afr_fd_ctx_get (local->fd, this);
 
-        locked_nodes = afr_locked_nodes_get (local->transaction.type, int_lock);
         for (i = 0; i < priv->child_count; i++) {
-                if (!locked_nodes[i])
+                if (!local->child_up[i])
                         continue;
-                ret = afr_set_pending_dict (priv, xattr[i], local->pending,
-                                            i, LOCAL_FIRST);
+                ret = afr_set_pending_dict (priv, xattr[i],
+                                            local->pending);
 
                 if (ret < 0)
                         gf_log (this->name, GF_LOG_INFO,
@@ -959,8 +798,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                                                    priv->children[i],
                                                    priv->children[i]->fops->xattrop,
                                                    &(local->loc),
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                                 break;
                         }
 
@@ -977,12 +815,9 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                         }
                         UNLOCK (&local->fd->lock);
 
-                        afr_set_delayed_post_op (frame, this);
-
                         if (piggyback)
                                 afr_changelog_pre_op_cbk (frame, (void *)(long)i,
-                                                          this, 1, 0, xattr[i],
-                                                          NULL);
+                                                          this, 1, 0, xattr[i]);
                         else
                                 STACK_WIND_COOKIE (frame,
                                                    afr_changelog_pre_op_cbk,
@@ -990,16 +825,14 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                                                    priv->children[i],
                                                    priv->children[i]->fops->fxattrop,
                                                    local->fd,
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                 }
                 break;
                 case AFR_METADATA_TRANSACTION:
                 {
                         if (local->optimistic_change_log) {
                                 afr_changelog_pre_op_cbk (frame, (void *)(long)i,
-                                                          this, 1, 0, xattr[i],
-                                                          NULL);
+                                                          this, 1, 0, xattr[i]);
                                 break;
                         }
 
@@ -1010,8 +843,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                                                    priv->children[i],
                                                    priv->children[i]->fops->fxattrop,
                                                    local->fd,
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                         else
                                 STACK_WIND_COOKIE (frame,
                                                    afr_changelog_pre_op_cbk,
@@ -1019,8 +851,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                                                    priv->children[i],
                                                    priv->children[i]->fops->xattrop,
                                                    &(local->loc),
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                 }
                 break;
 
@@ -1028,8 +859,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                 {
                         if (local->optimistic_change_log) {
                                 afr_changelog_pre_op_cbk (frame, (void *)(long)i,
-                                                          this, 1, 0, xattr[i],
-                                                          NULL);
+                                                          this, 1, 0, xattr[i]);
                         } else {
                                 STACK_WIND_COOKIE (frame,
                                                    afr_changelog_pre_op_cbk,
@@ -1037,8 +867,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                                                    priv->children[i],
                                                    priv->children[i]->fops->xattrop,
                                                    &local->transaction.new_parent_loc,
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                         }
 
                         call_count--;
@@ -1053,8 +882,8 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                   value
                 */
 
-                ret = afr_set_pending_dict (priv, xattr[i], local->pending,
-                                            i, LOCAL_FIRST);
+                ret = afr_set_pending_dict (priv, xattr[i],
+                                            local->pending);
 
                 if (ret < 0)
                         gf_log (this->name, GF_LOG_INFO,
@@ -1066,8 +895,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                 {
                         if (local->optimistic_change_log) {
                                 afr_changelog_pre_op_cbk (frame, (void *)(long)i,
-                                                          this, 1, 0, xattr[i],
-                                                          NULL);
+                                                          this, 1, 0, xattr[i]);
                                 break;
                         }
 
@@ -1078,8 +906,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                                                    priv->children[i],
                                                    priv->children[i]->fops->fxattrop,
                                                    local->fd,
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                         else
                                 STACK_WIND_COOKIE (frame,
                                                    afr_changelog_pre_op_cbk,
@@ -1087,8 +914,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                                                    priv->children[i],
                                                    priv->children[i]->fops->xattrop,
                                                    &local->transaction.parent_loc,
-                                                   GF_XATTROP_ADD_ARRAY, xattr[i],
-                                                   NULL);
+                                                   GF_XATTROP_ADD_ARRAY, xattr[i]);
                 }
                 break;
                 }
@@ -1096,7 +922,7 @@ afr_changelog_pre_op (call_frame_t *frame, xlator_t *this)
                 if (!--call_count)
                         break;
         }
-out:
+
         for (i = 0; i < priv->child_count; i++) {
                 dict_unref (xattr[i]);
         }
@@ -1250,14 +1076,12 @@ int
 afr_set_transaction_flock (afr_local_t *local)
 {
         afr_internal_lock_t *int_lock = NULL;
-        afr_inodelk_t       *inodelk  = NULL;
 
         int_lock = &local->internal_lock;
-        inodelk = afr_get_inodelk (int_lock, int_lock->domain);
 
-        inodelk->flock.l_len   = local->transaction.len;
-        inodelk->flock.l_start = local->transaction.start;
-        inodelk->flock.l_type  = F_WRLCK;
+        int_lock->lk_flock.l_len   = local->transaction.len;
+        int_lock->lk_flock.l_start = local->transaction.start;
+        int_lock->lk_flock.l_type  = F_WRLCK;
 
         return 0;
 }
@@ -1272,7 +1096,6 @@ afr_lock_rec (call_frame_t *frame, xlator_t *this)
         int_lock = &local->internal_lock;
 
         int_lock->transaction_lk_type = AFR_TRANSACTION_LK;
-        int_lock->domain = this->name;
 
         switch (local->transaction.type) {
         case AFR_DATA_TRANSACTION:
@@ -1286,8 +1109,8 @@ afr_lock_rec (call_frame_t *frame, xlator_t *this)
 
         case AFR_ENTRY_RENAME_TRANSACTION:
 
-                int_lock->lock_cbk = afr_post_nonblocking_entrylk_cbk;
-                afr_nonblocking_entrylk (frame, this);
+                int_lock->lock_cbk = afr_post_blocking_rename_cbk;
+                afr_blocking_lock (frame, this);
                 break;
 
         case AFR_ENTRY_TRANSACTION:
@@ -1309,6 +1132,12 @@ afr_lock_rec (call_frame_t *frame, xlator_t *this)
 int
 afr_lock (call_frame_t *frame, xlator_t *this)
 {
+        afr_pid_save (frame);
+
+        frame->root->pid = (long) frame->root;
+
+        afr_set_lk_owner (frame, this);
+
         afr_set_lock_number (frame, this);
 
         return afr_lock_rec (frame, this);
@@ -1320,463 +1149,28 @@ afr_lock (call_frame_t *frame, xlator_t *this)
 int
 afr_internal_lock_finish (call_frame_t *frame, xlator_t *this)
 {
-        if (__fop_changelog_needed (frame, this)) {
-                afr_changelog_pre_op (frame, this);
-        } else {
-                afr_transaction_perform_fop (frame, this);
-        }
-
-        return 0;
-}
-
-
-void
-afr_set_delayed_post_op (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t    *local = NULL;
-        afr_private_t  *priv = NULL;
-
-        /* call this function from any of the related optimizations
-           which benefit from delaying post op are enabled, namely:
-
-           - changelog piggybacking
-           - eager locking
-        */
-
-        priv = this->private;
-        if (!priv)
-                return;
-
-        if (!priv->post_op_delay_secs)
-                return;
-
-        local = frame->local;
-        if (!local->transaction.eager_lock_on)
-                return;
-
-        if (!local)
-                return;
-
-        if (!local->fd)
-                return;
-
-        if (local->op == GF_FOP_WRITE)
-                local->delayed_post_op = _gf_true;
-}
-
-gf_boolean_t
-afr_are_multiple_fds_opened (inode_t *inode, xlator_t *this)
-{
-        afr_inode_ctx_t *ictx = NULL;
-
-        if (!inode) {
-                /* If false is returned, it may keep on taking eager-lock
-                 * which may lead to starvation, so return true to avoid that.
-                 */
-                gf_log_callingfn (this->name, GF_LOG_ERROR, "Invalid inode");
-                return _gf_true;
-        }
-        /* Lets say mount1 has eager-lock(full-lock) and after the eager-lock
-         * is taken mount2 opened the same file, it won't be able to
-         * perform any data operations until mount1 releases eager-lock.
-         * To avoid such scenario do not enable eager-lock for this transaction
-         * if open-fd-count is > 1
-         */
-
-        ictx = afr_inode_ctx_get (inode, this);
-        if (!ictx)
-                return _gf_true;
-
-        if (ictx->open_fd_count > 1)
-                return _gf_true;
-
-        return _gf_false;
-}
-
-gf_boolean_t
-afr_any_fops_failed (afr_local_t *local, afr_private_t *priv)
-{
-        if (local->success_count != priv->child_count)
-                return _gf_true;
-        return _gf_false;
-}
-
-gf_boolean_t
-is_afr_delayed_changelog_post_op_needed (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t      *local = NULL;
-        gf_boolean_t      res = _gf_false;
-        afr_private_t    *priv  = NULL;
+        afr_local_t   *local = NULL;
+        afr_private_t *priv  = NULL;
 
         priv  = this->private;
-
-        local = frame->local;
-        if (!local)
-                goto out;
-
-        if (!local->delayed_post_op)
-                goto out;
-
-        //Mark pending changelog ASAP
-        if (afr_any_fops_failed (local, priv))
-                goto out;
-
-        if (local->fd && afr_are_multiple_fds_opened (local->fd->inode, this))
-                goto out;
-
-        res = _gf_true;
-out:
-        return res;
-}
-
-
-void
-afr_delayed_changelog_post_op (xlator_t *this, call_frame_t *frame, fd_t *fd,
-                               call_stub_t *stub);
-
-void
-afr_delayed_changelog_wake_up_cbk (void *data)
-{
-        fd_t           *fd = NULL;
-
-        fd = data;
-
-        afr_delayed_changelog_wake_up (THIS, fd);
-}
-
-
-/*
-  Check if the frame is destined to get optimized away
-  with changelog piggybacking
-*/
-static gf_boolean_t
-is_piggyback_post_op (call_frame_t *frame, fd_t *fd)
-{
-        afr_fd_ctx_t *fdctx = NULL;
-        afr_local_t *local = NULL;
-        gf_boolean_t piggyback = _gf_true;
-        afr_private_t *priv = NULL;
-        int i = 0;
-
-        priv = frame->this->private;
         local = frame->local;
-        fdctx = afr_fd_ctx_get (fd, frame->this);
-
-        LOCK(&fd->lock);
-        {
-                piggyback = _gf_true;
-
-                for (i = 0; i < priv->child_count; i++) {
-                        if (!local->transaction.pre_op[i])
-                                continue;
-                        if (fdctx->pre_op_piggyback[i]) {
-                                fdctx->pre_op_piggyback[i]--;
-                                local->transaction.postop_piggybacked[i] = 1;
-                        } else {
-                                /* For at least _one_ subvolume we cannot
-                                   piggyback on the changelog, and have to
-                                   perform a hard POST-OP and therefore fsync
-                                   if necesssary
-                                */
-                                piggyback = _gf_false;
-                                GF_ASSERT (fdctx->pre_op_done[i]);
-                                fdctx->pre_op_done[i]--;
-                        }
-                }
-        }
-        UNLOCK(&fd->lock);
-
-        if (!afr_txn_nothing_failed (frame, frame->this)) {
-                /* something failed in this transaction,
-                   we will be performing a hard post-op
-                */
-                return _gf_false;
-        }
-
-        return piggyback;
-}
-
-
-/* SET operation */
-int
-afr_fd_report_unstable_write (xlator_t *this, fd_t *fd)
-{
-        afr_fd_ctx_t *fdctx = NULL;
-
-        fdctx = afr_fd_ctx_get (fd, this);
-
-        LOCK(&fd->lock);
-        {
-                fdctx->witnessed_unstable_write = _gf_true;
-        }
-        UNLOCK(&fd->lock);
-
-        return 0;
-}
-
-/* TEST and CLEAR operation */
-gf_boolean_t
-afr_fd_has_witnessed_unstable_write (xlator_t *this, fd_t *fd)
-{
-        afr_fd_ctx_t *fdctx = NULL;
-        gf_boolean_t witness = _gf_false;
-
-	fdctx = afr_fd_ctx_get (fd, this);
-        if (!fdctx)
-                return _gf_true;
-
-        LOCK(&fd->lock);
-        {
-                if (fdctx->witnessed_unstable_write) {
-                        witness = _gf_true;
-                        fdctx->witnessed_unstable_write = _gf_false;
-                }
-        }
-        UNLOCK (&fd->lock);
-
-        return witness;
-}
-
 
-int
-afr_changelog_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                         int op_ret, int op_errno, struct iatt *pre,
-                         struct iatt *post, dict_t *xdata)
-{
-        afr_private_t *priv = NULL;
-        int child_index = (long) cookie;
-        int call_count = -1;
-        afr_local_t *local = NULL;
-
-        priv = this->private;
-        local = frame->local;
+        if (__changelog_needed_pre_op (frame, this)) {
+                afr_changelog_pre_op (frame, this);
+        } else {
+                __mark_all_success (local->pending, priv->child_count,
+                                    local->transaction.type);
 
-        if (afr_fop_failed (op_ret, op_errno)) {
-                /* Failure of fsync() is as good as failure of previous
-                   write(). So treat it like one.
-                */
-                gf_log (this->name, GF_LOG_WARNING,
-                        "fsync(%s) failed on subvolume %s. Transaction was %s",
-                        uuid_utoa (local->fd->inode->gfid),
-                        priv->children[child_index]->name,
-                        gf_fop_list[local->op]);
+                afr_pid_restore (frame);
 
-                afr_transaction_fop_failed (frame, this, child_index);
+                local->transaction.fop (frame, this);
         }
 
-        call_count = afr_frame_return (frame);
-
-        if (call_count == 0)
-                afr_changelog_post_op_now (frame, this);
-
         return 0;
 }
 
 
 int
-afr_changelog_fsync (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t *local = NULL;
-        int i = 0;
-        int call_count = 0;
-        afr_private_t *priv = NULL;
- 	dict_t *xdata = NULL;
- 	GF_UNUSED int ret = -1;
-
-        local = frame->local;
-        priv = this->private;
-
-        call_count = afr_pre_op_done_children_count (local->transaction.pre_op,
-                                                     priv->child_count);
-
-        if (!call_count) {
-                /* will go straight to unlock */
-                afr_changelog_post_op_now (frame, this);
-                return 0;
-        }
-
-        local->call_count = call_count;
-
-	xdata = dict_new();
-	if (xdata)
-		ret = dict_set_int32 (xdata, "batch-fsync", 1);
-
-        for (i = 0; i < priv->child_count; i++) {
-                if (!local->transaction.pre_op[i])
-                        continue;
-
-                STACK_WIND_COOKIE (frame, afr_changelog_fsync_cbk,
-                                (void *) (long) i, priv->children[i],
-                                priv->children[i]->fops->fsync, local->fd,
-                                1, xdata);
-                if (!--call_count)
-                        break;
-        }
-
-	if (xdata)
-		dict_unref (xdata);
-
-        return 0;
-}
-
-
-        int
-afr_changelog_post_op_safe (call_frame_t *frame, xlator_t *this)
-{
-	afr_local_t    *local = NULL;
-        afr_private_t  *priv = NULL;
-
-	local = frame->local;
-        priv = this->private;
-
-        if (!local->fd || local->transaction.type != AFR_DATA_TRANSACTION) {
-                afr_changelog_post_op_now (frame, this);
-                return 0;
-        }
-
-        if (is_piggyback_post_op (frame, local->fd)) {
-                /* just detected that this post-op is about to
-                   be optimized away as a new write() has
-                   already piggybacked on this frame's changelog.
-                   */
-                afr_changelog_post_op_now (frame, this);
-                return 0;
-        }
-
-        /* Calling afr_changelog_post_op_now() now will result in
-           issuing ->[f]xattrop().
-
-           Performing a hard POST-OP (->[f]xattrop() FOP) is a more
-           responsible operation that what it might appear on the surface.
-
-           The changelog of a file (in the xattr of the file on the server)
-           stores information (pending count) about the state of the file
-           on the OTHER server. This changelog is blindly trusted, and must
-           therefore be updated in such a way it remains trustworthy. This
-           implies that decrementing the pending count (essentially "clearing
-           the dirty flag") must be done STRICTLY after we are sure that the
-           operation on the other server has reached stable storage.
-
-           While the backend filesystem on that server will eventually flush
-           it to stable storage, we (being in userspace) have no mechanism
-           to get notified when the write became "stable".
-
-           This means we need take matter into our own hands and issue an
-           fsync() EVEN IF THE APPLICATION WAS PERFORMING UNSTABLE WRITES,
-           and get an acknowledgement for it. And we need to wait for the
-           fsync() acknowledgement before initiating the hard POST-OP.
-
-           However if the FD itself was opened in O_SYNC or O_DSYNC then
-           we are already guaranteed that the writes were made stable as
-           part of the FOP itself. The same holds true for NFS stable
-           writes which happen on an anonymous FD with O_DSYNC or O_SYNC
-           flag set in the writev() @flags param. For all other write types,
-           mark a flag in the fdctx whenever an unstable write is witnessed.
-           */
-
-        if (!afr_fd_has_witnessed_unstable_write (this, local->fd)) {
-                afr_changelog_post_op_now (frame, this);
-                return 0;
-        }
-
-        /* Check whether users want durability and perform fsync/post-op
-         * accordingly.
-         */
-        if (priv->ensure_durability) {
-                /* Time to fsync() */
-                afr_changelog_fsync (frame, this);
-        } else {
-                afr_changelog_post_op_now (frame, this);
-        }
-
-        return 0;
-}
-
-
-void
-afr_delayed_changelog_post_op (xlator_t *this, call_frame_t *frame, fd_t *fd,
-                               call_stub_t *stub)
-{
-	afr_fd_ctx_t      *fd_ctx = NULL;
-	call_frame_t      *prev_frame = NULL;
-	struct timespec    delta = {0, };
-	afr_private_t     *priv = NULL;
-	afr_local_t       *local = NULL;
-
-	priv = this->private;
-
-	fd_ctx = afr_fd_ctx_get (fd, this);
-	if (!fd_ctx)
-                goto out;
-
-	delta.tv_sec = priv->post_op_delay_secs;
-	delta.tv_nsec = 0;
-
-	pthread_mutex_lock (&fd_ctx->delay_lock);
-	{
-		prev_frame = fd_ctx->delay_frame;
-		fd_ctx->delay_frame = NULL;
-		if (fd_ctx->delay_timer)
-			gf_timer_call_cancel (this->ctx, fd_ctx->delay_timer);
-		fd_ctx->delay_timer = NULL;
-		if (!frame)
-			goto unlock;
-		fd_ctx->delay_timer = gf_timer_call_after (this->ctx, delta,
-							   afr_delayed_changelog_wake_up_cbk,
-							   fd);
-		fd_ctx->delay_frame = frame;
-	}
-unlock:
-	pthread_mutex_unlock (&fd_ctx->delay_lock);
-
-out:
-	if (prev_frame) {
-		local = prev_frame->local;
-		local->transaction.resume_stub = stub;
-		afr_changelog_post_op_safe (prev_frame, this);
-	} else if (stub) {
-		call_resume (stub);
-	}
-}
-
-
-void
-afr_changelog_post_op (call_frame_t *frame, xlator_t *this)
-{
-        afr_local_t  *local = NULL;
-
-        local = frame->local;
-
-        if (is_afr_delayed_changelog_post_op_needed (frame, this))
-                afr_delayed_changelog_post_op (this, frame, local->fd, NULL);
-        else
-                afr_changelog_post_op_safe (frame, this);
-}
-
-
-
-/* Wake up the sleeping/delayed post-op, and also register
-   a stub to have it resumed after this transaction
-   completely finishes.
-
-   The @stub gets saved in @local and gets resumed in
-   afr_local_cleanup()
-   */
-void
-afr_delayed_changelog_wake_resume (xlator_t *this, fd_t *fd, call_stub_t *stub)
-{
-        afr_delayed_changelog_post_op (this, NULL, fd, stub);
-}
-
-
-void
-afr_delayed_changelog_wake_up (xlator_t *this, fd_t *fd)
-{
-        afr_delayed_changelog_post_op (this, NULL, fd, NULL);
-}
-
-
-        int
 afr_transaction_resume (call_frame_t *frame, xlator_t *this)
 {
         afr_internal_lock_t *int_lock = NULL;
@@ -1787,20 +1181,7 @@ afr_transaction_resume (call_frame_t *frame, xlator_t *this)
         int_lock = &local->internal_lock;
         priv     = this->private;
 
-        if (local->transaction.eager_lock_on) {
-                /* We don't need to retain "local" in the
-                   fd list anymore, writes to all subvols
-                   are finished by now */
-                LOCK (&local->fd->lock);
-                {
-                        list_del_init (&local->transaction.eager_locked);
-                }
-                UNLOCK (&local->fd->lock);
-        }
-
-        afr_restore_lk_owner (frame);
-
-        if (__fop_changelog_needed (frame, this)) {
+        if (__changelog_needed_post_op (frame, this)) {
                 afr_changelog_post_op (frame, this);
         } else {
                 if (afr_lock_server_count (priv, local->transaction.type) == 0) {
@@ -1820,8 +1201,7 @@ afr_transaction_resume (call_frame_t *frame, xlator_t *this)
  */
 
 void
-afr_transaction_fop_failed (call_frame_t *frame, xlator_t *this,
-                            int child_index)
+afr_transaction_fop_failed (call_frame_t *frame, xlator_t *this, int child_index)
 {
         afr_local_t *   local = NULL;
         afr_private_t * priv  = NULL;
@@ -1830,89 +1210,7 @@ afr_transaction_fop_failed (call_frame_t *frame, xlator_t *this,
         priv  = this->private;
 
         __mark_child_dead (local->pending, priv->child_count,
-                        child_index, local->transaction.type);
-}
-
-
-
-        static gf_boolean_t
-afr_locals_overlap (afr_local_t *local1, afr_local_t *local2)
-{
-        uint64_t start1 = local1->transaction.start;
-        uint64_t start2 = local2->transaction.start;
-        uint64_t end1 = 0;
-        uint64_t end2 = 0;
-
-        if (local1->transaction.len)
-                end1 = start1 + local1->transaction.len - 1;
-        else
-                end1 = ULLONG_MAX;
-
-        if (local2->transaction.len)
-                end2 = start2 + local2->transaction.len - 1;
-        else
-                end2 = ULLONG_MAX;
-
-        return ((end1 >= start2) && (end2 >= start1));
-}
-
-void
-afr_transaction_eager_lock_init (afr_local_t *local, xlator_t *this)
-{
-        afr_private_t *priv = NULL;
-        afr_fd_ctx_t  *fdctx = NULL;
-        afr_local_t   *each = NULL;
-
-        priv = this->private;
-
-        if (!local->fd)
-                return;
-
-        if (local->transaction.type != AFR_DATA_TRANSACTION)
-                return;
-
-        if (!priv->eager_lock)
-                return;
-
-        fdctx = afr_fd_ctx_get (local->fd, this);
-        if (!fdctx)
-                return;
-
-        if (afr_are_multiple_fds_opened (local->fd->inode, this))
-                return;
-        /*
-         * Once full file lock is acquired in eager-lock phase, overlapping
-         * writes do not compete for inode-locks, instead are transferred to the
-         * next writes. Because of this overlapping writes are not ordered.
-         * This can cause inconsistencies in replication.
-         * Example:
-         * Two overlapping writes w1, w2 are sent in parallel on same fd
-         * in two threads t1, t2.
-         * Both threads can execute afr_writev_wind in the following manner.
-         * t1 winds w1 on brick-0
-         * t2 winds w2 on brick-0
-         * t2 winds w2 on brick-1
-         * t1 winds w1 on brick-1
-         *
-         * This check makes sure the locks are not transferred for
-         * overlapping writes.
-         */
-        LOCK (&local->fd->lock);
-        {
-                list_for_each_entry (each, &fdctx->eager_locked,
-                                     transaction.eager_locked) {
-                        if (afr_locals_overlap (each, local)) {
-                                local->transaction.eager_lock_on = _gf_false;
-                                goto unlock;
-                        }
-                }
-
-                local->transaction.eager_lock_on = _gf_true;
-                list_add_tail (&local->transaction.eager_locked,
-                               &fdctx->eager_locked);
-        }
-unlock:
-        UNLOCK (&local->fd->lock);
+                           child_index, local->transaction.type);
 }
 
 
@@ -1921,43 +1219,20 @@ afr_transaction (call_frame_t *frame, xlator_t *this, afr_transaction_type type)
 {
         afr_local_t *   local = NULL;
         afr_private_t * priv  = NULL;
-        fd_t            *fd   = NULL;
-        int             ret   = -1;
 
         local = frame->local;
         priv  = this->private;
 
+        afr_transaction_local_init (local, priv);
+
         local->transaction.resume = afr_transaction_resume;
         local->transaction.type   = type;
 
-        ret = afr_transaction_local_init (local, this);
-        if (ret < 0)
-            goto out;
-
-        afr_transaction_eager_lock_init (local, this);
-
-        if (local->fd && local->transaction.eager_lock_on)
-                afr_set_lk_owner (frame, this, local->fd);
-        else
-                afr_set_lk_owner (frame, this, frame->root);
-
-        if (!local->transaction.eager_lock_on && local->loc.inode) {
-                fd = fd_lookup (local->loc.inode, frame->root->pid);
-                if (fd == NULL)
-                        fd = fd_lookup_anonymous (local->loc.inode);
-
-                if (fd) {
-                        afr_delayed_changelog_wake_up (this, fd);
-                        fd_unref (fd);
-                }
-        }
-
         if (afr_lock_server_count (priv, local->transaction.type) == 0) {
                 afr_internal_lock_finish (frame, this);
         } else {
                 afr_lock (frame, this);
         }
-        ret = 0;
-out:
-        return ret;
+
+        return 0;
 }
diff --git a/xlators/cluster/afr/src/afr-transaction.h b/xlators/cluster/afr/src/afr-transaction.h
index fa626fd0d..4b4428cc5 100644
--- a/xlators/cluster/afr/src/afr-transaction.h
+++ b/xlators/cluster/afr/src/afr-transaction.h
@@ -1,21 +1,25 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __TRANSACTION_H__
 #define __TRANSACTION_H__
 
-typedef enum {
-        LOCAL_FIRST = 1,
-        LOCAL_LAST = 2
-} afr_xattrop_type_t;
-
 void
 afr_transaction_fop_failed (call_frame_t *frame, xlator_t *this,
 			    int child_index);
@@ -23,29 +27,7 @@ afr_transaction_fop_failed (call_frame_t *frame, xlator_t *this,
 int
 afr_lock_server_count (afr_private_t *priv, afr_transaction_type type);
 
-afr_inodelk_t*
-afr_get_inodelk (afr_internal_lock_t *int_lock, char *dom);
-
 int32_t
 afr_transaction (call_frame_t *frame, xlator_t *this, afr_transaction_type type);
 
-afr_fd_ctx_t *
-afr_fd_ctx_get (fd_t *fd, xlator_t *this);
-int
-afr_set_pending_dict (afr_private_t *priv, dict_t *xattr, int32_t **pending,
-                      int child, afr_xattrop_type_t op);
-void
-afr_set_delayed_post_op (call_frame_t *frame, xlator_t *this);
-
-void
-afr_delayed_changelog_wake_up (xlator_t *this, fd_t *fd);
-
-void
-__mark_all_success (int32_t *pending[], int child_count,
-                    afr_transaction_type type);
-gf_boolean_t
-afr_any_fops_failed (afr_local_t *local, afr_private_t *priv);
-
-gf_boolean_t
-afr_txn_nothing_failed (call_frame_t *frame, xlator_t *this);
 #endif /* __TRANSACTION_H__ */
diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c
index c724eb2ae..a662037e7 100644
--- a/xlators/cluster/afr/src/afr.c
+++ b/xlators/cluster/afr/src/afr.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #include <libgen.h>
@@ -21,11 +30,6 @@
 #endif
 #include "afr-common.c"
 
-#define SHD_INODE_LRU_LIMIT          2048
-#define AFR_EH_HEALED_LIMIT          1024
-#define AFR_EH_HEAL_FAIL_LIMIT       1024
-#define AFR_EH_SPLIT_BRAIN_LIMIT     1024
-
 struct volume_options options[];
 
 int32_t
@@ -33,13 +37,8 @@ notify (xlator_t *this, int32_t event,
         void *data, ...)
 {
         int ret = -1;
-        va_list         ap;
-        void *data2 = NULL;
 
-        va_start (ap, data);
-        data2 = va_arg (ap, dict_t*);
-        va_end (ap);
-        ret = afr_notify (this, event, data, data2);
+        ret = afr_notify (this, event, data);
 
         return ret;
 }
@@ -63,139 +62,284 @@ mem_acct_init (xlator_t *this)
         return ret;
 }
 
-
 int
-xlator_subvolume_index (xlator_t *this, xlator_t *subvol)
+validate_options (xlator_t *this, char **op_errstr)
 {
-        int index = -1;
-        int i = 0;
-        xlator_list_t *list = NULL;
+        int                 ret = 0;
+        volume_opt_list_t  *vol_opt = NULL;
+        volume_opt_list_t  *tmp;
 
-        list = this->children;
-
-        while (list) {
-                if (subvol == list->xlator ||
-                    strcmp (subvol->name, list->xlator->name) == 0) {
-                        index = i;
-                        break;
-                }
-                list = list->next;
-                i++;
+        if (!this) {
+                gf_log (this->name, GF_LOG_DEBUG, "'this' not a valid ptr");
+                ret =-1;
+                goto out;
         }
 
-        return index;
-}
+        if (list_empty (&this->volume_options))
+                goto out;
 
-void
-fix_quorum_options (xlator_t *this, afr_private_t *priv, char *qtype)
-{
-        if (priv->quorum_count && strcmp(qtype,"fixed")) {
-                gf_log(this->name,GF_LOG_WARNING,
-                       "quorum-type %s overriding quorum-count %u",
-                       qtype, priv->quorum_count);
-        }
-        if (!strcmp(qtype,"none")) {
-                priv->quorum_count = 0;
-        }
-        else if (!strcmp(qtype,"auto")) {
-                priv->quorum_count = AFR_QUORUM_AUTO;
+        vol_opt = list_entry (this->volume_options.next,
+                              volume_opt_list_t, list);
+        list_for_each_entry_safe (vol_opt, tmp, &this->volume_options, list) {
+                ret = validate_xlator_volume_options_attacherr (this,
+                                                                vol_opt->given_opt,
+                                                                op_errstr);
         }
+
+out:
+
+        return ret;
 }
 
+
 int
 reconfigure (xlator_t *this, dict_t *options)
 {
-        afr_private_t *priv        = NULL;
-        xlator_t      *read_subvol = NULL;
-        int            read_subvol_index = -1;
-        int            ret         = -1;
-        int            index       = -1;
-        char          *qtype       = NULL;
+
+        gf_boolean_t metadata_self_heal;   /* on/off */
+        gf_boolean_t entry_self_heal;
+        gf_boolean_t data_self_heal;
+        gf_boolean_t data_change_log;       /* on/off */
+        gf_boolean_t metadata_change_log;   /* on/off */
+        gf_boolean_t entry_change_log;      /* on/off */
+        gf_boolean_t strict_readdir;
+
+        afr_private_t * priv        = NULL;
+        xlator_list_t * trav        = NULL;
+
+        char * read_subvol     = NULL;
+        char * self_heal       = NULL;
+        char * change_log      = NULL;
+        char * str_readdir     = NULL;
+        char * self_heal_algo  = NULL;
+
+        int32_t background_count  = 0;
+        int32_t window_size       = 0;
+
+        int    read_ret      = -1;
+        int    dict_ret      = -1;
+        int    flag          = 1;
+        int    ret           = 0;
+        int    temp_ret      = -1;
 
         priv = this->private;
 
-        GF_OPTION_RECONF ("background-self-heal-count",
-                          priv->background_self_heal_count, options, uint32,
-                          out);
+        dict_ret = dict_get_int32 (options, "background-self-heal-count",
+                                   &background_count);
+        if (dict_ret == 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring background self-heal count to %d",
+                        background_count);
+
+                priv->background_self_heal_count = background_count;
+        }
 
-        GF_OPTION_RECONF ("metadata-self-heal",
-                          priv->metadata_self_heal, options, bool, out);
+        dict_ret = dict_get_str (options, "metadata-self-heal",
+                                 &self_heal);
+        if (dict_ret == 0) {
+                temp_ret = gf_string2boolean (self_heal, &metadata_self_heal);
+                if (temp_ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Reconfiguration Invalid 'option metadata"
+                                "-self-heal %s'. Defaulting to old value.",
+                                self_heal);
+                        ret = -1;
+                        goto out;
+                }
 
-        GF_OPTION_RECONF ("data-self-heal", priv->data_self_heal, options, str,
-                          out);
+                priv->metadata_self_heal = metadata_self_heal;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring 'option metadata"
+                        "-self-heal %s'.",
+                        self_heal);
+        }
 
-        GF_OPTION_RECONF ("entry-self-heal", priv->entry_self_heal, options,
-                          bool, out);
+        dict_ret = dict_get_str (options, "data-self-heal", &self_heal);
+        if (dict_ret == 0) {
+                temp_ret = gf_string2boolean (self_heal, &data_self_heal);
+                if (temp_ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Reconfiguration Invalid 'option data"
+                                "-self-heal %s'. Defaulting to old value.",
+                                self_heal);
+                        ret = -1;
+                        goto out;
+                }
 
-        GF_OPTION_RECONF ("strict-readdir", priv->strict_readdir, options, bool,
-                          out);
+                priv->data_self_heal = data_self_heal;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring 'option data"
+                        "-self-heal %s'.", self_heal);
+        }
 
-        GF_OPTION_RECONF ("data-self-heal-window-size",
-                          priv->data_self_heal_window_size, options,
-                          uint32, out);
+        dict_ret = dict_get_str (options, "entry-self-heal",
+                                 &self_heal);
+        if (dict_ret == 0) {
+                temp_ret = gf_string2boolean (self_heal, &entry_self_heal);
+                if (temp_ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Reconfiguration Invalid 'option data"
+                                "-self-heal %s'. Defaulting to old value.",
+                                self_heal);
+                        ret = -1;
+                        goto out;
+                }
 
-        GF_OPTION_RECONF ("data-change-log", priv->data_change_log, options,
-                          bool, out);
+                priv->entry_self_heal = entry_self_heal;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring 'option entry"
+                        "-self-heal %s'.", self_heal);
+        }
 
-        GF_OPTION_RECONF ("metadata-change-log",
-                          priv->metadata_change_log, options, bool, out);
 
-        GF_OPTION_RECONF ("entry-change-log", priv->entry_change_log, options,
-                          bool, out);
+        dict_ret = dict_get_str (options, "strict-readdir",
+                                 &str_readdir);
+        if (dict_ret == 0) {
+                temp_ret = gf_string2boolean (str_readdir, &strict_readdir);
+                if (temp_ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option strict-readdir %s'. "
+                                "Defaulting to old value.",
+                                str_readdir);
+                        ret = -1;
+                        goto out;
+                }
 
-        GF_OPTION_RECONF ("data-self-heal-algorithm",
-                          priv->data_self_heal_algorithm, options, str, out);
+                priv->strict_readdir = strict_readdir;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring 'option strict"
+                        "-readdir %s'.", str_readdir);
+        }
 
-        GF_OPTION_RECONF ("self-heal-daemon", priv->shd.enabled, options, bool, out);
+        dict_ret = dict_get_int32 (options, "data-self-heal-window-size",
+                                   &window_size);
+        if (dict_ret == 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring, Setting data self-heal window size to %d",
+                        window_size);
 
-        GF_OPTION_RECONF ("read-subvolume", read_subvol, options, xlator, out);
+                priv->data_self_heal_window_size = window_size;
+        }
+        else {
+                priv->data_self_heal_window_size = 16;
+        }
 
-        GF_OPTION_RECONF ("read-hash-mode", priv->hash_mode,
-                          options, uint32, out);
 
-        if (read_subvol) {
-                index = xlator_subvolume_index (this, read_subvol);
-                if (index == -1) {
-                        gf_log (this->name, GF_LOG_ERROR, "%s not a subvolume",
-                                read_subvol->name);
+        dict_ret = dict_get_str (options, "data-change-log", &change_log);
+        if (dict_ret == 0) {
+                temp_ret = gf_string2boolean (change_log, &data_change_log);
+                if (temp_ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Reconfiguration Invalid 'option data-"
+                                "change-log %s'. Defaulting to old value.",
+                                change_log);
+                        ret = -1;
                         goto out;
                 }
-                priv->read_child = index;
+
+                priv->data_change_log = data_change_log;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring 'option data-"
+                        "change-log %s'.", change_log);
         }
 
-        GF_OPTION_RECONF ("read-subvolume-index",read_subvol_index, options,int32,out);
+        dict_ret = dict_get_str (options, "metadata-change-log",
+                                 &change_log);
+        if (dict_ret == 0) {
+                temp_ret = gf_string2boolean (change_log,
+                                              &metadata_change_log);
+                if (temp_ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option metadata-change-log %s'. "
+                                "Defaulting to metadata-change-log as 'off'.",
+                                change_log);
+                        ret = -1;
+                        goto out;
+                }
+
+                priv->metadata_change_log = metadata_change_log;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring 'option metadata-"
+                        "change-log %s'.", change_log);
+        }
 
-        if (read_subvol_index >-1) {
-                index=read_subvol_index;
-                if (index >= priv->child_count) {
-                        gf_log (this->name, GF_LOG_ERROR, "%d not a subvolume-index",
-                                index);
+        dict_ret = dict_get_str (options, "entry-change-log",
+                                 &change_log);
+        if (dict_ret == 0) {
+                temp_ret = gf_string2boolean (change_log, &entry_change_log);
+                if (temp_ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option entry-change-log %s'. "
+                                "Defaulting to entry-change-log as 'on'.",
+                                change_log);
+                        ret = -1;
                         goto out;
                 }
-                priv->read_child = index;
+
+                priv->entry_change_log = entry_change_log;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Reconfiguring 'option entry-"
+                        "change-log %s'.", change_log);
+        }
+
+        dict_ret = dict_get_str (options, "data-self-heal-algorithm",
+                                 &self_heal_algo);
+        if (dict_ret == 0) {
+                /* Handling both strcmp cases - s1 > s2 and s1 < s2 */
+
+                if (!strcmp (self_heal_algo, "full")) {
+                        priv->data_self_heal_algorithm = self_heal_algo;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "Reconfiguring 'option data-self"
+                                "heal-algorithm %s'.", self_heal_algo);
+                        goto next;
+                }
+
+                if (!strcmp (self_heal_algo, "diff")) {
+                        priv->data_self_heal_algorithm = self_heal_algo;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "Reconfiguring 'option data-self"
+                                "heal-algorithm %s'.", self_heal_algo);
+                        goto next;
+                }
+
+                gf_log (this->name, GF_LOG_WARNING,
+                        "Invalid self-heal algorithm %s,"
+                        "defaulting back to old value",
+                        self_heal_algo);
+                ret = -1;
+                goto out;
         }
 
-        GF_OPTION_RECONF ("eager-lock", priv->eager_lock, options, bool, out);
-        GF_OPTION_RECONF ("quorum-type", qtype, options, str, out);
-        GF_OPTION_RECONF ("quorum-count", priv->quorum_count, options,
-                          uint32, out);
-        fix_quorum_options(this,priv,qtype);
-        GF_OPTION_RECONF ("heal-timeout", priv->shd.timeout, options,
-                          int32, out);
+        read_ret = dict_get_str (options, "read-subvolume", &read_subvol);
 
-	GF_OPTION_RECONF ("post-op-delay-secs", priv->post_op_delay_secs, options,
-			  uint32, out);
+        if (read_ret < 0)
+                goto next;// No need to traverse, hence set the next option
 
-        GF_OPTION_RECONF (AFR_SH_READDIR_SIZE_KEY, priv->sh_readdir_size,
-                          options, size, out);
-        /* Reset this so we re-discover in case the topology changed.  */
-        GF_OPTION_RECONF ("readdir-failover", priv->readdir_failover, options,
-                          bool, out);
-        GF_OPTION_RECONF ("ensure-durability", priv->ensure_durability, options,
-                          bool, out);
-        priv->did_discovery = _gf_false;
+        trav = this->children;
+        flag = 0;
+        while (trav) {
+                if (!read_ret && !strcmp (read_subvol, trav->xlator->name)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "Subvolume '%s' specified as read child.",
+                                trav->xlator->name);
+
+                        flag = 1;
+                        break;
+                }
 
-        ret = 0;
+                trav = trav->next;
+        }
+
+        if (flag == 0 ) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Invalid 'option read-subvolume %s', no such subvolume"
+                        , read_subvol);
+                ret = -1;
+                goto out;
+        }
+
+next:
 out:
         return ret;
 
@@ -210,20 +354,39 @@ static const char *favorite_child_warning_str = "You have specified subvolume '%
         "subvolumes. All versions of the file except that on '%s' "
         "WILL BE LOST.";
 
+static const char *no_lock_servers_warning_str = "You have set lock-server-count = 0. "
+        "This means correctness is NO LONGER GUARANTEED in all cases. If two or more "
+        "applications write to the same region of a file, there is a possibility that "
+        "its copies will be INCONSISTENT. Set it to a value greater than 0 unless you "
+        "are ABSOLUTELY SURE of what you are doing and WILL NOT HOLD GlusterFS "
+        "RESPONSIBLE for inconsistent data. If you are in doubt, set it to a value "
+        "greater than 0.";
 
 int32_t
 init (xlator_t *this)
 {
-        afr_private_t *priv        = NULL;
-        int            child_count = 0;
-        xlator_list_t *trav        = NULL;
-        int            i           = 0;
-        int            ret         = -1;
-        GF_UNUSED int  op_errno    = 0;
-        xlator_t      *read_subvol = NULL;
-        int            read_subvol_index = -1;
-        xlator_t      *fav_child   = NULL;
-        char          *qtype       = NULL;
+        afr_private_t * priv        = NULL;
+        int             child_count = 0;
+        xlator_list_t * trav        = NULL;
+        int             i           = 0;
+        int             ret         = -1;
+        int             op_errno    = 0;
+        char * read_subvol     = NULL;
+        char * fav_child       = NULL;
+        char * self_heal       = NULL;
+        char * algo            = NULL;
+        char * change_log      = NULL;
+        char * strict_readdir  = NULL;
+        char * inodelk_trace   = NULL;
+        char * entrylk_trace   = NULL;
+        char * def_val         = NULL;
+        int32_t background_count  = 0;
+        int32_t lock_server_count = 1;
+        int32_t window_size       = 0;
+        int    fav_ret       = -1;
+        int    read_ret      = -1;
+        int    dict_ret      = -1;
+
 
         if (!this->children) {
                 gf_log (this->name, GF_LOG_ERROR,
@@ -237,111 +400,288 @@ init (xlator_t *this)
                         "Volume is dangling.");
         }
 
-	this->private = GF_CALLOC (1, sizeof (afr_private_t),
-                                   gf_afr_mt_afr_private_t);
-        if (!this->private)
-                goto out;
+        ALLOC_OR_GOTO (this->private, afr_private_t, out);
 
         priv = this->private;
-        LOCK_INIT (&priv->lock);
-        LOCK_INIT (&priv->read_child_lock);
-        //lock recovery is not done in afr
-        pthread_mutex_init (&priv->mutex, NULL);
-        INIT_LIST_HEAD (&priv->saved_fds);
 
-        child_count = xlator_subvolume_count (this);
+        read_ret = dict_get_str (this->options, "read-subvolume", &read_subvol);
+        priv->read_child = -1;
 
-        priv->child_count = child_count;
+        fav_ret = dict_get_str (this->options, "favorite-child", &fav_child);
+        priv->favorite_child = -1;
 
-        priv->read_child = -1;
+        priv->background_self_heal_count = 16;
 
-        GF_OPTION_INIT ("read-subvolume", read_subvol, xlator, out);
-        if (read_subvol) {
-                priv->read_child = xlator_subvolume_index (this, read_subvol);
-                if (priv->read_child == -1) {
-                        gf_log (this->name, GF_LOG_ERROR, "%s not a subvolume",
-                                read_subvol->name);
-                        goto out;
+        dict_ret = dict_get_int32 (this->options, "background-self-heal-count",
+                                   &background_count);
+        if (dict_ret == 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Setting background self-heal count to %d",
+                        background_count);
+
+                priv->background_self_heal_count = background_count;
+        }
+
+        /* Default values */
+
+        priv->data_self_heal     = 1;
+        priv->metadata_self_heal = 1;
+        priv->entry_self_heal    = 1;
+
+        dict_ret = dict_get_str (this->options, "data-self-heal", &self_heal);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (self_heal, &priv->data_self_heal);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option data-self-heal %s'. "
+                                "Defaulting to data-self-heal as 'on'",
+                                self_heal);
+                        priv->data_self_heal = 1;
                 }
         }
-        GF_OPTION_INIT ("read-subvolume-index",read_subvol_index,int32,out);
-        if (read_subvol_index > -1) {
-                if (read_subvol_index >= priv->child_count) {
-                        gf_log (this->name, GF_LOG_ERROR, "%d not a subvolume-index",
-                                read_subvol_index);
+
+        if (xlator_get_volopt_info (&this->volume_options,
+                                    "data-self-heal-algorithm", &def_val, NULL)) {
+                gf_log (this->name, GF_LOG_ERROR, "Default value of "
+                                " data-self-heal-algorithm not found");
+                ret = -1;
+                goto out;
+        } else {
+                priv->data_self_heal_algorithm = def_val;
+        }
+        dict_ret = dict_get_str (this->options, "data-self-heal-algorithm",
+                                 &algo);
+        if (dict_ret == 0) {
+                priv->data_self_heal_algorithm = gf_strdup (algo);
+        }
+
+        if (xlator_get_volopt_info (&this->volume_options,
+                                    "data-self-heal-window-size",&def_val,
+                                    NULL)) {
+                gf_log (this->name, GF_LOG_ERROR, "Default value of "
+                          "data-self-heal-window-size not found");
+                ret = -1;
+                goto out;
+        } else {
+                if (gf_string2int32 (def_val,
+                                    (int *)&priv->data_self_heal_window_size)) {
+                        gf_log (this->name, GF_LOG_ERROR, "Default value of "
+                                 "data-self-heal-window-size  corrupt");
+                        ret = -1;
                         goto out;
                 }
-                priv->read_child = read_subvol_index;
         }
-        GF_OPTION_INIT ("choose-local", priv->choose_local, bool, out);
 
-        GF_OPTION_INIT ("read-hash-mode", priv->hash_mode, uint32, out);
+        dict_ret = dict_get_int32 (this->options, "data-self-heal-window-size",
+                                   &window_size);
+        if (dict_ret == 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Setting data self-heal window size to %d",
+                        window_size);
 
-        priv->favorite_child = -1;
-        GF_OPTION_INIT ("favorite-child", fav_child, xlator, out);
-        if (fav_child) {
-                priv->favorite_child = xlator_subvolume_index (this, fav_child);
-                if (priv->favorite_child == -1) {
-                        gf_log (this->name, GF_LOG_ERROR, "%s not a subvolume",
-                                fav_child->name);
-                        goto out;
+                priv->data_self_heal_window_size = window_size;
+        }
+
+        dict_ret = dict_get_str (this->options, "metadata-self-heal",
+                                 &self_heal);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (self_heal, &priv->metadata_self_heal);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option metadata-self-heal %s'. "
+                                "Defaulting to metadata-self-heal as 'on'.",
+                                self_heal);
+                        priv->metadata_self_heal = 1;
+                }
+        }
+
+        dict_ret = dict_get_str (this->options, "entry-self-heal", &self_heal);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (self_heal, &priv->entry_self_heal);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option entry-self-heal %s'. "
+                                "Defaulting to entry-self-heal as 'on'.",
+                                self_heal);
+                        priv->entry_self_heal = 1;
+                }
+        }
+
+        /* Change log options */
+
+        priv->data_change_log     = 1;
+        priv->metadata_change_log = 1;
+        priv->entry_change_log    = 1;
+        priv->optimistic_change_log = 1;
+
+        dict_ret = dict_get_str (this->options, "data-change-log",
+                                 &change_log);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (change_log, &priv->data_change_log);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option data-change-log %s'. "
+                                "Defaulting to data-change-log as 'on'.",
+                                change_log);
+                        priv->data_change_log = 1;
                 }
-                gf_log (this->name, GF_LOG_WARNING,
-                        favorite_child_warning_str, fav_child->name,
-                        fav_child->name, fav_child->name);
         }
 
+        dict_ret = dict_get_str (this->options, "metadata-change-log",
+                                 &change_log);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (change_log,
+                                         &priv->metadata_change_log);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option metadata-change-log %s'. "
+                                "Defaulting to metadata-change-log as 'off'.",
+                                change_log);
+                        priv->metadata_change_log = 0;
+                }
+        }
 
-        GF_OPTION_INIT ("background-self-heal-count",
-                        priv->background_self_heal_count, uint32, out);
+        dict_ret = dict_get_str (this->options, "entry-change-log",
+                                 &change_log);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (change_log, &priv->entry_change_log);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option entry-change-log %s'. "
+                                "Defaulting to entry-change-log as 'on'.",
+                                change_log);
+                        priv->entry_change_log = 1;
+                }
+        }
 
-        GF_OPTION_INIT ("data-self-heal", priv->data_self_heal, str, out);
+        dict_ret = dict_get_str (this->options, "optimistic-change-log",
+                                 &change_log);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (change_log, &priv->optimistic_change_log);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option optimistic-change-log %s'. "
+                                "Defaulting to optimistic-change-log as 'on'.",
+                                change_log);
+                        priv->optimistic_change_log = 1;
+                }
+        }
 
-        GF_OPTION_INIT ("data-self-heal-algorithm",
-                        priv->data_self_heal_algorithm, str, out);
+        /* Locking options */
 
-        GF_OPTION_INIT ("data-self-heal-window-size",
-                        priv->data_self_heal_window_size, uint32, out);
+        priv->inodelk_trace = 0;
+        priv->entrylk_trace = 0;
 
-        GF_OPTION_INIT ("metadata-self-heal", priv->metadata_self_heal, bool,
-                        out);
+        dict_ret = dict_get_str (this->options, "inodelk-trace",
+                                 &inodelk_trace);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (inodelk_trace, &priv->inodelk_trace);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option inodelk-trace %s' ",
+                                inodelk_trace);
+
+                        priv->inodelk_trace = 0;
+                }
+        }
 
-        GF_OPTION_INIT ("entry-self-heal", priv->entry_self_heal, bool, out);
 
-        GF_OPTION_INIT ("self-heal-daemon", priv->shd.enabled, bool, out);
+        dict_ret = dict_get_str (this->options, "entrylk-trace",
+                                 &entrylk_trace);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (entrylk_trace, &priv->entrylk_trace);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option entrylk-trace %s' ",
+                                inodelk_trace);
 
-        GF_OPTION_INIT ("iam-self-heal-daemon", priv->shd.iamshd, bool, out);
+                        priv->entrylk_trace = 0;
+                }
+        }
 
-        GF_OPTION_INIT ("data-change-log", priv->data_change_log, bool, out);
 
-        GF_OPTION_INIT ("metadata-change-log", priv->metadata_change_log, bool,
-                        out);
+        priv->data_lock_server_count = 1;
+        priv->metadata_lock_server_count = 0;
+        priv->entry_lock_server_count = 1;
 
-        GF_OPTION_INIT ("entry-change-log", priv->entry_change_log, bool, out);
+        dict_ret = dict_get_int32 (this->options, "data-lock-server-count",
+                                   &lock_server_count);
+        if (dict_ret == 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Setting data lock server count to %d.",
+                        lock_server_count);
 
-        GF_OPTION_INIT ("optimistic-change-log", priv->optimistic_change_log,
-                        bool, out);
+                if (lock_server_count == 0)
+                        gf_log (this->name, GF_LOG_WARNING, "%s",
+                                no_lock_servers_warning_str);
 
-        GF_OPTION_INIT ("inodelk-trace", priv->inodelk_trace, bool, out);
+                priv->data_lock_server_count = lock_server_count;
+        }
 
-        GF_OPTION_INIT ("entrylk-trace", priv->entrylk_trace, bool, out);
 
-        GF_OPTION_INIT ("strict-readdir", priv->strict_readdir, bool, out);
+        dict_ret = dict_get_int32 (this->options,
+                                   "metadata-lock-server-count",
+                                   &lock_server_count);
+        if (dict_ret == 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Setting metadata lock server count to %d.",
+                        lock_server_count);
+                priv->metadata_lock_server_count = lock_server_count;
+        }
 
-        GF_OPTION_INIT ("eager-lock", priv->eager_lock, bool, out);
-        GF_OPTION_INIT ("quorum-type", qtype, str, out);
-        GF_OPTION_INIT ("quorum-count", priv->quorum_count, uint32, out);
-        GF_OPTION_INIT (AFR_SH_READDIR_SIZE_KEY, priv->sh_readdir_size, size,
-                        out);
-        fix_quorum_options(this,priv,qtype);
 
-	GF_OPTION_INIT ("post-op-delay-secs", priv->post_op_delay_secs, uint32, out);
-        GF_OPTION_INIT ("readdir-failover", priv->readdir_failover, bool, out);
-        GF_OPTION_INIT ("ensure-durability", priv->ensure_durability, bool,
-                        out);
+        dict_ret = dict_get_int32 (this->options, "entry-lock-server-count",
+                                   &lock_server_count);
+        if (dict_ret == 0) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Setting entry lock server count to %d.",
+                        lock_server_count);
+
+                priv->entry_lock_server_count = lock_server_count;
+        }
+
+        priv->strict_readdir = _gf_false;
+
+        dict_ret = dict_get_str (this->options, "strict-readdir",
+                                 &strict_readdir);
+        if (dict_ret == 0) {
+                ret = gf_string2boolean (strict_readdir, &priv->strict_readdir);
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "Invalid 'option strict-readdir %s'. "
+                                "Defaulting to strict-readdir as 'off'.",
+                                strict_readdir);
+                }
+        }
+
+        trav = this->children;
+        while (trav) {
+                if (!read_ret && !strcmp (read_subvol, trav->xlator->name)) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "Subvolume '%s' specified as read child.",
+                                trav->xlator->name);
+
+                        priv->read_child = child_count;
+                }
+
+                if (fav_ret == 0 && !strcmp (fav_child, trav->xlator->name)) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                favorite_child_warning_str, trav->xlator->name,
+                                trav->xlator->name, trav->xlator->name);
+                        priv->favorite_child = child_count;
+                }
+
+                child_count++;
+                trav = trav->next;
+        }
 
         priv->wait_count = 1;
 
+        priv->child_count = child_count;
+
+        LOCK_INIT (&priv->lock);
+        LOCK_INIT (&priv->read_child_lock);
+
         priv->child_up = GF_CALLOC (sizeof (unsigned char), child_count,
                                     gf_afr_mt_char);
         if (!priv->child_up) {
@@ -380,6 +720,8 @@ init (xlator_t *this)
                                    AFR_XATTR_PREFIX,
                                    trav->xlator->name);
                 if (-1 == ret) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "asprintf failed to set pending key");
                         ret = -ENOMEM;
                         goto out;
                 }
@@ -388,13 +730,6 @@ init (xlator_t *this)
                 i++;
         }
 
-        ret = gf_asprintf (&priv->sh_domain, AFR_SH_DATA_DOMAIN_FMT,
-                           this->name);
-        if (-1 == ret) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
         priv->last_event = GF_CALLOC (child_count, sizeof (*priv->last_event),
                                       gf_afr_mt_int32_t);
         if (!priv->last_event) {
@@ -402,67 +737,13 @@ init (xlator_t *this)
                 goto out;
         }
 
-        /* keep more local here as we may need them for self-heal etc */
-        this->local_pool = mem_pool_new (afr_local_t, 512);
-        if (!this->local_pool) {
-                ret = -1;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to create local_t's memory pool");
-                goto out;
-        }
-
+        LOCK_INIT (&priv->root_inode_lk);
         priv->first_lookup = 1;
         priv->root_inode = NULL;
 
-        if (!priv->shd.iamshd) {
-                ret = 0;
-                goto out;
-        }
-
-        ret = -ENOMEM;
-        priv->shd.pos = GF_CALLOC (sizeof (*priv->shd.pos), child_count,
-                                   gf_afr_mt_brick_pos_t);
-        if (!priv->shd.pos)
-                goto out;
-
-        priv->shd.pending = GF_CALLOC (sizeof (*priv->shd.pending), child_count,
-                                       gf_afr_mt_int32_t);
-        if (!priv->shd.pending)
-                goto out;
-
-        priv->shd.inprogress = GF_CALLOC (sizeof (*priv->shd.inprogress),
-                                          child_count, gf_afr_mt_shd_bool_t);
-        if (!priv->shd.inprogress)
-                goto out;
-        priv->shd.timer = GF_CALLOC (sizeof (*priv->shd.timer), child_count,
-                                     gf_afr_mt_shd_timer_t);
-        if (!priv->shd.timer)
-                goto out;
-
-        priv->shd.healed = eh_new (AFR_EH_HEALED_LIMIT, _gf_false,
-                                   _destroy_shd_event_data);
-        if (!priv->shd.healed)
-                goto out;
-
-        priv->shd.heal_failed = eh_new (AFR_EH_HEAL_FAIL_LIMIT, _gf_false,
-                                        _destroy_shd_event_data);
-        if (!priv->shd.heal_failed)
-                goto out;
-
-        priv->shd.split_brain = eh_new (AFR_EH_SPLIT_BRAIN_LIMIT, _gf_false,
-                                        _destroy_shd_event_data);
-        if (!priv->shd.split_brain)
-                goto out;
+        pthread_mutex_init (&priv->mutex, NULL);
+        INIT_LIST_HEAD (&priv->saved_fds);
 
-        this->itable = inode_table_new (SHD_INODE_LRU_LIMIT, this);
-        if (!this->itable)
-                goto out;
-        priv->root_inode = inode_ref (this->itable->root);
-        GF_OPTION_INIT ("node-uuid", priv->shd.node_uuid, str, out);
-        GF_OPTION_INIT ("heal-timeout", priv->shd.timeout, int32, out);
-        ret = afr_initialise_statistics (this);
-        if (ret)
-                goto out;
         ret = 0;
 out:
         return ret;
@@ -472,13 +753,6 @@ out:
 int
 fini (xlator_t *this)
 {
-        afr_private_t *priv = NULL;
-
-        priv = this->private;
-        this->private = NULL;
-        afr_priv_destroy (priv);
-        if (this->itable);//I dont see any destroy func
-
         return 0;
 }
 
@@ -497,9 +771,6 @@ struct xlator_fops fops = {
         .finodelk    = afr_finodelk,
         .entrylk     = afr_entrylk,
         .fentrylk    = afr_fentrylk,
-	.fallocate   = afr_fallocate,
-	.discard     = afr_discard,
-        .zerofill    = afr_zerofill,
 
         /* inode read */
         .access      = afr_access,
@@ -507,7 +778,6 @@ struct xlator_fops fops = {
         .fstat       = afr_fstat,
         .readlink    = afr_readlink,
         .getxattr    = afr_getxattr,
-        .fgetxattr   = afr_fgetxattr,
         .readv       = afr_readv,
 
         /* inode write */
@@ -515,11 +785,9 @@ struct xlator_fops fops = {
         .truncate    = afr_truncate,
         .ftruncate   = afr_ftruncate,
         .setxattr    = afr_setxattr,
-        .fsetxattr   = afr_fsetxattr,
         .setattr     = afr_setattr,
         .fsetattr    = afr_fsetattr,
         .removexattr = afr_removexattr,
-        .fremovexattr = afr_fremovexattr,
 
         /* dir read */
         .opendir     = afr_opendir,
@@ -546,248 +814,73 @@ struct xlator_dumpops dumpops = {
 struct xlator_cbks cbks = {
         .release     = afr_release,
         .releasedir  = afr_releasedir,
-        .forget      = afr_forget,
 };
 
 
 struct volume_options options[] = {
         { .key  = {"read-subvolume" },
-          .type = GF_OPTION_TYPE_XLATOR,
-          .description = "inode-read fops happen only on one of the bricks in "
-                         "replicate. Afr will prefer the one specified using "
-                         "this option if it is not stale. Option value must be "
-                         "one of the xlator names of the children. "
-                         "Ex: <volname>-client-0 till "
-                         "<volname>-client-<number-of-bricks - 1>"
-        },
-        { .key  = {"read-subvolume-index" },
-          .type = GF_OPTION_TYPE_INT,
-          .default_value = "-1",
-          .description = "inode-read fops happen only on one of the bricks in "
-                         "replicate. AFR will prefer the one specified using "
-                         "this option if it is not stale. allowed options"
-                         " include -1 till replica-count - 1"
-        },
-        { .key = {"read-hash-mode" },
-          .type = GF_OPTION_TYPE_INT,
-          .min = 0,
-          .max = 2,
-          .default_value = "0",
-          .description = "inode-read fops happen only on one of the bricks in "
-                         "replicate. AFR will prefer the one computed using "
-                         "the method specified using this option"
-                         "0 = first responder, "
-                         "1 = hash by GFID of file (all clients use "
-                                                    "same subvolume), "
-                         "2 = hash by GFID of file and client PID",
-        },
-        { .key  = {"choose-local" },
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "true",
-          .description = "Choose a local subvolume(i.e. Brick) to read from if "
-                         "read-subvolume is not explicitly set.",
+          .type = GF_OPTION_TYPE_XLATOR
         },
         { .key  = {"favorite-child"},
-          .type = GF_OPTION_TYPE_XLATOR,
-          .description = "If a split-brain happens choose subvol/brick set by "
-                         "this option as source."
+          .type = GF_OPTION_TYPE_XLATOR
         },
         { .key  = {"background-self-heal-count"},
           .type = GF_OPTION_TYPE_INT,
-          .min  = 0,
-          .default_value = "16",
-          .validate = GF_OPT_VALIDATE_MIN,
-          .description = "This specifies the number of self-heals that can be "
-                         " performed in background without blocking the fop"
+          .min  = 0
         },
         { .key  = {"data-self-heal"},
-          .type = GF_OPTION_TYPE_STR,
-          .value = {"1", "on", "yes", "true", "enable",
-                    "0", "off", "no", "false", "disable",
-                    "open"},
-          .default_value = "on",
-          .description   = "Using this option we can enable/disable data "
-                           "self-heal on the file. \"open\" means data "
-                           "self-heal action will only be triggered by file "
-                           "open operations."
+          .type = GF_OPTION_TYPE_BOOL
         },
         { .key  = {"data-self-heal-algorithm"},
           .type = GF_OPTION_TYPE_STR,
+          .default_value = "",
           .description   = "Select between \"full\", \"diff\". The "
                            "\"full\" algorithm copies the entire file from "
                            "source to sink. The \"diff\" algorithm copies to "
                            "sink only those blocks whose checksums don't match "
-                           "with those of source. If no option is configured "
-                           "the option is chosen dynamically as follows: "
-                           "If the file does not exist on one of the sinks "
-                           "or empty file exists or if the source file size is "
-                           "about the same as page size the entire file will "
-                           "be read and written i.e \"full\" algo, "
-                           "otherwise \"diff\" algo is chosen.",
-          .value = { "diff", "full"}
+                           "with those of source.",
+          .value = { "diff", "full" }
         },
         { .key  = {"data-self-heal-window-size"},
           .type = GF_OPTION_TYPE_INT,
           .min  = 1,
           .max  = 1024,
-          .default_value = "1",
+          .default_value = "16",
           .description = "Maximum number blocks per file for which self-heal "
                          "process would be applied simultaneously."
         },
         { .key  = {"metadata-self-heal"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "on",
-          .description = "Using this option we can enable/disable metadata "
-                         "i.e. Permissions, ownerships, xattrs self-heal on "
-                         "the file/directory."
+          .type = GF_OPTION_TYPE_BOOL
         },
         { .key  = {"entry-self-heal"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "on",
-          .description = "Using this option we can enable/disable entry "
-                         "self-heal on the directory."
+          .type = GF_OPTION_TYPE_BOOL
         },
         { .key  = {"data-change-log"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "on",
-          .description = "Data fops like write/truncate will not perform "
-                         "pre/post fop changelog operations in afr transaction "
-                         "if this option is disabled"
+          .type = GF_OPTION_TYPE_BOOL
         },
         { .key  = {"metadata-change-log"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "on",
-          .description = "Metadata fops like setattr/setxattr will not perform "
-                         "pre/post fop changelog operations in afr transaction "
-                         "if this option is disabled"
+          .type = GF_OPTION_TYPE_BOOL
         },
         { .key  = {"entry-change-log"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "on",
-          .description = "Entry fops like create/unlink will not perform "
-                         "pre/post fop changelog operations in afr transaction "
-                         "if this option is disabled"
+          .type = GF_OPTION_TYPE_BOOL
         },
         { .key  = {"optimistic-change-log"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "on",
-          .description = "Entry/Metadata fops will not perform "
-                         "pre fop changelog operations in afr transaction "
-                         "if this option is enabled."
-        },
-        { .key  = {"strict-readdir"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-        },
-        { .key = {"inodelk-trace"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-          .description = "Enabling this option logs inode lock/unlocks"
-        },
-        { .key = {"entrylk-trace"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-          .description = "Enabling this option logs entry lock/unlocks"
-        },
-        { .key = {"eager-lock"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "on",
-          .description = "Lock phase of a transaction has two sub-phases. "
-                         "First is an attempt to acquire locks in parallel by "
-                         "broadcasting non-blocking lock requests. If lock "
-                         "aquistion fails on any server, then the held locks "
-                         "are unlocked and revert to a blocking locked mode "
-                         "sequentially on one server after another.  If this "
-                         "option is enabled the initial broadcasting lock "
-                         "request attempt to acquire lock on the entire file. "
-                         "If this fails, we revert back to the sequential "
-                         "\"regional\" blocking lock as before. In the case "
-                         "where such an \"eager\" lock is granted in the "
-                         "non-blocking phase, it gives rise to an opportunity "
-                         "for optimization. i.e, if the next write transaction "
-                         "on the same FD arrives before the unlock phase of "
-                         "the first transaction, it \"takes over\" the full "
-                         "file lock. Similarly if yet another data transaction "
-                         "arrives before the unlock phase of the \"optimized\" "
-                         "transaction, that in turn \"takes over\" the lock as "
-                         "well. The actual unlock now happens at the end of "
-                         "the last \"optimzed\" transaction."
-
+          .type = GF_OPTION_TYPE_BOOL
         },
-        { .key = {"self-heal-daemon"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-          .description = "This option applies to only self-heal-daemon. "
-                         "Index directory crawl and automatic healing of files"
-                         "will not be performed if this option is turned off."
-        },
-        { .key = {"iam-self-heal-daemon"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-          .description = "This option differentiates if the replicate "
-                         "translator is running as part of self-heal-daemon "
-                         "or not."
-        },
-        { .key = {"quorum-type"},
-          .type = GF_OPTION_TYPE_STR,
-          .value = { "none", "auto", "fixed"},
-          .default_value = "none",
-          .description = "If value is \"fixed\" only allow writes if "
-                         "quorum-count bricks are present.  If value is "
-                         "\"auto\" only allow writes if more than half of "
-                         "bricks, or exactly half including the first, are "
-                         "present.",
-        },
-        { .key = {"quorum-count"},
+        { .key  = {"data-lock-server-count"},
           .type = GF_OPTION_TYPE_INT,
-          .min = 1,
-          .max = INT_MAX,
-          .default_value = 0,
-          .description = "If quorum-type is \"fixed\" only allow writes if "
-                         "this many bricks or present.  Other quorum types "
-                         "will OVERWRITE this value.",
+          .min  = 0
         },
-        { .key  = {"node-uuid"},
-          .type = GF_OPTION_TYPE_STR,
-          .description = "Local glusterd uuid string, used in starting "
-                         "self-heal-daemon so that it can crawl only on "
-                         "local index directories.",
-        },
-        { .key  = {"heal-timeout"},
+        { .key  = {"metadata-lock-server-count"},
           .type = GF_OPTION_TYPE_INT,
-          .min  = 60,
-          .max  = INT_MAX,
-          .default_value = "600",
-          .description = "time interval for checking the need to self-heal "
-                         "in self-heal-daemon"
+          .min  = 0
         },
-        { .key  = {"post-op-delay-secs"},
+        { .key  = {"entry-lock-server-count"},
           .type = GF_OPTION_TYPE_INT,
-          .min  = 0,
-          .max  = INT_MAX,
-          .default_value = "1",
-          .description = "Time interval induced artificially before "
-	                 "post-operation phase of the transaction to "
-                         "enhance overlap of adjacent write operations.",
-        },
-        { .key = {AFR_SH_READDIR_SIZE_KEY},
-          .type = GF_OPTION_TYPE_SIZET,
-          .description = "readdirp size for performing entry self-heal",
-          .min = 1024,
-          .max = 131072,
-          .default_value = "1KB",
+          .min  = 0
         },
-        { .key = {"readdir-failover"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .description = "readdir(p) will not failover if this option is off",
-          .default_value = "on",
-        },
-        { .key = {"ensure-durability"},
+        { .key  = {"strict-readdir"},
           .type = GF_OPTION_TYPE_BOOL,
-          .description = "Afr performs fsyncs for transactions if this "
-                         "option is on to make sure the changelogs/data is "
-                         "written to the disk",
-          .default_value = "on",
         },
         { .key  = {NULL} },
 };
diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h
index 21064db58..f29dcae41 100644
--- a/xlators/cluster/afr/src/afr.h
+++ b/xlators/cluster/afr/src/afr.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -20,18 +29,11 @@
 #include "call-stub.h"
 #include "compat-errno.h"
 #include "afr-mem-types.h"
-#include "afr-self-heal-algorithm.h"
 
 #include "libxlator.h"
-#include "timer.h"
 
 #define AFR_XATTR_PREFIX "trusted.afr"
 #define AFR_PATHINFO_HEADER "REPLICATE:"
-#define AFR_SH_READDIR_SIZE_KEY "self-heal-readdir-size"
-#define AFR_SH_DATA_DOMAIN_FMT "%s:self-heal"
-
-#define AFR_LOCKEE_COUNT_MAX    3
-#define AFR_DOM_COUNT_MAX    3
 
 struct _pump_private;
 
@@ -40,80 +42,14 @@ typedef int (*afr_expunge_done_cbk_t) (call_frame_t *frame, xlator_t *this,
                                        int32_t op_errno);
 
 typedef int (*afr_impunge_done_cbk_t) (call_frame_t *frame, xlator_t *this,
-                                       int32_t op_error, int32_t op_errno);
+                                       int child, int32_t op_error,
+                                       int32_t op_errno);
 typedef int (*afr_post_remove_call_t) (call_frame_t *frame, xlator_t *this);
 
 typedef int (*afr_lock_cbk_t) (call_frame_t *frame, xlator_t *this);
 typedef void (*afr_lookup_done_cbk_t) (call_frame_t *frame, xlator_t *this,
                                       int32_t op_ret, int32_t op_errno);
 
-typedef enum {
-        AFR_POS_UNKNOWN,
-        AFR_POS_LOCAL,
-        AFR_POS_REMOTE
-} afr_child_pos_t;
-
-typedef enum {
-        SPLIT_BRAIN = 1,
-        ALL_FOOLS = 2
-} afr_subvol_status_t;
-
-typedef enum {
-        AFR_INODE_SET_READ_CTX = 1,
-        AFR_INODE_RM_STALE_CHILDREN,
-        AFR_INODE_SET_OPENDIR_DONE,
-        AFR_INODE_GET_READ_CTX,
-        AFR_INODE_GET_OPENDIR_DONE,
-} afr_inode_op_t;
-
-typedef struct afr_inode_params_ {
-        afr_inode_op_t op;
-        union {
-                gf_boolean_t value;
-                struct {
-                        int32_t read_child;
-                        int32_t *children;
-                } read_ctx;
-        } u;
-} afr_inode_params_t;
-
-typedef enum afr_spb_state {
-        DONT_KNOW,
-        SPB,
-        NO_SPB
-} afr_spb_state_t;
-
-typedef struct afr_inode_ctx_ {
-        uint64_t masks;
-        int32_t  *fresh_children;//increasing order of latency
-        afr_spb_state_t mdata_spb;
-        afr_spb_state_t data_spb;
-        uint32_t        open_fd_count;
-} afr_inode_ctx_t;
-
-typedef enum {
-        NONE,
-        INDEX,
-        INDEX_TO_BE_HEALED,
-        FULL,
-} afr_crawl_type_t;
-
-typedef struct afr_self_heald_ {
-        gf_boolean_t            enabled;
-        gf_boolean_t            iamshd;
-        afr_crawl_type_t        *pending;
-        gf_boolean_t            *inprogress;
-        afr_child_pos_t         *pos;
-        gf_timer_t              **timer;
-        eh_t                    *healed;
-        eh_t                    *heal_failed;
-        eh_t                    *split_brain;
-        eh_t                    **statistics;
-        void                    **crawl_events;
-        char                    *node_uuid;
-        int                     timeout;
-} afr_self_heald_t;
-
 typedef struct _afr_private {
         gf_lock_t lock;               /* to guard access to child_count, etc */
         unsigned int child_count;     /* total number of children   */
@@ -123,6 +59,7 @@ typedef struct _afr_private {
 
         xlator_t **children;
 
+        gf_lock_t root_inode_lk;
         int first_lookup;
         inode_t *root_inode;
 
@@ -130,7 +67,7 @@ typedef struct _afr_private {
 
         char **pending_key;
 
-        char         *data_self_heal;              /* on/off/open */
+        gf_boolean_t data_self_heal;              /* on/off */
         char *       data_self_heal_algorithm;    /* name of algorithm */
         unsigned int data_self_heal_window_size;  /* max number of pipelined
                                                      read/writes */
@@ -145,10 +82,13 @@ typedef struct _afr_private {
         gf_boolean_t entry_change_log;      /* on/off */
 
         int read_child;               /* read-subvolume */
-        unsigned int hash_mode;       /* for when read_child is not set */
         int favorite_child;  /* subvolume to be preferred in resolving
                                          split-brain cases */
 
+        unsigned int data_lock_server_count;
+        unsigned int metadata_lock_server_count;
+        unsigned int entry_lock_server_count;
+
         gf_boolean_t inodelk_trace;
         gf_boolean_t entrylk_trace;
 
@@ -164,70 +104,39 @@ typedef struct _afr_private {
 
         pthread_mutex_t  mutex;
         struct list_head saved_fds;   /* list of fds on which locks have succeeded */
-        gf_boolean_t      optimistic_change_log;
-        gf_boolean_t      eager_lock;
-	uint32_t          post_op_delay_secs;
-        unsigned int      quorum_count;
+        gf_boolean_t     optimistic_change_log;
 
         char                   vol_uuid[UUID_SIZE + 1];
         int32_t                *last_event;
-        afr_self_heald_t       shd;
-        gf_boolean_t           choose_local;
-        gf_boolean_t           did_discovery;
-        gf_boolean_t           readdir_failover;
-        uint64_t               sh_readdir_size;
-        gf_boolean_t           ensure_durability;
-        char                   *sh_domain;
 } afr_private_t;
 
-typedef enum {
-        AFR_SELF_HEAL_NOT_ATTEMPTED,
-        AFR_SELF_HEAL_STARTED,
-        AFR_SELF_HEAL_FAILED,
-        AFR_SELF_HEAL_SYNC_BEGIN,
-} afr_self_heal_status;
-
 typedef struct {
-        afr_self_heal_status gfid_or_missing_entry_self_heal;
-        afr_self_heal_status metadata_self_heal;
-        afr_self_heal_status data_self_heal;
-        afr_self_heal_status entry_self_heal;
-} afr_sh_status_for_all_type;
-
-typedef enum {
-        AFR_SELF_HEAL_ENTRY,
-        AFR_SELF_HEAL_METADATA,
-        AFR_SELF_HEAL_DATA,
-        AFR_SELF_HEAL_GFID_OR_MISSING_ENTRY,
-        AFR_SELF_HEAL_INVALID = -1,
-} afr_self_heal_type;
-
-typedef enum {
-        AFR_CHECK_ALL,
-        AFR_CHECK_SPECIFIC,
-} afr_sh_fail_check_type;
-
-struct afr_self_heal_ {
         /* External interface: These are variables (some optional) that
            are set by whoever has triggered self-heal */
 
-        gf_boolean_t do_data_self_heal;
-        gf_boolean_t do_metadata_self_heal;
-        gf_boolean_t do_entry_self_heal;
-        gf_boolean_t do_gfid_self_heal;
-        gf_boolean_t do_missing_entry_self_heal;
-        gf_boolean_t force_confirm_spb; /* Check for split-brains even when
-                                           self-heal is turned off */
+        inode_t      *inode;
+        gf_boolean_t need_data_self_heal;
+        gf_boolean_t need_metadata_self_heal;
+        gf_boolean_t need_entry_self_heal;
+        gf_boolean_t need_gfid_self_heal;
+        gf_boolean_t need_missing_entry_self_heal;
 
         gf_boolean_t forced_merge;        /* Is this a self-heal triggered to
                                              forcibly merge the directories? */
 
+        gf_boolean_t healing_fd_opened;   /* true if caller has already
+                                             opened fd */
+
+        gf_boolean_t data_lock_held;      /* true if caller has already
+                                             acquired 0-0 lock */
+
+        fd_t *healing_fd;                 /* set if callers has opened fd */
+
         gf_boolean_t background;          /* do self-heal in background
                                              if possible */
+
         ia_type_t type;                   /* st_mode of the entry we're doing
                                              self-heal on */
-        inode_t   *inode;                 /* inode on which the self-heal is
-                                             performed on */
         uuid_t  sh_gfid_req;                 /* gfid self-heal needs to be done
                                              with this gfid if it is not null */
 
@@ -235,7 +144,7 @@ struct afr_self_heal_ {
            background, this function will be called as soon as possible. */
 
         int (*unwind) (call_frame_t *frame, xlator_t *this, int32_t op_ret,
-                       int32_t op_errno, int32_t sh_failed);
+                       int32_t op_errno);
 
         /* End of external interface members */
 
@@ -248,13 +157,14 @@ struct afr_self_heal_ {
 
         afr_expunge_done_cbk_t expunge_done;
         afr_impunge_done_cbk_t impunge_done;
+        int32_t impunge_ret_child;
 
         /* array of xattr's, one for each child */
         dict_t **xattr;
 
         /* array containing if the lookups succeeded in the order of response
          */
-        int32_t *success_children;
+        int32_t *child_success;
         int     success_count;
         /* array containing the fresh children found in the self-heal process */
         int32_t *fresh_children;
@@ -277,53 +187,40 @@ struct afr_self_heal_ {
         int source;
         int active_source;
         int active_sinks;
-        unsigned char *success;
+        int *success;
         unsigned char *locked_nodes;
         int lock_count;
 
+        mode_t impunging_entry_mode;
         const char *linkname;
         gf_boolean_t entries_skipped;
 
-        gf_boolean_t actual_sh_started;
-        gf_boolean_t sync_done;
-        gf_boolean_t data_lock_held;
-        gf_boolean_t sh_dom_lock_held;
-        gf_boolean_t eof_reached;
-        fd_t  *healing_fd;
+        int   op_failed;
+
         int   file_has_holes;
         blksize_t block_size;
         off_t file_size;
         off_t offset;
-        unsigned char *write_needed;
-        uint8_t *checksum;
         afr_post_remove_call_t post_remove_call;
 
-        char    *data_sh_info;
-        char    *metadata_sh_info;
-
         loc_t parent_loc;
+
         call_frame_t *orig_frame;
-        call_frame_t *old_loop_frame;
         gf_boolean_t unwound;
 
-        afr_sh_algo_private_t *private;
-        afr_sh_status_for_all_type  afr_all_sh_status;
-        afr_self_heal_type       sh_type_in_action;
+        /* private data for the particular self-heal algorithm */
+        void *private;
+
+        int (*flush_self_heal_cbk) (call_frame_t *frame, xlator_t *this);
 
-        struct afr_sh_algorithm  *algo;
-        afr_lock_cbk_t data_lock_success_handler;
-        afr_lock_cbk_t data_lock_failure_handler;
-	gf_boolean_t data_lock_block;
         int (*completion_cbk) (call_frame_t *frame, xlator_t *this);
-        int (*sh_data_algo_start) (call_frame_t *frame, xlator_t *this);
         int (*algo_completion_cbk) (call_frame_t *frame, xlator_t *this);
         int (*algo_abort_cbk) (call_frame_t *frame, xlator_t *this);
         void (*gfid_sh_success_cbk) (call_frame_t *sh_frame, xlator_t *this);
 
         call_frame_t *sh_frame;
-};
+} afr_self_heal_t;
 
-typedef struct afr_self_heal_ afr_self_heal_t;
 
 typedef enum {
         AFR_DATA_TRANSACTION,          /* truncate, write, ... */
@@ -385,31 +282,11 @@ afr_index_for_transaction_type (afr_transaction_type type)
         return -1;  /* make gcc happy */
 }
 
-typedef struct {
-        loc_t                   loc;
-        char                    *basename;
-        unsigned char           *locked_nodes;
-        int                     locked_count;
-
-} afr_entry_lockee_t;
-
-int
-afr_entry_lockee_cmp (const void *l1, const void *l2);
-
-typedef struct {
-        char    *domain; /* Domain on which inodelk is taken */
-        struct gf_flock flock;
-        unsigned char *locked_nodes;
-        int32_t lock_count;
-} afr_inodelk_t;
 
 typedef struct {
         loc_t *lk_loc;
+        struct gf_flock lk_flock;
 
-        int                     lockee_count;
-        afr_entry_lockee_t      lockee[AFR_LOCKEE_COUNT_MAX];
-
-        afr_inodelk_t       inodelk[AFR_DOM_COUNT_MAX];
         const char *lk_basename;
         const char *lower_basename;
         const char *higher_basename;
@@ -418,22 +295,24 @@ typedef struct {
 
         unsigned char *locked_nodes;
         unsigned char *lower_locked_nodes;
+        unsigned char *inode_locked_nodes;
+        unsigned char *entry_locked_nodes;
 
         selfheal_lk_type_t selfheal_lk_type;
         transaction_lk_type_t transaction_lk_type;
 
         int32_t lock_count;
+        int32_t inodelk_lock_count;
         int32_t entrylk_lock_count;
 
         uint64_t lock_number;
         int32_t lk_call_count;
-        int32_t lk_expected_count;
-        int32_t lk_attempted_count;
 
         int32_t lock_op_ret;
         int32_t lock_op_errno;
-        afr_lock_cbk_t lock_cbk;
-        char *domain; /* Domain on which inode/entry lock/unlock in progress.*/
+
+        int (*lock_cbk) (call_frame_t *, xlator_t *);
+
 } afr_internal_lock_t;
 
 typedef struct _afr_locked_fd {
@@ -441,29 +320,21 @@ typedef struct _afr_locked_fd {
         struct list_head list;
 } afr_locked_fd_t;
 
-struct afr_reply {
-	int	valid;
-	int32_t	op_ret;
-	int32_t	op_errno;
-};
-
 typedef struct _afr_local {
         int     uid;
         int     gid;
         unsigned int call_count;
         unsigned int success_count;
         unsigned int enoent_count;
-        uint32_t     open_fd_count;
-        gf_boolean_t update_open_fd_count;
 
 
-        unsigned int unhealable;
+        unsigned int govinda_gOvinda;
 
         unsigned int read_child_index;
         unsigned char read_child_returned;
         unsigned int first_up_child;
 
-	gf_lkowner_t  saved_lk_owner;
+        pid_t saved_pid;
 
         int32_t op_ret;
         int32_t op_errno;
@@ -478,7 +349,6 @@ typedef struct _afr_local {
         glusterfs_fop_t fop;
 
         unsigned char *child_up;
-        int32_t       *fresh_children; //in the order of response
 
         int32_t *child_errno;
 
@@ -495,25 +365,12 @@ typedef struct _afr_local {
 
         dict_t  *dict;
         int      optimistic_change_log;
-	gf_boolean_t      delayed_post_op;
 
+        int (*openfd_flush_cbk) (call_frame_t *frame, xlator_t *this);
 
-	/* Is the current writev() going to perform a stable write?
-	   i.e, is fd->flags or @flags writev param have O_SYNC or
-	   O_DSYNC?
-	*/
-        gf_boolean_t      stable_write;
-
-        /* This write appended to the file. Nnot necessarily O_APPEND,
-           just means the offset of write was at the end of file.
-        */
-        gf_boolean_t      append_write;
-
-        int allow_sh_for_running_transaction;
-
-
-        /* This struct contains the arguments for the "continuation"
-           (scheme-like) of fops
+        /*
+          This struct contains the arguments for the "continuation"
+          (scheme-like) of fops
         */
 
         int   op;
@@ -524,25 +381,25 @@ typedef struct _afr_local {
                 } statfs;
 
                 struct {
-                        uint32_t parent_entrylk;
                         uuid_t  gfid_req;
                         inode_t *inode;
                         struct iatt buf;
                         struct iatt postparent;
+                        ino_t ino;
+                        uint64_t gen;
+                        ino_t parent_ino;
                         dict_t **xattrs;
                         dict_t *xattr;
                         struct iatt *postparents;
                         struct iatt *bufs;
                         int32_t read_child;
+                        int32_t *child_success;//in the order of response
                         int32_t *sources;
-                        int32_t *success_children;
-                        int32_t **pending_matrix;
-                        gf_boolean_t fresh_lookup;
-                        gf_boolean_t possible_spb;
                 } lookup;
 
                 struct {
                         int32_t flags;
+                        int32_t wbflags;
                 } open;
 
                 struct {
@@ -556,33 +413,36 @@ typedef struct _afr_local {
 
                 struct {
                         int32_t mask;
-                        int last_index;  /* index of the child we tried previously */
+                        int last_tried;  /* index of the child we tried previously */
                 } access;
 
                 struct {
-                        int last_index;
+                        int last_tried;
+                        ino_t ino;
                 } stat;
 
                 struct {
-                        int last_index;
+                        int last_tried;
+                        ino_t ino;
                 } fstat;
 
                 struct {
                         size_t size;
-                        int last_index;
+                        int last_tried;
+                        ino_t ino;
                 } readlink;
 
                 struct {
                         char *name;
-                        int last_index;
-                        long xattr_len;
+                        int last_tried;
+                        long pathinfo_len;
                 } getxattr;
 
                 struct {
+                        ino_t ino;
                         size_t size;
                         off_t offset;
-                        int last_index;
-                        uint32_t flags;
+                        int last_tried;
                 } readv;
 
                 /* dir read */
@@ -600,43 +460,71 @@ typedef struct _afr_local {
                         int32_t op_errno;
                         size_t size;
                         off_t offset;
-                        dict_t *dict;
+
                         gf_boolean_t failed;
-                        int last_index;
+                        int last_tried;
                 } readdir;
+
+                struct {
+                        int32_t op_ret;
+                        int32_t op_errno;
+
+                        size_t size;
+                        off_t offset;
+                        int32_t flag;
+
+                        int last_tried;
+                } getdents;
+
                 /* inode write */
 
                 struct {
+                        ino_t ino;
                         struct iatt prebuf;
                         struct iatt postbuf;
-                } inode_wfop; //common structure for all inode-write-fops
 
-                struct {
                         int32_t op_ret;
 
                         struct iovec *vector;
                         struct iobref *iobref;
                         int32_t count;
                         off_t offset;
-                        uint32_t flags;
                 } writev;
 
                 struct {
+                        ino_t ino;
+                        struct iatt prebuf;
+                        struct iatt postbuf;
+                } fsync;
+
+                struct {
+                        ino_t ino;
                         off_t offset;
+                        struct iatt prebuf;
+                        struct iatt postbuf;
                 } truncate;
 
                 struct {
+                        ino_t ino;
                         off_t offset;
+                        struct iatt prebuf;
+                        struct iatt postbuf;
                 } ftruncate;
 
                 struct {
+                        ino_t ino;
                         struct iatt in_buf;
                         int32_t valid;
+                        struct iatt preop_buf;
+                        struct iatt postop_buf;
                 } setattr;
 
                 struct {
+                        ino_t ino;
                         struct iatt in_buf;
                         int32_t valid;
+                        struct iatt preop_buf;
+                        struct iatt postop_buf;
                 } fsetattr;
 
                 struct {
@@ -645,87 +533,116 @@ typedef struct _afr_local {
                 } setxattr;
 
                 struct {
-                        dict_t *dict;
-                        int32_t flags;
-                } fsetxattr;
-
-                struct {
                         char *name;
                 } removexattr;
 
-                struct {
-                        dict_t *xattr;
-                } xattrop;
-
-                struct {
-                        dict_t *xattr;
-                } fxattrop;
-
                 /* dir write */
 
                 struct {
-                        inode_t *inode;
-                        struct iatt buf;
-                        struct iatt preparent;
-                        struct iatt postparent;
-                        struct iatt prenewparent;
-                        struct iatt postnewparent;
-                } dir_fop; //common structure for all dir fops
-
-                struct {
+                        ino_t ino;
+                        uint64_t gen;
+                        ino_t parent_ino;
                         fd_t *fd;
                         dict_t *params;
                         int32_t flags;
                         mode_t mode;
+                        inode_t *inode;
+                        struct iatt buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
+                        struct iatt read_child_buf;
                 } create;
 
                 struct {
+                        ino_t ino;
+                        uint64_t gen;
+                        ino_t parent_ino;
                         dev_t dev;
                         mode_t mode;
                         dict_t *params;
+                        inode_t *inode;
+                        struct iatt buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
+                        struct iatt read_child_buf;
                 } mknod;
 
                 struct {
+                        ino_t ino;
+                        uint64_t gen;
+                        ino_t parent_ino;
                         int32_t mode;
                         dict_t *params;
+                        inode_t *inode;
+                        struct iatt buf;
+                        struct iatt read_child_buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
                 } mkdir;
 
                 struct {
-                        int flags;
+                        ino_t parent_ino;
+                        int32_t op_ret;
+                        int32_t op_errno;
+                        struct iatt preparent;
+                        struct iatt postparent;
+                } unlink;
+
+                struct {
+                        int   flags;
+                        ino_t parent_ino;
+                        int32_t op_ret;
+                        int32_t op_errno;
+                        struct iatt preparent;
+                        struct iatt postparent;
                 } rmdir;
 
                 struct {
+                        ino_t oldparent_ino;
+                        ino_t newparent_ino;
+                        ino_t ino;
+                        struct iatt buf;
+                        struct iatt read_child_buf;
+                        struct iatt preoldparent;
+                        struct iatt prenewparent;
+                        struct iatt postoldparent;
+                        struct iatt postnewparent;
+                } rename;
+
+                struct {
+                        ino_t ino;
+                        uint64_t gen;
+                        ino_t parent_ino;
+                        inode_t *inode;
+                        struct iatt buf;
+                        struct iatt read_child_buf;
+                        struct iatt preparent;
+                        struct iatt postparent;
+                } link;
+
+                struct {
+                        ino_t ino;
+                        uint64_t gen;
+                        ino_t parent_ino;
+                        inode_t *inode;
                         dict_t *params;
+                        struct iatt buf;
+                        struct iatt read_child_buf;
                         char *linkpath;
+                        struct iatt preparent;
+                        struct iatt postparent;
                 } symlink;
 
-		struct {
-			int32_t mode;
-			off_t offset;
-			size_t len;
-		} fallocate;
-
-		struct {
-			off_t offset;
-			size_t len;
-		} discard;
-
                 struct {
-                        off_t offset;
-                        size_t len;
-                        struct iatt prebuf;
-                        struct iatt postbuf;
-                } zerofill;
-
-
+                        int32_t flags;
+                        dir_entry_t *entries;
+                        int32_t count;
+                } setdents;
         } cont;
 
         struct {
                 off_t start, len;
 
-                gf_boolean_t    eager_lock_on;
-                int *eager_lock;
-
                 char *basename;
                 char *new_basename;
 
@@ -734,19 +651,12 @@ typedef struct _afr_local {
 
                 afr_transaction_type type;
 
-		/* pre-compute the post piggyback status before
-		   entering POST-OP phase
-		*/
-		int              *postop_piggybacked;
-
-		/* stub to resume on destruction
-		   of the transaction frame */
-		call_stub_t      *resume_stub;
+                int success_count;
+                int erase_pending;
+                int failure_count;
 
-		struct list_head  eager_locked;
-
-                int32_t         **txn_changelog;//changelog after pre+post ops
-                unsigned char   *pre_op;
+                int last_tried;
+                int32_t *child_errno;
 
                 call_frame_t *main_frame;
 
@@ -764,32 +674,16 @@ typedef struct _afr_local {
         afr_self_heal_t self_heal;
 
         struct marker_str     marker;
-
-        /* extra data for fops */
-        dict_t         *xdata_req;
-        dict_t         *xdata_rsp;
-
-        mode_t          umask;
-        int             xflag;
-        gf_boolean_t    do_discovery;
-	struct afr_reply *replies;
 } afr_local_t;
 
-typedef enum {
-        AFR_FD_NOT_OPENED,
-        AFR_FD_OPENED,
-        AFR_FD_OPENING
-} afr_fd_open_status_t;
 
 typedef struct {
         unsigned int *pre_op_done;
-        afr_fd_open_status_t *opened_on; /* which subvolumes the fd is open on */
+        unsigned int *opened_on;     /* which subvolumes the fd is open on */
         unsigned int *pre_op_piggyback;
 
-        unsigned int *lock_piggyback;
-        unsigned int *lock_acquired;
-
         int flags;
+        int32_t wbflags;
         uint64_t up_count;   /* number of CHILD_UPs this fd has seen */
         uint64_t down_count; /* number of CHILD_DOWNs this fd has seen */
 
@@ -800,32 +694,19 @@ typedef struct {
         struct list_head entries; /* needed for readdir failover */
 
         unsigned char *locked_on; /* which subvolumes locks have been successful */
-
-	/* used for delayed-post-op optimization */
-	pthread_mutex_t    delay_lock;
-	gf_timer_t        *delay_timer;
-	call_frame_t      *delay_frame;
-        int               call_child;
-
-	/* set if any write on this fd was a non stable write
-	   (i.e, without O_SYNC or O_DSYNC)
-	*/
-	gf_boolean_t      witnessed_unstable_write;
-
-	/* list of frames currently in progress */
-	struct list_head  eager_locked;
 } afr_fd_ctx_t;
 
 
 /* try alloc and if it fails, goto label */
-#define AFR_LOCAL_ALLOC_OR_GOTO(var, label) do {                    \
-                var = mem_get0 (THIS->local_pool);                  \
-                if (!var) {                                         \
-                        gf_log (this->name, GF_LOG_ERROR,           \
-                                "out of memory :(");                \
-                        op_errno = ENOMEM;                          \
-                        goto label;                                 \
-                }                                                   \
+#define ALLOC_OR_GOTO(var, type, label) do {                    \
+                var = GF_CALLOC (sizeof (type), 1,              \
+                                 gf_afr_mt_##type);             \
+                if (!var) {                                     \
+                        gf_log (this->name, GF_LOG_ERROR,       \
+                                "out of memory :(");            \
+                        op_errno = ENOMEM;                      \
+                        goto label;                             \
+                }                                               \
         } while (0);
 
 
@@ -846,14 +727,8 @@ int
 pump_command_reply (call_frame_t *frame, xlator_t *this);
 
 int32_t
-afr_notify (xlator_t *this, int32_t event, void *data, void *data2);
-
-int
-afr_init_entry_lockee (afr_entry_lockee_t *lockee, afr_local_t *local,
-                       loc_t *loc, char *basename, int child_count);
-
-void
-afr_entry_lockee_cleanup (afr_internal_lock_t *int_lock);
+afr_notify (xlator_t *this, int32_t event,
+            void *data, ...);
 
 int
 afr_attempt_lock_recovery (xlator_t *this, int32_t child_index);
@@ -866,7 +741,7 @@ afr_mark_locked_nodes (xlator_t *this, fd_t *fd,
                        unsigned char *locked_nodes);
 
 void
-afr_set_lk_owner (call_frame_t *frame, xlator_t *this, void *lk_owner);
+afr_set_lk_owner (call_frame_t *frame, xlator_t *this);
 
 int
 afr_set_lock_number (call_frame_t *frame, xlator_t *this);
@@ -890,37 +765,23 @@ afr_blocking_lock (call_frame_t *frame, xlator_t *this);
 int
 afr_internal_lock_finish (call_frame_t *frame, xlator_t *this);
 
-int
-afr_lk_transfer_datalock (call_frame_t *dst, call_frame_t *src, char *dom,
-                          unsigned int child_count);
 
 int pump_start (call_frame_t *frame, xlator_t *this);
 
 int
-__afr_fd_ctx_set (xlator_t *this, fd_t *fd);
-
-int
 afr_fd_ctx_set (xlator_t *this, fd_t *fd);
 
-int32_t
-afr_inode_get_read_ctx (xlator_t *this, inode_t *inode, int32_t *fresh_children);
+uint64_t
+afr_read_child (xlator_t *this, inode_t *inode);
 
 void
-afr_inode_set_read_ctx (xlator_t *this, inode_t *inode, int32_t read_child,
-                        int32_t *fresh_children);
+afr_set_read_child (xlator_t *this, inode_t *inode, int32_t read_child);
 
-int
-afr_build_parent_loc (loc_t *parent, loc_t *child, int32_t *op_errno);
-
-unsigned int
-afr_up_children_count (unsigned char *child_up, unsigned int child_count);
-
-unsigned int
-afr_locked_children_count (unsigned char *children, unsigned int child_count);
+void
+afr_build_parent_loc (loc_t *parent, loc_t *child);
 
-unsigned int
-afr_pre_op_done_children_count (unsigned char *pre_op,
-                                unsigned int child_count);
+int
+afr_up_children_count (int child_count, unsigned char *child_up);
 
 gf_boolean_t
 afr_is_fresh_lookup (loc_t *loc, xlator_t *this);
@@ -931,27 +792,32 @@ afr_update_loc_gfids (loc_t *loc, struct iatt *buf, struct iatt *postparent);
 int
 afr_locked_nodes_count (unsigned char *locked_nodes, int child_count);
 
+ino64_t
+afr_itransform (ino64_t ino, int child_count, int child_index);
+
+int
+afr_deitransform (ino64_t ino, int child_count);
+
 void
 afr_local_cleanup (afr_local_t *local, xlator_t *this);
 
 int
 afr_frame_return (call_frame_t *frame);
 
-gf_boolean_t
+uint64_t
 afr_is_split_brain (xlator_t *this, inode_t *inode);
 
 void
-afr_set_split_brain (xlator_t *this, inode_t *inode, afr_spb_state_t mdata_spb,
-                     afr_spb_state_t data_spb);
+afr_set_split_brain (xlator_t *this, inode_t *inode, gf_boolean_t set);
 
 int
 afr_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
-          fd_t *fd, dict_t *xdata);
+          fd_t *fd, int32_t wbflags);
 
 void
 afr_set_opendir_done (xlator_t *this, inode_t *inode);
 
-gf_boolean_t
+uint64_t
 afr_is_opendir_done (xlator_t *this, inode_t *inode);
 
 void
@@ -961,7 +827,7 @@ int
 afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd);
 
 int
-afr_launch_openfd_self_heal (call_frame_t *frame, xlator_t *this, fd_t *fd);
+afr_openfd_flush (call_frame_t *frame, xlator_t *this, fd_t *fd);
 
 #define AFR_STACK_UNWIND(fop, frame, params ...)                \
         do {                                                    \
@@ -973,27 +839,22 @@ afr_launch_openfd_self_heal (call_frame_t *frame, xlator_t *this, fd_t *fd);
                         frame->local = NULL;                    \
                 }                                               \
                 STACK_UNWIND_STRICT (fop, frame, params);       \
-                if (__local) {                                  \
-                        afr_local_cleanup (__local, __this);    \
-                        mem_put (__local);                      \
-                }                                               \
-        } while (0)
+                afr_local_cleanup (__local, __this);            \
+                GF_FREE (__local);                              \
+        } while (0);
 
-#define AFR_STACK_DESTROY(frame)                                \
-        do {                                                    \
-                afr_local_t *__local = NULL;                    \
-                xlator_t    *__this = NULL;                     \
-                __local = frame->local;                         \
-                __this = frame->this;                           \
-                frame->local = NULL;                            \
-                STACK_DESTROY (frame->root);                    \
-                if (__local) {                                  \
-                        afr_local_cleanup (__local, __this);    \
-                        mem_put (__local);                      \
-                }                                               \
+#define AFR_STACK_DESTROY(frame)                        \
+        do {                                            \
+                afr_local_t *__local = NULL;            \
+                xlator_t    *__this = NULL;             \
+                __local = frame->local;                 \
+                __this = frame->this;                   \
+                frame->local = NULL;                    \
+                STACK_DESTROY (frame->root);            \
+                afr_local_cleanup (__local, __this);    \
+                GF_FREE (__local);                      \
         } while (0);
 
-#define AFR_NUM_CHANGE_LOGS            3 /*data + metadata + entry*/
 /* allocate and return a string that is the basename of argument */
 static inline char *
 AFR_BASENAME (const char *str)
@@ -1006,65 +867,151 @@ AFR_BASENAME (const char *str)
         return __basename_str;
 }
 
-int
-afr_transaction_local_init (afr_local_t *local, xlator_t *this);
+/* initialize local_t */
+static inline int
+AFR_LOCAL_INIT (afr_local_t *local, afr_private_t *priv)
+{
+        int  child_up_count = 0;
 
-int32_t
-afr_marker_getxattr (call_frame_t *frame, xlator_t *this,
-                     loc_t *loc, const char *name,afr_local_t *local, afr_private_t *priv );
+        local->child_up = GF_CALLOC (sizeof (*local->child_up),
+                                     priv->child_count,
+                                     gf_afr_mt_char);
+        if (!local->child_up) {
+                return -ENOMEM;
+        }
 
-int32_t *
-afr_children_create (int32_t child_count);
+        memcpy (local->child_up, priv->child_up,
+                sizeof (*local->child_up) * priv->child_count);
 
-int
-afr_local_init (afr_local_t *local, afr_private_t *priv, int32_t *op_errno);
+        child_up_count = afr_up_children_count (priv->child_count, local->child_up);
 
-int
-afr_internal_lock_init (afr_internal_lock_t *lk, size_t child_count,
-                        transaction_lk_type_t lk_type);
+        if (priv->optimistic_change_log && child_up_count == priv->child_count)
+                local->optimistic_change_log = 1;
 
-int
-afr_first_up_child (unsigned char *child_up, size_t child_count);
+        local->call_count = afr_up_children_count (priv->child_count, local->child_up);
+        if (local->call_count == 0) {
+                gf_log (THIS->name, GF_LOG_INFO, "no subvolumes up");
+                return -ENOTCONN;
+        }
 
-int
-afr_select_read_child_from_policy (int32_t *fresh_children, int32_t child_count,
-                                   int32_t prev_read_child,
-                                   int32_t config_read_child, int32_t *sources,
-                                   unsigned int hmode, uuid_t gfid);
+        local->transaction.erase_pending = 1;
 
-void
-afr_set_read_ctx_from_policy (xlator_t *this, inode_t *inode,
-                              int32_t *fresh_children, int32_t prev_read_child,
-                              int32_t config_read_child, uuid_t gfid);
+        local->op_ret = -1;
+        local->op_errno = EUCLEAN;
 
-int32_t
-afr_get_call_child (xlator_t *this, unsigned char *child_up, int32_t read_child,
-                    int32_t *fresh_children,
-                    int32_t *call_child, int32_t *last_index);
+        local->internal_lock.lock_op_ret   = -1;
+        local->internal_lock.lock_op_errno = EUCLEAN;
+
+
+        return 0;
+}
+
+
+/**
+ * first_up_child - return the index of the first child that is up
+ */
+
+static inline int
+afr_first_up_child (afr_private_t *priv)
+{
+        xlator_t ** children = NULL;
+        int         ret      = -1;
+        int         i        = 0;
+
+        LOCK (&priv->lock);
+        {
+                children = priv->children;
+                for (i = 0; i < priv->child_count; i++) {
+                        if (priv->child_up[i]) {
+                                ret = i;
+                                break;
+                        }
+                }
+        }
+        UNLOCK (&priv->lock);
+
+        return ret;
+}
+
+
+static inline int
+afr_transaction_local_init (afr_local_t *local, afr_private_t *priv)
+{
+        int i;
+
+        local->first_up_child = afr_first_up_child (priv);
+
+        local->child_errno = GF_CALLOC (sizeof (*local->child_errno),
+                                        priv->child_count,
+                                        gf_afr_mt_int32_t);
+        if (!local->child_errno) {
+                return -ENOMEM;
+        }
+
+        local->pending = GF_CALLOC (sizeof (*local->pending),
+                                    priv->child_count,
+                                    gf_afr_mt_int32_t);
+
+        if (!local->pending) {
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < priv->child_count; i++) {
+                local->pending[i] = GF_CALLOC (sizeof (*local->pending[i]),
+                                               3, /* data + metadata + entry */
+                                               gf_afr_mt_int32_t);
+                if (!local->pending[i])
+                        return -ENOMEM;
+        }
+
+        local->internal_lock.inode_locked_nodes =
+                GF_CALLOC (sizeof (*local->internal_lock.inode_locked_nodes),
+                           priv->child_count,
+                           gf_afr_mt_char);
+
+        local->internal_lock.entry_locked_nodes =
+                GF_CALLOC (sizeof (*local->internal_lock.entry_locked_nodes),
+                           priv->child_count,
+                           gf_afr_mt_char);
+
+        local->internal_lock.locked_nodes =
+                GF_CALLOC (sizeof (*local->internal_lock.locked_nodes),
+                           priv->child_count,
+                           gf_afr_mt_char);
+
+        local->internal_lock.lower_locked_nodes
+                = GF_CALLOC (sizeof (*local->internal_lock.lower_locked_nodes),
+                             priv->child_count,
+                             gf_afr_mt_char);
+
+        local->transaction.child_errno = GF_CALLOC (sizeof (*local->transaction.child_errno),
+                                                    priv->child_count,
+                                                    gf_afr_mt_int32_t);
+
+        local->internal_lock.transaction_lk_type = AFR_TRANSACTION_LK;
+
+        return 0;
+}
 
 int32_t
-afr_next_call_child (int32_t *fresh_children, unsigned char *child_up,
-                     size_t child_count, int32_t *last_index,
-                     int32_t read_child);
+afr_marker_getxattr (call_frame_t *frame, xlator_t *this,
+                     loc_t *loc, const char *name,afr_local_t *local, afr_private_t *priv );
+
 void
 afr_get_fresh_children (int32_t *success_children, int32_t *sources,
-                        int32_t *children, unsigned int child_count);
+                        int32_t *fresh_children, unsigned int child_count);
 void
-afr_children_add_child (int32_t *children, int32_t child,
+afr_fresh_children_add_child (int32_t *fresh_children, int32_t child,
                               int32_t child_count);
 void
-afr_children_rm_child (int32_t *children, int32_t child,
-                             int32_t child_count);
-void
-afr_reset_children (int32_t *children, int32_t child_count);
-int32_t
-afr_most_important_error(int32_t old_errno, int32_t new_errno,
-			 gf_boolean_t eio);
+afr_reset_children (int32_t *fresh_children, int32_t child_count);
+gf_boolean_t
+afr_error_more_important (int32_t old_errno, int32_t new_errno);
 int
 afr_errno_count (int32_t *children, int *child_errno,
                  unsigned int child_count, int32_t op_errno);
 int
-afr_get_children_count (int32_t *children, unsigned int child_count);
+afr_get_children_count (int32_t *fresh_children, unsigned int child_count);
 gf_boolean_t
 afr_is_child_present (int32_t *success_children, int32_t child_count,
                       int32_t child);
@@ -1091,122 +1038,6 @@ afr_transaction_type_get (ia_type_t ia_type);
 int32_t
 afr_resultant_errno_get (int32_t *children,
                          int *child_errno, unsigned int child_count);
-void
-afr_inode_rm_stale_children (xlator_t *this, inode_t *inode,
-                             int32_t *stale_children);
-void
-afr_launch_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode,
-                      gf_boolean_t background, ia_type_t ia_type, char *reason,
-                      void (*gfid_sh_success_cbk) (call_frame_t *sh_frame,
-                                                   xlator_t *this),
-                      int (*unwind) (call_frame_t *frame, xlator_t *this,
-                                     int32_t op_ret, int32_t op_errno,
-                                     int32_t sh_failed));
-void
-afr_fix_open (xlator_t *this, fd_t *fd, size_t need_open_count, int *need_open);
-
-void
-afr_open_fd_fix (fd_t *fd, xlator_t *this);
-int
-afr_set_elem_count_get (unsigned char *elems, int child_count);
-
-afr_fd_ctx_t *
-afr_fd_ctx_get (fd_t *fd, xlator_t *this);
-
-gf_boolean_t
-afr_open_only_data_self_heal (char *data_self_heal);
-
-gf_boolean_t
-afr_data_self_heal_enabled (char *data_self_heal);
-
-void
-afr_set_low_priority (call_frame_t *frame);
-int
-afr_child_fd_ctx_set (xlator_t *this, fd_t *fd, int32_t child,
-                      int flags);
-
-gf_boolean_t
-afr_have_quorum (char *logname, afr_private_t *priv);
-
-void
-afr_matrix_cleanup (int32_t **pending, unsigned int m);
-
-int32_t**
-afr_matrix_create (unsigned int m, unsigned int n);
-
-gf_boolean_t
-afr_is_errno_set (int *child_errno, int child);
-
-gf_boolean_t
-afr_is_errno_unset (int *child_errno, int child);
-
-gf_boolean_t
-afr_is_fd_fixable (fd_t *fd);
-
-void
-afr_prepare_new_entry_pending_matrix (int32_t **pending,
-                                      gf_boolean_t (*is_pending) (int *, int),
-                                      int *ctx, struct iatt *buf,
-                                      unsigned int child_count);
-void
-afr_xattr_array_destroy (dict_t **xattr, unsigned int child_count);
-/*
- * Special value indicating we should use the "auto" quorum method instead of
- * a fixed value (including zero to turn off quorum enforcement).
- */
-#define AFR_QUORUM_AUTO INT_MAX
-
-/*
- * Having this as a macro will make debugging a bit weirder, but does reduce
- * the probability of functions handling this check inconsistently.
- */
-#define QUORUM_CHECK(_func,_label) do {                                  \
-        if (priv->quorum_count && !afr_have_quorum(this->name,priv)) { \
-                gf_log(this->name,GF_LOG_WARNING,                        \
-                       "failing "#_func" due to lack of quorum");        \
-                op_errno = EROFS;                                        \
-                goto _label;                                             \
-        }                                                                \
-} while (0);
-
-
-#define AFR_SBRAIN_MSG "Failed on %s as split-brain is seen. Returning EIO."
-
-#define AFR_SBRAIN_CHECK_FD(fd, label) do {                              \
-        if (fd->inode && afr_is_split_brain (this, fd->inode)) {        \
-                op_errno = EIO;                                         \
-                gf_log (this->name, GF_LOG_WARNING,                     \
-                        AFR_SBRAIN_MSG ,uuid_utoa (fd->inode->gfid));   \
-                goto label;                                             \
-        }                                                               \
-} while (0)
-
-#define AFR_SBRAIN_CHECK_LOC(loc, label) do {                           \
-        if (loc->inode && afr_is_split_brain (this, loc->inode)) {      \
-                op_errno = EIO;                                         \
-                loc_path (loc, NULL);                                   \
-                gf_log (this->name, GF_LOG_WARNING,                     \
-                        AFR_SBRAIN_MSG , loc->path);                    \
-                goto label;                                             \
-        }                                                               \
-} while (0)
-
-int
-afr_fd_report_unstable_write (xlator_t *this, fd_t *fd);
-
-gf_boolean_t
-afr_fd_has_witnessed_unstable_write (xlator_t *this, fd_t *fd);
-
-void
-afr_delayed_changelog_wake_resume (xlator_t *this, fd_t *fd, call_stub_t *stub);
-
-int
-afr_inodelk_init (afr_inodelk_t *lk, char *dom, size_t child_count);
-
-void
-afr_handle_open_fd_count (call_frame_t *frame, xlator_t *this);
-
-afr_inode_ctx_t*
-afr_inode_ctx_get (inode_t *inode, xlator_t *this);
-
+int32_t*
+afr_children_create (unsigned int child_count);
 #endif /* __AFR_H__ */
diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c
index a7f72fb30..15eee3ee4 100644
--- a/xlators/cluster/afr/src/pump.c
+++ b/xlators/cluster/afr/src/pump.c
@@ -1,17 +1,25 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #include <unistd.h>
 #include <sys/time.h>
 #include <stdlib.h>
-#include <fnmatch.h>
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -20,16 +28,8 @@
 
 #include "afr-common.c"
 #include "defaults.c"
-#include "glusterfs.h"
-
-static uint64_t pump_pid = 0;
-static inline void
-pump_fill_loc_info (loc_t *loc, struct iatt *iatt, struct iatt *parent)
-{
-        afr_update_loc_gfids (loc, iatt, parent);
-        uuid_copy (loc->inode->gfid, iatt->ia_gfid);
-}
 
+uint64_t pump_pid = 0;
 static int
 pump_mark_start_pending (xlator_t *this)
 {
@@ -140,7 +140,9 @@ pump_set_resume_path (xlator_t *this, const char *path)
 
         LOCK (&pump_priv->resume_path_lock);
         {
-                strncpy (pump_priv->resume_path, path, strlen (path) + 1);
+                pump_priv->resume_path = strdup (path);
+                if (!pump_priv->resume_path)
+                        ret = -1;
         }
         UNLOCK (&pump_priv->resume_path_lock);
 
@@ -151,6 +153,7 @@ static int
 pump_save_path (xlator_t *this, const char *path)
 {
         afr_private_t *priv = NULL;
+        pump_private_t *pump_priv = NULL;
         pump_state_t state;
         dict_t *dict = NULL;
         loc_t  loc = {0};
@@ -162,30 +165,29 @@ pump_save_path (xlator_t *this, const char *path)
                 return 0;
 
         priv = this->private;
+        pump_priv = priv->pump_private;
 
         GF_ASSERT (priv->root_inode);
 
-        afr_build_root_loc (this, &loc);
+        build_root_loc (priv->root_inode, &loc);
 
         dict = dict_new ();
         dict_ret = dict_set_str (dict, PUMP_PATH, (char *)path);
-        if (dict_ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to set the key %s", path, PUMP_PATH);
 
         ret = syncop_setxattr (PUMP_SOURCE_CHILD (this), &loc, dict, 0);
 
         if (ret < 0) {
-                gf_log (this->name, GF_LOG_INFO,
+                gf_log (this->name, GF_LOG_DEBUG,
                         "setxattr failed - could not save path=%s", path);
         } else {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "setxattr succeeded - saved path=%s", path);
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "Saving path for status info");
         }
 
         dict_unref (dict);
 
-        loc_wipe (&loc);
         return 0;
 }
 
@@ -248,9 +250,15 @@ pump_get_resume_path (xlator_t *this)
 static int
 pump_update_resume_state (xlator_t *this, const char *path)
 {
+        afr_private_t *priv = NULL;
+        pump_private_t *pump_priv = NULL;
+
         pump_state_t state;
         const char *resume_path = NULL;
 
+        priv = this->private;
+        pump_priv = priv->pump_private;
+
         state = pump_get_state ();
 
         if (state == PUMP_STATE_RESUME) {
@@ -278,10 +286,16 @@ pump_update_resume_state (xlator_t *this, const char *path)
 static gf_boolean_t
 is_pump_traversal_allowed (xlator_t *this, const char *path)
 {
+        afr_private_t *priv = NULL;
+        pump_private_t *pump_priv = NULL;
+
         pump_state_t state;
         const char *resume_path = NULL;
         gf_boolean_t ret = _gf_true;
 
+        priv = this->private;
+        pump_priv = priv->pump_private;
+
         state = pump_get_state ();
 
         if (state == PUMP_STATE_RESUME) {
@@ -321,10 +335,29 @@ pump_save_file_stats (xlator_t *this, const char *path)
         return 0;
 }
 
+static void
+_fill_loc_info (loc_t *loc, struct iatt *iatt, struct iatt *parent)
+{
+        afr_update_loc_gfids (loc, iatt, parent);
+        uuid_copy (loc->inode->gfid, iatt->ia_gfid);
+        loc->ino = iatt->ia_ino;
+        loc->inode->ino = iatt->ia_ino;
+}
+
+static void
+_wipe_loc (loc_t *loc)
+{
+        loc_wipe (loc);
+        uuid_clear (loc->gfid);
+        uuid_clear (loc->pargfid);
+        loc->ino = 0;
+}
+
 static int
 gf_pump_traverse_directory (loc_t *loc)
 {
         xlator_t        *this              = NULL;
+        afr_private_t   *priv              = NULL;
         fd_t            *fd                = NULL;
         off_t           offset             = 0;
         loc_t           entry_loc          = {0};
@@ -340,6 +373,7 @@ gf_pump_traverse_directory (loc_t *loc)
 
         INIT_LIST_HEAD (&entries.list);
         this = THIS;
+        priv = this->private;
 
         GF_ASSERT (loc->inode);
 
@@ -361,7 +395,7 @@ gf_pump_traverse_directory (loc_t *loc)
                 "pump opendir on %s returned=%d",
                 loc->path, ret);
 
-        while (syncop_readdirp (this, fd, 131072, offset, NULL, &entries)) {
+        while (syncop_readdirp (this, fd, 131072, offset, &entries)) {
                 free_entries = _gf_true;
 
                 if (list_empty (&entries.list)) {
@@ -377,20 +411,21 @@ gf_pump_traverse_directory (loc_t *loc)
                         offset = entry->d_off;
                         if (uuid_is_null (entry->d_stat.ia_gfid)) {
                                 gf_log (this->name, GF_LOG_WARNING, "%s/%s: No "
-                                        "gfid present skipping",
+                                        "gfid present skipping the file",
                                         loc->path, entry->d_name);
                                 continue;
                         }
-                        loc_wipe (&entry_loc);
+                        _wipe_loc (&entry_loc);
                         ret = afr_build_child_loc (this, &entry_loc, loc,
-                                                   entry->d_name);
+                                                   entry->d_name,
+                                                   entry->d_stat.ia_gfid);
                         if (ret)
                                 goto out;
-
                         if (!IS_ENTRY_CWD (entry->d_name) &&
                             !IS_ENTRY_PARENT (entry->d_name)) {
 
                                     is_directory_empty = _gf_false;
+
                                     gf_log (this->name, GF_LOG_DEBUG,
                                             "lookup %s => %"PRId64,
                                             entry_loc.path,
@@ -405,8 +440,7 @@ gf_pump_traverse_directory (loc_t *loc)
                                                     entry_loc.path);
                                             continue;
                                     }
-                                    pump_fill_loc_info (&entry_loc, &iatt,
-                                                       &parent);
+                                    _fill_loc_info (&entry_loc, &iatt, &parent);
 
                                     pump_update_resume_state (this, entry_loc.path);
 
@@ -428,7 +462,7 @@ gf_pump_traverse_directory (loc_t *loc)
                                                     gf_pump_traverse_directory (&entry_loc);
                                             }
                                     }
-                        }
+                            }
                 }
 
                 gf_dirent_free (&entries);
@@ -439,10 +473,6 @@ gf_pump_traverse_directory (loc_t *loc)
 
         }
 
-        ret = syncop_close (fd);
-        if (ret < 0)
-                gf_log (this->name, GF_LOG_DEBUG, "closing the fd failed");
-
         if (is_directory_empty && IS_ROOT_PATH (loc->path)) {
                pump_change_state (this, PUMP_STATE_RUNNING);
                gf_log (this->name, GF_LOG_INFO, "Empty source brick. "
@@ -455,13 +485,33 @@ out:
         if (free_entries)
                 gf_dirent_free (&entries);
         return 0;
+
+}
+
+void
+build_root_loc (inode_t *inode, loc_t *loc)
+{
+        loc->path = "/";
+        loc->name = "";
+        loc->inode = inode;
+        loc->ino = 1;
+        loc->inode->ino = 1;
+        memset (loc->inode->gfid, 0, 16);
+        loc->inode->gfid[15] = 1;
+
 }
 
 static int
 pump_update_resume_path (xlator_t *this)
 {
+        afr_private_t *priv = NULL;
+        pump_private_t *pump_priv = NULL;
+
         const char *resume_path = NULL;
 
+        priv = this->private;
+        pump_priv = priv->pump_private;
+
         resume_path = pump_get_resume_path (this);
 
         if (resume_path) {
@@ -480,39 +530,6 @@ pump_update_resume_path (xlator_t *this)
         return 0;
 }
 
-static int32_t
-pump_xattr_cleaner (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int32_t op_ret, int32_t op_errno, dict_t *xdata)
-{
-        afr_private_t  *priv      = NULL;
-        loc_t           loc       = {0};
-        int             i         = 0;
-        int             ret       = 0;
-        int             source    = 0;
-        int             sink      = 1;
-
-        priv      = this->private;
-
-        afr_build_root_loc (this, &loc);
-
-        ret = syncop_removexattr (priv->children[source], &loc,
-                                          PUMP_PATH);
-
-        ret = syncop_removexattr (priv->children[sink], &loc,
-                                  PUMP_SINK_COMPLETE);
-
-        for (i = 0; i < priv->child_count; i++) {
-                ret = syncop_removexattr (priv->children[i], &loc,
-                                          PUMP_SOURCE_COMPLETE);
-                if (ret)
-                        gf_log (this->name, GF_LOG_DEBUG, "removexattr "
-                                "failed with %s", strerror (errno));
-        }
-
-        loc_wipe (&loc);
-        return pump_command_reply (frame, this);
-}
-
 static int
 pump_complete_migration (xlator_t *this)
 {
@@ -529,7 +546,7 @@ pump_complete_migration (xlator_t *this)
 
         GF_ASSERT (priv->root_inode);
 
-        afr_build_root_loc (this, &loc);
+        build_root_loc (priv->root_inode, &loc);
 
         dict = dict_new ();
 
@@ -541,10 +558,6 @@ pump_complete_migration (xlator_t *this)
                 pump_priv->pump_finished = _gf_true;
 
                 dict_ret = dict_set_str (dict, PUMP_SOURCE_COMPLETE, "jargon");
-                if (dict_ret)
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: failed to set the key %s",
-                                loc.path, PUMP_SOURCE_COMPLETE);
 
                 ret = syncop_setxattr (PUMP_SOURCE_CHILD (this), &loc, dict, 0);
                 if (ret < 0) {
@@ -552,10 +565,6 @@ pump_complete_migration (xlator_t *this)
                                 "setxattr failed - while  notifying source complete");
                 }
                 dict_ret = dict_set_str (dict, PUMP_SINK_COMPLETE, "jargon");
-                if (dict_ret)
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: failed to set the key %s",
-                                loc.path, PUMP_SINK_COMPLETE);
 
                 ret = syncop_setxattr (PUMP_SINK_CHILD (this), &loc, dict, 0);
                 if (ret < 0) {
@@ -564,18 +573,26 @@ pump_complete_migration (xlator_t *this)
                 }
 
                 pump_save_path (this, "/");
-
-        } else if (state == PUMP_STATE_ABORT) {
-                gf_log (this->name, GF_LOG_DEBUG, "Starting cleanup "
-                        "of pump internal xattrs");
-                call_resume (pump_priv->cleaner);
         }
 
-        loc_wipe (&loc);
         return 0;
 }
 
 static int
+pump_set_root_gfid (dict_t *dict)
+{
+        uuid_t gfid;
+        int ret = 0;
+
+        memset (gfid, 0, 16);
+        gfid[15] = 1;
+
+        ret = afr_set_dict_gfid (dict, gfid);
+
+        return ret;
+}
+
+static int
 pump_lookup_sink (loc_t *loc)
 {
         xlator_t *this = NULL;
@@ -588,7 +605,7 @@ pump_lookup_sink (loc_t *loc)
 
         xattr_req = dict_new ();
 
-        ret = afr_set_root_gfid (xattr_req);
+        ret = pump_set_root_gfid (xattr_req);
         if (ret)
                 goto out;
 
@@ -627,7 +644,7 @@ pump_task (void *data)
 
         GF_ASSERT (priv->root_inode);
 
-        afr_build_root_loc (this, &loc);
+        build_root_loc (priv->root_inode, &loc);
         xattr_req = dict_new ();
         if (!xattr_req) {
                 gf_log (this->name, GF_LOG_DEBUG,
@@ -636,13 +653,14 @@ pump_task (void *data)
                 goto out;
         }
 
-        afr_set_root_gfid (xattr_req);
+        pump_set_root_gfid (xattr_req);
         ret = syncop_lookup (this, &loc, xattr_req,
                              &iatt, &xattr_rsp, &parent);
 
         gf_log (this->name, GF_LOG_TRACE,
-                "lookup: path=%s gfid=%s",
-                loc.path, uuid_utoa (loc.inode->gfid));
+                "lookup: ino=%"PRId64", path=%s",
+                loc.ino,
+                loc.path);
 
         ret = pump_check_and_update_status (this);
         if (ret < 0) {
@@ -651,7 +669,7 @@ pump_task (void *data)
 
         pump_update_resume_path (this);
 
-        afr_set_root_gfid (xattr_req);
+        pump_set_root_gfid (xattr_req);
         ret = pump_lookup_sink (&loc);
         if (ret) {
                 pump_update_resume_path (this);
@@ -665,23 +683,26 @@ out:
         if (xattr_req)
                 dict_unref (xattr_req);
 
-        loc_wipe (&loc);
 	return 0;
 }
 
 
 static int
-pump_task_completion (int ret, call_frame_t *sync_frame, void *data)
+pump_task_completion (int ret, void *data)
 {
         xlator_t *this = NULL;
+        call_frame_t *frame = NULL;
         afr_private_t *priv = NULL;
+        pump_private_t *pump_priv = NULL;
 
         this = THIS;
 
+        frame = (call_frame_t *) data;
+
         priv = this->private;
+        pump_priv = priv->pump_private;
 
         inode_unref (priv->root_inode);
-        STACK_DESTROY (sync_frame->root);
 
         gf_log (this->name, GF_LOG_DEBUG,
                 "Pump xlator exiting");
@@ -699,22 +720,21 @@ pump_start (call_frame_t *pump_frame, xlator_t *this)
 	priv = this->private;
         pump_priv = priv->pump_private;
 
-        afr_set_lk_owner (pump_frame, this, pump_frame->root);
+	pump_frame->root->lk_owner = (uint64_t) (unsigned long)pump_frame->root;
 	pump_pid = (uint64_t) (unsigned long)pump_frame->root;
 
 	ret = synctask_new (pump_priv->env, pump_task,
                             pump_task_completion,
-                            pump_frame, NULL);
+                            pump_frame);
         if (ret == -1) {
-                gf_log (this->name, GF_LOG_ERROR,
+                gf_log (this->name, GF_LOG_DEBUG,
                         "starting pump failed");
                 pump_change_state (this, PUMP_STATE_ABORT);
                 goto out;
         }
 
-        gf_log (this->name, GF_LOG_DEBUG,
-                "setting pump as started lk_owner: %s %"PRIu64,
-                lkowner_utoa (&pump_frame->root->lk_owner), pump_pid);
+        gf_log (this->name, GF_LOG_TRACE,
+                "setting pump as started");
 
         priv->use_afr_in_pump = 1;
 out:
@@ -748,7 +768,7 @@ pump_cmd_start_setxattr_cbk (call_frame_t *frame,
                              void *cookie,
                              xlator_t *this,
                              int32_t op_ret,
-                             int32_t op_errno, dict_t *xdata)
+                             int32_t op_errno)
 
 {
         call_frame_t *prev = NULL;
@@ -790,7 +810,7 @@ pump_initiate_sink_connect (call_frame_t *frame, xlator_t *this)
         afr_private_t *priv      = NULL;
         dict_t        *dict      = NULL;
         data_t        *data      = NULL;
-        char          *clnt_cmd  = NULL;
+        char          *clnt_cmd = NULL;
         loc_t loc = {0};
 
         int ret = 0;
@@ -800,11 +820,10 @@ pump_initiate_sink_connect (call_frame_t *frame, xlator_t *this)
 
         GF_ASSERT (priv->root_inode);
 
-        afr_build_root_loc (this, &loc);
+        build_root_loc (priv->root_inode, &loc);
 
-        data = data_ref (dict_get (local->dict, RB_PUMP_CMD_START));
+        data = data_ref (dict_get (local->dict, PUMP_CMD_START));
         if (!data) {
-                ret = -1;
                 gf_log (this->name, GF_LOG_ERROR,
                         "Could not get destination brick value");
                 goto out;
@@ -812,13 +831,16 @@ pump_initiate_sink_connect (call_frame_t *frame, xlator_t *this)
 
         dict = dict_new ();
         if (!dict) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Out of memory");
                 ret = -1;
                 goto out;
         }
 
         clnt_cmd = GF_CALLOC (1, data->len+1, gf_common_mt_char);
         if (!clnt_cmd) {
-                ret = -1;
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Out of memory");
                 goto out;
         }
 
@@ -829,6 +851,7 @@ pump_initiate_sink_connect (call_frame_t *frame, xlator_t *this)
 
         ret = dict_set_dynstr (dict, CLIENT_CMD_CONNECT, clnt_cmd);
         if (ret < 0) {
+                GF_FREE (clnt_cmd);
                 gf_log (this->name, GF_LOG_ERROR,
                         "Could not inititiate destination brick "
                         "connect");
@@ -841,21 +864,14 @@ pump_initiate_sink_connect (call_frame_t *frame, xlator_t *this)
 		    PUMP_SINK_CHILD(this)->fops->setxattr,
 		    &loc,
 		    dict,
-		    0, NULL);
+		    0);
 
         ret = 0;
 
+        dict_unref (dict);
 out:
-        if (dict)
-                dict_unref (dict);
-
         if (data)
                 data_unref (data);
-
-        if (ret && clnt_cmd)
-                GF_FREE (clnt_cmd);
-
-        loc_wipe (&loc);
         return ret;
 }
 
@@ -875,7 +891,7 @@ pump_cmd_start_getxattr_cbk (call_frame_t *frame,
                              xlator_t *this,
                              int32_t op_ret,
                              int32_t op_errno,
-                             dict_t *dict, dict_t *xdata)
+                             dict_t *dict)
 {
         afr_local_t *local = NULL;
         char *path = NULL;
@@ -942,7 +958,6 @@ pump_execute_status (call_frame_t *frame, xlator_t *this)
         uint64_t number_files = 0;
 
         char filename[PATH_MAX];
-        char summary[PATH_MAX+256];
         char *dict_str = NULL;
 
         int32_t op_ret = 0;
@@ -971,36 +986,28 @@ pump_execute_status (call_frame_t *frame, xlator_t *this)
         }
 
         if (pump_priv->pump_finished) {
-                snprintf (summary, PATH_MAX+256,
-                          "no_of_files=%"PRIu64, number_files);
+        snprintf (dict_str, PATH_MAX + 256, "Number of files migrated = %"PRIu64"        Migration complete ",
+                  number_files);
         } else {
-                snprintf (summary, PATH_MAX+256,
-                          "no_of_files=%"PRIu64":current_file=%s",
-                          number_files, filename);
+        snprintf (dict_str, PATH_MAX + 256, "Number of files migrated = %"PRIu64"       Current file= %s ",
+                  number_files, filename);
         }
-        snprintf (dict_str, PATH_MAX+256, "status=%d:%s",
-                  (pump_priv->pump_finished)?1:0, summary);
 
         dict = dict_new ();
 
-        ret = dict_set_dynstr (dict, RB_PUMP_CMD_STATUS, dict_str);
+        ret = dict_set_dynptr (dict, PUMP_CMD_STATUS, dict_str, PATH_MAX + 256);
         if (ret < 0) {
                 gf_log (this->name, GF_LOG_DEBUG,
-                        "dict_set_dynstr returned negative value");
-        } else {
-                dict_str = NULL;
+                        "dict_set_dynptr returned negative value");
         }
 
         op_ret = 0;
 
 out:
 
-        AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict, NULL);
+        AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict);
 
-        if (dict)
-                dict_unref (dict);
-
-        GF_FREE (dict_str);
+        dict_unref (dict);
 
         return 0;
 }
@@ -1042,14 +1049,14 @@ pump_execute_start (call_frame_t *frame, xlator_t *this)
 
         GF_ASSERT (priv->root_inode);
 
-        afr_build_root_loc (this, &loc);
+        build_root_loc (priv->root_inode, &loc);
 
 	STACK_WIND (frame,
 		    pump_cmd_start_getxattr_cbk,
 		    PUMP_SOURCE_CHILD(this),
 		    PUMP_SOURCE_CHILD(this)->fops->getxattr,
 		    &loc,
-		    PUMP_PATH, NULL);
+		    PUMP_PATH);
 
         ret = 0;
 
@@ -1059,69 +1066,15 @@ out:
                 pump_command_reply (frame, this);
         }
 
-        loc_wipe (&loc);
 	return 0;
 }
 
-static int
-pump_cleanup_helper (void *data) {
-        call_frame_t *frame = data;
-
-        pump_xattr_cleaner (frame, 0, frame->this, 0, 0, NULL);
-
-        return 0;
-}
-
-static int
-pump_cleanup_done (int ret, call_frame_t *sync_frame, void *data)
-{
-        STACK_DESTROY (sync_frame->root);
-
-        return 0;
-}
-
-int
-pump_execute_commit (call_frame_t *frame, xlator_t *this)
-{
-        afr_private_t  *priv       = NULL;
-        pump_private_t *pump_priv  = NULL;
-        afr_local_t    *local      = NULL;
-        call_frame_t   *sync_frame = NULL;
-        int             ret        = 0;
-
-        priv      = this->private;
-        pump_priv = priv->pump_private;
-        local     = frame->local;
-
-        local->op_ret = 0;
-        if (pump_priv->pump_finished) {
-                pump_change_state (this, PUMP_STATE_COMMIT);
-                sync_frame = create_frame (this, this->ctx->pool);
-                ret = synctask_new (pump_priv->env, pump_cleanup_helper,
-                                    pump_cleanup_done, sync_frame, frame);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_DEBUG, "Couldn't create "
-                                "synctask for cleaning up xattrs.");
-                }
-
-        } else {
-                gf_log (this->name, GF_LOG_ERROR, "Commit can't proceed. "
-                        "Migration in progress");
-                local->op_ret = -1;
-                local->op_errno = EINPROGRESS;
-                pump_command_reply (frame, this);
-        }
-
-        return 0;
-}
 int
 pump_execute_abort (call_frame_t *frame, xlator_t *this)
 {
-        afr_private_t  *priv       = NULL;
-        pump_private_t *pump_priv  = NULL;
-        afr_local_t    *local      = NULL;
-        call_frame_t   *sync_frame = NULL;
-        int             ret        = 0;
+        afr_private_t  *priv      = NULL;
+        pump_private_t *pump_priv = NULL;
+        afr_local_t    *local     = NULL;
 
         priv      = this->private;
         pump_priv = priv->pump_private;
@@ -1137,20 +1090,7 @@ pump_execute_abort (call_frame_t *frame, xlator_t *this)
         UNLOCK (&pump_priv->resume_path_lock);
 
         local->op_ret = 0;
-        if (pump_priv->pump_finished) {
-                sync_frame = create_frame (this, this->ctx->pool);
-                ret = synctask_new (pump_priv->env, pump_cleanup_helper,
-                                    pump_cleanup_done, sync_frame, frame);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_DEBUG, "Couldn't create "
-                                "synctask for cleaning up xattrs.");
-                }
-
-        } else {
-                pump_priv->cleaner = fop_setxattr_cbk_stub (frame,
-                                                            pump_xattr_cleaner,
-                                                            0, 0, NULL);
-        }
+        pump_command_reply (frame, this);
 
         return 0;
 }
@@ -1162,7 +1102,7 @@ pump_command_status (xlator_t *this, dict_t *dict)
         int dict_ret = -1;
         int ret = _gf_true;
 
-        dict_ret = dict_get_str (dict, RB_PUMP_CMD_STATUS, &cmd);
+        dict_ret = dict_get_str (dict, PUMP_CMD_STATUS, &cmd);
         if (dict_ret < 0) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "Not a pump status command");
@@ -1186,7 +1126,7 @@ pump_command_pause (xlator_t *this, dict_t *dict)
         int dict_ret = -1;
         int ret = _gf_true;
 
-        dict_ret = dict_get_str (dict, RB_PUMP_CMD_PAUSE, &cmd);
+        dict_ret = dict_get_str (dict, PUMP_CMD_PAUSE, &cmd);
         if (dict_ret < 0) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "Not a pump pause command");
@@ -1204,37 +1144,13 @@ out:
 }
 
 gf_boolean_t
-pump_command_commit (xlator_t *this, dict_t *dict)
-{
-        char *cmd = NULL;
-        int dict_ret = -1;
-        int ret = _gf_true;
-
-        dict_ret = dict_get_str (dict, RB_PUMP_CMD_COMMIT, &cmd);
-        if (dict_ret < 0) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "Not a pump commit command");
-                ret = _gf_false;
-                goto out;
-        }
-
-        gf_log (this->name, GF_LOG_DEBUG,
-                "Hit a pump command - commit");
-        ret = _gf_true;
-
-out:
-        return ret;
-
-}
-
-gf_boolean_t
 pump_command_abort (xlator_t *this, dict_t *dict)
 {
         char *cmd = NULL;
         int dict_ret = -1;
         int ret = _gf_true;
 
-        dict_ret = dict_get_str (dict, RB_PUMP_CMD_ABORT, &cmd);
+        dict_ret = dict_get_str (dict, PUMP_CMD_ABORT, &cmd);
         if (dict_ret < 0) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "Not a pump abort command");
@@ -1258,7 +1174,7 @@ pump_command_start (xlator_t *this, dict_t *dict)
         int dict_ret = -1;
         int ret = _gf_true;
 
-        dict_ret = dict_get_str (dict, RB_PUMP_CMD_START, &cmd);
+        dict_ret = dict_get_str (dict, PUMP_CMD_START, &cmd);
         if (dict_ret < 0) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "Not a pump start command");
@@ -1280,7 +1196,7 @@ struct _xattr_key {
         struct list_head list;
 };
 
-static int
+static void
 __gather_xattr_keys (dict_t *dict, char *key, data_t *value,
                      void *data)
 {
@@ -1292,14 +1208,13 @@ __gather_xattr_keys (dict_t *dict, char *key, data_t *value,
 
                 xkey = GF_CALLOC (1, sizeof (*xkey), gf_afr_mt_xattr_key);
                 if (!xkey)
-                        return -1;
+                        return;
 
                 xkey->key = key;
                 INIT_LIST_HEAD (&xkey->list);
 
                 list_add_tail (&xkey->list, list);
         }
-        return 0;
 }
 
 static void
@@ -1327,17 +1242,16 @@ __filter_xattrs (dict_t *dict)
 int32_t
 pump_getxattr_cbk (call_frame_t *frame, void *cookie,
 		  xlator_t *this, int32_t op_ret, int32_t op_errno,
-		  dict_t *dict, dict_t *xdata)
+		  dict_t *dict)
 {
-	afr_private_t   *priv           = NULL;
-	afr_local_t     *local          = NULL;
-	xlator_t        **children      = NULL;
-	int             unwind          = 1;
-        int32_t         *last_index     = NULL;
-        int32_t         next_call_child = -1;
-        int32_t         read_child      = -1;
-        int32_t         *fresh_children = NULL;
+	afr_private_t * priv     = NULL;
+	afr_local_t *   local    = NULL;
+	xlator_t **     children = NULL;
 
+	int unwind     = 1;
+	int last_tried = -1;
+	int this_try = -1;
+        int read_child = -1;
 
 	priv     = this->private;
 	children = priv->children;
@@ -1347,22 +1261,25 @@ pump_getxattr_cbk (call_frame_t *frame, void *cookie,
         read_child = (long) cookie;
 
 	if (op_ret == -1) {
-		last_index = &local->cont.getxattr.last_index;
-                fresh_children = local->fresh_children;
-                next_call_child = afr_next_call_child (fresh_children,
-                                                       local->child_up,
-                                                       priv->child_count,
-                                                       last_index, read_child);
-                if (next_call_child < 0)
-                        goto out;
+        retry:
+		last_tried = local->cont.getxattr.last_tried;
+
+		if (all_tried (last_tried, priv->child_count)) {
+			goto out;
+		}
+		this_try = ++local->cont.getxattr.last_tried;
+
+                if (this_try == read_child) {
+                        goto retry;
+                }
 
 		unwind = 0;
 		STACK_WIND_COOKIE (frame, pump_getxattr_cbk,
 				   (void *) (long) read_child,
-				   children[next_call_child],
-				   children[next_call_child]->fops->getxattr,
+				   children[this_try],
+				   children[this_try]->fops->getxattr,
 				   &local->loc,
-				   local->cont.getxattr.name, NULL);
+				   local->cont.getxattr.name);
 	}
 
 out:
@@ -1370,7 +1287,7 @@ out:
                 if (op_ret >= 0 && dict)
                         __filter_xattrs (dict);
 
-		AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict, NULL);
+		AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict);
 	}
 
 	return 0;
@@ -1378,15 +1295,17 @@ out:
 
 int32_t
 pump_getxattr (call_frame_t *frame, xlator_t *this,
-	      loc_t *loc, const char *name, dict_t *xdata)
+	      loc_t *loc, const char *name)
 {
 	afr_private_t *   priv       = NULL;
 	xlator_t **       children   = NULL;
 	int               call_child = 0;
-	afr_local_t       *local     = NULL;
-	int32_t           ret     = -1;
-	int32_t           op_errno   = 0;
-        uint64_t          read_child = 0;
+	afr_local_t     * local      = NULL;
+
+        int               read_child = -1;
+
+	int32_t op_ret   = -1;
+	int32_t op_errno = 0;
 
 
 	VALIDATE_OR_GOTO (frame, out);
@@ -1397,21 +1316,9 @@ pump_getxattr (call_frame_t *frame, xlator_t *this,
 	VALIDATE_OR_GOTO (priv->children, out);
 
 	children = priv->children;
-        if (!priv->use_afr_in_pump) {
-                STACK_WIND (frame, default_getxattr_cbk,
-                            FIRST_CHILD (this),
-                            (FIRST_CHILD (this))->fops->getxattr,
-                            loc, name, xdata);
-                return 0;
-        }
-
-
-	AFR_LOCAL_ALLOC_OR_GOTO (frame->local, out);
-	local = frame->local;
 
-        ret = afr_local_init (local, priv, &op_errno);
-        if (ret < 0)
-                goto out;
+	ALLOC_OR_GOTO (local, afr_local_t, out);
+	frame->local = local;
 
         if (name) {
                 if (!strncmp (name, AFR_XATTR_PREFIX,
@@ -1421,33 +1328,42 @@ pump_getxattr (call_frame_t *frame, xlator_t *this,
                         goto out;
                 }
 
-                if (!strcmp (name, RB_PUMP_CMD_STATUS)) {
+                if (!strcmp (name, PUMP_CMD_STATUS)) {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "Hit pump command - status");
                         pump_execute_status (frame, this);
-                        ret = 0;
+                        op_ret = 0;
                         goto out;
                 }
         }
 
-        local->fresh_children = GF_CALLOC (priv->child_count,
-                                          sizeof (*local->fresh_children),
-                                          gf_afr_mt_int32_t);
-        if (!local->fresh_children) {
-                ret = -1;
-                op_errno = ENOMEM;
-                goto out;
+        if (!priv->use_afr_in_pump) {
+                STACK_WIND (frame, default_getxattr_cbk,
+                            FIRST_CHILD (this),
+                            (FIRST_CHILD (this))->fops->getxattr,
+                            loc, name);
+                return 0;
         }
 
-        read_child = afr_inode_get_read_ctx (this, loc->inode, local->fresh_children);
-        ret = afr_get_call_child (this, local->child_up, read_child,
-                                     local->fresh_children,
-                                     &call_child,
-                                     &local->cont.getxattr.last_index);
-        if (ret < 0) {
-                op_errno = -ret;
-                goto out;
+        read_child = afr_read_child (this, loc->inode);
+
+        if (read_child >= 0) {
+                call_child = read_child;
+
+                local->cont.getxattr.last_tried = -1;
+        } else {
+                call_child = afr_first_up_child (priv);
+
+                if (call_child == -1) {
+                        op_errno = ENOTCONN;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "no child is up");
+                        goto out;
+                }
+
+                local->cont.getxattr.last_tried = call_child;
         }
+
 	loc_copy (&local->loc, loc);
 	if (name)
 	  local->cont.getxattr.name       = gf_strdup (name);
@@ -1455,12 +1371,13 @@ pump_getxattr (call_frame_t *frame, xlator_t *this,
 	STACK_WIND_COOKIE (frame, pump_getxattr_cbk,
 			   (void *) (long) call_child,
 			   children[call_child], children[call_child]->fops->getxattr,
-			   loc, name, xdata);
+			   loc, name);
 
-	ret = 0;
+	op_ret = 0;
 out:
-	if (ret < 0)
-		AFR_STACK_UNWIND (getxattr, frame, -1, op_errno, NULL, NULL);
+	if (op_ret == -1) {
+		AFR_STACK_UNWIND (getxattr, frame, op_ret, op_errno, NULL);
+	}
 	return 0;
 }
 
@@ -1468,9 +1385,11 @@ static int
 afr_setxattr_unwind (call_frame_t *frame, xlator_t *this)
 {
 	afr_local_t *   local = NULL;
+	afr_private_t * priv  = NULL;
 	call_frame_t   *main_frame = NULL;
 
 	local = frame->local;
+	priv  = this->private;
 
 	LOCK (&frame->lock);
 	{
@@ -1482,14 +1401,14 @@ afr_setxattr_unwind (call_frame_t *frame, xlator_t *this)
 
 	if (main_frame) {
 		AFR_STACK_UNWIND (setxattr, main_frame,
-                                  local->op_ret, local->op_errno, NULL);
+                                  local->op_ret, local->op_errno)
 	}
 	return 0;
 }
 
 static int
 afr_setxattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-		       int32_t op_ret, int32_t op_errno, dict_t *xdata)
+		       int32_t op_ret, int32_t op_errno)
 {
 	afr_local_t *   local = NULL;
 	afr_private_t * priv  = NULL;
@@ -1541,7 +1460,7 @@ afr_setxattr_wind (call_frame_t *frame, xlator_t *this)
 	local = frame->local;
 	priv = this->private;
 
-	call_count = afr_up_children_count (local->child_up, priv->child_count);
+	call_count = afr_up_children_count (priv->child_count, local->child_up);
 
 	if (call_count == 0) {
 		local->transaction.resume (frame, this);
@@ -1558,7 +1477,7 @@ afr_setxattr_wind (call_frame_t *frame, xlator_t *this)
 					   priv->children[i]->fops->setxattr,
 					   &local->loc,
 					   local->cont.setxattr.dict,
-					   local->cont.setxattr.flags, NULL);
+					   local->cont.setxattr.flags);
 
 			if (!--call_count)
 				break;
@@ -1586,9 +1505,11 @@ pump_setxattr_cbk (call_frame_t *frame,
 		      void *cookie,
 		      xlator_t *this,
 		      int32_t op_ret,
-		      int32_t op_errno, dict_t *xdata)
+		      int32_t op_errno)
 {
-	AFR_STACK_UNWIND (setxattr, frame, op_ret, op_errno, xdata);
+	STACK_UNWIND (frame,
+		      op_ret,
+		      op_errno);
 	return 0;
 }
 
@@ -1606,10 +1527,12 @@ pump_command_reply (call_frame_t *frame, xlator_t *this)
                 gf_log (this->name, GF_LOG_INFO,
                         "Command succeeded");
 
+        dict_unref (local->dict);
+
         AFR_STACK_UNWIND (setxattr,
                           frame,
                           local->op_ret,
-                          local->op_errno, NULL);
+                          local->op_errno);
 
         return 0;
 }
@@ -1635,64 +1558,56 @@ pump_parse_command (call_frame_t *frame, xlator_t *this,
                 frame->local = local;
                 local->dict = dict_ref (dict);
                 ret = pump_execute_abort (frame, this);
-
-        } else if (pump_command_commit (this, dict)) {
-                frame->local = local;
-                local->dict = dict_ref (dict);
-                ret = pump_execute_commit (frame, this);
         }
         return ret;
 }
 
 int
 pump_setxattr (call_frame_t *frame, xlator_t *this,
-               loc_t *loc, dict_t *dict, int32_t flags, dict_t *xdata)
+               loc_t *loc, dict_t *dict, int32_t flags)
 {
 	afr_private_t * priv  = NULL;
 	afr_local_t   * local = NULL;
 	call_frame_t   *transaction_frame = NULL;
+
 	int ret = -1;
+
+	int op_ret   = -1;
 	int op_errno = 0;
 
 	VALIDATE_OR_GOTO (frame, out);
 	VALIDATE_OR_GOTO (this, out);
 	VALIDATE_OR_GOTO (this->private, out);
 
-        GF_IF_INTERNAL_XATTR_GOTO ("trusted.glusterfs.pump*", dict,
-                                   op_errno, out);
-
 	priv = this->private;
-        if (!priv->use_afr_in_pump) {
-                STACK_WIND (frame, default_setxattr_cbk,
-                            FIRST_CHILD (this),
-                            (FIRST_CHILD (this))->fops->setxattr,
-                            loc, dict, flags, xdata);
-                return 0;
-        }
-
 
-	AFR_LOCAL_ALLOC_OR_GOTO (local, out);
+	ALLOC_OR_GOTO (local, afr_local_t, out);
 
-	ret = afr_local_init (local, priv, &op_errno);
+	ret = AFR_LOCAL_INIT (local, priv);
 	if (ret < 0) {
-                afr_local_cleanup (local, this);
+		op_errno = -ret;
 		goto out;
-        }
+	}
 
         ret = pump_parse_command (frame, this,
                                   local, dict);
         if (ret >= 0) {
-                ret = 0;
+                op_ret = 0;
                 goto out;
         }
 
+        if (!priv->use_afr_in_pump) {
+                STACK_WIND (frame, default_setxattr_cbk,
+                            FIRST_CHILD (this),
+                            (FIRST_CHILD (this))->fops->setxattr,
+                            loc, dict, flags);
+                return 0;
+        }
+
 	transaction_frame = copy_frame (frame);
 	if (!transaction_frame) {
 		gf_log (this->name, GF_LOG_ERROR,
 			"Out of memory.");
-                op_errno = ENOMEM;
-                ret = -1;
-                afr_local_cleanup (local, this);
 		goto out;
 	}
 
@@ -1715,12 +1630,12 @@ pump_setxattr (call_frame_t *frame, xlator_t *this,
 
 	afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION);
 
-	ret = 0;
+	op_ret = 0;
 out:
-	if (ret < 0) {
+	if (op_ret == -1) {
 		if (transaction_frame)
 			AFR_STACK_DESTROY (transaction_frame);
-		AFR_STACK_UNWIND (setxattr, frame, -1, op_errno, NULL);
+		AFR_STACK_UNWIND (setxattr, frame, op_ret, op_errno);
 	}
 
 	return 0;
@@ -1754,7 +1669,7 @@ static int32_t
 pump_truncate (call_frame_t *frame,
                xlator_t *this,
                loc_t *loc,
-               off_t offset, dict_t *xdata)
+               off_t offset)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1764,11 +1679,11 @@ pump_truncate (call_frame_t *frame,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->truncate,
                             loc,
-                            offset, xdata);
+                            offset);
                 return 0;
         }
 
-        afr_truncate (frame, this, loc, offset, xdata);
+        afr_truncate (frame, this, loc, offset);
         return 0;
 }
 
@@ -1777,7 +1692,7 @@ static int32_t
 pump_ftruncate (call_frame_t *frame,
                 xlator_t *this,
                 fd_t *fd,
-                off_t offset, dict_t *xdata)
+                off_t offset)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1787,11 +1702,11 @@ pump_ftruncate (call_frame_t *frame,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->ftruncate,
                             fd,
-                            offset, xdata);
+                            offset);
                 return 0;
         }
 
-        afr_ftruncate (frame, this, fd, offset, xdata);
+        afr_ftruncate (frame, this, fd, offset);
         return 0;
 }
 
@@ -1800,7 +1715,7 @@ pump_ftruncate (call_frame_t *frame,
 
 int
 pump_mknod (call_frame_t *frame, xlator_t *this,
-            loc_t *loc, mode_t mode, dev_t rdev, mode_t umask, dict_t *xdata)
+            loc_t *loc, mode_t mode, dev_t rdev, dict_t *parms)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1808,10 +1723,10 @@ pump_mknod (call_frame_t *frame, xlator_t *this,
                 STACK_WIND (frame, default_mknod_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->mknod,
-                            loc, mode, rdev, umask, xdata);
+                            loc, mode, rdev, parms);
                 return 0;
         }
-        afr_mknod (frame, this, loc, mode, rdev, umask, xdata);
+        afr_mknod (frame, this, loc, mode, rdev, parms);
         return 0;
 
 }
@@ -1820,7 +1735,7 @@ pump_mknod (call_frame_t *frame, xlator_t *this,
 
 int
 pump_mkdir (call_frame_t *frame, xlator_t *this,
-            loc_t *loc, mode_t mode, mode_t umask, dict_t *xdata)
+            loc_t *loc, mode_t mode, dict_t *params)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1828,10 +1743,10 @@ pump_mkdir (call_frame_t *frame, xlator_t *this,
                 STACK_WIND (frame, default_mkdir_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->mkdir,
-                            loc, mode, umask, xdata);
+                            loc, mode, params);
                 return 0;
         }
-        afr_mkdir (frame, this, loc, mode, umask, xdata);
+        afr_mkdir (frame, this, loc, mode, params);
         return 0;
 
 }
@@ -1840,7 +1755,7 @@ pump_mkdir (call_frame_t *frame, xlator_t *this,
 static int32_t
 pump_unlink (call_frame_t *frame,
              xlator_t *this,
-             loc_t *loc, int xflag, dict_t *xdata)
+             loc_t *loc)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1849,10 +1764,10 @@ pump_unlink (call_frame_t *frame,
                             default_unlink_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->unlink,
-                            loc, xflag, xdata);
+                            loc);
                 return 0;
         }
-        afr_unlink (frame, this, loc, xflag, xdata);
+        afr_unlink (frame, this, loc);
         return 0;
 
 }
@@ -1860,7 +1775,7 @@ pump_unlink (call_frame_t *frame,
 
 static int
 pump_rmdir (call_frame_t *frame, xlator_t *this,
-            loc_t *loc, int flags, dict_t *xdata)
+            loc_t *loc, int flags)
 {
         afr_private_t *priv  = NULL;
 
@@ -1870,11 +1785,11 @@ pump_rmdir (call_frame_t *frame, xlator_t *this,
                 STACK_WIND (frame, default_rmdir_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->rmdir,
-                            loc, flags, xdata);
+                            loc, flags);
                 return 0;
         }
 
-        afr_rmdir (frame, this, loc, flags, xdata);
+        afr_rmdir (frame, this, loc, flags);
         return 0;
 
 }
@@ -1883,7 +1798,7 @@ pump_rmdir (call_frame_t *frame, xlator_t *this,
 
 int
 pump_symlink (call_frame_t *frame, xlator_t *this,
-              const char *linkpath, loc_t *loc, mode_t umask, dict_t *xdata)
+              const char *linkpath, loc_t *loc, dict_t *params)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1891,10 +1806,10 @@ pump_symlink (call_frame_t *frame, xlator_t *this,
                 STACK_WIND (frame, default_symlink_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->symlink,
-                            linkpath, loc, umask, xdata);
+                            linkpath, loc, params);
                 return 0;
         }
-        afr_symlink (frame, this, linkpath, loc, umask, xdata);
+        afr_symlink (frame, this, linkpath, loc, params);
         return 0;
 
 }
@@ -1904,7 +1819,7 @@ static int32_t
 pump_rename (call_frame_t *frame,
              xlator_t *this,
              loc_t *oldloc,
-             loc_t *newloc, dict_t *xdata)
+             loc_t *newloc)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1913,10 +1828,10 @@ pump_rename (call_frame_t *frame,
                             default_rename_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->rename,
-                            oldloc, newloc, xdata);
+                            oldloc, newloc);
                 return 0;
         }
-        afr_rename (frame, this, oldloc, newloc, xdata);
+        afr_rename (frame, this, oldloc, newloc);
         return 0;
 
 }
@@ -1926,7 +1841,7 @@ static int32_t
 pump_link (call_frame_t *frame,
            xlator_t *this,
            loc_t *oldloc,
-           loc_t *newloc, dict_t *xdata)
+           loc_t *newloc)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1935,10 +1850,10 @@ pump_link (call_frame_t *frame,
                             default_link_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->link,
-                            oldloc, newloc, xdata);
+                            oldloc, newloc);
                 return 0;
         }
-        afr_link (frame, this, oldloc, newloc, xdata);
+        afr_link (frame, this, oldloc, newloc);
         return 0;
 
 }
@@ -1947,7 +1862,7 @@ pump_link (call_frame_t *frame,
 static int32_t
 pump_create (call_frame_t *frame, xlator_t *this,
              loc_t *loc, int32_t flags, mode_t mode,
-             mode_t umask, fd_t *fd, dict_t *xdata)
+             fd_t *fd, dict_t *params)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1955,10 +1870,10 @@ pump_create (call_frame_t *frame, xlator_t *this,
                 STACK_WIND (frame, default_create_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->create,
-                            loc, flags, mode, umask, fd, xdata);
+                            loc, flags, mode, fd, params);
                 return 0;
         }
-        afr_create (frame, this, loc, flags, mode, umask, fd, xdata);
+        afr_create (frame, this, loc, flags, mode, fd, params);
         return 0;
 
 }
@@ -1968,7 +1883,8 @@ static int32_t
 pump_open (call_frame_t *frame,
            xlator_t *this,
            loc_t *loc,
-           int32_t flags, fd_t *fd, dict_t *xdata)
+           int32_t flags, fd_t *fd,
+           int32_t wbflags)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -1977,10 +1893,10 @@ pump_open (call_frame_t *frame,
                             default_open_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->open,
-                            loc, flags, fd, xdata);
+                            loc, flags, fd, wbflags);
                 return 0;
         }
-        afr_open (frame, this, loc, flags, fd, xdata);
+        afr_open (frame, this, loc, flags, fd, wbflags);
         return 0;
 
 }
@@ -1992,8 +1908,8 @@ pump_writev (call_frame_t *frame,
              fd_t *fd,
              struct iovec *vector,
              int32_t count,
-             off_t off, uint32_t flags,
-             struct iobref *iobref, dict_t *xdata)
+             off_t off,
+             struct iobref *iobref)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2005,20 +1921,20 @@ pump_writev (call_frame_t *frame,
                             fd,
                             vector,
                             count,
-                            off, flags,
-                            iobref, xdata);
+                            off,
+                            iobref);
                 return 0;
         }
-
-        afr_writev (frame, this, fd, vector, count, off, flags, iobref, xdata);
+        afr_writev (frame, this, fd, vector, count, off, iobref);
         return 0;
+
 }
 
 
 static int32_t
 pump_flush (call_frame_t *frame,
             xlator_t *this,
-            fd_t *fd, dict_t *xdata)
+            fd_t *fd)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2027,10 +1943,10 @@ pump_flush (call_frame_t *frame,
                             default_flush_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->flush,
-                            fd, xdata);
+                            fd);
                 return 0;
         }
-        afr_flush (frame, this, fd, xdata);
+        afr_flush (frame, this, fd);
         return 0;
 
 }
@@ -2040,7 +1956,7 @@ static int32_t
 pump_fsync (call_frame_t *frame,
             xlator_t *this,
             fd_t *fd,
-            int32_t flags, dict_t *xdata)
+            int32_t flags)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2050,10 +1966,10 @@ pump_fsync (call_frame_t *frame,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->fsync,
                             fd,
-                            flags, xdata);
+                            flags);
                 return 0;
         }
-        afr_fsync (frame, this, fd, flags, xdata);
+        afr_fsync (frame, this, fd, flags);
         return 0;
 
 }
@@ -2062,7 +1978,7 @@ pump_fsync (call_frame_t *frame,
 static int32_t
 pump_opendir (call_frame_t *frame,
               xlator_t *this,
-              loc_t *loc, fd_t *fd, dict_t *xdata)
+              loc_t *loc, fd_t *fd)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2071,10 +1987,10 @@ pump_opendir (call_frame_t *frame,
                             default_opendir_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->opendir,
-                            loc, fd, xdata);
+                            loc, fd);
                 return 0;
         }
-        afr_opendir (frame, this, loc, fd, xdata);
+        afr_opendir (frame, this, loc, fd);
         return 0;
 
 }
@@ -2084,7 +2000,7 @@ static int32_t
 pump_fsyncdir (call_frame_t *frame,
                xlator_t *this,
                fd_t *fd,
-               int32_t flags, dict_t *xdata)
+               int32_t flags)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2094,10 +2010,10 @@ pump_fsyncdir (call_frame_t *frame,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->fsyncdir,
                             fd,
-                            flags, xdata);
+                            flags);
                 return 0;
         }
-        afr_fsyncdir (frame, this, fd, flags, xdata);
+        afr_fsyncdir (frame, this, fd, flags);
         return 0;
 
 }
@@ -2108,7 +2024,7 @@ pump_xattrop (call_frame_t *frame,
               xlator_t *this,
               loc_t *loc,
               gf_xattrop_flags_t flags,
-              dict_t *dict, dict_t *xdata)
+              dict_t *dict)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2119,10 +2035,10 @@ pump_xattrop (call_frame_t *frame,
                             FIRST_CHILD(this)->fops->xattrop,
                             loc,
                             flags,
-                            dict, xdata);
+                            dict);
                 return 0;
         }
-        afr_xattrop (frame, this, loc, flags, dict, xdata);
+        afr_xattrop (frame, this, loc, flags, dict);
         return 0;
 
 }
@@ -2132,7 +2048,7 @@ pump_fxattrop (call_frame_t *frame,
                xlator_t *this,
                fd_t *fd,
                gf_xattrop_flags_t flags,
-               dict_t *dict, dict_t *xdata)
+               dict_t *dict)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2143,10 +2059,10 @@ pump_fxattrop (call_frame_t *frame,
                             FIRST_CHILD(this)->fops->fxattrop,
                             fd,
                             flags,
-                            dict, xdata);
+                            dict);
                 return 0;
         }
-        afr_fxattrop (frame, this, fd, flags, dict, xdata);
+        afr_fxattrop (frame, this, fd, flags, dict);
         return 0;
 
 }
@@ -2156,17 +2072,9 @@ static int32_t
 pump_removexattr (call_frame_t *frame,
                   xlator_t *this,
                   loc_t *loc,
-                  const char *name, dict_t *xdata)
+                  const char *name)
 {
-        afr_private_t *priv     = NULL;
-        int            op_errno = -1;
-
-        VALIDATE_OR_GOTO (this, out);
-
-        GF_IF_NATIVE_XATTR_GOTO ("trusted.glusterfs.pump*",
-                                 name, op_errno, out);
-
-        op_errno = 0;
+        afr_private_t *priv  = NULL;
 	priv = this->private;
         if (!priv->use_afr_in_pump) {
                 STACK_WIND (frame,
@@ -2174,14 +2082,10 @@ pump_removexattr (call_frame_t *frame,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->removexattr,
                             loc,
-                            name, xdata);
+                            name);
                 return 0;
         }
-        afr_removexattr (frame, this, loc, name, xdata);
-
- out:
-        if (op_errno)
-                AFR_STACK_UNWIND (removexattr, frame, -1, op_errno, NULL);
+        afr_removexattr (frame, this, loc, name);
         return 0;
 
 }
@@ -2193,7 +2097,7 @@ pump_readdir (call_frame_t *frame,
               xlator_t *this,
               fd_t *fd,
               size_t size,
-              off_t off, dict_t *xdata)
+              off_t off)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2202,18 +2106,21 @@ pump_readdir (call_frame_t *frame,
                             default_readdir_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->readdir,
-                            fd, size, off, xdata);
+                            fd, size, off);
                 return 0;
         }
-        afr_readdir (frame, this, fd, size, off, xdata);
+        afr_readdir (frame, this, fd, size, off);
         return 0;
 
 }
 
 
 static int32_t
-pump_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd,
-               size_t size, off_t off, dict_t *dict)
+pump_readdirp (call_frame_t *frame,
+               xlator_t *this,
+               fd_t *fd,
+               size_t size,
+               off_t off)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2222,10 +2129,10 @@ pump_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd,
                             default_readdirp_cbk,
                             FIRST_CHILD(this),
                             FIRST_CHILD(this)->fops->readdirp,
-                            fd, size, off, dict);
+                            fd, size, off);
                 return 0;
         }
-        afr_readdirp (frame, this, fd, size, off, dict);
+        afr_readdirp (frame, this, fd, size, off);
         return 0;
 
 }
@@ -2256,24 +2163,13 @@ pump_release (xlator_t *this,
 
 }
 
-static int32_t
-pump_forget (xlator_t *this, inode_t *inode)
-{
-        afr_private_t  *priv  = NULL;
-
-        priv = this->private;
-        if (priv->use_afr_in_pump)
-                afr_forget (this, inode);
-
-        return 0;
-}
 
 static int32_t
 pump_setattr (call_frame_t *frame,
               xlator_t *this,
               loc_t *loc,
               struct iatt *stbuf,
-              int32_t valid, dict_t *xdata)
+              int32_t valid)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2282,10 +2178,10 @@ pump_setattr (call_frame_t *frame,
                             default_setattr_cbk,
                             FIRST_CHILD (this),
                             FIRST_CHILD (this)->fops->setattr,
-                            loc, stbuf, valid, xdata);
+                            loc, stbuf, valid);
                 return 0;
         }
-        afr_setattr (frame, this, loc, stbuf, valid, xdata);
+        afr_setattr (frame, this, loc, stbuf, valid);
         return 0;
 
 }
@@ -2296,7 +2192,7 @@ pump_fsetattr (call_frame_t *frame,
                xlator_t *this,
                fd_t *fd,
                struct iatt *stbuf,
-               int32_t valid, dict_t *xdata)
+               int32_t valid)
 {
         afr_private_t *priv  = NULL;
 	priv = this->private;
@@ -2305,10 +2201,10 @@ pump_fsetattr (call_frame_t *frame,
                             default_fsetattr_cbk,
                             FIRST_CHILD (this),
                             FIRST_CHILD (this)->fops->fsetattr,
-                            fd, stbuf, valid, xdata);
+                            fd, stbuf, valid);
                 return 0;
         }
-        afr_fsetattr (frame, this, fd, stbuf, valid, xdata);
+        afr_fsetattr (frame, this, fd, stbuf, valid);
         return 0;
 
 }
@@ -2357,7 +2253,7 @@ notify (xlator_t *this, int32_t event,
 
         child_xl = (xlator_t *) data;
 
-        ret = afr_notify (this, event, data, NULL);
+        ret = afr_notify (this, event, data);
 
 	switch (event) {
 	case GF_EVENT_CHILD_DOWN:
@@ -2392,7 +2288,7 @@ init (xlator_t *this)
 	xlator_list_t * trav        = NULL;
 	int             i           = 0;
 	int             ret         = -1;
-	GF_UNUSED int   op_errno    = 0;
+	int             op_errno    = 0;
 
         int source_child = 0;
 
@@ -2408,42 +2304,26 @@ init (xlator_t *this)
 			"Volume is dangling.");
 	}
 
-	this->private = GF_CALLOC (1, sizeof (afr_private_t),
-                                   gf_afr_mt_afr_private_t);
-        if (!this->private)
-                goto out;
+	ALLOC_OR_GOTO (this->private, afr_private_t, out);
 
 	priv = this->private;
-        LOCK_INIT (&priv->lock);
-        LOCK_INIT (&priv->read_child_lock);
-        //lock recovery is not done in afr
-        pthread_mutex_init (&priv->mutex, NULL);
-        INIT_LIST_HEAD (&priv->saved_fds);
-
-        child_count = xlator_subvolume_count (this);
-        if (child_count != 2) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "There should be exactly 2 children - one source "
-                        "and one sink");
-                return -1;
-        }
-	priv->child_count = child_count;
 
         priv->read_child = source_child;
         priv->favorite_child = source_child;
         priv->background_self_heal_count = 0;
 
-	priv->data_self_heal     = "on";
+	priv->data_self_heal     = 1;
 	priv->metadata_self_heal = 1;
 	priv->entry_self_heal    = 1;
 
+        priv->data_self_heal_algorithm = "";
+
         priv->data_self_heal_window_size = 16;
 
 	priv->data_change_log     = 1;
 	priv->metadata_change_log = 1;
 	priv->entry_change_log    = 1;
         priv->use_afr_in_pump = 1;
-        priv->sh_readdir_size = 65536;
 
 	/* Locking options */
 
@@ -2452,9 +2332,31 @@ init (xlator_t *this)
            and the sink.
         */
 
+	priv->data_lock_server_count = 2;
+	priv->metadata_lock_server_count = 2;
+	priv->entry_lock_server_count = 2;
+
 	priv->strict_readdir = _gf_false;
 
+        trav = this->children;
+        while (trav) {
+                child_count++;
+                trav = trav->next;
+        }
+
 	priv->wait_count = 1;
+
+        if (child_count != 2) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "There should be exactly 2 children - one source "
+                        "and one sink");
+                return -1;
+        }
+	priv->child_count = child_count;
+
+	LOCK_INIT (&priv->lock);
+        LOCK_INIT (&priv->read_child_lock);
+
 	priv->child_up = GF_CALLOC (sizeof (unsigned char), child_count,
                                  gf_afr_mt_char);
 	if (!priv->child_up) {
@@ -2489,7 +2391,7 @@ init (xlator_t *this)
 		priv->children[i] = trav->xlator;
 
                 ret = gf_asprintf (&priv->pending_key[i], "%s.%s", AFR_XATTR_PREFIX,
-                                   trav->xlator->name);
+                                trav->xlator->name);
                 if (-1 == ret) {
                         gf_log (this->name, GF_LOG_ERROR,
                                 "asprintf failed to set pending key");
@@ -2501,12 +2403,6 @@ init (xlator_t *this)
 		i++;
 	}
 
-        ret = gf_asprintf (&priv->sh_domain, "%s-self-heal", this->name);
-        if (-1 == ret) {
-                op_errno = ENOMEM;
-                goto out;
-        }
-
         priv->first_lookup = 1;
         priv->root_inode = NULL;
 
@@ -2538,7 +2434,7 @@ init (xlator_t *this)
                 goto out;
         }
 
-	pump_priv->env = this->ctx->env;
+	pump_priv->env = syncenv_new (0);
         if (!pump_priv->env) {
                 gf_log (this->name, GF_LOG_ERROR,
                         "Could not create new sync-environment");
@@ -2546,17 +2442,11 @@ init (xlator_t *this)
                 goto out;
         }
 
-        /* keep more local here as we may need them for self-heal etc */
-        this->local_pool = mem_pool_new (afr_local_t, 128);
-        if (!this->local_pool) {
-                ret = -1;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to create local_t's memory pool");
-                goto out;
-        }
-
 	priv->pump_private = pump_priv;
 
+        pthread_mutex_init (&priv->mutex, NULL);
+        INIT_LIST_HEAD (&priv->saved_fds);
+
         pump_change_state (this, PUMP_STATE_ABORT);
 
 	ret = 0;
@@ -2567,25 +2457,6 @@ out:
 int
 fini (xlator_t *this)
 {
-        afr_private_t * priv        = NULL;
-        pump_private_t *pump_priv = NULL;
-
-        priv      = this->private;
-        this->private = NULL;
-        if (!priv)
-                goto out;
-
-        pump_priv = priv->pump_private;
-        if (!pump_priv)
-                goto afr_priv;
-
-        GF_FREE (pump_priv->resume_path);
-        LOCK_DESTROY (&pump_priv->resume_path_lock);
-        LOCK_DESTROY (&pump_priv->pump_state_lock);
-        GF_FREE (pump_priv);
-afr_priv:
-        afr_priv_destroy (priv);
-out:
 	return 0;
 }
 
@@ -2633,7 +2504,6 @@ struct xlator_dumpops dumpops = {
 struct xlator_cbks cbks = {
 	.release     = pump_release,
 	.releasedir  = pump_releasedir,
-        .forget      = pump_forget,
 };
 
 struct volume_options options[] = {
diff --git a/xlators/cluster/afr/src/pump.h b/xlators/cluster/afr/src/pump.h
index bc4c31a78..19bb96f8c 100644
--- a/xlators/cluster/afr/src/pump.h
+++ b/xlators/cluster/afr/src/pump.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __PUMP_H__
@@ -17,6 +26,17 @@
 #define CLIENT_CMD_CONNECT "trusted.glusterfs.client-connect"
 #define CLIENT_CMD_DISCONNECT "trusted.glusterfs.client-disconnect"
 
+#define PUMP_LK_OWNER 696969
+
+#define IS_ROOT_PATH(path) (!strcmp (path, "/"))
+#define IS_ENTRY_CWD(entry) (!strcmp (entry, "."))
+#define IS_ENTRY_PARENT(entry) (!strcmp (entry, ".."))
+
+#define PUMP_CMD_START  "trusted.glusterfs.pump.start"
+#define PUMP_CMD_ABORT  "trusted.glusterfs.pump.abort"
+#define PUMP_CMD_PAUSE  "trusted.glusterfs.pump.pause"
+#define PUMP_CMD_STATUS "trusted.glusterfs.pump.status"
+
 #define PUMP_SOURCE_COMPLETE "trusted.glusterfs.pump-source-complete"
 #define PUMP_SINK_COMPLETE "trusted.glusterfs.pump-sink-complete"
 
@@ -30,12 +50,11 @@ typedef enum {
         PUMP_STATE_RESUME,              /* Pump is resuming from a previous pause */
         PUMP_STATE_PAUSE,               /* Pump is paused */
         PUMP_STATE_ABORT,               /* Pump is aborted */
-        PUMP_STATE_COMMIT,              /* Pump is commited */
 } pump_state_t;
 
 typedef struct _pump_private {
 	struct syncenv *env;            /* The env pointer to the pump synctask */
-        char *resume_path;              /* path to resume from the last pause */
+        const char *resume_path;        /* path to resume from the last pause */
         gf_lock_t resume_path_lock;     /* Synchronize resume_path changes */
         gf_lock_t pump_state_lock;      /* Synchronize pump_state changes */
         pump_state_t pump_state;        /* State of pump */
@@ -44,7 +63,6 @@ typedef struct _pump_private {
         gf_boolean_t pump_finished;     /* Boolean to indicate pump termination */
         char pump_start_pending;        /* Boolean to mark start pending until
                                            CHILD_UP */
-        call_stub_t *cleaner;
 } pump_private_t;
 
 void
diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
index 174bea841..8ebcab044 100644
--- a/xlators/cluster/dht/src/Makefile.am
+++ b/xlators/cluster/dht/src/Makefile.am
@@ -2,34 +2,32 @@
 xlator_LTLIBRARIES = dht.la nufa.la switch.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
 
-dht_common_source = dht-layout.c dht-helper.c dht-linkfile.c dht-rebalance.c \
-	dht-selfheal.c dht-rename.c dht-hashfn.c dht-diskusage.c \
-	dht-common.c dht-inode-write.c dht-inode-read.c dht-shared.c \
-	$(top_builddir)/xlators/lib/src/libxlator.c
 
-dht_la_SOURCES = $(dht_common_source) dht.c
+dht_common_source = dht-layout.c dht-helper.c dht-linkfile.c \
+		dht-selfheal.c dht-rename.c dht-hashfn.c dht-diskusage.c \
+		$(top_builddir)/xlators/lib/src/libxlator.c
+
+dht_la_SOURCES = $(dht_common_source) dht.c 
 
 nufa_la_SOURCES = $(dht_common_source) nufa.c
 switch_la_SOURCES = $(dht_common_source) switch.c
 
-dht_la_LDFLAGS = -module -avoid-version
+dht_la_LDFLAGS = -module -avoidversion
 dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-nufa_la_LDFLAGS = -module -avoid-version
+nufa_la_LDFLAGS = -module -avoidversion
 nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-switch_la_LDFLAGS = -module -avoid-version
+switch_la_LDFLAGS = -module -avoidversion
 switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
-noinst_HEADERS = dht-common.h dht-mem-types.h \
-	$(top_builddir)/xlators/lib/src/libxlator.h
+noinst_HEADERS = dht-common.h dht-common.c dht-mem-types.h $(top_builddir)/xlators/lib/src/libxlator.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
 	-I$(top_srcdir)/xlators/lib/src
 
-AM_CFLAGS = -Wall $(GF_CFLAGS)
-
-CLEANFILES =
+CLEANFILES = 
 
 uninstall-local:
 	rm -f $(DESTDIR)$(xlatordir)/distribute.so
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 8f61339e6..65bfc3d1b 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2009-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -22,18 +31,17 @@
 #include "dht-common.h"
 #include "defaults.h"
 #include "byte-order.h"
-#include "glusterfs-acl.h"
 
 #include <sys/time.h>
 #include <libgen.h>
 
-int
+
+void
 dht_aggregate (dict_t *this, char *key, data_t *value, void *data)
 {
         dict_t  *dst  = NULL;
         int64_t *ptr  = 0, *size = NULL;
         int32_t  ret  = -1;
-        data_t  *dict_data = NULL;
 
         dst = data;
 
@@ -45,46 +53,27 @@ dht_aggregate (dict_t *this, char *key, data_t *value, void *data)
                         if (size == NULL) {
                                 gf_log ("dht", GF_LOG_WARNING,
                                         "memory allocation failed");
-                                return -1;
+                                return;
                         }
                         ret = dict_set_bin (dst, key, size, sizeof (int64_t));
                         if (ret < 0) {
                                 gf_log ("dht", GF_LOG_WARNING,
                                         "dht aggregate dict set failed");
                                 GF_FREE (size);
-                                return -1;
+                                return;
                         }
                 }
 
                 ptr = data_to_bin (value);
                 if (ptr == NULL) {
                         gf_log ("dht", GF_LOG_WARNING, "data to bin failed");
-                        return -1;
+                        return;
                 }
 
                 *size = hton64 (ntoh64 (*size) + ntoh64 (*ptr));
-
-        } else if (fnmatch (GF_XATTR_STIME_PATTERN, key, FNM_NOESCAPE) == 0) {
-                ret = gf_get_min_stime (THIS, dst, key, value);
-                if (ret < 0)
-                        return ret;
-        } else {
-                /* compare user xattrs only */
-                if (!strncmp (key, "user.", strlen ("user."))) {
-                        ret = dict_lookup (dst, key, &dict_data);
-                        if (!ret && dict_data && value) {
-                                ret = is_data_equal (dict_data, value);
-                                if (!ret)
-                                        gf_log ("dht", GF_LOG_DEBUG,
-                                                "xattr mismatch for %s", key);
-                        }
-                }
-                ret = dict_set (dst, key, value);
-                if (ret)
-                        gf_log ("dht", GF_LOG_WARNING, "xattr dict set failed");
         }
 
-        return 0;
+        return;
 }
 
 
@@ -111,7 +100,7 @@ out:
 int
 dht_lookup_selfheal_cbk (call_frame_t *frame, void *cookie,
                          xlator_t *this,
-                         int op_ret, int op_errno, dict_t *xdata)
+                         int op_ret, int op_errno)
 {
         dht_local_t  *local = NULL;
         dht_layout_t *layout = NULL;
@@ -129,14 +118,20 @@ dht_lookup_selfheal_cbk (call_frame_t *frame, void *cookie,
         if (ret == 0) {
                 layout = local->selfheal.layout;
                 ret = dht_layout_set (this, local->inode, layout);
-        }
 
-        if (local->loc.parent) {
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           &local->postparent, 1);
+                if (local->ia_ino) {
+                        local->stbuf.ia_ino = local->ia_ino;
+                } else {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "could not find hashed subvolume for %s",
+                                local->loc.path);
+                }
+
+                if (local->loc.parent)
+                        local->postparent.ia_ino = local->loc.parent->ino;
         }
 
-        DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
+        WIPE (&local->postparent);
 
         DHT_STACK_UNWIND (lookup, frame, ret, local->op_errno, local->inode,
                           &local->stbuf, local->xattr, &local->postparent);
@@ -147,97 +142,18 @@ out:
 
 
 int
-dht_discover_complete (xlator_t *this, call_frame_t *discover_frame)
-{
-        dht_local_t     *local = NULL;
-        call_frame_t    *main_frame = NULL;
-        int              op_errno = 0;
-        int              ret = -1;
-        dht_layout_t    *layout = NULL;
-        dht_conf_t      *conf = NULL;
-
-        local = discover_frame->local;
-        layout = local->layout;
-        conf = this->private;
-
-        LOCK(&discover_frame->lock);
-        {
-                main_frame = local->main_frame;
-                local->main_frame = NULL;
-        }
-        UNLOCK(&discover_frame->lock);
-
-        if (!main_frame)
-                return 0;
-
-        if (local->file_count && local->dir_count) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "path %s exists as a file on one subvolume "
-                        "and directory on another. "
-                        "Please fix it manually",
-                        local->loc.path);
-                op_errno = EIO;
-                goto out;
-        }
-
-        if (local->cached_subvol) {
-                ret = dht_layout_preset (this, local->cached_subvol,
-                                         local->inode);
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "failed to set layout for subvolume %s",
-                                local->cached_subvol ? local->cached_subvol->name : "<nil>");
-                        op_errno = EINVAL;
-                        goto out;
-                }
-        } else {
-                ret = dht_layout_normalize (this, &local->loc, layout);
-                if ((ret < 0) || ((ret > 0) && (local->op_ret != 0))) {
-                        /* either the layout is incorrect or the directory is
-                         * not found even in one subvolume.
-                         */
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "normalizing failed on %s "
-                                "(overlaps/holes present: %s, "
-                                "ENOENT errors: %d)", local->loc.path,
-                                (ret < 0) ? "yes" : "no", (ret > 0) ? ret : 0);
-                        if ((ret > 0) && (ret == conf->subvolume_cnt)) {
-                                op_errno = ESTALE;
-                                goto out;
-                        }
-                }
-
-                if (local->inode)
-                        dht_layout_set (this, local->inode, layout);
-        }
-
-        DHT_STACK_UNWIND (lookup, main_frame, local->op_ret, local->op_errno,
-                          local->inode, &local->stbuf, local->xattr,
-                          &local->postparent);
-        return 0;
-out:
-        DHT_STACK_UNWIND (lookup, main_frame, -1, op_errno, NULL, NULL, NULL,
-                          NULL);
-
-        return ret;
-}
-
-
-int
-dht_discover_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int op_ret, int op_errno,
-                  inode_t *inode, struct iatt *stbuf, dict_t *xattr,
-                  struct iatt *postparent)
+dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                    int op_ret, int op_errno,
+                    inode_t *inode, struct iatt *stbuf, dict_t *xattr,
+                    struct iatt *postparent)
 {
+        dht_conf_t   *conf                    = NULL;
         dht_local_t  *local                   = NULL;
         int           this_call_cnt           = 0;
         call_frame_t *prev                    = NULL;
         dht_layout_t *layout                  = NULL;
         int           ret                     = -1;
         int           is_dir                  = 0;
-        int           is_linkfile             = 0;
-        int           attempt_unwind          = 0;
-        dht_conf_t   *conf                    = 0;
 
         GF_VALIDATE_OR_GOTO ("dht", frame, out);
         GF_VALIDATE_OR_GOTO ("dht", this, out);
@@ -245,12 +161,15 @@ dht_discover_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         GF_VALIDATE_OR_GOTO ("dht", this->private, out);
         GF_VALIDATE_OR_GOTO ("dht", cookie, out);
 
+        conf  = this->private;
         local = frame->local;
         prev  = cookie;
-        conf = this->private;
 
         layout = local->layout;
 
+        if (!op_ret && uuid_is_null (local->gfid))
+                memcpy (local->gfid, stbuf->ia_gfid, 16);
+
         /* Check if the gfid is different for file from other node */
         if (!op_ret && uuid_compare (local->gfid, stbuf->ia_gfid)) {
                 gf_log (this->name, GF_LOG_WARNING,
@@ -258,7 +177,6 @@ dht_discover_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->loc.path, prev->this->name);
         }
 
-
         LOCK (&frame->lock);
         {
                 /* TODO: assert equal mode on stbuf->st_mode and
@@ -268,12 +186,9 @@ dht_discover_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 */
                 ret = dht_layout_merge (this, layout, prev->this,
                                         op_ret, op_errno, xattr);
-                if (ret)
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: failed to merge layouts", local->loc.path);
 
                 if (op_ret == -1) {
-                        local->op_errno = op_errno;
+                        local->op_errno = ENOENT;
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "lookup of %s on %s returned error (%s)",
                                 local->loc.path, prev->this->name,
@@ -282,26 +197,17 @@ dht_discover_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         goto unlock;
                 }
 
-                is_linkfile = check_is_linkfile (inode, stbuf, xattr,
-                                                 conf->link_xattr_name);
                 is_dir = check_is_dir (inode, stbuf, xattr);
-
-                if (is_dir) {
-                        local->dir_count ++;
-                } else {
-                        local->file_count ++;
-
-                        if (!is_linkfile) {
-                                /* real file */
-                                local->cached_subvol = prev->this;
-                                attempt_unwind = 1;
-                        } else {
-                                goto unlock;
-                        }
+                if (!is_dir) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "lookup of %s on %s returned non dir 0%o",
+                                local->loc.path, prev->this->name,
+                                stbuf->ia_type);
+                        local->need_selfheal = 1;
+                        goto unlock;
                 }
 
                 local->op_ret = 0;
-
                 if (local->xattr == NULL) {
                         local->xattr = dict_ref (xattr);
                 } else {
@@ -314,94 +220,74 @@ dht_discover_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
                 dht_iatt_merge (this, &local->postparent, postparent,
                                 prev->this);
+
+                if (!local->ia_ino &&
+                    (prev->this == dht_first_up_subvol (this))) {
+                        local->ia_ino = local->stbuf.ia_ino;
+                }
+
         }
 unlock:
         UNLOCK (&frame->lock);
-out:
-        this_call_cnt = dht_frame_return (frame);
 
-        if (is_last_call (this_call_cnt) || attempt_unwind) {
-                dht_discover_complete (this, frame);
-        }
-
-        if (is_last_call (this_call_cnt))
-                DHT_STACK_DESTROY (frame);
-
-        return 0;
-}
-
-
-int
-dht_discover (call_frame_t *frame, xlator_t *this, loc_t *loc)
-{
-        int          ret;
-        dht_local_t *local = NULL;
-        dht_conf_t  *conf = NULL;
-        int          call_cnt = 0;
-        int          op_errno = EINVAL;
-        int          i = 0;
-        call_frame_t *discover_frame = NULL;
-
-        conf = this->private;
-        local = frame->local;
 
-        ret = dict_set_uint32 (local->xattr_req, conf->xattr_name, 4 * 4);
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to set '%s' key",
-                        loc->path, conf->xattr_name);
-
-        ret = dict_set_uint32 (local->xattr_req, conf->link_xattr_name, 256);
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to set '%s' key",
-                        loc->path, conf->link_xattr_name);
+        this_call_cnt = dht_frame_return (frame);
 
-        call_cnt        = conf->subvolume_cnt;
-        local->call_cnt = call_cnt;
+        if (is_last_call (this_call_cnt)) {
+                if (local->need_selfheal) {
+                        local->need_selfheal = 0;
+                        dht_lookup_everywhere (frame, this, &local->loc);
+                        return 0;
+                }
 
-        local->layout = dht_layout_new (this, conf->subvolume_cnt);
+                if (local->op_ret == 0) {
+                        ret = dht_layout_normalize (this, &local->loc, layout);
 
-        if (!local->layout) {
-                op_errno = ENOMEM;
-                goto err;
-        }
+                        if (ret != 0) {
+                                gf_log (this->name, GF_LOG_DEBUG,
+                                        "fixing assignment on %s",
+                                        local->loc.path);
+                                goto selfheal;
+                        }
 
-        uuid_copy (local->gfid, loc->gfid);
+                        dht_layout_set (this, local->inode, layout);
 
-        discover_frame = copy_frame (frame);
-        if (!discover_frame) {
-                op_errno = ENOMEM;
-                goto err;
-        }
+                        if (local->ia_ino) {
+                                local->stbuf.ia_ino = local->ia_ino;
+                        } else {
+                                gf_log (this->name, GF_LOG_DEBUG,
+                                        "could not find hashed subvol for %s",
+                                        local->loc.path);
+                        }
 
-        discover_frame->local = local;
-        frame->local = NULL;
-        local->main_frame = frame;
+                        if (local->loc.parent)
+                                local->postparent.ia_ino =
+                                        local->loc.parent->ino;
+                }
 
-        for (i = 0; i < call_cnt; i++) {
-                STACK_WIND (discover_frame, dht_discover_cbk,
-                            conf->subvolumes[i],
-                            conf->subvolumes[i]->fops->lookup,
-                            &local->loc, local->xattr_req);
+                DHT_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno,
+                                  local->inode, &local->stbuf, local->xattr,
+                                  &local->postparent);
         }
 
         return 0;
 
-err:
-        DHT_STACK_UNWIND (lookup, frame, -1, op_errno, NULL, NULL, NULL,
-                          NULL);
-
-        return 0;
+selfheal:
+        FRAME_SU_DO (frame, dht_local_t);
+        uuid_copy (local->loc.gfid, local->gfid);
+        ret = dht_selfheal_directory (frame, dht_lookup_selfheal_cbk,
+                                      &local->loc, layout);
+out:
+        return ret;
 }
 
-
 int
-dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int op_ret, int op_errno,
-                    inode_t *inode, struct iatt *stbuf, dict_t *xattr,
-                    struct iatt *postparent)
+dht_lookup_root_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                         int op_ret, int op_errno,
+                         inode_t *inode, struct iatt *stbuf, dict_t *xattr,
+                         struct iatt *postparent)
 {
+        dht_conf_t   *conf                    = NULL;
         dht_local_t  *local                   = NULL;
         int           this_call_cnt           = 0;
         call_frame_t *prev                    = NULL;
@@ -415,48 +301,32 @@ dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         GF_VALIDATE_OR_GOTO ("dht", this->private, out);
         GF_VALIDATE_OR_GOTO ("dht", cookie, out);
 
+        conf  = this->private;
         local = frame->local;
         prev  = cookie;
 
         layout = local->layout;
 
-        if (!op_ret && uuid_is_null (local->gfid))
-                memcpy (local->gfid, stbuf->ia_gfid, 16);
-
-        /* Check if the gfid is different for file from other node */
-        if (!op_ret && uuid_compare (local->gfid, stbuf->ia_gfid)) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: gfid different on %s",
-                        local->loc.path, prev->this->name);
-        }
-
         LOCK (&frame->lock);
         {
-                /* TODO: assert equal mode on stbuf->st_mode and
-                   local->stbuf->st_mode
-
-                   else mkdir/chmod/chown and fix
-                */
                 ret = dht_layout_merge (this, layout, prev->this,
                                         op_ret, op_errno, xattr);
 
                 if (op_ret == -1) {
                         local->op_errno = op_errno;
-                        gf_log (this->name, GF_LOG_DEBUG,
+                        gf_log (this->name, GF_LOG_ERROR,
                                 "lookup of %s on %s returned error (%s)",
                                 local->loc.path, prev->this->name,
                                 strerror (op_errno));
-
                         goto unlock;
                 }
 
                 is_dir = check_is_dir (inode, stbuf, xattr);
                 if (!is_dir) {
-                        gf_log (this->name, GF_LOG_DEBUG,
+                        gf_log (this->name, GF_LOG_CRITICAL,
                                 "lookup of %s on %s returned non dir 0%o",
                                 local->loc.path, prev->this->name,
                                 stbuf->ia_type);
-                        local->need_selfheal = 1;
                         goto unlock;
                 }
 
@@ -471,8 +341,11 @@ dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->inode = inode_ref (inode);
 
                 dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
-                dht_iatt_merge (this, &local->postparent, postparent,
-                                prev->this);
+
+                if (prev->this == dht_first_up_subvol (this)) {
+                        local->ia_ino = local->stbuf.ia_ino;
+                }
+
         }
 unlock:
         UNLOCK (&frame->lock);
@@ -481,45 +354,88 @@ unlock:
         this_call_cnt = dht_frame_return (frame);
 
         if (is_last_call (this_call_cnt)) {
-                if (local->need_selfheal) {
-                        local->need_selfheal = 0;
-                        dht_lookup_everywhere (frame, this, &local->loc);
-                        return 0;
-                }
-
                 if (local->op_ret == 0) {
                         ret = dht_layout_normalize (this, &local->loc, layout);
-
                         if (ret != 0) {
-                                gf_log (this->name, GF_LOG_DEBUG,
+                                gf_log (this->name, GF_LOG_INFO,
                                         "fixing assignment on %s",
                                         local->loc.path);
-                                goto selfheal;
                         }
 
-                        dht_layout_set (this, local->inode, layout);
-                }
-
-                if (local->loc.parent) {
-                        dht_inode_ctx_time_update (local->loc.parent, this,
-                                                   &local->postparent, 1);
+                        ret = dht_layout_set (this, local->inode, layout);
                 }
 
-                DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
                 DHT_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno,
                                   local->inode, &local->stbuf, local->xattr,
                                   &local->postparent);
         }
 
+out:
+        return ret;
+}
+
+static int
+dht_do_fresh_lookup_on_root (xlator_t *this, call_frame_t *frame)
+{
+        dht_local_t  *local    = NULL;
+        dht_conf_t   *conf     = NULL;
+        int           ret      = -1;
+        int           call_cnt = 0;
+        int           i        = 0;
+        int           op_errno = EINVAL;
+
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+        GF_VALIDATE_OR_GOTO ("dht", frame, unwind);
+        GF_VALIDATE_OR_GOTO ("dht", frame->local, unwind);
+
+        local = frame->local;
+        conf = this->private;
+        if (!conf)
+                goto err;
+
+        if (local->layout) {
+                dht_layout_unref (this, local->layout);
+                local->layout = NULL;
+        }
+
+        if (local->xattr != NULL) {
+                dict_unref (local->xattr);
+                local->xattr = NULL;
+        }
+
+        ret = dict_set_uint32 (local->xattr_req,
+                               "trusted.glusterfs.dht", 4 * 4);
+        if (ret)
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "failed to set the dict entry for dht");
+
+        call_cnt = local->call_cnt = conf->subvolume_cnt;
+
+        local->layout = dht_layout_new (this,
+                                        conf->subvolume_cnt);
+        if (!local->layout) {
+                local->op_errno = ENOMEM;
+                goto err;
+        }
+
+        for (i = 0; i < call_cnt; i++) {
+                STACK_WIND (frame, dht_lookup_root_dir_cbk,
+                            conf->subvolumes[i],
+                            conf->subvolumes[i]->fops->lookup,
+                            &local->loc, local->xattr_req);
+        }
+
         return 0;
+err:
+        DHT_STACK_UNWIND (lookup, frame, -1, local->op_errno,
+                          local->inode, &local->stbuf, local->xattr,
+                          &local->postparent);
 
-selfheal:
-        FRAME_SU_DO (frame, dht_local_t);
-        uuid_copy (local->loc.gfid, local->gfid);
-        ret = dht_selfheal_directory (frame, dht_lookup_selfheal_cbk,
-                                      &local->loc, layout);
+        return 0;
+unwind:
+        DHT_STACK_UNWIND (lookup, frame, -1, op_errno, NULL, NULL, NULL, NULL);
 out:
-        return ret;
+        return -1;
 }
 
 int
@@ -536,8 +452,7 @@ dht_revalidate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         int           ret  = -1;
         int           is_dir = 0;
         int           is_linkfile = 0;
-        call_frame_t *copy          = NULL;
-        dht_local_t  *copy_local    = NULL;
+        unsigned char root_gfid[16] = {0,};
 
         GF_VALIDATE_OR_GOTO ("dht", frame, err);
         GF_VALIDATE_OR_GOTO ("dht", this, err);
@@ -564,20 +479,12 @@ dht_revalidate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         strerror (op_errno));
 			}
                         if (op_errno == ESTALE) {
-                                /* propagate the ESTALE to parent.
-                                 * setting local->return_estale would send
+                                /* propogate the ESTALE to parent.
+                                 * setting local->layout_mismatch would send
                                  * ESTALE to parent. */
-                                local->return_estale = 1;
+                                local->layout_mismatch = 1;
                         }
 
-                        /* if it is ENOENT, we may have to do a
-                         * 'lookup_everywhere()' to make sure
-                         * the file is not migrated */
-                        if (op_errno == ENOENT) {
-                                if (IA_ISREG (local->loc.inode->ia_type)) {
-                                        local->need_lookup_everywhere = 1;
-                                }
-                        }
                         goto unlock;
                 }
 
@@ -596,36 +503,18 @@ dht_revalidate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 layout = local->layout;
 
                 is_dir = check_is_dir (inode, stbuf, xattr);
-                is_linkfile = check_is_linkfile (inode, stbuf, xattr,
-                                                 conf->link_xattr_name);
+                is_linkfile = check_is_linkfile (inode, stbuf, xattr);
 
                 if (is_linkfile) {
                         gf_log (this->name, GF_LOG_INFO,
                                 "linkfile found in revalidate for %s",
                                 local->loc.path);
-                        local->return_estale = 1;
+                        local->layout_mismatch = 1;
 
                         goto unlock;
                 }
 
                 if (is_dir) {
-                        ret = dht_dir_has_layout (xattr, conf->xattr_name);
-                        if (ret >= 0) {
-                                if (is_greater_time(local->stbuf.ia_ctime,
-                                                    local->stbuf.ia_ctime_nsec,
-                                                    stbuf->ia_ctime,
-                                                    stbuf->ia_ctime_nsec)) {
-                                        local->prebuf.ia_gid = stbuf->ia_gid;
-                                        local->prebuf.ia_uid = stbuf->ia_uid;
-                                }
-                        }
-                        if (local->stbuf.ia_type != IA_INVAL)
-                        {
-                                if ((local->stbuf.ia_gid != stbuf->ia_gid) ||
-                                    (local->stbuf.ia_uid != stbuf->ia_uid)) {
-                                        local->need_selfheal = 1;
-                                }
-                        }
                         ret = dht_layout_dir_mismatch (this, layout,
                                                        prev->this, &local->loc,
                                                        xattr);
@@ -645,6 +534,10 @@ dht_revalidate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 prev->this);
 
                 local->op_ret = 0;
+                local->stbuf.ia_ino = local->ia_ino;
+
+                if (local->loc.parent)
+                        local->postparent.ia_ino = local->loc.parent->ino;
 
                 if (!local->xattr) {
                         local->xattr = dict_ref (xattr);
@@ -664,59 +557,24 @@ out:
                     && (conf && conf->unhashed_sticky_bit)) {
                         local->stbuf.ia_prot.sticky = 1;
                 }
-                if (local->need_selfheal) {
-                        local->need_selfheal = 0;
-                        uuid_copy (local->gfid, local->stbuf.ia_gfid);
-                        local->stbuf.ia_gid = local->prebuf.ia_gid;
-                        local->stbuf.ia_uid = local->prebuf.ia_uid;
-                        copy = create_frame (this, this->ctx->pool);
-                        if (copy) {
-                                copy_local = dht_local_init (copy, &local->loc,
-                                                             NULL, 0);
-                                if (!copy_local)
-                                        goto cont;
-                                copy_local->stbuf = local->stbuf;
-                                copy->local = copy_local;
-                                FRAME_SU_DO (copy, dht_local_t);
-                                ret = synctask_new (this->ctx->env,
-                                                    dht_dir_attr_heal,
-                                                    dht_dir_attr_heal_done,
-                                                    copy, copy);
-                        }
-                }
-cont:
-		if (local->layout_mismatch) {
-                        /* Found layout mismatch in the directory, need to
-                           fix this in the inode context */
-                        dht_layout_unref (this, local->layout);
-                        local->layout = NULL;
-                        dht_lookup_directory (frame, this, &local->loc);
-                        return 0;
-                }
-
-                if (local->need_lookup_everywhere) {
-                        /* As the current layout gave ENOENT error, we would
-                           need a new layout */
-                        dht_layout_unref (this, local->layout);
-                        local->layout = NULL;
 
-                        /* We know that current cached subvol is no more
-                           valid, get the new one */
-                        local->cached_subvol = NULL;
-                        dht_lookup_everywhere (frame, this, &local->loc);
-                        return 0;
-                }
-                if (local->return_estale) {
+                if (local->layout_mismatch) {
                         local->op_ret = -1;
                         local->op_errno = ESTALE;
-                }
 
-                if (local->loc.parent) {
-                        dht_inode_ctx_time_update (local->loc.parent, this,
-                                                   &local->postparent, 1);
+                        /* Because for 'root' inode, there is no FRESH lookup
+                         * sent from FUSE layer upon ESTALE, we need to handle
+                         * that one case here */
+                        root_gfid[15] = 1;
+                        if (!local->loc.parent &&
+                            !uuid_compare (local->loc.inode->gfid, root_gfid)) {
+                                dht_do_fresh_lookup_on_root (this, frame);
+                                return 0;
+                        }
                 }
 
-                DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
+                WIPE (&local->postparent);
+
                 DHT_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno,
                                   local->inode, &local->stbuf, local->xattr,
                                   &local->postparent);
@@ -732,8 +590,7 @@ dht_lookup_linkfile_create_cbk (call_frame_t *frame, void *cookie,
                                 xlator_t *this,
                                 int32_t op_ret, int32_t op_errno,
                                 inode_t *inode, struct iatt *stbuf,
-                                struct iatt *preparent, struct iatt *postparent,
-                                dict_t *xdata)
+                                struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         xlator_t     *cached_subvol = NULL;
@@ -766,16 +623,12 @@ dht_lookup_linkfile_create_cbk (call_frame_t *frame, void *cookie,
                 local->stbuf.ia_prot.sticky = 1;
         }
 
-        if (local->loc.parent) {
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           postparent, 1);
-        }
+        if (local->loc.parent)
+                local->postparent.ia_ino = local->loc.parent->ino;
 
 unwind:
-        if (local->linked == _gf_true)
-                dht_linkfile_attr_heal (frame, this);
+        WIPE (&local->postparent);
 
-        DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
         DHT_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno,
                           local->inode, &local->stbuf, local->xattr,
                           &local->postparent);
@@ -791,7 +644,7 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
         dht_local_t  *local = NULL;
         xlator_t     *hashed_subvol = NULL;
         xlator_t     *cached_subvol = NULL;
-        dht_layout_t *layout = NULL;
+
 
         local = frame->local;
         hashed_subvol = local->hashed_subvol;
@@ -819,46 +672,6 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
                 return 0;
         }
 
-        if (local->need_lookup_everywhere) {
-                if (uuid_compare (local->gfid, local->inode->gfid)) {
-                        /* GFID different, return error */
-                        DHT_STACK_UNWIND (lookup, frame, -1, ENOENT, NULL,
-                                          NULL, NULL, NULL);
-                        return 0;
-                }
-                local->op_ret = 0;
-                local->op_errno = 0;
-                layout = dht_layout_for_subvol (this, cached_subvol);
-                if (!layout) {
-                        gf_log (this->name, GF_LOG_INFO,
-                                "%s: no pre-set layout for subvolume %s",
-                                local->loc.path, (cached_subvol ?
-                                                  cached_subvol->name :
-                                                  "<nil>"));
-                }
-
-                ret = dht_layout_set (this, local->inode, layout);
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_INFO,
-                                "%s: failed to set layout for subvol %s",
-                                local->loc.path, (cached_subvol ?
-                                                  cached_subvol->name :
-                                                  "<nil>"));
-                }
-
-                if (local->loc.parent) {
-                        dht_inode_ctx_time_update (local->loc.parent, this,
-                                                   &local->postparent, 1);
-                }
-
-                DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
-                DHT_STACK_UNWIND (lookup, frame, local->op_ret,
-                                  local->op_errno, local->inode,
-                                  &local->stbuf, local->xattr,
-                                  &local->postparent);
-                return 0;
-        }
-
         if (!hashed_subvol) {
                 gf_log (this->name, GF_LOG_INFO,
                         "cannot create linkfile file for %s on %s: "
@@ -879,12 +692,12 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
                         local->op_errno = EINVAL;
                 }
 
-                if (local->loc.parent) {
-                        dht_inode_ctx_time_update (local->loc.parent, this,
-                                                   &local->postparent, 1);
-                }
+                if (local->loc.parent)
+                        local->postparent.ia_ino =
+                                local->loc.parent->ino;
+
+                WIPE (&local->postparent);
 
-                DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
                 DHT_STACK_UNWIND (lookup, frame, local->op_ret,
                                   local->op_errno, local->inode,
                                   &local->stbuf, local->xattr,
@@ -898,7 +711,7 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
                 hashed_subvol->name);
 
         ret = dht_linkfile_create (frame,
-                                   dht_lookup_linkfile_create_cbk, this,
+                                   dht_lookup_linkfile_create_cbk,
                                    cached_subvol, hashed_subvol, &local->loc);
 
         return ret;
@@ -908,8 +721,7 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
 int
 dht_lookup_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int op_ret, int op_errno,
-                       struct iatt *preparent, struct iatt *postparent,
-                       dict_t *xdata)
+                       struct iatt *preparent, struct iatt *postparent)
 {
         int  this_call_cnt = 0;
 
@@ -928,6 +740,7 @@ dht_lookup_everywhere_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                            inode_t *inode, struct iatt *buf, dict_t *xattr,
                            struct iatt *postparent)
 {
+        dht_conf_t   *conf          = NULL;
         dht_local_t  *local         = NULL;
         int           this_call_cnt = 0;
         call_frame_t *prev          = NULL;
@@ -936,9 +749,7 @@ dht_lookup_everywhere_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         xlator_t     *subvol        = NULL;
         loc_t        *loc           = NULL;
         xlator_t     *link_subvol   = NULL;
-        int           ret           = -1;
-        int32_t       fd_count      = 0;
-        dht_conf_t   *conf          = NULL;
+        int           ret = -1;
 
         GF_VALIDATE_OR_GOTO ("dht", frame, out);
         GF_VALIDATE_OR_GOTO ("dht", this, out);
@@ -946,9 +757,10 @@ dht_lookup_everywhere_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         GF_VALIDATE_OR_GOTO ("dht", cookie, out);
         GF_VALIDATE_OR_GOTO ("dht", this->private, out);
 
+        conf   = this->private;
+
         local  = frame->local;
         loc    = &local->loc;
-        conf   = this->private;
 
         prev   = cookie;
         subvol = prev->this;
@@ -970,8 +782,7 @@ dht_lookup_everywhere_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 loc->path, prev->this->name);
                 }
 
-                is_linkfile = check_is_linkfile (inode, buf, xattr,
-                                                 conf->link_xattr_name);
+                is_linkfile = check_is_linkfile (inode, buf, xattr);
                 is_dir = check_is_dir (inode, buf, xattr);
 
                 if (is_linkfile) {
@@ -1012,7 +823,7 @@ dht_lookup_everywhere_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 /* This is where we need 'rename' both entries logic */
                                 gf_log (this->name, GF_LOG_WARNING,
                                         "multiple subvolumes (%s and %s) have "
-                                        "file %s (preferably rename the file "
+                                        "file %s (preferrably rename the file "
                                         "in the backend, and do a fresh lookup)",
                                         local->cached_subvol->name,
                                         subvol->name, local->loc.path);
@@ -1023,17 +834,12 @@ unlock:
         UNLOCK (&frame->lock);
 
         if (is_linkfile) {
-                ret = dict_get_int32 (xattr, GLUSTERFS_OPEN_FD_COUNT, &fd_count);
-                /* Delete the linkfile only if there are no open fds on it.
-                   if there is a open-fd, it may be in migration */
-                if (!ret && (fd_count == 0)) {
-                        gf_log (this->name, GF_LOG_INFO,
-                                "deleting stale linkfile %s on %s",
-                                loc->path, subvol->name);
-                        STACK_WIND (frame, dht_lookup_unlink_cbk,
-                                    subvol, subvol->fops->unlink, loc, 0, NULL);
-                        return 0;
-                }
+                gf_log (this->name, GF_LOG_INFO,
+                        "deleting stale linkfile %s on %s",
+                        loc->path, subvol->name);
+                STACK_WIND (frame, dht_lookup_unlink_cbk,
+                            subvol, subvol->fops->unlink, loc);
+                return 0;
         }
 
         this_call_cnt = dht_frame_return (frame);
@@ -1113,16 +919,7 @@ dht_lookup_linkfile_cbk (call_frame_t *frame, void *cookie,
                 gf_log (this->name, GF_LOG_INFO,
                         "lookup of %s on %s (following linkfile) failed (%s)",
                         local->loc.path, subvol->name, strerror (op_errno));
-
-                /* If cached subvol returned ENOTCONN, do not do
-                lookup_everywhere. We need to make sure linkfile does not get
-                removed, which can take away the namespace, and subvol is
-                anyways down. */
-
-                if (op_errno != ENOTCONN)
-                        goto err;
-                else
-                        goto unwind;
+                goto err;
         }
 
         if (check_is_dir (inode, stbuf, xattr)) {
@@ -1132,7 +929,7 @@ dht_lookup_linkfile_cbk (call_frame_t *frame, void *cookie,
                 goto err;
         }
 
-        if (check_is_linkfile (inode, stbuf, xattr, conf->link_xattr_name)) {
+        if (check_is_linkfile (inode, stbuf, xattr)) {
                 gf_log (this->name, GF_LOG_INFO,
                         "lookup of %s on %s (following linkfile) reached link",
                         local->loc.path, subvol->name);
@@ -1150,6 +947,9 @@ dht_lookup_linkfile_cbk (call_frame_t *frame, void *cookie,
             && (conf && conf->unhashed_sticky_bit)) {
                 stbuf->ia_prot.sticky = 1;
         }
+        dht_itransform (this, prev->this, stbuf->ia_ino, &stbuf->ia_ino);
+        if (local->loc.parent)
+                postparent->ia_ino = local->loc.parent->ino;
 
         ret = dht_layout_preset (this, prev->this, inode);
         if (ret < 0) {
@@ -1160,13 +960,9 @@ dht_lookup_linkfile_cbk (call_frame_t *frame, void *cookie,
                 op_errno = EINVAL;
         }
 
-        if (local->loc.parent) {
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           postparent, 1);
-        }
-
 unwind:
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
+        WIPE (postparent);
+
         DHT_STACK_UNWIND (lookup, frame, op_ret, op_errno, inode, stbuf, xattr,
                           postparent);
 
@@ -1210,13 +1006,9 @@ dht_lookup_directory (call_frame_t *frame, xlator_t *this, loc_t *loc)
                 local->xattr = NULL;
         }
 
-        if (!uuid_is_null (local->gfid)) {
+        if (!uuid_is_null (local->gfid))
                 ret = dict_set_static_bin (local->xattr_req, "gfid-req",
                                            local->gfid, 16);
-                if (ret)
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: failed to set gfid", local->loc.path);
-        }
 
         for (i = 0; i < call_cnt; i++) {
                 STACK_WIND (frame, dht_lookup_dir_cbk,
@@ -1247,6 +1039,7 @@ dht_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         loc_t        *loc           = NULL;
         call_frame_t *prev          = NULL;
         int           ret           = 0;
+        uint64_t      tmp_layout    = 0;
         dht_layout_t *parent_layout = NULL;
 
         GF_VALIDATE_OR_GOTO ("dht", frame, err);
@@ -1277,10 +1070,8 @@ dht_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 }
                 if ((conf->search_unhashed == GF_DHT_LOOKUP_UNHASHED_AUTO) &&
                     (loc->parent)) {
-                        ret = dht_inode_ctx_layout_get (loc->parent, this,
-                                                        &parent_layout);
-                        if (ret || !parent_layout)
-                                goto out;
+                        ret = inode_ctx_get (loc->parent, this, &tmp_layout);
+                        parent_layout = (dht_layout_t *)(long)tmp_layout;
                         if (parent_layout->search_unhashed) {
                                 local->op_errno = ENOENT;
                                 dht_lookup_everywhere (frame, this, loc);
@@ -1309,12 +1100,16 @@ dht_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 goto out;
         }
 
-        is_linkfile = check_is_linkfile (inode, stbuf, xattr,
-                                         conf->link_xattr_name);
+        is_linkfile = check_is_linkfile (inode, stbuf, xattr);
 
         if (!is_linkfile) {
                 /* non-directory and not a linkfile */
 
+                dht_itransform (this, prev->this, stbuf->ia_ino,
+                                &stbuf->ia_ino);
+                if (loc->parent)
+                        postparent->ia_ino = loc->parent->ino;
+
                 ret = dht_layout_preset (this, prev->this, inode);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_INFO,
@@ -1350,51 +1145,14 @@ out:
          * from each of the subvolume. See dht_iatt_merge for reference.
          */
 
-        if (!op_ret && local->loc.parent) {
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           postparent, 1);
-        }
+        WIPE (postparent);
 
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
         DHT_STACK_UNWIND (lookup, frame, op_ret, op_errno, inode, stbuf, xattr,
                           postparent);
 err:
         return 0;
 }
 
-/* For directories, check if acl xattrs have been requested (by the acl xlator),
- * if not, request for them. These xattrs are needed for dht dir self-heal to
- * perform proper self-healing of dirs
- */
-void
-dht_check_and_set_acl_xattr_req (inode_t *inode, dict_t *xattr_req)
-{
-        int     ret = 0;
-
-        GF_ASSERT (inode);
-        GF_ASSERT (xattr_req);
-
-        if (inode->ia_type != IA_IFDIR)
-                return;
-
-        if (!dict_get (xattr_req, POSIX_ACL_ACCESS_XATTR)) {
-                ret = dict_set_int8 (xattr_req, POSIX_ACL_ACCESS_XATTR, 0);
-                if (ret)
-                        gf_log (THIS->name, GF_LOG_WARNING,
-                                "failed to set key %s",
-                                POSIX_ACL_ACCESS_XATTR);
-        }
-
-        if (!dict_get (xattr_req, POSIX_ACL_DEFAULT_XATTR)) {
-                ret = dict_set_int8 (xattr_req, POSIX_ACL_DEFAULT_XATTR, 0);
-                if (ret)
-                        gf_log (THIS->name, GF_LOG_WARNING,
-                                "failed to set key %s",
-                                POSIX_ACL_DEFAULT_XATTR);
-        }
-
-        return;
-}
 
 int
 dht_lookup (call_frame_t *frame, xlator_t *this,
@@ -1402,6 +1160,7 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
 {
         xlator_t     *subvol = NULL;
         xlator_t     *hashed_subvol = NULL;
+        xlator_t     *cached_subvol = NULL;
         dht_local_t  *local  = NULL;
         dht_conf_t   *conf = NULL;
         int           ret    = -1;
@@ -1409,33 +1168,26 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
         dht_layout_t *layout = NULL;
         int           i = 0;
         int           call_cnt = 0;
-        loc_t         new_loc = {0,};
+
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
         VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
 
         conf = this->private;
         if (!conf)
                 goto err;
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_LOOKUP);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
         }
-
-        ret = dht_filter_loc_subvol_key (this, loc, &new_loc,
-                                         &hashed_subvol);
-        if (ret) {
-                loc_wipe (&local->loc);
-                ret = loc_dup (&new_loc, &local->loc);
-
-                /* we no more need 'new_loc' entries */
-                loc_wipe (&new_loc);
-
-                /* check if loc_dup() is successful */
+        if (!dht_filter_loc_subvol_key (this, loc, &local->loc,
+                                        &hashed_subvol)) {
+                ret = loc_dup (loc, &local->loc);
                 if (ret == -1) {
                         op_errno = errno;
                         gf_log (this->name, GF_LOG_DEBUG,
@@ -1451,19 +1203,16 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
                 local->xattr_req = dict_new ();
         }
 
-        if (uuid_is_null (loc->pargfid) && !uuid_is_null (loc->gfid) &&
-            !__is_root_gfid (loc->inode->gfid)) {
-                local->cached_subvol = NULL;
-                dht_discover (frame, this, loc);
-                return 0;
-        }
-
         if (!hashed_subvol)
                 hashed_subvol = dht_subvol_get_hashed (this, loc);
+        cached_subvol = dht_subvol_get_cached (this, loc->inode);
+
+        local->cached_subvol = cached_subvol;
         local->hashed_subvol = hashed_subvol;
 
         if (is_revalidate (loc)) {
-                layout = local->layout;
+                local->layout = layout = dht_layout_get (this, loc->inode);
+
                 if (!layout) {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "revalidate without cache. path=%s",
@@ -1472,6 +1221,8 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
                         goto err;
                 }
 
+                local->ia_ino   = loc->inode->ino;
+
                 if (layout->gen && (layout->gen < conf->gen)) {
                         gf_log (this->name, GF_LOG_TRACE,
                                 "incomplete layout failure for path=%s",
@@ -1483,13 +1234,13 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
                         goto do_fresh_lookup;
                 }
 
-                local->inode = inode_ref (loc->inode);
+                local->inode    = inode_ref (loc->inode);
 
                 /* NOTE: we don't require 'trusted.glusterfs.dht.linkto' attribute,
                  *       revalidates directly go to the cached-subvolume.
                  */
                 ret = dict_set_uint32 (local->xattr_req,
-                                       conf->xattr_name, 4 * 4);
+                                       "trusted.glusterfs.dht", 4 * 4);
 
                 if (IA_ISDIR (local->inode->ia_type)) {
                         local->call_cnt = call_cnt = conf->subvolume_cnt;
@@ -1502,19 +1253,12 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
                         return 0;
                 }
 
-                call_cnt = local->call_cnt = layout->cnt;
-
-                /* need it for self-healing linkfiles which is
-                   'in-migration' state */
-                ret = dict_set_uint32 (local->xattr_req,
-                                       GLUSTERFS_OPEN_FD_COUNT, 4);
-
-                /* need it for dir self-heal */
-                dht_check_and_set_acl_xattr_req (loc->inode, local->xattr_req);
+                local->call_cnt = layout->cnt;
+                call_cnt = local->call_cnt;
 
 		for (i = 0; i < call_cnt; i++) {
 			subvol = layout->list[i].xlator;
-
+			
 			STACK_WIND (frame, dht_revalidate_cbk,
 				    subvol, subvol->fops->lookup,
 				    &local->loc, local->xattr_req);
@@ -1524,18 +1268,10 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
         do_fresh_lookup:
                 /* TODO: remove the hard-coding */
                 ret = dict_set_uint32 (local->xattr_req,
-                                       conf->xattr_name, 4 * 4);
-
-                ret = dict_set_uint32 (local->xattr_req,
-                                       conf->link_xattr_name, 256);
+                                       "trusted.glusterfs.dht", 4 * 4);
 
-                /* need it for self-healing linkfiles which is
-                   'in-migration' state */
                 ret = dict_set_uint32 (local->xattr_req,
-                                       GLUSTERFS_OPEN_FD_COUNT, 4);
-
-                /* need it for dir self-heal */
-                dht_check_and_set_acl_xattr_req (loc->inode, local->xattr_req);
+                                       "trusted.glusterfs.dht.linkto", 256);
 
                 if (!hashed_subvol) {
                         gf_log (this->name, GF_LOG_DEBUG,
@@ -1570,8 +1306,297 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (lookup, frame, -1, op_errno, NULL, NULL, NULL,
-                          NULL);
+        DHT_STACK_UNWIND (lookup, frame, -1, op_errno, NULL, NULL, NULL, NULL);
+        return 0;
+}
+
+
+int
+dht_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                  int op_ret, int op_errno, struct iatt *prebuf,
+                  struct iatt *postbuf)
+{
+        dht_local_t  *local = NULL;
+        int           this_call_cnt = 0;
+        call_frame_t *prev = NULL;
+
+        GF_VALIDATE_OR_GOTO ("dht", frame, err);
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+        GF_VALIDATE_OR_GOTO ("dht", frame->local, out);
+        GF_VALIDATE_OR_GOTO ("dht", cookie, out);
+
+        local = frame->local;
+        prev = cookie;
+
+        LOCK (&frame->lock);
+        {
+                if (op_ret == -1) {
+                        local->op_errno = op_errno;
+                        local->op_ret = -1;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "subvolume %s returned -1 (%s)",
+                                prev->this->name, strerror (op_errno));
+                        goto unlock;
+                }
+
+                dht_iatt_merge (this, &local->prebuf, prebuf, prev->this);
+                dht_iatt_merge (this, &local->stbuf, postbuf, prev->this);
+
+                if (local->inode) {
+                        local->stbuf.ia_ino = local->inode->ino;
+                        local->prebuf.ia_ino = local->inode->ino;
+                }
+
+                local->op_ret = 0;
+        }
+unlock:
+        UNLOCK (&frame->lock);
+out:
+        this_call_cnt = dht_frame_return (frame);
+        if (is_last_call (this_call_cnt))
+                DHT_STACK_UNWIND (truncate, frame, local->op_ret, local->op_errno,
+                                  &local->prebuf, &local->stbuf);
+err:
+        return 0;
+}
+
+
+
+int
+dht_attr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+              int op_ret, int op_errno, struct iatt *stbuf)
+{
+        dht_local_t  *local = NULL;
+        int           this_call_cnt = 0;
+        call_frame_t *prev = NULL;
+
+        GF_VALIDATE_OR_GOTO ("dht", frame, err);
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+        GF_VALIDATE_OR_GOTO ("dht", frame->local, out);
+        GF_VALIDATE_OR_GOTO ("dht", cookie, out);
+
+        local = frame->local;
+        prev = cookie;
+
+        LOCK (&frame->lock);
+        {
+                if (op_ret == -1) {
+                        local->op_errno = op_errno;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "subvolume %s returned -1 (%s)",
+                                prev->this->name, strerror (op_errno));
+                        goto unlock;
+                }
+
+                dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
+
+                if (local->inode)
+                        local->stbuf.ia_ino = local->inode->ino;
+                local->op_ret = 0;
+        }
+unlock:
+        UNLOCK (&frame->lock);
+out:
+        this_call_cnt = dht_frame_return (frame);
+        if (is_last_call (this_call_cnt))
+                DHT_STACK_UNWIND (stat, frame, local->op_ret, local->op_errno,
+                                  &local->stbuf);
+err:
+        return 0;
+}
+
+
+int
+dht_stat (call_frame_t *frame, xlator_t *this,
+          loc_t *loc)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+        dht_layout_t *layout = NULL;
+        int           i = 0;
+        int           call_cnt = 0;
+
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (loc, err);
+        VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
+
+
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
+
+        local->inode = inode_ref (loc->inode);
+
+        local->layout = layout = dht_layout_get (this, loc->inode);
+        if (!layout) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no layout for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        local->call_cnt = call_cnt = layout->cnt;
+
+        for (i = 0; i < call_cnt; i++) {
+                subvol = layout->list[i].xlator;
+
+                STACK_WIND (frame, dht_attr_cbk,
+                            subvol, subvol->fops->stat,
+                            loc);
+        }
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (stat, frame, -1, op_errno, NULL);
+
+        return 0;
+}
+
+
+int
+dht_fstat (call_frame_t *frame, xlator_t *this,
+           fd_t *fd)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+        dht_layout_t *layout = NULL;
+        int           i = 0;
+        int           call_cnt = 0;
+
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
+
+        local->layout = layout = dht_layout_get (this, fd->inode);
+        if (!layout) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no layout for fd=%p", fd);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        local->inode    = inode_ref (fd->inode);
+        local->call_cnt = call_cnt = layout->cnt;;
+
+        for (i = 0; i < call_cnt; i++) {
+                subvol = layout->list[i].xlator;
+                STACK_WIND (frame, dht_attr_cbk,
+                            subvol, subvol->fops->fstat,
+                            fd);
+        }
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (fstat, frame, -1, op_errno, NULL);
+
+        return 0;
+}
+
+
+int
+dht_truncate (call_frame_t *frame, xlator_t *this,
+              loc_t *loc, off_t offset)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (loc, err);
+        VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
+
+        subvol = dht_subvol_get_cached (this, loc->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
+
+        local->inode = inode_ref (loc->inode);
+        local->call_cnt = 1;
+
+        STACK_WIND (frame, dht_truncate_cbk,
+                    subvol, subvol->fops->truncate,
+                    loc, offset);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (truncate, frame, -1, op_errno, NULL, NULL);
+
+        return 0;
+}
+
+
+int
+dht_ftruncate (call_frame_t *frame, xlator_t *this,
+               fd_t *fd, off_t offset)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        subvol = dht_subvol_get_cached (this, fd->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for fd=%p", fd);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
+
+        local->inode = inode_ref (fd->inode);
+        local->call_cnt = 1;
+
+        STACK_WIND (frame, dht_truncate_cbk,
+                    subvol, subvol->fops->ftruncate,
+                    fd, offset);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (ftruncate, frame, -1, op_errno, NULL, NULL);
+
         return 0;
 }
 
@@ -1579,7 +1604,7 @@ err:
 int
 dht_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 int op_ret, int op_errno, struct iatt *preparent,
-                struct iatt *postparent, dict_t *xdata)
+                struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         call_frame_t *prev  = NULL;
@@ -1598,23 +1623,21 @@ dht_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         goto unlock;
                 }
 
+                preparent->ia_ino = local->loc.parent->ino;
+                postparent->ia_ino = local->loc.parent->ino;
                 local->op_ret = 0;
 
                 local->postparent = *postparent;
                 local->preparent = *preparent;
 
-                if (local->loc.parent) {
-                        dht_inode_ctx_time_update (local->loc.parent, this,
-                                                   &local->preparent, 0);
-                        dht_inode_ctx_time_update (local->loc.parent, this,
-                                                   &local->postparent, 1);
-                }
+                WIPE (&local->postparent);
+                WIPE (&local->preparent);
         }
 unlock:
         UNLOCK (&frame->lock);
 
         DHT_STACK_UNWIND (unlink, frame, local->op_ret, local->op_errno,
-                          &local->preparent, &local->postparent, NULL);
+                          &local->preparent, &local->postparent);
 
         return 0;
 }
@@ -1623,7 +1646,7 @@ unlock:
 int
 dht_unlink_linkfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                          int op_ret, int op_errno, struct iatt *preparent,
-                         struct iatt *postparent, dict_t *xdata)
+                         struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         call_frame_t *prev = NULL;
@@ -1635,8 +1658,7 @@ dht_unlink_linkfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         LOCK (&frame->lock);
         {
-                if ((op_ret == -1) && !((op_errno == ENOENT) ||
-                                        (op_errno == ENOTCONN))) {
+                if (op_ret == -1) {
                         local->op_errno = op_errno;
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "subvolume %s returned -1 (%s)",
@@ -1649,7 +1671,7 @@ dht_unlink_linkfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 unlock:
         UNLOCK (&frame->lock);
 
-        if (local->op_ret == -1)
+        if (op_ret == -1)
                 goto err;
 
         cached_subvol = dht_subvol_get_cached (this, local->loc.inode);
@@ -1663,24 +1685,26 @@ unlock:
 
         STACK_WIND (frame, dht_unlink_cbk,
                     cached_subvol, cached_subvol->fops->unlink,
-                    &local->loc, local->flags, NULL);
+                    &local->loc);
 
         return 0;
 
 err:
         DHT_STACK_UNWIND (unlink, frame, -1, local->op_errno,
-                          NULL, NULL, NULL);
+                          NULL, NULL);
         return 0;
 }
 
+
 int
-dht_err_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-             int op_ret, int op_errno, dict_t *xdata)
+dht_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
+               int op_errno, struct iatt *prebuf, struct iatt *postbuf)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = 0;
         call_frame_t *prev = NULL;
 
+
         local = frame->local;
         prev = cookie;
 
@@ -1699,275 +1723,313 @@ dht_err_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 unlock:
         UNLOCK (&frame->lock);
 
-        this_call_cnt = dht_frame_return (frame);
-        if (is_last_call (this_call_cnt)) {
-                DHT_STACK_UNWIND (setxattr, frame, local->op_ret,
-                                  local->op_errno, NULL);
+        if (local && (op_ret == 0)) {
+                prebuf->ia_ino = local->ia_ino;
+                postbuf->ia_ino = local->ia_ino;
         }
 
+        this_call_cnt = dht_frame_return (frame);
+        if (is_last_call (this_call_cnt))
+                DHT_STACK_UNWIND (fsync, frame, local->op_ret, local->op_errno,
+                                  prebuf, postbuf);
+
         return 0;
 }
 
-static void
-fill_layout_info (dht_layout_t *layout, char *buf)
+
+
+int
+dht_err_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+             int op_ret, int op_errno)
 {
-        int i = 0;
-        char tmp_buf[128] = {0,};
+        dht_local_t  *local = NULL;
+        int           this_call_cnt = 0;
+        call_frame_t *prev = NULL;
 
-        for (i = 0; i < layout->cnt; i++) {
-                snprintf (tmp_buf, 128, "(%s %u %u)",
-                          layout->list[i].xlator->name,
-                          layout->list[i].start,
-                          layout->list[i].stop);
-                if (i)
-                        strcat (buf, " ");
-                strcat (buf, tmp_buf);
+
+        local = frame->local;
+        prev = cookie;
+
+        LOCK (&frame->lock);
+        {
+                if (op_ret == -1) {
+                        local->op_errno = op_errno;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "subvolume %s returned -1 (%s)",
+                                prev->this->name, strerror (op_errno));
+                        goto unlock;
+                }
+
+                local->op_ret = 0;
+        }
+unlock:
+        UNLOCK (&frame->lock);
+
+        this_call_cnt = dht_frame_return (frame);
+        if (is_last_call (this_call_cnt)) {
+                DHT_STACK_UNWIND (setxattr, frame, local->op_ret, local->op_errno);
         }
+
+        return 0;
 }
 
-void
-dht_fill_pathinfo_xattr (xlator_t *this, dht_local_t *local,
-                         char *xattr_buf, int32_t alloc_len,
-                         int flag, char *layout_buf)
+
+int
+dht_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+             int op_ret, int op_errno)
 {
-        if (flag && local->xattr_val)
-                snprintf (xattr_buf, alloc_len,
-                          "((<"DHT_PATHINFO_HEADER"%s> %s) (%s-layout %s))",
-                          this->name, local->xattr_val, this->name,
-                          layout_buf);
-        else if (local->xattr_val)
-                snprintf (xattr_buf, alloc_len,
-                          "(<"DHT_PATHINFO_HEADER"%s> %s)",
-                          this->name, local->xattr_val);
-        else if (flag)
-                snprintf (xattr_buf, alloc_len, "(%s-layout %s)",
-                          this->name, layout_buf);
+        DHT_STACK_UNWIND (access, frame, op_ret, op_errno);
+        return 0;
 }
 
+
 int
-dht_vgetxattr_alloc_and_fill (dht_local_t *local, dict_t *xattr, xlator_t *this,
-                              int op_errno)
+dht_access (call_frame_t *frame, xlator_t *this,
+            loc_t *loc, int32_t mask)
 {
-        int      ret       = -1;
-        char    *value     = NULL;
-        int32_t  plen      = 0;
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
 
-        ret = dict_get_str (xattr, local->xsel, &value);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "Subvolume %s returned -1 (%s)", this->name,
-                        strerror (op_errno));
-                local->op_ret = -1;
-                local->op_errno = op_errno;
-                goto out;
-        }
 
-        local->alloc_len += strlen(value);
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (loc, err);
+        VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
 
-        if (!local->xattr_val) {
-                local->alloc_len += (strlen (DHT_PATHINFO_HEADER) + 10);
-                local->xattr_val = GF_CALLOC (local->alloc_len, sizeof (char),
-                                              gf_common_mt_char);
-                if (!local->xattr_val) {
-                        ret = -1;
-                        goto out;
-                }
+        subvol = dht_subvol_get_cached (this, loc->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
         }
 
-        if (local->xattr_val) {
-                plen = strlen (local->xattr_val);
-                if (plen) {
-                        /* extra byte(s) for \0 to be safe */
-                        local->alloc_len += (plen + 2);
-                        local->xattr_val = GF_REALLOC (local->xattr_val,
-                                                       local->alloc_len);
-                        if (!local->xattr_val) {
-                                ret = -1;
-                                goto out;
-                        }
-                }
-
-                (void) strcat (local->xattr_val, value);
-                (void) strcat (local->xattr_val, " ");
-                local->op_ret = 0;
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
         }
 
-        ret = 0;
+        local->call_cnt = 1;
 
- out:
-        return ret;
+        STACK_WIND (frame, dht_access_cbk,
+                    subvol, subvol->fops->access,
+                    loc, mask);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (access, frame, -1, op_errno);
+
+        return 0;
 }
 
+
 int
-dht_vgetxattr_fill_and_set (dht_local_t *local, dict_t **dict, xlator_t *this,
-                            gf_boolean_t flag)
+dht_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                  int op_ret, int op_errno, const char *path, struct iatt *sbuf)
 {
-        int   ret             = -1;
-        char *xattr_buf       = NULL;
-        char layout_buf[8192] = {0,};
-
-        if (flag)
-                fill_layout_info (local->layout, layout_buf);
-
-        *dict = dict_new ();
-        if (!*dict)
-                goto out;
+        dht_local_t *local = NULL;
 
-        local->xattr_val[strlen (local->xattr_val) - 1] = '\0';
-
-        /* we would need max this many bytes to create xattr string
-         * extra 40 bytes is just an estimated amount of additional
-         * space required as we include translator name and some
-         * spaces, brackets etc. when forming the pathinfo string.
-         *
-         * For node-uuid we just don't have all the pretty formatting,
-         * but since this is a generic routine for pathinfo & node-uuid
-         * we dont have conditional space allocation and try to be
-         * generic
-         */
-        local->alloc_len += (2 * strlen (this->name))
-                + strlen (layout_buf)
-                + 40;
-        xattr_buf = GF_CALLOC (local->alloc_len, sizeof (char),
-                               gf_common_mt_char);
-        if (!xattr_buf)
-                goto out;
+        local = frame->local;
+        if (op_ret == -1)
+                goto err;
 
-        if (XATTR_IS_PATHINFO (local->xsel)) {
-                (void) dht_fill_pathinfo_xattr (this, local, xattr_buf,
-                                                local->alloc_len, flag,
-                                                layout_buf);
-        } else if (XATTR_IS_NODE_UUID (local->xsel)) {
-                (void) snprintf (xattr_buf, local->alloc_len, "%s",
-                                 local->xattr_val);
+        if (local) {
+                sbuf->ia_ino = local->ia_ino;
         } else {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "Unknown local->xsel (%s)", local->xsel);
-                goto out;
+                op_ret = -1;
+                op_errno = EINVAL;
         }
 
-        ret = dict_set_dynstr (*dict, local->xsel, xattr_buf);
-        GF_FREE (local->xattr_val);
+err:
+        DHT_STACK_UNWIND (readlink, frame, op_ret, op_errno, path, sbuf);
 
- out:
-        return ret;
+        return 0;
 }
 
+
 int
-dht_vgetxattr_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int op_ret, int op_errno, dict_t *xattr, dict_t *xdata)
+dht_readlink (call_frame_t *frame, xlator_t *this,
+              loc_t *loc, size_t size)
 {
-        int          ret           = 0;
-        dht_local_t *local         = NULL;
-        int          this_call_cnt = 0;
-        dict_t      *dict          = NULL;
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
 
-        VALIDATE_OR_GOTO (frame, out);
-        VALIDATE_OR_GOTO (frame->local, out);
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (loc, err);
+        VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
 
-        local = frame->local;
+        subvol = dht_subvol_get_cached (this, loc->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
+        }
 
-        LOCK (&frame->lock);
-        {
-                this_call_cnt = --local->call_cnt;
-                if (op_ret < 0) {
-                        if (op_errno != ENOTCONN) {
-                                gf_log (this->name, GF_LOG_ERROR,
-                                        "getxattr err (%s) for dir",
-                                        strerror (op_errno));
-				local->op_ret = -1;
-				local->op_errno = op_errno;
-                        }
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
 
-                        goto unlock;
-                }
+        local->ia_ino = loc->inode->ino;
 
-                ret = dht_vgetxattr_alloc_and_fill (local, xattr, this,
-                                                    op_errno);
-                if (ret)
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "alloc or fill failure");
-        }
- unlock:
-        UNLOCK (&frame->lock);
+        STACK_WIND (frame, dht_readlink_cbk,
+                    subvol, subvol->fops->readlink,
+                    loc, size);
 
-        if (!is_last_call (this_call_cnt))
-                goto out;
+        return 0;
 
-        /* -- last call: do patch ups -- */
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (readlink, frame, -1, op_errno, NULL, NULL);
 
-        if (local->op_ret == -1) {
-                goto unwind;
-        }
+        return 0;
+}
 
-        ret = dht_vgetxattr_fill_and_set (local, &dict, this, _gf_true);
-        if (ret)
-                goto unwind;
 
-        DHT_STACK_UNWIND (getxattr, frame, 0, 0, dict, xdata);
-        goto cleanup;
+int
+dht_fix_layout_cbk (call_frame_t *frame, void *cookie,
+                    xlator_t *this, int32_t op_ret, int32_t op_errno)
+{
+        DHT_STACK_UNWIND (getxattr, frame, -1, ENODATA, NULL);
 
- unwind:
-        DHT_STACK_UNWIND (getxattr, frame, -1, local->op_errno, NULL, NULL);
- cleanup:
-        if (dict)
-                dict_unref (dict);
- out:
         return 0;
 }
 
+static void
+fill_layout_info (dht_layout_t *layout, char *buf)
+{
+        int i = 0;
+        char tmp_buf[128] = {0,};
+
+        for (i = 0; i < layout->cnt; i++) {
+                snprintf (tmp_buf, 128, "(%s %u %u)",
+                          layout->list[i].xlator->name,
+                          layout->list[i].start,
+                          layout->list[i].stop);
+                if (i)
+                        strcat (buf, " ");
+                strcat (buf, tmp_buf);
+        }
+}
+
 int
-dht_vgetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int op_ret, int op_errno, dict_t *xattr, dict_t *xdata)
+dht_pathinfo_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                           int op_ret, int op_errno, dict_t *xattr)
 {
-        dht_local_t  *local         = NULL;
-        int           ret           = 0;
-        dict_t       *dict          = NULL;
-        call_frame_t *prev          = NULL;
-        gf_boolean_t  flag          = _gf_true;
+        dht_local_t *local         = NULL;
+        int          ret           = 0;
+        int          flag          = 0;
+        int          this_call_cnt = 0;
+        char        *value_got     = NULL;
+        char  layout_buf[8192]     = {0,};
+        char        *xattr_buf     = NULL;
+        dict_t      *dict          = NULL;
+        int32_t      alloc_len     = 0;
+        int32_t      plen          = 0;
 
         local = frame->local;
-        prev = cookie;
 
-        if (op_ret < 0) {
-                local->op_ret = -1;
-                local->op_errno = op_errno;
-                gf_log (this->name, GF_LOG_ERROR, "Subvolume %s returned -1 "
-                        "(%s)", prev->this->name, strerror (op_errno));
-                goto unwind;
-        }
+        if (op_ret != -1) {
+                ret = dict_get_str (xattr, GF_XATTR_PATHINFO_KEY, &value_got);
+                if (!ret) {
+                        alloc_len = strlen (value_got);
 
-        ret = dht_vgetxattr_alloc_and_fill (local, xattr, this,
-                                            op_errno);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "alloc or fill failure");
-                goto unwind;
+                        /**
+                         * allocate the buffer:- we allocate 10 bytes extra in case we need to
+                         * append ' Link: ' in the buffer for another STACK_WIND
+                         */
+                        if (!local->pathinfo) {
+                                alloc_len += (strlen (DHT_PATHINFO_HEADER) + 10);
+                                local->pathinfo = GF_CALLOC (alloc_len, sizeof (char), gf_common_mt_char);
+                        }
+
+                        if (local->pathinfo) {
+                                plen = strlen (local->pathinfo);
+                                if (plen) {
+                                        /* extra byte(s) for \0 to be safe */
+                                        alloc_len += (plen + 2);
+                                        local->pathinfo = GF_REALLOC (local->pathinfo,
+                                                                      alloc_len);
+                                        if (!local->pathinfo)
+                                                goto out;
+                                }
+
+                                strcat (local->pathinfo, value_got);
+                        }
+                }
         }
 
-        flag = (local->layout->cnt > 1) ? _gf_true : _gf_false;
+ out:
+        this_call_cnt = dht_frame_return (frame);
+        if (is_last_call (this_call_cnt)) {
+                if (local->layout->cnt > 1) {
+                        /* Set it for directory */
+                        fill_layout_info (local->layout, layout_buf);
+                        flag = 1;
+                }
 
-        ret = dht_vgetxattr_fill_and_set (local, &dict, this, flag);
-        if (ret)
-                goto unwind;
+                dict = dict_new ();
 
-        DHT_STACK_UNWIND (getxattr, frame, 0, 0, dict, xdata);
-        goto cleanup;
+                /* we would need max-to-max this many bytes to create pathinfo string */
+                alloc_len += (2 * strlen (this->name)) + strlen (layout_buf) + 40;
+                xattr_buf = GF_CALLOC (alloc_len, sizeof (char), gf_common_mt_char);
 
- unwind:
-        DHT_STACK_UNWIND (getxattr, frame, -1, local->op_errno,
-                          NULL, NULL);
- cleanup:
-        if (dict)
-                dict_unref (dict);
+                if (flag && local->pathinfo)
+                        snprintf (xattr_buf, alloc_len, "((<"DHT_PATHINFO_HEADER"%s> %s) (%s-layout %s))",
+                                  this->name, local->pathinfo, this->name,
+                                  layout_buf);
+                else if (local->pathinfo)
+                        snprintf (xattr_buf, alloc_len, "(<"DHT_PATHINFO_HEADER"%s> %s)",
+                                  this->name, local->pathinfo);
+                else if (flag)
+                        snprintf (xattr_buf, alloc_len, "(%s-layout %s)",
+                                  this->name, layout_buf);
+
+                ret = dict_set_dynstr (dict, GF_XATTR_PATHINFO_KEY,
+                                       xattr_buf);
+
+                if (local->pathinfo)
+                        GF_FREE (local->pathinfo);
+
+                DHT_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict);
+
+                if (dict)
+                        dict_unref (dict);
+
+                return 0;
+        }
+
+        if (local->pathinfo)
+                strcat (local->pathinfo, " Link: ");
+        if (local->hashed_subvol) {
+                /* This will happen if there pending */
+                STACK_WIND (frame, dht_pathinfo_getxattr_cbk, local->hashed_subvol,
+                            local->hashed_subvol->fops->getxattr,
+                            &local->loc, local->key);
+
+                return 0;
+        }
+
+        gf_log ("this->name", GF_LOG_ERROR, "Unable to find hashed_subvol for path"
+                " %s", local->pathinfo);
 
+        DHT_STACK_UNWIND (getxattr, frame, -1, op_errno, dict);
         return 0;
 }
 
 int
 dht_linkinfo_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                           int op_ret, int op_errno, dict_t *xattr,
-                           dict_t *xdata)
+                           int op_ret, int op_errno, dict_t *xattr)
 {
         int   ret   = 0;
         char *value = NULL;
@@ -1982,24 +2044,21 @@ dht_linkinfo_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 }
         }
 
-        DHT_STACK_UNWIND (getxattr, frame, op_ret, op_errno, xattr, xdata);
+        DHT_STACK_UNWIND (getxattr, frame, op_ret, op_errno, xattr);
 
         return 0;
 }
 
 int
 dht_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int op_ret, int op_errno, dict_t *xattr, dict_t *xdata)
+                  int op_ret, int op_errno, dict_t *xattr)
 {
         int             this_call_cnt = 0;
         dht_local_t     *local = NULL;
-        dht_conf_t      *conf = NULL;
 
         VALIDATE_OR_GOTO (frame, out);
         VALIDATE_OR_GOTO (frame->local, out);
-        VALIDATE_OR_GOTO (this->private, out);
 
-        conf = this->private;
         local = frame->local;
 
         this_call_cnt = dht_frame_return (frame);
@@ -2007,8 +2066,8 @@ dht_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (!xattr || (op_ret == -1))
                 goto out;
 
-        if (dict_get (xattr, conf->xattr_name)) {
-                dict_del (xattr, conf->xattr_name);
+        if (dict_get (xattr, "trusted.glusterfs.dht")) {
+                dict_del (xattr, "trusted.glusterfs.dht");
         }
         local->op_ret = 0;
 
@@ -2016,97 +2075,31 @@ dht_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 local->xattr = dict_copy_with_ref (xattr, NULL);
         } else {
                 /* first aggregate everything into xattr and then copy into
-                 * local->xattr. This is required as we want to have
-                 * 'local->xattr' as the proper final dictionary passed above
-                 * distribute xlator.
+                 * local->xattr.
                  */
                 dht_aggregate_xattr (xattr, local->xattr);
                 local->xattr = dict_copy (xattr, local->xattr);
         }
 out:
         if (is_last_call (this_call_cnt)) {
-                DHT_STACK_UNWIND (getxattr, frame, local->op_ret, op_errno,
-                                  local->xattr, NULL);
+                DHT_STACK_UNWIND (getxattr, frame, local->op_ret, op_errno, local->xattr);
         }
         return 0;
 }
 
 int32_t
 dht_getxattr_unwind (call_frame_t *frame,
-                     int op_ret, int op_errno, dict_t *dict, dict_t *xdata)
+                     int op_ret, int op_errno, dict_t *dict)
 {
-        DHT_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict, xdata);
+        DHT_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict);
         return 0;
 }
 
 
 int
-dht_getxattr_get_real_filename_cbk (call_frame_t *frame, void *cookie,
-				    xlator_t *this, int op_ret, int op_errno,
-				    dict_t *xattr, dict_t *xdata)
-{
-        int             this_call_cnt = 0;
-        dht_local_t     *local = NULL;
-
-
-        local = frame->local;
-
-	if (op_ret != -1) {
-		if (local->xattr)
-			dict_unref (local->xattr);
-		local->xattr = dict_ref (xattr);
-
-		if (local->xattr_req)
-			dict_unref (local->xattr_req);
-		local->xattr_req = dict_ref (xdata);
-	}
-
-	this_call_cnt = dht_frame_return (frame);
-	if (is_last_call (this_call_cnt)) {
-		DHT_STACK_UNWIND (getxattr, frame, local->op_ret, op_errno,
-				  local->xattr, local->xattr_req);
-	}
-
-	return 0;
-}
-
-
-int
-dht_getxattr_get_real_filename (call_frame_t *frame, xlator_t *this,
-				loc_t *loc, const char *key, dict_t *xdata)
-{
-	dht_local_t     *local = NULL;
-	int              i = 0;
-	dht_layout_t    *layout = NULL;
-	int              cnt = 0;
-	xlator_t        *subvol = NULL;
-
-
-	local = frame->local;
-	layout = local->layout;
-
-	cnt = local->call_cnt = layout->cnt;
-
-	local->op_ret = -1;
-	local->op_errno = ENODATA;
-
-	for (i = 0; i < cnt; i++) {
-		subvol = layout->list[i].xlator;
-		STACK_WIND (frame, dht_getxattr_get_real_filename_cbk,
-			    subvol, subvol->fops->getxattr,
-			    loc, key, xdata);
-	}
-
-	return 0;
-}
-
-
-int
 dht_getxattr (call_frame_t *frame, xlator_t *this,
-              loc_t *loc, const char *key, dict_t *xdata)
-#define DHT_IS_DIR(layout)  (layout->cnt > 1)
+              loc_t *loc, const char *key)
 {
-
         xlator_t     *subvol        = NULL;
         xlator_t     *hashed_subvol = NULL;
         xlator_t     *cached_subvol = NULL;
@@ -2115,6 +2108,8 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
         dht_layout_t *layout        = NULL;
         xlator_t     **sub_volumes  = NULL;
         int           op_errno      = -1;
+        int           ret           = 0;
+        int           flag          = 0;
         int           i             = 0;
         int           cnt           = 0;
 
@@ -2122,94 +2117,64 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
         VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
         VALIDATE_OR_GOTO (this->private, err);
 
         conf   = this->private;
+        layout = dht_layout_get (this, loc->inode);
+        if (!layout) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "layout is NULL");
+                op_errno = ENOENT;
+                goto err;
+        }
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_GETXATTR);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
 
                 goto err;
         }
 
-        layout = local->layout;
-        if (!layout) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "layout is NULL");
-                op_errno = ENOENT;
-                goto err;
-        }
+        if (key && (strcmp (key, GF_XATTR_PATHINFO_KEY) == 0)) {
+                hashed_subvol = dht_subvol_get_hashed (this, loc);
+                cached_subvol = dht_subvol_get_cached (this, loc->inode);
 
-        if (key) {
-                local->key = gf_strdup (key);
-                if (!local->key) {
+                local = dht_local_init (frame);
+                if (!local) {
                         op_errno = ENOMEM;
+
                         goto err;
                 }
-        }
 
-	if (key &&
-	    (strncmp (key, GF_XATTR_GET_REAL_FILENAME_KEY,
-		      strlen (GF_XATTR_GET_REAL_FILENAME_KEY)) == 0)
-	    && DHT_IS_DIR(layout)) {
-		dht_getxattr_get_real_filename (frame, this, loc, key, xdata);
-		return 0;
-	}
-
-        /* for file use cached subvolume (obviously!): see if {}
-         * below
-         * for directory:
-         *  wind to all subvolumes and exclude subvolumes which
-         *  return ENOTCONN (in callback)
-         *
-         * NOTE: Don't trust inode here, as that may not be valid
-         *       (until inode_link() happens)
-         */
-        if (key && DHT_IS_DIR(layout) &&
-            ((strcmp (key, GF_XATTR_PATHINFO_KEY) == 0)
-             || (strcmp (key, GF_XATTR_NODE_UUID_KEY) == 0))) {
-                (void) strncpy (local->xsel, key, 256);
-                cnt = local->call_cnt = layout->cnt;
-                for (i = 0; i < cnt; i++) {
-                        subvol = layout->list[i].xlator;
-                        STACK_WIND (frame, dht_vgetxattr_dir_cbk,
-                                    subvol, subvol->fops->getxattr,
-                                    loc, key, NULL);
+                ret = loc_dup (loc, &local->loc);
+                if (ret == -1) {
+                        op_errno = ENOMEM;
+
+                        goto err;
                 }
-                return 0;
-        }
+                local->key = gf_strdup (key);
+                if (!local->key) {
+                        op_errno = ENOMEM;
 
-        /* node-uuid or pathinfo for files */
-        if (key && ((strcmp (key, GF_XATTR_NODE_UUID_KEY) == 0)
-                    || (strcmp (key, GF_XATTR_PATHINFO_KEY) == 0))) {
-                cached_subvol = local->cached_subvol;
-                (void) strncpy (local->xsel, key, 256);
+                        goto err;
+                }
+                local->layout = layout;
 
                 local->call_cnt = 1;
-                STACK_WIND (frame, dht_vgetxattr_cbk, cached_subvol,
-                            cached_subvol->fops->getxattr, loc, key, NULL);
+                if (hashed_subvol != cached_subvol) {
+                        local->call_cnt = 2;
+                        local->hashed_subvol = hashed_subvol;
+                }
+
+                STACK_WIND (frame, dht_pathinfo_getxattr_cbk, cached_subvol,
+                            cached_subvol->fops->getxattr, loc, key);
 
                 return 0;
         }
-
         if (key && (strcmp (key, GF_XATTR_LINKINFO_KEY) == 0)) {
                 hashed_subvol = dht_subvol_get_hashed (this, loc);
-                if (!hashed_subvol) {
-                        gf_log (this->name, GF_LOG_ERROR, "Failed to get"
-                                "hashed subvol for %s", loc->path);
-                        op_errno = EINVAL;
-                        goto err;
-                }
-
                 cached_subvol = dht_subvol_get_cached (this, loc->inode);
-                if (!cached_subvol) {
-                        gf_log (this->name, GF_LOG_ERROR, "Failed to get"
-                                "cached subvol for %s", loc->path);
-                        op_errno = EINVAL;
-                        goto err;
-                }
-
                 if (hashed_subvol == cached_subvol) {
                         op_errno = ENODATA;
                         goto err;
@@ -2217,7 +2182,41 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
                 if (hashed_subvol) {
                         STACK_WIND (frame, dht_linkinfo_getxattr_cbk, hashed_subvol,
                                     hashed_subvol->fops->getxattr, loc,
-                                    GF_XATTR_PATHINFO_KEY, NULL);
+                                    GF_XATTR_PATHINFO_KEY);
+                        return 0;
+                }
+                op_errno = ENODATA;
+                goto err;
+        }
+        if (key && (strcmp (key, GF_XATTR_FIX_LAYOUT_KEY) == 0)) {
+                for (i = 0; i < layout->cnt; i++) {
+                        if (layout->list[i].start == layout->list[i].stop) {
+                                flag = 1;
+                                break;
+                        }
+                }
+                if ((layout->cnt < conf->subvolume_cnt) || flag) {
+                        gf_log (this->name, GF_LOG_INFO,
+                                "expanding layout of %s from %d to %d",
+                                loc->path, layout->cnt, conf->subvolume_cnt);
+                        local = dht_local_init (frame);
+                        if (!local) {
+                                op_errno = ENOMEM;
+
+                                goto err;
+                        }
+
+                        ret = loc_dup (loc, &local->loc);
+                        if (ret == -1) {
+                                op_errno = ENOMEM;
+
+                                goto err;
+                        }
+                        local->layout = layout;
+                        //layout = dht_layout_new (this, conf->subvolume_cnt);
+
+                        dht_selfheal_new_directory (frame, dht_fix_layout_cbk,
+                                                    layout);
                         return 0;
                 }
                 op_errno = ENODATA;
@@ -2225,13 +2224,13 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
         }
 
         if (key && (!strcmp (GF_XATTR_MARKER_KEY, key))
-            && (GF_CLIENT_PID_GSYNCD == frame->root->pid)) {
-                if (DHT_IS_DIR(layout)) {
+            && (-1 == frame->root->pid)) {
+
+                if (loc->inode-> ia_type == IA_IFDIR) {
                         cnt = layout->cnt;
                 } else {
                         cnt = 1;
                 }
-
                 sub_volumes = alloca ( cnt * sizeof (xlator_t *));
                 for (i = 0; i < cnt; i++)
                         *(sub_volumes + i) = layout->list[i].xlator;
@@ -2239,8 +2238,7 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
                 if (cluster_getmarkerattr (frame, this, loc, key,
                                            local, dht_getxattr_unwind,
                                            sub_volumes, cnt,
-                                           MARKER_UUID_TYPE, marker_uuid_default_gauge,
-                                           conf->vol_uuid)) {
+                                           MARKER_UUID_TYPE, conf->vol_uuid)) {
                         op_errno = EINVAL;
                         goto err;
                 }
@@ -2250,8 +2248,8 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
 
         if (key && *conf->vol_uuid) {
                 if ((match_uuid_local (key, conf->vol_uuid) == 0) &&
-                    (GF_CLIENT_PID_GSYNCD == frame->root->pid)) {
-                        if (DHT_IS_DIR(layout)) {
+                    (-1 == frame->root->pid)) {
+                        if (loc->inode-> ia_type == IA_IFDIR) {
                                 cnt = layout->cnt;
                         } else {
                                 cnt = 1;
@@ -2264,7 +2262,6 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
                                                    local, dht_getxattr_unwind,
                                                    sub_volumes, cnt,
                                                    MARKER_XTIME_TYPE,
-                                                   marker_xtime_default_gauge,
                                                    conf->vol_uuid)) {
                                 op_errno = EINVAL;
                                 goto err;
@@ -2274,71 +2271,24 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
                 }
         }
 
-        if (DHT_IS_DIR(layout)) {
-                cnt = local->call_cnt = layout->cnt;
-        } else {
-                cnt = local->call_cnt  = 1;
-        }
-
-        for (i = 0; i < cnt; i++) {
-                subvol = layout->list[i].xlator;
-                STACK_WIND (frame, dht_getxattr_cbk,
-                            subvol, subvol->fops->getxattr,
-                            loc, key, NULL);
-        }
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (getxattr, frame, -1, op_errno, NULL, NULL);
-
-        return 0;
-}
-#undef DHT_IS_DIR
-
-int
-dht_fgetxattr (call_frame_t *frame, xlator_t *this,
-               fd_t *fd, const char *key, dict_t *xdata)
-{
-        xlator_t     *subvol        = NULL;
-        dht_local_t  *local         = NULL;
-        dht_layout_t *layout        = NULL;
-        int           op_errno      = -1;
-        int           i             = 0;
-        int           cnt           = 0;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-        VALIDATE_OR_GOTO (fd->inode, err);
-        VALIDATE_OR_GOTO (this->private, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FGETXATTR);
-        if (!local) {
+        ret = loc_dup (loc, &local->loc);
+        if (ret == -1) {
                 op_errno = ENOMEM;
 
                 goto err;
         }
 
-        layout = local->layout;
-        if (!layout) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "layout is NULL");
-                op_errno = ENOENT;
-                goto err;
-        }
-
         if (key) {
                 local->key = gf_strdup (key);
                 if (!local->key) {
                         op_errno = ENOMEM;
+
                         goto err;
                 }
         }
+        local->layout = layout;
 
-        if ((fd->inode->ia_type == IA_IFDIR)
-            && (strncmp (key, GF_XATTR_LOCKINFO_KEY,
-                         strlen (GF_XATTR_LOCKINFO_KEY) != 0))) {
+        if (loc->inode-> ia_type == IA_IFDIR) {
                 cnt = local->call_cnt = layout->cnt;
         } else {
                 cnt = local->call_cnt  = 1;
@@ -2347,45 +2297,32 @@ dht_fgetxattr (call_frame_t *frame, xlator_t *this,
         for (i = 0; i < cnt; i++) {
                 subvol = layout->list[i].xlator;
                 STACK_WIND (frame, dht_getxattr_cbk,
-                            subvol, subvol->fops->fgetxattr,
-                            fd, key, NULL);
+                            subvol, subvol->fops->getxattr,
+                            loc, key);
         }
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fgetxattr, frame, -1, op_errno, NULL, NULL);
+        DHT_STACK_UNWIND (getxattr, frame, -1, op_errno, NULL);
 
         return 0;
 }
 
 int
 dht_fsetxattr (call_frame_t *frame, xlator_t *this,
-               fd_t *fd, dict_t *xattr, int flags, dict_t *xdata)
+               fd_t *fd, dict_t *xattr, int flags)
 {
         xlator_t     *subvol   = NULL;
         dht_local_t  *local    = NULL;
         int           op_errno = EINVAL;
-        dht_conf_t   *conf     = NULL;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (fd, err);
         VALIDATE_OR_GOTO (fd->inode, err);
-        VALIDATE_OR_GOTO (this->private, err);
-
-        conf = this->private;
 
-        GF_IF_INTERNAL_XATTR_GOTO (conf->wild_xattr_name, xattr,
-                                   op_errno, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FSETXATTR);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
+        subvol = dht_subvol_get_cached (this, fd->inode);
         if (!subvol) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "no cached subvolume for fd=%p", fd);
@@ -2393,75 +2330,31 @@ dht_fsetxattr (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
+
+        local->inode = inode_ref (fd->inode);
         local->call_cnt = 1;
 
         STACK_WIND (frame, dht_err_cbk, subvol, subvol->fops->fsetxattr,
-                    fd, xattr, flags, NULL);
+                    fd, xattr, flags);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fsetxattr, frame, -1, op_errno, NULL);
-
-        return 0;
-}
-
-
-static int
-dht_common_setxattr_cbk (call_frame_t *frame, void *cookie,
-                         xlator_t *this, int32_t op_ret, int32_t op_errno,
-                         dict_t *xdata)
-{
-        DHT_STACK_UNWIND (setxattr, frame, op_ret, op_errno, xdata);
+        DHT_STACK_UNWIND (fsetxattr, frame, -1, op_errno);
 
         return 0;
 }
 
-int
-dht_checking_pathinfo_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                           int op_ret, int op_errno, dict_t *xattr,
-                           dict_t *xdata)
-{
-        int           i     = -1;
-        int           ret   = -1;
-        char         *value = NULL;
-        dht_local_t  *local = NULL;
-        dht_conf_t   *conf  = NULL;
-        call_frame_t *prev  = NULL;
-        int           this_call_cnt = 0;
-
-        local = frame->local;
-        prev = cookie;
-        conf = this->private;
-
-        if (op_ret == -1)
-                goto out;
-
-
-        ret = dict_get_str (xattr, GF_XATTR_PATHINFO_KEY, &value);
-        if (ret)
-                goto out;
-
-        if (!strcmp (value, local->key)) {
-                for (i = 0; i < conf->subvolume_cnt; i++) {
-                        if (conf->subvolumes[i] == prev->this)
-                                conf->decommissioned_bricks[i] = prev->this;
-                }
-        }
-
-out:
-        this_call_cnt = dht_frame_return (frame);
-        if (is_last_call (this_call_cnt)) {
-                DHT_STACK_UNWIND (setxattr, frame, local->op_ret, ENOTSUP, NULL);
-        }
-        return 0;
-
-}
 
 int
 dht_setxattr (call_frame_t *frame, xlator_t *this,
-              loc_t *loc, dict_t *xattr, int flags, dict_t *xdata)
+              loc_t *loc, dict_t *xattr, int flags)
 {
         xlator_t     *subvol   = NULL;
         dht_local_t  *local    = NULL;
@@ -2469,30 +2362,16 @@ dht_setxattr (call_frame_t *frame, xlator_t *this,
         dht_layout_t *layout   = NULL;
         int           i        = 0;
         int           op_errno = EINVAL;
-        int           ret      = -1;
-        data_t       *tmp      = NULL;
-        uint32_t      dir_spread = 0;
-        char          value[4096] = {0,};
-        gf_dht_migrate_data_type_t forced_rebalance = GF_DHT_MIGRATE_DATA;
         int           call_cnt = 0;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
         VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
 
         conf   = this->private;
-
-        GF_IF_INTERNAL_XATTR_GOTO (conf->wild_xattr_name, xattr,
-                                   op_errno, err);
-
-        local = dht_local_init (frame, loc, NULL, GF_FOP_SETXATTR);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
+        subvol = dht_subvol_get_cached (this, loc->inode);
         if (!subvol) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "no cached subvolume for path=%s", loc->path);
@@ -2500,7 +2379,13 @@ dht_setxattr (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
-        layout = local->layout;
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
+
+        local->layout = layout = dht_layout_get (this, loc->inode);
         if (!layout) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "no layout for path=%s", loc->path);
@@ -2510,138 +2395,126 @@ dht_setxattr (call_frame_t *frame, xlator_t *this,
 
         local->call_cnt = call_cnt = layout->cnt;
 
-        tmp = dict_get (xattr, "distribute.migrate-data");
-        if (tmp) {
-                if (IA_ISDIR (loc->inode->ia_type)) {
-                        op_errno = ENOTSUP;
-                        goto err;
-                }
+        for (i = 0; i < call_cnt; i++) {
+                STACK_WIND (frame, dht_err_cbk,
+                            layout->list[i].xlator,
+                            layout->list[i].xlator->fops->setxattr,
+                            loc, xattr, flags);
+        }
 
-                /* TODO: need to interpret the 'value' for more meaning
-                   (ie, 'target' subvolume given there, etc) */
-                memcpy (value, tmp->data, tmp->len);
-                if (strcmp (value, "force") == 0)
-                       forced_rebalance =
-                                GF_DHT_MIGRATE_DATA_EVEN_IF_LINK_EXISTS;
+        return 0;
 
-                if (conf->decommission_in_progress)
-                        forced_rebalance = GF_DHT_MIGRATE_HARDLINK;
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (setxattr, frame, -1, op_errno);
 
-                local->rebalance.target_node = dht_subvol_get_hashed (this, loc);
-                if (!local->rebalance.target_node) {
-                        gf_log (this->name, GF_LOG_ERROR, "Failed to get "
-                                "hashed subvol for %s", loc->path);
-                        op_errno = EINVAL;
-                        goto err;
-                }
+        return 0;
+}
 
-                local->rebalance.from_subvol = local->cached_subvol;
 
-                if (local->rebalance.target_node == local->rebalance.from_subvol) {
-                        op_errno = EEXIST;
-                        goto err;
-                }
-                if (local->rebalance.target_node) {
-                        local->flags = forced_rebalance;
+int
+dht_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                     int op_ret, int op_errno)
+{
+        dht_local_t  *local = NULL;
+        int           this_call_cnt = 0;
+        call_frame_t *prev = NULL;
 
-                        ret = dht_start_rebalance_task (this, frame);
-                        if (!ret)
-                                return 0;
+        local = frame->local;
+        prev = cookie;
 
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "%s: failed to create a new synctask",
-                                loc->path);
+        LOCK (&frame->lock);
+        {
+                if (op_ret == -1) {
+                        local->op_errno = op_errno;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "subvolume %s returned -1 (%s)",
+                                prev->this->name, strerror (op_errno));
+                        goto unlock;
                 }
-                op_errno = EINVAL;
-                goto err;
 
+                local->op_ret = 0;
         }
+unlock:
+        UNLOCK (&frame->lock);
 
-        tmp = dict_get (xattr, "decommission-brick");
-        if (tmp) {
-                /* This operation should happen only on '/' */
-                if (!__is_root_gfid (loc->inode->gfid)) {
-                        op_errno = ENOTSUP;
-                        goto err;
-                }
+        this_call_cnt = dht_frame_return (frame);
+        if (is_last_call (this_call_cnt)) {
+                DHT_STACK_UNWIND (removexattr, frame, local->op_ret, local->op_errno);
+        }
 
-                memcpy (value, tmp->data, ((tmp->len < 4095) ? tmp->len : 4095));
-                local->key = gf_strdup (value);
-                local->call_cnt = conf->subvolume_cnt;
+        return 0;
+}
 
-                for (i = 0 ; i < conf->subvolume_cnt; i++) {
-                        /* Get the pathinfo, and then compare */
-                        STACK_WIND (frame, dht_checking_pathinfo_cbk,
-                                    conf->subvolumes[i],
-                                    conf->subvolumes[i]->fops->getxattr,
-                                    loc, GF_XATTR_PATHINFO_KEY, NULL);
-                }
-                return 0;
-        }
 
-        tmp = dict_get (xattr, GF_XATTR_FIX_LAYOUT_KEY);
-        if (tmp) {
-                gf_log (this->name, GF_LOG_INFO,
-                        "fixing the layout of %s", loc->path);
+int
+dht_removexattr (call_frame_t *frame, xlator_t *this,
+                 loc_t *loc, const char *key)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+        dht_layout_t *layout = NULL;
+        int           call_cnt = 0;
 
-                ret = dht_fix_directory_layout (frame, dht_common_setxattr_cbk,
-                                                layout);
-                if (ret) {
-                        op_errno = ENOTCONN;
-                        goto err;
-                }
-                return ret;
+        int i;
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (loc, err);
+        VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
+
+        subvol = dht_subvol_get_cached (this, loc->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
         }
 
-        tmp = dict_get (xattr, "distribute.directory-spread-count");
-        if (tmp) {
-                /* Setxattr value is packed as 'binary', not string */
-                memcpy (value, tmp->data, ((tmp->len < 4095)?tmp->len:4095));
-                ret = gf_string2uint32 (value, &dir_spread);
-                if (!ret && ((dir_spread <= conf->subvolume_cnt) &&
-                             (dir_spread > 0))) {
-                        layout->spread_cnt = dir_spread;
-
-                        ret = dht_fix_directory_layout (frame,
-                                                        dht_common_setxattr_cbk,
-                                                        layout);
-                        if (ret) {
-                                op_errno = ENOTCONN;
-                                goto err;
-                        }
-                        return ret;
-                }
-                gf_log (this->name, GF_LOG_ERROR,
-                        "wrong 'directory-spread-count' value (%s)", value);
-                op_errno = ENOTSUP;
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
+
+        local->layout = layout = dht_layout_get (this, loc->inode);
+        if (!local->layout) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no layout for path=%s", loc->path);
+                op_errno = EINVAL;
                 goto err;
         }
 
+        local->call_cnt = call_cnt = layout->cnt;
+
         for (i = 0; i < call_cnt; i++) {
-                STACK_WIND (frame, dht_err_cbk,
+                STACK_WIND (frame, dht_removexattr_cbk,
                             layout->list[i].xlator,
-                            layout->list[i].xlator->fops->setxattr,
-                            loc, xattr, flags, xdata);
+                            layout->list[i].xlator->fops->removexattr,
+                            loc, key);
         }
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (setxattr, frame, -1, op_errno, NULL);
+        DHT_STACK_UNWIND (removexattr, frame, -1, op_errno);
 
         return 0;
 }
 
 
 int
-dht_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int op_ret, int op_errno, dict_t *xdata)
+dht_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+            int op_ret, int op_errno, fd_t *fd)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = 0;
         call_frame_t *prev = NULL;
 
+
         local = frame->local;
         prev = cookie;
 
@@ -2661,175 +2534,331 @@ unlock:
         UNLOCK (&frame->lock);
 
         this_call_cnt = dht_frame_return (frame);
-        if (is_last_call (this_call_cnt)) {
-                DHT_STACK_UNWIND (removexattr, frame, local->op_ret,
-                                  local->op_errno, NULL);
-        }
+        if (is_last_call (this_call_cnt))
+                DHT_STACK_UNWIND (open, frame, local->op_ret, local->op_errno,
+                                  local->fd);
 
         return 0;
 }
 
 
 int
-dht_removexattr (call_frame_t *frame, xlator_t *this,
-                 loc_t *loc, const char *key, dict_t *xdata)
+dht_open (call_frame_t *frame, xlator_t *this,
+          loc_t *loc, int flags, fd_t *fd, int wbflags)
 {
         xlator_t     *subvol = NULL;
+        int           ret = -1;
         int           op_errno = -1;
         dht_local_t  *local = NULL;
-        dht_layout_t *layout = NULL;
-        int           call_cnt = 0;
-        dht_conf_t   *conf = NULL;
 
-        int i;
 
+        VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (this->private, err);
+        VALIDATE_OR_GOTO (fd, err);
 
-        conf = this->private;
+        subvol = dht_subvol_get_cached (this, fd->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for fd=%p", fd);
+                op_errno = EINVAL;
+                goto err;
+        }
 
-        GF_IF_NATIVE_XATTR_GOTO (conf->wild_xattr_name, key, op_errno, err);
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
 
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (loc, err);
-        VALIDATE_OR_GOTO (loc->inode, err);
+                goto err;
+        }
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_REMOVEXATTR);
-        if (!local) {
+        local->fd = fd_ref (fd);
+        ret = loc_dup (loc, &local->loc);
+        if (ret == -1) {
                 op_errno = ENOMEM;
+
                 goto err;
         }
 
-        subvol = local->cached_subvol;
+        local->call_cnt = 1;
+
+        STACK_WIND (frame, dht_fd_cbk,
+                    subvol, subvol->fops->open,
+                    loc, flags, fd, wbflags);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (open, frame, -1, op_errno, NULL);
+
+        return 0;
+}
+
+
+int
+dht_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+               int op_ret, int op_errno,
+               struct iovec *vector, int count, struct iatt *stbuf,
+               struct iobref *iobref)
+{
+        dht_local_t     *local = frame->local;
+
+        if (!local) {
+                op_ret = -1;
+                op_errno = EINVAL;
+                goto out;
+        }
+
+        if (op_ret != -1)
+                stbuf->ia_ino = local->ia_ino;
+out:
+        DHT_STACK_UNWIND (readv, frame, op_ret, op_errno, vector, count, stbuf,
+                          iobref);
+
+        return 0;
+}
+
+
+int
+dht_readv (call_frame_t *frame, xlator_t *this,
+           fd_t *fd, size_t size, off_t off)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        subvol = dht_subvol_get_cached (this, fd->inode);
         if (!subvol) {
                 gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for path=%s", loc->path);
+                        "no cached subvolume for fd=%p", fd);
                 op_errno = EINVAL;
                 goto err;
         }
 
-        layout = local->layout;
-        if (!local->layout) {
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                goto err;
+        }
+
+        local->ia_ino = fd->inode->ino;
+        STACK_WIND (frame, dht_readv_cbk,
+                    subvol, subvol->fops->readv,
+                    fd, size, off);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (readv, frame, -1, op_errno, NULL, 0, NULL, NULL);
+
+        return 0;
+}
+
+
+int
+dht_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                int op_ret, int op_errno, struct iatt *prebuf,
+                struct iatt *postbuf)
+{
+        dht_local_t *local = NULL;
+
+        if (op_ret == -1) {
+                goto out;
+        }
+
+        local = frame->local;
+        if (!local) {
+                op_ret = -1;
+                op_errno = EINVAL;
+                goto out;
+        }
+
+        prebuf->ia_ino = local->ia_ino;
+        postbuf->ia_ino = local->ia_ino;
+
+out:
+        DHT_STACK_UNWIND (writev, frame, op_ret, op_errno, prebuf, postbuf);
+
+        return 0;
+}
+
+
+int
+dht_writev (call_frame_t *frame, xlator_t *this,
+            fd_t *fd, struct iovec *vector, int count, off_t off,
+            struct iobref *iobref)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        subvol = dht_subvol_get_cached (this, fd->inode);
+        if (!subvol) {
                 gf_log (this->name, GF_LOG_DEBUG,
-                        "no layout for path=%s", loc->path);
+                        "no cached subvolume for fd=%p", fd);
                 op_errno = EINVAL;
                 goto err;
         }
 
-        local->call_cnt = call_cnt = layout->cnt;
-        local->key = gf_strdup (key);
+        local = dht_local_init (frame);
+        if (!local) {
 
-        for (i = 0; i < call_cnt; i++) {
-                STACK_WIND (frame, dht_removexattr_cbk,
-                            layout->list[i].xlator,
-                            layout->list[i].xlator->fops->removexattr,
-                            loc, key, NULL);
+                op_errno = ENOMEM;
+                goto err;
         }
 
+        local->ia_ino = fd->inode->ino;
+
+        STACK_WIND (frame, dht_writev_cbk,
+                    subvol, subvol->fops->writev,
+                    fd, vector, count, off, iobref);
+
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (removexattr, frame, -1, op_errno, NULL);
+        DHT_STACK_UNWIND (writev, frame, -1, op_errno, NULL, NULL);
 
         return 0;
 }
 
+
 int
-dht_fremovexattr (call_frame_t *frame, xlator_t *this,
-                  fd_t *fd, const char *key, dict_t *xdata)
+dht_flush (call_frame_t *frame, xlator_t *this, fd_t *fd)
 {
         xlator_t     *subvol = NULL;
         int           op_errno = -1;
         dht_local_t  *local = NULL;
-        dht_layout_t *layout = NULL;
-        int           call_cnt = 0;
-        dht_conf_t   *conf = 0;
 
-        int i;
 
+        VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (this->private, err);
-
-        conf = this->private;
-
-        GF_IF_NATIVE_XATTR_GOTO (conf->wild_xattr_name, key, op_errno, err);
+        VALIDATE_OR_GOTO (fd, err);
 
-        VALIDATE_OR_GOTO (frame, err);
+        subvol = dht_subvol_get_cached (this, fd->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for fd=%p", fd);
+                op_errno = EINVAL;
+                goto err;
+        }
 
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FREMOVEXATTR);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
+
                 goto err;
         }
 
-        subvol = local->cached_subvol;
+        local->fd = fd_ref (fd);
+        local->call_cnt = 1;
+
+        STACK_WIND (frame, dht_err_cbk,
+                    subvol, subvol->fops->flush, fd);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (flush, frame, -1, op_errno);
+
+        return 0;
+}
+
+
+int
+dht_fsync (call_frame_t *frame, xlator_t *this,
+           fd_t *fd, int datasync)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        subvol = dht_subvol_get_cached (this, fd->inode);
         if (!subvol) {
                 gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for inode=%s",
-                        uuid_utoa (fd->inode->gfid));
+                        "no cached subvolume for fd=%p", fd);
                 op_errno = EINVAL;
                 goto err;
         }
 
-        layout = local->layout;
-        if (!local->layout) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no layout for inode=%s", uuid_utoa (fd->inode->gfid));
-                op_errno = EINVAL;
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+
                 goto err;
         }
+        local->call_cnt = 1;
 
-        local->call_cnt = call_cnt = layout->cnt;
-        local->key = gf_strdup (key);
+        local->ia_ino = fd->inode->ino;
 
-        for (i = 0; i < call_cnt; i++) {
-                STACK_WIND (frame, dht_removexattr_cbk,
-                            layout->list[i].xlator,
-                            layout->list[i].xlator->fops->fremovexattr,
-                            fd, key, NULL);
-        }
+        STACK_WIND (frame, dht_fsync_cbk,
+                    subvol, subvol->fops->fsync,
+                    fd, datasync);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fremovexattr, frame, -1, op_errno, NULL);
+        DHT_STACK_UNWIND (fsync, frame, -1, op_errno, NULL, NULL);
 
         return 0;
 }
 
 
 int
-dht_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-            int op_ret, int op_errno, fd_t *fd, dict_t *xdata)
+dht_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+            int op_ret, int op_errno, struct gf_flock *flock)
 {
-        dht_local_t  *local = NULL;
-        int           this_call_cnt = 0;
-        call_frame_t *prev = NULL;
+        DHT_STACK_UNWIND (lk, frame, op_ret, op_errno, flock);
 
-        local = frame->local;
-        prev = cookie;
+        return 0;
+}
 
-        LOCK (&frame->lock);
-        {
-                if (op_ret == -1) {
-                        local->op_errno = op_errno;
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "subvolume %s returned -1 (%s)",
-                                prev->this->name, strerror (op_errno));
-                        goto unlock;
-                }
 
-                local->op_ret = 0;
+int
+dht_lk (call_frame_t *frame, xlator_t *this,
+        fd_t *fd, int cmd, struct gf_flock *flock)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        subvol = dht_subvol_get_cached (this, fd->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for fd=%p", fd);
+                op_errno = EINVAL;
+                goto err;
         }
-unlock:
-        UNLOCK (&frame->lock);
 
-        this_call_cnt = dht_frame_return (frame);
-        if (is_last_call (this_call_cnt))
-                DHT_STACK_UNWIND (open, frame, local->op_ret, local->op_errno,
-                                  local->fd, NULL);
+        STACK_WIND (frame, dht_lk_cbk,
+                    subvol, subvol->fops->lk,
+                    fd, cmd, flock);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (lk, frame, -1, op_errno, NULL);
 
         return 0;
 }
@@ -2859,7 +2888,7 @@ dht_normalize_stats (struct statvfs *buf, unsigned long bsize,
 
 int
 dht_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                int op_ret, int op_errno, struct statvfs *statvfs, dict_t *xdata)
+                int op_ret, int op_errno, struct statvfs *statvfs)
 {
         dht_local_t *local         = NULL;
         int          this_call_cnt = 0;
@@ -2905,79 +2934,59 @@ unlock:
         this_call_cnt = dht_frame_return (frame);
         if (is_last_call (this_call_cnt))
                 DHT_STACK_UNWIND (statfs, frame, local->op_ret, local->op_errno,
-                                  &local->statvfs, xdata);
+                                  &local->statvfs);
 
         return 0;
 }
 
 
 int
-dht_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
+dht_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
-        xlator_t     *subvol = NULL;
         dht_local_t  *local  = NULL;
         dht_conf_t   *conf = NULL;
         int           op_errno = -1;
         int           i = -1;
 
+
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
         VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
         VALIDATE_OR_GOTO (this->private, err);
 
         conf = this->private;
 
-        local = dht_local_init (frame, NULL, NULL, GF_FOP_STATFS);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        if (IA_ISDIR (loc->inode->ia_type)) {
-                local->call_cnt = conf->subvolume_cnt;
-
-                for (i = 0; i < conf->subvolume_cnt; i++) {
-                        STACK_WIND (frame, dht_statfs_cbk,
-                                    conf->subvolumes[i],
-                                    conf->subvolumes[i]->fops->statfs, loc,
-                                    xdata);
-                }
-                return 0;
-        }
+        local = dht_local_init (frame);
+        local->call_cnt = conf->subvolume_cnt;
 
-        subvol = dht_subvol_get_cached (this, loc->inode);
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
+        for (i = 0; i < conf->subvolume_cnt; i++) {
+                STACK_WIND (frame, dht_statfs_cbk,
+                            conf->subvolumes[i],
+                            conf->subvolumes[i]->fops->statfs, loc);
         }
 
-        local->call_cnt = 1;
-
-        STACK_WIND (frame, dht_statfs_cbk,
-                    subvol, subvol->fops->statfs, loc, xdata);
-
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (statfs, frame, -1, op_errno, NULL, NULL);
+        DHT_STACK_UNWIND (statfs, frame, -1, op_errno, NULL);
 
         return 0;
 }
 
 
 int
-dht_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd,
-             dict_t *xdata)
+dht_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd)
 {
         dht_local_t  *local  = NULL;
         dht_conf_t   *conf = NULL;
+        int           ret = -1;
         int           op_errno = -1;
         int           i = -1;
 
+
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (fd, err);
@@ -2985,27 +2994,35 @@ dht_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd,
 
         conf = this->private;
 
-        local = dht_local_init (frame, loc, fd, GF_FOP_OPENDIR);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
 
                 goto err;
         }
 
+        local->fd = fd_ref (fd);
+        ret = loc_dup (loc, &local->loc);
+        if (ret == -1) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
+
         local->call_cnt = conf->subvolume_cnt;
 
         for (i = 0; i < conf->subvolume_cnt; i++) {
                 STACK_WIND (frame, dht_fd_cbk,
                             conf->subvolumes[i],
                             conf->subvolumes[i]->fops->opendir,
-                            loc, fd, xdata);
+                            loc, fd);
         }
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (opendir, frame, -1, op_errno, NULL, NULL);
+        DHT_STACK_UNWIND (opendir, frame, -1, op_errno, NULL);
 
         return 0;
 }
@@ -3013,7 +3030,7 @@ err:
 
 int
 dht_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
-                  int op_errno, gf_dirent_t *orig_entries, dict_t *xdata)
+                  int op_errno, gf_dirent_t *orig_entries)
 {
         dht_local_t  *local = NULL;
         gf_dirent_t   entries;
@@ -3026,7 +3043,6 @@ dht_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
         dht_layout_t *layout = 0;
         dht_conf_t   *conf   = NULL;
         xlator_t     *subvol = 0;
-        int           ret    = 0;
 
         INIT_LIST_HEAD (&entries.list);
         prev = cookie;
@@ -3043,13 +3059,10 @@ dht_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
 
         list_for_each_entry (orig_entry, (&orig_entries->list), list) {
                 next_offset = orig_entry->d_off;
-                if (check_is_dir (NULL, (&orig_entry->d_stat), NULL) &&
-                    (prev->this != local->first_up_subvol)) {
-                        continue;
-                }
-                if (check_is_linkfile (NULL, (&orig_entry->d_stat),
-                                       orig_entry->dict,
-                                       conf->link_xattr_name)) {
+
+                if (check_is_linkfile (NULL, (&orig_entry->d_stat), NULL)
+                    || (check_is_dir (NULL, (&orig_entry->d_stat), NULL)
+                        && (prev->this != dht_first_up_subvol (this)))) {
                         continue;
                 }
 
@@ -3065,37 +3078,21 @@ dht_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
                                                     orig_entry->d_name);
                         if (!subvol || (subvol != prev->this)) {
                                 /* TODO: Count the number of entries which need
-                                   linkfile to prove its existence in fs */
+                                   linkfile to prove its existance in fs */
                                 layout->search_unhashed++;
                         }
                 }
+                entry->d_stat = orig_entry->d_stat;
 
+                dht_itransform (this, prev->this, orig_entry->d_ino,
+                                &entry->d_ino);
                 dht_itransform (this, prev->this, orig_entry->d_off,
                                 &entry->d_off);
 
-                entry->d_stat = orig_entry->d_stat;
-                entry->d_ino  = orig_entry->d_ino;
+                entry->d_stat.ia_ino = entry->d_ino;
                 entry->d_type = orig_entry->d_type;
                 entry->d_len  = orig_entry->d_len;
 
-                if (orig_entry->dict)
-                        entry->dict = dict_ref (orig_entry->dict);
-
-                /* making sure we set the inode ctx right with layout,
-                   currently possible only for non-directories, so for
-                   directories don't set entry inodes */
-                if (!IA_ISDIR(entry->d_stat.ia_type)) {
-                        ret = dht_layout_preset (this, prev->this,
-                                                 orig_entry->inode);
-                        if (ret)
-                                gf_log (this->name, GF_LOG_WARNING,
-                                        "failed to link the layout in inode");
-                        entry->inode = inode_ref (orig_entry->inode);
-                } else if (orig_entry->inode) {
-                        dht_inode_ctx_time_update (orig_entry->inode, this,
-                                                   &entry->d_stat, 1);
-                }
-
                 list_add_tail (&entry->list, &entries.list);
                 count++;
         }
@@ -3125,23 +3122,9 @@ done:
                         goto unwind;
                 }
 
-		if (conf->readdir_optimize == _gf_true) {
-                        if (next_subvol != local->first_up_subvol) {
-                                ret = dict_set_int32 (local->xattr,
-                                                      GF_READDIR_SKIP_DIRS, 1);
-                                if (ret)
-                                        gf_log (this->name, GF_LOG_ERROR,
-					         "dict set failed");
-		        } else {
-                                 dict_del (local->xattr,
-                                           GF_READDIR_SKIP_DIRS);
-                        }
-                }
-
                 STACK_WIND (frame, dht_readdirp_cbk,
                             next_subvol, next_subvol->fops->readdirp,
-                            local->fd, local->size, next_offset,
-                            local->xattr);
+                            local->fd, local->size, next_offset);
                 return 0;
         }
 
@@ -3149,7 +3132,7 @@ unwind:
         if (op_ret < 0)
                 op_ret = 0;
 
-        DHT_STACK_UNWIND (readdirp, frame, op_ret, op_errno, &entries, NULL);
+        DHT_STACK_UNWIND (readdirp, frame, op_ret, op_errno, &entries);
 
         gf_dirent_free (&entries);
 
@@ -3160,8 +3143,7 @@ unwind:
 
 int
 dht_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                 int op_ret, int op_errno, gf_dirent_t *orig_entries,
-                 dict_t *xdata)
+                 int op_ret, int op_errno, gf_dirent_t *orig_entries)
 {
         dht_local_t  *local = NULL;
         gf_dirent_t   entries;
@@ -3172,11 +3154,13 @@ dht_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         off_t         next_offset = 0;
         int           count = 0;
         dht_layout_t *layout = 0;
+        dht_conf_t   *conf   = NULL;
         xlator_t     *subvol = 0;
 
         INIT_LIST_HEAD (&entries.list);
         prev = cookie;
         local = frame->local;
+        conf  = this->private;
 
         if (op_ret < 0)
                 goto done;
@@ -3199,10 +3183,11 @@ dht_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 goto unwind;
                         }
 
+                        dht_itransform (this, prev->this, orig_entry->d_ino,
+                                        &entry->d_ino);
                         dht_itransform (this, prev->this, orig_entry->d_off,
                                         &entry->d_off);
 
-                        entry->d_ino  = orig_entry->d_ino;
                         entry->d_type = orig_entry->d_type;
                         entry->d_len  = orig_entry->d_len;
 
@@ -3238,7 +3223,7 @@ done:
 
                 STACK_WIND (frame, dht_readdir_cbk,
                             next_subvol, next_subvol->fops->readdir,
-                            local->fd, local->size, next_offset, NULL);
+                            local->fd, local->size, next_offset);
                 return 0;
         }
 
@@ -3246,7 +3231,7 @@ unwind:
         if (op_ret < 0)
                 op_ret = 0;
 
-        DHT_STACK_UNWIND (readdir, frame, op_ret, op_errno, &entries, NULL);
+        DHT_STACK_UNWIND (readdir, frame, op_ret, op_errno, &entries);
 
         gf_dirent_free (&entries);
 
@@ -3256,76 +3241,46 @@ unwind:
 
 int
 dht_do_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
-                off_t yoff, int whichop, dict_t *dict)
+                off_t yoff, int whichop)
 {
         dht_local_t  *local  = NULL;
+        dht_conf_t   *conf = NULL;
         int           op_errno = -1;
         xlator_t     *xvol = NULL;
         off_t         xoff = 0;
-        int           ret = 0;
-        dht_conf_t   *conf = NULL;
+
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (fd, err);
-        VALIDATE_OR_GOTO (this->private, err);
 
         conf = this->private;
 
-        local = dht_local_init (frame, NULL, NULL, whichop);
+        local = dht_local_init (frame);
         if (!local) {
+
                 op_errno = ENOMEM;
                 goto err;
         }
 
         local->fd = fd_ref (fd);
         local->size = size;
-        local->xattr_req = (dict)? dict_ref (dict) : NULL;
-        local->first_up_subvol = dht_first_up_subvol (this);
 
         dht_deitransform (this, yoff, &xvol, (uint64_t *)&xoff);
 
         /* TODO: do proper readdir */
-        if (whichop == GF_FOP_READDIRP) {
-                if (dict)
-                        local->xattr = dict_ref (dict);
-                else
-                        local->xattr = dict_new ();
-
-                if (local->xattr) {
-                        ret = dict_set_uint32 (local->xattr,
-                                               conf->link_xattr_name, 256);
-                        if (ret)
-                                gf_log (this->name, GF_LOG_WARNING,
-                                        "failed to set '%s' key",
-                                        conf->link_xattr_name);
-			if (conf->readdir_optimize == _gf_true) {
-                                if (xvol != local->first_up_subvol) {
-				        ret = dict_set_int32 (local->xattr,
-			                               GF_READDIR_SKIP_DIRS, 1);
-				        if (ret)
-					        gf_log (this->name,
-                                                        GF_LOG_ERROR,
-						        "Dict set failed");
-                                } else {
-                                        dict_del (local->xattr,
-                                                  GF_READDIR_SKIP_DIRS);
-                                }
-			}
-                }
-
-                STACK_WIND (frame, dht_readdirp_cbk, xvol, xvol->fops->readdirp,
-                            fd, size, xoff, local->xattr);
-        } else {
+        if (whichop == GF_FOP_READDIR)
                 STACK_WIND (frame, dht_readdir_cbk, xvol, xvol->fops->readdir,
-                            fd, size, xoff, local->xattr);
-        }
+                            fd, size, xoff);
+        else
+                STACK_WIND (frame, dht_readdirp_cbk, xvol, xvol->fops->readdirp,
+                            fd, size, xoff);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (readdir, frame, -1, op_errno, NULL, NULL);
+        DHT_STACK_UNWIND (readdir, frame, -1, op_errno, NULL);
 
         return 0;
 }
@@ -3333,7 +3288,7 @@ err:
 
 int
 dht_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
-             off_t yoff, dict_t *xdata)
+             off_t yoff)
 {
         int          op = GF_FOP_READDIR;
         dht_conf_t  *conf = NULL;
@@ -3354,15 +3309,15 @@ dht_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
                 op = GF_FOP_READDIRP;
 
 out:
-        dht_do_readdir (frame, this, fd, size, yoff, op, 0);
+        dht_do_readdir (frame, this, fd, size, yoff, op);
         return 0;
 }
 
 int
 dht_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
-              off_t yoff, dict_t *dict)
+              off_t yoff)
 {
-        dht_do_readdir (frame, this, fd, size, yoff, GF_FOP_READDIRP, dict);
+        dht_do_readdir (frame, this, fd, size, yoff, GF_FOP_READDIRP);
         return 0;
 }
 
@@ -3370,7 +3325,7 @@ dht_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
 
 int
 dht_fsyncdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int op_ret, int op_errno, dict_t *xdata)
+                  int op_ret, int op_errno)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = 0;
@@ -3390,22 +3345,21 @@ dht_fsyncdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         this_call_cnt = dht_frame_return (frame);
         if (is_last_call (this_call_cnt))
-                DHT_STACK_UNWIND (fsyncdir, frame, local->op_ret,
-                                  local->op_errno, xdata);
+                DHT_STACK_UNWIND (fsyncdir, frame, local->op_ret, local->op_errno);
 
         return 0;
 }
 
 
 int
-dht_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd,
-              int datasync, dict_t *xdata)
+dht_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd, int datasync)
 {
         dht_local_t  *local  = NULL;
         dht_conf_t   *conf = NULL;
         int           op_errno = -1;
         int           i = -1;
 
+
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (fd, err);
@@ -3413,9 +3367,10 @@ dht_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd,
 
         conf = this->private;
 
-        local = dht_local_init (frame, NULL, NULL, GF_FOP_FSYNCDIR);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
+
                 goto err;
         }
 
@@ -3426,14 +3381,14 @@ dht_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd,
                 STACK_WIND (frame, dht_fsyncdir_cbk,
                             conf->subvolumes[i],
                             conf->subvolumes[i]->fops->fsyncdir,
-                            fd, datasync, xdata);
+                            fd, datasync);
         }
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fsyncdir, frame, -1, op_errno, NULL);
+        DHT_STACK_UNWIND (fsyncdir, frame, -1, op_errno);
 
         return 0;
 }
@@ -3443,9 +3398,9 @@ int
 dht_newfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                  int op_ret, int op_errno,
                  inode_t *inode, struct iatt *stbuf, struct iatt *preparent,
-                 struct iatt *postparent, dict_t *xdata)
+                 struct iatt *postparent)
 {
-        xlator_t     *prev = NULL;
+        call_frame_t *prev = NULL;
         int           ret = -1;
         dht_local_t  *local = NULL;
 
@@ -3462,25 +3417,24 @@ dht_newfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         prev = cookie;
 
+        dht_itransform (this, prev->this, stbuf->ia_ino, &stbuf->ia_ino);
         if (local->loc.parent) {
+                preparent->ia_ino = local->loc.parent->ino;
+                postparent->ia_ino = local->loc.parent->ino;
 
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           preparent, 0);
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           postparent, 1);
+                WIPE (preparent);
+                WIPE (postparent);
         }
 
-        ret = dht_layout_preset (this, prev, inode);
+        ret = dht_layout_preset (this, prev->this, inode);
         if (ret < 0) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "could not set pre-set layout for subvolume %s",
-                        prev? prev->name: NULL);
+                        prev->this->name);
                 op_ret   = -1;
                 op_errno = EINVAL;
                 goto out;
         }
-        if (local->linked == _gf_true)
-                dht_linkfile_attr_heal (frame, this);
 out:
         /*
          * FIXME: ia_size and st_blocks of preparent and postparent do not have
@@ -3489,9 +3443,9 @@ out:
          * corresponding values from each of the subvolume.
          * See dht_iatt_merge for reference.
          */
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
-        DHT_STACK_UNWIND (mknod, frame, op_ret, op_errno, inode, stbuf,
-                          preparent, postparent, xdata);
+
+        DHT_STACK_UNWIND (mknod, frame, op_ret, op_errno, inode, stbuf, preparent,
+                          postparent);
         return 0;
 }
 
@@ -3500,8 +3454,7 @@ dht_mknod_linkfile_create_cbk (call_frame_t *frame, void *cookie,
                                xlator_t *this,
                                int32_t op_ret, int32_t op_errno,
                                inode_t *inode, struct iatt *stbuf,
-                               struct iatt *preparent, struct iatt *postparent,
-                               dict_t *xdata)
+                               struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         xlator_t     *cached_subvol = NULL;
@@ -3510,43 +3463,42 @@ dht_mknod_linkfile_create_cbk (call_frame_t *frame, void *cookie,
                 goto err;
 
         local = frame->local;
-        if (!local || !local->cached_subvol) {
-                op_errno = EINVAL;
-                goto err;
-        }
-
         cached_subvol = local->cached_subvol;
 
-        STACK_WIND_COOKIE (frame, dht_newfile_cbk, (void *)cached_subvol,
-                           cached_subvol, cached_subvol->fops->mknod,
-                           &local->loc, local->mode, local->rdev, local->umask,
-                           local->params);
+        STACK_WIND (frame, dht_newfile_cbk,
+                    cached_subvol, cached_subvol->fops->mknod,
+                    &local->loc, local->mode, local->rdev,
+                    local->params);
 
         return 0;
 err:
-        DHT_STACK_UNWIND (mknod, frame, -1, op_errno, NULL, NULL, NULL, NULL,
-                          NULL);
+        DHT_STACK_UNWIND (mknod, frame, -1, op_errno, NULL, NULL, NULL, NULL);
         return 0;
 }
 
 int
 dht_mknod (call_frame_t *frame, xlator_t *this,
-           loc_t *loc, mode_t mode, dev_t rdev, mode_t umask, dict_t *params)
+           loc_t *loc, mode_t mode, dev_t rdev, dict_t *params)
 {
         xlator_t    *subvol = NULL;
         int          op_errno = -1;
+        int          ret = -1;
         xlator_t    *avail_subvol = NULL;
+        dht_conf_t  *conf = NULL;
         dht_local_t *local = NULL;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
 
+        conf = this->private;
+
         dht_get_du_info (frame, this, loc);
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_MKNOD);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
+
                 goto err;
         }
 
@@ -3559,17 +3511,22 @@ dht_mknod (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
+        ret = loc_dup (loc, &local->loc);
+        if (ret == -1) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
+
         if (!dht_is_subvol_filled (this, subvol)) {
                 gf_log (this->name, GF_LOG_TRACE,
                         "creating %s on %s", loc->path, subvol->name);
 
-                STACK_WIND_COOKIE (frame, dht_newfile_cbk, (void *)subvol,
-                                   subvol, subvol->fops->mknod, loc, mode,
-                                   rdev, umask, params);
+                STACK_WIND (frame, dht_newfile_cbk,
+                            subvol, subvol->fops->mknod,
+                            loc, mode, rdev, params);
         } else {
-
-                avail_subvol = dht_free_disk_available_subvol (this, subvol,
-                                                               local);
+                avail_subvol = dht_free_disk_available_subvol (this, subvol);
                 if (avail_subvol != subvol) {
                         /* Choose the minimum filled volume, and create the
                            files there */
@@ -3578,18 +3535,17 @@ dht_mknod (call_frame_t *frame, xlator_t *this,
                         local->cached_subvol = avail_subvol;
                         local->mode = mode;
                         local->rdev = rdev;
-                        local->umask = umask;
+
                         dht_linkfile_create (frame,
                                              dht_mknod_linkfile_create_cbk,
-                                             this, avail_subvol, subvol, loc);
+                                             avail_subvol, subvol, loc);
                 } else {
                         gf_log (this->name, GF_LOG_TRACE,
                                 "creating %s on %s", loc->path, subvol->name);
 
-                        STACK_WIND_COOKIE (frame, dht_newfile_cbk,
-                                           (void *)subvol, subvol,
-                                           subvol->fops->mknod, loc, mode,
-                                           rdev, umask, params);
+                        STACK_WIND (frame, dht_newfile_cbk,
+                                    subvol, subvol->fops->mknod,
+                                    loc, mode, rdev, params);
                 }
         }
 
@@ -3598,7 +3554,7 @@ dht_mknod (call_frame_t *frame, xlator_t *this,
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
         DHT_STACK_UNWIND (mknod, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL, NULL);
 
         return 0;
 }
@@ -3606,19 +3562,22 @@ err:
 
 int
 dht_symlink (call_frame_t *frame, xlator_t *this,
-             const char *linkname, loc_t *loc, mode_t umask, dict_t *params)
+             const char *linkname, loc_t *loc, dict_t *params)
 {
         xlator_t    *subvol = NULL;
         int          op_errno = -1;
         dht_local_t *local = NULL;
+        int          ret = -1;
+
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_SYMLINK);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
+
                 goto err;
         }
 
@@ -3631,33 +3590,41 @@ dht_symlink (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
+        ret = loc_copy (&local->loc, loc);
+        if (ret == -1) {
+                gf_log (this->name, GF_LOG_TRACE, "Failed to copy loc");
+                op_errno = ENOMEM;
+                goto err;
+        }
+
         gf_log (this->name, GF_LOG_TRACE,
                 "creating %s on %s", loc->path, subvol->name);
 
-        STACK_WIND_COOKIE (frame, dht_newfile_cbk, (void *)subvol, subvol,
-                           subvol->fops->symlink, linkname, loc, umask,
-                           params);
+        STACK_WIND (frame, dht_newfile_cbk,
+                    subvol, subvol->fops->symlink,
+                    linkname, loc, params);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
         DHT_STACK_UNWIND (link, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL, NULL);
 
         return 0;
 }
 
 
 int
-dht_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag,
-            dict_t *xdata)
+dht_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
         xlator_t    *cached_subvol = NULL;
         xlator_t    *hashed_subvol = NULL;
+        int          ret = -1;
         int          op_errno = -1;
         dht_local_t *local = NULL;
 
+
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
@@ -3669,14 +3636,15 @@ dht_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag,
                         local->loc.path, cached_subvol->name, loc->path);
                 STACK_WIND (frame, dht_unlink_cbk,
                             cached_subvol, cached_subvol->fops->unlink,
-                            &local->loc, xflag, xdata);
+                            &local->loc);
                 goto done;
         }
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_UNLINK);
-        if (!local) {
-                op_errno = ENOMEM;
-
+        cached_subvol = dht_subvol_get_cached (this, loc->inode);
+        if (!cached_subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for path=%s", loc->path);
+                op_errno = EINVAL;
                 goto err;
         }
 
@@ -3689,29 +3657,32 @@ dht_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag,
                 goto err;
         }
 
-        cached_subvol = local->cached_subvol;
-        if (!cached_subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for path=%s", loc->path);
-                op_errno = EINVAL;
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
+
+        ret = loc_copy (&local->loc, loc);
+        if (ret == -1) {
+                op_errno = ENOMEM;
+
                 goto err;
         }
 
-        local->flags = xflag;
         if (hashed_subvol != cached_subvol) {
                 STACK_WIND (frame, dht_unlink_linkfile_cbk,
-                            hashed_subvol, hashed_subvol->fops->unlink, loc,
-                            xflag, xdata);
+                            hashed_subvol, hashed_subvol->fops->unlink, loc);
         } else {
                 STACK_WIND (frame, dht_unlink_cbk,
-                            cached_subvol, cached_subvol->fops->unlink, loc,
-                            xflag, xdata);
+                            cached_subvol, cached_subvol->fops->unlink, loc);
         }
 done:
         return 0;
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (unlink, frame, -1, op_errno, NULL, NULL, NULL);
+        DHT_STACK_UNWIND (unlink, frame, -1, op_errno, NULL, NULL);
 
         return 0;
 }
@@ -3721,14 +3692,13 @@ int
 dht_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
               int op_ret, int op_errno,
               inode_t *inode, struct iatt *stbuf, struct iatt *preparent,
-              struct iatt *postparent, dict_t *xdata)
+              struct iatt *postparent)
 {
         call_frame_t *prev = NULL;
         dht_layout_t *layout = NULL;
         dht_local_t  *local = NULL;
 
         prev = cookie;
-
         local = frame->local;
 
         if (op_ret == -1)
@@ -3744,20 +3714,17 @@ dht_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 goto out;
         }
 
-        if (local->loc.parent) {
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           preparent, 0);
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           postparent, 1);
-        }
-        if (local->linked == _gf_true) {
-                local->stbuf = *stbuf;
-                dht_linkfile_attr_heal (frame, this);
-        }
+        stbuf->ia_ino = local->loc.inode->ino;
+
+        preparent->ia_ino = local->loc2.parent->ino;
+        postparent->ia_ino = local->loc2.parent->ino;
+
+        WIPE (preparent);
+        WIPE (postparent);
+
 out:
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
         DHT_STACK_UNWIND (link, frame, op_ret, op_errno, inode, stbuf, preparent,
-                          postparent, NULL);
+                          postparent);
 
         return 0;
 }
@@ -3767,27 +3734,27 @@ int
 dht_link_linkfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int op_ret, int op_errno,
                        inode_t *inode, struct iatt *stbuf,
-                       struct iatt *preparent, struct iatt *postparent,
-                       dict_t *xdata)
+                       struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         xlator_t     *srcvol = NULL;
 
+
         if (op_ret == -1)
                 goto err;
 
         local = frame->local;
         srcvol = local->linkfile.srcvol;
 
-        STACK_WIND (frame, dht_link_cbk, srcvol, srcvol->fops->link,
-                    &local->loc, &local->loc2, xdata);
+        STACK_WIND (frame, dht_link_cbk,
+                    srcvol, srcvol->fops->link,
+                    &local->loc, &local->loc2);
 
         return 0;
 
 err:
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
         DHT_STACK_UNWIND (link, frame, op_ret, op_errno, inode, stbuf, preparent,
-                          postparent, NULL);
+                          postparent);
 
         return 0;
 }
@@ -3795,7 +3762,7 @@ err:
 
 int
 dht_link (call_frame_t *frame, xlator_t *this,
-          loc_t *oldloc, loc_t *newloc, dict_t *xdata)
+          loc_t *oldloc, loc_t *newloc)
 {
         xlator_t    *cached_subvol = NULL;
         xlator_t    *hashed_subvol = NULL;
@@ -3803,19 +3770,13 @@ dht_link (call_frame_t *frame, xlator_t *this,
         int          ret = -1;
         dht_local_t *local = NULL;
 
+
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (oldloc, err);
         VALIDATE_OR_GOTO (newloc, err);
 
-        local = dht_local_init (frame, oldloc, NULL, GF_FOP_LINK);
-        if (!local) {
-                op_errno = ENOMEM;
-
-                goto err;
-        }
-
-        cached_subvol = local->cached_subvol;
+        cached_subvol = dht_subvol_get_cached (this, oldloc->inode);
         if (!cached_subvol) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "no cached subvolume for path=%s", oldloc->path);
@@ -3832,27 +3793,42 @@ dht_link (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
+
+        ret = loc_copy (&local->loc, oldloc);
+        if (ret == -1) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
+
         ret = loc_copy (&local->loc2, newloc);
         if (ret == -1) {
                 op_errno = ENOMEM;
+
                 goto err;
         }
 
         if (hashed_subvol != cached_subvol) {
-                uuid_copy (local->gfid, oldloc->inode->gfid);
-                dht_linkfile_create (frame, dht_link_linkfile_cbk, this,
+                memcpy (local->gfid, oldloc->inode->gfid, 16);
+                dht_linkfile_create (frame, dht_link_linkfile_cbk,
                                      cached_subvol, hashed_subvol, newloc);
         } else {
                 STACK_WIND (frame, dht_link_cbk,
                             cached_subvol, cached_subvol->fops->link,
-                            oldloc, newloc, xdata);
+                            oldloc, newloc);
         }
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (link, frame, -1, op_errno, NULL, NULL, NULL, NULL, NULL);
+        DHT_STACK_UNWIND (link, frame, -1, op_errno, NULL, NULL, NULL, NULL);
 
         return 0;
 }
@@ -3862,7 +3838,7 @@ int
 dht_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 int op_ret, int op_errno,
                 fd_t *fd, inode_t *inode, struct iatt *stbuf,
-                struct iatt *preparent, struct iatt *postparent, dict_t *xdata)
+                struct iatt *preparent, struct iatt *postparent)
 {
         call_frame_t *prev = NULL;
         int           ret = -1;
@@ -3880,12 +3856,13 @@ dht_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         prev = cookie;
 
+        dht_itransform (this, prev->this, stbuf->ia_ino, &stbuf->ia_ino);
         if (local->loc.parent) {
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           preparent, 0);
+                preparent->ia_ino = local->loc.parent->ino;
+                postparent->ia_ino = local->loc.parent->ino;
 
-                dht_inode_ctx_time_update (local->loc.parent, this,
-                                           postparent, 1);
+                WIPE (preparent);
+                WIPE (postparent);
         }
 
         ret = dht_layout_preset (this, prev->this, inode);
@@ -3897,14 +3874,10 @@ dht_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 op_errno = EINVAL;
                 goto out;
         }
-        if (local->linked == _gf_true) {
-                local->stbuf = *stbuf;
-                dht_linkfile_attr_heal (frame, this);
-        }
+
 out:
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
         DHT_STACK_UNWIND (create, frame, op_ret, op_errno, fd, inode, stbuf, preparent,
-                          postparent, NULL);
+                          postparent);
         return 0;
 }
 
@@ -3914,8 +3887,7 @@ dht_create_linkfile_create_cbk (call_frame_t *frame, void *cookie,
                                 xlator_t *this,
                                 int32_t op_ret, int32_t op_errno,
                                 inode_t *inode, struct iatt *stbuf,
-                                struct iatt *preparent, struct iatt *postparent,
-                                dict_t *xdata)
+                                struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         xlator_t     *cached_subvol = NULL;
@@ -3929,22 +3901,23 @@ dht_create_linkfile_create_cbk (call_frame_t *frame, void *cookie,
         STACK_WIND (frame, dht_create_cbk,
                     cached_subvol, cached_subvol->fops->create,
                     &local->loc, local->flags, local->mode,
-                    local->umask, local->fd, local->params);
+                    local->fd, local->params);
 
         return 0;
 err:
-        DHT_STACK_UNWIND (create, frame, -1, op_errno, NULL, NULL, NULL,
-                          NULL, NULL, NULL);
+        DHT_STACK_UNWIND (create, frame, -1, op_errno, NULL, NULL, NULL, NULL, NULL);
         return 0;
 }
 
 int
 dht_create (call_frame_t *frame, xlator_t *this,
             loc_t *loc, int32_t flags, mode_t mode,
-            mode_t umask, fd_t *fd, dict_t *params)
+            fd_t *fd, dict_t *params)
 {
         int          op_errno = -1;
+        int          ret = -1;
         xlator_t    *subvol = NULL;
+        dht_conf_t  *conf = NULL;
         dht_local_t *local = NULL;
         xlator_t    *avail_subvol = NULL;
 
@@ -3952,10 +3925,13 @@ dht_create (call_frame_t *frame, xlator_t *this,
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
 
+        conf = this->private;
+
         dht_get_du_info (frame, this, loc);
 
-        local = dht_local_init (frame, loc, fd, GF_FOP_CREATE);
+        local = dht_local_init (frame);
         if (!local) {
+
                 op_errno = ENOMEM;
                 goto err;
         }
@@ -3967,10 +3943,16 @@ dht_create (call_frame_t *frame, xlator_t *this,
                         local->loc.path, subvol->name, loc->path);
                 STACK_WIND (frame, dht_create_cbk,
                             subvol, subvol->fops->create,
-                            &local->loc, flags, mode, umask, fd, params);
+                            &local->loc, flags, mode, fd, params);
                 goto done;
         }
 
+        ret = loc_dup (loc, &local->loc);
+        if (ret == -1) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
         subvol = dht_subvol_get_hashed (this, loc);
         if (!subvol) {
                 gf_log (this->name, GF_LOG_DEBUG,
@@ -3985,38 +3967,40 @@ dht_create (call_frame_t *frame, xlator_t *this,
                         "creating %s on %s", loc->path, subvol->name);
                 STACK_WIND (frame, dht_create_cbk,
                             subvol, subvol->fops->create,
-                            loc, flags, mode, umask, fd, params);
+                            loc, flags, mode, fd, params);
                 goto done;
         }
         /* Choose the minimum filled volume, and create the
            files there */
-        avail_subvol = dht_free_disk_available_subvol (this, subvol, local);
+        /* TODO */
+        avail_subvol = dht_free_disk_available_subvol (this, subvol);
         if (avail_subvol != subvol) {
+                local->fd = fd_ref (fd);
                 local->params = dict_ref (params);
                 local->flags = flags;
                 local->mode = mode;
-                local->umask = umask;
+
                 local->cached_subvol = avail_subvol;
                 local->hashed_subvol = subvol;
                 gf_log (this->name, GF_LOG_TRACE,
                         "creating %s on %s (link at %s)", loc->path,
                         avail_subvol->name, subvol->name);
-                dht_linkfile_create (frame, dht_create_linkfile_create_cbk,
-                                     this, avail_subvol, subvol, loc);
+                dht_linkfile_create (frame,
+                                     dht_create_linkfile_create_cbk,
+                                     avail_subvol, subvol, loc);
                 goto done;
         }
         gf_log (this->name, GF_LOG_TRACE,
                 "creating %s on %s", loc->path, subvol->name);
         STACK_WIND (frame, dht_create_cbk,
                     subvol, subvol->fops->create,
-                    loc, flags, mode, umask, fd, params);
+                    loc, flags, mode, fd, params);
 done:
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (create, frame, -1, op_errno, NULL, NULL, NULL,
-                          NULL, NULL, NULL);
+        DHT_STACK_UNWIND (create, frame, -1, op_errno, NULL, NULL, NULL, NULL, NULL);
 
         return 0;
 }
@@ -4025,28 +4009,30 @@ err:
 int
 dht_mkdir_selfheal_cbk (call_frame_t *frame, void *cookie,
                         xlator_t *this,
-                        int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                        int32_t op_ret, int32_t op_errno)
 {
         dht_local_t   *local = NULL;
         dht_layout_t  *layout = NULL;
 
+
         local = frame->local;
         layout = local->selfheal.layout;
 
         if (op_ret == 0) {
                 dht_layout_set (this, local->inode, layout);
+                local->stbuf.ia_ino = local->ia_ino;
                 if (local->loc.parent) {
-                        dht_inode_ctx_time_update (local->loc.parent, this,
-                                                   &local->preparent, 0);
+                        local->preparent.ia_ino = local->loc.parent->ino;
+                        local->postparent.ia_ino = local->loc.parent->ino;
 
-                        dht_inode_ctx_time_update (local->loc.parent, this,
-                                                   &local->postparent, 1);
+                        WIPE (&local->preparent);
+                        WIPE (&local->postparent);
                 }
         }
 
         DHT_STACK_UNWIND (mkdir, frame, op_ret, op_errno,
                           local->inode, &local->stbuf, &local->preparent,
-                          &local->postparent, NULL);
+                          &local->postparent);
 
         return 0;
 }
@@ -4054,15 +4040,17 @@ dht_mkdir_selfheal_cbk (call_frame_t *frame, void *cookie,
 int
 dht_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                int op_ret, int op_errno, inode_t *inode, struct iatt *stbuf,
-               struct iatt *preparent, struct iatt *postparent, dict_t *xdata)
+               struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = 0;
         int           ret = -1;
-        gf_boolean_t subvol_filled = _gf_false;
+        int           subvol_filled = 0;
         call_frame_t *prev = NULL;
         dht_layout_t *layout = NULL;
+        dht_conf_t   *conf = NULL;
 
+        conf = this->private;
         local = frame->local;
         prev  = cookie;
         layout = local->layout;
@@ -4075,21 +4063,9 @@ dht_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         ret = dht_layout_merge (this, layout, prev->this,
                                                 -1, ENOSPC, NULL);
                 } else {
-			if (op_ret == -1 && op_errno == EEXIST)
-				/* Very likely just a race between mkdir and
-				   self-heal (from lookup of a concurrent mkdir
-				   attempt).
-				   Ignore error for now. layout setting will
-				   anyways fail if this was a different (old)
-				   pre-existing different directory.
-				*/
-				op_ret = 0;
                         ret = dht_layout_merge (this, layout, prev->this,
                                                 op_ret, op_errno, NULL);
                 }
-                if (ret)
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: failed to merge layouts", local->loc.path);
 
                 if (op_ret == -1) {
                         local->op_errno = op_errno;
@@ -4099,6 +4075,12 @@ dht_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 dht_iatt_merge (this, &local->preparent, preparent, prev->this);
                 dht_iatt_merge (this, &local->postparent, postparent,
                                 prev->this);
+
+                if (prev->this == dht_first_up_subvol (this)) {
+                        local->ia_ino = local->stbuf.ia_ino;
+                }
+                if (uuid_is_null (local->loc.gfid) && !op_ret)
+                        uuid_copy (local->loc.gfid, stbuf->ia_gfid);
         }
 unlock:
         UNLOCK (&frame->lock);
@@ -4116,8 +4098,7 @@ int
 dht_mkdir_hashed_cbk (call_frame_t *frame, void *cookie,
                       xlator_t *this, int op_ret, int op_errno,
                       inode_t *inode, struct iatt *stbuf,
-                      struct iatt *preparent, struct iatt *postparent,
-                      dict_t *xdata)
+                      struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         int           ret = -1;
@@ -4135,9 +4116,6 @@ dht_mkdir_hashed_cbk (call_frame_t *frame, void *cookie,
         conf = this->private;
         hashed_subvol = local->hashed_subvol;
 
-        if (uuid_is_null (local->loc.gfid) && !op_ret)
-                uuid_copy (local->loc.gfid, stbuf->ia_gfid);
-
         if (dht_is_subvol_filled (this, hashed_subvol))
                 ret = dht_layout_merge (this, layout, prev->this,
                                         -1, ENOSPC, NULL);
@@ -4145,12 +4123,6 @@ dht_mkdir_hashed_cbk (call_frame_t *frame, void *cookie,
                 ret = dht_layout_merge (this, layout, prev->this,
                                         op_ret, op_errno, NULL);
 
-        /* TODO: we may have to return from the function
-           if layout merge fails. For now, lets just log an error */
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to merge layouts", local->loc.path);
-
         if (op_ret == -1) {
                 local->op_errno = op_errno;
                 goto err;
@@ -4161,6 +4133,8 @@ dht_mkdir_hashed_cbk (call_frame_t *frame, void *cookie,
         dht_iatt_merge (this, &local->preparent, preparent, prev->this);
         dht_iatt_merge (this, &local->postparent, postparent, prev->this);
 
+        local->ia_ino = local->stbuf.ia_ino;
+
         local->call_cnt = conf->subvolume_cnt - 1;
 
         if (uuid_is_null (local->loc.gfid))
@@ -4174,24 +4148,24 @@ dht_mkdir_hashed_cbk (call_frame_t *frame, void *cookie,
                         continue;
                 STACK_WIND (frame, dht_mkdir_cbk,
                             conf->subvolumes[i],
-                            conf->subvolumes[i]->fops->mkdir, &local->loc,
-                            local->mode, local->umask, local->params);
+                            conf->subvolumes[i]->fops->mkdir,
+                            &local->loc, local->mode, local->params);
         }
         return 0;
 err:
-        DHT_STACK_UNWIND (mkdir, frame, -1, op_errno, NULL, NULL, NULL,
-                          NULL, NULL);
+        DHT_STACK_UNWIND (mkdir, frame, -1, op_errno, NULL, NULL, NULL, NULL);
         return 0;
 }
 
 
- int
+int
 dht_mkdir (call_frame_t *frame, xlator_t *this,
-           loc_t *loc, mode_t mode, mode_t umask, dict_t *params)
+           loc_t *loc, mode_t mode, dict_t *params)
 {
         dht_local_t  *local  = NULL;
         dht_conf_t   *conf = NULL;
         int           op_errno = -1;
+        int           ret = -1;
         xlator_t     *hashed_subvol = NULL;
 
 
@@ -4206,13 +4180,15 @@ dht_mkdir (call_frame_t *frame, xlator_t *this,
 
         dht_get_du_info (frame, this, loc);
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_MKDIR);
+        local = dht_local_init (frame);
         if (!local) {
+
                 op_errno = ENOMEM;
                 goto err;
         }
 
         hashed_subvol = dht_subvol_get_hashed (this, loc);
+
         if (hashed_subvol == NULL) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "hashed subvol not found for %s",
@@ -4222,13 +4198,21 @@ dht_mkdir (call_frame_t *frame, xlator_t *this,
         }
 
         local->hashed_subvol = hashed_subvol;
+        local->inode = inode_ref (loc->inode);
+        ret = loc_copy (&local->loc, loc);
         local->mode = mode;
-        local->umask = umask;
+
+        if (ret == -1) {
+
+                op_errno = ENOMEM;
+                goto err;
+        }
+
         local->params = dict_ref (params);
-        local->inode  = inode_ref (loc->inode);
 
         local->layout = dht_layout_new (this, conf->subvolume_cnt);
         if (!local->layout) {
+
                 op_errno = ENOMEM;
                 goto err;
         }
@@ -4236,14 +4220,13 @@ dht_mkdir (call_frame_t *frame, xlator_t *this,
         STACK_WIND (frame, dht_mkdir_hashed_cbk,
                     hashed_subvol,
                     hashed_subvol->fops->mkdir,
-                    loc, mode, umask, params);
+                    loc, mode, params);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (mkdir, frame, -1, op_errno, NULL, NULL, NULL,
-                          NULL, NULL);
+        DHT_STACK_UNWIND (mkdir, frame, -1, op_errno, NULL, NULL, NULL, NULL);
 
         return 0;
 }
@@ -4251,87 +4234,20 @@ err:
 
 int
 dht_rmdir_selfheal_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int op_ret, int op_errno, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-
-        local = frame->local;
-
-        DHT_STACK_UNWIND (rmdir, frame, local->op_ret, local->op_errno,
-                          &local->preparent, &local->postparent, NULL);
-
-        return 0;
-}
-
-
-int
-dht_rmdir_hashed_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-               int op_ret, int op_errno, struct iatt *preparent,
-               struct iatt *postparent, dict_t *xdata)
+                        int op_ret, int op_errno)
 {
         dht_local_t  *local = NULL;
-        int           this_call_cnt = 0;
-        call_frame_t *prev = NULL;
 
         local = frame->local;
-        prev  = cookie;
-
-        LOCK (&frame->lock);
-        {
-                if (op_ret == -1) {
-                        local->op_errno = op_errno;
-                        local->op_ret   = -1;
-                        if (op_errno != ENOENT && op_errno != EACCES) {
-                                local->need_selfheal = 1;
-                        }
-
-
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "rmdir on %s for %s failed (%s)",
-                                prev->this->name, local->loc.path,
-                                strerror (op_errno));
-                        goto unlock;
-                }
-
-                dht_iatt_merge (this, &local->preparent, preparent, prev->this);
-                dht_iatt_merge (this, &local->postparent, postparent,
-                                prev->this);
 
+        if (local->loc.parent) {
+                local->preparent.ia_ino = local->loc.parent->ino;
+                local->postparent.ia_ino = local->loc.parent->ino;
         }
-unlock:
-        UNLOCK (&frame->lock);
-
-        this_call_cnt = dht_frame_return (frame);
-        if (is_last_call (this_call_cnt)) {
-               if (local->need_selfheal) {
-                        local->layout =
-                                dht_layout_get (this, local->loc.inode);
-
-                        /* TODO: neater interface needed below */
-                        local->stbuf.ia_type = local->loc.inode->ia_type;
-
-                        uuid_copy (local->gfid, local->loc.inode->gfid);
-                        dht_selfheal_restore (frame, dht_rmdir_selfheal_cbk,
-                                              &local->loc, local->layout);
-               } else {
 
-                        if (local->loc.parent) {
-                                dht_inode_ctx_time_update (local->loc.parent,
-                                                           this,
-                                                           &local->preparent,
-                                                           0);
-
-                                dht_inode_ctx_time_update (local->loc.parent,
-                                                           this,
-                                                           &local->postparent,
-                                                           1);
-                        }
-
-                        DHT_STACK_UNWIND (rmdir, frame, local->op_ret,
-                                          local->op_errno, &local->preparent,
-                                          &local->postparent, NULL);
-               }
-        }
+        FRAME_SU_UNDO (frame, dht_local_t);
+        DHT_STACK_UNWIND (rmdir, frame, local->op_ret, local->op_errno,
+                          &local->preparent, &local->postparent);
 
         return 0;
 }
@@ -4340,12 +4256,11 @@ unlock:
 int
 dht_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                int op_ret, int op_errno, struct iatt *preparent,
-               struct iatt *postparent, dict_t *xdata)
+               struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = 0;
         call_frame_t *prev = NULL;
-        int           done = 0;
 
         local = frame->local;
         prev  = cookie;
@@ -4366,8 +4281,7 @@ dht_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 strerror (op_errno));
                         goto unlock;
                 }
-
-                /* Track if rmdir succeeded on atleast one subvol*/
+                /* Track if rmdir succeeded on atleast one subvol */
                 local->fop_succeeded = 1;
                 dht_iatt_merge (this, &local->preparent, preparent, prev->this);
                 dht_iatt_merge (this, &local->postparent, postparent,
@@ -4378,16 +4292,7 @@ unlock:
 
 
         this_call_cnt = dht_frame_return (frame);
-
-        /* if local->hashed_subvol, we are yet to wind to hashed_subvol. */
-        if (local->hashed_subvol && (this_call_cnt == 1)) {
-                done = 1;
-        } else if (!local->hashed_subvol && !this_call_cnt) {
-                done = 1;
-        }
-
-
-        if (done) {
+        if (is_last_call (this_call_cnt)) {
                 if (local->need_selfheal && local->fop_succeeded) {
                         local->layout =
                                 dht_layout_get (this, local->loc.inode);
@@ -4398,34 +4303,20 @@ unlock:
                         uuid_copy (local->gfid, local->loc.inode->gfid);
                         dht_selfheal_restore (frame, dht_rmdir_selfheal_cbk,
                                               &local->loc, local->layout);
-                } else if (this_call_cnt) {
-                        /* If non-hashed subvol's have responded, proceed */
-
-                        local->need_selfheal = 0;
-                        STACK_WIND (frame, dht_rmdir_hashed_subvol_cbk,
-                                    local->hashed_subvol,
-                                    local->hashed_subvol->fops->rmdir,
-                                    &local->loc, local->flags, NULL);
-                } else if (!this_call_cnt) {
-                        /* All subvol's have responded, proceed */
-
+                } else {
                         if (local->loc.parent) {
+                                local->preparent.ia_ino =
+                                        local->loc.parent->ino;
+                                local->postparent.ia_ino =
+                                        local->loc.parent->ino;
 
-                                dht_inode_ctx_time_update (local->loc.parent,
-                                                           this,
-                                                           &local->preparent,
-                                                           0);
-
-                                dht_inode_ctx_time_update (local->loc.parent,
-                                                           this,
-                                                           &local->postparent,
-                                                           1);
-
+                                WIPE (&local->preparent);
+                                WIPE (&local->postparent);
                         }
 
                         DHT_STACK_UNWIND (rmdir, frame, local->op_ret,
                                           local->op_errno, &local->preparent,
-                                          &local->postparent, NULL);
+                                          &local->postparent);
                 }
         }
 
@@ -4439,7 +4330,6 @@ dht_rmdir_do (call_frame_t *frame, xlator_t *this)
         dht_local_t  *local = NULL;
         dht_conf_t   *conf = NULL;
         int           i = 0;
-        xlator_t     *hashed_subvol = NULL;
 
         VALIDATE_OR_GOTO (this->private, err);
 
@@ -4451,41 +4341,18 @@ dht_rmdir_do (call_frame_t *frame, xlator_t *this)
 
         local->call_cnt = conf->subvolume_cnt;
 
-        /* first remove from non-hashed_subvol */
-        hashed_subvol = dht_subvol_get_hashed (this, &local->loc);
-
-        if (!hashed_subvol) {
-                gf_log (this->name, GF_LOG_WARNING, "failed to get hashed "
-                        "subvol for %s",local->loc.path);
-        } else {
-                local->hashed_subvol = hashed_subvol;
-        }
-
-        /* When DHT has only 1 child */
-        if (conf->subvolume_cnt == 1) {
-                STACK_WIND (frame, dht_rmdir_hashed_subvol_cbk,
-                            conf->subvolumes[0],
-                            conf->subvolumes[0]->fops->rmdir,
-                            &local->loc, local->flags, NULL);
-                return 0;
-        }
-
         for (i = 0; i < conf->subvolume_cnt; i++) {
-                if (hashed_subvol &&
-                    (hashed_subvol == conf->subvolumes[i]))
-                        continue;
-
                 STACK_WIND (frame, dht_rmdir_cbk,
                             conf->subvolumes[i],
                             conf->subvolumes[i]->fops->rmdir,
-                            &local->loc, local->flags, NULL);
+                            &local->loc, local->flags);
         }
 
         return 0;
 
 err:
         DHT_STACK_UNWIND (rmdir, frame, local->op_ret, local->op_errno,
-                          &local->preparent, &local->postparent, NULL);
+                          &local->preparent, &local->postparent);
         return 0;
 }
 
@@ -4493,7 +4360,7 @@ err:
 int
 dht_rmdir_linkfile_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                int op_ret, int op_errno, struct iatt *preparent,
-                               struct iatt *postparent, dict_t *xdata)
+                               struct iatt *postparent)
 {
         dht_local_t    *local = NULL;
         call_frame_t   *prev = NULL;
@@ -4541,7 +4408,6 @@ dht_rmdir_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         call_frame_t   *main_frame = NULL;
         dht_local_t    *main_local = NULL;
         int             this_call_cnt = 0;
-        dht_conf_t     *conf = this->private;
 
         local = frame->local;
         prev  = cookie;
@@ -4553,7 +4419,7 @@ dht_rmdir_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (op_ret != 0)
                 goto err;
 
-        if (!check_is_linkfile (inode, stbuf, xattr, conf->link_xattr_name)) {
+        if (check_is_linkfile (inode, stbuf, xattr) == 0) {
                 main_local->op_ret  = -1;
                 main_local->op_errno = ENOTEMPTY;
 
@@ -4564,7 +4430,7 @@ dht_rmdir_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         }
 
         STACK_WIND (frame, dht_rmdir_linkfile_unlink_cbk,
-                    src, src->fops->unlink, &local->loc, 0, NULL);
+                    src, src->fops->unlink, &local->loc);
         return 0;
 err:
 
@@ -4587,8 +4453,6 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
         call_frame_t       *lookup_frame = NULL;
         dht_local_t        *lookup_local = NULL;
         dht_local_t        *local = NULL;
-        dict_t             *xattrs = NULL;
-        dht_conf_t         *conf = this->private;
 
         local = frame->local;
 
@@ -4597,8 +4461,7 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
                         continue;
                 if (strcmp (trav->d_name, "..") == 0)
                         continue;
-                if (check_is_linkfile (NULL, (&trav->d_stat), trav->dict,
-                                              conf->link_xattr_name)) {
+                if (check_is_linkfile (NULL, (&trav->d_stat), NULL) == 1) {
                         ret++;
                         continue;
                 }
@@ -4610,21 +4473,6 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
                 return 0;
         }
 
-        xattrs = dict_new ();
-        if (!xattrs) {
-                gf_log (this->name, GF_LOG_ERROR, "dict_new failed");
-                return -1;
-        }
-
-        ret = dict_set_uint32 (xattrs, conf->link_xattr_name, 256);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "failed to set linkto key"
-                        " in dict");
-                if (xattrs)
-                        dict_unref (xattrs);
-                return -1;
-        }
-
         list_for_each_entry (trav, &entries->list, list) {
                 if (strcmp (trav->d_name, ".") == 0)
                         continue;
@@ -4641,7 +4489,8 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
                         goto err;
                 }
 
-                lookup_local = mem_get0 (this->local_pool);
+                lookup_local = GF_CALLOC (sizeof (*local), 1,
+                                          gf_dht_mt_dht_local_t);
                 if (!lookup_local) {
                         goto err;
                 }
@@ -4668,18 +4517,12 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
 
                 STACK_WIND (lookup_frame, dht_rmdir_lookup_cbk,
                             src, src->fops->lookup,
-                            &lookup_local->loc, xattrs);
+                            &lookup_local->loc, NULL);
                 ret++;
         }
 
-        if (xattrs)
-                dict_unref (xattrs);
-
         return ret;
 err:
-        if (xattrs)
-                dict_unref (xattrs);
-
         DHT_STACK_DESTROY (lookup_frame);
         return 0;
 }
@@ -4687,8 +4530,7 @@ err:
 
 int
 dht_rmdir_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int op_ret, int op_errno, gf_dirent_t *entries,
-                        dict_t *xdata)
+                        int op_ret, int op_errno, gf_dirent_t *entries)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = -1;
@@ -4732,14 +4574,12 @@ dht_rmdir_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 dht_rmdir_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                       int op_ret, int op_errno, fd_t *fd, dict_t *xdata)
+                       int op_ret, int op_errno, fd_t *fd)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = -1;
         call_frame_t *prev = NULL;
-        dict_t       *dict = NULL;
-        int           ret = 0;
-        dht_conf_t   *conf = this->private;
+
 
         local = frame->local;
         prev  = cookie;
@@ -4749,32 +4589,14 @@ dht_rmdir_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         "opendir on %s for %s failed (%s)",
                         prev->this->name, local->loc.path,
                         strerror (op_errno));
-                if (op_errno != ENOENT) {
-                        local->op_ret = -1;
-                        local->op_errno = op_errno;
-                }
-                goto err;
-        }
-
-        dict = dict_new ();
-        if (!dict) {
                 local->op_ret = -1;
-                local->op_errno = ENOMEM;
+                local->op_errno = op_errno;
                 goto err;
         }
 
-        ret = dict_set_uint32 (dict, conf->link_xattr_name, 256);
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to set '%s' key",
-                        local->loc.path, conf->link_xattr_name);
-
         STACK_WIND (frame, dht_rmdir_readdirp_cbk,
                     prev->this, prev->this->fops->readdirp,
-                    local->fd, 4096, 0, dict);
-
-        if (dict)
-                dict_unref (dict);
+                    local->fd, 4096, 0);
 
         return 0;
 
@@ -4790,13 +4612,14 @@ err:
 
 
 int
-dht_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags,
-           dict_t *xdata)
+dht_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags)
 {
         dht_local_t  *local  = NULL;
         dht_conf_t   *conf = NULL;
         int           op_errno = -1;
         int           i = -1;
+        int           ret = -1;
+
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
@@ -4807,8 +4630,9 @@ dht_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags,
 
         conf = this->private;
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_RMDIR);
+        local = dht_local_init (frame);
         if (!local) {
+
                 op_errno = ENOMEM;
                 goto err;
         }
@@ -4817,6 +4641,13 @@ dht_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags,
         local->op_ret   = 0;
         local->fop_succeeded = 0;
 
+        ret = loc_copy (&local->loc, loc);
+        if (ret == -1) {
+
+                op_errno = ENOMEM;
+                goto err;
+        }
+
         local->flags = flags;
 
         local->fd = fd_create (local->loc.inode, frame->root->pid);
@@ -4830,7 +4661,7 @@ dht_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags,
                 STACK_WIND (frame, dht_rmdir_opendir_cbk,
                             conf->subvolumes[i],
                             conf->subvolumes[i]->fops->opendir,
-                            loc, local->fd, NULL);
+                            loc, local->fd);
         }
 
         return 0;
@@ -4838,42 +4669,240 @@ dht_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags,
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
         DHT_STACK_UNWIND (rmdir, frame, -1, op_errno,
-                          NULL, NULL, NULL);
+                          NULL, NULL);
+
+        return 0;
+}
 
+
+int
+dht_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                 int32_t op_ret, int32_t op_errno, dict_t *dict)
+{
+        DHT_STACK_UNWIND (xattrop, frame, op_ret, op_errno, dict);
         return 0;
 }
 
+
 int
-dht_entrylk_cbk (call_frame_t *frame, void *cookie,
-                 xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *xdata)
+dht_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc,
+             gf_xattrop_flags_t flags, dict_t *dict)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (loc, err);
+        VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
+
+        subvol = dht_subvol_get_cached (this, loc->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
+
+        local->inode = inode_ref (loc->inode);
+        local->call_cnt = 1;
+
+        STACK_WIND (frame,
+                    dht_xattrop_cbk,
+                    subvol, subvol->fops->xattrop,
+                    loc, flags, dict);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (xattrop, frame, -1, op_errno, NULL);
+
+        return 0;
+}
 
+
+int
+dht_fxattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                  int32_t op_ret, int32_t op_errno, dict_t *dict)
 {
-        DHT_STACK_UNWIND (entrylk, frame, op_ret, op_errno, xdata);
+        DHT_STACK_UNWIND (fxattrop, frame, op_ret, op_errno, dict);
         return 0;
 }
 
 
 int
-dht_entrylk (call_frame_t *frame, xlator_t *this,
-             const char *volume, loc_t *loc, const char *basename,
-             entrylk_cmd cmd, entrylk_type type, dict_t *xdata)
+dht_fxattrop (call_frame_t *frame, xlator_t *this,
+              fd_t *fd, gf_xattrop_flags_t flags, dict_t *dict)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        subvol = dht_subvol_get_cached (this, fd->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for fd=%p", fd);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        STACK_WIND (frame,
+                    dht_fxattrop_cbk,
+                    subvol, subvol->fops->fxattrop,
+                    fd, flags, dict);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (fxattrop, frame, -1, op_errno, NULL);
+
+        return 0;
+}
+
+
+int
+dht_inodelk_cbk (call_frame_t *frame, void *cookie,
+                 xlator_t *this, int32_t op_ret, int32_t op_errno)
+
+{
+        DHT_STACK_UNWIND (inodelk, frame, op_ret, op_errno);
+        return 0;
+}
+
+
+int32_t
+dht_inodelk (call_frame_t *frame, xlator_t *this,
+             const char *volume, loc_t *loc, int32_t cmd, struct gf_flock *lock)
 {
         xlator_t     *subvol = NULL;
         int           op_errno = -1;
         dht_local_t  *local = NULL;
 
+
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
         VALIDATE_OR_GOTO (loc, err);
         VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
+
+        subvol = dht_subvol_get_cached (this, loc->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
+        }
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_ENTRYLK);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
+
+                goto err;
+        }
+
+        local->inode = inode_ref (loc->inode);
+        local->call_cnt = 1;
+
+        STACK_WIND (frame,
+                    dht_inodelk_cbk,
+                    subvol, subvol->fops->inodelk,
+                    volume, loc, cmd, lock);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (inodelk, frame, -1, op_errno);
+
+        return 0;
+}
+
+
+int
+dht_finodelk_cbk (call_frame_t *frame, void *cookie,
+                  xlator_t *this, int32_t op_ret, int32_t op_errno)
+
+{
+        DHT_STACK_UNWIND (finodelk, frame, op_ret, op_errno);
+        return 0;
+}
+
+
+int
+dht_finodelk (call_frame_t *frame, xlator_t *this,
+              const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *lock)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        subvol = dht_subvol_get_cached (this, fd->inode);
+        if (!subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no cached subvolume for fd=%p", fd);
+                op_errno = EINVAL;
                 goto err;
         }
 
-        subvol = local->cached_subvol;
+
+        STACK_WIND (frame,
+                    dht_finodelk_cbk,
+                    subvol, subvol->fops->finodelk,
+                    volume, fd, cmd, lock);
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (finodelk, frame, -1, op_errno);
+
+        return 0;
+}
+
+
+int
+dht_entrylk_cbk (call_frame_t *frame, void *cookie,
+                 xlator_t *this, int32_t op_ret, int32_t op_errno)
+
+{
+        DHT_STACK_UNWIND (entrylk, frame, op_ret, op_errno);
+        return 0;
+}
+
+
+int
+dht_entrylk (call_frame_t *frame, xlator_t *this,
+             const char *volume, loc_t *loc, const char *basename,
+             entrylk_cmd cmd, entrylk_type type)
+{
+        xlator_t     *subvol = NULL;
+        int           op_errno = -1;
+        dht_local_t  *local = NULL;
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (loc, err);
+        VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
+
+        subvol = dht_subvol_get_cached (this, loc->inode);
         if (!subvol) {
                 gf_log (this->name, GF_LOG_DEBUG,
                         "no cached subvolume for path=%s", loc->path);
@@ -4881,17 +4910,25 @@ dht_entrylk (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
+
+        local->inode = inode_ref (loc->inode);
         local->call_cnt = 1;
 
         STACK_WIND (frame, dht_entrylk_cbk,
                     subvol, subvol->fops->entrylk,
-                    volume, loc, basename, cmd, type, xdata);
+                    volume, loc, basename, cmd, type);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (entrylk, frame, -1, op_errno, NULL);
+        DHT_STACK_UNWIND (entrylk, frame, -1, op_errno);
 
         return 0;
 }
@@ -4899,10 +4936,10 @@ err:
 
 int
 dht_fentrylk_cbk (call_frame_t *frame, void *cookie,
-                  xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *xdata)
+                  xlator_t *this, int32_t op_ret, int32_t op_errno)
 
 {
-        DHT_STACK_UNWIND (fentrylk, frame, op_ret, op_errno, NULL);
+        DHT_STACK_UNWIND (fentrylk, frame, op_ret, op_errno);
         return 0;
 }
 
@@ -4910,7 +4947,7 @@ dht_fentrylk_cbk (call_frame_t *frame, void *cookie,
 int
 dht_fentrylk (call_frame_t *frame, xlator_t *this,
               const char *volume, fd_t *fd, const char *basename,
-              entrylk_cmd cmd, entrylk_type type, dict_t *xdata)
+              entrylk_cmd cmd, entrylk_type type)
 {
         xlator_t     *subvol = NULL;
         int           op_errno = -1;
@@ -4929,13 +4966,175 @@ dht_fentrylk (call_frame_t *frame, xlator_t *this,
 
         STACK_WIND (frame, dht_fentrylk_cbk,
                     subvol, subvol->fops->fentrylk,
-                    volume, fd, basename, cmd, type, xdata);
+                    volume, fd, basename, cmd, type);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fentrylk, frame, -1, op_errno, NULL);
+        DHT_STACK_UNWIND (fentrylk, frame, -1, op_errno);
+
+        return 0;
+}
+
+
+int
+dht_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
+                 int op_ret, int op_errno, struct iatt *statpre,
+                 struct iatt *statpost)
+{
+        dht_local_t  *local = NULL;
+        int           this_call_cnt = 0;
+        call_frame_t *prev = NULL;
+
+
+        local = frame->local;
+        prev = cookie;
+
+        LOCK (&frame->lock);
+        {
+                if (op_ret == -1) {
+                        local->op_errno = op_errno;
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "subvolume %s returned -1 (%s)",
+                                prev->this->name, strerror (op_errno));
+                        goto unlock;
+                }
+
+                dht_iatt_merge (this, &local->prebuf, statpre, prev->this);
+                dht_iatt_merge (this, &local->stbuf, statpost, prev->this);
+
+                if (local->inode) {
+                        local->prebuf.ia_ino = local->inode->ino;
+                        local->stbuf.ia_ino = local->inode->ino;
+                }
+
+                local->op_ret = 0;
+        }
+unlock:
+        UNLOCK (&frame->lock);
+
+        this_call_cnt = dht_frame_return (frame);
+        if (is_last_call (this_call_cnt))
+                DHT_STACK_UNWIND (setattr, frame, local->op_ret, local->op_errno,
+                                  &local->prebuf, &local->stbuf);
+
+        return 0;
+}
+
+
+int
+dht_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
+             struct iatt *stbuf, int32_t valid)
+{
+        dht_layout_t *layout = NULL;
+        dht_local_t  *local  = NULL;
+        int           op_errno = -1;
+        int           i = -1;
+        int           call_cnt = 0;
+
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (loc, err);
+        VALIDATE_OR_GOTO (loc->inode, err);
+        VALIDATE_OR_GOTO (loc->path, err);
+
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "memory allocation failed :(");
+                goto err;
+        }
+
+        local->layout = layout = dht_layout_get (this, loc->inode);
+        if (!layout) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no layout for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        if (!layout_is_sane (layout)) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "layout is not sane for path=%s", loc->path);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        local->inode = inode_ref (loc->inode);
+        local->call_cnt = call_cnt = layout->cnt;
+
+        for (i = 0; i < call_cnt; i++) {
+                STACK_WIND (frame, dht_setattr_cbk,
+                            layout->list[i].xlator,
+                            layout->list[i].xlator->fops->setattr,
+                            loc, stbuf, valid);
+        }
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (setattr, frame, -1, op_errno, NULL, NULL);
+
+        return 0;
+}
+
+
+int
+dht_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iatt *stbuf,
+              int32_t valid)
+{
+        dht_layout_t *layout = NULL;
+        dht_local_t  *local  = NULL;
+        int           op_errno = -1;
+        int           i = -1;
+        int           call_cnt = 0;
+
+
+        VALIDATE_OR_GOTO (frame, err);
+        VALIDATE_OR_GOTO (this, err);
+        VALIDATE_OR_GOTO (fd, err);
+
+        local = dht_local_init (frame);
+        if (!local) {
+                op_errno = ENOMEM;
+
+                goto err;
+        }
+
+        local->layout = layout = dht_layout_get (this, fd->inode);
+        if (!layout) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no layout for fd=%p", fd);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        if (!layout_is_sane (layout)) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "layout is not sane for fd=%p", fd);
+                op_errno = EINVAL;
+                goto err;
+        }
+
+        local->inode = inode_ref (fd->inode);
+        local->call_cnt = call_cnt = layout->cnt;
+
+        for (i = 0; i < call_cnt; i++) {
+                STACK_WIND (frame, dht_setattr_cbk,
+                            layout->list[i].xlator,
+                            layout->list[i].xlator->fops->fsetattr,
+                            fd, stbuf, valid);
+        }
+
+        return 0;
+
+err:
+        op_errno = (op_errno == -1) ? errno : op_errno;
+        DHT_STACK_UNWIND (fsetattr, frame, -1, op_errno, NULL, NULL);
 
         return 0;
 }
@@ -4944,44 +5143,75 @@ err:
 int
 dht_forget (xlator_t *this, inode_t *inode)
 {
-        uint64_t        ctx_int = 0;
-        dht_inode_ctx_t *ctx    = NULL;
+        uint64_t      tmp_layout = 0;
         dht_layout_t *layout = NULL;
 
-        inode_ctx_del (inode, this, &ctx_int);
+        inode_ctx_get (inode, this, &tmp_layout);
 
-        if (!ctx_int)
+        if (!tmp_layout)
                 return 0;
 
-        ctx = (dht_inode_ctx_t *) (long) ctx_int;
-
-        layout = ctx->layout;
-        ctx->layout = NULL;
+        layout = (dht_layout_t *)(long)tmp_layout;
         dht_layout_unref (this, layout);
-        GF_FREE (ctx);
 
         return 0;
 }
 
 
+
+int
+dht_init_subvolumes (xlator_t *this, dht_conf_t *conf)
+{
+        xlator_list_t *subvols = NULL;
+        int            cnt = 0;
+
+        if (!conf)
+                return -1;
+
+        for (subvols = this->children; subvols; subvols = subvols->next)
+                cnt++;
+
+        conf->subvolumes = GF_CALLOC (cnt, sizeof (xlator_t *),
+                                      gf_dht_mt_xlator_t);
+        if (!conf->subvolumes) {
+
+                return -1;
+        }
+        conf->subvolume_cnt = cnt;
+
+        cnt = 0;
+        for (subvols = this->children; subvols; subvols = subvols->next)
+                conf->subvolumes[cnt++] = subvols->xlator;
+
+        conf->subvolume_status = GF_CALLOC (cnt, sizeof (char),
+                                            gf_dht_mt_char);
+        if (!conf->subvolume_status) {
+
+                return -1;
+        }
+
+        conf->last_event = GF_CALLOC (cnt, sizeof (int),
+                                      gf_dht_mt_char);
+        if (!conf->last_event) {
+
+                return -1;
+        }
+        return 0;
+}
+
+
 int
 dht_notify (xlator_t *this, int event, void *data, ...)
 {
-        xlator_t                *subvol = NULL;
-        int                      cnt    = -1;
-        int                      i      = -1;
-        dht_conf_t              *conf   = NULL;
-        int                      ret    = -1;
-        int                      propagate = 0;
-
-        int                      had_heard_from_all = 0;
-        int                      have_heard_from_all = 0;
-        struct timeval           time = {0,};
-        gf_defrag_info_t        *defrag = NULL;
-        dict_t                  *dict   = NULL;
-        gf_defrag_type           cmd    = 0;
-        dict_t                  *output = NULL;
-        va_list                  ap;
+        xlator_t   *subvol = NULL;
+        int         cnt    = -1;
+        int         i      = -1;
+        dht_conf_t *conf   = NULL;
+        int         ret    = -1;
+        int         propagate = 0;
+
+        int         had_heard_from_all = 0;
+        int         have_heard_from_all = 0;
 
 
         conf = this->private;
@@ -5016,12 +5246,10 @@ dht_notify (xlator_t *this, int event, void *data, ...)
                         break;
                 }
 
-                gettimeofday (&time, NULL);
                 LOCK (&conf->subvolume_lock);
                 {
                         conf->subvolume_status[cnt] = 1;
                         conf->last_event[cnt] = event;
-                        conf->subvol_up_time[cnt] = time.tv_sec;
                 }
                 UNLOCK (&conf->subvolume_lock);
 
@@ -5044,11 +5272,7 @@ dht_notify (xlator_t *this, int event, void *data, ...)
                 if (conf->assert_no_child_down) {
                         gf_log (this->name, GF_LOG_WARNING,
                                 "Received CHILD_DOWN. Exiting");
-                        if (conf->defrag) {
-                                gf_defrag_stop (conf->defrag, NULL);
-                        } else {
-                                kill (getpid(), SIGTERM);
-                        }
+                        exit(0);
                 }
 
                 for (i = 0; i < conf->subvolume_cnt; i++) {
@@ -5069,7 +5293,6 @@ dht_notify (xlator_t *this, int event, void *data, ...)
                 {
                         conf->subvolume_status[cnt] = 0;
                         conf->last_event[cnt] = event;
-                        conf->subvol_up_time[cnt] = 0;
                 }
                 UNLOCK (&conf->subvolume_lock);
 
@@ -5099,36 +5322,6 @@ dht_notify (xlator_t *this, int event, void *data, ...)
                 UNLOCK (&conf->subvolume_lock);
 
                 break;
-        case GF_EVENT_VOLUME_DEFRAG:
-        {
-                if (!conf->defrag) {
-                        return ret;
-                }
-                defrag = conf->defrag;
-
-                dict = data;
-                va_start (ap, data);
-                output = va_arg (ap, dict_t*);
-
-                ret = dict_get_int32 (dict, "rebalance-command",
-                                      (int32_t*)&cmd);
-                if (ret)
-                        return ret;
-                LOCK (&defrag->lock);
-                {
-                        if (defrag->is_exiting)
-                                goto unlock;
-                        if (cmd == GF_DEFRAG_CMD_STATUS)
-                                gf_defrag_status_get (defrag, output);
-                        else if (cmd == GF_DEFRAG_CMD_STOP)
-                                gf_defrag_stop (defrag, output);
-                }
-unlock:
-                UNLOCK (&defrag->lock);
-                return 0;
-                break;
-        }
-
         default:
                 propagate = 1;
                 break;
@@ -5144,12 +5337,9 @@ unlock:
 
         /* if all subvols have reported status, no need to hide anything
            or wait for anything else. Just propagate blindly */
-        if (have_heard_from_all) {
+        if (have_heard_from_all)
                 propagate = 1;
 
-        }
-
-
         if (!had_heard_from_all && have_heard_from_all) {
                 /* This is the first event which completes aggregation
                    of events from all subvolumes. If at least one subvol
@@ -5168,19 +5358,6 @@ unlock:
                                 /* continue to check other events for CHILD_UP */
                         }
                 }
-
-                /* rebalance is started with assert_no_child_down. So we do
-                 * not need to handle CHILD_DOWN event here.
-                 */
-                if (conf->defrag) {
-                        ret = gf_thread_create (&conf->defrag->th, NULL,
-						gf_defrag_start, this);
-                        if (ret) {
-                                conf->defrag = NULL;
-                                GF_FREE (conf->defrag);
-                                kill (getpid(), SIGTERM);
-                        }
-                }
         }
 
         ret = 0;
@@ -5189,24 +5366,3 @@ unlock:
 
         return ret;
 }
-
-int
-dht_inode_ctx_layout_get (inode_t *inode, xlator_t *this, dht_layout_t **layout)
-{
-        dht_inode_ctx_t         *ctx            = NULL;
-        int                      ret            = -1;
-
-        ret = dht_inode_ctx_get (inode, this, &ctx);
-
-        if (!ret && ctx) {
-                if (ctx->layout) {
-                        if (layout)
-                                *layout = ctx->layout;
-                        ret = 0;
-                } else {
-                        ret = -1;
-                }
-        }
-
-        return ret;
-}
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index 5ccd66799..01e35da02 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -13,90 +22,48 @@
 #include "config.h"
 #endif
 
-#include <regex.h>
-
 #include "dht-mem-types.h"
 #include "libxlator.h"
-#include "syncop.h"
 
 #ifndef _DHT_H
 #define _DHT_H
 
-#define GF_XATTR_FIX_LAYOUT_KEY     "distribute.fix.layout"
+#define GF_XATTR_FIX_LAYOUT_KEY   "trusted.distribute.fix.layout"
 #define GF_DHT_LOOKUP_UNHASHED_ON   1
 #define GF_DHT_LOOKUP_UNHASHED_AUTO 2
-#define DHT_PATHINFO_HEADER         "DISTRIBUTE:"
+#define DHT_PATHINFO_HEADER "DISTRIBUTE:"
 
 #include <fnmatch.h>
 
 typedef int (*dht_selfheal_dir_cbk_t) (call_frame_t *frame, void *cookie,
-                                       xlator_t     *this,
-                                       int32_t       op_ret, int32_t op_errno,
-                                       dict_t *xdata);
-typedef int (*dht_defrag_cbk_fn_t) (xlator_t        *this, call_frame_t *frame,
-                                    int              ret);
+                                       xlator_t *this,
+                                       int32_t op_ret, int32_t op_errno);
 
 
 struct dht_layout {
-        int                spread_cnt;  /* layout spread count per directory,
-                                           is controlled by 'setxattr()' with
-                                           special key */
-        int                cnt;
-        int                preset;
-        int                gen;
-        int                type;
-        int                ref; /* use with dht_conf_t->layout_lock */
-        int                search_unhashed;
+        int               cnt;
+        int               preset;
+        int               gen;
+        int               type;
+        int               ref;   /* use with dht_conf_t->layout_lock */
+        int               search_unhashed;
         struct {
-                int        err;   /* 0 = normal
-                                     -1 = dir exists and no xattr
-                                     >0 = dir lookup failed with errno
-                                  */
-                uint32_t   start;
-                uint32_t   stop;
-                xlator_t  *xlator;
-        } list[];
-};
-typedef struct dht_layout  dht_layout_t;
-
-struct dht_stat_time {
-        uint32_t        atime;
-        uint32_t        atime_nsec;
-        uint32_t        ctime;
-        uint32_t        ctime_nsec;
-        uint32_t        mtime;
-        uint32_t        mtime_nsec;
-};
-
-typedef struct dht_stat_time dht_stat_time_t;
-
-struct dht_inode_ctx {
-        dht_layout_t    *layout;
-        dht_stat_time_t  time;
+                int       err;   /* 0 = normal
+                                    -1 = dir exists and no xattr
+                                    >0 = dir lookup failed with errno
+                                 */
+                uint32_t  start;
+                uint32_t  stop;
+                xlator_t *xlator;
+        } list[0];
 };
-
-typedef struct dht_inode_ctx dht_inode_ctx_t;
+typedef struct dht_layout dht_layout_t;
 
 
 typedef enum {
         DHT_HASH_TYPE_DM,
-        DHT_HASH_TYPE_DM_USER,
 } dht_hashfn_type_t;
 
-/* rebalance related */
-struct dht_rebalance_ {
-        xlator_t            *from_subvol;
-        xlator_t            *target_node;
-        off_t                offset;
-        size_t               size;
-        int32_t              flags;
-        int                  count;
-        struct iobref       *iobref;
-        struct iovec        *vector;
-        struct iatt          stbuf;
-        dht_defrag_cbk_fn_t  target_op_fn;
-        dict_t              *xdata;
-};
 
 struct dht_local {
         int                      call_cnt;
@@ -129,8 +96,8 @@ struct dht_local {
         char                     need_selfheal;
         int                      file_count;
         int                      dir_count;
-        call_frame_t            *main_frame;
         int                      fop_succeeded;
+        call_frame_t            *main_frame;
         struct {
                 fop_mknod_cbk_t  linkfile_cbk;
                 struct iatt      stbuf;
@@ -142,6 +109,7 @@ struct dht_local {
         struct {
                 uint32_t         hole_cnt;
                 uint32_t         overlaps_cnt;
+                uint32_t         missing;
                 uint32_t         down;
                 uint32_t         misc;
                 dht_selfheal_dir_cbk_t   dir_cbk;
@@ -154,16 +122,11 @@ struct dht_local {
         int32_t flags;
         mode_t  mode;
         dev_t   rdev;
-        mode_t  umask;
 
         /* need for file-info */
-        char   *xattr_val;
+        char   *pathinfo;
         char   *key;
 
-        /* which xattr request? */
-        char xsel[256];
-        int32_t alloc_len;
-
         char   *newpath;
 
         /* gfid related */
@@ -171,85 +134,17 @@ struct dht_local {
 
         /*Marker Related*/
         struct marker_str    marker;
-
-        /* flag used to make sure we need to return estale in
-           {lookup,revalidate}_cbk */
-        char return_estale;
-        char need_lookup_everywhere;
-
-        glusterfs_fop_t      fop;
-
-        gf_boolean_t     linked;
-        xlator_t        *link_subvol;
-
-        struct dht_rebalance_ rebalance;
-        xlator_t        *first_up_subvol;
-
 };
 typedef struct dht_local dht_local_t;
 
 /* du - disk-usage */
 struct dht_du {
         double   avail_percent;
-	double   avail_inodes;
         uint64_t avail_space;
         uint32_t log;
 };
 typedef struct dht_du dht_du_t;
 
-enum gf_defrag_type {
-        GF_DEFRAG_CMD_START = 1,
-        GF_DEFRAG_CMD_STOP = 1 + 1,
-        GF_DEFRAG_CMD_STATUS = 1 + 2,
-        GF_DEFRAG_CMD_START_LAYOUT_FIX = 1 + 3,
-        GF_DEFRAG_CMD_START_FORCE = 1 + 4,
-};
-typedef enum gf_defrag_type gf_defrag_type;
-
-enum gf_defrag_status_t {
-        GF_DEFRAG_STATUS_NOT_STARTED,
-        GF_DEFRAG_STATUS_STARTED,
-        GF_DEFRAG_STATUS_STOPPED,
-        GF_DEFRAG_STATUS_COMPLETE,
-        GF_DEFRAG_STATUS_FAILED,
-        GF_DEFRAG_STATUS_LAYOUT_FIX_STARTED,
-        GF_DEFRAG_STATUS_LAYOUT_FIX_STOPPED,
-        GF_DEFRAG_STATUS_LAYOUT_FIX_COMPLETE,
-        GF_DEFRAG_STATUS_LAYOUT_FIX_FAILED,
-};
-typedef enum gf_defrag_status_t gf_defrag_status_t;
-
-typedef struct gf_defrag_pattern_list gf_defrag_pattern_list_t;
-
-struct gf_defrag_pattern_list {
-        char                       path_pattern[256];
-        uint64_t                   size;
-        gf_defrag_pattern_list_t  *next;
-};
-
-struct gf_defrag_info_ {
-        uint64_t                     total_files;
-        uint64_t                     total_data;
-        uint64_t                     num_files_lookedup;
-        uint64_t                     total_failures;
-        uint64_t                     skipped;
-        gf_lock_t                    lock;
-        int                          cmd;
-        pthread_t                    th;
-        gf_defrag_status_t           defrag_status;
-        struct rpc_clnt             *rpc;
-        uint32_t                     connected;
-        uint32_t                     is_exiting;
-        pid_t                        pid;
-        inode_t                     *root_inode;
-        uuid_t                       node_uuid;
-        struct timeval               start_time;
-        gf_boolean_t                 stats;
-        gf_defrag_pattern_list_t    *defrag_pattern;
-};
-
-typedef struct gf_defrag_info_ gf_defrag_info_t;
-
 struct dht_conf {
         gf_lock_t      subvolume_lock;
         int            subvolume_cnt;
@@ -258,11 +153,11 @@ struct dht_conf {
         int           *last_event;
         dht_layout_t **file_layouts;
         dht_layout_t **dir_layouts;
+        dht_layout_t  *default_dir_layout;
         gf_boolean_t   search_unhashed;
         int            gen;
         dht_du_t      *du_stats;
-        double         min_free_disk;
-	double         min_free_inodes;
+        uint64_t       min_free_disk;
         char           disk_unit;
         int32_t        refresh_interval;
         gf_boolean_t   unhashed_sticky_bit;
@@ -273,34 +168,6 @@ struct dht_conf {
         gf_boolean_t   use_readdirp;
         char           vol_uuid[UUID_SIZE + 1];
         gf_boolean_t   assert_no_child_down;
-        time_t        *subvol_up_time;
-
-        /* This is the count used as the distribute layout for a directory */
-        /* Will be a global flag to control the layout spread count */
-        uint32_t       dir_spread_cnt;
-
-        /* to keep track of nodes which are decomissioned */
-        xlator_t     **decommissioned_bricks;
-        int            decommission_in_progress;
-        int            decommission_subvols_cnt;
-
-        /* defrag related */
-        gf_defrag_info_t *defrag;
-
-        /* Request to filter directory entries in readdir request */
-
-        gf_boolean_t    readdir_optimize;
-
-        /* Support regex-based name reinterpretation. */
-        regex_t         rsync_regex;
-        gf_boolean_t    rsync_regex_valid;
-        regex_t         extra_regex;
-        gf_boolean_t    extra_regex_valid;
-
-        /* Support variable xattr names. */
-        char            *xattr_name;
-        char            *link_xattr_name;
-        char            *wild_xattr_name;
 };
 typedef struct dht_conf dht_conf_t;
 
@@ -315,45 +182,20 @@ struct dht_disk_layout {
 };
 typedef struct dht_disk_layout dht_disk_layout_t;
 
-typedef enum {
-        GF_DHT_MIGRATE_DATA,
-        GF_DHT_MIGRATE_DATA_EVEN_IF_LINK_EXISTS,
-        GF_DHT_MIGRATE_HARDLINK,
-        GF_DHT_MIGRATE_HARDLINK_IN_PROGRESS
-} gf_dht_migrate_data_type_t;
 
 #define ENTRY_MISSING(op_ret, op_errno) (op_ret == -1 && op_errno == ENOENT)
 
-#define is_revalidate(loc) (dht_inode_ctx_layout_get (loc->inode, this, NULL) == 0)
-
-#define is_last_call(cnt) (cnt == 0)
-
-#define DHT_MIGRATION_IN_PROGRESS 1
-#define DHT_MIGRATION_COMPLETED   2
-
-#define DHT_LINKFILE_MODE        (S_ISVTX)
-
-#define check_is_linkfile(i,s,x,n) (                                      \
-                ((st_mode_from_ia ((s)->ia_prot, (s)->ia_type) & ~S_IFMT) \
-                 == DHT_LINKFILE_MODE) &&                                 \
-                dict_get (x, n))
+#define is_fs_root(loc) (strcmp (loc->path, "/") == 0)
 
-#define IS_DHT_MIGRATION_PHASE2(buf)  (                                 \
-                IA_ISREG ((buf)->ia_type) &&                            \
-                ((st_mode_from_ia ((buf)->ia_prot, (buf)->ia_type) &    \
-                  ~S_IFMT) == DHT_LINKFILE_MODE))
+#define is_revalidate(loc) (inode_ctx_get (loc->inode, this, NULL) == 0)
 
-#define IS_DHT_MIGRATION_PHASE1(buf)  (                                 \
-                IA_ISREG ((buf)->ia_type) &&                            \
-                ((buf)->ia_prot.sticky == 1) &&                         \
-                ((buf)->ia_prot.sgid == 1))
+#define is_last_call(cnt) (cnt == 0)
 
-#define DHT_STRIP_PHASE1_FLAGS(buf)  do {                       \
-                if ((buf) && IS_DHT_MIGRATION_PHASE1(buf)) {    \
-                        (buf)->ia_prot.sticky = 0;              \
-                        (buf)->ia_prot.sgid = 0;                \
-                }                                               \
-        } while (0)
+#define DHT_LINKFILE_MODE (S_ISVTX)
+#define check_is_linkfile(i,s,x) (                                      \
+                ((st_mode_from_ia (s->ia_prot, s->ia_type) & ~S_IFMT)   \
+                 == DHT_LINKFILE_MODE) &&                               \
+                (s->ia_size == 0))
 
 #define check_is_dir(i,s,x) (IA_ISDIR(s->ia_type))
 
@@ -361,427 +203,113 @@ typedef enum {
 
 #define DHT_STACK_UNWIND(fop, frame, params ...) do {           \
                 dht_local_t *__local = NULL;                    \
-                xlator_t    *__xl    = NULL;                    \
+                xlator_t *__xl = NULL;                          \
                 if (frame) {                                    \
-                        __xl         = frame->this;             \
-                        __local      = frame->local;            \
+                        __xl = frame->this;                     \
+                        __local = frame->local;                 \
                         frame->local = NULL;                    \
                 }                                               \
                 STACK_UNWIND_STRICT (fop, frame, params);       \
                 dht_local_wipe (__xl, __local);                 \
         } while (0)
 
-#define DHT_STACK_DESTROY(frame) do {                   \
-                dht_local_t *__local = NULL;            \
-                xlator_t    *__xl    = NULL;            \
-                __xl                 = frame->this;     \
-                __local              = frame->local;    \
-                frame->local         = NULL;            \
-                STACK_DESTROY (frame->root);            \
-                dht_local_wipe (__xl, __local);         \
-        } while (0)
-
-#define DHT_UPDATE_TIME(ctx_sec, ctx_nsec, new_sec, new_nsec, inode, post) do {\
-                int32_t sec = 0;                                        \
-                sec = new_sec;                                          \
-                LOCK (&inode->lock);                                    \
-                {                                                       \
-                        new_sec = max(new_sec, ctx_sec);                \
-                        if (sec < new_sec)                              \
-                                new_nsec = ctx_nsec;                    \
-                        if (sec == new_sec)                             \
-                                new_nsec = max (new_nsec, ctx_nsec);    \
-                        if (post) {                                     \
-                                ctx_sec = new_sec;                      \
-                                ctx_nsec = new_nsec;                    \
-                        }                                               \
-                }                                                       \
-                UNLOCK (&inode->lock);                                  \
+#define DHT_STACK_DESTROY(frame) do {           \
+                dht_local_t *__local = NULL;    \
+                xlator_t *__xl = NULL;          \
+                __xl = frame->this;             \
+                __local = frame->local;         \
+                frame->local = NULL;            \
+                STACK_DESTROY (frame->root);    \
+                dht_local_wipe (__xl, __local); \
         } while (0)
 
-#define is_greater_time(a, an, b, bn) (((a) < (b)) || (((a) == (b)) && ((an) < (bn))))
-dht_layout_t                            *dht_layout_new (xlator_t *this, int cnt);
-dht_layout_t                            *dht_layout_get (xlator_t *this, inode_t *inode);
-dht_layout_t                            *dht_layout_for_subvol (xlator_t *this, xlator_t *subvol);
-xlator_t *dht_layout_search (xlator_t   *this, dht_layout_t *layout,
+dht_layout_t *dht_layout_new (xlator_t *this, int cnt);
+dht_layout_t *dht_layout_get (xlator_t *this, inode_t *inode);
+dht_layout_t *dht_layout_for_subvol (xlator_t *this, xlator_t *subvol);
+xlator_t *dht_layout_search (xlator_t *this, dht_layout_t *layout,
                              const char *name);
-int                                      dht_layout_normalize (xlator_t *this, loc_t *loc, dht_layout_t *layout);
-int dht_layout_anomalies (xlator_t      *this, loc_t *loc, dht_layout_t *layout,
-                          uint32_t      *holes_p, uint32_t *overlaps_p,
-                          uint32_t      *missing_p, uint32_t *down_p,
-                          uint32_t      *misc_p, uint32_t *no_space_p);
-int dht_layout_dir_mismatch (xlator_t   *this, dht_layout_t *layout,
-                             xlator_t   *subvol, loc_t *loc, dict_t *xattr);
+int dht_layout_normalize (xlator_t *this, loc_t *loc, dht_layout_t *layout);
+int dht_layout_anomalies (xlator_t *this, loc_t *loc, dht_layout_t *layout,
+                          uint32_t *holes_p, uint32_t *overlaps_p,
+                          uint32_t *missing_p, uint32_t *down_p,
+                          uint32_t *misc_p);
+int dht_layout_dir_mismatch (xlator_t *this, dht_layout_t *layout,
+                             xlator_t *subvol, loc_t *loc, dict_t *xattr);
 
 xlator_t *dht_linkfile_subvol (xlator_t *this, inode_t *inode,
                                struct iatt *buf, dict_t *xattr);
-int dht_linkfile_unlink (call_frame_t      *frame, xlator_t *this,
-                         xlator_t          *subvol, loc_t *loc);
+int dht_linkfile_unlink (call_frame_t *frame, xlator_t *this,
+                         xlator_t *subvol, loc_t *loc);
 
 int dht_layouts_init (xlator_t *this, dht_conf_t *conf);
 int dht_layout_merge (xlator_t *this, dht_layout_t *layout, xlator_t *subvol,
-                      int       op_ret, int op_errno, dict_t *xattr);
+                      int op_ret, int op_errno, dict_t *xattr);
 
 int dht_disk_layout_extract (xlator_t *this, dht_layout_t *layout,
-                             int       pos, int32_t **disk_layout_p);
-int dht_disk_layout_merge (xlator_t   *this, dht_layout_t *layout,
-                           int         pos, void *disk_layout_raw, int disk_layout_len);
+                             int pos, int32_t **disk_layout_p);
+int dht_disk_layout_merge (xlator_t *this, dht_layout_t *layout,
+                           int pos, void *disk_layout_raw);
 
 
 int dht_frame_return (call_frame_t *frame);
 
-int                             dht_itransform (xlator_t *this, xlator_t *subvol, uint64_t x, uint64_t *y);
+int dht_itransform (xlator_t *this, xlator_t *subvol, uint64_t x, uint64_t *y);
 int dht_deitransform (xlator_t *this, uint64_t y, xlator_t **subvol,
                       uint64_t *x);
 
 void dht_local_wipe (xlator_t *this, dht_local_t *local);
-dht_local_t *dht_local_init (call_frame_t    *frame, loc_t *loc, fd_t *fd,
-                             glusterfs_fop_t  fop);
-int dht_iatt_merge (xlator_t                 *this, struct iatt *to, struct iatt *from,
-                    xlator_t                 *subvol);
+dht_local_t *dht_local_init (call_frame_t *frame);
+int dht_iatt_merge (xlator_t *this, struct iatt *to, struct iatt *from,
+                    xlator_t *subvol);
 
 xlator_t *dht_subvol_get_hashed (xlator_t *this, loc_t *loc);
 xlator_t *dht_subvol_get_cached (xlator_t *this, inode_t *inode);
 xlator_t *dht_subvol_next (xlator_t *this, xlator_t *prev);
-xlator_t *dht_subvol_next_available (xlator_t *this, xlator_t *prev);
-int       dht_subvol_cnt (xlator_t *this, xlator_t *subvol);
+int dht_subvol_cnt (xlator_t *this, xlator_t *subvol);
 
-int dht_hash_compute (xlator_t *this, int type, const char *name, uint32_t *hash_p);
+int dht_hash_compute (int type, const char *name, uint32_t *hash_p);
 
-int dht_linkfile_create (call_frame_t    *frame, fop_mknod_cbk_t linkfile_cbk,
-                         xlator_t        *this, xlator_t *tovol,
-                         xlator_t        *fromvol, loc_t *loc);
-int                                       dht_lookup_directory (call_frame_t *frame, xlator_t *this, loc_t *loc);
-int                                       dht_lookup_everywhere (call_frame_t *frame, xlator_t *this, loc_t *loc);
+int dht_linkfile_create (call_frame_t *frame, fop_mknod_cbk_t linkfile_cbk,
+                         xlator_t *tovol, xlator_t *fromvol, loc_t *loc);
+int dht_lookup_directory (call_frame_t *frame, xlator_t *this, loc_t *loc);
+int dht_lookup_everywhere (call_frame_t *frame, xlator_t *this, loc_t *loc);
 int
-dht_selfheal_directory (call_frame_t     *frame, dht_selfheal_dir_cbk_t cbk,
-                        loc_t            *loc, dht_layout_t *layout);
+dht_selfheal_directory (call_frame_t *frame, dht_selfheal_dir_cbk_t cbk,
+                        loc_t *loc, dht_layout_t *layout);
 int
 dht_selfheal_new_directory (call_frame_t *frame, dht_selfheal_dir_cbk_t cbk,
                             dht_layout_t *layout);
 int
-dht_selfheal_restore (call_frame_t       *frame, dht_selfheal_dir_cbk_t cbk,
-                      loc_t              *loc, dht_layout_t *layout);
+dht_selfheal_restore (call_frame_t *frame, dht_selfheal_dir_cbk_t cbk,
+                      loc_t *loc, dht_layout_t *layout);
 int
 dht_layout_sort_volname (dht_layout_t *layout);
 
+int dht_rename (call_frame_t *frame, xlator_t *this,
+                loc_t *oldloc, loc_t *newloc);
+
 int dht_get_du_info (call_frame_t *frame, xlator_t *this, loc_t *loc);
 
-gf_boolean_t dht_is_subvol_filled (xlator_t *this, xlator_t *subvol);
-xlator_t *dht_free_disk_available_subvol (xlator_t *this, xlator_t *subvol,
-                                          dht_local_t *layout);
-int       dht_get_du_info_for_subvol (xlator_t *this, int subvol_idx);
+int dht_is_subvol_filled (xlator_t *this, xlator_t *subvol);
+xlator_t *dht_free_disk_available_subvol (xlator_t *this, xlator_t *subvol);
+int dht_get_du_info_for_subvol (xlator_t *this, int subvol_idx);
 
 int dht_layout_preset (xlator_t *this, xlator_t *subvol, inode_t *inode);
-int           dht_layout_set (xlator_t *this, inode_t *inode, dht_layout_t *layout);;
-void          dht_layout_unref (xlator_t *this, dht_layout_t *layout);
+int dht_layout_set (xlator_t *this, inode_t *inode, dht_layout_t *layout);
+void dht_layout_unref (xlator_t *this, dht_layout_t *layout);
 dht_layout_t *dht_layout_ref (xlator_t *this, dht_layout_t *layout);
-xlator_t     *dht_first_up_subvol (xlator_t *this);
-xlator_t     *dht_last_up_subvol (xlator_t *this);
+xlator_t *dht_first_up_subvol (xlator_t *this);
+xlator_t *dht_last_up_subvol (xlator_t *this);
 
 int dht_build_child_loc (xlator_t *this, loc_t *child, loc_t *parent, char *name);
 
-int dht_filter_loc_subvol_key (xlator_t  *this, loc_t *loc, loc_t *new_loc,
+int dht_filter_loc_subvol_key (xlator_t *this, loc_t *loc, loc_t *new_loc,
                                xlator_t **subvol);
 
-int                                     dht_rename_cleanup (call_frame_t *frame);
+int dht_rename_cleanup (call_frame_t *frame);
 int dht_rename_links_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int32_t           op_ret, int32_t op_errno,
-                          inode_t          *inode, struct iatt *stbuf,
-                          struct iatt      *preparent, struct iatt *postparent,
-                          dict_t *xdata);
-
-int dht_fix_directory_layout (call_frame_t *frame,
-                              dht_selfheal_dir_cbk_t  dir_cbk,
-                              dht_layout_t           *layout);
-
-int dht_init_subvolumes (xlator_t *this, dht_conf_t *conf);
-
-/* migration/rebalance */
-int dht_start_rebalance_task (xlator_t *this, call_frame_t *frame);
-
-int dht_rebalance_in_progress_check (xlator_t *this, call_frame_t *frame);
-int dht_rebalance_complete_check (xlator_t *this, call_frame_t *frame);
-
-
-/* FOPS */
-int32_t dht_lookup (call_frame_t *frame,
-                    xlator_t *this,
-                    loc_t    *loc,
-                    dict_t   *xattr_req);
-
-int32_t dht_stat (call_frame_t *frame,
-                  xlator_t *this,
-                  loc_t    *loc, dict_t *xdata);
-
-int32_t dht_fstat (call_frame_t *frame,
-                   xlator_t *this,
-                   fd_t     *fd, dict_t *xdata);
-
-int32_t dht_truncate (call_frame_t *frame,
-                      xlator_t *this,
-                      loc_t    *loc,
-                      off_t     offset, dict_t *xdata);
-
-int32_t dht_ftruncate (call_frame_t *frame,
-                       xlator_t *this,
-                       fd_t     *fd,
-                       off_t     offset, dict_t *xdata);
-
-int32_t dht_access (call_frame_t *frame,
-                    xlator_t *this,
-                    loc_t    *loc,
-                    int32_t   mask, dict_t *xdata);
-
-int32_t dht_readlink (call_frame_t *frame,
-                      xlator_t *this,
-                      loc_t    *loc,
-                      size_t    size, dict_t *xdata);
-
-int32_t dht_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc,
-                   mode_t mode, dev_t rdev, mode_t umask, dict_t *xdata);
-
-int32_t dht_mkdir (call_frame_t *frame, xlator_t *this,
-                   loc_t *loc, mode_t mode, mode_t umask, dict_t *xdata);
-
-int32_t dht_unlink (call_frame_t *frame,
-                    xlator_t *this,
-                    loc_t    *loc, int xflag, dict_t *xdata);
-
-int32_t dht_rmdir (call_frame_t *frame, xlator_t *this,
-                   loc_t    *loc, int flags, dict_t *xdata);
-
-int32_t dht_symlink (call_frame_t   *frame, xlator_t *this,
-                     const char *linkpath, loc_t *loc, mode_t umask,
-                     dict_t *xdata);
-
-int32_t dht_rename (call_frame_t *frame,
-                    xlator_t *this,
-                    loc_t    *oldloc,
-                    loc_t    *newloc, dict_t *xdata);
-
-int32_t dht_link (call_frame_t *frame,
-                  xlator_t *this,
-                  loc_t    *oldloc,
-                  loc_t    *newloc, dict_t *xdata);
-
-int32_t dht_create (call_frame_t *frame, xlator_t *this,
-                    loc_t    *loc, int32_t flags, mode_t mode,
-                    mode_t umask, fd_t     *fd, dict_t *params);
-
-int32_t dht_open (call_frame_t *frame,
-                  xlator_t *this,
-                  loc_t    *loc,
-                  int32_t   flags, fd_t *fd, dict_t *xdata);
-
-int32_t dht_readv (call_frame_t *frame,
-                   xlator_t *this,
-                   fd_t     *fd,
-                   size_t    size,
-                   off_t     offset, uint32_t flags, dict_t *xdata);
-
-int32_t dht_writev (call_frame_t      *frame,
-                    xlator_t      *this,
-                    fd_t          *fd,
-                    struct iovec  *vector,
-                    int32_t        count,
-                    off_t          offset,
-                    uint32_t       flags,
-                    struct iobref *iobref, dict_t *xdata);
-
-int32_t dht_flush (call_frame_t *frame,
-                   xlator_t *this,
-                   fd_t     *fd, dict_t *xdata);
-
-int32_t dht_fsync (call_frame_t *frame,
-                   xlator_t *this,
-                   fd_t     *fd,
-                   int32_t   datasync, dict_t *xdata);
-
-int32_t dht_opendir (call_frame_t *frame,
-                     xlator_t *this,
-                     loc_t    *loc, fd_t *fd, dict_t *xdata);
-
-int32_t dht_fsyncdir (call_frame_t *frame,
-                      xlator_t *this,
-                      fd_t     *fd,
-                      int32_t   datasync, dict_t *xdata);
-
-int32_t dht_statfs (call_frame_t *frame,
-                    xlator_t *this,
-                    loc_t    *loc, dict_t *xdata);
-
-int32_t dht_setxattr (call_frame_t *frame,
-                      xlator_t *this,
-                      loc_t    *loc,
-                      dict_t   *dict,
-                      int32_t   flags, dict_t *xdata);
-
-int32_t dht_getxattr (call_frame_t   *frame,
-                      xlator_t   *this,
-                      loc_t      *loc,
-                      const char *name, dict_t *xdata);
-
-int32_t dht_fsetxattr (call_frame_t *frame,
-                       xlator_t *this,
-                       fd_t     *fd,
-                       dict_t   *dict,
-                       int32_t   flags, dict_t *xdata);
-
-int32_t dht_fgetxattr (call_frame_t   *frame,
-                       xlator_t   *this,
-                       fd_t       *fd,
-                       const char *name, dict_t *xdata);
-
-int32_t dht_removexattr (call_frame_t   *frame,
-                         xlator_t   *this,
-                         loc_t      *loc,
-                         const char *name, dict_t *xdata);
-int32_t dht_fremovexattr (call_frame_t   *frame,
-                          xlator_t   *this,
-                          fd_t      *fd,
-                          const char *name, dict_t *xdata);
-
-int32_t dht_lk (call_frame_t        *frame,
-                xlator_t        *this,
-                fd_t            *fd,
-                int32_t          cmd,
-                struct gf_flock *flock, dict_t *xdata);
-
-int32_t dht_inodelk (call_frame_t *frame, xlator_t *this,
-                     const char      *volume, loc_t *loc, int32_t cmd,
-                     struct gf_flock *flock, dict_t *xdata);
-
-int32_t dht_finodelk (call_frame_t        *frame, xlator_t *this,
-                      const char      *volume, fd_t *fd, int32_t cmd,
-                      struct gf_flock *flock, dict_t *xdata);
-
-int32_t dht_entrylk (call_frame_t    *frame, xlator_t *this,
-                     const char  *volume, loc_t *loc, const char *basename,
-                     entrylk_cmd  cmd, entrylk_type type, dict_t *xdata);
-
-int32_t dht_fentrylk (call_frame_t    *frame, xlator_t *this,
-                      const char  *volume, fd_t *fd, const char *basename,
-                      entrylk_cmd  cmd, entrylk_type type, dict_t *xdata);
-
-int32_t dht_readdir (call_frame_t  *frame,
-                     xlator_t *this,
-                     fd_t     *fd,
-                     size_t    size, off_t off, dict_t *xdata);
-
-int32_t dht_readdirp (call_frame_t *frame,
-                      xlator_t *this,
-                      fd_t     *fd,
-                      size_t    size, off_t off, dict_t *dict);
-
-int32_t dht_xattrop (call_frame_t           *frame,
-                     xlator_t           *this,
-                     loc_t              *loc,
-                     gf_xattrop_flags_t  flags,
-                     dict_t             *dict, dict_t *xdata);
-
-int32_t dht_fxattrop (call_frame_t *frame,
-                      xlator_t           *this,
-                      fd_t               *fd,
-                      gf_xattrop_flags_t  flags,
-                      dict_t             *dict, dict_t *xdata);
-
-int32_t dht_forget (xlator_t *this, inode_t *inode);
-int32_t dht_setattr (call_frame_t  *frame, xlator_t *this, loc_t *loc,
-                     struct iatt   *stbuf, int32_t valid, dict_t *xdata);
-int32_t dht_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                      struct iatt  *stbuf, int32_t valid, dict_t *xdata);
-int32_t dht_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd,
-		      int32_t mode, off_t offset, size_t len, dict_t *xdata);
-int32_t dht_discard(call_frame_t *frame, xlator_t *this, fd_t *fd,
-		    off_t offset, size_t len, dict_t *xdata);
-int32_t dht_zerofill(call_frame_t *frame, xlator_t *this, fd_t *fd,
-                    off_t offset, size_t len, dict_t *xdata);
-
-int32_t dht_init (xlator_t *this);
-void    dht_fini (xlator_t *this);
-int     dht_reconfigure (xlator_t *this, dict_t *options);
-int32_t dht_notify (xlator_t *this, int32_t event, void *data, ...);
-
-/* definitions for nufa/switch */
-int dht_revalidate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int op_ret, int op_errno, inode_t *inode,
-                        struct iatt *stbuf, dict_t *xattr,
-                        struct iatt *postparent);
-int dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int op_ret, int op_errno, inode_t *inode,
-                        struct iatt *stbuf, dict_t *xattr,
-                        struct iatt *postparent);
-int dht_lookup_linkfile_cbk (call_frame_t *frame, void *cookie,
-                             xlator_t *this, int op_ret, int op_errno,
-                             inode_t *inode, struct iatt *stbuf, dict_t *xattr,
-                             struct iatt *postparent);
-int dht_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int op_ret, int op_errno,
-                    inode_t *inode, struct iatt *stbuf, dict_t *xattr,
-                    struct iatt *postparent);
-int dht_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                    int op_ret, int op_errno,
-                    fd_t *fd, inode_t *inode, struct iatt *stbuf,
-                    struct iatt *preparent, struct iatt *postparent,
-                    dict_t *xdata);
-int dht_newfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                     int op_ret, int op_errno,
-                     inode_t *inode, struct iatt *stbuf, struct iatt *preparent,
-                     struct iatt *postparent, dict_t *xdata);
-
-int
-gf_defrag_status_get (gf_defrag_info_t *defrag, dict_t *dict);
-
-int
-gf_defrag_stop (gf_defrag_info_t *defrag, dict_t *output);
-
-void*
-gf_defrag_start (void *this);
-
-int32_t
-gf_defrag_handle_hardlink (xlator_t *this, loc_t *loc, dict_t  *xattrs,
-                           struct iatt *stbuf);
-int
-dht_migrate_file (xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to,
-                 int flag);
-int
-dht_inode_ctx_layout_get (inode_t *inode, xlator_t *this,
-                          dht_layout_t **layout_int);
-int
-dht_inode_ctx_layout_set (inode_t *inode, xlator_t *this,
-                          dht_layout_t* layout_int);
-int
-dht_inode_ctx_time_update (inode_t *inode, xlator_t *this, struct iatt *stat,
-                           int32_t update_ctx);
-
-int dht_inode_ctx_get (inode_t *inode, xlator_t *this, dht_inode_ctx_t **ctx);
-int dht_inode_ctx_set (inode_t *inode, xlator_t *this, dht_inode_ctx_t *ctx);
-int
-dht_dir_attr_heal (void *data);
-int
-dht_dir_attr_heal_done (int ret, call_frame_t *sync_frame, void *data);
-int
-dht_dir_has_layout (dict_t *xattr, char *name);
-gf_boolean_t
-dht_is_subvol_in_layout (dht_layout_t *layout, xlator_t *xlator);
-xlator_t *
-dht_subvol_with_free_space_inodes (xlator_t *this, xlator_t *subvol,
-                                   dht_layout_t *layout);
-xlator_t *
-dht_subvol_maxspace_nonzeroinode (xlator_t *this, xlator_t *subvol,
-                                  dht_layout_t *layout);
-int
-dht_linkfile_attr_heal (call_frame_t *frame, xlator_t *this);
-
-void
-dht_layout_dump (dht_layout_t  *layout, const char *prefix);
-int32_t
-dht_priv_dump (xlator_t *this);
-int32_t
-dht_inodectx_dump (xlator_t *this, inode_t *inode);
-
-int
-dht_inode_ctx_get1 (xlator_t *this, inode_t *inode, xlator_t **subvol);
+                      int32_t op_ret, int32_t op_errno,
+                      inode_t *inode, struct iatt *stbuf,
+                      struct iatt *preparent, struct iatt *postparent);
 
-#endif/* _DHT_H */
+#endif /* _DHT_H */
diff --git a/xlators/cluster/dht/src/dht-diskusage.c b/xlators/cluster/dht/src/dht-diskusage.c
index fe3955ecb..38e8ed892 100644
--- a/xlators/cluster/dht/src/dht-diskusage.c
+++ b/xlators/cluster/dht/src/dht-diskusage.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -26,389 +35,224 @@
 
 int
 dht_du_info_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-		 int op_ret, int op_errno, struct statvfs *statvfs,
-                 dict_t *xdata)
+                 int op_ret, int op_errno, struct statvfs *statvfs)
 {
-	dht_conf_t    *conf         = NULL;
-	call_frame_t  *prev          = NULL;
-	int            this_call_cnt = 0;
-	int            i = 0;
-	double         percent = 0;
-	double         percent_inodes = 0;
-	uint64_t       bytes = 0;
-
-	conf = this->private;
-	prev = cookie;
-
-	if (op_ret == -1) {
-		gf_log (this->name, GF_LOG_WARNING,
-			"failed to get disk info from %s", prev->this->name);
-		goto out;
-	}
-
-	if (statvfs && statvfs->f_blocks) {
-		percent = (statvfs->f_bavail * 100) / statvfs->f_blocks;
-		bytes = (statvfs->f_bavail * statvfs->f_frsize);
-	}
-
-	if (statvfs && statvfs->f_files) {
-		percent_inodes = (statvfs->f_ffree * 100) / statvfs->f_files;
-	} else {
-		/* set percent inodes to 100 for dynamically allocated inode filesystems
-		   this logic holds good so that, distribute has nothing to worry about
-		   total inodes rather let the 'create()' to be scheduled on the hashed
-		   subvol regardless of the total inodes. since we have no awareness on
-		   loosing inodes this logic fits well
-		*/
-		percent_inodes = 100;
-	}
-
-	LOCK (&conf->subvolume_lock);
-	{
-		for (i = 0; i < conf->subvolume_cnt; i++)
-			if (prev->this == conf->subvolumes[i]) {
-				conf->du_stats[i].avail_percent = percent;
-				conf->du_stats[i].avail_space   = bytes;
-				conf->du_stats[i].avail_inodes  = percent_inodes;
-				gf_log (this->name, GF_LOG_DEBUG,
-					"on subvolume '%s': avail_percent is: "
-					"%.2f and avail_space is: %"PRIu64" "
-					"and avail_inodes is: %.2f",
-					prev->this->name,
-					conf->du_stats[i].avail_percent,
-					conf->du_stats[i].avail_space,
-					conf->du_stats[i].avail_inodes);
-			}
-	}
-	UNLOCK (&conf->subvolume_lock);
+        dht_conf_t    *conf         = NULL;
+        call_frame_t  *prev          = NULL;
+        int            this_call_cnt = 0;
+        int            i = 0;
+        double         percent = 0;
+        uint64_t       bytes = 0;
+
+        conf = this->private;
+        prev = cookie;
+
+        if (op_ret == -1) {
+                gf_log (this->name, GF_LOG_WARNING,
+                        "failed to get disk info from %s", prev->this->name);
+                goto out;
+        }
+
+        if (statvfs && statvfs->f_blocks) {
+                percent = (statvfs->f_bfree * 100) / statvfs->f_blocks;
+                bytes = (statvfs->f_bfree * statvfs->f_frsize);
+        }
+
+        LOCK (&conf->subvolume_lock);
+        {
+                for (i = 0; i < conf->subvolume_cnt; i++)
+                        if (prev->this == conf->subvolumes[i]) {
+                                conf->du_stats[i].avail_percent = percent;
+                                conf->du_stats[i].avail_space   = bytes;
+                                gf_log (this->name, GF_LOG_TRACE,
+                                        "on subvolume '%s': avail_percent is: "
+                                        "%.2f and avail_space is: %"PRIu64"",
+                                        prev->this->name,
+                                        conf->du_stats[i].avail_percent,
+                                        conf->du_stats[i].avail_space);
+                        }
+        }
+        UNLOCK (&conf->subvolume_lock);
 
 out:
-	this_call_cnt = dht_frame_return (frame);
-	if (is_last_call (this_call_cnt))
-		DHT_STACK_DESTROY (frame);
+        this_call_cnt = dht_frame_return (frame);
+        if (is_last_call (this_call_cnt))
+                DHT_STACK_DESTROY (frame);
 
-	return 0;
+        return 0;
 }
 
 int
 dht_get_du_info_for_subvol (xlator_t *this, int subvol_idx)
 {
-	dht_conf_t    *conf         = NULL;
-	call_frame_t  *statfs_frame = NULL;
-	dht_local_t   *statfs_local = NULL;
-	call_pool_t   *pool         = NULL;
-	loc_t          tmp_loc      = {0,};
-
-	conf = this->private;
-	pool = this->ctx->pool;
-
-	statfs_frame = create_frame (this, pool);
-	if (!statfs_frame) {
-		goto err;
-	}
-
-	/* local->fop value is not used in this case */
-	statfs_local = dht_local_init (statfs_frame, NULL, NULL,
-				       GF_FOP_MAXVALUE);
-	if (!statfs_local) {
-		goto err;
-	}
-
-        /* make it root gfid, should be enough to get the proper info back */
-        tmp_loc.gfid[15] = 1;
-
-	statfs_local->call_cnt = 1;
-	STACK_WIND (statfs_frame, dht_du_info_cbk,
-		    conf->subvolumes[subvol_idx],
-		    conf->subvolumes[subvol_idx]->fops->statfs,
-		    &tmp_loc, NULL);
-
-	return 0;
+        dht_conf_t    *conf         = NULL;
+        call_frame_t  *statfs_frame = NULL;
+        dht_local_t   *statfs_local = NULL;
+        call_pool_t   *pool         = NULL;
+
+        conf = this->private;
+        pool = this->ctx->pool;
+
+        statfs_frame = create_frame (this, pool);
+        if (!statfs_frame) {
+                goto err;
+        }
+
+        statfs_local = dht_local_init (statfs_frame);
+        if (!statfs_local) {
+                goto err;
+        }
+
+        loc_t tmp_loc = { .inode = NULL,
+                          .path = "/",
+        };
+
+        statfs_local->call_cnt = 1;
+        STACK_WIND (statfs_frame, dht_du_info_cbk,
+                    conf->subvolumes[subvol_idx],
+                    conf->subvolumes[subvol_idx]->fops->statfs,
+                    &tmp_loc);
+
+        return 0;
 err:
-	if (statfs_frame)
-		DHT_STACK_DESTROY (statfs_frame);
+        if (statfs_frame)
+                DHT_STACK_DESTROY (statfs_frame);
 
-	return -1;
+        return -1;
 }
 
 int
 dht_get_du_info (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
-	int            i            = 0;
-	dht_conf_t    *conf         = NULL;
-	call_frame_t  *statfs_frame = NULL;
-	dht_local_t   *statfs_local = NULL;
-	struct timeval tv           = {0,};
-        loc_t          tmp_loc      = {0,};
-
-	conf  = this->private;
-
-	gettimeofday (&tv, NULL);
-
-        /* make it root gfid, should be enough to get the proper
-           info back */
-        tmp_loc.gfid[15] = 1;
-
-	if (tv.tv_sec > (conf->refresh_interval
-			 + conf->last_stat_fetch.tv_sec)) {
-
-		statfs_frame = copy_frame (frame);
-		if (!statfs_frame) {
-			goto err;
-		}
-
-		/* In this case, 'local->fop' is not used */
-		statfs_local = dht_local_init (statfs_frame, loc, NULL,
-					       GF_FOP_MAXVALUE);
-		if (!statfs_local) {
-			goto err;
-		}
-
-		statfs_local->call_cnt = conf->subvolume_cnt;
-		for (i = 0; i < conf->subvolume_cnt; i++) {
-			STACK_WIND (statfs_frame, dht_du_info_cbk,
-				    conf->subvolumes[i],
-				    conf->subvolumes[i]->fops->statfs,
-				    &tmp_loc, NULL);
-		}
-
-		conf->last_stat_fetch.tv_sec = tv.tv_sec;
-	}
-	return 0;
-err:
-	if (statfs_frame)
-		DHT_STACK_DESTROY (statfs_frame);
+        int            i = 0;
+        dht_conf_t    *conf         = NULL;
+        call_frame_t  *statfs_frame = NULL;
+        dht_local_t   *statfs_local = NULL;
+        struct timeval tv = {0,};
 
-	return -1;
-}
+        conf  = this->private;
 
+        gettimeofday (&tv, NULL);
+        if (tv.tv_sec > (conf->refresh_interval
+                         + conf->last_stat_fetch.tv_sec)) {
 
-gf_boolean_t
-dht_is_subvol_filled (xlator_t *this, xlator_t *subvol)
-{
-	int         i = 0;
-	dht_conf_t *conf = NULL;
-	gf_boolean_t subvol_filled_inodes = _gf_false;
-	gf_boolean_t subvol_filled_space = _gf_false;
-	gf_boolean_t is_subvol_filled = _gf_false;
-
-	conf = this->private;
-
-	/* Check for values above specified percent or free disk */
-	LOCK (&conf->subvolume_lock);
-	{
-		for (i = 0; i < conf->subvolume_cnt; i++) {
-			if (subvol == conf->subvolumes[i]) {
-				if (conf->disk_unit == 'p') {
-					if (conf->du_stats[i].avail_percent <
-					    conf->min_free_disk) {
-						subvol_filled_space = _gf_true;
-						break;
-					}
-
-				} else {
-					if (conf->du_stats[i].avail_space <
-					    conf->min_free_disk) {
-						subvol_filled_space = _gf_true;
-						break;
-					}
-				}
-				if (conf->du_stats[i].avail_inodes <
-				    conf->min_free_inodes) {
-					subvol_filled_inodes = _gf_true;
-					break;
-				}
-			}
-		}
-	}
-	UNLOCK (&conf->subvolume_lock);
-
-	if (subvol_filled_space && conf->subvolume_status[i]) {
-		if (!(conf->du_stats[i].log++ % (GF_UNIVERSAL_ANSWER * 10))) {
-			gf_log (this->name, GF_LOG_WARNING,
-				"disk space on subvolume '%s' is getting "
-				"full (%.2f %%), consider adding more nodes",
-				subvol->name,
-				(100 - conf->du_stats[i].avail_percent));
-		}
-	}
-
-	if (subvol_filled_inodes && conf->subvolume_status[i]) {
-		if (!(conf->du_stats[i].log++ % (GF_UNIVERSAL_ANSWER * 10))) {
-			gf_log (this->name, GF_LOG_CRITICAL,
-				"inodes on subvolume '%s' are at "
-				"(%.2f %%), consider adding more nodes",
-				subvol->name,
-				(100 - conf->du_stats[i].avail_inodes));
-		}
-	}
-
-	is_subvol_filled = (subvol_filled_space || subvol_filled_inodes);
-
-	return is_subvol_filled;
-}
-
-
-/*Get the best subvolume to create the file in*/
-xlator_t *
-dht_free_disk_available_subvol (xlator_t *this, xlator_t *subvol,
-                                dht_local_t *local)
-{
-	xlator_t   *avail_subvol = NULL;
-	dht_conf_t *conf = NULL;
-        dht_layout_t *layout = NULL;
-        loc_t      *loc = NULL;
+                statfs_frame = copy_frame (frame);
+                if (!statfs_frame) {
+                        goto err;
+                }
 
-	conf = this->private;
-        if (!local)
-                goto out;
-        loc = &local->loc;
-        if (!local->layout) {
-                layout = dht_layout_get (this, loc->parent);
-
-                if (!layout) {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "layout missing path=%s parent=%s",
-                                loc->path, uuid_utoa (loc->parent->gfid));
-                        goto out;
+                statfs_local = dht_local_init (statfs_frame);
+                if (!statfs_local) {
+                        goto err;
                 }
-        } else {
-                layout = dht_layout_ref (this, local->layout);
-        }
 
-        LOCK (&conf->subvolume_lock);
-	{
-                avail_subvol = dht_subvol_with_free_space_inodes(this, subvol,
-                                                                 layout);
-                if(!avail_subvol)
-                {
-                        avail_subvol = dht_subvol_maxspace_nonzeroinode(this,
-                                                                        subvol,
-                                                                        layout);
+                loc_copy (&statfs_local->loc, loc);
+                loc_t tmp_loc = { .inode = NULL,
+                                  .path = "/",
+                };
+
+                statfs_local->call_cnt = conf->subvolume_cnt;
+                for (i = 0; i < conf->subvolume_cnt; i++) {
+                        STACK_WIND (statfs_frame, dht_du_info_cbk,
+                                    conf->subvolumes[i],
+                                    conf->subvolumes[i]->fops->statfs,
+                                    &tmp_loc);
                 }
 
-	}
-	UNLOCK (&conf->subvolume_lock);
-out:
-	if (!avail_subvol) {
-		gf_log (this->name,
-                        GF_LOG_DEBUG,
-			"no subvolume has enough free space and/or inodes\
-                         to create");
-                avail_subvol = subvol;
-	}
+                conf->last_stat_fetch.tv_sec = tv.tv_sec;
+        }
+        return 0;
+err:
+        if (statfs_frame)
+                DHT_STACK_DESTROY (statfs_frame);
 
-        if (layout)
-                dht_layout_unref (this, layout);
-	return avail_subvol;
+        return -1;
 }
 
-static inline
-int32_t dht_subvol_has_err (xlator_t *this, dht_layout_t *layout)
-{
-        int ret = -1;
-        int i   = 0;
-
-        if (!this || !layout)
-                goto out;
 
-        /* check if subvol has layout errors, before selecting it */
-        for (i = 0; i < layout->cnt; i++) {
-                if (!strcmp (layout->list[i].xlator->name, this->name) &&
-                     (layout->list[i].err != 0)) {
-                        ret = -1;
-                        goto out;
-                }
-        }
-        ret = 0;
-out:
-        return ret;
-}
-
-/*Get subvolume which has both space and inodes more than the min criteria*/
-xlator_t *
-dht_subvol_with_free_space_inodes(xlator_t *this, xlator_t *subvol,
-                                  dht_layout_t *layout)
+int
+dht_is_subvol_filled (xlator_t *this, xlator_t *subvol)
 {
-        int i = 0;
-        double max = 0;
-        double max_inodes = 0;
-        int    ignore_subvol = 0;
-
-        xlator_t *avail_subvol = NULL;
+        int         i = 0;
+        int         subvol_filled = 0;
         dht_conf_t *conf = NULL;
 
         conf = this->private;
 
-        for(i=0; i < conf->subvolume_cnt; i++) {
-                /* check if subvol has layout errors, before selecting it */
-                ignore_subvol = dht_subvol_has_err (conf->subvolumes[i],
-                                                    layout);
-                if (ignore_subvol)
-                        continue;
-
-                if ((conf->disk_unit == 'p') &&
-                    (conf->du_stats[i].avail_percent > conf->min_free_disk) &&
-                    (conf->du_stats[i].avail_inodes  > conf->min_free_inodes)) {
-                        if ((conf->du_stats[i].avail_inodes > max_inodes) ||
-                            (conf->du_stats[i].avail_percent > max)) {
-                                max = conf->du_stats[i].avail_percent;
-                                max_inodes = conf->du_stats[i].avail_inodes;
-                                avail_subvol = conf->subvolumes[i];
+        /* Check for values above specified percent or free disk */
+        LOCK (&conf->subvolume_lock);
+        {
+                for (i = 0; i < conf->subvolume_cnt; i++) {
+                        if (subvol == conf->subvolumes[i]) {
+                                if (conf->disk_unit == 'p') {
+                                        if (conf->du_stats[i].avail_percent <
+                                            conf->min_free_disk) {
+                                                subvol_filled = 1;
+                                                break;
+                                        }
+                                } else {
+                                        if (conf->du_stats[i].avail_space <
+                                            conf->min_free_disk) {
+                                                subvol_filled = 1;
+                                                break;
+                                        }
+                                }
                         }
                 }
-
-                if ((conf->disk_unit != 'p') &&
-                    (conf->du_stats[i].avail_space > conf->min_free_disk) &&
-                    (conf->du_stats[i].avail_inodes  > conf->min_free_inodes)) {
-                        if ((conf->du_stats[i].avail_inodes > max_inodes) ||
-                            (conf->du_stats[i].avail_space > max)) {
-                                max = conf->du_stats[i].avail_space;
-                                max_inodes = conf->du_stats[i].avail_inodes;
-                                avail_subvol = conf->subvolumes[i];
-                        }
+        }
+        UNLOCK (&conf->subvolume_lock);
+
+        if (subvol_filled && conf->subvolume_status[i]) {
+                if (!(conf->du_stats[i].log++ % (GF_UNIVERSAL_ANSWER * 10))) {
+                        gf_log (this->name, GF_LOG_WARNING,
+                                "disk space on subvolume '%s' is getting "
+                                "full (%.2f %%), consider adding more nodes",
+                                subvol->name,
+                                (100 - conf->du_stats[i].avail_percent));
                 }
         }
 
-        return avail_subvol;
+        return subvol_filled;
 }
 
-
-/* Get subvol which has atleast one inode and maximum space */
 xlator_t *
-dht_subvol_maxspace_nonzeroinode (xlator_t *this, xlator_t *subvol,
-                                  dht_layout_t *layout)
+dht_free_disk_available_subvol (xlator_t *this, xlator_t *subvol)
 {
         int         i = 0;
-        double      max = 0;
-        int         ignore_subvol = 0;
-
+        double      max= 0;
         xlator_t   *avail_subvol = NULL;
         dht_conf_t *conf = NULL;
 
         conf = this->private;
 
-        for (i = 0; i < conf->subvolume_cnt; i++) {
-                /* check if subvol has layout errors, before selecting it */
-                ignore_subvol = dht_subvol_has_err (conf->subvolumes[i],
-                                                    layout);
-                if (ignore_subvol)
-                        continue;
-
-                if (conf->disk_unit == 'p') {
-                        if ((conf->du_stats[i].avail_percent > max)
-                            && (conf->du_stats[i].avail_inodes > 0 )) {
-                                max = conf->du_stats[i].avail_percent;
-                                avail_subvol = conf->subvolumes[i];
+        LOCK (&conf->subvolume_lock);
+        {
+                for (i = 0; i < conf->subvolume_cnt; i++) {
+                        if (conf->disk_unit == 'p') {
+                                if (conf->du_stats[i].avail_percent > max) {
+                                        max = conf->du_stats[i].avail_percent;
+                                        avail_subvol = conf->subvolumes[i];
+                                }
+                        } else {
+                                if (conf->du_stats[i].avail_space > max) {
+                                        max = conf->du_stats[i].avail_space;
+                                        avail_subvol = conf->subvolumes[i];
+                                }
                         }
-               } else {
-                         if ((conf->du_stats[i].avail_space > max)
-                            && (conf->du_stats[i].avail_inodes > 0)) {
-                                 max = conf->du_stats[i].avail_space;
-                                 avail_subvol = conf->subvolumes[i];
-                         }
-               }
+                }
+        }
+        UNLOCK (&conf->subvolume_lock);
+
+        if (!avail_subvol) {
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "no subvolume has enough free space to create");
         }
 
+        if (max < conf->min_free_disk)
+                avail_subvol = subvol;
+
+        if (!avail_subvol)
+                avail_subvol = subvol;
+
         return avail_subvol;
 }
diff --git a/xlators/cluster/dht/src/dht-hashfn.c b/xlators/cluster/dht/src/dht-hashfn.c
index 656cf23a0..c8ae74172 100644
--- a/xlators/cluster/dht/src/dht-hashfn.c
+++ b/xlators/cluster/dht/src/dht-hashfn.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -28,7 +37,6 @@ dht_hash_compute_internal (int type, const char *name, uint32_t *hash_p)
 
         switch (type) {
         case DHT_HASH_TYPE_DM:
-        case DHT_HASH_TYPE_DM_USER:
                 hash = gf_dm_hashfn (name, strlen (name));
                 break;
         default:
@@ -44,68 +52,30 @@ dht_hash_compute_internal (int type, const char *name, uint32_t *hash_p)
 }
 
 
-static inline
-gf_boolean_t
-dht_munge_name (const char *original, char *modified, size_t len, regex_t *re)
-{
-        regmatch_t      matches[2];
-        size_t          new_len;
-
-        if (regexec(re,original,2,matches,0) != REG_NOMATCH) {
-                if (matches[1].rm_so != -1) {
-                        new_len = matches[1].rm_eo - matches[1].rm_so;
-                        /* Equal would fail due to the NUL at the end. */
-                        if (new_len < len) {
-                                memcpy (modified,original+matches[1].rm_so,
-                                        new_len);
-                                modified[new_len] = '\0';
-                                return _gf_true;
-                        }
-                }
-        }
+#define MAKE_RSYNC_FRIENDLY_NAME(rsync_frndly_name, name) do {          \
+                rsync_frndly_name = (char *) name;                      \
+                if (name[0] == '.') {                                   \
+                        char *dot   = 0;                                \
+                        int namelen = 0;                                \
+                                                                        \
+                        dot = strrchr (name, '.');                      \
+                        if (dot && dot > (name + 1) && *(dot + 1)) {    \
+                                namelen = (dot - name);                 \
+                                rsync_frndly_name = alloca (namelen);   \
+                                strncpy (rsync_frndly_name, name + 1,   \
+                                         namelen);                      \
+                                rsync_frndly_name[namelen - 1] = 0;     \
+                        }                                               \
+                }                                                       \
+        } while (0);
 
-        /* This is guaranteed safe because of how the dest was allocated. */
-        strcpy(modified,original);
-        return _gf_false;
-}
 
 int
-dht_hash_compute (xlator_t *this, int type, const char *name, uint32_t *hash_p)
+dht_hash_compute (int type, const char *name, uint32_t *hash_p)
 {
-        char            *rsync_friendly_name    = NULL;
-        dht_conf_t      *priv                   = this->private;
-        size_t           len                    = 0;
-        gf_boolean_t     munged                 = _gf_false;
-
-        /*
-         * It wouldn't be safe to use alloca in an inline function that doesn't
-         * actually get inlined, and it wouldn't be efficient to do a real
-         * allocation, so we use alloca here (if needed) and pass that to the
-         * inline.
-         */
-
-        if (priv->extra_regex_valid) {
-                len = strlen(name) + 1;
-                rsync_friendly_name = alloca(len);
-                munged = dht_munge_name (name, rsync_friendly_name, len,
-                                         &priv->extra_regex);
-        }
-
-        if (!munged && priv->rsync_regex_valid) {
-                len = strlen(name) + 1;
-                rsync_friendly_name = alloca(len);
-                gf_log (this->name, GF_LOG_TRACE, "trying regex for %s", name);
-                munged = dht_munge_name (name, rsync_friendly_name, len,
-                                         &priv->rsync_regex);
-                if (munged) {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "munged down to %s", rsync_friendly_name);
-                }
-        }
+        char     *rsync_friendly_name = NULL;
 
-        if (!munged) {
-                rsync_friendly_name = (char *)name;
-        }
+        MAKE_RSYNC_FRIENDLY_NAME (rsync_friendly_name, name);
 
         return dht_hash_compute_internal (type, rsync_friendly_name, hash_p);
 }
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
index 311a48112..8c4926db5 100644
--- a/xlators/cluster/dht/src/dht-helper.c
+++ b/xlators/cluster/dht/src/dht-helper.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -18,28 +27,6 @@
 #include "xlator.h"
 #include "dht-common.h"
 
-static inline int
-dht_inode_ctx_set1 (xlator_t *this, inode_t *inode, xlator_t *subvol)
-{
-        uint64_t tmp_subvol = 0;
-
-        tmp_subvol = (long)subvol;
-        return inode_ctx_set1 (inode, this, &tmp_subvol);
-}
-
-int
-dht_inode_ctx_get1 (xlator_t *this, inode_t *inode, xlator_t **subvol)
-{
-        int ret = -1;
-        uint64_t tmp_subvol = 0;
-
-        ret =  inode_ctx_get1 (inode, this, &tmp_subvol);
-        if (tmp_subvol && subvol)
-                *subvol = (xlator_t *)tmp_subvol;
-
-        return ret;
-}
-
 
 int
 dht_frame_return (call_frame_t *frame)
@@ -62,43 +49,6 @@ dht_frame_return (call_frame_t *frame)
 }
 
 
-static uint64_t
-dht_bits_for (uint64_t num)
-{
-	uint64_t bits = 0, ctrl = 1;
-
-	while (ctrl < num) {
-		ctrl *= 2;
-		bits ++;
-	}
-
-	return bits;
-}
-
-/*
- * A slightly "updated" version of the algorithm described in the commit log
- * is used here.
- *
- * The only enhancement is that:
- *
- * - The number of bits used by the backend filesystem for HUGE d_off which
- *   is described as 63, and
- * - The number of bits used by the d_off presented by the transformation
- *   upwards which is described as 64, are both made "configurable."
- */
-
-
-#define BACKEND_D_OFF_BITS 63
-#define PRESENT_D_OFF_BITS 63
-
-#define ONE 1ULL
-#define MASK (~0ULL)
-#define PRESENT_MASK (MASK >> (64 - PRESENT_D_OFF_BITS))
-#define BACKEND_MASK (MASK >> (64 - BACKEND_D_OFF_BITS))
-
-#define TOP_BIT (ONE << (PRESENT_D_OFF_BITS - 1))
-#define SHIFT_BITS (max (0, (BACKEND_D_OFF_BITS - PRESENT_D_OFF_BITS + 1)))
-
 int
 dht_itransform (xlator_t *this, xlator_t *subvol, uint64_t x, uint64_t *y_p)
 {
@@ -106,9 +56,6 @@ dht_itransform (xlator_t *this, xlator_t *subvol, uint64_t x, uint64_t *y_p)
         int         cnt = 0;
         int         max = 0;
         uint64_t    y = 0;
-        uint64_t    hi_mask = 0;
-        uint64_t    off_mask = 0;
-        int         max_bits = 0;
 
         if (x == ((uint64_t) -1)) {
                 y = (uint64_t) -1;
@@ -122,23 +69,7 @@ dht_itransform (xlator_t *this, xlator_t *subvol, uint64_t x, uint64_t *y_p)
         max = conf->subvolume_cnt;
         cnt = dht_subvol_cnt (this, subvol);
 
-	if (max == 1) {
-		y = x;
-		goto out;
-	}
-
-        max_bits = dht_bits_for (max);
-
-        hi_mask = ~(PRESENT_MASK >> (max_bits + 1));
-
-        if (x & hi_mask) {
-                /* HUGE d_off */
-                off_mask = MASK << max_bits;
-                y = TOP_BIT | ((x >> SHIFT_BITS) & off_mask) | cnt;
-        } else {
-                /* small d_off */
-                y = ((x * max) + cnt);
-        }
+        y = ((x * max) + cnt);
 
 out:
         if (y_p)
@@ -158,7 +89,7 @@ dht_filter_loc_subvol_key (xlator_t *this, loc_t *loc, loc_t *new_loc,
         int            ret       = 0; /* not found */
 
         /* Why do other tasks if first required 'char' itself is not there */
-        if (!new_loc || !loc || !loc->name || !strchr (loc->name, '@'))
+        if (loc->name && !strchr (loc->name, '@'))
                 goto out;
 
         trav = this->children;
@@ -186,6 +117,7 @@ dht_filter_loc_subvol_key (xlator_t *this, loc_t *loc, loc_t *new_loc,
                                 new_loc->path   = ((new_path) ? new_path:
                                                    gf_strdup (loc->path));
                                 new_loc->name   = new_name;
+                                new_loc->ino    = loc->ino;
                                 new_loc->inode  = inode_ref (loc->inode);
                                 new_loc->parent = inode_ref (loc->parent);
                         }
@@ -198,8 +130,10 @@ dht_filter_loc_subvol_key (xlator_t *this, loc_t *loc, loc_t *new_loc,
 out:
         if (!ret) {
                 /* !success */
-                GF_FREE (new_path);
-                GF_FREE (new_name);
+                if (new_path)
+                        GF_FREE (new_path);
+                if (new_name)
+                        GF_FREE (new_name);
         }
         return ret;
 }
@@ -213,38 +147,16 @@ dht_deitransform (xlator_t *this, uint64_t y, xlator_t **subvol_p,
         int         max = 0;
         uint64_t    x = 0;
         xlator_t   *subvol = 0;
-        int         max_bits = 0;
-        uint64_t    off_mask = 0;
-        uint64_t    host_mask = 0;
 
         if (!this->private)
-                return -1;
+                goto out;
 
         conf = this->private;
         max = conf->subvolume_cnt;
 
-	if (max == 1) {
-		x = y;
-		cnt = 0;
-		goto out;
-	}
-
-        if (y & TOP_BIT) {
-                /* HUGE d_off */
-                max_bits = dht_bits_for (max);
-                off_mask = (MASK << max_bits);
-                host_mask = ~(off_mask);
-
-                x = ((y & ~TOP_BIT) & off_mask) << SHIFT_BITS;
-
-                cnt = y & host_mask;
-	} else {
-                /* small d_off */
-                cnt = y % max;
-                x = y / max;
-        }
+        cnt = y % max;
+        x   = y / max;
 
-out:
         subvol = conf->subvolumes[cnt];
 
         if (subvol_p)
@@ -253,6 +165,7 @@ out:
         if (x_p)
                 *x_p = x;
 
+out:
         return 0;
 }
 
@@ -303,72 +216,58 @@ dht_local_wipe (xlator_t *this, dht_local_t *local)
                 local->selfheal.layout = NULL;
         }
 
-        GF_FREE (local->newpath);
-
-        GF_FREE (local->key);
-
-        GF_FREE (local->rebalance.vector);
+        if (local->newpath) {
+                GF_FREE (local->newpath);
+        }
 
-        if (local->rebalance.iobref)
-                iobref_unref (local->rebalance.iobref);
+        if (local->key) {
+                GF_FREE (local->key);
+        }
 
-        mem_put (local);
+        GF_FREE (local);
 }
 
 
 dht_local_t *
-dht_local_init (call_frame_t *frame, loc_t *loc, fd_t *fd, glusterfs_fop_t fop)
+dht_local_init (call_frame_t *frame)
 {
         dht_local_t *local = NULL;
-        inode_t     *inode = NULL;
-        int          ret   = 0;
 
-        local = mem_get0 (THIS->local_pool);
+        /* TODO: use mem-pool */
+        local = GF_CALLOC (1, sizeof (*local),
+                           gf_dht_mt_dht_local_t);
+
         if (!local)
-                goto out;
+                return NULL;
 
-        if (loc) {
-                ret = loc_copy (&local->loc, loc);
-                if (ret)
-                        goto out;
+        local->op_ret = -1;
+        local->op_errno = EUCLEAN;
 
-                inode = loc->inode;
-        }
+        frame->local = local;
 
-        if (fd) {
-                local->fd = fd_ref (fd);
-                if (!inode)
-                        inode = fd->inode;
-        }
+        return local;
+}
 
-        local->op_ret   = -1;
-        local->op_errno = EUCLEAN;
-        local->fop      = fop;
 
-        if (inode) {
-                local->layout   = dht_layout_get (frame->this, inode);
-                local->cached_subvol = dht_subvol_get_cached (frame->this,
-                                                              inode);
-        }
+char *
+basestr (const char *str)
+{
+        char *basestr = NULL;
 
-        frame->local = local;
+        basestr = strrchr (str, '/');
+        if (basestr)
+                basestr ++;
 
-out:
-        if (ret) {
-                if (local)
-                        mem_put (local);
-                local = NULL;
-        }
-        return local;
+        return basestr;
 }
 
+
 xlator_t *
 dht_first_up_subvol (xlator_t *this)
 {
         dht_conf_t *conf = NULL;
         xlator_t   *child = NULL;
         int         i = 0;
-        time_t      time = 0;
 
         conf = this->private;
         if (!conf)
@@ -377,14 +276,9 @@ dht_first_up_subvol (xlator_t *this)
         LOCK (&conf->subvolume_lock);
         {
                 for (i = 0; i < conf->subvolume_cnt; i++) {
-                        if (conf->subvol_up_time[i]) {
-                                if (!time) {
-                                        time = conf->subvol_up_time[i];
-                                        child = conf->subvolumes[i];
-                                } else if (time > conf->subvol_up_time[i]) {
-                                        time  = conf->subvol_up_time[i];
-                                        child = conf->subvolumes[i];
-                                }
+                        if (conf->subvolume_status[i]) {
+                                child = conf->subvolumes[i];
+                                break;
                         }
                 }
         }
@@ -426,23 +320,17 @@ dht_subvol_get_hashed (xlator_t *this, loc_t *loc)
         dht_layout_t *layout = NULL;
         xlator_t     *subvol = NULL;
 
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO (this->name, loc, out);
-
-        if (__is_root_gfid (loc->gfid)) {
+        if (is_fs_root (loc)) {
                 subvol = dht_first_up_subvol (this);
                 goto out;
         }
 
-        GF_VALIDATE_OR_GOTO (this->name, loc->parent, out);
-        GF_VALIDATE_OR_GOTO (this->name, loc->name, out);
-
         layout = dht_layout_get (this, loc->parent);
 
         if (!layout) {
                 gf_log (this->name, GF_LOG_DEBUG,
-                        "layout missing path=%s parent=%s",
-                        loc->path, uuid_utoa (loc->parent->gfid));
+                        "layout missing path=%s parent=%"PRId64,
+                        loc->path, loc->parent->ino);
                 goto out;
         }
 
@@ -470,8 +358,6 @@ dht_subvol_get_cached (xlator_t *this, inode_t *inode)
         dht_layout_t *layout = NULL;
         xlator_t     *subvol = NULL;
 
-        GF_VALIDATE_OR_GOTO (this->name, this, out);
-        GF_VALIDATE_OR_GOTO (this->name, inode, out);
 
         layout = dht_layout_get (this, inode);
 
@@ -513,36 +399,7 @@ out:
         return next;
 }
 
-/* This func wraps around, if prev is actually the last subvol.
- */
-xlator_t *
-dht_subvol_next_available (xlator_t *this, xlator_t *prev)
-{
-        dht_conf_t *conf = NULL;
-        int         i = 0;
-        xlator_t   *next = NULL;
-
-        conf = this->private;
-        if (!conf)
-                goto out;
 
-        for (i = 0; i < conf->subvolume_cnt; i++) {
-                if (conf->subvolumes[i] == prev) {
-                        /* if prev is last in conf->subvolumes, then wrap
-                         * around.
-                         */
-                        if ((i + 1) < conf->subvolume_cnt) {
-                                next = conf->subvolumes[i + 1];
-                        } else {
-                                next = conf->subvolumes[0];
-                        }
-                        break;
-                }
-        }
-
-out:
-        return next;
-}
 int
 dht_subvol_cnt (xlator_t *this, xlator_t *subvol)
 {
@@ -571,15 +428,6 @@ out:
                         (a) = (b);              \
         } while (0)
 
-
-#define set_if_greater_time(a, an, b, bn) do {                          \
-                if (((a) < (b)) || (((a) == (b)) && ((an) < (bn)))){    \
-                        (a) = (b);                                      \
-                        (an) = (bn);                                    \
-                }                                                       \
-        } while (0)                                                     \
-
-
 int
 dht_iatt_merge (xlator_t *this, struct iatt *to,
                 struct iatt *from, xlator_t *subvol)
@@ -591,7 +439,8 @@ dht_iatt_merge (xlator_t *this, struct iatt *to,
 
         uuid_copy (to->ia_gfid, from->ia_gfid);
 
-        to->ia_ino      = from->ia_ino;
+        dht_itransform (this, subvol, from->ia_ino, &to->ia_ino);
+
         to->ia_prot     = from->ia_prot;
         to->ia_type     = from->ia_type;
         to->ia_nlink    = from->ia_nlink;
@@ -603,12 +452,9 @@ dht_iatt_merge (xlator_t *this, struct iatt *to,
         set_if_greater (to->ia_uid, from->ia_uid);
         set_if_greater (to->ia_gid, from->ia_gid);
 
-        set_if_greater_time(to->ia_atime, to->ia_atime_nsec,
-                            from->ia_atime, from->ia_atime_nsec);
-        set_if_greater_time (to->ia_mtime, to->ia_mtime_nsec,
-                             from->ia_mtime, from->ia_mtime_nsec);
-        set_if_greater_time (to->ia_ctime, to->ia_ctime_nsec,
-                             from->ia_ctime, from->ia_ctime_nsec);
+        set_if_greater (to->ia_atime, from->ia_atime);
+        set_if_greater (to->ia_mtime, from->ia_mtime);
+        set_if_greater (to->ia_ctime, from->ia_ctime);
 
         return 0;
 }
@@ -645,503 +491,3 @@ err:
         loc_wipe (child);
         return -1;
 }
-
-
-
-int
-dht_init_subvolumes (xlator_t *this, dht_conf_t *conf)
-{
-        xlator_list_t *subvols = NULL;
-        int            cnt = 0;
-
-        if (!conf)
-                return -1;
-
-        for (subvols = this->children; subvols; subvols = subvols->next)
-                cnt++;
-
-        conf->subvolumes = GF_CALLOC (cnt, sizeof (xlator_t *),
-                                      gf_dht_mt_xlator_t);
-        if (!conf->subvolumes) {
-                return -1;
-        }
-        conf->subvolume_cnt = cnt;
-
-        cnt = 0;
-        for (subvols = this->children; subvols; subvols = subvols->next)
-                conf->subvolumes[cnt++] = subvols->xlator;
-
-        conf->subvolume_status = GF_CALLOC (cnt, sizeof (char),
-                                            gf_dht_mt_char);
-        if (!conf->subvolume_status) {
-                return -1;
-        }
-
-        conf->last_event = GF_CALLOC (cnt, sizeof (int),
-                                      gf_dht_mt_char);
-        if (!conf->last_event) {
-                return -1;
-        }
-
-        conf->subvol_up_time = GF_CALLOC (cnt, sizeof (time_t),
-                                          gf_dht_mt_subvol_time);
-        if (!conf->subvol_up_time) {
-                return -1;
-        }
-
-        conf->du_stats = GF_CALLOC (conf->subvolume_cnt, sizeof (dht_du_t),
-                                    gf_dht_mt_dht_du_t);
-        if (!conf->du_stats) {
-                return -1;
-        }
-
-        conf->decommissioned_bricks = GF_CALLOC (cnt, sizeof (xlator_t *),
-                                                 gf_dht_mt_xlator_t);
-        if (!conf->decommissioned_bricks) {
-                return -1;
-        }
-
-        return 0;
-}
-
-
-
-
-static int
-dht_migration_complete_check_done (int op_ret, call_frame_t *frame, void *data)
-{
-        dht_local_t *local = NULL;
-
-        local = frame->local;
-
-        local->rebalance.target_op_fn (THIS, frame, op_ret);
-
-        return 0;
-}
-
-
-int
-dht_migration_complete_check_task (void *data)
-{
-        int           ret      = -1;
-        xlator_t     *src_node = NULL;
-        xlator_t     *dst_node = NULL;
-        dht_local_t  *local    = NULL;
-        dict_t       *dict     = NULL;
-        dht_layout_t *layout   = NULL;
-        struct iatt   stbuf    = {0,};
-        xlator_t     *this     = NULL;
-        call_frame_t *frame    = NULL;
-        loc_t         tmp_loc  = {0,};
-        char         *path     = NULL;
-        dht_conf_t   *conf     = NULL;
-        inode_t      *inode    = NULL;
-        fd_t         *iter_fd  = NULL;
-        uint64_t      tmp_subvol = 0;
-        int           open_failed = 0;
-
-        this  = THIS;
-        frame = data;
-        local = frame->local;
-        conf = this->private;
-
-        src_node = local->cached_subvol;
-
-        if (!local->loc.inode && !local->fd)
-                goto out;
-
-        inode = (!local->fd) ? local->loc.inode : local->fd->inode;
-
-        /* getxattr on cached_subvol for 'linkto' value. Do path based getxattr
-         * as root:root. If a fd is already open, access check wont be done*/
-
-        if (!local->loc.inode) {
-                ret = syncop_fgetxattr (src_node, local->fd, &dict,
-                                        conf->link_xattr_name);
-        } else {
-                SYNCTASK_SETID (0, 0);
-                ret = syncop_getxattr (src_node, &local->loc, &dict,
-                                       conf->link_xattr_name);
-                SYNCTASK_SETID (frame->root->uid, frame->root->gid);
-        }
-
-        if (!ret)
-                dst_node = dht_linkfile_subvol (this, NULL, NULL, dict);
-
-        if (ret) {
-                if ((errno != ENOENT) || (!local->loc.inode)) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "%s: failed to get the 'linkto' xattr %s",
-                                local->loc.path, strerror (errno));
-                        goto out;
-                }
-                /* Need to do lookup on hashed subvol, then get the file */
-                ret = syncop_lookup (this, &local->loc, NULL, &stbuf, NULL,
-                                     NULL);
-                if (ret)
-                        goto out;
-                dst_node = dht_subvol_get_cached (this, local->loc.inode);
-        }
-
-        if (!dst_node) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to get the destination node",
-                        local->loc.path);
-                ret = -1;
-                goto out;
-        }
-
-        /* lookup on dst */
-        if (local->loc.inode) {
-                ret = syncop_lookup (dst_node, &local->loc, NULL, &stbuf, NULL, NULL);
-
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "%s: failed to lookup the file on %s",
-                                local->loc.path, dst_node->name);
-                        goto out;
-                }
-
-                if (uuid_compare (stbuf.ia_gfid, local->loc.inode->gfid)) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "%s: gfid different on the target file on %s",
-                                local->loc.path, dst_node->name);
-                        ret = -1;
-                        goto out;
-                }
-        }
-
-        /* update inode ctx (the layout) */
-        dht_layout_unref (this, local->layout);
-
-        ret = dht_layout_preset (this, dst_node, inode);
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "%s: could not set preset layout for subvol %s",
-                        local->loc.path, dst_node->name);
-                ret   = -1;
-                goto out;
-        }
-
-        layout = dht_layout_for_subvol (this, dst_node);
-        if (!layout) {
-                gf_log (this->name, GF_LOG_INFO,
-                        "%s: no pre-set layout for subvolume %s",
-                        local->loc.path, dst_node ? dst_node->name : "<nil>");
-                ret = -1;
-                goto out;
-        }
-
-        ret = dht_layout_set (this, inode, layout);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to set the new layout",
-                        local->loc.path);
-                goto out;
-        }
-
-        local->cached_subvol = dst_node;
-        ret = 0;
-
-        /* once we detect the migration complete, the inode-ctx2 is no more
-           required.. delete the ctx and also, it means, open() already
-           done on all the fd of inode */
-        ret = inode_ctx_reset1 (inode, this, &tmp_subvol);
-        if (tmp_subvol)
-                goto out;
-
-        if (list_empty (&inode->fd_list))
-                goto out;
-
-        /* perform open as root:root. There is window between linkfile
-         * creation(root:root) and setattr with the correct uid/gid
-         */
-        SYNCTASK_SETID(0, 0);
-
-        /* perform 'open()' on all the fd's present on the inode */
-        tmp_loc.inode = inode;
-        inode_path (inode, NULL, &path);
-        if (path)
-                tmp_loc.path = path;
-        list_for_each_entry (iter_fd, &inode->fd_list, inode_list) {
-                if (fd_is_anonymous (iter_fd))
-                        continue;
-
-                ret = syncop_open (dst_node, &tmp_loc,
-                                   iter_fd->flags, iter_fd);
-                if (ret == -1) {
-                        gf_log (this->name, GF_LOG_ERROR, "failed to open "
-                                "the fd (%p, flags=0%o) on file %s @ %s",
-                                iter_fd, iter_fd->flags, path, dst_node->name);
-                        open_failed = 1;
-                }
-        }
-        GF_FREE (path);
-
-        SYNCTASK_SETID (frame->root->uid, frame->root->gid);
-        if (open_failed) {
-                ret = -1;
-                goto out;
-        }
-        ret = 0;
-out:
-
-        return ret;
-}
-
-int
-dht_rebalance_complete_check (xlator_t *this, call_frame_t *frame)
-{
-        int         ret     = -1;
-
-        ret = synctask_new (this->ctx->env, dht_migration_complete_check_task,
-                            dht_migration_complete_check_done,
-                            frame, frame);
-        return ret;
-}
-
-/* During 'in-progress' state, both nodes should have the file */
-static int
-dht_inprogress_check_done (int op_ret, call_frame_t *sync_frame, void *data)
-{
-        dht_local_t *local = NULL;
-
-        local = sync_frame->local;
-
-        local->rebalance.target_op_fn (THIS, sync_frame, op_ret);
-
-        return 0;
-}
-
-static int
-dht_rebalance_inprogress_task (void *data)
-{
-        int           ret      = -1;
-        xlator_t     *src_node = NULL;
-        xlator_t     *dst_node = NULL;
-        dht_local_t  *local    = NULL;
-        dict_t       *dict     = NULL;
-        call_frame_t *frame    = NULL;
-        xlator_t     *this     = NULL;
-        char         *path     = NULL;
-        struct iatt   stbuf    = {0,};
-        loc_t         tmp_loc  = {0,};
-        dht_conf_t   *conf     = NULL;
-        inode_t      *inode    = NULL;
-        fd_t         *iter_fd  = NULL;
-        int           open_failed = 0;
-
-        this  = THIS;
-        frame = data;
-        local = frame->local;
-        conf = this->private;
-
-        src_node = local->cached_subvol;
-
-        if (!local->loc.inode && !local->fd)
-                goto out;
-
-        inode = (!local->fd) ? local->loc.inode : local->fd->inode;
-
-        /* getxattr on cached_subvol for 'linkto' value. Do path based getxattr
-         * as root:root. If a fd is already open, access check wont be done*/
-        if (local->loc.inode) {
-                SYNCTASK_SETID (0, 0);
-                ret = syncop_getxattr (src_node, &local->loc, &dict,
-                                       conf->link_xattr_name);
-                SYNCTASK_SETID (frame->root->uid, frame->root->gid);
-        } else {
-                ret = syncop_fgetxattr (src_node, local->fd, &dict,
-                                        conf->link_xattr_name);
-        }
-
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to get the 'linkto' xattr %s",
-                        local->loc.path, strerror (errno));
-                        goto out;
-        }
-
-        dst_node = dht_linkfile_subvol (this, NULL, NULL, dict);
-        if (!dst_node) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to get the 'linkto' xattr from dict",
-                        local->loc.path);
-                ret = -1;
-                goto out;
-        }
-
-        local->rebalance.target_node = dst_node;
-
-        if (local->loc.inode) {
-                /* lookup on dst */
-                ret = syncop_lookup (dst_node, &local->loc, NULL,
-                                     &stbuf, NULL, NULL);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "%s: failed to lookup the file on %s",
-                                local->loc.path, dst_node->name);
-                        goto out;
-                }
-
-                if (uuid_compare (stbuf.ia_gfid, local->loc.inode->gfid)) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "%s: gfid different on the target file on %s",
-                                local->loc.path, dst_node->name);
-                        ret = -1;
-                        goto out;
-                }
-        }
-
-        ret = 0;
-
-        if (list_empty (&inode->fd_list))
-                goto done;
-
-        /* perform open as root:root. There is window between linkfile
-         * creation(root:root) and setattr with the correct uid/gid
-         */
-        SYNCTASK_SETID (0, 0);
-
-        tmp_loc.inode = inode;
-        inode_path (inode, NULL, &path);
-        if (path)
-                tmp_loc.path = path;
-
-        list_for_each_entry (iter_fd, &inode->fd_list, inode_list) {
-                if (fd_is_anonymous (iter_fd))
-                        continue;
-
-                ret = syncop_open (dst_node, &tmp_loc,
-                                   iter_fd->flags, iter_fd);
-                if (ret == -1) {
-                        gf_log (this->name, GF_LOG_ERROR, "failed to send open "
-                                "the fd (%p, flags=0%o) on file %s @ %s",
-                                iter_fd, iter_fd->flags, path, dst_node->name);
-                        open_failed = 1;
-                }
-        }
-        GF_FREE (path);
-
-        SYNCTASK_SETID (frame->root->uid, frame->root->gid);
-
-        if (open_failed) {
-                ret = -1;
-                goto out;
-        }
-
-done:
-        ret = dht_inode_ctx_set1 (this, inode, dst_node);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to set inode-ctx target file at %s",
-                        local->loc.path, dst_node->name);
-                goto out;
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
-
-int
-dht_rebalance_in_progress_check (xlator_t *this, call_frame_t *frame)
-{
-
-        int         ret     = -1;
-
-        ret = synctask_new (this->ctx->env, dht_rebalance_inprogress_task,
-                            dht_inprogress_check_done,
-                            frame, frame);
-        return ret;
-}
-
-int
-dht_inode_ctx_layout_set (inode_t *inode, xlator_t *this,
-                          dht_layout_t *layout_int)
-{
-        dht_inode_ctx_t         *ctx            = NULL;
-        int                      ret            = -1;
-
-        ret = dht_inode_ctx_get (inode, this, &ctx);
-        if (!ret && ctx) {
-                ctx->layout = layout_int;
-        } else {
-                ctx = GF_CALLOC (1, sizeof (*ctx), gf_dht_mt_inode_ctx_t);
-                if (!ctx)
-                        return ret;
-                ctx->layout = layout_int;
-        }
-
-        ret = dht_inode_ctx_set (inode, this, ctx);
-
-        return ret;
-}
-
-int
-dht_inode_ctx_time_update (inode_t *inode, xlator_t *this, struct iatt *stat,
-                           int32_t post)
-{
-        dht_inode_ctx_t         *ctx            = NULL;
-        dht_stat_time_t         *time           = 0;
-        int                      ret            = -1;
-
-        GF_VALIDATE_OR_GOTO (this->name, stat, out);
-        GF_VALIDATE_OR_GOTO (this->name, inode, out);
-
-        ret = dht_inode_ctx_get (inode, this, &ctx);
-
-        if (ret) {
-                ctx = GF_CALLOC (1, sizeof (*ctx), gf_dht_mt_inode_ctx_t);
-                if (!ctx)
-                        return -1;
-        }
-
-        time = &ctx->time;
-
-        DHT_UPDATE_TIME(time->mtime, time->mtime_nsec,
-                        stat->ia_mtime, stat->ia_mtime_nsec, inode, post);
-        DHT_UPDATE_TIME(time->ctime, time->ctime_nsec,
-                        stat->ia_ctime, stat->ia_ctime_nsec, inode, post);
-        DHT_UPDATE_TIME(time->atime, time->atime_nsec,
-                        stat->ia_atime, stat->ia_atime_nsec, inode, post);
-
-        ret = dht_inode_ctx_set (inode, this, ctx);
-out:
-        return 0;
-}
-
-int
-dht_inode_ctx_get (inode_t *inode, xlator_t *this, dht_inode_ctx_t **ctx)
-{
-        int             ret     = -1;
-        uint64_t        ctx_int = 0;
-
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO (this->name, inode, out);
-
-        ret = inode_ctx_get (inode, this, &ctx_int);
-
-        if (ret)
-                return ret;
-
-        if (ctx)
-                *ctx = (dht_inode_ctx_t *) ctx_int;
-out:
-        return ret;
-}
-
-int dht_inode_ctx_set (inode_t *inode, xlator_t *this, dht_inode_ctx_t *ctx)
-{
-        int             ret = -1;
-        uint64_t        ctx_int = 0;
-
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO (this->name, inode, out);
-        GF_VALIDATE_OR_GOTO (this->name, ctx, out);
-
-        ctx_int = (long)ctx;
-        ret = inode_ctx_set (inode, this, &ctx_int);
-out:
-        return ret;
-}
diff --git a/xlators/cluster/dht/src/dht-inode-read.c b/xlators/cluster/dht/src/dht-inode-read.c
deleted file mode 100644
index ece84151a..000000000
--- a/xlators/cluster/dht/src/dht-inode-read.c
+++ /dev/null
@@ -1,1139 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "dht-common.h"
-
-int dht_access2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_readv2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_attr2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_open2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_flush2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_lk2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_fsync2 (xlator_t *this, call_frame_t *frame, int ret);
-
-int
-dht_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-              int op_ret, int op_errno, fd_t *fd, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        call_frame_t *prev = NULL;
-        int           ret = 0;
-
-        local = frame->local;
-        prev = cookie;
-
-        local->op_errno = op_errno;
-        if ((op_ret == -1) && (op_errno != ENOENT)) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "subvolume %s returned -1 (%s)",
-                        prev->this->name, strerror (op_errno));
-                goto out;
-        }
-
-        if (!op_ret || (local->call_cnt != 1))
-                goto out;
-
-        /* rebalance would have happened */
-        local->rebalance.target_op_fn = dht_open2;
-        ret = dht_rebalance_complete_check (this, frame);
-        if (!ret)
-                return 0;
-
-out:
-        DHT_STACK_UNWIND (open, frame, op_ret, op_errno, local->fd, xdata);
-
-        return 0;
-}
-
-int
-dht_open2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t *local  = NULL;
-        xlator_t    *subvol = NULL;
-        int          op_errno = EINVAL;
-
-        local = frame->local;
-        if (!local)
-                goto out;
-
-        op_errno = ENOENT;
-        if (op_ret)
-                goto out;
-
-        local->call_cnt = 2;
-        subvol = local->cached_subvol;
-
-        STACK_WIND (frame, dht_open_cbk, subvol, subvol->fops->open,
-                    &local->loc, local->rebalance.flags, local->fd,
-                    NULL);
-        return 0;
-
-out:
-        DHT_STACK_UNWIND (stat, frame, -1, op_errno, NULL, NULL);
-        return 0;
-}
-
-int
-dht_open (call_frame_t *frame, xlator_t *this,
-          loc_t *loc, int flags, fd_t *fd, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, loc, fd, GF_FOP_OPEN);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        local->rebalance.flags = flags;
-        local->call_cnt = 1;
-
-        STACK_WIND (frame, dht_open_cbk, subvol, subvol->fops->open,
-                    loc, flags, fd, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (open, frame, -1, op_errno, NULL, NULL);
-
-        return 0;
-}
-
-int
-dht_file_attr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int op_ret, int op_errno, struct iatt *stbuf, dict_t *xdata)
-{
-        xlator_t     *subvol = 0;
-        dht_local_t  *local = NULL;
-        call_frame_t *prev = NULL;
-        int           ret = -1;
-        inode_t      *inode = NULL;
-
-        GF_VALIDATE_OR_GOTO ("dht", frame, err);
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO ("dht", frame->local, out);
-        GF_VALIDATE_OR_GOTO ("dht", cookie, out);
-
-        local = frame->local;
-        prev = cookie;
-
-        if ((op_ret == -1) && (op_errno != ENOENT)) {
-                local->op_errno = op_errno;
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "subvolume %s returned -1 (%s)",
-                        prev->this->name, strerror (op_errno));
-                goto out;
-        }
-
-        if (local->call_cnt != 1)
-                goto out;
-
-        local->op_errno = op_errno;
-        /* Check if the rebalance phase2 is true */
-        if ((op_ret == -1) || IS_DHT_MIGRATION_PHASE2 (stbuf)) {
-                inode = (local->fd) ? local->fd->inode : local->loc.inode;
-                ret = dht_inode_ctx_get1 (this, inode, &subvol);
-                if (!subvol) {
-                        /* Phase 2 of migration */
-                        local->rebalance.target_op_fn = dht_attr2;
-                        ret = dht_rebalance_complete_check (this, frame);
-                        if (!ret)
-                                return 0;
-                } else {
-                        /* value is already set in fd_ctx, that means no need
-                           to check for whether its complete or not. */
-                        dht_attr2 (this, frame, 0);
-                        return 0;
-                }
-        }
-
-out:
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
-        DHT_STACK_UNWIND (stat, frame, op_ret, op_errno, stbuf, xdata);
-err:
-        return 0;
-}
-
-int
-dht_attr2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t *local  = NULL;
-        xlator_t    *subvol = NULL;
-        int          op_errno = EINVAL;
-
-        local = frame->local;
-        if (!local)
-                goto out;
-
-        op_errno = local->op_errno;
-        if (op_ret == -1)
-                goto out;
-
-        subvol = local->cached_subvol;
-        local->call_cnt = 2;
-
-        if (local->fop == GF_FOP_FSTAT) {
-                STACK_WIND (frame, dht_file_attr_cbk, subvol,
-                            subvol->fops->fstat, local->fd, NULL);
-        } else {
-                STACK_WIND (frame, dht_file_attr_cbk, subvol,
-                            subvol->fops->stat, &local->loc, NULL);
-        }
-        return 0;
-
-out:
-        DHT_STACK_UNWIND (stat, frame, -1, op_errno, NULL, NULL);
-        return 0;
-}
-
-int
-dht_attr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-              int op_ret, int op_errno, struct iatt *stbuf, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        int           this_call_cnt = 0;
-        call_frame_t *prev = NULL;
-
-        GF_VALIDATE_OR_GOTO ("dht", frame, err);
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO ("dht", frame->local, out);
-        GF_VALIDATE_OR_GOTO ("dht", cookie, out);
-
-        local = frame->local;
-        prev = cookie;
-
-        LOCK (&frame->lock);
-        {
-                if (op_ret == -1) {
-                        local->op_errno = op_errno;
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "subvolume %s returned -1 (%s)",
-                                prev->this->name, strerror (op_errno));
-
-                        goto unlock;
-                }
-
-                dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
-
-                local->op_ret = 0;
-        }
-unlock:
-        UNLOCK (&frame->lock);
-out:
-        this_call_cnt = dht_frame_return (frame);
-        if (is_last_call (this_call_cnt)) {
-                DHT_STACK_UNWIND (stat, frame, local->op_ret, local->op_errno,
-                                  &local->stbuf, xdata);
-        }
-err:
-        return 0;
-}
-
-int
-dht_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-        dht_layout_t *layout = NULL;
-        int           i = 0;
-        int           call_cnt = 0;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (loc, err);
-        VALIDATE_OR_GOTO (loc->inode, err);
-        VALIDATE_OR_GOTO (loc->path, err);
-
-
-        local = dht_local_init (frame, loc, NULL, GF_FOP_STAT);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        layout = local->layout;
-        if (!layout) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no layout for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        if (IA_ISREG (loc->inode->ia_type)) {
-                local->call_cnt = 1;
-
-                subvol = local->cached_subvol;
-
-                STACK_WIND (frame, dht_file_attr_cbk, subvol,
-                            subvol->fops->stat, loc, xdata);
-
-                return 0;
-        }
-
-        local->call_cnt = call_cnt = layout->cnt;
-
-        for (i = 0; i < call_cnt; i++) {
-                subvol = layout->list[i].xlator;
-
-                STACK_WIND (frame, dht_attr_cbk,
-                            subvol, subvol->fops->stat,
-                            loc, xdata);
-        }
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (stat, frame, -1, op_errno, NULL, NULL);
-
-        return 0;
-}
-
-
-int
-dht_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-        dht_layout_t *layout = NULL;
-        int           i = 0;
-        int           call_cnt = 0;
-
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FSTAT);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        layout = local->layout;
-        if (!layout) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no layout for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        if (IA_ISREG (fd->inode->ia_type)) {
-                local->call_cnt = 1;
-
-                subvol = local->cached_subvol;
-
-                STACK_WIND (frame, dht_file_attr_cbk, subvol,
-                            subvol->fops->fstat, fd, xdata);
-
-                return 0;
-        }
-
-        local->call_cnt = call_cnt = layout->cnt;
-
-        for (i = 0; i < call_cnt; i++) {
-                subvol = layout->list[i].xlator;
-                STACK_WIND (frame, dht_attr_cbk,
-                            subvol, subvol->fops->fstat,
-                            fd, xdata);
-        }
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fstat, frame, -1, op_errno, NULL, NULL);
-
-        return 0;
-}
-
-int
-dht_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-               int op_ret, int op_errno,
-               struct iovec *vector, int count, struct iatt *stbuf,
-               struct iobref *iobref, dict_t *xdata)
-{
-        dht_local_t *local      = NULL;
-        int          ret        = 0;
-        inode_t     *inode      = NULL;
-        xlator_t    *subvol = 0;
-
-        local = frame->local;
-        if (!local) {
-                op_ret = -1;
-                op_errno = EINVAL;
-                goto out;
-        }
-
-        /* This is already second try, no need for re-check */
-        if (local->call_cnt != 1)
-                goto out;
-
-        if ((op_ret == -1) && (op_errno != ENOENT))
-                goto out;
-
-        local->op_errno = op_errno;
-        if ((op_ret == -1) || IS_DHT_MIGRATION_PHASE2 (stbuf)) {
-                /* File would be migrated to other node */
-                ret = dht_inode_ctx_get1 (this, inode, &subvol);
-                if (!subvol) {
-                        local->rebalance.target_op_fn = dht_readv2;
-                        ret = dht_rebalance_complete_check (this, frame);
-                        if (!ret)
-                                return 0;
-                } else {
-                        /* value is already set in fd_ctx, that means no need
-                           to check for whether its complete or not. */
-                        dht_readv2 (this, frame, 0);
-                        return 0;
-                }
-        }
-
-out:
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
-        DHT_STACK_UNWIND (readv, frame, op_ret, op_errno, vector, count, stbuf,
-                          iobref, xdata);
-
-        return 0;
-}
-
-int
-dht_readv2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t *local  = NULL;
-        xlator_t    *subvol = NULL;
-        int          op_errno = EINVAL;
-
-        local = frame->local;
-        if (!local)
-                goto out;
-
-        op_errno = local->op_errno;
-        if (op_ret == -1)
-                goto out;
-
-        local->call_cnt = 2;
-        subvol = local->cached_subvol;
-
-        STACK_WIND (frame, dht_readv_cbk, subvol, subvol->fops->readv,
-                    local->fd, local->rebalance.size, local->rebalance.offset,
-                    local->rebalance.flags, NULL);
-
-        return 0;
-
-out:
-        DHT_STACK_UNWIND (readv, frame, -1, op_errno, NULL, 0, NULL, NULL, NULL);
-        return 0;
-}
-
-int
-dht_readv (call_frame_t *frame, xlator_t *this,
-           fd_t *fd, size_t size, off_t off, uint32_t flags, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_READ);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        local->rebalance.offset = off;
-        local->rebalance.size   = size;
-        local->rebalance.flags  = flags;
-        local->call_cnt = 1;
-
-        STACK_WIND (frame, dht_readv_cbk,
-                    subvol, subvol->fops->readv,
-                    fd, size, off, flags, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (readv, frame, -1, op_errno, NULL, 0, NULL, NULL, NULL);
-
-        return 0;
-}
-
-int
-dht_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                int op_ret, int op_errno, dict_t *xdata)
-{
-        int          ret = -1;
-        dht_local_t *local = NULL;
-        xlator_t    *subvol = NULL;
-        call_frame_t *prev = NULL;
-
-        local = frame->local;
-        prev = cookie;
-
-        if (!prev || !prev->this)
-                goto out;
-        if (local->call_cnt != 1)
-                goto out;
-        if ((op_ret == -1) && (op_errno == ENOTCONN) &&
-            IA_ISDIR(local->loc.inode->ia_type)) {
-
-                subvol = dht_subvol_next_available (this, prev->this);
-                if (!subvol)
-                        goto out;
-
-                /* check if we are done with visiting every node */
-                if (subvol == local->cached_subvol) {
-                        goto out;
-                }
-
-                STACK_WIND (frame, dht_access_cbk, subvol, subvol->fops->access,
-                            &local->loc, local->rebalance.flags, NULL);
-                return 0;
-        }
-        if ((op_ret == -1) && (op_errno == ENOENT)) {
-                /* File would be migrated to other node */
-                local->op_errno = op_errno;
-                local->rebalance.target_op_fn = dht_access2;
-                ret = dht_rebalance_complete_check (frame->this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-out:
-        DHT_STACK_UNWIND (access, frame, op_ret, op_errno, xdata);
-        return 0;
-}
-
-int
-dht_access2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t *local  = NULL;
-        xlator_t    *subvol = NULL;
-        int          op_errno = EINVAL;
-
-        local = frame->local;
-        if (!local)
-                goto out;
-
-        op_errno = local->op_errno;
-        if (op_ret == -1)
-                goto out;
-
-        local->call_cnt = 2;
-        subvol = local->cached_subvol;
-
-        STACK_WIND (frame, dht_access_cbk, subvol, subvol->fops->access,
-                    &local->loc, local->rebalance.flags, NULL);
-
-        return 0;
-
-out:
-        DHT_STACK_UNWIND (access, frame, -1, op_errno, NULL);
-        return 0;
-}
-
-
-int
-dht_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask,
-            dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (loc, err);
-        VALIDATE_OR_GOTO (loc->inode, err);
-        VALIDATE_OR_GOTO (loc->path, err);
-
-        local = dht_local_init (frame, loc, NULL, GF_FOP_ACCESS);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        local->rebalance.flags = mask;
-        local->call_cnt = 1;
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        STACK_WIND (frame, dht_access_cbk, subvol, subvol->fops->access,
-                    loc, mask, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (access, frame, -1, op_errno, NULL);
-
-        return 0;
-}
-
-
-int
-dht_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-               int op_ret, int op_errno, dict_t *xdata)
-{
-        dht_local_t  *local  = NULL;
-        inode_t      *inode  = NULL;
-        xlator_t     *subvol = 0;
-
-        local = frame->local;
-
-        local->op_errno = op_errno;
-
-        if (local->call_cnt != 1)
-                goto out;
-
-        /* If context is set, then send flush() it to the destination */
-        dht_inode_ctx_get1 (this, inode, &subvol);
-        if (subvol) {
-                dht_flush2 (this, frame, 0);
-                return 0;
-        }
-
-out:
-        DHT_STACK_UNWIND (flush, frame, op_ret, op_errno, xdata);
-
-        return 0;
-}
-
-int
-dht_flush2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t  *local  = NULL;
-        xlator_t     *subvol = NULL;
-
-        local = frame->local;
-
-        dht_inode_ctx_get1 (this, local->fd->inode, &subvol);
-
-        if (!subvol)
-                subvol = local->cached_subvol;
-
-        local->call_cnt = 2; /* This is the second attempt */
-
-        STACK_WIND (frame, dht_flush_cbk,
-                    subvol, subvol->fops->flush, local->fd, NULL);
-
-        return 0;
-}
-
-
-int
-dht_flush (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FLUSH);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        local->call_cnt = 1;
-
-        STACK_WIND (frame, dht_flush_cbk,
-                    subvol, subvol->fops->flush, fd, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (flush, frame, -1, op_errno, NULL);
-
-        return 0;
-}
-
-
-int
-dht_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
-               int op_errno, struct iatt *prebuf, struct iatt *postbuf,
-               dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        call_frame_t *prev = NULL;
-        int           ret = -1;
-        inode_t      *inode = NULL;
-        xlator_t     *subvol = 0;
-
-        local = frame->local;
-        prev = cookie;
-
-        local->op_errno = op_errno;
-        if (op_ret == -1 && (op_errno != ENOENT)) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "subvolume %s returned -1 (%s)",
-                        prev->this->name, strerror (op_errno));
-                goto out;
-        }
-
-        if (local->call_cnt != 1) {
-                if (local->stbuf.ia_blocks) {
-                        dht_iatt_merge (this, postbuf, &local->stbuf, NULL);
-                        dht_iatt_merge (this, prebuf, &local->prebuf, NULL);
-                }
-                goto out;
-        }
-
-        local->op_errno = op_errno;
-        dht_inode_ctx_get1 (this, inode, &subvol);
-        if (!subvol) {
-                local->rebalance.target_op_fn = dht_fsync2;
-
-                /* Check if the rebalance phase1 is true */
-                if (IS_DHT_MIGRATION_PHASE1 (postbuf)) {
-                        dht_iatt_merge (this, &local->stbuf, postbuf, NULL);
-                        dht_iatt_merge (this, &local->prebuf, prebuf, NULL);
-
-                        ret = dht_rebalance_in_progress_check (this, frame);
-                }
-
-                /* Check if the rebalance phase2 is true */
-                if (IS_DHT_MIGRATION_PHASE2 (postbuf)) {
-                        ret = dht_rebalance_complete_check (this, frame);
-                }
-                if (!ret)
-                        return 0;
-        } else {
-                dht_fsync2 (this, frame, 0);
-                return 0;
-        }
-
-out:
-        DHT_STRIP_PHASE1_FLAGS (postbuf);
-        DHT_STRIP_PHASE1_FLAGS (prebuf);
-        DHT_STACK_UNWIND (fsync, frame, op_ret, op_errno,
-                          prebuf, postbuf, xdata);
-
-        return 0;
-}
-
-int
-dht_fsync2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t  *local  = NULL;
-        xlator_t     *subvol = NULL;
-
-        local = frame->local;
-
-        dht_inode_ctx_get1 (this, local->fd->inode, &subvol);
-        if (!subvol)
-                subvol = local->cached_subvol;
-
-        local->call_cnt = 2; /* This is the second attempt */
-
-        STACK_WIND (frame, dht_fsync_cbk, subvol, subvol->fops->fsync,
-                    local->fd, local->rebalance.flags, NULL);
-
-        return 0;
-}
-
-int
-dht_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd, int datasync,
-           dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FSYNC);
-        if (!local) {
-                op_errno = ENOMEM;
-
-                goto err;
-        }
-
-        local->call_cnt = 1;
-        local->rebalance.flags = datasync;
-
-        subvol = local->cached_subvol;
-
-        STACK_WIND (frame, dht_fsync_cbk, subvol, subvol->fops->fsync,
-                    fd, datasync, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fsync, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-
-/* TODO: for 'lk()' call, we need some other special error, may be ESTALE to
-   indicate that lock migration happened on the fd, so we can consider it as
-   phase 2 of migration */
-int
-dht_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-            int op_ret, int op_errno, struct gf_flock *flock, dict_t *xdata)
-{
-        DHT_STACK_UNWIND (lk, frame, op_ret, op_errno, flock, xdata);
-
-        return 0;
-}
-
-
-int
-dht_lk (call_frame_t *frame, xlator_t *this,
-        fd_t *fd, int cmd, struct gf_flock *flock, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        subvol = dht_subvol_get_cached (this, fd->inode);
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        /* TODO: for rebalance, we need to preserve the fop arguments */
-        STACK_WIND (frame, dht_lk_cbk, subvol, subvol->fops->lk, fd,
-                    cmd, flock, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (lk, frame, -1, op_errno, NULL, NULL);
-
-        return 0;
-}
-
-/* Symlinks are currently not migrated, so no need for any check here */
-int
-dht_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int op_ret, int op_errno, const char *path,
-                  struct iatt *stbuf, dict_t *xdata)
-{
-        dht_local_t *local = NULL;
-
-        local = frame->local;
-        if (op_ret == -1)
-                goto err;
-
-        if (!local) {
-                op_ret = -1;
-                op_errno = EINVAL;
-        }
-
-err:
-        DHT_STRIP_PHASE1_FLAGS (stbuf);
-        DHT_STACK_UNWIND (readlink, frame, op_ret, op_errno, path, stbuf, xdata);
-
-        return 0;
-}
-
-
-int
-dht_readlink (call_frame_t *frame, xlator_t *this, loc_t *loc, size_t size,
-              dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (loc, err);
-        VALIDATE_OR_GOTO (loc->inode, err);
-        VALIDATE_OR_GOTO (loc->path, err);
-
-        local = dht_local_init (frame, loc, NULL, GF_FOP_READLINK);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        STACK_WIND (frame, dht_readlink_cbk,
-                    subvol, subvol->fops->readlink,
-                    loc, size, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (readlink, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-/* Currently no translators on top of 'distribute' will be using
- * below fops, hence not implementing 'migration' related checks
- */
-
-int
-dht_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                 int32_t op_ret, int32_t op_errno, dict_t *dict, dict_t *xdata)
-{
-        DHT_STACK_UNWIND (xattrop, frame, op_ret, op_errno, dict, xdata);
-        return 0;
-}
-
-
-int
-dht_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc,
-             gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (loc, err);
-        VALIDATE_OR_GOTO (loc->inode, err);
-        VALIDATE_OR_GOTO (loc->path, err);
-
-        local = dht_local_init (frame, loc, NULL, GF_FOP_XATTROP);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        local->call_cnt = 1;
-
-        STACK_WIND (frame,
-                    dht_xattrop_cbk,
-                    subvol, subvol->fops->xattrop,
-                    loc, flags, dict, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (xattrop, frame, -1, op_errno, NULL, NULL);
-
-        return 0;
-}
-
-
-int
-dht_fxattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, dict_t *dict, dict_t *xdata)
-{
-        DHT_STACK_UNWIND (fxattrop, frame, op_ret, op_errno, dict, xdata);
-        return 0;
-}
-
-
-int
-dht_fxattrop (call_frame_t *frame, xlator_t *this,
-              fd_t *fd, gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        subvol = dht_subvol_get_cached (this, fd->inode);
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        STACK_WIND (frame,
-                    dht_fxattrop_cbk,
-                    subvol, subvol->fops->fxattrop,
-                    fd, flags, dict, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fxattrop, frame, -1, op_errno, NULL, NULL);
-
-        return 0;
-}
-
-
-int
-dht_inodelk_cbk (call_frame_t *frame, void *cookie,
-                 xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *xdata)
-
-{
-        DHT_STACK_UNWIND (inodelk, frame, op_ret, op_errno, xdata);
-        return 0;
-}
-
-
-int32_t
-dht_inodelk (call_frame_t *frame, xlator_t *this, const char *volume,
-             loc_t *loc, int32_t cmd, struct gf_flock *lock, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (loc, err);
-        VALIDATE_OR_GOTO (loc->inode, err);
-        VALIDATE_OR_GOTO (loc->path, err);
-
-        local = dht_local_init (frame, loc, NULL, GF_FOP_INODELK);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        local->call_cnt = 1;
-
-        STACK_WIND (frame,
-                    dht_inodelk_cbk,
-                    subvol, subvol->fops->inodelk,
-                    volume, loc, cmd, lock, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (inodelk, frame, -1, op_errno, NULL);
-
-        return 0;
-}
-
-
-int
-dht_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int32_t op_ret, int32_t op_errno, dict_t *xdata)
-
-{
-        DHT_STACK_UNWIND (finodelk, frame, op_ret, op_errno, xdata);
-        return 0;
-}
-
-
-int
-dht_finodelk (call_frame_t *frame, xlator_t *this, const char *volume,
-              fd_t *fd, int32_t cmd, struct gf_flock *lock, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        subvol = dht_subvol_get_cached (this, fd->inode);
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-
-        STACK_WIND (frame, dht_finodelk_cbk, subvol, subvol->fops->finodelk,
-                    volume, fd, cmd, lock, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (finodelk, frame, -1, op_errno, NULL);
-
-        return 0;
-}
diff --git a/xlators/cluster/dht/src/dht-inode-write.c b/xlators/cluster/dht/src/dht-inode-write.c
deleted file mode 100644
index 4b3f3a049..000000000
--- a/xlators/cluster/dht/src/dht-inode-write.c
+++ /dev/null
@@ -1,1013 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "dht-common.h"
-
-int dht_writev2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_truncate2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_setattr2 (xlator_t *this, call_frame_t *frame, int ret);
-int dht_fallocate2(xlator_t *this, call_frame_t *frame, int op_ret);
-int dht_discard2(xlator_t *this, call_frame_t *frame, int op_ret);
-int dht_zerofill2(xlator_t *this, call_frame_t *frame, int op_ret);
-
-int
-dht_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                int op_ret, int op_errno, struct iatt *prebuf,
-                struct iatt *postbuf, dict_t *xdata)
-{
-        dht_local_t *local = NULL;
-        int          ret   = -1;
-        xlator_t    *subvol = NULL;
-
-        if (op_ret == -1 && (op_errno != ENOENT)) {
-                goto out;
-        }
-
-        local = frame->local;
-        if (!local) {
-                op_ret = -1;
-                op_errno = EINVAL;
-                goto out;
-        }
-
-        if (local->call_cnt != 1) {
-                /* preserve the modes of source */
-                if (local->stbuf.ia_blocks) {
-                        dht_iatt_merge (this, postbuf, &local->stbuf, NULL);
-                        dht_iatt_merge (this, prebuf, &local->prebuf, NULL);
-                }
-                goto out;
-        }
-
-        local->rebalance.target_op_fn = dht_writev2;
-
-        local->op_errno = op_errno;
-        /* Phase 2 of migration */
-        if (IS_DHT_MIGRATION_PHASE2 (postbuf)) {
-                ret = dht_rebalance_complete_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-        /* Check if the rebalance phase1 is true */
-        if (IS_DHT_MIGRATION_PHASE1 (postbuf)) {
-                dht_iatt_merge (this, &local->stbuf, postbuf, NULL);
-                dht_iatt_merge (this, &local->prebuf, prebuf, NULL);
-
-                ret = dht_inode_ctx_get1 (this, local->fd->inode, &subvol);
-                if (subvol) {
-                        dht_writev2 (this, frame, 0);
-                        return 0;
-                }
-                ret = dht_rebalance_in_progress_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-out:
-        DHT_STRIP_PHASE1_FLAGS (postbuf);
-        DHT_STRIP_PHASE1_FLAGS (prebuf);
-
-        DHT_STACK_UNWIND (writev, frame, op_ret, op_errno, prebuf, postbuf,
-                          xdata);
-
-        return 0;
-}
-
-int
-dht_writev2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t  *local  = NULL;
-        xlator_t     *subvol = NULL;
-
-        local = frame->local;
-
-        dht_inode_ctx_get1 (this, local->fd->inode, &subvol);
-
-        if (!subvol)
-                subvol = local->cached_subvol;
-
-        local->call_cnt = 2; /* This is the second attempt */
-
-        STACK_WIND (frame, dht_writev_cbk,
-                    subvol, subvol->fops->writev,
-                    local->fd, local->rebalance.vector, local->rebalance.count,
-                    local->rebalance.offset, local->rebalance.flags,
-                    local->rebalance.iobref, NULL);
-
-        return 0;
-}
-
-int
-dht_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
-            struct iovec *vector, int count, off_t off, uint32_t flags,
-            struct iobref *iobref, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_WRITE);
-        if (!local) {
-
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-
-        local->rebalance.vector = iov_dup (vector, count);
-        local->rebalance.offset = off;
-        local->rebalance.count = count;
-        local->rebalance.flags = flags;
-        local->rebalance.iobref = iobref_ref (iobref);
-        local->call_cnt = 1;
-
-        STACK_WIND (frame, dht_writev_cbk,
-                    subvol, subvol->fops->writev,
-                    fd, vector, count, off, flags, iobref, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (writev, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-
-
-int
-dht_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                  int op_ret, int op_errno, struct iatt *prebuf,
-                  struct iatt *postbuf, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        call_frame_t *prev = NULL;
-        int           ret = -1;
-        xlator_t    *subvol = NULL;
-        inode_t      *inode = NULL;
-
-        GF_VALIDATE_OR_GOTO ("dht", frame, err);
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO ("dht", frame->local, out);
-        GF_VALIDATE_OR_GOTO ("dht", cookie, out);
-
-        local = frame->local;
-        prev = cookie;
-
-        if ((op_ret == -1) && (op_errno != ENOENT)) {
-                local->op_errno = op_errno;
-                local->op_ret = -1;
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "subvolume %s returned -1 (%s)",
-                        prev->this->name, strerror (op_errno));
-
-                goto out;
-        }
-
-        if (local->call_cnt != 1) {
-                if (local->stbuf.ia_blocks) {
-                        dht_iatt_merge (this, postbuf, &local->stbuf, NULL);
-                        dht_iatt_merge (this, prebuf, &local->prebuf, NULL);
-                }
-                goto out;
-        }
-
-        local->rebalance.target_op_fn = dht_truncate2;
-
-        local->op_errno = op_errno;
-        /* Phase 2 of migration */
-        if ((op_ret == -1) || IS_DHT_MIGRATION_PHASE2 (postbuf)) {
-                ret = dht_rebalance_complete_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-        /* Check if the rebalance phase1 is true */
-        if (IS_DHT_MIGRATION_PHASE1 (postbuf)) {
-                dht_iatt_merge (this, &local->stbuf, postbuf, NULL);
-                dht_iatt_merge (this, &local->prebuf, prebuf, NULL);
-                inode = (local->fd) ? local->fd->inode : local->loc.inode;
-                dht_inode_ctx_get1 (this, inode, &subvol);
-                if (subvol) {
-                        dht_truncate2 (this, frame, 0);
-                        return 0;
-                }
-                ret = dht_rebalance_in_progress_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-out:
-        DHT_STRIP_PHASE1_FLAGS (postbuf);
-        DHT_STRIP_PHASE1_FLAGS (prebuf);
-        DHT_STACK_UNWIND (truncate, frame, op_ret, op_errno,
-                          prebuf, postbuf, xdata);
-err:
-        return 0;
-}
-
-
-int
-dht_truncate2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t  *local  = NULL;
-        xlator_t     *subvol = NULL;
-        inode_t      *inode = NULL;
-
-        local = frame->local;
-
-        inode = local->fd ? local->fd->inode : local->loc.inode;
-
-        dht_inode_ctx_get1 (this, inode, &subvol);
-        if (!subvol)
-                subvol = local->cached_subvol;
-
-        local->call_cnt = 2; /* This is the second attempt */
-
-        if (local->fop == GF_FOP_TRUNCATE) {
-                STACK_WIND (frame, dht_truncate_cbk, subvol,
-                            subvol->fops->truncate, &local->loc,
-                            local->rebalance.offset, NULL);
-        } else {
-                STACK_WIND (frame, dht_truncate_cbk, subvol,
-                            subvol->fops->ftruncate, local->fd,
-                            local->rebalance.offset, NULL);
-        }
-
-        return 0;
-}
-
-int
-dht_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset,
-              dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (loc, err);
-        VALIDATE_OR_GOTO (loc->inode, err);
-        VALIDATE_OR_GOTO (loc->path, err);
-
-        local = dht_local_init (frame, loc, NULL, GF_FOP_TRUNCATE);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        local->rebalance.offset = offset;
-        local->call_cnt = 1;
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        STACK_WIND (frame, dht_truncate_cbk,
-                    subvol, subvol->fops->truncate,
-                    loc, offset, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (truncate, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-int
-dht_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
-               dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FTRUNCATE);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        local->rebalance.offset = offset;
-        local->call_cnt = 1;
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        STACK_WIND (frame, dht_truncate_cbk,
-                    subvol, subvol->fops->ftruncate,
-                    fd, offset, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (ftruncate, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-
-int
-dht_fallocate_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-                  int op_ret, int op_errno, struct iatt *prebuf,
-                  struct iatt *postbuf, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        call_frame_t *prev = NULL;
-        int           ret = -1;
-        xlator_t    *subvol = NULL;
-
-        GF_VALIDATE_OR_GOTO ("dht", frame, err);
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO ("dht", frame->local, out);
-        GF_VALIDATE_OR_GOTO ("dht", cookie, out);
-
-        local = frame->local;
-        prev = cookie;
-
-        if ((op_ret == -1) && (op_errno != ENOENT)) {
-                local->op_errno = op_errno;
-                local->op_ret = -1;
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "subvolume %s returned -1 (%s)",
-                        prev->this->name, strerror (op_errno));
-
-                goto out;
-        }
-
-        if (local->call_cnt != 1) {
-                if (local->stbuf.ia_blocks) {
-                        dht_iatt_merge (this, postbuf, &local->stbuf, NULL);
-                        dht_iatt_merge (this, prebuf, &local->prebuf, NULL);
-                }
-                goto out;
-        }
-        local->rebalance.target_op_fn = dht_fallocate2;
-
-        /* Phase 2 of migration */
-        if ((op_ret == -1) || IS_DHT_MIGRATION_PHASE2 (postbuf)) {
-                ret = dht_rebalance_complete_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-        /* Check if the rebalance phase1 is true */
-        if (IS_DHT_MIGRATION_PHASE1 (postbuf)) {
-                dht_iatt_merge (this, &local->stbuf, postbuf, NULL);
-                dht_iatt_merge (this, &local->prebuf, prebuf, NULL);
-                dht_inode_ctx_get1 (this, local->fd->inode, &subvol);
-                if (subvol) {
-                        dht_fallocate2 (this, frame, 0);
-                        return 0;
-                }
-                ret = dht_rebalance_in_progress_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-out:
-        DHT_STRIP_PHASE1_FLAGS (postbuf);
-        DHT_STRIP_PHASE1_FLAGS (prebuf);
-        DHT_STACK_UNWIND (fallocate, frame, op_ret, op_errno,
-                          prebuf, postbuf, xdata);
-err:
-        return 0;
-}
-
-int
-dht_fallocate2(xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t  *local  = NULL;
-        xlator_t     *subvol = NULL;
-
-        local = frame->local;
-
-        dht_inode_ctx_get1 (this, local->fd->inode, &subvol);
-
-        if (!subvol)
-                subvol = local->cached_subvol;
-
-        local->call_cnt = 2; /* This is the second attempt */
-
-	STACK_WIND(frame, dht_fallocate_cbk, subvol, subvol->fops->fallocate,
-		   local->fd, local->rebalance.flags, local->rebalance.offset,
-		   local->rebalance.size, NULL);
-
-        return 0;
-}
-
-int
-dht_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t mode,
-	      off_t offset, size_t len, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FALLOCATE);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-	local->rebalance.flags = mode;
-        local->rebalance.offset = offset;
-	local->rebalance.size = len;
-
-        local->call_cnt = 1;
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        STACK_WIND (frame, dht_fallocate_cbk,
-                    subvol, subvol->fops->fallocate,
-                    fd, mode, offset, len, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fallocate, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-
-int
-dht_discard_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-                int op_ret, int op_errno, struct iatt *prebuf,
-                struct iatt *postbuf, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        call_frame_t *prev = NULL;
-        int           ret = -1;
-        xlator_t    *subvol = NULL;
-
-        GF_VALIDATE_OR_GOTO ("dht", frame, err);
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO ("dht", frame->local, out);
-        GF_VALIDATE_OR_GOTO ("dht", cookie, out);
-
-        local = frame->local;
-        prev = cookie;
-
-        if ((op_ret == -1) && (op_errno != ENOENT)) {
-                local->op_errno = op_errno;
-                local->op_ret = -1;
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "subvolume %s returned -1 (%s)",
-                        prev->this->name, strerror (op_errno));
-
-                goto out;
-        }
-
-        if (local->call_cnt != 1) {
-                if (local->stbuf.ia_blocks) {
-                        dht_iatt_merge (this, postbuf, &local->stbuf, NULL);
-                        dht_iatt_merge (this, prebuf, &local->prebuf, NULL);
-                }
-                goto out;
-        }
-        local->rebalance.target_op_fn = dht_discard2;
-
-        /* Phase 2 of migration */
-        if ((op_ret == -1) || IS_DHT_MIGRATION_PHASE2 (postbuf)) {
-                ret = dht_rebalance_complete_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-        /* Check if the rebalance phase1 is true */
-        if (IS_DHT_MIGRATION_PHASE1 (postbuf)) {
-                dht_iatt_merge (this, &local->stbuf, postbuf, NULL);
-                dht_iatt_merge (this, &local->prebuf, prebuf, NULL);
-                dht_inode_ctx_get1 (this, local->fd->inode, &subvol);
-                if (subvol) {
-                        dht_discard2 (this, frame, 0);
-                        return 0;
-                }
-                ret = dht_rebalance_in_progress_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-out:
-        DHT_STRIP_PHASE1_FLAGS (postbuf);
-        DHT_STRIP_PHASE1_FLAGS (prebuf);
-        DHT_STACK_UNWIND (discard, frame, op_ret, op_errno,
-                          prebuf, postbuf, xdata);
-err:
-        return 0;
-}
-
-int
-dht_discard2(xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t  *local  = NULL;
-        xlator_t     *subvol = NULL;
-
-        local = frame->local;
-
-        dht_inode_ctx_get1 (this, local->fd->inode, &subvol);
-
-        if (!subvol)
-                subvol = local->cached_subvol;
-
-        local->call_cnt = 2; /* This is the second attempt */
-
-	STACK_WIND(frame, dht_discard_cbk, subvol, subvol->fops->discard,
-		   local->fd, local->rebalance.offset, local->rebalance.size,
-		   NULL);
-
-        return 0;
-}
-
-int
-dht_discard(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
-	    size_t len, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        int           op_errno = -1;
-        dht_local_t  *local = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_DISCARD);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        local->rebalance.offset = offset;
-	local->rebalance.size = len;
-
-        local->call_cnt = 1;
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        STACK_WIND (frame, dht_discard_cbk, subvol, subvol->fops->discard,
-                    fd, offset, len, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (discard, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-int
-dht_zerofill_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
-                int op_ret, int op_errno, struct iatt *prebuf,
-                struct iatt *postbuf, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        call_frame_t *prev  = NULL;
-        int           ret   = -1;
-
-        GF_VALIDATE_OR_GOTO ("dht", frame, err);
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO ("dht", frame->local, out);
-        GF_VALIDATE_OR_GOTO ("dht", cookie, out);
-
-        local = frame->local;
-        prev = cookie;
-
-        if ((op_ret == -1) && (op_errno != ENOENT)) {
-                local->op_errno = op_errno;
-                local->op_ret = -1;
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "subvolume %s returned -1 (%s)",
-                        prev->this->name, strerror (op_errno));
-                goto out;
-        }
-
-        if (local->call_cnt != 1) {
-                if (local->stbuf.ia_blocks) {
-                        dht_iatt_merge (this, postbuf, &local->stbuf, NULL);
-                        dht_iatt_merge (this, prebuf, &local->prebuf, NULL);
-                }
-                goto out;
-        }
-        local->rebalance.target_op_fn = dht_zerofill2;
-        /* Phase 2 of migration */
-        if ((op_ret == -1) || IS_DHT_MIGRATION_PHASE2 (postbuf)) {
-                ret = dht_rebalance_complete_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-        /* Check if the rebalance phase1 is true */
-        if (IS_DHT_MIGRATION_PHASE1 (postbuf)) {
-                dht_iatt_merge (this, &local->stbuf, postbuf, NULL);
-                dht_iatt_merge (this, &local->prebuf, prebuf, NULL);
-                ret = fd_ctx_get (local->fd, this, NULL);
-                if (!ret) {
-                        dht_zerofill2 (this, frame, 0);
-                        return 0;
-                }
-                ret = dht_rebalance_in_progress_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-out:
-        DHT_STRIP_PHASE1_FLAGS (postbuf);
-        DHT_STRIP_PHASE1_FLAGS (prebuf);
-        DHT_STACK_UNWIND (zerofill, frame, op_ret, op_errno,
-                          prebuf, postbuf, xdata);
-err:
-        return 0;
-}
-
-int
-dht_zerofill2(xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t  *local          = NULL;
-        xlator_t     *subvol         = NULL;
-        uint64_t      tmp_subvol     = 0;
-        int           ret            = -1;
-
-        local = frame->local;
-
-        if (local->fd)
-                ret = fd_ctx_get (local->fd, this, &tmp_subvol);
-        if (!ret)
-                subvol = (xlator_t *)(long)tmp_subvol;
-
-        if (!subvol)
-                subvol = local->cached_subvol;
-
-        local->call_cnt = 2; /* This is the second attempt */
-
-        STACK_WIND(frame, dht_zerofill_cbk, subvol, subvol->fops->zerofill,
-                   local->fd, local->rebalance.offset, local->rebalance.size,
-                   NULL);
-
-        return 0;
-}
-
-int
-dht_zerofill(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
-            size_t len, dict_t *xdata)
-{
-        xlator_t     *subvol       = NULL;
-        int           op_errno     = -1;
-        dht_local_t  *local        = NULL;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_ZEROFILL);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        local->rebalance.offset = offset;
-        local->rebalance.size = len;
-
-        local->call_cnt = 1;
-        subvol = local->cached_subvol;
-        if (!subvol) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no cached subvolume for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        STACK_WIND (frame, dht_zerofill_cbk, subvol, subvol->fops->zerofill,
-                    fd, offset, len, xdata);
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (zerofill, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-
-
-/* handle cases of migration here for 'setattr()' calls */
-int
-dht_file_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                      int op_ret, int op_errno, struct iatt *prebuf,
-                      struct iatt *postbuf, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        call_frame_t *prev = NULL;
-        int           ret = -1;
-
-        local = frame->local;
-        prev = cookie;
-
-        local->op_errno = op_errno;
-        if ((op_ret == -1) && (op_errno != ENOENT)) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "subvolume %s returned -1 (%s)",
-                        prev->this->name, strerror (op_errno));
-                goto out;
-        }
-
-        if (local->call_cnt != 1)
-                goto out;
-
-        local->rebalance.target_op_fn = dht_setattr2;
-
-        /* Phase 2 of migration */
-        if ((op_ret == -1) || IS_DHT_MIGRATION_PHASE2 (postbuf)) {
-                ret = dht_rebalance_complete_check (this, frame);
-                if (!ret)
-                        return 0;
-        }
-
-        /* At the end of the migration process, whatever 'attr' we
-           have on source file will be migrated to destination file
-           in one shot, hence we don't need to check for in progress
-           state here (ie, PHASE1) */
-out:
-        DHT_STRIP_PHASE1_FLAGS (postbuf);
-        DHT_STRIP_PHASE1_FLAGS (prebuf);
-        DHT_STACK_UNWIND (setattr, frame, op_ret, op_errno,
-                          prebuf, postbuf, xdata);
-
-        return 0;
-}
-
-int
-dht_setattr2 (xlator_t *this, call_frame_t *frame, int op_ret)
-{
-        dht_local_t  *local  = NULL;
-        xlator_t     *subvol = NULL;
-        inode_t      *inode = NULL;
-
-        local = frame->local;
-
-        inode = (local->fd) ? local->fd->inode : local->loc.inode;
-
-        dht_inode_ctx_get1 (this, inode, &subvol);
-
-        if (!subvol)
-                subvol = local->cached_subvol;
-
-        local->call_cnt = 2; /* This is the second attempt */
-
-        if (local->fop == GF_FOP_SETATTR) {
-                STACK_WIND (frame, dht_file_setattr_cbk, subvol,
-                            subvol->fops->setattr, &local->loc,
-                            &local->rebalance.stbuf, local->rebalance.flags,
-                            NULL);
-        } else {
-                STACK_WIND (frame, dht_file_setattr_cbk, subvol,
-                            subvol->fops->fsetattr, local->fd,
-                            &local->rebalance.stbuf, local->rebalance.flags,
-                            NULL);
-        }
-
-        return 0;
-}
-
-
-/* Keep the existing code same for all the cases other than regular file */
-int
-dht_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                 int op_ret, int op_errno, struct iatt *statpre,
-                 struct iatt *statpost, dict_t *xdata)
-{
-        dht_local_t  *local = NULL;
-        int           this_call_cnt = 0;
-        call_frame_t *prev = NULL;
-
-
-        local = frame->local;
-        prev = cookie;
-
-        LOCK (&frame->lock);
-        {
-                if (op_ret == -1) {
-                        local->op_errno = op_errno;
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "subvolume %s returned -1 (%s)",
-                                prev->this->name, strerror (op_errno));
-                        goto unlock;
-                }
-
-                dht_iatt_merge (this, &local->prebuf, statpre, prev->this);
-                dht_iatt_merge (this, &local->stbuf, statpost, prev->this);
-
-                local->op_ret = 0;
-        }
-unlock:
-        UNLOCK (&frame->lock);
-
-        this_call_cnt = dht_frame_return (frame);
-        if (is_last_call (this_call_cnt))
-                DHT_STACK_UNWIND (setattr, frame, local->op_ret, local->op_errno,
-                                  &local->prebuf, &local->stbuf, xdata);
-
-        return 0;
-}
-
-
-int
-dht_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
-             struct iatt *stbuf, int32_t valid, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        dht_layout_t *layout = NULL;
-        dht_local_t  *local  = NULL;
-        int           op_errno = -1;
-        int           i = -1;
-        int           call_cnt = 0;
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (loc, err);
-        VALIDATE_OR_GOTO (loc->inode, err);
-        VALIDATE_OR_GOTO (loc->path, err);
-
-        local = dht_local_init (frame, loc, NULL, GF_FOP_SETATTR);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        layout = local->layout;
-        if (!layout) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no layout for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        if (!layout_is_sane (layout)) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "layout is not sane for path=%s", loc->path);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        if (IA_ISREG (loc->inode->ia_type)) {
-                /* in the regular file _cbk(), we need to check for
-                   migration possibilities */
-                local->rebalance.stbuf = *stbuf;
-                local->rebalance.flags = valid;
-                local->call_cnt = 1;
-                subvol = local->cached_subvol;
-
-                STACK_WIND (frame, dht_file_setattr_cbk, subvol,
-                            subvol->fops->setattr,
-                            loc, stbuf, valid, xdata);
-
-                return 0;
-        }
-
-        local->call_cnt = call_cnt = layout->cnt;
-
-        for (i = 0; i < call_cnt; i++) {
-                STACK_WIND (frame, dht_setattr_cbk,
-                            layout->list[i].xlator,
-                            layout->list[i].xlator->fops->setattr,
-                            loc, stbuf, valid, xdata);
-        }
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (setattr, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
-
-
-int
-dht_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iatt *stbuf,
-              int32_t valid, dict_t *xdata)
-{
-        xlator_t     *subvol = NULL;
-        dht_layout_t *layout = NULL;
-        dht_local_t  *local  = NULL;
-        int           op_errno = -1;
-        int           i = -1;
-        int           call_cnt = 0;
-
-
-        VALIDATE_OR_GOTO (frame, err);
-        VALIDATE_OR_GOTO (this, err);
-        VALIDATE_OR_GOTO (fd, err);
-
-        local = dht_local_init (frame, NULL, fd, GF_FOP_FSETATTR);
-        if (!local) {
-                op_errno = ENOMEM;
-                goto err;
-        }
-
-        layout = local->layout;
-        if (!layout) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "no layout for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        if (!layout_is_sane (layout)) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "layout is not sane for fd=%p", fd);
-                op_errno = EINVAL;
-                goto err;
-        }
-
-        if (IA_ISREG (fd->inode->ia_type)) {
-                /* in the regular file _cbk(), we need to check for
-                   migration possibilities */
-                local->rebalance.stbuf = *stbuf;
-                local->rebalance.flags = valid;
-                local->call_cnt = 1;
-                subvol = local->cached_subvol;
-
-                STACK_WIND (frame, dht_file_setattr_cbk, subvol,
-                            subvol->fops->fsetattr,
-                            fd, stbuf, valid, xdata);
-
-                return 0;
-        }
-
-        local->call_cnt = call_cnt = layout->cnt;
-
-        for (i = 0; i < call_cnt; i++) {
-                STACK_WIND (frame, dht_setattr_cbk,
-                            layout->list[i].xlator,
-                            layout->list[i].xlator->fops->fsetattr,
-                            fd, stbuf, valid, xdata);
-        }
-
-        return 0;
-
-err:
-        op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (fsetattr, frame, -1, op_errno, NULL, NULL, NULL);
-
-        return 0;
-}
diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c
index 38e9970a7..e479e984f 100644
--- a/xlators/cluster/dht/src/dht-layout.c
+++ b/xlators/cluster/dht/src/dht-layout.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -43,11 +52,8 @@ dht_layout_new (xlator_t *this, int cnt)
 
         layout->type = DHT_HASH_TYPE_DM;
         layout->cnt = cnt;
-
-        if (conf) {
-                layout->spread_cnt = conf->dir_spread_cnt;
+        if (conf)
                 layout->gen = conf->gen;
-        }
 
         layout->ref = 1;
 out:
@@ -59,7 +65,9 @@ dht_layout_t *
 dht_layout_get (xlator_t *this, inode_t *inode)
 {
         dht_conf_t   *conf = NULL;
+        uint64_t      layout_int = 0;
         dht_layout_t *layout = NULL;
+        int           ret    = -1;
 
         conf = this->private;
         if (!conf)
@@ -67,8 +75,9 @@ dht_layout_get (xlator_t *this, inode_t *inode)
 
         LOCK (&conf->layout_lock);
         {
-                dht_inode_ctx_layout_get (inode, this, &layout);
-                if (layout) {
+                ret = inode_ctx_get (inode, this, &layout_int);
+                if (ret == 0) {
+                        layout = (dht_layout_t *) (unsigned long) layout_int;
                         layout->ref++;
                 }
         }
@@ -86,6 +95,7 @@ dht_layout_set (xlator_t *this, inode_t *inode, dht_layout_t *layout)
         int           oldret = -1;
         int           ret = 0;
         dht_layout_t *old_layout;
+        uint64_t      old_layout_int;
 
         conf = this->private;
         if (!conf)
@@ -93,13 +103,16 @@ dht_layout_set (xlator_t *this, inode_t *inode, dht_layout_t *layout)
 
         LOCK (&conf->layout_lock);
         {
-                oldret = dht_inode_ctx_layout_get (inode, this, &old_layout);
+                oldret = inode_ctx_get (inode, this, &old_layout_int);
+
                 layout->ref++;
-                dht_inode_ctx_layout_set (inode, this, layout);
+                ret = inode_ctx_put (inode, this, (uint64_t) (unsigned long)
+                                     layout);
         }
         UNLOCK (&conf->layout_lock);
 
-        if (!oldret) {
+        if (oldret == 0) {
+                old_layout = (dht_layout_t *) (unsigned long) old_layout_int;
                 dht_layout_unref (this, old_layout);
         }
 
@@ -114,7 +127,7 @@ dht_layout_unref (xlator_t *this, dht_layout_t *layout)
         dht_conf_t  *conf = NULL;
         int          ref = 0;
 
-        if (!layout || layout->preset || !this->private)
+        if (layout->preset || !this->private)
                 return;
 
         conf = this->private;
@@ -158,9 +171,9 @@ dht_layout_search (xlator_t *this, dht_layout_t *layout, const char *name)
         int        ret = 0;
 
 
-        ret = dht_hash_compute (this, layout->type, name, &hash);
+        ret = dht_hash_compute (layout->type, name, &hash);
         if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
+                gf_log (this->name, GF_LOG_INFO,
                         "hash computation failed for type=%d name=%s",
                         layout->type, name);
                 goto out;
@@ -175,7 +188,7 @@ dht_layout_search (xlator_t *this, dht_layout_t *layout, const char *name)
         }
 
         if (!subvol) {
-                gf_log (this->name, GF_LOG_WARNING,
+                gf_log (this->name, GF_LOG_INFO,
                         "no subvolume for hash (value) = %u", hash);
         }
 
@@ -264,9 +277,6 @@ dht_disk_layout_extract (xlator_t *this, dht_layout_t *layout,
 
         if (disk_layout_p)
                 *disk_layout_p = disk_layout;
-        else
-                GF_FREE (disk_layout);
-
         ret = 0;
 
 out:
@@ -276,7 +286,7 @@ out:
 
 int
 dht_disk_layout_merge (xlator_t *this, dht_layout_t *layout,
-		       int pos, void *disk_layout_raw, int disk_layout_len)
+                       int pos, void *disk_layout_raw)
 {
         int      cnt = 0;
         int      type = 0;
@@ -284,38 +294,19 @@ dht_disk_layout_merge (xlator_t *this, dht_layout_t *layout,
         int      stop_off = 0;
         int      disk_layout[4];
 
-	if (!disk_layout_raw) {
-		gf_log (this->name, GF_LOG_CRITICAL,
-                        "error no layout on disk for merge");
-		return -1;
-	}
+        /* TODO: assert disk_layout_ptr is of required length */
 
-	GF_ASSERT (disk_layout_len == sizeof (disk_layout));
-
-        memcpy (disk_layout, disk_layout_raw, disk_layout_len);
+        memcpy (disk_layout, disk_layout_raw, sizeof (disk_layout));
 
         cnt  = ntoh32 (disk_layout[0]);
         if (cnt != 1) {
-                gf_log (this->name, GF_LOG_ERROR,
+                gf_log (this->name, GF_LOG_INFO,
                         "disk layout has invalid count %d", cnt);
                 return -1;
         }
 
-        type = ntoh32 (disk_layout[1]);
-	switch (type) {
-        case DHT_HASH_TYPE_DM_USER:
-                gf_log (this->name, GF_LOG_DEBUG, "found user-set layout");
-                layout->type = type;
-                /* Fall through. */
-	case DHT_HASH_TYPE_DM:
-		break;
-        default:
-		gf_log (this->name, GF_LOG_CRITICAL,
-			"Catastrophic error layout with unknown type found %d",
-			disk_layout[1]);
-		return -1;
-	}
-
+        /* TODO: assert type is compatible */
+        type      = ntoh32 (disk_layout[1]);
         start_off = ntoh32 (disk_layout[2]);
         stop_off  = ntoh32 (disk_layout[3]);
 
@@ -335,12 +326,11 @@ int
 dht_layout_merge (xlator_t *this, dht_layout_t *layout, xlator_t *subvol,
                   int op_ret, int op_errno, dict_t *xattr)
 {
-        int         i     = 0;
-        int         ret   = -1;
-        int         err   = -1;
-        void       *disk_layout_raw = NULL;
-        int         disk_layout_len = 0;
-        dht_conf_t *conf = this->private;
+        int      i     = 0;
+        int      ret   = -1;
+        int      err   = -1;
+        void    *disk_layout_raw = NULL;
+
 
         if (op_ret != 0) {
                 err = op_errno;
@@ -361,12 +351,12 @@ dht_layout_merge (xlator_t *this, dht_layout_t *layout, xlator_t *subvol,
 
         if (xattr) {
                 /* during lookup and not mkdir */
-                ret = dict_get_ptr_and_len (xattr, conf->xattr_name,
-					    &disk_layout_raw, &disk_layout_len);
+                ret = dict_get_ptr (xattr, "trusted.glusterfs.dht",
+                                    &disk_layout_raw);
         }
 
         if (ret != 0) {
-                layout->list[i].err = 0;
+                layout->list[i].err = -1;
                 gf_log (this->name, GF_LOG_TRACE,
                         "missing disk layout on %s. err = %d",
                         subvol->name, err);
@@ -374,10 +364,9 @@ dht_layout_merge (xlator_t *this, dht_layout_t *layout, xlator_t *subvol,
                 goto out;
         }
 
-        ret = dht_disk_layout_merge (this, layout, i, disk_layout_raw,
-				     disk_layout_len);
+        ret = dht_disk_layout_merge (this, layout, i, disk_layout_raw);
         if (ret != 0) {
-                gf_log (this->name, GF_LOG_WARNING,
+                gf_log (this->name, GF_LOG_DEBUG,
                         "layout merge from subvolume %s failed",
                         subvol->name);
                 goto out;
@@ -413,22 +402,6 @@ dht_layout_entry_swap (dht_layout_t *layout, int i, int j)
         layout->list[j].err    = err_swap;
 }
 
-void
-dht_layout_range_swap (dht_layout_t *layout, int i, int j)
-{
-        uint32_t  start_swap = 0;
-        uint32_t  stop_swap = 0;
-
-        start_swap  = layout->list[i].start;
-        stop_swap   = layout->list[i].stop;
-
-        layout->list[i].start  = layout->list[j].start;
-        layout->list[i].stop   = layout->list[j].stop;
-
-        layout->list[j].start  = start_swap;
-        layout->list[j].stop   = stop_swap;
-}
-
 int64_t
 dht_layout_entry_cmp_volname (dht_layout_t *layout, int i, int j)
 {
@@ -436,37 +409,17 @@ dht_layout_entry_cmp_volname (dht_layout_t *layout, int i, int j)
                         layout->list[j].xlator->name));
 }
 
-
-gf_boolean_t
-dht_is_subvol_in_layout (dht_layout_t *layout, xlator_t *xlator)
-{
-        int i = 0;
-
-        for (i = 0; i < layout->cnt; i++) {
-                if (!strcmp (layout->list[i].xlator->name, xlator->name))
-                        return _gf_true;
-        }
-        return _gf_false;
-}
-
 int64_t
 dht_layout_entry_cmp (dht_layout_t *layout, int i, int j)
 {
         int64_t diff = 0;
 
-        /* swap zero'ed out layouts to front, if needed */
-        if (!layout->list[j].start && !layout->list[j].stop) {
-                diff = (int64_t) layout->list[i].stop
-                       - (int64_t) layout->list[j].stop;
-                       goto out;
-        }
         if (layout->list[i].err || layout->list[j].err)
                 diff = layout->list[i].err - layout->list[j].err;
         else
                 diff = (int64_t) layout->list[i].start
                         - (int64_t) layout->list[j].start;
 
-out:
         return diff;
 }
 
@@ -515,8 +468,7 @@ dht_layout_sort_volname (dht_layout_t *layout)
 int
 dht_layout_anomalies (xlator_t *this, loc_t *loc, dht_layout_t *layout,
                       uint32_t *holes_p, uint32_t *overlaps_p,
-                      uint32_t *missing_p, uint32_t *down_p, uint32_t *misc_p,
-                      uint32_t *no_space_p)
+                      uint32_t *missing_p, uint32_t *down_p, uint32_t *misc_p)
 {
         uint32_t    overlaps = 0;
         uint32_t    missing  = 0;
@@ -529,38 +481,30 @@ dht_layout_anomalies (xlator_t *this, loc_t *loc, dht_layout_t *layout,
         uint32_t    prev_stop = 0;
         uint32_t    last_stop = 0;
         char        is_virgin = 1;
-        uint32_t    no_space  = 0;
 
-        /* TODO: explain what is happening */
+        /* TODO: explain WTF is happening */
 
         last_stop = layout->list[0].start - 1;
         prev_stop = last_stop;
 
         for (i = 0; i < layout->cnt; i++) {
-                switch (layout->list[i].err) {
-                case -1:
-                case ENOENT:
-                        missing++;
-                        continue;
-                case ENOTCONN:
-                        down++;
-                        continue;
-                case ENOSPC:
-                        no_space++;
-                        continue;
-                case 0:
-                        /* if err == 0 and start == stop, then it is a non misc++;
-                         * participating subvolume(spread-cnt). Then, do not
-                         * check for anomalies. If start != stop, then treat it
-                         * as misc err */
-                        if (layout->list[i].start == layout->list[i].stop) {
-                                continue;
+                if (layout->list[i].err) {
+                        switch (layout->list[i].err) {
+                        case -1:
+                        case ENOENT:
+                                missing++;
+                                break;
+                        case ENOTCONN:
+                                down++;
+                                break;
+                        case ENOSPC:
+                                down++;
+                                break;
+                        default:
+                                misc++;
                         }
-                        break;
-                default:
-                        misc++;
                         continue;
-                 }
+                }
 
                 is_virgin = 0;
 
@@ -593,9 +537,6 @@ dht_layout_anomalies (xlator_t *this, loc_t *loc, dht_layout_t *layout,
         if (misc_p)
                 *misc_p = misc;
 
-        if (no_space_p)
-                *no_space_p = no_space;
-
         return ret;
 }
 
@@ -611,6 +552,7 @@ dht_layout_normalize (xlator_t *this, loc_t *loc, dht_layout_t *layout)
         uint32_t     down = 0;
         uint32_t     misc = 0;
 
+
         ret = dht_layout_sort (layout);
         if (ret == -1) {
                 gf_log (this->name, GF_LOG_WARNING,
@@ -620,7 +562,7 @@ dht_layout_normalize (xlator_t *this, loc_t *loc, dht_layout_t *layout)
 
         ret = dht_layout_anomalies (this, loc, layout,
                                     &holes, &overlaps,
-                                    &missing, &down, &misc, NULL);
+                                    &missing, &down, &misc);
         if (ret == -1) {
                 gf_log (this->name, GF_LOG_WARNING,
                         "error while finding anomalies in %s -- not good news",
@@ -638,56 +580,43 @@ dht_layout_normalize (xlator_t *this, loc_t *loc, dht_layout_t *layout)
                                 "found anomalies in %s. holes=%d overlaps=%d",
                                 loc->path, holes, overlaps);
                 }
-                ret = -1;
+                ret = 1;
         }
 
         for (i = 0; i < layout->cnt; i++) {
-                /* TODO During DHT selfheal rewrite (almost) find a better place
-                 * to detect this - probably in dht_layout_anomalies()
+                /* TODO During DHT selfheal rewrite (almost) find a better place to
+                 * detect this - probably in dht_layout_anomalies()
                  */
                 if (layout->list[i].err > 0) {
-                        gf_log_callingfn (this->name, GF_LOG_DEBUG,
-                                          "path=%s err=%s on subvol=%s",
-                                          loc->path,
-                                          strerror (layout->list[i].err),
-                                          (layout->list[i].xlator ?
-                                           layout->list[i].xlator->name
-                                           : "<>"));
-                        if ((layout->list[i].err == ENOENT) && (ret >= 0)) {
-                                ret++;
-                        }
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "path=%s err=%s on subvol=%s",
+                                loc->path, strerror (layout->list[i].err),
+                                (layout->list[i].xlator ?
+                                 layout->list[i].xlator->name : "<>"));
+                        if (layout->list[i].err == ENOENT)
+                                ret = 1;
                 }
         }
 
-
 out:
         return ret;
 }
 
-int
-dht_dir_has_layout (dict_t *xattr, char *name)
-{
-
-        void     *disk_layout_raw = NULL;
-
-        return dict_get_ptr (xattr, name, &disk_layout_raw);
-}
 
 int
 dht_layout_dir_mismatch (xlator_t *this, dht_layout_t *layout, xlator_t *subvol,
                          loc_t *loc, dict_t *xattr)
 {
-        int         idx = 0;
-        int         pos = -1;
-        int         ret = 0;
-        int         err = 0;
-        int         dict_ret = 0;
-        int32_t     disk_layout[4];
-        void       *disk_layout_raw = NULL;
-        int32_t     count = -1;
-        uint32_t    start_off = -1;
-        uint32_t    stop_off = -1;
-        dht_conf_t *conf = this->private;
+        int       idx = 0;
+        int       pos = -1;
+        int       ret = 0;
+        int       err = 0;
+        int       dict_ret = 0;
+        int32_t   disk_layout[4];
+        void     *disk_layout_raw = NULL;
+        int32_t   count = -1;
+        uint32_t  start_off = -1;
+        uint32_t  stop_off = -1;
 
 
         for (idx = 0; idx < layout->cnt; idx++) {
@@ -717,7 +646,7 @@ dht_layout_dir_mismatch (xlator_t *this, dht_layout_t *layout, xlator_t *subvol,
                 goto out;
         }
 
-        dict_ret = dict_get_ptr (xattr, conf->xattr_name,
+        dict_ret = dict_get_ptr (xattr, "trusted.glusterfs.dht",
                                  &disk_layout_raw);
 
         if (dict_ret < 0) {
@@ -733,7 +662,7 @@ dht_layout_dir_mismatch (xlator_t *this, dht_layout_t *layout, xlator_t *subvol,
 
         count  = ntoh32 (disk_layout[0]);
         if (count != 1) {
-                gf_log (this->name, GF_LOG_ERROR,
+                gf_log (this->name, GF_LOG_INFO,
                         "%s - disk layout has invalid count %d",
                         loc->path, count);
                 ret = -1;
@@ -782,7 +711,7 @@ dht_layout_preset (xlator_t *this, xlator_t *subvol, inode_t *inode)
 
         LOCK (&conf->layout_lock);
         {
-                dht_inode_ctx_layout_set (inode, this, layout);
+                inode_ctx_put (inode, this, (uint64_t)(long)layout);
         }
         UNLOCK (&conf->layout_lock);
 
diff --git a/xlators/cluster/dht/src/dht-linkfile.c b/xlators/cluster/dht/src/dht-linkfile.c
index dbc9d0b3c..1c90c61d6 100644
--- a/xlators/cluster/dht/src/dht-linkfile.c
+++ b/xlators/cluster/dht/src/dht-linkfile.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -19,106 +28,37 @@
 #include "compat.h"
 #include "dht-common.h"
 
-int
-dht_linkfile_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                         int op_ret, int op_errno,
-                         inode_t *inode, struct iatt *stbuf, dict_t *xattr,
-                         struct iatt *postparent)
-{
-        char          is_linkfile   = 0;
-        dht_conf_t   *conf          = NULL;
-        dht_local_t  *local         = NULL;
-        call_frame_t *prev          = NULL;
 
-        local = frame->local;
-        prev = cookie;
-        conf = this->private;
-
-        if (op_ret)
-                goto out;
-
-        is_linkfile = check_is_linkfile (inode, stbuf, xattr,
-                                         conf->link_xattr_name);
-        if (!is_linkfile)
-                gf_log (this->name, GF_LOG_WARNING, "got non-linkfile %s:%s",
-                        prev->this->name, local->loc.path);
-out:
-        local->linkfile.linkfile_cbk (frame, cookie, this, op_ret, op_errno,
-                                      inode, stbuf, postparent, postparent,
-                                      xattr);
-        return 0;
-}
 
-#define is_equal(a, b) (a == b)
 int
 dht_linkfile_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                          int op_ret, int op_errno, inode_t *inode,
                          struct iatt *stbuf, struct iatt *preparent,
-                         struct iatt *postparent, dict_t *xdata)
+                         struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
-        xlator_t     *subvol = NULL;
-        call_frame_t *prev = NULL;
-        dict_t       *xattrs = NULL;
-        dht_conf_t   *conf = NULL;
-        int           ret = -1;
 
         local = frame->local;
 
-        if (!op_ret)
-                local->linked = _gf_true;
-
-        FRAME_SU_UNDO (frame, dht_local_t);
-
-        if (op_ret && (op_errno == EEXIST)) {
-                conf = this->private;
-                prev = cookie;
-                subvol = prev->this;
-                if (!subvol)
-                        goto out;
-                xattrs = dict_new ();
-                if (!xattrs)
-                        goto out;
-                ret = dict_set_uint32 (xattrs, conf->link_xattr_name, 256);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "Failed to set linkto key");
-                        goto out;
-                }
-
-                STACK_WIND (frame, dht_linkfile_lookup_cbk, subvol,
-                            subvol->fops->lookup, &local->loc, xattrs);
-                if (xattrs)
-                        dict_unref (xattrs);
-                return 0;
-        }
-out:
         local->linkfile.linkfile_cbk (frame, cookie, this, op_ret, op_errno,
-                                      inode, stbuf, preparent, postparent,
-                                      xdata);
-        if (xattrs)
-                dict_unref (xattrs);
+                                      inode, stbuf, preparent, postparent);
         return 0;
 }
 
 
 int
 dht_linkfile_create (call_frame_t *frame, fop_mknod_cbk_t linkfile_cbk,
-                     xlator_t *this,
                      xlator_t *tovol, xlator_t *fromvol, loc_t *loc)
 {
         dht_local_t *local = NULL;
         dict_t      *dict = NULL;
         int          need_unref = 0;
         int          ret = 0;
-        dht_conf_t  *conf = this->private;
 
         local = frame->local;
         local->linkfile.linkfile_cbk = linkfile_cbk;
         local->linkfile.srcvol = tovol;
 
-        local->linked = _gf_false;
-
         dict = local->params;
         if (!dict) {
                 dict = dict_new ();
@@ -134,12 +74,8 @@ dht_linkfile_create (call_frame_t *frame, fop_mknod_cbk_t linkfile_cbk,
                                 "%s: gfid set failed", loc->path);
         }
 
-        ret = dict_set_str (dict, GLUSTERFS_INTERNAL_FOP_KEY, "yes");
-        if (ret)
-                gf_log ("dht-linkfile", GF_LOG_INFO,
-                        "%s: internal-fop set failed", loc->path);
-
-        ret = dict_set_str (dict, conf->link_xattr_name, tovol->name);
+        ret = dict_set_str (dict, "trusted.glusterfs.dht.linkto",
+                                   tovol->name);
 
         if (ret < 0) {
                 gf_log (frame->this->name, GF_LOG_INFO,
@@ -148,13 +84,9 @@ dht_linkfile_create (call_frame_t *frame, fop_mknod_cbk_t linkfile_cbk,
                 goto out;
         }
 
-        local->link_subvol = fromvol;
-        /* Always create as root:root. dht_linkfile_attr_heal fixes the
-         * ownsership */
-        FRAME_SU_DO (frame, dht_local_t);
         STACK_WIND (frame, dht_linkfile_create_cbk,
                     fromvol, fromvol->fops->mknod, loc,
-                    S_IFREG | DHT_LINKFILE_MODE, 0, 0, dict);
+                    S_IFREG | DHT_LINKFILE_MODE, 0, dict);
 
         if (need_unref && dict)
                 dict_unref (dict);
@@ -162,7 +94,7 @@ dht_linkfile_create (call_frame_t *frame, fop_mknod_cbk_t linkfile_cbk,
         return 0;
 out:
         local->linkfile.linkfile_cbk (frame, NULL, frame->this, -1, ENOMEM,
-                                      loc->inode, NULL, NULL, NULL, NULL);
+                                      loc->inode, NULL, NULL, NULL);
 
         if (need_unref && dict)
                 dict_unref (dict);
@@ -174,8 +106,7 @@ out:
 int
 dht_linkfile_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                          int32_t op_ret, int32_t op_errno,
-                         struct iatt *preparent, struct iatt *postparent,
-                         dict_t *xdata)
+                         struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t   *local = NULL;
         call_frame_t  *prev = NULL;
@@ -209,17 +140,16 @@ dht_linkfile_unlink (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
-        /* Using non-fop value here, as anyways, 'local->fop' is not used in
-           this particular case */
-        unlink_local = dht_local_init (unlink_frame, loc, NULL,
-                                       GF_FOP_MAXVALUE);
+        unlink_local = dht_local_init (unlink_frame);
         if (!unlink_local) {
                 goto err;
         }
 
+        loc_copy (&unlink_local->loc, loc);
+
         STACK_WIND (unlink_frame, dht_linkfile_unlink_cbk,
                     subvol, subvol->fops->unlink,
-                    &unlink_local->loc, 0, NULL);
+                    &unlink_local->loc);
 
         return 0;
 err:
@@ -244,7 +174,7 @@ dht_linkfile_subvol (xlator_t *this, inode_t *inode, struct iatt *stbuf,
         if (!xattr)
                 goto out;
 
-        ret = dict_get_ptr (xattr, conf->link_xattr_name, &volname);
+        ret = dict_get_ptr (xattr, "trusted.glusterfs.dht.linkto", &volname);
 
         if ((-1 == ret) || !volname)
                 goto out;
@@ -259,70 +189,3 @@ dht_linkfile_subvol (xlator_t *this, inode_t *inode, struct iatt *stbuf,
 out:
         return subvol;
 }
-
-int
-dht_linkfile_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                          int op_ret, int op_errno, struct iatt *statpre,
-                          struct iatt *statpost, dict_t *xdata)
-{
-        dht_local_t *local = NULL;
-        loc_t *loc = NULL;
-
-        local = frame->local;
-        loc = &local->loc;
-
-        if (op_ret)
-                gf_log (this->name, GF_LOG_ERROR, "setattr of uid/gid on %s"
-                        " :<gfid:%s> failed (%s)",
-                        (loc->path? loc->path: "NULL"),
-                        uuid_utoa(local->gfid), strerror(op_errno));
-
-        DHT_STACK_DESTROY (frame);
-
-       return 0;
-}
-
-int
-dht_linkfile_attr_heal (call_frame_t *frame, xlator_t *this)
-{
-        int     ret = -1;
-        call_frame_t *copy = NULL;
-        dht_local_t  *local = NULL;
-        dht_local_t  *copy_local = NULL;
-        xlator_t     *subvol = NULL;
-        struct iatt   stbuf = {0,};
-
-        local = frame->local;
-
-        GF_VALIDATE_OR_GOTO ("dht", local, out);
-        GF_VALIDATE_OR_GOTO ("dht", local->link_subvol, out);
-
-        if (local->stbuf.ia_type == IA_INVAL)
-                return 0;
-
-        uuid_copy (local->loc.gfid, local->stbuf.ia_gfid);
-
-        copy = copy_frame (frame);
-
-        if (!copy)
-                goto out;
-
-       copy_local = dht_local_init (copy, &local->loc, NULL, 0);
-
-       if (!copy_local)
-               goto out;
-
-        stbuf = local->stbuf;
-        subvol = local->link_subvol;
-
-        copy->local = copy_local;
-
-        FRAME_SU_DO (copy, dht_local_t);
-
-        STACK_WIND (copy, dht_linkfile_setattr_cbk, subvol,
-                    subvol->fops->setattr, &copy_local->loc,
-                    &stbuf, (GF_SET_ATTR_UID | GF_SET_ATTR_GID), NULL);
-        ret = 0;
-out:
-        return ret;
-}
diff --git a/xlators/cluster/dht/src/dht-mem-types.h b/xlators/cluster/dht/src/dht-mem-types.h
index e893eb48f..5775b417a 100644
--- a/xlators/cluster/dht/src/dht-mem-types.h
+++ b/xlators/cluster/dht/src/dht-mem-types.h
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -19,17 +28,13 @@ enum gf_dht_mem_types_ {
         gf_dht_mt_dht_conf_t,
         gf_dht_mt_char,
         gf_dht_mt_int32_t,
+        gf_dht_mt_dht_local_t,
         gf_dht_mt_xlator_t,
         gf_dht_mt_dht_layout_t,
         gf_switch_mt_dht_conf_t,
         gf_switch_mt_dht_du_t,
         gf_switch_mt_switch_sched_array,
         gf_switch_mt_switch_struct,
-        gf_dht_mt_subvol_time,
-        gf_dht_mt_loc_t,
-        gf_defrag_info_mt,
-        gf_dht_mt_inode_ctx_t,
-        gf_dht_mt_ctx_stat_time_t,
         gf_dht_mt_end
 };
 #endif
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
deleted file mode 100644
index bcb19f23e..000000000
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ /dev/null
@@ -1,1815 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-#include "dht-common.h"
-#include "xlator.h"
-#include <fnmatch.h>
-
-#define GF_DISK_SECTOR_SIZE             512
-#define DHT_REBALANCE_PID               4242 /* Change it if required */
-#define DHT_REBALANCE_BLKSIZE           (128 * 1024)
-
-static int
-dht_write_with_holes (xlator_t *to, fd_t *fd, struct iovec *vec, int count,
-                      int32_t size, off_t offset, struct iobref *iobref)
-{
-        int i            = 0;
-        int ret          = -1;
-        int start_idx    = 0;
-        int tmp_offset   = 0;
-        int write_needed = 0;
-        int buf_len      = 0;
-        int size_pending = 0;
-        char *buf        = NULL;
-
-        /* loop through each vector */
-        for (i = 0; i < count; i++) {
-                buf = vec[i].iov_base;
-                buf_len = vec[i].iov_len;
-
-                for (start_idx = 0; (start_idx + GF_DISK_SECTOR_SIZE) <= buf_len;
-                     start_idx += GF_DISK_SECTOR_SIZE) {
-
-                        if (mem_0filled (buf + start_idx, GF_DISK_SECTOR_SIZE) != 0) {
-                                write_needed = 1;
-                                continue;
-                        }
-
-                        if (write_needed) {
-                                ret = syncop_write (to, fd, (buf + tmp_offset),
-                                                    (start_idx - tmp_offset),
-                                                    (offset + tmp_offset),
-                                                    iobref, 0);
-                                /* 'path' will be logged in calling function */
-                                if (ret < 0) {
-                                        gf_log (THIS->name, GF_LOG_WARNING,
-                                                "failed to write (%s)",
-                                                strerror (errno));
-                                        goto out;
-                                }
-
-                                write_needed = 0;
-                        }
-                        tmp_offset = start_idx + GF_DISK_SECTOR_SIZE;
-                }
-
-                if ((start_idx < buf_len) || write_needed) {
-                        /* This means, last chunk is not yet written.. write it */
-                        ret = syncop_write (to, fd, (buf + tmp_offset),
-                                            (buf_len - tmp_offset),
-                                            (offset + tmp_offset), iobref, 0);
-                        if (ret < 0) {
-                                /* 'path' will be logged in calling function */
-                                gf_log (THIS->name, GF_LOG_WARNING,
-                                        "failed to write (%s)",
-                                        strerror (errno));
-                                goto out;
-                        }
-                }
-
-                size_pending = (size - buf_len);
-                if (!size_pending)
-                        break;
-        }
-
-        ret = size;
-out:
-        return ret;
-
-}
-
-int32_t
-gf_defrag_handle_hardlink (xlator_t *this, loc_t *loc, dict_t  *xattrs,
-                           struct iatt *stbuf)
-{
-        int32_t                 ret             = -1;
-        xlator_t               *cached_subvol   = NULL;
-        xlator_t               *hashed_subvol   = NULL;
-        xlator_t               *linkto_subvol   = NULL;
-        data_t                 *data            = NULL;
-        struct iatt             iatt            = {0,};
-        int32_t                 op_errno        = 0;
-        dht_conf_t             *conf            = NULL;
-
-        GF_VALIDATE_OR_GOTO ("defrag", loc, out);
-        GF_VALIDATE_OR_GOTO ("defrag", loc->name, out);
-        GF_VALIDATE_OR_GOTO ("defrag", stbuf, out);
-        GF_VALIDATE_OR_GOTO ("defrag", this, out);
-        GF_VALIDATE_OR_GOTO ("defrag", xattrs, out);
-        GF_VALIDATE_OR_GOTO ("defrag", this->private, out);
-
-        conf = this->private;
-
-        if (uuid_is_null (loc->pargfid)) {
-                gf_log ("", GF_LOG_ERROR, "loc->pargfid is NULL for "
-                        "%s", loc->path);
-                goto out;
-        }
-
-        if (uuid_is_null (loc->gfid)) {
-                gf_log ("", GF_LOG_ERROR, "loc->gfid is NULL for "
-                        "%s", loc->path);
-                goto out;
-        }
-
-        cached_subvol = dht_subvol_get_cached (this, loc->inode);
-        if (!cached_subvol) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to get cached subvol"
-                        " for %s on %s", loc->name, this->name);
-                goto out;
-        }
-
-        hashed_subvol = dht_subvol_get_hashed (this, loc);
-        if (!hashed_subvol) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to get hashed subvol"
-                        " for %s on %s", loc->name, this->name);
-                goto out;
-        }
-
-        gf_log (this->name, GF_LOG_INFO, "Attempting to migrate hardlink %s "
-                "with gfid %s from %s -> %s", loc->name, uuid_utoa (loc->gfid),
-                cached_subvol->name, hashed_subvol->name);
-        data = dict_get (xattrs, conf->link_xattr_name);
-        /* set linkto on cached -> hashed if not present, else link it */
-        if (!data) {
-                ret = dict_set_str (xattrs, conf->link_xattr_name,
-                                    hashed_subvol->name);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "Failed to set "
-                                "linkto xattr in dict for %s", loc->name);
-                        goto out;
-                }
-
-                ret = syncop_setxattr (cached_subvol, loc, xattrs, 0);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "Linkto setxattr "
-                                "failed %s -> %s (%s)", cached_subvol->name,
-                                loc->name, strerror (errno));
-                        goto out;
-                }
-                goto out;
-        } else {
-                linkto_subvol = dht_linkfile_subvol (this, NULL, NULL, xattrs);
-                if (!linkto_subvol) {
-                        gf_log (this->name, GF_LOG_ERROR, "Failed to get "
-                                "linkto subvol for %s", loc->name);
-                } else {
-                        hashed_subvol = linkto_subvol;
-                }
-
-                ret = syncop_link (hashed_subvol, loc, loc);
-                if  (ret) {
-                        op_errno = errno;
-                        gf_log (this->name, GF_LOG_ERROR, "link of %s -> %s"
-                                " failed on  subvol %s (%s)", loc->name,
-                                uuid_utoa(loc->gfid),
-                                hashed_subvol->name, strerror (op_errno));
-                        if (op_errno != EEXIST)
-                                goto out;
-                }
-        }
-        ret = syncop_lookup (hashed_subvol, loc, NULL, &iatt, NULL, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed lookup %s on %s (%s)"
-                        , loc->name, hashed_subvol->name, strerror (errno));
-                goto out;
-        }
-
-        if (iatt.ia_nlink == stbuf->ia_nlink) {
-                ret = dht_migrate_file (this, loc, cached_subvol, hashed_subvol,
-                                        GF_DHT_MIGRATE_HARDLINK_IN_PROGRESS);
-                if (ret)
-                        goto out;
-        }
-        ret = 0;
-out:
-        return ret;
-}
-
-
-static inline int
-__is_file_migratable (xlator_t *this, loc_t *loc,
-                      struct iatt *stbuf, dict_t *xattrs, int flags)
-{
-        int ret = -1;
-
-        if (IA_ISDIR (stbuf->ia_type)) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: migrate-file called on directory", loc->path);
-                ret = -1;
-                goto out;
-        }
-
-        if (flags == GF_DHT_MIGRATE_HARDLINK_IN_PROGRESS) {
-                ret = 0;
-                goto out;
-        }
-        if (stbuf->ia_nlink > 1) {
-                /* support for decomission */
-                if (flags == GF_DHT_MIGRATE_HARDLINK) {
-                        ret = gf_defrag_handle_hardlink (this, loc,
-                                                         xattrs, stbuf);
-                        if (ret) {
-                                gf_log (this->name, GF_LOG_WARNING,
-                                        "%s: failed to migrate file with link",
-                                        loc->path);
-                        }
-                } else {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: file has hardlinks", loc->path);
-                }
-                ret = ENOTSUP;
-                goto out;
-        }
-
-        ret = 0;
-
-out:
-        return ret;
-}
-
-static inline int
-__dht_rebalance_create_dst_file (xlator_t *to, xlator_t *from, loc_t *loc, struct iatt *stbuf,
-                                 dict_t *dict, fd_t **dst_fd, dict_t *xattr)
-{
-        xlator_t    *this = NULL;
-        int          ret  = -1;
-        fd_t        *fd   = NULL;
-        struct iatt  new_stbuf = {0,};
-        dht_conf_t  *conf = NULL;
-
-        this = THIS;
-        conf = this->private;
-
-        ret = dict_set_static_bin (dict, "gfid-req", stbuf->ia_gfid, 16);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to set gfid in dict for create", loc->path);
-                goto out;
-        }
-
-        ret = dict_set_str (dict, conf->link_xattr_name, from->name);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to set gfid in dict for create", loc->path);
-                goto out;
-        }
-
-        fd = fd_create (loc->inode, DHT_REBALANCE_PID);
-        if (!fd) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: fd create failed (destination) (%s)",
-                        loc->path, strerror (errno));
-                ret = -1;
-                goto out;
-        }
-
-        ret = syncop_lookup (to, loc, NULL, &new_stbuf, NULL, NULL);
-        if (!ret) {
-                /* File exits in the destination, check if gfid matches */
-                if (uuid_compare (stbuf->ia_gfid, new_stbuf.ia_gfid) != 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "file %s exits in %s with different gfid",
-                                loc->path, to->name);
-                        fd_unref (fd);
-                        goto out;
-                }
-        }
-        if ((ret == -1) && (errno != ENOENT)) {
-                /* File exists in destination, but not accessible */
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "%s: failed to lookup file (%s)",
-                        loc->path, strerror (errno));
-                goto out;
-        }
-
-        /* Create the destination with LINKFILE mode, and linkto xattr,
-           if the linkfile already exists, it will just open the file */
-        ret = syncop_create (to, loc, O_RDWR, DHT_LINKFILE_MODE, fd,
-                             dict, &new_stbuf);
-        if (ret < 0) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to create %s on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-                goto out;
-        }
-
-        ret = syncop_fsetxattr (to, fd, xattr, 0);
-        if (ret == -1)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to set xattr on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-
-        ret = syncop_ftruncate (to, fd, stbuf->ia_size);
-        if (ret < 0)
-                gf_log (this->name, GF_LOG_ERROR,
-                        "ftruncate failed for %s on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-
-        ret = syncop_fsetattr (to, fd, stbuf,
-                               (GF_SET_ATTR_UID | GF_SET_ATTR_GID),
-                                NULL, NULL);
-        if (ret < 0)
-                gf_log (this->name, GF_LOG_ERROR,
-                        "chown failed for %s on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-
-        if (dst_fd)
-                *dst_fd = fd;
-
-        /* success */
-        ret = 0;
-
-out:
-        return ret;
-}
-
-static inline int
-__dht_check_free_space (xlator_t *to, xlator_t *from, loc_t *loc,
-                        struct iatt *stbuf, int flag)
-{
-        struct statvfs  src_statfs = {0,};
-        struct statvfs  dst_statfs = {0,};
-        int             ret        = -1;
-        xlator_t       *this       = NULL;
-
-        uint64_t        src_statfs_blocks = 1;
-        uint64_t        dst_statfs_blocks = 1;
-
-        this = THIS;
-
-        ret = syncop_statfs (from, loc, &src_statfs);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to get statfs of %s on %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-        ret = syncop_statfs (to, loc, &dst_statfs);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to get statfs of %s on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-                goto out;
-        }
-
-        /* if force option is given, do not check for space @ dst.
-         * Check only if space is avail for the file */
-        if (flag != GF_DHT_MIGRATE_DATA)
-                goto check_avail_space;
-
-        /* Check:
-           During rebalance `migrate-data` - Destination subvol experiences
-           a `reduction` in 'blocks' of free space, at the same time source
-           subvol gains certain 'blocks' of free space. A valid check is
-           necessary here to avoid errorneous move to destination where
-           the space could be scantily available.
-         */
-        if (stbuf) {
-                dst_statfs_blocks = ((dst_statfs.f_bavail *
-                                      dst_statfs.f_bsize) /
-                                     GF_DISK_SECTOR_SIZE);
-                src_statfs_blocks = ((src_statfs.f_bavail *
-                                      src_statfs.f_bsize) /
-                                     GF_DISK_SECTOR_SIZE);
-                if ((dst_statfs_blocks - stbuf->ia_blocks) <
-                    (src_statfs_blocks + stbuf->ia_blocks)) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "data movement attempted from node (%s) with"
-                                " higher disk space to a node (%s) with "
-                                "lesser disk space (%s)", from->name,
-                                to->name, loc->path);
-
-                        /* this is not a 'failure', but we don't want to
-                           consider this as 'success' too :-/ */
-                        ret = 1;
-                        goto out;
-                }
-        }
-check_avail_space:
-        if (((dst_statfs.f_bavail * dst_statfs.f_bsize) /
-              GF_DISK_SECTOR_SIZE) < stbuf->ia_blocks) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "data movement attempted from node (%s) with "
-                        "to node (%s) which does not have required free space"
-                        " for %s", from->name, to->name, loc->path);
-                ret = 1;
-                goto out;
-        }
-
-        ret = 0;
-out:
-        return ret;
-}
-
-static inline int
-__dht_rebalance_migrate_data (xlator_t *from, xlator_t *to, fd_t *src, fd_t *dst,
-                             uint64_t ia_size, int hole_exists)
-{
-        int            ret    = 0;
-        int            count  = 0;
-        off_t          offset = 0;
-        struct iovec  *vector = NULL;
-        struct iobref *iobref = NULL;
-        uint64_t       total  = 0;
-        size_t         read_size = 0;
-
-        /* if file size is '0', no need to enter this loop */
-        while (total < ia_size) {
-                read_size = (((ia_size - total) > DHT_REBALANCE_BLKSIZE) ?
-                             DHT_REBALANCE_BLKSIZE : (ia_size - total));
-                ret = syncop_readv (from, src, read_size,
-                                    offset, 0, &vector, &count, &iobref);
-                if (!ret || (ret < 0)) {
-                        break;
-                }
-
-                if (hole_exists)
-                        ret = dht_write_with_holes (to, dst, vector, count,
-                                                    ret, offset, iobref);
-                else
-                        ret = syncop_writev (to, dst, vector, count,
-                                             offset, iobref, 0);
-                if (ret < 0) {
-                        break;
-                }
-                offset += ret;
-                total += ret;
-
-                GF_FREE (vector);
-                if (iobref)
-                        iobref_unref (iobref);
-                iobref = NULL;
-                vector = NULL;
-        }
-        if (iobref)
-                iobref_unref (iobref);
-        GF_FREE (vector);
-
-        if (ret >= 0)
-                ret = 0;
-
-        return ret;
-}
-
-
-static inline int
-__dht_rebalance_open_src_file (xlator_t *from, xlator_t *to, loc_t *loc,
-                               struct iatt *stbuf, fd_t **src_fd)
-{
-        int          ret  = 0;
-        fd_t        *fd   = NULL;
-        dict_t      *dict = NULL;
-        xlator_t    *this = NULL;
-        struct iatt  iatt = {0,};
-        dht_conf_t  *conf = NULL;
-
-        this = THIS;
-        conf = this->private;
-
-        fd = fd_create (loc->inode, DHT_REBALANCE_PID);
-        if (!fd) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: fd create failed (source)", loc->path);
-                ret = -1;
-                goto out;
-        }
-
-        ret = syncop_open (from, loc, O_RDWR, fd);
-        if (ret == -1) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to open file %s on %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-        ret = -1;
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        ret = dict_set_str (dict, conf->link_xattr_name, to->name);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to set xattr in dict for %s (linkto:%s)",
-                        loc->path, to->name);
-                goto out;
-        }
-
-        /* Once the migration starts, the source should have 'linkto' key set
-           to show which is the target, so other clients can work around it */
-        ret = syncop_setxattr (from, loc, dict, 0);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to set xattr on %s in %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-        /* mode should be (+S+T) to indicate migration is in progress */
-        iatt.ia_prot = stbuf->ia_prot;
-        iatt.ia_type = stbuf->ia_type;
-        iatt.ia_prot.sticky = 1;
-        iatt.ia_prot.sgid = 1;
-
-        ret = syncop_setattr (from, loc, &iatt, GF_SET_ATTR_MODE, NULL, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to set mode on %s in %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-        if (src_fd)
-                *src_fd = fd;
-
-        /* success */
-        ret = 0;
-out:
-        if (dict)
-                dict_unref (dict);
-
-        return ret;
-}
-
-int
-migrate_special_files (xlator_t *this, xlator_t *from, xlator_t *to, loc_t *loc,
-                       struct iatt *buf)
-{
-        int          ret      = -1;
-        dict_t      *rsp_dict = NULL;
-        dict_t      *dict     = NULL;
-        char        *link     = NULL;
-        struct iatt  stbuf    = {0,};
-        dht_conf_t  *conf     = this->private;
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        ret = dict_set_int32 (dict, conf->link_xattr_name, 256);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to set 'linkto' key in dict", loc->path);
-                goto out;
-        }
-
-        /* check in the destination if the file is link file */
-        ret = syncop_lookup (to, loc, dict, &stbuf, &rsp_dict, NULL);
-        if ((ret == -1) && (errno != ENOENT)) {
-                gf_log (this->name, GF_LOG_WARNING, "%s: lookup failed (%s)",
-                        loc->path, strerror (errno));
-                goto out;
-        }
-
-        /* we no more require this key */
-        dict_del (dict, conf->link_xattr_name);
-
-        /* file exists in target node, only if it is 'linkfile' its valid,
-           otherwise, error out */
-        if (!ret) {
-                if (!check_is_linkfile (loc->inode, &stbuf, rsp_dict,
-                                        conf->link_xattr_name)) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: file exists in destination", loc->path);
-                        ret = -1;
-                        goto out;
-                }
-
-                /* as file is linkfile, delete it */
-                ret = syncop_unlink (to, loc);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: failed to delete the linkfile (%s)",
-                                loc->path, strerror (errno));
-                        goto out;
-                }
-        }
-
-        /* Set the gfid of the source file in dict */
-        ret = dict_set_static_bin (dict, "gfid-req", buf->ia_gfid, 16);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to set gfid in dict for create", loc->path);
-                goto out;
-        }
-
-        /* Create the file in target */
-        if (IA_ISLNK (buf->ia_type)) {
-                /* Handle symlinks separately */
-                ret = syncop_readlink (from, loc, &link, buf->ia_size);
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: readlink on symlink failed (%s)",
-                                loc->path, strerror (errno));
-                        goto out;
-                }
-
-                ret = syncop_symlink (to, loc, link, dict, 0);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: creating symlink failed (%s)",
-                                loc->path, strerror (errno));
-                        goto out;
-                }
-
-                goto done;
-        }
-
-        ret = syncop_mknod (to, loc, st_mode_from_ia (buf->ia_prot,
-                                                      buf->ia_type),
-                            makedev (ia_major (buf->ia_rdev),
-                                     ia_minor (buf->ia_rdev)), dict, 0);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING, "%s: mknod failed (%s)",
-                        loc->path, strerror (errno));
-                goto out;
-        }
-
-done:
-        ret = syncop_setattr (to, loc, buf,
-                              (GF_SET_ATTR_UID | GF_SET_ATTR_GID |
-                               GF_SET_ATTR_MODE), NULL, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to perform setattr on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-        }
-
-        ret = syncop_unlink (from, loc);
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING, "%s: unlink failed (%s)",
-                        loc->path, strerror (errno));
-
-out:
-        if (dict)
-                dict_unref (dict);
-
-        if (rsp_dict)
-                dict_unref (rsp_dict);
-
-        return ret;
-}
-
-/*
-  return values:
-
-   -1 : failure
-    0 : successfully migrated data
-    1 : not a failure, but we can't migrate data as of now
-*/
-int
-dht_migrate_file (xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to,
-                  int flag)
-{
-        int             ret            = -1;
-        struct iatt     new_stbuf      = {0,};
-        struct iatt     stbuf          = {0,};
-        struct iatt     empty_iatt     = {0,};
-        ia_prot_t       src_ia_prot    = {0,};
-        fd_t           *src_fd         = NULL;
-        fd_t           *dst_fd         = NULL;
-        dict_t         *dict           = NULL;
-        dict_t         *xattr          = NULL;
-        dict_t         *xattr_rsp      = NULL;
-        int             file_has_holes = 0;
-        dht_conf_t     *conf           = this->private;
-
-        gf_log (this->name, GF_LOG_INFO, "%s: attempting to move from %s to %s",
-                loc->path, from->name, to->name);
-
-        dict = dict_new ();
-        if (!dict)
-                goto out;
-
-        ret = dict_set_int32 (dict, conf->link_xattr_name, 256);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "%s: failed to set 'linkto' key in dict", loc->path);
-                goto out;
-        }
-
-        /* Phase 1 - Data migration is in progress from now on */
-        ret = syncop_lookup (from, loc, dict, &stbuf, &xattr_rsp, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "%s: lookup failed on %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-        /* we no more require this key */
-        dict_del (dict, conf->link_xattr_name);
-
-        /* preserve source mode, so set the same to the destination */
-        src_ia_prot = stbuf.ia_prot;
-
-        /* Check if file can be migrated */
-        ret = __is_file_migratable (this, loc, &stbuf, xattr_rsp, flag);
-        if (ret)
-                goto out;
-
-        /* Take care of the special files */
-        if (!IA_ISREG (stbuf.ia_type)) {
-                /* Special files */
-                ret = migrate_special_files (this, from, to, loc, &stbuf);
-                goto out;
-        }
-
-        /* TODO: move all xattr related operations to fd based operations */
-        ret = syncop_listxattr (from, loc, &xattr);
-        if (ret == -1)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to get xattr from %s (%s)",
-                        loc->path, from->name, strerror (errno));
-
-        /* create the destination, with required modes/xattr */
-        ret = __dht_rebalance_create_dst_file (to, from, loc, &stbuf,
-                                               dict, &dst_fd, xattr);
-        if (ret)
-                goto out;
-
-        ret = __dht_check_free_space (to, from, loc, &stbuf, flag);
-        if (ret) {
-                goto out;
-        }
-
-        /* Open the source, and also update mode/xattr */
-        ret = __dht_rebalance_open_src_file (from, to, loc, &stbuf, &src_fd);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "failed to open %s on %s",
-                        loc->path, from->name);
-                goto out;
-        }
-
-
-        ret = syncop_fstat (from, src_fd, &stbuf);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "failed to lookup %s on %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-        /* Try to preserve 'holes' while migrating data */
-        if (stbuf.ia_size > (stbuf.ia_blocks * GF_DISK_SECTOR_SIZE))
-                file_has_holes = 1;
-
-        /* All I/O happens in this function */
-        ret = __dht_rebalance_migrate_data (from, to, src_fd, dst_fd,
-					    stbuf.ia_size, file_has_holes);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "%s: failed to migrate data",
-                        loc->path);
-                /* reset the destination back to 0 */
-                ret = syncop_ftruncate (to, dst_fd, 0);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "%s: failed to reset target size back to 0 (%s)",
-                                loc->path, strerror (errno));
-                }
-
-                ret = -1;
-                goto out;
-        }
-
-        /* TODO: Sync the locks */
-
-        ret = syncop_fsync (to, dst_fd, 0);
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to fsync on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-
-
-        /* Phase 2 - Data-Migration Complete, Housekeeping updates pending */
-
-        ret = syncop_fstat (from, src_fd, &new_stbuf);
-        if (ret < 0) {
-                /* Failed to get the stat info */
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to fstat file %s on %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-        /* source would have both sticky bit and sgid bit set, reset it to 0,
-           and set the source permission on destination, if it was not set
-           prior to setting rebalance-modes in source  */
-        if (!src_ia_prot.sticky)
-                new_stbuf.ia_prot.sticky = 0;
-
-        if (!src_ia_prot.sgid)
-                new_stbuf.ia_prot.sgid = 0;
-
-        /* TODO: if the source actually had sticky bit, or sgid bit set,
-           we are not handling it */
-
-        ret = syncop_fsetattr (to, dst_fd, &new_stbuf,
-                               (GF_SET_ATTR_UID | GF_SET_ATTR_GID |
-                                GF_SET_ATTR_MODE), NULL, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to perform setattr on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-                goto out;
-        }
-
-        /* Because 'futimes' is not portable */
-        ret = syncop_setattr (to, loc, &new_stbuf,
-                              (GF_SET_ATTR_MTIME | GF_SET_ATTR_ATIME),
-                              NULL, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to perform setattr on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-        }
-
-        /* Make the source as a linkfile first before deleting it */
-        empty_iatt.ia_prot.sticky = 1;
-        ret = syncop_fsetattr (from, src_fd, &empty_iatt,
-                               GF_SET_ATTR_MODE, NULL, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,             \
-                        "%s: failed to perform setattr on %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-       /* Free up the data blocks on the source node, as the whole
-           file is migrated */
-        ret = syncop_ftruncate (from, src_fd, 0);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to perform truncate on %s (%s)",
-                        loc->path, from->name, strerror (errno));
-        }
-
-        /* remove the 'linkto' xattr from the destination */
-        ret = syncop_fremovexattr (to, dst_fd, conf->link_xattr_name);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to perform removexattr on %s (%s)",
-                        loc->path, to->name, strerror (errno));
-        }
-
-        /* Do a stat and check the gfid before unlink */
-        ret = syncop_stat (from, loc, &empty_iatt);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to do a stat on %s (%s)",
-                        loc->path, from->name, strerror (errno));
-                goto out;
-        }
-
-        if (uuid_compare (empty_iatt.ia_gfid, loc->gfid) == 0) {
-                /* take out the source from namespace */
-                ret = syncop_unlink (from, loc);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: failed to perform unlink on %s (%s)",
-                                loc->path, from->name, strerror (errno));
-                        goto out;
-                }
-        }
-
-        ret = syncop_lookup (this, loc, NULL, NULL, NULL, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "%s: failed to lookup the file on subvolumes (%s)",
-                        loc->path, strerror (errno));
-        }
-
-        gf_log (this->name, GF_LOG_INFO,
-                "completed migration of %s from subvolume %s to %s",
-                loc->path, from->name, to->name);
-
-        ret = 0;
-out:
-        if (dict)
-                dict_unref (dict);
-
-        if (xattr)
-                dict_unref (xattr);
-        if (xattr_rsp)
-                dict_unref (xattr_rsp);
-
-        if (dst_fd)
-                syncop_close (dst_fd);
-        if (src_fd)
-                syncop_close (src_fd);
-
-        return ret;
-}
-
-static int
-rebalance_task (void *data)
-{
-        int           ret   = -1;
-        dht_local_t  *local = NULL;
-        call_frame_t *frame = NULL;
-
-        frame = data;
-
-        local = frame->local;
-
-        /* This function is 'synchrounous', hence if it returns,
-           we are done with the task */
-        ret = dht_migrate_file (THIS, &local->loc, local->rebalance.from_subvol,
-                                local->rebalance.target_node, local->flags);
-
-        return ret;
-}
-
-static int
-rebalance_task_completion (int op_ret, call_frame_t *sync_frame, void *data)
-{
-        int           ret        = -1;
-        uint64_t      layout_int = 0;
-        dht_layout_t *layout     = 0;
-        xlator_t     *this       = NULL;
-        dht_local_t  *local      = NULL;
-        int32_t       op_errno   = EINVAL;
-
-        this = THIS;
-        local = sync_frame->local;
-
-        if (!op_ret) {
-                /* Make sure we have valid 'layout' in inode ctx
-                   after the operation */
-                ret = inode_ctx_del (local->loc.inode, this, &layout_int);
-                if (!ret && layout_int) {
-                        layout = (dht_layout_t *)(long)layout_int;
-                        dht_layout_unref (this, layout);
-                }
-
-                ret = dht_layout_preset (this, local->rebalance.target_node,
-                                         local->loc.inode);
-                if (ret)
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "%s: failed to set inode ctx", local->loc.path);
-        }
-
-        if (op_ret == -1) {
-                /* Failure of migration process, mostly due to write process.
-                   as we can't preserve the exact errno, lets say there was
-                   no space to migrate-data
-                */
-                op_errno = ENOSPC;
-        }
-
-        if (op_ret == 1) {
-                /* migration didn't happen, but is not a failure, let the user
-                   understand that he doesn't have permission to migrate the
-                   file.
-                */
-                op_ret = -1;
-                op_errno = EPERM;
-        }
-
-        DHT_STACK_UNWIND (setxattr, sync_frame, op_ret, op_errno, NULL);
-        return 0;
-}
-
-int
-dht_start_rebalance_task (xlator_t *this, call_frame_t *frame)
-{
-        int         ret     = -1;
-
-        ret = synctask_new (this->ctx->env, rebalance_task,
-                            rebalance_task_completion,
-                            frame, frame);
-        return ret;
-}
-
-int
-gf_listener_stop (xlator_t *this)
-{
-        glusterfs_ctx_t  *ctx = NULL;
-        cmd_args_t       *cmd_args = NULL;
-        int              ret = 0;
-
-        ctx = this->ctx;
-        GF_ASSERT (ctx);
-        cmd_args = &ctx->cmd_args;
-        if (cmd_args->sock_file) {
-                ret = unlink (cmd_args->sock_file);
-                if (ret && (ENOENT == errno)) {
-                        ret = 0;
-                }
-        }
-
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to unlink listener "
-                        "socket %s, error: %s", cmd_args->sock_file,
-                        strerror (errno));
-        }
-        return ret;
-}
-
-void
-dht_build_root_inode (xlator_t *this, inode_t **inode)
-{
-        inode_table_t    *itable        = NULL;
-        uuid_t            root_gfid     = {0, };
-
-        itable = inode_table_new (0, this);
-        if (!itable)
-                return;
-
-        root_gfid[15] = 1;
-        *inode = inode_find (itable, root_gfid);
-}
-
-void
-dht_build_root_loc (inode_t *inode, loc_t *loc)
-{
-        loc->path = "/";
-        loc->inode = inode;
-        loc->inode->ia_type = IA_IFDIR;
-        memset (loc->gfid, 0, 16);
-        loc->gfid[15] = 1;
-}
-
-
-/* return values: 1 -> error, bug ignore and continue
-                  0 -> proceed
-                 -1 -> error, handle it */
-int32_t
-gf_defrag_handle_migrate_error (int32_t op_errno, gf_defrag_info_t *defrag)
-{
-        /* if errno is not ENOSPC or ENOTCONN, we can still continue
-           with rebalance process */
-        if ((errno != ENOSPC) || (errno != ENOTCONN))
-                return 1;
-
-        if (errno == ENOTCONN) {
-                /* Most probably mount point went missing (mostly due
-                   to a brick down), say rebalance failure to user,
-                   let him restart it if everything is fine */
-                defrag->defrag_status = GF_DEFRAG_STATUS_FAILED;
-                return -1;
-        }
-
-        if (errno == ENOSPC) {
-                /* rebalance process itself failed, may be
-                   remote brick went down, or write failed due to
-                   disk full etc etc.. */
-                defrag->defrag_status = GF_DEFRAG_STATUS_FAILED;
-                return -1;
-        }
-
-        return 0;
-}
-
-static gf_boolean_t
-gf_defrag_pattern_match (gf_defrag_info_t *defrag, char *name, uint64_t size)
-{
-        gf_defrag_pattern_list_t *trav = NULL;
-        gf_boolean_t               match = _gf_false;
-        gf_boolean_t               ret = _gf_false;
-
-        GF_VALIDATE_OR_GOTO ("dht", defrag, out);
-
-        trav = defrag->defrag_pattern;
-        while (trav) {
-                if (!fnmatch (trav->path_pattern, name, FNM_NOESCAPE)) {
-                        match = _gf_true;
-                        break;
-                }
-                trav = trav->next;
-        }
-
-        if ((match == _gf_true) && (size >= trav->size))
-                ret = _gf_true;
-
- out:
-        return ret;
-}
-
-/* We do a depth first traversal of directories. But before we move into
- * subdirs, we complete the data migration of those directories whose layouts
- * have been fixed
- */
-
-int
-gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
-                        dict_t *migrate_data)
-{
-        int                      ret            = -1;
-        loc_t                    entry_loc      = {0,};
-        fd_t                    *fd             = NULL;
-        gf_dirent_t              entries;
-        gf_dirent_t             *tmp            = NULL;
-        gf_dirent_t             *entry          = NULL;
-        gf_boolean_t             free_entries   = _gf_false;
-        off_t                    offset         = 0;
-        dict_t                  *dict           = NULL;
-        struct iatt              iatt           = {0,};
-        int32_t                  op_errno       = 0;
-        char                    *uuid_str       = NULL;
-        uuid_t                   node_uuid      = {0,};
-        int                      readdir_operrno = 0;
-        struct timeval           dir_start      = {0,};
-        struct timeval           end            = {0,};
-        double                   elapsed        = {0,};
-        struct timeval           start          = {0,};
-        int32_t                  err            = 0;
-
-        gf_log (this->name, GF_LOG_INFO, "migrate data called on %s",
-                loc->path);
-        gettimeofday (&dir_start, NULL);
-
-        fd = fd_create (loc->inode, defrag->pid);
-        if (!fd) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to create fd");
-                goto out;
-        }
-
-        ret = syncop_opendir (this, loc, fd);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to open dir %s",
-                        loc->path);
-                goto out;
-        }
-
-        INIT_LIST_HEAD (&entries.list);
-
-        while ((ret = syncop_readdirp (this, fd, 131072, offset, NULL,
-                                       &entries)) != 0) {
-
-                if (ret < 0) {
-
-                        gf_log (this->name, GF_LOG_ERROR, "Readdir returned %s."
-                                " Aborting migrate-data",
-                                strerror(readdir_operrno));
-                        goto out;
-                }
-
-                /* Need to keep track of ENOENT errno, that means, there is no
-                   need to send more readdirp() */
-                readdir_operrno = errno;
-
-                if (list_empty (&entries.list))
-                        break;
-
-                free_entries = _gf_true;
-
-                list_for_each_entry_safe (entry, tmp, &entries.list, list) {
-                        if (defrag->defrag_status != GF_DEFRAG_STATUS_STARTED) {
-                                ret = 1;
-                                goto out;
-                        }
-
-                        offset = entry->d_off;
-
-                        if (!strcmp (entry->d_name, ".") ||
-                            !strcmp (entry->d_name, ".."))
-                                continue;
-
-                        if (IA_ISDIR (entry->d_stat.ia_type))
-                                continue;
-
-                        defrag->num_files_lookedup++;
-                        if (defrag->stats == _gf_true) {
-                                gettimeofday (&start, NULL);
-                        }
-                        if (defrag->defrag_pattern &&
-                            (gf_defrag_pattern_match (defrag, entry->d_name,
-                                                      entry->d_stat.ia_size)
-                             == _gf_false)) {
-                                continue;
-                        }
-                        loc_wipe (&entry_loc);
-                        ret =dht_build_child_loc (this, &entry_loc, loc,
-                                                  entry->d_name);
-                        if (ret) {
-                                gf_log (this->name, GF_LOG_ERROR, "Child loc"
-                                        " build failed");
-                                goto out;
-                        }
-
-                        if (uuid_is_null (entry->d_stat.ia_gfid)) {
-                                gf_log (this->name, GF_LOG_ERROR, "%s/%s"
-                                        " gfid not present", loc->path,
-                                         entry->d_name);
-                                continue;
-                        }
-
-                        uuid_copy (entry_loc.gfid, entry->d_stat.ia_gfid);
-
-                        if (uuid_is_null (loc->gfid)) {
-                                gf_log (this->name, GF_LOG_ERROR, "%s/%s"
-                                        " gfid not present", loc->path,
-                                         entry->d_name);
-                                continue;
-                        }
-
-                        uuid_copy (entry_loc.pargfid, loc->gfid);
-
-                        entry_loc.inode->ia_type = entry->d_stat.ia_type;
-
-                        ret = syncop_lookup (this, &entry_loc, NULL, &iatt,
-                                             NULL, NULL);
-                        if (ret) {
-                                gf_log (this->name, GF_LOG_ERROR, "%s"
-                                        " lookup failed", entry_loc.path);
-                                continue;
-                        }
-
-                        ret = syncop_getxattr (this, &entry_loc, &dict,
-                                               GF_XATTR_NODE_UUID_KEY);
-                        if(ret < 0) {
-                                gf_log (this->name, GF_LOG_ERROR, "Failed to "
-                                        "get node-uuid for %s", entry_loc.path);
-                                continue;
-                        }
-
-                        ret = dict_get_str (dict, GF_XATTR_NODE_UUID_KEY,
-                                            &uuid_str);
-                        if(ret < 0) {
-                                gf_log (this->name, GF_LOG_ERROR, "Failed to "
-                                        "get node-uuid from dict for %s",
-                                        entry_loc.path);
-                                continue;
-                        }
-
-                        if (uuid_parse (uuid_str, node_uuid)) {
-                                gf_log (this->name, GF_LOG_ERROR, "uuid_parse "
-                                        "failed for %s", entry_loc.path);
-                                continue;
-                        }
-
-                        /* if file belongs to different node, skip migration
-                         * the other node will take responsibility of migration
-                         */
-                        if (uuid_compare (node_uuid, defrag->node_uuid)) {
-                                gf_log (this->name, GF_LOG_TRACE, "%s does not"
-                                        "belong to this node", entry_loc.path);
-                                continue;
-                        }
-
-                        uuid_str = NULL;
-
-                        dict_del (dict, GF_XATTR_NODE_UUID_KEY);
-
-
-                        /* if distribute is present, it will honor this key.
-                         * -1 is returned if distribute is not present or file
-                         * doesn't have a link-file. If file has link-file, the
-                         * path of link-file will be the value, and also that
-                         * guarantees that file has to be mostly migrated */
-
-                        ret = syncop_getxattr (this, &entry_loc, &dict,
-                                               GF_XATTR_LINKINFO_KEY);
-                        if (ret < 0) {
-                                gf_log (this->name, GF_LOG_TRACE, "failed to "
-                                        "get link-to key for %s",
-                                        entry_loc.path);
-                                continue;
-                        }
-
-                        ret = syncop_setxattr (this, &entry_loc, migrate_data,
-                                               0);
-                        if (ret) {
-                                err = op_errno;
-                                /* errno is overloaded. See
-                                 * rebalance_task_completion () */
-                                if (err != ENOSPC) {
-                                        gf_log (this->name, GF_LOG_DEBUG,
-                                                "migrate-data skipped for %s"
-                                                " due to space constraints",
-                                                entry_loc.path);
-                                        defrag->skipped +=1;
-                                } else{
-                                        gf_log (this->name, GF_LOG_ERROR,
-                                                "migrate-data failed for %s",
-                                                entry_loc.path);
-                                        defrag->total_failures +=1;
-                                }
-                        }
-
-                        if (ret == -1) {
-                                op_errno = errno;
-                                ret = gf_defrag_handle_migrate_error (op_errno,
-                                                                      defrag);
-
-                                if (!ret)
-                                        gf_log (this->name, GF_LOG_DEBUG,
-                                                "migrate-data on %s failed: %s",
-                                                entry_loc.path,
-                                                strerror (op_errno));
-                                else if (ret == 1)
-                                        continue;
-                                else if (ret == -1)
-                                        goto out;
-                        }
-
-                        LOCK (&defrag->lock);
-                        {
-                                defrag->total_files += 1;
-                                defrag->total_data += iatt.ia_size;
-                        }
-                        UNLOCK (&defrag->lock);
-                        if (defrag->stats == _gf_true) {
-                                gettimeofday (&end, NULL);
-                                elapsed = (end.tv_sec - start.tv_sec) * 1e6 +
-                                          (end.tv_usec - start.tv_usec);
-                                gf_log (this->name, GF_LOG_INFO, "Migration of "
-                                        "file:%s size:%"PRIu64" bytes took %.2f"
-                                        "secs", entry_loc.path, iatt.ia_size,
-                                         elapsed/1e6);
-                        }
-                }
-
-                gf_dirent_free (&entries);
-                free_entries = _gf_false;
-                INIT_LIST_HEAD (&entries.list);
-
-                if (readdir_operrno == ENOENT)
-                        break;
-        }
-
-        gettimeofday (&end, NULL);
-        elapsed = (end.tv_sec - dir_start.tv_sec) * 1e6 +
-                  (end.tv_usec - dir_start.tv_usec);
-        gf_log (this->name, GF_LOG_INFO, "Migration operation on dir %s took "
-                "%.2f secs", loc->path, elapsed/1e6);
-        ret = 0;
-out:
-        if (free_entries)
-                gf_dirent_free (&entries);
-
-        loc_wipe (&entry_loc);
-
-        if (dict)
-                dict_unref(dict);
-
-        if (fd)
-                fd_unref (fd);
-        return ret;
-
-}
-
-
-int
-gf_defrag_fix_layout (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
-                  dict_t *fix_layout, dict_t *migrate_data)
-{
-        int                      ret            = -1;
-        loc_t                    entry_loc      = {0,};
-        fd_t                    *fd             = NULL;
-        gf_dirent_t              entries;
-        gf_dirent_t             *tmp            = NULL;
-        gf_dirent_t             *entry          = NULL;
-        gf_boolean_t             free_entries   = _gf_false;
-        dict_t                  *dict           = NULL;
-        off_t                    offset         = 0;
-        struct iatt              iatt           = {0,};
-        int                      readdirp_errno = 0;
-
-        ret = syncop_lookup (this, loc, NULL, &iatt, NULL, NULL);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Lookup failed on %s",
-                        loc->path);
-                goto out;
-        }
-
-        if (defrag->cmd != GF_DEFRAG_CMD_START_LAYOUT_FIX) {
-                ret = gf_defrag_migrate_data (this, defrag, loc, migrate_data);
-                if (ret)
-                        goto out;
-        }
-
-        gf_log (this->name, GF_LOG_TRACE, "fix layout called on %s", loc->path);
-
-        fd = fd_create (loc->inode, defrag->pid);
-        if (!fd) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to create fd");
-                ret = -1;
-                goto out;
-        }
-
-        ret = syncop_opendir (this, loc, fd);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to open dir %s",
-                        loc->path);
-                ret = -1;
-                goto out;
-        }
-
-        INIT_LIST_HEAD (&entries.list);
-        while ((ret = syncop_readdirp (this, fd, 131072, offset, NULL,
-                &entries)) != 0)
-        {
-
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_ERROR, "Readdir returned %s"
-                                ". Aborting fix-layout",strerror(errno));
-                        goto out;
-                }
-
-                /* Need to keep track of ENOENT errno, that means, there is no
-                   need to send more readdirp() */
-                readdirp_errno = errno;
-
-                if (list_empty (&entries.list))
-                        break;
-
-                free_entries = _gf_true;
-
-                list_for_each_entry_safe (entry, tmp, &entries.list, list) {
-                        if (defrag->defrag_status != GF_DEFRAG_STATUS_STARTED) {
-                                ret = 1;
-                                goto out;
-                        }
-
-                        offset = entry->d_off;
-
-                        if (!strcmp (entry->d_name, ".") ||
-                            !strcmp (entry->d_name, ".."))
-                                continue;
-
-                        if (!IA_ISDIR (entry->d_stat.ia_type))
-                                continue;
-
-                        loc_wipe (&entry_loc);
-                        ret =dht_build_child_loc (this, &entry_loc, loc,
-                                                  entry->d_name);
-                        if (ret) {
-                                gf_log (this->name, GF_LOG_ERROR, "Child loc"
-                                        " build failed");
-                                goto out;
-                        }
-
-                        if (uuid_is_null (entry->d_stat.ia_gfid)) {
-                                gf_log (this->name, GF_LOG_ERROR, "%s/%s"
-                                        " gfid not present", loc->path,
-                                         entry->d_name);
-                                continue;
-                        }
-
-                        entry_loc.inode->ia_type = entry->d_stat.ia_type;
-
-                        uuid_copy (entry_loc.gfid, entry->d_stat.ia_gfid);
-                        if (uuid_is_null (loc->gfid)) {
-                                gf_log (this->name, GF_LOG_ERROR, "%s/%s"
-                                        " gfid not present", loc->path,
-                                         entry->d_name);
-                                continue;
-                        }
-
-                        uuid_copy (entry_loc.pargfid, loc->gfid);
-
-                        ret = syncop_lookup (this, &entry_loc, NULL, &iatt,
-                                             NULL, NULL);
-                        if (ret) {
-                                gf_log (this->name, GF_LOG_ERROR, "%s"
-                                        " lookup failed", entry_loc.path);
-                                continue;
-                        }
-
-                        ret = syncop_setxattr (this, &entry_loc, fix_layout,
-                                               0);
-                        if (ret) {
-                                gf_log (this->name, GF_LOG_ERROR, "Setxattr "
-                                        "failed for %s", entry_loc.path);
-                                defrag->defrag_status =
-                                GF_DEFRAG_STATUS_FAILED;
-                                defrag->total_failures ++;
-                                goto out;
-                        }
-                        ret = gf_defrag_fix_layout (this, defrag, &entry_loc,
-                                                    fix_layout, migrate_data);
-
-                        if (ret) {
-                                gf_log (this->name, GF_LOG_ERROR, "Fix layout "
-                                        "failed for %s", entry_loc.path);
-                                defrag->total_failures++;
-                                goto out;
-                        }
-
-                }
-                gf_dirent_free (&entries);
-                free_entries = _gf_false;
-                INIT_LIST_HEAD (&entries.list);
-                if (readdirp_errno == ENOENT)
-                        break;
-        }
-
-        ret = 0;
-out:
-        if (free_entries)
-                gf_dirent_free (&entries);
-
-        loc_wipe (&entry_loc);
-
-        if (dict)
-                dict_unref(dict);
-
-        if (fd)
-                fd_unref (fd);
-
-        return ret;
-
-}
-
-
-int
-gf_defrag_start_crawl (void *data)
-{
-        xlator_t                *this   = NULL;
-        dht_conf_t              *conf   = NULL;
-        gf_defrag_info_t        *defrag = NULL;
-        int                      ret    = -1;
-        loc_t                    loc    = {0,};
-        struct iatt              iatt   = {0,};
-        struct iatt              parent = {0,};
-        dict_t                  *fix_layout = NULL;
-        dict_t                  *migrate_data = NULL;
-        dict_t                  *status = NULL;
-        glusterfs_ctx_t         *ctx = NULL;
-
-        this = data;
-        if (!this)
-                goto out;
-
-        ctx = this->ctx;
-        if (!ctx)
-                goto out;
-
-        conf = this->private;
-        if (!conf)
-                goto out;
-
-        defrag = conf->defrag;
-        if (!defrag)
-                goto out;
-
-        gettimeofday (&defrag->start_time, NULL);
-        dht_build_root_inode (this, &defrag->root_inode);
-        if (!defrag->root_inode)
-                goto out;
-
-        dht_build_root_loc (defrag->root_inode, &loc);
-
-        /* fix-layout on '/' first */
-
-        ret = syncop_lookup (this, &loc, NULL, &iatt, NULL, &parent);
-
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "look up on / failed");
-                goto out;
-        }
-
-        fix_layout = dict_new ();
-        if (!fix_layout) {
-                ret = -1;
-                goto out;
-        }
-
-        ret = dict_set_str (fix_layout, GF_XATTR_FIX_LAYOUT_KEY, "yes");
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "Failed to set dict str");
-                goto out;
-        }
-
-        ret = syncop_setxattr (this, &loc, fix_layout, 0);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR, "fix layout on %s failed",
-                        loc.path);
-                defrag->total_failures++;
-                goto out;
-        }
-
-        if (defrag->cmd != GF_DEFRAG_CMD_START_LAYOUT_FIX) {
-                migrate_data = dict_new ();
-                if (!migrate_data) {
-                        ret = -1;
-                        goto out;
-                }
-                if (defrag->cmd == GF_DEFRAG_CMD_START_FORCE)
-                        ret = dict_set_str (migrate_data,
-                                            "distribute.migrate-data", "force");
-                else
-                        ret = dict_set_str (migrate_data,
-                                            "distribute.migrate-data",
-                                            "non-force");
-                if (ret)
-                        goto out;
-        }
-        ret = gf_defrag_fix_layout (this, defrag, &loc, fix_layout,
-                                    migrate_data);
-        if ((defrag->defrag_status != GF_DEFRAG_STATUS_STOPPED) &&
-            (defrag->defrag_status != GF_DEFRAG_STATUS_FAILED)) {
-                defrag->defrag_status = GF_DEFRAG_STATUS_COMPLETE;
-        }
-
-
-
-out:
-        LOCK (&defrag->lock);
-        {
-                status = dict_new ();
-                gf_defrag_status_get (defrag, status);
-                if (ctx->notify)
-                        ctx->notify (GF_EN_DEFRAG_STATUS, status);
-                if (status)
-                        dict_unref (status);
-                defrag->is_exiting = 1;
-        }
-        UNLOCK (&defrag->lock);
-
-        if (defrag) {
-                GF_FREE (defrag);
-                conf->defrag = NULL;
-        }
-
-        return ret;
-}
-
-
-static int
-gf_defrag_done  (int ret, call_frame_t *sync_frame, void *data)
-{
-        gf_listener_stop (sync_frame->this);
-
-        STACK_DESTROY (sync_frame->root);
-        kill (getpid(), SIGTERM);
-        return 0;
-}
-
-void *
-gf_defrag_start (void *data)
-{
-        int                      ret    = -1;
-        call_frame_t            *frame  = NULL;
-        dht_conf_t              *conf   = NULL;
-        gf_defrag_info_t        *defrag = NULL;
-        xlator_t                *this  = NULL;
-
-        this = data;
-        conf = this->private;
-        if (!conf)
-                goto out;
-
-        defrag = conf->defrag;
-        if (!defrag)
-                goto out;
-
-        frame = create_frame (this, this->ctx->pool);
-        if (!frame)
-                goto out;
-
-        frame->root->pid = GF_CLIENT_PID_DEFRAG;
-
-        defrag->pid = frame->root->pid;
-
-        defrag->defrag_status = GF_DEFRAG_STATUS_STARTED;
-
-        ret = synctask_new (this->ctx->env, gf_defrag_start_crawl,
-                            gf_defrag_done, frame, this);
-
-        if (ret)
-                gf_log (this->name, GF_LOG_ERROR, "Could not create"
-                        " task for rebalance");
-out:
-        return NULL;
-}
-
-int
-gf_defrag_status_get (gf_defrag_info_t *defrag, dict_t *dict)
-{
-        int      ret    = 0;
-        uint64_t files  = 0;
-        uint64_t size   = 0;
-        uint64_t lookup = 0;
-        uint64_t failures = 0;
-        uint64_t skipped = 0;
-        char     *status = "";
-        double   elapsed = 0;
-        struct timeval end = {0,};
-
-
-        if (!defrag)
-                goto out;
-
-        ret = 0;
-        if (defrag->defrag_status == GF_DEFRAG_STATUS_NOT_STARTED)
-                goto out;
-
-        files  = defrag->total_files;
-        size   = defrag->total_data;
-        lookup = defrag->num_files_lookedup;
-        failures = defrag->total_failures;
-        skipped = defrag->skipped;
-
-        gettimeofday (&end, NULL);
-
-        elapsed = end.tv_sec - defrag->start_time.tv_sec;
-
-        if (!dict)
-                goto log;
-
-        ret = dict_set_uint64 (dict, "files", files);
-        if (ret)
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to set file count");
-
-        ret = dict_set_uint64 (dict, "size", size);
-        if (ret)
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to set size of xfer");
-
-        ret = dict_set_uint64 (dict, "lookups", lookup);
-        if (ret)
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to set lookedup file count");
-
-
-        ret = dict_set_int32 (dict, "status", defrag->defrag_status);
-        if (ret)
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to set status");
-        if (elapsed) {
-                ret = dict_set_double (dict, "run-time", elapsed);
-                if (ret)
-                        gf_log (THIS->name, GF_LOG_WARNING,
-                                "failed to set run-time");
-        }
-
-        ret = dict_set_uint64 (dict, "failures", failures);
-        if (ret)
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to set failure count");
-
-        ret = dict_set_uint64 (dict, "skipped", skipped);
-        if (ret)
-                gf_log (THIS->name, GF_LOG_WARNING,
-                        "failed to set skipped file count");
-log:
-        switch (defrag->defrag_status) {
-        case GF_DEFRAG_STATUS_NOT_STARTED:
-                status = "not started";
-                break;
-        case GF_DEFRAG_STATUS_STARTED:
-                status = "in progress";
-                break;
-        case GF_DEFRAG_STATUS_STOPPED:
-                status = "stopped";
-                break;
-        case GF_DEFRAG_STATUS_COMPLETE:
-                status = "completed";
-                break;
-        case GF_DEFRAG_STATUS_FAILED:
-                status = "failed";
-                break;
-        default:
-                break;
-        }
-
-        gf_log (THIS->name, GF_LOG_INFO, "Rebalance is %s. Time taken is %.2f "
-                "secs", status, elapsed);
-        gf_log (THIS->name, GF_LOG_INFO, "Files migrated: %"PRIu64", size: %"
-                PRIu64", lookups: %"PRIu64", failures: %"PRIu64", skipped: "
-                "%"PRIu64, files, size, lookup, failures, skipped);
-
-
-out:
-        return 0;
-}
-
-int
-gf_defrag_stop (gf_defrag_info_t *defrag, dict_t *output)
-{
-        /* TODO: set a variable 'stop_defrag' here, it should be checked
-           in defrag loop */
-        int     ret = -1;
-        GF_ASSERT (defrag);
-
-        if (defrag->defrag_status == GF_DEFRAG_STATUS_NOT_STARTED) {
-                goto out;
-        }
-
-        gf_log ("", GF_LOG_INFO, "Received stop command on rebalance");
-        defrag->defrag_status = GF_DEFRAG_STATUS_STOPPED;
-
-        if (output)
-                gf_defrag_status_get (defrag, output);
-        ret = 0;
-out:
-        gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);
-        return ret;
-}
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c
index 5d6f4f232..46117d317 100644
--- a/xlators/cluster/dht/src/dht-rename.c
+++ b/xlators/cluster/dht/src/dht-rename.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 /* TODO: link(oldpath, newpath) fails if newpath already exists. DHT should
@@ -26,8 +35,7 @@ int
 dht_rename_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                     int32_t op_ret, int32_t op_errno, struct iatt *stbuf,
                     struct iatt *preoldparent, struct iatt *postoldparent,
-                    struct iatt *prenewparent, struct iatt *postnewparent,
-                    dict_t *xdata)
+                    struct iatt *prenewparent, struct iatt *postnewparent)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = 0;
@@ -67,16 +75,23 @@ dht_rename_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 unwind:
         this_call_cnt = dht_frame_return (frame);
         if (is_last_call (this_call_cnt)) {
+                local->stbuf.ia_ino = local->loc.inode->ino;
+
+                local->preoldparent.ia_ino = local->loc.parent->ino;
+                local->postoldparent.ia_ino = local->loc.parent->ino;
+
+                local->preparent.ia_ino = local->loc2.parent->ino;
+                local->postparent.ia_ino = local->loc2.parent->ino;
+
                 WIPE (&local->preoldparent);
                 WIPE (&local->postoldparent);
                 WIPE (&local->preparent);
                 WIPE (&local->postparent);
 
-                DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
                 DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,
                                   &local->stbuf, &local->preoldparent,
                                   &local->postoldparent,
-                                  &local->preparent, &local->postparent, xdata);
+                                  &local->preparent, &local->postparent);
         }
 
         return 0;
@@ -89,7 +104,7 @@ dht_rename_hashed_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                            struct iatt *preoldparent,
                            struct iatt *postoldparent,
                            struct iatt *prenewparent,
-                           struct iatt *postnewparent, dict_t *xdata)
+                           struct iatt *postnewparent)
 {
         dht_conf_t   *conf = NULL;
         dht_local_t  *local = NULL;
@@ -139,7 +154,7 @@ dht_rename_hashed_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 STACK_WIND (frame, dht_rename_dir_cbk,
                             conf->subvolumes[i],
                             conf->subvolumes[i]->fops->rename,
-                            &local->loc, &local->loc2, NULL);
+                            &local->loc, &local->loc2);
                 if (!--call_cnt)
                         break;
         }
@@ -152,11 +167,10 @@ unwind:
         WIPE (&local->preparent);
         WIPE (&local->postparent);
 
-        DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
         DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,
                           &local->stbuf, &local->preoldparent,
                           &local->postoldparent,
-                          &local->preparent, &local->postparent, NULL);
+                          &local->preparent, &local->postparent);
 
         return 0;
 }
@@ -166,7 +180,9 @@ int
 dht_rename_dir_do (call_frame_t *frame, xlator_t *this)
 {
         dht_local_t  *local = NULL;
+        dht_conf_t   *conf = NULL;
 
+        conf = this->private;
         local = frame->local;
 
         if (local->op_ret == -1)
@@ -177,20 +193,19 @@ dht_rename_dir_do (call_frame_t *frame, xlator_t *this)
         STACK_WIND (frame, dht_rename_hashed_dir_cbk,
                     local->dst_hashed,
                     local->dst_hashed->fops->rename,
-                    &local->loc, &local->loc2, NULL);
+                    &local->loc, &local->loc2);
         return 0;
 
 err:
         DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno, NULL, NULL,
-                          NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL);
         return 0;
 }
 
 
 int
 dht_rename_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int op_ret, int op_errno, gf_dirent_t *entries,
-                        dict_t *xdata)
+                        int op_ret, int op_errno, gf_dirent_t *entries)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = -1;
@@ -219,7 +234,7 @@ dht_rename_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 dht_rename_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                        int op_ret, int op_errno, fd_t *fd, dict_t *xdata)
+                        int op_ret, int op_errno, fd_t *fd)
 {
         dht_local_t  *local = NULL;
         int           this_call_cnt = -1;
@@ -239,7 +254,7 @@ dht_rename_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         STACK_WIND (frame, dht_rename_readdir_cbk,
                     prev->this, prev->this->fops->readdir,
-                    local->fd, 4096, 0, NULL);
+                    local->fd, 4096, 0);
 
         return 0;
 
@@ -295,54 +310,22 @@ dht_rename_dir (call_frame_t *frame, xlator_t *this)
                 STACK_WIND (frame, dht_rename_opendir_cbk,
                             conf->subvolumes[i],
                             conf->subvolumes[i]->fops->opendir,
-                            &local->loc2, local->fd, NULL);
+                            &local->loc2, local->fd);
         }
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL,
-                          NULL, NULL);
+        DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL, NULL);
         return 0;
 }
-#define DHT_MARK_FOP_INTERNAL(xattr) do {                                      \
-                int tmp = -1;                                                  \
-                if (!xattr) {                                                  \
-                        xattr = dict_new ();                                   \
-                        if (!xattr)                                            \
-                                break;                                         \
-                }                                                              \
-                tmp = dict_set_str (xattr, GLUSTERFS_INTERNAL_FOP_KEY, "yes"); \
-                if (tmp) {                                                     \
-                        gf_log (this->name, GF_LOG_ERROR, "Failed to set"      \
-                                " internal dict key for %s", local->loc.path); \
-                }                                                              \
-        }while (0)
-int
-dht_rename_done (call_frame_t *frame, xlator_t *this)
-{
-        dht_local_t     *local = NULL;
 
-        local = frame->local;
-
-        if (local->linked == _gf_true) {
-                local->linked = _gf_false;
-                dht_linkfile_attr_heal (frame, this);
-        }
-        DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
-        DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,
-                          &local->stbuf, &local->preoldparent,
-                          &local->postoldparent, &local->preparent,
-                          &local->postparent, NULL);
-
-        return 0;
-}
 
 int
 dht_rename_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int32_t op_ret, int32_t op_errno, struct iatt *preparent,
-                       struct iatt *postparent, dict_t *xdata)
+                       struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         call_frame_t *prev = NULL;
@@ -371,7 +354,10 @@ dht_rename_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         WIPE (&local->postparent);
 
         if (is_last_call (this_call_cnt)) {
-                dht_rename_done (frame, this);
+                DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,
+                                  &local->stbuf, &local->preoldparent,
+                                  &local->postoldparent, &local->preparent,
+                                  &local->postparent);
         }
 
 out:
@@ -389,7 +375,7 @@ dht_rename_cleanup (call_frame_t *frame)
         xlator_t    *dst_hashed = NULL;
         xlator_t    *dst_cached = NULL;
         int          call_cnt = 0;
-        dict_t      *xattr      = NULL;
+
 
         local = frame->local;
         this  = frame->this;
@@ -413,15 +399,13 @@ dht_rename_cleanup (call_frame_t *frame)
         if (!call_cnt)
                 goto nolinks;
 
-        DHT_MARK_FOP_INTERNAL (xattr);
-
         if (dst_hashed != src_hashed && dst_hashed != src_cached) {
                 gf_log (this->name, GF_LOG_TRACE,
                         "unlinking linkfile %s @ %s => %s",
                         local->loc.path, dst_hashed->name, src_cached->name);
                 STACK_WIND (frame, dht_rename_unlink_cbk,
                             dst_hashed, dst_hashed->fops->unlink,
-                            &local->loc, 0, xattr);
+                            &local->loc);
         }
 
         if (src_cached != dst_hashed) {
@@ -430,12 +414,9 @@ dht_rename_cleanup (call_frame_t *frame)
                         local->loc2.path, src_cached->name);
                 STACK_WIND (frame, dht_rename_unlink_cbk,
                             src_cached, src_cached->fops->unlink,
-                            &local->loc2, 0, xattr);
+                            &local->loc2);
         }
 
-        if (xattr)
-                dict_unref (xattr);
-
         return 0;
 
 nolinks:
@@ -444,11 +425,10 @@ nolinks:
         WIPE (&local->preparent);
         WIPE (&local->postparent);
 
-        DHT_STRIP_PHASE1_FLAGS (&local->stbuf);
         DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,
                           &local->stbuf, &local->preoldparent,
                           &local->postoldparent, &local->preparent,
-                          &local->postparent, NULL);
+                          &local->postparent);
 
         return 0;
 }
@@ -456,10 +436,9 @@ nolinks:
 
 int
 dht_rename_links_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                             int32_t op_ret, int32_t op_errno,
-                             inode_t *inode, struct iatt *stbuf,
-                             struct iatt *preparent, struct iatt *postparent,
-                             dict_t *xdata)
+                      int32_t op_ret, int32_t op_errno,
+                      inode_t *inode, struct iatt *stbuf,
+                      struct iatt *preparent, struct iatt *postparent)
 {
         call_frame_t *prev = NULL;
         dht_local_t  *local = NULL;
@@ -473,10 +452,6 @@ dht_rename_links_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->loc.path, prev->this->name, strerror (op_errno));
         }
 
-        if (local->linked == _gf_true) {
-                local->linked = _gf_false;
-                dht_linkfile_attr_heal (frame, this);
-        }
         DHT_STACK_DESTROY (frame);
 
         return 0;
@@ -487,8 +462,7 @@ int
 dht_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 int32_t op_ret, int32_t op_errno, struct iatt *stbuf,
                 struct iatt *preoldparent, struct iatt *postoldparent,
-                struct iatt *prenewparent, struct iatt *postnewparent,
-                dict_t *xdata)
+                struct iatt *prenewparent, struct iatt *postnewparent)
 {
         dht_local_t  *local = NULL;
         call_frame_t *prev = NULL;
@@ -498,8 +472,7 @@ dht_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         xlator_t     *dst_cached = NULL;
         xlator_t     *rename_subvol = NULL;
         call_frame_t *link_frame = NULL;
-        dht_local_t *link_local = NULL;
-        dict_t       *xattr     = NULL;
+        dht_local_t  *link_local = NULL;
 
         local = frame->local;
         prev = cookie;
@@ -509,8 +482,6 @@ dht_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         dst_hashed = local->dst_hashed;
         dst_cached = local->dst_cached;
 
-        if (local->linked == _gf_true)
-                FRAME_SU_UNDO (frame, dht_local_t);
         if (op_ret == -1) {
                 gf_log (this->name, GF_LOG_WARNING,
                         "%s: rename on %s failed (%s)", local->loc.path,
@@ -526,39 +497,36 @@ dht_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         goto err;
                 }
 
-                /* fop value sent as maxvalue because it is not used
-                   anywhere in this case */
-                link_local = dht_local_init (link_frame, &local->loc2, NULL,
-                                             GF_FOP_MAXVALUE);
+                link_local = dht_local_init (link_frame);
                 if (!link_local) {
                         goto err;
                 }
 
+                loc_copy (&link_local->loc, &local->loc2);
                 if (link_local->loc.inode)
                         inode_unref (link_local->loc.inode);
                 link_local->loc.inode = inode_ref (local->loc.inode);
                 uuid_copy (link_local->gfid, local->loc.inode->gfid);
+                link_frame->local = link_local;
 
                 dht_linkfile_create (link_frame, dht_rename_links_create_cbk,
-                                     this, src_cached, dst_hashed,
-                                     &link_local->loc);
+                                     src_cached, dst_hashed, &link_local->loc);
         }
 
 err:
-        /* Merge attrs only from src_cached. In case there of src_cached !=
-         * dst_hashed, this ignores linkfile attrs. */
-        if (prev->this == src_cached) {
-                dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
-                dht_iatt_merge (this, &local->preoldparent, preoldparent,
-                                prev->this);
-                dht_iatt_merge (this, &local->postoldparent, postoldparent,
-                                prev->this);
-                dht_iatt_merge (this, &local->preparent, prenewparent,
-                                prev->this);
-                dht_iatt_merge (this, &local->postparent, postnewparent,
-                                prev->this);
-        }
+        dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
+        dht_iatt_merge (this, &local->preoldparent, preoldparent, prev->this);
+        dht_iatt_merge (this, &local->postoldparent, postoldparent, prev->this);
+        dht_iatt_merge (this, &local->preparent, prenewparent, prev->this);
+        dht_iatt_merge (this, &local->postparent, postnewparent, prev->this);
+
+        local->stbuf.ia_ino = local->loc.inode->ino;
 
+        local->preoldparent.ia_ino = local->loc.parent->ino;
+        local->postoldparent.ia_ino = local->loc.parent->ino;
+
+        local->preparent.ia_ino = local->loc2.parent->ino;
+        local->postparent.ia_ino = local->loc2.parent->ino;
 
         /* NOTE: rename_subvol is the same subvolume from which dht_rename_cbk
          *       is called. since rename has already happened on rename_subvol,
@@ -583,8 +551,6 @@ err:
         if (local->call_cnt == 0)
                 goto unwind;
 
-        DHT_MARK_FOP_INTERNAL (xattr);
-
         if (src_cached != dst_hashed && src_cached != dst_cached) {
                 gf_log (this->name, GF_LOG_TRACE,
                         "deleting old src datafile %s @ %s",
@@ -592,7 +558,7 @@ err:
 
                 STACK_WIND (frame, dht_rename_unlink_cbk,
                             src_cached, src_cached->fops->unlink,
-                            &local->loc, 0, xattr);
+                            &local->loc);
         }
 
         if (src_hashed != rename_subvol && src_hashed != src_cached) {
@@ -602,7 +568,7 @@ err:
 
                 STACK_WIND (frame, dht_rename_unlink_cbk,
                             src_hashed, src_hashed->fops->unlink,
-                            &local->loc, 0, xattr);
+                            &local->loc);
         }
 
         if (dst_cached
@@ -614,10 +580,8 @@ err:
 
                 STACK_WIND (frame, dht_rename_unlink_cbk,
                             dst_cached, dst_cached->fops->unlink,
-                            &local->loc2, 0, xattr);
+                            &local->loc2);
         }
-        if (xattr)
-                dict_unref (xattr);
         return 0;
 
 unwind:
@@ -625,16 +589,15 @@ unwind:
         WIPE (&local->postoldparent);
         WIPE (&local->preparent);
         WIPE (&local->postparent);
-        if (xattr)
-                dict_unref (xattr);
 
-        dht_rename_done (frame, this);
+        DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,
+                          &local->stbuf, &local->preoldparent,
+                          &local->postoldparent, &local->preparent,
+                          &local->postparent);
 
         return 0;
 
 cleanup:
-        if (xattr)
-                dict_unref (xattr);
         dht_rename_cleanup (frame);
 
         return 0;
@@ -668,11 +631,9 @@ dht_do_rename (call_frame_t *frame)
                 "renaming %s => %s (%s)",
                 local->loc.path, local->loc2.path, rename_subvol->name);
 
-        if (local->linked == _gf_true)
-                FRAME_SU_DO (frame, dht_local_t);
         STACK_WIND (frame, dht_rename_cbk,
                     rename_subvol, rename_subvol->fops->rename,
-                    &local->loc, &local->loc2, NULL);
+                    &local->loc, &local->loc2);
 
         return 0;
 }
@@ -682,8 +643,7 @@ int
 dht_rename_links_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                       int32_t op_ret, int32_t op_errno,
                       inode_t *inode, struct iatt *stbuf,
-                      struct iatt *preparent, struct iatt *postparent,
-                      dict_t *xdata)
+                      struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
         call_frame_t *prev = NULL;
@@ -698,11 +658,7 @@ dht_rename_links_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         "link/file on %s failed (%s)",
                         prev->this->name, strerror (op_errno));
                 local->op_ret   = -1;
-                if (op_errno != ENOENT)
-                        local->op_errno = op_errno;
-        } else if (local->src_cached == prev->this) {
-                /* merge of attr returned only from linkfile creation */
-                dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
+                local->op_errno = op_errno;
         }
 
         this_call_cnt = dht_frame_return (frame);
@@ -725,8 +681,7 @@ cleanup:
 int
 dht_rename_unlink_links_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                              int32_t op_ret, int32_t op_errno,
-                             struct iatt *preparent, struct iatt *postparent,
-                             dict_t *xdata)
+                             struct iatt *preparent, struct iatt *postparent)
 {
 	dht_local_t  *local = NULL;
 	call_frame_t *prev = NULL;
@@ -768,7 +723,6 @@ dht_rename_create_links (call_frame_t *frame)
         xlator_t    *dst_hashed = NULL;
         xlator_t    *dst_cached = NULL;
         int          call_cnt = 0;
-        dict_t      *xattr = NULL;
 
 
         local = frame->local;
@@ -779,8 +733,6 @@ dht_rename_create_links (call_frame_t *frame)
         dst_hashed = local->dst_hashed;
         dst_cached = local->dst_cached;
 
-        DHT_MARK_FOP_INTERNAL (xattr);
-
         if (src_cached == dst_cached) {
                 if (dst_hashed == dst_cached)
                         goto nolinks;
@@ -791,7 +743,7 @@ dht_rename_create_links (call_frame_t *frame)
 
 		STACK_WIND (frame, dht_rename_unlink_links_cbk,
 			    dst_hashed, dst_hashed->fops->unlink,
-			    &local->loc2, 0, xattr);
+			    &local->loc2);
                 return 0;
         }
 
@@ -808,7 +760,7 @@ dht_rename_create_links (call_frame_t *frame)
                         "linkfile %s @ %s => %s",
                         local->loc.path, dst_hashed->name, src_cached->name);
                 memcpy (local->gfid, local->loc.inode->gfid, 16);
-		dht_linkfile_create (frame, dht_rename_links_cbk, this,
+		dht_linkfile_create (frame, dht_rename_links_cbk,
 				     src_cached, dst_hashed, &local->loc);
 	}
 
@@ -818,7 +770,7 @@ dht_rename_create_links (call_frame_t *frame)
 			local->loc2.path, src_cached->name);
 		STACK_WIND (frame, dht_rename_links_cbk,
 			    src_cached, src_cached->fops->link,
-			    &local->loc, &local->loc2, xattr);
+			    &local->loc, &local->loc2);
 	}
 
 nolinks:
@@ -826,8 +778,6 @@ nolinks:
                 /* skip to next step */
                 dht_do_rename (frame);
         }
-        if (xattr)
-                dict_unref (xattr);
 
         return 0;
 }
@@ -835,7 +785,7 @@ nolinks:
 
 int
 dht_rename (call_frame_t *frame, xlator_t *this,
-            loc_t *oldloc, loc_t *newloc, dict_t *xdata)
+            loc_t *oldloc, loc_t *newloc)
 {
         xlator_t    *src_cached = NULL;
         xlator_t    *src_hashed = NULL;
@@ -880,14 +830,17 @@ dht_rename (call_frame_t *frame, xlator_t *this,
         if (newloc->inode)
                 dst_cached = dht_subvol_get_cached (this, newloc->inode);
 
-        local = dht_local_init (frame, oldloc, NULL, GF_FOP_RENAME);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
         }
-        /* cached_subvol will be set from dht_local_init, reset it to NULL,
-           as the logic of handling rename is different  */
-        local->cached_subvol = NULL;
+
+        ret = loc_copy (&local->loc, oldloc);
+        if (ret == -1) {
+                op_errno = ENOMEM;
+                goto err;
+        }
 
         ret = loc_copy (&local->loc2, newloc);
         if (ret == -1) {
@@ -917,8 +870,7 @@ dht_rename (call_frame_t *frame, xlator_t *this,
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL,
-                          NULL, NULL);
+        DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL, NULL);
 
         return 0;
 }
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index 3fe96b1c7..d5c7e9df2 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CONFIG_H
@@ -17,50 +26,6 @@
 #include "glusterfs.h"
 #include "xlator.h"
 #include "dht-common.h"
-#include "glusterfs-acl.h"
-
-#define DHT_SET_LAYOUT_RANGE(layout,i,srt,chunk,cnt,path)    do {       \
-                layout->list[i].start = srt;                            \
-                layout->list[i].stop  = srt + chunk - 1;                \
-                                                                        \
-                gf_log (this->name, GF_LOG_TRACE,                       \
-                        "gave fix: %u - %u on %s for %s",               \
-                        layout->list[i].start, layout->list[i].stop,    \
-                        layout->list[i].xlator->name, path);            \
-        } while (0)
-
-#define DHT_RESET_LAYOUT_RANGE(layout)    do {                          \
-                int cnt = 0;                                            \
-                for (cnt = 0; cnt < layout->cnt; cnt++ ) {              \
-                        layout->list[cnt].start = 0;                    \
-                        layout->list[cnt].stop  = 0;                    \
-                }                                                       \
-        } while (0)
-
-static uint32_t
-dht_overlap_calc (dht_layout_t *old, int o, dht_layout_t *new, int n)
-{
-	if (o >= old->cnt || n >= new->cnt)
-		return 0;
-
-	if (old->list[o].err > 0 || new->list[n].err > 0)
-		return 0;
-
-        if (old->list[o].start == old->list[o].stop) {
-                return 0;
-        }
-
-        if (new->list[n].start == new->list[n].stop) {
-                return 0;
-        }
-
-	if ((old->list[o].start > new->list[n].stop) ||
-	    (old->list[o].stop < new->list[n].start))
-		return 0;
-
-	return min (old->list[o].stop, new->list[n].stop) -
-	        max (old->list[o].start, new->list[n].start) + 1;
-}
 
 
 int
@@ -70,7 +35,7 @@ dht_selfheal_dir_finish (call_frame_t *frame, xlator_t *this, int ret)
 
         local = frame->local;
         local->selfheal.dir_cbk (frame, NULL, frame->this, ret,
-                                 local->op_errno, NULL);
+                                 local->op_errno);
 
         return 0;
 }
@@ -78,7 +43,7 @@ dht_selfheal_dir_finish (call_frame_t *frame, xlator_t *this, int ret)
 
 int
 dht_selfheal_dir_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                            int op_ret, int op_errno, dict_t *xdata)
+                            int op_ret, int op_errno)
 {
         dht_local_t  *local = NULL;
         call_frame_t *prev = NULL;
@@ -117,31 +82,17 @@ dht_selfheal_dir_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 dht_selfheal_dir_xattr_persubvol (call_frame_t *frame, loc_t *loc,
-                                  dht_layout_t *layout, int i,
-                                  xlator_t *req_subvol)
+                                  dht_layout_t *layout, int i)
 {
         xlator_t          *subvol = NULL;
         dict_t            *xattr = NULL;
         int                ret = 0;
         xlator_t          *this = NULL;
         int32_t           *disk_layout = NULL;
-        dht_local_t       *local = NULL;
-        dht_conf_t        *conf = NULL;
 
-        local = frame->local;
-        if (req_subvol)
-                subvol = req_subvol;
-        else
-                subvol = layout->list[i].xlator;
-        this = frame->this;
-
-        GF_VALIDATE_OR_GOTO ("", this, err);
-        GF_VALIDATE_OR_GOTO (this->name, layout, err);
-        GF_VALIDATE_OR_GOTO (this->name, local, err);
-        GF_VALIDATE_OR_GOTO (this->name, subvol, err);
-        VALIDATE_OR_GOTO (this->private, err);
 
-        conf = this->private;
+        subvol = layout->list[i].xlator;
+        this = frame->this;
 
         xattr = get_new_dict ();
         if (!xattr) {
@@ -156,7 +107,8 @@ dht_selfheal_dir_xattr_persubvol (call_frame_t *frame, loc_t *loc,
                 goto err;
         }
 
-        ret = dict_set_bin (xattr, conf->xattr_name, disk_layout, 4 * 4);
+        ret = dict_set_bin (xattr, "trusted.glusterfs.dht",
+                            disk_layout, 4 * 4);
         if (ret == -1) {
                 gf_log (this->name, GF_LOG_WARNING,
                         "%s: (subvol %s) failed to set xattr dictionary",
@@ -172,12 +124,9 @@ dht_selfheal_dir_xattr_persubvol (call_frame_t *frame, loc_t *loc,
 
         dict_ref (xattr);
 
-        if (!uuid_is_null (local->gfid))
-                uuid_copy (loc->gfid, local->gfid);
-
         STACK_WIND (frame, dht_selfheal_dir_xattr_cbk,
                     subvol, subvol->fops->setxattr,
-                    loc, xattr, 0, NULL);
+                    loc, xattr, 0);
 
         dict_unref (xattr);
 
@@ -187,58 +136,14 @@ err:
         if (xattr)
                 dict_destroy (xattr);
 
-        GF_FREE (disk_layout);
+        if (disk_layout)
+                GF_FREE (disk_layout);
 
         dht_selfheal_dir_xattr_cbk (frame, subvol, frame->this,
-                                    -1, ENOMEM, NULL);
+                                    -1, ENOMEM);
         return 0;
 }
 
-int
-dht_fix_dir_xattr (call_frame_t *frame, loc_t *loc, dht_layout_t *layout)
-{
-        dht_local_t *local = NULL;
-        int          i = 0;
-        int          count = 0;
-        xlator_t    *this = NULL;
-        dht_conf_t  *conf = NULL;
-        dht_layout_t *dummy = NULL;
-
-        local = frame->local;
-        this = frame->this;
-        conf = this->private;
-
-        gf_log (this->name, GF_LOG_DEBUG,
-                "writing the new range for all subvolumes");
-
-        local->call_cnt = count = conf->subvolume_cnt;
-
-        for (i = 0; i < layout->cnt; i++) {
-                dht_selfheal_dir_xattr_persubvol (frame, loc, layout, i, NULL);
-
-                if (--count == 0)
-                        goto out;
-        }
-        /* if we are here, subvolcount > layout_count. subvols-per-directory
-         * option might be set here. We need to clear out layout from the
-         * non-participating subvolumes, else it will result in overlaps */
-        dummy = dht_layout_new (this, 1);
-        if (!dummy)
-                goto out;
-        for (i = 0; i < conf->subvolume_cnt; i++) {
-                if (_gf_false ==
-                    dht_is_subvol_in_layout (layout, conf->subvolumes[i])) {
-                        dht_selfheal_dir_xattr_persubvol (frame, loc, dummy, 0,
-                                                          conf->subvolumes[i]);
-                        if (--count == 0)
-                                break;
-                }
-        }
-
-        dht_layout_unref (this, dummy);
-out:
-        return 0;
-}
 
 int
 dht_selfheal_dir_xattr (call_frame_t *frame, loc_t *loc, dht_layout_t *layout)
@@ -247,17 +152,14 @@ dht_selfheal_dir_xattr (call_frame_t *frame, loc_t *loc, dht_layout_t *layout)
         int          missing_xattr = 0;
         int          i = 0;
         xlator_t    *this = NULL;
-        dht_conf_t   *conf = NULL;
-        dht_layout_t *dummy = NULL;
 
         local = frame->local;
         this = frame->this;
-        conf = this->private;
 
         for (i = 0; i < layout->cnt; i++) {
                 if (layout->list[i].err != -1 || !layout->list[i].stop) {
                         /* err != -1 would mean xattr present on the directory
-                         * or the directory is non existent.
+                         * or the directory is itself non existant.
                          * !layout->list[i].stop would mean layout absent
                          */
 
@@ -281,30 +183,18 @@ dht_selfheal_dir_xattr (call_frame_t *frame, loc_t *loc, dht_layout_t *layout)
                 if (layout->list[i].err != -1 || !layout->list[i].stop)
                         continue;
 
-                dht_selfheal_dir_xattr_persubvol (frame, loc, layout, i, NULL);
+                dht_selfheal_dir_xattr_persubvol (frame, loc, layout, i);
 
                 if (--missing_xattr == 0)
                         break;
         }
-        dummy = dht_layout_new (this, 1);
-        if (!dummy)
-                goto out;
-        for (i = 0; i < conf->subvolume_cnt; i++) {
-                if (_gf_false ==
-                    dht_is_subvol_in_layout (layout, conf->subvolumes[i])) {
-                        dht_selfheal_dir_xattr_persubvol (frame, loc, dummy, 0,
-                                                          conf->subvolumes[i]);
-                }
-        }
-        dht_layout_unref (this, dummy);
-out:
         return 0;
 }
 
 int
 dht_selfheal_dir_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                               int op_ret, int op_errno, struct iatt *statpre,
-                              struct iatt *statpost, dict_t *xdata)
+                              struct iatt *statpost)
 {
         dht_local_t   *local = NULL;
         dht_layout_t  *layout = NULL;
@@ -345,9 +235,6 @@ dht_selfheal_dir_setattr (call_frame_t *frame, loc_t *loc, struct iatt *stbuf,
                 return 0;
         }
 
-        if (!uuid_is_null (local->gfid))
-                uuid_copy (loc->gfid, local->gfid);
-
         local->call_cnt = missing_attr;
         for (i = 0; i < layout->cnt; i++) {
                 if (layout->list[i].err == -1) {
@@ -358,7 +245,7 @@ dht_selfheal_dir_setattr (call_frame_t *frame, loc_t *loc, struct iatt *stbuf,
                         STACK_WIND (frame, dht_selfheal_dir_setattr_cbk,
                                     layout->list[i].xlator,
                                     layout->list[i].xlator->fops->setattr,
-                                    loc, stbuf, valid, NULL);
+                                    loc, stbuf, valid);
                 }
         }
 
@@ -369,8 +256,7 @@ int
 dht_selfheal_dir_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                             int op_ret, int op_errno,
                             inode_t *inode, struct iatt *stbuf,
-                            struct iatt *preparent, struct iatt *postparent,
-                            dict_t *xdata)
+                            struct iatt *preparent, struct iatt *postparent)
 {
         dht_local_t   *local = NULL;
         dht_layout_t  *layout = NULL;
@@ -403,6 +289,9 @@ dht_selfheal_dir_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         }
 
         dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
+        if (prev->this == local->hashed_subvol)
+                local->ia_ino = local->stbuf.ia_ino;
+
         dht_iatt_merge (this, &local->preparent, preparent, prev->this);
         dht_iatt_merge (this, &local->postparent, postparent, prev->this);
 
@@ -416,46 +305,6 @@ out:
         return 0;
 }
 
-void
-dht_selfheal_dir_mkdir_setacl (dict_t *xattr, dict_t *dict)
-{
-        data_t          *acl_default = NULL;
-        data_t          *acl_access = NULL;
-        xlator_t        *this = NULL;
-        int     ret = -1;
-
-        GF_ASSERT (xattr);
-        GF_ASSERT (dict);
-
-        this = THIS;
-        GF_ASSERT (this);
-
-        acl_default = dict_get (xattr, POSIX_ACL_DEFAULT_XATTR);
-
-        if (!acl_default) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "ACL_DEFAULT xattr not present");
-                goto cont;
-        }
-        ret = dict_set (dict, POSIX_ACL_DEFAULT_XATTR, acl_default);
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "Could not set ACL_DEFAULT xattr");
-cont:
-        acl_access = dict_get (xattr, POSIX_ACL_ACCESS_XATTR);
-        if (!acl_access) {
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "ACL_ACCESS xattr not present");
-                goto out;
-        }
-        ret = dict_set (dict, POSIX_ACL_ACCESS_XATTR, acl_access);
-        if (ret)
-                gf_log (this->name, GF_LOG_WARNING,
-                        "Could not set ACL_ACCESS xattr");
-
-out:
-        return;
-}
 
 int
 dht_selfheal_dir_mkdir (call_frame_t *frame, loc_t *loc,
@@ -489,19 +338,16 @@ dht_selfheal_dir_mkdir (call_frame_t *frame, loc_t *loc,
 
                 ret = dict_set_static_bin (dict, "gfid-req", local->gfid, 16);
                 if (ret)
-                        gf_log (this->name, GF_LOG_WARNING,
+                        gf_log (this->name, GF_LOG_INFO,
                                 "%s: failed to set gfid in dict", loc->path);
         } else if (local->params) {
                 /* Send the dictionary from higher layers directly */
                 dict = dict_ref (local->params);
         }
-        /* Set acls */
-        if (local->xattr && dict)
-                dht_selfheal_dir_mkdir_setacl (local->xattr, dict);
 
         if (!dict)
                 gf_log (this->name, GF_LOG_WARNING,
-                        "dict is NULL, need to make sure gfids are same");
+                        "dict is NULL, need to make sure gfid's are same");
 
         for (i = 0; i < layout->cnt; i++) {
                 if (layout->list[i].err == ENOENT || force) {
@@ -515,7 +361,7 @@ dht_selfheal_dir_mkdir (call_frame_t *frame, loc_t *loc,
                                     loc,
                                     st_mode_from_ia (local->stbuf.ia_prot,
                                                      local->stbuf.ia_type),
-                                    0, dict);
+                                    dict);
                 }
         }
 
@@ -534,7 +380,7 @@ dht_selfheal_layout_alloc_start (xlator_t *this, loc_t *loc,
         uint32_t      hashval = 0;
         int           ret = 0;
 
-        ret = dht_hash_compute (this, layout->type, loc->path, &hashval);
+        ret = dht_hash_compute (layout->type, loc->path, &hashval);
         if (ret == 0) {
                 start = (hashval % layout->cnt);
         }
@@ -542,308 +388,117 @@ dht_selfheal_layout_alloc_start (xlator_t *this, loc_t *loc,
         return start;
 }
 
-static inline int
-dht_get_layout_count (xlator_t *this, dht_layout_t *layout, int new_layout)
+
+void
+dht_selfheal_layout_new_directory (call_frame_t *frame, loc_t *loc,
+                                   dht_layout_t *layout)
 {
-        int i = 0;
-        int j = 0;
-        int err = 0;
-        int count = 0;
-        dht_conf_t *conf = NULL;
+        xlator_t    *this = NULL;
+        uint32_t     chunk = 0;
+        int          i = 0;
+        uint32_t     start = 0;
+        int          cnt = 0;
+        int          err = 0;
+        int          start_subvol = 0;
 
-        /* Gets in use only for replace-brick, remove-brick */
-        conf = this->private;
-        for (i = 0; i < layout->cnt; i++) {
-                for (j = 0; j < conf->subvolume_cnt; j++) {
-                        if (conf->decommissioned_bricks[j] &&
-                            conf->decommissioned_bricks[j] == layout->list[i].xlator) {
-                                layout->list[i].err = EINVAL;
-                                break;
-                        }
-                }
-        }
+        this = frame->this;
 
         for (i = 0; i < layout->cnt; i++) {
                 err = layout->list[i].err;
-                if (err == -1 || err == 0 || err == ENOENT) {
-			/* Setting list[i].err = -1 is an indication for
-			   dht_selfheal_layout_new_directory() to assign
-			   a range. We set it to -1 based on any one of
-			   the three criteria:
-
-			   - err == -1 already, which means directory
-			     existed but layout was not set on it.
-
-			   - err == 0, which means directory exists and
-			     has an old layout piece which will be
-			     overwritten now.
-
-			   - err == ENOENT, which means directory does
-			     not exist (possibly racing with mkdir or
-			     finishing half done mkdir). The missing
-			     directory will be attempted to be recreated.
-
-			     It is important to note that it is safe
-			     to race with mkdir() as self-heal and
-			     mkdir are idempotent operations. Both will
-			     strive to set the directory and layouts to
-			     the same final state.
-			*/
-                        count++;
-			if (!err)
-				layout->list[i].err = -1;
+                if (err == -1 || err == 0) {
+                        layout->list[i].err = -1;
+                        cnt++;
                 }
         }
 
         /* no subvolume has enough space, but can't stop directory creation */
-        if (!count || !new_layout) {
+        if (!cnt) {
                 for (i = 0; i < layout->cnt; i++) {
                         err = layout->list[i].err;
                         if (err == ENOSPC) {
                                 layout->list[i].err = -1;
-                                count++;
-                        }
-                }
-        }
-
-        /* if layout->spread_cnt is set, check if it is <= available
-         * subvolumes (down brick and decommissioned bricks are considered
-         * un-availbale). Else return count (available up bricks) */
-        count = ((layout->spread_cnt &&
-                 (layout->spread_cnt <= count)) ?
-                 layout->spread_cnt : ((count) ? count : 1));
-
-        return count;
-}
-
-
-void dht_selfheal_layout_new_directory (call_frame_t *frame, loc_t *loc,
-					dht_layout_t *new_layout);
-
-void dht_layout_entry_swap (dht_layout_t *layout, int i, int j);
-void dht_layout_range_swap (dht_layout_t *layout, int i, int j);
-
-/*
- * It's a bit icky using local variables in a macro, but it makes the rest
- * of the code a lot clearer.
- */
-#define OV_ENTRY(x,y)      table[x*new->cnt+y]
-
-void
-dht_selfheal_layout_maximize_overlap (call_frame_t *frame, loc_t *loc,
-				      dht_layout_t *new, dht_layout_t *old)
-{
-	int           i            = 0;
-	int           j            = 0;
-	uint32_t      curr_overlap = 0;
-	uint32_t      max_overlap  = 0;
-	int           max_overlap_idx = -1;
-	uint32_t      overlap      = 0;
-        uint32_t     *table = NULL;
-
-	dht_layout_sort_volname (old);
-	/* Now both old_layout->list[] and new_layout->list[]
-	   are match the same xlators/subvolumes. i.e,
-	   old_layout->[i] and new_layout->[i] are referring
-	   to the same subvolumes
-	*/
-
-        /* Build a table of overlaps between new[i] and old[j]. */
-        table = alloca(sizeof(overlap)*old->cnt*new->cnt);
-        if (!table) {
-                return;
-        }
-        memset(table,0,sizeof(overlap)*old->cnt*new->cnt);
-        for (i = 0; i < new->cnt; ++i) {
-                for (j = 0; j < old->cnt; ++j) {
-                        OV_ENTRY(i,j) = dht_overlap_calc(old,j,new,i);
-                }
-        }
-
-	for (i = 0; i < new->cnt; i++) {
-		if (new->list[i].err > 0) {
-			/* Subvol might be marked for decommission
-			   with EINVAL, or some other serious error
-			   marked with positive errno.
-			*/
-			continue;
-                }
-
-                max_overlap = 0;
-                max_overlap_idx = i;
-                for (j = (i + 1); j < new->cnt; ++j) {
-                        if (new->list[j].err > 0) {
-			        /* Subvol might be marked for decommission
-			        with EINVAL, or some other serious error
-			        marked with positive errno.
-			        */
-			        continue;
-                        }
-                        /* Calculate the overlap now. */
-                        curr_overlap = OV_ENTRY(i,i) + OV_ENTRY(j,j);
-                        /* Calculate the overlap after the proposed swap. */
-                        overlap = OV_ENTRY(i,j) + OV_ENTRY(j,i);
-                        /* Are we better than status quo? */
-                        if (overlap > curr_overlap) {
-                                overlap -= curr_overlap;
-                                /* Are we better than the previous choice? */
-                                if (overlap > max_overlap) {
-                                        max_overlap = overlap;
-                                        max_overlap_idx = j;
-                                }
+                                cnt++;
                         }
                 }
-
-		if (max_overlap_idx != i) {
- 			dht_layout_range_swap (new, i, max_overlap_idx);
-                        /* Need to swap the table values too. */
-                        for (j = 0; j < old->cnt; ++j) {
-                                overlap = OV_ENTRY(i,j);
-                                OV_ENTRY(i,j) = OV_ENTRY(max_overlap_idx,j);
-                                OV_ENTRY(max_overlap_idx,j) = overlap;
-                        }
-                }
-	}
-}
-
-
-dht_layout_t *
-dht_fix_layout_of_directory (call_frame_t *frame, loc_t *loc,
-                             dht_layout_t *layout)
-{
-        int           i            = 0;
-        xlator_t     *this         = NULL;
-        dht_layout_t *new_layout   = NULL;
-        dht_conf_t   *priv         = NULL;
-        dht_local_t  *local        = NULL;
-        uint32_t      subvol_down  = 0;
-        int           ret          = 0;
-
-        this  = frame->this;
-        priv  = this->private;
-        local = frame->local;
-
-        if (layout->type == DHT_HASH_TYPE_DM_USER) {
-                gf_log (THIS->name, GF_LOG_DEBUG, "leaving %s alone",
-                        loc->path);
-                goto done;
-        }
-
-        new_layout = dht_layout_new (this, priv->subvolume_cnt);
-        if (!new_layout)
-                goto done;
-
-        /* If a subvolume is down, do not re-write the layout. */
-        ret = dht_layout_anomalies (this, loc, layout, NULL, NULL, NULL,
-                                    &subvol_down, NULL, NULL);
-
-        if (subvol_down || (ret == -1)) {
-                gf_log (this->name, GF_LOG_WARNING, "%u subvolume(s) are down"
-                        ". Skipping fix layout.", subvol_down);
-                GF_FREE (new_layout);
-                return NULL;
         }
 
-        for (i = 0; i < new_layout->cnt; i++) {
-		if (layout->list[i].err != ENOSPC)
-			new_layout->list[i].err = layout->list[i].err;
-		else
-			new_layout->list[i].err = -1;
-
-		new_layout->list[i].xlator = layout->list[i].xlator;
-        }
-
-	/* First give it a layout as though it is a new directory. This
-	   ensures rotation to kick in */
-        dht_layout_sort_volname (new_layout);
-	dht_selfheal_layout_new_directory (frame, loc, new_layout);
-
-	/* Now selectively re-assign ranges only when it helps */
-	dht_selfheal_layout_maximize_overlap (frame, loc, new_layout, layout);
-
-done:
-        if (new_layout) {
-                /* Now that the new layout has all the proper layout, change the
-                   inode context */
-                dht_layout_set (this, loc->inode, new_layout);
-
-                /* Make sure the extra 'ref' for existing layout is removed */
-                dht_layout_unref (this, local->layout);
-
-                local->layout = new_layout;
-        }
-
-        return local->layout;
-}
-
-
-void
-dht_selfheal_layout_new_directory (call_frame_t *frame, loc_t *loc,
-                                   dht_layout_t *layout)
-{
-        xlator_t    *this = NULL;
-        uint32_t     chunk = 0;
-        int          i = 0;
-        uint32_t     start = 0;
-        int          cnt = 0;
-        int          err = 0;
-        int          start_subvol = 0;
-
-        this = frame->this;
-
-        cnt = dht_get_layout_count (this, layout, 1);
-
         chunk = ((unsigned long) 0xffffffff) / ((cnt) ? cnt : 1);
 
         start_subvol = dht_selfheal_layout_alloc_start (this, loc, layout);
 
-        /* clear out the range, as we are re-computing here */
-        DHT_RESET_LAYOUT_RANGE (layout);
         for (i = start_subvol; i < layout->cnt; i++) {
                 err = layout->list[i].err;
-                if (err == -1 || err == ENOENT) {
-                        DHT_SET_LAYOUT_RANGE(layout, i, start, chunk,
-                                             cnt, loc->path);
+                if (err == -1) {
+                        layout->list[i].start = start;
+                        layout->list[i].stop  = start + chunk - 1;
+
+                        start = start + chunk;
+
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "gave fix: %u - %u on %s for %s",
+                                layout->list[i].start, layout->list[i].stop,
+                                layout->list[i].xlator->name, loc->path);
                         if (--cnt == 0) {
                                 layout->list[i].stop = 0xffffffff;
-                                goto done;
+                                break;
                         }
-                        start += chunk;
                 }
         }
 
         for (i = 0; i < start_subvol; i++) {
                 err = layout->list[i].err;
-                if (err == -1 || err == ENOENT) {
-                        DHT_SET_LAYOUT_RANGE(layout, i, start, chunk,
-                                             cnt, loc->path);
+                if (err == -1) {
+                        layout->list[i].start = start;
+                        layout->list[i].stop  = start + chunk - 1;
+
+                        start = start + chunk;
+
+                        gf_log (this->name, GF_LOG_TRACE,
+                                "gave fix: %u - %u on %s for %s",
+                                layout->list[i].start, layout->list[i].stop,
+                                layout->list[i].xlator->name, loc->path);
                         if (--cnt == 0) {
                                 layout->list[i].stop = 0xffffffff;
-                                goto done;
+                                break;
                         }
-                        start += chunk;
                 }
         }
-
-done:
-        return;
 }
 
+
 int
 dht_selfheal_dir_getafix (call_frame_t *frame, loc_t *loc,
                           dht_layout_t *layout)
 {
+        dht_conf_t  *conf = NULL;
+        xlator_t    *this = NULL;
         dht_local_t *local = NULL;
-        uint32_t     holes = 0;
+        int          missing = -1;
+        int          down = -1;
+        int          holes = -1;
         int          ret = -1;
         int          i = -1;
-        uint32_t     overlaps = 0;
+        int          overlaps = -1;
 
+        this = frame->this;
+        conf = this->private;
         local = frame->local;
 
+        missing = local->selfheal.missing;
+        down = local->selfheal.down;
         holes = local->selfheal.hole_cnt;
         overlaps = local->selfheal.overlaps_cnt;
 
+        if ((missing + down) == conf->subvolume_cnt) {
+                dht_selfheal_layout_new_directory (frame, loc, layout);
+                ret = 0;
+        }
+
+        if (holes <= down) {
+                /* the down subvol might fill up the holes */
+                ret = 0;
+        }
+
         if (holes || overlaps) {
                 dht_selfheal_layout_new_directory (frame, loc, layout);
                 ret = 0;
@@ -880,35 +535,13 @@ dht_selfheal_new_directory (call_frame_t *frame,
         return 0;
 }
 
-int
-dht_fix_directory_layout (call_frame_t *frame,
-                          dht_selfheal_dir_cbk_t dir_cbk,
-                          dht_layout_t *layout)
-{
-        dht_local_t  *local = NULL;
-        dht_layout_t *tmp_layout = NULL;
-
-        local = frame->local;
-
-        local->selfheal.dir_cbk = dir_cbk;
-        local->selfheal.layout = dht_layout_ref (frame->this, layout);
-
-        /* No layout sorting required here */
-        tmp_layout = dht_fix_layout_of_directory (frame, &local->loc, layout);
-        if (!tmp_layout) {
-                return -1;
-        }
-        dht_fix_dir_xattr (frame, &local->loc, tmp_layout);
-
-        return 0;
-}
-
 
 int
 dht_selfheal_directory (call_frame_t *frame, dht_selfheal_dir_cbk_t dir_cbk,
                         loc_t *loc, dht_layout_t *layout)
 {
         dht_local_t *local    = NULL;
+        uint32_t     holes    = 0;
         uint32_t     down     = 0;
         uint32_t     misc     = 0;
         int          ret      = 0;
@@ -920,9 +553,11 @@ dht_selfheal_directory (call_frame_t *frame, dht_selfheal_dir_cbk_t dir_cbk,
         dht_layout_anomalies (this, loc, layout,
                               &local->selfheal.hole_cnt,
                               &local->selfheal.overlaps_cnt,
-                              NULL, &local->selfheal.down,
-                              &local->selfheal.misc, NULL);
+                              &local->selfheal.missing,
+                              &local->selfheal.down,
+                              &local->selfheal.misc);
 
+        holes    = local->selfheal.hole_cnt;
         down     = local->selfheal.down;
         misc     = local->selfheal.misc;
 
@@ -930,14 +565,14 @@ dht_selfheal_directory (call_frame_t *frame, dht_selfheal_dir_cbk_t dir_cbk,
         local->selfheal.layout = dht_layout_ref (this, layout);
 
         if (down) {
-                gf_log (this->name, GF_LOG_WARNING,
+                gf_log (this->name, GF_LOG_INFO,
                         "%d subvolumes down -- not fixing", down);
                 ret = 0;
                 goto sorry_no_fix;
         }
 
         if (misc) {
-                gf_log (this->name, GF_LOG_WARNING,
+                gf_log (this->name, GF_LOG_INFO,
                         "%d subvolumes have unrecoverable errors", misc);
                 ret = 0;
                 goto sorry_no_fix;
@@ -947,7 +582,7 @@ dht_selfheal_directory (call_frame_t *frame, dht_selfheal_dir_cbk_t dir_cbk,
         ret = dht_selfheal_dir_getafix (frame, loc, layout);
 
         if (ret == -1) {
-                gf_log (this->name, GF_LOG_WARNING,
+                gf_log (this->name, GF_LOG_INFO,
                         "not able to form layout for the directory");
                 goto sorry_no_fix;
         }
@@ -976,54 +611,8 @@ dht_selfheal_restore (call_frame_t *frame, dht_selfheal_dir_cbk_t dir_cbk,
         local->selfheal.dir_cbk = dir_cbk;
         local->selfheal.layout = dht_layout_ref (frame->this, layout);
 
+        FRAME_SU_DO (frame, dht_local_t);
         ret = dht_selfheal_dir_mkdir (frame, loc, layout, 1);
 
         return ret;
 }
-
-int
-dht_dir_attr_heal (void *data)
-{
-        call_frame_t    *frame = NULL;
-        dht_local_t     *local = NULL;
-        xlator_t        *subvol = NULL;
-        xlator_t        *this  = NULL;
-        dht_conf_t      *conf  = NULL;
-        int              call_cnt = 0;
-        int              ret   = -1;
-        int              i     = 0;
-
-        GF_VALIDATE_OR_GOTO ("dht", data, out);
-
-        frame = data;
-        local = frame->local;
-        this = frame->this;
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO ("dht", local, out);
-        conf = this->private;
-        GF_VALIDATE_OR_GOTO ("dht", conf, out);
-
-        call_cnt = conf->subvolume_cnt;
-
-        for (i = 0; i < call_cnt; i++) {
-                subvol = conf->subvolumes[i];
-                if (!subvol || (subvol == dht_first_up_subvol (this)))
-                        continue;
-                ret = syncop_setattr (subvol, &local->loc, &local->stbuf,
-                                      (GF_SET_ATTR_UID | GF_SET_ATTR_GID),
-                                      NULL, NULL);
-                if (ret)
-                        gf_log ("dht", GF_LOG_ERROR, "Failed to set uid/gid on"
-                                " %s on %s subvol (%s)", local->loc.path,
-                                subvol->name, strerror (errno));
-        }
-out:
-        return 0;
-}
-
-int
-dht_dir_attr_heal_done (int ret, call_frame_t *sync_frame, void *data)
-{
-        DHT_STACK_DESTROY (sync_frame);
-        return 0;
-}
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c
deleted file mode 100644
index 70aac7710..000000000
--- a/xlators/cluster/dht/src/dht-shared.c
+++ /dev/null
@@ -1,758 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
-/* TODO: add NS locking */
-
-#include "statedump.h"
-#include "dht-common.h"
-
-/* TODO:
-   - use volumename in xattr instead of "dht"
-   - use NS locks
-   - handle all cases in self heal layout reconstruction
-   - complete linkfile selfheal
-*/
-struct volume_options options[];
-
-void
-dht_layout_dump (dht_layout_t  *layout, const char *prefix)
-{
-
-        char    key[GF_DUMP_MAX_BUF_LEN];
-        int     i = 0;
-
-        if (!layout)
-                goto out;
-        if (!prefix)
-                goto out;
-
-        gf_proc_dump_build_key(key, prefix, "cnt");
-        gf_proc_dump_write(key, "%d", layout->cnt);
-        gf_proc_dump_build_key(key, prefix, "preset");
-        gf_proc_dump_write(key, "%d", layout->preset);
-        gf_proc_dump_build_key(key, prefix, "gen");
-        gf_proc_dump_write(key, "%d", layout->gen);
-        if (layout->type != IA_INVAL) {
-                gf_proc_dump_build_key(key, prefix, "inode type");
-                gf_proc_dump_write(key, "%d", layout->type);
-        }
-
-        if  (!IA_ISDIR (layout->type))
-                goto out;
-
-        for (i = 0; i < layout->cnt; i++) {
-                gf_proc_dump_build_key(key, prefix,"list[%d].err", i);
-                gf_proc_dump_write(key, "%d", layout->list[i].err);
-                gf_proc_dump_build_key(key, prefix,"list[%d].start", i);
-                gf_proc_dump_write(key, "%u", layout->list[i].start);
-                gf_proc_dump_build_key(key, prefix,"list[%d].stop", i);
-                gf_proc_dump_write(key, "%u", layout->list[i].stop);
-                if (layout->list[i].xlator) {
-                        gf_proc_dump_build_key(key, prefix,
-                                               "list[%d].xlator.type", i);
-                        gf_proc_dump_write(key, "%s",
-                                           layout->list[i].xlator->type);
-                        gf_proc_dump_build_key(key, prefix,
-                                               "list[%d].xlator.name", i);
-                        gf_proc_dump_write(key, "%s",
-                                           layout->list[i].xlator->name);
-                }
-        }
-
-out:
-        return;
-}
-
-
-int32_t
-dht_priv_dump (xlator_t *this)
-{
-        char            key_prefix[GF_DUMP_MAX_BUF_LEN];
-        char            key[GF_DUMP_MAX_BUF_LEN];
-        int             i = 0;
-        dht_conf_t      *conf = NULL;
-        int             ret = -1;
-
-        if (!this)
-                goto out;
-
-        conf = this->private;
-        if (!conf)
-                goto out;
-
-        ret = TRY_LOCK(&conf->subvolume_lock);
-        if (ret != 0) {
-                return ret;
-        }
-
-        gf_proc_dump_add_section("xlator.cluster.dht.%s.priv", this->name);
-        gf_proc_dump_build_key(key_prefix,"xlator.cluster.dht","%s.priv",
-                               this->name);
-        gf_proc_dump_write("subvol_cnt","%d", conf->subvolume_cnt);
-        for (i = 0; i < conf->subvolume_cnt; i++) {
-                sprintf (key, "subvolumes[%d]", i);
-                gf_proc_dump_write(key, "%s.%s", conf->subvolumes[i]->type,
-                                   conf->subvolumes[i]->name);
-                if (conf->file_layouts && conf->file_layouts[i]){
-                        sprintf (key, "file_layouts[%d]", i);
-                        dht_layout_dump(conf->file_layouts[i], key);
-                }
-                if (conf->dir_layouts && conf->dir_layouts[i]) {
-                        sprintf (key, "dir_layouts[%d]", i);
-                        dht_layout_dump(conf->dir_layouts[i], key);
-                }
-                if (conf->subvolume_status) {
-
-                        sprintf (key, "subvolume_status[%d]", i);
-                        gf_proc_dump_write(key, "%d",
-                                           (int)conf->subvolume_status[i]);
-                }
-
-        }
-
-        gf_proc_dump_write("search_unhashed", "%d", conf->search_unhashed);
-        gf_proc_dump_write("gen", "%d", conf->gen);
-        gf_proc_dump_write("min_free_disk", "%lf", conf->min_free_disk);
-	gf_proc_dump_write("min_free_inodes", "%lf", conf->min_free_inodes);
-        gf_proc_dump_write("disk_unit", "%c", conf->disk_unit);
-        gf_proc_dump_write("refresh_interval", "%d", conf->refresh_interval);
-        gf_proc_dump_write("unhashed_sticky_bit", "%d", conf->unhashed_sticky_bit);
-        if (conf ->du_stats) {
-                gf_proc_dump_write("du_stats.avail_percent", "%lf",
-                                   conf->du_stats->avail_percent);
-                gf_proc_dump_write("du_stats.avail_space", "%lu",
-                                   conf->du_stats->avail_space);
-		gf_proc_dump_write("du_stats.avail_inodes", "%lf",
-                                   conf->du_stats->avail_inodes);
-                gf_proc_dump_write("du_stats.log", "%lu", conf->du_stats->log);
-        }
-
-        if (conf->last_stat_fetch.tv_sec)
-                gf_proc_dump_write("last_stat_fetch", "%s",
-                                    ctime(&conf->last_stat_fetch.tv_sec));
-
-        UNLOCK(&conf->subvolume_lock);
-
-out:
-        return ret;
-}
-
-int32_t
-dht_inodectx_dump (xlator_t *this, inode_t *inode)
-{
-        int             ret = -1;
-        dht_layout_t    *layout = NULL;
-
-        if (!this)
-                goto out;
-        if (!inode)
-                goto out;
-
-        ret = dht_inode_ctx_layout_get (inode, this, &layout);
-
-        if ((ret != 0) || !layout)
-                return ret;
-
-        gf_proc_dump_add_section("xlator.cluster.dht.%s.inode", this->name);
-        dht_layout_dump(layout, "layout");
-
-out:
-        return ret;
-}
-
-void
-dht_fini (xlator_t *this)
-{
-        int         i = 0;
-        dht_conf_t *conf = NULL;
-
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-
-        conf = this->private;
-        this->private = NULL;
-        if (conf) {
-                if (conf->file_layouts) {
-                        for (i = 0; i < conf->subvolume_cnt; i++) {
-                                GF_FREE (conf->file_layouts[i]);
-                        }
-                        GF_FREE (conf->file_layouts);
-                }
-
-                GF_FREE (conf->subvolumes);
-
-                GF_FREE (conf->subvolume_status);
-
-                GF_FREE (conf);
-        }
-out:
-        return;
-}
-
-int32_t
-mem_acct_init (xlator_t *this)
-{
-        int     ret = -1;
-
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-
-        ret = xlator_mem_acct_init (this, gf_dht_mt_end + 1);
-
-        if (ret != 0) {
-                gf_log (this->name, GF_LOG_ERROR, "Memory accounting init"
-                        "failed");
-                return ret;
-        }
-out:
-        return ret;
-}
-
-
-int
-dht_parse_decommissioned_bricks (xlator_t *this, dht_conf_t *conf,
-                                 const char *bricks)
-{
-        int         i  = 0;
-        int         ret  = -1;
-        char       *tmpstr = NULL;
-        char       *dup_brick = NULL;
-        char       *node = NULL;
-
-        if (!conf || !bricks)
-                goto out;
-
-        dup_brick = gf_strdup (bricks);
-        node = strtok_r (dup_brick, ",", &tmpstr);
-        while (node) {
-                for (i = 0; i < conf->subvolume_cnt; i++) {
-                        if (!strcmp (conf->subvolumes[i]->name, node)) {
-                                conf->decommissioned_bricks[i] =
-                                        conf->subvolumes[i];
-                                        conf->decommission_subvols_cnt++;
-                                gf_log (this->name, GF_LOG_INFO,
-                                        "decommissioning subvolume %s",
-                                        conf->subvolumes[i]->name);
-                                break;
-                        }
-                }
-                if (i == conf->subvolume_cnt) {
-                        /* Wrong node given. */
-                        goto out;
-                }
-                node = strtok_r (NULL, ",", &tmpstr);
-        }
-
-        ret = 0;
-        conf->decommission_in_progress = 1;
-out:
-        GF_FREE (dup_brick);
-
-        return ret;
-}
-
-
-int
-dht_decommissioned_remove (xlator_t *this, dht_conf_t *conf)
-{
-        int         i  = 0;
-        int         ret  = -1;
-
-        if (!conf)
-                goto out;
-
-        for (i = 0; i < conf->subvolume_cnt; i++) {
-                if (conf->decommissioned_bricks[i]) {
-                        conf->decommissioned_bricks[i] = NULL;
-                        conf->decommission_subvols_cnt--;
-                }
-        }
-
-        ret = 0;
-out:
-
-        return ret;
-}
-void
-dht_init_regex (xlator_t *this, dict_t *odict, char *name,
-                regex_t *re, gf_boolean_t *re_valid)
-{
-        char    *temp_str;
-
-        if (dict_get_str (odict, name, &temp_str) != 0) {
-                if (strcmp(name,"rsync-hash-regex")) {
-                        return;
-                }
-                temp_str = "^\\.(.+)\\.[^.]+$";
-        }
-
-        if (*re_valid) {
-                regfree(re);
-                *re_valid = _gf_false;
-        }
-
-        if (!strcmp(temp_str,"none")) {
-                return;
-        }
-
-        if (regcomp(re,temp_str,REG_EXTENDED) == 0) {
-                gf_log (this->name, GF_LOG_INFO,
-                        "using regex %s = %s", name, temp_str);
-                *re_valid = _gf_true;
-        }
-        else {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "compiling regex %s failed", temp_str);
-        }
-}
-
-int
-dht_reconfigure (xlator_t *this, dict_t *options)
-{
-        dht_conf_t      *conf = NULL;
-        char            *temp_str = NULL;
-        gf_boolean_t     search_unhashed;
-        int              ret = -1;
-
-        GF_VALIDATE_OR_GOTO ("dht", this, out);
-        GF_VALIDATE_OR_GOTO ("dht", options, out);
-
-        conf = this->private;
-        if (!conf)
-                return 0;
-
-        if (dict_get_str (options, "lookup-unhashed", &temp_str) == 0) {
-                /* If option is not "auto", other options _should_ be boolean*/
-                if (strcasecmp (temp_str, "auto")) {
-                        if (!gf_string2boolean (temp_str, &search_unhashed)) {
-                                gf_log(this->name, GF_LOG_DEBUG, "Reconfigure:"
-                                       " lookup-unhashed reconfigured (%s)",
-                                       temp_str);
-                                conf->search_unhashed = search_unhashed;
-                        } else {
-                                gf_log(this->name, GF_LOG_ERROR, "Reconfigure:"
-                                       " lookup-unhashed should be boolean,"
-                                       " not (%s), defaulting to (%d)",
-                                       temp_str, conf->search_unhashed);
-                                //return -1;
-                                ret = -1;
-                                goto out;
-                        }
-                } else {
-                        gf_log(this->name, GF_LOG_DEBUG, "Reconfigure:"
-                               " lookup-unhashed reconfigured auto ");
-                        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_AUTO;
-                }
-        }
-
-	GF_OPTION_RECONF ("min-free-disk", conf->min_free_disk, options,
-                          percent_or_size, out);
-        /* option can be any one of percent or bytes */
-        conf->disk_unit = 0;
-        if (conf->min_free_disk < 100.0)
-                conf->disk_unit = 'p';
-
-	GF_OPTION_RECONF ("min-free-inodes", conf->min_free_inodes, options,
-                          percent, out);
-
-        GF_OPTION_RECONF ("directory-layout-spread", conf->dir_spread_cnt,
-                          options, uint32, out);
-
-        GF_OPTION_RECONF ("readdir-optimize", conf->readdir_optimize, options,
-                          bool, out);
-        if (conf->defrag) {
-                GF_OPTION_RECONF ("rebalance-stats", conf->defrag->stats,
-                                  options, bool, out);
-        }
-
-        if (dict_get_str (options, "decommissioned-bricks", &temp_str) == 0) {
-                ret = dht_parse_decommissioned_bricks (this, conf, temp_str);
-                if (ret == -1)
-                        goto out;
-        } else {
-                ret = dht_decommissioned_remove (this, conf);
-                if (ret == -1)
-                        goto out;
-        }
-
-        dht_init_regex (this, options, "rsync-hash-regex",
-                        &conf->rsync_regex, &conf->rsync_regex_valid);
-        dht_init_regex (this, options, "extra-hash-regex",
-                        &conf->extra_regex, &conf->extra_regex_valid);
-
-        ret = 0;
-out:
-        return ret;
-}
-
-static int
-gf_defrag_pattern_list_fill (xlator_t *this, gf_defrag_info_t *defrag, char *data)
-{
-        int                    ret = -1;
-        char                  *tmp_str = NULL;
-        char                  *tmp_str1 = NULL;
-        char                  *dup_str = NULL;
-        char                  *num = NULL;
-        char                  *pattern_str = NULL;
-        char                  *pattern = NULL;
-        gf_defrag_pattern_list_t *temp_list = NULL;
-        gf_defrag_pattern_list_t *pattern_list = NULL;
-
-        if (!this || !defrag || !data)
-                goto out;
-
-        /* Get the pattern for pattern list. "pattern:<optional-size>"
-         * eg: *avi, *pdf:10MB, *:1TB
-         */
-        pattern_str = strtok_r (data, ",", &tmp_str);
-        while (pattern_str) {
-                dup_str = gf_strdup (pattern_str);
-                pattern_list = GF_CALLOC (1, sizeof (gf_defrag_pattern_list_t),
-                                        1);
-                if (!pattern_list) {
-                        goto out;
-                }
-                pattern = strtok_r (dup_str, ":", &tmp_str1);
-                num = strtok_r (NULL, ":", &tmp_str1);
-                if (!pattern)
-                        goto out;
-                if (!num) {
-                        if (gf_string2bytesize(pattern, &pattern_list->size)
-                             == 0) {
-                                pattern = "*";
-                        }
-                } else if (gf_string2bytesize (num, &pattern_list->size) != 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "invalid number format \"%s\"", num);
-                        goto out;
-                }
-                memcpy (pattern_list->path_pattern, pattern, strlen (dup_str));
-
-                if (!defrag->defrag_pattern)
-                        temp_list = NULL;
-                else
-                        temp_list = defrag->defrag_pattern;
-
-                pattern_list->next = temp_list;
-
-                defrag->defrag_pattern = pattern_list;
-                pattern_list = NULL;
-
-                GF_FREE (dup_str);
-                dup_str = NULL;
-
-                pattern_str = strtok_r (NULL, ",", &tmp_str);
-        }
-
-        ret = 0;
-out:
-        if (ret)
-                GF_FREE (pattern_list);
-        GF_FREE (dup_str);
-
-        return ret;
-}
-
-int
-dht_init (xlator_t *this)
-{
-        dht_conf_t                      *conf           = NULL;
-        char                            *temp_str       = NULL;
-        int                              ret            = -1;
-        int                              i              = 0;
-        gf_defrag_info_t                *defrag         = NULL;
-        int                              cmd            = 0;
-        char                            *node_uuid      = NULL;
-
-
-        GF_VALIDATE_OR_GOTO ("dht", this, err);
-
-        if (!this->children) {
-                gf_log (this->name, GF_LOG_CRITICAL,
-                        "Distribute needs more than one subvolume");
-                return -1;
-        }
-
-        if (!this->parents) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "dangling volume. check volfile");
-        }
-
-        conf = GF_CALLOC (1, sizeof (*conf), gf_dht_mt_dht_conf_t);
-        if (!conf) {
-                goto err;
-        }
-
-        ret = dict_get_int32 (this->options, "rebalance-cmd", &cmd);
-
-        if (cmd) {
-                defrag = GF_CALLOC (1, sizeof (gf_defrag_info_t),
-                                    gf_defrag_info_mt);
-
-                GF_VALIDATE_OR_GOTO (this->name, defrag, err);
-
-                LOCK_INIT (&defrag->lock);
-
-                defrag->is_exiting = 0;
-
-                conf->defrag = defrag;
-
-                ret = dict_get_str (this->options, "node-uuid", &node_uuid);
-                if (ret) {
-                        gf_log (this->name, GF_LOG_ERROR, "node-uuid not "
-                                "specified");
-                        goto err;
-                }
-
-                if (uuid_parse (node_uuid, defrag->node_uuid)) {
-                        gf_log (this->name, GF_LOG_ERROR, "Cannot parse "
-                                "glusterd node uuid");
-                        goto err;
-                }
-
-                defrag->cmd = cmd;
-
-                defrag->stats = _gf_false;
-        }
-
-        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_ON;
-        if (dict_get_str (this->options, "lookup-unhashed", &temp_str) == 0) {
-                /* If option is not "auto", other options _should_ be boolean */
-                if (strcasecmp (temp_str, "auto"))
-                        gf_string2boolean (temp_str, &conf->search_unhashed);
-                else
-                        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_AUTO;
-        }
-
-        GF_OPTION_INIT ("unhashed-sticky-bit", conf->unhashed_sticky_bit, bool,
-                        err);
-
-        GF_OPTION_INIT ("use-readdirp", conf->use_readdirp, bool, err);
-
-	GF_OPTION_INIT ("min-free-disk", conf->min_free_disk, percent_or_size,
-			err);
-
-        GF_OPTION_INIT ("min-free-inodes", conf->min_free_inodes, percent,
-                        err);
-
-        conf->dir_spread_cnt = conf->subvolume_cnt;
-        GF_OPTION_INIT ("directory-layout-spread", conf->dir_spread_cnt,
-                        uint32, err);
-
-        GF_OPTION_INIT ("assert-no-child-down", conf->assert_no_child_down,
-                        bool, err);
-
-        GF_OPTION_INIT ("readdir-optimize", conf->readdir_optimize, bool, err);
-
-        if (defrag) {
-                GF_OPTION_INIT ("rebalance-stats", defrag->stats, bool, err);
-                if (dict_get_str (this->options, "rebalance-filter", &temp_str)
-                    == 0) {
-                        if (gf_defrag_pattern_list_fill (this, defrag, temp_str)
-                            == -1) {
-                                gf_log (this->name, GF_LOG_ERROR, "Cannot parse"
-                                        " rebalance-filter (%s)", temp_str);
-                                goto err;
-                        }
-                }
-        }
-
-        /* option can be any one of percent or bytes */
-        conf->disk_unit = 0;
-        if (conf->min_free_disk < 100)
-                conf->disk_unit = 'p';
-
-        ret = dht_init_subvolumes (this, conf);
-        if (ret == -1) {
-                goto err;
-        }
-
-        if (dict_get_str (this->options, "decommissioned-bricks", &temp_str) == 0) {
-                ret = dht_parse_decommissioned_bricks (this, conf, temp_str);
-                if (ret == -1)
-                        goto err;
-        }
-
-        dht_init_regex (this, this->options, "rsync-hash-regex",
-                        &conf->rsync_regex, &conf->rsync_regex_valid);
-        dht_init_regex (this, this->options, "extra-hash-regex",
-                        &conf->extra_regex, &conf->extra_regex_valid);
-
-        ret = dht_layouts_init (this, conf);
-        if (ret == -1) {
-                goto err;
-        }
-
-        LOCK_INIT (&conf->subvolume_lock);
-        LOCK_INIT (&conf->layout_lock);
-
-        conf->gen = 1;
-
-        this->local_pool = mem_pool_new (dht_local_t, 512);
-        if (!this->local_pool) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "failed to create local_t's memory pool");
-                goto err;
-        }
-
-        GF_OPTION_INIT ("xattr-name", conf->xattr_name, str, err);
-        gf_asprintf (&conf->link_xattr_name, "%s.linkto", conf->xattr_name);
-        gf_asprintf (&conf->wild_xattr_name, "%s*", conf->xattr_name);
-        if (!conf->link_xattr_name || !conf->wild_xattr_name) {
-                goto err;
-        }
-
-        this->private = conf;
-
-        return 0;
-
-err:
-        if (conf) {
-                if (conf->file_layouts) {
-                        for (i = 0; i < conf->subvolume_cnt; i++) {
-                                GF_FREE (conf->file_layouts[i]);
-                        }
-                        GF_FREE (conf->file_layouts);
-                }
-
-                GF_FREE (conf->subvolumes);
-
-                GF_FREE (conf->subvolume_status);
-
-                GF_FREE (conf->du_stats);
-
-                GF_FREE (conf->defrag);
-
-                GF_FREE (conf->xattr_name);
-                GF_FREE (conf->link_xattr_name);
-                GF_FREE (conf->wild_xattr_name);
-
-                GF_FREE (conf);
-        }
-
-        return -1;
-}
-
-
-struct volume_options options[] = {
-        { .key  = {"lookup-unhashed"},
-          .value = {"auto", "yes", "no", "enable", "disable", "1", "0",
-                    "on", "off"},
-          .type = GF_OPTION_TYPE_STR,
-          .default_value = "on",
-          .description = "This option if set to ON, does a lookup through "
-          "all the sub-volumes, in case a lookup didn't return any result "
-          "from the hash subvolume. If set to OFF, it does not do a lookup "
-          "on the remaining subvolumes."
-        },
-        { .key  = {"min-free-disk"},
-          .type = GF_OPTION_TYPE_PERCENT_OR_SIZET,
-          .default_value = "10%",
-          .description = "Percentage/Size of disk space, after which the "
-          "process starts balancing out the cluster, and logs will appear "
-          "in log files",
-        },
-	{ .key  = {"min-free-inodes"},
-          .type = GF_OPTION_TYPE_PERCENT,
-          .default_value = "5%",
-          .description = "after system has only N% of inodes, warnings "
-          "starts to appear in log files",
-        },
-        { .key = {"unhashed-sticky-bit"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-        },
-        { .key = {"use-readdirp"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "on",
-          .description = "This option if set to ON, forces the use of "
-          "readdirp, and hence also displays the stats of the files."
-        },
-        { .key = {"assert-no-child-down"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-          .description = "This option if set to ON, in the event of "
-          "CHILD_DOWN, will call exit."
-        },
-        { .key  = {"directory-layout-spread"},
-          .type = GF_OPTION_TYPE_INT,
-          .min  = 1,
-          .validate = GF_OPT_VALIDATE_MIN,
-          .description = "Specifies the directory layout spread."
-        },
-        { .key  = {"decommissioned-bricks"},
-          .type = GF_OPTION_TYPE_ANY,
-          .description = "This option if set to ON, decommissions "
-          "the brick, so that no new data is allowed to be created "
-          "on that brick."
-        },
-        { .key  = {"rebalance-cmd"},
-          .type = GF_OPTION_TYPE_INT,
-        },
-        { .key = {"node-uuid"},
-          .type = GF_OPTION_TYPE_STR,
-        },
-        { .key = {"rebalance-stats"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-          .description = "This option if set to ON displays and logs the "
-          " time taken for migration of each file, during the rebalance "
-          "process. If set to OFF, the rebalance logs will only display the "
-          "time spent in each directory."
-        },
-        { .key = {"readdir-optimize"},
-          .type = GF_OPTION_TYPE_BOOL,
-          .default_value = "off",
-          .description = "This option if set to ON enables the optimization "
-          "that allows DHT to requests non-first subvolumes to filter out "
-          "directory entries."
-        },
-        { .key = {"rsync-hash-regex"},
-          .type = GF_OPTION_TYPE_STR,
-          /* Setting a default here doesn't work.  See dht_init_regex. */
-          .description = "Regular expression for stripping temporary-file "
-          "suffix and prefix used by rsync, to prevent relocation when the "
-          "file is renamed."
-        },
-        { .key = {"extra-hash-regex"},
-          .type = GF_OPTION_TYPE_STR,
-          /* Setting a default here doesn't work.  See dht_init_regex. */
-          .description = "Regular expression for stripping temporary-file "
-          "suffix and prefix used by an application, to prevent relocation when "
-          "the file is renamed."
-        },
-        { .key = {"rebalance-filter"},
-          .type = GF_OPTION_TYPE_STR,
-        },
-
-        { .key = {"xattr-name"},
-          .type = GF_OPTION_TYPE_STR,
-          .default_value = "trusted.glusterfs.dht",
-          .description = "Base for extended attributes used by this "
-          "translator instance, to avoid conflicts with others above or "
-          "below it."
-        },
-
-        /* NUFA option */
-        { .key  = {"local-volume-name"},
-          .type = GF_OPTION_TYPE_XLATOR
-        },
-
-        /* switch option */
-        { .key  = {"pattern.switch.case"},
-          .type = GF_OPTION_TYPE_ANY
-        },
-
-        { .key  = {NULL} },
-};
diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c
index fc0ca2f77..0958a8bab 100644
--- a/xlators/cluster/dht/src/dht.c
+++ b/xlators/cluster/dht/src/dht.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -14,23 +23,512 @@
 #include "config.h"
 #endif
 
+/* TODO: add NS locking */
+
 #include "statedump.h"
-#include "dht-common.h"
+#include "dht-common.c"
+
+/* TODO:
+   - use volumename in xattr instead of "dht"
+   - use NS locks
+   - handle all cases in self heal layout reconstruction
+   - complete linkfile selfheal
+*/
+struct volume_options options[];
+
+void
+dht_layout_dump (dht_layout_t  *layout, const char *prefix)
+{
+
+        char    key[GF_DUMP_MAX_BUF_LEN];
+        int     i = 0;
+
+        GF_VALIDATE_OR_GOTO ("dht", layout, out);
+        GF_VALIDATE_OR_GOTO ("dht", prefix, out);
+
+        gf_proc_dump_build_key(key, prefix, "cnt");
+        gf_proc_dump_write(key, "%d", layout->cnt);
+        gf_proc_dump_build_key(key, prefix, "preset");
+        gf_proc_dump_write(key, "%d", layout->preset);
+        gf_proc_dump_build_key(key, prefix, "gen");
+        gf_proc_dump_write(key, "%d", layout->gen);
+        gf_proc_dump_build_key(key, prefix, "type");
+        gf_proc_dump_write(key, "%d", layout->type);
+
+        for (i = 0; i < layout->cnt; i++) {
+                gf_proc_dump_build_key(key, prefix,"list[%d].err", i);
+                gf_proc_dump_write(key, "%d", layout->list[i].err);
+                gf_proc_dump_build_key(key, prefix,"list[%d].start", i);
+                gf_proc_dump_write(key, "%u", layout->list[i].start);
+                gf_proc_dump_build_key(key, prefix,"list[%d].stop", i);
+                gf_proc_dump_write(key, "%u", layout->list[i].stop);
+                if (layout->list[i].xlator) {
+                        gf_proc_dump_build_key(key, prefix,
+                                               "list[%d].xlator.type", i);
+                        gf_proc_dump_write(key, "%s",
+                                           layout->list[i].xlator->type);
+                        gf_proc_dump_build_key(key, prefix,
+                                               "list[%d].xlator.name", i);
+                        gf_proc_dump_write(key, "%s",
+                                           layout->list[i].xlator->name);
+                }
+        }
+
+out:
+        return;
+}
+
+
+int32_t
+dht_priv_dump (xlator_t *this)
+{
+        char            key_prefix[GF_DUMP_MAX_BUF_LEN];
+        char            key[GF_DUMP_MAX_BUF_LEN];
+        int             i = 0;
+        dht_conf_t      *conf = NULL;
+        int             ret = -1;
+
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+
+        conf = this->private;
+
+        if (!conf)
+                return -1;
+
+        ret = TRY_LOCK(&conf->subvolume_lock);
+
+        if (ret != 0) {
+                gf_log("", GF_LOG_WARNING, "Unable to lock dht subvolume %s",
+                       this->name);
+                return ret;
+        }
+
+        gf_proc_dump_add_section("xlator.cluster.dht.%s.priv", this->name);
+        gf_proc_dump_build_key(key_prefix,"xlator.cluster.dht","%s.priv",
+                               this->name);
+        gf_proc_dump_build_key(key, key_prefix, "subvolume_cnt");
+        gf_proc_dump_write(key,"%d", conf->subvolume_cnt);
+        for (i = 0; i < conf->subvolume_cnt; i++) {
+                gf_proc_dump_build_key(key, key_prefix, "subvolumes[%d]", i);
+                gf_proc_dump_write(key, "%s.%s", conf->subvolumes[i]->type,
+                                   conf->subvolumes[i]->name);
+                if (conf->file_layouts && conf->file_layouts[i]){
+                        gf_proc_dump_build_key(key, key_prefix,
+                                               "file_layouts[%d]",i);
+                        dht_layout_dump(conf->file_layouts[i], key);
+                }
+                if (conf->dir_layouts && conf->dir_layouts[i]) {
+                        gf_proc_dump_build_key(key, key_prefix,
+                                               "dir_layouts[%d]",i);
+                        dht_layout_dump(conf->dir_layouts[i], key);
+                }
+                if (conf->subvolume_status) {
+                        gf_proc_dump_build_key(key, key_prefix,
+                                               "subvolume_status[%d]", i);
+                        gf_proc_dump_write(key, "%d",
+                                           (int)conf->subvolume_status[i]);
+                }
+
+        }
+
+        gf_proc_dump_build_key(key, key_prefix,"default_dir_layout");
+        dht_layout_dump(conf->default_dir_layout, key);
+
+        gf_proc_dump_build_key(key, key_prefix, "search_unhashed");
+        gf_proc_dump_write(key, "%d", conf->search_unhashed);
+        gf_proc_dump_build_key(key, key_prefix, "gen");
+        gf_proc_dump_write(key, "%d", conf->gen);
+        gf_proc_dump_build_key(key, key_prefix, "min_free_disk");
+        gf_proc_dump_write(key, "%lu", conf->min_free_disk);
+        gf_proc_dump_build_key(key, key_prefix, "disk_unit");
+        gf_proc_dump_write(key, "%c", conf->disk_unit);
+        gf_proc_dump_build_key(key, key_prefix, "refresh_interval");
+        gf_proc_dump_write(key, "%d", conf->refresh_interval);
+        gf_proc_dump_build_key(key, key_prefix, "unhashed_sticky_bit");
+        gf_proc_dump_write(key, "%d", conf->unhashed_sticky_bit);
+        if (conf ->du_stats) {
+                gf_proc_dump_build_key(key, key_prefix,
+                                       "du_stats.avail_percent");
+                gf_proc_dump_write(key, "%lf", conf->du_stats->avail_percent);
+                gf_proc_dump_build_key(key, key_prefix,
+                                       "du_stats.avail_space");
+                gf_proc_dump_write(key, "%lu", conf->du_stats->avail_space);
+                gf_proc_dump_build_key(key, key_prefix,
+                                       "du_stats.log");
+                gf_proc_dump_write(key, "%lu", conf->du_stats->log);
+        }
+        gf_proc_dump_build_key(key, key_prefix, "last_stat_fetch");
+        gf_proc_dump_write(key, "%s", ctime(&conf->last_stat_fetch.tv_sec));
+
+        UNLOCK(&conf->subvolume_lock);
+
+out:
+        return ret;
+}
+
+int32_t
+dht_inodectx_dump (xlator_t *this, inode_t *inode)
+{
+        int             ret = -1;
+        char            key_prefix[GF_DUMP_MAX_BUF_LEN];
+        dht_layout_t    *layout = NULL;
+        uint64_t        tmp_layout = 0;
+
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+        GF_VALIDATE_OR_GOTO ("dht", inode, out);
+
+        ret = inode_ctx_get (inode, this, &tmp_layout);
+
+        if (ret != 0)
+                return ret;
+
+        layout = (dht_layout_t *)(long)tmp_layout;
+
+        if (!layout)
+                return -1;
+
+        gf_proc_dump_build_key(key_prefix, "xlator.cluster.dht",
+                               "%s.inode.%ld", this->name, inode->ino);
+        dht_layout_dump(layout, key_prefix);
+
+out:
+        return ret;
+}
+
+int
+notify (xlator_t *this, int event, void *data, ...)
+{
+        int ret = -1;
+
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+
+        ret = dht_notify (this, event, data);
+
+out:
+        return ret;
+}
+
+void
+fini (xlator_t *this)
+{
+        int         i = 0;
+        dht_conf_t *conf = NULL;
+
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+
+        conf = this->private;
+        this->private = NULL;
+        if (conf) {
+                if (conf->file_layouts) {
+                        for (i = 0; i < conf->subvolume_cnt; i++) {
+                                GF_FREE (conf->file_layouts[i]);
+                        }
+                        GF_FREE (conf->file_layouts);
+                }
+
+                if (conf->default_dir_layout)
+                        GF_FREE (conf->default_dir_layout);
+
+                if (conf->subvolumes)
+                        GF_FREE (conf->subvolumes);
+
+                if (conf->subvolume_status)
+                        GF_FREE (conf->subvolume_status);
+
+                GF_FREE (conf);
+        }
+out:
+        return;
+}
+
+int32_t
+mem_acct_init (xlator_t *this)
+{
+        int     ret = -1;
+
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+
+        ret = xlator_mem_acct_init (this, gf_dht_mt_end + 1);
+
+        if (ret != 0) {
+                gf_log (this->name, GF_LOG_ERROR, "Memory accounting init"
+                        "failed");
+                return ret;
+        }
+out:
+        return ret;
+}
+
+int
+validate_options (xlator_t *this, char **op_errstr)
+{
+        int                 ret = 0;
+        volume_opt_list_t  *vol_opt = NULL;
+        volume_opt_list_t  *tmp;
+
+        if (!this) {
+                gf_log (this->name, GF_LOG_DEBUG, "'this' not a valid ptr");
+                ret =-1;
+                goto out;
+        }
+
+        if (list_empty (&this->volume_options))
+                goto out;
+
+        vol_opt = list_entry (this->volume_options.next,
+                                      volume_opt_list_t, list);
+         list_for_each_entry_safe (vol_opt, tmp, &this->volume_options, list) {
+                ret = validate_xlator_volume_options_attacherr (this,
+                                                                vol_opt->given_opt,
+                                                                op_errstr);
+        }
+
+out:
+
+        return ret;
+}
+
+int
+reconfigure (xlator_t *this, dict_t *options)
+{
+        dht_conf_t      *conf = NULL;
+        char            *temp_str = NULL;
+        gf_boolean_t     search_unhashed;
+        uint32_t         temp_free_disk = 0;
+        int              ret = -1;
+
+        GF_VALIDATE_OR_GOTO ("dht", this, out);
+        GF_VALIDATE_OR_GOTO ("dht", options, out);
+
+        conf = this->private;
+        if (!conf)
+                return 0;
+
+        if (dict_get_str (options, "lookup-unhashed", &temp_str) == 0) {
+                /* If option is not "auto", other options _should_ be boolean*/
+                if (strcasecmp (temp_str, "auto")) {
+                        if (!gf_string2boolean (temp_str, &search_unhashed)) {
+                                gf_log(this->name, GF_LOG_DEBUG, "Reconfigure:"
+                                       " lookup-unahashed reconfigured (%s)",
+                                       temp_str);
+                                conf->search_unhashed = search_unhashed;
+                        } else {
+                                gf_log(this->name, GF_LOG_ERROR, "Reconfigure:"
+                                       " lookup-unahashed should be boolean,"
+                                       " not (%s), defaulting to (%d)",
+                                       temp_str, conf->search_unhashed);
+                                //return -1;
+                                ret = -1;
+                                goto out;
+                        }
+                } else {
+                        gf_log(this->name, GF_LOG_DEBUG, "Reconfigure:"
+                               " lookup-unahashed reconfigured auto ");
+                        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_AUTO;
+                }
+        }
+
+        if (dict_get_str (options, "min-free-disk", &temp_str) == 0) {
+                if (gf_string2percent (temp_str, &temp_free_disk) == 0) {
+                        if (temp_free_disk > 100) {
+                                gf_string2bytesize (temp_str,
+                                                    &conf->min_free_disk);
+                                conf->disk_unit = 'b';
+                        } else {
+                                conf->min_free_disk = (uint64_t)temp_free_disk;
+                        }
+                } else {
+                        gf_string2bytesize (temp_str, &conf->min_free_disk);
+                        conf->disk_unit = 'b';
+                }
+
+                gf_log(this->name, GF_LOG_DEBUG, "Reconfigure:"
+                       " min-free-disk reconfigured to %s",
+                       temp_str);
+        }
+        ret = 0;
+out:
+        return ret;
+}
+
+int
+init (xlator_t *this)
+{
+        dht_conf_t    *conf = NULL;
+        char          *temp_str = NULL;
+        int            ret = -1;
+        int            i = 0;
+        uint32_t       temp_free_disk = 0;
+        char          *def_val = NULL;
+
+        GF_VALIDATE_OR_GOTO ("dht", this, err);
+
+        if (!this->children) {
+                gf_log (this->name, GF_LOG_CRITICAL,
+                        "Distribute needs more than one subvolume");
+                return -1;
+        }
+
+        if (!this->parents) {
+                gf_log (this->name, GF_LOG_WARNING,
+                        "dangling volume. check volfile");
+        }
+
+        conf = GF_CALLOC (1, sizeof (*conf), gf_dht_mt_dht_conf_t);
+        if (!conf) {
+                goto err;
+        }
+
+        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_ON;
+        if (dict_get_str (this->options, "lookup-unhashed", &temp_str) == 0) {
+                /* If option is not "auto", other options _should_ be boolean */
+                if (strcasecmp (temp_str, "auto"))
+                        gf_string2boolean (temp_str, &conf->search_unhashed);
+                else
+                        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_AUTO;
+        }
+
+        conf->unhashed_sticky_bit = 0;
+
+        if (dict_get_str (this->options, "unhashed-sticky-bit",
+                          &temp_str) == 0) {
+                gf_string2boolean (temp_str, &conf->unhashed_sticky_bit);
+        }
+
+        conf->use_readdirp = 1;
+
+        if (dict_get_str (this->options, "use-readdirp",
+                          &temp_str) == 0) {
+                gf_string2boolean (temp_str, &conf->use_readdirp);
+        }
+
+        if (xlator_get_volopt_info (&this->volume_options, "min-free-disk",
+                                    &def_val, NULL)) {
+                gf_log (this->name, GF_LOG_ERROR, "Default value of "
+                         " min-free-disk not found");
+                ret = -1;
+                goto err;
+        } else {
+                if (gf_string2percent (def_val, &temp_free_disk) == 0) {
+                        if (temp_free_disk > 100) {
+                                gf_string2bytesize (temp_str,
+                                                    &conf->min_free_disk);
+                                conf->disk_unit = 'b';
+                        } else {
+                                conf->min_free_disk = (uint64_t)temp_free_disk;
+                                conf->disk_unit = 'p';
+                        }
+                } else {
+                        gf_string2bytesize (temp_str, &conf->min_free_disk);
+                        conf->disk_unit = 'b';
+                }
+        }
+
+        if (dict_get_str (this->options, "min-free-disk", &temp_str) == 0) {
+                if (gf_string2percent (temp_str, &temp_free_disk) == 0) {
+                        if (temp_free_disk > 100) {
+                                gf_string2bytesize (temp_str,
+                                                    &conf->min_free_disk);
+                                conf->disk_unit = 'b';
+                        } else {
+                                conf->min_free_disk = (uint64_t)temp_free_disk;
+                        }
+                } else {
+                        gf_string2bytesize (temp_str, &conf->min_free_disk);
+                        conf->disk_unit = 'b';
+                }
+        }
+
+        conf->assert_no_child_down = 0;
+
+        ret = dict_get_str_boolean (this->options, "assert-no-child-down", 0);
+        if (ret != -1) {
+                if (conf->assert_no_child_down != ret) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "Changing assert-no-child-down from %d to %d",
+                                conf->assert_no_child_down, ret);
+                }
+                conf->assert_no_child_down = ret;
+        } else {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "'assert-no-child-down' takes only boolean arguments");
+        }
+
+        ret = dht_init_subvolumes (this, conf);
+        if (ret == -1) {
+                goto err;
+        }
+
+        ret = dht_layouts_init (this, conf);
+        if (ret == -1) {
+                goto err;
+        }
+
+        conf->du_stats = GF_CALLOC (conf->subvolume_cnt, sizeof (dht_du_t),
+                                    gf_dht_mt_dht_du_t);
+        if (!conf->du_stats) {
+                goto err;
+        }
+
+        LOCK_INIT (&conf->subvolume_lock);
+        LOCK_INIT (&conf->layout_lock);
+
+        conf->gen = 1;
+
+        this->private = conf;
+
+        return 0;
+
+err:
+        if (conf) {
+                if (conf->file_layouts) {
+                        for (i = 0; i < conf->subvolume_cnt; i++) {
+                                GF_FREE (conf->file_layouts[i]);
+                        }
+                        GF_FREE (conf->file_layouts);
+                }
+
+                if (conf->default_dir_layout)
+                        GF_FREE (conf->default_dir_layout);
+
+                if (conf->subvolumes)
+                        GF_FREE (conf->subvolumes);
+
+                if (conf->subvolume_status)
+                        GF_FREE (conf->subvolume_status);
+
+                if (conf->du_stats)
+                        GF_FREE (conf->du_stats);
+
+                GF_FREE (conf);
+        }
+
+        return -1;
+}
 
-class_methods_t class_methods = {
-        .init           = dht_init,
-        .fini           = dht_fini,
-        .reconfigure    = dht_reconfigure,
-        .notify         = dht_notify
-};
 
 struct xlator_fops fops = {
         .lookup      = dht_lookup,
         .mknod       = dht_mknod,
         .create      = dht_create,
 
+        .stat        = dht_stat,
+        .fstat       = dht_fstat,
+        .truncate    = dht_truncate,
+        .ftruncate   = dht_ftruncate,
+        .access      = dht_access,
+        .readlink    = dht_readlink,
+        .setxattr    = dht_setxattr,
+        .fsetxattr   = dht_fsetxattr,
+        .getxattr    = dht_getxattr,
+        .removexattr = dht_removexattr,
         .open        = dht_open,
+        .readv       = dht_readv,
+        .writev      = dht_writev,
+        .flush       = dht_flush,
+        .fsync       = dht_fsync,
         .statfs      = dht_statfs,
+        .lk          = dht_lk,
         .opendir     = dht_opendir,
         .readdir     = dht_readdir,
         .readdirp    = dht_readdirp,
@@ -41,38 +539,14 @@ struct xlator_fops fops = {
         .mkdir       = dht_mkdir,
         .rmdir       = dht_rmdir,
         .rename      = dht_rename,
-        .entrylk     = dht_entrylk,
-        .fentrylk    = dht_fentrylk,
-
-        /* Inode read operations */
-        .stat        = dht_stat,
-        .fstat       = dht_fstat,
-        .access      = dht_access,
-        .readlink    = dht_readlink,
-        .getxattr    = dht_getxattr,
-        .fgetxattr    = dht_fgetxattr,
-        .readv       = dht_readv,
-        .flush       = dht_flush,
-        .fsync       = dht_fsync,
         .inodelk     = dht_inodelk,
         .finodelk    = dht_finodelk,
-        .lk          = dht_lk,
-
-        /* Inode write operations */
-        .fremovexattr = dht_fremovexattr,
-        .removexattr = dht_removexattr,
-        .setxattr    = dht_setxattr,
-        .fsetxattr   = dht_fsetxattr,
-        .truncate    = dht_truncate,
-        .ftruncate   = dht_ftruncate,
-        .writev      = dht_writev,
+        .entrylk     = dht_entrylk,
+        .fentrylk    = dht_fentrylk,
         .xattrop     = dht_xattrop,
         .fxattrop    = dht_fxattrop,
         .setattr     = dht_setattr,
         .fsetattr    = dht_fsetattr,
-	.fallocate   = dht_fallocate,
-	.discard     = dht_discard,
-        .zerofill    = dht_zerofill,
 };
 
 struct xlator_dumpops dumpops = {
@@ -86,4 +560,28 @@ struct xlator_cbks cbks = {
 //      .releasedir = dht_releasedir,
         .forget     = dht_forget
 };
-;
+
+
+struct volume_options options[] = {
+        { .key  = {"lookup-unhashed"},
+          .value = {"auto", "yes", "no", "enable", "disable", "1", "0",
+                    "on", "off"},
+          .type = GF_OPTION_TYPE_STR
+        },
+        { .key  = {"min-free-disk"},
+          .type = GF_OPTION_TYPE_PERCENT_OR_SIZET,
+          .default_value = "10%",
+          .description = "Percentage/Size of disk space that must be "
+                         "kept free."
+        },
+        { .key = {"unhashed-sticky-bit"},
+          .type = GF_OPTION_TYPE_BOOL
+        },
+        { .key = {"use-readdirp"},
+          .type = GF_OPTION_TYPE_BOOL
+        },
+        { .key = {"assert-no-child-down"},
+          .type = GF_OPTION_TYPE_BOOL
+        },
+        { .key  = {NULL} },
+};
diff --git a/xlators/cluster/dht/src/nufa.c b/xlators/cluster/dht/src/nufa.c
index e934acdf0..96a9dfd30 100644
--- a/xlators/cluster/dht/src/nufa.c
+++ b/xlators/cluster/dht/src/nufa.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -14,12 +23,10 @@
 #include "config.h"
 #endif
 
-#include "dht-common.h"
+#include "dht-common.c"
 
 /* TODO: all 'TODO's in dht.c holds good */
 
-extern struct volume_options options[];
-
 int
 nufa_local_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                        int op_ret, int op_errno,
@@ -37,6 +44,7 @@ nufa_local_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         int           call_cnt    = 0;
         int           ret         = 0;
 
+
         conf  = this->private;
 
         prev  = cookie;
@@ -54,12 +62,15 @@ nufa_local_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (op_ret == -1)
                 goto out;
 
-        is_linkfile = check_is_linkfile (inode, stbuf, xattr,
-                                         conf->link_xattr_name);
+        is_linkfile = check_is_linkfile (inode, stbuf, xattr);
         is_dir      = check_is_dir (inode, stbuf, xattr);
 
         if (!is_dir && !is_linkfile) {
                 /* non-directory and not a linkfile */
+
+                dht_itransform (this, prev->this, stbuf->ia_ino,
+                                &stbuf->ia_ino);
+
                 ret = dht_layout_preset (this, prev->this, inode);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_DEBUG,
@@ -134,7 +145,7 @@ out:
 
 err:
         DHT_STACK_UNWIND (lookup, frame, op_ret, op_errno,
-                          inode, stbuf, xattr, postparent);
+                          inode, stbuf, xattr, NULL);
         return 0;
 }
 
@@ -143,6 +154,7 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
              loc_t *loc, dict_t *xattr_req)
 {
         xlator_t     *hashed_subvol = NULL;
+        xlator_t     *cached_subvol = NULL;
         xlator_t     *subvol = NULL;
         dht_local_t  *local  = NULL;
         dht_conf_t   *conf = NULL;
@@ -161,12 +173,21 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
 
         conf = this->private;
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_LOOKUP);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
         }
 
+        ret = loc_dup (loc, &local->loc);
+        if (ret == -1) {
+                op_errno = errno;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "copying location failed for path=%s",
+                        loc->path);
+                goto err;
+        }
+
         if (xattr_req) {
                 local->xattr_req = dict_ref (xattr_req);
         } else {
@@ -174,11 +195,14 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
         }
 
         hashed_subvol = dht_subvol_get_hashed (this, &local->loc);
+        cached_subvol = dht_subvol_get_cached (this, local->loc.inode);
 
+        local->cached_subvol = cached_subvol;
         local->hashed_subvol = hashed_subvol;
 
         if (is_revalidate (loc)) {
-                layout = local->layout;
+                local->layout = layout = dht_layout_get (this, loc->inode);
+
                 if (!layout) {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "revalidate without cache. path=%s",
@@ -195,7 +219,8 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
                         goto do_fresh_lookup;
                 }
 
-                local->inode = inode_ref (loc->inode);
+                local->inode    = inode_ref (loc->inode);
+                local->ia_ino   = loc->inode->ino;
 
                 local->call_cnt = layout->cnt;
                 call_cnt = local->call_cnt;
@@ -204,7 +229,7 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
                  *       revalidates directly go to the cached-subvolume.
                  */
                 ret = dict_set_uint32 (local->xattr_req,
-                                       conf->xattr_name, 4 * 4);
+                                       "trusted.glusterfs.dht", 4 * 4);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_ERROR,
                                 "Failed to set dict value.");
@@ -225,7 +250,7 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
         } else {
         do_fresh_lookup:
                 ret = dict_set_uint32 (local->xattr_req,
-                                       conf->xattr_name, 4 * 4);
+                                       "trusted.glusterfs.dht", 4 * 4);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_ERROR,
                                 "Failed to set dict value.");
@@ -234,7 +259,7 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
                 }
 
                 ret = dict_set_uint32 (local->xattr_req,
-                                       conf->link_xattr_name, 256);
+                                       "trusted.glusterfs.dht.linkto", 256);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_ERROR,
                                 "Failed to set dict value.");
@@ -253,8 +278,7 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (lookup, frame, -1, op_errno, NULL, NULL, NULL,
-                          NULL);
+        DHT_STACK_UNWIND (lookup, frame, -1, op_errno, NULL, NULL, NULL, NULL);
         return 0;
 }
 
@@ -263,7 +287,7 @@ nufa_create_linkfile_create_cbk (call_frame_t *frame, void *cookie,
                                  xlator_t *this, int op_ret, int op_errno,
                                  inode_t *inode, struct iatt *stbuf,
                                  struct iatt *preparent,
-                                 struct iatt *postparent, dict_t *xdata)
+                                 struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
 
@@ -274,27 +298,28 @@ nufa_create_linkfile_create_cbk (call_frame_t *frame, void *cookie,
 
         STACK_WIND (frame, dht_create_cbk,
                     local->cached_subvol, local->cached_subvol->fops->create,
-                    &local->loc, local->flags, local->mode, local->umask,
-                    local->fd, local->params);
+                    &local->loc, local->flags, local->mode, local->fd,
+                    local->params);
 
         return 0;
 
 err:
         DHT_STACK_UNWIND (create, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL, NULL, NULL);
         return 0;
 }
 
 int
 nufa_create (call_frame_t *frame, xlator_t *this,
              loc_t *loc, int32_t flags, mode_t mode,
-             mode_t umask, fd_t *fd, dict_t *params)
+             fd_t *fd, dict_t *params)
 {
         dht_local_t *local = NULL;
         dht_conf_t  *conf  = NULL;
         xlator_t    *subvol = NULL;
         xlator_t    *avail_subvol = NULL;
         int          op_errno = -1;
+        int          ret = -1;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
@@ -304,7 +329,7 @@ nufa_create (call_frame_t *frame, xlator_t *this,
 
         dht_get_du_info (frame, this, loc);
 
-        local = dht_local_init (frame, loc, fd, GF_FOP_CREATE);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
@@ -323,19 +348,26 @@ nufa_create (call_frame_t *frame, xlator_t *this,
         if (dht_is_subvol_filled (this, (xlator_t *)conf->private)) {
                 avail_subvol =
                         dht_free_disk_available_subvol (this,
-                                                        (xlator_t *)conf->private,
-                                                        local);
+                                                        (xlator_t *)conf->private);
         }
 
         if (subvol != avail_subvol) {
                 /* create a link file instead of actual file */
+                ret = loc_copy (&local->loc, loc);
+                if (ret == -1) {
+                        op_errno = ENOMEM;
+                        goto err;
+                }
+
+                local->fd = fd_ref (fd);
                 local->params = dict_ref (params);
                 local->mode = mode;
                 local->flags = flags;
-                local->umask = umask;
+
                 local->cached_subvol = avail_subvol;
-                dht_linkfile_create (frame, nufa_create_linkfile_create_cbk,
-                                     this, avail_subvol, subvol, loc);
+                dht_linkfile_create (frame,
+                                     nufa_create_linkfile_create_cbk,
+                                     avail_subvol, subvol, loc);
                 return 0;
         }
 
@@ -344,14 +376,14 @@ nufa_create (call_frame_t *frame, xlator_t *this,
 
         STACK_WIND (frame, dht_create_cbk,
                     subvol, subvol->fops->create,
-                    loc, flags, mode, umask, fd, params);
+                    loc, flags, mode, fd, params);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
         DHT_STACK_UNWIND (create, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL, NULL, NULL);
 
         return 0;
 }
@@ -360,45 +392,41 @@ int
 nufa_mknod_linkfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                          int op_ret, int op_errno, inode_t *inode,
                          struct iatt *stbuf, struct iatt *preparent,
-                         struct iatt *postparent, dict_t *xdata)
+                         struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
 
         local = frame->local;
-        if (!local || !local->cached_subvol) {
-                op_errno = EINVAL;
-                op_ret = -1;
-                goto err;
-        }
 
         if (op_ret >= 0) {
-                STACK_WIND_COOKIE (frame, dht_newfile_cbk,
-                            (void *)local->cached_subvol, local->cached_subvol,
+                STACK_WIND (frame, dht_newfile_cbk,
+                            local->cached_subvol,
                             local->cached_subvol->fops->mknod,
                             &local->loc, local->mode, local->rdev,
-                            local->umask, local->params);
+                            local->params);
 
                 return 0;
         }
-err:
+
         WIPE (postparent);
         WIPE (preparent);
 
         DHT_STACK_UNWIND (link, frame, op_ret, op_errno,
-                          inode, stbuf, preparent, postparent, xdata);
+                          inode, stbuf, preparent, postparent);
         return 0;
 }
 
 
 int
 nufa_mknod (call_frame_t *frame, xlator_t *this,
-            loc_t *loc, mode_t mode, dev_t rdev, mode_t umask, dict_t *params)
+            loc_t *loc, mode_t mode, dev_t rdev, dict_t *params)
 {
         dht_local_t *local = NULL;
         dht_conf_t  *conf  = NULL;
         xlator_t    *subvol = NULL;
         xlator_t    *avail_subvol = NULL;
         int          op_errno = -1;
+        int          ret = -1;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
@@ -408,7 +436,7 @@ nufa_mknod (call_frame_t *frame, xlator_t *this,
 
         dht_get_du_info (frame, this, loc);
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_MKNOD);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
@@ -428,20 +456,23 @@ nufa_mknod (call_frame_t *frame, xlator_t *this,
         if (dht_is_subvol_filled (this, (xlator_t *)conf->private)) {
                 avail_subvol =
                         dht_free_disk_available_subvol (this,
-                                                        (xlator_t *)conf->private,
-                                                        local);
+                                                        (xlator_t *)conf->private);
         }
 
         if (avail_subvol != subvol) {
                 /* Create linkfile first */
+                ret = loc_copy (&local->loc, loc);
+                if (ret == -1) {
+                        op_errno = ENOMEM;
+                        goto err;
+                }
 
                 local->params = dict_ref (params);
                 local->mode = mode;
-                local->umask = umask;
                 local->rdev = rdev;
                 local->cached_subvol = avail_subvol;
 
-                dht_linkfile_create (frame, nufa_mknod_linkfile_cbk, this,
+                dht_linkfile_create (frame, nufa_mknod_linkfile_cbk,
                                      avail_subvol, subvol, loc);
                 return 0;
         }
@@ -449,185 +480,208 @@ nufa_mknod (call_frame_t *frame, xlator_t *this,
         gf_log (this->name, GF_LOG_TRACE,
                 "creating %s on %s", loc->path, subvol->name);
 
-        STACK_WIND_COOKIE (frame, dht_newfile_cbk, (void *)subvol, subvol,
-                           subvol->fops->mknod, loc, mode, rdev, umask,
-                           params);
+        STACK_WIND (frame, dht_newfile_cbk,
+                    subvol, subvol->fops->mknod,
+                    loc, mode, rdev, params);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
         DHT_STACK_UNWIND (mknod, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL, NULL);
 
         return 0;
 }
 
 
-gf_boolean_t
-same_first_part (char *str1, char term1, char *str2, char term2)
-{
-        gf_boolean_t    ended1;
-        gf_boolean_t    ended2;
-
-        for (;;) {
-                ended1 = ((*str1 == '\0') || (*str1 == term1));
-                ended2 = ((*str2 == '\0') || (*str2 == term2));
-                if (ended1 && ended2) {
-                        return _gf_true;
-                }
-                if (ended1 || ended2 || (*str1 != *str2)) {
-                        return _gf_false;
-                }
-                ++str1;
-                ++str2;
-        }
-}
-
-typedef struct nufa_args {
-        xlator_t    *this;
-        char        *volname;
-        gf_boolean_t addr_match;
-} nufa_args_t;
-
-static void
-nufa_find_local_brick (xlator_t *xl, void *data)
+int
+notify (xlator_t *this, int event, void *data, ...)
 {
-        nufa_args_t     *args = data;
-        xlator_t        *this = args->this;
-        char            *local_volname = args->volname;
-        gf_boolean_t    addr_match = args->addr_match;
-        char            *brick_host = NULL;
-        dht_conf_t      *conf = this->private;
-        int             ret = -1;
-
-        /*This means a local subvol was already found. We pick the first brick
-         * that is local*/
-        if (conf->private)
-                return;
-
-        if (strcmp (xl->name, local_volname) == 0) {
-                conf->private = xl;
-                gf_log (this->name, GF_LOG_INFO, "Using specified subvol %s",
-                        local_volname);
-                return;
-        }
+        int ret = -1;
 
-        if (!addr_match)
-                return;
-
-        ret = dict_get_str (xl->options, "remote-host", &brick_host);
-        if ((ret == 0) &&
-            (gf_is_same_address (local_volname, brick_host) ||
-             gf_is_local_addr (brick_host))) {
-                conf->private = xl;
-                gf_log (this->name, GF_LOG_INFO, "Using the first local "
-                        "subvol %s", xl->name);
-                return;
-        }
+        ret = dht_notify (this, event, data);
 
+        return ret;
 }
 
-static void
-nufa_to_dht (xlator_t *this)
+void
+fini (xlator_t *this)
 {
-        GF_ASSERT (this);
-        GF_ASSERT (this->fops);
+        int         i = 0;
+        dht_conf_t *conf = NULL;
 
-        this->fops->lookup = dht_lookup;
-        this->fops->create = dht_create;
-        this->fops->mknod  = dht_mknod;
-}
+        conf = this->private;
 
-int
-nufa_find_local_subvol (xlator_t *this,
-                        void (*fn) (xlator_t *each, void* data), void *data)
-{
-        int             ret = -1;
-        dht_conf_t      *conf = this->private;
-        xlator_list_t   *trav = NULL;
-        xlator_t        *parent = NULL;
-        xlator_t        *candidate = NULL;
-
-        xlator_foreach_depth_first (this, fn, data);
-        if (!conf->private) {
-                gf_log (this->name, GF_LOG_ERROR, "Couldn't find a local "
-                        "brick");
-                return -1;
-        }
+        if (conf) {
+                if (conf->file_layouts) {
+                        for (i = 0; i < conf->subvolume_cnt; i++) {
+                                GF_FREE (conf->file_layouts[i]);
+                        }
+                        GF_FREE (conf->file_layouts);
+                }
 
-        candidate = conf->private;
-        trav = candidate->parents;
-        while (trav) {
+                if (conf->default_dir_layout)
+                        GF_FREE (conf->default_dir_layout);
 
-                parent = trav->xlator;
-                if (strcmp (parent->type, "cluster/nufa") == 0) {
-                        gf_log (this->name, GF_LOG_INFO, "Found local subvol, "
-                                "%s", candidate->name);
-                        ret = 0;
-                        conf->private = candidate;
-                        break;
-                }
+                if (conf->subvolumes)
+                        GF_FREE (conf->subvolumes);
+
+                if (conf->subvolume_status)
+                        GF_FREE (conf->subvolume_status);
 
-                candidate = parent;
-                trav = parent->parents;
+                GF_FREE (conf);
         }
 
-        return ret;
+        return;
 }
 
 int
-nufa_init (xlator_t *this)
+init (xlator_t *this)
 {
+        dht_conf_t    *conf = NULL;
+        xlator_list_t *trav = NULL;
         data_t        *data = NULL;
         char          *local_volname = NULL;
+        char          *temp_str = NULL;
         int            ret = -1;
+        int            i = 0;
         char           my_hostname[256];
-        gf_boolean_t   addr_match = _gf_false;
-        nufa_args_t    args = {0, };
+        uint32_t       temp_free_disk = 0;
 
-        ret = dht_init(this);
-        if (ret) {
-                return ret;
+        if (!this->children) {
+                gf_log (this->name, GF_LOG_CRITICAL,
+                        "NUFA needs more than one subvolume");
+                return -1;
         }
 
-        if ((data = dict_get (this->options, "local-volume-name"))) {
-                local_volname = data->data;
+        if (!this->parents) {
+                gf_log (this->name, GF_LOG_WARNING,
+                        "dangling volume. check volfile");
+        }
 
-        } else {
-                addr_match = _gf_true;
-                local_volname = "localhost";
-                ret = gethostname (my_hostname, 256);
-                if (ret == 0)
-                        local_volname = my_hostname;
+        conf = GF_CALLOC (1, sizeof (*conf),
+                          gf_dht_mt_dht_conf_t);
+        if (!conf) {
+                goto err;
+        }
 
+        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_ON;
+        if (dict_get_str (this->options, "lookup-unhashed", &temp_str) == 0) {
+                /* If option is not "auto", other options _should_ be boolean */
+                if (strcasecmp (temp_str, "auto"))
+                        gf_string2boolean (temp_str, &conf->search_unhashed);
                 else
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "could not find hostname (%s)",
-                                strerror (errno));
+                        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_AUTO;
+        }
 
+        ret = dht_init_subvolumes (this, conf);
+        if (ret == -1) {
+                goto err;
         }
 
-        args.this = this;
-        args.volname = local_volname;
-        args.addr_match = addr_match;
-        ret = nufa_find_local_subvol (this, nufa_find_local_brick, &args);
-        if (ret) {
-                gf_log (this->name, GF_LOG_INFO,
-                        "Unable to find local subvolume, switching "
-                        "to dht mode");
-                nufa_to_dht (this);
+        ret = dht_layouts_init (this, conf);
+        if (ret == -1) {
+                goto err;
         }
+
+        LOCK_INIT (&conf->subvolume_lock);
+        LOCK_INIT (&conf->layout_lock);
+
+        conf->gen = 1;
+
+        local_volname = "localhost";
+        ret = gethostname (my_hostname, 256);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_WARNING,
+                        "could not find hostname (%s)",
+                        strerror (errno));
+        }
+
+        if (ret == 0)
+                local_volname = my_hostname;
+
+        data = dict_get (this->options, "local-volume-name");
+        if (data) {
+                local_volname = data->data;
+        }
+
+        trav = this->children;
+        while (trav) {
+                if (strcmp (trav->xlator->name, local_volname) == 0)
+                        break;
+                trav = trav->next;
+        }
+
+        if (!trav) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Could not find subvolume named '%s'. "
+                        "Please define volume with the name as the hostname "
+                        "or override it with 'option local-volume-name'",
+                        local_volname);
+                goto err;
+        }
+        /* The volume specified exists */
+        conf->private = trav->xlator;
+
+        conf->min_free_disk = 10;
+        conf->disk_unit = 'p';
+
+        if (dict_get_str (this->options, "min-free-disk",
+                          &temp_str) == 0) {
+                if (gf_string2percent (temp_str,
+                                       &temp_free_disk) == 0) {
+                        if (temp_free_disk > 100) {
+                                gf_string2bytesize (temp_str,
+                                                    &conf->min_free_disk);
+                                conf->disk_unit = 'b';
+                        } else {
+                                conf->min_free_disk = (uint64_t)temp_free_disk;
+                                conf->disk_unit = 'p';
+                        }
+                } else {
+                        gf_string2bytesize (temp_str,
+                                            &conf->min_free_disk);
+                        conf->disk_unit = 'b';
+                }
+        }
+
+        conf->du_stats = GF_CALLOC (conf->subvolume_cnt, sizeof (dht_du_t),
+                                    gf_dht_mt_dht_du_t);
+        if (!conf->du_stats) {
+                goto err;
+        }
+
+        this->private = conf;
+
         return 0;
-}
 
+err:
+        if (conf) {
+                if (conf->file_layouts) {
+                        for (i = 0; i < conf->subvolume_cnt; i++) {
+                                GF_FREE (conf->file_layouts[i]);
+                        }
+                        GF_FREE (conf->file_layouts);
+                }
+
+                if (conf->default_dir_layout)
+                        GF_FREE (conf->default_dir_layout);
 
-class_methods_t class_methods = {
-        .init           = nufa_init,
-        .fini           = dht_fini,
-        .reconfigure    = dht_reconfigure,
-        .notify         = dht_notify
-};
+                if (conf->subvolumes)
+                        GF_FREE (conf->subvolumes);
+
+                if (conf->subvolume_status)
+                        GF_FREE (conf->subvolume_status);
+
+                if (conf->du_stats)
+                        GF_FREE (conf->du_stats);
+
+                GF_FREE (conf);
+        }
+
+        return -1;
+}
 
 
 struct xlator_fops fops = {
@@ -674,3 +728,19 @@ struct xlator_fops fops = {
 struct xlator_cbks cbks = {
         .forget     = dht_forget
 };
+
+
+struct volume_options options[] = {
+        { .key  = {"lookup-unhashed"},
+          .value = {"auto", "yes", "no", "enable", "disable", "1", "0",
+                    "on", "off"},
+          .type = GF_OPTION_TYPE_STR
+        },
+        { .key  = {"local-volume-name"},
+          .type = GF_OPTION_TYPE_XLATOR
+        },
+        { .key  = {"min-free-disk"},
+          .type = GF_OPTION_TYPE_PERCENT_OR_SIZET,
+        },
+        { .key  = {NULL} },
+};
diff --git a/xlators/cluster/dht/src/switch.c b/xlators/cluster/dht/src/switch.c
index d3ea90ba8..c291c0f09 100644
--- a/xlators/cluster/dht/src/switch.c
+++ b/xlators/cluster/dht/src/switch.c
@@ -1,11 +1,20 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 
@@ -14,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include "dht-common.h"
+#include "dht-common.c"
 #include "dht-mem-types.h"
 
 #include <sys/time.h>
@@ -22,8 +31,6 @@
 #include <fnmatch.h>
 #include <string.h>
 
-extern struct volume_options options[];
-
 struct switch_sched_array {
         xlator_t *xl;
         int32_t   eligible;
@@ -69,37 +76,29 @@ get_switch_matching_subvol (const char *path, dht_conf_t *conf,
         struct switch_struct *cond      = NULL;
         struct switch_struct *trav      = NULL;
         char                 *pathname  = NULL;
-        int                   idx       = 0;
-        xlator_t             *subvol    = NULL;
+        int                   idx     = 0;
 
         cond = conf->private;
-        subvol = hashed_subvol;
         if (!cond)
-                goto out;
-
-        pathname = gf_strdup (path);
-        if (!pathname)
-                goto out;
+                return hashed_subvol;
 
         trav = cond;
+        pathname = gf_strdup (path);
         while (trav) {
                 if (fnmatch (trav->path_pattern,
                              pathname, FNM_NOESCAPE) == 0) {
                         for (idx = 0; idx < trav->num_child; idx++) {
                                 if (trav->array[idx].xl == hashed_subvol)
-                                        goto out;
+                                        return hashed_subvol;
                         }
                         idx = trav->node_index++;
                         trav->node_index %= trav->num_child;
-                        subvol = trav->array[idx].xl;
-                        goto out;
+                        return trav->array[idx].xl;
                 }
                 trav = trav->next;
         }
-out:
         GF_FREE (pathname);
-
-        return subvol;
+        return hashed_subvol;
 }
 
 
@@ -137,13 +136,15 @@ switch_local_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (op_ret == -1)
                 goto out;
 
-        is_linkfile = check_is_linkfile (inode, stbuf, xattr,
-                                         conf->link_xattr_name);
+        is_linkfile = check_is_linkfile (inode, stbuf, xattr);
         is_dir      = check_is_dir (inode, stbuf, xattr);
 
         if (!is_dir && !is_linkfile) {
                 /* non-directory and not a linkfile */
 
+                dht_itransform (this, prev->this, stbuf->ia_ino,
+                                &stbuf->ia_ino);
+
                 ret = dht_layout_preset (this, prev->this, inode);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_DEBUG,
@@ -248,12 +249,21 @@ switch_lookup (call_frame_t *frame, xlator_t *this,
 
         conf = this->private;
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_LOOKUP);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
         }
 
+        ret = loc_dup (loc, &local->loc);
+        if (ret == -1) {
+                op_errno = errno;
+                gf_log (this->name, GF_LOG_DEBUG,
+                        "copying location failed for path=%s",
+                        loc->path);
+                goto err;
+        }
+
         if (xattr_req) {
                 local->xattr_req = dict_ref (xattr_req);
         } else {
@@ -261,12 +271,14 @@ switch_lookup (call_frame_t *frame, xlator_t *this,
         }
 
         hashed_subvol = dht_subvol_get_hashed (this, &local->loc);
-        cached_subvol = local->cached_subvol;
+        cached_subvol = dht_subvol_get_cached (this, local->loc.inode);
 
+        local->cached_subvol = cached_subvol;
         local->hashed_subvol = hashed_subvol;
 
         if (is_revalidate (loc)) {
-                layout = local->layout;
+                local->layout = layout = dht_layout_get (this, loc->inode);
+
                 if (!layout) {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "revalidate without cache. path=%s",
@@ -284,6 +296,7 @@ switch_lookup (call_frame_t *frame, xlator_t *this,
                 }
 
                 local->inode    = inode_ref (loc->inode);
+                local->ia_ino   = loc->inode->ino;
 
                 local->call_cnt = layout->cnt;
                 call_cnt = local->call_cnt;
@@ -292,11 +305,11 @@ switch_lookup (call_frame_t *frame, xlator_t *this,
                  * attribute, revalidates directly go to the cached-subvolume.
                  */
                 ret = dict_set_uint32 (local->xattr_req,
-                                       conf->xattr_name, 4 * 4);
+                                       "trusted.glusterfs.dht", 4 * 4);
                 if (ret < 0)
                         gf_log (this->name, GF_LOG_WARNING,
-                                "failed to set dict value for %s",
-                                conf->xattr_name);
+                                "failed to set dict value for "
+                                "trusted.glusterfs.dht");
 
                 for (i = 0; i < layout->cnt; i++) {
                         subvol = layout->list[i].xlator;
@@ -311,18 +324,18 @@ switch_lookup (call_frame_t *frame, xlator_t *this,
         } else {
         do_fresh_lookup:
                 ret = dict_set_uint32 (local->xattr_req,
-                                       conf->xattr_name, 4 * 4);
+                                       "trusted.glusterfs.dht", 4 * 4);
                 if (ret < 0)
                         gf_log (this->name, GF_LOG_WARNING,
-                                "failed to set dict value for %s",
-                                conf->xattr_name);
+                                "failed to set dict value for "
+                                "trusted.glusterfs.dht");
 
                 ret = dict_set_uint32 (local->xattr_req,
-                                       conf->link_xattr_name, 256);
+                                       "trusted.glusterfs.dht.linkto", 256);
                 if (ret < 0)
                         gf_log (this->name, GF_LOG_WARNING,
-                                "failed to set dict value for %s",
-                                conf->link_xattr_name);
+                                "failed to set dict value for "
+                                "trusted.glusterfs.dht.linkto");
 
                 if (!hashed_subvol) {
                         gf_log (this->name, GF_LOG_DEBUG,
@@ -368,8 +381,7 @@ switch_lookup (call_frame_t *frame, xlator_t *this,
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
-        DHT_STACK_UNWIND (lookup, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL);
+        DHT_STACK_UNWIND (lookup, frame, -1, op_errno, NULL, NULL, NULL, NULL);
         return 0;
 }
 
@@ -378,7 +390,7 @@ switch_create_linkfile_create_cbk (call_frame_t *frame, void *cookie,
                                    xlator_t *this, int op_ret, int op_errno,
                                    inode_t *inode, struct iatt *stbuf,
                                    struct iatt *preparent,
-                                   struct iatt *postparent, dict_t *xdata)
+                                   struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
 
@@ -389,27 +401,28 @@ switch_create_linkfile_create_cbk (call_frame_t *frame, void *cookie,
 
         STACK_WIND (frame, dht_create_cbk,
                     local->cached_subvol, local->cached_subvol->fops->create,
-                    &local->loc, local->flags, local->mode, local->umask,
-                    local->fd, local->params);
+                    &local->loc, local->flags, local->mode, local->fd,
+                    local->params);
 
         return 0;
 
 err:
         DHT_STACK_UNWIND (create, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL, NULL, NULL);
         return 0;
 }
 
 int
 switch_create (call_frame_t *frame, xlator_t *this,
                loc_t *loc, int32_t flags, mode_t mode,
-               mode_t umask, fd_t *fd, dict_t *params)
+               fd_t *fd, dict_t *params)
 {
         dht_local_t *local = NULL;
         dht_conf_t  *conf  = NULL;
         xlator_t    *subvol = NULL;
         xlator_t    *avail_subvol = NULL;
         int          op_errno = -1;
+        int          ret = -1;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
@@ -419,7 +432,7 @@ switch_create (call_frame_t *frame, xlator_t *this,
 
         dht_get_du_info (frame, this, loc);
 
-        local = dht_local_init (frame, loc, fd, GF_FOP_CREATE);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
@@ -437,18 +450,25 @@ switch_create (call_frame_t *frame, xlator_t *this,
         avail_subvol = get_switch_matching_subvol (loc->path, conf, subvol);
         if (dht_is_subvol_filled (this, avail_subvol)) {
                 avail_subvol =
-                        dht_free_disk_available_subvol (this, avail_subvol,
-                                                        local);
+                        dht_free_disk_available_subvol (this, avail_subvol);
         }
 
         if (subvol != avail_subvol) {
                 /* create a link file instead of actual file */
+                ret = loc_copy (&local->loc, loc);
+                if (ret == -1) {
+                        op_errno = ENOMEM;
+                        goto err;
+                }
+
+                local->fd = fd_ref (fd);
                 local->mode = mode;
                 local->flags = flags;
-                local->umask = umask;
+
                 local->cached_subvol = avail_subvol;
-                dht_linkfile_create (frame, switch_create_linkfile_create_cbk,
-                                     this, avail_subvol, subvol, loc);
+                dht_linkfile_create (frame,
+                                     switch_create_linkfile_create_cbk,
+                                     avail_subvol, subvol, loc);
                 return 0;
         }
 
@@ -457,14 +477,14 @@ switch_create (call_frame_t *frame, xlator_t *this,
 
         STACK_WIND (frame, dht_create_cbk,
                     subvol, subvol->fops->create,
-                    loc, flags, mode, umask, fd, params);
+                    loc, flags, mode, fd, params);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
         DHT_STACK_UNWIND (create, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL, NULL, NULL);
 
         return 0;
 }
@@ -473,42 +493,38 @@ int
 switch_mknod_linkfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                            int op_ret, int op_errno, inode_t *inode,
                            struct iatt *stbuf, struct iatt *preparent,
-                           struct iatt *postparent, dict_t *xdata)
+                           struct iatt *postparent)
 {
         dht_local_t  *local = NULL;
 
         local = frame->local;
-        if (!local || !local->cached_subvol) {
-                op_errno = EINVAL;
-                op_ret = -1;
-                goto err;
-        }
 
         if (op_ret >= 0) {
-                STACK_WIND_COOKIE (frame, dht_newfile_cbk,
-                            (void *)local->cached_subvol, local->cached_subvol,
+                STACK_WIND (frame, dht_newfile_cbk,
+                            local->cached_subvol,
                             local->cached_subvol->fops->mknod,
                             &local->loc, local->mode, local->rdev,
-                            local->umask, local->params);
+                            local->params);
 
                 return 0;
         }
-err:
+
         DHT_STACK_UNWIND (link, frame, op_ret, op_errno,
-                          inode, stbuf, preparent, postparent, xdata);
+                          inode, stbuf, preparent, postparent);
         return 0;
 }
 
 
 int
-switch_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
-              dev_t rdev, mode_t umask, dict_t *params)
+switch_mknod (call_frame_t *frame, xlator_t *this,
+              loc_t *loc, mode_t mode, dev_t rdev, dict_t *params)
 {
         dht_local_t *local = NULL;
         dht_conf_t  *conf  = NULL;
         xlator_t    *subvol = NULL;
         xlator_t    *avail_subvol = NULL;
         int          op_errno = -1;
+        int          ret = -1;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
@@ -518,7 +534,7 @@ switch_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
 
         dht_get_du_info (frame, this, loc);
 
-        local = dht_local_init (frame, loc, NULL, GF_FOP_MKNOD);
+        local = dht_local_init (frame);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
@@ -537,45 +553,59 @@ switch_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
         avail_subvol = get_switch_matching_subvol (loc->path, conf, subvol);
         if (dht_is_subvol_filled (this, avail_subvol)) {
                 avail_subvol =
-                        dht_free_disk_available_subvol (this, avail_subvol,
-                                                        local);
+                        dht_free_disk_available_subvol (this, avail_subvol);
         }
 
         if (avail_subvol != subvol) {
                 /* Create linkfile first */
+                ret = loc_copy (&local->loc, loc);
+                if (ret == -1) {
+                        op_errno = ENOMEM;
+                        goto err;
+                }
 
                 local->params = dict_ref (params);
                 local->mode = mode;
-                local->umask = umask;
                 local->rdev = rdev;
                 local->cached_subvol = avail_subvol;
 
                 dht_linkfile_create (frame, switch_mknod_linkfile_cbk,
-                                     this, avail_subvol, subvol, loc);
+                                     avail_subvol, subvol, loc);
                 return 0;
         }
 
         gf_log (this->name, GF_LOG_TRACE,
                 "creating %s on %s", loc->path, subvol->name);
 
-        STACK_WIND_COOKIE (frame, dht_newfile_cbk, (void *)subvol, subvol,
-                           subvol->fops->mknod, loc, mode, rdev, umask,
-                           params);
+        STACK_WIND (frame, dht_newfile_cbk,
+                    subvol, subvol->fops->mknod,
+                    loc, mode, rdev, params);
 
         return 0;
 
 err:
         op_errno = (op_errno == -1) ? errno : op_errno;
         DHT_STACK_UNWIND (mknod, frame, -1, op_errno,
-                          NULL, NULL, NULL, NULL, NULL);
+                          NULL, NULL, NULL, NULL);
 
         return 0;
 }
 
 
+int
+notify (xlator_t *this, int event, void *data, ...)
+{
+        int ret = -1;
+
+        ret = dht_notify (this, event, data);
+
+        return ret;
+}
+
 void
-switch_fini (xlator_t *this)
+fini (xlator_t *this)
 {
+        int                   i = 0;
         dht_conf_t           *conf = NULL;
         struct switch_struct *trav = NULL;
         struct switch_struct *prev = NULL;
@@ -586,14 +616,33 @@ switch_fini (xlator_t *this)
                 trav = (struct switch_struct *)conf->private;
                 conf->private = NULL;
                 while (trav) {
-                        GF_FREE (trav->array);
+                        if (trav->array)
+                                GF_FREE (trav->array);
                         prev = trav;
                         trav = trav->next;
                         GF_FREE (prev);
                 }
+
+                if (conf->file_layouts) {
+                        for (i = 0; i < conf->subvolume_cnt; i++) {
+                                GF_FREE (conf->file_layouts[i]);
+                        }
+                        GF_FREE (conf->file_layouts);
+                }
+
+                if (conf->default_dir_layout)
+                        GF_FREE (conf->default_dir_layout);
+
+                if (conf->subvolumes)
+                        GF_FREE (conf->subvolumes);
+
+                if (conf->subvolume_status)
+                        GF_FREE (conf->subvolume_status);
+
+                GF_FREE (conf);
         }
 
-        dht_fini(this);
+        return;
 }
 
 int
@@ -653,10 +702,8 @@ set_switch_pattern (xlator_t *this, dht_conf_t *conf,
                 dup_str = gf_strdup (switch_str);
                 switch_opt = GF_CALLOC (1, sizeof (struct switch_struct),
                                         gf_switch_mt_switch_struct);
-                if (!switch_opt) {
-                        GF_FREE (dup_str);
+                if (!switch_opt)
                         goto err;
-                }
 
                 pattern = strtok_r (dup_str, ":", &tmp_str1);
                 childs = strtok_r (NULL, ":", &tmp_str1);
@@ -666,7 +713,6 @@ set_switch_pattern (xlator_t *this, dht_conf_t *conf,
                                 "for all the unconfigured child nodes,"
                                 " hence neglecting current option");
                         switch_str = strtok_r (NULL, ";", &tmp_str);
-                        GF_FREE (switch_opt);
                         GF_FREE (dup_str);
                         continue;
                 }
@@ -739,7 +785,6 @@ set_switch_pattern (xlator_t *this, dht_conf_t *conf,
                         /* First entry */
                         switch_buf = switch_opt;
                 }
-                switch_opt = NULL;
                 switch_str = strtok_r (NULL, ";", &tmp_str);
         }
 
@@ -796,20 +841,19 @@ set_switch_pattern (xlator_t *this, dht_conf_t *conf,
                         /* First entry */
                         switch_buf = switch_opt;
                 }
-                switch_opt = NULL;
         }
         /* */
         conf->private = switch_buf;
 
         return 0;
 err:
-        GF_FREE (switch_buf_array);
-        GF_FREE (switch_opt);
-
         if (switch_buf) {
+                if (switch_buf_array)
+                        GF_FREE (switch_buf_array);
                 trav = switch_buf;
                 while (trav) {
-                        GF_FREE (trav->array);
+                        if (trav->array)
+                                GF_FREE (trav->array);
                         switch_opt = trav;
                         trav = trav->next;
                         GF_FREE (switch_opt);
@@ -819,18 +863,68 @@ err:
 }
 
 
-int32_t
-switch_init (xlator_t *this)
+int
+init (xlator_t *this)
 {
         dht_conf_t            *conf = NULL;
         data_t                *data = NULL;
+        char                  *temp_str = NULL;
         int                    ret = -1;
+        int                    i = 0;
+        uint32_t               temp_free_disk = 0;
 
-        ret = dht_init(this);
-        if (ret) {
-                return ret;
+        if (!this->children) {
+                gf_log (this->name, GF_LOG_CRITICAL,
+                        "SWITCH needs more than one subvolume");
+                return -1;
+        }
+
+        if (!this->parents) {
+                gf_log (this->name, GF_LOG_WARNING,
+                        "dangling volume. check volfile");
+        }
+
+        conf = GF_CALLOC (1, sizeof (*conf), gf_switch_mt_dht_conf_t);
+        if (!conf) {
+                goto err;
+        }
+
+        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_ON;
+        if (dict_get_str (this->options, "lookup-unhashed", &temp_str) == 0) {
+                /* If option is not "auto", other options _should_ be boolean */
+                if (strcasecmp (temp_str, "auto"))
+                        gf_string2boolean (temp_str, &conf->search_unhashed);
+                else
+                        conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_AUTO;
+        }
+
+        conf->unhashed_sticky_bit = 0;
+        if (dict_get_str (this->options, "unhashed-sticky-bit",
+                          &temp_str) == 0) {
+                gf_string2boolean (temp_str, &conf->unhashed_sticky_bit);
+        }
+
+        conf->min_free_disk = 10;
+        conf->disk_unit = 'p';
+
+        if (dict_get_str (this->options, "min-free-disk",
+                          &temp_str) == 0) {
+                if (gf_string2percent (temp_str,
+                                       &temp_free_disk) == 0) {
+                        if (temp_free_disk > 100) {
+                                gf_string2bytesize (temp_str,
+                                                    &conf->min_free_disk);
+                                conf->disk_unit = 'b';
+                        } else {
+                                conf->min_free_disk = (uint64_t)temp_free_disk;
+                                conf->disk_unit = 'p';
+                        }
+                } else {
+                        gf_string2bytesize (temp_str,
+                                            &conf->min_free_disk);
+                        conf->disk_unit = 'b';
+                }
         }
-        conf = this->private;
 
         data = dict_get (this->options, "pattern.switch.case");
         if (data) {
@@ -841,21 +935,57 @@ switch_init (xlator_t *this)
                 }
         }
 
+        ret = dht_init_subvolumes (this, conf);
+        if (ret == -1) {
+                goto err;
+        }
+
+        ret = dht_layouts_init (this, conf);
+        if (ret == -1) {
+                goto err;
+        }
+
+        LOCK_INIT (&conf->subvolume_lock);
+        LOCK_INIT (&conf->layout_lock);
+
+        conf->gen = 1;
+
+        conf->du_stats = GF_CALLOC (conf->subvolume_cnt, sizeof (dht_du_t),
+                                    gf_switch_mt_dht_du_t);
+        if (!conf->du_stats) {
+                goto err;
+        }
+
         this->private = conf;
+
         return 0;
 
 err:
-        dht_fini(this);
-        return -1;
-}
+        if (conf) {
+                if (conf->file_layouts) {
+                        for (i = 0; i < conf->subvolume_cnt; i++) {
+                                GF_FREE (conf->file_layouts[i]);
+                        }
+                        GF_FREE (conf->file_layouts);
+                }
 
+                if (conf->default_dir_layout)
+                        GF_FREE (conf->default_dir_layout);
 
-class_methods_t class_methods = {
-        .init           = switch_init,
-        .fini           = switch_fini,
-        .reconfigure    = dht_reconfigure,
-        .notify         = dht_notify
-};
+                if (conf->subvolumes)
+                        GF_FREE (conf->subvolumes);
+
+                if (conf->subvolume_status)
+                        GF_FREE (conf->subvolume_status);
+
+                if (conf->du_stats)
+                        GF_FREE (conf->du_stats);
+
+                GF_FREE (conf);
+        }
+
+        return -1;
+}
 
 
 struct xlator_fops fops = {
@@ -902,3 +1032,19 @@ struct xlator_fops fops = {
 struct xlator_cbks cbks = {
         .forget     = dht_forget
 };
+
+
+struct volume_options options[] = {
+        { .key  = {"lookup-unhashed"},
+          .value = {"auto", "yes", "no", "enable", "disable", "1", "0",
+                    "on", "off"},
+          .type = GF_OPTION_TYPE_STR
+        },
+        { .key  = {"pattern.switch.case"},
+          .type = GF_OPTION_TYPE_ANY
+        },
+        { .key  = {"min-free-disk"},
+          .type = GF_OPTION_TYPE_PERCENT_OR_SIZET,
+        },
+        { .key  = {NULL} },
+};
diff --git a/xlators/cluster/ha/src/Makefile.am b/xlators/cluster/ha/src/Makefile.am
index 5c1364b7f..5f78a2965 100644
--- a/xlators/cluster/ha/src/Makefile.am
+++ b/xlators/cluster/ha/src/Makefile.am
@@ -1,16 +1,15 @@
 xlator_LTLIBRARIES = ha.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/cluster
 
-ha_la_LDFLAGS = -module -avoid-version 
+ha_la_LDFLAGS = -module -avoidversion 
 
 ha_la_SOURCES = ha-helpers.c ha.c
 ha_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = ha.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
+	    -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
 
 CLEANFILES = 
 
diff --git a/xlators/cluster/ha/src/ha-helpers.c b/xlators/cluster/ha/src/ha-helpers.c
index 19be1ed27..1e4af1b62 100644
--- a/xlators/cluster/ha/src/ha-helpers.c
+++ b/xlators/cluster/ha/src/ha-helpers.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #include "xlator.h"
 #include "call-stub.h"
 #include "defaults.h"
diff --git a/xlators/cluster/ha/src/ha-mem-types.h b/xlators/cluster/ha/src/ha-mem-types.h
index e5e97d237..9bfb3972b 100644
--- a/xlators/cluster/ha/src/ha-mem-types.h
+++ b/xlators/cluster/ha/src/ha-mem-types.h
@@ -1,13 +1,24 @@
+
 /*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
+
 #ifndef __HA_MEM_TYPES_H__
 #define __HA_MEM_TYPES_H__
 
diff --git a/xlators/cluster/ha/src/ha.c b/xlators/cluster/ha/src/ha.c
index 3eccb516b..38d4229d3 100644
--- a/xlators/cluster/ha/src/ha.c
+++ b/xlators/cluster/ha/src/ha.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 /* generate errors randomly, code is simple now, better alogorithm
  * can be written to decide what error to be returned and when
  */
@@ -1866,9 +1876,13 @@ err:
         }
 
         if (hafdp) {
-                GF_FREE (hafdp->fdstate);
+                if (hafdp->fdstate) {
+                        GF_FREE (hafdp->fdstate);
+                }
 
-                GF_FREE (hafdp->path);
+                if (hafdp->path) {
+                        GF_FREE (hafdp->path);
+                }
 
                 GF_FREE (hafdp);
         }
diff --git a/xlators/cluster/ha/src/ha.h b/xlators/cluster/ha/src/ha.h
index e2ed7eaa6..39b6851e7 100644
--- a/xlators/cluster/ha/src/ha.h
+++ b/xlators/cluster/ha/src/ha.h
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #ifndef __HA_H_
 #define __HA_H_
 
diff --git a/xlators/cluster/map/src/Makefile.am b/xlators/cluster/map/src/Makefile.am
index a278b05e2..26e19137a 100644
--- a/xlators/cluster/map/src/Makefile.am
+++ b/xlators/cluster/map/src/Makefile.am
@@ -1,16 +1,15 @@
 xlator_LTLIBRARIES = map.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/cluster
 
-map_la_LDFLAGS = -module -avoid-version 
+map_la_LDFLAGS = -module -avoidversion 
 
 map_la_SOURCES = map.c map-helper.c
 map_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = map.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
+	    -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
 
 CLEANFILES = 
 
diff --git a/xlators/cluster/map/src/map-helper.c b/xlators/cluster/map/src/map-helper.c
index 851397b68..81212fcfd 100644
--- a/xlators/cluster/map/src/map-helper.c
+++ b/xlators/cluster/map/src/map-helper.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2009-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2009-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #ifndef _CONFIG_H
 #define _CONFIG_H
 #include "config.h"
diff --git a/xlators/cluster/map/src/map-mem-types.h b/xlators/cluster/map/src/map-mem-types.h
index 3e89f4736..669b93dc2 100644
--- a/xlators/cluster/map/src/map-mem-types.h
+++ b/xlators/cluster/map/src/map-mem-types.h
@@ -1,13 +1,24 @@
+
 /*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
    This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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, see
+   <http://www.gnu.org/licenses/>.
 */
 
+
 #ifndef __MAP_MEM_TYPES_H__
 #define __MAP_MEM_TYPES_H__
 
diff --git a/xlators/cluster/map/src/map.c b/xlators/cluster/map/src/map.c
index 6150a33ce..ead9da0b9 100644
--- a/xlators/cluster/map/src/map.c
+++ b/xlators/cluster/map/src/map.c
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
-
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
+
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #ifndef _CONFIG_H
 #define _CONFIG_H
 #include "config.h"
@@ -2365,7 +2375,8 @@ fini (xlator_t *this)
 	priv = this->private;
 
 	if (priv) {
-		GF_FREE (priv->xlarray);
+		if (priv->xlarray)
+			GF_FREE (priv->xlarray);
 
 		trav_map = priv->map;
 		while (trav_map) {
diff --git a/xlators/cluster/map/src/map.h b/xlators/cluster/map/src/map.h
index 7703a543e..bccac437c 100644
--- a/xlators/cluster/map/src/map.h
+++ b/xlators/cluster/map/src/map.h
@@ -1,12 +1,22 @@
 /*
-   Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-   This file is part of GlusterFS.
+  Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+  This file is part of GlusterFS.
 
-   This file is licensed to you under your choice of the GNU Lesser
-   General Public License, version 3 or any later version (LGPLv3 or
-   later), or the GNU General Public License, version 2 (GPLv2), in all
-   cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
+
 #ifndef __MAP_H__
 #define __MAP_H__
 
diff --git a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am
index 2d151422a..0db3c9eeb 100644
--- a/xlators/cluster/stripe/src/Makefile.am
+++ b/xlators/cluster/stripe/src/Makefile.am
@@ -2,19 +2,16 @@
 xlator_LTLIBRARIES = stripe.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
 
-stripe_la_LDFLAGS = -module -avoid-version
-
-stripe_la_SOURCES = stripe.c stripe-helpers.c \
-	$(top_builddir)/xlators/lib/src/libxlator.c
+stripe_la_LDFLAGS = -module -avoidversion
 
+stripe_la_SOURCES = stripe.c $(top_builddir)/xlators/lib/src/libxlator.c
 stripe_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
 noinst_HEADERS = stripe.h stripe-mem-types.h $(top_builddir)/xlators/lib/src/libxlator.h
 
-AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
+	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
 	-I$(top_srcdir)/xlators/lib/src
 
-AM_CFLAGS = -Wall $(GF_CFLAGS)
-
 CLEANFILES = 
 
diff --git a/xlators/cluster/stripe/src/stripe-helpers.c b/xlators/cluster/stripe/src/stripe-helpers.c
deleted file mode 100644
index a83abdc72..000000000
--- a/xlators/cluster/stripe/src/stripe-helpers.c
+++ /dev/null
@@ -1,675 +0,0 @@
-/*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
-
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
-*/
-
-#include <fnmatch.h>
-
-#include "stripe.h"
-#include "byte-order.h"
-#include "mem-types.h"
-
-void
-stripe_local_wipe (stripe_local_t *local)
-{
-        if (!local)
-                goto out;
-
-        loc_wipe (&local->loc);
-        loc_wipe (&local->loc2);
-
-        if (local->fd)
-                fd_unref (local->fd);
-
-        if (local->inode)
-                inode_unref (local->inode);
-
-        if (local->xattr)
-                dict_unref (local->xattr);
-
-        if (local->xdata)
-                dict_unref (local->xdata);
-
-out:
-        return;
-}
-
-
-
-int
-stripe_aggregate (dict_t *this, char *key, data_t *value, void *data)
-{
-        dict_t  *dst  = NULL;
-        int64_t *ptr  = 0, *size = NULL;
-        int32_t  ret  = -1;
-
-        dst = data;
-
-        if (strcmp (key, GF_XATTR_QUOTA_SIZE_KEY) == 0) {
-                ret = dict_get_bin (dst, key, (void **)&size);
-                if (ret < 0) {
-                        size = GF_CALLOC (1, sizeof (int64_t),
-                                          gf_common_mt_char);
-                        if (size == NULL) {
-                                gf_log ("stripe", GF_LOG_WARNING,
-                                        "memory allocation failed");
-                                goto out;
-                        }
-                        ret = dict_set_bin (dst, key, size, sizeof (int64_t));
-                        if (ret < 0) {
-                                gf_log ("stripe", GF_LOG_WARNING,
-                                        "stripe aggregate dict set failed");
-                                GF_FREE (size);
-                                goto out;
-                        }
-                }
-
-                ptr = data_to_bin (value);
-                if (ptr == NULL) {
-                        gf_log ("stripe", GF_LOG_WARNING, "data to bin failed");
-                        goto out;
-                }
-
-                *size = hton64 (ntoh64 (*size) + ntoh64 (*ptr));
-        } else if (strcmp (key, GF_CONTENT_KEY)) {
-                /* No need to aggregate 'CONTENT' data */
-                ret = dict_set (dst, key, value);
-                if (ret)
-                        gf_log ("stripe", GF_LOG_WARNING, "xattr dict set failed");
-        }
-
-out:
-        return 0;
-}
-
-
-void
-stripe_aggregate_xattr (dict_t *dst, dict_t *src)
-{
-        if ((dst == NULL) || (src == NULL)) {
-                goto out;
-        }
-
-        dict_foreach (src, stripe_aggregate, dst);
-out:
-        return;
-}
-
-
-int32_t
-stripe_xattr_aggregate (char *buffer, stripe_local_t *local, int32_t *total)
-{
-        int32_t              i     = 0;
-        int32_t              ret   = -1;
-        int32_t              len   = 0;
-        char                *sbuf  = NULL;
-        stripe_xattr_sort_t *xattr = NULL;
-
-        if (!buffer || !local || !local->xattr_list)
-                goto out;
-
-        sbuf = buffer;
-
-        for (i = 0; i < local->nallocs; i++) {
-                xattr = local->xattr_list + i;
-                len = xattr->xattr_len;
-
-                if (len && xattr && xattr->xattr_value) {
-                        memcpy (buffer, xattr->xattr_value, len);
-                        buffer += len;
-                        *buffer++ = ' ';
-                }
-        }
-
-        *--buffer = '\0';
-        if (total)
-                *total = buffer - sbuf;
-        ret = 0;
-
- out:
-        return ret;
-}
-
-int32_t
-stripe_free_xattr_str (stripe_local_t *local)
-{
-        int32_t              i     = 0;
-        int32_t              ret   = -1;
-        stripe_xattr_sort_t *xattr = NULL;
-
-        if (!local || !local->xattr_list)
-                goto out;
-
-        for (i = 0; i < local->nallocs; i++) {
-                xattr = local->xattr_list + i;
-
-                if (xattr && xattr->xattr_value)
-                        GF_FREE (xattr->xattr_value);
-        }
-
-        ret = 0;
- out:
-        return ret;
-}
-
-
-int32_t
-stripe_fill_lockinfo_xattr (xlator_t *this, stripe_local_t *local,
-                            void **xattr_serz)
-{
-        int32_t              ret   = -1, i = 0, len = 0;
-        dict_t              *tmp1  = NULL, *tmp2 = NULL;
-        char                *buf   = NULL;
-        stripe_xattr_sort_t *xattr = NULL;
-
-        if (xattr_serz == NULL) {
-                goto out;
-        }
-
-        tmp2 = dict_new ();
-
-        if (tmp2 == NULL) {
-                goto out;
-        }
-
-        for (i = 0; i < local->nallocs; i++) {
-                xattr = local->xattr_list + i;
-                len = xattr->xattr_len;
-
-                if (len && xattr && xattr->xattr_value) {
-                        ret = dict_reset (tmp2);
-                        if (ret < 0) {
-                                gf_log (this->name, GF_LOG_DEBUG,
-                                        "dict_reset failed (%s)",
-                                        strerror (-ret));
-                        }
-
-                        ret = dict_unserialize (xattr->xattr_value,
-                                                xattr->xattr_len,
-                                                &tmp2);
-                        if (ret < 0) {
-                                gf_log (this->name, GF_LOG_WARNING,
-                                        "dict_unserialize failed (%s)",
-                                        strerror (-ret));
-                                ret = -1;
-                                goto out;
-                        }
-
-                        tmp1 = dict_copy (tmp2, tmp1);
-                        if (tmp1 == NULL) {
-                                gf_log (this->name, GF_LOG_WARNING,
-                                        "dict_copy failed (%s)",
-                                        strerror (-ret));
-                                ret = -1;
-                                goto out;
-                        }
-                }
-        }
-
-        len = dict_serialized_length (tmp1);
-        if (len > 0) {
-                buf = GF_CALLOC (1, len, gf_common_mt_dict_t);
-                if (buf == NULL) {
-                        ret = -1;
-                        goto out;
-                }
-
-                ret = dict_serialize (tmp1, buf);
-                if (ret < 0) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "dict_serialize failed (%s)", strerror (-ret));
-                        ret = -1;
-                        goto out;
-                }
-
-                *xattr_serz = buf;
-        }
-
-        ret = 0;
-out:
-        if (tmp1 != NULL) {
-                dict_unref (tmp1);
-        }
-
-        if (tmp2 != NULL) {
-                dict_unref (tmp2);
-        }
-
-        return ret;
-}
-
-
-int32_t
-stripe_fill_pathinfo_xattr (xlator_t *this, stripe_local_t *local,
-                            char **xattr_serz)
-{
-        int      ret             = -1;
-        int32_t  padding         = 0;
-        int32_t  tlen            = 0;
-        char stripe_size_str[20] = {0,};
-        char    *pathinfo_serz   = NULL;
-
-        if (!local) {
-                gf_log (this->name, GF_LOG_ERROR, "Possible NULL deref");
-                goto out;
-        }
-
-        (void) snprintf (stripe_size_str, 20, "%ld",
-                         (local->fctx) ? local->fctx->stripe_size : 0);
-
-        /* extra bytes for decorations (brackets and <>'s) */
-        padding = strlen (this->name) + strlen (STRIPE_PATHINFO_HEADER)
-                + strlen (stripe_size_str) + 7;
-        local->xattr_total_len += (padding + 2);
-
-        pathinfo_serz = GF_CALLOC (local->xattr_total_len, sizeof (char),
-                                   gf_common_mt_char);
-        if (!pathinfo_serz)
-                goto out;
-
-        /* xlator info */
-        (void) sprintf (pathinfo_serz, "(<"STRIPE_PATHINFO_HEADER"%s:[%s]> ",
-                        this->name, stripe_size_str);
-
-        ret = stripe_xattr_aggregate (pathinfo_serz + padding, local, &tlen);
-        if (ret) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "Cannot aggregate pathinfo list");
-                goto out;
-        }
-
-        *(pathinfo_serz + padding + tlen) = ')';
-        *(pathinfo_serz + padding + tlen + 1) = '\0';
-
-        *xattr_serz = pathinfo_serz;
-
-        ret = 0;
- out:
-        return ret;
-}
-
-/**
- * stripe_get_matching_bs - Get the matching block size for the given path.
- */
-int32_t
-stripe_get_matching_bs (const char *path, stripe_private_t *priv)
-{
-        struct stripe_options *trav       = NULL;
-        uint64_t               block_size = 0;
-
-        GF_VALIDATE_OR_GOTO ("stripe", priv, out);
-        GF_VALIDATE_OR_GOTO ("stripe", path, out);
-
-        LOCK (&priv->lock);
-        {
-                block_size = priv->block_size;
-                trav = priv->pattern;
-                while (trav) {
-                        if (!fnmatch (trav->path_pattern, path, FNM_NOESCAPE)) {
-                                block_size = trav->block_size;
-                                break;
-                        }
-                        trav = trav->next;
-                }
-        }
-        UNLOCK (&priv->lock);
-
-out:
-        return block_size;
-}
-
-int32_t
-stripe_ctx_handle (xlator_t *this, call_frame_t *prev, stripe_local_t *local,
-                   dict_t *dict)
-{
-        char            key[256]       = {0,};
-        data_t         *data            = NULL;
-        int32_t         index           = 0;
-        stripe_private_t *priv          = NULL;
-
-        priv = this->private;
-
-
-        if (!local->fctx) {
-                local->fctx =  GF_CALLOC (1, sizeof (stripe_fd_ctx_t),
-                                         gf_stripe_mt_stripe_fd_ctx_t);
-                if (!local->fctx) {
-                        local->op_errno = ENOMEM;
-                        local->op_ret = -1;
-                        goto out;
-                }
-
-                local->fctx->static_array = 0;
-        }
-        /* Stripe block size */
-        sprintf (key, "trusted.%s.stripe-size", this->name);
-        data = dict_get (dict, key);
-        if (!data) {
-                local->xattr_self_heal_needed = 1;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "Failed to get stripe-size");
-                goto out;
-        } else {
-                if (!local->fctx->stripe_size) {
-                        local->fctx->stripe_size =
-                                     data_to_int64 (data);
-                }
-
-                if (local->fctx->stripe_size != data_to_int64 (data)) {
-                        gf_log (this->name, GF_LOG_WARNING,
-                                "stripe-size mismatch in blocks");
-                        local->xattr_self_heal_needed = 1;
-                }
-        }
-
-        /* Stripe count */
-        sprintf (key, "trusted.%s.stripe-count", this->name);
-        data = dict_get (dict, key);
-
-        if (!data) {
-                local->xattr_self_heal_needed = 1;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "Failed to get stripe-count");
-                goto out;
-        }
-        if (!local->fctx->xl_array) {
-                local->fctx->stripe_count = data_to_int32 (data);
-                if (!local->fctx->stripe_count) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "error with stripe-count xattr");
-                        local->op_ret   = -1;
-                        local->op_errno = EIO;
-                        goto out;
-                }
-
-                local->fctx->xl_array = GF_CALLOC (local->fctx->stripe_count,
-                                                   sizeof (xlator_t *),
-                                                   gf_stripe_mt_xlator_t);
-
-                if (!local->fctx->xl_array) {
-                        local->op_errno = ENOMEM;
-                        local->op_ret   = -1;
-                        goto out;
-                }
-        }
-        if (local->fctx->stripe_count != data_to_int32 (data)) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "error with stripe-count xattr (%d != %d)",
-                        local->fctx->stripe_count, data_to_int32 (data));
-                local->op_ret   = -1;
-                local->op_errno = EIO;
-                goto out;
-        }
-
-        /* index */
-        sprintf (key, "trusted.%s.stripe-index", this->name);
-        data = dict_get (dict, key);
-        if (!data) {
-                local->xattr_self_heal_needed = 1;
-                gf_log (this->name, GF_LOG_ERROR,
-                        "Failed to get stripe-index");
-                goto out;
-        }
-        index = data_to_int32 (data);
-        if (index > priv->child_count) {
-                gf_log (this->name, GF_LOG_ERROR,
-                        "error with stripe-index xattr (%d)", index);
-                local->op_ret   = -1;
-                local->op_errno = EIO;
-                goto out;
-        }
-        if (local->fctx->xl_array) {
-                if (!local->fctx->xl_array[index])
-                        local->fctx->xl_array[index] = prev->this;
-        }
-
-	sprintf(key, "trusted.%s.stripe-coalesce", this->name);
-	data = dict_get(dict, key);
-	if (!data) {
-		/*
-		 * The file was probably created prior to coalesce support.
-		 * Assume non-coalesce mode for this file to maintain backwards
-		 * compatibility.
-		 */
-		gf_log(this->name, GF_LOG_DEBUG, "missing stripe-coalesce "
-			"attr, assume non-coalesce mode");
-		local->fctx->stripe_coalesce = 0;
-	} else {
-		local->fctx->stripe_coalesce = data_to_int32(data);
-	}
-
-
-out:
-        return 0;
-}
-
-int32_t
-stripe_xattr_request_build (xlator_t *this, dict_t *dict, uint64_t stripe_size,
-                            uint32_t stripe_count, uint32_t stripe_index,
-			    uint32_t stripe_coalesce)
-{
-        char            key[256]       = {0,};
-        int32_t         ret             = -1;
-
-        sprintf (key, "trusted.%s.stripe-size", this->name);
-        ret = dict_set_int64 (dict, key, stripe_size);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "failed to set %s in xattr_req dict", key);
-                goto out;
-        }
-
-        sprintf (key, "trusted.%s.stripe-count", this->name);
-        ret = dict_set_int32 (dict, key, stripe_count);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "failed to set %s in xattr_req dict", key);
-                goto out;
-        }
-
-        sprintf (key, "trusted.%s.stripe-index", this->name);
-        ret = dict_set_int32 (dict, key, stripe_index);
-        if (ret) {
-                gf_log (this->name, GF_LOG_WARNING,
-                        "failed to set %s in xattr_req dict", key);
-                goto out;
-        }
-
-	sprintf(key, "trusted.%s.stripe-coalesce", this->name);
-	ret = dict_set_int32(dict, key, stripe_coalesce);
-	if (ret) {
-		gf_log(this->name, GF_LOG_WARNING,
-			"failed to set %s in xattr_req_dict", key);
-		goto out;
-	}
-out:
-        return ret;
-}
-
-
-static int
-set_default_block_size (stripe_private_t *priv, char *num)
-{
-
-        int             ret = -1;
-        GF_VALIDATE_OR_GOTO ("stripe", THIS, out);
-        GF_VALIDATE_OR_GOTO (THIS->name, priv, out);
-        GF_VALIDATE_OR_GOTO (THIS->name, num, out);
-
-
-        if (gf_string2bytesize (num, &priv->block_size) != 0) {
-                gf_log (THIS->name, GF_LOG_ERROR,
-                        "invalid number format \"%s\"", num);
-                goto out;
-        }
-
-        ret = 0;
-
- out:
-        return ret;
-
-}
-
-
-int
-set_stripe_block_size (xlator_t *this, stripe_private_t *priv, char *data)
-{
-        int                    ret = -1;
-        char                  *tmp_str = NULL;
-        char                  *tmp_str1 = NULL;
-        char                  *dup_str = NULL;
-        char                  *stripe_str = NULL;
-        char                  *pattern = NULL;
-        char                  *num = NULL;
-        struct stripe_options *temp_stripeopt = NULL;
-        struct stripe_options *stripe_opt = NULL;
-
-        if (!this || !priv || !data)
-                goto out;
-
-        /* Get the pattern for striping.
-           "option block-size *avi:10MB" etc */
-        stripe_str = strtok_r (data, ",", &tmp_str);
-        while (stripe_str) {
-                dup_str = gf_strdup (stripe_str);
-                stripe_opt = GF_CALLOC (1, sizeof (struct stripe_options),
-                                        gf_stripe_mt_stripe_options);
-                if (!stripe_opt) {
-                        goto out;
-                }
-
-                pattern = strtok_r (dup_str, ":", &tmp_str1);
-                num = strtok_r (NULL, ":", &tmp_str1);
-                if (!num) {
-                        num = pattern;
-                        pattern = "*";
-                        ret = set_default_block_size (priv, num);
-                        if (ret)
-                                goto out;
-                }
-                if (gf_string2bytesize (num, &stripe_opt->block_size) != 0) {
-                        gf_log (this->name, GF_LOG_ERROR,
-                                "invalid number format \"%s\"", num);
-                        goto out;
-                }
-
-                if (stripe_opt->block_size < STRIPE_MIN_BLOCK_SIZE) {
-                        gf_log (this->name, GF_LOG_ERROR, "Invalid Block-size: "
-                                "%s. Should be atleast %llu bytes", num,
-                                STRIPE_MIN_BLOCK_SIZE);
-                        goto out;
-                }
-                if (stripe_opt->block_size % 512) {
-                        gf_log (this->name, GF_LOG_ERROR, "Block-size: %s should"
-                                " be a multiple of 512 bytes", num);
-                        goto out;
-                }
-
-                memcpy (stripe_opt->path_pattern, pattern, strlen (pattern));
-
-                gf_log (this->name, GF_LOG_DEBUG,
-                        "block-size : pattern %s : size %"PRId64,
-                        stripe_opt->path_pattern, stripe_opt->block_size);
-
-                if (priv->pattern)
-                        temp_stripeopt = NULL;
-                else
-                        temp_stripeopt = priv->pattern;
-
-                stripe_opt->next = temp_stripeopt;
-
-                priv->pattern = stripe_opt;
-                stripe_opt = NULL;
-
-                GF_FREE (dup_str);
-                dup_str = NULL;
-
-                stripe_str = strtok_r (NULL, ",", &tmp_str);
-        }
-
-        ret = 0;
-out:
-
-        GF_FREE (dup_str);
-
-        GF_FREE (stripe_opt);
-
-        return ret;
-}
-
-int32_t
-stripe_iatt_merge (struct iatt *from, struct iatt *to)
-{
-        if (to->ia_size < from->ia_size)
-                to->ia_size = from->ia_size;
-        if (to->ia_mtime < from->ia_mtime)
-                to->ia_mtime = from->ia_mtime;
-        if (to->ia_ctime < from->ia_ctime)
-                to->ia_ctime = from->ia_ctime;
-        if (to->ia_atime < from->ia_atime)
-                to->ia_atime = from->ia_atime;
-        return 0;
-}
-
-off_t
-coalesced_offset(off_t offset, uint64_t stripe_size, int stripe_count)
-{
-	size_t line_size = 0;
-	uint64_t stripe_num = 0;
-	off_t coalesced_offset = 0;
-
-	line_size = stripe_size * stripe_count;
-	stripe_num = offset / line_size;
-
-	coalesced_offset = (stripe_num * stripe_size) +
-		(offset % stripe_size);
-
-	return coalesced_offset;
-}
-
-off_t
-uncoalesced_size(off_t size, uint64_t stripe_size, int stripe_count,
-		int stripe_index)
-{
-        uint64_t nr_full_stripe_chunks = 0, mod = 0;
-
-        if (!size)
-                return size;
-
-	/*
-	 * Estimate the number of fully written stripes from the
-	 * local file size. Each stripe_size chunk corresponds to
-	 * a stripe.
-	 */
-        nr_full_stripe_chunks = (size / stripe_size) * stripe_count;
-        mod = size % stripe_size;
-
-        if (!mod) {
-                /*
-		 * There is no remainder, thus we could have overestimated
-		 * the size of the file in terms of chunks. Trim the number
-		 * of chunks by the following stripe members and leave it
-		 * up to those nodes to respond with a larger size (if
-		 * necessary).
-		 */
-                nr_full_stripe_chunks -= stripe_count -
-                        (stripe_index + 1);
-                size = nr_full_stripe_chunks * stripe_size;
-        } else {
-		/*
-		 * There is a remainder and thus we own the last chunk of the
-		 * file. Add the preceding stripe members of the final stripe
-		 * along with the remainder to calculate the exact size.
-		 */
-                nr_full_stripe_chunks += stripe_index;
-                size = nr_full_stripe_chunks * stripe_size + mod;
-        }
-
-        return size;
-}
-
diff --git a/xlators/cluster/stripe/src/stripe-mem-types.h b/xlators/cluster/stripe/src/stripe-mem-types.h
index e9ac9cf46..29c95c257 100644
--- a/xlators/cluster/stripe/src/stripe-mem-types.h
+++ b/xlators/cluster/stripe/src/stripe-mem-types.h
@@ -1,11 +1,21 @@
+
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
-  This file is part of GlusterFS.
+   Copyright (c) 2008-2011 Gluster, Inc. <http://www.gluster.com>
+   This file is part of GlusterFS.
+
+   GlusterFS 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 3 of the License,
+   or (at your option) any later version.
+
+   GlusterFS 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.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see
+   <http://www.gnu.org/licenses/>.
 */
 
 
@@ -15,12 +25,12 @@
 #include "mem-types.h"
 
 enum gf_stripe_mem_types_ {
-        gf_stripe_mt_iovec = gf_common_mt_end + 1,
-        gf_stripe_mt_stripe_replies,
+        gf_stripe_mt_stripe_local_t = gf_common_mt_end + 1,
+        gf_stripe_mt_iovec,
+        gf_stripe_mt_readv_replies,
         gf_stripe_mt_stripe_fd_ctx_t,
         gf_stripe_mt_char,
         gf_stripe_mt_int8_t,
-        gf_stripe_mt_int32_t,
         gf_stripe_mt_xlator_t,
         gf_stripe_mt_stripe_private_t,
         gf_stripe_mt_stripe_options,
diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c
index 69b510e23..e6175c203 100644
--- a/xlators/cluster/stripe/src/stripe.c
+++ b/xlators/cluster/stripe/src/stripe.c
@@ -1,16 +1,25 @@
 /*
-  Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
-  This file is licensed to you under your choice of the GNU Lesser
-  General Public License, version 3 or any later version (LGPLv3 or
-  later), or the GNU General Public License, version 2 (GPLv2), in all
-  cases as published by the Free Software Foundation.
+  GlusterFS 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 3 of the License,
+  or (at your option) any later version.
+
+  GlusterFS 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, see
+  <http://www.gnu.org/licenses/>.
 */
 
 /**
  * xlators/cluster/stripe:
- *    Stripe translator, stripes the data across its child nodes,
+ *    Stripe translator, stripes the data accross its child nodes,
  *    as per the options given in the volfile. The striping works
  *    fairly simple. It writes files at different offset as per
  *    calculation. So, 'ls -l' output at the real posix level will
@@ -23,19 +32,80 @@
  *  very much necessary, or else, use it in combination with AFR, to have a
  *  backup copy.
  */
-#include <fnmatch.h>
 
 #include "stripe.h"
 #include "libxlator.h"
 #include "byte-order.h"
-#include "statedump.h"
 
 struct volume_options options[];
 
+void
+stripe_local_wipe (stripe_local_t *local)
+{
+        if (!local)
+                goto out;
+
+        loc_wipe (&local->loc);
+        loc_wipe (&local->loc2);
+
+        if (local->fd)
+                fd_unref (local->fd);
+
+        if (local->inode)
+                inode_unref (local->inode);
+
+        if (local->xattr)
+                dict_unref (local->xattr);
+
+        if (local->dict)
+                dict_unref (local->dict);
+
+out:
+        return;
+}
+
+/**
+ * stripe_get_matching_bs - Get the matching block size for the given path.
+ */
+int32_t
+stripe_get_matching_bs (const char *path, struct stripe_options *opts,
+                        uint64_t default_bs)
+{
+        struct stripe_options *trav       = NULL;
+        char                  *pathname   = NULL;
+        uint64_t               block_size = 0;
+
+        block_size = default_bs;
+
+        if (!path || !opts)
+                goto out;
+
+        /* FIXME: is a strdup really necessary? */
+        pathname = gf_strdup (path);
+        if (!pathname)
+                goto out;
+
+        trav = opts;
+        while (trav) {
+                if (!fnmatch (trav->path_pattern, pathname, FNM_NOESCAPE)) {
+                        block_size = trav->block_size;
+                        break;
+                }
+                trav = trav->next;
+        }
+
+        GF_FREE (pathname);
+
+out:
+        return block_size;
+}
+
+
+
 int32_t
 stripe_sh_chown_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno,
-                     struct iatt *preop, struct iatt *postop, dict_t *xdata)
+                     struct iatt *preop, struct iatt *postop)
 {
         int             callcnt = -1;
         stripe_local_t *local   = NULL;
@@ -64,7 +134,7 @@ int32_t
 stripe_sh_make_entry_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                           int32_t op_ret, int32_t op_errno, inode_t *inode,
                           struct iatt *buf, struct iatt *preparent,
-                          struct iatt *postparent, dict_t *xdata)
+                          struct iatt *postparent)
 {
         stripe_local_t *local = NULL;
         call_frame_t    *prev = NULL;
@@ -79,7 +149,7 @@ stripe_sh_make_entry_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         STACK_WIND (frame, stripe_sh_chown_cbk, prev->this,
                     prev->this->fops->setattr, &local->loc,
-                    &local->stbuf, (GF_SET_ATTR_UID | GF_SET_ATTR_GID), NULL);
+                    &local->stbuf, (GF_SET_ATTR_UID | GF_SET_ATTR_GID));
 
 out:
         return 0;
@@ -93,7 +163,7 @@ stripe_entry_self_heal (call_frame_t *frame, xlator_t *this,
         call_frame_t     *rframe = NULL;
         stripe_local_t   *rlocal = NULL;
         stripe_private_t *priv   = NULL;
-        dict_t           *xdata  = NULL;
+        dict_t           *dict   = NULL;
         int               ret    = 0;
 
         if (!local || !this || !frame) {
@@ -111,7 +181,8 @@ stripe_entry_self_heal (call_frame_t *frame, xlator_t *this,
         if (!rframe) {
                 goto out;
         }
-        rlocal = mem_get0 (this->local_pool);
+        rlocal = GF_CALLOC (1, sizeof (stripe_local_t),
+                            gf_stripe_mt_stripe_local_t);
         if (!rlocal) {
                 goto out;
         }
@@ -120,14 +191,14 @@ stripe_entry_self_heal (call_frame_t *frame, xlator_t *this,
         loc_copy (&rlocal->loc, &local->loc);
         memcpy (&rlocal->stbuf, &local->stbuf, sizeof (struct iatt));
 
-        xdata = dict_new ();
-        if (!xdata)
+        dict = dict_new ();
+        if (!dict)
                 goto out;
 
-        ret = dict_set_static_bin (xdata, "gfid-req", local->stbuf.ia_gfid, 16);
+        ret = dict_set_static_bin (dict, "gfid-req", local->stbuf.ia_gfid, 16);
         if (ret)
                 gf_log (this->name, GF_LOG_WARNING,
-                        "%s: failed to set gfid-req", local->loc.path);
+                        "failed to set gfid-req");
 
         while (trav) {
                 if (IA_ISREG (local->stbuf.ia_type)) {
@@ -135,43 +206,101 @@ stripe_entry_self_heal (call_frame_t *frame, xlator_t *this,
                                     trav->xlator, trav->xlator->fops->mknod,
                                     &local->loc,
                                     st_mode_from_ia (local->stbuf.ia_prot,
-                                                     local->stbuf.ia_type),
-                                    0, 0, xdata);
+                                                     local->stbuf.ia_type), 0,
+                                    dict);
                 }
                 if (IA_ISDIR (local->stbuf.ia_type)) {
                         STACK_WIND (rframe, stripe_sh_make_entry_cbk,
                                     trav->xlator, trav->xlator->fops->mkdir,
-                                    &local->loc,
-                                    st_mode_from_ia (local->stbuf.ia_prot,
-                                                     local->stbuf.ia_type),
-                                    0, xdata);
+                                    &local->loc, st_mode_from_ia (local->stbuf.ia_prot,
+                                                                  local->stbuf.ia_type),
+                                    dict);
                 }
                 trav = trav->next;
         }
-
-        if (xdata)
-                dict_unref (xdata);
+        if (dict)
+                dict_unref (dict);
         return 0;
 
+
 out:
         if (rframe)
                 STRIPE_STACK_DESTROY (rframe);
-        if (xdata)
-                dict_unref (xdata);
+        if (dict)
+                dict_unref (dict);
 
         return 0;
 }
 
 
+void
+stripe_aggregate (dict_t *this, char *key, data_t *value, void *data)
+{
+        dict_t  *dst  = NULL;
+        int64_t *ptr  = 0, *size = NULL;
+        int32_t  ret  = -1;
+
+        dst = data;
+
+        if (strcmp (key, GF_XATTR_QUOTA_SIZE_KEY) == 0) {
+                ret = dict_get_bin (dst, key, (void **)&size);
+                if (ret < 0) {
+                        size = GF_CALLOC (1, sizeof (int64_t),
+                                          gf_common_mt_char);
+                        if (size == NULL) {
+                                gf_log ("stripe", GF_LOG_WARNING,
+                                        "memory allocation failed");
+                                goto out;
+                        }
+                        ret = dict_set_bin (dst, key, size, sizeof (int64_t));
+                        if (ret < 0) {
+                                gf_log ("stripe", GF_LOG_WARNING,
+                                        "stripe aggregate dict set failed");
+                                GF_FREE (size);
+                                goto out;
+                        }
+                }
+
+                ptr = data_to_bin (value);
+                if (ptr == NULL) {
+                        gf_log ("stripe", GF_LOG_WARNING, "data to bin failed");
+                        goto out;
+                }
+
+                *size = hton64 (ntoh64 (*size) + ntoh64 (*ptr));
+        } else if (strcmp (key, GF_CONTENT_KEY)) {
+                /* No need to aggregate 'CONTENT' data */
+                ret = dict_set (dst, key, value);
+                if (ret)
+                        gf_log ("stripe", GF_LOG_WARNING, "xattr dict set failed");
+        }
+
+out:
+        return;
+}
+
+
+void
+stripe_aggregate_xattr (dict_t *dst, dict_t *src)
+{
+        if ((dst == NULL) || (src == NULL)) {
+                goto out;
+        }
+
+        dict_foreach (src, stripe_aggregate, dst);
+out:
+        return;
+}
+
+
 int32_t
 stripe_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                    int32_t op_ret, int32_t op_errno, inode_t *inode,
-                   struct iatt *buf, dict_t *xdata, struct iatt *postparent)
+                   struct iatt *buf, dict_t *dict, struct iatt *postparent)
 {
-        int32_t         callcnt     = 0;
-        stripe_local_t *local       = NULL;
-        call_frame_t   *prev        = NULL;
-        int             ret         = 0;
+        int32_t         callcnt = 0;
+        stripe_local_t *local = NULL;
+        call_frame_t   *prev = NULL;
 
         if (!this || !frame || !frame->local || !cookie) {
                 gf_log ("stripe", GF_LOG_DEBUG, "possible NULL deref");
@@ -202,42 +331,30 @@ stripe_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
                 if (op_ret >= 0) {
                         local->op_ret = 0;
-                        if (IA_ISREG (buf->ia_type)) {
-                                ret = stripe_ctx_handle (this, prev, local,
-                                                         xdata);
-                                if (ret)
-                                        gf_log (this->name, GF_LOG_ERROR,
-                                                 "Error getting fctx info from"
-                                                 " dict");
-                        }
 
                         if (FIRST_CHILD(this) == prev->this) {
                                 local->stbuf      = *buf;
                                 local->postparent = *postparent;
                                 local->inode = inode_ref (inode);
-                                if (xdata)
-                                        local->xdata = dict_ref (xdata);
+                                local->dict = dict_ref (dict);
                                 if (local->xattr) {
-                                        stripe_aggregate_xattr (local->xdata,
+                                        stripe_aggregate_xattr (local->dict,
                                                                 local->xattr);
                                         dict_unref (local->xattr);
                                         local->xattr = NULL;
                                 }
                         }
-
-                        if (!local->xdata && !local->xattr) {
-                                local->xattr = dict_ref (xdata);
-                        } else if (local->xdata) {
-                                stripe_aggregate_xattr (local->xdata, xdata);
+                        if (!local->dict && !local->xattr) {
+                                local->xattr = dict_ref (dict);
+                        } else if (local->dict) {
+                                stripe_aggregate_xattr (local->dict, dict);
                         } else if (local->xattr) {
-                                stripe_aggregate_xattr (local->xattr, xdata);
+                                stripe_aggregate_xattr (local->xattr, dict);
                         }
 
                         local->stbuf_blocks      += buf->ia_blocks;
                         local->postparent_blocks += postparent->ia_blocks;
 
-			correct_file_size(buf, local->fctx, prev);
-
                         if (local->stbuf_size < buf->ia_size)
                                 local->stbuf_size = buf->ia_size;
                         if (local->postparent_size < postparent->ia_size)
@@ -269,13 +386,11 @@ stripe_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->stbuf.ia_size        = local->stbuf_size;
                         local->postparent.ia_blocks = local->postparent_blocks;
                         local->postparent.ia_size   = local->postparent_size;
-                        inode_ctx_put (local->inode, this,
-                                       (uint64_t) (long)local->fctx);
                 }
 
                 STRIPE_STACK_UNWIND (lookup, frame, local->op_ret,
                                      local->op_errno, local->inode,
-                                     &local->stbuf, local->xdata,
+                                     &local->stbuf, local->dict,
                                      &local->postparent);
         }
 out:
@@ -284,15 +399,14 @@ out:
 
 int32_t
 stripe_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
-               dict_t *xdata)
+               dict_t *xattr_req)
 {
-        stripe_local_t   *local    = NULL;
-        xlator_list_t    *trav     = NULL;
-        stripe_private_t *priv     = NULL;
+        stripe_local_t   *local = NULL;
+        xlator_list_t    *trav = NULL;
+        stripe_private_t *priv = NULL;
         int32_t           op_errno = EINVAL;
         int64_t           filesize = 0;
-        int               ret      = 0;
-        uint64_t          tmpctx   = 0;
+        int               ret = 0;
 
         VALIDATE_OR_GOTO (frame, err);
         VALIDATE_OR_GOTO (this, err);
@@ -304,7 +418,8 @@ stripe_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
         trav = this->children;
 
         /* Initialization */
-        local = mem_get0 (this->local_pool);
+        local = GF_CALLOC (1, sizeof (stripe_local_t),
+                           gf_stripe_mt_stripe_local_t);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
@@ -313,37 +428,10 @@ stripe_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
         frame->local = local;
         loc_copy (&local->loc, loc);
 
-        inode_ctx_get (local->inode, this, &tmpctx);
-        if (tmpctx)
-                local->fctx = (stripe_fd_ctx_t*) (long)tmpctx;
-
-        /* quick-read friendly changes */
-        if (xdata && dict_get (xdata, GF_CONTENT_KEY)) {
-                ret = dict_get_int64 (xdata, GF_CONTENT_KEY, &filesize);
+        if (xattr_req && dict_get (xattr_req, GF_CONTENT_KEY)) {
+                ret = dict_get_int64 (xattr_req, GF_CONTENT_KEY, &filesize);
                 if (!ret && (filesize > priv->block_size))
-                        dict_del (xdata, GF_CONTENT_KEY);
-        }
-
-        /* get stripe-size xattr on lookup. This would be required for
-         * open/read/write/pathinfo calls. Hence we send down the request
-         * even when type == IA_INVAL */
-
-	/*
-	 * We aren't guaranteed to have xdata here. We need the format info for
-	 * the file, so allocate xdata if necessary.
-	 */
-	if (!xdata)
-		xdata = dict_new();
-	else
-		xdata = dict_ref(xdata);
-
-        if (xdata && (IA_ISREG (loc->inode->ia_type) ||
-            (loc->inode->ia_type == IA_INVAL))) {
-                ret = stripe_xattr_request_build (this, xdata, 8, 4, 4, 0);
-                if (ret)
-                        gf_log (this->name , GF_LOG_ERROR, "Failed to build"
-                                " xattr request for %s", loc->path);
-
+                        dict_del (xattr_req, GF_CONTENT_KEY);
         }
 
         /* Everytime in stripe lookup, all child nodes
@@ -351,12 +439,11 @@ stripe_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
         local->call_count = priv->child_count;
         while (trav) {
                 STACK_WIND (frame, stripe_lookup_cbk, trav->xlator,
-                            trav->xlator->fops->lookup, loc, xdata);
+                            trav->xlator->fops->lookup,
+                            loc, xattr_req);
                 trav = trav->next;
         }
 
-	dict_unref(xdata);
-
         return 0;
 err:
         STRIPE_STACK_UNWIND (lookup, frame, -1, op_errno, NULL, NULL, NULL, NULL);
@@ -366,7 +453,7 @@ err:
 
 int32_t
 stripe_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                 int32_t op_ret, int32_t op_errno, struct iatt *buf, dict_t *xdata)
+                 int32_t op_ret, int32_t op_errno, struct iatt *buf)
 {
         int32_t         callcnt = 0;
         stripe_local_t *local = NULL;
@@ -401,9 +488,6 @@ stripe_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         }
 
                         local->stbuf_blocks += buf->ia_blocks;
-
-			correct_file_size(buf, local->fctx, prev);
-
                         if (local->stbuf_size < buf->ia_size)
                                 local->stbuf_size = buf->ia_size;
                 }
@@ -420,19 +504,18 @@ stripe_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 }
 
                 STRIPE_STACK_UNWIND (stat, frame, local->op_ret,
-                                     local->op_errno, &local->stbuf, NULL);
+                                     local->op_errno, &local->stbuf);
         }
 out:
         return 0;
 }
 
 int32_t
-stripe_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
+stripe_stat (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
         xlator_list_t    *trav = NULL;
         stripe_local_t   *local = NULL;
         stripe_private_t *priv = NULL;
-	stripe_fd_ctx_t  *fctx = NULL;
         int32_t           op_errno = EINVAL;
 
         VALIDATE_OR_GOTO (frame, err);
@@ -450,7 +533,8 @@ stripe_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
         }
 
         /* Initialization */
-        local = mem_get0 (this->local_pool);
+        local = GF_CALLOC (1, sizeof (stripe_local_t),
+                           gf_stripe_mt_stripe_local_t);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
@@ -459,30 +543,23 @@ stripe_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
         frame->local = local;
         local->call_count = priv->child_count;
 
-	if (IA_ISREG(loc->inode->ia_type)) {
-		inode_ctx_get(loc->inode, this, (uint64_t *) &fctx);
-		if (!fctx)
-			goto err;
-		local->fctx = fctx;
-	}
-
         while (trav) {
                 STACK_WIND (frame, stripe_stat_cbk, trav->xlator,
-                            trav->xlator->fops->stat, loc, NULL);
+                            trav->xlator->fops->stat, loc);
                 trav = trav->next;
         }
 
         return 0;
 
 err:
-        STRIPE_STACK_UNWIND (stat, frame, -1, op_errno, NULL, NULL);
+        STRIPE_STACK_UNWIND (stat, frame, -1, op_errno, NULL);
         return 0;
 }
 
 
 int32_t
 stripe_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-                   int32_t op_ret, int32_t op_errno, struct statvfs *stbuf, dict_t *xdata)
+                   int32_t op_ret, int32_t op_errno, struct statvfs *stbuf)
 {
         stripe_local_t *local = NULL;
         int32_t         callcnt = 0;
@@ -520,14 +597,14 @@ stripe_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         if (!callcnt) {
                 STRIPE_STACK_UNWIND (statfs, frame, local->op_ret,
-                                     local->op_errno, &local->statvfs_buf, NULL);
+                                     local->op_errno, &local->statvfs_buf);
         }
 out:
         return 0;
 }
 
 int32_t
-stripe_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
+stripe_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc)
 {
         stripe_local_t   *local = NULL;
         xlator_list_t    *trav = NULL;
@@ -542,7 +619,8 @@ stripe_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
         priv = this->private;
 
         /* Initialization */
-        local = mem_get0 (this->local_pool);
+        local = GF_CALLOC (1, sizeof (stripe_local_t),
+                           gf_stripe_mt_stripe_local_t);
         if (!local) {
                 op_errno = ENOMEM;
                 goto err;
@@ -554,13 +632,13 @@ stripe_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
         local->call_count = priv->child_count;
         while (trav) {
                 STACK_WIND (frame, stripe_statfs_cbk, trav->xlator,
-                            trav->xlator->fops->statfs, loc, NULL);
+                            trav->xlator->fops->statfs, loc);
                 trav = trav->next;
         }
 
         return 0;
 err:
-        STRIPE_STACK_UNWIND (statfs, frame, -1, op_errno, NULL, NULL);
+        STRIPE_STACK_UNWIND (statfs, frame, -1, op_errno, NULL);
         return 0;
 }
 
@@ -569,7 +647,7 @@ err:
 int32_t
 stripe_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                      int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
-                     struct iatt *postbuf, dict_t *xdata)
+                     struct iatt *postbuf)
 {
         int32_t         callcnt = 0;
         stripe_local_t *local = NULL;
@@ -607,9 +685,6 @@ stripe_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->prebuf_blocks  += prebuf->ia_blocks;
                         local->postbuf_blocks += postbuf->ia_blocks;
 
-			correct_file_size(prebuf, local->fctx, prev);
-			correct_file_size(postbuf, local->fctx, prev);
-
                         if (local->prebuf_size < prebuf->ia_size)
                                 local->prebuf_size = prebuf->ia_size;
 
@@ -632,21 +707,19 @@ stripe_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
                 STRIPE_STACK_UNWIND (truncate, frame, local->op_ret,
                                      local->op_errno, &local->pre_buf,
-                                     &local->post_buf, NULL);
+                                     &local->post_buf);
         }
 out:
         return 0;
 }
 
 int32_t
-stripe_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset, dict_t *xdata)
+stripe_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset)
 {
+        xlator_list_t    *trav = NULL;
         stripe_local_t   *local = NULL;
         stripe_private_t *priv = NULL;
-	stripe_fd_ctx_t  *fctx = NULL;
         int32_t           op_errno = EINVAL;
-	int		  i, eof_idx;